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

Gijs Vermeulen : sapi/tests: Remove SpResourceManager refcount tests.
by Alexandre Julliard March 24, 2021

March 24, 2021

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 : jscript: Fallback to begin of input in script_parse if error location was not recorded.
by Alexandre Julliard March 24, 2021

March 24, 2021

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

Jacek Caban : quartz: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 598a12a9ab4f34385a0b70a76893967430de17c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598a12a9ab4f34385a0b70a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:38:20 2021 +0100 quartz: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/filtermapper.c | 58 +++++++++++++++++++++++----------------------- dlls/quartz/regsvr.c | 4 ++-- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index a03d84a7d13..110377bec79 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,7 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 78353c00534..b3210fdcd59 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -597,24 +597,24 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrf.dwVersion = prf2->dwVersion; rrf.dwMerit = prf2->dwMerit; - rrf.dwPins = prf2->u.s2.cPins2; + rrf.dwPins = prf2->cPins2; rrf.dwUnused = 0; add_data(&mainStore, &rrf, sizeof(rrf)); - for (i = 0; i < prf2->u.s2.cPins2; i++) + for (i = 0; i < prf2->cPins2; i++) { size += sizeof(struct REG_RFP); - if (prf2->u.s2.rgPins2[i].clsPinCategory) + if (prf2->rgPins2[i].clsPinCategory) size += sizeof(DWORD); - size += prf2->u.s2.rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE); - size += prf2->u.s2.rgPins2[i].nMediums * sizeof(DWORD); + size += prf2->rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE); + size += prf2->rgPins2[i].nMediums * sizeof(DWORD); } - for (i = 0; i < prf2->u.s2.cPins2; i++) + for (i = 0; i < prf2->cPins2; i++) { struct REG_RFP rrfp; - REGFILTERPINS2 rgPin2 = prf2->u.s2.rgPins2[i]; + REGFILTERPINS2 rgPin2 = prf2->rgPins2[i]; unsigned int j; rrfp.signature[0] = '0'; @@ -716,9 +716,9 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) prf2->dwVersion = prrf->dwVersion; prf2->dwMerit = prrf->dwMerit; - prf2->u.s2.cPins2 = prrf->dwPins; + prf2->cPins2 = prrf->dwPins; rgPins2 = CoTaskMemAlloc(prrf->dwPins * sizeof(*rgPins2)); - prf2->u.s2.rgPins2 = rgPins2; + prf2->rgPins2 = rgPins2; pCurrent += sizeof(struct REG_RF); for (i = 0; i < prrf->dwPins; i++) @@ -800,20 +800,20 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) static void FM2_DeleteRegFilter(REGFILTER2 * prf2) { UINT i; - for (i = 0; i < prf2->u.s2.cPins2; i++) + for (i = 0; i < prf2->cPins2; i++) { UINT j; - CoTaskMemFree((void*)prf2->u.s2.rgPins2[i].clsPinCategory); + CoTaskMemFree((void*)prf2->rgPins2[i].clsPinCategory); - for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++) + for (j = 0; j < prf2->rgPins2[i].nMediaTypes; j++) { - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMajorType); - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMinorType); + CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMajorType); + CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMinorType); } - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType); - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMedium); + CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType); + CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMedium); } - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2); + CoTaskMemFree((LPVOID)prf2->rgPins2); } static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, @@ -848,24 +848,24 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, /* REGFILTER2 structure is converted from version 1 to 2. Tested on Win2k. */ regfilter2.dwVersion = 2; regfilter2.dwMerit = prf2->dwMerit; - regfilter2.u.s2.cPins2 = prf2->u.s1.cPins; - pregfp2 = CoTaskMemAlloc(prf2->u.s1.cPins * sizeof(REGFILTERPINS2)); - regfilter2.u.s2.rgPins2 = pregfp2; - for (i = 0; i < prf2->u.s1.cPins; i++) + regfilter2.cPins2 = prf2->cPins; + pregfp2 = CoTaskMemAlloc(prf2->cPins * sizeof(REGFILTERPINS2)); + regfilter2.rgPins2 = pregfp2; + for (i = 0; i < prf2->cPins; i++) { flags = 0; - if (prf2->u.s1.rgPins[i].bRendered) + if (prf2->rgPins[i].bRendered) flags |= REG_PINFLAG_B_RENDERER; - if (prf2->u.s1.rgPins[i].bOutput) + if (prf2->rgPins[i].bOutput) flags |= REG_PINFLAG_B_OUTPUT; - if (prf2->u.s1.rgPins[i].bZero) + if (prf2->rgPins[i].bZero) flags |= REG_PINFLAG_B_ZERO; - if (prf2->u.s1.rgPins[i].bMany) + if (prf2->rgPins[i].bMany) flags |= REG_PINFLAG_B_MANY; pregfp2[i].dwFlags = flags; pregfp2[i].cInstances = 1; - pregfp2[i].nMediaTypes = prf2->u.s1.rgPins[i].nMediaTypes; - pregfp2[i].lpMediaType = prf2->u.s1.rgPins[i].lpMediaType; + pregfp2[i].nMediaTypes = prf2->rgPins[i].nMediaTypes; + pregfp2[i].lpMediaType = prf2->rgPins[i].lpMediaType; pregfp2[i].nMediums = 0; pregfp2[i].lpMedium = NULL; pregfp2[i].clsPinCategory = NULL; @@ -1152,9 +1152,9 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( /* determine whether filter meets requirements */ if (SUCCEEDED(hrSub) && (rf2.dwMerit >= dwMerit)) { - for (i = 0; (i < rf2.u.s2.cPins2) && (!bInputMatch || !bOutputMatch); i++) + for (i = 0; (i < rf2.cPins2) && (!bInputMatch || !bOutputMatch); i++) { - const REGFILTERPINS2 * rfp2 = rf2.u.s2.rgPins2 + i; + const REGFILTERPINS2 * rfp2 = rf2.rgPins2 + i; bInputMatch = bInputMatch || (!(rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && (!bRender || (rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 92555630e9e..649e25e7327 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -86,8 +86,8 @@ static HRESULT register_filters(struct regsvr_filter const *list) for (i = 0; list->pins[i].flags != 0xFFFFFFFF; i++) ; rf2.dwVersion = 2; rf2.dwMerit = list->merit; - rf2.u.s2.cPins2 = i; - rf2.u.s2.rgPins2 = prfp2 = CoTaskMemAlloc(i*sizeof(REGFILTERPINS2)); + rf2.cPins2 = i; + rf2.rgPins2 = prfp2 = CoTaskMemAlloc(i*sizeof(REGFILTERPINS2)); if (!prfp2) { hr = E_OUTOFMEMORY; break;

1 0

Jacek Caban : winegstreamer: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: ab044d1b9f19b3abc4adc941e6fee8174728ce02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab044d1b9f19b3abc4adc941… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 19:34:13 2021 +0100 winegstreamer: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/main.c | 2 ++ dlls/winegstreamer/media_source.c | 6 +++--- dlls/winegstreamer/quartz_parser.c | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index bd95a38316f..4d5dece64b3 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = strmbase strmiids uuid ole32 mfuuid DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index d5c06bf3279..4772c958f8e 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_NAMELESS_EXTENSION + #include "gst_private.h" #include "winternl.h" #include "rpcproxy.h" diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3260175f45a..589e894db2e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -249,9 +249,9 @@ static void start_pipeline(struct media_source *source, struct source_async_comm if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY) { position->vt = VT_I8; - position->u.hVal.QuadPart = 0; + position->hVal.QuadPart = 0; } - source->start_time = position->u.hVal.QuadPart; + source->start_time = position->hVal.QuadPart; for (i = 0; i < source->stream_count; i++) { @@ -310,7 +310,7 @@ static void start_pipeline(struct media_source *source, struct source_async_comm source->state = SOURCE_RUNNING; unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, - position->u.hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); + position->hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); unix_funcs->wg_parser_end_flush(source->wg_parser); } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index e9e7c3a0f9f..243dc9f80ba 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -336,10 +336,10 @@ static bool amt_from_wg_format_video(AM_MEDIA_TYPE *mt, const struct wg_format * if (format->u.video.format == WG_VIDEO_FORMAT_RGB16) { - mt->cbFormat = offsetof(VIDEOINFO, u.dwBitMasks[3]); - video_format->u.dwBitMasks[iRED] = 0xf800; - video_format->u.dwBitMasks[iGREEN] = 0x07e0; - video_format->u.dwBitMasks[iBLUE] = 0x001f; + mt->cbFormat = offsetof(VIDEOINFO, dwBitMasks[3]); + video_format->dwBitMasks[iRED] = 0xf800; + video_format->dwBitMasks[iGREEN] = 0x07e0; + video_format->dwBitMasks[iBLUE] = 0x001f; } return true;

1 0

Jacek Caban : sechost: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: b8b57a9809a9edf4853c454948534eeb55736f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8b57a9809a9edf4853c4549… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:38:14 2021 +0100 sechost: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/Makefile.in | 1 - dlls/sechost/service.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index 8e03946c7af..f4d88272857 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -2,7 +2,6 @@ MODULE = sechost.dll IMPORTLIB = sechost IMPORTS = kernelbase DELAYIMPORTS = rpcrt4 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 5beff41a164..305c1169bd4 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -533,10 +533,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfig2W( SC_HANDLE service, DWORD le rpc_privinfo.cbRequiredPrivileges = multisz_size( privinfo->pmszRequiredPrivileges ); rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; - rpc_info.u.privinfo = &rpc_privinfo; + rpc_info.privinfo = &rpc_privinfo; } else - rpc_info.u.descr = info; + rpc_info.descr = info; err = svcctl_ChangeServiceConfig2W( service, rpc_info ); } __EXCEPT(rpc_filter) @@ -1309,7 +1309,7 @@ static DWORD WINAPI notify_thread(void *user) if (err == ERROR_SUCCESS && list) { - cparams = list->NotifyParamsArray[0].u.params; + cparams = list->NotifyParamsArray[0].params; data->notify_buffer->dwNotificationStatus = cparams->dwNotificationStatus; memcpy(&data->notify_buffer->ServiceStatus, &cparams->ServiceStatus, @@ -1372,7 +1372,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DW } data->params.dwInfoLevel = 2; - data->params.u.params = &data->cparams; + data->params.params = &data->cparams; data->cparams.dwNotifyMask = mask;

1 0

Jacek Caban : shell32: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: b9a8437d52efb16fb29924bde16b166b645692bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a8437d52efb16fb29924bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:56 2021 +0100 shell32: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellole.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e89177c3a73..fe49bf09f98 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ -DWINE_NO_NAMELESS_EXTENSION +EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3c88642512e..64ae59fd283 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -718,7 +718,7 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, if(FAILED(hres) || ret.vt!=VT_I2) *puCodePage = 0; else - *puCodePage = ret.u.iVal; + *puCodePage = ret.iVal; } } @@ -751,7 +751,7 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, if(FAILED(hres) || ret.vt!=VT_I2) return S_OK; - uCodePage = ret.u.iVal; + uCodePage = ret.iVal; } hres = IPropertyStorage_Stat(pps, &stat); @@ -789,10 +789,10 @@ HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); if(FAILED(hres)) return hres; - if(ret.vt!=VT_I2 || !ret.u.iVal) + if(ret.vt!=VT_I2 || !ret.iVal) return E_FAIL; - codepage = ret.u.iVal; + codepage = ret.iVal; if(uCodePage) *uCodePage = codepage; }

1 0

Jacek Caban : shell32/tests: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 4e05e6d67ef48cde0a4215f3a55539b5c2b42e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e05e6d67ef48cde0a4215f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:38:07 2021 +0100 shell32/tests: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/shellole.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 3820fe4101e..08a7d3af3a6 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = shell32.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index a4158aaf3c9..1c26612bf98 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -120,7 +120,7 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG ok(rgpspec[0].u.propid == PID_CODEPAGE, "rgpspec[0].propid = %d\n", rgpspec[0].u.propid); rgpropvar[0].vt = VT_I2; - rgpropvar[0].u.iVal = 1234; + rgpropvar[0].iVal = 1234; } else { CHECK_EXPECT(ReadMultiple); @@ -131,13 +131,13 @@ static HRESULT WINAPI PropertyStorage_ReadMultiple(IPropertyStorage *This, ULONG ok(rgpropvar[0].vt==0 || broken(rgpropvar[0].vt==VT_BSTR), "rgpropvar[0].vt = %d\n", rgpropvar[0].vt); rgpropvar[0].vt = VT_BSTR; - rgpropvar[0].u.bstrVal = (void*)0xdeadbeef; + rgpropvar[0].bstrVal = (void*)0xdeadbeef; rgpropvar[1].vt = VT_LPSTR; - rgpropvar[1].u.pszVal = (void*)0xdeadbeef; + rgpropvar[1].pszVal = (void*)0xdeadbeef; rgpropvar[2].vt = VT_BYREF|VT_I1; - rgpropvar[2].u.pcVal = (void*)0xdeadbeef; + rgpropvar[2].pcVal = (void*)0xdeadbeef; rgpropvar[3].vt = VT_BYREF|VT_VARIANT; - rgpropvar[3].u.pvarVal = (void*)0xdeadbeef; + rgpropvar[3].pvarVal = (void*)0xdeadbeef; } return S_OK; @@ -420,7 +420,7 @@ static void test_SHPropStg_functions(void) CHECK_CALLED(WriteMultiple); read[0].vt = VT_BSTR; - read[0].u.bstrVal = (void*)0xdeadbeef; + read[0].bstrVal = (void*)0xdeadbeef; SET_EXPECT(ReadMultiple); SET_EXPECT(ReadMultipleCodePage); SET_EXPECT(Stat);

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_stream_source().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: db04f6270788c18121a6746c1f067f0f7c7747e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db04f6270788c18121a6746c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:14 2021 -0500 wined3d: Introduce wined3d_device_context_set_stream_source(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 79 ++++++++++++++++++++++++++--------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d02845737dc..12dae835cec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1266,44 +1266,10 @@ struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_de HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) { - struct wined3d_stream_state *stream; - struct wined3d_buffer *prev_buffer; - TRACE("device %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", device, stream_idx, buffer, offset, stride); - if (stream_idx >= WINED3D_MAX_STREAMS) - { - WARN("Stream index %u out of range.\n", stream_idx); - return WINED3DERR_INVALIDCALL; - } - else if (offset & 0x3) - { - WARN("Offset %u is not 4 byte aligned.\n", offset); - return WINED3DERR_INVALIDCALL; - } - - stream = &device->cs->c.state->streams[stream_idx]; - prev_buffer = stream->buffer; - - if (prev_buffer == buffer - && stream->stride == stride - && stream->offset == offset) - { - TRACE("Application is setting the old values over, nothing to do.\n"); - return WINED3D_OK; - } - - stream->buffer = buffer; - stream->stride = stride; - stream->offset = offset; - if (buffer) - wined3d_buffer_incref(buffer); - wined3d_device_context_emit_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - - return WINED3D_OK; + return wined3d_device_context_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); } HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *device, @@ -2362,6 +2328,49 @@ void CDECL wined3d_device_context_set_predication(struct wined3d_device_context wined3d_query_decref(prev); } +HRESULT CDECL wined3d_device_context_set_stream_source(struct wined3d_device_context *context, + unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) +{ + struct wined3d_stream_state *stream; + struct wined3d_buffer *prev_buffer; + + TRACE("context %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", + context, stream_idx, buffer, offset, stride); + + if (stream_idx >= WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + else if (offset & 0x3) + { + WARN("Offset %u is not 4 byte aligned.\n", offset); + return WINED3DERR_INVALIDCALL; + } + + stream = &context->state->streams[stream_idx]; + prev_buffer = stream->buffer; + + if (prev_buffer == buffer + && stream->stride == stride + && stream->offset == offset) + { + TRACE("Application is setting the old values over, nothing to do.\n"); + return WINED3D_OK; + } + + stream->buffer = buffer; + stream->stride = stride; + stream->offset = offset; + if (buffer) + wined3d_buffer_incref(buffer); + wined3d_device_context_emit_set_stream_source(context, stream_idx, buffer, offset, stride); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); + + return WINED3D_OK; +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 762cbd97f7c..cac0c19bab4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -177,6 +177,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 82cce3d0251..3f29b78044e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2577,6 +2577,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, + unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count);

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_stream_source().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: baf87afd01e5967cbb645371a24d9e28c6bb2a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf87afd01e5967cbb645371… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:15 2021 -0500 d3d11: Use wined3d_device_context_set_stream_source(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6e0ae6d695b..63172472b0e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -666,7 +666,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext1 *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", @@ -677,7 +677,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11D { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_stream_source(device->wined3d_device, start_slot + i, + wined3d_device_context_set_stream_source(context->wined3d_context, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } wined3d_mutex_unlock(); @@ -2613,7 +2613,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon } for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) { - wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); } wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0); wined3d_device_set_vertex_declaration(device->wined3d_device, NULL);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_index_buffer().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 37e17804083105dd1fb4ac2aee11608e674957fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e17804083105dd1fb4ac2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:16 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_index_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f32699c40cd..468819b604b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1395,18 +1395,18 @@ static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void * device_invalidate_state(cs->c.device, STATE_INDEXBUFFER); } -void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, +void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) { struct wined3d_cs_set_index_buffer *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_INDEX_BUFFER; op->buffer = buffer; op->format_id = format_id; op->offset = offset; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12dae835cec..e6bfa90e026 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1556,7 +1556,7 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, state->index_buffer = buffer; state->index_format = format_id; state->index_offset = offset; - wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); + wined3d_device_context_emit_set_index_buffer(&device->cs->c, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1795,7 +1795,8 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 state->streams[i].offset, state->streams[i].stride); } - wined3d_cs_emit_set_index_buffer(device->cs, state->index_buffer, state->index_format, state->index_offset); + wined3d_device_context_emit_set_index_buffer(context, state->index_buffer, + state->index_format, state->index_offset); wined3d_device_context_emit_set_predication(context, state->predicate, state->predicate_value); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3c165716e1..7c43695e5f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4754,8 +4754,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_feature_level(struct wined3d_cs *cs, enum wined3d_feature_level level) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, - enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; @@ -4805,6 +4803,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context,

1 0