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

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_depth_stencil_state().
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 41f521b59be289978a5b2b42338b81f666376210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f521b59be289978a5b2b42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:25:16 2021 -0600 wined3d: Introduce wined3d_device_context_set_depth_stencil_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 36 ++++++++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b24342d2f3..3864bcfbb81 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1761,22 +1761,9 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_depth_stencil_state *prev; - TRACE("device %p, depth_stencil_state %p, stencil_ref %u.\n", device, depth_stencil_state, stencil_ref); - prev = state->depth_stencil_state; - if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) - return; - - if (depth_stencil_state) - wined3d_depth_stencil_state_incref(depth_stencil_state); - state->depth_stencil_state = depth_stencil_state; - state->stencil_ref = stencil_ref; - wined3d_device_context_emit_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); - if (prev) - wined3d_depth_stencil_state_decref(prev); + wined3d_device_context_set_depth_stencil_state(&device->cs->c, depth_stencil_state, stencil_ref); } struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, @@ -2142,6 +2129,27 @@ void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context wined3d_blend_state_decref(prev); } +void CDECL wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref) +{ + struct wined3d_state *state = context->state; + struct wined3d_depth_stencil_state *prev; + + TRACE("context %p, depth_stencil_state %p, stencil_ref %u.\n", context, depth_stencil_state, stencil_ref); + + prev = state->depth_stencil_state; + if (prev == depth_stencil_state && state->stencil_ref == stencil_ref) + return; + + if (depth_stencil_state) + wined3d_depth_stencil_state_incref(depth_stencil_state); + state->depth_stencil_state = depth_stencil_state; + state->stencil_ref = stencil_ref; + wined3d_device_context_emit_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); + if (prev) + wined3d_depth_stencil_state_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 17cff7ffb9f..04bb975da73 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -169,6 +169,7 @@ @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) +@ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ead427a13f6..c52f328c277 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2553,6 +2553,8 @@ void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_contex struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, + struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader);

1 0

Bernhard Kölbl : netprofm: Set correct GUIDs for network connections.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 4393438ab31e8825edf4111524ef5a0be0a90d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4393438ab31e8825edf41115… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 5 16:22:07 2021 +0100 netprofm: Set correct GUIDs for network connections. Retrieve the network connection's GUID from the interface index. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index fa94916dd9b..40d2fd9763c 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1738,8 +1738,10 @@ static void init_networks( struct list_manager *mgr ) { struct network *network; struct connection *connection; + NET_LUID luid; - id.Data1 = aa->u.s.IfIndex; + ConvertInterfaceIndexToLuid(aa->u.s.IfIndex, &luid); + ConvertInterfaceLuidToGuid(&luid, &id); /* assume a one-to-one mapping between networks and connections */ if (!(network = create_network( &id ))) goto done;

1 0

Zebediah Figura : strmbase: Move run_event to the strmbase_renderer structure.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 914ad66c52236c92676f4e5f720153d3822abcf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=914ad66c52236c92676f4e5f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:35 2021 -0600 strmbase: Move run_event to the strmbase_renderer structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 9 +++------ dlls/quartz/videorenderer.c | 11 +++-------- dlls/quartz/vmr9.c | 11 +++-------- dlls/strmbase/renderer.c | 2 ++ include/wine/strmbase.h | 3 +++ 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 97e3cdbb202..85493da02f1 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); struct null_renderer { struct strmbase_renderer renderer; - HANDLE run_event; }; static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -43,7 +42,7 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac if (filter->renderer.filter.state == State_Paused) { - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); WaitForMultipleObjects(2, events, FALSE, INFINITE); @@ -62,7 +61,6 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); } @@ -70,13 +68,13 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static void null_renderer_start_stream(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void null_renderer_stop_stream(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); - ResetEvent(filter->run_event); + ResetEvent(filter->renderer.run_event); } static const struct strmbase_renderer_ops renderer_ops = @@ -96,7 +94,6 @@ HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created null renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ed5774bf484..1da5ad02d7a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -48,8 +48,6 @@ struct video_renderer LONG FullScreenMode; DWORD saved_style; - - HANDLE run_event; }; static inline struct video_renderer *impl_from_video_window(struct video_window *iface) @@ -106,7 +104,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa if (filter->renderer.filter.state == State_Paused) { - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.filter.stream_cs); @@ -140,7 +138,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) struct video_renderer *filter = impl_from_strmbase_renderer(iface); video_window_cleanup(&filter->window); - CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); @@ -179,7 +176,7 @@ static void video_renderer_start_stream(struct strmbase_renderer *iface) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void video_renderer_stop_stream(struct strmbase_renderer *iface) @@ -192,7 +189,7 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) /* Black it out */ RedrawWindow(This->window.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); - ResetEvent(This->run_event); + ResetEvent(This->renderer.run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -519,8 +516,6 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) return hr; } - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - TRACE("Created video renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c748e674081..7e0edc57f61 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -108,8 +108,6 @@ struct quartz_vmr LONG VideoWidth; LONG VideoHeight; VMR9AspectRatioMode aspect_mode; - - HANDLE run_event; }; static inline BOOL is_vmr9(const struct quartz_vmr *filter) @@ -211,7 +209,7 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; REFERENCE_TIME start_time, end_time; @@ -486,7 +484,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - SetEvent(filter->run_event); + SetEvent(filter->renderer.run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -497,7 +495,7 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) if (This->renderer.filter.state == State_Running) IVMRImagePresenter9_StopPresenting(This->presenter, This->cookie); - ResetEvent(This->run_event); + ResetEvent(This->renderer.run_event); } static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) @@ -585,7 +583,6 @@ static void vmr_destroy(struct strmbase_renderer *iface) filter->allocator_d3d9_dev = NULL; } - CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); if (!filter->IVMRSurfaceAllocatorNotify9_refcount) @@ -2610,8 +2607,6 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) return hr; } - object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b384ea991d9..0978f7305c8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -554,6 +554,7 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) CloseHandle(filter->state_event); CloseHandle(filter->advise_event); + CloseHandle(filter->run_event); CloseHandle(filter->flush_event); strmbase_filter_cleanup(&filter->filter); } @@ -573,5 +574,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index e902790ecb1..76caf103dee 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -286,6 +286,9 @@ struct strmbase_renderer /* Signaled when the sample presentation time occurs. The streaming thread * waits for this event in Receive() if applicable. */ HANDLE advise_event; + /* Signaled when the filter is running. The streaming thread waits for this + * event in Receive() while paused. */ + HANDLE run_event; /* Signaled when a flush or state change occurs, i.e. anything that needs * to immediately unblock the streaming thread. */ HANDLE flush_event;

1 0

Zebediah Figura : strmbase: Move run_event handling to strmbase.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 6ab9ad109699a42abd890b72a5f9d301d63f7e84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab9ad109699a42abd890b72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:36 2021 -0600 strmbase: Move run_event handling to strmbase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 24 ------------------------ dlls/quartz/videorenderer.c | 20 -------------------- dlls/quartz/vmr9.c | 15 +-------------- dlls/strmbase/renderer.c | 12 ++++++++++++ 4 files changed, 13 insertions(+), 58 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 85493da02f1..e703ea24305 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -38,16 +38,6 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - - if (filter->renderer.filter.state == State_Paused) - { - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; - - SetEvent(filter->renderer.state_event); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - } - return S_OK; } @@ -65,24 +55,10 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) free(filter); } -static void null_renderer_start_stream(struct strmbase_renderer *iface) -{ - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - SetEvent(filter->renderer.run_event); -} - -static void null_renderer_stop_stream(struct strmbase_renderer *iface) -{ - struct null_renderer *filter = impl_from_strmbase_renderer(iface); - ResetEvent(filter->renderer.run_event); -} - static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = NullRenderer_CheckMediaType, .pfnDoRenderSample = NullRenderer_DoRenderSample, - .renderer_start_stream = null_renderer_start_stream, - .renderer_stop_stream = null_renderer_stop_stream, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1da5ad02d7a..a90e96c8f2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -102,16 +102,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->window.hwnd, dc); - if (filter->renderer.filter.state == State_Paused) - { - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; - - SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.filter.stream_cs); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.filter.stream_cs); - } - return S_OK; } @@ -172,13 +162,6 @@ static HRESULT video_renderer_pin_query_interface(struct strmbase_renderer *ifac return S_OK; } -static void video_renderer_start_stream(struct strmbase_renderer *iface) -{ - struct video_renderer *filter = impl_from_strmbase_renderer(iface); - - SetEvent(filter->renderer.run_event); -} - static void video_renderer_stop_stream(struct strmbase_renderer *iface) { struct video_renderer *This = impl_from_strmbase_renderer(iface); @@ -188,8 +171,6 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) if (This->window.AutoShow) /* Black it out */ RedrawWindow(This->window.hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE); - - ResetEvent(This->renderer.run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -235,7 +216,6 @@ static const struct strmbase_renderer_ops renderer_ops = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, - .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7e0edc57f61..b98e172e48e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -209,7 +209,6 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {filter->renderer.run_event, filter->renderer.flush_event}; unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; REFERENCE_TIME start_time, end_time; @@ -310,17 +309,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi IDirect3DSurface9_UnlockRect(info.lpSurf); - hr = IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); - - if (filter->renderer.filter.state == State_Paused) - { - SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.filter.stream_cs); - WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.filter.stream_cs); - } - - return hr; + return IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); } static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) @@ -484,7 +473,6 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - SetEvent(filter->renderer.run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -495,7 +483,6 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) if (This->renderer.filter.state == State_Running) IVMRImagePresenter9_StopPresenting(This->presenter, This->cookie); - ResetEvent(This->renderer.run_event); } static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0978f7305c8..c95fe63c3f9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -245,6 +245,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); + SetEvent(filter->run_event); if (filter->sink.pin.peer) filter->eos = FALSE; reset_qos(filter); @@ -258,6 +259,8 @@ static HRESULT renderer_stop_stream(struct strmbase_filter *iface) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); + ResetEvent(filter->run_event); + if (filter->sink.pin.peer && filter->pFuncsTable->renderer_stop_stream) filter->pFuncsTable->renderer_stop_stream(filter); @@ -354,8 +357,17 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (state == State_Paused) { + HANDLE events[2] = {filter->run_event, filter->flush_event}; + filter->current_sample = sample; + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + + SetEvent(filter->state_event); + LeaveCriticalSection(&filter->filter.stream_cs); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->filter.stream_cs); + filter->current_sample = NULL; }

1 0

Zebediah Figura : strmbase: Rename pfnCheckMediaType to renderer_query_accept.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 646f2040d855cf2185e900c16fe2758d4ef07bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=646f2040d855cf2185e900c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 10 19:23:37 2021 -0600 strmbase: Rename pfnCheckMediaType to renderer_query_accept. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qedit/nullrenderer.c | 5 ++--- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 3 +-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 001839026b2..ff89d85ac8c 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -54,7 +54,7 @@ static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMedia return E_NOTIMPL; } -static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { FIXME("Not implemented.\n"); return E_NOTIMPL; @@ -62,7 +62,7 @@ static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = evr_CheckMediaType, + .renderer_query_accept = evr_query_accept, .pfnDoRenderSample = evr_DoRenderSample, .renderer_destroy = evr_destroy, }; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index e703ea24305..a9319b06efe 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -41,9 +41,8 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac return S_OK; } -static HRESULT WINAPI NullRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT null_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - TRACE("Not a stub!\n"); return S_OK; } @@ -57,7 +56,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = NullRenderer_CheckMediaType, + .renderer_query_accept = null_renderer_query_accept, .pfnDoRenderSample = NullRenderer_DoRenderSample, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a90e96c8f2a..ec40bc8db9c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -105,7 +105,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT video_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; @@ -213,7 +213,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VideoRenderer_CheckMediaType, + .renderer_query_accept = video_renderer_query_accept, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b98e172e48e..9e8a037eca0 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -312,7 +312,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); } -static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT vmr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualIID(&mt->majortype, &MEDIATYPE_Video) || !mt->pbFormat) return S_FALSE; @@ -637,7 +637,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VMR9_CheckMediaType, + .renderer_query_accept = vmr_query_accept, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c95fe63c3f9..7718232e97c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -302,7 +302,7 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { struct strmbase_renderer *filter = impl_from_IPin(&pin->IPin_iface); - return filter->pFuncsTable->pfnCheckMediaType(filter, mt); + return filter->pFuncsTable->renderer_query_accept(filter, mt); } static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -344,7 +344,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp TRACE("Format change.\n"); strmbase_dump_media_type(mt); - if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + if (FAILED(filter->pFuncsTable->renderer_query_accept(filter, mt))) return VFW_E_TYPE_NOT_ACCEPTED; DeleteMediaType(mt); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 76caf103dee..dbb4a21c071 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,13 +305,12 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops { - BaseRenderer_CheckMediaType pfnCheckMediaType; + HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface);

1 0

Huw Davies : riched20: Add ITextServices stdcall wrappers.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 7ea39932844ebafb0ef6eb60954b97ddf7b99793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea39932844ebafb0ef6eb60… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 11 08:50:59 2021 +0000 riched20: Add ITextServices stdcall wrappers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 31 +++++++++++++++++++--- dlls/riched20/editstr.h | 4 --- dlls/riched20/txthost.c | 8 +++--- dlls/riched20/txtsrv.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 38d99f4351a..ee2cde833c4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -318,10 +318,11 @@ static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) /* txthost.c */ #ifdef __ASM_USE_THISCALL_WRAPPER -#define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) -#else /* __i386__ */ +extern const struct ITextHostVtbl text_host_stdcall_vtbl DECLSPEC_HIDDEN; +#define TXTHOST_VTABLE(This) (&text_host_stdcall_vtbl) +#else #define TXTHOST_VTABLE(This) (This)->lpVtbl -#endif /* __i386__ */ +#endif /*** ITextHost methods ***/ #define ITextHost_TxGetDC(This) TXTHOST_VTABLE(This)->TxGetDC(This) #define ITextHost_TxReleaseDC(This,a) TXTHOST_VTABLE(This)->TxReleaseDC(This,a) @@ -379,6 +380,30 @@ void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* txtsrv.c */ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; +#ifdef __ASM_USE_THISCALL_WRAPPER +extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN; +#define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) +#else +#define TXTSERV_VTABLE(This) (This)->lpVtbl +#endif +#define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) +#define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) +#define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) +#define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) +#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) +#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) +#define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) +#define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) +#define ITextServices_TxSetText(This,a) TXTSERV_VTABLE(This)->TxSetText(This,a) +#define ITextServices_TxGetCurTargetX(This,a) TXTSERV_VTABLE(This)->TxGetCurTargetX(This,a) +#define ITextServices_TxGetBaseLinePos(This,a) TXTSERV_VTABLE(This)->TxGetBaseLinePos(This,a) +#define ITextServices_TxGetNaturalSize(This,a,b,c,d,e,f,g,h) TXTSERV_VTABLE(This)->TxGetNaturalSize(This,a,b,c,d,e,f,g,h) +#define ITextServices_TxGetDropTarget(This,a) TXTSERV_VTABLE(This)->TxGetDropTarget(This,a) +#define ITextServices_OnTxPropertyBitsChange(This,a,b) TXTSERV_VTABLE(This)->OnTxPropertyBitsChange(This,a,b) +#define ITextServices_TxGetCachedSize(This,a,b) TXTSERV_VTABLE(This)->TxGetCachedSize(This,a,b) /* writer.c */ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, const ME_Cursor *start, int nChars, EDITSTREAM *stream) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 204e078c986..57dd45136af 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -49,10 +49,6 @@ #include "wine/list.h" #include "wine/rbtree.h" -#ifdef __ASM_USE_THISCALL_WRAPPER -extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; -#endif /* __i386__ */ - typedef struct tagME_String { WCHAR *szData; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 291c9a3b677..51dccf3b7ed 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -584,7 +584,8 @@ DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4) DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8) DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8) -const ITextHostVtbl itextHostStdcallVtbl = { +const ITextHostVtbl text_host_stdcall_vtbl = +{ NULL, NULL, NULL, @@ -629,9 +630,10 @@ const ITextHostVtbl itextHostStdcallVtbl = { STDCALL(ITextHostImpl_TxGetSelectionBarWidth), }; -#endif /* __i386__ */ +#endif /* __ASM_USE_THISCALL_WRAPPER */ -static const ITextHostVtbl textHostVtbl = { +static const ITextHostVtbl textHostVtbl = +{ ITextHostImpl_QueryInterface, ITextHostImpl_AddRef, ITextHostImpl_Release, diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 49d1c706076..7893888af57 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -339,6 +339,75 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *ifac return E_NOTIMPL; } +#ifdef __ASM_USE_THISCALL_WRAPPER + +#define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ +#define DEFINE_STDCALL_WRAPPER(num,func) \ + extern HRESULT __stdcall_ ## func(void); \ + __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl (%ecx), %eax\n\t" \ + "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ + +DEFINE_STDCALL_WRAPPER(3, ITextServices_TxSendMessage) +DEFINE_STDCALL_WRAPPER(4, ITextServices_TxDraw) +DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) +DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) +DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) +DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) +DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) +DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) +DEFINE_STDCALL_WRAPPER(14, ITextServices_TxSetText) +DEFINE_STDCALL_WRAPPER(15, ITextServices_TxGetCurTargetX) +DEFINE_STDCALL_WRAPPER(16, ITextServices_TxGetBaseLinePos) +DEFINE_STDCALL_WRAPPER(17, ITextServices_TxGetNaturalSize) +DEFINE_STDCALL_WRAPPER(18, ITextServices_TxGetDropTarget) +DEFINE_STDCALL_WRAPPER(19, ITextServices_OnTxPropertyBitsChange) +DEFINE_STDCALL_WRAPPER(20, ITextServices_TxGetCachedSize) + +const ITextServicesVtbl text_services_stdcall_vtbl = +{ + NULL, + NULL, + NULL, + STDCALL(ITextServices_TxSendMessage), + STDCALL(ITextServices_TxDraw), + STDCALL(ITextServices_TxGetHScroll), + STDCALL(ITextServices_TxGetVScroll), + STDCALL(ITextServices_OnTxSetCursor), + STDCALL(ITextServices_TxQueryHitPoint), + STDCALL(ITextServices_OnTxInplaceActivate), + STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxUIActivate), + STDCALL(ITextServices_OnTxUIDeactivate), + STDCALL(ITextServices_TxGetText), + STDCALL(ITextServices_TxSetText), + STDCALL(ITextServices_TxGetCurTargetX), + STDCALL(ITextServices_TxGetBaseLinePos), + STDCALL(ITextServices_TxGetNaturalSize), + STDCALL(ITextServices_TxGetDropTarget), + STDCALL(ITextServices_OnTxPropertyBitsChange), + STDCALL(ITextServices_TxGetCachedSize), +}; + +#endif /* __ASM_USE_THISCALL_WRAPPER */ static const ITextServicesVtbl textservices_vtbl = {

1 0

Nikolay Sivov : dwrite: Use properly capitalized weight names for constructed face names.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 1f8d7489b7e0a196d8f59ac401a67c2b7a84d3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f8d7489b7e0a196d8f59ac4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:22 2021 +0300 dwrite: Use properly capitalized weight names for constructed face names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4252a3698ba..1a54d2300b1 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3653,6 +3653,10 @@ static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) static const WCHAR extrablackW[] = {'E','x','t','r','a',' ','B','l','a','c','k',0}; static const WCHAR extraboldW[] = {'E','x','t','r','a',' ','B','o','l','d',0}; static const WCHAR demiboldW[] = {'D','e','m','i',' ','B','o','l','d',0}; + static const WCHAR thinW[] = {'T','h','i','n',0}; + static const WCHAR lightW[] = {'L','i','g','h','t',0}; + static const WCHAR mediumW[] = {'M','e','d','i','u','m',0}; + static const WCHAR blackW[] = {'B','l','a','c','k',0}; const struct knownweight_entry *ptr; static const struct knownweight_entry knownweights[] = {

1 0

Nikolay Sivov : dwrite: Use same name for refcount field across different object structures.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 118b080a08db941a23ade3893e7f44e90ad29a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=118b080a08db941a23ade389… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:21 2021 +0300 dwrite: Use same name for refcount field across different object structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 11 ++++++----- dlls/dwrite/font.c | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6b74a23540a..ecbe1a389fa 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -258,9 +258,10 @@ struct dwrite_fontfallback_builder size_t count; }; -struct dwrite_numbersubstitution { +struct dwrite_numbersubstitution +{ IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; - LONG ref; + LONG refcount; DWRITE_NUMBER_SUBSTITUTION_METHOD method; WCHAR *locale; @@ -1871,7 +1872,7 @@ static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubst static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *iface) { struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); - ULONG refcount = InterlockedIncrement(&object->ref); + ULONG refcount = InterlockedIncrement(&object->refcount); TRACE("%p, refcount %d.\n", iface, refcount); @@ -1881,7 +1882,7 @@ static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *i static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution *iface) { struct dwrite_numbersubstitution *object = impl_from_IDWriteNumberSubstitution(iface); - ULONG refcount = InterlockedDecrement(&object->ref); + ULONG refcount = InterlockedDecrement(&object->refcount); TRACE("%p, refcount %d.\n", iface, refcount); @@ -1926,7 +1927,7 @@ HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, cons return E_OUTOFMEMORY; substitution->IDWriteNumberSubstitution_iface.lpVtbl = &numbersubstitutionvtbl; - substitution->ref = 1; + substitution->refcount = 1; substitution->ignore_user_override = ignore_user_override; substitution->method = method; substitution->locale = heap_strdupW(locale); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8e173263ad5..4252a3698ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -71,7 +71,7 @@ struct dwrite_font_propvec { struct dwrite_font_data { - LONG ref; + LONG refcount; DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; @@ -498,7 +498,7 @@ static const struct dwrite_fonttable *get_fontface_cpal(struct dwrite_fontface * static struct dwrite_font_data * addref_font_data(struct dwrite_font_data *data) { - InterlockedIncrement(&data->ref); + InterlockedIncrement(&data->refcount); return data; } @@ -506,7 +506,7 @@ static void release_font_data(struct dwrite_font_data *data) { int i; - if (InterlockedDecrement(&data->ref) > 0) + if (InterlockedDecrement(&data->refcount) > 0) return; for (i = 0; i < ARRAY_SIZE(data->info_strings); ++i) @@ -3963,7 +3963,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo if (!data) return E_OUTOFMEMORY; - data->ref = 1; + data->refcount = 1; data->file = desc->file; data->face_index = desc->index; data->face_type = desc->face_type; @@ -4024,7 +4024,7 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI return E_OUTOFMEMORY; *data = *src; - data->ref = 1; + data->refcount = 1; data->simulations |= sim; if (sim == DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; @@ -4448,7 +4448,7 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat struct system_fontfile_enumerator { IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; - LONG ref; + LONG refcount; IDWriteFactory7 *factory; HKEY hkey; @@ -4481,15 +4481,15 @@ static HRESULT WINAPI systemfontfileenumerator_QueryInterface(IDWriteFontFileEnu static ULONG WINAPI systemfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - return InterlockedIncrement(&enumerator->ref); + return InterlockedIncrement(&enumerator->refcount); } static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - ULONG ref = InterlockedDecrement(&enumerator->ref); + ULONG refcount = InterlockedDecrement(&enumerator->refcount); - if (!ref) + if (!refcount) { IDWriteFactory7_Release(enumerator->factory); RegCloseKey(enumerator->hkey); @@ -4497,7 +4497,7 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * heap_free(enumerator); } - return ref; + return refcount; } static HRESULT create_local_file_reference(IDWriteFactory7 *factory, const WCHAR *filename, IDWriteFontFile **file) @@ -4614,7 +4614,7 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWri return E_OUTOFMEMORY; enumerator->IDWriteFontFileEnumerator_iface.lpVtbl = &systemfontfileenumeratorvtbl; - enumerator->ref = 1; + enumerator->refcount = 1; enumerator->factory = factory; enumerator->index = -1; enumerator->filename_size = MAX_PATH * sizeof(*enumerator->filename); @@ -5085,7 +5085,7 @@ static struct dwrite_localfontfileloader local_fontfile_loader; struct dwrite_inmemory_stream_data { - LONG ref; + LONG refcount; IUnknown *owner; void *data; UINT32 size; @@ -5094,7 +5094,7 @@ struct dwrite_inmemory_stream_data struct dwrite_inmemory_filestream { IDWriteFontFileStream IDWriteFontFileStream_iface; - LONG ref; + LONG refcount; struct dwrite_inmemory_stream_data *data; }; @@ -5102,7 +5102,7 @@ struct dwrite_inmemory_filestream struct dwrite_inmemory_fileloader { IDWriteInMemoryFontFileLoader IDWriteInMemoryFontFileLoader_iface; - LONG ref; + LONG refcount; struct dwrite_inmemory_stream_data **streams; size_t size; @@ -5131,7 +5131,8 @@ static inline struct dwrite_inmemory_filestream *inmemory_impl_from_IDWriteFontF static void release_inmemory_stream(struct dwrite_inmemory_stream_data *stream) { - if (InterlockedDecrement(&stream->ref) == 0) { + if (InterlockedDecrement(&stream->refcount) == 0) + { if (stream->owner) IUnknown_Release(stream->owner); else @@ -6638,7 +6639,7 @@ static HRESULT WINAPI inmemoryfilestream_QueryInterface(IDWriteFontFileStream *i static ULONG WINAPI inmemoryfilestream_AddRef(IDWriteFontFileStream *iface) { struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); - ULONG refcount = InterlockedIncrement(&stream->ref); + ULONG refcount = InterlockedIncrement(&stream->refcount); TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); @@ -6648,7 +6649,7 @@ static ULONG WINAPI inmemoryfilestream_AddRef(IDWriteFontFileStream *iface) static ULONG WINAPI inmemoryfilestream_Release(IDWriteFontFileStream *iface) { struct dwrite_inmemory_filestream *stream = inmemory_impl_from_IDWriteFontFileStream(iface); - ULONG refcount = InterlockedDecrement(&stream->ref); + ULONG refcount = InterlockedDecrement(&stream->refcount); TRACE_(dwrite_file)("%p, refcount %u.\n", iface, refcount); @@ -6739,7 +6740,7 @@ static HRESULT WINAPI inmemoryfontfileloader_QueryInterface(IDWriteInMemoryFontF static ULONG WINAPI inmemoryfontfileloader_AddRef(IDWriteInMemoryFontFileLoader *iface) { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); - ULONG refcount = InterlockedIncrement(&loader->ref); + ULONG refcount = InterlockedIncrement(&loader->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -6749,7 +6750,7 @@ static ULONG WINAPI inmemoryfontfileloader_AddRef(IDWriteInMemoryFontFileLoader static ULONG WINAPI inmemoryfontfileloader_Release(IDWriteInMemoryFontFileLoader *iface) { struct dwrite_inmemory_fileloader *loader = impl_from_IDWriteInMemoryFontFileLoader(iface); - ULONG refcount = InterlockedDecrement(&loader->ref); + ULONG refcount = InterlockedDecrement(&loader->refcount); size_t i; TRACE("%p, refcount %u.\n", iface, refcount); @@ -6788,9 +6789,9 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateStreamFromKey(IDWriteInMemory return E_OUTOFMEMORY; stream->IDWriteFontFileStream_iface.lpVtbl = &inmemoryfilestreamvtbl; - stream->ref = 1; + stream->refcount = 1; stream->data = loader->streams[index]; - InterlockedIncrement(&stream->data->ref); + InterlockedIncrement(&stream->data->refcount); *ret = &stream->IDWriteFontFileStream_iface; @@ -6814,7 +6815,7 @@ static HRESULT WINAPI inmemoryfontfileloader_CreateInMemoryFontFileReference(IDW if (!(stream = heap_alloc(sizeof(*stream)))) return E_OUTOFMEMORY; - stream->ref = 1; + stream->refcount = 1; stream->size = data_size; stream->owner = owner; if (stream->owner) { @@ -6866,7 +6867,7 @@ HRESULT create_inmemory_fileloader(IDWriteInMemoryFontFileLoader **ret) return E_OUTOFMEMORY; loader->IDWriteInMemoryFontFileLoader_iface.lpVtbl = &inmemoryfontfileloadervtbl; - loader->ref = 1; + loader->refcount = 1; *ret = &loader->IDWriteInMemoryFontFileLoader_iface;

1 0

Nikolay Sivov : dwrite: Implement GetSystemFontSet().
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 318ebc89dcb590c6afa71e5b1504669037979a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=318ebc89dcb590c6afa71e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 11 12:41:23 2021 +0300 dwrite: Implement GetSystemFontSet(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 159 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 25 ++++++++ 2 files changed, 178 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 51020d6f586..3326b1550ce 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1509,11 +1509,152 @@ static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory7 *if return hr; } +static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) +{ + unsigned int index = 0, value_size, name_count, max_name_count, type, data_size; + WCHAR **paths = NULL, *name, *value = NULL; + size_t capacity = 0, count = 0; + HKEY hkey; + LONG r; + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", + 0, GENERIC_READ, &hkey)) + { + return E_UNEXPECTED; + } + + value_size = MAX_PATH * sizeof(*value); + value = heap_alloc(value_size); + + max_name_count = MAX_PATH; + name = heap_alloc(max_name_count * sizeof(*name)); + + for (;;) + { + if (!value) + { + value_size = MAX_PATH * sizeof(*value); + value = heap_alloc(value_size); + } + + do + { + name_count = max_name_count; + data_size = value_size - sizeof(*value); + + r = RegEnumValueW(hkey, index, name, &name_count, NULL, &type, (BYTE *)value, &data_size); + if (r == ERROR_MORE_DATA) + { + if (name_count >= max_name_count) + { + max_name_count *= 2; + heap_free(name); + name = heap_alloc(max_name_count * sizeof(*name)); + } + + if (data_size > value_size - sizeof(*value)) + { + heap_free(value); + value_size = max(data_size + sizeof(*value), value_size * 2); + value = heap_alloc(value_size); + } + } + } while (r == ERROR_MORE_DATA); + + if (r != ERROR_SUCCESS) + break; + + value[data_size / sizeof(*value)] = 0; + if (type == REG_SZ && *name != '@') + { + if (dwrite_array_reserve((void **)&paths, &capacity, count + 1, sizeof(*paths))) + { + if (!strchrW(value, '\\')) + { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR *ptrW; + + ptrW = heap_alloc((MAX_PATH + lstrlenW(value)) * sizeof(WCHAR)); + GetWindowsDirectoryW(ptrW, MAX_PATH); + lstrcatW(ptrW, fontsW); + lstrcatW(ptrW, value); + + heap_free(value); + value = ptrW; + } + + paths[count++] = value; + value = NULL; + } + } + index++; + } + + heap_free(name); + + *ret = paths; + *ret_count = count; + + RegCloseKey(hkey); + + return S_OK; +} + +static int create_system_fontset_compare(const void *left, const void *right) +{ + const WCHAR *_l = *(WCHAR **)left, *_r = *(WCHAR **)right; + return lstrcmpiW(_l, _r); +}; + +static HRESULT create_system_fontset(IDWriteFactory7 *factory, REFIID riid, void **obj) +{ + IDWriteFontSetBuilder2 *builder; + IDWriteFontSet *fontset; + unsigned int i, j, count; + WCHAR **paths; + HRESULT hr; + + *obj = NULL; + + if (FAILED(hr = create_fontset_builder(factory, &builder))) return hr; + + if (SUCCEEDED(hr = create_system_path_list(&paths, &count))) + { + /* Sort, skip duplicates. */ + + qsort(paths, count, sizeof(*paths), create_system_fontset_compare); + + for (i = 0, j = 0; i < count; ++i) + { + if (i != j && !lstrcmpiW(paths[i], paths[j])) continue; + + if (FAILED(hr = IDWriteFontSetBuilder2_AddFontFile(builder, paths[i])) && hr != DWRITE_E_FILEFORMAT) + WARN("Failed to add font file, hr %#x, path %s.\n", hr, debugstr_w(paths[i])); + + j = i; + } + + for (i = 0; i < count; ++i) + heap_free(paths[i]); + heap_free(paths); + } + + if (SUCCEEDED(hr = IDWriteFontSetBuilder2_CreateFontSet(builder, &fontset))) + { + hr = IDWriteFontSet_QueryInterface(fontset, riid, obj); + IDWriteFontSet_Release(fontset); + } + + IDWriteFontSetBuilder2_Release(builder); + + return hr; +} + static HRESULT WINAPI dwritefactory3_GetSystemFontSet(IDWriteFactory7 *iface, IDWriteFontSet **fontset) { - FIXME("%p, %p: stub\n", iface, fontset); + TRACE("%p, %p.\n", iface, fontset); - return E_NOTIMPL; + return create_system_fontset(iface, &IID_IDWriteFontSet, (void **)fontset); } static HRESULT WINAPI dwritefactory3_CreateFontSetBuilder(IDWriteFactory7 *iface, IDWriteFontSetBuilder **builder) @@ -1691,9 +1832,12 @@ static HRESULT WINAPI dwritefactory6_CreateFontResource(IDWriteFactory7 *iface, static HRESULT WINAPI dwritefactory6_GetSystemFontSet(IDWriteFactory7 *iface, BOOL include_downloadable, IDWriteFontSet1 **fontset) { - FIXME("%p, %d, %p.\n", iface, include_downloadable, fontset); + TRACE("%p, %d, %p.\n", iface, include_downloadable, fontset); - return E_NOTIMPL; + if (include_downloadable) + FIXME("Downloadable fonts are not supported.\n"); + + return create_system_fontset(iface, &IID_IDWriteFontSet1, (void **)fontset); } static HRESULT WINAPI dwritefactory6_GetSystemFontCollection(IDWriteFactory7 *iface, BOOL include_downloadable, @@ -1732,9 +1876,12 @@ static HRESULT WINAPI dwritefactory6_CreateTextFormat(IDWriteFactory7 *iface, co static HRESULT WINAPI dwritefactory7_GetSystemFontSet(IDWriteFactory7 *iface, BOOL include_downloadable, IDWriteFontSet2 **fontset) { - FIXME("%p, %d, %p.\n", iface, include_downloadable, fontset); + TRACE("%p, %d, %p.\n", iface, include_downloadable, fontset); - return E_NOTIMPL; + if (include_downloadable) + FIXME("Downloadable fonts are not supported.\n"); + + return create_system_fontset(iface, &IID_IDWriteFontSet2, (void **)fontset); } static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *iface, BOOL include_downloadable, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4367f1d95c8..bded40a53c7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10009,6 +10009,30 @@ static void test_family_font_set(void) ok(!refcount, "Unexpected factory refcount %u.\n", refcount); } +static void test_system_font_set(void) +{ + IDWriteFactory3 *factory; + IDWriteFontSet *fontset; + unsigned int count; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory3))) + { + win_skip("System font set is not supported.\n"); + return; + } + + hr = IDWriteFactory3_GetSystemFontSet(factory, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteFontSet_GetFontCount(fontset); + ok(!!count, "Unexpected font count %u.\n", count); + + IDWriteFontSet_Release(fontset); + + IDWriteFactory3_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10081,6 +10105,7 @@ START_TEST(font) test_GetVerticalGlyphVariants(); test_expiration_event(); test_family_font_set(); + test_system_font_set(); IDWriteFactory_Release(factory); }

1 0

Hugh McMaster : regedit/tests: Add tests for escaped null characters.
by Alexandre Julliard March 11, 2021

March 11, 2021

Module: wine Branch: master Commit: 7eb77bef05243621ce7facf8797c3c0f64fdaa92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb77bef05243621ce7facf8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 11 21:37:51 2021 +1100 regedit/tests: Add tests for escaped null characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 134 +++++++++++++++++++++++---------------- 1 file changed, 80 insertions(+), 54 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0f58b6d85b8..9b431fa6f38 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -677,6 +677,22 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test with escaped null characters */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine23a\"=\"\\\\0\"\n" + "\"Wine23b\"=\"\\\\0\\\\0\"\n" + "\"Wine23c\"=\"Value1\\\\0\"\n" + "\"Wine23d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine23e\"=\"Value3\\\\0Value4\"\n" + "\"Wine23f\"=\"\\\\0Value5\"\n\n"); + verify_reg(hkey, "Wine23a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine23b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine23c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine23d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine23e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine23f", REG_SZ, "\\0Value5", 9, 0); + /* Test forward and back slashes */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1100,6 +1116,22 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test with escaped null characters */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine23a\"=\"\\\\0\"\n" + "\"Wine23b\"=\"\\\\0\\\\0\"\n" + "\"Wine23c\"=\"Value1\\\\0\"\n" + "\"Wine23d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine23e\"=\"Value3\\\\0Value4\"\n" + "\"Wine23f\"=\"\\\\0Value5\"\n\n"); + verify_reg(hkey, "Wine23a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine23b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine23c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine23d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine23e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine23f", REG_SZ, "\\0Value5", 9, 0); + /* Test forward and back slashes */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1656,33 +1688,18 @@ static void test_invalid_import(void) /* Test with embedded null characters */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine33a\"=\"\\0\n" - "\"Wine33b\"=\"\\0\\0\n" - "\"Wine33c\"=\"Value1\\0\n" - "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value5\n\n"); - verify_reg_nonexist(hkey, "Wine33a"); - verify_reg_nonexist(hkey, "Wine33b"); - verify_reg_nonexist(hkey, "Wine33c"); - verify_reg_nonexist(hkey, "Wine33d"); - verify_reg_nonexist(hkey, "Wine33e"); - verify_reg_nonexist(hkey, "Wine33f"); - - exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine34a\"=\"\\0\"\n" - "\"Wine34b\"=\"\\0\\0\"\n" - "\"Wine34c\"=\"Value1\\0\"\n" - "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" - "\"Wine34e\"=\"Value3\\0Value4\"\n" - "\"Wine34f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); - todo_wine verify_reg_nonexist(hkey, "Wine34c"); - todo_wine verify_reg_nonexist(hkey, "Wine34d"); - todo_wine verify_reg_nonexist(hkey, "Wine34e"); - todo_wine verify_reg_nonexist(hkey, "Wine34f"); + "\"Wine33a\"=\"\\0\"\n" + "\"Wine33b\"=\"\\0\\0\"\n" + "\"Wine33c\"=\"Value1\\0\"\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine33e\"=\"Value3\\0Value4\"\n" + "\"Wine33f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); + todo_wine verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -2182,33 +2199,18 @@ static void test_invalid_import_unicode(void) /* Test with embedded null characters */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine33a\"=\"\\0\n" - "\"Wine33b\"=\"\\0\\0\n" - "\"Wine33c\"=\"Value1\\0\n" - "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value5\n\n"); - verify_reg_nonexist(hkey, "Wine33a"); - verify_reg_nonexist(hkey, "Wine33b"); - verify_reg_nonexist(hkey, "Wine33c"); - verify_reg_nonexist(hkey, "Wine33d"); - verify_reg_nonexist(hkey, "Wine33e"); - verify_reg_nonexist(hkey, "Wine33f"); - - exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine34a\"=\"\\0\"\n" - "\"Wine34b\"=\"\\0\\0\"\n" - "\"Wine34c\"=\"Value1\\0\"\n" - "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" - "\"Wine34e\"=\"Value3\\0Value4\"\n" - "\"Wine34f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); - todo_wine verify_reg_nonexist(hkey, "Wine34c"); - todo_wine verify_reg_nonexist(hkey, "Wine34d"); - todo_wine verify_reg_nonexist(hkey, "Wine34e"); - todo_wine verify_reg_nonexist(hkey, "Wine34f"); + "\"Wine33a\"=\"\\0\"\n" + "\"Wine33b\"=\"\\0\\0\"\n" + "\"Wine33c\"=\"Value1\\0\"\n" + "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine33e\"=\"Value3\\0Value4\"\n" + "\"Wine33f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); + todo_wine verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -3559,6 +3561,16 @@ static void test_export(void) "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Wine5a\"=\"\\\\0\"\r\n" + "\"Wine5b\"=\"\\\\0\\\\0\"\r\n" + "\"Wine5c\"=\"Value1\\\\0\"\r\n" + "\"Wine5d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\r\n" + "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" + "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -3725,6 +3737,20 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with escaped null characters */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\\0\\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\\0\\0\\0\\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\\0Value5", 9); + close_key(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + delete_key(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0