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

Jacek Caban : windowscodecs: Use nameless unions.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 909b2ced71f1151c29fa7a9e24f1a42d6cdd81ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=909b2ced71f1151c29fa7a9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:50 2021 +0100 windowscodecs: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/gifformat.c | 110 +++++++++++++++--------------- dlls/windowscodecs/metadatahandler.c | 126 +++++++++++++++++------------------ dlls/windowscodecs/metadataquery.c | 40 +++++------ dlls/windowscodecs/pngformat.c | 12 ++-- 5 files changed, 144 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=909b2ced71f1151c29fa…

1 0

Huw Davies : riched20: Add support for TXTBACK_TRANSPARENT.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e668aa9dcb590be9990ff2c96ea950a429fe4223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e668aa9dcb590be9990ff2c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:26 2021 +0000 riched20: Add support for TXTBACK_TRANSPARENT. 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/editstr.h | 1 + dlls/riched20/paint.c | 76 +++++++++++++++++++++++++++++-------------------- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4f66220d230..4eb90a4c300 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3037,6 +3037,9 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; + ed->back_style = TXTBACK_OPAQUE; + ITextHost_TxGetBackStyle( texthost, &ed->back_style ); + list_init( &ed->reobj_list ); OleInitialize(NULL); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index c0fef69547e..6bf60748f7e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -436,6 +436,7 @@ typedef struct tagME_TextEditor BOOL caret_hidden; BOOL bMouseCaptured; int wheel_remain; + TXTBACKSTYLE back_style; struct list style_list; struct list reobj_list; struct wine_rb_tree marked_paras; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4704f43c2c3..7b7882be2b7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -25,6 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); +static inline BOOL editor_opaque( ME_TextEditor *editor ) +{ + return editor->back_style != TXTBACK_TRANSPARENT; +} + void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) { ME_Paragraph *para; @@ -78,23 +83,26 @@ void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) draw_paragraph( &c, para ); para = para_next( para ); } - if (c.pt.y + editor->nTotalLength < c.rcView.bottom) - { /* space after the end of the text */ - rc.top = c.pt.y + editor->nTotalLength; - rc.left = c.rcView.left; - rc.bottom = c.rcView.bottom; - rc.right = c.rcView.right; - if (IntersectRect( &rc, &rc, update )) - PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); - } - if (editor->selofs) - { /* selection bar */ - rc.left = c.rcView.left - editor->selofs; - rc.top = c.rcView.top; - rc.right = c.rcView.left; - rc.bottom = c.rcView.bottom; - if (IntersectRect( &rc, &rc, update )) - PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + if (editor_opaque( editor )) + { + if (c.pt.y + editor->nTotalLength < c.rcView.bottom) + { /* space after the end of the text */ + rc.top = c.pt.y + editor->nTotalLength; + rc.left = c.rcView.left; + rc.bottom = c.rcView.bottom; + rc.right = c.rcView.right; + if (IntersectRect( &rc, &rc, update )) + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } + if (editor->selofs) + { /* selection bar */ + rc.left = c.rcView.left - editor->selofs; + rc.top = c.rcView.top; + rc.right = c.rcView.left; + rc.bottom = c.rcView.bottom; + if (IntersectRect( &rc, &rc, update )) + PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + } } if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) ME_SendRequestResize(editor, FALSE); @@ -597,22 +605,28 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT if (para->fmt.dwMask & PFM_SPACEBEFORE) { - rc.left = c->rcView.left; - rc.right = c->rcView.right; - rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); - rc.bottom = y + bounds->top + top_border; - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + if (editor_opaque( c->editor )) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.top = y; + rc.bottom = y + bounds->top + top_border; + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } } if (para->fmt.dwMask & PFM_SPACEAFTER) { - rc.left = c->rcView.left; - rc.right = c->rcView.right; - rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); - rc.top = rc.bottom - bounds->bottom - bottom_border; - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + if (editor_opaque( c->editor )) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.bottom = y + para->nHeight; + rc.top = rc.bottom - bounds->bottom - bottom_border; + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -730,7 +744,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) + if (width && editor_opaque( c->editor )) PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. @@ -973,7 +987,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) + if (editor_opaque( c->editor ) && visible) PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { @@ -982,7 +996,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) RECT after_bdr = rc; after_bdr.left = rc.right + bounds.right; after_bdr.right = c->rcView.right; - if (RectVisible(c->hDC, &after_bdr)) + if (editor_opaque( c->editor ) && RectVisible( c->hDC, &after_bdr )) PatBlt(c->hDC, after_bdr.left, after_bdr.top, after_bdr.right - after_bdr.left, after_bdr.bottom - after_bdr.top, PATCOPY); } @@ -1035,7 +1049,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) no++; } - if (para_cell( para )) + if (editor_opaque( c->editor ) && para_cell( para )) { /* Clear any space at the bottom of the cell after the text. */ rc.top = c->pt.y + para->pt.y + para->nHeight;

1 0

Huw Davies : riched20: Don't invalidate while inside TxDraw().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: aae4fa9b1cdf0012a3fc07c553b08ea211fa03b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4fa9b1cdf0012a3fc07c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:27 2021 +0000 riched20: Don't invalidate while inside TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/wrap.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 929e10a3179..bf713880f8f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -202,7 +202,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) DECLSPEC_HIDDEN; +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) DECLSPEC_HIDDEN; /* para.c */ void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6ef7b7ef029..79ade0f6117 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -192,7 +192,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (rewrap) { editor_mark_rewrap_all( services->editor ); - wrap_marked_paras_dc( services->editor, dc ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); } editor_draw( services->editor, dc, update ); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 468b267ceae..9456d54d815 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1020,7 +1020,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) { ME_Paragraph *para, *next; struct wine_rb_entry *entry, *next_entry = NULL; @@ -1086,7 +1086,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) ME_DestroyContext(&c); - if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + if (invalidate && (repaint.start || editor->nTotalLength < editor->nLastTotalLength)) para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } @@ -1094,7 +1094,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) BOOL ME_WrapMarkedParagraphs( ME_TextEditor *editor ) { HDC hdc = ITextHost_TxGetDC( editor->texthost ); - BOOL ret = wrap_marked_paras_dc( editor, hdc ); + BOOL ret = wrap_marked_paras_dc( editor, hdc, TRUE ); ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; }

1 0

Huw Davies : riched20: Implement TxGetNaturalSize().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e7b42deaf2a18e32313e2da02566905180986760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b42deaf2a18e32313e2da0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:28 2021 +0000 riched20: Implement TxGetNaturalSize(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 6 +++--- dlls/riched20/txtsrv.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 7ca6074587d..3cfd5e63753 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,7 +705,7 @@ static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hd expected_width = expected_rect.right - expected_rect.left; expected_height = expected_rect.bottom - expected_rect.top; ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); - ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + todo_wine ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", height, expected_height); @@ -717,7 +717,7 @@ static void test_TxGetNaturalSize(void) ITextHost *host; HRESULT result; SIZEL extent; - static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + static const WCHAR test_text[] = L"TestSomeText"; LONG width, height; HDC hdcDraw; HWND hwnd; @@ -752,7 +752,7 @@ static void test_TxGetNaturalSize(void) height = 0; result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &extent, &width, &height); - todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); ReleaseDC(hwnd, hdcDraw); DestroyWindow(hwnd); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 79ade0f6117..5736964c1b1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -366,14 +366,43 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *ifa } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize(ITextServices *iface, DWORD dwAspect, HDC hdcDraw, - HDC hicTargetDev, DVTARGETDEVICE *ptd, DWORD dwMode, - const SIZEL *psizelExtent, LONG *pwidth, LONG *pheight) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, + HDC target, DVTARGETDEVICE *td, DWORD mode, + const SIZEL *extent, LONG *width, LONG *height ) { struct text_services *services = impl_from_ITextServices( iface ); + RECT rect; + HDC dc = draw; + BOOL rewrap = FALSE; + HRESULT hr; - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p: aspect %d, draw %p, target %p, td %p, mode %08x, extent %s, *width %d, *height %d\n", services, + aspect, draw, target, td, mode, wine_dbgstr_point( (POINT *)extent ), *width, *height ); + + if (aspect != DVASPECT_CONTENT || target || td || mode != TXTNS_FITTOCONTENT ) + FIXME( "Many arguments are ignored\n" ); + + SetRect( &rect, 0, 0, *width, *height ); + + hr = update_client_rect( services, &rect ); + if (FAILED( hr )) return hr; + if (hr == S_OK) rewrap = TRUE; + + if (!dc && services->editor->in_place_active) + dc = ITextHost_TxGetDC( services->host ); + if (!dc) return E_FAIL; + + if (rewrap) + { + editor_mark_rewrap_all( services->editor ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); + } + + *width = services->editor->nTotalWidth; + *height = services->editor->nTotalLength; + + if (!draw) ITextHost_TxReleaseDC( services->host, dc ); + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8)

1 0

Nikolay Sivov : mfplat: Implement Lock2D()/Unlock2D() for d3d11 buffer.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 9932a1943b2091d7b1f9df35aabde5901665c71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9932a1943b2091d7b1f9df35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:31 2021 +0300 mfplat: Implement Lock2D()/Unlock2D() for d3d11 buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 127 +++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 72 +++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9932a1943b2091d7b1f9…

1 0

Jacek Caban : jscript: Fallback to begin of input in script_parse if error location was not recorded.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: bb61c8d338c825c31057014b3c46d322f402ec27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb61c8d338c825c31057014b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 16:41:45 2021 +0100 jscript: Fallback to begin of input in script_parse if error location was not recorded. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 716c9688201..bfc83912ba1 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1595,7 +1595,8 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_clear(mark); hres = parser_ctx->hres; if(FAILED(hres)) { - const WCHAR *line_start = code->source + parser_ctx->error_loc, *line_end = line_start; + unsigned int error_loc = parser_ctx->error_loc == -1 ? 0 : parser_ctx->error_loc; + const WCHAR *line_start = code->source + error_loc, *line_end = line_start; jsstr_t *line_str; while(line_start > code->source && line_start[-1] != '\n') @@ -1609,7 +1610,7 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco debugstr_jsstr(line_str)); throw_error(ctx, hres, NULL); - set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR, line_str); + set_error_location(ctx->ei, code, error_loc, IDS_COMPILATION_ERROR, line_str); parser_release(parser_ctx); if(line_str) jsstr_release(line_str);

1 0

Gijs Vermeulen : sapi/tests: Remove SpResourceManager refcount tests.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 55e834948cb21dc400411448abc44c37fc5dc509 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e834948cb21dc400411448… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Mar 24 18:16:26 2021 +0100 sapi/tests: Remove SpResourceManager refcount tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50841 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/resource.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/sapi/tests/resource.c b/dlls/sapi/tests/resource.c index cbddaf6323a..0c4bd5bc783 100644 --- a/dlls/sapi/tests/resource.c +++ b/dlls/sapi/tests/resource.c @@ -25,15 +25,6 @@ #include "wine/test.h" -#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) -static void _expect_ref(IUnknown *obj, ULONG ref, int line) -{ - ULONG rc; - IUnknown_AddRef(obj); - rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); -} - static void test_interfaces(void) { ISpResourceManager *resource_manager, *resource_manager2; @@ -44,25 +35,21 @@ static void test_interfaces(void) hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); - EXPECT_REF(resource_manager, 1); + ok(!!resource_manager, "Expected non-NULL resource manager.\n"); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager2); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); + ok(!!resource_manager2, "Expected non-NULL resource manager.\n"); todo_wine ok(resource_manager2 == resource_manager, "Expected managers to match.\n"); - todo_wine EXPECT_REF(resource_manager2, 2); - todo_wine EXPECT_REF(resource_manager, 2); - if (resource_manager2 == resource_manager) ISpResourceManager_Release(resource_manager2); - EXPECT_REF(resource_manager, 1); + ISpResourceManager_Release(resource_manager2); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); + ok(!!unk, "Expected non-NULL unk.\n"); todo_wine ok(unk == (IUnknown *)resource_manager, "Expected unk to match existing manager.\n"); - todo_wine EXPECT_REF(unk, 2); - todo_wine EXPECT_REF(resource_manager, 2); - if (unk == (IUnknown *)resource_manager) IUnknown_Release(unk); - EXPECT_REF(resource_manager, 1); + IUnknown_Release(unk); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IDispatch, (void **)&dispatch);

1 0

Jacek Caban : winmm: Use nameless unions.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 19ca8c7f30c48f7eebea9267a763f24f48ec0c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ca8c7f30c48f7eebea9267… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:02 2021 +0100 winmm: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/lolvldrv.c | 4 ++-- dlls/winmm/waveform.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index d003a53afe4..c05115d5c58 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_WINMM_ -DWINE_NO_NAMELESS_EXTENSION +EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32 diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index d5efc7f6b9f..d3bd5536976 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -532,10 +532,10 @@ static void MMDRV_Init(void) goto exit; } - size = WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, + size = WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, NULL, 0, NULL, NULL); drvA = HeapAlloc(GetProcessHeap(), 0, size); - WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, drvA, size, NULL, NULL); MMDRV_Install(drvA, drvA, FALSE); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 37dfc919174..1159b48b483 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -422,7 +422,7 @@ static HRESULT WINMM_GetFriendlyName(IMMDevice *device, WCHAR *out, return hr; } - lstrcpynW(out, var.u.pwszVal, outlen); + lstrcpynW(out, var.pwszVal, outlen); PropVariantClear(&var); @@ -2368,7 +2368,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) return MMSYSERR_ERROR; } - len_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + len_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); if(info->str){ if(len_bytes > *info->len_bytes){ @@ -2378,7 +2378,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) return MMSYSERR_INVALPARAM; } - memcpy(info->str, pv.u.pwszVal, len_bytes); + memcpy(info->str, pv.pwszVal, len_bytes); }else *info->len_bytes = len_bytes;

1 0

Jacek Caban : winepulse: Use nameless unions.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: ac23adbdece2cf6c38bf1db96d101e3f62af8d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac23adbdece2cf6c38bf1db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:20 2021 +0100 winepulse: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 1 - dlls/winepulse.drv/mmdevdrv.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index 3082ed8a69e..d6600632360 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winepulse.drv IMPORTS = dxguid uuid winmm user32 advapi32 ole32 EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(PULSE_CFLAGS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ mmdevdrv.c diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 10b01868a9d..ea739affb2f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -3704,9 +3704,9 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { out->vt = VT_UI4; - out->u.ulVal = g_phys_speakers_mask; + out->ulVal = g_phys_speakers_mask; - return out->u.ulVal ? S_OK : E_FAIL; + return out->ulVal ? S_OK : E_FAIL; } return E_NOTIMPL;

1 0

Jacek Caban : winealsa: Use nameless unions.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 1610c80a397c351da10005107fe7f80a6ada66c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1610c80a397c351da1000510… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:41 2021 +0100 winealsa: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 1 - dlls/winealsa.drv/mmdevdrv.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index d14a0628076..3158371a64f 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winealsa.drv IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ midi.c \ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cf2edcc7454..5f7d277ce9a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -4324,15 +4324,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; out->vt = VT_LPWSTR; - out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); + out->pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); - if(!out->u.pwszVal) + if(!out->pwszVal) return E_OUTOFMEMORY; if(connection == AudioDeviceConnectionType_USB) - sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); + sprintfW( out->pwszVal, usbformatW, vendor_id, product_id, device, serial_number); else if(connection == AudioDeviceConnectionType_PCI) - sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); + sprintfW( out->pwszVal, pciformatW, vendor_id, product_id, device, serial_number); return S_OK; } @@ -4356,15 +4356,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI out->vt = VT_UI4; if (num_speakers > 6) - out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + out->ulVal = KSAUDIO_SPEAKER_STEREO; else if (num_speakers == 6) - out->u.ulVal = KSAUDIO_SPEAKER_5POINT1; + out->ulVal = KSAUDIO_SPEAKER_5POINT1; else if (num_speakers >= 4) - out->u.ulVal = KSAUDIO_SPEAKER_QUAD; + out->ulVal = KSAUDIO_SPEAKER_QUAD; else if (num_speakers >= 2) - out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + out->ulVal = KSAUDIO_SPEAKER_STEREO; else if (num_speakers == 1) - out->u.ulVal = KSAUDIO_SPEAKER_MONO; + out->ulVal = KSAUDIO_SPEAKER_MONO; return S_OK; }

1 0