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

Alexandre Julliard : ntdll: Add the builtin signature in .so file mappings.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 5cc603528434db4abc689185ba685bfe6d510224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc603528434db4abc689185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 20:12:46 2021 +0100 ntdll: Add the builtin signature in .so file mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b9df449fa5a..20f614f59f1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -613,6 +613,7 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) dos->e_ss = 0x0000; dos->e_sp = 0x00b8; dos->e_lfanew = sizeof(*dos) + sizeof(builtin_signature); + memcpy( dos + 1, builtin_signature, sizeof(builtin_signature) ); *nt = *nt_descr;

1 0

Michael Stefaniuc : mscoree: Remove redundant NULL check before HeapFree().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 0edd90daafb1d5d6197737118fd26b3a7b21bf91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0edd90daafb1d5d619773711… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:35 2021 +0100 mscoree: Remove redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 907d8af9791..acefb2887ca 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1809,7 +1809,7 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname TRACE("skipping Windows GAC search due to override setting\n"); done: - if (cultureW) HeapFree(GetProcessHeap(), 0, cultureW); + HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); return result;

1 0

Ziqing Hui : windowscodecs: Add stub implementation for DDS encoder.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 8ee4c1e21c14bbfafc1aed9551047d30a1ff8e12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee4c1e21c14bbfafc1aed95… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 15 10:59:17 2021 +0800 windowscodecs: Add stub implementation for DDS encoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 196 ++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 4 files changed, 205 insertions(+) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index b2914a7fd5b..f1be96dd11d 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -58,6 +58,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICTiffEncoder, TiffEncoder_CreateInstance}, {&CLSID_WICIcnsEncoder, IcnsEncoder_CreateInstance}, {&CLSID_WICDdsDecoder, DdsDecoder_CreateInstance}, + {&CLSID_WICDdsEncoder, DdsEncoder_CreateInstance}, {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 0830519fbc0..873d4f1bb1f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -159,6 +159,16 @@ typedef struct DdsFrameDecode { dds_frame_info info; } DdsFrameDecode; +typedef struct DdsEncoder { + IWICBitmapEncoder IWICBitmapEncoder_iface; + LONG ref; + CRITICAL_SECTION lock; + IStream *stream; + UINT frame_count; + BOOL uncommitted_frame; + BOOL committed; +} DdsEncoder; + static struct dds_format { DDS_PIXELFORMAT pixel_format; const GUID *wic_format; @@ -683,6 +693,11 @@ static inline DdsFrameDecode *impl_from_IWICDdsFrameDecode(IWICDdsFrameDecode *i return CONTAINING_RECORD(iface, DdsFrameDecode, IWICDdsFrameDecode_iface); } +static inline DdsEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, DdsEncoder, IWICBitmapEncoder_iface); +} + static HRESULT WINAPI DdsFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { @@ -1493,3 +1508,184 @@ HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) return ret; } + +static HRESULT WINAPI DdsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + FIXME("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapEncoder, iid)) { + *ppv = &This->IWICBitmapEncoder_iface; + } + else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI DdsEncoder_AddRef(IWICBitmapEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI DdsEncoder_Release(IWICBitmapEncoder *iface) +{ + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOption); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) +{ + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + memcpy(format, &GUID_ContainerFormatDds, sizeof(*format)); + return S_OK; +} + +static HRESULT WINAPI DdsEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) +{ + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICDdsEncoder, &comp_info); + if (hr == S_OK) { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; +} + +static HRESULT WINAPI DdsEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) +{ + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + EnterCriticalSection(&This->lock); + + hr = This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT WINAPI DdsEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI DdsEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI DdsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_Commit(IWICBitmapEncoder *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl DdsEncoder_Vtbl = { + DdsEncoder_QueryInterface, + DdsEncoder_AddRef, + DdsEncoder_Release, + DdsEncoder_Initialize, + DdsEncoder_GetContainerFormat, + DdsEncoder_GetEncoderInfo, + DdsEncoder_SetColorContexts, + DdsEncoder_SetPalette, + DdsEncoder_SetThumbnail, + DdsEncoder_SetPreview, + DdsEncoder_CreateNewFrame, + DdsEncoder_Commit, + DdsEncoder_GetMetadataQueryWriter +}; + +HRESULT DdsEncoder_CreateInstance( REFIID iid, void **ppv) +{ + DdsEncoder *This; + HRESULT ret; + + TRACE("(%s,%p)\n", debugstr_guid(iid), ppv); + + *ppv = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(DdsEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapEncoder_iface.lpVtbl = &DdsEncoder_Vtbl; + This->ref = 1; + This->stream = NULL; + This->frame_count = 0; + This->uncommitted_frame = FALSE; + This->committed = FALSE; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DdsEncoder.lock"); + + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); + + return ret; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 453bc58cca6..78a01a983c0 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -153,6 +153,7 @@ extern HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDE extern HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT TgaDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT DdsEncoder_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, UINT stride, UINT datasize, void *view, UINT offset, diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 3519e6c6189..ed8154051ef 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -132,6 +132,13 @@ coclass WICIcnsEncoder { interface IWICBitmapEncoder; } ] coclass WICDdsDecoder { interface IWICBitmapDecoder; } +[ + helpstring("WIC DDS Encoder"), + threading(both), + uuid(a61dde94-66ce-4ac1-881b-71680588895e) +] +coclass WICDdsEncoder { interface IWICBitmapEncoder; } + [ helpstring("WIC Default Format Converter"), threading(both),

1 0

Rémi Bernon : include: Include x86intrin.h in msvcrt/intrin.h.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: b18a48eb703c06ea4152d797c18c66c5094ced4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b18a48eb703c06ea4152d797… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 15 16:07:38 2021 +0100 include: Include x86intrin.h in msvcrt/intrin.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/intrin.h | 4 ++++ include/msvcrt/stdlib.h | 8 ++++++++ tools/makedep.c | 1 + 3 files changed, 13 insertions(+) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 781c6fac823..8b84929bc02 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -7,6 +7,10 @@ #ifndef _INC_INTRIN #define _INC_INTRIN +#if defined(__i386__) || defined(__x86_64__) +# include <x86intrin.h> +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ed6560bc318..287e4030669 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -164,15 +164,23 @@ _ACRTIMP char* __cdecl _itoa(int,char*,int); _ACRTIMP errno_t __cdecl _itoa_s(int,char*,size_t,int); _ACRTIMP char* __cdecl _ltoa(__msvcrt_long,char*,int); _ACRTIMP errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); +#ifndef _lrotl _ACRTIMP __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); +#endif +#ifndef _lrotr _ACRTIMP __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); +#endif _ACRTIMP void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); _ACRTIMP int __cdecl _makepath_s(char*,size_t,const char*,const char*,const char*,const char*); _ACRTIMP size_t __cdecl _mbstrlen(const char*); _ACRTIMP _onexit_t __cdecl _onexit(_onexit_t); _ACRTIMP int __cdecl _putenv(const char*); +#ifndef _rotl _ACRTIMP unsigned int __cdecl _rotl(unsigned int,int); +#endif +#ifndef _rotr _ACRTIMP unsigned int __cdecl _rotr(unsigned int,int); +#endif _ACRTIMP void __cdecl _searchenv(const char*,const char*,char*); _ACRTIMP int __cdecl _set_error_mode(int); _ACRTIMP void __cdecl _seterrormode(int); diff --git a/tools/makedep.c b/tools/makedep.c index 913854c7f05..8245a324279 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1570,6 +1570,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_viewports().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 911ed1caf15943724b4278c5eeafab53f4381e13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=911ed1caf15943724b4278c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:18 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_viewports(). 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 | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 886a76284ff..d7a413057c9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1147,18 +1147,18 @@ static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) { struct wined3d_cs_set_viewports *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), - WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, + FIELD_OFFSET(struct wined3d_cs_set_viewports,viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - 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_scissor_rects(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ca179c753ab..62a3e990cf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1698,7 +1698,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned memset(state->viewports, 0, sizeof(state->viewports)); state->viewport_count = viewport_count; - wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -1983,7 +1983,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); - wined3d_cs_emit_set_viewports(device->cs, state->viewport_count, state->viewports); + wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -5191,7 +5191,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].min_z = 0.0f; state->viewports[0].max_z = 1.0f; state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, 1, state->viewports); SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8947f444cd..524b6ae7ce3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4793,7 +4793,6 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) {

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_viewports().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: da7a9bd8115cf16dc4757285a3043c399acd3e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da7a9bd8115cf16dc4757285… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:19 2021 -0500 wined3d: Introduce wined3d_device_context_set_viewports(). 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 | 32 ++++++++++++++++++++++++-------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 62a3e990cf1..6e9afb8468d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1681,7 +1681,6 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, const struct wined3d_viewport *viewports) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, viewport_count %u, viewports %p.\n", device, viewport_count, viewports); @@ -1692,13 +1691,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); } - if (viewport_count) - memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); - else - memset(state->viewports, 0, sizeof(state->viewports)); - state->viewport_count = viewport_count; - - wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); + wined3d_device_context_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -2157,6 +2150,29 @@ void CDECL wined3d_device_context_set_rasterizer_state(struct wined3d_device_con wined3d_rasterizer_state_decref(prev); } +void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, viewport_count %u, viewports %p.\n", context, viewport_count, viewports); + + for (i = 0; i < viewport_count; ++i) + { + TRACE("%u: x %.8e, y %.8e, w %.8e, h %.8e, min_z %.8e, max_z %.8e.\n", i, viewports[i].x, viewports[i].y, + viewports[i].width, viewports[i].height, viewports[i].min_z, viewports[i].max_z); + } + + if (viewport_count) + memcpy(state->viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(state->viewports, 0, sizeof(state->viewports)); + state->viewport_count = viewport_count; + + wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); +} + 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 3fe3e0cfd89..8fc190b73ba 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) +@ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3c091263742..f3de0098ef3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2558,6 +2558,8 @@ void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_c struct wined3d_rasterizer_state *rasterizer_state); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); +void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports); HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode);

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_viewports().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 06d2430679f8544cdab60e1c4358b988a6bad485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d2430679f8544cdab60e1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:20 2021 -0500 d3d11: Use wined3d_device_context_set_viewports(). 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16a1027beb9..190e60be4b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1162,7 +1162,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11DeviceContext1 *iface, UINT viewport_count, const D3D11_VIEWPORT *viewports) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_viewport wined3d_vp[WINED3D_MAX_VIEWPORTS]; unsigned int i; @@ -1182,7 +1182,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic } wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, viewport_count, wined3d_vp); + wined3d_device_context_set_viewports(context->wined3d_context, viewport_count, wined3d_vp); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_scissor_rects().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: e00ce29a5e78eb529467001fd3ea2f64ec472aa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00ce29a5e78eb529467001f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:21 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_scissor_rects(). 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 | 7 ++++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d7a413057c9..d8635bba8d7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1173,17 +1173,18 @@ static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_SCISSORRECT); } -void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) +void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, + unsigned int rect_count, const RECT *rects) { struct wined3d_cs_set_scissor_rects *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + op = wined3d_device_context_require_space(context, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; - 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_rendertarget_view(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6e9afb8468d..0ba5215c076 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1858,7 +1858,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); state->scissor_rect_count = rect_count; - wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) @@ -1977,7 +1977,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); - wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) { @@ -5211,7 +5211,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; - wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); + wined3d_device_context_emit_set_scissor_rects(&device->cs->c, 1, state->scissor_rects); } prev = state->fb.render_targets[view_idx]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 524b6ae7ce3..4ad0c05d34a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4776,7 +4776,6 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, @@ -4824,6 +4823,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_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context *context, + unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0

Francois Gouget : testbot/LogUtils: Highlight the dll 'version' errors.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: tools Branch: master Commit: 72e55a7b302cdc878d4c986d94647d6641885a79 URL: https://source.winehq.org/git/tools.git/?a=commit;h=72e55a7b302cdc878d4c986… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:07 2021 +0100 testbot/LogUtils: Highlight the dll 'version' errors. WineTest replaces the dll version information with an error message when it cannot get that information, or if the dll is missing an entry point needed by the test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index eced000..840a552 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,7 +325,9 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or + $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { return "info";

1 0

Francois Gouget : testbot/LibvirtTool: Always shut down for '-off' snapshots.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: tools Branch: master Commit: b22f79a59d9a04f70a9a5c9b66570a85927cf072 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b22f79a59d9a04f70a9a5c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:25 2021 +0100 testbot/LibvirtTool: Always shut down for '-off' snapshots. Snapshots with a name ending in '-off' request that the VM be cleanly shut down if possible rather than summarily powered off. So check the domain's current snapshot and do a clean shutdown before powering off for every operation, including checkoff, monitor and revert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 118 +++++++++++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 46 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f135b9b..c4dbffb 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -257,6 +257,66 @@ sub ChangeStatus($$;$) return 0; } +sub ShutDown() +{ + my $Domain = $VM->GetDomain(); + my $CurrentSnapshot = $Domain->GetSnapshotName(); + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + !$Domain->IsPoweredOn()) + { + return 1; + } + + Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); + LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; + + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + return 0; + } + } + + my $Success = 1; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + $Success = 0; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + $Success = 0; + last; + } + sleep(1); + } + } + $TA->Disconnect(); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return $Success; +} + sub Monitor() { # Still try recovering the VM in case of repeated errors, but space out @@ -301,6 +361,9 @@ sub Monitor() my $IsReady = $VM->GetDomain()->IsReady(); if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) { @@ -324,55 +387,12 @@ sub Monitor() sub PowerOff() { - my $Domain = $VM->GetDomain(); - if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) - { - # Attempt to perform a clean shutdown. - # Use SetTime() to detect if privileged operations are allowed. - my $TA = $VM->GetAgent(); - if (!$TA->SetTime()) - { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - $TA->Disconnect(); - $TA = $VM->GetAgent(1); - if (!$TA->SetTime()) - { - Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; - $TA->Disconnect(); - $TA = undef; - } - } - if ($TA) - { - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - if (!$TA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; - } - else - { - Debug(Elapsed($Start), " Waiting for the VM to power off\n"); - my $Deadline = time() + $WaitForShutdown; - while ($Domain->IsPoweredOn()) - { - if (time() >= $Deadline) - { - Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; - last; - } - sleep(1); - } - } - } - } + # Try to perform a clean shutdown if requested + ShutDown(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $Domain->PowerOff(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -407,6 +427,9 @@ sub CheckOff() FatalError("$ErrMessage\n") if (defined $ErrMessage); if ($SnapshotName eq $VM->IdleSnapshot) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); } @@ -584,6 +607,9 @@ sub Revert() $VM->Save(); } + # Before reverting, try to perform a clean shutdown if requested + ShutDown(); + # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot);

1 0