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

[PATCH 1/3] msado15: Use correct string type for default provider.
by Hans Leidekker 21 Oct '20

21 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2773850236d..e3222e63b6a 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -681,7 +681,11 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; - connection->provider = SysAllocString(L"MSDASQL"); + if (!(connection->provider = strdupW( L"MSDASQL" ))) + { + heap_free( connection ); + return E_OUTOFMEMORY; + } connection->mode = adModeUnknown; connection->location = adUseServer; -- 2.20.1

1 0

[PATCH 5/5] riched20: Return a paragraph ptr from the table insert helper.
by Huw Davies 21 Oct '20

21 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/table.c | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index a26715a5d80..14fdf6eb73a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -58,29 +58,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); static const WCHAR cr_lf[] = {'\r', '\n', 0}; -static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, - int nCursor, - const WCHAR *eol_str, int eol_len, - int paraFlags) +static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, + const WCHAR *eol_str, int eol_len, int para_flags ) { - ME_Style *pStyle = style_get_insert_style( editor, editor->pCursors + nCursor ); - ME_Paragraph *para; - ME_Cursor* cursor = &editor->pCursors[nCursor]; + ME_Style *style = style_get_insert_style( editor, cursor ); + ME_Paragraph *para; - if (cursor->nOffset) run_split( editor, cursor ); + if (cursor->nOffset) run_split( editor, cursor ); - para = para_split( editor, &cursor->pRun->member.run, pStyle, eol_str, eol_len, paraFlags ); - ME_ReleaseStyle(pStyle); - cursor->pPara = para_get_di( para ); - cursor->pRun = run_get_di( para_first_run( para ) ); - return para_get_di( para ); + para = para_split( editor, &cursor->pRun->member.run, style, eol_str, eol_len, para_flags ); + ME_ReleaseStyle( style ); + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( para_first_run( para ) ); + return para; } ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWSTART); - return para->member.para.prev_para; + ME_Paragraph *para; + + para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWSTART ); + return para_get_di( para_prev( para ) ); } ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, @@ -120,17 +118,19 @@ ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, * Returns the first paragraph of the new cell. */ ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - WCHAR tab = '\t'; - para = ME_InsertEndParaFromCursor(editor, 0, &tab, 1, MEPF_CELL); - return para; + ME_Paragraph *para; + WCHAR tab = '\t'; + + para = table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); + return para_get_di( para ); } ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWEND); - return para->member.para.prev_para; + ME_Paragraph *para; + + para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWEND ); + return para_get_di( para_prev( para ) ); } ME_Paragraph* table_row_end( ME_Paragraph *para ) -- 2.23.0

1 0

[PATCH 4/5] riched20: Pass and return paragraph ptrs in the table append row function.
by Huw Davies 21 Oct '20

21 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 6 +- dlls/riched20/editor.h | 4 +- dlls/riched20/table.c | 126 +++++++++++++++++++++-------------------- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dfb066d5976..5cf1ad35f59 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2504,7 +2504,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (para->member.para.nFlags & MEPF_ROWEND) { /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); + 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); @@ -2552,7 +2552,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (from == to) { ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); + para = para_get_di( table_append_row( editor, &para->member.para ) ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; @@ -2583,7 +2583,7 @@ static BOOL handle_enter(ME_TextEditor *editor) else { editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); + para = para_get_di( table_append_row( editor, &para->member.para ) ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a43a6c2c1ed..b1cd75f2946 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -284,12 +284,12 @@ ME_DisplayItem *ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; -ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row) DECLSPEC_HIDDEN; void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 08c8fcb7ebf..a26715a5d80 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -398,98 +398,98 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC } } -ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, - ME_DisplayItem *table_row) +ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) { WCHAR endl = '\r', tab = '\t'; - ME_DisplayItem *run; + ME_Run *run; PARAFORMAT2 *pFmt; int i; assert(table_row); - assert(table_row->type == diParagraph); - if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; - cell = ME_FindItemFwd( para_get_di( table_row_start( &table_row->member.para ) ), diCell ); - prevTableEnd = para_get_di( table_row_end( &table_row->member.para ) ); - para = prevTableEnd->member.para.next_para; - run = ME_FindItemFwd(para, diRun); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = run; + if (!editor->bEmulateVersion10) /* v4.1 */ + { + ME_DisplayItem *insertedCell, *cell; + ME_Paragraph *para, *prev_table_end; + + cell = ME_FindItemFwd( para_get_di( table_row_start( table_row ) ), diCell ); + prev_table_end = table_row_end( table_row ); + para = para_next( prev_table_end ); + run = para_first_run( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - para = ME_InsertTableRowStartFromCursor(editor); - insertedCell = ME_FindItemFwd(para, diCell); + para = &ME_InsertTableRowStartFromCursor(editor)->member.para; + insertedCell = ME_FindItemFwd( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; - while (cell->member.cell.next_cell) { + while (cell->member.cell.next_cell) + { cell = cell->member.cell.next_cell; - para = ME_InsertTableCellFromCursor(editor); - insertedCell = ME_FindItemBack(para, diCell); + para = &ME_InsertTableCellFromCursor( editor )->member.para; + insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - para = ME_InsertTableRowEndFromCursor(editor); - para->member.para.fmt = prevTableEnd->member.para.fmt; + para = &ME_InsertTableRowEndFromCursor(editor)->member.para; + para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ - return ME_FindItemFwd(cell, diParagraph)->member.para.next_para; - } else { /* v1.0 - 3.0 */ - run = ME_FindItemBack(table_row->member.para.next_para, diRun); - pFmt = &table_row->member.para.fmt; + return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para ); + } + else /* v1.0 - 3.0 */ + { + run = para_end_run( table_row ); + pFmt = &table_row->fmt; assert(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE); - editor->pCursors[0].pPara = table_row; - editor->pCursors[0].pRun = run; + editor->pCursors[0].pPara = para_get_di( table_row ); + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, run->member.run.style); - run = editor->pCursors[0].pRun; - for (i = 0; i < pFmt->cTabCount; i++) { - ME_InsertTextFromCursor(editor, 0, &tab, 1, run->member.run.style); - } - return table_row->member.para.next_para; + ME_InsertTextFromCursor( editor, 0, &endl, 1, run->style ); + run = &editor->pCursors[0].pRun->member.run; + for (i = 0; i < pFmt->cTabCount; i++) + ME_InsertTextFromCursor(editor, 0, &tab, 1, run->style); + + return para_next( table_row ); } } /* Selects the next table cell or appends a new table row if at end of table */ -static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, - ME_DisplayItem *run) +static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *run ) { - ME_DisplayItem *para = ME_GetParagraph(run); + ME_Paragraph *para = run->member.run.para; int i; assert(run && run->type == diRun); assert(ME_IsInTable(run)); - if (!editor->bEmulateVersion10) { /* v4.1 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { ME_DisplayItem *cell; /* Get the initial cell */ - if (para->member.para.nFlags & MEPF_ROWSTART) { - cell = para->member.para.next_para->member.para.pCell; - } else if (para->member.para.nFlags & MEPF_ROWEND) { - cell = para->member.para.prev_para->member.para.pCell; - } else { - cell = para->member.para.pCell; - } + if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + else if (para->nFlags & MEPF_ROWEND) cell = para_prev( para )->pCell; + else cell = para->pCell; assert(cell); + /* Get the next cell. */ if (cell->member.cell.next_cell && cell->member.cell.next_cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; } else { - para = table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para )->next_para; - assert(para); - if (para->member.para.nFlags & MEPF_ROWSTART) { - cell = para->member.para.next_para->member.para.pCell; - } else { + para = para_next( table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para ) ); + if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + else + { /* Insert row */ - para = para->member.para.prev_para; - para = ME_AppendTableRow( editor, para_get_di( table_row_start( &para->member.para ) ) ); + para = para_prev( para ); + para = table_append_row( editor, table_row_start( para ) ); /* Put cursor at the start of the new table row */ - 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]; ME_WrapMarkedParagraphs(editor); @@ -506,7 +506,9 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); editor->pCursors[0].nOffset = 0; assert(editor->pCursors[1].pRun); - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { if (run->member.run.nFlags & MERF_ENDPARA && ME_IsInTable(ME_FindItemFwd(run, diParagraphOrEnd))) { @@ -520,21 +522,23 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, run = ME_FindItemFwd(run, diRunOrParagraphOrEnd); if (run->type != diRun) { - para = run; - if (ME_IsInTable(para)) + para = &run->member.para; + if (para_in_table( para )) { - run = ME_FindItemFwd(para, diRun); + run = run_get_di( para_first_run( para ) ); assert(run); - editor->pCursors[0].pPara = para; + editor->pCursors[0].pPara = para_get_di( para ); editor->pCursors[0].pRun = run; editor->pCursors[0].nOffset = 0; i = 1; - } else { + } + else + { /* Insert table row */ - para = ME_AppendTableRow(editor, para->member.para.prev_para); + para = table_append_row( editor, para_prev( para ) ); /* Put cursor at the start of the new table row */ - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + 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_WrapMarkedParagraphs(editor); -- 2.23.0

1 0

[PATCH 3/5] riched20: Pass a cursor ptr to the insert style retrieval function.
by Huw Davies 21 Oct '20

21 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/run.c | 2 +- dlls/riched20/style.c | 44 +++++++++++++---------------------------- dlls/riched20/table.c | 2 +- 7 files changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 97cee3d9b3a..5d49d11bd3b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -473,11 +473,11 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *style = ME_GetInsertStyle( editor, nCursor ); ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; ME_Cursor *cursor = editor->pCursors + nCursor; + ME_Style *style = style_get_insert_style( editor, cursor ); /* FIXME no no no */ if (ME_IsSelection(editor)) @@ -508,9 +508,9 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *style = ME_GetInsertStyle( editor, nCursor ); const WCHAR space = ' '; ME_Cursor *cursor = editor->pCursors + nCursor; + ME_Style *style = style_get_insert_style( editor, cursor ); /* FIXME no no no */ if (ME_IsSelection(editor)) @@ -1510,7 +1510,7 @@ void ME_DeleteSelection(ME_TextEditor *editor) ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) { - return ME_GetInsertStyle(editor, 0); + return style_get_insert_style( editor, editor->pCursors ); } void ME_SendSelChange(ME_TextEditor *editor) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c91d47302cf..dfb066d5976 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2596,7 +2596,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } } - style = ME_GetInsertStyle(editor, 0); + style = style_get_insert_style( editor, editor->pCursors ); /* 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). @@ -2838,7 +2838,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, /* WM_CHAR is restricted to nTextLimit */ if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { - ME_Style *style = ME_GetInsertStyle(editor, 0); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); @@ -4818,7 +4818,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { HIMC hIMC; - ME_Style *style = ME_GetInsertStyle(editor, 0); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); ME_SaveTempStyle(editor, style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1f74a2eb8b4..a43a6c2c1ed 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -47,11 +47,11 @@ static inline const char *debugstr_run( const ME_Run *run ) } /* style.c */ +ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Style *ME_MakeStyle(CHARFORMAT2W *style) DECLSPEC_HIDDEN; void ME_AddRefStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; -ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; void select_style(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 21e92e95cd1..2f2e5e09d1f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1697,7 +1697,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) len = lstrlenW(str); cursor = editor->pCursors[0]; cursor_from_char_ofs( editor, This->start, &editor->pCursors[0] ); - style = ME_GetInsertStyle(editor, 0); + style = style_get_insert_style( editor, editor->pCursors ); ME_InsertTextFromCursor(editor, 0, str, len, style); ME_ReleaseStyle(style); editor->pCursors[0] = cursor; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 22a5db8610b..b1436ad5060 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -716,7 +716,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) { ME_Style *s; if (!editor->pBuffer->pCharStyle) - editor->pBuffer->pCharStyle = ME_GetInsertStyle(editor, 0); + editor->pBuffer->pCharStyle = style_get_insert_style( editor, editor->pCursors ); s = ME_ApplyStyle(editor, editor->pBuffer->pCharStyle, pFmt); ME_ReleaseStyle(editor->pBuffer->pCharStyle); editor->pBuffer->pCharStyle = s; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 8b9c2126b1b..fbbe29dce14 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -473,42 +473,26 @@ void ME_ReleaseStyle(ME_Style *s) ME_DestroyStyle(s); } -ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) +ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ) { - if (ME_IsSelection(editor)) - { + ME_Style *style; ME_Cursor *from, *to; + ME_Run *prev; - ME_GetSelection(editor, &from, &to); - ME_AddRefStyle(from->pRun->member.run.style); - return from->pRun->member.run.style; - } - if (editor->pBuffer->pCharStyle) { - ME_AddRefStyle(editor->pBuffer->pCharStyle); - return editor->pBuffer->pCharStyle; - } - else - { - ME_Cursor *pCursor = &editor->pCursors[nCursor]; - ME_DisplayItem *pRunItem = pCursor->pRun; - ME_DisplayItem *pPrevItem = NULL; - if (pCursor->nOffset) { - ME_Run *pRun = &pRunItem->member.run; - ME_AddRefStyle(pRun->style); - return pRun->style; - } - pPrevItem = ME_FindItemBack(pRunItem, diRunOrParagraph); - if (pPrevItem->type == diRun) + if (ME_IsSelection( editor )) { - ME_AddRefStyle(pPrevItem->member.run.style); - return pPrevItem->member.run.style; + ME_GetSelection( editor, &from, &to ); + style = from->pRun->member.run.style; } + else if (editor->pBuffer->pCharStyle) + style = editor->pBuffer->pCharStyle; + else if (!cursor->nOffset && (prev = run_prev( &cursor->pRun->member.run ))) + style = prev->style; else - { - ME_AddRefStyle(pRunItem->member.run.style); - return pRunItem->member.run.style; - } - } + style = cursor->pRun->member.run.style; + + ME_AddRefStyle( style ); + return style; } void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 876244c9706..08c8fcb7ebf 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -63,7 +63,7 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, const WCHAR *eol_str, int eol_len, int paraFlags) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_Style *pStyle = style_get_insert_style( editor, editor->pCursors + nCursor ); ME_Paragraph *para; ME_Cursor* cursor = &editor->pCursors[nCursor]; -- 2.23.0

1 0

[PATCH 2/5] riched20: Remove a redundant condition.
by Huw Davies 21 Oct '20

21 Oct '20

If the cursor offset is zero, then it is by definition at the beginning of a run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 21dd901088e..97cee3d9b3a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -327,9 +327,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, { ME_Run *run; cursor_from_char_ofs( editor, nOfs + nChars, &c ); - if (!c.nOffset && - nOfs+nChars == (c.pRun->member.run.nCharOfs - + c.pPara->member.para.nCharOfs)) + if (!c.nOffset) { /* We aren't deleting anything in this run, so we will go back to the * last run we are deleting text in. */ -- 2.23.0

1 0

[PATCH 1/5] riched20: Use the paragraph and run helpers in the delete text function.
by Huw Davies 21 Oct '20

21 Oct '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index eb7ad7f1899..21dd901088e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -333,18 +333,18 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, { /* We aren't deleting anything in this run, so we will go back to the * last run we are deleting text in. */ - ME_PrevRun(&c.pPara, &c.pRun, TRUE); + c.pRun = run_get_di( run_prev_all_paras( &c.pRun->member.run ) ); + c.pPara = para_get_di( c.pRun->member.run.para ); c.nOffset = c.pRun->member.run.len; } run = &c.pRun->member.run; - if (run->nFlags & MERF_ENDPARA) { + if (run->nFlags & MERF_ENDPARA) + { int eollen = c.pRun->member.run.len; BOOL keepFirstParaFormat; - if (!ME_FindItemFwd(c.pRun, diParagraph)) - { - return TRUE; - } + if (!para_next( para_next( &c.pPara->member.para ) )) return TRUE; + keepFirstParaFormat = (totalChars == nChars && nChars <= eollen && run->nCharOfs); if (!editor->bEmulateVersion10) /* v4.1 */ -- 2.23.0

1 0

[PATCH v2] msado15: Implement _Connection Open
by Alistair Leslie-Hughes 21 Oct '20

21 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 74 +++++++++++++++++++++++++++++++++++- dlls/msado15/tests/msado15.c | 4 +- 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9852e0863dd..e64da605473 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,5 +1,5 @@ MODULE = msado15.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2773850236d..4b0bc879ecc 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "msdasc.h" #include "olectl.h" #include "msado15_backcompat.h" @@ -33,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + struct connection; struct connection_point @@ -54,8 +57,10 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + WCHAR *dsn; ConnectModeEnum mode; CursorLocationEnum location; + IUnknown *session; struct connection_point cp_connev; }; @@ -98,8 +103,10 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (connection->cp_connev.sinks[i]) IUnknown_Release( connection->cp_connev.sinks[i] ); } + if (connection->session) IUnknown_Release(connection->session); heap_free( connection->cp_connev.sinks ); heap_free( connection->provider ); + heap_free( connection->dsn ); heap_free( connection->datasource ); heap_free( connection ); } @@ -240,6 +247,12 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (connection->session) + { + IUnknown_Release(connection->session); + connection->session = NULL; + } + connection->state = adStateClosed; return S_OK; } @@ -273,13 +286,68 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { struct connection *connection = impl_from_Connection( iface ); - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *session = NULL; + HRESULT hr; + + TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (!connect_str) + return E_FAIL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + if (FAILED(hr)) + return E_FAIL; + + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, (IUnknown**)&dbinit); + if (FAILED(hr)) + goto done; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); + if (FAILED(hr)) + goto done; + + /* TODO - Update username/password if required. */ + if ((userid && *userid) || (password && *password)) + FIXME("Username/password parameters currently not supported\n"); + + hr = IDBInitialize_Initialize(dbinit); + if (FAILED(hr)) + goto done; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBCreateSession, (void**)&session); + if (FAILED(hr)) + goto done; + + hr = IDBCreateSession_CreateSession(session, NULL, &IID_IUnknown, &connection->session); + IDBCreateSession_Release(session); + if (FAILED(hr)) + goto done; + connection->state = adStateOpen; - return S_OK; + hr = S_OK; + +done: + if (FAILED(hr) && connection->session) + { + IUnknown_Release(connection->session); + connection->session = NULL; + } + + if (dbinit) { + IDBInitialize_Uninitialize(dbinit); + IDBInitialize_Release(dbinit); + } + + IDataInitialize_Release(datainit); + + TRACE("ret 0x%08x\n", hr); + return hr; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) @@ -681,9 +749,11 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->dsn = NULL; connection->provider = SysAllocString(L"MSDASQL"); connection->mode = adModeUnknown; connection->location = adUseServer; + connection->session = NULL; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 378c2eb918c..adf9fb30bc2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -808,12 +808,12 @@ if (0) /* Crashes on windows */ ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, NULL, NULL, NULL, 0); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); /* Open adds trailing ; if it's missing */ str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); -- 2.28.0

1 0

[PATCH] bcrypt: Use internal helpers to generate hashes.
by Hans Leidekker 21 Oct '20

21 Oct '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 171 ++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 81 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4eb1fc29e94..85d06f6001e 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -666,7 +666,7 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } -static NTSTATUS prepare_hash( struct hash *hash ) +static NTSTATUS hash_prepare( struct hash *hash ) { UCHAR buffer[MAX_HASH_BLOCK_BITS / 8] = {0}; int block_bytes, i; @@ -695,24 +695,12 @@ static NTSTATUS prepare_hash( struct hash *hash ) return hash_update( &hash->inner, hash->alg_id, buffer, block_bytes ); } -NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, - UCHAR *secret, ULONG secretlen, ULONG flags ) +static NTSTATUS hash_create( const struct algorithm *alg, UCHAR *secret, ULONG secret_len, ULONG flags, + struct hash **ret_hash ) { - struct algorithm *alg = algorithm; struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen, - secret, secretlen, flags ); - if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) - { - FIXME( "unimplemented flags %08x\n", flags ); - return STATUS_NOT_IMPLEMENTED; - } - - if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; - if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; @@ -720,21 +708,44 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if ((alg->flags & BCRYPT_HASH_REUSABLE_FLAG) || (flags & BCRYPT_HASH_REUSABLE_FLAG)) hash->flags |= HASH_FLAG_REUSABLE; - if (secretlen && !(hash->secret = heap_alloc( secretlen ))) + if (secret_len && !(hash->secret = heap_alloc( secret_len ))) { heap_free( hash ); return STATUS_NO_MEMORY; } - memcpy( hash->secret, secret, secretlen ); - hash->secret_len = secretlen; + memcpy( hash->secret, secret, secret_len ); + hash->secret_len = secret_len; - if ((status = prepare_hash( hash )) != STATUS_SUCCESS) + if ((status = hash_prepare( hash ))) { heap_free( hash->secret ); heap_free( hash ); return status; } + *ret_hash = hash; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, + ULONG object_len, UCHAR *secret, ULONG secret_len, ULONG flags ) +{ + struct algorithm *alg = algorithm; + struct hash *hash; + NTSTATUS status; + + TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, object_len, + secret, secret_len, flags ); + if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) + { + FIXME( "unimplemented flags %08x\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (object) FIXME( "ignoring object buffer\n" ); + + if ((status = hash_create( alg, secret, secret_len, flags, &hash ))) return status; *handle = hash; return STATUS_SUCCESS; } @@ -766,6 +777,14 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND return STATUS_SUCCESS; } +static void hash_destroy( struct hash *hash ) +{ + if (!hash) return; + hash->hdr.magic = 0; + heap_free( hash->secret ); + heap_free( hash ); +} + NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) { struct hash *hash = handle; @@ -773,9 +792,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_PARAMETER; - hash->hdr.magic = 0; - heap_free( hash->secret ); - heap_free( hash ); + hash_destroy( hash ); return STATUS_SUCCESS; } @@ -791,22 +808,16 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s return hash_update( &hash->inner, hash->alg_id, input, size ); } -NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) +static NTSTATUS hash_finalize( struct hash *hash, UCHAR *output, ULONG size ) { UCHAR buffer[MAX_HASH_OUTPUT_BYTES]; - struct hash *hash = handle; - NTSTATUS status; int hash_length; - - TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags ); - - if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - if (!output) return STATUS_INVALID_PARAMETER; + NTSTATUS status; if (!(hash->flags & HASH_FLAG_HMAC)) { if ((status = hash_finish( &hash->inner, hash->alg_id, output, size ))) return status; - if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; } @@ -814,40 +825,43 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON if ((status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_length ))) return status; if ((status = hash_update( &hash->outer, hash->alg_id, buffer, hash_length ))) return status; if ((status = hash_finish( &hash->outer, hash->alg_id, output, size ))) return status; - if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + + if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, - UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ) +NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) { - NTSTATUS status; - BCRYPT_HASH_HANDLE handle; + struct hash *hash = handle; - TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secretlen, - input, inputlen, output, outputlen ); + TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags ); - status = BCryptCreateHash( algorithm, &handle, NULL, 0, secret, secretlen, 0); - if (status != STATUS_SUCCESS) - { - return status; - } + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!output) return STATUS_INVALID_PARAMETER; - status = BCryptHashData( handle, input, inputlen, 0 ); - if (status != STATUS_SUCCESS) - { - BCryptDestroyHash( handle ); - return status; - } + return hash_finalize( hash, output, size ); +} + +NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secret_len, + UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len ) +{ + struct algorithm *alg = algorithm; + struct hash *hash; + NTSTATUS status; + + TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secret_len, input, input_len, output, output_len ); - status = BCryptFinishHash( handle, output, outputlen, 0 ); - if (status != STATUS_SUCCESS) + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + + if ((status = hash_create( alg, secret, secret_len, 0, &hash ))) return status; + if ((status = hash_update( &hash->inner, hash->alg_id, input, input_len ))) { - BCryptDestroyHash( handle ); + hash_destroy( hash ); return status; } - - return BCryptDestroyHash( handle ); + status = hash_finalize( hash, output, output_len ); + hash_destroy( hash ); + return status; } static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *alg, ULONG bitlen, @@ -1685,7 +1699,7 @@ NTSTATUS WINAPI BCryptDeriveKeyCapi( BCRYPT_HASH_HANDLE handle, BCRYPT_ALG_HANDL } len = builtin_algorithms[hash->alg_id].hash_length; - if ((status = BCryptFinishHash( handle, buf, len, 0 ))) return status; + if ((status = hash_finalize( hash, buf, len ))) return status; if (len < keylen) { @@ -1698,20 +1712,20 @@ NTSTATUS WINAPI BCryptDeriveKeyCapi( BCRYPT_HASH_HANDLE handle, BCRYPT_ALG_HANDL pad2[i] = 0x5c ^ (i < len ? buf[i] : 0); } - if ((status = prepare_hash( hash )) || - (status = BCryptHashData( handle, pad1, sizeof(pad1), 0 )) || - (status = BCryptFinishHash( handle, buf, len, 0 ))) return status; + if ((status = hash_prepare( hash )) || + (status = hash_update( &hash->inner, hash->alg_id, pad1, sizeof(pad1) )) || + (status = hash_finalize( hash, buf, len ))) return status; - if ((status = prepare_hash( hash )) || - (status = BCryptHashData( handle, pad2, sizeof(pad2), 0 )) || - (status = BCryptFinishHash( handle, buf + len, len, 0 ))) return status; + if ((status = hash_prepare( hash )) || + (status = hash_update( &hash->inner, hash->alg_id, pad2, sizeof(pad2) )) || + (status = hash_finalize( hash, buf + len, len ))) return status; } memcpy( key, buf, keylen ); return STATUS_SUCCESS; } -static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, +static NTSTATUS pbkdf2( struct hash *hash, UCHAR *pwd, ULONG pwd_len, UCHAR *salt, ULONG salt_len, ULONGLONG iterations, ULONG i, UCHAR *dst, ULONG hash_len ) { NTSTATUS status = STATUS_INVALID_PARAMETER; @@ -1725,8 +1739,7 @@ static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UC if (j == 0) { /* use salt || INT(i) */ - status = BCryptHashData( handle, salt, salt_len, 0 ); - if (status != STATUS_SUCCESS) + if ((status = hash_update( &hash->inner, hash->alg_id, salt, salt_len ))) { heap_free( buf ); return status; @@ -1735,17 +1748,17 @@ static NTSTATUS pbkdf2( BCRYPT_HASH_HANDLE handle, UCHAR *pwd, ULONG pwd_len, UC bytes[1] = (i >> 16) & 0xff; bytes[2] = (i >> 8) & 0xff; bytes[3] = i & 0xff; - status = BCryptHashData( handle, bytes, 4, 0 ); + status = hash_update( &hash->inner, hash->alg_id, bytes, 4 ); } - else status = BCryptHashData( handle, buf, hash_len, 0 ); /* use U_j */ - if (status != STATUS_SUCCESS) + else status = hash_update( &hash->inner, hash->alg_id, buf, hash_len ); /* use U_j */ + + if (status) { heap_free( buf ); return status; } - status = BCryptFinishHash( handle, buf, hash_len, 0 ); - if (status != STATUS_SUCCESS) + if ((status = hash_finalize( hash, buf, hash_len ))) { heap_free( buf ); return status; @@ -1764,7 +1777,7 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO { struct algorithm *alg = handle; ULONG hash_len, block_count, bytes_left, i; - BCRYPT_HASH_HANDLE hash; + struct hash *hash; UCHAR *partial; NTSTATUS status; @@ -1779,17 +1792,14 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO block_count = 1 + ((dk_len - 1) / hash_len); /* ceil(dk_len / hash_len) */ bytes_left = dk_len - (block_count - 1) * hash_len; - status = BCryptCreateHash( handle, &hash, NULL, 0, pwd, pwd_len, BCRYPT_HASH_REUSABLE_FLAG ); - if (status != STATUS_SUCCESS) - return status; + if ((status = hash_create( alg, pwd, pwd_len, BCRYPT_HASH_REUSABLE_FLAG, &hash ))) return status; /* full blocks */ for (i = 1; i < block_count; i++) { - status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ); - if (status != STATUS_SUCCESS) + if ((status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, i, dk + ((i - 1) * hash_len), hash_len ))) { - BCryptDestroyHash( hash ); + hash_destroy( hash ); return status; } } @@ -1797,20 +1807,19 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO /* final partial block */ if (!(partial = heap_alloc( hash_len ))) { - BCryptDestroyHash( hash ); + hash_destroy( hash ); return STATUS_NO_MEMORY; } - status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ); - if (status != STATUS_SUCCESS) + if ((status = pbkdf2( hash, pwd, pwd_len, salt, salt_len, iterations, block_count, partial, hash_len ))) { - BCryptDestroyHash( hash ); + hash_destroy( hash ); heap_free( partial ); return status; } memcpy( dk + ((block_count - 1) * hash_len), partial, bytes_left ); - BCryptDestroyHash( hash ); + hash_destroy( hash ); heap_free( partial ); return STATUS_SUCCESS; } -- 2.28.0

1 0

[PATCH] comsvcs/tests: Close test thread handles.
by Nikolay Sivov 21 Oct '20

21 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comsvcs/tests/comsvcs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 4e9471e7343..f0cf0d8543f 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -197,6 +197,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + CloseHandle(thread); init_test_driver(&driver); @@ -210,6 +211,7 @@ static void create_dispenser(void) ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); + CloseHandle(thread); hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.28.0

1 0

[v2 PATCH 1/6] dxva2: Fix valid handle range test.
by Nikolay Sivov 21 Oct '20

21 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 2 +- dlls/dxva2/tests/dxva2.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 6262531c7d1..83c4723a7dc 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -562,7 +562,7 @@ static HRESULT WINAPI device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *i static HRESULT device_manager_get_handle_index(struct device_manager *manager, HANDLE hdevice, size_t *idx) { - if (hdevice > ULongToHandle(manager->count)) + if (!hdevice || hdevice > ULongToHandle(manager->count)) return E_HANDLE; *idx = (ULONG_PTR)hdevice - 1; return S_OK; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f617bf74079..a49635e7596 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -115,6 +115,9 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_LockDevice(manager, 0, &device2, FALSE); ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + /* Invalid token. */ hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -123,9 +126,13 @@ static void test_device_manager(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); refcount = get_refcount(device); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!handle1, "Unexpected handle value.\n"); refcount2 = get_refcount(device); ok(refcount2 == refcount, "Unexpected refcount %d.\n", refcount); @@ -152,6 +159,9 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_TestDevice(manager, 0); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 5