- Wine-Devel - list.winehq.org

[PATCH 1/3] evr/mixer: Add IMFClockStateSink stub.
by Nikolay Sivov Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 86 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 59d75c0476b..20b5e3b2bba 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -74,6 +74,7 @@ struct video_mixer IMFVideoProcessor IMFVideoProcessor_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFClockStateSink IMFClockStateSink_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -153,6 +154,11 @@ static struct video_mixer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFQualityAdvise_iface); } +static struct video_mixer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFClockStateSink_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -251,6 +257,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &mixer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2181,6 +2191,77 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = video_mixer_quality_advise_DropTime, }; +static HRESULT WINAPI video_mixer_clock_state_sink_QueryInterface(IMFClockStateSink *iface, + REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_clock_state_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_clock_state_sink_Release(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStart(IMFClockStateSink *iface, + MFTIME systime, LONGLONG offset) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStop(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockPause(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockRestart(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockSetRate(IMFClockStateSink *iface, + MFTIME systime, float rate) +{ + FIXME("%p, %f.\n", iface, rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_mixer_clock_state_sink_vtbl = +{ + video_mixer_clock_state_sink_QueryInterface, + video_mixer_clock_state_sink_AddRef, + video_mixer_clock_state_sink_Release, + video_mixer_clock_state_sink_OnClockStart, + video_mixer_clock_state_sink_OnClockStop, + video_mixer_clock_state_sink_OnClockPause, + video_mixer_clock_state_sink_OnClockRestart, + video_mixer_clock_state_sink_OnClockSetRate, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -2212,6 +2293,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_mixer_quality_advise_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_mixer_clock_state_sink_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0158a0320a7..8c82ae34f8d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -465,6 +465,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFClockStateSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); -- 2.28.0

1 2

[PATCH] include: Add INetworkEvents and some enums to netlistmgr.idl.
by Gijs Vermeulen Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/netlistmgr.idl | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e098f7225ab..d12b4a5f4b7 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,10 +27,26 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkConnectionEvents; interface INetworkCostManager; +interface INetworkEvents; interface INetworkListManager; interface INetworkListManagerEvents; +typedef [v1_enum] enum NLM_NETWORK_CLASS +{ + NLM_NETWORK_IDENTIFYING = 0x01, + NLM_NETWORK_IDENTIFIED = 0x02, + NLM_NETWORK_UNIDENTIFIED = 0x03 +} NLM_NETWORK_CLASS; + +typedef [v1_enum] enum NLM_INTERNET_CONNECTIVITY +{ + NLM_INTERNET_CONNECTIVITY_WEBHIJACK = 0x01, + NLM_INTERNET_CONNECTIVITY_PROXIED = 0x02, + NLM_INTERNET_CONNECTIVITY_CORPORATE = 0x04 +} NLM_INTERNET_CONNECTIVITY; + typedef [v1_enum] enum NLM_CONNECTIVITY { NLM_CONNECTIVITY_DISCONNECTED = 0x0000, @@ -390,3 +406,35 @@ interface INetwork : IDispatch HRESULT SetCategory( [in] NLM_NETWORK_CATEGORY NewCategory); } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(dcb00004-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkEvents : IUnknown +{ + typedef enum NLM_NETWORK_PROPERTY_CHANGE + { + NLM_NETWORK_PROPERTY_CHANGE_CONNECTION = 0x01, + NLM_NETWORK_PROPERTY_CHANGE_DESCRIPTION = 0x02, + NLM_NETWORK_PROPERTY_CHANGE_NAME = 0x04, + NLM_NETWORK_PROPERTY_CHANGE_ICON = 0x08, + NLM_NETWORK_PROPERTY_CHANGE_CATEGORY_VALUE = 0x10 + } NLM_NETWORK_PROPERTY_CHANGE; + + HRESULT NetworkAdded ( + [in] GUID networkId); + + HRESULT NetworkDeleted ( + [in] GUID networkId); + + HRESULT NetworkConnectivityChanged ( + [in] GUID networkId, + [in] NLM_CONNECTIVITY newConnectivity); + + HRESULT NetworkPropertyChanged( + [in] GUID networkId, + [in] NLM_NETWORK_PROPERTY_CHANGE flags); +} -- 2.29.1

1 0

[PATCH 5/5] riched20: Use row ptrs in the cursor to co-ordinates function.
by Huw Davies Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 24 +++++++++++------------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 49ae1b2769a..834f9fd3afe 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -218,31 +218,29 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) } -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, + int *x, int *y, int *height ) { - ME_DisplayItem *row; - ME_Run *run = &pCursor->pRun->member.run; - ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + ME_Paragraph *para = &cursor->pPara->member.para; ME_Run *size_run = run, *prev; ME_Context c; int run_x; - assert(height && x && y); assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); - assert(row && row->type == diStartRow); + row = row_from_cursor( cursor ); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; - run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, cursor->nOffset, TRUE ); *height = size_run->nAscent + size_run->nDescent; *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; @@ -252,7 +250,7 @@ void create_caret(ME_TextEditor *editor) { int x, y, height; - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); editor->caret_height = height; editor->caret_hidden = TRUE; @@ -281,7 +279,7 @@ void update_caret(ME_TextEditor *editor) if (!editor->bHaveFocus) return; if (!ME_IsSelection(editor)) { - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); if (height != editor->caret_height) create_caret(editor); x = min(x, editor->rcFormat.right-1); ITextHost_TxSetCaretPos(editor->texthost, x, y); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e197e3e9a9b..f4484f57d39 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -164,6 +164,7 @@ static inline ME_DisplayItem *run_get_di( ME_Run *run ) } /* caret.c */ +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; @@ -192,7 +193,6 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2f2e5e09d1f..21b63911954 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2734,11 +2734,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { case tomStart: cursor_from_char_ofs( editor, This->start, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; case tomEnd: cursor_from_char_ofs( editor, This->end, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; default: FIXME("bStart value %d not handled\n", value); -- 2.23.0

1 0

[PATCH 4/5] riched20: Use row helpers for Home/End key handling.
by Huw Davies Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 650c065dbe0..49ae1b2769a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1375,19 +1375,11 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pCursor->pRun->type == diRun); } -static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - if (pRow) { - ME_DisplayItem *pRun; - - pRun = ME_FindItemFwd(pRow, diRun); - if (pRun) { - pCursor->pRun = pRun; - assert(pCursor->pPara == ME_GetParagraph(pRun)); - pCursor->nOffset = 0; - } - } + ME_Row *row = row_from_cursor( cursor ); + + row_first_cursor( row, cursor ); } static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1395,14 +1387,11 @@ static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) ME_SetCursorToStart(editor, pCursor); } -static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowEnd( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow; + ME_Row *row = row_from_cursor( cursor ); - pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); - assert(pRow); - pCursor->pRun = ME_FindItemBack(pRow, diRun); - pCursor->nOffset = (pRow->type == diStartRow) ? pCursor->pRun->member.run.len : 0; + row_end_cursor( row, cursor, FALSE ); } static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) -- 2.23.0

1 0

[PATCH 3/5] riched20: Use row and para helpers for the selection function.
by Huw Davies Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 38 ++++++++++++++------------------------ dlls/riched20/editor.h | 3 +++ dlls/riched20/row.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5af4cd04d55..650c065dbe0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -818,38 +818,28 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[1] = editor->pCursors[0]; ME_MoveCursorWords(editor, &editor->pCursors[1], -1); break; - case stLine: case stParagraph: - { - ME_DisplayItem *pItem; - ME_DIType fwdSearchType, backSearchType; - if (selectionType == stParagraph) { - backSearchType = diParagraph; - fwdSearchType = diParagraphOrEnd; - } else { - backSearchType = diStartRow; - fwdSearchType = diStartRowOrParagraphOrEnd; - } - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); - assert(pItem); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; - pItem = ME_FindItemBack(pItem, backSearchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; break; + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + + row_first_cursor( row, editor->pCursors + 1 ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; } case stDocument: /* Select everything with cursor anchored from the start of the text */ - editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); break; default: assert(0); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7025ddceea7..e197e3e9a9b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,7 +111,10 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC_HIDDEN; +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_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; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ce8de935a19..ba082244cfc 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -53,6 +53,35 @@ ME_Run *row_next_run( ME_Row *row, ME_Run *run ) return &item->member.run; } +ME_Row *row_from_cursor( ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( cursor->pRun, diStartRow ); + return &item->member.row; +} + +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRun ); + cursor->pRun = item; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; +} + +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) +{ + ME_DisplayItem *item, *run; + + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + run = ME_FindItemBack( item, diRun ); + cursor->pRun = run; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + 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 */ -- 2.23.0

1 0

[PATCH 2/5] riched20: Use row ptrs in the cursor from virtual co-ords function.
by Huw Davies Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 16 +++++++--------- dlls/riched20/editor.h | 2 ++ dlls/riched20/para.c | 19 +++++++++++++++++++ dlls/riched20/row.c | 4 ++-- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0c5f221a7c4..5af4cd04d55 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -952,7 +952,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL final_eop ) { ME_Paragraph *para = editor_first_para( editor ); - ME_DisplayItem *row = NULL; + ME_Row *row = NULL, *next_row; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -966,7 +966,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, if (para->nFlags & MEPF_ROWSTART) para = pixel_pos_in_table_row( x, y, para ); y -= para->pt.y; - row = ME_FindItemFwd( para_get_di( para ), diStartRow); + row = para_first_row( para ); break; } else if (para->nFlags & MEPF_ROWSTART) @@ -977,24 +977,22 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, /* find row */ while (row) { - ME_DisplayItem *next_row; - - if (y < row->member.row.pt.y + row->member.row.nHeight) break; - next_row = ME_FindItemFwd(row, diStartRow); + if (y < row->pt.y + row->nHeight) break; + next_row = row_next( row ); if (!next_row) break; row = next_row; } - if (!row && !final_eop) + if (!row && !final_eop && para_prev( para )) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack( para_get_di( para ), diStartRow); + row = para_end_row( para_prev( para ) ); } - if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; + if (row) return row_cursor( editor, row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cf5e2d84fc2..7025ddceea7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -213,7 +213,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; +ME_Row *para_end_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Row *para_first_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; BOOL para_in_table( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index db258947916..e1b848cf8f9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -130,6 +130,25 @@ ME_Cell *para_cell( ME_Paragraph *para ) return &para->pCell->member.cell; } +ME_Row *para_first_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + +ME_Row *para_end_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + para = para_next( para ); + item = ME_FindItemBack( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a149231dcbe..ce8de935a19 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -28,8 +28,8 @@ ME_Row *row_next( ME_Row *row ) { ME_DisplayItem *item; - item = ME_FindItemFwd( row_get_di( row ), diStartRow ); - if (!item) return NULL; + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + if (!item || item->type != diStartRow) return NULL; return &item->member.row; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Pass a row ptr to the cursor from row function.
by Huw Davies Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 66 ++++++++++++++++++++---------------------- dlls/riched20/editor.h | 7 +++++ dlls/riched20/row.c | 29 +++++++++++++++++++ 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4da6898bef8..0c5f221a7c4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -903,40 +903,39 @@ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) return para; } - -static BOOL cursor_from_row( ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor ) +static BOOL row_cursor( ME_TextEditor *editor, ME_Row *row, int x, + ME_Cursor *cursor ) { - ME_DisplayItem *pNext, *pLastRun; - ME_Row *row = &pRow->member.row; - BOOL exact = TRUE; + ME_Run *run, *last; + BOOL exact = TRUE; - if (x < row->pt.x) - { - x = row->pt.x; - exact = FALSE; - } - pNext = ME_FindItemFwd(pRow, diRunOrStartRow); - assert(pNext->type == diRun); - cursor->nOffset = 0; - do { - int run_x = pNext->member.run.pt.x; - int width = pNext->member.run.nWidth; - - if (x >= run_x && x < run_x+width) + if (x < row->pt.x) { - cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE, TRUE); - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return exact; + x = row->pt.x; + exact = FALSE; } - pLastRun = pNext; - pNext = ME_FindItemFwd(pNext, diRunOrStartRow); - } while(pNext && pNext->type == diRun); - cursor->pRun = pLastRun; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; + run = row_first_run( row ); + assert( run ); + cursor->nOffset = 0; + do + { + if (x >= run->pt.x && x < run->pt.x + run->nWidth) + { + cursor->nOffset = ME_CharFromPoint( editor, x - run->pt.x, run, TRUE, TRUE ); + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return exact; + } + last = run; + run = row_next_run( row, run ); + } while (run); + + run = last; + + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return FALSE; } /* Finds the run and offset from the pixel position. @@ -995,8 +994,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, row = ME_FindItemBack( para_get_di( para ), diStartRow); } - - if (row) return cursor_from_row( editor, row, x, result ) && isExact; + if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; @@ -1279,7 +1277,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL /* row not found - ignore */ return; } - cursor_from_row( editor, pItem, x, pCursor ); + row_cursor( editor, &pItem->member.row, x, pCursor ); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1329,7 +1327,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1383,7 +1381,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68c54c2b328..cf5e2d84fc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,10 +111,17 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +ME_Run *row_first_run( ME_Row *row ) 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 ) +{ + return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); +} /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 1bf153f6ca9..a149231dcbe 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -24,6 +24,35 @@ #include "editor.h" +ME_Row *row_next( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Run *row_first_run( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRunOrStartRow ); + assert( item->type == diRun ); + return &item->member.run; +} + +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) +{ + ME_DisplayItem *item; + + assert( row == &ME_FindItemBack( run_get_di( run ), diStartRow )->member.row ); + + item = ME_FindItemFwd( run_get_di( run ), diRunOrStartRow ); + if (!item || item->type == diStartRow) return NULL; + return &item->member.run; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */ -- 2.23.0

1 0

[PATCH] wmic: Use wide-char string literals.
by Michael Stefaniuc Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wmic/main.c | 81 +++++++++++--------------------------------- 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f31a69a4241..1372c0986e9 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -31,36 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmic); -static const WCHAR biosW[] = - {'b','i','o','s',0}; -static const WCHAR computersystemW[] = - {'c','o','m','p','u','t','e','r','s','y','s','t','e','m',0}; -static const WCHAR cpuW[] = - {'c','p','u',0}; -static const WCHAR logicaldiskW[] = - {'L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR nicW[] = - {'n','i','c',0}; -static const WCHAR osW[] = - {'o','s',0}; -static const WCHAR processW[] = - {'p','r','o','c','e','s','s',0}; - -static const WCHAR win32_biosW[] = - {'W','i','n','3','2','_','B','I','O','S',0}; -static const WCHAR win32_computersystemW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; -static const WCHAR win32_logicaldiskW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR win32_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; -static const WCHAR win32_operatingsystemW[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR win32_processW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; -static const WCHAR win32_processorW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; - static const struct { const WCHAR *alias; @@ -68,13 +38,13 @@ static const struct } alias_map[] = { - { biosW, win32_biosW }, - { computersystemW, win32_computersystemW }, - { cpuW, win32_processorW }, - { logicaldiskW, win32_logicaldiskW }, - { nicW, win32_networkadapterW }, - { osW, win32_operatingsystemW }, - { processW, win32_processW } + { L"bios", L"Win32_BIOS" }, + { L"computersystem", L"Win32_ComputerSystem" }, + { L"cpu", L"Win32_Processor" }, + { L"LogicalDisk", L"Win32_LogicalDisk" }, + { L"nic", L"Win32_NetworkAdapter" }, + { L"os", L"Win32_OperatingSystem" }, + { L"process", L"Win32_Process" } }; static const WCHAR *find_class( const WCHAR *alias ) @@ -139,21 +109,20 @@ static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) static int output_error( int msg ) { - static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); - return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); + return output_string( GetStdHandle(STD_ERROR_HANDLE), L"%s", buffer ); } static int output_header( const WCHAR *prop, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0}; + static const WCHAR bomW[] = {0xfeff}; int len; DWORD count; WCHAR buffer[8192]; - len = swprintf( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); + len = swprintf( buffer, ARRAY_SIZE(buffer), L"%-*s\r\n", column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -167,15 +136,11 @@ static int output_header( const WCHAR *prop, ULONG column_width ) static int output_line( const WCHAR *str, ULONG column_width ) { - static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0}; - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str ); + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s\r\n", column_width, str ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) { - static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - static const WCHAR wqlW[] = {'W','Q','L',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -199,16 +164,16 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) (void **)&locator ); if (hr != S_OK) goto done; - if (!(path = SysAllocString( cimv2W ))) goto done; + if (!(path = SysAllocString(L"ROOT\\CIMV2" ))) goto done; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = lstrlenW( class ) + ARRAY_SIZE(select_allW); + len = lstrlenW( class ) + ARRAY_SIZE(L"SELECT * FROM "); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - lstrcpyW( query, select_allW ); + lstrcpyW( query, L"SELECT * FROM " ); lstrcatW( query, class ); - if (!(wql = SysAllocString( wqlW ))) goto done; + if (!(wql = SysAllocString(L"WQL" ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); if (hr != S_OK) goto done; @@ -267,12 +232,6 @@ done: int __cdecl wmain(int argc, WCHAR *argv[]) { - static const WCHAR getW[] = {'g','e','t',0}; - static const WCHAR quitW[] = {'q','u','i','t',0}; - static const WCHAR exitW[] = {'e','x','i','t',0}; - static const WCHAR pathW[] = {'p','a','t','h',0}; - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0}; const WCHAR *class, *value; int i; @@ -282,20 +241,18 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (i >= argc) goto not_supported; - if (!wcsicmp( argv[i], quitW ) || - !wcsicmp( argv[i], exitW )) + if (!wcsicmp( argv[i], L"quit" ) || !wcsicmp( argv[i], L"exit" )) { return 0; } - if (!wcsicmp( argv[i], classW) || - !wcsicmp( argv[i], contextW )) + if (!wcsicmp( argv[i], L"class") || !wcsicmp( argv[i], L"context" )) { WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - if (!wcsicmp( argv[i], pathW )) + if (!wcsicmp( argv[i], L"path" )) { if (++i >= argc) { @@ -317,7 +274,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (++i >= argc) goto not_supported; - if (!wcsicmp( argv[i], getW )) + if (!wcsicmp( argv[i], L"get" )) { if (++i >= argc) goto not_supported; -- 2.26.2

2 1

[PATCH] wmiutils: Use wide-char string literals.
by Michael Stefaniuc Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmiutils/statuscode.c | 8 +-- dlls/wmiutils/tests/path.c | 141 +++++++++++++------------------------ 2 files changed, 50 insertions(+), 99 deletions(-) diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index fb2b7db21f1..7137bf1c699 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -92,13 +92,11 @@ static HRESULT WINAPI status_code_GetErrorCodeText( LONG flags, BSTR *text ) { - static const WCHAR fmt[] = - {'E','r','r','o','r',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; WCHAR msg[32]; FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - swprintf(msg, ARRAY_SIZE(msg), fmt, res); + swprintf(msg, ARRAY_SIZE(msg), L"Error code: 0x%08x", res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } @@ -110,13 +108,11 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( LONG flags, BSTR *text ) { - static const WCHAR fmt[] = - {'F','a','c','i','l','i','t','y',' ','c','o','d','e',':',' ','0','x','%','0','8','x',0}; WCHAR msg[32]; FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); - swprintf(msg, ARRAY_SIZE(msg), fmt, res); + swprintf(msg, ARRAY_SIZE(msg), L"Facility code: 0x%08x", res); *text = SysAllocString(msg); return WBEM_S_NO_ERROR; } diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index ecb42aa647c..0b5473c4d0d 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -25,53 +25,26 @@ #include "wbemcli.h" #include "wine/test.h" -static const WCHAR path1[] = {0}; -static const WCHAR path2[] = {'\\',0}; -static const WCHAR path3[] = {'\\','\\','s','e','r','v','e','r',0}; -static const WCHAR path4[] = {'\\','\\','s','e','r','v','e','r','\\',0}; -static const WCHAR path5[] = {'\\','\\','.','\\',0}; -static const WCHAR path6[] = {'/','/','.','/','r','o','o','t','/','c','i','m','v','2',0}; -static const WCHAR path7[] = - {'/','/','.','/','r','o','o','t','/','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path8[] = - {'/','r','o','o','t','/','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path9[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path10[] = - {'/','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path11[] = - {'/','/','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path12[] = - {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path13[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path14[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR path15[] = - {'r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path16[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; -static const WCHAR path17[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',0}; -static const WCHAR path18[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',',','D','r','i','v','e','T','y','p','e','=','3',0}; -static const WCHAR path19[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=',0}; -static const WCHAR path20[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d',' ','=',' ', - '"','C',':','"',0}; +static const WCHAR path1[] = L""; +static const WCHAR path2[] = L"\\"; +static const WCHAR path3[] = L"\\\\server"; +static const WCHAR path4[] = L"\\\\server\\"; +static const WCHAR path5[] = L"\\\\.\\"; +static const WCHAR path6[] = L"//./root/cimv2"; +static const WCHAR path7[] = L"//./root/cimv2:Win32_OperatingSystem"; +static const WCHAR path8[] = L"/root/cimv2:Win32_OperatingSystem"; +static const WCHAR path9[] = L"\\\\.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path10[] = L"/\\.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path11[] = L"//.\\root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path12[] = L"root\\cimv2:Win32_OperatingSystem"; +static const WCHAR path13[] = L"\\\\.\\root\\cimv2"; +static const WCHAR path14[] = L"Win32_OperatingSystem"; +static const WCHAR path15[] = L"root\\cimv2"; +static const WCHAR path16[] = L"\\\\.\\root\\cimv2"; +static const WCHAR path17[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\""; +static const WCHAR path18[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\",DriveType=3"; +static const WCHAR path19[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId="; +static const WCHAR path20[] = L"\\\\.\\root\\cimv2:Win32_LogicalDisk.DeviceId = \"C:\""; static IWbemPath *create_path(void) { @@ -161,20 +134,11 @@ static void test_IWbemPath_SetText(void) static void test_IWbemPath_GetText(void) { - static const WCHAR serviceW[] = - {'W','i','n','3','2','_','S','e','r','v','i','c','e','.','N','a','m','e','=', - '\"','S','e','r','v','i','c','e','\"',0}; - static const WCHAR classW[] = - {'W','i','n','3','2','_','C','l','a','s','s',0}; - static const WCHAR expected1W[] = - {'r','o','o','t','\\','c','i','m','v','2',':','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','d','=', - '"','C',':','"',0}; - static const WCHAR expected2W[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', - 'D','e','v','i','c','e','I','d','=','"','C',':','"',0}; - static const WCHAR expected3W[] = - {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; + static const WCHAR serviceW[] = L"Win32_Service.Name=\"Service\""; + static const WCHAR classW[] = L"Win32_Class"; + static const WCHAR expected1W[] = L"root\\cimv2:Win32_LogicalDisk.DeviceId=\"C:\""; + static const WCHAR expected2W[] = L"Win32_LogicalDisk.DeviceId=\"C:\""; + static const WCHAR expected3W[] = L"\\\\.\\root\\cimv2"; WCHAR buf[128]; ULONG len, count; IWbemPath *path; @@ -364,7 +328,7 @@ static void test_IWbemPath_GetText(void) static void test_IWbemPath_GetClassName(void) { - static const WCHAR classW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; + static const WCHAR classW[] = L"Win32_LogicalDisk"; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -412,8 +376,7 @@ static void test_IWbemPath_GetClassName(void) static void test_IWbemPath_SetClassName(void) { - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR classW[] = L"class"; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -425,7 +388,7 @@ static void test_IWbemPath_SetClassName(void) hr = IWbemPath_SetClassName( path, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetClassName( path, emptyW ); + hr = IWbemPath_SetClassName( path, L"" ); ok( hr == S_OK, "got %08x\n", hr ); hr = IWbemPath_SetClassName( path, classW ); @@ -450,7 +413,6 @@ static void test_IWbemPath_SetClassName(void) static void test_IWbemPath_GetServer(void) { - static const WCHAR dotW[] = {'.',0}; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -490,8 +452,8 @@ static void test_IWbemPath_GetServer(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, dotW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( dotW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"." ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW(L"." ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } @@ -561,8 +523,6 @@ static void test_IWbemPath_GetInfo(void) static void test_IWbemPath_SetServer(void) { - static const WCHAR serverW[] = {'s','e','r','v','e','r',0}; - static const WCHAR emptyW[] = {0}; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -578,17 +538,17 @@ static void test_IWbemPath_SetServer(void) hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); - hr = IWbemPath_SetServer( path, emptyW ); + hr = IWbemPath_SetServer( path, L"" ); ok( hr == S_OK, "got %08x\n", hr ); - hr = IWbemPath_SetServer( path, serverW ); + hr = IWbemPath_SetServer( path, L"server" ); ok( hr == S_OK, "got %08x\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, serverW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( !lstrcmpW( buf, L"server" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); @@ -616,8 +576,6 @@ static void test_IWbemPath_SetServer(void) static void test_IWbemPath_GetNamespaceAt(void) { - static const WCHAR rootW[] = {'r','o','o','t',0}; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; HRESULT hr; WCHAR buf[32]; @@ -657,15 +615,15 @@ static void test_IWbemPath_GetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } @@ -719,7 +677,6 @@ static void test_IWbemPath_RemoveNamespaceAt(void) WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; WCHAR buf[16]; ULONG len, count; @@ -763,8 +720,8 @@ static void test_IWbemPath_RemoveNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); ok( hr == S_OK, "got %08x\n", hr ); @@ -794,8 +751,6 @@ static void test_IWbemPath_SetNamespaceAt(void) WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY; - static const WCHAR rootW[] = {'r','o','o','t',0}; - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; IWbemPath *path; WCHAR buf[16]; ULONG len, count; @@ -807,10 +762,10 @@ static void test_IWbemPath_SetNamespaceAt(void) hr = IWbemPath_SetNamespaceAt( path, 0, NULL ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetNamespaceAt( path, 1, cimv2W ); + hr = IWbemPath_SetNamespaceAt( path, 1, L"cimv2" ); ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - hr = IWbemPath_SetNamespaceAt( path, 0, cimv2W ); + hr = IWbemPath_SetNamespaceAt( path, 0, L"cimv2" ); ok( hr == S_OK, "got %08x\n", hr ); count = 0xdeadbeef; @@ -828,10 +783,10 @@ static void test_IWbemPath_SetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); - hr = IWbemPath_SetNamespaceAt( path, 0, rootW ); + hr = IWbemPath_SetNamespaceAt( path, 0, L"root" ); ok( hr == S_OK, "got %08x\n", hr ); flags = 0; @@ -849,15 +804,15 @@ static void test_IWbemPath_SetNamespaceAt(void) len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, rootW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( rootW ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); IWbemPath_Release( path ); } -- 2.26.2

2 1

[PATCH] ncrypt: Add NCryptIsKeyHandle stub
by Vitaly Lipatov Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long) -- 2.25.4

2 1