wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

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

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

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

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

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

Alexandre Julliard : ntdll: Call the Unix entry point from the Unix side.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: e0fc8d7acbed511a495de8a566b59f8ab00310f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0fc8d7acbed511a495de8a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 11:10:15 2021 +0100 ntdll: Call the Unix entry point from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++---------- dlls/ntdll/unix/loader.c | 26 +++++++------------------ dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 44 ++++++++++++++++++++++++++++++------------ dlls/ntdll/unixlib.h | 5 +++-- 5 files changed, 49 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0fc8d7acbed511a495d…

1 0

Alexandre Julliard : ntdll: Move the loadorder support to the Unix library.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 22da5bd75780e9177a9f674c56a7d103665de749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22da5bd75780e9177a9f674c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 11:04:05 2021 +0100 ntdll: Move the loadorder support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 13 ---- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/{ => unix}/loadorder.c | 157 +++++++++++++++----------------------- dlls/ntdll/unix/unix_private.h | 18 +++++ dlls/ntdll/unixlib.h | 14 +++- 7 files changed, 95 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22da5bd75780e9177a9f…

1 0

Alexandre Julliard : ntdll: Add a helper for mapping a PE image.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 9e38a6800178ee2da39e265340660a36a82e3407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e38a6800178ee2da39e2653… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 11:01:19 2021 +0100 ntdll: Add a helper for mapping a PE image. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 210 +++++++++++++++++++++++++++++----------------- 1 file changed, 131 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e38a6800178ee2da39e…

1 0

Alexandre Julliard : ntdll: Move the builtin dll list to virtual.c.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 8824474e08a1db3e722bb905045b6243834f1486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8824474e08a1db3e722bb905… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 10:58:14 2021 +0100 ntdll: Move the builtin dll list to virtual.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 +- dlls/ntdll/unix/loader.c | 227 +++++++++-------------------------------- dlls/ntdll/unix/unix_private.h | 5 +- dlls/ntdll/unix/virtual.c | 162 ++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 3 +- 5 files changed, 214 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8824474e08a1db3e722b…

1 0

Francois Gouget : winetest: Don't parse the test list if 'test --list' failed.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 100b81e8a8f5ea33c73d06d8c69ba4cd44361d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=100b81e8a8f5ea33c73d06d8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 10:34:17 2021 +0100 winetest: Don't parse the test list if 'test --list' failed. Any non-zero exit code is grounds for ignoring the 'test --list' output. This also causes get_subtests() to return the actual process exit code rather than a generic internal error when it fails to parse the test list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 8f80aca9919..225e9a2548b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -735,9 +735,12 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) } heap_free (cmd); - if (status == -2) + if (status) { - report (R_ERROR, "Cannot run %s error %u", test->exename, err); + if (status == -2) + report (R_ERROR, "Cannot run %s error %u", test->exename, err); + else + err = status; CloseHandle( subfile ); goto quit; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021