March 2021 - Wine-Devel - list.winehq.org

[PATCH 1/5] riched20: Handle EM_SETBKGNDCOLOR in the host.
by Huw Davies March 18, 2021

March 18, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 26 -------------------------- dlls/riched20/editstr.h | 2 -- dlls/riched20/txthost.c | 26 ++++++++++++++++++++++---- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 13a04a003f4..3073294bd7b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3005,8 +3005,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nLastTotalLength = ed->nTotalLength = 0; ed->nLastTotalWidth = ed->nTotalWidth = 0; ed->nUDArrowX = -1; - ed->rgbBackColor = -1; - ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); ed->nEventMask = 0; ed->nModifyStep = 0; ed->nTextLimit = TEXT_LIMIT_DEFAULT; @@ -3100,8 +3098,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - if (editor->rgbBackColor != -1) - DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); if (editor->reOle) @@ -3516,28 +3512,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SELECTIONTYPE: return ME_GetSelectionType(editor); - case EM_SETBKGNDCOLOR: - { - LRESULT lColor; - if (editor->rgbBackColor != -1) { - DeleteObject(editor->hbrBackground); - lColor = editor->rgbBackColor; - } - else lColor = ITextHost_TxGetSysColor(editor->texthost, COLOR_WINDOW); - - if (wParam) - { - editor->rgbBackColor = -1; - editor->hbrBackground = GetSysColorBrush(COLOR_WINDOW); - } - else - { - editor->rgbBackColor = lParam; - editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); - } - ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - return lColor; - } case EM_GETMODIFY: return editor->nModifyStep == 0 ? 0 : -1; case EM_SETMODIFY: diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 1f277cbf6bc..0273fde4350 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -392,8 +392,6 @@ typedef struct tagME_TextEditor int nAvailWidth; /* 0 = wrap to client area, else wrap width in twips */ int nUDArrowX; int total_rows; - COLORREF rgbBackColor; - HBRUSH hbrBackground; int nEventMask; int nModifyStep; struct list undo_stack; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c80263bbd69..ebccddf65e3 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -45,9 +45,11 @@ struct host unsigned int sel_bar : 1; unsigned int client_edge : 1; unsigned int use_set_rect : 1; + unsigned int use_back_colour : 1; PARAFORMAT2 para_fmt; DWORD props, scrollbars, event_mask; RECT client_rect, set_rect; + COLORREF back_colour; }; static const ITextHostVtbl textHostVtbl; @@ -111,6 +113,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->use_set_rect = 0; SetRectEmpty( &texthost->set_rect ); GetClientRect( hwnd, &texthost->client_rect ); + texthost->use_back_colour = 0; return texthost; } @@ -346,6 +349,9 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost *ifa DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost *iface, int index ) { + struct host *host = impl_from_ITextHost( iface ); + + if (index == COLOR_WINDOW && host->use_back_colour) return host->back_colour; return GetSysColor( index ); } @@ -992,9 +998,14 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, { HDC hdc = (HDC)wparam; RECT rc; + HBRUSH brush; if (GetUpdateRect( editor->hWnd, &rc, TRUE )) - FillRect( hdc, &rc, editor->hbrBackground ); + { + brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); + FillRect( hdc, &rc, brush ); + DeleteObject( brush ); + } return 1; } case EM_FINDTEXT: @@ -1127,13 +1138,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HDC hdc; RECT rc; PAINTSTRUCT ps; - HBRUSH old_brush; + HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE ); - old_brush = SelectObject( hdc, editor->hbrBackground ); + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ if (ps.rcPaint.top < editor->rcFormat.top) @@ -1166,7 +1177,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } ME_PaintContent( editor, hdc, &ps.rcPaint ); - SelectObject( hdc, old_brush ); + DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0; } @@ -1181,6 +1192,13 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = len; break; } + case EM_SETBKGNDCOLOR: + res = ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ); + host->use_back_colour = !wparam; + if (host->use_back_colour) host->back_colour = lparam; + InvalidateRect( hwnd, NULL, TRUE ); + break; + case EM_SETEVENTMASK: host->event_mask = lparam; hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); -- 2.23.0

1 0

[PATCH 1/5] server: Do not allow selecting on the ifchange object.
by Zebediah Figura March 18, 2021

March 18, 2021

We never pass a handle to this object to the client anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3aed5494612..8ab7d5b7236 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1536,7 +1536,7 @@ static const struct object_ops ifchange_ops = sizeof(struct ifchange), /* size */ &no_type, /* type */ ifchange_dump, /* dump */ - add_queue, /* add_queue */ + no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */ -- 2.30.2

1 4

[PATCH v2 3/3] msado15: Improve return when field cannot be found
by Alistair Leslie-Hughes March 17, 2021

March 17, 2021

--- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index b21385bd860..f5d4d578766 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -631,7 +631,7 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) } } - return E_INVALIDARG; + return MAKE_ADO_HRESULT(adErrItemNotFound); } static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) -- 2.30.1

2 1

[PATCH v2 2/3] msado15: Support VT_I4/I2 for Fields Item property
by Alistair Leslie-Hughes March 17, 2021

March 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 16 ++++++++++++++++ dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 2e684542828..b21385bd860 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -593,6 +593,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) { ULONG i; + if (V_VT( index ) == VT_I4 || V_VT( index ) == VT_I2) + { + if (V_VT( index ) == VT_I4) + i = V_I4 ( index ); + else + i = V_I2 ( index ); + + if (i < fields->count) + { + *ret = i; + return S_OK; + } + + return MAKE_ADO_HRESULT(adErrItemNotFound); + } + if (V_VT( index ) != VT_BSTR) { FIXME( "variant type %u not supported\n", V_VT( index ) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bc9b4a24761..2d226ac027f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -169,6 +169,23 @@ static void test_Recordset(void) hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); ok( hr == S_OK, "got %08x\n", hr ); + V_VT( &index ) = VT_I4; + V_I4( &index ) = 1000; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + + V_VT( &index ) = VT_I4; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_I2; + V_I4( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field ); -- 2.30.1

2 1

[PATCH v2 1/3] msado15: Free field objects in recordset.
by Alistair Leslie-Hughes March 17, 2021

March 17, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 0b91358f83d..2e684542828 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -92,12 +92,7 @@ static ULONG WINAPI field_Release( Field *iface ) struct field *field = impl_from_Field( iface ); LONG refs = InterlockedDecrement( &field->refs ); TRACE( "%p new refcount %d\n", field, refs ); - if (!refs) - { - TRACE( "destroying %p\n", field ); - heap_free( field->name ); - heap_free( field ); - } + /* Fields aren't destroyed here */ return refs; } @@ -857,6 +852,7 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + ULONG i; if ( recordset->row_set ) IRowset_Release( recordset->row_set ); recordset->row_set = NULL; @@ -865,6 +861,13 @@ static void close_recordset( struct recordset *recordset ) col_count = get_column_count( recordset ); recordset->fields->recordset = NULL; + + for (i=0; i < recordset->fields->count; i++) + { + struct field *field = impl_from_Field( recordset->fields->field[i] ); + heap_free( field->name ); + heap_free( field ); + } Fields_Release( &recordset->fields->Fields_iface ); recordset->fields = NULL; -- 2.30.1

2 1

[PATCH 2/2] uninstaller: Use wide-char string literals.
by Michael Stefaniuc March 17, 2021

March 17, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 44 +++++++++++++------------------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 7686c803b36..7236f1689e5 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -46,17 +46,7 @@ static WCHAR *sFilter; static int FetchUninstallInformation(void); static void UninstallProgram(void); - -static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; -static const WCHAR PathUninstallW[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'U','n','i','n','s','t','a','l','l',0 }; -static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; -static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; -static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; +static const WCHAR PathUninstallW[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; static void output_writeconsole(const WCHAR *str, DWORD len) { @@ -125,12 +115,11 @@ static void WINAPIV output_array(const WCHAR *fmt, ...) static void ListUninstallPrograms(void) { unsigned int i; - static WCHAR fmtW[] = {'%','1','|','|','|','%','2','\n',0}; FetchUninstallInformation(); for (i=0; i < numentries; i++) - output_array(fmtW, entries[i].key, entries[i].descr); + output_array(L"%1|||%2\n", entries[i].key, entries[i].descr); } @@ -159,9 +148,6 @@ static void RemoveSpecificProgram(WCHAR *nameW) int __cdecl wmain(int argc, WCHAR *argv[]) { LPCWSTR token = NULL; - static const WCHAR helpW[] = { '-','-','h','e','l','p',0 }; - static const WCHAR listW[] = { '-','-','l','i','s','t',0 }; - static const WCHAR removeW[] = { '-','-','r','e','m','o','v','e',0 }; int i = 1; BOOL is_wow64; @@ -192,19 +178,19 @@ int __cdecl wmain(int argc, WCHAR *argv[]) while( i<argc ) { token = argv[i++]; - - if( !lstrcmpW( token, helpW ) ) + + if( !lstrcmpW( token, L"--help" ) ) { output_message(STRING_HEADER); output_message(STRING_USAGE); return 0; } - else if( !lstrcmpW( token, listW ) ) + else if( !lstrcmpW( token, L"--list" ) ) { ListUninstallPrograms(); return 0; } - else if( !lstrcmpW( token, removeW ) ) + else if( !lstrcmpW( token, L"--remove" ) ) { if( i >= argc ) { @@ -252,29 +238,29 @@ static int FetchFromRootKey(HKEY root) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && + if (!RegQueryValueExW(hkeyApp, L"SystemComponent", NULL, &type, (BYTE *)&value, &size) && type == REG_DWORD && value == 1) { RegCloseKey(hkeyApp); sizeOfSubKeyName = 255; continue; } - if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) + if (!RegQueryValueExW(hkeyApp, L"DisplayName", NULL, NULL, NULL, &displen)) { WCHAR *command; size = sizeof(value); - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, (LPBYTE)&value, &size) && + if (!RegQueryValueExW(hkeyApp, L"WindowsInstaller", NULL, &type, (BYTE *)&value, &size) && type == REG_DWORD && value == 1) { - static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; - command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR)); - wsprintfW(command, fmtW, subKeyName); + command = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(L"msiexec /x%s") + lstrlenW(subKeyName)) * sizeof(WCHAR)); + wsprintfW(command, L"msiexec /x%s", subKeyName); } - else if (!RegQueryValueExW(hkeyApp, UninstallCommandlineW, NULL, NULL, NULL, &uninstlen)) + else if (!RegQueryValueExW(hkeyApp, L"UninstallString", NULL, NULL, NULL, &uninstlen)) { command = HeapAlloc(GetProcessHeap(), 0, uninstlen); - RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)command, &uninstlen); + RegQueryValueExW(hkeyApp, L"UninstallString", 0, 0, (BYTE *)command, &uninstlen); } else { @@ -288,7 +274,7 @@ static int FetchFromRootKey(HKEY root) entries[numentries-1].key = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(subKeyName)+1)*sizeof(WCHAR)); lstrcpyW(entries[numentries-1].key, subKeyName); entries[numentries-1].descr = HeapAlloc(GetProcessHeap(), 0, displen); - RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)entries[numentries-1].descr, &displen); + RegQueryValueExW(hkeyApp, L"DisplayName", 0, 0, (BYTE *)entries[numentries-1].descr, &displen); entries[numentries-1].command = command; entries[numentries-1].active = 0; WINE_TRACE("allocated entry #%d: %s (%s), %s\n", -- 2.26.3

1 0

[PATCH 1/2] uninstaller: Constify the string paramenter of output_array()
by Michael Stefaniuc March 17, 2021

March 17, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/uninstaller/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index d7f308c798d..7686c803b36 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -110,7 +110,7 @@ static void WINAPIV output_message(unsigned int id, ...) __ms_va_end(va_args); } -static void WINAPIV output_array(WCHAR *fmt, ...) +static void WINAPIV output_array(const WCHAR *fmt, ...) { __ms_va_list va_args; -- 2.26.3

1 0

[PATCH] urlmon: Remove unnecessary local variable.
by Nikolay Sivov March 17, 2021

March 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/urlmon/binding.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index d35052dfdf6..a74970033b3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1126,8 +1126,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres HRESULT hres; if(!(This->state & BINDING_LOCKED)) { - HRESULT hres = IInternetProtocolEx_LockRequest( - &This->protocol->IInternetProtocolEx_iface, 0); + hres = IInternetProtocolEx_LockRequest(&This->protocol->IInternetProtocolEx_iface, 0); if(SUCCEEDED(hres)) This->state |= BINDING_LOCKED; } -- 2.30.2

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Factor out hlsl_new_copy().
by Zebediah Figura March 17, 2021

March 17, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 6 ++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 +++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19c0e2e4..988f64dc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -382,6 +382,12 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * return hlsl_ir_expr(cast); } +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) +{ + /* Use a cast to the same type as a makeshift identity expression. */ + return hlsl_new_cast(node, node->data_type, &node->loc); +} + struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5a2f6af1..92ac5270 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -525,6 +525,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fceafb6..afac0ab3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1336,9 +1336,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in /* Don't use the instruction itself as a source, as this makes structure * splitting easier. Instead copy it here. Since we retrieve sources from - * the last instruction in the list, we do need to copy. Use a cast - * instruction to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + * the last instruction in the list, we do need to copy. */ + if (!(copy = hlsl_new_copy(rhs))) return NULL; list_add_tail(instrs, &copy->node.entry); return &copy->node; @@ -1365,8 +1364,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem { struct hlsl_ir_expr *copy; - /* Use a cast to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc))) + if (!(copy = hlsl_new_copy(lhs))) return false; list_add_tail(instrs, &copy->node.entry); -- 2.30.1

4 15

[PATCH] winegstreamer: Set specific large buffer sizes for decodebin
by Andrew Eikum March 17, 2021

March 17, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Setting them to 0 just means use the default: https://gstreamer.freedesktop.org/documentation/playback/decodebin.html?gi-… dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/wg_parser.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 55a62361966..69833a40b62 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -173,7 +173,7 @@ struct unix_funcs void **data, uint64_t *offset, uint32_t *size); void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, bool ret); - void (CDECL *wg_parser_set_unlimited_buffering)(struct wg_parser *parser); + void (CDECL *wg_parser_set_large_buffering)(struct wg_parser *parser); uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3260175f45a..828d15f906e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1125,7 +1125,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * never deselects it). Remove buffering limits from decodebin in order to * account for this. Note that this does leak memory, but the same memory * leak occurs with native. */ - unix_funcs->wg_parser_set_unlimited_buffering(parser); + unix_funcs->wg_parser_set_large_buffering(parser); object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f76ca903b80..de6396a5603 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -543,11 +543,11 @@ static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool pthread_cond_signal(&parser->read_done_cond); } -static void CDECL wg_parser_set_unlimited_buffering(struct wg_parser *parser) +static void CDECL wg_parser_set_large_buffering(struct wg_parser *parser) { - g_object_set(parser->decodebin, "max-size-buffers", 0, NULL); - g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(0), NULL); - g_object_set(parser->decodebin, "max-size-bytes", 0, NULL); + g_object_set(parser->decodebin, "max-size-buffers", UINT_MAX, NULL); + g_object_set(parser->decodebin, "max-size-time", G_GUINT64_CONSTANT(1000000000), NULL); + g_object_set(parser->decodebin, "max-size-bytes", 8 * 1024 * 1024, NULL); } static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) @@ -1883,7 +1883,7 @@ static const struct unix_funcs funcs = wg_parser_get_read_request, wg_parser_complete_read_request, - wg_parser_set_unlimited_buffering, + wg_parser_set_large_buffering, wg_parser_get_stream_count, wg_parser_get_stream, -- 2.31.0

2 1