May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase/transform: Don' t expose IMediaPosition from the filter.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 2a52c54f432b306060e5e3d6e33907ad0e2b1278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a52c54f432b306060e5e3d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 18 21:38:48 2019 -0500 strmbase/transform: Don't expose IMediaPosition from the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 2 +- dlls/quartz/tests/avidec.c | 2 +- dlls/strmbase/transform.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 5acc91e..08ee40b 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -73,7 +73,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE); - todo_wine check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); check_interface(filter, &IID_IMediaSeeking, FALSE); check_interface(filter, &IID_IPin, FALSE); todo_wine check_interface(filter, &IID_IQualityControl, FALSE); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ffea059..04de373 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -97,7 +97,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IKsPropertySet, FALSE); - todo_wine check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); check_interface(filter, &IID_IMediaSeeking, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); check_interface(filter, &IID_IPin, FALSE); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fa9abb0..ab502c9 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -172,10 +172,6 @@ static HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, RE IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } - else if (IsEqualIID(riid, &IID_IMediaPosition)) - { - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); if (FAILED(hr) && !IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) &&

1 0

Zebediah Figura : strmbase/transform: Don' t expose IQualityControl from the filter.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: c1b8ffde91d759bb90d47a4f06cc5e597b772016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b8ffde91d759bb90d47a4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 18 21:38:49 2019 -0500 strmbase/transform: Don't expose IQualityControl from the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 2 +- dlls/quartz/tests/avidec.c | 2 +- dlls/strmbase/transform.c | 22 +--------------------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 08ee40b..357a1ff 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -76,7 +76,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IMediaPosition, FALSE); check_interface(filter, &IID_IMediaSeeking, FALSE); check_interface(filter, &IID_IPin, FALSE); - todo_wine check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 04de373..5406c56 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -101,7 +101,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IMediaSeeking, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); check_interface(filter, &IID_IPin, FALSE); - todo_wine check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index ab502c9..9cb18b2 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -161,26 +161,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { BaseOutputPinImpl_DecideAllocator, }; -static HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - TransformFilter *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IQualityControl)) { - *ppv = (IQualityControl*)This->qcimpl; - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); - - if (FAILED(hr) && !IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return hr; -} - static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) { TransformFilter *This = impl_from_IBaseFilter(iface); @@ -293,7 +273,7 @@ static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME static const IBaseFilterVtbl transform_vtbl = { - TransformFilterImpl_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Zebediah Figura : quartz/filtergraph: Don' t require IAMFilterMiscFlags when performing seek operations.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 474295e34edc7554bcc0360b4f845e867cad4826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=474295e34edc7554bcc0360b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 18 21:38:50 2019 -0500 quartz/filtergraph: Don't require IAMFilterMiscFlags when performing seek operations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 9 ------ dlls/quartz/tests/filtergraph.c | 62 ++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 02707b4..60cc368 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2319,15 +2319,6 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { IMediaSeeking *seek = NULL; - IAMFilterMiscFlags *flags = NULL; - ULONG filterflags; - IBaseFilter_QueryInterface(filter->filter, &IID_IAMFilterMiscFlags, (void **)&flags); - if (!flags) - continue; - filterflags = IAMFilterMiscFlags_GetMiscFlags(flags); - IAMFilterMiscFlags_Release(flags); - if (filterflags != AM_FILTER_MISC_FLAGS_IS_RENDERER) - continue; IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seek); if (!seek) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f63f738..79841e6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3448,23 +3448,23 @@ static void test_graph_seeking(void) filter1.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; filter2.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetDuration; hr = IMediaSeeking_GetCapabilities(seeking, &caps); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); caps = AM_SEEKING_CanDoSegments; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); caps = AM_SEEKING_CanGetCurrentPos; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); - todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); - todo_wine ok(!caps, "Got caps %#x.\n", caps); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(!caps, "Got caps %#x.\n", caps); hr = IMediaSeeking_IsFormatSupported(seeking, &testguid); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3526,25 +3526,25 @@ static void test_graph_seeking(void) filter1.seek_duration = 0x12345; filter2.seek_duration = 0x23456; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); filter2.seek_duration = 0x12345; filter1.seek_duration = 0x23456; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_stop = 0x54321; filter2.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter2.seek_stop = 0x54321; filter1.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); @@ -3553,7 +3553,7 @@ static void test_graph_seeking(void) current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current)); todo_wine ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3561,13 +3561,13 @@ static void test_graph_seeking(void) stop = 0x321; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); - ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); + todo_wine ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); todo_wine ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); todo_wine ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); - todo_wine ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); - todo_wine ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); + ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); + ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3583,25 +3583,25 @@ static void test_graph_seeking(void) stop = 0x321; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime, &stop, AM_SEEKING_AbsolutePositioning); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(current == 0x1234, "Got time %s.\n", wine_dbgstr_longlong(current)); - ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); - todo_wine ok(filter1.seek_current == 0x1234, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(current == 0x1234, "Got time %s.\n", wine_dbgstr_longlong(current)); + todo_wine ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(filter1.seek_current == 0x1234, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); todo_wine ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); - todo_wine ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); - todo_wine ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); + ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); + ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); current = 0x123; stop = 0x321; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); - todo_wine ok(stop == 0x4321, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current)); + ok(stop == 0x4321, "Got time %s.\n", wine_dbgstr_longlong(stop)); todo_wine ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current)); - todo_wine ok(filter1.seek_stop == 0x4321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); - todo_wine ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); - todo_wine ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); + ok(filter1.seek_stop == 0x4321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop)); + ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); + ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); hr = IMediaSeeking_SetRate(seeking, 2.0); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Move the FBO fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: f2506fc778092311102a5eb4fc77b99503dfb72d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2506fc778092311102a5eb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 19 18:48:43 2019 +0430 wined3d: Move the FBO fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 150 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 28 ++++---- 2 files changed, 90 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2506fc778092311102a…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_get_offscreen_gl_buffer().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 74ed5d722f6bf167a6aad4dbac3885f79c37379a URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ed5d722f6bf167a6aad4db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 19 18:48:44 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_get_offscreen_gl_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/surface.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 84d6f4e..0847cb9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2724,7 +2724,7 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context->render_offscreen = offscreen; } -GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) +GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) { switch (wined3d_settings.offscreen_rendering_mode) { @@ -2732,7 +2732,7 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) return GL_COLOR_ATTACHMENT0; case ORM_BACKBUFFER: - return context->aux_buffers > 0 ? GL_AUX0 : GL_BACK; + return context_gl->c.aux_buffers > 0 ? GL_AUX0 : GL_BACK; default: FIXME("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); @@ -2742,12 +2742,14 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) return context_generate_rt_mask_from_resource(rt); else - return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); + return context_generate_rt_mask(wined3d_context_gl_get_offscreen_gl_buffer(context_gl)); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 318ac19..a95b18e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -754,7 +754,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns /* Mapping the primary render target which is not on a swapchain. * Read from the back buffer. */ TRACE("Mapping offscreen render target.\n"); - gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_context_gl_get_offscreen_gl_buffer(context_gl)); src_is_upside_down = TRUE; } else @@ -845,6 +845,7 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, { struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_resource *resource; unsigned int restore_idx, level; struct wined3d_device *device; @@ -858,17 +859,18 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, context = context_acquire(device, &texture_gl->t, sub_resource_idx); else restore_texture = NULL; + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); wined3d_texture_prepare_texture(&texture_gl->t, context, srgb); - wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); TRACE("Reading back offscreen render target %p, %u.\n", texture_gl, sub_resource_idx); if (wined3d_resource_is_offscreen(resource)) - gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_context_gl_get_offscreen_gl_buffer(context_gl)); else gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(&texture_gl->t)); checkGLcall("glReadBuffer"); @@ -922,7 +924,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, un { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; - gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); + gl_info->gl_ops.gl.p_glReadBuffer(wined3d_context_gl_get_offscreen_gl_buffer(context_gl)); } else { @@ -1036,7 +1038,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, wined3d_context_gl_apply_ffp_blit_state(context_gl, device); wined3d_texture_load(&dst_texture->t, context, FALSE); - offscreen_buffer = context_get_offscreen_gl_buffer(context); + offscreen_buffer = wined3d_context_gl_get_offscreen_gl_buffer(context_gl); src_level = src_sub_resource_idx % src_texture->t.level_count; src_width = wined3d_texture_get_level_width(&src_texture->t, src_level); src_height = wined3d_texture_get_level_height(&src_texture->t, src_level); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94765cb..0fc5646 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2081,6 +2081,7 @@ void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *que void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_so_statistics_query(struct wined3d_so_statistics_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_timestamp_query(struct wined3d_timestamp_query *query) DECLSPEC_HIDDEN; +GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, @@ -2246,7 +2247,6 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; -GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_context_gl_restore_pixel_format ().
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: da91e15bda87ff310a493135fef46b074b1bd974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da91e15bda87ff310a493135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 19 18:48:45 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_context_gl_restore_pixel_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0847cb9..0908ed1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1120,39 +1120,41 @@ void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, } } -static BOOL context_restore_pixel_format(struct wined3d_context *ctx) +static BOOL wined3d_context_gl_restore_pixel_format(struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; BOOL ret = FALSE; - if (ctx->restore_pf && IsWindow(ctx->restore_pf_win)) + if (context_gl->c.restore_pf && IsWindow(context_gl->c.restore_pf_win)) { - if (ctx->gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) + if (context_gl->c.gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HDC dc = GetDCEx(ctx->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); + HDC dc = GetDCEx(context_gl->c.restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); if (dc) { - if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf)))) + if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->c.restore_pf)))) { - ERR("wglSetPixelFormatWINE failed to restore pixel format %d on window %p.\n", - ctx->restore_pf, ctx->restore_pf_win); + ERR("Failed to restore pixel format %d on window %p.\n", + context_gl->c.restore_pf, context_gl->c.restore_pf_win); } - ReleaseDC(ctx->restore_pf_win, dc); + ReleaseDC(context_gl->c.restore_pf_win, dc); } } else { - ERR("can't restore pixel format %d on window %p\n", ctx->restore_pf, ctx->restore_pf_win); + ERR("Unable to restore pixel format %d on window %p.\n", + context_gl->c.restore_pf, context_gl->c.restore_pf_win); } } - ctx->restore_pf = 0; - ctx->restore_pf_win = NULL; + context_gl->c.restore_pf = 0; + context_gl->c.restore_pf_win = NULL; return ret; } static BOOL context_set_pixel_format(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL private = context->hdc_is_private; int format = context->pixel_format; @@ -1201,7 +1203,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context) win = private ? NULL : WindowFromDC(dc); if (win != context->restore_pf_win) { - context_restore_pixel_format(context); + wined3d_context_gl_restore_pixel_format(context_gl); context->restore_pf = private ? 0 : current; context->restore_pf_win = win; @@ -1324,6 +1326,7 @@ static void context_update_window(struct wined3d_context *context) void wined3d_context_cleanup(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; HGLRC restore_ctx; HDC restore_dc; @@ -1336,7 +1339,7 @@ void wined3d_context_cleanup(struct wined3d_context *context) else if (context->valid) context_set_gl_context(context); - context_restore_pixel_format(context); + wined3d_context_gl_restore_pixel_format(context_gl); if (restore_ctx) { context_restore_gl_context(gl_info, restore_dc, restore_ctx); @@ -1499,7 +1502,7 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) heap_free(context_gl->texture_type); - context_restore_pixel_format(&context_gl->c); + wined3d_context_gl_restore_pixel_format(context_gl); if (restore_ctx) context_restore_gl_context(gl_info, restore_dc, restore_ctx); @@ -1582,6 +1585,8 @@ BOOL context_set_current(struct wined3d_context *ctx) void context_release(struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + TRACE("Releasing context %p, level %u.\n", context, context->level); if (WARN_ON(d3d)) @@ -1594,7 +1599,7 @@ void context_release(struct wined3d_context *context) if (!--context->level) { - if (context_restore_pixel_format(context)) + if (wined3d_context_gl_restore_pixel_format(context_gl)) context->needs_set = 1; if (context->restore_ctx) {

1 0

Alexandre Julliard : winebuild: Use cdecl calling convention for stub exceptions.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 1f6681f474fe2c626428752068c8e68ebfd44202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f6681f474fe2c6264287520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 21:56:32 2019 +0200 winebuild: Use cdecl calling convention for stub exceptions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47226 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/stub.c | 2 +- tools/winebuild/import.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 49e179e..49fd273 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -23,7 +23,7 @@ #include "winbase.h" #include "wine/exception.h" -void DECLSPEC_HIDDEN __wine_spec_unimplemented_stub( const char *module, const char *function ) +void DECLSPEC_HIDDEN __cdecl __wine_spec_unimplemented_stub( const char *module, const char *function ) { ULONG_PTR args[2]; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 89a8457..d8abc9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1250,13 +1250,13 @@ void output_stubs( DLLSPEC *spec ) output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_x86_64: - output( "\tsubq $8,%%rsp\n" ); + output( "\tsubq $0x28,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 8" ); - output( "\tleaq .L__wine_spec_file_name(%%rip),%%rdi\n" ); + output( "\tleaq .L__wine_spec_file_name(%%rip),%%rcx\n" ); if (exp_name) - output( "leaq .L%s_string(%%rip),%%rsi\n", name ); + output( "leaq .L%s_string(%%rip),%%rdx\n", name ); else - output( "\tmovq $%d,%%rsi\n", odp->ordinal ); + output( "\tmovq $%d,%%rdx\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_ARM:

1 0

Alexandre Julliard : winebuild: Add 16-bit support for PE builds.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: d58953b3002a749eeb584531319afb02011cd16a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d58953b3002a749eeb584531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:21:49 2019 +0200 winebuild: Add 16-bit support for PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec16.c | 17 +++++++++++------ tools/winebuild/utils.c | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 9dce748..b21f472 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -55,6 +55,8 @@ static const char * const nop_sequence[4] = ".byte 0x8d,0x74,0x26,0x00,0x8d,0x74,0x26,0x00" /* lea 0x00(%esi),%esi; lea 0x00(%esi),%esi */ }; +static const char fakedll_signature[] = "Wine placeholder DLL"; + static inline int is_function( const ORDDEF *odp ) { if (odp->flags & FLAG_EXPORT32) return 0; @@ -565,7 +567,7 @@ static void output_module16( DLLSPEC *spec ) output( "\n/* module data */\n\n" ); output( "\t.data\n" ); - output( "\t.align %d\n", get_alignment(4) ); + output( "\t.align %d\n", get_alignment(16) ); output( ".L__wine_spec_dos_header:\n" ); output( "\t.short 0x5a4d\n" ); /* e_magic */ output( "\t.short 0\n" ); /* e_cblp */ @@ -584,9 +586,12 @@ static void output_module16( DLLSPEC *spec ) output( "\t.short 0,0,0,0\n" ); /* e_res */ output( "\t.short 0\n" ); /* e_oemid */ output( "\t.short 0\n" ); /* e_oeminfo */ - output( ".Lwine_ldt_copy_ptr:\t.long 0,0,0,0,0\n" ); /* e_res2, used for ldt_copy */ + output( ".Lwine_ldt_copy_ptr:\n" ); /* e_res2, used for private data */ + output( "\t.long .L__wine_spec_ne_header_end-.L__wine_spec_dos_header,0,0,0,0\n" ); output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ + output( "\t%s \"%s\"\n", get_asm_string_keyword(), fakedll_signature ); + output( "\t.align %d\n", get_alignment(16) ); output( ".L__wine_spec_ne_header:\n" ); output( "\t.short 0x454e\n" ); /* ne_magic */ output( "\t.byte 0\n" ); /* ne_ver */ @@ -755,7 +760,7 @@ static void output_module16( DLLSPEC *spec ) output( ".L__wine_%s_%u:\n", spec->c_name, i ); output( "\tpushw %%bp\n" ); output( "\tpushl $%s\n", - asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : odp->link_name )); + asm_name( odp->type == TYPE_STUB ? get_stub_name( odp, spec ) : get_link_name( odp ))); output( "\tcallw .L__wine_spec_callfrom16_%s\n", get_callfrom16_name( odp ) ); } output( ".L__wine_spec_code_segment_end:\n" ); @@ -784,6 +789,7 @@ static void output_module16( DLLSPEC *spec ) output_res16_data( spec ); } + output( ".L__wine_spec_ne_header_end:\n" ); output( "\t.byte 0\n" ); /* make sure the last symbol points to something */ /* relay functions */ @@ -815,11 +821,11 @@ void output_spec16_file( DLLSPEC *spec16 ) needs_get_pc_thunk = 0; open_output_file(); output_standard_file_header(); - output_module( spec32 ); + if (target_platform != PLATFORM_WINDOWS) output_module( spec32 ); output_module16( spec16 ); output_stubs( spec16 ); output_exports( spec32 ); - output_imports( spec16 ); + if (target_platform != PLATFORM_WINDOWS) output_imports( spec16 ); if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); if (needs_get_pc_thunk) output_get_pc_thunk(); if (spec16->main_module) @@ -842,7 +848,6 @@ void output_fake_module16( DLLSPEC *spec ) { static const unsigned char code_segment[] = { 0x90, 0xc3 }; static const unsigned char data_segment[16] = { 0 }; - static const char fakedll_signature[] = "Wine placeholder DLL"; const unsigned int cseg = 2; const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; const unsigned int segtab = lfanew + 0x40; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 315643c..dbfe7a4 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -900,20 +900,37 @@ const char *get_link_name( const ORDDEF *odp ) char *ret; if (target_cpu != CPU_x86) return odp->link_name; - if (odp->type != TYPE_STDCALL) return odp->link_name; - if (target_platform == PLATFORM_WINDOWS) + switch (odp->type) { - if (odp->flags & FLAG_THISCALL) return odp->link_name; - if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); - else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - else return odp->link_name; - } - else - { - if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); - else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + case TYPE_STDCALL: + if (target_platform == PLATFORM_WINDOWS) + { + if (odp->flags & FLAG_THISCALL) return odp->link_name; + if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); + else return odp->link_name; + } + else + { + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + else return odp->link_name; + } + break; + + case TYPE_PASCAL: + if (target_platform == PLATFORM_WINDOWS && !kill_at) + { + int args = get_args_size( odp ); + if (odp->flags & FLAG_REGISTER) args += get_ptr_size(); /* context argument */ + ret = strmake( "%s@%u", odp->link_name, args ); + } else return odp->link_name; + break; + + default: + return odp->link_name; } free( buffer );

1 0

Alexandre Julliard : makefiles: Support cross-compilation of 16-bit libraries.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: c4e0b9d0925529faec050f023c669f7c58c1c5dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4e0b9d0925529faec050f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:22:26 2019 +0200 makefiles: Support cross-compilation of 16-bit libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exe16_entry.c | 2 +- tools/makedep.c | 20 ++++++++++++++------ tools/winegcc/winegcc.c | 5 +---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index 1e477bd..e6823b2 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__i386__) && !defined(_WIN32) +#ifdef __i386__ #include <stdarg.h> #include "windef.h" diff --git a/tools/makedep.c b/tools/makedep.c index 7ed9efd..23b3389 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3221,9 +3221,11 @@ static void output_module( struct makefile *make ) { strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s -w --def -o $@ --export %s", tools_path( make, "winebuild" ), spec_file ); + output( "\t%s -w --def -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.def", make->importlib ), @@ -3240,8 +3242,11 @@ static void output_module( struct makefile *make ) output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); - output( "\t%s -w --implib -o $@ --export %s", tools_path( make, "winebuild" ), spec_file ); + output( "\t%s -w --implib -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); add_install_rule( make, make->importlib, @@ -3264,8 +3269,10 @@ static void output_module( struct makefile *make ) output( ": %s %s", tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); - output( "\t%s -b %s -w --implib -o $@ --export %s", - tools_path( make, "winebuild" ), crosstarget, spec_file ); + output( "\t%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); } @@ -3586,6 +3593,7 @@ static void output_subdirs( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output( "\n" ); output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); + if (submake->is_win16) output_filename( "-m16" ); output_filename( "--implib" ); output_filename( "--export" ); output_filename( spec_file ); @@ -4175,14 +4183,14 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - if (crosstarget && !make->is_win16 && !strarray_exists( &make->imports, "kernel" )) - make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); + if (crosstarget) make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "ntdll" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 28dce1b..242df38 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -429,7 +429,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) case PLATFORM_WINDOWS: case PLATFORM_CYGWIN: - if (opts->shared) + if (opts->shared || opts->win16_app) { strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,--kill-at" ); @@ -999,9 +999,6 @@ static void build(struct options* opts) lang = file; } - if (opts->win16_app && is_pe) - error( "Building 16-bit code is not supported for Windows\n" ); - /* add the default libraries, if needed */ if (!opts->wine_objdir && !opts->nodefaultlibs)

1 0

Alexandre Julliard : setupapi: Extract the 16-bit fake dll from the 32-bit PE one.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: 16851b1c122e83549522ed01c3a303c2f2ca9097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16851b1c122e83549522ed01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:29:04 2019 +0200 setupapi: Extract the 16-bit fake dll from the 32-bit PE one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 260eb1e..2802aed 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -190,6 +190,50 @@ failed: return FALSE; } +static int is_valid_ptr( const void *data, SIZE_T size, const void *ptr, SIZE_T ptr_size ) +{ + if (ptr < data) return 0; + if ((char *)ptr - (char *)data >= size) return 0; + return (size - ((char *)ptr - (char *)data) >= ptr_size); +} + +/* extract the 16-bit NE dll from a PE builtin */ +static void extract_16bit_image( IMAGE_NT_HEADERS *nt, void **data, SIZE_T *size ) +{ + DWORD exp_size, *size_ptr; + IMAGE_DOS_HEADER *dos; + IMAGE_EXPORT_DIRECTORY *exports; + IMAGE_SECTION_HEADER *section = NULL; + WORD *ordinals; + DWORD *names, *functions; + int i; + + exports = RtlImageDirectoryEntryToData( *data, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + if (!is_valid_ptr( *data, *size, exports, exp_size )) return; + ordinals = RtlImageRvaToVa( nt, *data, exports->AddressOfNameOrdinals, &section ); + names = RtlImageRvaToVa( nt, *data, exports->AddressOfNames, &section ); + functions = RtlImageRvaToVa( nt, *data, exports->AddressOfFunctions, &section ); + if (!is_valid_ptr( *data, *size, ordinals, exports->NumberOfNames * sizeof(*ordinals) )) return; + if (!is_valid_ptr( *data, *size, names, exports->NumberOfNames * sizeof(*names) )) return; + + for (i = 0; i < exports->NumberOfNames; i++) + { + char *ename = RtlImageRvaToVa( nt, *data, names[i], &section ); + if (strcmp( ename, "__wine_spec_dos_header" )) continue; + if (ordinals[i] >= exports->NumberOfFunctions) return; + if (!is_valid_ptr( *data, *size, functions, sizeof(*functions) )) return; + if (!functions[ordinals[i]]) return; + dos = RtlImageRvaToVa( nt, *data, functions[ordinals[i]], NULL ); + if (!is_valid_ptr( *data, *size, dos, sizeof(*dos) )) return; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) return; + size_ptr = (DWORD *)dos->e_res2; + *size = min( *size_ptr, *size - ((const char *)dos - (const char *)*data) ); + *size_ptr = 0; + *data = dos; + break; + } +} + /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ static int read_file( const char *name, void **data, SIZE_T *size, BOOL expect_builtin ) @@ -238,6 +282,8 @@ static int read_file( const char *name, void **data, SIZE_T *size, BOOL expect_b st.st_size - header_size, header_size ) == st.st_size - header_size) { *data = file_buffer; + if (strlen(name) > 2 && !strcmp( name + strlen(name) - 2, "16" )) + extract_16bit_image( nt, data, size ); ret = 1; } done:

1 0