October 2020 - Wine-Commits

Hans Leidekker : msado15: Avoid a crash with tracing on.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 45295c5e07f13c7ff98e73e5e0134b19d8f8aa17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45295c5e07f13c7ff98e73e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 11:47:13 2020 +0200 msado15: Avoid a crash with tracing on. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index e3222e63b6a..3f1a87aa5b3 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -190,7 +190,7 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR struct connection *connection = impl_from_Connection( iface ); WCHAR *source = NULL; - TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + TRACE( "%p, %s\n", connection, debugstr_w( str && !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; heap_free( connection->datasource );

1 0

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

Oct. 21, 2020

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

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

Oct. 21, 2020

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: Pass a cursor ptr to the insert style retrieval function.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

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

Nikolay Sivov : mf/sar: Use advertised type in IsMediaTypeSupported().
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: f6a5a3d03c1eb914444af96352ca54eec79d7e2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a5a3d03c1eb914444af963… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 13:07:23 2020 +0300 mf/sar: Use advertised type in IsMediaTypeSupported(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 5 ++--- dlls/mf/tests/mf.c | 62 ++++++++++++++++++++---------------------------------- 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 6f1f1bd834e..e318576e80e 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1479,11 +1479,10 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM TRACE("%p, %p, %p.\n", iface, in_type, out_type); EnterCriticalSection(&renderer->cs); - hr = renderer->current_media_type && IMFMediaType_IsEqual(renderer->current_media_type, in_type, &flags) == S_OK ? - S_OK : MF_E_INVALIDMEDIATYPE; + hr = IMFMediaType_IsEqual(renderer->media_type, in_type, &flags); LeaveCriticalSection(&renderer->cs); - return hr; + return hr != S_OK ? MF_E_INVALIDMEDIATYPE : hr; } static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7dc325424a6..6699c1ca9d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2831,7 +2831,7 @@ static void test_sar(void) IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; IMFAttributes *attributes; - DWORD id, flags, count; + DWORD i, id, flags, count; IMFActivate *activate; MFCLOCK_STATE state; IMFClock *clock; @@ -2839,6 +2839,7 @@ static void test_sar(void) HRESULT hr; GUID guid; BOOL mute; + int found; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -2988,6 +2989,22 @@ todo_wine ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); ok(!!count, "Unexpected type count %u.\n", count); + /* A number of same major/subtype entries are returned, with different degrees of finer format + details. Some incomplete types are not accepted, check that at least one of them is considered supported. */ + + for (i = 0, found = -1; i < count; ++i) + { + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &mediatype); + ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); + + if (SUCCEEDED(IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL))) + found = i; + IMFMediaType_Release(mediatype); + + if (found != -1) break; + } + ok(found != -1, "Haven't found a supported type.\n"); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); @@ -3005,16 +3022,16 @@ todo_wine hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype2); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype2); ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype3); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype3); ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); ok(mediatype2 == mediatype3, "Unexpected instance.\n"); IMFMediaType_Release(mediatype3); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype2, NULL); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaType_Release(mediatype); @@ -3026,39 +3043,8 @@ todo_wine ok(mediatype == mediatype2, "Unexpected instance.\n"); IMFMediaType_Release(mediatype); - /* Type is validated against current type. */ - hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype2, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(mediatype2); - /* Set partial type. */ - hr = MFCreateMediaType(&mediatype); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); - - hr = IMFMediaType_GetGUID(mediatype2, &MF_MT_SUBTYPE, &guid); - ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); - - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &guid); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); - ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); - - hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mediatype == mediatype2, "Unexpected instance.\n"); - IMFMediaType_Release(mediatype2); - - hr = IMFMediaType_GetCount(mediatype, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 2, "Unexpected attribute count %u.\n", count); - - IMFMediaType_Release(mediatype); - /* Reset back to uninitialized state. */ hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); @@ -3121,10 +3107,8 @@ todo_wine IMFAudioStreamVolume_Release(stream_volume); hr = MFGetService((IUnknown *)sink, &MR_AUDIO_POLICY_SERVICE, &IID_IMFAudioPolicy, (void **)&unk); -todo_wine - ok(hr == MF_E_NOT_INITIALIZED, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); /* Shutdown */ EXPECT_REF(present_clock, 2);

1 0

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

Oct. 21, 2020

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

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

Oct. 21, 2020

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

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

Oct. 21, 2020

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

Huw Davies : riched20: Remove a redundant condition.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

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: Use the paragraph and run helpers in the delete text function.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

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: Return a paragraph ptr from the table insert helper.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

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

Alistair Leslie-Hughes : msado15: Implement _Connection Open.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 57e30f27cb3f4d3d494660b09746b67b152efcc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57e30f27cb3f4d3d494660b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 21 11:47:14 2020 +0200 msado15: Implement _Connection Open. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 55 ++++++++++++++++++++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 4 ++-- 3 files changed, 54 insertions(+), 7 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 3f1a87aa5b3..fd15d5a443f 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" @@ -56,6 +57,7 @@ struct connection WCHAR *provider; ConnectModeEnum mode; CursorLocationEnum location; + IUnknown *session; struct connection_point cp_connev; }; @@ -98,6 +100,7 @@ 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->datasource ); @@ -240,6 +243,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 +282,50 @@ 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), - password, options ); + 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; - connection->state = adStateOpen; - return S_OK; + if ((hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit )) != S_OK) return hr; + if ((hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit )) != S_OK) goto done; + if ((hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props )) != S_OK) goto done; + + /* TODO - Update username/password if required. */ + if ((userid && *userid) || (password && *password)) + FIXME("Username/password parameters currently not supported\n"); + + if ((hr = IDBInitialize_Initialize( dbinit )) != S_OK) goto done; + if ((hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&session )) != S_OK) goto done; + if ((hr = IDBCreateSession_CreateSession( session, NULL, &IID_IUnknown, &connection->session )) == S_OK) + { + connection->state = adStateOpen; + } + IDBCreateSession_Release( session ); + +done: + if (hr != S_OK && 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 ) @@ -688,6 +734,7 @@ HRESULT Connection_create( void **obj ) } 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);

1 0

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

Oct. 21, 2020

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

Alexandre Julliard : gdi32: Move the font charset information out of freetype.c.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 6c94c0b04f35f58828c2edc02db12a490a99e440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c94c0b04f35f58828c2edc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 11:04:35 2020 +0200 gdi32: Move the font charset information out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 ++- dlls/gdi32/freetype.c | 53 +++++++++++++++++++----------------------------- dlls/gdi32/gdi_private.h | 4 +++- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 486936393b2..d3606d405b2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1047,7 +1047,8 @@ static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD dev = GET_NEXT_PHYSDEV( dev, pGetTextCharsetInfo ); return dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); } - return font_funcs->pGetTextCharsetInfo( physdev->font, fs, flags ); + if (fs) *fs = physdev->font->fs; + return physdev->font->charset; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c5b91d39438..8ebea2616c4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -330,8 +330,6 @@ struct tagGdiFont { /* the following members can be accessed without locking, they are never modified after creation */ FT_Face ft_face; struct font_mapping *mapping; - int charset; - int codepage; BOOL fake_italic; BOOL fake_bold; BYTE underline; @@ -344,7 +342,6 @@ struct tagGdiFont { DWORD ntmFlags; DWORD aa_flags; UINT ntmCellHeight, ntmAvgWidth; - FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; @@ -4032,7 +4029,7 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) } -static int get_nearest_charset(const WCHAR *family_name, Face *face, int *cp) +static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) { /* Only get here if lfCharSet == DEFAULT_CHARSET or we couldn't find a single face with the requested charset. The idea is to check if @@ -4407,8 +4404,8 @@ static BOOL create_child_font_list(GdiFont *font) * if not SYMBOL or OEM then we also get all the fonts for Microsoft * Sans Serif. This is how asian windows get default fallbacks for fonts */ - if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && - font->charset != OEM_CHARSET && + if (is_dbcs_ansi_cp(GetACP()) && gdi_font->charset != SYMBOL_CHARSET && + gdi_font->charset != OEM_CHARSET && strcmpiW(font_name,szDefaultFallbackLink) != 0) { font_link = find_font_link(szDefaultFallbackLink); @@ -4702,7 +4699,7 @@ static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GS return NULL; } -static const char* get_opentype_script(const GdiFont *font) +static const char* get_opentype_script(const struct gdi_font *font) { /* * I am not sure if this is the correct way to generate our script tag @@ -4741,7 +4738,7 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) header = font->GSUB_Table; - script = GSUB_get_script_table(header, get_opentype_script(font)); + script = GSUB_get_script_table(header, get_opentype_script(font->gdi_font)); if (!script) { TRACE("Script not found\n"); @@ -5094,14 +5091,14 @@ found: found_face: height = lf.lfHeight; - ret->fs = face->fs; + gdi_font->fs = face->fs; if(csi.fs.fsCsb[0]) { - ret->charset = lf.lfCharSet; - ret->codepage = csi.ciACP; + gdi_font->charset = lf.lfCharSet; + gdi_font->codepage = csi.ciACP; } else - ret->charset = get_nearest_charset( family->family_name, face, &ret->codepage ); + gdi_font->charset = get_nearest_charset( family->family_name, face, &gdi_font->codepage ); TRACE( "Chosen: %s (%s/%p:%ld)\n", debugstr_w(face->full_name), debugstr_w(face->file), face->font_data_ptr, face->face_index ); @@ -5159,7 +5156,7 @@ found_face: set_gdi_font_file_info( gdi_font, face->file, face->font_data_size ); ret->ntmFlags = face->ntmFlags; - pick_charmap( ret->ft_face, ret->charset ); + pick_charmap( ret->ft_face, gdi_font->charset ); ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; set_gdi_font_name( gdi_font, psub ? psub->from.name : family->family_name ); @@ -5728,6 +5725,7 @@ static FT_UInt get_glyph_index_symbol(const GdiFont *font, UINT glyph) static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) { + struct gdi_font *gdi_font = font->gdi_font; FT_UInt ret; WCHAR wc; char buf; @@ -5739,13 +5737,13 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) default_used_pointer = NULL; default_used = FALSE; - if (codepage_sets_default_used(font->codepage)) + if (codepage_sets_default_used(gdi_font->codepage)) default_used_pointer = &default_used; wc = (WCHAR)glyph; - if (!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || + if (!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) { - if (font->codepage == CP_SYMBOL) + if (gdi_font->codepage == CP_SYMBOL) { ret = get_glyph_index_symbol(font, glyph); if (!ret) @@ -5781,6 +5779,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) /* helper for freetype_GetGlyphIndices */ static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) { + struct gdi_font *gdi_font = font->gdi_font; WCHAR wc = (WCHAR)glyph; BOOL default_used = FALSE; BOOL *default_used_pointer = NULL; @@ -5790,12 +5789,12 @@ static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) return get_glyph_index(font, glyph); - if (codepage_sets_default_used(font->codepage)) + if (codepage_sets_default_used(gdi_font->codepage)) default_used_pointer = &default_used; - if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) + if(!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) { - if (font->codepage == CP_SYMBOL && wc < 0x100) + if (gdi_font->codepage == CP_SYMBOL && wc < 0x100) ret = (unsigned char)wc; else ret = 0; @@ -6961,6 +6960,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, static BOOL get_bitmap_text_metrics(GdiFont *font) { + struct gdi_font *gdi_font = font->gdi_font; FT_Face ft_face = font->ft_face; FT_WinFNT_HeaderRec winfnt_header; const DWORD size = offsetof(OUTLINETEXTMETRICW, otmFiller); @@ -7013,7 +7013,7 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmStruckOut = font->strikeout; /* NB inverted meaning of TMPF_FIXED_PITCH */ TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; - TM.tmCharSet = font->charset; + TM.tmCharSet = gdi_font->charset; } if(font->fake_bold) @@ -7398,7 +7398,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) TM.tmPitchAndFamily |= TMPF_TRUETYPE; } - TM.tmCharSet = font->charset; + TM.tmCharSet = gdi_font->charset; font->potm->otmFiller = 0; memcpy(&font->potm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT); @@ -7772,16 +7772,6 @@ static DWORD CDECL freetype_GetFontData( struct gdi_font *font, DWORD table, DWO return get_font_data( get_font_ptr(font), table, offset, buf, cbData ); } -/************************************************************* - * freetype_GetTextCharsetInfo - */ -static UINT CDECL freetype_GetTextCharsetInfo( struct gdi_font *gdi_font, LPFONTSIGNATURE fs, DWORD flags ) -{ - GdiFont *font = get_font_ptr(gdi_font); - if (fs) *fs = font->fs; - return font->charset; -} - /* Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. @@ -8190,7 +8180,6 @@ static const struct font_backend_funcs font_funcs = freetype_GetGlyphOutline, freetype_GetKerningPairs, freetype_GetOutlineTextMetrics, - freetype_GetTextCharsetInfo, freetype_GetTextExtentExPoint, freetype_GetTextExtentExPointI, freetype_GetTextMetrics, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b34131698ed..40b231004b8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -313,6 +313,9 @@ struct gdi_font DWORD handle; DWORD cache_num; DWORD hash; + UINT charset; + UINT codepage; + FONTSIGNATURE fs; LOGFONTW lf; FMAT2 matrix; BOOL can_use_bitmap; @@ -336,7 +339,6 @@ struct font_backend_funcs GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); UINT (CDECL *pGetOutlineTextMetrics)( struct gdi_font *font, UINT size, OUTLINETEXTMETRICW *metrics ); - UINT (CDECL *pGetTextCharsetInfo)( struct gdi_font *font, FONTSIGNATURE *fs, DWORD flags ); BOOL (CDECL *pGetTextExtentExPoint)( struct gdi_font *font, LPCWSTR wstr, INT count, INT *dxs ); BOOL (CDECL *pGetTextExtentExPointI)( struct gdi_font *font, const WORD *indices, INT count, INT *dxs ); BOOL (CDECL *pGetTextMetrics)( struct gdi_font *font, TEXTMETRICW *metrics );

1 0

Alexandre Julliard : gdi32: Move the realized font handle allocation out of freetype.c.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: d7a54394d469480e4a5e7a8b3359f0e3b32515ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a54394d469480e4a5e7a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 21 10:59:51 2020 +0200 gdi32: Move the realized font handle allocation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 88 +++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 101 ++++------------------------------------------- dlls/gdi32/gdi_private.h | 5 ++- 3 files changed, 95 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7a54394d469480e4a5e…

1 0

Nikolay Sivov : evr/mixer: Create dxva processor when output type is set.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 70399c4e4ab6b78a53b3220727240f5126174957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70399c4e4ab6b78a53b32207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:30 2020 +0300 evr/mixer: Create dxva processor when output type is set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 42e0ca42f91..1b77afac5b2 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -82,6 +82,7 @@ struct video_mixer struct output_stream output; IDirect3DDeviceManager9 *device_manager; + IDirectXVideoProcessor *processor; HANDLE device_handle; IMediaEventSink *event_sink; @@ -270,6 +271,8 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) static void video_mixer_release_device_manager(struct video_mixer *mixer) { + if (mixer->processor) + IDirectXVideoProcessor_Release(mixer->processor); if (mixer->device_manager) { IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); @@ -277,6 +280,7 @@ static void video_mixer_release_device_manager(struct video_mixer *mixer) } mixer->device_handle = NULL; mixer->device_manager = NULL; + mixer->processor = NULL; } static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) @@ -819,10 +823,33 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - if (mixer->output.media_type) - IMFMediaType_Release(mixer->output.media_type); - mixer->output.media_type = type; - IMFMediaType_AddRef(mixer->output.media_type); + IDirectXVideoProcessorService *service; + + if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) + { + DXVA2_VideoDesc video_desc; + GUID subtype = { 0 }; + D3DFORMAT rt_format; + + if (mixer->processor) + IDirectXVideoProcessor_Release(mixer->processor); + mixer->processor = NULL; + + video_mixer_init_dxva_videodesc(mixer->inputs[0].media_type, &video_desc); + IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype); + rt_format = subtype.Data1; + + if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, + &video_desc, rt_format, MAX_MIXER_INPUT_STREAMS, &mixer->processor))) + { + if (mixer->output.media_type) + IMFMediaType_Release(mixer->output.media_type); + mixer->output.media_type = type; + IMFMediaType_AddRef(mixer->output.media_type); + } + + IDirectXVideoProcessorService_Release(service); + } } LeaveCriticalSection(&mixer->cs);

1 0

Nikolay Sivov : evr/mixer: Drop input samples on flush.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: e2a4b8a56338bd6a598e0e77aa74487abd32f387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a4b8a56338bd6a598e0e77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:32 2020 +0300 evr/mixer: Drop input samples on flush. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 28361255fe1..5ea1b9aa22b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -949,6 +949,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, { struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = S_OK; + unsigned int i; TRACE("%p, %u, %#lx.\n", iface, message, param); @@ -966,6 +967,23 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, break; + case MFT_MESSAGE_COMMAND_FLUSH: + + EnterCriticalSection(&mixer->cs); + + for (i = 0; i < mixer->input_count; ++i) + { + if (mixer->inputs[i].sample) + { + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; + } + } + + LeaveCriticalSection(&mixer->cs); + + break; + case MFT_MESSAGE_COMMAND_DRAIN: break;

1 0

Zebediah Figura : quartz: Return the paused timestamp from IMediaSeeking::GetCurrentPosition() if the graph is running asynchronously.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 78c2f08225bf1e8a3e3342fe4d36f597af51451f URL: https://source.winehq.org/git/wine.git/?a=commit;h=78c2f08225bf1e8a3e3342fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 20 16:42:57 2020 -0500 quartz: Return the paused timestamp from IMediaSeeking::GetCurrentPosition() if the graph is running asynchronously. In this case "graph->stream_start" has not yet been set. This fixes a regression with Blazblue Centralfiction, which incorrectly skipped a video. The application called IMediaControl::Run() and IMediaSeeking::GetCurrentPosition() in quick succession, received an incorrect value for the latter, and consequently believed that the video had already finished. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4cef1004bdd..e5ae12d9452 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2331,7 +2331,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG { ret = graph->stream_stop; } - else if (graph->state == State_Running && graph->refClock) + else if (graph->state == State_Running && !graph->needs_async_run && graph->refClock) { REFERENCE_TIME time; IReferenceClock_GetTime(graph->refClock, &time);

1 0

Nikolay Sivov : evr/mixer: Maintain streaming state flag.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 14003b00f53efc6e36e1f9de8247c4067ede196e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14003b00f53efc6e36e1f9de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:33 2020 +0300 evr/mixer: Maintain streaming state flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 5ea1b9aa22b..55acf179bdc 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -89,6 +89,7 @@ struct video_mixer IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + unsigned int is_streaming; COLORREF bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; @@ -984,6 +985,17 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, break; + case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: + case MFT_MESSAGE_NOTIFY_END_STREAMING: + + EnterCriticalSection(&mixer->cs); + + mixer->is_streaming = message == MFT_MESSAGE_NOTIFY_BEGIN_STREAMING; + + LeaveCriticalSection(&mixer->cs); + + break; + case MFT_MESSAGE_COMMAND_DRAIN: break; @@ -1016,6 +1028,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW hr = MF_E_NOTACCEPTING; else { + mixer->is_streaming = 1; input->sample = sample; IMFSample_AddRef(input->sample); }

1 0

Michael Stefaniuc : xcopy: Avoid an empty if-block.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 7bbd46ba3f12d2acadd4cfef882642d97381898d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bbd46ba3f12d2acadd4cfef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 21 01:02:39 2020 +0200 xcopy: Avoid an empty if-block. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7c1bc1f472d..c2427f355aa 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -526,16 +526,11 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Output a status message */ if (!skipFile) { - if (flags & OPT_QUIET) { - /* Skip message */ - } else if (flags & OPT_FULL) { - const WCHAR infostr[] = {'%', '1', ' ', '-', '>', ' ', - '%', '2', '\n', 0}; - - XCOPY_wprintf(infostr, copyFrom, copyTo); - } else { - const WCHAR infostr[] = {'%', '1', '\n', 0}; - XCOPY_wprintf(infostr, copyFrom); + if (!(flags & OPT_QUIET)) { + if (flags & OPT_FULL) + XCOPY_wprintf(L"%1 -> %2\n", copyFrom, copyTo); + else + XCOPY_wprintf(L"%1\n", copyFrom); } /* If allowing overwriting of read only files, remove any

1 0

Nikolay Sivov : evr/mixer: Keep dxva device handle around.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 35663e6a7fd9a1d73a3aad5129b8f59bc0923c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35663e6a7fd9a1d73a3aad51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:29 2020 +0300 evr/mixer: Keep dxva device handle around. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 90 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index fd7596eeadf..42e0ca42f91 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -81,12 +81,14 @@ struct video_mixer unsigned int input_count; struct output_stream output; - COLORREF bkgnd_color; IDirect3DDeviceManager9 *device_manager; + HANDLE device_handle; + IMediaEventSink *event_sink; IMFAttributes *attributes; IMFAttributes *internal_attributes; unsigned int mixing_flags; + COLORREF bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -266,6 +268,17 @@ static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) return refcount; } +static void video_mixer_release_device_manager(struct video_mixer *mixer) +{ + if (mixer->device_manager) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + IDirect3DDeviceManager9_Release(mixer->device_manager); + } + mixer->device_handle = NULL; + mixer->device_manager = NULL; +} + static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) { struct video_mixer *mixer = impl_from_IUnknown(iface); @@ -282,8 +295,7 @@ static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) IMFAttributes_Release(mixer->inputs[i].attributes); } video_mixer_clear_types(mixer); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); + video_mixer_release_device_manager(mixer); if (mixer->attributes) IMFAttributes_Release(mixer->attributes); if (mixer->internal_attributes) @@ -695,6 +707,33 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const return count ? S_OK : hr; } +static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDirectXVideoProcessorService **service) +{ + HRESULT hr; + + if (!mixer->device_handle) + { + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + return hr; + } + + for (;;) + { + hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, mixer->device_handle, + &IID_IDirectXVideoProcessorService, (void **)service); + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) + { + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + mixer->device_handle = NULL; + if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + continue; + } + break; + } + + return hr; +} + static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *media_type, DWORD flags) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -702,7 +741,6 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW DXVA2_VideoDesc video_desc; HRESULT hr = E_NOTIMPL; unsigned int count; - HANDLE handle; GUID *guids; TRACE("%p, %u, %p, %#x.\n", iface, id, media_type, flags); @@ -716,37 +754,33 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW hr = MF_E_NOT_INITIALIZED; else { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &handle))) + if (SUCCEEDED(hr = video_mixer_get_processor_service(mixer, &service))) { - if (SUCCEEDED(hr = IDirect3DDeviceManager9_GetVideoService(mixer->device_manager, handle, - &IID_IDirectXVideoProcessorService, (void **)&service))) + if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) { - if (SUCCEEDED(hr = video_mixer_init_dxva_videodesc(media_type, &video_desc))) + if (!id) { - if (!id) + if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, + &count, &guids))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, - &count, &guids))) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, + guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) - { - if (mixer->inputs[0].media_type) - IMFMediaType_Release(mixer->inputs[0].media_type); - mixer->inputs[0].media_type = media_type; - IMFMediaType_AddRef(mixer->inputs[0].media_type); - } - CoTaskMemFree(guids); + if (mixer->inputs[0].media_type) + IMFMediaType_Release(mixer->inputs[0].media_type); + mixer->inputs[0].media_type = media_type; + IMFMediaType_AddRef(mixer->inputs[0].media_type); } + CoTaskMemFree(guids); } - else - { - FIXME("Unimplemented for substreams.\n"); - hr = E_NOTIMPL; - } + } + else + { + FIXME("Unimplemented for substreams.\n"); + hr = E_NOTIMPL; } } - IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, handle); + IDirectXVideoProcessorService_Release(service); } } @@ -897,9 +931,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, EnterCriticalSection(&mixer->cs); - if (mixer->device_manager) - IDirect3DDeviceManager9_Release(mixer->device_manager); - mixer->device_manager = NULL; + video_mixer_release_device_manager(mixer); if (param) hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager);

1 0

Michael Stefaniuc : ipconfig: Use wide-char string literals.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 9834492d2fcf4d6b468ea257d086aebf389fa2c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9834492d2fcf4d6b468ea257… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 21 01:02:41 2020 +0200 ipconfig: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 52 +++++++++++++------------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 1823d482e2a..a056771128c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -91,12 +91,11 @@ static int WINAPIV ipconfig_message_printfW(int msg, ...) static int ipconfig_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return ipconfig_printfW(formatW, msg_buffer); + return ipconfig_printfW(L"%1", msg_buffer); } static const WCHAR *iftype_to_string(DWORD type) @@ -123,27 +122,18 @@ static const WCHAR *iftype_to_string(DWORD type) static void print_field(int msg, const WCHAR *value) { - static const WCHAR formatW[] = {' ',' ',' ',' ','%','1',':',' ','%','2','\n',0}; - - WCHAR field[] = {'.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.', - ' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ','.',' ',0}; + WCHAR field[] = L". . . . . . . . . . . . . . . . . "; WCHAR name_buffer[ARRAY_SIZE(field)]; LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, ARRAY_SIZE(name_buffer)); memcpy(field, name_buffer, sizeof(WCHAR) * min(lstrlenW(name_buffer), ARRAY_SIZE(field) - 1)); - ipconfig_printfW(formatW, field, value); + ipconfig_printfW(L" %1: %2\n", field, value); } static void print_value(const WCHAR *value) { - static const WCHAR formatW[] = {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', - '%','1','\n',0}; - - ipconfig_printfW(formatW, value); + ipconfig_printfW(L" %1\n", value); } static BOOL socket_address_to_string(WCHAR *buf, DWORD len, SOCKET_ADDRESS *addr) @@ -172,15 +162,12 @@ static void print_basic_information(void) for (p = adapters; p; p = p->Next) { - static const WCHAR newlineW[] = {'\n',0}; - static const WCHAR emptyW[] = {0}; - IP_ADAPTER_UNICAST_ADDRESS *addr; IP_ADAPTER_GATEWAY_ADDRESS_LH *gateway; WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) @@ -206,9 +193,9 @@ static void print_basic_information(void) } } else - print_field(STRING_DEFAULT_GATEWAY, emptyW); + print_field(STRING_DEFAULT_GATEWAY, L""); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } } @@ -247,9 +234,6 @@ static const WCHAR *nodetype_to_string(DWORD type) static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) { - static const WCHAR fmtW[] = {'%','0','2','X','-',0}; - static const WCHAR fmt2W[] = {'%','0','2','X',0}; - if (!len) *buf = '\0'; else @@ -259,10 +243,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len) for (i = 0; i < len - 1; i++) { - swprintf(p, 4, fmtW, addr[i]); + swprintf(p, 4, L"%02X-", addr[i]); p += 3; } - swprintf(p, 3, fmt2W, addr[i]); + swprintf(p, 3, L"%02X", addr[i]); } return buf; @@ -280,9 +264,6 @@ static const WCHAR *boolean_to_string(int value) static void print_full_information(void) { - static const WCHAR newlineW[] = {'\n',0}; - static const WCHAR emptyW[] = {0}; - FIXED_INFO *info; IP_ADAPTER_ADDRESSES *adapters; ULONG out = 0; @@ -307,7 +288,7 @@ static void print_full_information(void) /* FIXME: Output WINS proxy status and DNS suffix search list. */ - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } HeapFree(GetProcessHeap(), 0, info); @@ -333,7 +314,7 @@ static void print_full_information(void) WCHAR addr_buf[54]; ipconfig_message_printfW(STRING_ADAPTER_FRIENDLY, iftype_to_string(p->IfType), p->FriendlyName); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); @@ -364,9 +345,9 @@ static void print_full_information(void) } } else - print_field(STRING_DEFAULT_GATEWAY, emptyW); + print_field(STRING_DEFAULT_GATEWAY, L""); - ipconfig_printfW(newlineW); + ipconfig_printfW(L"\n"); } } @@ -376,9 +357,6 @@ static void print_full_information(void) int __cdecl wmain(int argc, WCHAR *argv[]) { - static const WCHAR slashHelp[] = {'/','?',0}; - static const WCHAR slashAll[] = {'/','a','l','l',0}; - WSADATA data; if (WSAStartup(MAKEWORD(2, 2), &data)) @@ -386,13 +364,13 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc > 1) { - if (!lstrcmpW(slashHelp, argv[1])) + if (!lstrcmpW(L"/?", argv[1])) { ipconfig_message(STRING_USAGE); WSACleanup(); return 1; } - else if (!wcsicmp(slashAll, argv[1])) + else if (!wcsicmp(L"/all", argv[1])) { if (argv[2]) {

1 0

Michael Stefaniuc : xcopy: Use wide-char string literals.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: 73aed88c69dca069cf071bc8ff7b326eb8420d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73aed88c69dca069cf071bc8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 21 01:02:40 2020 +0200 xcopy: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/xcopy/xcopy.c | 57 ++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index a8614f979ac..7c1bc1f472d 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -63,10 +63,6 @@ typedef struct _EXCLUDELIST static ULONG filesCopied = 0; /* Number of files copied */ static EXCLUDELIST *excludeList = NULL; /* Excluded strings list */ static FILETIME dateRange; /* Date range to copy after*/ -static const WCHAR wchr_slash[] = {'\\', 0}; -static const WCHAR wchr_star[] = {'*', 0}; -static const WCHAR wchr_dot[] = {'.', 0}; -static const WCHAR wchr_dotdot[] = {'.', '.', 0}; /* To minimize stack usage during recursion, some temporary variables @@ -81,11 +77,10 @@ static WCHAR copyTo[MAX_PATH]; * ========================================================================= */ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -186,8 +181,7 @@ static void XCOPY_FailMessage(DWORD err) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); } else { - const WCHAR infostr[] = {'%', '1', '\n', 0}; - XCOPY_wprintf(infostr, lpMsgBuf); + XCOPY_wprintf(L"%1\n", lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); } } @@ -252,14 +246,13 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { WCHAR endChar = *endOfName; WCHAR buffer[MAXSTRING]; FILE *inFile = NULL; - const WCHAR readTextMode[] = {'r', 't', 0}; /* Null terminate the filename (temporarily updates the filename hence parms not const) */ *endOfName = 0x00; /* Open the file */ - inFile = _wfopen(filename, readTextMode); + inFile = _wfopen(filename, L"rt"); if (inFile == NULL) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_OPENFAIL), filename); *endOfName = endChar; @@ -371,8 +364,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, skipFile = FALSE; /* Ignore . and .. */ - if (lstrcmpW(finddata->cFileName, wchr_dot)==0 || - lstrcmpW(finddata->cFileName, wchr_dotdot)==0 || + if (lstrcmpW(finddata->cFileName, L".")==0 || + lstrcmpW(finddata->cFileName, L"..")==0 || finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { WINE_TRACE("Skipping directory, . or .. (%s)\n", wine_dbgstr_w(finddata->cFileName)); @@ -606,7 +599,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } lstrcpyW(inputpath, srcstem); - lstrcatW(inputpath, wchr_star); + lstrcatW(inputpath, L"*"); findres = TRUE; WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); @@ -615,20 +608,20 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Only looking for dirs */ if ((finddata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - (lstrcmpW(finddata->cFileName, wchr_dot) != 0) && - (lstrcmpW(finddata->cFileName, wchr_dotdot) != 0)) { + (lstrcmpW(finddata->cFileName, L".") != 0) && + (lstrcmpW(finddata->cFileName, L"..") != 0)) { WINE_TRACE("Handling subdir: %s\n", wine_dbgstr_w(finddata->cFileName)); /* Make up recursive information */ lstrcpyW(inputpath, srcstem); lstrcatW(inputpath, finddata->cFileName); - lstrcatW(inputpath, wchr_slash); + lstrcatW(inputpath, L"\\"); lstrcpyW(outputpath, deststem); if (*destspec == 0x00) { lstrcatW(outputpath, finddata->cFileName); - lstrcatW(outputpath, wchr_slash); + lstrcatW(outputpath, L"\\"); } XCOPY_DoCopy(inputpath, srcspec, outputpath, destspec, flags); @@ -713,7 +706,6 @@ static void strip_quotes(WCHAR *word, WCHAR **end) static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, WCHAR *supplieddestination, DWORD *pflags) { - const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; DWORD flags = *pflags; WCHAR *cmdline, *word, *end, *next; int rc = RC_INITERROR; @@ -781,10 +773,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, OPT_REMOVEARCH; break; /* E can be /E or /EXCLUDE */ - case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - &word[1], 8, - EXCLUDE, -1) == CSTR_EQUAL) { + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + &word[1], 8, L"EXCLUDE:", -1) == CSTR_EQUAL) { if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); goto out; @@ -889,7 +879,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* Default the destination if not supplied */ if (supplieddestination[0] == 0x00) - lstrcpyW(supplieddestination, wchr_dot); + lstrcpyW(supplieddestination, L"."); *pflags = flags; rc = RC_OK; @@ -959,10 +949,9 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WINE_TRACE("Directory supplied\n"); lstrcpyW(stem, suppliedsource); lastChar = stem[lstrlenW(stem)-1]; - if (lastChar != '\\' && lastChar != ':') { - lstrcatW(stem, wchr_slash); - } - lstrcpyW(spec, wchr_star); + if (lastChar != '\\' && lastChar != ':') + lstrcatW(stem, L"\\"); + lstrcpyW(spec, L"*"); /* File or wildcard search: stem should be: @@ -1062,9 +1051,8 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR *spec = 0x00; /* Ensure ends with a '\' */ - if (stem[lstrlenW(stem)-1] != '\\') { - lstrcatW(stem, wchr_slash); - } + if (stem[lstrlenW(stem)-1] != '\\') + lstrcatW(stem, L"\\"); } else { WCHAR drive[MAX_PATH]; @@ -1097,16 +1085,11 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) WCHAR destinationspec[MAX_PATH] = {0}; /* Filespec of destination */ WCHAR copyCmd[MAXSTRING]; /* COPYCMD env var */ DWORD flags = 0; /* Option flags */ - const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; - const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; - const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; /* Preinitialize flags based on COPYCMD */ - if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { - if (wcsstr(copyCmd, PROMPTSTR1) != NULL || - wcsstr(copyCmd, PROMPTSTR2) != NULL) { + if (GetEnvironmentVariableW(L"COPYCMD", copyCmd, MAXSTRING)) { + if (wcsstr(copyCmd, L"/Y") != NULL || wcsstr(copyCmd, L"/y") != NULL) flags |= OPT_NOPROMPT; - } } /* FIXME: On UNIX, files starting with a '.' are treated as hidden under

1 0

Hans Leidekker : bcrypt: Use internal helpers to generate hashes.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: a6e589bc52f4ffc80021e38c49ef2355b9479695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e589bc52f4ffc80021e38c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 09:56:39 2020 +0200 bcrypt: Use internal helpers to generate hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 171 ++++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e589bc52f4ffc80021…

1 0

Nikolay Sivov : evr/mixer: Ignore draining command.
by Alexandre Julliard Oct. 21, 2020

Oct. 21, 2020

Module: wine Branch: master Commit: c1e57ea291d179c210559c8ff3d6952e775df592 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e57ea291d179c210559c8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 09:46:31 2020 +0300 evr/mixer: Ignore draining command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 ++++ dlls/evr/tests/evr.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1b77afac5b2..28361255fe1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -965,6 +965,10 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, LeaveCriticalSection(&mixer->cs); break; + + case MFT_MESSAGE_COMMAND_DRAIN: + break; + default: WARN("Message not handled %d.\n", message); hr = E_NOTIMPL; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 182280d0a39..d71a63ff602 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2171,6 +2171,9 @@ todo_wine hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFSample_Release(sample); IDirect3DSurface9_Release(surface);

1 0