October 2020 - Wine-commits

Huw Davies : riched20: Use paragraph ptrs in the table move from row start function.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 3ba419081a5413472aed0c6cdc1a79abf3ce9802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba419081a5413472aed0c6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:14 2020 +0000 riched20: Use paragraph ptrs in the table move from row start function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 15 ++++++++------- dlls/riched20/undo.c | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7687ec9d93e..797eb27b6b9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2690,7 +2690,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } else return TRUE; - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor, FALSE); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a49883c9861..b8916bc4ff3 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -302,6 +302,7 @@ ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECL ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void table_move_from_row_start( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; @@ -309,7 +310,6 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 25c4e1820ce..c262d190b79 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -629,16 +629,17 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) /* Make sure the cursor is not in the hidden table row start paragraph * without a selection. */ -void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) +void table_move_from_row_start( ME_TextEditor *editor ) { - ME_DisplayItem *para = editor->pCursors[0].pPara; - if (para == editor->pCursors[1].pPara && - para->member.para.nFlags & MEPF_ROWSTART) { + ME_Paragraph *para = &editor->pCursors[0].pPara->member.para; + + if (para == &editor->pCursors[1].pPara->member.para && para->nFlags & MEPF_ROWSTART) + { /* The cursors should not be at the hidden start row paragraph without * a selection, so the cursor is moved into the first cell. */ - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index d9c5d28d6dc..fe0a4f721cd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -438,7 +438,7 @@ BOOL ME_Undo(ME_TextEditor *editor) destroy_undo_item( undo ); } - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; @@ -475,7 +475,7 @@ BOOL ME_Redo(ME_TextEditor *editor) list_remove( &undo->entry ); destroy_undo_item( undo ); } - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode;

1 0

Huw Davies : riched20: Remove the table corruption check function.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: f2d770d4913e19136c553f5bd638a9380ea68541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d770d4913e19136c553f5b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:15 2020 +0000 riched20: Remove the table corruption check function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 -- dlls/riched20/editor.h | 1 - dlls/riched20/table.c | 89 -------------------------------------------------- dlls/riched20/undo.c | 2 -- 4 files changed, 95 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 797eb27b6b9..d1667dc9176 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1735,7 +1735,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (parser.tableDef) parser.tableDef->row_start = NULL; } } - ME_CheckTablesForCorruption(editor); RTFDestroy(&parser); if (parser.stackTop > 0) @@ -2515,7 +2514,6 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } @@ -2541,7 +2539,6 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[1] = editor->pCursors[0]; para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b8916bc4ff3..5f93aa39db9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -309,7 +309,6 @@ ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; -void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c262d190b79..e08876d29bd 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,6 @@ #include "editor.h" #include "rtf.h" -WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); - static const WCHAR cr_lf[] = {'\r', '\n', 0}; static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, @@ -214,93 +212,6 @@ ME_Paragraph *cell_end_para( ME_Cell *cell ) return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; } -/* Make a bunch of assertions to make sure tables haven't been corrupted. - * - * These invariants may not hold true in the middle of streaming in rich text - * or during an undo and redo of streaming in rich text. It should be safe to - * call this method after an event is processed. - */ -void ME_CheckTablesForCorruption(ME_TextEditor *editor) -{ - if(TRACE_ON(richedit_lists)) - { - TRACE("---\n"); - ME_DumpDocument(editor->pBuffer); - } -#ifndef NDEBUG - { - ME_DisplayItem *p, *pPrev; - pPrev = editor->pBuffer->pFirst; - p = pPrev->next; - if (!editor->bEmulateVersion10) /* v4.1 */ - { - while (p->type == diParagraph) - { - assert(p->member.para.fmt.dwMask & PFM_TABLE); - assert(p->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - if (p->member.para.pCell) - { - assert(p->member.para.nFlags & MEPF_CELL); - assert(p->member.para.fmt.wEffects & PFE_TABLE); - } - if (p->member.para.pCell != pPrev->member.para.pCell) - { - /* There must be a diCell in between the paragraphs if pCell changes. */ - ME_DisplayItem *pCell = ME_FindItemBack(p, diCell); - assert(pCell); - assert(ME_FindItemBack(p, diRun) == ME_FindItemBack(pCell, diRun)); - } - if (p->member.para.nFlags & MEPF_ROWEND) - { - /* ROWEND must come after a cell. */ - assert(pPrev->member.para.pCell); - assert(p->member.para.pCell - == pPrev->member.para.pCell->member.cell.parent_cell); - assert(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); - } - else if (p->member.para.pCell) - { - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - assert(pPrev->member.para.pCell || - pPrev->member.para.nFlags & MEPF_ROWSTART); - if (pPrev->member.para.pCell && - !(pPrev->member.para.nFlags & MEPF_ROWSTART)) - { - assert(p->member.para.pCell->member.cell.parent_cell - == pPrev->member.para.pCell->member.cell.parent_cell); - if (pPrev->member.para.pCell != p->member.para.pCell) - assert(pPrev->member.para.pCell - == p->member.para.pCell->member.cell.prev_cell); - } - } - else if (!(p->member.para.nFlags & MEPF_ROWSTART)) - { - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - /* ROWSTART must be followed by a cell. */ - assert(!(p->member.para.nFlags & MEPF_CELL)); - /* ROWSTART must be followed by a cell. */ - assert(!(pPrev->member.para.nFlags & MEPF_ROWSTART)); - } - pPrev = p; - p = p->member.para.next_para; - } - } else { /* v1.0 - 3.0 */ - while (p->type == diParagraph) - { - assert(!(p->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); - assert(p->member.para.fmt.dwMask & PFM_TABLE); - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - assert(!p->member.para.pCell); - p = p->member.para.next_para; - } - return; - } - assert(p->type == diTextEnd); - assert(!pPrev->member.para.pCell); - } -#endif -} - BOOL ME_IsInTable(ME_DisplayItem *pItem) { PARAFORMAT2 *pFmt; diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index fe0a4f721cd..884f87b56fd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -440,7 +440,6 @@ BOOL ME_Undo(ME_TextEditor *editor) table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); - ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; editor->nUndoMode = nMode; ME_UpdateRepaint(editor, FALSE); @@ -477,7 +476,6 @@ BOOL ME_Redo(ME_TextEditor *editor) } table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); - ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode; ME_UpdateRepaint(editor, FALSE); return TRUE;

1 0

Pengpeng Dong : wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 89698cfae4d9aefd3f77c2982e64f7b98e00edf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89698cfae4d9aefd3f77c298… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Thu Oct 29 13:15:48 2020 +0100 wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 95 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e35aa069e1d..be22d8d3066 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,8 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { + { L"DeviceID", CIM_STRING }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING }, { L"ProductName", CIM_STRING }, { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 }, @@ -766,8 +768,10 @@ struct record_sid }; struct record_sounddevice { + const WCHAR *deviceid; const WCHAR *manufacturer; const WCHAR *name; + const WCHAR *pnpdeviceid; const WCHAR *productname; const WCHAR *status; UINT16 statusinfo; @@ -886,10 +890,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, }; -static const struct record_sounddevice data_sounddevice[] = -{ - { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", L"OK", 3 /* enabled */ } -}; + static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } @@ -3830,7 +3831,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct return status; } -static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +static WCHAR *get_videocontroller_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; UINT len = sizeof(fmtW) + 2; @@ -3846,7 +3847,7 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) #define HW_VENDOR_VMWARE 0x15ad #define HW_VENDOR_INTEL 0x8086 -static const WCHAR *get_installeddriver( UINT vendorid ) +static const WCHAR *get_videocontroller_installeddriver( UINT vendorid ) { /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ @@ -3856,12 +3857,32 @@ static const WCHAR *get_installeddriver( UINT vendorid ) return L"wine.dll"; } +static BOOL get_dxgi_adapter_desc( DXGI_ADAPTER_DESC *desc ) +{ + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + memset( desc, 0, sizeof(*desc) ); + hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); + if (FAILED( hr )) return FALSE; + + hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); + if (FAILED( hr )) + { + IDXGIFactory_Release( factory ); + return FALSE; + } + + hr = IDXGIAdapter_GetDesc( adapter, desc ); + IDXGIAdapter_Release( adapter ); + IDXGIFactory_Release( factory ); + return SUCCEEDED( hr ); +} + static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { struct record_videocontroller *rec; - HRESULT hr; - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; UINT row = 0, hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; const WCHAR *name = L"VideoController1"; @@ -3870,22 +3891,13 @@ static enum fill_status fill_videocontroller( struct table *table, const struct if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - memset (&desc, 0, sizeof(desc)); - hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); - if (FAILED(hr)) goto done; - - hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); - if (FAILED(hr)) goto done; - - hr = IDXGIAdapter_GetDesc( adapter, &desc ); - if (SUCCEEDED(hr)) + if (get_dxgi_adapter_desc( &desc )) { if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; else vidmem = desc.DedicatedVideoMemory; name = desc.Description; } -done: rec = (struct record_videocontroller *)table->data; rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; @@ -3902,9 +3914,9 @@ done: rec->device_id = L"VideoController1"; rec->driverdate = L"20170101000000.000000+000"; rec->driverversion = L"1.0"; - rec->installeddriver = get_installeddriver( desc.VendorId ); + rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); - rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc ); rec->status = L"OK"; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ @@ -3916,9 +3928,44 @@ done: TRACE("created %u rows\n", row); table->num_rows = row; + return status; +} - if (adapter) IDXGIAdapter_Release( adapter ); - if (factory) IDXGIFactory_Release( factory ); +static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +{ + static const WCHAR fmtW[] = L"HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%04X\\0&DEADBEEF&0&DEAD"; + UINT len = sizeof(fmtW) + 2; + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + return ret; +} + +static enum fill_status fill_sounddevice( struct table *table, const struct expr *cond ) +{ + struct record_sounddevice *rec; + DXGI_ADAPTER_DESC desc; + UINT row = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + get_dxgi_adapter_desc( &desc ); + + rec = (struct record_sounddevice *)table->data; + rec->deviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine Audio Device"; + rec->pnpdeviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->productname = L"Wine Audio Device"; + rec->status = L"OK"; + rec->statusinfo = 3; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; return status; } @@ -3960,7 +4007,7 @@ static struct table builtin_classes[] = { L"Win32_QuickFixEngineering", C(col_quickfixengineering), D(data_quickfixengineering) }, { L"Win32_SID", C(col_sid), 0, 0, NULL, fill_sid }, { L"Win32_Service", C(col_service), 0, 0, NULL, fill_service }, - { L"Win32_SoundDevice", C(col_sounddevice), D(data_sounddevice) }, + { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) },

1 0

Hans Leidekker : wbemprox/tests: Test more sound device properties.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 488ec98bf2080370d023211d4319beb79d58cc69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488ec98bf2080370d023211d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 13:15:49 2020 +0100 wbemprox/tests: Test more sound device properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7ba55dffdfb..191b9f6c85a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1745,10 +1745,13 @@ static void test_Win32_SoundDevice( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PNPDeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"ProductName", VT_BSTR, CIM_STRING ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 ); - check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); }

1 0

Alexandre Julliard : winebuild: Set PE timestamps to a hash of the file name.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: d5c089f5fa71e2ae568b2f1bcb9158223c552040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c089f5fa71e2ae568b2f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 16:49:29 2020 +0100 winebuild: Set PE timestamps to a hash of the file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index efb136a8e61..ba2edfb588f 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -51,6 +51,14 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static unsigned int hash_filename( const char *name ) +{ + /* FNV-1 hash */ + unsigned int ret = 2166136261u; + while (*name) ret = (ret * 16777619) ^ *name++; + return ret; +} + /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) { @@ -405,7 +413,7 @@ void output_exports( DLLSPEC *spec ) /* export directory header */ output( "\t.long 0\n" ); /* Characteristics */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ @@ -666,7 +674,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short 0x%04x\n", /* Machine */ machine ); output( "\t.short 0\n" ); /* NumberOfSections */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* PointerToSymbolTable */ output( "\t.long 0\n" ); /* NumberOfSymbols */ output( "\t.short %d\n", /* SizeOfOptionalHeader */ @@ -817,7 +825,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ - put_dword( 0 ); /* TimeDateStamp */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ put_dword( 0 ); /* PointerToSymbolTable */ put_dword( 0 ); /* NumberOfSymbols */ put_word( get_ptr_size() == 8 ?

1 0

Nikolay Sivov : include: Add IMFVideoSampleAllocatorEx.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 99c1f2a0a8f3aa60728acc239e11dad669dd0bf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c1f2a0a8f3aa60728acc23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:11 2020 +0300 include: Add IMFVideoSampleAllocatorEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 9f2d825bd5f..dd5de8d0d2f 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1147,6 +1147,22 @@ interface IMFVideoSampleAllocatorCallback : IUnknown ); } +[ + object, + uuid(545b3a48-3283-4f62-866f-a62d8f598f9f), + local, + pointer_default(unique) +] +interface IMFVideoSampleAllocatorEx : IMFVideoSampleAllocator +{ + HRESULT InitializeSampleAllocatorEx( + DWORD initial_sample_count, + DWORD max_sample_count, + IMFAttributes *attributes, + IMFMediaType *media_type + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001,

1 0

Nikolay Sivov : evr/tests: Add sample allocator test with surface-backed buffers.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 7aad298f7158e5b5f79a37c29626afc5b84ed784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aad298f7158e5b5f79a37c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:25 2020 +0300 evr/tests: Add sample allocator test with surface-backed buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 116 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 27 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fbcf798157e..e4f45396ae8 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1302,13 +1302,19 @@ static void test_MFCreateVideoSampleAllocator(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFMediaType *media_type, *video_type; IMFVideoSampleAllocator *allocator; + IDirect3DDeviceManager9 *manager; IMFSample *sample, *sample2; IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; IMFMediaBuffer *buffer; + unsigned int token; IMFGetService *gs; + IDirect3D9 *d3d; IUnknown *unk; + HWND window; HRESULT hr; LONG count; + BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1387,48 +1393,104 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 4, "Unexpected count %d.\n", count); - if (sample) - { - hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample gets regular memory buffers. */ - if (SUCCEEDED(hr)) - { - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); - IMFGetService_Release(gs); - } + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - IMFMediaBuffer_Release(buffer); + IMFMediaBuffer_Release(buffer); - IMFSample_Release(sample); - } + IMFSample_Release(sample); IMFVideoSampleAllocatorCallback_Release(allocator_cb); - IMFMediaType_Release(media_type); - IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + + /* Using device manager */ + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(surface); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IDirect3DDeviceManager9_Release(manager); + IDirect3DDevice9_Release(device); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } struct test_host

1 0

Alexandre Julliard : gdi32: Move the GSUB table support out of freetype.c.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 8631506270ab116c6aecabe8a3159ba7d23edd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631506270ab116c6aecabe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 11:10:30 2020 +0100 gdi32: Move the GSUB table support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 336 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 388 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 5 + 3 files changed, 353 insertions(+), 376 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8631506270ab116c6aec…

1 0

Alexandre Julliard : gdi32: Store child font objects directly on the child font list.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 54bdbd3c03262868c51cf4bab4a524ea054ace2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bdbd3c03262868c51cf4ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:44:25 2020 +0100 gdi32: Store child font objects directly on the child font list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 13 ++-- dlls/gdi32/freetype.c | 167 ++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 66 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54bdbd3c03262868c51c…

1 0

Alexandre Julliard : gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c.
by Alexandre Julliard 29 Oct '20

29 Oct '20

Module: wine Branch: master Commit: 044315c0b3890676d9fd751d8191b0b7381e0b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=044315c0b3890676d9fd751d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:47:18 2020 +0100 gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 155 +++++++++++++++++++++--- dlls/gdi32/freetype.c | 306 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 10 +- 3 files changed, 198 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=044315c0b3890676d9fd…

1 0