October 2020 - Wine-Commits

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