February 2019 - Wine-Devel - list.winehq.org

[PATCH] windowscodecs: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_INVALIDARG if ret_len is NULL. dlls/windowscodecs/metadataquery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index c4c188d8c9..0a44c1e5c8 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -925,7 +925,7 @@ HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - if (ret_len) *ret_len = lstrlenW(name2schema[i].name) + 1; + *ret_len = lstrlenW(name2schema[i].name) + 1; return S_OK; } } -- 2.20.1

2 1

[PATCH] gdiplus: Remove useless casts to self
by Michael Stefaniuc Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/metafile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1e48d07703..b65e456c05 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3103,7 +3103,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3151,7 +3151,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3216,7 +3216,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3255,7 +3255,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; -- 2.20.1

2 1

[PATCH 1/2] vbscript: Allow most keywords to be used as 'dot' identifiers.
by Brendan McGrath Feb. 28, 2019

Feb. 28, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- The added keywords are based on the documentation found at: https://rosettacode.org/wiki/BNF_Grammar#VBScript There appears to be special code for the 'rem' keyword, so I couldn't get that to work (there's a TODO test in the next patch if it's wanted). That page also listed the following keywords (which we don't have): - Erase - Preserve - Redim - With But did not mention these (which we do have): - Stop - Me I'm not sure how accurate that site is so I've added a test for every keyword I added to make sure they work on Windows. dlls/vbscript/parser.y | 86 +++++++++++++++++---- dlls/vbscript/tests/lang.vbs | 55 +++++++++++++ dlls/vbscript/tests/run.c | 144 ++++++++++++++++++++++++++++++++--- 3 files changed, 258 insertions(+), 27 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b81d7919662..52c98fca596 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -102,20 +102,21 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEOF tNL tREM tEMPTYBRACKETS -%token tTRUE tFALSE -%token tNOT tAND tOR tXOR tEQV tIMP tNEQ -%token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST -%token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN -%token tSELECT tCASE -%token tBYREF tBYVAL -%token tOPTION -%token tSTOP -%token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME -%token tNEXT tON tRESUME tGOTO +%token tEOF tNL tEMPTYBRACKETS +%token tLTEQ tGTEQ tNEQ +%token tSTOP tME tREM +%token <string> tTRUE tFALSE +%token <string> tNOT tAND tOR tXOR tEQV tIMP +%token <string> tIS tMOD +%token <string> tCALL tDIM tSUB tFUNCTION tGET tLET tCONST +%token <string> tIF tELSE tELSEIF tEND tTHEN tEXIT +%token <string> tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN +%token <string> tSELECT tCASE +%token <string> tBYREF tBYVAL +%token <string> tOPTION +%token <string> tNOTHING tEMPTY tNULL +%token <string> tCLASS tSET tNEW tPUBLIC tPRIVATE +%token <string> tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort @@ -137,7 +138,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <dim_decl> DimDeclList DimDecl %type <dim_list> DimList %type <const_decl> ConstDecl ConstDeclList -%type <string> Identifier +%type <string> Identifier DotIdentifier %type <case_clausule> CaseClausules %% @@ -209,7 +210,7 @@ SimpleStatement MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - | CallExpression '.' Identifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } + | CallExpression '.' DotIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } DimDeclList : DimDecl { $$ = $1; } @@ -451,6 +452,59 @@ Identifier | tPROPERTY { $$ = $1; } | tSTEP { $$ = $1; } +/* most keywords can be an identifier after a dot */ +DotIdentifier + : Identifier { $$ = $1; } + | tTRUE { $$ = $1; } + | tFALSE { $$ = $1; } + | tNOT { $$ = $1; } + | tAND { $$ = $1; } + | tOR { $$ = $1; } + | tXOR { $$ = $1; } + | tEQV { $$ = $1; } + | tIMP { $$ = $1; } + | tIS { $$ = $1; } + | tMOD { $$ = $1; } + | tCALL { $$ = $1; } + | tDIM { $$ = $1; } + | tSUB { $$ = $1; } + | tFUNCTION { $$ = $1; } + | tGET { $$ = $1; } + | tLET { $$ = $1; } + | tCONST { $$ = $1; } + | tIF { $$ = $1; } + | tELSE { $$ = $1; } + | tELSEIF { $$ = $1; } + | tEND { $$ = $1; } + | tTHEN { $$ = $1; } + | tEXIT { $$ = $1; } + | tWHILE { $$ = $1; } + | tWEND { $$ = $1; } + | tDO { $$ = $1; } + | tLOOP { $$ = $1; } + | tUNTIL { $$ = $1; } + | tFOR { $$ = $1; } + | tTO { $$ = $1; } + | tEACH { $$ = $1; } + | tIN { $$ = $1; } + | tSELECT { $$ = $1; } + | tCASE { $$ = $1; } + | tBYREF { $$ = $1; } + | tBYVAL { $$ = $1; } + | tOPTION { $$ = $1; } + | tNOTHING { $$ = $1; } + | tEMPTY { $$ = $1; } + | tNULL { $$ = $1; } + | tCLASS { $$ = $1; } + | tSET { $$ = $1; } + | tNEW { $$ = $1; } + | tPUBLIC { $$ = $1; } + | tPRIVATE { $$ = $1; } + | tNEXT { $$ = $1; } + | tON { $$ = $1; } + | tRESUME { $$ = $1; } + | tGOTO { $$ = $1; } + /* Most statements accept both new line and ':' as separators */ StSep : tNL diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 15ad84a23ac..098506402bc 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1365,4 +1365,59 @@ sub test_identifiers end sub call test_identifiers() +sub test_dotIdentifiers + ' test keywords that can also be an indentifier after a dot + ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") + Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") + Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10") + Call ok(testObj.not = 10, "testObj.not = " & testObj.not & " expected 10") + Call ok(testObj.and = 10, "testObj.and = " & testObj.and & " expected 10") + Call ok(testObj.or = 10, "testObj.or = " & testObj.or & " expected 10") + Call ok(testObj.xor = 10, "testObj.xor = " & testObj.xor & " expected 10") + Call ok(testObj.eqv = 10, "testObj.eqv = " & testObj.eqv & " expected 10") + Call ok(testObj.imp = 10, "testObj.imp = " & testObj.imp & " expected 10") + Call ok(testObj.is = 10, "testObj.is = " & testObj.is & " expected 10") + Call ok(testObj.mod = 10, "testObj.mod = " & testObj.mod & " expected 10") + Call ok(testObj.call = 10, "testObj.call = " & testObj.call & " expected 10") + Call ok(testObj.dim = 10, "testObj.dim = " & testObj.dim & " expected 10") + Call ok(testObj.sub = 10, "testObj.sub = " & testObj.sub & " expected 10") + Call ok(testObj.function = 10, "testObj.function = " & testObj.function & " expected 10") + Call ok(testObj.get = 10, "testObj.get = " & testObj.get & " expected 10") + Call ok(testObj.let = 10, "testObj.let = " & testObj.let & " expected 10") + Call ok(testObj.const = 10, "testObj.const = " & testObj.const & " expected 10") + Call ok(testObj.if = 10, "testObj.if = " & testObj.if & " expected 10") + Call ok(testObj.else = 10, "testObj.else = " & testObj.else & " expected 10") + Call ok(testObj.elseif = 10, "testObj.elseif = " & testObj.elseif & " expected 10") + Call ok(testObj.end = 10, "testObj.end = " & testObj.end & " expected 10") + Call ok(testObj.then = 10, "testObj.then = " & testObj.then & " expected 10") + Call ok(testObj.exit = 10, "testObj.exit = " & testObj.exit & " expected 10") + Call ok(testObj.while = 10, "testObj.while = " & testObj.while & " expected 10") + Call ok(testObj.wend = 10, "testObj.wend = " & testObj.wend & " expected 10") + Call ok(testObj.do = 10, "testObj.do = " & testObj.do & " expected 10") + Call ok(testObj.loop = 10, "testObj.loop = " & testObj.loop & " expected 10") + Call ok(testObj.until = 10, "testObj.until = " & testObj.until & " expected 10") + Call ok(testObj.for = 10, "testObj.for = " & testObj.for & " expected 10") + Call ok(testObj.to = 10, "testObj.to = " & testObj.to & " expected 10") + Call ok(testObj.each = 10, "testObj.each = " & testObj.each & " expected 10") + Call ok(testObj.in = 10, "testObj.in = " & testObj.in & " expected 10") + Call ok(testObj.select = 10, "testObj.select = " & testObj.select & " expected 10") + Call ok(testObj.case = 10, "testObj.case = " & testObj.case & " expected 10") + Call ok(testObj.byref = 10, "testObj.byref = " & testObj.byref & " expected 10") + Call ok(testObj.byval = 10, "testObj.byval = " & testObj.byval & " expected 10") + Call ok(testObj.option = 10, "testObj.option = " & testObj.option & " expected 10") + Call ok(testObj.nothing = 10, "testObj.nothing = " & testObj.nothing & " expected 10") + Call ok(testObj.empty = 10, "testObj.empty = " & testObj.empty & " expected 10") + Call ok(testObj.null = 10, "testObj.null = " & testObj.null & " expected 10") + Call ok(testObj.class = 10, "testObj.class = " & testObj.class & " expected 10") + Call ok(testObj.set = 10, "testObj.set = " & testObj.set & " expected 10") + Call ok(testObj.new = 10, "testObj.new = " & testObj.new & " expected 10") + Call ok(testObj.public = 10, "testObj.public = " & testObj.public & " expected 10") + Call ok(testObj.private = 10, "testObj.private = " & testObj.private & " expected 10") + Call ok(testObj.next = 10, "testObj.next = " & testObj.next & " expected 10") + Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10") + Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") + Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") +end sub +'call test_dotIdentifiers + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 191f5a79a0d..a28cf74196b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -58,6 +58,9 @@ extern const CLSID CLSID_VBScriptRegExp; #define SET_EXPECT(func) \ expect_ ## func = TRUE +#define REF_EXPECT(func) \ + (&expect_ ## func), (&called_ ## func) + #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ @@ -127,6 +130,56 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 +#define DISPID_TESTOBJ_REM 2002 +#define DISPID_TESTOBJ_TRUE 2003 +#define DISPID_TESTOBJ_FALSE 2004 +#define DISPID_TESTOBJ_NOT 2005 +#define DISPID_TESTOBJ_AND 2006 +#define DISPID_TESTOBJ_OR 2007 +#define DISPID_TESTOBJ_XOR 2008 +#define DISPID_TESTOBJ_EQV 2009 +#define DISPID_TESTOBJ_IMP 2010 +#define DISPID_TESTOBJ_IS 2011 +#define DISPID_TESTOBJ_MOD 2012 +#define DISPID_TESTOBJ_CALL 2013 +#define DISPID_TESTOBJ_DIM 2014 +#define DISPID_TESTOBJ_SUB 2015 +#define DISPID_TESTOBJ_FUNCTION 2016 +#define DISPID_TESTOBJ_GET 2017 +#define DISPID_TESTOBJ_LET 2018 +#define DISPID_TESTOBJ_CONST 2019 +#define DISPID_TESTOBJ_IF 2020 +#define DISPID_TESTOBJ_ELSE 2021 +#define DISPID_TESTOBJ_ELSEIF 2022 +#define DISPID_TESTOBJ_END 2023 +#define DISPID_TESTOBJ_THEN 2024 +#define DISPID_TESTOBJ_EXIT 2025 +#define DISPID_TESTOBJ_WHILE 2026 +#define DISPID_TESTOBJ_WEND 2027 +#define DISPID_TESTOBJ_DO 2028 +#define DISPID_TESTOBJ_LOOP 2029 +#define DISPID_TESTOBJ_UNTIL 2030 +#define DISPID_TESTOBJ_FOR 2031 +#define DISPID_TESTOBJ_TO 2032 +#define DISPID_TESTOBJ_EACH 2033 +#define DISPID_TESTOBJ_IN 2034 +#define DISPID_TESTOBJ_SELECT 2035 +#define DISPID_TESTOBJ_CASE 2036 +#define DISPID_TESTOBJ_BYREF 2037 +#define DISPID_TESTOBJ_BYVAL 2038 +#define DISPID_TESTOBJ_OPTION 2039 +#define DISPID_TESTOBJ_NOTHING 2040 +#define DISPID_TESTOBJ_EMPTY 2041 +#define DISPID_TESTOBJ_NULL 2042 +#define DISPID_TESTOBJ_CLASS 2043 +#define DISPID_TESTOBJ_SET 2044 +#define DISPID_TESTOBJ_NEW 2045 +#define DISPID_TESTOBJ_PUBLIC 2046 +#define DISPID_TESTOBJ_PRIVATE 2047 +#define DISPID_TESTOBJ_NEXT 2048 +#define DISPID_TESTOBJ_ON 2049 +#define DISPID_TESTOBJ_RESUME 2050 +#define DISPID_TESTOBJ_GOTO 2051 #define DISPID_COLLOBJ_RESET 3000 @@ -756,17 +809,80 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "propget")) { - CHECK_EXPECT(testobj_propget_d); - test_grfdex(grfdex, fdexNameCaseInsensitive); - *pid = DISPID_TESTOBJ_PROPGET; - return S_OK; - } - if(!strcmp_wa(bstrName, "propput")) { - CHECK_EXPECT(testobj_propput_d); - test_grfdex(grfdex, fdexNameCaseInsensitive); - *pid = DISPID_TESTOBJ_PROPPUT; - return S_OK; + typedef struct { + const char * const name; + DISPID pid; + BOOL *expect; + BOOL *called; + } dispid_t; + + dispid_t dispids[] = { + { "propget", DISPID_TESTOBJ_PROPGET, REF_EXPECT(testobj_propget_d) }, + { "propput", DISPID_TESTOBJ_PROPPUT, REF_EXPECT(testobj_propput_d) }, + { "rem", DISPID_TESTOBJ_REM, NULL }, + { "true", DISPID_TESTOBJ_TRUE, NULL }, + { "false", DISPID_TESTOBJ_FALSE, NULL }, + { "not", DISPID_TESTOBJ_NOT, NULL }, + { "and", DISPID_TESTOBJ_AND, NULL }, + { "or", DISPID_TESTOBJ_OR, NULL }, + { "xor", DISPID_TESTOBJ_XOR, NULL }, + { "eqv", DISPID_TESTOBJ_EQV, NULL }, + { "imp", DISPID_TESTOBJ_IMP, NULL }, + { "is", DISPID_TESTOBJ_IS, NULL }, + { "mod", DISPID_TESTOBJ_MOD, NULL }, + { "call", DISPID_TESTOBJ_CALL, NULL }, + { "dim", DISPID_TESTOBJ_DIM, NULL }, + { "sub", DISPID_TESTOBJ_SUB, NULL }, + { "function", DISPID_TESTOBJ_FUNCTION, NULL }, + { "get", DISPID_TESTOBJ_GET, NULL }, + { "let", DISPID_TESTOBJ_LET, NULL }, + { "const", DISPID_TESTOBJ_CONST, NULL }, + { "if", DISPID_TESTOBJ_IF, NULL }, + { "else", DISPID_TESTOBJ_ELSE, NULL }, + { "elseif", DISPID_TESTOBJ_ELSEIF, NULL }, + { "end", DISPID_TESTOBJ_END, NULL }, + { "then", DISPID_TESTOBJ_THEN, NULL }, + { "exit", DISPID_TESTOBJ_EXIT, NULL }, + { "while", DISPID_TESTOBJ_WHILE, NULL }, + { "wend", DISPID_TESTOBJ_WEND, NULL }, + { "do", DISPID_TESTOBJ_DO, NULL }, + { "loop", DISPID_TESTOBJ_LOOP, NULL }, + { "until", DISPID_TESTOBJ_UNTIL, NULL }, + { "for", DISPID_TESTOBJ_FOR, NULL }, + { "to", DISPID_TESTOBJ_TO, NULL }, + { "each", DISPID_TESTOBJ_EACH, NULL }, + { "in", DISPID_TESTOBJ_IN, NULL }, + { "select", DISPID_TESTOBJ_SELECT, NULL }, + { "case", DISPID_TESTOBJ_CASE, NULL }, + { "byref", DISPID_TESTOBJ_BYREF, NULL }, + { "byval", DISPID_TESTOBJ_BYVAL, NULL }, + { "option", DISPID_TESTOBJ_OPTION, NULL }, + { "nothing", DISPID_TESTOBJ_NOTHING, NULL }, + { "empty", DISPID_TESTOBJ_EMPTY, NULL }, + { "null", DISPID_TESTOBJ_NULL, NULL }, + { "class", DISPID_TESTOBJ_CLASS, NULL }, + { "set", DISPID_TESTOBJ_SET, NULL }, + { "new", DISPID_TESTOBJ_NEW, NULL }, + { "public", DISPID_TESTOBJ_PUBLIC, NULL }, + { "private", DISPID_TESTOBJ_PRIVATE, NULL }, + { "next", DISPID_TESTOBJ_NEXT, NULL }, + { "on", DISPID_TESTOBJ_ON, NULL }, + { "resume", DISPID_TESTOBJ_RESUME, NULL }, + { "goto", DISPID_TESTOBJ_GOTO, NULL }, + }; + + for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + if(!strcmp_wa(bstrName, dispids[i].name)) { + dispid_t *d = &dispids[i]; + if(d->expect) { + ok(*d->expect, "unexpected call %s\n", d->name); + *d->called = TRUE; + *d->expect = FALSE; + } + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = d->pid; + return S_OK; + } } ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); @@ -833,6 +949,12 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + if (id >= DISPID_TESTOBJ_REM && id <= DISPID_TESTOBJ_GOTO) { + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; + } + ok(0, "unexpected call %d\n", id); return E_FAIL; } -- 2.17.1

3 12

[PATCH] xaudio2: IXAPO::Process out parameter should not be const
by Andrew Eikum Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xapo.c | 2 +- include/xapo.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index ccad417ea5..3ccb3f190b 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -175,7 +175,7 @@ static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) static void WINAPI XAPOFX_Process(IXAPO *iface, UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) + XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) { XA2XAPOFXImpl *This = impl_from_IXAPO(iface); TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, diff --git a/include/xapo.idl b/include/xapo.idl index 9c3ad15134..7b28ac9f43 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -118,7 +118,7 @@ interface IXAPO : IUnknown void UnlockForProcess(void); void Process(UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, + UINT32 out_params_count, XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled); UINT32 CalcInputFrames(UINT32 output_frames); -- 2.21.0

2 1

[PATCH] xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters
by elee＠codeweavers.com Feb. 28, 2019

Feb. 28, 2019

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 222 +++++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 4 + dlls/xaudio2_7/xaudio_private.h | 4 + include/xaudio2.idl | 61 +++++++++ 4 files changed, 286 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index bc33cb92ed..c4538ae367 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -2488,6 +2488,222 @@ const IXAudio22Vtbl XAudio22_Vtbl = { XA22_SetDebugConfiguration }; +#elif XAUDIO2_VER <= 3 + +static inline IXAudio2Impl *impl_from_IXAudio23(IXAudio23 *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23_iface); +} + +static HRESULT WINAPI XA23_QueryInterface(IXAudio23 *iface, REFIID riid, + void **ppvObject) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_QueryInterface(&This->IXAudio2_iface, riid, ppvObject); +} + +static ULONG WINAPI XA23_AddRef(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_AddRef(&This->IXAudio2_iface); +} + +static ULONG WINAPI XA23_Release(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_Release(&This->IXAudio2_iface); +} + +static HRESULT WINAPI XA23_GetDeviceCount(IXAudio23 *iface, UINT32 *pCount) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("%p, %p\n", This, pCount); + return FAudio_GetDeviceCount(This->faudio, pCount); +} + +static HRESULT WINAPI XA23_GetDeviceDetails(IXAudio23 *iface, UINT32 index, + XAUDIO2_DEVICE_DETAILS *pDeviceDetails) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("%p, %u, %p\n", This, index, pDeviceDetails); + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); +} + +static HRESULT WINAPI XA23_Initialize(IXAudio23 *iface, UINT32 flags, + XAUDIO2_PROCESSOR processor) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); + return xaudio2_initialize(This, flags, processor); +} + +static HRESULT WINAPI XA23_RegisterForCallbacks(IXAudio23 *iface, + IXAudio2EngineCallback *pCallback) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_RegisterForCallbacks(&This->IXAudio2_iface, pCallback); +} + +static void WINAPI XA23_UnregisterForCallbacks(IXAudio23 *iface, + IXAudio2EngineCallback *pCallback) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + IXAudio2_UnregisterForCallbacks(&This->IXAudio2_iface, pCallback); +} + +static HRESULT WINAPI XA23_CreateSourceVoice(IXAudio23 *iface, + IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, + UINT32 flags, float maxFrequencyRatio, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, + pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; +} + +static HRESULT WINAPI XA23_CreateSubmixVoice(IXAudio23 *iface, + IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, + const XAUDIO23_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, + pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; +} + +static HRESULT WINAPI XA23_CreateMasteringVoice(IXAudio23 *iface, + IXAudio2MasteringVoice **ppMasteringVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 deviceIndex, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + + TRACE("(%p)->(%p, %u, %u, 0x%x, %u, %p)\n", This, ppMasteringVoice, + inputChannels, inputSampleRate, flags, deviceIndex, + pEffectChain); + + EnterCriticalSection(&This->lock); + + /* XAUDIO2_VER == 3 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; +} + +static HRESULT WINAPI XA23_StartEngine(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_StartEngine(&This->IXAudio2_iface); +} + +static void WINAPI XA23_StopEngine(IXAudio23 *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_StopEngine(&This->IXAudio2_iface); +} + +static HRESULT WINAPI XA23_CommitChanges(IXAudio23 *iface, UINT32 operationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_CommitChanges(&This->IXAudio2_iface, operationSet); +} + +static void WINAPI XA23_GetPerformanceData(IXAudio23 *iface, + XAUDIO2_PERFORMANCE_DATA *pPerfData) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_GetPerformanceData(&This->IXAudio2_iface, pPerfData); +} + +static void WINAPI XA23_SetDebugConfiguration(IXAudio23 *iface, + const XAUDIO2_DEBUG_CONFIGURATION *pDebugConfiguration, + void *pReserved) +{ + IXAudio2Impl *This = impl_from_IXAudio23(iface); + return IXAudio2_SetDebugConfiguration(&This->IXAudio2_iface, + pDebugConfiguration, pReserved); +} + +const IXAudio23Vtbl XAudio23_Vtbl = { + XA23_QueryInterface, + XA23_AddRef, + XA23_Release, + XA23_GetDeviceCount, + XA23_GetDeviceDetails, + XA23_Initialize, + XA23_RegisterForCallbacks, + XA23_UnregisterForCallbacks, + XA23_CreateSourceVoice, + XA23_CreateSubmixVoice, + XA23_CreateMasteringVoice, + XA23_StartEngine, + XA23_StopEngine, + XA23_CommitChanges, + XA23_GetPerformanceData, + XA23_SetDebugConfiguration +}; + #elif XAUDIO2_VER <= 7 static inline IXAudio2Impl *impl_from_IXAudio27(IXAudio27 *iface) @@ -2588,12 +2804,8 @@ static HRESULT WINAPI XA27_CreateMasteringVoice(IXAudio27 *iface, EnterCriticalSection(&This->lock); - /* 3 <= XAUDIO2_VER <= 7 */ -#if XAUDIO2_VER == 3 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; -#else + /* 4 <= XAUDIO2_VER <= 7 */ *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio27MasteringVoice_iface; -#endif EnterCriticalSection(&This->mst.lock); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index f338b56dc9..18306a1603 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1400,6 +1400,8 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, *ppvObject = &This->IXAudio20_iface; #elif XAUDIO2_VER <= 2 *ppvObject = &This->IXAudio22_iface; +#elif XAUDIO2_VER <= 3 + *ppvObject = &This->IXAudio23_iface; #elif XAUDIO2_VER <= 7 *ppvObject = &This->IXAudio27_iface; #else @@ -1902,6 +1904,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio20_iface.lpVtbl = &XAudio20_Vtbl; #elif XAUDIO2_VER <= 2 object->IXAudio22_iface.lpVtbl = &XAudio22_Vtbl; +#elif XAUDIO2_VER <= 3 + object->IXAudio23_iface.lpVtbl = &XAudio23_Vtbl; #elif XAUDIO2_VER <= 7 object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; #endif diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 84bab8257d..46d842bf4c 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -111,6 +111,8 @@ typedef struct _IXAudio2Impl { IXAudio20 IXAudio20_iface; #elif XAUDIO2_VER <= 2 IXAudio22 IXAudio22_iface; +#elif XAUDIO2_VER <= 3 + IXAudio23 IXAudio23_iface; #elif XAUDIO2_VER <= 7 IXAudio27 IXAudio27_iface; #endif @@ -158,6 +160,8 @@ extern XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice * extern const IXAudio20Vtbl XAudio20_Vtbl DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 2 extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; +#elif XAUDIO2_VER <= 3 +extern const IXAudio23Vtbl XAudio23_Vtbl DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 7 extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif diff --git a/include/xaudio2.idl b/include/xaudio2.idl index e97cf9948b..074454d490 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1050,6 +1050,67 @@ interface IXAudio22 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +[ + object, + uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb), /* all versions before 28 share IID_IXAudio */ +] +/* XAudio2 2.3's IXAudio2 interface. Actually called IXAudio2 in the Nov 2008 + * DX SDK */ +interface IXAudio23 : IUnknown +{ + HRESULT GetDeviceCount([out] UINT32* pCount); + + HRESULT GetDeviceDetails( + [in] UINT32 Index, + [out] XAUDIO2_DEVICE_DETAILS* pDeviceDetails); + + HRESULT Initialize( + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(XAUDIO2_DEFAULT_PROCESSOR)] XAUDIO2_PROCESSOR XAudio2Processor); + + HRESULT RegisterForCallbacks([in] IXAudio2EngineCallback* pCallback); + + void UnregisterForCallbacks([in] IXAudio2EngineCallback* pCallback); + + HRESULT CreateSourceVoice( + [out] IXAudio2SourceVoice** ppSourceVoice, + [in] const WAVEFORMATEX* pSourceFormat, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, + [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT CreateSubmixVoice( + [out] IXAudio2SubmixVoice** ppSubmixVoice, + [in] UINT32 InputChannels, + [in] UINT32 InputSampleRate, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(0)] UINT32 ProcessingStage, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT CreateMasteringVoice( + [out] IXAudio2MasteringVoice** ppMasteringVoice, + [in, defaultvalue(XAUDIO2_DEFAULT_CHANNELS)] UINT32 InputChannels, + [in, defaultvalue(XAUDIO2_DEFAULT_SAMPLERATE)] UINT32 InputSampleRate, + [in, defaultvalue(0)] UINT32 Flags, + [in, defaultvalue(0)] UINT32 DeviceIndex, + [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); + + HRESULT StartEngine(); + + void StopEngine(); + + HRESULT CommitChanges([in] UINT32 OperationSet); + + void GetPerformanceData([out] XAUDIO2_PERFORMANCE_DATA* pPerfData); + + [local] void SetDebugConfiguration( + [in] const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration, + [in, defaultvalue(NULL)] void* pReserved); +} + [ object, uuid(8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb), -- 2.17.2

3 3

[PATCH] xaudio2: Fix uninitialized variable access (Valgrind)
by elee＠codeweavers.com Feb. 28, 2019

Feb. 28, 2019

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 318f668589..bc33cb92ed 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -923,7 +923,7 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -1483,7 +1483,7 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; TRACE("%p, %p\n", This, pSendList); @@ -2115,7 +2115,7 @@ static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){ @@ -2350,7 +2350,7 @@ static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - XAUDIO2_VOICE_SENDS sends, *psends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; if(pSendList){ -- 2.17.2

3 2

[PATCH] msvcrt: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return MultiByteToWideChar() if wcstr is NULL. dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b22adca1c..1ea8163296 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2395,7 +2395,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, } } - if(size<count && wcstr) + if(size<count) wcstr[size] = '\0'; return size; -- 2.20.1

2 1

[PATCH v3 1/3] comctl32/listbox.c Use helper functions for item initialization.
by Huw Davies Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Sorry, this time with a couple of unused params removed. dlls/comctl32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index f2d0615bda..002501729f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -171,6 +171,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -194,7 +199,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } -static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +static void insert_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; @@ -203,11 +208,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1599,8 +1599,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - insert_item_data(descr, index, str, data); + insert_item_data(descr, index); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */ -- 2.18.0

2 1

[PATCH vkd3d] vkd3d: Use vkCmdResolveImage() to resolve typeless resources if possible.
by Józef Kucia Feb. 28, 2019

Feb. 28, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5b11c3c43d44..4999280a2afc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2855,8 +2855,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_format *src_format, *dst_format, *vk_format; struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkImageResolve vk_image_resolve; @@ -2876,13 +2876,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi d3d12_command_list_end_current_render_pass(list); - if (dxgi_format_is_typeless(dst_resource->desc.Format) - || dxgi_format_is_typeless(src_resource->desc.Format)) - { - FIXME("Not implemented for typeless resources.\n"); - return; - } - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); @@ -2894,6 +2887,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi return; } + if (dxgi_format_is_typeless(dst_resource->desc.Format) || dxgi_format_is_typeless(src_resource->desc.Format)) + { + if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, format))) + { + WARN("Invalid format %#x.\n", format); + return; + } + if (dst_format->vk_format != src_format->vk_format || dst_format->vk_format != vk_format->vk_format) + { + FIXME("Not implemented for typeless resources.\n"); + return; + } + } + /* Resolve of depth/stencil images is not supported in Vulkan. */ if ((dst_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) || (src_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) -- 2.19.2

2 1

[PATCH v3 3/3] comctl32/listbox: Implement LBS_NODATA for multi-selection listboxes
by Huw Davies Feb. 28, 2019

Feb. 28, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Use a byte array to store selection state of items, since we don't need any other data for LBS_NODATA multi-selection listboxes. This improves memory usage dramatically for large lists, and performance boosts are nice too. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 72 +++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 04540ad5d0..bd9cffd1a3 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * TODO: - * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -71,7 +69,11 @@ typedef struct UINT style; /* Window style */ INT width; /* Window width */ INT height; /* Window height */ - LB_ITEMDATA *items; /* Array of items */ + union + { + LB_ITEMDATA *items; /* Array of items */ + BYTE *nodata_items; /* For multi-selection LBS_NODATA */ + } u; INT nb_items; /* Number of items */ UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ @@ -127,9 +129,19 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +/* + For listboxes without LBS_NODATA, an array of LB_ITEMDATA is allocated + to store the states of each item into descr->u.items. + + For single-selection LBS_NODATA listboxes, no storage is allocated, + and thus descr->u.nodata_items will always be NULL. + + For multi-selection LBS_NODATA listboxes, one byte per item is stored + for the item's selection state into descr->u.nodata_items. +*/ static size_t get_sizeof_item( const LB_DESCR *descr ) { - return sizeof(LB_ITEMDATA); + return (descr->style & LBS_NODATA) ? sizeof(BYTE) : sizeof(LB_ITEMDATA); } static BOOL resize_storage(LB_DESCR *descr, UINT items_size) @@ -142,20 +154,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); + items = heap_realloc(descr->u.items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); return FALSE; } - descr->items = items; + descr->u.items = items; } descr->items_size = items_size; } - if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->u.nodata_items && items_size > descr->nb_items) { - memset(&descr->items[descr->nb_items], 0, + memset(descr->u.nodata_items + descr->nb_items, 0, (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; @@ -163,69 +175,75 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].data; } static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].data = data; } static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { - return HAS_STRINGS(descr) ? descr->items[index].str : NULL; + return HAS_STRINGS(descr) ? descr->u.items[index].str : NULL; } static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].str = string; } static UINT get_item_height( const LB_DESCR *descr, UINT index ) { - return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; + return (descr->style & LBS_NODATA) ? 0 : descr->u.items[index].height; } static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) { - if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; + if (!(descr->style & LBS_NODATA)) descr->u.items[index].height = height; } static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) return index == descr->selected_item; - return descr->items[index].selected; + if (descr->style & LBS_NODATA) + return descr->u.nodata_items[index]; + else + return descr->u.items[index].selected; } static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) { if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) - descr->items[index].selected = state; + { + if (descr->style & LBS_NODATA) + descr->u.nodata_items[index] = state; + else + descr->u.items[index].selected = state; + } } static void insert_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * size); + memmove(p + size, p, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { size_t size = get_sizeof_item(descr); - LB_ITEMDATA *item; + BYTE *p = descr->u.nodata_items + index * size; - if (!descr->items) return; + if (!descr->u.items) return; - item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * size); + memmove(p, p + size, (descr->nb_items - index) * size); } /*********************************************************************** @@ -1782,14 +1800,14 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) if (!(descr->style & LBS_NODATA)) for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); - HeapFree( GetProcessHeap(), 0, descr->items ); + HeapFree( GetProcessHeap(), 0, descr->u.items ); descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; descr->items_size = 0; - descr->items = NULL; + descr->u.items = NULL; } @@ -2536,7 +2554,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->style = GetWindowLongW( descr->self, GWL_STYLE ); descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; - descr->items = NULL; + descr->u.items = NULL; descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; -- 2.18.0

1 0