October 2020 - Wine-commits

Alexandre Julliard : gdi32: Move the font realization information out of freetype.c.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 35f5e65197d3ddc120e8aba9be973e7d26a6b361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35f5e65197d3ddc120e8aba9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:05:28 2020 +0200 gdi32: Move the font realization information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 19 +++++++++++- dlls/gdi32/freetype.c | 80 ++++++++++++++++-------------------------------- dlls/gdi32/gdi_private.h | 7 +++-- 3 files changed, 50 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35f5e65197d3ddc120e8…

1 0

Huw Davies : riched20: Use the paragraph and run helpers in the delete text function.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 887d7e686de8a76be87b959a3d6ae5d71707deb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887d7e686de8a76be87b959a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 10:05:52 2020 +0100 riched20: Use the paragraph and run helpers in the delete text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

1 0

Huw Davies : riched20: Remove a redundant condition.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: e69bb46c061e929e545aab3b86749f530208797a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69bb46c061e929e545aab3b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 10:05:53 2020 +0100 riched20: Remove a redundant condition. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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. */

1 0

Huw Davies : riched20: Pass a cursor ptr to the insert style retrieval function.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 75433bc39be8d71dbd8ed45e9578a40f965ef6c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75433bc39be8d71dbd8ed45e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 10:05:54 2020 +0100 riched20: Pass a cursor ptr to the insert style retrieval function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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];

1 0

Huw Davies : riched20: Pass and return paragraph ptrs in the table append row function.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: f0783863f90543580a47766e7235b1ddc8e272fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0783863f90543580a47766e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 10:05:55 2020 +0100 riched20: Pass and return paragraph ptrs in the table append row function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +-- dlls/riched20/editor.h | 4 +- dlls/riched20/table.c | 126 +++++++++++++++++++++++++------------------------ 3 files changed, 70 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0783863f90543580a47…

1 0

Huw Davies : riched20: Return a paragraph ptr from the table insert helper.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 103cd9f2f2237d624090b41d1b2476a5cb5a879d URL: https://source.winehq.org/git/wine.git/?a=commit;h=103cd9f2f2237d624090b41d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 10:05:56 2020 +0100 riched20: Return a paragraph ptr from the table insert helper. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 )

1 0

Zhiyi Zhang : ddraw/tests: Use the correct version of DirectDraw calls.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: e89c85118b543b597f06cd62ed52aa843a73f8d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89c85118b543b597f06cd62… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 20 15:42:07 2020 +0800 ddraw/tests: Use the correct version of DirectDraw calls. These are typos cumulated over the years. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 14 ++++++------- dlls/ddraw/tests/ddraw4.c | 12 +++++------ dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/ddraw/tests/dsurface.c | 50 ++++++++++++++++++++++----------------------- dlls/ddraw/tests/refcount.c | 6 +++--- dlls/ddraw/tests/visual.c | 6 +++--- 8 files changed, 54 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e89c85118b543b597f06…

1 0

Zhiyi Zhang : ddraw/tests: Fix possible memory leaks.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 8915500868a4be4838af5a2c84bdf2fc67406b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8915500868a4be4838af5a2c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 20 15:42:24 2020 +0800 ddraw/tests: Fix possible memory leaks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 21 ++++++++++++++++++++- dlls/ddraw/tests/dsurface.c | 9 +++++++++ dlls/ddraw/tests/refcount.c | 3 +++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 93ff6e296cc..d8f3618200b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -109,7 +109,11 @@ static BOOL CreateDirect3D(void) ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n", rc); rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); - if (rc == E_NOINTERFACE) return FALSE; + if (rc == E_NOINTERFACE) + { + IDirectDraw7_Release(lpDD); + return FALSE; + } ok(rc==DD_OK, "QueryInterface returned: %x\n", rc); memset(&ddsd, 0, sizeof(ddsd)); @@ -120,7 +124,11 @@ static BOOL CreateDirect3D(void) ddsd.dwHeight = 256; rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDS, NULL); if (FAILED(rc)) + { + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; + } num = 0; IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &num, SurfaceCounter); @@ -144,7 +152,13 @@ static BOOL CreateDirect3D(void) rc = IDirectDrawSurface_AddAttachedSurface(lpDDS, lpDDSdepth); ok(rc == DD_OK, "IDirectDrawSurface_AddAttachedSurface returned %x\n", rc); if (FAILED(rc)) + { + IDirectDrawSurface7_Release(lpDDSdepth); + IDirectDrawSurface7_Release(lpDDS); + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; + } } rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS, @@ -160,6 +174,11 @@ static BOOL CreateDirect3D(void) &lpD3DDevice); if (!lpD3DDevice) { trace("IDirect3D7::CreateDevice() for a RGB device failed with an error %x, giving up\n", rc); + if (lpDDSdepth) + IDirectDrawSurface7_Release(lpDDSdepth); + IDirectDrawSurface7_Release(lpDDS); + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; } } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index af18fc217b1..478fb5d4a27 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -165,6 +165,9 @@ static void GetDDInterface_2(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface_QueryInterface(dsurface, &IID_IDirectDrawSurface2, (void **) &dsurface2); @@ -226,6 +229,9 @@ static void GetDDInterface_4(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface4_QueryInterface(dsurface4, &IID_IDirectDrawSurface2, (void **) &dsurface2); @@ -297,6 +303,9 @@ static void GetDDInterface_7(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface7_QueryInterface(dsurface7, &IID_IDirectDrawSurface4, (void **) &dsurface4); diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 447e6a99c67..07673ab66e9 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -97,6 +97,9 @@ static void test_ddraw_objects(void) if (!surface) { win_skip("Could not create surface : %08x\n", hr); + IDirectDraw_Release(DDraw1); + IDirectDraw2_Release(DDraw2); + IDirectDraw4_Release(DDraw4); IDirectDraw7_Release(DDraw7); return; }

1 0

Zhiyi Zhang : dxgi/tests: Fix a window leak in test_inexact_modes().
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 541437e2ce8affc5626e9ec4f95d06ee4a56720f URL: https://source.winehq.org/git/wine.git/?a=commit;h=541437e2ce8affc5626e9ec4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 21 15:10:52 2020 +0800 dxgi/tests: Fix a window leak in test_inexact_modes(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bf798508a6d..43c4247dc2a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3630,6 +3630,7 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); } static void test_create_factory(void)

1 0

Hans Leidekker : msado15: Use correct string type for default provider.
by Alexandre Julliard 21 Oct '20

21 Oct '20

Module: wine Branch: master Commit: 9415d45a808eb0d35380b22430b892cb9291c0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9415d45a808eb0d35380b224… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 11:47:12 2020 +0200 msado15: Use correct string type for default provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0