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

Fabian Maurer : ole32: Better logging for apartment_getclassobject, on failure log dll path.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 2bb69639e6295e437e51d15029b97f43c6719a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb69639e6295e437e51d150… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Mar 13 21:14:02 2018 +0100 ole32: Better logging for apartment_getclassobject, on failure log dll path. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 598081b..58b9835 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1339,7 +1339,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); + ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); return hr; } @@ -1388,7 +1388,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); + ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); } return hr;

1 0

Jacek Caban : msctf: Added semi-stub support for ITfKeyTraceEventSink event sink.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: c082108e24f9d3461875fd95a2cf654b17289ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c082108e24f9d3461875fd95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 13 22:51:23 2018 +0100 msctf: Added semi-stub support for ITfKeyTraceEventSink event sink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/tests/inputprocessor.c | 59 +++++++++++++++++++++++++++++++++++++-- dlls/msctf/threadmgr.c | 12 +++++++- include/msctf.idl | 17 +++++++++++ 4 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index d5e7fe0..9d37548 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -31,6 +31,7 @@ #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 #define COOKIE_MAGIC_DMSINK 0x0070 #define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 +#define COOKIE_MAGIC_KEYTRACESINK 0x0090 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 9bd112c..8a02f95 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -64,6 +64,7 @@ static DWORD tmSinkCookie; static DWORD tmSinkRefCount; static DWORD dmSinkCookie; static DWORD documentStatus; +static DWORD key_trace_sink_cookie; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static ITfDocumentMgr *test_LastCurrentFocus = FOCUS_SAVE; @@ -625,6 +626,51 @@ static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) return S_OK; } +static HRESULT WINAPI TfKeyTraceEventSink_QueryInterface(ITfKeyTraceEventSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfKeyTraceEventSink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfKeyTraceEventSink_AddRef(ITfKeyTraceEventSink *iface) +{ + return 2; +} + +static ULONG WINAPI TfKeyTraceEventSink_Release(ITfKeyTraceEventSink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfKeyTraceEventSink_OnKeyTraceDown(ITfKeyTraceEventSink *iface, + WPARAM wparam, LPARAM lparam) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TfKeyTraceEventSink_OnKeyTraceUp(ITfKeyTraceEventSink *iface, + WPARAM wparam, LPARAM lparam) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITfKeyTraceEventSinkVtbl TfKeyTraceEventSinkVtbl = { + TfKeyTraceEventSink_QueryInterface, + TfKeyTraceEventSink_AddRef, + TfKeyTraceEventSink_Release, + TfKeyTraceEventSink_OnKeyTraceDown, + TfKeyTraceEventSink_OnKeyTraceUp +}; + +static ITfKeyTraceEventSink TfKeyTraceEventSink = { &TfKeyTraceEventSinkVtbl }; + static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { @@ -1070,13 +1116,18 @@ static void test_ThreadMgrAdviseSinks(void) tmSinkRefCount = 1; tmSinkCookie = 0; hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, sink, &tmSinkCookie); - ok(SUCCEEDED(hr),"Failed to Advise Sink\n"); + ok(hr == S_OK, "Failed to Advise Sink\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); /* Advising the sink adds a ref, Releasing here lets the object be deleted when unadvised */ tmSinkRefCount = 2; IUnknown_Release(sink); + + hr = ITfSource_AdviseSink(source, &IID_ITfKeyTraceEventSink, (IUnknown*)&TfKeyTraceEventSink, + &key_trace_sink_cookie); + ok(hr == S_OK, "Failed to Advise Sink\n"); + ITfSource_Release(source); } @@ -1092,7 +1143,11 @@ static void test_ThreadMgrUnadviseSinks(void) tmSinkRefCount = 1; hr = ITfSource_UnadviseSink(source, tmSinkCookie); - ok(SUCCEEDED(hr),"Failed to unadvise Sink\n"); + ok(hr == S_OK, "Failed to unadvise Sink\n"); + + hr = ITfSource_UnadviseSink(source, key_trace_sink_cookie); + ok(hr == S_OK, "Failed to unadvise Sink\n"); + ITfSource_Release(source); } diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 8ca12ac..5338e72 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink)) + { + WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n"); + return advise_sink(&This->KeyTraceEventSink, &IID_ITfKeyTraceEventSink, + COOKIE_MAGIC_KEYTRACESINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; } @@ -628,10 +635,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { ThreadMgr *This = impl_from_ITfSource(iface); + DWORD magic; TRACE("(%p) %x\n",This,pdwCookie); - if (get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_TMSINK && get_Cookie_magic(pdwCookie) != COOKIE_MAGIC_THREADFOCUSSINK) + magic = get_Cookie_magic(pdwCookie); + if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK + && magic != COOKIE_MAGIC_KEYTRACESINK) return E_INVALIDARG; return unadvise_sink(pdwCookie); diff --git a/include/msctf.idl b/include/msctf.idl index 0b96faa..01e944c 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1122,6 +1122,23 @@ interface ITfKeyEventSink : IUnknown [ object, local, + uuid(1cd4c13b-1c36-4191-a70a-7f3e611f367d), + pointer_default(unique) +] +interface ITfKeyTraceEventSink : IUnknown +{ + HRESULT OnKeyTraceDown( + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT OnKeyTraceUp( + [in] WPARAM wParam, + [in] LPARAM lParam); +} + +[ + object, + local, uuid(8f1b8ad8-0b6b-4874-90c5-bd76011e8f7c), pointer_default(unique) ]

1 0

Michael Stefaniuc : dmime: Stop pretending to Load() the 'WAVE' form.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: a35d4c77ca707eef4be0ac4ec94b4e85481728e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35d4c77ca707eef4be0ac4e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 14 00:43:21 2018 +0100 dmime: Stop pretending to Load() the 'WAVE' form. It doesn't make sense to forward to DirectSoundWave anyway as that would require the totally undocumented interface {69e934e4-97f1-4f1d-88e8-f2ac88671327} Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 49 +------------------------------------------------ 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index dbb9467..fcb97be 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1001,35 +1001,6 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_C return S_OK; } -static HRESULT load_wave(IStream *pClonedStream, IDirectMusicObject **ppWaveObject) -{ - HRESULT hr = E_FAIL; - IPersistStream* pPersistStream = NULL; - - hr = CoCreateInstance (&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*) ppWaveObject); - if (FAILED(hr)) { - ERR(": could not create object\n"); - return hr; - } - /* acquire PersistStream interface */ - hr = IDirectMusicObject_QueryInterface (*ppWaveObject, &IID_IPersistStream, (LPVOID*) &pPersistStream); - if (FAILED(hr)) { - ERR(": could not acquire IPersistStream\n"); - return hr; - } - /* load */ - hr = IPersistStream_Load (pPersistStream, pClonedStream); - if (FAILED(hr)) { - ERR(": failed to load object\n"); - return hr; - } - - /* release all loading-related stuff */ - IPersistStream_Release (pPersistStream); - - return S_OK; -} - static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); @@ -1064,25 +1035,7 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pS break; } case mmioFOURCC('W','A','V','E'): { - LPSTREAM pClonedStream = NULL; - IDirectMusicObject* pWave = NULL; - - FIXME_(dmfile)(": WAVE form (loading to be checked)\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_wave(pClonedStream, &pWave); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pWave); pWave = NULL; /* now we can release at as it inserted */ - + FIXME(": WAVE form loading not implemented\n"); liMove.QuadPart = StreamSize; IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ break;

1 0

Michael Müller : mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 31e5b4e5ee385e3d955545fbfa8ec79b77819b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e5b4e5ee385e3d955545fb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 13 20:32:33 2018 -0500 mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 9 +++------ dlls/mpr/wnet.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 330e66b..041afbf 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void) info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine { if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 7b24693..78759ec 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2348,7 +2348,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default:

1 0

Henri Verbeet : wined3d: Pass a texture to context_surface_update().
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: f4f20e48cf8a588a1d2d2b02b87d67ba47ec2e4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4f20e48cf8a588a1d2d2b02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 11:57:12 2018 +0330 wined3d: Pass a texture to context_surface_update(). 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 | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6530b6f..1ea2765 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1092,7 +1092,7 @@ void context_gl_resource_released(struct wined3d_device *device, context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); } -void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) +void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; @@ -1102,10 +1102,10 @@ void context_surface_update(struct wined3d_context *context, const struct wined3 for (i = 0; i < gl_info->limits.buffers + 1; ++i) { - if (surface->container->texture_rgb.name == entry->key.objects[i].object - || surface->container->texture_srgb.name == entry->key.objects[i].object) + if (texture->texture_rgb.name == entry->key.objects[i].object + || texture->texture_srgb.name == entry->key.objects[i].object) { - TRACE("Updated surface %p is bound as attachment %u to the current FBO.\n", surface, i); + TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture, i); context->rebind_fbo = TRUE; return; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b0ccfb8..7f74d49 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -912,13 +912,12 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { - struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; struct wined3d_device *device = texture->resource.device; unsigned int i; for (i = 0; i < device->context_count; ++i) { - context_surface_update(device->contexts[i], surface); + context_texture_update(device->contexts[i], texture); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f02ae4..3a404e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2185,7 +2185,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a resource to context_generate_rt_mask_no_fbo().
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 50920453b0effd3bb5454894d36d699fb2f2f19f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50920453b0effd3bb5454894… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 11:57:13 2018 +0330 wined3d: Pass a resource to context_generate_rt_mask_no_fbo(). Instead of a texture, since rendertarget views operate on resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1ea2765..34102c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2717,12 +2717,12 @@ 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_texture *rt) +static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) { - if (!rt || rt->resource.format->id == WINED3DFMT_NULL) + if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; - else if (rt->swapchain) - return context_generate_rt_mask_from_resource(&rt->resource); + 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)); } @@ -2760,7 +2760,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { - rt_mask = context_generate_rt_mask_no_fbo(context, rt); + rt_mask = context_generate_rt_mask_no_fbo(context, &rt->resource); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -3043,8 +3043,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win } else { - rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); + rt_mask = context_generate_rt_mask_no_fbo(context, rt_count ? rts[0]->resource : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -3058,8 +3057,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win } else { - rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); + rt_mask = context_generate_rt_mask_no_fbo(context, rt_count ? rts[0]->resource : NULL); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -3109,7 +3107,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])->container); + return context_generate_rt_mask_no_fbo(context, rts[0]->resource); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource);

1 0

Henri Verbeet : wined3d: Get rid of the "container" field from struct wined3d_surface.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: b7ed6b9b8edb2f2b728ed5abebb97e500d4d7435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ed6b9b8edb2f2b728ed5ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 11:57:14 2018 +0330 wined3d: Get rid of the "container" field from struct wined3d_surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 12 +++++------- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/swapchain.c | 20 ++++++++++---------- dlls/wined3d/texture.c | 1 - dlls/wined3d/wined3d_private.h | 15 --------------- 5 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 480717c..0db2daa 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1011,16 +1011,14 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; - if ((prev = cs->state.fb->depth_stencil)) + if ((prev = cs->state.fb->depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_surface *prev_surface = wined3d_rendertarget_view_get_surface(prev); + struct wined3d_texture *prev_texture = texture_from_resource(prev->resource); - if (prev_surface && (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL - || prev_surface->container->flags & WINED3D_TEXTURE_DISCARD)) - { - wined3d_texture_validate_location(prev_surface->container, + if (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL + || prev_texture->flags & WINED3D_TEXTURE_DISCARD) + wined3d_texture_validate_location(prev_texture, prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - } } cs->fb.depth_stencil = op->view; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92dfa0c..c5517f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -226,11 +226,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c float depth, DWORD stencil) { struct wined3d_rendertarget_view *rtv = rt_count ? fb->render_targets[0] : NULL; - struct wined3d_surface *target = rtv ? wined3d_rendertarget_view_get_surface(rtv) : NULL; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; const struct wined3d_state *state = &device->cs->state; + struct wined3d_texture *depth_stencil = NULL; const struct wined3d_gl_info *gl_info; + struct wined3d_texture *target = NULL; UINT drawable_width, drawable_height; struct wined3d_color corrected_color; struct wined3d_context *context; @@ -238,10 +238,19 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c BOOL render_offscreen; unsigned int i; - if (target) - context = context_acquire(device, target->container, rtv->sub_resource_idx); + if (rtv && rtv->resource->type != WINED3D_RTYPE_BUFFER) + { + target = texture_from_resource(rtv->resource); + context = context_acquire(device, target, rtv->sub_resource_idx); + } else + { context = context_acquire(device, NULL, 0); + } + + if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) + depth_stencil = texture_from_resource(dsv->resource); + if (!context->valid) { context_release(context); @@ -281,11 +290,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } else { - unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->container->level_count; + unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->level_count; render_offscreen = TRUE; - drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, ds_level); - drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, ds_level); + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil, ds_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil, ds_level); } if (depth_stencil) @@ -449,7 +458,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } if (wined3d_settings.strict_draw_ordering || (flags & WINED3DCLEAR_TARGET - && target->container->swapchain && target->container->swapchain->front_buffer == target->container)) + && target->swapchain && target->swapchain->front_buffer == target)) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4542f29..36d84f6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -385,6 +385,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; + struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context; @@ -509,14 +510,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); - if (fb->depth_stencil) + if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); + struct wined3d_texture *ds = texture_from_resource(dsv->resource); - if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL - || ds->container->flags & WINED3D_TEXTURE_DISCARD)) - wined3d_texture_validate_location(ds->container, - fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); + if ((swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL + || ds->flags & WINED3D_TEXTURE_DISCARD)) + wined3d_texture_validate_location(ds, dsv->sub_resource_idx, WINED3D_LOCATION_DISCARDED); } context_release(context); @@ -553,7 +553,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->dc); - if (front->container->resource.map_count) + if (swapchain->front_buffer->resource.map_count) ERR("Trying to blit a mapped surface.\n"); TRACE("Copying surface %p to screen.\n", front); @@ -595,15 +595,15 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, /* Flip the surface data. */ dc = front->dc; bitmap = front->bitmap; - data = front->container->resource.heap_memory; + data = swapchain->front_buffer->resource.heap_memory; front->dc = back->dc; front->bitmap = back->bitmap; - front->container->resource.heap_memory = back->container->resource.heap_memory; + swapchain->front_buffer->resource.heap_memory = swapchain->back_buffers[0]->resource.heap_memory; back->dc = dc; back->bitmap = bitmap; - back->container->resource.heap_memory = data; + swapchain->back_buffers[0]->resource.heap_memory = data; /* FPS support */ if (TRACE_ON(fps)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6abc7e7..fc5c674 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2365,7 +2365,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 struct wined3d_surface *surface; surface = &surfaces[idx]; - surface->container = texture; sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a404e0..7da2da4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3337,8 +3337,6 @@ struct fbo_entry struct wined3d_surface { - struct wined3d_texture *container; - /* For GetDC */ HBITMAP bitmap; HDC dc; @@ -3716,19 +3714,6 @@ struct wined3d_rendertarget_view struct wined3d_view_desc desc; }; -static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( - const struct wined3d_rendertarget_view *view) -{ - struct wined3d_texture *texture; - - if (!view || view->resource->type != WINED3D_RTYPE_TEXTURE_2D) - return NULL; - - texture = texture_from_resource(view->resource); - - return texture->sub_resources[view->sub_resource_idx].u.surface; -} - void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view,

1 0

Henri Verbeet : wined3d: Get rid of the unused context_get_rt_surface().
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 3abe88f12549dd8a73ab9797145c04e145e954a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3abe88f12549dd8a73ab9797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 11:57:15 2018 +0330 wined3d: Get rid of the unused context_get_rt_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7da2da4..8acf3b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4419,15 +4419,6 @@ static inline void wined3d_insert_bits(DWORD *bitstream, } } -static inline struct wined3d_surface *context_get_rt_surface(const struct wined3d_context *context) -{ - struct wined3d_texture *texture = context->current_rt.texture; - - if (!texture) - return NULL; - return texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; -} - static inline void wined3d_from_cs(const struct wined3d_cs *cs) { if (cs->thread)

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in GSUB_initialize_script_cache().
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: 01abc2f8d26975675060834a04f4222f60c3c367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01abc2f8d26975675060834a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 14 11:57:16 2018 +0330 usp10: Use usp10_array_reserve() in GSUB_initialize_script_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2d708a8..74620a3 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2580,25 +2580,31 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP static void GSUB_initialize_script_cache(ScriptCache *psc) { - int i; + const OT_ScriptList *script; + const GSUB_Header *header; + SIZE_T i; + + if (!(header = psc->GSUB_Table)) + return; + + script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); + psc->script_count = GET_BE_WORD(script->ScriptCount); + + TRACE("Initialising %li scripts in this font.\n", psc->script_count); + + if (!psc->script_count) + return; + + if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts))) + ERR("Failed to allocate script array.\n"); - if (psc->GSUB_Table) + for (i = 0; i < psc->script_count; ++i) { - const OT_ScriptList *script; - const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; - script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - psc->script_count = GET_BE_WORD(script->ScriptCount); - TRACE("initializing %li scripts in this font\n",psc->script_count); - if (psc->script_count) - { - psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); - for (i = 0; i < psc->script_count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gsub_table = ((const BYTE*)script + offset); - } - } + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], + script->ScriptRecord[i].ScriptTag[1], + script->ScriptRecord[i].ScriptTag[2], + script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script); } }

1 0

Roderick Colenbrander : winevulkan: Implement device extension enumeration.
by Alexandre Julliard 14 Mar '18

14 Mar '18

Module: wine Branch: master Commit: a7159e7c6a6c7e821f0fbd2b3c49aff5644ea79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7159e7c6a6c7e821f0fbd2b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 13:11:50 2018 +0100 winevulkan: Implement device extension enumeration. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++ dlls/winevulkan/vulkan.c | 138 +++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 4 ++ dlls/winevulkan/vulkan_thunks.c | 16 +++++ dlls/winevulkan/vulkan_thunks.h | 2 + 5 files changed, 168 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7159e7c6a6c7e821f0f…

1 0