- wine-devel - winehq.org

[PATCH 1/2] mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Connor McAdams 05 Apr '21

05 Apr '21

Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..45781d3725a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3965,6 +3965,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5293,6 +5299,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride; -- 2.25.1

3 3

[PATCH] jscript: Use quiet NaNs in jsval.
by Jacek Caban 05 Apr '21

05 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50845 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsval.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 1/5] reg: Constify the type member of struct reg_type_rels
by Hugh McMaster 05 Apr '21

05 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index c7719a6e4f0..c281770bdb4 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,7 @@ /* reg.c */ struct reg_type_rels { - DWORD type; + const DWORD type; const WCHAR *name; }; -- 2.31.0

2 5

[PATCH 1/2] mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Connor McAdams 05 Apr '21

05 Apr '21

Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..45781d3725a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3965,6 +3965,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5293,6 +5299,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride; -- 2.25.1

4 4

[PATCH 5/6] mshtml: Expose IHTMLStyleElement2 to scripts.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyleelem.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 9 +++++++++ 2 files changed, 28 insertions(+), 2 deletions(-)

2 1

[PATCH 4/6] mshtml: Don't expose readyState property to elements in IE11 mode.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+)

2 1

[PATCH 1/2] conhost: Wrap around immediately if ENABLE_VIRTUAL_TERMINAL_PROCESSING is not set.
by Jacek Caban 05 Apr '21

05 Apr '21

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 11 ++++- programs/conhost/tests/tty.c | 82 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-)

2 1

[PATCH v5 1/3] conhost: Add the ENABLE_VIRTUAL_TERMINAL_PROCESSING mode flag by default.
by Gabriel Ivăncescu 05 Apr '21

05 Apr '21

Newer versions of Windows set it by default. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 39544fb..54ead48 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -80,7 +80,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = calloc( 1, sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; - screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING; screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; -- 2.30.0

2 3

[PATCH 2/2] conhost: Fix line wrapping around when ENABLE_VIRTUAL_TERMINAL_PROCESSING is set.
by Jacek Caban 05 Apr '21

05 Apr '21

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Remember the fact we completed the entire line but normalize the cursor otherwise. A newline is delayed so it wraps when writing a new character if the cursor is outside the width. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 36 ++++++++++------ programs/conhost/conhost.h | 5 +++ programs/conhost/tests/tty.c | 80 ++++++++++++++++++++++++++++++++++-- programs/conhost/window.c | 6 +-- 4 files changed, 107 insertions(+), 20 deletions(-)

1 0

[PATCH 6/6] include: Add IHTMLStyleSheet4 and IHTMLCSSRule declarations.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 18 ++++++++ include/mshtml.idl | 100 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+)

1 0

[PATCH 3/6] mshtml: Add IHTMLStyleElement2 implementation.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyleelem.c | 81 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 11 +++++ 3 files changed, 93 insertions(+)

1 0

[PATCH 2/6] include: Add IHTMLStyleElement2 declaration.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] mshtml: Add IHTMLStyleElement::onload and onerror implementation.
by Jacek Caban 05 Apr '21

05 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyleelem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH] mfreadwrite/tests: Fix testing of a source with one stream.
by Giovanni Mascellani 05 Apr '21

05 Apr '21

Even when a lower stream count was requested, most of the implementation still used ARRAY_SIZE(source->streams) as actual count, so the implemented behaviour was not the desired one. Also, it implied undefined behaviour. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c27806f699e..8ea4e5038f6 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -255,6 +255,7 @@ struct test_source IMFMediaEventQueue *event_queue; IMFPresentationDescriptor *pd; struct test_media_stream *streams[TEST_SOURCE_NUM_STREAMS]; + unsigned stream_count; enum source_state state; CRITICAL_SECTION cs; }; @@ -352,7 +353,7 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i } else { - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); @@ -368,9 +369,9 @@ static HRESULT WINAPI test_source_CreatePresentationDescriptor(IMFMediaSource *i IMFMediaType_Release(media_type); } - hr = MFCreatePresentationDescriptor(ARRAY_SIZE(sds), sds, &source->pd); + hr = MFCreatePresentationDescriptor(source->stream_count, sds, &source->pd); ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(sds); ++i) + for (i = 0; i < source->stream_count; ++i) IMFStreamDescriptor_Release(sds[i]); *pd = source->pd; @@ -413,7 +414,7 @@ static HRESULT WINAPI test_source_Start(IMFMediaSource *iface, IMFPresentationDe hr = IMFMediaEventQueue_QueueEventParamVar(source->event_queue, event_type, &GUID_NULL, S_OK, NULL); ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < source->stream_count; ++i) { if (!is_stream_selected(pd, i)) continue; @@ -501,7 +502,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia return stream; } -static IMFMediaSource *create_test_source(int stream_num) +static IMFMediaSource *create_test_source(int stream_count) { struct test_source *source; int i; @@ -509,9 +510,10 @@ static IMFMediaSource *create_test_source(int stream_num) source = heap_alloc_zero(sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; + source->stream_count = stream_count; MFCreateEventQueue(&source->event_queue); InitializeCriticalSection(&source->cs); - for (i = 0; i < stream_num; ++i) + for (i = 0; i < source->stream_count; ++i) source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); return &source->IMFMediaSource_iface; -- 2.31.0

3 2

[PATCH v3 1/5] wined3d: Introduce wined3d_device_context_draw_indexed().
by Zebediah Figura 05 Apr '21

05 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e578e51de68..278bc8677e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2409,6 +2409,18 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u 0, start_vertex, vertex_count, start_instance, instance_count, false); } +void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, base_vertex_index %d, start_index %u, index_count %u, start_instance %u, instance_count %u.\n", + context, base_vertex_index, start_index, index_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + base_vertex_index, start_index, index_count, start_instance, instance_count, true); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4486,8 +4498,7 @@ void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, @@ -4498,8 +4509,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, + start_idx, index_count, start_instance, instance_count); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 087a6bead13..bae5a6d42f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) +@ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3316d6f6653..ee02914b0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2562,6 +2562,8 @@ void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_cont struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, 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, -- 2.30.2

2 9

[v2 PATCH] d2d1: Implement ID2D1Multithread.
by Nikolay Sivov 05 Apr '21

05 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: should fix test crashes dlls/d2d1/factory.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 68 +++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2a9de448c6e..b65727d3a32 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,12 +30,15 @@ struct d2d_settings d2d_settings = struct d2d_factory { ID2D1Factory2 ID2D1Factory2_iface; + ID2D1Multithread ID2D1Multithread_iface; LONG refcount; ID3D10Device1 *device; float dpi_x; float dpi_y; + + CRITICAL_SECTION cs; }; static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) @@ -43,6 +46,11 @@ static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } +static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Multithread_iface); +} + static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) { HDC hdc; @@ -63,6 +71,8 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) @@ -74,6 +84,12 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface *out = iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_ID2D1Multithread)) + { + ID2D1Factory2_AddRef(iface); + *out = &factory->ID2D1Multithread_iface; + return S_OK; + } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -102,6 +118,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); + DeleteCriticalSection(&factory->cs); heap_free(factory); } @@ -593,17 +610,92 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_ID2D1Factory1_CreateDevice, }; +static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_QueryInterface(&factory->ID2D1Factory2_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_AddRef(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_AddRef(&factory->ID2D1Factory2_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_Release(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_Release(&factory->ID2D1Factory2_iface); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_mt_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return TRUE; +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return EnterCriticalSection(&factory->cs); +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return LeaveCriticalSection(&factory->cs); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_factory_st_Enter(ID2D1Multithread *iface) +{ +} + +static void STDMETHODCALLTYPE d2d_factory_st_Leave(ID2D1Multithread *iface) +{ +} + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_mt_GetMultithreadProtected, + d2d_factory_mt_Enter, + d2d_factory_mt_Leave, +}; + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_noop_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_st_GetMultithreadProtected, + d2d_factory_st_Enter, + d2d_factory_st_Leave, +}; + static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) - FIXME("Ignoring factory type %#x.\n", factory_type); if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Multithread_iface.lpVtbl = factory_type == D2D1_FACTORY_TYPE_SINGLE_THREADED ? + &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); + InitializeCriticalSection(&factory->cs); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, @@ -615,6 +707,12 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED && + factory_type != D2D1_FACTORY_TYPE_MULTI_THREADED) + { + return E_INVALIDARG; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a046a21c7f6..8dbad9c5ecc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9614,6 +9614,73 @@ static void test_geometry_group(BOOL d3d11) ID2D1Factory_Release(factory); } +static DWORD WINAPI mt_factory_test_thread_func(void *param) +{ + ID2D1Multithread *multithread = param; + + ID2D1Multithread_Enter(multithread); + + return 0; +} + +static void test_mt_factory(BOOL d3d11) +{ + ID2D1Multithread *multithread; + ID2D1Factory *factory; + HANDLE thread; + HRESULT hr; + DWORD ret; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED + 1, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + if (hr == E_NOINTERFACE) + { + win_skip("ID2D1Multithread is not supported.\n"); + ID2D1Factory_Release(factory); + return; + } + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + ID2D1Factory_Release(factory); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + ret = WaitForSingleObject(thread, 10); + ok(ret == WAIT_TIMEOUT, "Expected timeout.\n"); + ID2D1Multithread_Leave(multithread); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9674,6 +9741,7 @@ START_TEST(d2d1) queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); + queue_test(test_mt_factory); run_queued_tests(); } -- 2.30.2

2 1

[PATCH v2 1/2] msxml3/tests: Add a test for saving XML with not default encoding.
by Dmitry Timoshkov 05 Apr '21

05 Apr '21

v2: Use encoding="windows-1252" instead of encoding="iso-8859-1" to avoid a test failure caused by a Vista bug. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e94a2c88a81..5bc2fe1d5c3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8522,10 +8522,19 @@ static void test_events(void) static void test_createProcessingInstruction(void) { + static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; + static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMElement *element; WCHAR buff[10]; + BSTR xml; + VARIANT var; HRESULT hr; + IStream *stream; + HGLOBAL global; + char *p; doc = create_document(&IID_IXMLDOMDocument); @@ -8538,6 +8547,47 @@ static void test_createProcessingInstruction(void) IXMLDOMProcessingInstruction_Release(pi); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("test"), &element); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)element, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMElement_Release(element); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!wcscmp(xml, xml1), "got %s\n", wine_dbgstr_w(xml)); + SysFreeString(xml); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; +todo_wine + ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + IStream_Release(stream); + + IXMLDOMDocument_Release(doc); } static void test_put_nodeTypedValue(void) -- 2.30.2

2 1

[PATCH] po: Update Polish translation.
by Łukasz Wojniłowicz 05 Apr '21

05 Apr '21

Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> --- po/pl.po | 360 ++++++++++++++++++++++--------------------------------- 1 file changed, 144 insertions(+), 216 deletions(-) diff --git a/po/pl.po b/po/pl.po index f2ddc11..4b50889 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,6 +1,6 @@ # Polish translations for Wine # -# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. +# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014, 2021. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. # Marcin Mikołajczak <me(a)m4sk.in>, 2017, 2018. msgid "" @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-02-24 13:47+0100\n" -"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" +"PO-Revision-Date: 2021-04-05 10:02+0200\n" +"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 20.12.1\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10" +" || n%100>=20) ? 1 : 2);\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -25,30 +25,27 @@ msgid "Security" msgstr "Prawa dostępu" #: dlls/aclui/aclui.rc:32 -#, fuzzy #| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Użytkownik:" +msgstr "Nazwy &grup lub użytkowników:" #: dlls/aclui/aclui.rc:38 -#, fuzzy #| msgid "Yellow" msgid "Allow" -msgstr "Żółty" +msgstr "Zezwól" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Odmów" #: dlls/aclui/aclui.rc:47 -#, fuzzy #| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Uprawnienia dla %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -msgstr "Zainstaluj/Odinstaluj" +msgstr "Wgraj/Usuń" #: dlls/appwiz.cpl/appwiz.rc:61 msgid "" @@ -56,11 +53,11 @@ msgid "" "drive, click Install." msgstr "" "Aby dodać program z dysku, płyty CD-ROM lub dyskietki, kliknij przycisk " -"Zainstaluj." +"Wgraj." #: dlls/appwiz.cpl/appwiz.rc:62 msgid "&Install..." -msgstr "Za&instaluj..." +msgstr "&Wgraj..." #: dlls/appwiz.cpl/appwiz.rc:65 msgid "" @@ -190,7 +187,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:109 dlls/appwiz.cpl/appwiz.rc:124 msgid "&Install" -msgstr "Za&instaluj" +msgstr "&Wgraj" #: dlls/appwiz.cpl/appwiz.rc:110 dlls/appwiz.cpl/appwiz.rc:125 #: dlls/avifil32/avifil32.rc:55 dlls/browseui/browseui.rc:45 @@ -400,18 +397,17 @@ msgid "%1!u! %2 and %3!u! %4 remaining" msgstr "" #: dlls/browseui/browseui.rc:31 -#, fuzzy #| msgid "&Seconds" msgid "seconds" -msgstr "&Sekundy" +msgstr "sekundy" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuty" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "godziny" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" @@ -456,7 +452,7 @@ msgstr "&Zamknij" #: dlls/comctl32/comctl32.rc:101 msgid "R&eset" -msgstr "Z&resetuj" +msgstr "Wyze&ruj" #: dlls/comctl32/comctl32.rc:102 dlls/comdlg32/comdlg32.rc:173 #: dlls/comdlg32/comdlg32.rc:195 dlls/comdlg32/comdlg32.rc:266 @@ -526,16 +522,14 @@ msgid "&Retry" msgstr "&Ponów próbę" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy #| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Ukryj &karty" +msgstr "Ukryj szczegóły" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy #| msgid "Details" msgid "See details" -msgstr "Szczegóły" +msgstr "Obejrzyj szczegóły" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -742,8 +736,9 @@ msgid "&Custom Colors:" msgstr "Własne &kolory:" #: dlls/comdlg32/comdlg32.rc:289 +#, fuzzy msgid "|S&olid" -msgstr "" +msgstr "Ciągła" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -780,11 +775,10 @@ msgid "&Define Custom Colors >>" msgstr "Z&definiuj własne kolory >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy #| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nie" +msgstr "&o" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -897,7 +891,7 @@ msgstr "&Sortuj" #: dlls/comdlg32/comdlg32.rc:414 programs/winecfg/winecfg.rc:298 msgid "Si&ze:" -msgstr "Wielkość:" +msgstr "Ro&zmiar:" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" @@ -1143,7 +1137,7 @@ msgid "" "Please reenter margins." msgstr "" "Marginesy znajdują się poza stroną.\n" -"Wprowadź inną wielkość marginesu." +"Wprowadź inny rozmiar marginesu." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -2256,7 +2250,7 @@ msgstr "Ogólne" #: dlls/cryptui/cryptui.rc:196 msgid "&Install Certificate..." -msgstr "&Zainstaluj certyfikat..." +msgstr "Wgraj certyf&ikat..." #: dlls/cryptui/cryptui.rc:197 msgid "Issuer &Statement" @@ -2272,7 +2266,7 @@ msgstr "&Edytuj właściwości..." #: dlls/cryptui/cryptui.rc:211 msgid "&Copy to File..." -msgstr "&Kopiuj do pliku..." +msgstr "&Skopiuj do pliku..." #: dlls/cryptui/cryptui.rc:215 msgid "Certification Path" @@ -2601,10 +2595,9 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Praca kreatora eksportu certyfikatów została zakończona pomyślnie." #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy #| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Wybór magazynu certyfikatów" +msgstr "Wybierz certyfikat" #: dlls/cryptui/cryptui.rc:459 #, fuzzy @@ -3146,10 +3139,9 @@ msgstr "" "eksportu." #: dlls/cryptui/cryptui.rc:177 -#, fuzzy #| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Zamierzone cele:" +msgstr "Zamiar użycia" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:152 msgid "Location" @@ -3289,7 +3281,7 @@ msgstr "Pliki w aparacie" #: dlls/gphoto2.ds/gphoto2.rc:34 msgid "Import Selected" -msgstr "Skopiuj wybrane" +msgstr "Zaimportuj zaznaczone" #: dlls/gphoto2.ds/gphoto2.rc:35 msgid "Preview" @@ -3297,7 +3289,7 @@ msgstr "Podgląd" #: dlls/gphoto2.ds/gphoto2.rc:36 msgid "Import All" -msgstr "Skopiuj wszystkie" +msgstr "Zaimportuj wszystkie" #: dlls/gphoto2.ds/gphoto2.rc:37 msgid "Skip This Dialog" @@ -3383,7 +3375,7 @@ msgstr "Wy&tnij" #: dlls/user32/user32.rc:61 programs/conhost/conhost.rc:36 #: programs/winhlp32/winhlp32.rc:40 programs/wordpad/wordpad.rc:113 msgid "&Copy" -msgstr "&Kopiuj" +msgstr "&Skopiuj" #: dlls/hhctrl.ocx/hhctrl.rc:89 dlls/shdoclc/shdoclc.rc:119 #: dlls/shell32/shell32.rc:64 @@ -3671,10 +3663,9 @@ msgid "Publishers..." msgstr "Wydawcy..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy #| msgid "LAN Connection" msgid "Connections" -msgstr "Połączenie LAN" +msgstr "Połączenia" #: dlls/inetcpl.cpl/inetcpl.rc:125 #, fuzzy @@ -3691,26 +3682,23 @@ msgid "Use Proxy Auto-Config (PAC) script" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy #| msgid "Address" msgid "Address:" -msgstr "Adres" +msgstr "Adres:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy #| msgid "&Local server" msgid "Proxy server" -msgstr "Serwer &lokalny" +msgstr "Serwer pośredniczący" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy #| msgid "No Ports" msgid "Port:" -msgstr "Brak portów" +msgstr "Port:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3730,7 +3718,7 @@ msgstr "Dostosuj" #: dlls/inetcpl.cpl/inetcpl.rc:35 msgid "Very Low" -msgstr "Najniższy" +msgstr "Bardzo nisko" #: dlls/inetcpl.cpl/inetcpl.rc:36 dlls/wininet/wininet.rc:42 msgid "Low" @@ -3821,10 +3809,9 @@ msgid "Subscript out of range" msgstr "Indeks dolny poza zakresem" #: dlls/jscript/jscript.rc:31 -#, fuzzy #| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Brak papieru; " +msgstr "Wyczerpano pamięć stosu" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -7000,16 +6987,14 @@ msgid "Connection reset by peer.\n" msgstr "Połączenie wyzerowane przez uczestnika.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy #| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Nie zaimplementowane" +msgstr "Niezaimplementowane.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy #| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Wywołanie RPC nieudane.\n" +msgstr "Nie udało się wywołać.\n" #: dlls/kernel32/winerror.mc:3760 #, fuzzy @@ -7018,10 +7003,9 @@ msgid "No Signature found in file.\n" msgstr "Nie znaleziono wiadomości 0x%1 w pliku %2.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy #| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Niepoprawny poziom.\n" +msgstr "Nieprawidłowe wywołanie.\n" #: dlls/kernel32/winerror.mc:3781 #, fuzzy @@ -7091,10 +7075,9 @@ msgid "Sink has not been finalized.\n" msgstr "Nie znaleziono UUID obiektu.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy #| msgid "Class already exists.\n" msgid "Clock was stopped\n" -msgstr "Klasa już istnieje.\n" +msgstr "Zegar został zatrzymany\n" #: dlls/mferror/mferror.mc:32 #, fuzzy @@ -7103,16 +7086,14 @@ msgid "Media Foundation platform is not initialized.\n" msgstr "Platforma instalacyjna niewspierana.\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy #| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Liczba bajtów zbyt mała.\n" +msgstr "Zbyt mały bufor.\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy #| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Niepoprawne składnia kwerendy.\n" +msgstr "Nieprawidłowe żądanie.\n" #: dlls/mferror/mferror.mc:53 #, fuzzy @@ -7149,28 +7130,24 @@ msgid "No more types in the list of suggested media types.\n" msgstr "" #: dlls/mferror/mferror.mc:95 -#, fuzzy #| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Niewspierany typ.\n" +msgstr "Nieobsługiwana usługa.\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy #| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Nieoczekiwany błąd sieciowy.\n" +msgstr "Nieoczekiwany błąd.\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy #| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Niepoprawny czas.\n" +msgstr "Niepoprawny rodzaj.\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy #| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Niepoprawny format piksela.\n" +msgstr "Nieprawidłowy format pliku.\n" #: dlls/mferror/mferror.mc:137 #, fuzzy @@ -7217,10 +7194,9 @@ msgid "Realtime support is not available.\n" msgstr "Pomoc nie jest dostępna." #: dlls/mferror/mferror.mc:193 -#, fuzzy #| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Niewspierany typ.\n" +msgstr "Nieobsługiwana szybkość.\n" #: dlls/mferror/mferror.mc:200 #, fuzzy @@ -7303,10 +7279,9 @@ msgid "Sample is not writable.\n" msgstr "Katalog tymczasowy jest nie do zapisu.\n" #: dlls/mferror/mferror.mc:312 -#, fuzzy #| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Niepoprawna ścieżka.\n" +msgstr "Nieprawidłowy klucz.\n" #: dlls/mferror/mferror.mc:319 #, fuzzy @@ -7321,10 +7296,9 @@ msgid "Unsupported caption.\n" msgstr "Niewspierany typ.\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy #| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Niepoprawna stacja robocza.\n" +msgstr "Nieprawidłowe położenie.\n" #: dlls/mferror/mferror.mc:340 #, fuzzy @@ -7605,10 +7579,9 @@ msgid "Stream descriptor is not selected.\n" msgstr "Urządzenie jest niepodłączone.\n" #: dlls/mferror/mferror.mc:697 -#, fuzzy #| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Brakuje wskaźnika.\n" +msgstr "Brakuje źródła.\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -8723,10 +8696,9 @@ msgid "Off" msgstr "Wyłączone" #: dlls/oledb32/version.rc:56 -#, fuzzy #| msgid "video" msgid "Provider" -msgstr "obraz" +msgstr "Dostawca" #: dlls/oledb32/version.rc:59 #, fuzzy @@ -8735,10 +8707,9 @@ msgid "Select the data you want to connect to:" msgstr "Wybierz format, którego chcesz użyć:" #: dlls/oledb32/version.rc:66 -#, fuzzy #| msgid "LAN Connection" msgid "Connection" -msgstr "Połączenie LAN" +msgstr "Połączenie" #: dlls/oledb32/version.rc:69 #, fuzzy @@ -8763,32 +8734,28 @@ msgid "Use c&onnection string" msgstr "Wyzerowane połączenia" #: dlls/oledb32/version.rc:75 -#, fuzzy #| msgid "LAN Connection" msgid "&Connection string:" -msgstr "Połączenie LAN" +msgstr "&Ciąg znaków połączenia:" #: dlls/oledb32/version.rc:77 -#, fuzzy #| msgid "A&dd..." msgid "B&uild..." -msgstr "&Dodaj..." +msgstr "B&uduj..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy #| msgid "&User name:" msgid "User &name:" -msgstr "&Użytkownik:" +msgstr "&Nazwa użytkownika:" #: dlls/oledb32/version.rc:83 -#, fuzzy #| msgid "&Blank page" msgid "&Blank password" -msgstr "Użyj pu&stej" +msgstr "&Puste hasło" #: dlls/oledb32/version.rc:84 #, fuzzy @@ -8801,20 +8768,18 @@ msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy #| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Wyzerowane połączenia" +msgstr "&Testuj połączenie" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Zaawansowany" #: dlls/oledb32/version.rc:95 -#, fuzzy #| msgid "Network share" msgid "Network settings" -msgstr "Zasób sieciowy" +msgstr "Ustawienia sieciowe" #: dlls/oledb32/version.rc:96 #, fuzzy @@ -8827,28 +8792,24 @@ msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy #| msgid "Connected" msgid "Connect:" -msgstr "Włączone" +msgstr "Połącz:" #: dlls/oledb32/version.rc:103 -#, fuzzy #| msgid "&Seconds" msgid "seconds." -msgstr "&Sekundy" +msgstr "sekund." #: dlls/oledb32/version.rc:104 -#, fuzzy #| msgid "Success" msgid "A&ccess:" -msgstr "Powodzenie" +msgstr "&Dostęp:" #: dlls/oledb32/version.rc:110 -#, fuzzy #| msgid "&All" msgid "All" -msgstr "&Cały rejestr" +msgstr "Wszystkie" #: dlls/oledb32/version.rc:114 msgid "" @@ -8857,16 +8818,14 @@ msgid "" msgstr "" #: dlls/oledb32/version.rc:115 -#, fuzzy #| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Edycja..." +msgstr "Zmi&eń wartość..." #: dlls/oledb32/version.rc:49 -#, fuzzy #| msgid "Properties" msgid "Data Link Error" -msgstr "Właściwości" +msgstr "Błąd odnośnika danych" #: dlls/oledb32/version.rc:50 #, fuzzy @@ -8891,16 +8850,14 @@ msgid "OLE DB Provider(s)" msgstr "" #: dlls/oledb32/version.rc:41 -#, fuzzy #| msgid "Ready" msgid "Read" -msgstr "Gotowe" +msgstr "Odczyt" #: dlls/oledb32/version.rc:42 -#, fuzzy #| msgid "Readme:" msgid "ReadWrite" -msgstr "CzytajTo:" +msgstr "OdczytZapis" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -8919,10 +8876,9 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy #| msgid "I/O Writes" msgid "Write" -msgstr "Zapisy We/Wy" +msgstr "Zapis" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -8970,7 +8926,7 @@ msgstr "Wklej specjalnie" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "Kopiuj pliki z:" +msgstr "Skopiuj pliki z:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9170,7 +9126,7 @@ msgstr "Kopiowanie plików..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "Kopiuj pliki do:" +msgstr "Skopiuj pliki do:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9186,7 +9142,7 @@ msgstr "" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "Kopiuj pliki producenta z:" +msgstr "Skopiuj pliki producenta z:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" @@ -9198,7 +9154,7 @@ msgstr "Nieznane" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "Kopiuj pliki z:" +msgstr "Skopiuj pliki z:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9218,7 +9174,7 @@ msgstr "&Ustaw jako tło" #: dlls/shdoclc/shdoclc.rc:46 msgid "&Copy Background" -msgstr "Kop&iuj tło" +msgstr "Skop&iuj tło" #: dlls/shdoclc/shdoclc.rc:47 msgid "Set as &Desktop Item" @@ -9296,7 +9252,7 @@ msgstr "Ustaw jako &element pulpitu..." #: dlls/shdoclc/shdoclc.rc:81 dlls/shdoclc/shdoclc.rc:134 #: dlls/shdoclc/shdoclc.rc:161 dlls/shdoclc/shdoclc.rc:185 msgid "Copy Shor&tcut" -msgstr "Kopiuj &skrót" +msgstr "Skopiuj &skrót" #: dlls/shdoclc/shdoclc.rc:86 dlls/shdoclc/shdoclc.rc:139 #: dlls/shdoclc/shdoclc.rc:168 dlls/shdoclc/shdoclc.rc:194 @@ -9650,10 +9606,9 @@ msgid "&Browse..." msgstr "&Przeglądaj..." #: dlls/shell32/shell32.rc:355 dlls/shell32/shell32.rc:384 -#, fuzzy #| msgid "File type" msgid "File type:" -msgstr "Typ pliku" +msgstr "Rodzaj pliku:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:32 @@ -9663,19 +9618,17 @@ msgstr "Położenie:" #: dlls/shell32/shell32.rc:361 dlls/shell32/shell32.rc:394 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "Wie&lkość:" +msgstr "Rozmiar:" #: dlls/shell32/shell32.rc:365 dlls/shell32/shell32.rc:398 -#, fuzzy #| msgid "Creation date" msgid "Creation date:" -msgstr "Data utworzenia" +msgstr "Data utworzenia:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 -#, fuzzy #| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Atrybuty:" +msgstr "Atrybuty:" #: dlls/shell32/shell32.rc:371 dlls/shell32/shell32.rc:408 #: programs/winefile/winefile.rc:173 @@ -9688,28 +9641,24 @@ msgid "&Archive" msgstr "&Archiwalny" #: dlls/shell32/shell32.rc:386 -#, fuzzy #| msgid "Open:" msgid "Open with:" -msgstr "Otwórz:" +msgstr "Otwórz za pomocą:" #: dlls/shell32/shell32.rc:389 -#, fuzzy #| msgid "Change &Icon..." msgid "&Change..." -msgstr "Zmień &ikonę..." +msgstr "&Zmień..." #: dlls/shell32/shell32.rc:400 -#, fuzzy #| msgid "Modified" msgid "Last modified:" -msgstr "Zmieniony" +msgstr "Ostatnio zmieniony:" #: dlls/shell32/shell32.rc:402 -#, fuzzy #| msgid "Last Change:" msgid "Last accessed:" -msgstr "Ostatnio zmieniony:" +msgstr "Ostatnio otwierany:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -9731,7 +9680,7 @@ msgstr "Atrybuty" #: dlls/shell32/shell32.rc:143 msgid "Size available" -msgstr "Dostępna wielkość" +msgstr "Dostępny rozmiar" #: dlls/shell32/shell32.rc:145 msgid "Comments" @@ -10137,7 +10086,7 @@ msgstr "Zaznacz źródło" #: dlls/tzres/tzres.rc:90 msgid "China Standard Time" -msgstr "" +msgstr "Czas urzędowy chiński" #: dlls/tzres/tzres.rc:91 msgid "China Daylight Time" @@ -10176,10 +10125,9 @@ msgid "Cape Verde Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:126 -#, fuzzy #| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "Data i godzina" +msgstr "Czas urzędowy Haiti" #: dlls/tzres/tzres.rc:127 #, fuzzy @@ -10264,10 +10212,9 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: dlls/tzres/tzres.rc:118 -#, fuzzy #| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy GMT" #: dlls/tzres/tzres.rc:119 msgid "GMT Daylight Time" @@ -10327,7 +10274,7 @@ msgstr "" #: dlls/tzres/tzres.rc:186 msgid "Pacific Standard Time" -msgstr "" +msgstr "Czas urzędowy pacyficzny" #: dlls/tzres/tzres.rc:187 msgid "Pacific Daylight Time" @@ -10402,10 +10349,9 @@ msgid "Line Islands Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:92 -#, fuzzy #| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "Data i godzina" +msgstr "Czas urzędowy kubański" #: dlls/tzres/tzres.rc:93 #, fuzzy @@ -10423,7 +10369,7 @@ msgstr "" #: dlls/tzres/tzres.rc:84 msgid "Central Standard Time" -msgstr "" +msgstr "Czas urzędowy środkowy" #: dlls/tzres/tzres.rc:85 msgid "Central Daylight Time" @@ -10447,7 +10393,7 @@ msgstr "" #: dlls/tzres/tzres.rc:42 msgid "Argentina Standard Time" -msgstr "" +msgstr "Czas urzędowy argentyński" #: dlls/tzres/tzres.rc:43 msgid "Argentina Daylight Time" @@ -10479,17 +10425,16 @@ msgstr "" #: dlls/tzres/tzres.rc:130 msgid "India Standard Time" -msgstr "" +msgstr "Czas urzędowy indyjski" #: dlls/tzres/tzres.rc:131 msgid "India Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:124 -#, fuzzy #| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy GTB" #: dlls/tzres/tzres.rc:125 msgid "GTB Daylight Time" @@ -10577,7 +10522,7 @@ msgstr "" #: dlls/tzres/tzres.rc:104 msgid "Eastern Standard Time" -msgstr "" +msgstr "Czas urzędowy wschodni" #: dlls/tzres/tzres.rc:105 msgid "Eastern Daylight Time" @@ -10601,7 +10546,7 @@ msgstr "" #: dlls/tzres/tzres.rc:162 msgid "Mountain Standard Time" -msgstr "" +msgstr "Czas urzędowy górski" #: dlls/tzres/tzres.rc:163 msgid "Mountain Daylight Time" @@ -10805,7 +10750,7 @@ msgstr "" #: dlls/tzres/tzres.rc:58 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Czas urzędowy bangladeski" #: dlls/tzres/tzres.rc:59 msgid "Bangladesh Daylight Time" @@ -10907,7 +10852,7 @@ msgstr "" #: dlls/tzres/tzres.rc:174 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Czas urzędowy nowozelandzki " #: dlls/tzres/tzres.rc:175 msgid "New Zealand Daylight Time" @@ -10971,7 +10916,7 @@ msgstr "Data i godzina" #: dlls/tzres/tzres.rc:108 msgid "Egypt Standard Time" -msgstr "" +msgstr "Czas urzędowy egipski" #: dlls/tzres/tzres.rc:109 msgid "Egypt Daylight Time" @@ -11042,10 +10987,9 @@ msgid "E. Africa Daylight Time" msgstr "" #: dlls/tzres/tzres.rc:114 -#, fuzzy #| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "Pasek &standardowy" +msgstr "Czas urzędowy FLE" #: dlls/tzres/tzres.rc:115 msgid "FLE Daylight Time" @@ -11109,7 +11053,7 @@ msgstr "Czy chcesz zainstalować to oprogramowanie?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" -msgstr "Nie instaluj" +msgstr "Nie wgrywaj" #: dlls/urlmon/urlmon.rc:43 msgid "" @@ -11117,7 +11061,7 @@ msgid "" "not click install unless you have absolute trust in the above source." msgstr "" "Składnik ActiveX ma pełny dostęp do twojego komputera, jeśli jest " -"zainstalowany. Nie klikaj zainstaluj dopóki nie masz pełnego zaufania do " +"wgrany. Nie klikaj wgraj dopóki nie masz pełnego zaufania do " "powyższego źródła." #: dlls/urlmon/urlmon.rc:51 @@ -11126,11 +11070,11 @@ msgstr "Nieudana instalacja składnika: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" -msgstr "Zainstaluj (%d)" +msgstr "Wgraj (%d)" #: dlls/urlmon/urlmon.rc:53 msgid "Install" -msgstr "Zainstaluj" +msgstr "Wgraj" #: dlls/user32/user32.rc:30 dlls/user32/user32.rc:43 #: programs/taskmgr/taskmgr.rc:138 @@ -11179,7 +11123,7 @@ msgstr "&Zaniechaj" #: dlls/user32/user32.rc:85 msgid "&Ignore" -msgstr "&Ignoruj" +msgstr "Pom&iń" #: dlls/user32/user32.rc:86 msgid "&Try Again" @@ -11199,75 +11143,65 @@ msgstr "&Więcej okien..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Przepełnienie w górę" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy #| msgid "Out of memory." msgid "Out of memory" -msgstr "Za mało pamięci dla tej operacji." +msgstr "Brak pamięci" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy #| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Niezgodność typu danych.\n" +msgstr "Niezgodność rodzajów" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy #| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Błąd WE/WY urządzenia.\n" +msgstr "Błąd WE/WY urządzenia." #: dlls/vbscript/vbscript.rc:37 -#, fuzzy #| msgid "File already exists.\n" msgid "File already exists" -msgstr "Plik już istnieje.\n" +msgstr "Plik już istnieje" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy #| msgid "Disk full.\n" msgid "Disk full" -msgstr "Dysk pełen.\n" +msgstr "Dysk pełen" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy #| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Zbyt dużo otwartych plików.\n" +msgstr "Zbyt wiele plików" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy #| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Odmówiono dostępu" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy #| msgid "Path not found.\n" msgid "Path not found" -msgstr "Nie znaleziono ścieżki.\n" +msgstr "Nie znaleziono ścieżki" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy #| msgid "(value not set)" msgid "Object variable not set" -msgstr "(wartość nie ustalona)" +msgstr "Nie ustawiono zmiennej obiektu" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy #| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Niepoprawny bufor użytkownika.\n" +msgstr "Nieprawidłowe użycie Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" @@ -11312,10 +11246,9 @@ msgid "Wrong number of arguments or invalid property assignment" msgstr "" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy #| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Naruszenie klasy obiektu" +msgstr "Obiekt nie jest zbiorem" #: dlls/vbscript/vbscript.rc:57 #, fuzzy @@ -11438,25 +11371,22 @@ msgstr "Wystąpił przynajmniej jeden nieokreślony problem z tym certyfikatem." #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data obowiązywania" #: dlls/wininet/wininet.rc:37 -#, fuzzy #| msgid "Security" msgid "Security Protocol" -msgstr "Prawa dostępu" +msgstr "Protokół zabezpieczeń" #: dlls/wininet/wininet.rc:38 -#, fuzzy #| msgid "Signature" msgid "Signature Type" -msgstr "Podpis" +msgstr "Rodzaj podpisu" #: dlls/wininet/wininet.rc:39 -#, fuzzy #| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Szyfrowanie systemu plików" +msgstr "Rodzaj szyfrowania" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -11464,7 +11394,7 @@ msgstr "" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bity" #: dlls/wininet/winineterror.mc:26 #, fuzzy @@ -12359,7 +12289,7 @@ msgstr "Błąd podczas dekodowania" #: dlls/wldap32/wldap32.rc:117 msgid "Timeout" -msgstr "Limit czasu" +msgstr "Czas oczekiwania" #: dlls/wldap32/wldap32.rc:118 msgid "Auth Unknown" @@ -13320,7 +13250,7 @@ msgstr "" #: programs/conhost/conhost.rc:54 msgid "Cursor size" -msgstr "Wielkość kursora" +msgstr "Rozmiar kursora" #: programs/conhost/conhost.rc:55 msgid "&Small" @@ -13472,7 +13402,7 @@ msgstr "Błąd ustawiania" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Wielkość bufora ekranu musi być większa lub równa rozmiarowi okna." +msgstr "Rozmiar bufora ekranu musi być większa lub równa rozmiarowi okna." #: programs/conhost/conhost.rc:41 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" @@ -13892,7 +13822,7 @@ msgstr "Wy&tnij\tCtrl+X" #: programs/notepad/notepad.rc:45 programs/wordpad/wordpad.rc:48 msgid "&Copy\tCtrl+C" -msgstr "&Kopiuj\tCtrl+C" +msgstr "&Skopiuj\tCtrl+C" #: programs/notepad/notepad.rc:46 programs/wordpad/wordpad.rc:49 msgid "&Paste\tCtrl+V" @@ -14109,7 +14039,7 @@ msgstr "Ustawienia &systemu" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Uruchom Edytor Rejestrów" +msgstr "&Uruchom Edytor Rejestru" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14149,11 +14079,11 @@ msgstr "&Zwolnij instancję" #: programs/oleview/oleview.rc:56 msgid "Copy C&LSID to clipboard" -msgstr "Kopiuj C&LSID do schowka" +msgstr "Skopiuj C&LSID do schowka" #: programs/oleview/oleview.rc:57 msgid "Copy &HTML object Tag to clipboard" -msgstr "Kopiuj tag obiektu &HTML do schowka" +msgstr "Skopiuj znacznik obiektu &HTML do schowka" #: programs/oleview/oleview.rc:63 msgid "&Expert mode" @@ -14286,7 +14216,7 @@ msgstr "Zmień ustawienia Distributed COM tego komputera" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Uruchom Edytor Rejestrów Wine" +msgstr "Uruchom Edytor Rejestru Wine" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -14448,7 +14378,7 @@ msgstr "&Przenieś...\tF7" #: programs/progman/progman.rc:36 programs/winefile/winefile.rc:31 msgid "&Copy...\tF8" -msgstr "&Kopiuj...\tF8" +msgstr "&Skopiuj...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" @@ -14526,7 +14456,7 @@ msgstr "&Do grupy:" #: programs/progman/progman.rc:134 msgid "Copy Program" -msgstr "Kopiuj program" +msgstr "Skopiuj program" #: programs/progman/progman.rc:136 msgid "Copy program:" @@ -16986,7 +16916,7 @@ msgstr "Wys&trój:" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." -msgstr "Za&instaluj wystrój..." +msgstr "&Wgraj wystrój..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" @@ -16998,11 +16928,11 @@ msgstr "K&olor:" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" -msgstr "" +msgstr "Typy MIME" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "" +msgstr "Z&arządzaj skojarzeniami plików" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17502,11 +17432,11 @@ msgstr "Wybór celu" #: programs/winefile/winefile.rc:134 msgid "By File Type" -msgstr "Według typu pliku" +msgstr "Wg rodzaju pliku" #: programs/winefile/winefile.rc:139 msgid "File type" -msgstr "Typ pliku" +msgstr "Rodzaj pliku" #: programs/winefile/winefile.rc:140 msgid "&Directories" @@ -17618,14 +17548,13 @@ msgid "&Beginner" msgstr "&Początkujący" #: programs/winemine/winemine.rc:45 -#, fuzzy #| msgid "Interface" msgid "&Intermediate" -msgstr "Interfejs" +msgstr "Dośw&iadczony" #: programs/winemine/winemine.rc:46 msgid "&Expert" -msgstr "&Ekspert" +msgstr "&Mistrz" #: programs/winemine/winemine.rc:47 msgid "&Custom..." @@ -17641,25 +17570,24 @@ msgstr "Saper Wine - i&nformacje" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" -msgstr "Najlepsze Wyniki" +msgstr "Najszybsze czasy" #: programs/winemine/winemine.rc:63 msgid "Fastest times" -msgstr "Najlepsze wyniki" +msgstr "Najszybsze czasy" #: programs/winemine/winemine.rc:64 msgid "Beginner" msgstr "Początkujący" #: programs/winemine/winemine.rc:65 -#, fuzzy #| msgid "Interface" msgid "Intermediate" -msgstr "Interfejs" +msgstr "Doświadczony" #: programs/winemine/winemine.rc:66 msgid "Expert" -msgstr "Ekspert" +msgstr "Mistrz" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 msgid "Reset Results" @@ -17671,7 +17599,7 @@ msgstr "Gratulacje!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "Podaj swoje imię" +msgstr "Wpisz swoje imię" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -17755,7 +17683,7 @@ msgstr "Adnotacja..." #: programs/winhlp32/winhlp32.rc:68 msgid "Copy" -msgstr "Kopiuj" +msgstr "Skopiuj" #: programs/winhlp32/winhlp32.rc:100 msgid "Index" -- 2.30.2

1 0

[PATCH 1/5] mf: Add MFRequireProtectedEnvironment().
by Nikolay Sivov 05 Apr '21

05 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 19 +++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 39 +++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index bf7066ad032..b59ad466c73 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1460,3 +1460,22 @@ HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) return S_OK; } + +HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) +{ + BOOL selected, protected = FALSE; + unsigned int i = 0, value; + IMFStreamDescriptor *sd; + + TRACE("%p.\n", pd); + + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, i++, &selected, &sd))) + { + value = 0; + protected = SUCCEEDED(IMFStreamDescriptor_GetUINT32(sd, &MF_SD_PROTECTED, &value)) && value; + IMFStreamDescriptor_Release(sd); + if (protected) break; + } + + return protected ? S_OK : S_FALSE; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 2927d9f8a88..8f340243fc2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -77,7 +77,7 @@ @ stdcall MFGetSupportedSchemes(ptr) @ stdcall MFGetTopoNodeCurrentType(ptr long long ptr) @ stub MFReadSequencerSegmentOffset -@ stub MFRequireProtectedEnvironment +@ stdcall MFRequireProtectedEnvironment(ptr) @ stdcall MFShutdownObject(ptr) @ stub MFTranscodeGetAudioOutputAvailableTypes @ stub MergePropertyStore diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 40d8561bb06..df286db6385 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5185,6 +5185,44 @@ static void init_functions(void) #undef X } +static void test_MFRequireProtectedEnvironment(void) +{ + IMFPresentationDescriptor *pd; + IMFMediaType *mediatype; + IMFStreamDescriptor *sd; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); + ok(hr == S_OK, "Failed to create stream descriptor, hr %#x.\n", hr); + + hr = MFCreatePresentationDescriptor(1, &sd, &pd); + ok(hr == S_OK, "Failed to create presentation descriptor, hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_SelectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_SetUINT32(sd, &MF_SD_PROTECTED, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_DeselectStream(pd, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFRequireProtectedEnvironment(pd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); +} + START_TEST(mf) { init_functions(); @@ -5216,4 +5254,5 @@ START_TEST(mf) test_sample_copier(); test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); + test_MFRequireProtectedEnvironment(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 46c715a3752..138b899ffdb 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -698,6 +698,7 @@ cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") cpp_quote("HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample);") +cpp_quote("HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS { -- 2.30.2

2 7

[PATCH] ole32: Add support for writing VT_BLOB properties.
by Nikolay Sivov 05 Apr '21

05 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50917 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/stg_prop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 63e93c0b8c9..cd30dad8c99 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2267,6 +2267,16 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_BLOB: + { + StorageUtl_WriteDWord(&dwTemp, 0, var->blob.cbSize); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (FAILED(hr)) + goto end; + hr = IStream_Write(This->stm, var->blob.pBlobData, var->blob.cbSize, &count); + bytesWritten = count + sizeof(DWORD); + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER; -- 2.30.2

1 0

[PATCH] kernelbase: Cache last used locale->sortguid mapping.
by Torge Matthies 05 Apr '21

05 Apr '21

get_language_sort reads from the registry, which is not particularly fast. Staging's implementation of CompareStringEx calls this function, and if CompareStringEx is used in a loop over many elements, it will slow down the application by a lot (> 30 seconds vs a few hundred ms in osu!, depends on the CPU and the number of installed beatmaps). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50923 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- This could be put into the Staging patchset libs-Unicode_Collation, if deemed not appropriate for vanilla. I could also make it cache all requested locales in an rbtree, if desired. However most applications should only ever need one locale. dlls/kernelbase/locale.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c58c2cbe434..3b4191078ad 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -618,6 +618,21 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION locale_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct +{ + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; /* The locale name */ + const struct sortguid *guid; /* The cached associated GUID */ +} sortguid_cache; + +static CRITICAL_SECTION sortguid_cache_section; +static CRITICAL_SECTION_DEBUG sortguid_cache_section_debug = +{ + 0, 0, &sortguid_cache_section, + { &sortguid_cache_section_debug.ProcessLocksList, &sortguid_cache_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": sortguid_cache_section") } +}; +static CRITICAL_SECTION sortguid_cache_section = { &sortguid_cache_section_debug, -1, 0, 0, 0, 0 }; + static void init_sortkeys( DWORD *ptr ) { @@ -655,7 +670,7 @@ static const struct sortguid *find_sortguid( const GUID *guid ) } -static const struct sortguid *get_language_sort( const WCHAR *locale ) +static const struct sortguid *get_language_sort_uncached( const WCHAR *locale ) { WCHAR *p, *end, buffer[LOCALE_NAME_MAX_LENGTH], guidstr[39]; const struct sortguid *ret; @@ -698,6 +713,31 @@ done: } +static const struct sortguid *get_language_sort( const WCHAR *locale ) +{ + const struct sortguid *ret = NULL; + + if (!locale) return get_language_sort_uncached( locale ); + + RtlEnterCriticalSection( &sortguid_cache_section ); + + if (sortguid_cache.guid && !wcsncmp( sortguid_cache.locale, locale, LOCALE_NAME_MAX_LENGTH )) + { + ret = sortguid_cache.guid; + goto done; + } + + ret = get_language_sort_uncached( locale ); + + lstrcpynW( sortguid_cache.locale, locale, LOCALE_NAME_MAX_LENGTH ); + sortguid_cache.guid = ret; + +done: + RtlLeaveCriticalSection( &sortguid_cache_section ); + return ret; +} + + static LCID locale_to_lcid( WCHAR *win_name ) { WCHAR *p; -- 2.31.1

1 0

[PATCH] websocket: add stub dll
by Louis Lenders 03 Apr '21

03 Apr '21

https://bugs.winehq.org/show_bug.cgi?id=50902 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/websocket/Makefile.in | 3 +++ dlls/websocket/websocket.spec | 13 +++++++++++++ 4 files changed, 19 insertions(+) create mode 100644 dlls/websocket/Makefile.in create mode 100644 dlls/websocket/websocket.spec diff --git a/configure b/configure index cf34fa3ada5..4665a6f5876 100755 --- a/configure +++ b/configure @@ -1655,6 +1655,7 @@ enable_wbemprox enable_wbemuuid enable_wdscore enable_webservices +enable_websocket enable_wer enable_wevtapi enable_wevtsvc @@ -21116,6 +21117,7 @@ wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests +wine_fn_config_makefile dlls/websocket enable_websocket wine_fn_config_makefile dlls/wer enable_wer wine_fn_config_makefile dlls/wer/tests enable_tests wine_fn_config_makefile dlls/wevtapi enable_wevtapi diff --git a/configure.ac b/configure.ac index 95eb04d6d49..2217330d60e 100644 --- a/configure.ac +++ b/configure.ac @@ -3791,6 +3791,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) +WINE_CONFIG_MAKEFILE(dlls/websocket) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) diff --git a/dlls/websocket/Makefile.in b/dlls/websocket/Makefile.in new file mode 100644 index 00000000000..95b76b5931e --- /dev/null +++ b/dlls/websocket/Makefile.in @@ -0,0 +1,3 @@ +MODULE = websocket.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/websocket/websocket.spec b/dlls/websocket/websocket.spec new file mode 100644 index 00000000000..d1f17790d74 --- /dev/null +++ b/dlls/websocket/websocket.spec @@ -0,0 +1,13 @@ +@ stub WebSocketAbortHandle +@ stub WebSocketBeginClientHandshake +@ stub WebSocketBeginServerHandshake +@ stub WebSocketCompleteAction +@ stub WebSocketCreateClientHandle +@ stub WebSocketCreateServerHandle +@ stub WebSocketDeleteHandle +@ stub WebSocketEndClientHandshake +@ stub WebSocketEndServerHandshake +@ stub WebSocketGetAction +@ stub WebSocketGetGlobalProperty +@ stub WebSocketReceive +@ stub WebSocketSend \ No newline at end of file -- 2.31.0

1 0

[PATCH] advapi32: update version resource
by Louis Lenders 03 Apr '21

03 Apr '21

https://bugs.winehq.org/show_bug.cgi?id=50854 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/version.rc b/dlls/advapi32/version.rc index 1c05b9cac95..d22f12b1c7d 100644 --- a/dlls/advapi32/version.rc +++ b/dlls/advapi32/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine advapi32 dll" #define WINE_FILENAME_STR "advapi32.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" +#define WINE_FILEVERSION 10,0,10240,16384 +#define WINE_FILEVERSION_STR "10.0.10240.16384" +#define WINE_PRODUCTVERSION 10,0,10240,16384 +#define WINE_PRODUCTVERSION_STR "10.0.10240.16384" #include "wine/wine_common_ver.rc" -- 2.31.0

1 0

[PATCH] bcrypt: Don't try to unload gnutls if loading failed.
by Esme Povirk 03 Apr '21

03 Apr '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index efab65b8315..2f0c62bc6da 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1908,7 +1908,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p *(const struct key_funcs **)ptr_out = &key_funcs; break; case DLL_PROCESS_DETACH: - gnutls_uninitialize(); + if (libgnutls_handle) gnutls_uninitialize(); break; } return STATUS_SUCCESS; -- 2.25.1

1 0

[resend PATCH 1/2] dhtmled.ocx: Add stub IOleControl interface.
by Vijay Kiran Kamuju 03 Apr '21

03 Apr '21

diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 53dcdfc9ac6..e111f0b7979 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleControl IOleControl_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -50,6 +51,11 @@ static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); } +static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -83,6 +89,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IPersistStreamInit_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IOleControl)) + { + dhtml_edit_addref(This); + *out = &This->IOleControl_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -858,6 +870,59 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IOleControl(iface), iid, out); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + return dhtml_edit_addref(impl_from_IOleControl(iface)); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + return dhtml_edit_release(impl_from_IOleControl(iface)); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -874,6 +939,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

1 1

[PATCH 1/2] dhtmled.ocx: Add stub IOleControl interface.
by Vijay Kiran Kamuju 03 Apr '21

03 Apr '21

diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 53dcdfc9ac6..e111f0b7979 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleControl IOleControl_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -50,6 +51,11 @@ static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); } +static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -83,6 +89,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IPersistStreamInit_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IOleControl)) + { + dhtml_edit_addref(This); + *out = &This->IOleControl_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -858,6 +870,59 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IOleControl(iface), iid, out); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + return dhtml_edit_addref(impl_from_IOleControl(iface)); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + return dhtml_edit_release(impl_from_IOleControl(iface)); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -874,6 +939,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

1 1

[PATCH v4 1/3] conhost: Add the ENABLE_VIRTUAL_TERMINAL_PROCESSING mode flag by default.
by Gabriel Ivăncescu 03 Apr '21

03 Apr '21

Newer versions of Windows set it by default. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 39544fb..54ead48 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -80,7 +80,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = calloc( 1, sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; - screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING; screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; -- 2.30.0

3 5

[PATCH vkd3d 1/5] vkd3d-shader: Allocate temporary registers for variables.
by Zebediah Figura 02 Apr '21

02 Apr '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 +- libs/vkd3d-shader/hlsl.h | 9 ++ libs/vkd3d-shader/hlsl_codegen.c | 184 +++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 53b9db36..67ca2f2c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -890,7 +890,7 @@ static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_der } } -static const char *debug_writemask(DWORD writemask) +const char *debug_hlsl_writemask(unsigned int writemask) { static const char components[] = {'x', 'y', 'z', 'w'}; char string[5]; @@ -914,7 +914,7 @@ static void dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct vkd3d_string_buffer_printf(buffer, "= ("); dump_deref(buffer, &assign->lhs); if (assign->writemask != VKD3DSP_WRITEMASK_ALL) - vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(assign->writemask)); + vkd3d_string_buffer_printf(buffer, "%s", debug_hlsl_writemask(assign->writemask)); vkd3d_string_buffer_printf(buffer, " "); dump_src(buffer, &assign->rhs); vkd3d_string_buffer_printf(buffer, ")"); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index cf12f63f..fa7709ef 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -137,6 +137,13 @@ struct hlsl_struct_field unsigned int reg_offset; }; +struct hlsl_reg +{ + uint32_t id; + unsigned char writemask; + bool allocated; +}; + enum hlsl_ir_node_type { HLSL_IR_ASSIGNMENT = 0, @@ -208,6 +215,7 @@ struct hlsl_ir_var struct list scope_entry, param_entry; unsigned int first_write, last_read; + struct hlsl_reg reg; uint32_t is_input_varying : 1; uint32_t is_output_varying : 1; @@ -493,6 +501,7 @@ static inline void hlsl_src_remove(struct hlsl_src *src) } const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_hlsl_writemask(unsigned int writemask) DECLSPEC_HIDDEN; struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, const struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index dbd591af..420e720f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -612,6 +612,188 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl compute_liveness_recurse(entry_func->body, 0, 0); } +struct liveness +{ + size_t size; + struct + { + /* 0 if not live yet. */ + unsigned int last_read; + } *regs; +}; + +static unsigned char get_available_writemask(struct liveness *liveness, + unsigned int first_write, unsigned int index, unsigned int components) +{ + unsigned char i, writemask = 0, count = 0; + + for (i = 0; i < 4; ++i) + { + if (liveness->regs[index + i].last_read <= first_write) + { + writemask |= 1 << i; + if (++count == components) + return writemask; + } + } + + return 0; +} + +static bool resize_liveness(struct liveness *liveness, size_t new_count) +{ + size_t old_capacity = liveness->size; + + if (!vkd3d_array_reserve((void **)&liveness->regs, &liveness->size, new_count, sizeof(*liveness->regs))) + return false; + + if (liveness->size > old_capacity) + memset(liveness->regs + old_capacity, 0, (liveness->size - old_capacity) * sizeof(*liveness->regs)); + return true; +} + +static struct hlsl_reg allocate_register(struct liveness *liveness, + unsigned int first_write, unsigned int last_read, unsigned char components) +{ + struct hlsl_reg ret = {.allocated = true}; + unsigned char writemask, i; + unsigned int regnum; + + for (regnum = 0; regnum < liveness->size; regnum += 4) + { + if ((writemask = get_available_writemask(liveness, first_write, regnum, components))) + break; + } + if (regnum == liveness->size) + { + if (!resize_liveness(liveness, regnum + 4)) + return ret; + writemask = (1 << components) - 1; + } + for (i = 0; i < 4; ++i) + { + if (writemask & (1 << i)) + liveness->regs[regnum + i].last_read = last_read; + } + ret.id = regnum / 4; + ret.writemask = writemask; + return ret; +} + +static bool is_range_available(struct liveness *liveness, unsigned int first_write, + unsigned int index, unsigned int elements) +{ + unsigned int i; + + for (i = 0; i < elements; i += 4) + { + if (!get_available_writemask(liveness, first_write, index + i, 4)) + return false; + } + return true; +} + +/* "elements" is the total number of consecutive whole registers needed. */ +static struct hlsl_reg allocate_range(struct liveness *liveness, + unsigned int first_write, unsigned int last_read, unsigned int elements) +{ + const unsigned int components = elements * 4; + struct hlsl_reg ret = {.allocated = true}; + unsigned int i, regnum; + + for (regnum = 0; regnum < liveness->size; regnum += 4) + { + if (is_range_available(liveness, first_write, regnum, min(components, liveness->size - regnum))) + break; + } + if (!resize_liveness(liveness, regnum + components)) + return ret; + + for (i = 0; i < components; ++i) + liveness->regs[regnum + i].last_read = last_read; + ret.id = regnum / 4; + return ret; +} + +static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) +{ + if (type->reg_size > 4) + return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, + reg.id + type->reg_size - 1); + return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); +} + +static void allocate_variable_temp_register(struct hlsl_ir_var *var, struct liveness *liveness) +{ + if (var->is_input_varying || var->is_output_varying || var->is_uniform) + return; + + if (!var->reg.allocated && var->last_read) + { + if (var->data_type->reg_size > 1) + var->reg = allocate_range(liveness, var->first_write, + var->last_read, var->data_type->reg_size); + else + var->reg = allocate_register(liveness, var->first_write, + var->last_read, var->data_type->dimx); + TRACE("Allocated %s to %s (liveness %u-%u).\n", debug_register('r', var->reg, var->data_type), + var->name, var->first_write, var->last_read); + } +} + +static void allocate_temp_registers_recurse(struct list *instrs, struct liveness *liveness) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + { + struct hlsl_ir_assignment *assignment = hlsl_ir_assignment(instr); + allocate_variable_temp_register(assignment->lhs.var, liveness); + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + allocate_temp_registers_recurse(&iff->then_instrs, liveness); + allocate_temp_registers_recurse(&iff->else_instrs, liveness); + break; + } + + case HLSL_IR_LOAD: + { + struct hlsl_ir_load *load = hlsl_ir_load(instr); + allocate_variable_temp_register(load->src.var, liveness); + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + allocate_temp_registers_recurse(&loop->body, liveness); + break; + } + + default: + break; + } + } +} + +/* Simple greedy temporary register allocation pass that just assigns a unique + * index to all (simultaneously live) variables or intermediate values. Agnostic + * as to how many registers are actually available for the current backend, and + * does not handle constants. */ +static void allocate_temp_registers(struct hlsl_ir_function_decl *entry_func) +{ + struct liveness liveness = {0}; + allocate_temp_registers_recurse(entry_func->body, &liveness); +} + int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { struct hlsl_ir_var *var; @@ -649,6 +831,8 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (TRACE_ON()) rb_for_each_entry(&ctx->functions, dump_function, NULL); + allocate_temp_registers(entry_func); + if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_NOT_IMPLEMENTED; -- 2.31.0

3 10

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 02 Apr '21

02 Apr '21

1 0

[PATCH 3/3] jscript: Add Object.isFrozen and Object.isSealed implementation.
by Jacek Caban 02 Apr '21

02 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 20 ++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 46 +++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 68 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 135 insertions(+)

2 1

[PATCH 2/3] jscript: Throw error in jsdisp_delete_idx for non-configurable properties.
by Jacek Caban 02 Apr '21

02 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 5 ++++- dlls/mshtml/tests/es5.js | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-)

2 1

[PATCH 1/3] jscript: Throw error when trying to add a property to non-extensible objects in jsdisp_propput_idx.
by Jacek Caban 02 Apr '21

02 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 ++++++----- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/mshtml/tests/es5.js | 43 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 7 deletions(-)

2 1

[PATCH] mfreadwrite/reader: Improve decoder output samples handling.
by Nikolay Sivov 02 Apr '21

02 Apr '21

Equivalent of 706fd3dcce52c0deec7c98143d715a1d9016d3ad, but for the reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index d3df7abd9fc..ffe91f5d265 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -667,7 +667,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s { memset(&out_buffer, 0, sizeof(out_buffer)); - if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) { if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; -- 2.30.2

1 0

[PATCH v2 2/2] ole32: Always initialize storage header before writing it.
by Dmitry Timoshkov 02 Apr '21

02 Apr '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/storage32.c | 33 ++++----------------------------- dlls/ole32/tests/storage32.c | 1 - 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3d372af83f5..980b6c8d9f6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3016,20 +3016,10 @@ static void StorageImpl_SaveFileHeader( { BYTE headerBigBlock[HEADER_SIZE]; int index; - HRESULT hr; ULARGE_INTEGER offset; - DWORD bytes_read, bytes_written; + DWORD bytes_written; DWORD major_version, dirsectorcount; - /* - * Get a pointer to the big block of data containing the header. - */ - offset.u.HighPart = 0; - offset.u.LowPart = 0; - hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); - if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) - hr = STG_E_FILENOTFOUND; - if (This->bigBlockSizeBits == 0x9) major_version = 3; else if (This->bigBlockSizeBits == 0xc) @@ -3040,21 +3030,8 @@ static void StorageImpl_SaveFileHeader( major_version = 4; } - /* - * If the block read failed, the file is probably new. - */ - if (FAILED(hr)) - { - /* - * Initialize for all unknown fields. - */ - memset(headerBigBlock, 0, HEADER_SIZE); - - /* - * Initialize the magic number. - */ - memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - } + memset(headerBigBlock, 0, HEADER_SIZE); + memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); /* * Write the information to the header. @@ -3150,9 +3127,7 @@ static void StorageImpl_SaveFileHeader( (This->bigBlockDepotStart[index])); } - /* - * Write the big block back to the file. - */ + offset.QuadPart = 0; StorageImpl_WriteAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_written); } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 44ff3a07a21..b05baddac98 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3883,7 +3883,6 @@ static void test_custom_lockbytes(void) hr = IStorage_Commit(stg, 0); ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); -todo_wine ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); IStorage_Release(stg); -- 2.30.2

3 2

[PATCH v2 1/2] ole32/tests: Add more tests for custom ILockBytes implementation.
by Dmitry Timoshkov 02 Apr '21

02 Apr '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/tests/storage32.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eea78c6d3fe..44ff3a07a21 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -241,6 +241,9 @@ static void CreateTestLockBytes(TestLockBytes **This) { (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; (*This)->ref = 1; + (*This)->size = 0; + (*This)->buffer_size = 1024; + (*This)->contents = HeapAlloc(GetProcessHeap(), 0, (*This)->buffer_size); } } @@ -3872,9 +3875,16 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); + memset(lockbytes->contents, 0, lockbytes->buffer_size); + hr = IStorage_Commit(stg, 0); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); + +todo_wine + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); IStorage_Release(stg); @@ -3888,14 +3898,25 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); hr = IStorage_Commit(stg, 0); - - IStorage_Release(stg); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); ok(lockbytes->lock_called, "expected LockRegion to be called\n"); + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + memset(lockbytes->contents, 0, lockbytes->buffer_size); + + hr = IStorage_Commit(stg, 0); + ok(hr==STG_E_INVALIDHEADER, "IStorage_Commit should fail: %x\n", hr); + + ok(*(DWORD *)lockbytes->contents == 0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + IStorage_Release(stg); + lockbytes->lock_hr = STG_E_INVALIDFUNCTION; hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); -- 2.30.2

3 2

[PATCH v3 1/3] conhost: Add the ENABLE_VIRTUAL_TERMINAL_PROCESSING mode flag by default.
by Gabriel Ivăncescu 02 Apr '21

02 Apr '21

Newer versions of Windows set it by default. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 39544fb..54ead48 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -80,7 +80,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = calloc( 1, sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; - screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING; screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; -- 2.30.0

1 3

[PATCH v2 1/3] conhost: Add the ENABLE_VIRTUAL_TERMINAL_PROCESSING mode flag by default.
by Gabriel Ivăncescu 02 Apr '21

02 Apr '21

Newer versions of Windows set it by default. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 39544fb..54ead48 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -80,7 +80,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (!(screen_buffer = calloc( 1, sizeof(*screen_buffer) ))) return NULL; screen_buffer->console = console; screen_buffer->id = id; - screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; + screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING; screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; -- 2.30.0

2 6

[PATCH v3 1/7] ntoskrnl: Store root PnP devices in a linked list.
by Zebediah Figura 02 Apr '21

02 Apr '21

It is quite rare to have more than one or two of these, and lists are slightly easier to work with. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6652be73c47..913a63e8f0d 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" +#include "wine/list.h" #include "ntoskrnl_private.h" #include "plugplay.h" @@ -923,20 +924,25 @@ static DRIVER_OBJECT *pnp_manager; struct root_pnp_device { WCHAR id[MAX_DEVICE_ID_LEN]; - struct wine_rb_entry entry; + struct list entry; DEVICE_OBJECT *device; }; -static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); + +static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) { - const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); - const WCHAR *k = key; + struct root_pnp_device *device; - return wcsicmp( k, device->id ); + LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + { + if (!wcsicmp( id, device->id )) + return device; + } + + return NULL; } -static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; - static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -1043,15 +1049,12 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) -{ - struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); - remove_device( device->device ); -} - void pnp_manager_stop(void) { - wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); + struct root_pnp_device *device, *next; + + LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + remove_device( device->device ); IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1088,7 +1091,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (wine_rb_get( &root_pnp_devices, id )) + if (find_root_pnp_device( id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1103,12 +1106,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) - { - ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); - IoDeleteDevice( device ); - continue; - } + list_add_tail( &root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } -- 2.30.2

2 12

[PATCH] jscript: Force base type of _jsval_t to be ULONGLONG instead of double.
by Dmitry Timoshkov 02 Apr '21

02 Apr '21

I guess that I should send the proposed fix to wine-devel instead of waiting for response in the bug report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50845 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/jscript/jsval.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 963f59f6a08..d930d35f4e4 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -54,6 +54,7 @@ typedef enum { struct _jsval_t { #ifdef JSVAL_DOUBLE_LAYOUT_PTR32 union { + ULONGLONG ull; double n; struct { union { @@ -69,9 +70,10 @@ struct _jsval_t { #else jsval_type_t type; union { + ULONGLONG ull; + double n; IDispatch *obj; jsstr_t *str; - double n; BOOL b; VARIANT *v; } u; -- 2.30.2

3 10

[PATCH 1/2] gdi32: Move the loop through each clipped rectangle to the primitive blend funcs.
by Gabriel Ivăncescu 02 Apr '21

02 Apr '21

This is to prepare so we don't recalculate the lookup cache map for color tables on every clipped rect (which is expensive). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch, it's needed for next patch. dlls/gdi32/dibdrv/bitblt.c | 11 +- dlls/gdi32/dibdrv/dibdrv.h | 18 +-- dlls/gdi32/dibdrv/primitives.c | 284 +++++++++++++++++++-------------- 3 files changed, 174 insertions(+), 139 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 8f67535..590ba08 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -584,17 +584,12 @@ static void mask_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, static DWORD blend_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, HRGN clip, BLENDFUNCTION blend ) { - POINT origin; struct clipped_rects clipped_rects; - int i; if (!get_clipped_rects( dst, dst_rect, clip, &clipped_rects )) return ERROR_SUCCESS; - for (i = 0; i < clipped_rects.count; i++) - { - origin.x = src_rect->left + clipped_rects.rects[i].left - dst_rect->left; - origin.y = src_rect->top + clipped_rects.rects[i].top - dst_rect->top; - dst->funcs->blend_rect( dst, &clipped_rects.rects[i], src, &origin, blend ); - } + + dst->funcs->blend_rect( dst, src, src_rect->left - dst_rect->left, src_rect->top - dst_rect->top, &clipped_rects, blend ); + free_clipped_rects( &clipped_rects ); return ERROR_SUCCESS; } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 88b4c62..2a69625 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -165,6 +165,13 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } +struct clipped_rects +{ + RECT *rects; + int count; + RECT buffer[32]; +}; + struct line_params { int err_start, err_add_1, err_add_2, bias; @@ -189,8 +196,8 @@ typedef struct primitive_funcs const dib_info *brush, const rop_mask_bits *bits); void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap); - void (* blend_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, - const POINT *origin, BLENDFUNCTION blend); + void (* blend_rect)(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend); BOOL (* gradient_rect)(const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode); void (* mask_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2); @@ -240,13 +247,6 @@ typedef struct DWORD octant; } bres_params; -struct clipped_rects -{ - RECT *rects; - int count; - RECT buffer[32]; -}; - extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 01a1c7c..569baae 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4651,199 +4651,239 @@ static inline DWORD blend_rgb( BYTE dst_r, BYTE dst_g, BYTE dst_b, DWORD src, BL blend_color( dst_r, src >> 16, blend.SourceConstantAlpha ) << 16); } -static void blend_rect_8888(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_8888(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - DWORD *dst_ptr = get_pixel_ptr_32( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - if (blend.AlphaFormat & AC_SRC_ALPHA) + for (i = 0; i < clipped_rects->count; i++) { - if (blend.SourceConstantAlpha == 255) - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb( dst_ptr[x], src_ptr[x] ); + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + DWORD *dst_ptr = get_pixel_ptr_32( dst, rc->left, rc->top ); + + if (blend.AlphaFormat & AC_SRC_ALPHA) + { + if (blend.SourceConstantAlpha == 255) + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb( dst_ptr[x], src_ptr[x] ); + else + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + } + else if (src->compression == BI_RGB) + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_constant_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); else - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); - } - else if (src->compression == BI_RGB) - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb_constant_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); - else - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) - for (x = 0; x < rc->right - rc->left; x++) - dst_ptr[x] = blend_argb_no_src_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + for (x = 0; x < rc->right - rc->left; x++) + dst_ptr[x] = blend_argb_no_src_alpha( dst_ptr[x], src_ptr[x], blend.SourceConstantAlpha ); + } } -static void blend_rect_32(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_32(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - DWORD *dst_ptr = get_pixel_ptr_32( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - if (dst->red_len == 8 && dst->green_len == 8 && dst->blue_len == 8) + for (i = 0; i < clipped_rects->count; i++) { - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + DWORD *dst_ptr = get_pixel_ptr_32( dst, rc->left, rc->top ); + + if (dst->red_len == 8 && dst->green_len == 8 && dst->blue_len == 8) { - for (x = 0; x < rc->right - rc->left; x++) + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) { - DWORD val = blend_rgb( dst_ptr[x] >> dst->red_shift, - dst_ptr[x] >> dst->green_shift, - dst_ptr[x] >> dst->blue_shift, - src_ptr[x], blend ); - dst_ptr[x] = ((( val & 0xff) << dst->blue_shift) | - (((val >> 8) & 0xff) << dst->green_shift) | - (((val >> 16) & 0xff) << dst->red_shift)); + for (x = 0; x < rc->right - rc->left; x++) + { + DWORD val = blend_rgb( dst_ptr[x] >> dst->red_shift, + dst_ptr[x] >> dst->green_shift, + dst_ptr[x] >> dst->blue_shift, + src_ptr[x], blend ); + dst_ptr[x] = ((( val & 0xff) << dst->blue_shift) | + (((val >> 8) & 0xff) << dst->green_shift) | + (((val >> 16) & 0xff) << dst->red_shift)); + } } } - } - else - { - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) + else { - for (x = 0; x < rc->right - rc->left; x++) + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 4, src_ptr += src->stride / 4) { - DWORD val = blend_rgb( get_field( dst_ptr[x], dst->red_shift, dst->red_len ), - get_field( dst_ptr[x], dst->green_shift, dst->green_len ), - get_field( dst_ptr[x], dst->blue_shift, dst->blue_len ), - src_ptr[x], blend ); - dst_ptr[x] = rgb_to_pixel_masks( dst, val >> 16, val >> 8, val ); + for (x = 0; x < rc->right - rc->left; x++) + { + DWORD val = blend_rgb( get_field( dst_ptr[x], dst->red_shift, dst->red_len ), + get_field( dst_ptr[x], dst->green_shift, dst->green_len ), + get_field( dst_ptr[x], dst->blue_shift, dst->blue_len ), + src_ptr[x], blend ); + dst_ptr[x] = rgb_to_pixel_masks( dst, val >> 16, val >> 8, val ); + } } } } } -static void blend_rect_24(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_24(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - BYTE *dst_ptr = get_pixel_ptr_24( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (x = 0; x < rc->right - rc->left; x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + BYTE *dst_ptr = get_pixel_ptr_24( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) { - DWORD val = blend_rgb( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - src_ptr[x], blend ); - dst_ptr[x * 3] = val; - dst_ptr[x * 3 + 1] = val >> 8; - dst_ptr[x * 3 + 2] = val >> 16; + for (x = 0; x < rc->right - rc->left; x++) + { + DWORD val = blend_rgb( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], + src_ptr[x], blend ); + dst_ptr[x * 3] = val; + dst_ptr[x * 3 + 1] = val >> 8; + dst_ptr[x * 3 + 2] = val >> 16; + } } } } -static void blend_rect_555(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_555(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - WORD *dst_ptr = get_pixel_ptr_16( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 2, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (x = 0; x < rc->right - rc->left; x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + WORD *dst_ptr = get_pixel_ptr_16( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 2, src_ptr += src->stride / 4) { - DWORD val = blend_rgb( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), - ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), - ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - src_ptr[x], blend ); - dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); + for (x = 0; x < rc->right - rc->left; x++) + { + DWORD val = blend_rgb( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), + ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), + ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), + src_ptr[x], blend ); + dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); + } } } } -static void blend_rect_16(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_16(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - WORD *dst_ptr = get_pixel_ptr_16( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 2, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (x = 0; x < rc->right - rc->left; x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + WORD *dst_ptr = get_pixel_ptr_16( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride / 2, src_ptr += src->stride / 4) { - DWORD val = blend_rgb( get_field( dst_ptr[x], dst->red_shift, dst->red_len ), - get_field( dst_ptr[x], dst->green_shift, dst->green_len ), - get_field( dst_ptr[x], dst->blue_shift, dst->blue_len ), - src_ptr[x], blend ); - dst_ptr[x] = rgb_to_pixel_masks( dst, val >> 16, val >> 8, val ); + for (x = 0; x < rc->right - rc->left; x++) + { + DWORD val = blend_rgb( get_field( dst_ptr[x], dst->red_shift, dst->red_len ), + get_field( dst_ptr[x], dst->green_shift, dst->green_len ), + get_field( dst_ptr[x], dst->blue_shift, dst->blue_len ), + src_ptr[x], blend ); + dst_ptr[x] = rgb_to_pixel_masks( dst, val >> 16, val >> 8, val ); + } } } } -static void blend_rect_8(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_8(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { const RGBQUAD *color_table = get_dib_color_table( dst ); - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - BYTE *dst_ptr = get_pixel_ptr_8( dst, rc->left, rc->top ); - int x, y; + int i, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (x = 0; x < rc->right - rc->left; x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + BYTE *dst_ptr = get_pixel_ptr_8( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) { - RGBQUAD rgb = color_table[dst_ptr[x]]; - DWORD val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[x], blend ); - dst_ptr[x] = rgb_lookup_colortable( dst, val >> 16, val >> 8, val ); + for (x = 0; x < rc->right - rc->left; x++) + { + RGBQUAD rgb = color_table[dst_ptr[x]]; + DWORD val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[x], blend ); + dst_ptr[x] = rgb_lookup_colortable( dst, val >> 16, val >> 8, val ); + } } } } -static void blend_rect_4(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_4(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { const RGBQUAD *color_table = get_dib_color_table( dst ); - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - BYTE *dst_ptr = get_pixel_ptr_4( dst, rc->left, rc->top ); - int i, x, y; + int i, j, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (i = 0, x = (dst->rect.left + rc->left) & 1; i < rc->right - rc->left; i++, x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + BYTE *dst_ptr = get_pixel_ptr_4( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) { - DWORD val = ((x & 1) ? dst_ptr[x / 2] : (dst_ptr[x / 2] >> 4)) & 0x0f; - RGBQUAD rgb = color_table[val]; - val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[i], blend ); - val = rgb_lookup_colortable( dst, val >> 16, val >> 8, val ); - if (x & 1) - dst_ptr[x / 2] = val | (dst_ptr[x / 2] & 0xf0); - else - dst_ptr[x / 2] = (val << 4) | (dst_ptr[x / 2] & 0x0f); + for (j = 0, x = (dst->rect.left + rc->left) & 1; j < rc->right - rc->left; j++, x++) + { + DWORD val = ((x & 1) ? dst_ptr[x / 2] : (dst_ptr[x / 2] >> 4)) & 0x0f; + RGBQUAD rgb = color_table[val]; + val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[j], blend ); + val = rgb_lookup_colortable( dst, val >> 16, val >> 8, val ); + if (x & 1) + dst_ptr[x / 2] = val | (dst_ptr[x / 2] & 0xf0); + else + dst_ptr[x / 2] = (val << 4) | (dst_ptr[x / 2] & 0x0f); + } } } } -static void blend_rect_1(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_1(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { const RGBQUAD *color_table = get_dib_color_table( dst ); - DWORD *src_ptr = get_pixel_ptr_32( src, origin->x, origin->y ); - BYTE *dst_ptr = get_pixel_ptr_1( dst, rc->left, rc->top ); - int i, x, y; + int i, j, x, y; - for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) + for (i = 0; i < clipped_rects->count; i++) { - for (i = 0, x = (dst->rect.left + rc->left) & 7; i < rc->right - rc->left; i++, x++) + const RECT *rc = &clipped_rects->rects[i]; + DWORD *src_ptr = get_pixel_ptr_32( src, rc->left + diff_x, rc->top + diff_y ); + BYTE *dst_ptr = get_pixel_ptr_1( dst, rc->left, rc->top ); + + for (y = rc->top; y < rc->bottom; y++, dst_ptr += dst->stride, src_ptr += src->stride / 4) { - DWORD val = (dst_ptr[x / 8] & pixel_masks_1[x % 8]) ? 1 : 0; - RGBQUAD rgb = color_table[val]; - val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[i], blend ); - val = rgb_to_pixel_colortable(dst, val >> 16, val >> 8, val) ? 0xff : 0; - dst_ptr[x / 8] = (dst_ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); + for (j = 0, x = (dst->rect.left + rc->left) & 7; j < rc->right - rc->left; j++, x++) + { + DWORD val = (dst_ptr[x / 8] & pixel_masks_1[x % 8]) ? 1 : 0; + RGBQUAD rgb = color_table[val]; + val = blend_rgb( rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue, src_ptr[j], blend ); + val = rgb_to_pixel_colortable(dst, val >> 16, val >> 8, val) ? 0xff : 0; + dst_ptr[x / 8] = (dst_ptr[x / 8] & ~pixel_masks_1[x % 8]) | (val & pixel_masks_1[x % 8]); + } } } } -static void blend_rect_null(const dib_info *dst, const RECT *rc, - const dib_info *src, const POINT *origin, BLENDFUNCTION blend) +static void blend_rect_null(const dib_info *dst, const dib_info *src, LONG diff_x, LONG diff_y, + const struct clipped_rects *clipped_rects, BLENDFUNCTION blend) { } -- 2.30.0

2 6

[PATCH] shcore: Add names for stubs.
by Mark Harmstone 02 Apr '21

02 Apr '21

Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- dlls/shcore/shcore.spec | 211 ++++++++++++++++++++++------------------ 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 368fab19541..3f81c340c6f 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -1,4 +1,4 @@ -1 stub @ +1 stub -noname SHCreateReadOnlySharedMemoryStream @ stdcall CommandLineToArgvW(wstr ptr) @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @@ -9,6 +9,8 @@ @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent +# @ stub GetFeatureEnabledState +# @ stub GetFeatureVariant @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stdcall GetScaleFactorForDevice(long) @@ -26,6 +28,10 @@ @ stdcall IUnknown_Set(ptr ptr) @ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) +# @ stub IsProcessInIsolatedContainer +# @ stub IsProcessInWDAGContainer +# @ stub RecordFeatureError +# @ stub RecordFeatureUsage @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications @@ -75,107 +81,118 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) +# @ stub SHTaskPoolAllowThreadReuse +# @ stub SHTaskPoolDoNotWaitForMoreTasks +# @ stub SHTaskPoolGetCurrentThreadLifetime +# @ stub SHTaskPoolGetUniqueContext +# @ stub SHTaskPoolQueueTask +# @ stub SHTaskPoolSetThreadReuseAllowed @ stdcall SHUnicodeToAnsi(wstr ptr ptr) @ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) +# @ stub SubscribeFeatureStateChangeNotification @ stub UnregisterScaleChangeEvent +# @ stub UnsubscribeFeatureStateChangeNotification -100 stub @ -101 stub @ -102 stub @ -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -115 stub @ -116 stub @ -117 stub @ -120 stub @ -121 stub @ +100 stub -noname SHManagedCreateStreamOnFile +101 stub -noname SHManagedCreateFile +102 stub -noname SHIsEmptyStream +103 stub -noname MapWin32ErrorToSTG +104 stub -noname ModeToCreateFileFlags +105 stub -noname CreateTempStreamName +106 stub -noname StreamCopyTo +107 stub -noname IStream_ReadStrLong +108 stub -noname IStream_WriteStrLong +109 stub -noname SHCreateStreamOnModuleResourceW +110 stub -noname SHCreateStreamOnDllResourceW +111 stub -noname CreateWritableSharedMemoryStream +115 stub -noname CreateRandomAccessStreamOnFileWithOptions +116 stub -noname RandomAccessStreamCopyAsync +117 stub -noname CreateRandomAccessStreamOnPlaceholderFile +120 stub -noname SHRegGetCLSIDKey +121 stub -noname SHRegSetValue 122 stub SHRegGetValueFromHKCUHKLM -123 stub @ -124 stub @ -125 stub @ -126 stub @ -127 stub @ -130 stub @ -131 stub @ -132 stub @ -133 stub @ -140 stub @ -141 stub @ -142 stub @ -143 stub @ -144 stub @ -145 stub @ -150 stub @ -151 stub @ -152 stub @ -153 stub @ -160 stub @ -161 stub @ -162 stub @ -170 stub @ -171 stub @ -172 stub @ -173 stub @ -181 stub @ -182 stub @ -183 stub @ -184 stub @ -185 stub @ -186 stub @ -187 stub @ -188 stub @ -190 stub @ -191 stub @ -192 stub @ -193 stub @ -200 stub @ -220 stub @ -221 stub @ -222 stub @ -223 stub @ -224 stub @ -225 stub @ -226 stub @ -227 stub @ -228 stub @ -230 stub @ -231 stub @ -232 stub @ -233 stub @ -234 stub @ -240 stub @ -241 stub @ -242 stub @ -243 stub @ -244 stub @ -245 stub @ -246 stub @ -247 stub @ -248 stub @ -250 stub @ -251 stub @ -252 stub @ -253 stub @ -254 stub @ -255 stub @ -260 stub @ -261 stub @ -270 stub @ -280 stub @ -281 stub @ -282 stub @ -283 stub @ -284 stub @ -290 stub @ -291 stub @ -292 stub @ +123 stub -noname SHRegGetBoolValueFromHKCUHKLM +124 stub -noname SHGetValueGoodBootA +125 stub -noname SHGetValueGoodBootW +126 stub -noname SHLoadRegUIStringW +127 stub -noname QuerySourceCreateFromKeyEx +130 stub -noname SHGlobalCounterGetValue +131 stub -noname SHGlobalCounterIncrement +132 stub -noname SHGlobalCounterDecrement +133 stub -noname SHGlobalCounterSetValue +140 stub -noname IUnknown_ProfferService +141 stub -noname IUnknown_RemoveBackReferences +142 stub -noname IUnknown_GetClassID +143 stub -noname StrRetToStrW +144 stub -noname StrRetToBSTR +145 stub -noname StrRetToBufW +150 stub -noname SHAnsiToUnicodeCP +151 stub -noname SHUnicodeToAnsiCP +152 stub -noname SHUnicodeToAnsiCPAlloc +153 stub -noname SHAnsiToUnicodeCPAlloc +160 stub -noname SHWaitForSendMessageThread +161 stub -noname SHWaitForThreadWithWakeMask +162 stub -noname SHQueueUserWorkItem +170 stub -noname PathIsNetworkPathW +171 stub -noname PathIsNetworkPathA +172 stub -noname PathBuildRootW +173 stub -noname PathBuildRootA +174 stub -noname DriveType +175 stub -noname IsNetDrive +181 stub -noname SHMapHandle +182 stub -noname SHAllocShared +183 stub -noname SHLockSharedEx +184 stub -noname SHLockShared +185 stub -noname SHGetSizeShared +186 stub -noname SHUnlockShared +187 stub -noname SHFreeShared +188 stub -noname SHCreateWorkerWindowW +189 stub -noname SHCreateOplockProvider +190 stub -noname SHWindowsPolicy +191 stub -noname SHWindowsPolicyGetValue +192 stub -noname IsAppCompatModeEnabled +193 stub -noname SHGetObjectCompatFlags +200 stub -noname GUIDFromStringW +220 stub -noname GetPhysicalDpiForDevice +222 stub -noname ScaleRelativePixelsForDevice +223 stub -noname PhysicalRectFromScaledRect +224 stub -noname ScaleAndMapRelativeRectForDevice +225 stub -noname CanOverrideScaleFactor +226 stub -noname GetScalingOverride +227 stub -noname RegisterScaleChangeSink +228 stub -noname SetDesignModeScaleFactor +229 stub -noname GetProposedScaleFactorForWindow +230 stub -noname SHSetWindowSubclass +231 stub -noname SHGetWindowSubclassData +232 stub -noname SHRemoveWindowSubclass +233 stub -noname SHDefSubclassProc +234 stub -noname SHRegisterClassW +240 stub -noname RegisterScaleChangeSinkForWindow +241 stub -noname ScaleAndMapRelativeRect +242 stub -noname RelativeRectFromPhysicalRectWithScale +244 stub -noname GetScaleFactorForWindow +245 stub -noname RegisterScaleChangeNotificationsForWindow +246 stub -noname RevokeScaleChangeNotificationsForWindow +247 stub -noname GetOverrideScaleFactorForWindow +248 stub -noname GetSystemScaleFactorForWindow +249 stub -noname UpdateScalingInfoCache +250 stub -noname RegisterCurrentWindowChangeListener +251 stub -noname RegisterWindowMonitorChangeListener +252 stub -noname UnregisterCurrentWindowChangeListener +253 stub -noname UnregisterWindowMonitorChangeListener +254 stub -noname AddCurrentWindowCandidate +255 stub -noname GetCurrentWindow +260 stub -noname PhysicalRectFromRelativeRectWithScales +261 stub -noname RelativeRectFromPhysicalRectWithScales +270 stub -noname SHCreateMemoryStreamOnSharedBuffer +280 stub -noname _CreateDirectoryHelper +281 stub -noname Win32CreateDirectory +282 stub -noname SuspendSHNotify +283 stub -noname ResumeSHNotify +284 stub -noname IsNotifySuspended +290 stub -noname SHCreateDirectoryExW +291 stub -noname SHCreateDirectoryExA +292 stub -noname SHCreateDirectory -- 2.26.3

1 0

[PATCH v2 1/5] wined3d: Introduce wined3d_device_context_draw_indexed().
by Zebediah Figura 02 Apr '21

02 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e578e51de68..9c37cd97db9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2409,6 +2409,18 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u 0, start_vertex, vertex_count, start_instance, instance_count, false); } +void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, base_vertex_index %d, start_index %u, index_count %u, start_instance %u, instance_count %u.\n", + context, base_vertex_index, start_index, index_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + base_vertex_index, start_index, index_count, 0, 0, true); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4486,8 +4498,7 @@ void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, @@ -4498,8 +4509,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, + start_idx, index_count, start_instance, instance_count); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 087a6bead13..bae5a6d42f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) +@ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3316d6f6653..ee02914b0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2562,6 +2562,8 @@ void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_cont struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, 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, -- 2.30.2

2 7

[PATCH 1/3] reg: Abort 'add' operation when parsing command-line arguments that are not switches
by Hugh McMaster 02 Apr '21

02 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 74 ++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index e1fd2223716..f259f0a4100 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -222,46 +222,48 @@ int reg_add(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (argvW[i][0] == '/' || argvW[i][0] == '-') + WCHAR *str; + + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; + + str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) { - WCHAR *str = &argvW[i][1]; + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; - if (!lstrcmpiW(str, L"ve")) - { - if (value_empty) goto invalid; - value_empty = TRUE; - continue; - } - else if (!str[0] || str[1]) + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) goto invalid; - - switch (towlower(*str)) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - goto invalid; - break; - case 't': - if (type || !(type = argvW[++i])) - goto invalid; - break; - case 'd': - if (data || !(data = argvW[++i])) - goto invalid; - break; - case 's': - str = argvW[++i]; - if (separator || !str || lstrlenW(str) != 1) - goto invalid; - separator = str[0]; - break; - case 'f': - if (force) goto invalid; - force = TRUE; - break; - default: + break; + case 't': + if (type || !(type = argvW[++i])) goto invalid; - } + break; + case 'd': + if (data || !(data = argvW[++i])) + goto invalid; + break; + case 's': + str = argvW[++i]; + if (separator || !str || lstrlenW(str) != 1) + goto invalid; + separator = str[0]; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; } } -- 2.31.0

1 2

[PATCH 1/6] user32/tests: Factor GetKeyState test checks together.
by Rémi Bernon 02 Apr '21

02 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should be no-op and just adds some tests and does some refactoring in preparation for the actual bug fixes. dlls/user32/tests/input.c | 128 +++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..9540566867f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3739,15 +3739,48 @@ struct get_key_state_thread_params int index; }; +#define check_get_keyboard_state(i, c, x, todo) check_get_keyboard_state_(i, c, x, todo, __LINE__) +static void check_get_keyboard_state_(int i, int c, int x, int todo, int line) +{ + unsigned char keystate[256]; + BOOL ret; + + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); + + /* calling it twice shouldn't change */ + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); +} + +#define check_get_key_state(i, c, x, todo) check_get_key_state_(i, c, x, todo, __LINE__) +static void check_get_key_state_(int i, int c, int x, int todo, int line) +{ + SHORT state; + + state = GetKeyState('X'); + todo_wine_if(todo) ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d: expected that X highest bit is %s, got %#x\n", i, x ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that X undefined bits are unset, got %#x\n", i, state); + + state = GetKeyState('C'); + ok_(__FILE__, line)(!(state & 0x8000) == !c, "%d: expected that C highest bit is %s, got %#x\n", i, c ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, state); +} + static DWORD WINAPI get_key_state_thread(void *arg) { struct get_key_state_thread_params *params = arg; struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; BOOL has_queue; - BOOL ret; + BOOL expect_x; MSG msg; int i = params->index; @@ -3770,67 +3803,21 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - todo_wine_if(!has_queue) - ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + if (!has_queue) expect_x = FALSE; + else expect_x = TRUE; - result = GetKeyState('X'); - if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ !has_queue); + check_get_key_state(i, FALSE, expect_x, /* todo */ TRUE); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ TRUE); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); - - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ has_queue); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); return 0; } @@ -3841,6 +3828,7 @@ static void test_GetKeyState(void) HANDLE thread; DWORD result; BYTE keystate[256]; + BOOL expect_x; HWND hwnd; MSG msg; int i; @@ -3888,13 +3876,19 @@ static void test_GetKeyState(void) keybd_event('X', 0, 0, 0); keystate['C'] = 0xff; SetKeyboardState(keystate); + + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_key_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - result = GetKeyState('X'); - if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + if (test->peek_message_main) expect_x = TRUE; + else expect_x = FALSE; + + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_key_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); @@ -3905,12 +3899,16 @@ static void test_GetKeyState(void) keybd_event('X', 0, KEYEVENTF_KEYUP, 0); keystate['C'] = 0x00; SetKeyboardState(keystate); + + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); -- 2.30.2

2 9

[PATCH v3 1/7] ntoskrnl: Store root PnP devices in a linked list.
by Zebediah Figura 02 Apr '21

02 Apr '21

It is quite rare to have more than one or two of these, and lists are slightly easier to work with. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6652be73c47..913a63e8f0d 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" +#include "wine/list.h" #include "ntoskrnl_private.h" #include "plugplay.h" @@ -923,20 +924,25 @@ static DRIVER_OBJECT *pnp_manager; struct root_pnp_device { WCHAR id[MAX_DEVICE_ID_LEN]; - struct wine_rb_entry entry; + struct list entry; DEVICE_OBJECT *device; }; -static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); + +static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) { - const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); - const WCHAR *k = key; + struct root_pnp_device *device; - return wcsicmp( k, device->id ); + LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + { + if (!wcsicmp( id, device->id )) + return device; + } + + return NULL; } -static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; - static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -1043,15 +1049,12 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) -{ - struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); - remove_device( device->device ); -} - void pnp_manager_stop(void) { - wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); + struct root_pnp_device *device, *next; + + LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + remove_device( device->device ); IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1088,7 +1091,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (wine_rb_get( &root_pnp_devices, id )) + if (find_root_pnp_device( id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1103,12 +1106,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) - { - ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); - IoDeleteDevice( device ); - continue; - } + list_add_tail( &root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } -- 2.30.2

2 7

[PATCH v2 1/6] ntoskrnl: Store root PnP devices in a linked list.
by Zebediah Figura 02 Apr '21

02 Apr '21

It is quite rare to have more than one or two of these, and lists are slightly easier to work with. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6652be73c47..913a63e8f0d 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" +#include "wine/list.h" #include "ntoskrnl_private.h" #include "plugplay.h" @@ -923,19 +924,24 @@ static DRIVER_OBJECT *pnp_manager; struct root_pnp_device { WCHAR id[MAX_DEVICE_ID_LEN]; - struct wine_rb_entry entry; + struct list entry; DEVICE_OBJECT *device; }; -static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); + +static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) { - const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); - const WCHAR *k = key; + struct root_pnp_device *device; - return wcsicmp( k, device->id ); -} + LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + { + if (!wcsicmp( id, device->id )) + return device; + } -static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; + return NULL; +} static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { @@ -1043,15 +1049,12 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) -{ - struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); - remove_device( device->device ); -} - void pnp_manager_stop(void) { - wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); + struct root_pnp_device *device, *next; + + LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + remove_device( device->device ); IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1088,7 +1091,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (wine_rb_get( &root_pnp_devices, id )) + if (find_root_pnp_device( id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1103,12 +1106,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) - { - ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); - IoDeleteDevice( device ); - continue; - } + list_add_tail( &root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } -- 2.30.2

2 6

[tools resubmit] testbot/PatchUtils: Rework GetPatchImpacts() to fix patchset handling.
by Francois Gouget 02 Apr '21

02 Apr '21

Rename the Tests set to Modules since it contains information about each module impacted by the patch, including a full list of the still existing and patched test units. Better separate the build impacts from the test impacts: the former impact the build of all following parts, while only the last part impacts the tests that need to be run. This stops the TestBot from running test units which were not impacted by the _last part_ of the patchset. Document the returned $Impacts structure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- With the Signed-off-by line this time! For the following wtbsuite tests: WTBS S8.2 - Check the make_* scripts are still run (advpack:advpack). WTBS S5.6 - Rerun a single test despite previous patches (serialui:confdlg). WTBS S5.5 - A non-test patch to another dll (serialui). WTBS S5.4 - Rerun a single test despite previous patches (msi:source). WTBS S4.3 - Trigger an autoconf run. WTBS S4.2 - Another non-test Wine patch (api-ms-win-core-timezone-l1-1-0). --- testbot/bin/WineRunBuild.pl | 6 +- testbot/bin/build/WineTest.pl | 30 +-- testbot/lib/WineTestBot/PatchUtils.pm | 370 ++++++++++++++++---------- testbot/lib/WineTestBot/Patches.pm | 15 +- testbot/web/Submit.pl | 36 ++- 5 files changed, 266 insertions(+), 191 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index adb1959f0..8a92f88d1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -461,16 +461,16 @@ foreach my $TestStep (@{$Job->Steps->GetItems()}) my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); -foreach my $TestInfo (values %{$Impacts->{Tests}}) +foreach my $Module (values %{$Impacts->{Modules}}) { foreach my $Bits ("", "64") { - my $Local = "$TestInfo->{ExeBase}$Bits.exe"; + my $Local = "$Module->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); Debug(Elapsed($Start), " Retrieving '$Local'\n"); my $BuildDir = "wine-$TestExes{$Local}"; - if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + if ($TA->GetFile("$BuildDir/$Module->{Path}/$Module->{ExeBase}.exe", "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3e13637d0..ffd665faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -118,21 +118,21 @@ sub TestPatch($$) } else { - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All} or - ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if ($Module->{All} or + ($Mission->{test} eq "module" and $Module->{Patched})) { # When given a module name WineTest runs all its tests. # But make sure the module actually has tests first! - push @TestList, $Module if (%{$TestInfo->{Files}}); + push @TestList, $ModuleName if (@{$Module->{TestUnits}}); } else { - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { - push @TestList, "$Module:$PatchedUnit"; + push @TestList, "$ModuleName:$TestUnit"; } } } @@ -157,15 +157,15 @@ sub TestPatch($$) sub GetExecutable($$$) { - my ($Mission, $Impacts, $Module) = @_; + my ($Mission, $Impacts, $ModuleName) = @_; - my $TestInfo = $Impacts->{Tests}->{$Module}; - my $TestExecutable = "$TestInfo->{ExeBase}.exe"; + my $Module = $Impacts->{Modules}->{$ModuleName}; + my $TestExecutable = "$Module->{ExeBase}.exe"; my $Dst = "$DataDir/staging/$TestExecutable"; unlink $Dst; my $WineDir = GetWineDir($Mission); - if (!symlink "$WineDir/$TestInfo->{Path}/$TestExecutable", $Dst) + if (!symlink "$WineDir/$Module->{Path}/$TestExecutable", $Dst) { LogMsg "Could not find $TestExecutable: $!\n"; return undef; @@ -207,7 +207,7 @@ sub TestExe($$$) # my $Action = ""; -my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $Module, $BaseTag); +my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $ModuleName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; @@ -268,9 +268,9 @@ while (@ARGV) last; # The remainder are the executable's arguments } } - elsif ($Action eq "testpatch" and !defined $Module) + elsif ($Action eq "testpatch" and !defined $ModuleName) { - $Module = $Arg; + $ModuleName = $Arg; last; # The remainder are the executable's arguments } else @@ -431,7 +431,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif (@ARGV) { - my $FileName = GetExecutable($Mission, $Impacts, $Module); + my $FileName = GetExecutable($Mission, $Impacts, $ModuleName); exit(1) if (!$FileName or !TestExe($Mission, $FileName, \@ARGV)); } else diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 87e4508ba..0d60fdb29 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -187,25 +187,24 @@ sub LastPartSeparator() return "===== TestBot: Last patchset part =====\n"; } -sub _CreateTestInfo($$$) +sub _CreateModuleInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = _Dir2ModuleName($Root, $Dir); - $Impacts->{BuildModules}->{$Module} = 1; + my $ModuleName = _Dir2ModuleName($Root, $Dir); $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if (!$Module) { - $Tests->{$Module} = { - "Module" => $Module, + $Impacts->{Modules}->{$ModuleName} = $Module = { + "Name" => $ModuleName, "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", + "ExeBase" => "${ModuleName}_test", }; - foreach my $File (keys %{$_TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$ModuleName}}) { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified + $Module->{TestFiles}->{$File} = 0; # not modified } } @@ -231,9 +230,9 @@ sub _HandleFile($$$) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{PatchedTests} = 1; - $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{TestFiles}->{$File} = $Change; + $Module->{PatchedTests} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -247,10 +246,9 @@ sub _HandleFile($$$) foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) { - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{Patched} = 1; } - $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -258,35 +256,31 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - else + elsif ($Impacts->{WineFiles}->{$FilePath}) { - my $WineFiles = $Impacts->{WineFiles} || $_WineFiles; - if ($WineFiles->{$FilePath}) + if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) { - if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) - { - $Impacts->{IsWinePatch} = 1; - } - # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. + $Impacts->{IsWinePatch} = 1; + } + # Else this file exists in Wine but has a very common name so it may just + # as well belong to another repository. - if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + { + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = 1; + if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") { - $Impacts->{PatchedRoot} = 1; - if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } - # Else patches to this file don't impact the Wine build. - } - elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") - { - # This may or may not be a Wine patch but the new Makefile.in will be - # added to the build by make_makefiles. - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } + # Else patches to this file don't impact the Wine build. + } + elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") + { + # This may or may not be a Wine patch but the new Makefile.in will be + # added to the build by make_makefiles. + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } @@ -299,6 +293,121 @@ Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or configure, whether it impacts the tests, etc. +Notes: A module is a dlls/ or programs/ directory. All references to patchsets +mean the patchset as being tested. So if a patch series has 5 parts and the +TestBot is testing part 3, the LAST PART is part 3, and ANY PART means part 1, +2 or 3. + +=over +=item IsWinePatch + +This flag is set if the LAST PART of the patchset has been identified as a +Wine patch. + +=item BuildModules + +This is a count of the number of modules where either the source or the tests +have been modified by ANY PART of the patchset. + +=item BuildRoot + +This flag is set if ANY PART of the patchset modified the Wine source +outside of a specific module in a way that impacts the build. + +=item Autoconf +=item MakeErrors +=item MakeFir +=item MakeMakefiles +=item MakeOpenGL +=item MakeRequests +=item MakeUnicode +=item MakeVulkan + +These flags are set if ANY PART of the patchset requires running the +corresponding script before building Wine. + +=item TestBuild + +This flag is set if the LAST PART of the patchset modified the Wine source +such that the build needs to be tested. + +=item RunTestUnits +=item PatchedModules +=item PatchedModuleOrTests + +These are counts based on the LAST PART of the patchset, so excluding any +impact from PREVIOUS PARTS. They count, respectively, the test units that need +to be rerun (so excluding deleted ones), the modules whose source has been +modified (including file deletions), and the modules where either the source +or the tests have been modified (again including deletions). + +=item PatchedRoot + +This flag is set if the LAST PART of the patchset modified the Wine source +outside of a specific module. + +=item Modules + +A set of structures containing information about each module impacted by +ANY PART of the patchset, indexed by module name. Each module has the +following information: + +=over + +=item Patched + +This flag is true if the LAST PART of the patchset has modified the module +itself, so excluding its test units. + +=item PatchedTests + +This flag is true if the LAST PART of the patchset has modified the tests of +the module. + +=item TestUnits + +This is an alphabetical list of the module's test units, after applying the +patchset (so excluding any test unit deleted by the patchset). + +=item All + +This flag is true if all the module's test units are impacted by the LAST PART +of the patchset. This is typically true if a resource file or helper dll is +modified. + +=item RunTestUnits + +This is an alphabetical list of the module's test units that are impacted by +the LAST PART of the patchset such that they should be rerun. In particular if +All is true this is identical to TestUnits. + +=item TestFiles + +This hashtable is indexed by the filenames of the files in the module's tests +directory. Note that this is not limited to the test unit C files but also +includes the resource files, makefile and helper dlls (but not testlist.c). +For each file the value describes the modification performed by the +LAST PART of the patchset: 0 (false) if there is no modification, "modify" for +modified files, "new" for added files and "rm" for deletions. + +=back + +=item WineFiles + +The keys of this hashtable enumerate all the Wine source files, including all +files added and removed by PREVIOUS PARTS of the patchset. +This is mostly for the internal use of the impact analyzer and should be +treated as read-only by outside code (and copy-on-write by the analyzer). + +=item NewFiles +=item DeletedFiles + +The keys of these hashtables enumerate, respectively, the files added and +removed by the LAST PART of the patchset. +This is mostly for the internal use of the impact analyzer. + +=back + =back =cut @@ -309,39 +418,31 @@ sub GetPatchImpacts($) my $fh; return undef if (!open($fh, "<", $PatchFileName)); - my $Impacts = { - # Number of test units impacted either directly, or indirectly by a module - # patch. - ModuleUnitCount => 0, - # Number of patched test units. - TestUnitCount => 0, - # The modules that need a rebuild, even if only for the tests. - BuildModules => {}, - # Information about 'tests' directories. - Tests => {}, - }; _LoadWineFiles(); - my $PastImpacts; + my $Impacts = { Modules => {}, WineFiles => $_WineFiles }; my ($Path, $Change); while (my $Line = <$fh>) { + # All the files on '---' lines will be passed to _HandleFile() when the + # corresponding '+++' line comes. if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{BuildRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -358,20 +459,20 @@ sub GetPatchImpacts($) elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { @@ -398,16 +499,18 @@ sub GetPatchImpacts($) elsif ($Line eq LastPartSeparator()) { # All the diffs so far belong to previous parts of this patchset. - # But: - # - Only the last part must be taken into account to determine if a - # rebuild and testing is needed. - # - Yet if a rebuild is needed the previous parts' patches will impact - # the scope of the rebuild so that information must be preserved. - # So save current impacts in $PastImpacts and reset the current state. - $PastImpacts = {}; - - # Build a copy of the Wine files list reflecting the current situation. - $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); + # But only the last part must be taken into account to determine if + # testing is needed. So reset all the Patched* fields. + + delete $Impacts->{PatchedRoot}; + foreach my $Module (values %{$Impacts->{Modules}}) + { + delete $Module->{Patched}; + delete $Module->{PatchedTests}; + } + + # Make a copy of the Wine files list reflecting the current situation. + $Impacts->{WineFiles} = { %{$Impacts->{WineFiles}} }; if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) { map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; @@ -417,30 +520,23 @@ sub GetPatchImpacts($) delete $Impacts->{IsWinePatch}; } - # The modules impacted by previous parts will still need to be built, - # but only if the last part justifies a build. So make a backup. - $PastImpacts->{BuildModules} = $Impacts->{BuildModules}; - $Impacts->{BuildModules} = {}; - - # Also backup the build-related fields. - foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") + # Reset the status of all modified test unit files to not modified + # (deleted files won't come back). + foreach my $Module (values %{$Impacts->{Modules}}) { - $PastImpacts->{$Field} = $Impacts->{$Field}; - $Impacts->{$Field} = undef; - } - - # Reset the status of all test unit files to not modified. - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - foreach my $File (keys %{$TestInfo->{Files}}) + my $TestFiles = $Module->{TestFiles}; + foreach my $File (keys %$TestFiles) { - if ($TestInfo->{Files}->{$File} ne "rm") + if ($TestFiles->{$File} eq "rm") + { + delete $TestFiles->{$File}; + } + else { - $TestInfo->{Files}->{$File} = 0; + $TestFiles->{$File} = 0; } } } - $Impacts->{ModuleUnitCount} = $Impacts->{TestUnitCount} = 0; } else { @@ -450,76 +546,58 @@ sub GetPatchImpacts($) } close($fh); - foreach my $TestInfo (values %{$Impacts->{Tests}}) + # Calculate the impact counts and lists of test units. + foreach my $Module (values %{$Impacts->{Modules}}) { - # For each module, identify modifications to non-C files and helper dlls - foreach my $File (keys %{$TestInfo->{Files}}) + $Module->{TestUnits} = []; + $Module->{RunTestUnits} = []; + + # For each module build the lists of test units + my $TestFiles = $Module->{TestFiles}; + foreach my $File (sort keys %$TestFiles) { - # Skip unmodified files - next if (!$TestInfo->{Files}->{$File}); # Assume makefile modifications may break the build but not the tests next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) { - # Any change to a non-C non-Spec file can potentially impact all tests - $TestInfo->{All} = 1; - last; + # Any change to a non-C non-Spec file (including deletions) can + # potentially impact all tests + $Module->{All} = 1 if ($TestFiles->{$File}); + next; } - if (exists $TestInfo->{Files}->{"$Base.spec"} and - ($TestInfo->{Files}->{"$Base.c"} or - $TestInfo->{Files}->{"$Base.spec"})) - { - # Any change to a helper dll can potentially impact all tests - $TestInfo->{All} = 1; - last; - } - } - $TestInfo->{PatchedUnits} = {}; - foreach my $File (keys %{$TestInfo->{Files}}) - { - my $Base = $File; - # Non-C files are not test units - next if ($Base !~ s/(?:\.c|\.spec)$//); - # Helper dlls are not test units - next if (exists $TestInfo->{Files}->{"$Base.spec"}); - # Don't try running a deleted test unit obviously - next if ($TestInfo->{Files}->{$File} eq "rm"); - $TestInfo->{AllUnits}->{$Base} = 1; - - if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) + if (exists $TestFiles->{"$Base.spec"}) { - $TestInfo->{PatchedUnits}->{$Base} = 1; - $Impacts->{ModuleUnitCount}++; + # This is a helper dll, not a test unit. + # Any change, including deletions, could impact all tests. + $Module->{All} ||= ($TestFiles->{"$Base.c"} or + $TestFiles->{"$Base.spec"}); + next; } - elsif ($TestInfo->{PatchedModule}) + + if ($TestFiles->{$File} ne "rm") { - # The module has been patched so this test unit is impacted indirectly. - $Impacts->{ModuleUnitCount}++; + push @{$Module->{TestUnits}}, $Base; + push @{$Module->{RunTestUnits}}, $Base if ($TestFiles->{$File}); } } + $Module->{All} ||= (@{$Module->{TestUnits}} == @{$Module->{RunTestUnits}}); + $Module->{RunTestUnits} = $Module->{TestUnits} if ($Module->{All}); - $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{PatchedUnits}}); - $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; - } - - if ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules} or - $Impacts->{PatchedTests}) - { - # Any patched area will need to be rebuilt... - $Impacts->{RebuildRoot} = $Impacts->{PatchedRoot}; - $Impacts->{RebuildModules} = $Impacts->{PatchedModules}; + my $RunTestUnits = scalar(@{$Module->{RunTestUnits}}); + $Impacts->{RunTestUnits} += $RunTestUnits; + $Impacts->{ModuleTestUnits} += $Module->{Patched} ? scalar(@{$Module->{TestUnits}}) : $RunTestUnits; - # ... even if the patch was in previous parts - if ($PastImpacts) + if ($Module->{Patched} or $Module->{PatchedTests}) { - $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; - $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; - map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; + $Impacts->{PatchedModuleOrTests}++; + $Impacts->{PatchedModules}++ if ($Module->{Patched}); } + $Impacts->{BuildModules}++; } + $Impacts->{TestBuild} = $Impacts->{PatchedRoot} || $Impacts->{PatchedModuleOrTests}; return $Impacts; } @@ -534,11 +612,11 @@ sub GetBuildTimeout($$) my ($Impacts, $TaskMissions) = @_; my ($ExeCount, $WineCount); - map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; + map { $_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : - scalar(keys %{$Impacts->{BuildModules}}); + my $ModuleCount = (!$Impacts or $Impacts->{BuildRoot}) ? 0 : + $Impacts->{BuildModules}; my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); @@ -575,9 +653,9 @@ sub GetTestTimeout($$) elsif ($Mission->{test} ne "build") { # Note: If only test units have been patched then - # ModuleUnitCount == TestUnitCount. - my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : - $Impacts->{ModuleUnitCount}; + # ModuleTestUnits == RunTestUnits. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{RunTestUnits} : + $Impacts->{ModuleTestUnits}; my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + max(0, $UnitCount - 2) * $SingleAvgTime; $Timeout += min($SuiteTimeout, $TestsTimeout); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b6a8af4c4..cc0fbe94a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -213,8 +213,7 @@ sub Submit($$;$) $SubjectInfo ||= $self->ParseSubject(); my $Impacts = GetPatchImpacts($PatchFileName); - if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and - !$Impacts->{PatchedTests}) + if (!$Impacts->{TestBuild}) { if ($Impacts->{IsWinePatch}) { @@ -255,14 +254,14 @@ sub Submit($$;$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{RunTestUnits} and !$BuildVMs->IsEmpty()) { # Create steps for the Windows tests my ($BuildStep, $BuildMissions); - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { foreach my $Bits ("32", "64") { @@ -305,7 +304,7 @@ sub Submit($$;$) # Create one Step per (module, unit, bitness) combination my $NewStep = $NewJob->Steps->Add(); $NewStep->PreviousNo($BuildStep->No); - my $FileName = $TestInfo->{ExeBase}; + my $FileName = $Module->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); @@ -317,7 +316,7 @@ sub Submit($$;$) $Task->VM($VM); $Task->Timeout($SingleTimeout); $Task->Missions($TaskMissions->{Statement}); - $Task->CmdLineArg($PatchedUnit); + $Task->CmdLineArg($TestUnit); } } } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 68978f089..76069bbc3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -168,15 +168,13 @@ sub _AnalyzePatch($) $self->{Impacts} ||= GetPatchImpacts($self->_GetStagingFilePath()); - if (!$self->{Impacts}->{PatchedRoot} and - !$self->{Impacts}->{PatchedModules} and - !$self->{Impacts}->{PatchedTests}) + if (!$self->{Impacts}->{TestBuild}) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; return undef; } - if ($self->{Impacts}->{ModuleUnitCount} == 0) + if ($self->{Impacts}->{PatchedModuleOrTests} == 0) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; @@ -307,11 +305,10 @@ sub _GetTestExecutables($) { if ($self->{FileType} eq "patch") { - foreach my $Module (sort keys %{$self->{Impacts}->{Tests}}) + foreach my $Module (values %{$self->{Impacts}->{Modules}}) { - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - next if (!%{$TestInfo->{Files}}); - $self->{TestExecutables}->{"$TestInfo->{ExeBase}.exe"} = $Module; + next if (!@{$Module->{TestUnits}}); + $self->{TestExecutables}->{"$Module->{ExeBase}.exe"} = $Module->{Name}; } } else @@ -332,10 +329,10 @@ sub _ValidateTestExecutable($;$) $self->{TestExecutable} = (sort keys %{$self->{TestExecutables}})[0]; if (!defined $self->{CmdLineArg} and $self->{Impacts}) { - my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - $self->{CmdLineArg} = (sort keys %{$TestInfo->{PatchedUnits}})[0] || - (sort keys %{$TestInfo->{AllUnits}})[0]; + my $ModuleName = $self->{TestExecutables}->{$self->{TestExecutable}}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; + $self->{CmdLineArg} = ($Module->{RunTestUnits}->[0] || + $Module->{TestUnits}->[0]); } } @@ -640,21 +637,22 @@ sub GetHeaderText($) $self->_GetTestExecutables(); foreach my $TestExecutable (sort keys %{$self->{TestExecutables}}) { - my $Module = $self->{TestExecutables}->{$TestExecutable}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + my $ModuleName = $self->{TestExecutables}->{$TestExecutable}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; my @TestUnits; - foreach my $TestUnit (sort keys %{$TestInfo->{AllUnits}}) + foreach my $TestUnit (@{$Module->{TestUnits}}) { - if ($TestInfo->{PatchedUnits}->{$TestUnit}) + if ($Module->{TestFiles}->{"$TestUnit.c"}) { + # This test unit was patched push @TestUnits, "<i>$TestUnit</i>"; } - elsif ($TestInfo->{All} or $TestInfo->{PatchedModule}) + elsif ($Module->{All} or $Module->{Patched}) { push @TestUnits, $TestUnit; } } - push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); + push @TestExecutables, "$ModuleName: ". join(" ", @TestUnits) if (@TestUnits); } push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); } @@ -788,7 +786,7 @@ sub GenerateFields($) if (!$self->{UserVMSelection} and !$VMRow->{Extra} and $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or - $self->{Impacts}->{TestUnitCount})) + $self->{Impacts}->{RunTestUnits})) { $VMRow->{Checked} = 1; } -- 2.20.1

1 0

[v2 PATCH 1/3] mfuuid: Add mfplay GUIDs.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/Makefile.in | 1 + dlls/mfuuid/mfplay.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 dlls/mfuuid/mfplay.c diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index 5fbb522782c..b42583bbb73 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,5 @@ MODULE = libmfuuid.a C_SRCS = \ + mfplay.c \ mfuuid.c diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c new file mode 100644 index 00000000000..1d28306fe4f --- /dev/null +++ b/dlls/mfuuid/mfplay.c @@ -0,0 +1,21 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "evr.h" +#include "initguid.h" +#include "mfplay.h" -- 2.30.2

2 3

[PATCH 1/3] mfuuid: Add mfplay GUIDs.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/mfuuid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index 537eaef6427..ae649cce633 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -35,3 +35,8 @@ DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad); + +/* mfplay.h is not used here because of the other header it includes, particularly evr.idl */ +DEFINE_GUID(IID_IMFPMediaPlayer, 0xa714590a,0x58af,0x430a,0x85,0xbf,0x44,0xf5,0xec,0x83,0x8d,0x85); +DEFINE_GUID(IID_IMFPMediaPlayerCallback, 0x766c8ffb,0x5fdb,0x4fea,0xa2,0x8d,0xb9,0x12,0x99,0x6f,0x51,0xbd); +DEFINE_GUID(IID_IMFPMediaItem, 0x90eb3e6b,0xecbf,0x45cc,0xb1,0xda,0xc6,0xfe,0x3e,0xa7,0x0d,0x57); -- 2.30.2

3 7

[PATCH 6/6] jscript: Add Object.seal implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/object.c | 26 ++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-)

2 1

[PATCH] msvcrt: Handle negative zero (-0.0) in _ecvt and others.
by Lauri Kenttä 01 Apr '21

01 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- v2: More compact version. dlls/msvcrt/math.c | 18 ++++++++---------- dlls/msvcrt/tests/printf.c | 4 ++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6b2d08a8294..eb25b578a2b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2585,7 +2585,7 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if( number < 0) { + if (number < 0 || (number == 0 && signbit(number))) { *sign = TRUE; number = -number; } else @@ -2648,7 +2648,7 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int if( prec < 1) prec = 2; result = malloc(prec + 7); - if( number < 0) { + if (number < 0 || (number == 0 && signbit(number))) { *sign = TRUE; number = -number; } else @@ -2690,10 +2690,9 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if (number < 0) - { - *sign = 1; - number = -number; + if (number < 0 || (number == 0 && signbit(number))) { + *sign = 1; + number = -number; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); @@ -2774,10 +2773,9 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int return EINVAL; } - if (number < 0) - { - *sign = 1; - number = -number; + if (number < 0 || (number == 0 && signbit(number))) { + *sign = 1; + number = -number; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 8960671f23e..14fd75d2b3c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -647,6 +647,10 @@ static struct { { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, + /* -0.0 with different precisions */ + { -0.0, 5, "00000", "00000", 0, 0, 1 }, + { -0.0, 0, "", "", 0, 0, 1 }, + { -0.0, -1, "", "", 0, 0, 1 }, /* Numbers > 1.0 with 0 or -ve precision */ { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, -- 2.31.0

2 2

[PATCH 5/6] jscript: Add Object.freeze implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 +++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 24 +++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+)

2 1

[PATCH 2/2 v2] msvcrt: Handle negative zero, infinity and nan in _ecvt and others.
by Piotr Caban 01 Apr '21

01 Apr '21

From: Lauri Kenttä <lauri.kentta(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 65 +++++++++++++++----------------------- dlls/msvcrt/tests/printf.c | 11 +++++++ 2 files changed, 36 insertions(+), 40 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Cleanup _ecvt tests.
by Piotr Caban 01 Apr '21

01 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - also fix the functions for NAN, -NAN, INFINITY and -INFINITY dlls/msvcrt/tests/printf.c | 43 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 26 deletions(-)

1 0

[PATCH 4/6] jscript: Support non-extensible objects in jsdisp_define_property.
by Jacek Caban 01 Apr '21

01 Apr '21

2 1

[PATCH 3/6] jscript: Add Object.isExtensible implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 15 +++++++++++++++ 2 files changed, 37 insertions(+)

2 1

[PATCH 2/6] jscript: Support non-extensible objects.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 +++++++++--- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 3 ++- dlls/mshtml/tests/es5.js | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-)

2 1

[PATCH] mf/session: Prefer transform-provided sample path.
by Nikolay Sivov 01 Apr '21

01 Apr '21

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c2334f82d62..20ccdd0535e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2750,7 +2750,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, if (FAILED(hr = IMFTransform_GetOutputStreamInfo(node->object.transform, buffers[i].dwStreamID, &stream_info))) break; - if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) { if (FAILED(hr = transform_get_external_output_sample(session, node, i, &stream_info, &buffers[i].pSample))) break; -- 2.30.2

1 0

[PATCH 1/6] jscript: Get dispid and call invoke in a single step when setting a member property.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 89 ++++++++++++++++++-------------------- dlls/jscript/dispex.c | 32 ++++++++++++++ dlls/jscript/engine.c | 54 +++++++++++++++++++++++ dlls/jscript/engine.h | 2 + dlls/jscript/jscript.h | 1 + dlls/jscript/tests/lang.js | 6 +++ dlls/jscript/tests/run.c | 19 ++++++++ 7 files changed, 156 insertions(+), 47 deletions(-)

1 0

[PATCH 1/5] wined3d: Check for a valid index buffer in d3d[89]_device_DrawIndexedPrimitive().
by Zebediah Figura 01 Apr '21

01 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 13 +++++++++---- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/device.c | 19 +++++++++++-------- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/device.c | 14 +------------- include/wine/wined3d.h | 2 +- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f4bdb748275..f0bfab660a7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2518,22 +2518,27 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int index_count; int base_vertex_index; - HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, start_idx, primitive_count); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + if (!device->stateblock_state->index_buffer) + { + wined3d_mutex_unlock(); + WARN("Index buffer not set, returning D3D_OK.\n"); + return D3D_OK; + } base_vertex_index = device->stateblock_state->base_vertex_index; d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } /* The caller is responsible for wined3d locking */ @@ -2752,7 +2757,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4eb1ab65e72..fc94dcaaad7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10176,7 +10176,7 @@ static void test_draw_primitive(void) hr = IDirect3DDevice8_SetIndices(device, NULL, 0); ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); - todo_wine ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Valid index buffer, NULL stream source. */ hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 229fc59521c..aa216edfcc0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3049,7 +3049,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); unsigned int index_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, " "vertex_count %u, start_idx %u, primitive_count %u.\n", @@ -3063,6 +3062,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + if (!device->stateblock_state->index_buffer) + { + wined3d_mutex_unlock(); + WARN("Called without a valid index buffer set.\n"); + return D3DERR_INVALIDCALL; + } index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -3070,12 +3075,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } /* The caller is responsible for wined3d locking */ @@ -3322,13 +3326,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + d3d9_rts_flag_auto_gen_mipmap(device); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bf2e77e5b71..ce937b0c543 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3736,7 +3736,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); done: wined3d_mutex_unlock(); @@ -4200,7 +4200,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: wined3d_mutex_unlock(); @@ -4478,7 +4478,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71ca6740c37..0389a73b924 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4480,26 +4480,14 @@ void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_devic state->patch_vertex_count, buffer, offset, false); } -HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) +void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { struct wined3d_state *state = device->cs->c.state; TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - if (!state->index_buffer) - { - /* D3D9 returns D3DERR_INVALIDCALL when DrawIndexedPrimitive is called - * without an index buffer set. (The first time at least...) - * D3D8 simply dies, but I doubt it can do much harm to return - * D3DERR_INVALIDCALL there as well. */ - WARN("Called without a valid index buffer set, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, 0, 0, true); - - return WINED3D_OK; } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 197a56d1952..bc6f2e29b7f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2372,7 +2372,7 @@ void __cdecl wined3d_device_dispatch_compute(struct wined3d_device *device, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); -HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); +void __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, -- 2.30.2

4 11

[PATCH] include: Add ID2D1DeviceContext1 definition.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_2.idl | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 3506c796ccb..39e285dc221 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -18,8 +18,6 @@ import "d2d1_1.idl"; -interface ID2D1DeviceContext1; - typedef enum D2D1_RENDERING_PRIORITY { D2D1_RENDERING_PRIORITY_NORMAL = 0, @@ -27,6 +25,40 @@ typedef enum D2D1_RENDERING_PRIORITY D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff, } D2D1_RENDERING_PRIORITY; +[ + object, + uuid(a16907d7-bc02-4801-99e8-8cf7f485f774), + local, +] +interface ID2D1GeometryRealization : ID2D1Resource +{ +} + +[ + object, + uuid(d37f57e4-6908-459f-a199-e72f24f79987), + local, +] +interface ID2D1DeviceContext1 : ID2D1DeviceContext +{ + HRESULT CreateFilledGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [out] ID2D1GeometryRealization **realization + ); + HRESULT CreateStrokedGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [in] float stroke_width, + [in] ID2D1StrokeStyle *stroke_style, + [out] ID2D1GeometryRealization **realization + ); + void DrawGeometryRealization( + [in] ID2D1GeometryRealization *realization, + [in] ID2D1Brush *brush + ); +} + [ object, uuid(d21768e1-23a4-4823-a14b-7c3eba85d658), -- 2.30.2

2 1

[tools] testbot/web: Fix Apache intermittently not finding CreatePatches().
by Francois Gouget 01 Apr '21

01 Apr '21

If CreatePatches() is not refered to with its full name Apache (mod_perl really) intermittently fails to find it and issues an error of the form: Undefined subroutine &WineTestBot::Jobs::CreatePatches called at .../testbot/lib/ObjectModel/Item.pm line 275. Strangely enough it never has trouble finding any of the other Create*() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- If anyone can explain this mystery to me I would be grateful. --- testbot/lib/WineTestBot/Jobs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 5dbc1a7f4..a5ae13525 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -454,7 +454,10 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&CreatePatches, ["PatchId"]), + # Somehow mod_perl sometimes fails to find CreatePatches() if not given the + # fully qualified name, but never has any trouble with the other Create*() + # functions. + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); -- 2.20.1

1 0

[tools] testbot/PatchUtils: Rework GetPatchImpacts() to fix patchset handling.
by Francois Gouget 01 Apr '21

01 Apr '21

Rename the Tests set to Modules since it contains information about each module impacted by the patch (which also happens to contain a list of the still existing and patched test units). Better separate the build impacts (Build*) from the test impacts (Patched*): the former impact the build of all following parts, while only the last part impacts the tests that need to be run. This stops the TestBot from running test units which were not impacted by the _last part_ of the patchset. Document the returned $Impacts structure. --- For the following wtbsuite tests: WTBS S8.2 - Check the make_* scripts are still run (advpack:advpack). WTBS S5.6 - Rerun a single test despite previous patches (serialui:confdlg). WTBS S5.5 - A non-test patch to another dll (serialui). WTBS S5.4 - Rerun a single test despite previous patches (msi:source). WTBS S4.3 - Trigger an autoconf run. WTBS S4.2 - Another non-test Wine patch (api-ms-win-core-timezone-l1-1-0). --- testbot/bin/WineRunBuild.pl | 6 +- testbot/bin/build/WineTest.pl | 30 +-- testbot/lib/WineTestBot/PatchUtils.pm | 370 ++++++++++++++++---------- testbot/lib/WineTestBot/Patches.pm | 15 +- testbot/web/Submit.pl | 36 ++- 5 files changed, 266 insertions(+), 191 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index adb1959f0..8a92f88d1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -461,16 +461,16 @@ foreach my $TestStep (@{$Job->Steps->GetItems()}) my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); -foreach my $TestInfo (values %{$Impacts->{Tests}}) +foreach my $Module (values %{$Impacts->{Modules}}) { foreach my $Bits ("", "64") { - my $Local = "$TestInfo->{ExeBase}$Bits.exe"; + my $Local = "$Module->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); Debug(Elapsed($Start), " Retrieving '$Local'\n"); my $BuildDir = "wine-$TestExes{$Local}"; - if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + if ($TA->GetFile("$BuildDir/$Module->{Path}/$Module->{ExeBase}.exe", "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3e13637d0..ffd665faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -118,21 +118,21 @@ sub TestPatch($$) } else { - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All} or - ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if ($Module->{All} or + ($Mission->{test} eq "module" and $Module->{Patched})) { # When given a module name WineTest runs all its tests. # But make sure the module actually has tests first! - push @TestList, $Module if (%{$TestInfo->{Files}}); + push @TestList, $ModuleName if (@{$Module->{TestUnits}}); } else { - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { - push @TestList, "$Module:$PatchedUnit"; + push @TestList, "$ModuleName:$TestUnit"; } } } @@ -157,15 +157,15 @@ sub TestPatch($$) sub GetExecutable($$$) { - my ($Mission, $Impacts, $Module) = @_; + my ($Mission, $Impacts, $ModuleName) = @_; - my $TestInfo = $Impacts->{Tests}->{$Module}; - my $TestExecutable = "$TestInfo->{ExeBase}.exe"; + my $Module = $Impacts->{Modules}->{$ModuleName}; + my $TestExecutable = "$Module->{ExeBase}.exe"; my $Dst = "$DataDir/staging/$TestExecutable"; unlink $Dst; my $WineDir = GetWineDir($Mission); - if (!symlink "$WineDir/$TestInfo->{Path}/$TestExecutable", $Dst) + if (!symlink "$WineDir/$Module->{Path}/$TestExecutable", $Dst) { LogMsg "Could not find $TestExecutable: $!\n"; return undef; @@ -207,7 +207,7 @@ sub TestExe($$$) # my $Action = ""; -my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $Module, $BaseTag); +my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $ModuleName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; @@ -268,9 +268,9 @@ while (@ARGV) last; # The remainder are the executable's arguments } } - elsif ($Action eq "testpatch" and !defined $Module) + elsif ($Action eq "testpatch" and !defined $ModuleName) { - $Module = $Arg; + $ModuleName = $Arg; last; # The remainder are the executable's arguments } else @@ -431,7 +431,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif (@ARGV) { - my $FileName = GetExecutable($Mission, $Impacts, $Module); + my $FileName = GetExecutable($Mission, $Impacts, $ModuleName); exit(1) if (!$FileName or !TestExe($Mission, $FileName, \@ARGV)); } else diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 87e4508ba..0d60fdb29 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -187,25 +187,24 @@ sub LastPartSeparator() return "===== TestBot: Last patchset part =====\n"; } -sub _CreateTestInfo($$$) +sub _CreateModuleInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = _Dir2ModuleName($Root, $Dir); - $Impacts->{BuildModules}->{$Module} = 1; + my $ModuleName = _Dir2ModuleName($Root, $Dir); $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if (!$Module) { - $Tests->{$Module} = { - "Module" => $Module, + $Impacts->{Modules}->{$ModuleName} = $Module = { + "Name" => $ModuleName, "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", + "ExeBase" => "${ModuleName}_test", }; - foreach my $File (keys %{$_TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$ModuleName}}) { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified + $Module->{TestFiles}->{$File} = 0; # not modified } } @@ -231,9 +230,9 @@ sub _HandleFile($$$) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{PatchedTests} = 1; - $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{TestFiles}->{$File} = $Change; + $Module->{PatchedTests} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -247,10 +246,9 @@ sub _HandleFile($$$) foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) { - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{Patched} = 1; } - $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -258,35 +256,31 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - else + elsif ($Impacts->{WineFiles}->{$FilePath}) { - my $WineFiles = $Impacts->{WineFiles} || $_WineFiles; - if ($WineFiles->{$FilePath}) + if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) { - if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) - { - $Impacts->{IsWinePatch} = 1; - } - # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. + $Impacts->{IsWinePatch} = 1; + } + # Else this file exists in Wine but has a very common name so it may just + # as well belong to another repository. - if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + { + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = 1; + if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") { - $Impacts->{PatchedRoot} = 1; - if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } - # Else patches to this file don't impact the Wine build. - } - elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") - { - # This may or may not be a Wine patch but the new Makefile.in will be - # added to the build by make_makefiles. - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } + # Else patches to this file don't impact the Wine build. + } + elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") + { + # This may or may not be a Wine patch but the new Makefile.in will be + # added to the build by make_makefiles. + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } @@ -299,6 +293,121 @@ Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or configure, whether it impacts the tests, etc. +Notes: A module is a dlls/ or programs/ directory. All references to patchsets +mean the patchset as being tested. So if a patch series has 5 parts and the +TestBot is testing part 3, the LAST PART is part 3, and ANY PART means part 1, +2 or 3. + +=over +=item IsWinePatch + +This flag is set if the LAST PART of the patchset has been identified as a +Wine patch. + +=item BuildModules + +This is a count of the number of modules where either the source or the tests +have been modified by ANY PART of the patchset. + +=item BuildRoot + +This flag is set if ANY PART of the patchset modified the Wine source +outside of a specific module in a way that impacts the build. + +=item Autoconf +=item MakeErrors +=item MakeFir +=item MakeMakefiles +=item MakeOpenGL +=item MakeRequests +=item MakeUnicode +=item MakeVulkan + +These flags are set if ANY PART of the patchset requires running the +corresponding script before building Wine. + +=item TestBuild + +This flag is set if the LAST PART of the patchset modified the Wine source +such that the build needs to be tested. + +=item RunTestUnits +=item PatchedModules +=item PatchedModuleOrTests + +These are counts based on the LAST PART of the patchset, so excluding any +impact from PREVIOUS PARTS. They count, respectively, the test units that need +to be rerun (so excluding deleted ones), the modules whose source has been +modified (including file deletions), and the modules where either the source +or the tests have been modified (again including deletions). + +=item PatchedRoot + +This flag is set if the LAST PART of the patchset modified the Wine source +outside of a specific module. + +=item Modules + +A set of structures containing information about each module impacted by +ANY PART of the patchset, indexed by module name. Each module has the +following information: + +=over + +=item Patched + +This flag is true if the LAST PART of the patchset has modified the module +itself, so excluding its test units. + +=item PatchedTests + +This flag is true if the LAST PART of the patchset has modified the tests of +the module. + +=item TestUnits + +This is an alphabetical list of the module's test units, after applying the +patchset (so excluding any test unit deleted by the patchset). + +=item All + +This flag is true if all the module's test units are impacted by the LAST PART +of the patchset. This is typically true if a resource file or helper dll is +modified. + +=item RunTestUnits + +This is an alphabetical list of the module's test units that are impacted by +the LAST PART of the patchset such that they should be rerun. In particular if +All is true this is identical to TestUnits. + +=item TestFiles + +This hashtable is indexed by the filenames of the files in the module's tests +directory. Note that this is not limited to the test unit C files but also +includes the resource files, makefile and helper dlls (but not testlist.c). +For each file the value describes the modification performed by the +LAST PART of the patchset: 0 (false) if there is no modification, "modify" for +modified files, "new" for added files and "rm" for deletions. + +=back + +=item WineFiles + +The keys of this hashtable enumerate all the Wine source files, including all +files added and removed by PREVIOUS PARTS of the patchset. +This is mostly for the internal use of the impact analyzer and should be +treated as read-only by outside code (and copy-on-write by the analyzer). + +=item NewFiles +=item DeletedFiles + +The keys of these hashtables enumerate, respectively, the files added and +removed by the LAST PART of the patchset. +This is mostly for the internal use of the impact analyzer. + +=back + =back =cut @@ -309,39 +418,31 @@ sub GetPatchImpacts($) my $fh; return undef if (!open($fh, "<", $PatchFileName)); - my $Impacts = { - # Number of test units impacted either directly, or indirectly by a module - # patch. - ModuleUnitCount => 0, - # Number of patched test units. - TestUnitCount => 0, - # The modules that need a rebuild, even if only for the tests. - BuildModules => {}, - # Information about 'tests' directories. - Tests => {}, - }; _LoadWineFiles(); - my $PastImpacts; + my $Impacts = { Modules => {}, WineFiles => $_WineFiles }; my ($Path, $Change); while (my $Line = <$fh>) { + # All the files on '---' lines will be passed to _HandleFile() when the + # corresponding '+++' line comes. if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{BuildRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -358,20 +459,20 @@ sub GetPatchImpacts($) elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { @@ -398,16 +499,18 @@ sub GetPatchImpacts($) elsif ($Line eq LastPartSeparator()) { # All the diffs so far belong to previous parts of this patchset. - # But: - # - Only the last part must be taken into account to determine if a - # rebuild and testing is needed. - # - Yet if a rebuild is needed the previous parts' patches will impact - # the scope of the rebuild so that information must be preserved. - # So save current impacts in $PastImpacts and reset the current state. - $PastImpacts = {}; - - # Build a copy of the Wine files list reflecting the current situation. - $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); + # But only the last part must be taken into account to determine if + # testing is needed. So reset all the Patched* fields. + + delete $Impacts->{PatchedRoot}; + foreach my $Module (values %{$Impacts->{Modules}}) + { + delete $Module->{Patched}; + delete $Module->{PatchedTests}; + } + + # Make a copy of the Wine files list reflecting the current situation. + $Impacts->{WineFiles} = { %{$Impacts->{WineFiles}} }; if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) { map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; @@ -417,30 +520,23 @@ sub GetPatchImpacts($) delete $Impacts->{IsWinePatch}; } - # The modules impacted by previous parts will still need to be built, - # but only if the last part justifies a build. So make a backup. - $PastImpacts->{BuildModules} = $Impacts->{BuildModules}; - $Impacts->{BuildModules} = {}; - - # Also backup the build-related fields. - foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") + # Reset the status of all modified test unit files to not modified + # (deleted files won't come back). + foreach my $Module (values %{$Impacts->{Modules}}) { - $PastImpacts->{$Field} = $Impacts->{$Field}; - $Impacts->{$Field} = undef; - } - - # Reset the status of all test unit files to not modified. - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - foreach my $File (keys %{$TestInfo->{Files}}) + my $TestFiles = $Module->{TestFiles}; + foreach my $File (keys %$TestFiles) { - if ($TestInfo->{Files}->{$File} ne "rm") + if ($TestFiles->{$File} eq "rm") + { + delete $TestFiles->{$File}; + } + else { - $TestInfo->{Files}->{$File} = 0; + $TestFiles->{$File} = 0; } } } - $Impacts->{ModuleUnitCount} = $Impacts->{TestUnitCount} = 0; } else { @@ -450,76 +546,58 @@ sub GetPatchImpacts($) } close($fh); - foreach my $TestInfo (values %{$Impacts->{Tests}}) + # Calculate the impact counts and lists of test units. + foreach my $Module (values %{$Impacts->{Modules}}) { - # For each module, identify modifications to non-C files and helper dlls - foreach my $File (keys %{$TestInfo->{Files}}) + $Module->{TestUnits} = []; + $Module->{RunTestUnits} = []; + + # For each module build the lists of test units + my $TestFiles = $Module->{TestFiles}; + foreach my $File (sort keys %$TestFiles) { - # Skip unmodified files - next if (!$TestInfo->{Files}->{$File}); # Assume makefile modifications may break the build but not the tests next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) { - # Any change to a non-C non-Spec file can potentially impact all tests - $TestInfo->{All} = 1; - last; + # Any change to a non-C non-Spec file (including deletions) can + # potentially impact all tests + $Module->{All} = 1 if ($TestFiles->{$File}); + next; } - if (exists $TestInfo->{Files}->{"$Base.spec"} and - ($TestInfo->{Files}->{"$Base.c"} or - $TestInfo->{Files}->{"$Base.spec"})) - { - # Any change to a helper dll can potentially impact all tests - $TestInfo->{All} = 1; - last; - } - } - $TestInfo->{PatchedUnits} = {}; - foreach my $File (keys %{$TestInfo->{Files}}) - { - my $Base = $File; - # Non-C files are not test units - next if ($Base !~ s/(?:\.c|\.spec)$//); - # Helper dlls are not test units - next if (exists $TestInfo->{Files}->{"$Base.spec"}); - # Don't try running a deleted test unit obviously - next if ($TestInfo->{Files}->{$File} eq "rm"); - $TestInfo->{AllUnits}->{$Base} = 1; - - if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) + if (exists $TestFiles->{"$Base.spec"}) { - $TestInfo->{PatchedUnits}->{$Base} = 1; - $Impacts->{ModuleUnitCount}++; + # This is a helper dll, not a test unit. + # Any change, including deletions, could impact all tests. + $Module->{All} ||= ($TestFiles->{"$Base.c"} or + $TestFiles->{"$Base.spec"}); + next; } - elsif ($TestInfo->{PatchedModule}) + + if ($TestFiles->{$File} ne "rm") { - # The module has been patched so this test unit is impacted indirectly. - $Impacts->{ModuleUnitCount}++; + push @{$Module->{TestUnits}}, $Base; + push @{$Module->{RunTestUnits}}, $Base if ($TestFiles->{$File}); } } + $Module->{All} ||= (@{$Module->{TestUnits}} == @{$Module->{RunTestUnits}}); + $Module->{RunTestUnits} = $Module->{TestUnits} if ($Module->{All}); - $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{PatchedUnits}}); - $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; - } - - if ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules} or - $Impacts->{PatchedTests}) - { - # Any patched area will need to be rebuilt... - $Impacts->{RebuildRoot} = $Impacts->{PatchedRoot}; - $Impacts->{RebuildModules} = $Impacts->{PatchedModules}; + my $RunTestUnits = scalar(@{$Module->{RunTestUnits}}); + $Impacts->{RunTestUnits} += $RunTestUnits; + $Impacts->{ModuleTestUnits} += $Module->{Patched} ? scalar(@{$Module->{TestUnits}}) : $RunTestUnits; - # ... even if the patch was in previous parts - if ($PastImpacts) + if ($Module->{Patched} or $Module->{PatchedTests}) { - $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; - $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; - map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; + $Impacts->{PatchedModuleOrTests}++; + $Impacts->{PatchedModules}++ if ($Module->{Patched}); } + $Impacts->{BuildModules}++; } + $Impacts->{TestBuild} = $Impacts->{PatchedRoot} || $Impacts->{PatchedModuleOrTests}; return $Impacts; } @@ -534,11 +612,11 @@ sub GetBuildTimeout($$) my ($Impacts, $TaskMissions) = @_; my ($ExeCount, $WineCount); - map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; + map { $_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : - scalar(keys %{$Impacts->{BuildModules}}); + my $ModuleCount = (!$Impacts or $Impacts->{BuildRoot}) ? 0 : + $Impacts->{BuildModules}; my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); @@ -575,9 +653,9 @@ sub GetTestTimeout($$) elsif ($Mission->{test} ne "build") { # Note: If only test units have been patched then - # ModuleUnitCount == TestUnitCount. - my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : - $Impacts->{ModuleUnitCount}; + # ModuleTestUnits == RunTestUnits. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{RunTestUnits} : + $Impacts->{ModuleTestUnits}; my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + max(0, $UnitCount - 2) * $SingleAvgTime; $Timeout += min($SuiteTimeout, $TestsTimeout); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b6a8af4c4..cc0fbe94a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -213,8 +213,7 @@ sub Submit($$;$) $SubjectInfo ||= $self->ParseSubject(); my $Impacts = GetPatchImpacts($PatchFileName); - if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and - !$Impacts->{PatchedTests}) + if (!$Impacts->{TestBuild}) { if ($Impacts->{IsWinePatch}) { @@ -255,14 +254,14 @@ sub Submit($$;$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{RunTestUnits} and !$BuildVMs->IsEmpty()) { # Create steps for the Windows tests my ($BuildStep, $BuildMissions); - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { foreach my $Bits ("32", "64") { @@ -305,7 +304,7 @@ sub Submit($$;$) # Create one Step per (module, unit, bitness) combination my $NewStep = $NewJob->Steps->Add(); $NewStep->PreviousNo($BuildStep->No); - my $FileName = $TestInfo->{ExeBase}; + my $FileName = $Module->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); @@ -317,7 +316,7 @@ sub Submit($$;$) $Task->VM($VM); $Task->Timeout($SingleTimeout); $Task->Missions($TaskMissions->{Statement}); - $Task->CmdLineArg($PatchedUnit); + $Task->CmdLineArg($TestUnit); } } } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 68978f089..76069bbc3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -168,15 +168,13 @@ sub _AnalyzePatch($) $self->{Impacts} ||= GetPatchImpacts($self->_GetStagingFilePath()); - if (!$self->{Impacts}->{PatchedRoot} and - !$self->{Impacts}->{PatchedModules} and - !$self->{Impacts}->{PatchedTests}) + if (!$self->{Impacts}->{TestBuild}) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; return undef; } - if ($self->{Impacts}->{ModuleUnitCount} == 0) + if ($self->{Impacts}->{PatchedModuleOrTests} == 0) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; @@ -307,11 +305,10 @@ sub _GetTestExecutables($) { if ($self->{FileType} eq "patch") { - foreach my $Module (sort keys %{$self->{Impacts}->{Tests}}) + foreach my $Module (values %{$self->{Impacts}->{Modules}}) { - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - next if (!%{$TestInfo->{Files}}); - $self->{TestExecutables}->{"$TestInfo->{ExeBase}.exe"} = $Module; + next if (!@{$Module->{TestUnits}}); + $self->{TestExecutables}->{"$Module->{ExeBase}.exe"} = $Module->{Name}; } } else @@ -332,10 +329,10 @@ sub _ValidateTestExecutable($;$) $self->{TestExecutable} = (sort keys %{$self->{TestExecutables}})[0]; if (!defined $self->{CmdLineArg} and $self->{Impacts}) { - my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - $self->{CmdLineArg} = (sort keys %{$TestInfo->{PatchedUnits}})[0] || - (sort keys %{$TestInfo->{AllUnits}})[0]; + my $ModuleName = $self->{TestExecutables}->{$self->{TestExecutable}}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; + $self->{CmdLineArg} = ($Module->{RunTestUnits}->[0] || + $Module->{TestUnits}->[0]); } } @@ -640,21 +637,22 @@ sub GetHeaderText($) $self->_GetTestExecutables(); foreach my $TestExecutable (sort keys %{$self->{TestExecutables}}) { - my $Module = $self->{TestExecutables}->{$TestExecutable}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + my $ModuleName = $self->{TestExecutables}->{$TestExecutable}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; my @TestUnits; - foreach my $TestUnit (sort keys %{$TestInfo->{AllUnits}}) + foreach my $TestUnit (@{$Module->{TestUnits}}) { - if ($TestInfo->{PatchedUnits}->{$TestUnit}) + if ($Module->{TestFiles}->{"$TestUnit.c"}) { + # This test unit was patched push @TestUnits, "<i>$TestUnit</i>"; } - elsif ($TestInfo->{All} or $TestInfo->{PatchedModule}) + elsif ($Module->{All} or $Module->{Patched}) { push @TestUnits, $TestUnit; } } - push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); + push @TestExecutables, "$ModuleName: ". join(" ", @TestUnits) if (@TestUnits); } push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); } @@ -788,7 +786,7 @@ sub GenerateFields($) if (!$self->{UserVMSelection} and !$VMRow->{Extra} and $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or - $self->{Impacts}->{TestUnitCount})) + $self->{Impacts}->{RunTestUnits})) { $VMRow->{Checked} = 1; } -- 2.20.1

1 0

[PATCH] Rewrite wineserver main.c in Haskell.
by Jefferson Carpenter 01 Apr '21

01 Apr '21

Some or all additions to Makefile.in may be removed pending more makedep.c extensions. Currently builds PC / ghc architecture. To enable WoW64 builds, we intend to use stack to create both 32- and 64-bit ghc and package sandboxes as needed.

2 2

[PATCH 1/6] reg: Use wide-char string literals in export.c
by Hugh McMaster 01 Apr '21

01 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 30f01c8b94f..3150c075f26 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -79,15 +79,14 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) { - static const WCHAR quoted_fmt[] = {'"','%','s','"','=',0}; - static const WCHAR default_name[] = {'@','=',0}; + static const WCHAR *default_name = L"@="; size_t line_len; if (name && *name) { WCHAR *str = escape_string(name, len, &line_len); WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); - line_len = swprintf(buf, line_len + 4, quoted_fmt, str); + line_len = swprintf(buf, line_len + 4, L"\"%s\"=", str); write_file(hFile, buf); free(buf); free(str); @@ -105,28 +104,24 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) { size_t len = 0, line_len; WCHAR *str; - static const WCHAR fmt[] = {'"','%','s','"',0}; if (size) len = size / sizeof(WCHAR) - 1; str = escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); - swprintf(*buf, line_len + 3, fmt, str); + swprintf(*buf, line_len + 3, L"\"%s\"", str); free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) { - static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = malloc(15 * sizeof(WCHAR)); - swprintf(*buf, 15, fmt, *data); + swprintf(*buf, 15, L"dword:%08x", *data); } static size_t export_hex_data_type(HANDLE hFile, DWORD type) { - static const WCHAR hex[] = {'h','e','x',':',0}; - static const WCHAR hexp_fmt[] = {'h','e','x','(','%','x',')',':',0}; + static const WCHAR *hex = L"hex:"; size_t line_len; if (type == REG_BINARY) @@ -137,7 +132,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) else { WCHAR *buf = malloc(15 * sizeof(WCHAR)); - line_len = swprintf(buf, 15, hexp_fmt, type); + line_len = swprintf(buf, 15, L"hex(%x):", type); write_file(hFile, buf); free(buf); } @@ -150,8 +145,6 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, DWORD line_len, void *data, DWORD size) { - static const WCHAR fmt[] = {'%','0','2','x',0}; - static const WCHAR hex_concat[] = {'\\','\r','\n',' ',' ',0}; size_t num_commas, i, pos; line_len += export_hex_data_type(hFile, type); @@ -163,7 +156,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, for (i = 0, pos = 0; i < size; i++) { - pos += swprintf(*buf + pos, 3, fmt, ((BYTE *)data)[i]); + pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); if (i == num_commas) break; (*buf)[pos++] = ','; (*buf)[pos] = 0; @@ -172,7 +165,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, if (line_len >= MAX_HEX_CHARS) { write_file(hFile, *buf); - write_file(hFile, hex_concat); + write_file(hFile, L"\\\r\n "); line_len = 2; pos = 0; } @@ -181,7 +174,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, static void export_newline(HANDLE hFile) { - static const WCHAR newline[] = {'\r','\n',0}; + static const WCHAR *newline = L"\r\n"; write_file(hFile, newline); } @@ -224,11 +217,10 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, static void export_key_name(HANDLE hFile, WCHAR *name) { - static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); - swprintf(buf, lstrlenW(name) + 7, fmt, name); + swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); write_file(hFile, buf); free(buf); } @@ -309,9 +301,7 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) static void export_file_header(HANDLE hFile) { - static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n',0}; + static const WCHAR *header = L"\uFEFFWindows Registry Editor Version 5.00\r\n"; write_file(hFile, header); } -- 2.31.0

1 5

[PATCH] combase: Return initial values for global options.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 11 +++++++++-- dlls/ole32/tests/compobj.c | 13 +++++++++++++ include/objidlbase.idl | 28 +++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index cda0d52f579..4677972656f 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); HINSTANCE hProxyDll; +static ULONG_PTR global_options[COMGLB_PROPERTIES_RESERVED3 + 1]; + /* Ole32 exports */ extern void WINAPI DestroyRunningObjectTable(void); extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj); @@ -490,9 +492,14 @@ static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPER static HRESULT WINAPI global_options_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) { - FIXME("%p, %u, %p.\n", iface, property, value); + TRACE("%p, %u, %p.\n", iface, property, value); - return E_NOTIMPL; + if (property < COMGLB_EXCEPTION_HANDLING || property > COMGLB_PROPERTIES_RESERVED3) + return E_INVALIDARG; + + *value = global_options[property]; + + return S_OK; } static const IGlobalOptionsVtbl global_options_vtbl = diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 2e5006463da..d1e947e393f 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3919,6 +3919,7 @@ todo_wine { static void test_GlobalOptions(void) { IGlobalOptions *global_options; + ULONG_PTR value; HRESULT hres; CoInitialize(NULL); @@ -3933,6 +3934,18 @@ static void test_GlobalOptions(void) return; } + hres = IGlobalOptions_Query(global_options, 0, &value); + ok(FAILED(hres), "Unexpected hr %#x.\n", hres); + + hres = IGlobalOptions_Query(global_options, COMGLB_PROPERTIES_RESERVED3 + 1, &value); + ok(FAILED(hres), "Unexpected hr %#x.\n", hres); + + value = ~0u; + hres = IGlobalOptions_Query(global_options, COMGLB_EXCEPTION_HANDLING, &value); + ok(hres == S_OK || broken(hres == E_FAIL) /* Vista */, "Unexpected hr %#x.\n", hres); + if (SUCCEEDED(hres)) + ok(value == COMGLB_EXCEPTION_HANDLE, "Unexpected value %ld.\n", value); + IGlobalOptions_Release(global_options); hres = CoCreateInstance(&CLSID_GlobalOptions, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 6449be8417b..bd5a9b12409 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -1095,7 +1095,12 @@ typedef enum tagGLOBALOPT_PROPERTIES { COMGLB_EXCEPTION_HANDLING = 1, COMGLB_APPID = 2, - COMGLB_RPC_THREADPOOL_SETTING = 3 + COMGLB_RPC_THREADPOOL_SETTING = 3, + COMGLB_RO_SETTINGS = 4, + COMGLB_UNMARSHALING_POLICY = 5, + COMGLB_PROPERTIES_RESERVED1 = 6, + COMGLB_PROPERTIES_RESERVED2 = 7, + COMGLB_PROPERTIES_RESERVED3 = 8, } GLOBALOPT_PROPERTIES; typedef enum tagGLOBALOPT_EH_VALUES @@ -1112,6 +1117,27 @@ typedef enum tagGLOBALOPT_RPCTP_VALUES COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1 } GLOBALOPT_RPCTP_VALUES; +typedef enum tagGLOBALOPT_RO_FLAGS +{ + COMGLB_STA_MODALLOOP_REMOVE_TOUCH_MESSAGES = 0x1, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_REMOVE_INPUT_MESSAGES = 0x2, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_DONOT_REMOVE_INPUT_MESSAGES = 0x4, + COMGLB_FAST_RUNDOWN = 0x8, + COMGLB_RESERVED1 = 0x10, + COMGLB_RESERVED2 = 0x20, + COMGLB_RESERVED3 = 0x40, + COMGLB_STA_MODALLOOP_SHARED_QUEUE_REORDER_POINTER_MESSAGES = 0x80, + COMGLB_RESERVED4 = 0x100, + COMGLB_RESERVED5 = 0x200, + COMGLB_RESERVED6 = 0x400, +} GLOBALOPT_RO_FLAGS; + +typedef enum tagGLOBALOPT_UNMARSHALING_POLICY_VALUES +{ + COMGLB_UNMARSHALING_POLICY_NORMAL = 0, + COMGLB_UNMARSHALING_POLICY_STRONG = 1, + COMGLB_UNMARSHALING_POLICY_HYBRID = 2, +} GLOBALOPT_UNMARSHALING_POLICY_VALUES; [ object, -- 2.30.2

2 1

[PATCH] d2d1: Implement ID2D1Multithread.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 59 ++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2a9de448c6e..b65727d3a32 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,12 +30,15 @@ struct d2d_settings d2d_settings = struct d2d_factory { ID2D1Factory2 ID2D1Factory2_iface; + ID2D1Multithread ID2D1Multithread_iface; LONG refcount; ID3D10Device1 *device; float dpi_x; float dpi_y; + + CRITICAL_SECTION cs; }; static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) @@ -43,6 +46,11 @@ static inline struct d2d_factory *impl_from_ID2D1Factory2(ID2D1Factory2 *iface) return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory2_iface); } +static inline struct d2d_factory *impl_from_ID2D1Multithread(ID2D1Multithread *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Multithread_iface); +} + static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) { HDC hdc; @@ -63,6 +71,8 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface, REFIID iid, void **out) { + struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if ((IsEqualGUID(iid, &IID_ID2D1Factory2) && d2d_settings.max_version_factory >= 2) @@ -74,6 +84,12 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory2 *iface *out = iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_ID2D1Multithread)) + { + ID2D1Factory2_AddRef(iface); + *out = &factory->ID2D1Multithread_iface; + return S_OK; + } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -102,6 +118,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); + DeleteCriticalSection(&factory->cs); heap_free(factory); } @@ -593,17 +610,92 @@ static const struct ID2D1Factory2Vtbl d2d_factory_vtbl = d2d_factory_ID2D1Factory1_CreateDevice, }; +static HRESULT STDMETHODCALLTYPE d2d_factory_mt_QueryInterface(ID2D1Multithread *iface, REFIID iid, void **out) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_QueryInterface(&factory->ID2D1Factory2_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_AddRef(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_AddRef(&factory->ID2D1Factory2_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_factory_mt_Release(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + return d2d_factory_Release(&factory->ID2D1Factory2_iface); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_mt_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return TRUE; +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return EnterCriticalSection(&factory->cs); +} + +static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) +{ + struct d2d_factory *factory = impl_from_ID2D1Multithread(iface); + + TRACE("%p.\n", iface); + + return LeaveCriticalSection(&factory->cs); +} + +static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) +{ + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_factory_st_Enter(ID2D1Multithread *iface) +{ +} + +static void STDMETHODCALLTYPE d2d_factory_st_Leave(ID2D1Multithread *iface) +{ +} + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_mt_GetMultithreadProtected, + d2d_factory_mt_Enter, + d2d_factory_mt_Leave, +}; + +static const struct ID2D1MultithreadVtbl d2d_factory_multithread_noop_vtbl = +{ + d2d_factory_mt_QueryInterface, + d2d_factory_mt_AddRef, + d2d_factory_mt_Release, + d2d_factory_st_GetMultithreadProtected, + d2d_factory_st_Enter, + d2d_factory_st_Leave, +}; + static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, const D2D1_FACTORY_OPTIONS *factory_options) { - if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED) - FIXME("Ignoring factory type %#x.\n", factory_type); if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); factory->ID2D1Factory2_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Multithread_iface.lpVtbl = factory_type == D2D1_FACTORY_TYPE_SINGLE_THREADED ? + &d2d_factory_multithread_noop_vtbl : &d2d_factory_multithread_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); + InitializeCriticalSection(&factory->cs); } HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, @@ -615,6 +707,12 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); + if (factory_type != D2D1_FACTORY_TYPE_SINGLE_THREADED && + factory_type != D2D1_FACTORY_TYPE_MULTI_THREADED) + { + return E_INVALIDARG; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a046a21c7f6..8db2aad813e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9614,6 +9614,64 @@ static void test_geometry_group(BOOL d3d11) ID2D1Factory_Release(factory); } +static DWORD WINAPI mt_factory_test_thread_func(void *param) +{ + ID2D1Multithread *multithread = param; + + ID2D1Multithread_Enter(multithread); + + return 0; +} + +static void test_mt_factory(BOOL d3d11) +{ + ID2D1Multithread *multithread; + ID2D1Factory *factory; + HANDLE thread; + HRESULT hr; + DWORD ret; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED + 1, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + ID2D1Multithread_Release(multithread); + ID2D1Factory_Release(factory); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + hr = ID2D1Factory_QueryInterface(factory, &IID_ID2D1Multithread, (void **)&multithread); + ok(SUCCEEDED(hr), "Failed to get interface, hr %#x.\n", hr); + + ret = ID2D1Multithread_GetMultithreadProtected(multithread); + ok(!!ret, "Unexpected return value.\n"); + + ID2D1Multithread_Enter(multithread); + thread = CreateThread(NULL, 0, mt_factory_test_thread_func, multithread, 0, NULL); + ok(!!thread, "Failed to create a thread.\n"); + ret = WaitForSingleObject(thread, 10); + ok(ret == WAIT_TIMEOUT, "Expected timeout.\n"); + CloseHandle(thread); + ID2D1Multithread_Release(multithread); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9674,6 +9732,7 @@ START_TEST(d2d1) queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); + queue_test(test_mt_factory); run_queued_tests(); } -- 2.30.2

2 1

[PATCH v2 1/3] winex11.drv: Don't remap root_window relative coordinates.
by Rémi Bernon 01 Apr '21

01 Apr '21

We already converted coordinates from root to virtual screen, we shouldn't need to remap them. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remap coordinates for client_window too, if we ever receive events on them. dlls/winex11.drv/mouse.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8b39458fd37..e567a03c61c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -599,15 +599,18 @@ static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data * TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); - if (window == data->whole_window) + else { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + } TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); -- 2.30.2

1 2

[PATCH] msvcrt: Handle negative zero (-0.0) in _ecvt and others.
by Lauri Kenttä 31 Mar '21

31 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- dlls/msvcrt/math.c | 24 ++++++++++++++++++++---- dlls/msvcrt/tests/printf.c | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6b2d08a8294..cdc93a6b75a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2588,6 +2588,10 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) if( number < 0) { *sign = TRUE; number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? TRUE : FALSE; + number = 0; } else *sign = FALSE; /* handle cases with zero ndigits or less */ @@ -2651,6 +2655,10 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int if( number < 0) { *sign = TRUE; number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? TRUE : FALSE; + number = 0; } else *sign = FALSE; len = _snprintf(result, prec + 7, "%.*le", prec - 1, number); @@ -2692,8 +2700,12 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) if (number < 0) { - *sign = 1; - number = -number; + *sign = 1; + number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? 1 : 0; + number = 0; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); @@ -2776,8 +2788,12 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int if (number < 0) { - *sign = 1; - number = -number; + *sign = 1; + number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? 1 : 0; + number = 0; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 8960671f23e..14fd75d2b3c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -647,6 +647,10 @@ static struct { { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, + /* -0.0 with different precisions */ + { -0.0, 5, "00000", "00000", 0, 0, 1 }, + { -0.0, 0, "", "", 0, 0, 1 }, + { -0.0, -1, "", "", 0, 0, 1 }, /* Numbers > 1.0 with 0 or -ve precision */ { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, -- 2.31.0

1 0

[PATCH 1/5] winex11.drv: Introduce new map_event_coords helper.
by Rémi Bernon 31 Mar '21

31 Mar '21

Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This patch has been in staging and proton for a while and been sent already but it silently dropped off the patch list. It's causing conflicts with some other patches I have that deal with __wine_send_input and that I'd like to send too, and so I cleaned it up a bit and I'm now sending it with Gabriel's blessing. I can reproduce the issue with Winamp, but not on my regular desktop. The issue is however pretty easy to reproduce when there's lag between Wine and X11, such as when using a remote X11 server. dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dd25f8b172c..8a379e5a3b7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -587,6 +587,34 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_event_coords + * + * Map the input event coordinates so they're relative to the desktop. + */ +static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +{ + POINT pt = { input->u.mi.dx, input->u.mi.dy }; + + TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + + TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -618,24 +646,8 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + pt = map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) -- 2.30.2

3 12

[PATCH] jscript: Support calling properties with getters.
by Jacek Caban 31 Mar '21

31 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 130 ++++++++++++++++++++++----------------- dlls/mshtml/tests/es5.js | 13 ++++ 2 files changed, 85 insertions(+), 58 deletions(-)

2 1

[PATCH] winevulkan: Fix queue creation with mixed queue flags.
by Georg Lehmann 31 Mar '21

31 Mar '21

The Vulkan spec says: The queueFamilyIndex member of each element of pQueueCreateInfos must be unique within pQueueCreateInfos, except that two members can share the same queueFamilyIndex if one is a protected-capable queue and one is not a protected-capable queue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 83 ++++++++++++++++++-------------- dlls/winevulkan/vulkan_private.h | 6 ++- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b2045295718..0beb09329d2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -323,25 +323,21 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, } } -static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, - uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) +static void wine_vk_device_get_queues(struct VkDevice_T *device, + uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags, + struct VkQueue_T* queues) { VkDeviceQueueInfo2 queue_info; - struct VkQueue_T *queues; unsigned int i; - if (!(queues = heap_calloc(queue_count, sizeof(*queues)))) - { - ERR("Failed to allocate memory for queues\n"); - return NULL; - } - for (i = 0; i < queue_count; i++) { struct VkQueue_T *queue = &queues[i]; queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; queue->device = device; + queue->family_index = family_index; + queue->queue_index = i; queue->flags = flags; /* The Vulkan spec says: @@ -365,8 +361,6 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, queue, queue->queue); } - - return queues; } static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) @@ -438,17 +432,18 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ static void wine_vk_device_free(struct VkDevice_T *device) { + struct VkQueue_T *queue; if (!device) return; if (device->queues) { unsigned int i; - for (i = 0; i < device->max_queue_families; i++) + for (i = 0; i < device->queue_count; i++) { - if (device->queues[i] && device->queues[i]->queue) - WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device->queues[i]); - heap_free(device->queues[i]); + queue = &device->queues[i]; + if (queue && queue->queue) + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, queue); } heap_free(device->queues); device->queues = NULL; @@ -764,7 +759,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { VkDeviceCreateInfo create_info_host; - uint32_t max_queue_families; + struct VkQueue_T *next_queue; struct VkDevice_T *object; unsigned int i; VkResult res; @@ -819,17 +814,18 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, /* We need to cache all queues within the device as each requires wrapping since queues are * dispatchable objects. */ - phys_dev->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(phys_dev->phys_dev, - &max_queue_families, NULL); - object->max_queue_families = max_queue_families; - TRACE("Max queue families: %u.\n", object->max_queue_families); + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) + { + object->queue_count += create_info_host.pQueueCreateInfos[i].queueCount; + } - if (!(object->queues = heap_calloc(max_queue_families, sizeof(*object->queues)))) + if (!(object->queues = heap_calloc(object->queue_count, sizeof(*object->queues)))) { res = VK_ERROR_OUT_OF_HOST_MEMORY; goto fail; } + next_queue = object->queues; for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { uint32_t flags = create_info_host.pQueueCreateInfos[i].flags; @@ -838,12 +834,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, TRACE("Queue family index %u, queue count %u.\n", family_index, queue_count); - if (!(object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count, flags))) - { - ERR("Failed to allocate memory for queues.\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto fail; - } + wine_vk_device_get_queues(object, family_index, queue_count, flags, next_queue); + next_queue += queue_count; } object->quirks = phys_dev->instance->quirks; @@ -1173,17 +1165,42 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return NULL; } +static VkQueue wine_vk_device_find_queue(VkDevice device, const VkDeviceQueueInfo2 *info) +{ + struct VkQueue_T* queue; + uint32_t i; + + for (i = 0; i < device->queue_count; i++) + { + queue = &device->queues[i]; + if (queue->family_index == info->queueFamilyIndex + && queue->queue_index == info->queueIndex + && queue->flags == info->flags) + { + return queue; + } + } + + return VK_NULL_HANDLE; +} + void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { + VkDeviceQueueInfo2 queue_info; TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); - *queue = &device->queues[family_index][queue_index]; + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = family_index; + queue_info.queueIndex = queue_index; + + *queue = wine_vk_device_find_queue(device, &queue_info); } void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - struct VkQueue_T *matching_queue; const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1191,13 +1208,7 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in if ((chain = info->pNext)) FIXME("Ignoring a linked structure of type %u.\n", chain->sType); - matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; - if (matching_queue->flags != info->flags) - { - WARN("No matching flags were specified %#x, %#x.\n", matching_queue->flags, info->flags); - matching_queue = VK_NULL_HANDLE; - } - *queue = matching_queue; + *queue = wine_vk_device_find_queue(device, info); } PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 322d27079ea..2b4d155ca9b 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -87,8 +87,8 @@ struct VkDevice_T struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ - struct VkQueue_T **queues; - uint32_t max_queue_families; + struct VkQueue_T* queues; + uint32_t queue_count; unsigned int quirks; @@ -153,6 +153,8 @@ struct VkQueue_T struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ + uint32_t family_index; + uint32_t queue_index; VkDeviceQueueCreateFlags flags; struct wine_vk_mapping mapping; -- 2.31.1

1 0

[PATCH 1/8] ntoskrnl/tests: Fix a test failure on LUA Windows.
by Zebediah Figura 31 Mar '21

31 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50abb9f9d1f..c3ebe5b8ee1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -173,6 +173,17 @@ static BOOL testsign_create_cert(struct testsign_context *ctx) ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) -- 2.30.2

3 10

[PATCH v3 1/7] d3d11/tests: Don't use all samples for blending in multisample resolve test.
by Jan Sikorski 31 Mar '21

31 Mar '21

Shows whether the resolve happens in the right color space. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 42 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f6ba0b16748..91637df0747 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30309,105 +30309,105 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff0dec4}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffe2cdc0, TRUE}, }; if (!init_test_context(&test_context, NULL)) @@ -30424,6 +30424,8 @@ static void test_multisample_resolve(void) return; } + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, 3); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); -- 2.31.0

4 12

[PATCH 4/4] d3d11: Use nameless unions.
by Jacek Caban 31 Mar '21

31 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/d3d11/Makefile.in | 1 - dlls/d3d11/device.c | 1 + dlls/d3d11/view.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)

3 2

[PATCH] mscoree: Update Wine Mono to 6.1.1.
by Esme Povirk 31 Mar '21

31 Mar '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..e3004c972f1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..e396d855e71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.25.1

2 1

[PATCH] conhost: Fix wrapping when write_console finishes on line end.
by Gabriel Ivăncescu 31 Mar '21

31 Mar '21

Remember the fact we completed the entire line in cursor_x, but report it as usual in other cases as the last character on the line. When writing a new character, a newline is then written so it wraps properly. This can happen in practice when writing one character at a time to the console; right now it will keep overwriting the last character on the line. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 30 ++++++++-------- programs/conhost/conhost.h | 5 +++ programs/conhost/tests/tty.c | 67 ++++++++++++++++++++++++++++++++++++ programs/conhost/window.c | 8 ++--- 4 files changed, 91 insertions(+), 19 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fbee37d..e5ec84f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -278,7 +278,7 @@ static void tty_sync( struct console *console ) if (console->active->cursor_visible) { - set_tty_cursor( console, console->active->cursor_x, console->active->cursor_y ); + set_tty_cursor( console, get_bounded_cursor_x(console->active), console->active->cursor_y ); if (!console->tty_cursor_visible) { tty_write( console, "\x1b[?25h", 6 ); /* show cursor */ @@ -307,11 +307,12 @@ static void scroll_to_cursor( struct screen_buffer *screen_buffer ) { int w = screen_buffer->win.right - screen_buffer->win.left + 1; int h = screen_buffer->win.bottom - screen_buffer->win.top + 1; + unsigned int cursor_x = get_bounded_cursor_x(screen_buffer); - if (screen_buffer->cursor_x < screen_buffer->win.left) - screen_buffer->win.left = min( screen_buffer->cursor_x, screen_buffer->width - w ); - else if (screen_buffer->cursor_x > screen_buffer->win.right) - screen_buffer->win.left = max( screen_buffer->cursor_x, w ) - w + 1; + if (cursor_x < screen_buffer->win.left) + screen_buffer->win.left = min( cursor_x, screen_buffer->width - w ); + else if (cursor_x > screen_buffer->win.right) + screen_buffer->win.left = max( cursor_x, w ) - w + 1; screen_buffer->win.right = screen_buffer->win.left + w - 1; if (screen_buffer->cursor_y < screen_buffer->win.top) @@ -1209,7 +1210,7 @@ static void update_read_output( struct console *console ) scroll_to_cursor( screen_buffer ); } if (console->is_unix) - set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); + set_tty_cursor_relative( screen_buffer->console, get_bounded_cursor_x(screen_buffer), screen_buffer->cursor_y ); tty_sync( screen_buffer->console ); update_window_config( screen_buffer->console ); } @@ -1356,7 +1357,7 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ } console->edit_line.history_index = console->history_index; - console->edit_line.home_x = console->active->cursor_x; + console->edit_line.home_x = get_bounded_cursor_x(console->active); console->edit_line.home_y = console->active->cursor_y; console->edit_line.status = STATUS_PENDING; if (edit_line_grow( console, 1 )) console->edit_line.buf[0] = 0; @@ -1716,7 +1717,7 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou info->cursor_size = screen_buffer->cursor_size; info->cursor_visible = screen_buffer->cursor_visible; - info->cursor_x = screen_buffer->cursor_x; + info->cursor_x = get_bounded_cursor_x(screen_buffer); info->cursor_y = screen_buffer->cursor_y; info->width = screen_buffer->width; info->height = screen_buffer->height; @@ -1917,10 +1918,12 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR switch (buffer[i]) { case '\b': - if (screen_buffer->cursor_x) screen_buffer->cursor_x--; + if (screen_buffer->cursor_x && screen_buffer->cursor_x < screen_buffer->width) + screen_buffer->cursor_x--; continue; case '\t': - j = min( screen_buffer->width - screen_buffer->cursor_x, 8 - (screen_buffer->cursor_x % 8) ); + j = screen_buffer->cursor_x < screen_buffer->width ? screen_buffer->cursor_x : 0; + j = min( screen_buffer->width - j, 8 - (j % 8) ); while (j--) write_char( screen_buffer, ' ', &update_rect, NULL ); continue; case '\n': @@ -1946,11 +1949,8 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR write_char( screen_buffer, buffer[i], &update_rect, NULL ); } - if (screen_buffer->cursor_x == screen_buffer->width) - { - if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) screen_buffer->cursor_x--; - else screen_buffer->cursor_x = update_rect.left; - } + if (screen_buffer->cursor_x == screen_buffer->width && !(screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT)) + screen_buffer->cursor_x = update_rect.left; scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 6f39853..9e855c3 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -140,6 +140,11 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +static inline unsigned int get_bounded_cursor_x( struct screen_buffer *screen_buffer ) +{ + return min(screen_buffer->cursor_x, screen_buffer->width - 1); +} + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 7cc37fa..db6c646 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -553,6 +553,8 @@ static void expect_char_key_(unsigned int line, WCHAR ch) static void test_write_console(void) { + BOOL expect_newline; + child_string_request(REQ_WRITE_CONSOLE, L"abc"); skip_hide_cursor(); expect_output_sequence("abc"); @@ -761,6 +763,71 @@ static void test_write_console(void) expect_empty_output(); child_set_output_mode(ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + child_set_cursor(28, 11); + skip_hide_cursor(); + expect_output_sequence("\x1b[12;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"a"); + skip_hide_cursor(); + expect_output_sequence("a"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"b"); + skip_hide_cursor(); + expect_output_sequence("b"); + expect_newline = TRUE; + if (!skip_sequence("\b")) + { + expect_newline = FALSE; + expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"c"); + skip_hide_cursor(); + if (expect_newline) expect_output_sequence("\r\n"); + expect_output_sequence("c"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_set_cursor(28, 11); + skip_hide_cursor(); + expect_output_sequence("\x1b[12;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"x"); + skip_hide_cursor(); + expect_output_sequence("x"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"y"); + skip_hide_cursor(); + expect_output_sequence("y"); + expect_newline = TRUE; + if (!skip_sequence("\b")) + { + expect_newline = FALSE; + expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"\b"); + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"z"); + skip_hide_cursor(); + if (expect_newline) expect_output_sequence("\r\n"); + expect_output_sequence("z"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); } static void test_tty_output(void) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a665cbb..456bcdd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -430,8 +430,8 @@ static void update_window_cursor( struct console *console ) { if (console->win != GetFocus() || !console->active->cursor_visible) return; - SetCaretPos( (console->active->cursor_x - console->active->win.left) * console->active->font.width, - (console->active->cursor_y - console->active->win.top) * console->active->font.height ); + SetCaretPos( (get_bounded_cursor_x(console->active) - console->active->win.left) * console->active->font.width, + (console->active->cursor_y - console->active->win.top) * console->active->font.height ); ShowCaret( console->win ); } @@ -607,10 +607,10 @@ static void update_window( struct console *console ) } } - if (update_all || console->active->cursor_x != console->window->cursor_pos.X || + if (update_all || get_bounded_cursor_x(console->active) != console->window->cursor_pos.X || console->active->cursor_y != console->window->cursor_pos.Y) { - console->window->cursor_pos.X = console->active->cursor_x; + console->window->cursor_pos.X = get_bounded_cursor_x(console->active); console->window->cursor_pos.Y = console->active->cursor_y; update_window_cursor( console ); } -- 2.30.0

3 5

[PATCH] combase: Move IGlobalOptions implementation.
by Nikolay Sivov 31 Mar '21

31 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Global options supposedly control exception handling configuration of a COM core, which is now in combase. dlls/combase/combase.c | 162 +++++++++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 96 ---------------------- dlls/ole32/oleproxy.c | 13 --- 4 files changed, 162 insertions(+), 111 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 09d455317d1..cda0d52f579 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -429,6 +429,150 @@ static void com_cleanup_tlsdata(void) NtCurrentTeb()->ReservedForOle = NULL; } +struct global_options +{ + IGlobalOptions IGlobalOptions_iface; + LONG refcount; +}; + +static inline struct global_options *impl_from_IGlobalOptions(IGlobalOptions *iface) +{ + return CONTAINING_RECORD(iface, struct global_options, IGlobalOptions_iface); +} + +static HRESULT WINAPI global_options_QueryInterface(IGlobalOptions *iface, REFIID riid, void **ppv) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(&IID_IGlobalOptions, riid) || IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; +} + +static ULONG WINAPI global_options_AddRef(IGlobalOptions *iface) +{ + struct global_options *options = impl_from_IGlobalOptions(iface); + LONG refcount = InterlockedIncrement(&options->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI global_options_Release(IGlobalOptions *iface) +{ + struct global_options *options = impl_from_IGlobalOptions(iface); + LONG refcount = InterlockedDecrement(&options->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + if (!refcount) + heap_free(options); + + return refcount; +} + +static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) +{ + FIXME("%p, %u, %lx.\n", iface, property, value); + + return S_OK; +} + +static HRESULT WINAPI global_options_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) +{ + FIXME("%p, %u, %p.\n", iface, property, value); + + return E_NOTIMPL; +} + +static const IGlobalOptionsVtbl global_options_vtbl = +{ + global_options_QueryInterface, + global_options_AddRef, + global_options_Release, + global_options_Set, + global_options_Query +}; + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("%d\n", fLock); + + return S_OK; +} + +static HRESULT WINAPI global_options_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + struct global_options *object; + HRESULT hr; + + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return E_INVALIDARG; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + object->IGlobalOptions_iface.lpVtbl = &global_options_vtbl; + object->refcount = 1; + + hr = IGlobalOptions_QueryInterface(&object->IGlobalOptions_iface, riid, ppv); + IGlobalOptions_Release(&object->IGlobalOptions_iface); + return hr; +} + +static const IClassFactoryVtbl global_options_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + global_options_CreateInstance, + class_factory_LockServer +}; + +static IClassFactory global_options_factory = { &global_options_factory_vtbl }; + +static HRESULT get_builtin_class_factory(REFCLSID rclsid, REFIID riid, void **obj) +{ + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&global_options_factory, riid, obj); + return E_UNEXPECTED; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ @@ -1569,7 +1713,11 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); - return Ole32DllGetClassObject(rclsid, riid, obj); + + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return get_builtin_class_factory(rclsid, riid, obj); + else + return Ole32DllGetClassObject(rclsid, riid, obj); } } @@ -3226,3 +3374,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + TRACE("%s, %s, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&global_options_factory, riid, obj); + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6e74cca1f24..0437714edcc 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -178,7 +178,7 @@ @ stub DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall DllGetActivationFactory(ptr ptr) -@ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub EnableHookObject @ stdcall FreePropVariantArray(long ptr) @ stub FreePropVariantArrayWorker diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 51db61414dc..c40d8d03b2d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -924,102 +924,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -typedef struct { - IGlobalOptions IGlobalOptions_iface; - LONG ref; -} GlobalOptions; - -static inline GlobalOptions *impl_from_IGlobalOptions(IGlobalOptions *iface) -{ - return CONTAINING_RECORD(iface, GlobalOptions, IGlobalOptions_iface); -} - -static HRESULT WINAPI GlobalOptions_QueryInterface(IGlobalOptions *iface, REFIID riid, void **ppv) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - if (IsEqualGUID(&IID_IGlobalOptions, riid) || IsEqualGUID(&IID_IUnknown, riid)) - { - *ppv = iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI GlobalOptions_AddRef(IGlobalOptions *iface) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI GlobalOptions_Release(IGlobalOptions *iface) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if (!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI GlobalOptions_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - FIXME("(%p)->(%u %lx)\n", This, property, value); - return S_OK; -} - -static HRESULT WINAPI GlobalOptions_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - FIXME("(%p)->(%u %p)\n", This, property, value); - return E_NOTIMPL; -} - -static const IGlobalOptionsVtbl GlobalOptionsVtbl = { - GlobalOptions_QueryInterface, - GlobalOptions_AddRef, - GlobalOptions_Release, - GlobalOptions_Set, - GlobalOptions_Query -}; - -HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) -{ - GlobalOptions *global_options; - HRESULT hres; - - TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - - if (outer) - return E_INVALIDARG; - - global_options = heap_alloc(sizeof(*global_options)); - if (!global_options) - return E_OUTOFMEMORY; - global_options->IGlobalOptions_iface.lpVtbl = &GlobalOptionsVtbl; - global_options->ref = 1; - - hres = IGlobalOptions_QueryInterface(&global_options->IGlobalOptions_iface, riid, ppv); - IGlobalOptions_Release(&global_options->IGlobalOptions_iface); - return hres; -} - /*********************************************************************** * DllMain (OLE32.@) */ diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 0429e0f5495..e40e2b073e5 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -148,17 +148,6 @@ static const IClassFactoryVtbl ComCatCFVtbl = static IClassFactory ComCatCF = { &ComCatCFVtbl }; -static const IClassFactoryVtbl GlobalOptionsCFVtbl = -{ - ClassFactory_QueryInterface, - ClassFactory_AddRef, - ClassFactory_Release, - GlobalOptions_CreateInstance, - ClassFactory_LockServer -}; - -IClassFactory GlobalOptionsCF = { &GlobalOptionsCFVtbl }; - static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = { ClassFactory_QueryInterface, @@ -230,8 +219,6 @@ HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, riid, obj); else if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) return IClassFactory_QueryInterface(&ManualResetEventCF, riid, obj); - else if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) - return IClassFactory_QueryInterface(&GlobalOptionsCF, riid, obj); else if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) return FTMarshalCF_Create(riid, obj); else -- 2.30.2

1 0

[PATCH] dnsapi/tests: Don't fail on query timeouts.
by Hans Leidekker 31 Mar '21

31 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/tests/query.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 74669005a33..d68e9383204 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -40,7 +40,12 @@ static void test_DnsQuery(void) rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %d\n", status); DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); -- 2.30.2

1 0

[PATCH 4/4] riched20/tests: Silence the beeps.
by Huw Davies 31 Mar '21

31 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8ef88bd1b21..3a6a072f1f8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -33,6 +33,8 @@ #include <ole2.h> #include <richedit.h> #include <richole.h> +#include <imm.h> +#include <textserv.h> #include <commdlg.h> #include <time.h> #include <wine/test.h> @@ -51,12 +53,38 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; static HMODULE hmoduleRichEdit; static BOOL is_lang_japanese; +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) +static void disable_beep( HWND hwnd ) +{ + /* don't attempt to disable beep if we don't have thiscall compiler support */ +} +#else +#define ITextServices_OnTxPropertyBitsChange(This,a,b) (This)->lpVtbl->OnTxPropertyBitsChange(This,a,b) +static void disable_beep( HWND hwnd ) +{ + IRichEditOle *richole; + ITextServices *services; + IID *pIID_ITextServices = (IID *)GetProcAddress( hmoduleRichEdit, "IID_ITextServices" ); + + if (SendMessageW( hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&richole )) + { + if (SUCCEEDED( IRichEditOle_QueryInterface( richole, pIID_ITextServices, (void **)&services ) )) + { + ITextServices_OnTxPropertyBitsChange( services, TXTBIT_ALLOWBEEP, 0 ); + ITextServices_Release( services ); + } + IRichEditOle_Release( richole ); + } +} +#endif + static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -66,6 +94,7 @@ static HWND new_windowW(LPCWSTR lpClassName, DWORD dwStyle, HWND parent) { |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(lpClassName), (int) GetLastError()); + disable_beep( hwnd ); return hwnd; } @@ -1862,6 +1891,7 @@ static void test_EM_SETOPTIONS(void) hmoduleRichEdit, NULL); ok(hwndRichEdit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + disable_beep( hwndRichEdit ); options = SendMessageA(hwndRichEdit, EM_GETOPTIONS, 0, 0); /* WS_[VH]SCROLL cause the ECO_AUTO[VH]SCROLL options to be set */ ok(options == (ECO_AUTOVSCROLL|ECO_AUTOHSCROLL), @@ -6337,6 +6367,7 @@ static void test_WM_CHAR(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); p = char_list; while (*p != '\0') { @@ -6940,6 +6971,7 @@ static void test_undo_coalescing(void) hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, 0, 0, 0, 0); ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + disable_beep( hwnd ); result = SendMessageA(hwnd, EM_CANUNDO, 0, 0); ok (result == FALSE, "Can undo after window creation.\n"); -- 2.23.0

1 0

[PATCH 3/4] riched20/tests: Add some object identity tests.
by Huw Davies 31 Mar '21

31 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/richole.c | 9 +++++++++ dlls/riched20/tests/txtsrv.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3cea9902620..e6329c5b1b6 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -149,6 +149,7 @@ static void test_Interfaces(void) LRESULT res; HWND w; ULONG refcount; + IUnknown *unk, *unk2; w = new_richedit(NULL); if (!w) { @@ -180,6 +181,14 @@ static void test_Interfaces(void) hres = ITextDocument_GetSelection(txtDoc, &txtSel); ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextDocument_QueryInterface(txtDoc, &IID_IUnknown, (void **)&unk); + ok(hres == S_OK, "got 0x%08x\n", hres); + hres = ITextSelection_QueryInterface(txtSel, &IID_IUnknown, (void **)&unk2); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(unk != unk2, "unknowns are the same\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + EXPECT_REF(txtDoc, 4); EXPECT_REF(txtSel, 2); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 6834e38b7f5..fe27be26edb 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -917,6 +917,7 @@ static void test_QueryInterface(void) IRichEditOle *reole, *txtsrv_reole; ITextDocument *txtdoc, *txtsrv_txtdoc; ITextDocument2Old *txtdoc2old, *txtsrv_txtdoc2old; + IUnknown *unk, *unk2; ULONG refcount; if(!init_texthost(&txtserv, &host)) @@ -933,6 +934,14 @@ static void test_QueryInterface(void) refcount = get_refcount((IUnknown *)txtsrv_reole); ok(refcount == 2, "got wrong ref count: %d\n", refcount); + hres = ITextServices_QueryInterface( txtserv, &IID_IUnknown, (void **)&unk ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + hres = IRichEditOle_QueryInterface( txtsrv_reole, &IID_IUnknown, (void **)&unk2 ); + ok( hres == S_OK, "got 0x%08x\n", hres ); + ok( unk == unk2, "unknowns differ\n" ); + IUnknown_Release( unk2 ); + IUnknown_Release( unk ); + hres = IRichEditOle_QueryInterface(txtsrv_reole, &IID_ITextDocument, (void **)&txtdoc); ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); refcount = get_refcount((IUnknown *)txtserv); -- 2.23.0

1 0

[PATCH 2/4] riched20: Merge the richole object with the text services object.
by Huw Davies 31 Mar '21

31 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 31 +- dlls/riched20/editor.h | 4 +- dlls/riched20/editstr.h | 26 +- dlls/riched20/richole.c | 897 ++++++++++++++++++---------------------- dlls/riched20/txtsrv.c | 29 +- 5 files changed, 444 insertions(+), 543 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index deb0a93c8dc..d4aadc325f9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1121,7 +1121,6 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB LPOLECLIENTSITE lpClientSite = NULL; LPDATAOBJECT lpDataObject = NULL; LPOLECACHE lpOleCache = NULL; - LPRICHEDITOLE lpReOle = NULL; STGMEDIUM stgm; FORMATETC fm; CLSID clsid; @@ -1149,15 +1148,8 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB fm.lindex = -1; fm.tymed = stgm.tymed; - if (!editor->reOle) - { - if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) - return hr; - } - if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && - IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (void**)&lpReOle) == S_OK && - IRichEditOle_GetClientSite(lpReOle, &lpClientSite) == S_OK && + IRichEditOle_GetClientSite(editor->richole, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && @@ -1189,7 +1181,6 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB if (lpStorage) IStorage_Release(lpStorage); if (lpDataObject) IDataObject_Release(lpDataObject); if (lpOleCache) IOleCache_Release(lpOleCache); - if (lpReOle) IRichEditOle_Release(lpReOle); return hr; } @@ -2950,7 +2941,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->have_texthost2 = FALSE; } - ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->in_place_active = FALSE; ed->total_rows = 0; @@ -2993,6 +2983,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->last_sel_start_para = ed->last_sel_end_para = ed->pCursors[0].para; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL; + ed->richole = NULL; ed->lpOleCallback = NULL; ed->mode = TM_MULTILEVELUNDO | TM_MULTICODEPAGE; ed->mode |= (ed->props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; @@ -3094,11 +3085,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) } if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); - if (editor->reOle) - { - IUnknown_Release(editor->reOle); - editor->reOle = NULL; - } + OleUninitialize(); heap_free(editor->pBuffer); @@ -4159,14 +4146,10 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } case EM_GETOLEINTERFACE: - { - if (!editor->reOle) - if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle)) - return 0; - if (IUnknown_QueryInterface(editor->reOle, &IID_IRichEditOle, (LPVOID *)lParam) == S_OK) - return 1; - return 0; - } + IRichEditOle_AddRef( editor->richole ); + *(IRichEditOle **)lParam = editor->richole; + return 1; + case EM_SETOLECALLBACK: if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d0274de409d..141e9034a6a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -263,11 +263,13 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ -LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; +void richole_release_children( struct text_services *services ) DECLSPEC_HIDDEN; +extern const IRichEditOleVtbl re_ole_vtbl DECLSPEC_HIDDEN; +extern const ITextDocument2OldVtbl text_doc2old_vtbl DECLSPEC_HIDDEN; /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 86b3f0196c7..22cfd74722c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -41,6 +41,7 @@ #include <richole.h> #include "imm.h" #include <textserv.h> +#include <tom.h> #include "usp10.h" #include "wine/asm.h" @@ -378,7 +379,6 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { ITextHost2 *texthost; - IUnknown *reOle; unsigned int bEmulateVersion10 : 1; unsigned int in_place_active : 1; unsigned int have_texthost2 : 1; @@ -409,6 +409,7 @@ typedef struct tagME_TextEditor BOOL bWordWrap; int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; + IRichEditOle *richole; LPRICHEDITOLECALLBACK lpOleCallback; /*TEXTMODE variable; contains only one of each of the following options: *TM_RICHTEXT or TM_PLAINTEXT @@ -456,4 +457,27 @@ typedef struct tagME_Context ME_TextEditor *editor; } ME_Context; +struct text_selection +{ + ITextSelection ITextSelection_iface; + LONG ref; + + struct text_services *services; +}; + +struct text_services +{ + IUnknown IUnknown_inner; + ITextServices ITextServices_iface; + IRichEditOle IRichEditOle_iface; + ITextDocument2Old ITextDocument2Old_iface; + IUnknown *outer_unk; + LONG ref; + ME_TextEditor *editor; + struct text_selection *text_selection; + struct list rangelist; + struct list clientsites; + char spare[256]; /* for bug #12179 */ +}; + #endif diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2bb15bb4504..72840a4cafa 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -136,7 +136,6 @@ static HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) /* private IID used to get back IRichEditOleImpl pointer */ DEFINE_GUID(IID_Igetrichole, 0xe3ce5c7a, 0x8247, 0x4622, 0x81, 0xad, 0x11, 0x81, 0x02, 0xaa, 0x01, 0x30); -typedef struct ITextSelectionImpl ITextSelectionImpl; typedef struct IOleClientSiteImpl IOleClientSiteImpl; typedef struct ITextRangeImpl ITextRangeImpl; @@ -206,23 +205,9 @@ enum range_update_op { RANGE_UPDATE_DELETE }; -typedef struct IRichEditOleImpl { - IUnknown IUnknown_inner; - IRichEditOle IRichEditOle_iface; - ITextDocument2Old ITextDocument2Old_iface; - IUnknown *outer_unk; - LONG ref; - - ME_TextEditor *editor; - ITextSelectionImpl *txtSel; - - struct list rangelist; - struct list clientsites; -} IRichEditOleImpl; - struct reole_child { struct list entry; - IRichEditOleImpl *reole; + struct text_services *reole; }; struct ITextRangeImpl { @@ -232,13 +217,6 @@ struct ITextRangeImpl { LONG start, end; }; -struct ITextSelectionImpl { - ITextSelection ITextSelection_iface; - LONG ref; - - IRichEditOleImpl *reOle; -}; - typedef struct ITextFontImpl { ITextFont ITextFont_iface; LONG ref; @@ -263,19 +241,14 @@ struct IOleClientSiteImpl { LONG ref; }; -static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) -{ - return CONTAINING_RECORD(iface, IRichEditOleImpl, IRichEditOle_iface); -} - -static inline IRichEditOleImpl *impl_from_ITextDocument2Old(ITextDocument2Old *iface) +static inline struct text_services *impl_from_IRichEditOle( IRichEditOle *iface ) { - return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument2Old_iface); + return CONTAINING_RECORD( iface, struct text_services, IRichEditOle_iface ); } -static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) +static inline struct text_services *impl_from_ITextDocument2Old( ITextDocument2Old *iface ) { - return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); + return CONTAINING_RECORD( iface, struct text_services, ITextDocument2Old_iface ); } static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) @@ -288,9 +261,9 @@ static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface) return CONTAINING_RECORD(iface, ITextRangeImpl, ITextRange_iface); } -static inline ITextSelectionImpl *impl_from_ITextSelection(ITextSelection *iface) +static inline struct text_selection *impl_from_ITextSelection(ITextSelection *iface) { - return CONTAINING_RECORD(iface, ITextSelectionImpl, ITextSelection_iface); + return CONTAINING_RECORD(iface, struct text_selection, ITextSelection_iface); } static inline ITextFontImpl *impl_from_ITextFont(ITextFont *iface) @@ -305,7 +278,7 @@ static inline ITextParaImpl *impl_from_ITextPara(ITextPara *iface) static HRESULT create_textfont(ITextRange*, const ITextFontImpl*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); -static ITextSelectionImpl *CreateTextSelection(IRichEditOleImpl*); +static struct text_selection *text_selection_create( struct text_services * ); static HRESULT textrange_get_storylength(ME_TextEditor *editor, LONG *length) { @@ -316,11 +289,11 @@ static HRESULT textrange_get_storylength(ME_TextEditor *editor, LONG *length) return S_OK; } -static void textranges_update_ranges(IRichEditOleImpl *reole, LONG start, LONG end, enum range_update_op op) +static void textranges_update_ranges(struct text_services *services, LONG start, LONG end, enum range_update_op op) { ITextRangeImpl *range; - LIST_FOR_EACH_ENTRY(range, &reole->rangelist, ITextRangeImpl, child.entry) { + LIST_FOR_EACH_ENTRY(range, &services->rangelist, ITextRangeImpl, child.entry) { switch (op) { case RANGE_UPDATE_DELETE: @@ -434,7 +407,7 @@ static inline FLOAT points_to_twips(FLOAT value) return value * 1440 / 72.0; } -static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, enum textfont_prop_id propid, +static HRESULT get_textfont_prop_for_pos(const struct text_services *services, int pos, enum textfont_prop_id propid, textfont_prop_val *value) { ME_Cursor from, to; @@ -444,10 +417,10 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, fmt.cbSize = sizeof(fmt); fmt.dwMask = textfont_prop_masks[propid][0]; - cursor_from_char_ofs( reole->editor, pos, &from ); + cursor_from_char_ofs( services->editor, pos, &from ); to = from; - ME_MoveCursorChars(reole->editor, &to, 1, FALSE); - ME_GetCharFormat(reole->editor, &from, &to, &fmt); + ME_MoveCursorChars( services->editor, &to, 1, FALSE ); + ME_GetCharFormat( services->editor, &from, &to, &fmt ); switch (propid) { @@ -508,11 +481,11 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, return S_OK; } -static inline const IRichEditOleImpl *get_range_reole(ITextRange *range) +static inline const struct text_services *get_range_reole(ITextRange *range) { - IRichEditOleImpl *reole = NULL; - ITextRange_QueryInterface(range, &IID_Igetrichole, (void**)&reole); - return reole; + struct text_services *services = NULL; + ITextRange_QueryInterface(range, &IID_Igetrichole, (void**)&services); + return services; } static void textrange_set_font(ITextRange *range, ITextFont *font) @@ -664,22 +637,22 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) if (fmt.dwMask) { - const IRichEditOleImpl *reole = get_range_reole(range); + const struct text_services *services = get_range_reole(range); ME_Cursor from, to; LONG start, end; ITextRange_GetStart(range, &start); ITextRange_GetEnd(range, &end); - cursor_from_char_ofs( reole->editor, start, &from ); - cursor_from_char_ofs( reole->editor, end, &to ); - ME_SetCharFormat(reole->editor, &from, &to, &fmt); + cursor_from_char_ofs( services->editor, start, &from ); + cursor_from_char_ofs( services->editor, end, &to ); + ME_SetCharFormat( services->editor, &from, &to, &fmt ); } } static HRESULT get_textfont_prop(const ITextFontImpl *font, enum textfont_prop_id propid, textfont_prop_val *value) { - const IRichEditOleImpl *reole; + const struct text_services *services; textfont_prop_val v; LONG start, end, i; HRESULT hr; @@ -690,7 +663,7 @@ static HRESULT get_textfont_prop(const ITextFontImpl *font, enum textfont_prop_i return S_OK; } - if (!(reole = get_range_reole(font->range))) + if (!(services = get_range_reole(font->range))) return CO_E_RELEASED; init_textfont_prop_value(propid, value); @@ -699,14 +672,14 @@ static HRESULT get_textfont_prop(const ITextFontImpl *font, enum textfont_prop_i ITextRange_GetEnd(font->range, &end); /* iterate trough a range to see if property value is consistent */ - hr = get_textfont_prop_for_pos(reole, start, propid, &v); + hr = get_textfont_prop_for_pos( services, start, propid, &v ); if (FAILED(hr)) return hr; for (i = start + 1; i < end; i++) { textfont_prop_val cur; - hr = get_textfont_prop_for_pos(reole, i, propid, &cur); + hr = get_textfont_prop_for_pos( services, i, propid, &cur ); if (FAILED(hr)) return hr; @@ -747,7 +720,7 @@ static HRESULT get_textfont_propl(const ITextFontImpl *font, enum textfont_prop_ /* Value should already have a terminal value, for boolean properties it means tomToggle is not handled */ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id propid, const textfont_prop_val *value) { - const IRichEditOleImpl *reole; + const struct text_services *services; ME_Cursor from, to; CHARFORMAT2W fmt; LONG start, end; @@ -763,7 +736,7 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop return S_OK; } - if (!(reole = get_range_reole(font->range))) + if (!(services = get_range_reole(font->range))) return CO_E_RELEASED; memset(&fmt, 0, sizeof(fmt)); @@ -829,9 +802,9 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop ITextRange_GetStart(font->range, &start); ITextRange_GetEnd(font->range, &end); - cursor_from_char_ofs( reole->editor, start, &from ); - cursor_from_char_ofs( reole->editor, end, &to ); - ME_SetCharFormat(reole->editor, &from, &to, &fmt); + cursor_from_char_ofs( services->editor, start, &from ); + cursor_from_char_ofs( services->editor, end, &to ); + ME_SetCharFormat( services->editor, &from, &to, &fmt ); return S_OK; } @@ -880,16 +853,16 @@ static HRESULT set_textfont_propd(ITextFontImpl *font, enum textfont_prop_id pro static HRESULT textfont_getname_from_range(ITextRange *range, BSTR *ret) { - const IRichEditOleImpl *reole; + const struct text_services *services; textfont_prop_val v; HRESULT hr; LONG start; - if (!(reole = get_range_reole(range))) + if (!(services = get_range_reole( range ))) return CO_E_RELEASED; ITextRange_GetStart(range, &start); - hr = get_textfont_prop_for_pos(reole, start, FONT_NAME, &v); + hr = get_textfont_prop_for_pos( services, start, FONT_NAME, &v ); *ret = v.str; return hr; } @@ -934,118 +907,48 @@ static HRESULT textrange_expand(ITextRange *range, LONG unit, LONG *delta) return S_OK; } -static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) -{ - IRichEditOleImpl *This = impl_from_IUnknown(iface); - - TRACE("%p %s\n", This, debugstr_guid(riid)); - - *ppvObj = NULL; - if (IsEqualGUID(riid, &IID_IUnknown)) - *ppvObj = &This->IUnknown_inner; - else if (IsEqualGUID(riid, &IID_IRichEditOle)) - *ppvObj = &This->IRichEditOle_iface; - else if (IsEqualGUID(riid, &IID_ITextDocument) || IsEqualGUID(riid, &IID_ITextDocument2Old)) - *ppvObj = &This->ITextDocument2Old_iface; - if (*ppvObj) - { - IUnknown_AddRef((IUnknown *)*ppvObj); - return S_OK; - } - FIXME("%p: unhandled interface %s\n", This, debugstr_guid(riid)); - - return E_NOINTERFACE; -} - -static ULONG WINAPI IRichEditOleImpl_inner_fnAddRef(IUnknown *iface) -{ - IRichEditOleImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("%p ref = %u\n", This, ref); - - return ref; -} - -static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) -{ - IRichEditOleImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE ("%p ref=%u\n", This, ref); - - if (!ref) - { - IOleClientSiteImpl *clientsite; - ITextRangeImpl *txtRge; - - This->editor->reOle = NULL; - if (This->txtSel) { - This->txtSel->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); - } - - LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, child.entry) - txtRge->child.reole = NULL; - - LIST_FOR_EACH_ENTRY(clientsite, &This->clientsites, IOleClientSiteImpl, child.entry) - clientsite->child.reole = NULL; - - heap_free(This); - } - return ref; -} - -static const IUnknownVtbl reo_unk_vtbl = -{ - IRichEditOleImpl_inner_fnQueryInterface, - IRichEditOleImpl_inner_fnAddRef, - IRichEditOleImpl_inner_fnRelease -}; - static HRESULT WINAPI -IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj) +IRichEditOle_fnQueryInterface(IRichEditOle *iface, REFIID riid, LPVOID *ppvObj) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + struct text_services *services = impl_from_IRichEditOle( iface ); + return IUnknown_QueryInterface( services->outer_unk, riid, ppvObj ); } static ULONG WINAPI -IRichEditOle_fnAddRef(IRichEditOle *me) +IRichEditOle_fnAddRef(IRichEditOle *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - return IUnknown_AddRef(This->outer_unk); + struct text_services *services = impl_from_IRichEditOle( iface ); + return IUnknown_AddRef( services->outer_unk ); } static ULONG WINAPI -IRichEditOle_fnRelease(IRichEditOle *me) +IRichEditOle_fnRelease(IRichEditOle *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - return IUnknown_Release(This->outer_unk); + struct text_services *services = impl_from_IRichEditOle( iface ); + return IUnknown_Release( services->outer_unk ); } static HRESULT WINAPI -IRichEditOle_fnActivateAs(IRichEditOle *me, REFCLSID rclsid, REFCLSID rclsidAs) +IRichEditOle_fnActivateAs(IRichEditOle *iface, REFCLSID rclsid, REFCLSID rclsidAs) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME( "stub %p\n", services ); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnContextSensitiveHelp(IRichEditOle *me, BOOL fEnterMode) +IRichEditOle_fnContextSensitiveHelp(IRichEditOle *iface, BOOL fEnterMode) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME( "stub %p\n", services ); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnConvertObject(IRichEditOle *me, LONG iob, - REFCLSID rclsidNew, LPCSTR lpstrUserTypeNew) +IRichEditOle_fnConvertObject( IRichEditOle *iface, LONG iob, REFCLSID class, LPCSTR user_type ) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME( "stub %p\n", services ); return E_NOTIMPL; } @@ -1308,7 +1211,7 @@ static const IOleInPlaceSiteVtbl olestvt = IOleInPlaceSite_fnOnPosRectChange }; -static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret) +static HRESULT CreateOleClientSite( struct text_services *services, IOleClientSite **ret ) { IOleClientSiteImpl *clientSite = heap_alloc(sizeof *clientSite); @@ -1318,67 +1221,67 @@ static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret clientSite->IOleClientSite_iface.lpVtbl = &ocst; clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; - clientSite->child.reole = reOle; - list_add_head(&reOle->clientsites, &clientSite->child.entry); + clientSite->child.reole = services; + list_add_head( &services->clientsites, &clientSite->child.entry ); *ret = &clientSite->IOleClientSite_iface; return S_OK; } static HRESULT WINAPI -IRichEditOle_fnGetClientSite(IRichEditOle *me, IOleClientSite **clientsite) +IRichEditOle_fnGetClientSite( IRichEditOle *iface, IOleClientSite **clientsite ) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + struct text_services *services = impl_from_IRichEditOle( iface ); - TRACE("(%p)->(%p)\n", This, clientsite); + TRACE("(%p)->(%p)\n", services, clientsite); if (!clientsite) return E_INVALIDARG; - return CreateOleClientSite(This, clientsite); + return CreateOleClientSite( services, clientsite ); } static HRESULT WINAPI -IRichEditOle_fnGetClipboardData(IRichEditOle *me, CHARRANGE *lpchrg, +IRichEditOle_fnGetClipboardData(IRichEditOle *iface, CHARRANGE *lpchrg, DWORD reco, LPDATAOBJECT *lplpdataobj) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + struct text_services *services = impl_from_IRichEditOle( iface ); ME_Cursor start; int nChars; - TRACE("(%p,%p,%d)\n",This, lpchrg, reco); + TRACE("(%p,%p,%d)\n", services, lpchrg, reco); if(!lplpdataobj) return E_INVALIDARG; if(!lpchrg) { - int nFrom, nTo, nStartCur = ME_GetSelectionOfs(This->editor, &nFrom, &nTo); - start = This->editor->pCursors[nStartCur]; + int nFrom, nTo, nStartCur = ME_GetSelectionOfs( services->editor, &nFrom, &nTo ); + start = services->editor->pCursors[nStartCur]; nChars = nTo - nFrom; } else { - cursor_from_char_ofs( This->editor, lpchrg->cpMin, &start ); + cursor_from_char_ofs( services->editor, lpchrg->cpMin, &start ); nChars = lpchrg->cpMax - lpchrg->cpMin; } - return ME_GetDataObject(This->editor, &start, nChars, lplpdataobj); + return ME_GetDataObject( services->editor, &start, nChars, lplpdataobj ); } -static LONG WINAPI IRichEditOle_fnGetLinkCount(IRichEditOle *me) +static LONG WINAPI IRichEditOle_fnGetLinkCount(IRichEditOle *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, +IRichEditOle_fnGetObject(IRichEditOle *iface, LONG iob, REOBJECT *lpreobject, DWORD dwFlags) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + struct text_services *services = impl_from_IRichEditOle( iface ); struct re_object *reobj = NULL; LONG count = 0; - TRACE("(%p)->(%x, %p, %x)\n", This, iob, lpreobject, dwFlags); + TRACE("(%p)->(%x, %p, %x)\n", services, iob, lpreobject, dwFlags); if (!lpreobject || !lpreobject->cbStruct) return E_INVALIDARG; @@ -1388,7 +1291,7 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, ME_Cursor cursor; TRACE("character offset: %d\n", lpreobject->cp); - cursor_from_char_ofs( This->editor, lpreobject->cp, &cursor ); + cursor_from_char_ofs( services->editor, lpreobject->cp, &cursor ); if (!cursor.run->reobj) return E_INVALIDARG; else @@ -1398,7 +1301,7 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, { ME_Cursor *from, *to; - ME_GetSelection(This->editor, &from, &to); + ME_GetSelection(services->editor, &from, &to); if (!from->run->reobj) return E_INVALIDARG; else @@ -1406,9 +1309,9 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, } else { - if (iob < 0 || iob >= IRichEditOle_GetObjectCount(me)) + if (iob < 0 || iob >= IRichEditOle_GetObjectCount( iface )) return E_INVALIDARG; - LIST_FOR_EACH_ENTRY(reobj, &This->editor->reobj_list, struct re_object, entry) + LIST_FOR_EACH_ENTRY(reobj, &services->editor->reobj_list, struct re_object, entry) { if (count == iob) break; @@ -1420,89 +1323,90 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, } static LONG WINAPI -IRichEditOle_fnGetObjectCount(IRichEditOle *me) +IRichEditOle_fnGetObjectCount( IRichEditOle *iface ) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - TRACE("(%p)\n",This); - return list_count(&This->editor->reobj_list); + struct text_services *services = impl_from_IRichEditOle( iface ); + TRACE("(%p)\n", services); + return list_count( &services->editor->reobj_list ); } static HRESULT WINAPI -IRichEditOle_fnHandsOffStorage(IRichEditOle *me, LONG iob) +IRichEditOle_fnHandsOffStorage(IRichEditOle *iface, LONG iob) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnImportDataObject(IRichEditOle *me, LPDATAOBJECT lpdataobj, +IRichEditOle_fnImportDataObject(IRichEditOle *iface, LPDATAOBJECT lpdataobj, CLIPFORMAT cf, HGLOBAL hMetaPict) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnInPlaceDeactivate(IRichEditOle *me) +IRichEditOle_fnInPlaceDeactivate(IRichEditOle *iface) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) +IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); + struct text_services *services = impl_from_IRichEditOle( iface ); - TRACE("(%p,%p)\n", This, reo); + TRACE("(%p,%p)\n", services, reo); if (!reo) return E_INVALIDARG; if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - ME_InsertOLEFromCursor(This->editor, reo, 0); - ME_CommitUndo(This->editor); - ME_UpdateRepaint(This->editor, FALSE); + ME_InsertOLEFromCursor(services->editor, reo, 0); + ME_CommitUndo(services->editor); + ME_UpdateRepaint(services->editor, FALSE); return S_OK; } -static HRESULT WINAPI IRichEditOle_fnSaveCompleted(IRichEditOle *me, LONG iob, +static HRESULT WINAPI IRichEditOle_fnSaveCompleted(IRichEditOle *iface, LONG iob, LPSTORAGE lpstg) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnSetDvaspect(IRichEditOle *me, LONG iob, DWORD dvaspect) +IRichEditOle_fnSetDvaspect(IRichEditOle *iface, LONG iob, DWORD dvaspect) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } -static HRESULT WINAPI IRichEditOle_fnSetHostNames(IRichEditOle *me, +static HRESULT WINAPI IRichEditOle_fnSetHostNames(IRichEditOle *iface, LPCSTR lpstrContainerApp, LPCSTR lpstrContainerObj) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p %s %s\n",This, lpstrContainerApp, lpstrContainerObj); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p %s %s\n", services, lpstrContainerApp, lpstrContainerObj); return E_NOTIMPL; } static HRESULT WINAPI -IRichEditOle_fnSetLinkAvailable(IRichEditOle *me, LONG iob, BOOL fAvailable) +IRichEditOle_fnSetLinkAvailable(IRichEditOle *iface, LONG iob, BOOL fAvailable) { - IRichEditOleImpl *This = impl_from_IRichEditOle(me); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_IRichEditOle( iface ); + FIXME("stub %p\n", services); return E_NOTIMPL; } -static const IRichEditOleVtbl revt = { +const IRichEditOleVtbl re_ole_vtbl = +{ IRichEditOle_fnQueryInterface, IRichEditOle_fnAddRef, IRichEditOle_fnRelease, @@ -1750,7 +1654,7 @@ static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) return E_NOTIMPL; } -static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, ITextRange** ppRange); +static HRESULT CreateITextRange(struct text_services *services, LONG start, LONG end, ITextRange** ppRange); static HRESULT WINAPI ITextRange_fnGetDuplicate(ITextRange *me, ITextRange **ppRange) { @@ -1807,7 +1711,7 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *start) return S_OK; } -static HRESULT textrange_setstart(const IRichEditOleImpl *reole, LONG value, LONG *start, LONG *end) +static HRESULT textrange_setstart(const struct text_services *services, LONG value, LONG *start, LONG *end) { int len; @@ -1822,7 +1726,7 @@ static HRESULT textrange_setstart(const IRichEditOleImpl *reole, LONG value, LON return S_OK; } - len = ME_GetTextLength(reole->editor); + len = ME_GetTextLength(services->editor); *start = *end = value > len ? len : value; return S_OK; } @@ -1855,7 +1759,7 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *end) return S_OK; } -static HRESULT textrange_setend(const IRichEditOleImpl *reole, LONG value, LONG *start, LONG *end) +static HRESULT textrange_setend(const struct text_services *services, LONG value, LONG *start, LONG *end) { int len; @@ -1867,7 +1771,7 @@ static HRESULT textrange_setend(const IRichEditOleImpl *reole, LONG value, LONG return S_OK; } - len = ME_GetTextLength(reole->editor); + len = ME_GetTextLength( services->editor ); *end = value > len ? len + 1 : value; return S_OK; } @@ -4126,27 +4030,27 @@ static HRESULT create_textpara(ITextRange *range, ITextPara **ret) static HRESULT WINAPI ITextDocument2Old_fnQueryInterface(ITextDocument2Old* iface, REFIID riid, void **ppvObject) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - return IRichEditOle_QueryInterface(&This->IRichEditOle_iface, riid, ppvObject); + struct text_services *services = impl_from_ITextDocument2Old(iface); + return IUnknown_QueryInterface( services->outer_unk, riid, ppvObject ); } static ULONG WINAPI ITextDocument2Old_fnAddRef(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - return IRichEditOle_AddRef(&This->IRichEditOle_iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); + return IUnknown_AddRef( services->outer_unk ); } static ULONG WINAPI ITextDocument2Old_fnRelease(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - return IRichEditOle_Release(&This->IRichEditOle_iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); + return IUnknown_Release( services->outer_unk ); } static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfoCount(ITextDocument2Old *iface, UINT *pctinfo) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); + struct text_services *services = impl_from_ITextDocument2Old(iface); + TRACE("(%p)->(%p)\n", services, pctinfo); *pctinfo = 1; return S_OK; } @@ -4154,10 +4058,10 @@ static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfoCount(ITextDocument2Old *if static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfo(ITextDocument2Old *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%d,%p)\n", services, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextDocument_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -4169,11 +4073,11 @@ static HRESULT WINAPI ITextDocument2Old_fnGetIDsOfNames(ITextDocument2Old *iface LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", services, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextDocument_tid, &ti); @@ -4187,11 +4091,11 @@ static HRESULT WINAPI ITextDocument2Old_fnInvoke(ITextDocument2Old *iface, DISPI DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", services, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -4203,142 +4107,144 @@ static HRESULT WINAPI ITextDocument2Old_fnInvoke(ITextDocument2Old *iface, DISPI static HRESULT WINAPI ITextDocument2Old_fnGetName(ITextDocument2Old *iface, BSTR *pName) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetSelection(ITextDocument2Old *iface, ITextSelection **selection) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); TRACE("(%p)->(%p)\n", iface, selection); if (!selection) return E_INVALIDARG; - if (!This->txtSel) { - This->txtSel = CreateTextSelection(This); - if (!This->txtSel) { - *selection = NULL; - return E_OUTOFMEMORY; - } + if (!services->text_selection) + { + services->text_selection = text_selection_create( services ); + if (!services->text_selection) + { + *selection = NULL; + return E_OUTOFMEMORY; + } } - *selection = &This->txtSel->ITextSelection_iface; + *selection = &services->text_selection->ITextSelection_iface; ITextSelection_AddRef(*selection); return S_OK; } static HRESULT WINAPI ITextDocument2Old_fnGetStoryCount(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetStoryRanges(ITextDocument2Old *iface, ITextStoryRanges **ppStories) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetSaved(ITextDocument2Old *iface, LONG *pValue) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSetSaved(ITextDocument2Old *iface, LONG Value) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetDefaultTabStop(ITextDocument2Old *iface, float *pValue) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSetDefaultTabStop(ITextDocument2Old *iface, float Value) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnNew(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnOpen(ITextDocument2Old *iface, VARIANT *pVar, LONG Flags, LONG CodePage) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSave(ITextDocument2Old *iface, VARIANT *pVar, LONG Flags, LONG CodePage) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnFreeze(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnUnfreeze(ITextDocument2Old *iface, LONG *pCount) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnBeginEditCollection(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnEndEditCollection(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnUndo(ITextDocument2Old *iface, LONG Count, LONG *prop) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnRedo(ITextDocument2Old *iface, LONG Count, LONG *prop) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } -static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, ITextRange** ppRange) +static HRESULT CreateITextRange(struct text_services *services, LONG start, LONG end, ITextRange** ppRange) { ITextRangeImpl *txtRge = heap_alloc(sizeof(ITextRangeImpl)); @@ -4346,10 +4252,10 @@ static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, I return E_OUTOFMEMORY; txtRge->ITextRange_iface.lpVtbl = &trvt; txtRge->ref = 1; - txtRge->child.reole = reOle; + txtRge->child.reole = services; txtRge->start = start; txtRge->end = end; - list_add_head(&reOle->rangelist, &txtRge->child.entry); + list_add_head( &services->rangelist, &txtRge->child.entry ); *ppRange = &txtRge->ITextRange_iface; return S_OK; } @@ -4357,84 +4263,84 @@ static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, I static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG cp1, LONG cp2, ITextRange **ppRange) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); + TRACE("%p %p %d %d\n", services, ppRange, cp1, cp2); if (!ppRange) return E_INVALIDARG; - cp2range(This->editor, &cp1, &cp2); - return CreateITextRange(This, cp1, cp2, ppRange); + cp2range(services->editor, &cp1, &cp2); + return CreateITextRange(services, cp1, cp2, ppRange); } static HRESULT WINAPI ITextDocument2Old_fnRangeFromPoint(ITextDocument2Old *iface, LONG x, LONG y, ITextRange **ppRange) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n",This); + struct text_services *services = impl_from_ITextDocument2Old(iface); + FIXME("stub %p\n", services); return E_NOTIMPL; } /* ITextDocument2Old methods */ static HRESULT WINAPI ITextDocument2Old_fnAttachMsgFilter(ITextDocument2Old *iface, IUnknown *filter) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, filter); + FIXME("(%p)->(%p): stub\n", services, filter); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF cr) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, 0x%x): stub\n", This, index, cr); + FIXME("(%p)->(%d, 0x%x): stub\n", services, index, cr); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetEffectColor(ITextDocument2Old *iface, LONG index, COLORREF *cr) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p): stub\n", This, index, cr); + FIXME("(%p)->(%d, %p): stub\n", services, index, cr); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetCaretType(ITextDocument2Old *iface, LONG *type) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, type); + FIXME("(%p)->(%p): stub\n", services, type); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSetCaretType(ITextDocument2Old *iface, LONG type) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", This, type); + FIXME("(%p)->(%d): stub\n", services, type); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetImmContext(ITextDocument2Old *iface, LONG *context) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, context); + FIXME("(%p)->(%p): stub\n", services, context); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnReleaseImmContext(ITextDocument2Old *iface, LONG context) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", This, context); + FIXME("(%p)->(%d): stub\n", services, context); return E_NOTIMPL; } @@ -4443,9 +4349,9 @@ static HRESULT WINAPI ITextDocument2Old_fnGetPreferredFont(ITextDocument2Old *if LONG options, LONG current_charrep, LONG current_fontsize, BSTR *bstr, LONG *pitch_family, LONG *new_fontsize) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", This, cp, charrep, options, current_charrep, + FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", services, cp, charrep, options, current_charrep, current_fontsize, bstr, pitch_family, new_fontsize); return E_NOTIMPL; @@ -4453,18 +4359,18 @@ static HRESULT WINAPI ITextDocument2Old_fnGetPreferredFont(ITextDocument2Old *if static HRESULT WINAPI ITextDocument2Old_fnGetNotificationMode(ITextDocument2Old *iface, LONG *mode) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, mode); + FIXME("(%p)->(%p): stub\n", services, mode); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSetNotificationMode(ITextDocument2Old *iface, LONG mode) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", This, mode); + FIXME("(%p)->(0x%x): stub\n", services, mode); return E_NOTIMPL; } @@ -4472,95 +4378,96 @@ static HRESULT WINAPI ITextDocument2Old_fnSetNotificationMode(ITextDocument2Old static HRESULT WINAPI ITextDocument2Old_fnGetClientRect(ITextDocument2Old *iface, LONG type, LONG *left, LONG *top, LONG *right, LONG *bottom) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, type, left, top, right, bottom); + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", services, type, left, top, right, bottom); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetSelectionEx(ITextDocument2Old *iface, ITextSelection **selection) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, selection); + FIXME("(%p)->(%p): stub\n", services, selection); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetWindow(ITextDocument2Old *iface, LONG *hwnd) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, hwnd); + FIXME("(%p)->(%p): stub\n", services, hwnd); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnGetFEFlags(ITextDocument2Old *iface, LONG *flags) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%p): stub\n", This, flags); + FIXME("(%p)->(%p): stub\n", services, flags); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnUpdateWindow(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p): stub\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnCheckTextLimit(ITextDocument2Old *iface, LONG cch, LONG *exceed) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p): stub\n", This, cch, exceed); + FIXME("(%p)->(%d, %p): stub\n", services, cch, exceed); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnIMEInProgress(ITextDocument2Old *iface, LONG mode) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", This, mode); + FIXME("(%p)->(0x%x): stub\n", services, mode); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnSysBeep(ITextDocument2Old *iface) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p): stub\n", services); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnUpdate(ITextDocument2Old *iface, LONG mode) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", This, mode); + FIXME("(%p)->(0x%x): stub\n", services, mode); return E_NOTIMPL; } static HRESULT WINAPI ITextDocument2Old_fnNotify(ITextDocument2Old *iface, LONG notify) { - IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); + struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", This, notify); + FIXME("(%p)->(%d): stub\n", services, notify); return E_NOTIMPL; } -static const ITextDocument2OldVtbl tdvt = { +const ITextDocument2OldVtbl text_doc2old_vtbl = +{ ITextDocument2Old_fnQueryInterface, ITextDocument2Old_fnAddRef, ITextDocument2Old_fnRelease, @@ -4616,7 +4523,7 @@ static HRESULT WINAPI ITextSelection_fnQueryInterface( REFIID riid, void **ppvObj) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); *ppvObj = NULL; if (IsEqualGUID(riid, &IID_IUnknown) @@ -4630,7 +4537,7 @@ static HRESULT WINAPI ITextSelection_fnQueryInterface( } else if (IsEqualGUID(riid, &IID_Igetrichole)) { - *ppvObj = This->reOle; + *ppvObj = This->services; return S_OK; } @@ -4639,13 +4546,13 @@ static HRESULT WINAPI ITextSelection_fnQueryInterface( static ULONG WINAPI ITextSelection_fnAddRef(ITextSelection *me) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); return InterlockedIncrement(&This->ref); } static ULONG WINAPI ITextSelection_fnRelease(ITextSelection *me) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) heap_free(This); @@ -4654,7 +4561,7 @@ static ULONG WINAPI ITextSelection_fnRelease(ITextSelection *me) static HRESULT WINAPI ITextSelection_fnGetTypeInfoCount(ITextSelection *me, UINT *pctinfo) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -4663,7 +4570,7 @@ static HRESULT WINAPI ITextSelection_fnGetTypeInfoCount(ITextSelection *me, UINT static HRESULT WINAPI ITextSelection_fnGetTypeInfo(ITextSelection *me, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); HRESULT hr; TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); @@ -4677,7 +4584,7 @@ static HRESULT WINAPI ITextSelection_fnGetTypeInfo(ITextSelection *me, UINT iTIn static HRESULT WINAPI ITextSelection_fnGetIDsOfNames(ITextSelection *me, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITypeInfo *ti; HRESULT hr; @@ -4701,7 +4608,7 @@ static HRESULT WINAPI ITextSelection_fnInvoke( EXCEPINFO *pExcepInfo, UINT *puArgErr) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITypeInfo *ti; HRESULT hr; @@ -4717,20 +4624,20 @@ static HRESULT WINAPI ITextSelection_fnInvoke( /*** ITextRange methods ***/ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ME_Cursor *start = NULL, *end = NULL; int nChars, endOfs; BOOL bEOP; TRACE("(%p)->(%p)\n", This, pbstr); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!pbstr) return E_INVALIDARG; - ME_GetSelection(This->reOle->editor, &start, &end); + ME_GetSelection(This->services->editor, &start, &end); endOfs = ME_GetCursorOfs(end); nChars = endOfs - ME_GetCursorOfs(start); if (!nChars) @@ -4743,8 +4650,8 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) if (!*pbstr) return E_OUTOFMEMORY; - bEOP = (!para_next( para_next( end->para ) ) && endOfs > ME_GetTextLength(This->reOle->editor)); - ME_GetTextW(This->reOle->editor, *pbstr, nChars, start, nChars, FALSE, bEOP); + bEOP = (!para_next( para_next( end->para ) ) && endOfs > ME_GetTextLength(This->services->editor)); + ME_GetTextW(This->services->editor, *pbstr, nChars, start, nChars, FALSE, bEOP); TRACE("%s\n", wine_dbgstr_w(*pbstr)); return S_OK; @@ -4752,50 +4659,50 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr) static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ME_TextEditor *editor; int len, to, from; TRACE("(%p)->(%s)\n", This, debugstr_w(str)); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; - editor = This->reOle->editor; + editor = This->services->editor; len = lstrlenW(str); ME_GetSelectionOfs(editor, &from, &to); ME_ReplaceSel(editor, FALSE, str, len); if (len < to - from) - textranges_update_ranges(This->reOle, from, len, RANGE_UPDATE_DELETE); + textranges_update_ranges(This->services, from, len, RANGE_UPDATE_DELETE); return S_OK; } static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ME_Cursor *start = NULL, *end = NULL; TRACE("(%p)->(%p)\n", This, pch); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!pch) return E_INVALIDARG; - ME_GetSelection(This->reOle->editor, &start, &end); - return range_GetChar(This->reOle->editor, start, pch); + ME_GetSelection(This->services->editor, &start, &end); + return range_GetChar(This->services->editor, start, pch); } static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%x): stub\n", This, ch); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -4803,12 +4710,12 @@ static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRange **range) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG start, end; TRACE("(%p)->(%p)\n", This, range); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!range) @@ -4816,16 +4723,16 @@ static HRESULT WINAPI ITextSelection_fnGetDuplicate(ITextSelection *me, ITextRan ITextSelection_GetStart(me, &start); ITextSelection_GetEnd(me, &end); - return CreateITextRange(This->reOle, start, end, range); + return CreateITextRange(This->services, start, end, range); } static HRESULT WINAPI ITextSelection_fnGetFormattedText(ITextSelection *me, ITextRange **range) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, range); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -4833,11 +4740,11 @@ static HRESULT WINAPI ITextSelection_fnGetFormattedText(ITextSelection *me, ITex static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITextRange *range) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, range); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; FIXME("not implemented\n"); @@ -4846,83 +4753,83 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITex static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFirst) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG lim; TRACE("(%p)->(%p)\n", This, pcpFirst); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!pcpFirst) return E_INVALIDARG; - ME_GetSelectionOfs(This->reOle->editor, pcpFirst, &lim); + ME_GetSelectionOfs(This->services->editor, pcpFirst, &lim); return S_OK; } static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG start, end; HRESULT hr; TRACE("(%p)->(%d)\n", This, value); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; - ME_GetSelectionOfs(This->reOle->editor, &start, &end); - hr = textrange_setstart(This->reOle, value, &start, &end); + ME_GetSelectionOfs(This->services->editor, &start, &end); + hr = textrange_setstart(This->services, value, &start, &end); if (hr == S_OK) - set_selection(This->reOle->editor, start, end); + set_selection(This->services->editor, start, end); return hr; } static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG first; TRACE("(%p)->(%p)\n", This, pcpLim); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!pcpLim) return E_INVALIDARG; - ME_GetSelectionOfs(This->reOle->editor, &first, pcpLim); + ME_GetSelectionOfs(This->services->editor, &first, pcpLim); return S_OK; } static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG start, end; HRESULT hr; TRACE("(%p)->(%d)\n", This, value); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; - ME_GetSelectionOfs(This->reOle->editor, &start, &end); - hr = textrange_setend(This->reOle, value, &start, &end); + ME_GetSelectionOfs(This->services->editor, &start, &end); + hr = textrange_setend(This->services, value, &start, &end); if (hr == S_OK) - set_selection(This->reOle->editor, start, end); + set_selection(This->services->editor, start, end); return hr; } static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **font) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%p)\n", This, font); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!font) @@ -4936,7 +4843,7 @@ static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **f static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *font) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; TRACE("(%p)->(%p)\n", This, font); @@ -4944,7 +4851,7 @@ static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *fo if (!font) return E_INVALIDARG; - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); @@ -4955,13 +4862,13 @@ static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *fo static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **para) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%p)\n", This, para); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!para) @@ -4975,11 +4882,11 @@ static HRESULT WINAPI ITextSelection_fnGetPara(ITextSelection *me, ITextPara **p static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *para) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, para); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; FIXME("not implemented\n"); @@ -4988,23 +4895,23 @@ static HRESULT WINAPI ITextSelection_fnSetPara(ITextSelection *me, ITextPara *pa static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG *length) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); TRACE("(%p)->(%p)\n", This, length); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; - return textrange_get_storylength(This->reOle->editor, length); + return textrange_get_storylength(This->services->editor, length); } static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *value) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); TRACE("(%p)->(%p)\n", This, value); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!value) @@ -5016,31 +4923,31 @@ static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *va static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); LONG start, end; HRESULT hres; TRACE("(%p)->(%d)\n", This, bStart); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; - ME_GetSelectionOfs(This->reOle->editor, &start, &end); + ME_GetSelectionOfs(This->services->editor, &start, &end); hres = range_Collapse(bStart, &start, &end); if (SUCCEEDED(hres)) - set_selection(This->reOle->editor, start, end); + set_selection(This->services->editor, start, end); return hres; } static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG unit, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %p)\n", This, unit, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); @@ -5051,11 +4958,11 @@ static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnGetIndex(ITextSelection *me, LONG unit, LONG *index) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %p): stub\n", This, unit, index); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5064,11 +4971,11 @@ static HRESULT WINAPI ITextSelection_fnGetIndex(ITextSelection *me, LONG unit, L static HRESULT WINAPI ITextSelection_fnSetIndex(ITextSelection *me, LONG unit, LONG index, LONG extend) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d): stub\n", This, unit, index, extend); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5076,11 +4983,11 @@ static HRESULT WINAPI ITextSelection_fnSetIndex(ITextSelection *me, LONG unit, L static HRESULT WINAPI ITextSelection_fnSetRange(ITextSelection *me, LONG anchor, LONG active) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d): stub\n", This, anchor, active); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5088,7 +4995,7 @@ static HRESULT WINAPI ITextSelection_fnSetRange(ITextSelection *me, LONG anchor, static HRESULT WINAPI ITextSelection_fnInRange(ITextSelection *me, ITextRange *range, LONG *ret) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextSelection *selection = NULL; LONG start, end; @@ -5097,7 +5004,7 @@ static HRESULT WINAPI ITextSelection_fnInRange(ITextSelection *me, ITextRange *r if (ret) *ret = tomFalse; - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!range) @@ -5115,11 +5022,11 @@ static HRESULT WINAPI ITextSelection_fnInRange(ITextSelection *me, ITextRange *r static HRESULT WINAPI ITextSelection_fnInStory(ITextSelection *me, ITextRange *range, LONG *ret) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p %p): stub\n", This, range, ret); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5127,7 +5034,7 @@ static HRESULT WINAPI ITextSelection_fnInStory(ITextSelection *me, ITextRange *r static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *range, LONG *ret) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextSelection *selection = NULL; LONG start, end; @@ -5136,7 +5043,7 @@ static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *r if (ret) *ret = tomFalse; - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; if (!range) @@ -5154,11 +5061,11 @@ static HRESULT WINAPI ITextSelection_fnIsEqual(ITextSelection *me, ITextRange *r static HRESULT WINAPI ITextSelection_fnSelect(ITextSelection *me) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); TRACE("(%p)\n", This); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; /* nothing to do */ @@ -5168,13 +5075,13 @@ static HRESULT WINAPI ITextSelection_fnSelect(ITextSelection *me) static HRESULT WINAPI ITextSelection_fnStartOf(ITextSelection *me, LONG unit, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); @@ -5186,34 +5093,34 @@ static HRESULT WINAPI ITextSelection_fnStartOf(ITextSelection *me, LONG unit, LO static HRESULT WINAPI ITextSelection_fnEndOf(ITextSelection *me, LONG unit, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_endof(range, This->reOle->editor, unit, extend, delta); + hr = textrange_endof(range, This->services->editor, unit, extend, delta); ITextRange_Release(range); return hr; } static HRESULT WINAPI ITextSelection_fnMove(ITextSelection *me, LONG unit, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_movestart(range, This->reOle->editor, unit, count, delta); + hr = textrange_movestart(range, This->services->editor, unit, count, delta); ITextRange_Release(range); return hr; } @@ -5221,17 +5128,17 @@ static HRESULT WINAPI ITextSelection_fnMove(ITextSelection *me, LONG unit, LONG static HRESULT WINAPI ITextSelection_fnMoveStart(ITextSelection *me, LONG unit, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_movestart(range, This->reOle->editor, unit, count, delta); + hr = textrange_movestart(range, This->services->editor, unit, count, delta); ITextRange_Release(range); return hr; } @@ -5239,17 +5146,17 @@ static HRESULT WINAPI ITextSelection_fnMoveStart(ITextSelection *me, LONG unit, static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_moveend(range, This->reOle->editor, unit, count, delta); + hr = textrange_moveend(range, This->services->editor, unit, count, delta); ITextRange_Release(range); return hr; } @@ -5257,11 +5164,11 @@ static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LO static HRESULT WINAPI ITextSelection_fnMoveWhile(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5270,11 +5177,11 @@ static HRESULT WINAPI ITextSelection_fnMoveWhile(ITextSelection *me, VARIANT *ch static HRESULT WINAPI ITextSelection_fnMoveStartWhile(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5283,11 +5190,11 @@ static HRESULT WINAPI ITextSelection_fnMoveStartWhile(ITextSelection *me, VARIAN static HRESULT WINAPI ITextSelection_fnMoveEndWhile(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5296,11 +5203,11 @@ static HRESULT WINAPI ITextSelection_fnMoveEndWhile(ITextSelection *me, VARIANT static HRESULT WINAPI ITextSelection_fnMoveUntil(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5309,11 +5216,11 @@ static HRESULT WINAPI ITextSelection_fnMoveUntil(ITextSelection *me, VARIANT *ch static HRESULT WINAPI ITextSelection_fnMoveStartUntil(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5322,11 +5229,11 @@ static HRESULT WINAPI ITextSelection_fnMoveStartUntil(ITextSelection *me, VARIAN static HRESULT WINAPI ITextSelection_fnMoveEndUntil(ITextSelection *me, VARIANT *charset, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5335,11 +5242,11 @@ static HRESULT WINAPI ITextSelection_fnMoveEndUntil(ITextSelection *me, VARIANT static HRESULT WINAPI ITextSelection_fnFindText(ITextSelection *me, BSTR text, LONG count, LONG flags, LONG *length) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; FIXME("not implemented\n"); @@ -5349,11 +5256,11 @@ static HRESULT WINAPI ITextSelection_fnFindText(ITextSelection *me, BSTR text, L static HRESULT WINAPI ITextSelection_fnFindTextStart(ITextSelection *me, BSTR text, LONG count, LONG flags, LONG *length) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5362,11 +5269,11 @@ static HRESULT WINAPI ITextSelection_fnFindTextStart(ITextSelection *me, BSTR te static HRESULT WINAPI ITextSelection_fnFindTextEnd(ITextSelection *me, BSTR text, LONG count, LONG flags, LONG *length) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5375,11 +5282,11 @@ static HRESULT WINAPI ITextSelection_fnFindTextEnd(ITextSelection *me, BSTR text static HRESULT WINAPI ITextSelection_fnDelete(ITextSelection *me, LONG unit, LONG count, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5387,45 +5294,45 @@ static HRESULT WINAPI ITextSelection_fnDelete(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnCut(ITextSelection *me, VARIANT *v) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%p): stub\n", This, v); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_copy_or_cut(range, This->reOle->editor, TRUE, v); + hr = textrange_copy_or_cut(range, This->services->editor, TRUE, v); ITextRange_Release(range); return hr; } static HRESULT WINAPI ITextSelection_fnCopy(ITextSelection *me, VARIANT *v) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); ITextRange *range = NULL; HRESULT hr; TRACE("(%p)->(%p)\n", This, v); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; ITextSelection_QueryInterface(me, &IID_ITextRange, (void**)&range); - hr = textrange_copy_or_cut(range, This->reOle->editor, FALSE, v); + hr = textrange_copy_or_cut(range, This->services->editor, FALSE, v); ITextRange_Release(range); return hr; } static HRESULT WINAPI ITextSelection_fnPaste(ITextSelection *me, VARIANT *v, LONG format) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %x): stub\n", This, debugstr_variant(v), format); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5434,11 +5341,11 @@ static HRESULT WINAPI ITextSelection_fnPaste(ITextSelection *me, VARIANT *v, LON static HRESULT WINAPI ITextSelection_fnCanPaste(ITextSelection *me, VARIANT *v, LONG format, LONG *ret) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s %x %p): stub\n", This, debugstr_variant(v), format, ret); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5446,11 +5353,11 @@ static HRESULT WINAPI ITextSelection_fnCanPaste(ITextSelection *me, VARIANT *v, static HRESULT WINAPI ITextSelection_fnCanEdit(ITextSelection *me, LONG *ret) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, ret); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5458,11 +5365,11 @@ static HRESULT WINAPI ITextSelection_fnCanEdit(ITextSelection *me, LONG *ret) static HRESULT WINAPI ITextSelection_fnChangeCase(ITextSelection *me, LONG type) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d): stub\n", This, type); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5470,11 +5377,11 @@ static HRESULT WINAPI ITextSelection_fnChangeCase(ITextSelection *me, LONG type) static HRESULT WINAPI ITextSelection_fnGetPoint(ITextSelection *me, LONG type, LONG *cx, LONG *cy) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %p %p): stub\n", This, type, cx, cy); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5483,11 +5390,11 @@ static HRESULT WINAPI ITextSelection_fnGetPoint(ITextSelection *me, LONG type, L static HRESULT WINAPI ITextSelection_fnSetPoint(ITextSelection *me, LONG x, LONG y, LONG type, LONG extend) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d %d): stub\n", This, x, y, type, extend); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5495,11 +5402,11 @@ static HRESULT WINAPI ITextSelection_fnSetPoint(ITextSelection *me, LONG x, LONG static HRESULT WINAPI ITextSelection_fnScrollIntoView(ITextSelection *me, LONG value) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d): stub\n", This, value); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5507,11 +5414,11 @@ static HRESULT WINAPI ITextSelection_fnScrollIntoView(ITextSelection *me, LONG v static HRESULT WINAPI ITextSelection_fnGetEmbeddedObject(ITextSelection *me, IUnknown **ppv) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, ppv); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5520,11 +5427,11 @@ static HRESULT WINAPI ITextSelection_fnGetEmbeddedObject(ITextSelection *me, IUn /*** ITextSelection methods ***/ static HRESULT WINAPI ITextSelection_fnGetFlags(ITextSelection *me, LONG *flags) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, flags); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5532,11 +5439,11 @@ static HRESULT WINAPI ITextSelection_fnGetFlags(ITextSelection *me, LONG *flags) static HRESULT WINAPI ITextSelection_fnSetFlags(ITextSelection *me, LONG flags) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%x): stub\n", This, flags); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5544,11 +5451,11 @@ static HRESULT WINAPI ITextSelection_fnSetFlags(ITextSelection *me, LONG flags) static HRESULT WINAPI ITextSelection_fnGetType(ITextSelection *me, LONG *type) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%p): stub\n", This, type); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5557,11 +5464,11 @@ static HRESULT WINAPI ITextSelection_fnGetType(ITextSelection *me, LONG *type) static HRESULT WINAPI ITextSelection_fnMoveLeft(ITextSelection *me, LONG unit, LONG count, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5570,11 +5477,11 @@ static HRESULT WINAPI ITextSelection_fnMoveLeft(ITextSelection *me, LONG unit, L static HRESULT WINAPI ITextSelection_fnMoveRight(ITextSelection *me, LONG unit, LONG count, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5583,11 +5490,11 @@ static HRESULT WINAPI ITextSelection_fnMoveRight(ITextSelection *me, LONG unit, static HRESULT WINAPI ITextSelection_fnMoveUp(ITextSelection *me, LONG unit, LONG count, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5596,11 +5503,11 @@ static HRESULT WINAPI ITextSelection_fnMoveUp(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnMoveDown(ITextSelection *me, LONG unit, LONG count, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5609,11 +5516,11 @@ static HRESULT WINAPI ITextSelection_fnMoveDown(ITextSelection *me, LONG unit, L static HRESULT WINAPI ITextSelection_fnHomeKey(ITextSelection *me, LONG unit, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %p): stub\n", This, unit, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5622,11 +5529,11 @@ static HRESULT WINAPI ITextSelection_fnHomeKey(ITextSelection *me, LONG unit, LO static HRESULT WINAPI ITextSelection_fnEndKey(ITextSelection *me, LONG unit, LONG extend, LONG *delta) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%d %d %p): stub\n", This, unit, extend, delta); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5634,11 +5541,11 @@ static HRESULT WINAPI ITextSelection_fnEndKey(ITextSelection *me, LONG unit, LON static HRESULT WINAPI ITextSelection_fnTypeText(ITextSelection *me, BSTR text) { - ITextSelectionImpl *This = impl_from_ITextSelection(me); + struct text_selection *This = impl_from_ITextSelection(me); FIXME("(%p)->(%s): stub\n", This, debugstr_w(text)); - if (!This->reOle) + if (!This->services) return CO_E_RELEASED; return E_NOTIMPL; @@ -5715,46 +5622,18 @@ static const ITextSelectionVtbl tsvt = { ITextSelection_fnTypeText }; -static ITextSelectionImpl * -CreateTextSelection(IRichEditOleImpl *reOle) +static struct text_selection *text_selection_create(struct text_services *services) { - ITextSelectionImpl *txtSel = heap_alloc(sizeof *txtSel); + struct text_selection *txtSel = heap_alloc(sizeof *txtSel); if (!txtSel) return NULL; txtSel->ITextSelection_iface.lpVtbl = &tsvt; txtSel->ref = 1; - txtSel->reOle = reOle; + txtSel->services = services; return txtSel; } -LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) -{ - IRichEditOleImpl *reo; - - reo = heap_alloc(sizeof(IRichEditOleImpl)); - if (!reo) - return 0; - - reo->IUnknown_inner.lpVtbl = &reo_unk_vtbl; - reo->IRichEditOle_iface.lpVtbl = &revt; - reo->ITextDocument2Old_iface.lpVtbl = &tdvt; - reo->ref = 1; - reo->editor = editor; - reo->txtSel = NULL; - - TRACE("Created %p\n",reo); - list_init(&reo->rangelist); - list_init(&reo->clientsites); - if (outer_unk) - reo->outer_unk = outer_unk; - else - reo->outer_unk = &reo->IUnknown_inner; - *ppvObj = &reo->IUnknown_inner; - - return 1; -} - static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */ @@ -5970,3 +5849,21 @@ void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) IOleClientSite_AddRef(dst->polesite); } } + +void richole_release_children( struct text_services *services ) +{ + ITextRangeImpl *range; + IOleClientSiteImpl *site; + + if (services->text_selection) + { + services->text_selection->services = NULL; + ITextSelection_Release( &services->text_selection->ITextSelection_iface ); + } + + LIST_FOR_EACH_ENTRY( range, &services->rangelist, ITextRangeImpl, child.entry ) + range->child.reole = NULL; + + LIST_FOR_EACH_ENTRY( site, &services->clientsites, IOleClientSiteImpl, child.entry ) + site->child.reole = NULL; +} diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 80e4682880f..73b8d3ea7e9 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -32,16 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -struct text_services -{ - IUnknown IUnknown_inner; - ITextServices ITextServices_iface; - IUnknown *outer_unk; - LONG ref; - ME_TextEditor *editor; - char spare[256]; /* for bug #12179 */ -}; - static inline struct text_services *impl_from_IUnknown( IUnknown *iface ) { return CONTAINING_RECORD( iface, struct text_services, IUnknown_inner ); @@ -55,13 +45,10 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface( IUnknown *iface, REFIID if (IsEqualIID( iid, &IID_IUnknown )) *obj = &services->IUnknown_inner; else if (IsEqualIID( iid, &IID_ITextServices )) *obj = &services->ITextServices_iface; - else if (IsEqualIID( iid, &IID_IRichEditOle ) || IsEqualIID( iid, &IID_ITextDocument ) || - IsEqualIID( iid, &IID_ITextDocument2Old )) - { - if (!services->editor->reOle && !CreateIRichEditOle( services->outer_unk, services->editor, (void **)&services->editor->reOle )) - return E_OUTOFMEMORY; - return IUnknown_QueryInterface( services->editor->reOle, iid, obj ); - } + else if (IsEqualIID( iid, &IID_IRichEditOle )) *obj= &services->IRichEditOle_iface; + else if (IsEqualIID( iid, &IID_IDispatch ) || + IsEqualIID( iid, &IID_ITextDocument ) || + IsEqualIID( iid, &IID_ITextDocument2Old )) *obj = &services->ITextDocument2Old_iface; else { *obj = NULL; @@ -92,6 +79,7 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) if (!ref) { + richole_release_children( services ); ME_DestroyEditor( services->editor ); CoTaskMemFree( services ); } @@ -597,11 +585,18 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services->ref = 1; services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; services->ITextServices_iface.lpVtbl = &textservices_vtbl; + services->IRichEditOle_iface.lpVtbl = &re_ole_vtbl; + services->ITextDocument2Old_iface.lpVtbl = &text_doc2old_vtbl; services->editor = ME_MakeEditor( text_host, emulate_10 ); + services->editor->richole = &services->IRichEditOle_iface; if (outer) services->outer_unk = outer; else services->outer_unk = &services->IUnknown_inner; + services->text_selection = NULL; + list_init( &services->rangelist ); + list_init( &services->clientsites ); + *unk = &services->IUnknown_inner; return S_OK; } -- 2.23.0

1 0

[PATCH 1/4] riched20: Add support for TXTBIT_ALLOWBEEP.
by Huw Davies 31 Mar '21

31 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fe05d1e7444..deb0a93c8dc 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -279,6 +279,11 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) return &editor->pBuffer->pLast->member.para; } +static BOOL editor_beep( ME_TextEditor *editor, UINT type ) +{ + return editor->props & TXTBIT_ALLOWBEEP && MessageBeep( type ); +} + static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStream *stream, ME_Style *style) { WCHAR *pText; @@ -2281,7 +2286,7 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO /* Protect read-only edit control from modification */ if (editor->props & TXTBIT_READONLY) { - if (!check_only) MessageBeep(MB_ICONERROR); + if (!check_only) editor_beep( editor, MB_ICONERROR ); return FALSE; } @@ -2379,7 +2384,7 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) count -= offs; hr = editor_copy_or_cut( editor, cut, sel_start, count, NULL ); - if (FAILED( hr )) MessageBeep( MB_ICONERROR ); + if (FAILED( hr )) editor_beep( editor, MB_ICONERROR ); return SUCCEEDED( hr ); } @@ -2422,7 +2427,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return TRUE; } @@ -2683,7 +2688,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (editor->props & TXTBIT_READONLY) { - MessageBeep(MB_ICONERROR); + editor_beep( editor, MB_ICONERROR ); return 0; /* FIXME really 0 ? */ } @@ -2737,7 +2742,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (para_in_table( para ) && cursor.run->nFlags & MERF_ENDPARA && from == to) { /* Text should not be inserted at the end of the table. */ - MessageBeep(-1); + editor_beep( editor, -1 ); return 0; } } @@ -2951,7 +2956,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->total_rows = 0; ITextHost_TxGetPropertyBits( ed->texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | - TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, + TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_ALLOWBEEP | + TXTBIT_DISABLEDRAG, &ed->props ); ITextHost_TxGetScrollBars( ed->texthost, &ed->scrollbars ); ed->pBuffer = ME_MakeText(); -- 2.23.0

1 0

[tools 1/3] testbot/TestLauncher: Add a RunTest() function.
by Francois Gouget 31 Mar '21

31 Mar '21

This moves running and waiting for the test executable out of main(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 162 +++++++++++++----------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index b024714ac..022f25c98 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -208,6 +208,86 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) return TRUE; } +DWORD Start; + +DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pid) +{ + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD ExitCode, WaitTimeOut; + + StartupInfo.cb = sizeof(STARTUPINFOA); + GetStartupInfoA(&StartupInfo); + StartupInfo.dwFlags |= STARTF_USESTDHANDLES; + StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + /* Unlike WineTest we do not have the luxury of first running the test with + * a --list argument. This means we cannot use SetErrorMode() to check + * whether there are missing dependencies as it could modify the test + * results... + */ + if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) + { + Error("CreateProcess failed (error %lu)\n", GetLastError()); + ExitProcess(1); + } + CloseHandle(ProcessInformation.hThread); + *Pid = ProcessInformation.dwProcessId; + + WaitTimeOut = 100; + ExitCode = WAIT_TIMEOUT; + while (ExitCode == WAIT_TIMEOUT) + { + DWORD Elapsed, Remaining; + + ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); + Elapsed = GetTickCount() - Start; + if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) + break; + + /* ...instead detect the critical error dialog that pops up */ + EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); + if (Skips) + { + ExitCode = WAIT_OBJECT_0; + break; + } + + Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; + WaitTimeOut = (Elapsed > 3000) ? Remaining : + (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : + Remaining; + } + + if (ExitCode != WAIT_OBJECT_0) + { + switch (ExitCode) + { + case WAIT_FAILED: + Error("Wait for child failed (error %lu)\n", GetLastError()); + break; + + case WAIT_TIMEOUT: + /* The 'exit code' on the done line identifies timeouts */ + break; + + default: + Error("Unexpected return value %lu from wait for child\n", ExitCode); + break; + } + if (!TerminateProcess(ProcessInformation.hProcess, 257)) + Error("TerminateProcess failed (error %lu)\n", GetLastError()); + } + else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) + { + Error("Could not get the child exit code (error %lu)\n", GetLastError()); + ExitCode = 259; + } + CloseHandle(ProcessInformation.hProcess); + return ExitCode; +} /* * Command line parsing and test running. @@ -216,7 +296,7 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) int main(int argc, char *argv[]) { int Arg; - DWORD Start, TimeOut, WaitTimeOut; + DWORD TimeOut; BOOL UsageError; char TestExeFullName[MAX_PATH]; char *TestExeFileName; @@ -225,9 +305,7 @@ int main(int argc, char *argv[]) int TestArg; char *CommandLine, *p; int CommandLen; - STARTUPINFOA StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD ExitCode; + DWORD Pid, ExitCode; Name0 = p = argv[0]; while (*p != '\0') @@ -340,82 +418,12 @@ int main(int argc, char *argv[]) printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); - StartupInfo.cb = sizeof(STARTUPINFOA); - GetStartupInfoA(&StartupInfo); - StartupInfo.dwFlags |= STARTF_USESTDHANDLES; - StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); - StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); - StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); - - /* Unlike WineTest we do not have the luxury of first running the test with - * a --list argument. This means we cannot use SetErrorMode() to check - * whether there are missing dependencies as it could modify the test - * results... - */ - if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) - { - Error("CreateProcess failed (error %lu)\n", GetLastError()); - return 1; - } - CloseHandle(ProcessInformation.hThread); - - WaitTimeOut = 100; - ExitCode = WAIT_TIMEOUT; - while (ExitCode == WAIT_TIMEOUT) - { - DWORD Elapsed, Remaining; - - ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); - Elapsed = GetTickCount() - Start; - if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) - break; - - /* ...instead detect the critical error dialog that pops up */ - EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); - if (Skips) - { - ExitCode = WAIT_OBJECT_0; - break; - } - - Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; - WaitTimeOut = (Elapsed > 3000) ? Remaining : - (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : - Remaining; - } - - if (ExitCode != WAIT_OBJECT_0) - { - switch (ExitCode) - { - case WAIT_FAILED: - Error("Wait for child failed (error %lu)\n", GetLastError()); - break; - - case WAIT_TIMEOUT: - /* The 'exit code' on the done line identifies timeouts */ - break; - - default: - Error("Unexpected return value %lu from wait for child\n", ExitCode); - break; - } - if (!TerminateProcess(ProcessInformation.hProcess, 257)) - Error("TerminateProcess failed (error %lu)\n", GetLastError()); - } - else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) - { - Error("Could not get the child exit code (error %lu)\n", GetLastError()); - ExitCode = 259; - } - CloseHandle(ProcessInformation.hProcess); - + ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); if (Skips) - printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", ProcessInformation.dwProcessId, Subtest, Skips); + printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", Pid, Subtest, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, - ProcessInformation.dwProcessId, ExitCode, - (GetTickCount() - Start) / 1000); + Pid, ExitCode, (GetTickCount() - Start) / 1000); return 0; } -- 2.20.1

1 2

[tools] testbot/reporttest: Add tests for the 'dll versions' block.
by Francois Gouget 31 Mar '21

31 Mar '21

Exercise handling of the messages dealing with missing dlls, dll loading errors, and dll version detection errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 20 ++++++++++---------- testbot/src/reporttest/report.testwtbs | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9624c9065..f1dbfd618 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -198,16 +198,16 @@ Dll info: wldap32=5.1.2600.5512 wmiutils=5.1.2600.5512 wmp=11.0.5721.5280 - wpc=dll is missing - ws2_32=5.1.2600.5512 - wscript.exe=5.7.0.18066 - wshom.ocx=5.7.0.18066 - wsnmp32=5.1.2600.5512 - wtsapi32=5.1.2600.5512 - xaudio2_7=dll is missing - xcopy.exe=5.1.2600.5512 - xinput1_3=dll is missing - xmllite=1.0.1018.0 + wpc=dll is native + ws2_32=dll is a stub + wscript.exe=dll is missing + wshom.ocx=dll is missing an ordinal (1.0) + wsnmp32=dll is missing an entrypoint (version not found) + wtsapi32=dll is missing the requested side-by-side version + xaudio2_7=load error 5 + xcopy.exe=version not found + xinput1_3=version error 5 + xmllite=version not present 2 Test output: stub advapi32:cred ----- WTBS Simple test patch diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 104c8ea60..7b56e1310 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,12 +13,16 @@ with: ----- TestWTBS ----- -p tests.TestFailures 68 +p tests.TestFailures 70 p build.HasTask 0 a wine.log.GrepV ^Applying patch a wine.log.GrepV ^Rebuilding the +g 0 tests.report. +n 0 wpc=dll is native +n 0 xaudio2_7=load error 5 + g 0 tests.report.advapi32 n 0 crypt.c:1: Test failed: Something wrong n 0 crypt_lmhash.c:10: Test failed: Something wrong -- 2.20.1

1 0

[tools] testbot/PatchUtils: There is no need to migrate the make_* flags.
by Francois Gouget 31 Mar '21

31 Mar '21

They impact the build, and only the build, no matter which patchset part they appear in. This is confirmed by the old code which moved them from $Impacts to $PastImpacts and then back to $Impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 796457a21..87e4508ba 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -423,10 +423,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan", - "PatchedRoot", "PatchedModules", "PatchedTests") + foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -518,12 +515,6 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan") - { - $Impacts->{$Field} ||= $PastImpacts->{$Field}; - } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; -- 2.20.1

1 0

[tools] testbot/WineTest: Always return the mission base name in SetupTest().
by Francois Gouget 31 Mar '21

31 Mar '21

WineTest runs the tests even if the wineprefix creation failed so developers have as much information as possible. So it needs to know the mission base name either way. The tests will be considered to be failed anyway since the wineprefix creation failure could be caused by the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c4a1216b0..ffd665faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -71,7 +71,6 @@ sub SetupTest($$) if (defined $ErrMessage) { LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; } } -- 2.20.1

1 0

[PATCH v2 1/2] ntdll/tests: Add committed / reserved thread stack sizes tests.
by Rémi Bernon 31 Mar '21

31 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Clear around 1MB of stack instead of a few pages, and keep setting the stack pointer while doing it. dlls/ntdll/tests/virtual.c | 264 +++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 546a7d83bbd..112be80c01e 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -237,14 +237,266 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } +struct test_stack_size_thread_args +{ + DWORD expect_committed; + DWORD expect_reserved; +}; + +static void force_stack_grow(void) +{ + volatile int buffer[0x2000]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} + +#ifdef _WIN64 +static void force_stack_grow_small(void) +{ + volatile int buffer[0x400]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} +#endif + +static DWORD WINAPI test_stack_size_thread(void *ptr) +{ + struct test_stack_size_thread_args *args = ptr; + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS status; + SIZE_T size, guard_size; + DWORD committed, reserved; + void *addr; +#ifdef _WIN64 + DWORD prot; + void *tmp; +#endif + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == args->expect_committed || broken(committed == 0x1000), "unexpected stack committed size %x, expected %x\n", committed, args->expect_committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == 0x9000, "unexpected stack committed size %x, expected 9000\n", committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + + /* reserved area shrinks whenever stack grows */ + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + guard_size = reserved - committed - mbi.RegionSize; + ok( guard_size == 0x1000 || guard_size == 0x2000 || guard_size == 0x3000, "unexpected guard_size %I64x, expected 1000, 2000 or 3000\n", (UINT64)guard_size ); + + /* the commit area is initially preceded by guard pages */ + + addr = (char *)NtCurrentTeb()->DeallocationStack + mbi.RegionSize; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected 3000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE|PAGE_GUARD ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == committed, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)committed ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + +#ifdef _WIN64 + /* setting a guard page shrinks stack automatically */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* guard pages are restored as the stack grows back */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x4000; + tmp = (char *)addr - guard_size - 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x1000, "unexpected stack committed size %x, expected 1000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)guard_size ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + + /* forcing stack limit over guard pages still shrinks the stack on page fault */ + + addr = (char *)tmp + guard_size + 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + NtCurrentTeb()->Tib.StackLimit = (char *)tmp; + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + + /* it works with NtProtectVirtualMemory as well */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* clearing the guard pages doesn't change StackLimit back */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + ok( prot == (PAGE_READWRITE | PAGE_GUARD), "unexpected prot %#x, expected %#x\n", prot, (PAGE_READWRITE | PAGE_GUARD) ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + /* and as we messed with it and it now doesn't fault, it doesn't grow back either */ + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); +#endif + + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + struct test_stack_size_thread_args args; SIZE_T default_commit = nt->OptionalHeader.SizeOfStackCommit; SIZE_T default_reserve = nt->OptionalHeader.SizeOfStackReserve; INITIAL_TEB stack = {0}; unsigned int i; NTSTATUS ret; + HANDLE thread; struct { @@ -298,6 +550,18 @@ static void test_RtlCreateUserStack(void) ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 0, 1, &stack); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + args.expect_committed = 0x4000; + args.expect_reserved = default_reserve; + thread = CreateThread(NULL, 0x3f00, test_stack_size_thread, &args, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; + args.expect_reserved = 0x400000; + thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } static void test_NtMapViewOfSection(void) -- 2.30.2

1 1

[PATCH] shcore: Added another api-ms-* forwarding dll.
by Nikolay Sivov 31 Mar '21

31 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-stream-winrt-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec diff --git a/configure b/configure index 5d430365ea4..a19bb0b9581 100755 --- a/configure +++ b/configure @@ -1143,6 +1143,7 @@ enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shcore_obsolete_l1_1_0 enable_api_ms_win_shcore_scaling_l1_1_1 enable_api_ms_win_shcore_stream_l1_1_0 +enable_api_ms_win_shcore_stream_winrt_l1_1_0 enable_api_ms_win_shcore_thread_l1_1_0 enable_api_ms_win_shell_shellcom_l1_1_0 enable_api_ms_win_shell_shellfolders_l1_1_0 @@ -20349,6 +20350,7 @@ wine_fn_config_makefile dlls/api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_ wine_fn_config_makefile dlls/api-ms-win-shcore-obsolete-l1-1-0 enable_api_ms_win_shcore_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-scaling-l1-1-1 enable_api_ms_win_shcore_scaling_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-shcore-stream-l1-1-0 enable_api_ms_win_shcore_stream_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-shcore-stream-winrt-l1-1-0 enable_api_ms_win_shcore_stream_winrt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-thread-l1-1-0 enable_api_ms_win_shcore_thread_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 diff --git a/configure.ac b/configure.ac index afd46b353ea..eb08e8b0f17 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,6 +3025,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-winrt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in new file mode 100644 index 00000000000..7af35b2eed6 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-winrt-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec new file mode 100644 index 00000000000..e30eb81184d --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec @@ -0,0 +1 @@ +@ stub CreateRandomAccessStreamOverStream diff --git a/tools/make_specfiles b/tools/make_specfiles index 3689a856b9f..9ff4974641a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -356,6 +356,7 @@ my @dll_groups = "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", "api-ms-win-shcore-stream-l1-1-0", + "api-ms-win-shcore-stream-winrt-l1-1-0", ], [ "shell32", -- 2.30.2

1 0

[PATCH] dwrite: Use wide-char literals.
by Nikolay Sivov 31 Mar '21

31 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/font.c | 408 ++++++++++++++++++----------------------- dlls/dwrite/main.c | 6 +- dlls/dwrite/opentype.c | 25 +-- 4 files changed, 196 insertions(+), 253 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e58ec835acc..93d507cf3dc 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -207,9 +207,7 @@ const char *debugstr_sa_script(UINT16 script) } /* system font falback configuration */ -static const WCHAR meiryoW[] = {'M','e','i','r','y','o',0}; - -static const WCHAR *cjk_families[] = { meiryoW }; +static const WCHAR *cjk_families[] = { L"Meiryo" }; static const DWRITE_UNICODE_RANGE cjk_ranges[] = { @@ -1102,12 +1100,12 @@ static void get_number_substitutes(IDWriteNumberSubstitution *substitution, BOOL break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: - if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) { - static const WCHAR arW[] = {'a','r',0}; + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) + { static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; /* For some Arabic locales Latin digits are returned for SNATIVEDIGITS */ - if (!wcscmp(arW, isolang)) + if (!wcscmp(L"ar", isolang)) { wcscpy(digits, arabicW); break; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index adc51d872dc..44a61aba1ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -45,24 +45,6 @@ static const FLOAT RECOMMENDED_OUTLINE_AA_THRESHOLD = 100.0f; static const FLOAT RECOMMENDED_OUTLINE_A_THRESHOLD = 350.0f; static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; -static const WCHAR extraW[] = {'e','x','t','r','a',0}; -static const WCHAR ultraW[] = {'u','l','t','r','a',0}; -static const WCHAR semiW[] = {'s','e','m','i',0}; -static const WCHAR extW[] = {'e','x','t',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}; -static const WCHAR condensedW[] = {'c','o','n','d','e','n','s','e','d',0}; -static const WCHAR expandedW[] = {'e','x','p','a','n','d','e','d',0}; -static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; -static const WCHAR boldW[] = {'B','o','l','d',0}; -static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; -static const WCHAR regularW[] = {'R','e','g','u','l','a','r',0}; -static const WCHAR demiW[] = {'d','e','m','i',0}; -static const WCHAR spaceW[] = {' ',0}; -static const WCHAR enusW[] = {'e','n','-','u','s',0}; - static const struct font_backend_funcs *font_funcs; void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) @@ -3320,7 +3302,7 @@ static void fontstrings_get_en_string(IDWriteLocalizedStrings *strings, WCHAR *b HRESULT hr; buffer[0] = 0; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); if (FAILED(hr) || !exists) return; @@ -3453,31 +3435,23 @@ static BOOL match_pattern_list(struct list *tokens, const struct name_pattern *p static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STYLE style, struct name_token *match) { - static const WCHAR itaW[] = {'i','t','a',0}; - static const WCHAR italW[] = {'i','t','a','l',0}; - static const WCHAR cursiveW[] = {'c','u','r','s','i','v','e',0}; - static const WCHAR kursivW[] = {'k','u','r','s','i','v',0}; - - static const WCHAR inclinedW[] = {'i','n','c','l','i','n','e','d',0}; - static const WCHAR backslantedW[] = {'b','a','c','k','s','l','a','n','t','e','d',0}; - static const WCHAR backslantW[] = {'b','a','c','k','s','l','a','n','t',0}; - static const WCHAR slantedW[] = {'s','l','a','n','t','e','d',0}; - - static const struct name_pattern italic_patterns[] = { - { itaW }, - { italW }, - { italicW }, - { cursiveW }, - { kursivW }, + static const struct name_pattern italic_patterns[] = + { + { L"ita" }, + { L"ital" }, + { L"italic" }, + { L"cursive" }, + { L"kursiv" }, { NULL } }; - static const struct name_pattern oblique_patterns[] = { - { inclinedW }, - { obliqueW }, - { backslantedW }, - { backslantW }, - { slantedW }, + static const struct name_pattern oblique_patterns[] = + { + { L"inclined" }, + { L"oblique" }, + { L"backslanted" }, + { L"backslant" }, + { L"slanted" }, { NULL } }; @@ -3495,69 +3469,70 @@ static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STY static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT_STRETCH stretch, struct name_token *match) { - static const WCHAR compressedW[] = {'c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR extendedW[] = {'e','x','t','e','n','d','e','d',0}; - static const WCHAR compactW[] = {'c','o','m','p','a','c','t',0}; - static const WCHAR narrowW[] = {'n','a','r','r','o','w',0}; - static const WCHAR wideW[] = {'w','i','d','e',0}; - static const WCHAR condW[] = {'c','o','n','d',0}; - - static const struct name_pattern ultracondensed_patterns[] = { - { extraW, compressedW }, - { extW, compressedW }, - { ultraW, compressedW }, - { ultraW, condensedW }, - { ultraW, condW }, + static const struct name_pattern ultracondensed_patterns[] = + { + { L"extra", L"compressed" }, + { L"ext", L"compressed" }, + { L"ultra", L"compressed" }, + { L"ultra", L"condensed" }, + { L"ultra", L"cond" }, { NULL } }; - static const struct name_pattern extracondensed_patterns[] = { - { compressedW }, - { extraW, condensedW }, - { extW, condensedW }, - { extraW, condW }, - { extW, condW }, + static const struct name_pattern extracondensed_patterns[] = + { + { L"compressed" }, + { L"extra", L"condensed" }, + { L"ext", L"condensed" }, + { L"extra", L"cond" }, + { L"ext", L"cond" }, { NULL } }; - static const struct name_pattern semicondensed_patterns[] = { - { narrowW }, - { compactW }, - { semiW, condensedW }, - { semiW, condW }, + static const struct name_pattern semicondensed_patterns[] = + { + { L"narrow" }, + { L"compact" }, + { L"semi", L"condensed" }, + { L"semi", L"cond" }, { NULL } }; - static const struct name_pattern semiexpanded_patterns[] = { - { wideW }, - { semiW, expandedW }, - { semiW, extendedW }, + static const struct name_pattern semiexpanded_patterns[] = + { + { L"wide" }, + { L"semi", L"expanded" }, + { L"semi", L"extended" }, { NULL } }; - static const struct name_pattern extraexpanded_patterns[] = { - { extraW, expandedW }, - { extW, expandedW }, - { extraW, extendedW }, - { extW, extendedW }, + static const struct name_pattern extraexpanded_patterns[] = + { + { L"extra", L"expanded" }, + { L"ext", L"expanded" }, + { L"extra", L"extended" }, + { L"ext", L"extended" }, { NULL } }; - static const struct name_pattern ultraexpanded_patterns[] = { - { ultraW, expandedW }, - { ultraW, extendedW }, + static const struct name_pattern ultraexpanded_patterns[] = + { + { L"ultra", L"expanded" }, + { L"ultra", L"extended" }, { NULL } }; - static const struct name_pattern condensed_patterns[] = { - { condensedW }, - { condW }, + static const struct name_pattern condensed_patterns[] = + { + { L"condensed" }, + { L"cond" }, { NULL } }; - static const struct name_pattern expanded_patterns[] = { - { expandedW }, - { extendedW }, + static const struct name_pattern expanded_patterns[] = + { + { L"expanded" }, + { L"extended" }, { NULL } }; @@ -3591,82 +3566,92 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_WEIGHT weight, struct name_token *match) { - static const WCHAR heavyW[] = {'h','e','a','v','y',0}; - static const WCHAR nordW[] = {'n','o','r','d',0}; - - static const struct name_pattern thin_patterns[] = { - { extraW, thinW }, - { extW, thinW }, - { ultraW, thinW }, + static const struct name_pattern thin_patterns[] = + { + { L"extra", L"thin" }, + { L"ext", L"thin" }, + { L"ultra", L"thin" }, { NULL } }; - static const struct name_pattern extralight_patterns[] = { - { extraW, lightW }, - { extW, lightW }, - { ultraW, lightW }, + static const struct name_pattern extralight_patterns[] = + { + { L"extra", L"light" }, + { L"ext", L"light" }, + { L"ultra", L"light" }, { NULL } }; - static const struct name_pattern semilight_patterns[] = { - { semiW, lightW }, + static const struct name_pattern semilight_patterns[] = + { + { L"semi", L"light" }, { NULL } }; - static const struct name_pattern demibold_patterns[] = { - { semiW, boldW }, - { demiW, boldW }, + static const struct name_pattern demibold_patterns[] = + { + { L"semi", L"bold" }, + { L"demi", L"bold" }, { NULL } }; - static const struct name_pattern extrabold_patterns[] = { - { extraW, boldW }, - { extW, boldW }, - { ultraW, boldW }, + static const struct name_pattern extrabold_patterns[] = + { + { L"extra", L"bold" }, + { L"ext", L"bold" }, + { L"ultra", L"bold" }, { NULL } }; - static const struct name_pattern extrablack_patterns[] = { - { extraW, blackW }, - { extW, blackW }, - { ultraW, blackW }, + static const struct name_pattern extrablack_patterns[] = + { + { L"extra", L"black" }, + { L"ext", L"black" }, + { L"ultra", L"black" }, { NULL } }; - static const struct name_pattern bold_patterns[] = { - { boldW }, + static const struct name_pattern bold_patterns[] = + { + { L"bold" }, { NULL } }; - static const struct name_pattern thin2_patterns[] = { - { thinW }, + static const struct name_pattern thin2_patterns[] = + { + { L"thin" }, { NULL } }; - static const struct name_pattern light_patterns[] = { - { lightW }, + static const struct name_pattern light_patterns[] = + { + { L"light" }, { NULL } }; - static const struct name_pattern medium_patterns[] = { - { mediumW }, + static const struct name_pattern medium_patterns[] = + { + { L"medium" }, { NULL } }; - static const struct name_pattern black_patterns[] = { - { blackW }, - { heavyW }, - { nordW }, + static const struct name_pattern black_patterns[] = + { + { L"black" }, + { L"heavy" }, + { L"nord" }, { NULL } }; - static const struct name_pattern demibold2_patterns[] = { - { demiW }, + static const struct name_pattern demibold2_patterns[] = + { + { L"demi" }, { NULL } }; - static const struct name_pattern extrabold2_patterns[] = { - { ultraW }, + static const struct name_pattern extrabold2_patterns[] = + { + { L"ultra" }, { NULL } }; @@ -3742,31 +3727,22 @@ static int __cdecl compare_knownweights(const void *a, const void* b) static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { - static const WCHAR extralightW[] = {'E','x','t','r','a',' ','L','i','g','h','t',0}; - static const WCHAR semilightW[] = {'S','e','m','i',' ','L','i','g','h','t',0}; - 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[] = { - { thinW, DWRITE_FONT_WEIGHT_THIN }, - { extralightW, DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, - { lightW, DWRITE_FONT_WEIGHT_LIGHT }, - { semilightW, DWRITE_FONT_WEIGHT_SEMI_LIGHT }, - { mediumW, DWRITE_FONT_WEIGHT_MEDIUM }, - { demiboldW, DWRITE_FONT_WEIGHT_DEMI_BOLD }, - { boldW, DWRITE_FONT_WEIGHT_BOLD }, - { extraboldW, DWRITE_FONT_WEIGHT_EXTRA_BOLD }, - { blackW, DWRITE_FONT_WEIGHT_BLACK }, - { extrablackW, DWRITE_FONT_WEIGHT_EXTRA_BLACK } + static const struct knownweight_entry knownweights[] = + { + { L"Thin", DWRITE_FONT_WEIGHT_THIN }, + { L"Extra Light", DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, + { L"Light", DWRITE_FONT_WEIGHT_LIGHT }, + { L"Semi Light", DWRITE_FONT_WEIGHT_SEMI_LIGHT }, + { L"Medium", DWRITE_FONT_WEIGHT_MEDIUM }, + { L"Demi Bold", DWRITE_FONT_WEIGHT_DEMI_BOLD }, + { L"Bold", DWRITE_FONT_WEIGHT_BOLD }, + { L"Extra Bold", DWRITE_FONT_WEIGHT_EXTRA_BOLD }, + { L"Black", DWRITE_FONT_WEIGHT_BLACK }, + { L"Extra Black", DWRITE_FONT_WEIGHT_EXTRA_BLACK } }; + const struct knownweight_entry *ptr; - ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(knownweights[0]), + ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(*knownweights), compare_knownweights); if (!ptr) { nameW[0] = 0; @@ -3786,18 +3762,13 @@ static inline void font_name_token_to_str(const struct name_token *name, WCHAR * /* Modifies facenameW string, and returns pointer to regular term that was removed */ static const WCHAR *facename_remove_regular_term(WCHAR *facenameW, INT len) { - static const WCHAR bookW[] = {'B','o','o','k',0}; - static const WCHAR normalW[] = {'N','o','r','m','a','l',0}; - static const WCHAR regularW[] = {'R','e','g','u','l','a','r',0}; - static const WCHAR romanW[] = {'R','o','m','a','n',0}; - static const WCHAR uprightW[] = {'U','p','r','i','g','h','t',0}; - - static const WCHAR *regular_patterns[] = { - bookW, - normalW, - regularW, - romanW, - uprightW, + static const WCHAR *regular_patterns[] = + { + L"Book", + L"Normal", + L"Regular", + L"Roman", + L"Upright", NULL }; @@ -3902,7 +3873,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* append face name to family name, FIXME check if face name is a substring of family name */ if (*facenameW) { - wcscat(familynameW, spaceW); + wcscat(familynameW, L" "); wcscat(familynameW, facenameW); } @@ -3968,10 +3939,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA } /* use Wnnn format as a fallback in case weight is not one of known values */ else - { - static const WCHAR fmtW[] = {'W','%','d',0}; - swprintf(weightW, ARRAY_SIZE(weightW), fmtW, font->weight); - } + swprintf(weightW, ARRAY_SIZE(weightW), L"W%d", font->weight); /* resolved stretch name */ if (stretch_name.ptr) @@ -3980,25 +3948,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA else if (font->stretch == DWRITE_FONT_STRETCH_NORMAL) stretchW[0] = 0; /* use predefined stretch names */ - else { - static const WCHAR ultracondensedW[] = {'U','l','t','r','a',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR extracondensedW[] = {'E','x','t','r','a',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR semicondensedW[] = {'S','e','m','i',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR semiexpandedW[] = {'S','e','m','i',' ','E','x','p','a','n','d','e','d',0}; - static const WCHAR extraexpandedW[] = {'E','x','t','r','a',' ','E','x','p','a','n','d','e','d',0}; - static const WCHAR ultraexpandedW[] = {'U','l','t','r','a',' ','E','x','p','a','n','d','e','d',0}; - - static const WCHAR *stretchnamesW[] = { + else + { + static const WCHAR *stretchnamesW[] = + { NULL, /* DWRITE_FONT_STRETCH_UNDEFINED */ - ultracondensedW, - extracondensedW, - condensedW, - semicondensedW, + L"Ultra Condensed", + L"Extra Condensed", + L"Condensed", + L"Semi Condensed", NULL, /* DWRITE_FONT_STRETCH_NORMAL */ - semiexpandedW, - expandedW, - extraexpandedW, - ultraexpandedW + L"Semi Expanded", + L"Expanded", + L"Extra Expanded", + L"Ultra Expanded" }; wcscpy(stretchW, stretchnamesW[font->stretch]); } @@ -4009,16 +3972,12 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA else if (font->style == DWRITE_FONT_STYLE_NORMAL) styleW[0] = 0; /* use predefined names */ - else { - if (font->style == DWRITE_FONT_STYLE_ITALIC) - wcscpy(styleW, italicW); - else - wcscpy(styleW, obliqueW); - } + else + wcscpy(styleW, font->style == DWRITE_FONT_STYLE_ITALIC ? L"Italic" : L"Oblique"); /* use Regular match if it was found initially */ if (!*weightW && !*stretchW && !*styleW) - wcscpy(faceW, regular_ptr ? regular_ptr : regularW); + wcscpy(faceW, regular_ptr ? regular_ptr : L"Regular"); else { faceW[0] = 0; @@ -4027,13 +3986,13 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA if (*weightW) { - if (*faceW) wcscat(faceW, spaceW); + if (*faceW) wcscat(faceW, L" "); wcscat(faceW, weightW); } if (*styleW) { - if (*faceW) wcscat(faceW, spaceW); + if (*faceW) wcscat(faceW, L" "); wcscat(faceW, styleW); } } @@ -4143,7 +4102,7 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI IDWriteLocalizedStrings_AddRef(data->family_names); create_localizedstrings(&data->names); - add_localizedstring(data->names, enusW, facenameW); + add_localizedstring(data->names, L"en-us", facenameW); init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); @@ -4196,19 +4155,21 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa } } - if (weight >= DWRITE_FONT_WEIGHT_SEMI_LIGHT && weight <= 550) { - static const struct name_pattern weightsim_patterns[] = { - { extraW, lightW }, - { extW, lightW }, - { ultraW, lightW }, - { semiW, lightW }, - { semiW, boldW }, - { demiW, boldW }, - { boldW }, - { thinW }, - { lightW }, - { mediumW }, - { demiW }, + if (weight >= DWRITE_FONT_WEIGHT_SEMI_LIGHT && weight <= 550) + { + static const struct name_pattern weightsim_patterns[] = + { + { L"extra", L"light" }, + { L"ext", L"light" }, + { L"ultra", L"light" }, + { L"semi", L"light" }, + { L"semi", L"bold" }, + { L"demi", L"bold" }, + { L"bold" }, + { L"thin" }, + { L"light" }, + { L"medium" }, + { L"demi" }, { NULL } }; @@ -4229,8 +4190,8 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa fontname_tokens_to_str(&tokens, facenameW); /* Bold suffix for new name */ - if (*facenameW) wcscat(facenameW, spaceW); - wcscat(facenameW, boldW); + if (*facenameW) wcscat(facenameW, L" "); + wcscat(facenameW, L"Bold"); if (init_font_data_from_font(family->fonts[heaviest], DWRITE_FONT_SIMULATIONS_BOLD, facenameW, &boldface) == S_OK) { boldface->bold_sim_tested = 1; @@ -4295,8 +4256,8 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data fontstrings_get_en_string(family->fonts[regular]->names, facenameW, ARRAY_SIZE(facenameW)); facename_remove_regular_term(facenameW, -1); - if (*facenameW) wcscat(facenameW, spaceW); - wcscat(facenameW, obliqueW); + if (*facenameW) wcscat(facenameW, L" "); + wcscat(facenameW, L"Oblique"); if (init_font_data_from_font(family->fonts[regular], DWRITE_FONT_SIMULATIONS_OBLIQUE, facenameW, &obliqueface) == S_OK) { obliqueface->oblique_sim_tested = 1; @@ -4323,7 +4284,7 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect return FALSE; /* add a new family with target name, reuse font data from replacement */ - add_localizedstring(strings, enusW, target_name); + add_localizedstring(strings, L"en-us", target_name); hr = init_fontfamily_data(strings, &target); if (hr == S_OK) { struct dwrite_fontfamily_data *replacement = collection->family_data[i]; @@ -4612,11 +4573,10 @@ static HRESULT create_local_file_reference(IDWriteFactory7 *factory, const WCHAR /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ if (!wcschr(filename, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR fullpathW[MAX_PATH]; GetWindowsDirectoryW(fullpathW, ARRAY_SIZE(fullpathW)); - wcscat(fullpathW, fontsW); + wcscat(fullpathW, L"\\fonts\\"); wcscat(fullpathW, filename); hr = IDWriteFactory7_CreateFontFileReference(factory, fullpathW, NULL, file); @@ -4707,11 +4667,6 @@ static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWriteFontFileEnumerator **ret) { struct system_fontfile_enumerator *enumerator; - static const WCHAR fontslistW[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'F','o','n','t','s',0 - }; *ret = NULL; @@ -4732,7 +4687,8 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWri IDWriteFactory7_AddRef(factory); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, fontslistW, 0, GENERIC_READ, &enumerator->hkey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", 0, + GENERIC_READ, &enumerator->hkey)) { ERR("failed to open fonts list key\n"); IDWriteFactory7_Release(factory); @@ -4766,8 +4722,6 @@ HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollectio static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrite_fontcollection *collection, const WCHAR *keynameW, const WCHAR *pathW) { - static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0}; - static const WCHAR emptyW[] = {0}; struct dwrite_fontfamily_data *family_data; IDWriteLocalizedStrings *names; DWRITE_FONT_FACE_TYPE face_type; @@ -4802,10 +4756,10 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit /* Family names are added for non-specific locale, represented with empty string. Default family appears with empty family name. */ create_localizedstrings(&names); - if (!wcsicmp(keynameW, defaultfontW)) - add_localizedstring(names, emptyW, emptyW); + if (!wcsicmp(keynameW, L"SystemDefaultEUDCFont")) + add_localizedstring(names, L"", L""); else - add_localizedstring(names, emptyW, keynameW); + add_localizedstring(names, L"", keynameW); hr = init_fontfamily_data(names, &family_data); IDWriteLocalizedStrings_Release(names); @@ -4850,9 +4804,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **ret) { - static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; struct dwrite_fontcollection *collection; - static const WCHAR emptyW[] = {0}; WCHAR eudckeypathW[16]; HKEY eudckey; DWORD index; @@ -4879,7 +4831,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 IDWriteFactory7_AddRef(factory); /* return empty collection if EUDC fonts are not configured */ - swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), eudckeyfmtW, GetACP()); + swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), L"EUDC\\%u", GetACP()); if (RegOpenKeyExW(HKEY_CURRENT_USER, eudckeypathW, 0, GENERIC_READ, &eudckey)) return S_OK; @@ -4903,11 +4855,11 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 /* try to add global default if not defined for specific codepage */ exists = FALSE; - hr = IDWriteFontCollection3_FindFamilyName(&collection->IDWriteFontCollection3_iface, emptyW, + hr = IDWriteFontCollection3_FindFamilyName(&collection->IDWriteFontCollection3_iface, L"", &index, &exists); - if (FAILED(hr) || !exists) { - static const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; - hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); + if (FAILED(hr) || !exists) + { + hr = eudc_collection_add_family(factory, collection, L"", L"EUDC.TTE"); if (hr != S_OK) WARN("failed to add global default EUDC font, 0x%08x\n", hr); } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 274e8be91b3..825e323b468 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -531,13 +531,12 @@ HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedS void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); UINT32 i; for (i = 0; i < strings->count; i++) { - if (!wcsicmp(strings->data[i].locale, enusW)) + if (!wcsicmp(strings->data[i].locale, L"en-US")) { heap_free(strings->data[i].string); strings->data[i].string = heap_strdupW(string); @@ -1573,12 +1572,11 @@ static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) { if (!wcschr(value, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR *ptrW; ptrW = heap_alloc((MAX_PATH + wcslen(value)) * sizeof(WCHAR)); GetWindowsDirectoryW(ptrW, MAX_PATH); - wcscat(ptrW, fontsW); + wcscat(ptrW, L"\\fonts\\"); wcscat(ptrW, value); heap_free(value); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 53c0400c25f..717550acf38 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2252,9 +2252,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT lang_id, WCHAR *locale, USHORT locale_len) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; - - switch (platform) { + switch (platform) + { case OPENTYPE_PLATFORM_MAC: { const char *locale_name = NULL; @@ -2269,18 +2268,18 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la if (locale_name) MultiByteToWideChar(CP_ACP, 0, name_mac_langid_to_locale[lang_id], -1, locale, locale_len); else - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); break; } case OPENTYPE_PLATFORM_WIN: if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, locale_len, 0)) { FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); } break; case OPENTYPE_PLATFORM_UNICODE: - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); break; default: FIXME("unknown platform %d\n", platform); @@ -2301,7 +2300,6 @@ static BOOL opentype_is_english_namerecord(const struct dwrite_fonttable *table, static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, unsigned int idx, IDWriteLocalizedStrings *strings) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; USHORT lang_id, length, offset, encoding, platform; const struct name_header *header = (const struct name_header *)table->data; const struct name_record *record; @@ -2350,7 +2348,7 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns add_localizedstring(strings, locale, name_string); heap_free(name_string); - ret = !wcscmp(locale, enusW); + ret = !wcscmp(locale, L"en-US"); } else FIXME("handle NAME format 1\n"); @@ -2443,14 +2441,13 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) { - static const WCHAR delimW[] = {',',' ',0}; WCHAR *ret; if (!str) str = *ctx; - while (*str && wcschr(delimW, *str)) str++; + while (*str && wcschr(L", ", *str)) str++; if (!*str) return NULL; ret = str++; - while (*str && !wcschr(delimW, *str)) str++; + while (*str && !wcschr(L", ", *str)) str++; if (*str) *str++ = 0; *ctx = str; @@ -2460,7 +2457,6 @@ static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *stream_desc, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **ret) { - static const WCHAR emptyW[] = { 0 }; const struct meta_data_map *maps; IDWriteLocalizedStrings *strings; struct dwrite_fonttable meta; @@ -2528,7 +2524,7 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc while (token) { - add_localizedstring(strings, emptyW, token); + add_localizedstring(strings, L"", token); token = meta_get_lng_name(NULL, &ctx); } @@ -2632,7 +2628,6 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * *lfname = 0; if (SUCCEEDED(opentype_get_font_strings_from_id(&name, OPENTYPE_STRING_FAMILY_NAME, &lfnames))) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; UINT32 index; BOOL exists; @@ -2642,7 +2637,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) - IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); + IDWriteLocalizedStrings_FindLocaleName(lfnames, L"en-us", &index, &exists); if (exists) { UINT32 length = 0; -- 2.30.2

1 0

[PATCH v3] gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc.
by Huw Davies 31 Mar '21

31 Mar '21

From: Zhiyi Zhang <zzhang(a)codeweavers.com> When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n"); -- 2.23.0

2 1

[PATCH v2] gdi32: Avoid crash when calling EMFDRV_ModifyWorldTransform() with a NULL xform parameter.
by Zhiyi Zhang 31 Mar '21

31 Mar '21

When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 202843. Check the mode parameter in EMFDRV_ModifyWorldTransform(). dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n"); -- 2.27.0

2 1

[PATCH 1/2] ole32/tests: Add a test for custom ILockBytes on HGlobal implementation.
by Dmitry Timoshkov 31 Mar '21

31 Mar '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/tests/storage32.c | 164 +++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eea78c6d3fe..da2e411eea4 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3876,6 +3876,9 @@ static void test_custom_lockbytes(void) hr = IStorage_Commit(stg, 0); + ok(lockbytes->contents != NULL, "lockbytes->contents should not be NULL\n"); + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + IStorage_Release(stg); ok(!lockbytes->lock_called, "unexpected call to LockRegion\n"); @@ -3904,6 +3907,166 @@ static void test_custom_lockbytes(void) DeleteTestLockBytes(lockbytes); } +struct byte_array_t +{ + ILockBytes ILockBytes_iface; + ILockBytes *lock_bytes; + HGLOBAL mem; + LONG ref; +}; + +static inline struct byte_array_t *byte_array_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, struct byte_array_t, ILockBytes_iface); +} + +static HRESULT WINAPI byte_array_QueryInterface(ILockBytes *iface, REFIID iid, void **ppv) +{ + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_ILockBytes, iid)) + { + ILockBytes_AddRef(iface); + *ppv = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI byte_array_AddRef(ILockBytes *iface) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI byte_array_Release(ILockBytes *iface) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) + { + ILockBytes_Release(This->lock_bytes); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI byte_array_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_ReadAt(This->lock_bytes, ulOffset, pv, cb, pcbRead); +} + +static HRESULT WINAPI byte_array_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_WriteAt(This->lock_bytes, ulOffset, pv, cb, pcbWritten); +} + +static HRESULT WINAPI byte_array_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI byte_array_SetSize(ILockBytes *iface, ULARGE_INTEGER cb) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_SetSize(This->lock_bytes, cb); +} + +static HRESULT WINAPI byte_array_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_LockRegion(This->lock_bytes, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI byte_array_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_UnlockRegion(This->lock_bytes, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI byte_array_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_Stat(This->lock_bytes, pstatstg, grfStatFlag); +} + +static const ILockBytesVtbl byte_array_Vtbl = +{ + byte_array_QueryInterface, + byte_array_AddRef, + byte_array_Release, + byte_array_ReadAt, + byte_array_WriteAt, + byte_array_Flush, + byte_array_SetSize, + byte_array_LockRegion, + byte_array_UnlockRegion, + byte_array_Stat +}; + +static struct byte_array_t *create_byte_array(void) +{ + struct byte_array_t *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (This) + { + HRESULT hr; + + This->ref = 1; + This->ILockBytes_iface.lpVtbl = &byte_array_Vtbl; + This->mem = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 1024); + hr = CreateILockBytesOnHGlobal(This->mem, TRUE, &This->lock_bytes); + ok(hr == S_OK, "CreateILockBytesOnHGlobal error %#x\n", hr); + } + return This; +} + +static void test_custom_lockbytes_on_hglobal(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + struct byte_array_t *This; + HRESULT hr; + IStorage *stg; + IStream *stm; + DWORD *p; + + This = create_byte_array(); + + hr = StgCreateDocfileOnILockBytes(&This->ILockBytes_iface, STGM_CREATE | STGM_READWRITE | STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE, 0, &stg); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(hr == S_OK, "got %#x\n", hr); + + IStream_Write(stm, "Hello World!", 12, NULL); + IStream_Release(stm); + + p = GlobalLock(This->mem); +todo_wine + ok(*p == 0, "got %#x\n", *p); + memset(p, 0, 512); + GlobalUnlock(This->mem); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "got %#x\n", hr); + + IStorage_Release(stg); + + p = GlobalLock(This->mem); +todo_wine + ok(*p == 0xe011cfd0, "got %#x\n", *p); + GlobalUnlock(This->mem); + + ILockBytes_Release(&This->ILockBytes_iface); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3953,4 +4116,5 @@ START_TEST(storage32) test_transacted_shared(); test_overwrite(); test_custom_lockbytes(); + test_custom_lockbytes_on_hglobal(); } -- 2.30.2

2 2

[PATCH 3/4] dsound/tests: Use nameless unions.
by Jacek Caban 30 Mar '21

30 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/dsound8.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

2 1

[PATCH 2/4] dsound: Use nameless unions.
by Jacek Caban 30 Mar '21

30 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dsound/Makefile.in | 1 - dlls/dsound/dsound_main.c | 6 +++--- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-)

2 1

[PATCH 1/2] ntdll/tests: Add committed / reserved thread stack sizes tests.
by Rémi Bernon 30 Mar '21

30 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not sure at all about the layout of things in PATCH 2, or the safe stack size to clear, but the idea is to avoid touching all the pages. Dragon Quest Builder 2 uses a default stack reserve size of 2G, and it quickly exhaust memory, especially with all the internal threads being created. I also have some draft implementation of growing stacks on page fault instead, but I figured it was going to be a pain for debugging with all the additional signals being received. Also is seems like that some unix libraries are reserving stack pages very far away from the current stack pointer, and it overflows the usual number of guard pages. We would then have to grow stack on uncommitted page faults too, or to mark all reserved pages as page guard (to the contrary to what the tests are showing). dlls/ntdll/tests/virtual.c | 264 +++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 546a7d83bbd..112be80c01e 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -237,14 +237,266 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } +struct test_stack_size_thread_args +{ + DWORD expect_committed; + DWORD expect_reserved; +}; + +static void force_stack_grow(void) +{ + volatile int buffer[0x2000]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} + +#ifdef _WIN64 +static void force_stack_grow_small(void) +{ + volatile int buffer[0x400]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} +#endif + +static DWORD WINAPI test_stack_size_thread(void *ptr) +{ + struct test_stack_size_thread_args *args = ptr; + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS status; + SIZE_T size, guard_size; + DWORD committed, reserved; + void *addr; +#ifdef _WIN64 + DWORD prot; + void *tmp; +#endif + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == args->expect_committed || broken(committed == 0x1000), "unexpected stack committed size %x, expected %x\n", committed, args->expect_committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == 0x9000, "unexpected stack committed size %x, expected 9000\n", committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + + /* reserved area shrinks whenever stack grows */ + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + guard_size = reserved - committed - mbi.RegionSize; + ok( guard_size == 0x1000 || guard_size == 0x2000 || guard_size == 0x3000, "unexpected guard_size %I64x, expected 1000, 2000 or 3000\n", (UINT64)guard_size ); + + /* the commit area is initially preceded by guard pages */ + + addr = (char *)NtCurrentTeb()->DeallocationStack + mbi.RegionSize; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected 3000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE|PAGE_GUARD ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == committed, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)committed ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + +#ifdef _WIN64 + /* setting a guard page shrinks stack automatically */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* guard pages are restored as the stack grows back */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x4000; + tmp = (char *)addr - guard_size - 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x1000, "unexpected stack committed size %x, expected 1000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)guard_size ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + + /* forcing stack limit over guard pages still shrinks the stack on page fault */ + + addr = (char *)tmp + guard_size + 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + NtCurrentTeb()->Tib.StackLimit = (char *)tmp; + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + + /* it works with NtProtectVirtualMemory as well */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* clearing the guard pages doesn't change StackLimit back */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + ok( prot == (PAGE_READWRITE | PAGE_GUARD), "unexpected prot %#x, expected %#x\n", prot, (PAGE_READWRITE | PAGE_GUARD) ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + /* and as we messed with it and it now doesn't fault, it doesn't grow back either */ + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); +#endif + + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + struct test_stack_size_thread_args args; SIZE_T default_commit = nt->OptionalHeader.SizeOfStackCommit; SIZE_T default_reserve = nt->OptionalHeader.SizeOfStackReserve; INITIAL_TEB stack = {0}; unsigned int i; NTSTATUS ret; + HANDLE thread; struct { @@ -298,6 +550,18 @@ static void test_RtlCreateUserStack(void) ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 0, 1, &stack); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + args.expect_committed = 0x4000; + args.expect_reserved = default_reserve; + thread = CreateThread(NULL, 0x3f00, test_stack_size_thread, &args, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; + args.expect_reserved = 0x400000; + thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } static void test_NtMapViewOfSection(void) -- 2.30.2

2 4

Wine 5.0.4 regression: build failure in dlls/qcap/v4l.c
by Gerald Pfeifer 30 Mar '21

30 Mar '21

The following patch (full version at the end) commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 Author: Huw D. M. Davies <huw(a)codeweavers.com> Date: Tue Dec 22 14:26:36 2020 +0000 qcap: Avoid unused variable warning if v4l is absent. broke builds of Wine 5.0.4 where v4l is not present, specifically when the header <linux/videodev2.h> is not available. Configuring with --without-v4l2 does not trigger this; it really is about the presence of the header. The failure mode is In file included from v4l.c:60: v4l.c: In function 'qcap_driver_destroy': ../../include/wine/debug.h:485:56: error: '__wine_dbch___default' undeclared (first use in this function) : v4l.c:602:5: note: in expansion of macro 'ERR' 602 | ERR("v4l absent: shouldn't be called\n"); \ | ^~~ v4l.c:607:5: note: in expansion of macro 'FAIL_WITH_ERR' 607 | FAIL_WITH_ERR; | ^~~~~~~~~~~~~ and the straightforward fix is simply reverting this patch. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254601 has more details. Gerald commit cb8e15a64307e580123b459e4c5964dc7b0d73d9 jAuthor: Huw D. M. Davies <huw(a)codeweavers.com> Date: Tue Dec 22 14:26:36 2020 +0000 qcap: Avoid unused variable warning if v4l is absent. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 73281bf132e1dad9aebf3410b21616727438fb63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0d7e176d3da..e548000187f 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -63,10 +63,9 @@ #include "qcap_main.h" #include "capture.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - #ifdef HAVE_LINUX_VIDEODEV2_H +WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open;

4 3

[PATCH] conhost: Delay window refresh on output update.
by Jacek Caban 30 Mar '21

30 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 8 ++++---- programs/conhost/conhost.h | 2 +- programs/conhost/window.c | 15 +++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-)

1 0

[PATCH 1/4] dxdiagn: Use nameless unions.
by Jacek Caban 30 Mar '21

30 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dxdiagn/Makefile.in | 1 - dlls/dxdiagn/provider.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 1/3] server: Do not cancel process sigkill in kill_process().
by Paul Gofman 30 Mar '21

30 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The series avoids process being left alive on normal process termination if some of the native exit handlers hang. I hope it might fix https://bugs.winehq.org/show_bug.cgi?id=49897 but I am mostly unable to reproduce that here so cannot verify. server/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/process.c b/server/process.c index 7bc096a7b1f..9a647e7eddc 100644 --- a/server/process.c +++ b/server/process.c @@ -946,12 +946,7 @@ void kill_process( struct process *process, int violent_death ) } if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); return; - } if (violent_death) terminate_process( process, NULL, 1 ); else -- 2.30.2

1 2

[PATCH v2] msvcrt/tests: Add a test for wcsncpy().
by Piotr Caban 30 Mar '21

30 Mar '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - test whole output buffer dlls/msvcrt/tests/string.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH 2/2] ole32: Always initialize storage header before writing it.
by Dmitry Timoshkov 30 Mar '21

30 Mar '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/storage32.c | 33 ++++----------------------------- dlls/ole32/tests/storage32.c | 1 - 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3d372af83f5..980b6c8d9f6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3016,20 +3016,10 @@ static void StorageImpl_SaveFileHeader( { BYTE headerBigBlock[HEADER_SIZE]; int index; - HRESULT hr; ULARGE_INTEGER offset; - DWORD bytes_read, bytes_written; + DWORD bytes_written; DWORD major_version, dirsectorcount; - /* - * Get a pointer to the big block of data containing the header. - */ - offset.u.HighPart = 0; - offset.u.LowPart = 0; - hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); - if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) - hr = STG_E_FILENOTFOUND; - if (This->bigBlockSizeBits == 0x9) major_version = 3; else if (This->bigBlockSizeBits == 0xc) @@ -3040,21 +3030,8 @@ static void StorageImpl_SaveFileHeader( major_version = 4; } - /* - * If the block read failed, the file is probably new. - */ - if (FAILED(hr)) - { - /* - * Initialize for all unknown fields. - */ - memset(headerBigBlock, 0, HEADER_SIZE); - - /* - * Initialize the magic number. - */ - memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - } + memset(headerBigBlock, 0, HEADER_SIZE); + memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); /* * Write the information to the header. @@ -3150,9 +3127,7 @@ static void StorageImpl_SaveFileHeader( (This->bigBlockDepotStart[index])); } - /* - * Write the big block back to the file. - */ + offset.QuadPart = 0; StorageImpl_WriteAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_written); } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index da2e411eea4..3dc63ed1b12 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -4060,7 +4060,6 @@ todo_wine IStorage_Release(stg); p = GlobalLock(This->mem); -todo_wine ok(*p == 0xe011cfd0, "got %#x\n", *p); GlobalUnlock(This->mem); -- 2.30.2

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_draw().
by Zebediah Figura 30 Mar '21

30 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 15 ++++++++------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 390a97a64d3..cbc97d3614a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1046,15 +1046,16 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, - unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) { - const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info; - const struct wined3d_state *state = cs->c.state; + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; + const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -1068,7 +1069,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type pri acquire_graphics_pipeline_resources(state, indexed, d3d_info); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e123661cdb..a683f4096f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4445,7 +4445,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; @@ -4459,7 +4459,7 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } @@ -4490,7 +4490,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; @@ -4504,7 +4504,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0205a41c7e..a60c3691c82 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,9 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) DECLSPEC_HIDDEN; @@ -4789,6 +4786,10 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN; -- 2.30.2

4 12

[PATCH v3 1/2] ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Paul Gofman 30 Mar '21

30 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - also remove is_win64 from tests. dlls/ntdll/tests/info.c | 85 +++++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 120 +++++++++++++++++++++++++++++++++++++++ include/winnt.h | 41 +++++++++++++ include/winternl.h | 1 + 4 files changed, 247 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85c523881ef..2c0b95d34c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -21,6 +21,7 @@ #include "ntdll_test.h" #include <winnls.h> #include <stdio.h> +#include "wine/heap.h" static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); @@ -1099,6 +1100,89 @@ static void test_query_logicalprocex(void) HeapFree(GetProcessHeap(), 0, infoex_group); } +static void test_query_cpusetinfo(void) +{ + SYSTEM_CPU_SET_INFORMATION *info; + unsigned int i, cpu_count; + ULONG len, expected_len; + NTSTATUS status; + SYSTEM_INFO si; + HANDLE process; + + if (!pNtQuerySystemInformationEx) + return; + + GetSystemInfo(&si); + cpu_count = si.dwNumberOfProcessors; + expected_len = cpu_count * sizeof(*info); + + process = GetCurrentProcess(); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemCpuSetInformation is not supported\n"); + return; + } + + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len); + ok(status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_INFO_CLASS, + "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len); + + len = 0xdeadbeef; + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + process = NULL; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len); + ok((status == STATUS_INVALID_PARAMETER && len == 0xdeadbeef) + || (status == STATUS_BUFFER_TOO_SMALL && len == expected_len), + "Got unexpected status %#x, length %u.\n", status, len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, + expected_len, &len); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + info = heap_alloc(expected_len); + len = 0; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + for (i = 0; i < cpu_count; ++i) + { + SYSTEM_CPU_SET_INFORMATION *d = &info[i]; + + ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i); + ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i); + ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i); + ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i); + ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n", + d->CpuSet.LogicalProcessorIndex, i); + ok(!d->CpuSet.AllFlags, "Got unexpected AllFlags %#x, i %u.\n", d->CpuSet.AllFlags, i); + } + heap_free(info); +} + static void test_query_firmware(void) { static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -3059,6 +3143,7 @@ START_TEST(info) test_query_regquota(); test_query_logicalproc(); test_query_logicalprocex(); + test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6fa71ddfb91..a9cd686ed62 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1166,6 +1166,98 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION * } #endif +static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info; + BYTE core_index, cache_index, max_cache_level; + unsigned int i, j, count; + BYTE *proc_info_buffer; + DWORD cpu_info_size; + ULONG64 cpu_mask; + NTSTATUS status; + + count = NtCurrentTeb()->Peb->NumberOfProcessors; + + cpu_info_size = 3 * sizeof(*proc_info); + if (!(proc_info_buffer = malloc(cpu_info_size))) + return STATUS_NO_MEMORY; + + if ((status = create_logical_proc_info(NULL, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **)&proc_info_buffer, + &cpu_info_size, RelationAll))) + { + free(proc_info_buffer); + return status; + } + + max_cache_level = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; (BYTE *)proc_info != proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationCache) + { + if (max_cache_level < proc_info->u.Cache.Level) + max_cache_level = proc_info->u.Cache.Level; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + memset(info, 0, count * sizeof(*info)); + + core_index = 0; + cache_index = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; i < count; ++i) + { + info[i].Size = sizeof(*info); + info[i].Type = CpuSetInformation; + info[i].u.CpuSet.Id = 0x100 + i; + info[i].u.CpuSet.LogicalProcessorIndex = i; + } + + for (i = 0; (BYTE *)proc_info != (BYTE *)proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationProcessorCore) + { + if (proc_info->u.Processor.GroupCount != 1) + { + FIXME("Unsupported group count %u.\n", proc_info->u.Processor.GroupCount); + continue; + } + cpu_mask = proc_info->u.Processor.GroupMask[0].Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + { + info[j].u.CpuSet.CoreIndex = core_index; + info[j].u.CpuSet.EfficiencyClass = proc_info->u.Processor.EfficiencyClass; + } + ++core_index; + } + else if (proc_info->Relationship == RelationCache) + { + if (proc_info->u.Cache.Level == max_cache_level) + { + cpu_mask = proc_info->u.Cache.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.LastLevelCacheIndex = cache_index; + } + ++cache_index; + } + else if (proc_info->Relationship == RelationNumaNode) + { + cpu_mask = proc_info->u.NumaNode.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.NumaNodeIndex = proc_info->u.NumaNode.NodeNumber; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + free(proc_info_buffer); + + return STATUS_SUCCESS; +} + #ifdef linux static void copy_smbios_string( char **buffer, char *s, size_t len ) @@ -2651,6 +2743,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + return NtQuerySystemInformationEx(class, NULL, 0, info, size, ret_size); + case SystemRecommendedSharedDataAlignment: { len = sizeof(DWORD); @@ -2773,6 +2868,31 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + { + unsigned int cpu_count = NtCurrentTeb()->Peb->NumberOfProcessors; + PROCESS_BASIC_INFORMATION pbi; + HANDLE process; + + if (!query || query_len < sizeof(HANDLE)) + return STATUS_INVALID_PARAMETER; + + process = *(HANDLE *)query; + if (process && (ret = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL))) + return ret; + + if (size < (len = cpu_count * sizeof(SYSTEM_CPU_SET_INFORMATION))) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + if (!info) + return STATUS_ACCESS_VIOLATION; + + if ((ret = create_cpuset_info(info))) + return ret; + break; + } default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break; diff --git a/include/winnt.h b/include/winnt.h index 0a6027118fe..840966f657b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6726,6 +6726,47 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +typedef enum _CPU_SET_INFORMATION_TYPE +{ + CpuSetInformation, +} CPU_SET_INFORMATION_TYPE, *PCPU_SET_INFORMATION_TYPE; + +typedef struct _SYSTEM_CPU_SET_INFORMATION +{ + DWORD Size; + CPU_SET_INFORMATION_TYPE Type; + union + { + struct + { + DWORD Id; + WORD Group; + BYTE LogicalProcessorIndex; + BYTE CoreIndex; + BYTE LastLevelCacheIndex; + BYTE NumaNodeIndex; + BYTE EfficiencyClass; + union + { + BYTE AllFlags; + struct + { + BYTE Parked : 1; + BYTE Allocated : 1; + BYTE AllocatedToTargetProcess : 1; + BYTE RealTime : 1; + BYTE ReservedFlags : 4; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; + union { + DWORD Reserved; + BYTE SchedulingClass; + }; + DWORD64 AllocationTag; + } CpuSet; + } DUMMYUNIONNAME; +} SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; diff --git a/include/winternl.h b/include/winternl.h index fcdedaec8aa..c8fb7031d91 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemCpuSetInformation = 175, SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

2 2

[PATCH vkd3d v2 1/5] vkd3d-shader: Create a separate variable for uniforms.
by Matteo Bruni 30 Mar '21

30 Mar '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Use struct vkd3d_string_buffer, stop expecting uniforms in function parameters. libs/vkd3d-shader/hlsl_codegen.c | 59 +++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 21bd9ab..e9f3699 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -19,6 +19,49 @@ */ #include "hlsl.h" +#include <stdio.h> + +/* Split uniforms into two variables representing the constant and temp + * registers, and copy the former to the latter, so that writes to uniforms + * work. */ +static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) +{ + struct vkd3d_string_buffer *name; + struct hlsl_ir_assignment *store; + struct hlsl_ir_var *const_var; + struct hlsl_ir_load *load; + + if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) + { + ctx->failed = true; + return; + } + vkd3d_string_buffer_printf(name, "<uniform-%s>", var->name); + if (!(const_var = hlsl_new_var(vkd3d_strdup(name->buffer), var->data_type, var->loc, NULL, var->reg_reservation))) + { + vkd3d_string_buffer_release(&ctx->string_buffers, name); + ctx->failed = true; + return; + } + vkd3d_string_buffer_release(&ctx->string_buffers, name); + list_add_head(&ctx->globals->vars, &const_var->scope_entry); + var->is_uniform = 0; + const_var->is_uniform = 1; + + if (!(load = hlsl_new_var_load(const_var, var->loc))) + { + ctx->failed = true; + return; + } + list_add_head(instrs, &load->node.entry); + + if (!(store = hlsl_new_simple_assignment(var, &load->node))) + { + ctx->failed = true; + return; + } + list_add_after(&load->node.entry, &store->node.entry); +} static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct list *instrs, void *context) @@ -404,7 +447,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->is_input_varying || var->is_uniform) + if (var->is_input_varying) var->first_write = 1; if (var->is_output_varying) var->last_read = UINT_MAX; @@ -418,8 +461,22 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { + struct hlsl_ir_var *var; + list_move_head(entry_func->body, &ctx->static_initializers); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); -- 2.26.3

2 9

[PATCH v2 1/6] reg: Parse 'reg delete' command-line arguments in delete.c
by Hugh McMaster 30 Mar '21

30 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 61 +++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.c | 22 +++++----------- programs/reg/reg.h | 3 +-- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index c102fb4ad53..1f3755b3365 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,8 +18,8 @@ #include "reg.h" -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force) +static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) { HKEY key; @@ -105,3 +105,60 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_SUCCESS); return 0; } + +int reg_delete(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"va")) + { + if (value_all) goto invalid; + value_all = TRUE; + continue; + } + else if (!lstrcmpiW(str, L"ve")) + { + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; + } + } + } + + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + goto invalid; + + return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 88889205ca7..9f2b4b53a04 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -333,11 +333,10 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { - int i, op, op_help, ret; - static const WCHAR switchVAW[] = {'v','a',0}; + int i, op, op_help; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; + BOOL value_empty = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -374,6 +373,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_DELETE) + return reg_delete(argc, argvW); + if (op == REG_EXPORT) return reg_export(argc, argvW); @@ -397,11 +399,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(ptr, switchVAW)) - { - value_all = TRUE; - continue; - } else if (!ptr[0] || ptr[1]) { output_message(STRING_INVALID_CMDLINE); @@ -450,16 +447,11 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } } - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); return 1; } - if (op == REG_ADD) - ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - - return ret; + return reg_add(root, path, value_name, value_empty, type, separator, data, force); } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e1e4804d19d..e4ee13eca6e 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -47,8 +47,7 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force); /* delete.c */ -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force); +int reg_delete(int argc, WCHAR *argvW[]); /* export.c */ int reg_export(int argc, WCHAR *argvW[]); -- 2.31.0

1 5

[PATCH 4/4] riched20: Send EN_UPDATE from TxDraw().
by Huw Davies 30 Mar '21

30 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 3 --- dlls/riched20/tests/txtsrv.c | 12 ++++++++++++ dlls/riched20/txtsrv.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f991b2bebcf..6ab7e4de76b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -140,9 +140,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL ); - ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 45e48a734fa..6834e38b7f5 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -399,6 +399,7 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR } static int en_vscroll_sent; +static int en_update_sent; static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, void *data ) { ITextHostTestImpl *This = impl_from_ITextHost(iface); @@ -409,6 +410,10 @@ static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, en_vscroll_sent++; ok( !data, "got %p\n", data ); break; + case EN_UPDATE: + en_update_sent++; + ok( !data, "got %p\n", data ); + break; } return S_OK; } @@ -1152,6 +1157,13 @@ static void test_notifications( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( en_vscroll_sent == 2, "got %d\n", en_vscroll_sent ); + /* EN_UPDATE is sent by TxDraw() */ + en_update_sent = 0; + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_update_sent == 1, "got %d\n", en_update_sent ); + DestroyWindow( host_impl->window ); ITextServices_Release( txtserv ); ITextHost_Release( host ); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7a979971a0a..80e4682880f 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -193,6 +193,10 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD editor_mark_rewrap_all( services->editor ); wrap_marked_paras_dc( services->editor, dc, FALSE ); } + + if (!services->editor->bEmulateVersion10 || services->editor->nEventMask & ENM_UPDATE) + ITextHost_TxNotify( services->editor->texthost, EN_UPDATE, NULL ); + editor_draw( services->editor, dc, update ); if (!draw) ITextHost_TxReleaseDC( services->editor->texthost, dc ); -- 2.23.0

1 0

[PATCH 3/4] riched20: Add support for ENM_SCROLLEVENTS.
by Huw Davies 30 Mar '21

30 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35650 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a7b91716dab..6d2221e4d69 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1097,7 +1097,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || - ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST)) && + ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) || + ((host->event_mask & ENM_SCROLLEVENTS) && msg >= WM_HSCROLL && msg <= WM_VSCROLL)) && send_msg_filter( host, msg, &wparam, &lparam )) { TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", -- 2.23.0

1 0

[PATCH 2/4] riched20: Remove SendOldNotify() helper.
by Huw Davies 30 Mar '21

30 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 9 ++------- dlls/riched20/editor.h | 1 - dlls/riched20/paint.c | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dccc431f041..fe05d1e7444 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3939,7 +3939,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bHaveFocus = TRUE; create_caret(editor); update_caret(editor); - ME_SendOldNotify(editor, EN_SETFOCUS); + ITextHost_TxNotify( editor->texthost, EN_SETFOCUS, NULL ); if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; @@ -3949,7 +3949,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->wheel_remain = 0; hide_caret(editor); DestroyCaret(); - ME_SendOldNotify(editor, EN_KILLFOCUS); + ITextHost_TxNotify( editor->texthost, EN_KILLFOCUS, NULL ); if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; @@ -4244,11 +4244,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0L; } -void ME_SendOldNotify(ME_TextEditor *editor, int nCode) -{ - ITextHost_TxNotify(editor->texthost, nCode, NULL); -} - /* Fill buffer with srcChars unicode characters from the start cursor. * * buffer: destination buffer diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index fa1e22f9b48..d0274de409d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -274,7 +274,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) DECLSP void ME_DestroyEditor(ME_TextEditor *editor) DECLSPEC_HIDDEN; LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, HRESULT* phresult ) DECLSPEC_HIDDEN; -void ME_SendOldNotify(ME_TextEditor *editor, int nCode) DECLSPEC_HIDDEN; int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) DECLSPEC_HIDDEN; void ME_RTFCharAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 550c3c97045..f991b2bebcf 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -141,7 +141,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify( editor, EN_UPDATE ); + ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL ); ITextHost_TxViewChange(editor->texthost, update_now); @@ -150,7 +150,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) if(editor->nEventMask & ENM_CHANGE) { editor->nEventMask &= ~ENM_CHANGE; - ME_SendOldNotify(editor, EN_CHANGE); + ITextHost_TxNotify( editor->texthost, EN_CHANGE, NULL ); editor->nEventMask |= ENM_CHANGE; } } -- 2.23.0

1 0

[PATCH 1/4] riched20: Add support for EN_[HV]SCROLL notifications.
by Huw Davies 30 Mar '21

30 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 20 +++++------ dlls/riched20/editor.h | 6 ++-- dlls/riched20/paint.c | 47 +++++++++++++------------- dlls/riched20/richole.c | 2 +- dlls/riched20/tests/txtsrv.c | 64 ++++++++++++++++++++++++++++++++++-- 5 files changed, 99 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28b5cb1512d..dccc431f041 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3377,7 +3377,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETSCROLLPOS: { POINT *point = (POINT *)lParam; - ME_ScrollAbs(editor, point->x, point->y); + scroll_abs( editor, point->x, point->y, TRUE ); return 0; } case EM_AUTOURLDETECT: @@ -3986,12 +3986,11 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, switch(LOWORD(wParam)) { case SB_LEFT: - ME_ScrollAbs(editor, 0, 0); + scroll_abs( editor, 0, 0, TRUE ); break; case SB_RIGHT: - ME_ScrollAbs(editor, - editor->horz_si.nMax - (int)editor->horz_si.nPage, - editor->vert_si.nMax - (int)editor->vert_si.nPage); + scroll_abs( editor, editor->horz_si.nMax - (int)editor->horz_si.nPage, + editor->vert_si.nMax - (int)editor->vert_si.nPage, TRUE ); break; case SB_LINELEFT: ME_ScrollLeft(editor, scrollUnit); @@ -4011,7 +4010,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, int pos = HIWORD(wParam); if (editor->horz_si.nMax > 0xffff) pos = MulDiv(pos, editor->horz_si.nMax, 0xffff); - ME_HScrollAbs(editor, pos); + scroll_h_abs( editor, pos, FALSE ); break; } } @@ -4028,12 +4027,11 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, switch(LOWORD(wParam)) { case SB_TOP: - ME_ScrollAbs(editor, 0, 0); + scroll_abs( editor, 0, 0, TRUE ); break; case SB_BOTTOM: - ME_ScrollAbs(editor, - editor->horz_si.nMax - (int)editor->horz_si.nPage, - editor->vert_si.nMax - (int)editor->vert_si.nPage); + scroll_abs( editor, editor->horz_si.nMax - (int)editor->horz_si.nPage, + editor->vert_si.nMax - (int)editor->vert_si.nPage, TRUE ); break; case SB_LINEUP: ME_ScrollUp(editor,lineHeight); @@ -4053,7 +4051,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, int pos = HIWORD(wParam); if (editor->vert_si.nMax > 0xffff) pos = MulDiv(pos, editor->vert_si.nMax, 0xffff); - ME_VScrollAbs(editor, pos); + scroll_v_abs( editor, pos, FALSE ); break; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7a79df83c99..fa1e22f9b48 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -250,9 +250,9 @@ int ME_twips2pointsY(const ME_Context *c, int y) DECLSPEC_HIDDEN; /* scroll functions in paint.c */ -void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) DECLSPEC_HIDDEN; -void ME_HScrollAbs(ME_TextEditor *editor, int x) DECLSPEC_HIDDEN; -void ME_VScrollAbs(ME_TextEditor *editor, int y) DECLSPEC_HIDDEN; +void scroll_abs( ME_TextEditor *editor, int x, int y, BOOL notify ) DECLSPEC_HIDDEN; +void scroll_h_abs( ME_TextEditor *editor, int x, BOOL notify ) DECLSPEC_HIDDEN; +void scroll_v_abs( ME_TextEditor *editor, int y, BOOL notify ) DECLSPEC_HIDDEN; void ME_ScrollUp(ME_TextEditor *editor, int cy) DECLSPEC_HIDDEN; void ME_ScrollDown(ME_TextEditor *editor, int cy) DECLSPEC_HIDDEN; void ME_ScrollLeft(ME_TextEditor *editor, int cx) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ad9f504db8e..550c3c97045 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1070,7 +1070,7 @@ static void enable_show_scrollbar( ME_TextEditor *editor, INT bar, BOOL enable ) ITextHost_TxShowScrollBar( editor->texthost, bar, enable ); } -static void set_scroll_range_pos( ITextHost2 *host, INT bar, SCROLLINFO *info, BOOL set_range ) +static void set_scroll_range_pos( ME_TextEditor *editor, INT bar, SCROLLINFO *info, BOOL set_range, BOOL notify ) { LONG max_pos = info->nMax, pos = info->nPos; @@ -1080,11 +1080,14 @@ static void set_scroll_range_pos( ITextHost2 *host, INT bar, SCROLLINFO *info, B pos = MulDiv( pos, 0xffff, max_pos ); max_pos = 0xffff; } - if (set_range) ITextHost_TxSetScrollRange( host, bar, 0, max_pos, FALSE ); - ITextHost_TxSetScrollPos( host, bar, pos, TRUE ); + if (set_range) ITextHost_TxSetScrollRange( editor->texthost, bar, 0, max_pos, FALSE ); + ITextHost_TxSetScrollPos( editor->texthost, bar, pos, TRUE ); + + if (notify && editor->nEventMask & ENM_SCROLL) + ITextHost_TxNotify( editor->texthost, bar == SB_VERT ? EN_VSCROLL : EN_HSCROLL, NULL ); } -void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) +void scroll_abs( ME_TextEditor *editor, int x, int y, BOOL notify ) { int scrollX = 0, scrollY = 0; @@ -1093,7 +1096,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) x = max(x, editor->horz_si.nMin); scrollX = editor->horz_si.nPos - x; editor->horz_si.nPos = x; - set_scroll_range_pos( editor->texthost, SB_HORZ, &editor->horz_si, FALSE ); + set_scroll_range_pos( editor, SB_HORZ, &editor->horz_si, FALSE, notify ); } if (editor->vert_si.nPos != y) { @@ -1101,7 +1104,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) y = max(y, editor->vert_si.nMin); scrollY = editor->vert_si.nPos - y; editor->vert_si.nPos = y; - set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, FALSE ); + set_scroll_range_pos( editor, SB_VERT, &editor->vert_si, FALSE, notify ); } if (abs(scrollX) > editor->sizeWindow.cx || abs(scrollY) > editor->sizeWindow.cy) @@ -1114,34 +1117,34 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) ME_Repaint(editor); } -void ME_HScrollAbs(ME_TextEditor *editor, int x) +void scroll_h_abs( ME_TextEditor *editor, int x, BOOL notify ) { - ME_ScrollAbs(editor, x, editor->vert_si.nPos); + scroll_abs( editor, x, editor->vert_si.nPos, notify ); } -void ME_VScrollAbs(ME_TextEditor *editor, int y) +void scroll_v_abs( ME_TextEditor *editor, int y, BOOL notify ) { - ME_ScrollAbs(editor, editor->horz_si.nPos, y); + scroll_abs( editor, editor->horz_si.nPos, y, notify ); } void ME_ScrollUp(ME_TextEditor *editor, int cy) { - ME_VScrollAbs(editor, editor->vert_si.nPos - cy); + scroll_v_abs( editor, editor->vert_si.nPos - cy, TRUE ); } void ME_ScrollDown(ME_TextEditor *editor, int cy) { - ME_VScrollAbs(editor, editor->vert_si.nPos + cy); + scroll_v_abs( editor, editor->vert_si.nPos + cy, TRUE ); } void ME_ScrollLeft(ME_TextEditor *editor, int cx) { - ME_HScrollAbs(editor, editor->horz_si.nPos - cx); + scroll_h_abs( editor, editor->horz_si.nPos - cx, TRUE ); } void ME_ScrollRight(ME_TextEditor *editor, int cx) { - ME_HScrollAbs(editor, editor->horz_si.nPos + cx); + scroll_h_abs( editor, editor->horz_si.nPos + cx, TRUE ); } void ME_UpdateScrollBar(ME_TextEditor *editor) @@ -1157,7 +1160,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) enable = editor->nTotalWidth > editor->sizeWindow.cx; if (editor->horz_si.nPos && !enable) { - ME_HScrollAbs(editor, 0); + scroll_h_abs( editor, 0, TRUE ); /* ME_HScrollAbs will call this function, so nothing else needs to be done here. */ return; } @@ -1174,7 +1177,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->horz_si.nPage = editor->sizeWindow.cx; TRACE( "min = %d max = %d page = %d\n", editor->horz_si.nMin, editor->horz_si.nMax, editor->horz_si.nPage ); if ((enable || editor->horz_sb_enabled) && editor->scrollbars & WS_HSCROLL) - set_scroll_range_pos( editor->texthost, SB_HORZ, &editor->horz_si, TRUE ); + set_scroll_range_pos( editor, SB_HORZ, &editor->horz_si, TRUE, TRUE ); } /* Update vertical scrollbar */ @@ -1182,7 +1185,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (editor->vert_si.nPos && !enable) { - ME_VScrollAbs(editor, 0); + scroll_v_abs( editor, 0, TRUE ); /* ME_VScrollAbs will call this function, so nothing else needs to be done here. */ return; } @@ -1199,7 +1202,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->vert_si.nPage = editor->sizeWindow.cy; TRACE( "min = %d max = %d page = %d\n", editor->vert_si.nMin, editor->vert_si.nMax, editor->vert_si.nPage ); if ((enable || editor->vert_sb_enabled) && editor->scrollbars & WS_VSCROLL) - set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, TRUE ); + set_scroll_range_pos( editor, SB_VERT, &editor->vert_si, TRUE, TRUE ); } } @@ -1221,7 +1224,7 @@ void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) if (~editor->scrollbars & ES_AUTOVSCROLL) { - ME_HScrollAbs(editor, x); + scroll_h_abs( editor, x, TRUE ); return; } } @@ -1235,11 +1238,11 @@ void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) yheight = row->nHeight; if (y < editor->vert_si.nPos) - ME_ScrollAbs(editor, x, y); + scroll_abs( editor, x, y, TRUE ); else if (y + yheight > editor->vert_si.nPos + editor->sizeWindow.cy) - ME_ScrollAbs(editor, x, y + yheight - editor->sizeWindow.cy); + scroll_abs( editor, x, y + yheight - editor->sizeWindow.cy, TRUE ); else if (x != editor->horz_si.nPos) - ME_ScrollAbs(editor, x, editor->vert_si.nPos); + scroll_abs( editor, x, editor->vert_si.nPos, TRUE ); } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b652d5a753a..2bb15bb4504 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2743,7 +2743,7 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) FIXME("bStart value %d not handled\n", value); return E_NOTIMPL; } - ME_ScrollAbs(editor, x, y); + scroll_abs( editor, x, y, TRUE ); return S_OK; } diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3cfd5e63753..45e48a734fa 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -398,11 +398,19 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR return S_OK; } -static HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) +static int en_vscroll_sent; +static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, void *data ) { ITextHostTestImpl *This = impl_from_ITextHost(iface); - TRACECALL("Call to TxNotify(%p, iNotify=%d, pv=%p)\n", This, iNotify, pv); - return E_NOTIMPL; + TRACECALL( "Call to TxNotify(%p, code = %#x, data = %p)\n", This, code, data ); + switch (code) + { + case EN_VSCROLL: + en_vscroll_sent++; + ok( !data, "got %p\n", data ); + break; + } + return S_OK; } static HIMC __thiscall ITextHostImpl_TxImmGetContext(ITextHost *iface) @@ -1100,6 +1108,55 @@ todo_wine ITextHost_Release(host); } +static void test_notifications( void ) +{ + ITextServices *txtserv; + ITextHost *host; + LRESULT res; + HRESULT hr; + RECT client = { 0, 0, 100, 100 }; + ITextHostTestImpl *host_impl; + + init_texthost( &txtserv, &host ); + host_impl = impl_from_ITextHost( host ); + + host_impl->scrollbars = WS_VSCROLL; + host_impl->props = TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP; + ITextServices_OnTxPropertyBitsChange( txtserv, TXTBIT_SCROLLBARCHANGE | TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP, host_impl->props ); + + ITextServices_TxSetText( txtserv, lorem ); + + host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 400, 400, 0, 0, 0, NULL ); + host_impl->client_rect = client; + hr = ITextServices_OnTxInPlaceActivate( txtserv, &client ); + ok( hr == S_OK, "got 0x%08x.\n", hr ); + + hr = ITextServices_TxSendMessage( txtserv, EM_SETEVENTMASK, 0, ENM_SCROLL, &res ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* check EN_VSCROLL notification is sent */ + en_vscroll_sent = 0; + hr = ITextServices_TxSendMessage( txtserv, WM_VSCROLL, SB_LINEDOWN, 0, &res ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_vscroll_sent == 1, "got %d\n", en_vscroll_sent ); + + hr = ITextServices_TxSendMessage( txtserv, WM_VSCROLL, SB_BOTTOM, 0, &res ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_vscroll_sent == 2, "got %d\n", en_vscroll_sent ); + + /* but not when the thumb is moved */ + hr = ITextServices_TxSendMessage( txtserv, WM_VSCROLL, MAKEWPARAM( SB_THUMBTRACK, 0 ), 0, &res ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ITextServices_TxSendMessage( txtserv, WM_VSCROLL, MAKEWPARAM( SB_THUMBPOSITION, 0 ), 0, &res ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_vscroll_sent == 2, "got %d\n", en_vscroll_sent ); + + DestroyWindow( host_impl->window ); + ITextServices_Release( txtserv ); + ITextHost_Release( host ); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1132,6 +1189,7 @@ START_TEST( txtsrv ) test_QueryInterface(); test_default_format(); test_TxGetScroll(); + test_notifications(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.23.0

1 0

[PATCH] msvcrt/tests: Add a test for wcsncpy().
by Nikolay Sivov 30 Mar '21

30 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dbc93dc93f5..7bed261d49d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4457,6 +4457,16 @@ static void test__mbbtype(void) } } +static void test_wcsncpy(void) +{ + wchar_t dst[6], *p; + + memset(dst, 0xff, sizeof(dst)); + p = wcsncpy(dst, L"1234567", 6); + ok(p == dst, "Unexpected return value.\n"); + ok(dst[5] == '6', "Unexpected buffer %#x.\n", dst[5]); +} + START_TEST(string) { char mem[100]; @@ -4612,4 +4622,5 @@ START_TEST(string) test___STRINGTOLD(); test_SpecialCasing(); test__mbbtype(); + test_wcsncpy(); } -- 2.30.2

1 0

[PATCH 1/4] dwrite: Move outline dumping helpers.
by Nikolay Sivov 30 Mar '21

30 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 10 +++++----- dlls/dwrite/font.c | 27 --------------------------- dlls/dwrite/freetype.c | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8536e3c6a36..2408251717b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -97,7 +97,11 @@ static inline BOOL dwrite_array_reserve(void **elements, size_t *capacity, size_ if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!*elements) + new_elements = RtlAllocateHeap(GetProcessHeap(), 0, new_capacity * size); + else + new_elements = RtlReAllocateHeap(GetProcessHeap(), 0, *elements, new_capacity * size); + if (!new_elements) return FALSE; *elements = new_elements; @@ -481,10 +485,6 @@ struct dwrite_outline } points; }; -extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) DECLSPEC_HIDDEN; -extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, - unsigned int count) DECLSPEC_HIDDEN; - /* Glyph shaping */ enum SCRIPT_JUSTIFY { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 57c64e4622d..2fd6ad90f1f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -832,33 +832,6 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, table_context); } -int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) -{ - if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, - sizeof(*outline->tags.values))) - { - return 1; - } - - outline->tags.values[outline->tags.count++] = tag; - - return 0; -} - -int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) -{ - if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, - sizeof(*outline->points.values))) - { - return 1; - } - - memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); - outline->points.count += count; - - return 0; -} - static void apply_outline_point_offset(const D2D1_POINT_2F *src, const D2D1_POINT_2F *offset, D2D1_POINT_2F *dst) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index efa0f24d96c..128388c9c86 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -267,6 +267,33 @@ static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) p->y = v->y / 64.0f; } +static int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) +{ + if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, + sizeof(*outline->tags.values))) + { + return 1; + } + + outline->tags.values[outline->tags.count++] = tag; + + return 0; +} + +static int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) +{ + if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, + sizeof(*outline->points.values))) + { + return 1; + } + + memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); + outline->points.count += count; + + return 0; +} + static int decompose_beginfigure(struct decompose_context *ctxt) { D2D1_POINT_2F point; -- 2.30.2

1 3

[PATCH 5/5] dnsapi/tests: Add a query test.
by Hans Leidekker 30 Mar '21

30 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/tests/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 237dfd6ae7c..74669005a33 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -38,6 +38,11 @@ static void test_DnsQuery(void) DNS_RECORDW *rec; DNS_STATUS status; + rec = NULL; + status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + DnsRecordListFree(rec, DnsFreeRecordList); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); -- 2.30.2

3 2

[PATCH v2 1/2] ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Paul Gofman 30 Mar '21

30 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't introduce different behaviour based on is_win64. dlls/ntdll/tests/info.c | 90 ++++++++++++++++++++++++++++- dlls/ntdll/unix/system.c | 120 +++++++++++++++++++++++++++++++++++++++ include/winnt.h | 41 +++++++++++++ include/winternl.h | 1 + 4 files changed, 251 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85c523881ef..f3e4ebdf8bb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -21,6 +21,7 @@ #include "ntdll_test.h" #include <winnls.h> #include <stdio.h> +#include "wine/heap.h" static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); @@ -46,8 +47,8 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); - static BOOL is_wow64; +static const BOOL is_win64 = sizeof(void *) > sizeof(int); /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. @@ -1099,6 +1100,92 @@ static void test_query_logicalprocex(void) HeapFree(GetProcessHeap(), 0, infoex_group); } +static void test_query_cpusetinfo(void) +{ + SYSTEM_CPU_SET_INFORMATION *info; + unsigned int i, cpu_count; + ULONG len, expected_len; + NTSTATUS status; + SYSTEM_INFO si; + HANDLE process; + + if (!pNtQuerySystemInformationEx) + return; + + GetSystemInfo(&si); + cpu_count = si.dwNumberOfProcessors; + expected_len = cpu_count * sizeof(*info); + + process = GetCurrentProcess(); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemCpuSetInformation is not supported\n"); + return; + } + + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len); + todo_wine_if(!is_win64 && status == STATUS_INVALID_PARAMETER) + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_INVALID_INFO_CLASS), + "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len); + + len = 0xdeadbeef; + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + process = NULL; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len); + todo_wine_if(is_win64 && status == STATUS_BUFFER_TOO_SMALL) + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_BUFFER_TOO_SMALL), + "Got unexpected status %#x.\n", status); + todo_wine_if(is_win64 && len == expected_len) + ok(len == (is_win64 ? 0xdeadbeef : expected_len), "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, + expected_len, &len); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + info = heap_alloc(expected_len); + len = 0; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + for (i = 0; i < cpu_count; ++i) + { + SYSTEM_CPU_SET_INFORMATION *d = &info[i]; + + ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i); + ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i); + ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i); + ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i); + ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n", + d->CpuSet.LogicalProcessorIndex, i); + ok(!d->CpuSet.AllFlags, "Got unexpected AllFlags %#x, i %u.\n", d->CpuSet.AllFlags, i); + } + heap_free(info); +} + static void test_query_firmware(void) { static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -3059,6 +3146,7 @@ START_TEST(info) test_query_regquota(); test_query_logicalproc(); test_query_logicalprocex(); + test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6fa71ddfb91..a9cd686ed62 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1166,6 +1166,98 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION * } #endif +static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info; + BYTE core_index, cache_index, max_cache_level; + unsigned int i, j, count; + BYTE *proc_info_buffer; + DWORD cpu_info_size; + ULONG64 cpu_mask; + NTSTATUS status; + + count = NtCurrentTeb()->Peb->NumberOfProcessors; + + cpu_info_size = 3 * sizeof(*proc_info); + if (!(proc_info_buffer = malloc(cpu_info_size))) + return STATUS_NO_MEMORY; + + if ((status = create_logical_proc_info(NULL, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **)&proc_info_buffer, + &cpu_info_size, RelationAll))) + { + free(proc_info_buffer); + return status; + } + + max_cache_level = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; (BYTE *)proc_info != proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationCache) + { + if (max_cache_level < proc_info->u.Cache.Level) + max_cache_level = proc_info->u.Cache.Level; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + memset(info, 0, count * sizeof(*info)); + + core_index = 0; + cache_index = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; i < count; ++i) + { + info[i].Size = sizeof(*info); + info[i].Type = CpuSetInformation; + info[i].u.CpuSet.Id = 0x100 + i; + info[i].u.CpuSet.LogicalProcessorIndex = i; + } + + for (i = 0; (BYTE *)proc_info != (BYTE *)proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationProcessorCore) + { + if (proc_info->u.Processor.GroupCount != 1) + { + FIXME("Unsupported group count %u.\n", proc_info->u.Processor.GroupCount); + continue; + } + cpu_mask = proc_info->u.Processor.GroupMask[0].Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + { + info[j].u.CpuSet.CoreIndex = core_index; + info[j].u.CpuSet.EfficiencyClass = proc_info->u.Processor.EfficiencyClass; + } + ++core_index; + } + else if (proc_info->Relationship == RelationCache) + { + if (proc_info->u.Cache.Level == max_cache_level) + { + cpu_mask = proc_info->u.Cache.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.LastLevelCacheIndex = cache_index; + } + ++cache_index; + } + else if (proc_info->Relationship == RelationNumaNode) + { + cpu_mask = proc_info->u.NumaNode.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.NumaNodeIndex = proc_info->u.NumaNode.NodeNumber; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + free(proc_info_buffer); + + return STATUS_SUCCESS; +} + #ifdef linux static void copy_smbios_string( char **buffer, char *s, size_t len ) @@ -2651,6 +2743,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + return NtQuerySystemInformationEx(class, NULL, 0, info, size, ret_size); + case SystemRecommendedSharedDataAlignment: { len = sizeof(DWORD); @@ -2773,6 +2868,31 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + { + unsigned int cpu_count = NtCurrentTeb()->Peb->NumberOfProcessors; + PROCESS_BASIC_INFORMATION pbi; + HANDLE process; + + if (!query || query_len < sizeof(HANDLE)) + return STATUS_INVALID_PARAMETER; + + process = *(HANDLE *)query; + if (process && (ret = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL))) + return ret; + + if (size < (len = cpu_count * sizeof(SYSTEM_CPU_SET_INFORMATION))) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + if (!info) + return STATUS_ACCESS_VIOLATION; + + if ((ret = create_cpuset_info(info))) + return ret; + break; + } default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break; diff --git a/include/winnt.h b/include/winnt.h index 0a6027118fe..840966f657b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6726,6 +6726,47 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +typedef enum _CPU_SET_INFORMATION_TYPE +{ + CpuSetInformation, +} CPU_SET_INFORMATION_TYPE, *PCPU_SET_INFORMATION_TYPE; + +typedef struct _SYSTEM_CPU_SET_INFORMATION +{ + DWORD Size; + CPU_SET_INFORMATION_TYPE Type; + union + { + struct + { + DWORD Id; + WORD Group; + BYTE LogicalProcessorIndex; + BYTE CoreIndex; + BYTE LastLevelCacheIndex; + BYTE NumaNodeIndex; + BYTE EfficiencyClass; + union + { + BYTE AllFlags; + struct + { + BYTE Parked : 1; + BYTE Allocated : 1; + BYTE AllocatedToTargetProcess : 1; + BYTE RealTime : 1; + BYTE ReservedFlags : 4; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; + union { + DWORD Reserved; + BYTE SchedulingClass; + }; + DWORD64 AllocationTag; + } CpuSet; + } DUMMYUNIONNAME; +} SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; diff --git a/include/winternl.h b/include/winternl.h index fcdedaec8aa..c8fb7031d91 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemCpuSetInformation = 175, SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

3 4

[PATCH 4/5] dnsapi: Build with msvcrt.
by Hans Leidekker 30 Mar '21

30 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/Makefile.in | 2 ++ dlls/dnsapi/name.c | 9 +++------ dlls/dnsapi/record.c | 19 +++++++++---------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index a4f80e83fd4..ae00cf73a9f 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = dnsapi IMPORTS = netapi32 EXTRALIBS = $(RESOLV_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ libresolv.c \ main.c \ diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 4f4ba507cac..a12e58b8684 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -27,7 +27,6 @@ #include "windns.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -77,7 +76,7 @@ BOOL WINAPI DnsNameCompare_W( PCWSTR name1, PCWSTR name2 ) while (name1 <= p) { - if (toupperW( *name1 ) != toupperW( *name2 )) + if (towupper( *name1 ) != towupper( *name2 )) return FALSE; name1++; @@ -141,9 +140,7 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) { PCWSTR p; unsigned int i, j, state = 0; - static const WCHAR invalid[] = { - '{','|','}','~','[','\\',']','^','\'',':',';','<','=','>', - '?','@','!','\"','#','$','%','^','`','(',')','+','/',',',0 }; + static const WCHAR invalid[] = L"{|}~[\\]^':;<=>?@!\"#$%&`()+/,"; TRACE( "(%s, %d)\n", debugstr_w(name), format ); @@ -162,7 +159,7 @@ DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format ) if (j > 62) state |= HAS_LONG_LABEL; - if (strchrW( invalid, *p )) state |= HAS_INVALID; + if (wcschr( invalid, *p )) state |= HAS_INVALID; else if ((unsigned)*p > 127) state |= HAS_EXTENDED; else if (*p == ' ') state |= HAS_SPACE; else if (*p == '_') state |= HAS_UNDERSCORE; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 4697438df57..5a75503d892 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -25,7 +25,6 @@ #include "windns.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -450,8 +449,8 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.MINFO); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + - (strlenW( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.MINFO.pNameMailbox ) + 1) * sizeof(WCHAR) + + (wcslen( dst->Data.MINFO.pNameErrorsMailbox ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_AFSDB: @@ -463,7 +462,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.MX); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.MX.pNameExchange ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_NXT: @@ -473,7 +472,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.NXT); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.NXT.pNameNext ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_CNAME: @@ -490,7 +489,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.PTR); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.PTR.pNameHost ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SIG: @@ -500,7 +499,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SIG); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SIG.pNameSigner ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SOA: @@ -517,8 +516,8 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SOA); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + - (strlenW( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SOA.pNamePrimaryServer ) + 1) * sizeof(WCHAR) + + (wcslen( dst->Data.SOA.pNameAdministrator ) + 1) * sizeof(WCHAR); break; } case DNS_TYPE_SRV: @@ -528,7 +527,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET dst->wDataLength = sizeof(dst->Data.SRV); if (out == DnsCharSetUnicode) dst->wDataLength += - (strlenW( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); + (wcslen( dst->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); break; } default: -- 2.30.2

1 0

[PATCH 3/5] dnsapi: Move libresolv support to a new Unix library.
by Hans Leidekker 30 Mar '21

30 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/Makefile.in | 1 + dlls/dnsapi/dnsapi.h | 19 +- dlls/dnsapi/libresolv.c | 742 ++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/main.c | 20 ++ dlls/dnsapi/name.c | 23 +- dlls/dnsapi/query.c | 582 +------------------------------ dlls/dnsapi/record.c | 66 +--- 7 files changed, 809 insertions(+), 644 deletions(-) create mode 100644 dlls/dnsapi/libresolv.c diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index d1f66723fc6..a4f80e83fd4 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = netapi32 EXTRALIBS = $(RESOLV_LIBS) C_SRCS = \ + libresolv.c \ main.c \ name.c \ query.c \ diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index d0a31ea0981..bcd6a6d5bc3 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include "wine/heap.h" static inline char *strdup_a( const char *src ) @@ -123,4 +119,17 @@ static inline char *strdup_ua( const char *src ) return dst; } -const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; + +extern DNS_STATUS CDECL resolv_get_serverlist( IP4_ARRAY *, DWORD * ) DECLSPEC_HIDDEN; +extern DNS_STATUS CDECL resolv_query( const char *, WORD, DWORD, DNS_RECORDA ** ) DECLSPEC_HIDDEN; +extern DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY * ) DECLSPEC_HIDDEN; + +struct resolv_funcs +{ + DNS_STATUS (CDECL *get_serverlist)( IP4_ARRAY *addrs, DWORD *len ); + DNS_STATUS (CDECL *query)( const char *name, WORD type, DWORD options, DNS_RECORDA **result ); + DNS_STATUS (CDECL *set_serverlist)( const IP4_ARRAY *addrs ); +}; + +extern const struct resolv_funcs *resolv_funcs; diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c new file mode 100644 index 00000000000..ac52147af01 --- /dev/null +++ b/dlls/dnsapi/libresolv.c @@ -0,0 +1,742 @@ +/* + * Unix interface for libresolv + * + * Copyright 2021 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#ifdef HAVE_RESOLV +#include <stdarg.h> +#include <string.h> +#include <stdio.h> +#include <sys/types.h> + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +# include <resolv.h> +#endif +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" + +#include "wine/debug.h" +#include "wine/heap.h" +#include "dnsapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); + +static const char *debugstr_type( unsigned short type ) +{ + const char *str; + + switch (type) + { +#define X(x) case (x): str = #x; break; + X(DNS_TYPE_ZERO) + X(DNS_TYPE_A) + X(DNS_TYPE_NS) + X(DNS_TYPE_MD) + X(DNS_TYPE_MF) + X(DNS_TYPE_CNAME) + X(DNS_TYPE_SOA) + X(DNS_TYPE_MB) + X(DNS_TYPE_MG) + X(DNS_TYPE_MR) + X(DNS_TYPE_NULL) + X(DNS_TYPE_WKS) + X(DNS_TYPE_PTR) + X(DNS_TYPE_HINFO) + X(DNS_TYPE_MINFO) + X(DNS_TYPE_MX) + X(DNS_TYPE_TEXT) + X(DNS_TYPE_RP) + X(DNS_TYPE_AFSDB) + X(DNS_TYPE_X25) + X(DNS_TYPE_ISDN) + X(DNS_TYPE_RT) + X(DNS_TYPE_NSAP) + X(DNS_TYPE_NSAPPTR) + X(DNS_TYPE_SIG) + X(DNS_TYPE_KEY) + X(DNS_TYPE_PX) + X(DNS_TYPE_GPOS) + X(DNS_TYPE_AAAA) + X(DNS_TYPE_LOC) + X(DNS_TYPE_NXT) + X(DNS_TYPE_EID) + X(DNS_TYPE_NIMLOC) + X(DNS_TYPE_SRV) + X(DNS_TYPE_ATMA) + X(DNS_TYPE_NAPTR) + X(DNS_TYPE_KX) + X(DNS_TYPE_CERT) + X(DNS_TYPE_A6) + X(DNS_TYPE_DNAME) + X(DNS_TYPE_SINK) + X(DNS_TYPE_OPT) + X(DNS_TYPE_UINFO) + X(DNS_TYPE_UID) + X(DNS_TYPE_GID) + X(DNS_TYPE_UNSPEC) + X(DNS_TYPE_ADDRS) + X(DNS_TYPE_TKEY) + X(DNS_TYPE_TSIG) + X(DNS_TYPE_IXFR) + X(DNS_TYPE_AXFR) + X(DNS_TYPE_MAILB) + X(DNS_TYPE_MAILA) + X(DNS_TYPE_ANY) + X(DNS_TYPE_WINS) + X(DNS_TYPE_WINSR) +#undef X + default: + return wine_dbg_sprintf( "0x%04x", type ); + } + + return wine_dbg_sprintf( "%s", str ); +} + +static const char *debugstr_section( ns_sect section ) +{ + switch (section) + { + case ns_s_qd: return "Question"; + case ns_s_an: return "Answer"; + case ns_s_ns: return "Authority"; + case ns_s_ar: return "Additional"; + default: + return wine_dbg_sprintf( "0x%02x", section ); + } +} + +/* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* call once per thread on systems that have per-thread _res */ +static void init_resolver( void ) +{ + if (!(_res.options & RES_INIT)) res_init(); +} + +static unsigned long map_options( DWORD options ) +{ + unsigned long ret = 0; + + if (options == DNS_QUERY_STANDARD) + return RES_DEFAULT; + + if (options & DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE) + ret |= RES_IGNTC; + if (options & DNS_QUERY_USE_TCP_ONLY) + ret |= RES_USEVC; + if (options & DNS_QUERY_NO_RECURSION) + ret &= ~RES_RECURSE; + if (options & DNS_QUERY_NO_LOCAL_NAME) + ret &= ~RES_DNSRCH; + if (options & DNS_QUERY_NO_HOSTS_FILE) + ret |= RES_NOALIASES; + if (options & DNS_QUERY_TREAT_AS_FQDN) + ret &= ~RES_DEFNAMES; + + if (options & DNS_QUERY_DONT_RESET_TTL_VALUES) + FIXME( "option DNS_QUERY_DONT_RESET_TTL_VALUES not implemented\n" ); + if (options & DNS_QUERY_RESERVED) + FIXME( "option DNS_QUERY_RESERVED not implemented\n" ); + if (options & DNS_QUERY_WIRE_ONLY) + FIXME( "option DNS_QUERY_WIRE_ONLY not implemented\n" ); + if (options & DNS_QUERY_NO_WIRE_QUERY) + FIXME( "option DNS_QUERY_NO_WIRE_QUERY not implemented\n" ); + if (options & DNS_QUERY_BYPASS_CACHE) + FIXME( "option DNS_QUERY_BYPASS_CACHE not implemented\n" ); + if (options & DNS_QUERY_RETURN_MESSAGE) + FIXME( "option DNS_QUERY_RETURN_MESSAGE not implemented\n" ); + + if (options & DNS_QUERY_NO_NETBT) + TRACE( "netbios query disabled\n" ); + + return ret; +} + +static DNS_STATUS map_error( int error ) +{ + switch (error) + { + case ns_r_noerror: return ERROR_SUCCESS; + case ns_r_formerr: return DNS_ERROR_RCODE_FORMAT_ERROR; + case ns_r_servfail: return DNS_ERROR_RCODE_SERVER_FAILURE; + case ns_r_nxdomain: return DNS_ERROR_RCODE_NAME_ERROR; + case ns_r_notimpl: return DNS_ERROR_RCODE_NOT_IMPLEMENTED; + case ns_r_refused: return DNS_ERROR_RCODE_REFUSED; + case ns_r_yxdomain: return DNS_ERROR_RCODE_YXDOMAIN; + case ns_r_yxrrset: return DNS_ERROR_RCODE_YXRRSET; + case ns_r_nxrrset: return DNS_ERROR_RCODE_NXRRSET; + case ns_r_notauth: return DNS_ERROR_RCODE_NOTAUTH; + case ns_r_notzone: return DNS_ERROR_RCODE_NOTZONE; + default: + FIXME( "unmapped error code: %d\n", error ); + return DNS_ERROR_RCODE_NOT_IMPLEMENTED; + } +} + +static DNS_STATUS map_h_errno( int error ) +{ + switch (error) + { + case NO_DATA: + case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR; + case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE; + case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED; +#ifdef NETDB_INTERNAL + case NETDB_INTERNAL: return DNS_ERROR_RCODE; +#endif + default: + FIXME( "unmapped error code: %d\n", error ); + return DNS_ERROR_RCODE_NOT_IMPLEMENTED; + } +} + +DNS_STATUS CDECL resolv_get_serverlist( IP4_ARRAY *addrs, DWORD *len ) +{ + unsigned int size; + int i; + + init_resolver(); + + size = FIELD_OFFSET(IP4_ARRAY, AddrArray[_res.nscount]); + if (!addrs || *len < size) + { + *len = size; + return ERROR_INSUFFICIENT_BUFFER; + } + + addrs->AddrCount = _res.nscount; + + for (i = 0; i < _res.nscount; i++) + addrs->AddrArray[i] = _res.nsaddr_list[i].sin_addr.s_addr; + + return ERROR_SUCCESS; +} + +DNS_STATUS CDECL resolv_set_serverlist( const IP4_ARRAY *addrs ) +{ + int i; + + init_resolver(); + + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; + if (addrs->AddrCount > MAXNS) + { + WARN( "too many servers: %d only using the first: %d\n", + addrs->AddrCount, MAXNS ); + _res.nscount = MAXNS; + } + else _res.nscount = addrs->AddrCount; + + for (i = 0; i < _res.nscount; i++) + _res.nsaddr_list[i].sin_addr.s_addr = addrs->AddrArray[i]; + + return ERROR_SUCCESS; +} + +static char *dname_from_msg( ns_msg msg, const unsigned char *pos ) +{ + char *str, dname[NS_MAXDNAME] = "."; + + /* returns *compressed* length, ignore it */ + ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); + + if ((str = RtlAllocateHeap( GetProcessHeap(), 0, strlen(dname) + 1 ))) strcpy( str, dname ); + return str; +} + +static char *str_from_rdata( const unsigned char *rdata ) +{ + char *str; + unsigned int len = rdata[0]; + + if ((str = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) + { + memcpy( str, ++rdata, len ); + str[len] = 0; + } + return str; +} + +static unsigned int get_record_size( const ns_rr *rr ) +{ + const unsigned char *pos = rr->rdata; + unsigned int num = 0, size = sizeof(DNS_RECORDA); + + switch (rr->type) + { + case ns_t_key: + { + pos += sizeof(WORD) + sizeof(BYTE) + sizeof(BYTE); + size += rr->rdata + rr->rdlength - pos - 1; + break; + } + case ns_t_sig: + { + pos += sizeof(PCHAR) + sizeof(WORD) + 2 * sizeof(BYTE); + pos += 3 * sizeof(DWORD) + 2 * sizeof(WORD); + size += rr->rdata + rr->rdlength - pos - 1; + break; + } + case ns_t_hinfo: + case ns_t_isdn: + case ns_t_txt: + case ns_t_x25: + { + while (pos[0] && pos < rr->rdata + rr->rdlength) + { + num++; + pos += pos[0] + 1; + } + size += (num - 1) * sizeof(PCHAR); + break; + } + case ns_t_null: + case ns_t_opt: + { + size += rr->rdlength - 1; + break; + } + case ns_t_nxt: + case ns_t_wks: + case 0xff01: /* WINS */ + { + FIXME( "unhandled type: %s\n", debugstr_type( rr->type ) ); + break; + } + default: + break; + } + return size; +} + +static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) +{ + DNS_STATUS ret = ERROR_SUCCESS; + const unsigned char *pos = rr->rdata; + unsigned int i, size; + + switch (rr->type) + { + case ns_t_a: + { + r->Data.A.IpAddress = *(const DWORD *)pos; + *dlen = sizeof(DNS_A_DATA); + break; + } + case ns_t_aaaa: + { + for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) + { + r->Data.AAAA.Ip6Address.IP6Dword[i] = *(const DWORD *)pos; + pos += sizeof(DWORD); + } + + *dlen = sizeof(DNS_AAAA_DATA); + break; + } + case ns_t_key: + { + /* FIXME: byte order? */ + r->Data.KEY.wFlags = *(const WORD *)pos; pos += sizeof(WORD); + r->Data.KEY.chProtocol = *pos++; + r->Data.KEY.chAlgorithm = *pos++; + + size = rr->rdata + rr->rdlength - pos; + + for (i = 0; i < size; i++) + r->Data.KEY.Key[i] = *pos++; + + *dlen = sizeof(DNS_KEY_DATA) + (size - 1) * sizeof(BYTE); + break; + } + case ns_t_rp: + case ns_t_minfo: + { + r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos ); + if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY; + + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + return DNS_ERROR_BAD_PACKET; + + r->Data.MINFO.pNameErrorsMailbox = dname_from_msg( msg, pos ); + if (!r->Data.MINFO.pNameErrorsMailbox) + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.MINFO.pNameMailbox ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + *dlen = sizeof(DNS_MINFO_DATAA); + break; + } + case ns_t_afsdb: + case ns_t_rt: + case ns_t_mx: + { + r->Data.MX.wPreference = ntohs( *(const WORD *)pos ); + r->Data.MX.pNameExchange = dname_from_msg( msg, pos + sizeof(WORD) ); + if (!r->Data.MX.pNameExchange) return ERROR_NOT_ENOUGH_MEMORY; + + *dlen = sizeof(DNS_MX_DATAA); + break; + } + case ns_t_null: + { + r->Data.Null.dwByteCount = rr->rdlength; + memcpy( r->Data.Null.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; + break; + } + case ns_t_opt: + { + r->Data.OPT.wDataLength = rr->rdlength; + r->Data.OPT.wPad = 0; + memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); + + *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; + break; + } + case ns_t_cname: + case ns_t_ns: + case ns_t_mb: + case ns_t_md: + case ns_t_mf: + case ns_t_mg: + case ns_t_mr: + case ns_t_ptr: + { + r->Data.PTR.pNameHost = dname_from_msg( msg, pos ); + if (!r->Data.PTR.pNameHost) return ERROR_NOT_ENOUGH_MEMORY; + + *dlen = sizeof(DNS_PTR_DATAA); + break; + } + case ns_t_sig: + { + r->Data.SIG.pNameSigner = dname_from_msg( msg, pos ); + if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY; + + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + return DNS_ERROR_BAD_PACKET; + + /* FIXME: byte order? */ + r->Data.SIG.wTypeCovered = *(const WORD *)pos; pos += sizeof(WORD); + r->Data.SIG.chAlgorithm = *pos++; + r->Data.SIG.chLabelCount = *pos++; + r->Data.SIG.dwOriginalTtl = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.dwExpiration = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.dwTimeSigned = *(const DWORD *)pos; pos += sizeof(DWORD); + r->Data.SIG.wKeyTag = *(const WORD *)pos; + + size = rr->rdata + rr->rdlength - pos; + + for (i = 0; i < size; i++) + r->Data.SIG.Signature[i] = *pos++; + + *dlen = sizeof(DNS_SIG_DATAA) + (size - 1) * sizeof(BYTE); + break; + } + case ns_t_soa: + { + r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos ); + if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY; + + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + return DNS_ERROR_BAD_PACKET; + + r->Data.SOA.pNameAdministrator = dname_from_msg( msg, pos ); + if (!r->Data.SOA.pNameAdministrator) + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.SOA.pNamePrimaryServer ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + return DNS_ERROR_BAD_PACKET; + + r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwRefresh = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwRetry = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwExpire = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + r->Data.SOA.dwDefaultTtl = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); + + *dlen = sizeof(DNS_SOA_DATAA); + break; + } + case ns_t_srv: + { + r->Data.SRV.wPriority = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); + r->Data.SRV.wWeight = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); + r->Data.SRV.wPort = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); + + r->Data.SRV.pNameTarget = dname_from_msg( msg, pos ); + if (!r->Data.SRV.pNameTarget) return ERROR_NOT_ENOUGH_MEMORY; + + *dlen = sizeof(DNS_SRV_DATAA); + break; + } + case ns_t_hinfo: + case ns_t_isdn: + case ns_t_x25: + case ns_t_txt: + { + i = 0; + while (pos[0] && pos < rr->rdata + rr->rdlength) + { + r->Data.TXT.pStringArray[i] = str_from_rdata( pos ); + if (!r->Data.TXT.pStringArray[i]) + { + while (i > 0) RtlFreeHeap( GetProcessHeap(), 0, r->Data.TXT.pStringArray[--i] ); + return ERROR_NOT_ENOUGH_MEMORY; + } + i++; + pos += pos[0] + 1; + } + r->Data.TXT.dwStringCount = i; + *dlen = sizeof(DNS_TXT_DATAA) + (i - 1) * sizeof(PCHAR); + break; + } + case ns_t_atma: + case ns_t_loc: + case ns_t_nxt: + case ns_t_tsig: + case ns_t_wks: + case 0x00f9: /* TKEY */ + case 0xff01: /* WINS */ + case 0xff02: /* WINSR */ + default: + FIXME( "unhandled type: %s\n", debugstr_type( rr->type ) ); + return DNS_ERROR_RCODE_NOT_IMPLEMENTED; + } + + return ret; +} + +static inline char *heap_strdup( const char *src ) +{ + char *dst; + if (!src) return NULL; + if ((dst = RtlAllocateHeap( GetProcessHeap(), 0, (strlen( src ) + 1) * sizeof(char) ))) strcpy( dst, src ); + return dst; +} + +static DNS_STATUS copy_record( ns_msg msg, ns_sect section, unsigned short num, DNS_RECORDA **recp ) +{ + DNS_STATUS ret; + DNS_RECORDA *record; + WORD dlen; + ns_rr rr; + + if (ns_parserr( &msg, section, num, &rr ) < 0) + return DNS_ERROR_BAD_PACKET; + + if (!(record = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, get_record_size( &rr ) ))) + return ERROR_NOT_ENOUGH_MEMORY; + + if (!(record->pName = heap_strdup( rr.name ))) + { + RtlFreeHeap( GetProcessHeap(), 0, record ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + record->wType = rr.type; + record->Flags.S.Section = section; + record->Flags.S.CharSet = DnsCharSetUtf8; + record->dwTtl = rr.ttl; + + if ((ret = copy_rdata( msg, &rr, record, &dlen ))) + { + RtlFreeHeap( GetProcessHeap(), 0, record->pName ); + RtlFreeHeap( GetProcessHeap(), 0, record ); + return ret; + } + record->wDataLength = dlen; + *recp = record; + + TRACE( "found %s record in %s section\n", debugstr_type( rr.type ), debugstr_section( section ) ); + return ERROR_SUCCESS; +} + +static void free_record_list( DNS_RECORD *list ) +{ + DNS_RECORD *r, *next; + unsigned int i; + + for (r = list; (list = r); r = next) + { + RtlFreeHeap( GetProcessHeap(), 0, r->pName ); + + switch (r->wType) + { + case DNS_TYPE_HINFO: + case DNS_TYPE_ISDN: + case DNS_TYPE_TEXT: + case DNS_TYPE_X25: + { + for (i = 0; i < r->Data.TXT.dwStringCount; i++) + RtlFreeHeap( GetProcessHeap(), 0, r->Data.TXT.pStringArray[i] ); + break; + } + case DNS_TYPE_MINFO: + case DNS_TYPE_RP: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.MINFO.pNameMailbox ); + RtlFreeHeap( GetProcessHeap(), 0, r->Data.MINFO.pNameErrorsMailbox ); + break; + } + case DNS_TYPE_AFSDB: + case DNS_TYPE_RT: + case DNS_TYPE_MX: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.MX.pNameExchange ); + break; + } + case DNS_TYPE_NXT: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.NXT.pNameNext ); + break; + } + case DNS_TYPE_CNAME: + case DNS_TYPE_MB: + case DNS_TYPE_MD: + case DNS_TYPE_MF: + case DNS_TYPE_MG: + case DNS_TYPE_MR: + case DNS_TYPE_NS: + case DNS_TYPE_PTR: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.PTR.pNameHost ); + break; + } + case DNS_TYPE_SIG: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.SIG.pNameSigner ); + break; + } + case DNS_TYPE_SOA: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.SOA.pNamePrimaryServer ); + RtlFreeHeap( GetProcessHeap(), 0, r->Data.SOA.pNameAdministrator ); + break; + } + case DNS_TYPE_SRV: + { + RtlFreeHeap( GetProcessHeap(), 0, r->Data.SRV.pNameTarget ); + break; + } + default: break; + } + + next = r->pNext; + RtlFreeHeap( GetProcessHeap(), 0, r ); + } +} + +#define DNS_MAX_PACKET_SIZE 4096 +DNS_STATUS CDECL resolv_query( const char *name, WORD type, DWORD options, DNS_RECORDA **result ) +{ + DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; + unsigned int i, num; + unsigned char answer[DNS_MAX_PACKET_SIZE]; + ns_sect sections[] = { ns_s_an, ns_s_ar }; + ns_msg msg; + DNS_RECORDA *record = NULL; + DNS_RRSET rrset; + int len; + + DNS_RRSET_INIT( rrset ); + + init_resolver(); + _res.options |= map_options( options ); + + if ((len = res_query( name, ns_c_in, type, answer, sizeof(answer) )) < 0) + { + ret = map_h_errno( h_errno ); + goto exit; + } + + if (ns_initparse( answer, len, &msg ) < 0) + { + ret = DNS_ERROR_BAD_PACKET; + goto exit; + } + +#define RCODE_MASK 0x0f + if ((msg._flags & RCODE_MASK) != ns_r_noerror) + { + ret = map_error( msg._flags & RCODE_MASK ); + goto exit; + } + + for (i = 0; i < ARRAY_SIZE(sections); i++) + { + for (num = 0; num < ns_msg_count( msg, sections[i] ); num++) + { + ret = copy_record( msg, sections[i], num, &record ); + if (ret != ERROR_SUCCESS) goto exit; + + DNS_RRSET_ADD( rrset, (DNS_RECORD *)record ); + } + } + +exit: + DNS_RRSET_TERMINATE( rrset ); + + if (ret != ERROR_SUCCESS) + free_record_list( rrset.pFirstRR ); + else + *result = (DNS_RECORDA *)rrset.pFirstRR; + + return ret; +} + +static const struct resolv_funcs funcs = +{ + resolv_get_serverlist, + resolv_query, + resolv_set_serverlist +}; + +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +{ + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + *(const struct resolv_funcs **)ptr_out = &funcs; + return STATUS_SUCCESS; +} + +#endif /* HAVE_RESOLV */ diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 4ab294c7c07..f83a54d1469 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include "windef.h" +#include "winternl.h" #include "winbase.h" #include "winerror.h" #include "windns.h" @@ -30,6 +31,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); +const struct resolv_funcs *resolv_funcs = NULL; + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE( "(%p,%u,%p)\n", hinst, reason, reserved ); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + if (__wine_init_unix_lib( hinst, reason, NULL, &resolv_funcs )) + ERR( "No libresolv support, expect problems\n" ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + /****************************************************************************** * DnsAcquireContextHandle_A [DNSAPI.@] * diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index 9404200e443..4f4ba507cac 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -3,7 +3,7 @@ * * Copyright (C) 2006 Matthew Kehrer * Copyright (C) 2006 Hans Leidekker - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -19,30 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include <stdarg.h> -#include <sys/types.h> - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -# undef NOERROR -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif - #include "windef.h" #include "winbase.h" #include "winerror.h" #include "winnls.h" #include "windns.h" +#include "wine/debug.h" +#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -81,7 +66,7 @@ BOOL WINAPI DnsNameCompare_W( PCWSTR name1, PCWSTR name2 ) if (!name1 && !name2) return TRUE; if (!name1 || !name2) return FALSE; - + p = name1 + lstrlenW( name1 ) - 1; q = name2 + lstrlenW( name2 ) - 1; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 3bef65e9731..a7ae77148be 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -2,7 +2,7 @@ * DNS support * * Copyright (C) 2006 Hans Leidekker - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - #include <stdarg.h> -#include <string.h> -#include <stdio.h> -#include <sys/types.h> - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif - #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -47,438 +26,11 @@ #include "windns.h" #include "nb30.h" +#include "wine/debug.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -#ifdef HAVE_RESOLV - -/* call res_init() just once because of a bug in Mac OS X 10.4 */ -/* call once per thread on systems that have per-thread _res */ -static void initialise_resolver( void ) -{ - if ((_res.options & RES_INIT) == 0) - res_init(); -} - -static const char *section_to_str( ns_sect section ) -{ - switch (section) - { - case ns_s_qd: return "Question"; - case ns_s_an: return "Answer"; - case ns_s_ns: return "Authority"; - case ns_s_ar: return "Additional"; - default: - { - static char tmp[11]; - FIXME( "unknown section: 0x%02x\n", section ); - sprintf( tmp, "0x%02x", section ); - return tmp; - } - } -} - -static unsigned long map_options( DWORD options ) -{ - unsigned long ret = 0; - - if (options == DNS_QUERY_STANDARD) - return RES_DEFAULT; - - if (options & DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE) - ret |= RES_IGNTC; - if (options & DNS_QUERY_USE_TCP_ONLY) - ret |= RES_USEVC; - if (options & DNS_QUERY_NO_RECURSION) - ret &= ~RES_RECURSE; - if (options & DNS_QUERY_NO_LOCAL_NAME) - ret &= ~RES_DNSRCH; - if (options & DNS_QUERY_NO_HOSTS_FILE) - ret |= RES_NOALIASES; - if (options & DNS_QUERY_TREAT_AS_FQDN) - ret &= ~RES_DEFNAMES; - - if (options & DNS_QUERY_DONT_RESET_TTL_VALUES) - FIXME( "option DNS_QUERY_DONT_RESET_TTL_VALUES not implemented\n" ); - if (options & DNS_QUERY_RESERVED) - FIXME( "option DNS_QUERY_RESERVED not implemented\n" ); - if (options & DNS_QUERY_WIRE_ONLY) - FIXME( "option DNS_QUERY_WIRE_ONLY not implemented\n" ); - if (options & DNS_QUERY_NO_WIRE_QUERY) - FIXME( "option DNS_QUERY_NO_WIRE_QUERY not implemented\n" ); - if (options & DNS_QUERY_BYPASS_CACHE) - FIXME( "option DNS_QUERY_BYPASS_CACHE not implemented\n" ); - if (options & DNS_QUERY_RETURN_MESSAGE) - FIXME( "option DNS_QUERY_RETURN_MESSAGE not implemented\n" ); - - if (options & DNS_QUERY_NO_NETBT) - TRACE( "netbios query disabled\n" ); - - return ret; -} - -static DNS_STATUS map_error( int error ) -{ - switch (error) - { - case ns_r_noerror: return ERROR_SUCCESS; - case ns_r_formerr: return DNS_ERROR_RCODE_FORMAT_ERROR; - case ns_r_servfail: return DNS_ERROR_RCODE_SERVER_FAILURE; - case ns_r_nxdomain: return DNS_ERROR_RCODE_NAME_ERROR; - case ns_r_notimpl: return DNS_ERROR_RCODE_NOT_IMPLEMENTED; - case ns_r_refused: return DNS_ERROR_RCODE_REFUSED; - case ns_r_yxdomain: return DNS_ERROR_RCODE_YXDOMAIN; - case ns_r_yxrrset: return DNS_ERROR_RCODE_YXRRSET; - case ns_r_nxrrset: return DNS_ERROR_RCODE_NXRRSET; - case ns_r_notauth: return DNS_ERROR_RCODE_NOTAUTH; - case ns_r_notzone: return DNS_ERROR_RCODE_NOTZONE; - default: - FIXME( "unmapped error code: %d\n", error ); - return DNS_ERROR_RCODE_NOT_IMPLEMENTED; - } -} - -static DNS_STATUS map_h_errno( int error ) -{ - switch (error) - { - case NO_DATA: - case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR; - case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE; - case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED; -#ifdef NETDB_INTERNAL - case NETDB_INTERNAL: return DNS_ERROR_RCODE; -#endif - default: - FIXME( "unmapped error code: %d\n", error ); - return DNS_ERROR_RCODE_NOT_IMPLEMENTED; - } -} - -static char *dname_from_msg( ns_msg msg, const unsigned char *pos ) -{ - int len; - char *str, dname[NS_MAXDNAME] = "."; - - /* returns *compressed* length, ignore it */ - ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); - - len = strlen( dname ); - str = heap_alloc( len + 1 ); - if (str) strcpy( str, dname ); - return str; -} - -static char *str_from_rdata( const unsigned char *rdata ) -{ - char *str; - unsigned int len = rdata[0]; - - str = heap_alloc( len + 1 ); - if (str) - { - memcpy( str, ++rdata, len ); - str[len] = '\0'; - } - return str; -} - -static unsigned int get_record_size( const ns_rr *rr ) -{ - const unsigned char *pos = rr->rdata; - unsigned int num = 0, size = sizeof(DNS_RECORDA); - - switch (rr->type) - { - case ns_t_key: - { - pos += sizeof(WORD) + sizeof(BYTE) + sizeof(BYTE); - size += rr->rdata + rr->rdlength - pos - 1; - break; - } - case ns_t_sig: - { - pos += sizeof(PCHAR) + sizeof(WORD) + 2 * sizeof(BYTE); - pos += 3 * sizeof(DWORD) + 2 * sizeof(WORD); - size += rr->rdata + rr->rdlength - pos - 1; - break; - } - case ns_t_hinfo: - case ns_t_isdn: - case ns_t_txt: - case ns_t_x25: - { - while (pos[0] && pos < rr->rdata + rr->rdlength) - { - num++; - pos += pos[0] + 1; - } - size += (num - 1) * sizeof(PCHAR); - break; - } - case ns_t_null: - case ns_t_opt: - { - size += rr->rdlength - 1; - break; - } - case ns_t_nxt: - case ns_t_wks: - case 0xff01: /* WINS */ - { - FIXME( "unhandled type: %s\n", type_to_str( rr->type ) ); - break; - } - default: - break; - } - return size; -} - -static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) -{ - DNS_STATUS ret = ERROR_SUCCESS; - const unsigned char *pos = rr->rdata; - unsigned int i, size; - - switch (rr->type) - { - case ns_t_a: - { - r->Data.A.IpAddress = *(const DWORD *)pos; - *dlen = sizeof(DNS_A_DATA); - break; - } - case ns_t_aaaa: - { - for (i = 0; i < sizeof(IP6_ADDRESS)/sizeof(DWORD); i++) - { - r->Data.AAAA.Ip6Address.IP6Dword[i] = *(const DWORD *)pos; - pos += sizeof(DWORD); - } - - *dlen = sizeof(DNS_AAAA_DATA); - break; - } - case ns_t_key: - { - /* FIXME: byte order? */ - r->Data.KEY.wFlags = *(const WORD *)pos; pos += sizeof(WORD); - r->Data.KEY.chProtocol = *pos++; - r->Data.KEY.chAlgorithm = *pos++; - - size = rr->rdata + rr->rdlength - pos; - - for (i = 0; i < size; i++) - r->Data.KEY.Key[i] = *pos++; - - *dlen = sizeof(DNS_KEY_DATA) + (size - 1) * sizeof(BYTE); - break; - } - case ns_t_rp: - case ns_t_minfo: - { - r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos ); - if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY; - - if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) - return DNS_ERROR_BAD_PACKET; - - r->Data.MINFO.pNameErrorsMailbox = dname_from_msg( msg, pos ); - if (!r->Data.MINFO.pNameErrorsMailbox) - { - heap_free( r->Data.MINFO.pNameMailbox ); - return ERROR_NOT_ENOUGH_MEMORY; - } - - *dlen = sizeof(DNS_MINFO_DATAA); - break; - } - case ns_t_afsdb: - case ns_t_rt: - case ns_t_mx: - { - r->Data.MX.wPreference = ntohs( *(const WORD *)pos ); - r->Data.MX.pNameExchange = dname_from_msg( msg, pos + sizeof(WORD) ); - if (!r->Data.MX.pNameExchange) return ERROR_NOT_ENOUGH_MEMORY; - - *dlen = sizeof(DNS_MX_DATAA); - break; - } - case ns_t_null: - { - r->Data.Null.dwByteCount = rr->rdlength; - memcpy( r->Data.Null.Data, rr->rdata, rr->rdlength ); - - *dlen = sizeof(DNS_NULL_DATA) + rr->rdlength - 1; - break; - } - case ns_t_opt: - { - r->Data.OPT.wDataLength = rr->rdlength; - r->Data.OPT.wPad = 0; - memcpy( r->Data.OPT.Data, rr->rdata, rr->rdlength ); - - *dlen = sizeof(DNS_OPT_DATA) + rr->rdlength - 1; - break; - } - case ns_t_cname: - case ns_t_ns: - case ns_t_mb: - case ns_t_md: - case ns_t_mf: - case ns_t_mg: - case ns_t_mr: - case ns_t_ptr: - { - r->Data.PTR.pNameHost = dname_from_msg( msg, pos ); - if (!r->Data.PTR.pNameHost) return ERROR_NOT_ENOUGH_MEMORY; - - *dlen = sizeof(DNS_PTR_DATAA); - break; - } - case ns_t_sig: - { - r->Data.SIG.pNameSigner = dname_from_msg( msg, pos ); - if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY; - - if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) - return DNS_ERROR_BAD_PACKET; - - /* FIXME: byte order? */ - r->Data.SIG.wTypeCovered = *(const WORD *)pos; pos += sizeof(WORD); - r->Data.SIG.chAlgorithm = *pos++; - r->Data.SIG.chLabelCount = *pos++; - r->Data.SIG.dwOriginalTtl = *(const DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.dwExpiration = *(const DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.dwTimeSigned = *(const DWORD *)pos; pos += sizeof(DWORD); - r->Data.SIG.wKeyTag = *(const WORD *)pos; - - size = rr->rdata + rr->rdlength - pos; - - for (i = 0; i < size; i++) - r->Data.SIG.Signature[i] = *pos++; - - *dlen = sizeof(DNS_SIG_DATAA) + (size - 1) * sizeof(BYTE); - break; - } - case ns_t_soa: - { - r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos ); - if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY; - - if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) - return DNS_ERROR_BAD_PACKET; - - r->Data.SOA.pNameAdministrator = dname_from_msg( msg, pos ); - if (!r->Data.SOA.pNameAdministrator) - { - heap_free( r->Data.SOA.pNamePrimaryServer ); - return ERROR_NOT_ENOUGH_MEMORY; - } - - if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) - return DNS_ERROR_BAD_PACKET; - - r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwRefresh = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwRetry = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwExpire = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); - r->Data.SOA.dwDefaultTtl = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); - - *dlen = sizeof(DNS_SOA_DATAA); - break; - } - case ns_t_srv: - { - r->Data.SRV.wPriority = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); - r->Data.SRV.wWeight = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); - r->Data.SRV.wPort = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); - - r->Data.SRV.pNameTarget = dname_from_msg( msg, pos ); - if (!r->Data.SRV.pNameTarget) return ERROR_NOT_ENOUGH_MEMORY; - - *dlen = sizeof(DNS_SRV_DATAA); - break; - } - case ns_t_hinfo: - case ns_t_isdn: - case ns_t_x25: - case ns_t_txt: - { - i = 0; - while (pos[0] && pos < rr->rdata + rr->rdlength) - { - r->Data.TXT.pStringArray[i] = str_from_rdata( pos ); - if (!r->Data.TXT.pStringArray[i]) - { - while (i > 0) heap_free( r->Data.TXT.pStringArray[--i] ); - return ERROR_NOT_ENOUGH_MEMORY; - } - i++; - pos += pos[0] + 1; - } - r->Data.TXT.dwStringCount = i; - *dlen = sizeof(DNS_TXT_DATAA) + (i - 1) * sizeof(PCHAR); - break; - } - case ns_t_atma: - case ns_t_loc: - case ns_t_nxt: - case ns_t_tsig: - case ns_t_wks: - case 0x00f9: /* TKEY */ - case 0xff01: /* WINS */ - case 0xff02: /* WINSR */ - default: - FIXME( "unhandled type: %s\n", type_to_str( rr->type ) ); - return DNS_ERROR_RCODE_NOT_IMPLEMENTED; - } - - return ret; -} - -static DNS_STATUS copy_record( ns_msg msg, ns_sect section, - unsigned short num, DNS_RECORDA **recp ) -{ - DNS_STATUS ret; - DNS_RECORDA *record; - WORD dlen; - ns_rr rr; - - if (ns_parserr( &msg, section, num, &rr ) < 0) - return DNS_ERROR_BAD_PACKET; - - if (!(record = heap_alloc_zero( get_record_size( &rr ) ))) - return ERROR_NOT_ENOUGH_MEMORY; - - record->pName = strdup_u( rr.name ); - if (!record->pName) - { - heap_free( record ); - return ERROR_NOT_ENOUGH_MEMORY; - } - - record->wType = rr.type; - record->Flags.S.Section = section; - record->Flags.S.CharSet = DnsCharSetUtf8; - record->dwTtl = rr.ttl; - - if ((ret = copy_rdata( msg, &rr, record, &dlen ))) - { - heap_free( record->pName ); - heap_free( record ); - return ret; - } - record->wDataLength = dlen; - *recp = record; - - TRACE( "found %s record in %s section\n", - type_to_str( rr.type ), section_to_str( section ) ); - return ERROR_SUCCESS; -} - #define DEFAULT_TTL 1200 static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) @@ -510,7 +62,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) header = (FIND_NAME_HEADER *)ncb.ncb_buffer; buffer = (FIND_NAME_BUFFER *)((char *)header + sizeof(FIND_NAME_HEADER)); - for (i = 0; i < header->node_count; i++) + for (i = 0; i < header->node_count; i++) { record = heap_alloc_zero( sizeof(DNS_RECORDA) ); if (!record) @@ -551,107 +103,6 @@ exit: return status; } -/* res_init() must have been called before calling these three functions. - */ -static DNS_STATUS set_serverlist( const IP4_ARRAY *addrs ) -{ - int i; - - if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; - if (addrs->AddrCount > MAXNS) - { - WARN( "too many servers: %d only using the first: %d\n", - addrs->AddrCount, MAXNS ); - _res.nscount = MAXNS; - } - else _res.nscount = addrs->AddrCount; - - for (i = 0; i < _res.nscount; i++) - _res.nsaddr_list[i].sin_addr.s_addr = addrs->AddrArray[i]; - - return ERROR_SUCCESS; -} - -static DNS_STATUS get_serverlist( PIP4_ARRAY addrs, PDWORD len ) -{ - unsigned int size; - int i; - - size = FIELD_OFFSET(IP4_ARRAY, AddrArray[_res.nscount]); - if (!addrs || *len < size) - { - *len = size; - return ERROR_INSUFFICIENT_BUFFER; - } - - addrs->AddrCount = _res.nscount; - - for (i = 0; i < _res.nscount; i++) - addrs->AddrArray[i] = _res.nsaddr_list[i].sin_addr.s_addr; - - return ERROR_SUCCESS; -} - -#define DNS_MAX_PACKET_SIZE 4096 -static DNS_STATUS do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) -{ - DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; - - unsigned int i, num; - unsigned char answer[DNS_MAX_PACKET_SIZE]; - ns_sect sections[] = { ns_s_an, ns_s_ar }; - ns_msg msg; - - DNS_RECORDA *record = NULL; - DNS_RRSET rrset; - int len; - - DNS_RRSET_INIT( rrset ); - - len = res_query( name, ns_c_in, type, answer, sizeof(answer) ); - if (len < 0) - { - ret = map_h_errno( h_errno ); - goto exit; - } - - if (ns_initparse( answer, len, &msg ) < 0) - { - ret = DNS_ERROR_BAD_PACKET; - goto exit; - } - -#define RCODE_MASK 0x0f - if ((msg._flags & RCODE_MASK) != ns_r_noerror) - { - ret = map_error( msg._flags & RCODE_MASK ); - goto exit; - } - - for (i = 0; i < ARRAY_SIZE(sections); i++) - { - for (num = 0; num < ns_msg_count( msg, sections[i] ); num++) - { - ret = copy_record( msg, sections[i], num, &record ); - if (ret != ERROR_SUCCESS) goto exit; - - DNS_RRSET_ADD( rrset, (DNS_RECORD *)record ); - } - } - -exit: - DNS_RRSET_TERMINATE( rrset ); - - if (ret != ERROR_SUCCESS) - DnsRecordListFree( rrset.pFirstRR, DnsFreeRecordList ); - else - *result = (DNS_RECORDA *)rrset.pFirstRR; - - return ret; -} - -#endif /* HAVE_RESOLV */ - static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) { if (!req) @@ -693,7 +144,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server nameW = strdup_aw( name ); if (!nameW) return ERROR_NOT_ENOUGH_MEMORY; - status = DnsQuery_W( nameW, type, options, servers, &resultW, reserved ); + status = DnsQuery_W( nameW, type, options, servers, &resultW, reserved ); if (status == ERROR_SUCCESS) { @@ -716,7 +167,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser PDNS_RECORDA *result, PVOID *reserved ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; -#ifdef HAVE_RESOLV TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), options, servers, result, reserved ); @@ -724,12 +174,9 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - initialise_resolver(); - _res.options |= map_options( options ); - - if ((ret = set_serverlist( servers ))) return ret; + if ((ret = resolv_funcs->set_serverlist( servers ))) return ret; - ret = do_query( name, type, options, result ); + ret = resolv_funcs->query( name, type, options, result ); if (ret == DNS_ERROR_RCODE_NAME_ERROR && type == DNS_TYPE_A && !(options & DNS_QUERY_NO_NETBT)) @@ -738,7 +185,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ret = do_query_netbios( name, result ); } -#endif return ret; } @@ -762,7 +208,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve nameU = strdup_wu( name ); if (!nameU) return ERROR_NOT_ENOUGH_MEMORY; - status = DnsQuery_UTF8( nameU, type, options, servers, &resultA, reserved ); + status = DnsQuery_UTF8( nameU, type, options, servers, &resultA, reserved ); if (status == ERROR_SUCCESS) { @@ -777,8 +223,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve return status; } -static DNS_STATUS get_hostname_a( COMPUTER_NAME_FORMAT format, - PSTR buffer, PDWORD len ) +static DNS_STATUS get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; DWORD size = ARRAY_SIZE(name); @@ -796,8 +241,7 @@ static DNS_STATUS get_hostname_a( COMPUTER_NAME_FORMAT format, return ERROR_SUCCESS; } -static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, - PWSTR buffer, PDWORD len ) +static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; DWORD size = ARRAY_SIZE(name); @@ -833,14 +277,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada { case DnsConfigDnsServerList: { -#ifdef HAVE_RESOLV - initialise_resolver(); - ret = get_serverlist( buffer, len ); - break; -#else - WARN( "compiled without resolver support\n" ); + ret = resolv_funcs->get_serverlist( buffer, len ); break; -#endif } case DnsConfigHostName_A: case DnsConfigHostName_UTF8: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 51d9e8fd2d7..4697438df57 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -2,7 +2,7 @@ * DNS support * * Copyright (C) 2006 Hans Leidekker - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -18,31 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <sys/types.h> - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif - #include "windef.h" #include "winbase.h" #include "winnls.h" #include "windns.h" +#include "wine/debug.h" +#include "wine/unicode.h" #include "dnsapi.h" WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); @@ -158,10 +141,8 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.SOA.dwExpire != r2->Data.SOA.dwExpire || r1->Data.SOA.dwDefaultTtl != r2->Data.SOA.dwDefaultTtl) return FALSE; - if (strcmpX( r1->Data.SOA.pNamePrimaryServer, - r2->Data.SOA.pNamePrimaryServer, wide ) || - strcmpX( r1->Data.SOA.pNameAdministrator, - r2->Data.SOA.pNameAdministrator, wide )) + if (strcmpX( r1->Data.SOA.pNamePrimaryServer, r2->Data.SOA.pNamePrimaryServer, wide ) || + strcmpX( r1->Data.SOA.pNameAdministrator, r2->Data.SOA.pNameAdministrator, wide )) return FALSE; break; } @@ -174,17 +155,14 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) case DNS_TYPE_MG: case DNS_TYPE_MR: { - if (strcmpX( r1->Data.PTR.pNameHost, - r2->Data.PTR.pNameHost, wide )) return FALSE; + if (strcmpX( r1->Data.PTR.pNameHost, r2->Data.PTR.pNameHost, wide )) return FALSE; break; } case DNS_TYPE_MINFO: case DNS_TYPE_RP: { - if (strcmpX( r1->Data.MINFO.pNameMailbox, - r2->Data.MINFO.pNameMailbox, wide ) || - strcmpX( r1->Data.MINFO.pNameErrorsMailbox, - r2->Data.MINFO.pNameErrorsMailbox, wide )) + if (strcmpX( r1->Data.MINFO.pNameMailbox, r2->Data.MINFO.pNameMailbox, wide ) || + strcmpX( r1->Data.MINFO.pNameErrorsMailbox, r2->Data.MINFO.pNameErrorsMailbox, wide )) return FALSE; break; } @@ -194,8 +172,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) { if (r1->Data.MX.wPreference != r2->Data.MX.wPreference) return FALSE; - if (strcmpX( r1->Data.MX.pNameExchange, - r2->Data.MX.pNameExchange, wide )) + if (strcmpX( r1->Data.MX.pNameExchange, r2->Data.MX.pNameExchange, wide )) return FALSE; break; } @@ -208,8 +185,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; for (i = 0; i < r1->Data.TXT.dwStringCount; i++) { - if (strcmpX( r1->Data.TXT.pStringArray[i], - r2->Data.TXT.pStringArray[i], wide )) + if (strcmpX( r1->Data.TXT.pStringArray[i], r2->Data.TXT.pStringArray[i], wide )) return FALSE; } break; @@ -255,8 +231,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_SIG: { - if (strcmpX( r1->Data.SIG.pNameSigner, - r2->Data.SIG.pNameSigner, wide )) + if (strcmpX( r1->Data.SIG.pNameSigner, r2->Data.SIG.pNameSigner, wide )) return FALSE; if (r1->Data.SIG.wTypeCovered != r2->Data.SIG.wTypeCovered || r1->Data.SIG.chAlgorithm != r2->Data.SIG.chAlgorithm || @@ -284,8 +259,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_NXT: { - if (strcmpX( r1->Data.NXT.pNameNext, - r2->Data.NXT.pNameNext, wide )) return FALSE; + if (strcmpX( r1->Data.NXT.pNameNext, r2->Data.NXT.pNameNext, wide )) return FALSE; if (r1->Data.NXT.wNumTypes != r2->Data.NXT.wNumTypes) return FALSE; if (memcmp( r1->Data.NXT.wTypes, r2->Data.NXT.wTypes, r1->wDataLength - sizeof(DNS_NXT_DATAA) + sizeof(WORD) )) @@ -294,8 +268,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_SRV: { - if (strcmpX( r1->Data.SRV.pNameTarget, - r2->Data.SRV.pNameTarget, wide )) return FALSE; + if (strcmpX( r1->Data.SRV.pNameTarget, r2->Data.SRV.pNameTarget, wide )) return FALSE; if (r1->Data.SRV.wPriority != r2->Data.SRV.wPriority || r1->Data.SRV.wWeight != r2->Data.SRV.wWeight || r1->Data.SRV.wPort != r2->Data.SRV.wPort) @@ -304,8 +277,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_TKEY: { - if (strcmpX( r1->Data.TKEY.pNameAlgorithm, - r2->Data.TKEY.pNameAlgorithm, wide )) + if (strcmpX( r1->Data.TKEY.pNameAlgorithm, r2->Data.TKEY.pNameAlgorithm, wide )) return FALSE; if (r1->Data.TKEY.dwCreateTime != r2->Data.TKEY.dwCreateTime || r1->Data.TKEY.dwExpireTime != r2->Data.TKEY.dwExpireTime || @@ -326,8 +298,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_TSIG: { - if (strcmpX( r1->Data.TSIG.pNameAlgorithm, - r2->Data.TSIG.pNameAlgorithm, wide )) + if (strcmpX( r1->Data.TSIG.pNameAlgorithm, r2->Data.TSIG.pNameAlgorithm, wide )) return FALSE; if (r1->Data.TSIG.i64CreateTime != r2->Data.TSIG.i64CreateTime || r1->Data.TSIG.wFudgeTime != r2->Data.TSIG.wFudgeTime || @@ -364,8 +335,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.WINSR.dwLookupTimeout != r2->Data.WINSR.dwLookupTimeout || r1->Data.WINSR.dwCacheTimeout != r2->Data.WINSR.dwCacheTimeout) return FALSE; - if (strcmpX( r1->Data.WINSR.pNameResultDomain, - r2->Data.WINSR.pNameResultDomain, wide )) + if (strcmpX( r1->Data.WINSR.pNameResultDomain, r2->Data.WINSR.pNameResultDomain, wide )) return FALSE; break; } @@ -748,7 +718,7 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_TERMINATE( rr1 ); DNS_RRSET_TERMINATE( rr2 ); - + if (diff1) *diff1 = rr1.pFirstRR; else DnsRecordListFree( rr1.pFirstRR, DnsFreeRecordList ); @@ -763,7 +733,7 @@ error: DnsRecordListFree( rr1.pFirstRR, DnsFreeRecordList ); DnsRecordListFree( rr2.pFirstRR, DnsFreeRecordList ); - + return FALSE; } -- 2.30.2

1 0

[PATCH 2/5] dnsapi: Get rid of the dns_ prefix on helpers.
by Hans Leidekker 30 Mar '21

30 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/dnsapi.h | 47 +++++++++----------- dlls/dnsapi/name.c | 8 ++-- dlls/dnsapi/query.c | 102 +++++++++++++++++++++---------------------- dlls/dnsapi/record.c | 87 ++++++++++++++++-------------------- 4 files changed, 114 insertions(+), 130 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 510555698c7..d0a31ea0981 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -24,39 +24,36 @@ #include "wine/heap.h" -static inline LPSTR dns_strdup_a( LPCSTR src ) +static inline char *strdup_a( const char *src ) { - LPSTR dst; - + char *dst; if (!src) return NULL; dst = heap_alloc( (lstrlenA( src ) + 1) * sizeof(char) ); if (dst) lstrcpyA( dst, src ); return dst; } -static inline char *dns_strdup_u( const char *src ) +static inline char *strdup_u( const char *src ) { char *dst; - if (!src) return NULL; dst = heap_alloc( (strlen( src ) + 1) * sizeof(char) ); if (dst) strcpy( dst, src ); return dst; } -static inline LPWSTR dns_strdup_w( LPCWSTR src ) +static inline WCHAR *strdup_w( const WCHAR *src ) { - LPWSTR dst; - + WCHAR *dst; if (!src) return NULL; dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); if (dst) lstrcpyW( dst, src ); return dst; } -static inline LPWSTR dns_strdup_aw( LPCSTR str ) +static inline WCHAR *strdup_aw( const char *str ) { - LPWSTR ret = NULL; + WCHAR *ret = NULL; if (str) { DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); @@ -66,9 +63,9 @@ static inline LPWSTR dns_strdup_aw( LPCSTR str ) return ret; } -static inline LPWSTR dns_strdup_uw( const char *str ) +static inline WCHAR *strdup_uw( const char *str ) { - LPWSTR ret = NULL; + WCHAR *ret = NULL; if (str) { DWORD len = MultiByteToWideChar( CP_UTF8, 0, str, -1, NULL, 0 ); @@ -78,9 +75,9 @@ static inline LPWSTR dns_strdup_uw( const char *str ) return ret; } -static inline LPSTR dns_strdup_wa( LPCWSTR str ) +static inline char *strdup_wa( const WCHAR *str ) { - LPSTR ret = NULL; + char *ret = NULL; if (str) { DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); @@ -90,9 +87,9 @@ static inline LPSTR dns_strdup_wa( LPCWSTR str ) return ret; } -static inline char *dns_strdup_wu( LPCWSTR str ) +static inline char *strdup_wu( const WCHAR *str ) { - LPSTR ret = NULL; + char *ret = NULL; if (str) { DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); @@ -102,30 +99,28 @@ static inline char *dns_strdup_wu( LPCWSTR str ) return ret; } -static inline char *dns_strdup_au( LPCSTR src ) +static inline char *strdup_au( const char *src ) { char *dst = NULL; - LPWSTR ret = dns_strdup_aw( src ); - + WCHAR *ret = strdup_aw( src ); if (ret) { - dst = dns_strdup_wu( ret ); + dst = strdup_wu( ret ); heap_free( ret ); } return dst; } -static inline LPSTR dns_strdup_ua( const char *src ) +static inline char *strdup_ua( const char *src ) { - LPSTR dst = NULL; - LPWSTR ret = dns_strdup_uw( src ); - + char *dst = NULL; + WCHAR *ret = strdup_uw( src ); if (ret) { - dst = dns_strdup_wa( ret ); + dst = strdup_wa( ret ); heap_free( ret ); } return dst; } -const char *dns_type_to_str( unsigned short ) DECLSPEC_HIDDEN; +const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c index c14c8a0e495..9404200e443 100644 --- a/dlls/dnsapi/name.c +++ b/dlls/dnsapi/name.c @@ -58,8 +58,8 @@ BOOL WINAPI DnsNameCompare_A( PCSTR name1, PCSTR name2 ) TRACE( "(%s,%s)\n", debugstr_a(name1), debugstr_a(name2) ); - name1W = dns_strdup_aw( name1 ); - name2W = dns_strdup_aw( name2 ); + name1W = strdup_aw( name1 ); + name2W = strdup_aw( name2 ); ret = DnsNameCompare_W( name1W, name2W ); @@ -112,7 +112,7 @@ DNS_STATUS WINAPI DnsValidateName_A( PCSTR name, DNS_NAME_FORMAT format ) TRACE( "(%s, %d)\n", debugstr_a(name), format ); - nameW = dns_strdup_aw( name ); + nameW = strdup_aw( name ); ret = DnsValidateName_W( nameW, format ); heap_free( nameW ); @@ -130,7 +130,7 @@ DNS_STATUS WINAPI DnsValidateName_UTF8( PCSTR name, DNS_NAME_FORMAT format ) TRACE( "(%s, %d)\n", debugstr_a(name), format ); - nameW = dns_strdup_uw( name ); + nameW = strdup_uw( name ); ret = DnsValidateName_W( nameW, format ); heap_free( nameW ); diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 4c7a65eb264..3bef65e9731 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -61,7 +61,7 @@ static void initialise_resolver( void ) res_init(); } -static const char *dns_section_to_str( ns_sect section ) +static const char *section_to_str( ns_sect section ) { switch (section) { @@ -79,7 +79,7 @@ static const char *dns_section_to_str( ns_sect section ) } } -static unsigned long dns_map_options( DWORD options ) +static unsigned long map_options( DWORD options ) { unsigned long ret = 0; @@ -118,7 +118,7 @@ static unsigned long dns_map_options( DWORD options ) return ret; } -static DNS_STATUS dns_map_error( int error ) +static DNS_STATUS map_error( int error ) { switch (error) { @@ -139,7 +139,7 @@ static DNS_STATUS dns_map_error( int error ) } } -static DNS_STATUS dns_map_h_errno( int error ) +static DNS_STATUS map_h_errno( int error ) { switch (error) { @@ -156,7 +156,7 @@ static DNS_STATUS dns_map_h_errno( int error ) } } -static char *dns_dname_from_msg( ns_msg msg, const unsigned char *pos ) +static char *dname_from_msg( ns_msg msg, const unsigned char *pos ) { int len; char *str, dname[NS_MAXDNAME] = "."; @@ -170,7 +170,7 @@ static char *dns_dname_from_msg( ns_msg msg, const unsigned char *pos ) return str; } -static char *dns_str_from_rdata( const unsigned char *rdata ) +static char *str_from_rdata( const unsigned char *rdata ) { char *str; unsigned int len = rdata[0]; @@ -184,7 +184,7 @@ static char *dns_str_from_rdata( const unsigned char *rdata ) return str; } -static unsigned int dns_get_record_size( const ns_rr *rr ) +static unsigned int get_record_size( const ns_rr *rr ) { const unsigned char *pos = rr->rdata; unsigned int num = 0, size = sizeof(DNS_RECORDA); @@ -227,7 +227,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) case ns_t_wks: case 0xff01: /* WINS */ { - FIXME( "unhandled type: %s\n", dns_type_to_str( rr->type ) ); + FIXME( "unhandled type: %s\n", type_to_str( rr->type ) ); break; } default: @@ -236,7 +236,7 @@ static unsigned int dns_get_record_size( const ns_rr *rr ) return size; } -static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) +static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) { DNS_STATUS ret = ERROR_SUCCESS; const unsigned char *pos = rr->rdata; @@ -279,13 +279,13 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W case ns_t_rp: case ns_t_minfo: { - r->Data.MINFO.pNameMailbox = dns_dname_from_msg( msg, pos ); + r->Data.MINFO.pNameMailbox = dname_from_msg( msg, pos ); if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY; if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; - r->Data.MINFO.pNameErrorsMailbox = dns_dname_from_msg( msg, pos ); + r->Data.MINFO.pNameErrorsMailbox = dname_from_msg( msg, pos ); if (!r->Data.MINFO.pNameErrorsMailbox) { heap_free( r->Data.MINFO.pNameMailbox ); @@ -300,7 +300,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W case ns_t_mx: { r->Data.MX.wPreference = ntohs( *(const WORD *)pos ); - r->Data.MX.pNameExchange = dns_dname_from_msg( msg, pos + sizeof(WORD) ); + r->Data.MX.pNameExchange = dname_from_msg( msg, pos + sizeof(WORD) ); if (!r->Data.MX.pNameExchange) return ERROR_NOT_ENOUGH_MEMORY; *dlen = sizeof(DNS_MX_DATAA); @@ -332,7 +332,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W case ns_t_mr: case ns_t_ptr: { - r->Data.PTR.pNameHost = dns_dname_from_msg( msg, pos ); + r->Data.PTR.pNameHost = dname_from_msg( msg, pos ); if (!r->Data.PTR.pNameHost) return ERROR_NOT_ENOUGH_MEMORY; *dlen = sizeof(DNS_PTR_DATAA); @@ -340,7 +340,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W } case ns_t_sig: { - r->Data.SIG.pNameSigner = dns_dname_from_msg( msg, pos ); + r->Data.SIG.pNameSigner = dname_from_msg( msg, pos ); if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY; if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) @@ -365,13 +365,13 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W } case ns_t_soa: { - r->Data.SOA.pNamePrimaryServer = dns_dname_from_msg( msg, pos ); + r->Data.SOA.pNamePrimaryServer = dname_from_msg( msg, pos ); if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY; if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; - r->Data.SOA.pNameAdministrator = dns_dname_from_msg( msg, pos ); + r->Data.SOA.pNameAdministrator = dname_from_msg( msg, pos ); if (!r->Data.SOA.pNameAdministrator) { heap_free( r->Data.SOA.pNamePrimaryServer ); @@ -396,7 +396,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W r->Data.SRV.wWeight = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); r->Data.SRV.wPort = ntohs( *(const WORD *)pos ); pos += sizeof(WORD); - r->Data.SRV.pNameTarget = dns_dname_from_msg( msg, pos ); + r->Data.SRV.pNameTarget = dname_from_msg( msg, pos ); if (!r->Data.SRV.pNameTarget) return ERROR_NOT_ENOUGH_MEMORY; *dlen = sizeof(DNS_SRV_DATAA); @@ -410,7 +410,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W i = 0; while (pos[0] && pos < rr->rdata + rr->rdlength) { - r->Data.TXT.pStringArray[i] = dns_str_from_rdata( pos ); + r->Data.TXT.pStringArray[i] = str_from_rdata( pos ); if (!r->Data.TXT.pStringArray[i]) { while (i > 0) heap_free( r->Data.TXT.pStringArray[--i] ); @@ -432,14 +432,14 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W case 0xff01: /* WINS */ case 0xff02: /* WINSR */ default: - FIXME( "unhandled type: %s\n", dns_type_to_str( rr->type ) ); + FIXME( "unhandled type: %s\n", type_to_str( rr->type ) ); return DNS_ERROR_RCODE_NOT_IMPLEMENTED; } return ret; } -static DNS_STATUS dns_copy_record( ns_msg msg, ns_sect section, +static DNS_STATUS copy_record( ns_msg msg, ns_sect section, unsigned short num, DNS_RECORDA **recp ) { DNS_STATUS ret; @@ -450,10 +450,10 @@ static DNS_STATUS dns_copy_record( ns_msg msg, ns_sect section, if (ns_parserr( &msg, section, num, &rr ) < 0) return DNS_ERROR_BAD_PACKET; - if (!(record = heap_alloc_zero( dns_get_record_size( &rr ) ))) + if (!(record = heap_alloc_zero( get_record_size( &rr ) ))) return ERROR_NOT_ENOUGH_MEMORY; - record->pName = dns_strdup_u( rr.name ); + record->pName = strdup_u( rr.name ); if (!record->pName) { heap_free( record ); @@ -465,7 +465,7 @@ static DNS_STATUS dns_copy_record( ns_msg msg, ns_sect section, record->Flags.S.CharSet = DnsCharSetUtf8; record->dwTtl = rr.ttl; - if ((ret = dns_copy_rdata( msg, &rr, record, &dlen ))) + if ((ret = copy_rdata( msg, &rr, record, &dlen ))) { heap_free( record->pName ); heap_free( record ); @@ -475,13 +475,13 @@ static DNS_STATUS dns_copy_record( ns_msg msg, ns_sect section, *recp = record; TRACE( "found %s record in %s section\n", - dns_type_to_str( rr.type ), dns_section_to_str( section ) ); + type_to_str( rr.type ), section_to_str( section ) ); return ERROR_SUCCESS; } #define DEFAULT_TTL 1200 -static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp ) +static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) { NCB ncb; UCHAR ret; @@ -520,7 +520,7 @@ static DNS_STATUS dns_do_query_netbios( PCSTR name, DNS_RECORDA **recp ) } else { - record->pName = dns_strdup_u( name ); + record->pName = strdup_u( name ); if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; @@ -553,7 +553,7 @@ exit: /* res_init() must have been called before calling these three functions. */ -static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) +static DNS_STATUS set_serverlist( const IP4_ARRAY *addrs ) { int i; @@ -572,7 +572,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) return ERROR_SUCCESS; } -static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) +static DNS_STATUS get_serverlist( PIP4_ARRAY addrs, PDWORD len ) { unsigned int size; int i; @@ -593,7 +593,7 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) } #define DNS_MAX_PACKET_SIZE 4096 -static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) +static DNS_STATUS do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; @@ -611,7 +611,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR len = res_query( name, ns_c_in, type, answer, sizeof(answer) ); if (len < 0) { - ret = dns_map_h_errno( h_errno ); + ret = map_h_errno( h_errno ); goto exit; } @@ -624,7 +624,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR #define RCODE_MASK 0x0f if ((msg._flags & RCODE_MASK) != ns_r_noerror) { - ret = dns_map_error( msg._flags & RCODE_MASK ); + ret = map_error( msg._flags & RCODE_MASK ); goto exit; } @@ -632,7 +632,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR { for (num = 0; num < ns_msg_count( msg, sections[i] ); num++) { - ret = dns_copy_record( msg, sections[i], num, &record ); + ret = copy_record( msg, sections[i], num, &record ); if (ret != ERROR_SUCCESS) goto exit; DNS_RRSET_ADD( rrset, (DNS_RECORD *)record ); @@ -658,7 +658,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) return "(null)"; return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, - debugstr_w(req->QueryName), dns_type_to_str(req->QueryType), + debugstr_w(req->QueryName), type_to_str(req->QueryType), (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); } @@ -684,13 +684,13 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), options, servers, result, reserved ); if (!name || !result) return ERROR_INVALID_PARAMETER; - nameW = dns_strdup_aw( name ); + nameW = strdup_aw( name ); if (!nameW) return ERROR_NOT_ENOUGH_MEMORY; status = DnsQuery_W( nameW, type, options, servers, &resultW, reserved ); @@ -718,24 +718,24 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; #ifdef HAVE_RESOLV - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), options, servers, result, reserved ); if (!name || !result) return ERROR_INVALID_PARAMETER; initialise_resolver(); - _res.options |= dns_map_options( options ); + _res.options |= map_options( options ); - if ((ret = dns_set_serverlist( servers ))) return ret; + if ((ret = set_serverlist( servers ))) return ret; - ret = dns_do_query( name, type, options, result ); + ret = do_query( name, type, options, result ); if (ret == DNS_ERROR_RCODE_NAME_ERROR && type == DNS_TYPE_A && !(options & DNS_QUERY_NO_NETBT)) { TRACE( "dns lookup failed, trying netbios query\n" ); - ret = dns_do_query_netbios( name, result ); + ret = do_query_netbios( name, result ); } #endif @@ -753,13 +753,13 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), dns_type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), type_to_str( type ), options, servers, result, reserved ); if (!name || !result) return ERROR_INVALID_PARAMETER; - nameU = dns_strdup_wu( name ); + nameU = strdup_wu( name ); if (!nameU) return ERROR_NOT_ENOUGH_MEMORY; status = DnsQuery_UTF8( nameU, type, options, servers, &resultA, reserved ); @@ -777,7 +777,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve return status; } -static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, +static DNS_STATUS get_hostname_a( COMPUTER_NAME_FORMAT format, PSTR buffer, PDWORD len ) { char name[256]; @@ -796,7 +796,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, return ERROR_SUCCESS; } -static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, +static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDWORD len ) { WCHAR name[256]; @@ -835,7 +835,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada { #ifdef HAVE_RESOLV initialise_resolver(); - ret = dns_get_serverlist( buffer, len ); + ret = get_serverlist( buffer, len ); break; #else WARN( "compiled without resolver support\n" ); @@ -844,24 +844,24 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada } case DnsConfigHostName_A: case DnsConfigHostName_UTF8: - return dns_get_hostname_a( ComputerNameDnsHostname, buffer, len ); + return get_hostname_a( ComputerNameDnsHostname, buffer, len ); case DnsConfigFullHostName_A: case DnsConfigFullHostName_UTF8: - return dns_get_hostname_a( ComputerNameDnsFullyQualified, buffer, len ); + return get_hostname_a( ComputerNameDnsFullyQualified, buffer, len ); case DnsConfigPrimaryDomainName_A: case DnsConfigPrimaryDomainName_UTF8: - return dns_get_hostname_a( ComputerNameDnsDomain, buffer, len ); + return get_hostname_a( ComputerNameDnsDomain, buffer, len ); case DnsConfigHostName_W: - return dns_get_hostname_w( ComputerNameDnsHostname, buffer, len ); + return get_hostname_w( ComputerNameDnsHostname, buffer, len ); case DnsConfigFullHostName_W: - return dns_get_hostname_w( ComputerNameDnsFullyQualified, buffer, len ); + return get_hostname_w( ComputerNameDnsFullyQualified, buffer, len ); case DnsConfigPrimaryDomainName_W: - return dns_get_hostname_w( ComputerNameDnsDomain, buffer, len ); + return get_hostname_w( ComputerNameDnsDomain, buffer, len ); case DnsConfigAdapterDomainName_A: case DnsConfigAdapterDomainName_W: diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index dc6a1137d95..51d9e8fd2d7 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -const char *dns_type_to_str( unsigned short type ) +const char *type_to_str( unsigned short type ) { switch (type) { @@ -113,7 +113,7 @@ const char *dns_type_to_str( unsigned short type ) } } -static int dns_strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide ) +static int strcmpX( LPCVOID str1, LPCVOID str2, BOOL wide ) { if (wide) return lstrcmpiW( str1, str2 ); @@ -141,7 +141,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->dwReserved != r2->dwReserved) return FALSE; wide = (r1->Flags.S.CharSet == DnsCharSetUnicode || r1->Flags.S.CharSet == DnsCharSetUnknown); - if (dns_strcmpX( r1->pName, r2->pName, wide )) return FALSE; + if (strcmpX( r1->pName, r2->pName, wide )) return FALSE; switch (r1->wType) { @@ -158,9 +158,9 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.SOA.dwExpire != r2->Data.SOA.dwExpire || r1->Data.SOA.dwDefaultTtl != r2->Data.SOA.dwDefaultTtl) return FALSE; - if (dns_strcmpX( r1->Data.SOA.pNamePrimaryServer, + if (strcmpX( r1->Data.SOA.pNamePrimaryServer, r2->Data.SOA.pNamePrimaryServer, wide ) || - dns_strcmpX( r1->Data.SOA.pNameAdministrator, + strcmpX( r1->Data.SOA.pNameAdministrator, r2->Data.SOA.pNameAdministrator, wide )) return FALSE; break; @@ -174,16 +174,16 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) case DNS_TYPE_MG: case DNS_TYPE_MR: { - if (dns_strcmpX( r1->Data.PTR.pNameHost, + if (strcmpX( r1->Data.PTR.pNameHost, r2->Data.PTR.pNameHost, wide )) return FALSE; break; } case DNS_TYPE_MINFO: case DNS_TYPE_RP: { - if (dns_strcmpX( r1->Data.MINFO.pNameMailbox, + if (strcmpX( r1->Data.MINFO.pNameMailbox, r2->Data.MINFO.pNameMailbox, wide ) || - dns_strcmpX( r1->Data.MINFO.pNameErrorsMailbox, + strcmpX( r1->Data.MINFO.pNameErrorsMailbox, r2->Data.MINFO.pNameErrorsMailbox, wide )) return FALSE; break; @@ -194,7 +194,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) { if (r1->Data.MX.wPreference != r2->Data.MX.wPreference) return FALSE; - if (dns_strcmpX( r1->Data.MX.pNameExchange, + if (strcmpX( r1->Data.MX.pNameExchange, r2->Data.MX.pNameExchange, wide )) return FALSE; break; @@ -208,7 +208,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) return FALSE; for (i = 0; i < r1->Data.TXT.dwStringCount; i++) { - if (dns_strcmpX( r1->Data.TXT.pStringArray[i], + if (strcmpX( r1->Data.TXT.pStringArray[i], r2->Data.TXT.pStringArray[i], wide )) return FALSE; } @@ -255,7 +255,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_SIG: { - if (dns_strcmpX( r1->Data.SIG.pNameSigner, + if (strcmpX( r1->Data.SIG.pNameSigner, r2->Data.SIG.pNameSigner, wide )) return FALSE; if (r1->Data.SIG.wTypeCovered != r2->Data.SIG.wTypeCovered || @@ -284,7 +284,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_NXT: { - if (dns_strcmpX( r1->Data.NXT.pNameNext, + if (strcmpX( r1->Data.NXT.pNameNext, r2->Data.NXT.pNameNext, wide )) return FALSE; if (r1->Data.NXT.wNumTypes != r2->Data.NXT.wNumTypes) return FALSE; if (memcmp( r1->Data.NXT.wTypes, r2->Data.NXT.wTypes, @@ -294,7 +294,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_SRV: { - if (dns_strcmpX( r1->Data.SRV.pNameTarget, + if (strcmpX( r1->Data.SRV.pNameTarget, r2->Data.SRV.pNameTarget, wide )) return FALSE; if (r1->Data.SRV.wPriority != r2->Data.SRV.wPriority || r1->Data.SRV.wWeight != r2->Data.SRV.wWeight || @@ -304,7 +304,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_TKEY: { - if (dns_strcmpX( r1->Data.TKEY.pNameAlgorithm, + if (strcmpX( r1->Data.TKEY.pNameAlgorithm, r2->Data.TKEY.pNameAlgorithm, wide )) return FALSE; if (r1->Data.TKEY.dwCreateTime != r2->Data.TKEY.dwCreateTime || @@ -326,7 +326,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) } case DNS_TYPE_TSIG: { - if (dns_strcmpX( r1->Data.TSIG.pNameAlgorithm, + if (strcmpX( r1->Data.TSIG.pNameAlgorithm, r2->Data.TSIG.pNameAlgorithm, wide )) return FALSE; if (r1->Data.TSIG.i64CreateTime != r2->Data.TSIG.i64CreateTime || @@ -364,19 +364,19 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.WINSR.dwLookupTimeout != r2->Data.WINSR.dwLookupTimeout || r1->Data.WINSR.dwCacheTimeout != r2->Data.WINSR.dwCacheTimeout) return FALSE; - if (dns_strcmpX( r1->Data.WINSR.pNameResultDomain, + if (strcmpX( r1->Data.WINSR.pNameResultDomain, r2->Data.WINSR.pNameResultDomain, wide )) return FALSE; break; } default: - FIXME( "unknown type: %s\n", dns_type_to_str( r1->wType ) ); + FIXME( "unknown type: %s\n", type_to_str( r1->wType ) ); return FALSE; } return TRUE; } -static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) +static LPVOID strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (in) { @@ -384,9 +384,9 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (out) { - case DnsCharSetUnicode: return dns_strdup_w( src ); - case DnsCharSetUtf8: return dns_strdup_wu( src ); - case DnsCharSetAnsi: return dns_strdup_wa( src ); + case DnsCharSetUnicode: return strdup_w( src ); + case DnsCharSetUtf8: return strdup_wu( src ); + case DnsCharSetAnsi: return strdup_wa( src ); default: WARN( "unhandled target charset: %d\n", out ); break; @@ -396,9 +396,9 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) case DnsCharSetUtf8: switch (out) { - case DnsCharSetUnicode: return dns_strdup_uw( src ); - case DnsCharSetUtf8: return dns_strdup_u( src ); - case DnsCharSetAnsi: return dns_strdup_ua( src ); + case DnsCharSetUnicode: return strdup_uw( src ); + case DnsCharSetUtf8: return strdup_u( src ); + case DnsCharSetAnsi: return strdup_ua( src ); default: WARN( "unhandled target charset: %d\n", out ); break; @@ -407,9 +407,9 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) case DnsCharSetAnsi: switch (out) { - case DnsCharSetUnicode: return dns_strdup_aw( src ); - case DnsCharSetUtf8: return dns_strdup_au( src ); - case DnsCharSetAnsi: return dns_strdup_a( src ); + case DnsCharSetUnicode: return strdup_aw( src ); + case DnsCharSetUtf8: return strdup_au( src ); + case DnsCharSetAnsi: return strdup_a( src ); default: WARN( "unhandled target charset: %d\n", out ); break; @@ -444,7 +444,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET src->Flags.S.CharSet == DnsCharSetUnicode) in = src->Flags.S.CharSet; dst->Flags.S.CharSet = out; - dst->pName = dns_strcpyX( src->pName, in, out ); + dst->pName = strcpyX( src->pName, in, out ); if (!dst->pName) goto error; switch (src->wType) @@ -456,9 +456,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET { for (i = 0; i < src->Data.TXT.dwStringCount; i++) { - dst->Data.TXT.pStringArray[i] = - dns_strcpyX( src->Data.TXT.pStringArray[i], in, out ); - + dst->Data.TXT.pStringArray[i] = strcpyX( src->Data.TXT.pStringArray[i], in, out ); if (!dst->Data.TXT.pStringArray[i]) { while (i > 0) heap_free( dst->Data.TXT.pStringArray[--i] ); @@ -470,12 +468,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET case DNS_TYPE_MINFO: case DNS_TYPE_RP: { - dst->Data.MINFO.pNameMailbox = - dns_strcpyX( src->Data.MINFO.pNameMailbox, in, out ); + dst->Data.MINFO.pNameMailbox = strcpyX( src->Data.MINFO.pNameMailbox, in, out ); if (!dst->Data.MINFO.pNameMailbox) goto error; - dst->Data.MINFO.pNameErrorsMailbox = - dns_strcpyX( src->Data.MINFO.pNameErrorsMailbox, in, out ); + dst->Data.MINFO.pNameErrorsMailbox = strcpyX( src->Data.MINFO.pNameErrorsMailbox, in, out ); if (!dst->Data.MINFO.pNameErrorsMailbox) { heap_free( dst->Data.MINFO.pNameMailbox ); @@ -492,8 +488,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET case DNS_TYPE_RT: case DNS_TYPE_MX: { - dst->Data.MX.pNameExchange = - dns_strcpyX( src->Data.MX.pNameExchange, in, out ); + dst->Data.MX.pNameExchange = strcpyX( src->Data.MX.pNameExchange, in, out ); if (!dst->Data.MX.pNameExchange) goto error; dst->wDataLength = sizeof(dst->Data.MX); @@ -503,8 +498,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET } case DNS_TYPE_NXT: { - dst->Data.NXT.pNameNext = - dns_strcpyX( src->Data.NXT.pNameNext, in, out ); + dst->Data.NXT.pNameNext = strcpyX( src->Data.NXT.pNameNext, in, out ); if (!dst->Data.NXT.pNameNext) goto error; dst->wDataLength = sizeof(dst->Data.NXT); @@ -521,8 +515,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET case DNS_TYPE_NS: case DNS_TYPE_PTR: { - dst->Data.PTR.pNameHost = - dns_strcpyX( src->Data.PTR.pNameHost, in, out ); + dst->Data.PTR.pNameHost = strcpyX( src->Data.PTR.pNameHost, in, out ); if (!dst->Data.PTR.pNameHost) goto error; dst->wDataLength = sizeof(dst->Data.PTR); @@ -532,8 +525,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET } case DNS_TYPE_SIG: { - dst->Data.SIG.pNameSigner = - dns_strcpyX( src->Data.SIG.pNameSigner, in, out ); + dst->Data.SIG.pNameSigner = strcpyX( src->Data.SIG.pNameSigner, in, out ); if (!dst->Data.SIG.pNameSigner) goto error; dst->wDataLength = sizeof(dst->Data.SIG); @@ -543,12 +535,10 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET } case DNS_TYPE_SOA: { - dst->Data.SOA.pNamePrimaryServer = - dns_strcpyX( src->Data.SOA.pNamePrimaryServer, in, out ); + dst->Data.SOA.pNamePrimaryServer = strcpyX( src->Data.SOA.pNamePrimaryServer, in, out ); if (!dst->Data.SOA.pNamePrimaryServer) goto error; - dst->Data.SOA.pNameAdministrator = - dns_strcpyX( src->Data.SOA.pNameAdministrator, in, out ); + dst->Data.SOA.pNameAdministrator = strcpyX( src->Data.SOA.pNameAdministrator, in, out ); if (!dst->Data.SOA.pNameAdministrator) { heap_free( dst->Data.SOA.pNamePrimaryServer ); @@ -563,8 +553,7 @@ PDNS_RECORD WINAPI DnsRecordCopyEx( PDNS_RECORD src, DNS_CHARSET in, DNS_CHARSET } case DNS_TYPE_SRV: { - dst->Data.SRV.pNameTarget = - dns_strcpyX( src->Data.SRV.pNameTarget, in, out ); + dst->Data.SRV.pNameTarget = strcpyX( src->Data.SRV.pNameTarget, in, out ); if (!dst->Data.SRV.pNameTarget) goto error; dst->wDataLength = sizeof(dst->Data.SRV); -- 2.30.2

1 0

[PATCH 1/5] dnsapi: Get rid of imported domain name parsing code.
by Hans Leidekker 30 Mar '21

30 Mar '21

These functions have been exported since glibc 2.9. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/Makefile.in | 2 - dlls/dnsapi/dnsapi.h | 7 - dlls/dnsapi/ns_name.c | 313 ---------------------------------------- dlls/dnsapi/ns_parse.c | 210 --------------------------- dlls/dnsapi/query.c | 14 +- 5 files changed, 7 insertions(+), 539 deletions(-) delete mode 100644 dlls/dnsapi/ns_name.c delete mode 100644 dlls/dnsapi/ns_parse.c diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 36552967be0..d1f66723fc6 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -6,8 +6,6 @@ EXTRALIBS = $(RESOLV_LIBS) C_SRCS = \ main.c \ name.c \ - ns_name.c \ - ns_parse.c \ query.c \ record.c diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 0b679731e91..510555698c7 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -129,10 +129,3 @@ static inline LPSTR dns_strdup_ua( const char *src ) } const char *dns_type_to_str( unsigned short ) DECLSPEC_HIDDEN; - -#ifdef HAVE_RESOLV -int dns_ns_initparse( const u_char *, int, ns_msg * ) DECLSPEC_HIDDEN; -int dns_ns_parserr( ns_msg *, ns_sect, int, ns_rr * ) DECLSPEC_HIDDEN; -int dns_ns_name_skip( const u_char **, const u_char * ) DECLSPEC_HIDDEN; -int dns_ns_name_uncompress( const u_char *, const u_char *, const u_char *, char *, size_t ) DECLSPEC_HIDDEN; -#endif diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c deleted file mode 100644 index 994aef94459..00000000000 --- a/dlls/dnsapi/ns_name.c +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -#include "config.h" - -#ifdef HAVE_RESOLV - -#include <sys/types.h> - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif - -#include <ctype.h> -#include <errno.h> -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif -#include <string.h> - -/* Data. */ - -static const char digits[] = "0123456789"; - -/* Private. */ - -/* - * special(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this character special ("in need of quoting") ? - * return: - * boolean. - */ -static int -special(int ch) { - switch (ch) { - case 0x22: /* '"' */ - case 0x2E: /* '.' */ - case 0x3B: /* ';' */ - case 0x5C: /* '\\' */ - /* Special modifiers in zone files. */ - case 0x40: /* '@' */ - case 0x24: /* '$' */ - return (1); - default: - return (0); - } -} - -/* - * printable(ch) - * Thinking in noninternationalized USASCII (per the DNS spec), - * is this character visible and not a space when printed ? - * return: - * boolean. - */ -static int -printable(int ch) { - return (ch > 0x20 && ch < 0x7f); -} - -/* Public. */ - -/* - * dns_ns_name_ntop(src, dst, dstsiz) - * Convert an encoded domain name to printable ascii as per RFC1035. - * return: - * Number of bytes written to buffer, or -1 (with errno set) - * notes: - * The root is returned as "." - * All other domains are returned in non absolute form - */ -static int -dns_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { - const u_char *cp; - char *dn, *eom; - u_char c; - u_int n; - - cp = src; - dn = dst; - eom = dst + dstsiz; - - while ((n = *cp++) != 0) { - if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) { - /* Some kind of compression pointer. */ - return (-1); - } - if (dn != dst) { - if (dn >= eom) { - return (-1); - } - *dn++ = '.'; - } - - if (n == 0x41) { - n = *cp++ / 8; - if (dn + n * 2 + 4 >= eom) { - return (-1); - } - *dn++ = '\\'; - *dn++ = '['; - *dn++ = 'x'; - - while (n-- > 0) { - unsigned u; - c = *cp++; - u = c >> 4; - *dn++ = u > 9 ? 'a' + u - 10 : '0' + u; - u = c & 0xf; - *dn++ = u > 9 ? 'a' + u - 10 : '0' + u; - } - - *dn++ = ']'; - continue; - } - - if (dn + n >= eom) { - return (-1); - } - while (n-- > 0) { - c = *cp++; - if (special(c)) { - if (dn + 1 >= eom) { - return (-1); - } - *dn++ = '\\'; - *dn++ = (char)c; - } else if (!printable(c)) { - if (dn + 3 >= eom) { - return (-1); - } - *dn++ = '\\'; - *dn++ = digits[c / 100]; - *dn++ = digits[(c % 100) / 10]; - *dn++ = digits[c % 10]; - } else { - if (dn >= eom) { - return (-1); - } - *dn++ = (char)c; - } - } - } - if (dn == dst) { - if (dn >= eom) { - return (-1); - } - *dn++ = '.'; - } - if (dn >= eom) { - return (-1); - } - *dn++ = '\0'; - return (dn - dst); -} - - -/* - * dns_ns_name_unpack(msg, eom, src, dst, dstsiz) - * Unpack a domain name from a message, source may be compressed. - * return: - * -1 if it fails, or consumed octets if it succeeds. - */ -static int -dns_ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, - u_char *dst, size_t dstsiz) -{ - const u_char *srcp, *dstlim; - u_char *dstp; - int n, len, checked; - - len = -1; - checked = 0; - dstp = dst; - srcp = src; - dstlim = dst + dstsiz; - if (srcp < msg || srcp >= eom) { - return (-1); - } - /* Fetch next label in domain name. */ - while ((n = *srcp++) != 0) { - /* Check for indirection. */ - switch (n & NS_CMPRSFLGS) { - case 0x40: - if (n == 0x41) { - if (dstp + 1 >= dstlim) { - return (-1); - } - *dstp++ = 0x41; - n = *srcp++ / 8; - ++checked; - } else { - return (-1); /* flag error */ - } - /* FALLTHROUGH */ - case 0: - /* Limit checks. */ - if (dstp + n + 1 >= dstlim || srcp + n >= eom) { - return (-1); - } - checked += n + 1; - dstp = memcpy(dstp, srcp - 1, n + 1); - dstp += n + 1; - srcp += n; - break; - - case NS_CMPRSFLGS: - if (srcp >= eom) { - return (-1); - } - if (len < 0) - len = srcp - src + 1; - srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); - if (srcp < msg || srcp >= eom) { /* Out of range. */ - return (-1); - } - checked += 2; - /* - * Check for loops in the compressed name; - * if we've looked at the whole message, - * there must be a loop. - */ - if (checked >= eom - msg) { - return (-1); - } - break; - - default: - return (-1); /* flag error */ - } - } - *dstp = '\0'; - if (len < 0) - len = srcp - src; - return (len); -} - - -/* - * dns_ns_name_uncompress(msg, eom, src, dst, dstsiz) - * Expand compressed domain name to presentation format. - * return: - * Number of bytes read out of `src', or -1 (with errno set). - * note: - * Root domain returns as "." not "". - */ -int -dns_ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, - char *dst, size_t dstsiz) -{ - u_char tmp[NS_MAXCDNAME]; - int n; - - if ((n = dns_ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) - return (-1); - if (dns_ns_name_ntop(tmp, dst, dstsiz) == -1) - return (-1); - return (n); -} - - -/* - * dns_ns_name_skip(ptrptr, eom) - * Advance *ptrptr to skip over the compressed name it points at. - * return: - * 0 on success, -1 (with errno set) on failure. - */ -int -dns_ns_name_skip(const u_char **ptrptr, const u_char *eom) { - const u_char *cp; - u_int n; - - cp = *ptrptr; - while (cp < eom && (n = *cp++) != 0) { - /* Check for indirection. */ - switch (n & NS_CMPRSFLGS) { - case 0: /* normal case, n == len */ - cp += n; - continue; - case NS_CMPRSFLGS: /* indirection */ - cp++; - break; - default: /* illegal type */ - return (-1); - } - break; - } - if (cp > eom) { - return (-1); - } - *ptrptr = cp; - return (0); -} - -#endif /* HAVE_RESOLV */ diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c deleted file mode 100644 index df4933a82ad..00000000000 --- a/dlls/dnsapi/ns_parse.c +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright (c) 1996,1999 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -#include "config.h" - -#ifdef HAVE_RESOLV - -#include <sys/types.h> - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif - -#include <errno.h> -#ifdef HAVE_RESOLV_H -# include <resolv.h> -#endif -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" - -#include "dnsapi.h" - -/* Forward. */ - -static void setsection(ns_msg *msg, ns_sect sect); - -/* Macros. */ - -#define RETERR(err) do { return (-1); } while (0) - -#ifdef HAVE_NS_MSG__MSG_PTR -# define NS_PTR(ns_msg) ((ns_msg)->_msg_ptr) -#else -# define NS_PTR(ns_msg) ((ns_msg)->_ptr) -#endif - -#define DNS_NS_GET16(s, cp) do { \ - register const u_char *t_cp = (cp); \ - (s) = ((WORD)t_cp[0] << 8) \ - | ((WORD)t_cp[1]) \ - ; \ - (cp) += NS_INT16SZ; \ -} while (0) - -#define DNS_NS_GET32(l, cp) do { \ - register const u_char *t_cp = (cp); \ - (l) = ((DWORD)t_cp[0] << 24) \ - | ((DWORD)t_cp[1] << 16) \ - | ((DWORD)t_cp[2] << 8) \ - | ((DWORD)t_cp[3]) \ - ; \ - (cp) += NS_INT32SZ; \ -} while (0) - -/* Public. */ - -static int -dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { - const u_char *optr = ptr; - - while (count-- > 0) { - int rdlength; - - if (dns_ns_name_skip(&ptr, eom) < 0) - RETERR(EMSGSIZE); - ptr += NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/; - if (section != ns_s_qd) { - if (ptr + NS_INT32SZ + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - ptr += NS_INT32SZ/*TTL*/; - DNS_NS_GET16(rdlength, ptr); - ptr += rdlength/*RData*/; - } - } - if (ptr > eom) - RETERR(EMSGSIZE); - return (ptr - optr); -} - -int -dns_ns_initparse(const u_char *msg, int msglen, ns_msg *handle) { - const u_char *eom = msg + msglen; - int i; - - memset(handle, 0x5e, sizeof *handle); - handle->_msg = msg; - handle->_eom = eom; - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - DNS_NS_GET16(handle->_id, msg); - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - DNS_NS_GET16(handle->_flags, msg); - for (i = 0; i < ns_s_max; i++) { - if (msg + NS_INT16SZ > eom) - RETERR(EMSGSIZE); - DNS_NS_GET16(handle->_counts[i], msg); - } - for (i = 0; i < ns_s_max; i++) - if (handle->_counts[i] == 0) - handle->_sections[i] = NULL; - else { - int b = dns_ns_skiprr(msg, eom, (ns_sect)i, - handle->_counts[i]); - - if (b < 0) - return (-1); - handle->_sections[i] = msg; - msg += b; - } - if (msg != eom) - RETERR(EMSGSIZE); - setsection(handle, ns_s_max); - return (0); -} - -int -dns_ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { - int b; - - /* Make section right. */ - if (section >= ns_s_max) - RETERR(ENODEV); - if (section != handle->_sect) - setsection(handle, section); - - /* Make rrnum right. */ - if (rrnum == -1) - rrnum = handle->_rrnum; - if (rrnum < 0 || rrnum >= handle->_counts[(int)section]) - RETERR(ENODEV); - if (rrnum < handle->_rrnum) - setsection(handle, section); - if (rrnum > handle->_rrnum) { - b = dns_ns_skiprr(NS_PTR(handle), handle->_eom, section, - rrnum - handle->_rrnum); - - if (b < 0) - return (-1); - NS_PTR(handle) += b; - handle->_rrnum = rrnum; - } - - /* Do the parse. */ - b = dn_expand(handle->_msg, handle->_eom, - NS_PTR(handle), rr->name, NS_MAXDNAME); - if (b < 0) - return (-1); - NS_PTR(handle) += b; - if (NS_PTR(handle) + NS_INT16SZ + NS_INT16SZ > handle->_eom) - RETERR(EMSGSIZE); - DNS_NS_GET16(rr->type, NS_PTR(handle)); - DNS_NS_GET16(rr->rr_class, NS_PTR(handle)); - if (section == ns_s_qd) { - rr->ttl = 0; - rr->rdlength = 0; - rr->rdata = NULL; - } else { - if (NS_PTR(handle) + NS_INT32SZ + NS_INT16SZ > handle->_eom) - RETERR(EMSGSIZE); - DNS_NS_GET32(rr->ttl, NS_PTR(handle)); - DNS_NS_GET16(rr->rdlength, NS_PTR(handle)); - if (NS_PTR(handle) + rr->rdlength > handle->_eom) - RETERR(EMSGSIZE); - rr->rdata = NS_PTR(handle); - NS_PTR(handle) += rr->rdlength; - } - if (++handle->_rrnum > handle->_counts[(int)section]) - setsection(handle, (ns_sect)((int)section + 1)); - - /* All done. */ - return (0); -} - -/* Private. */ - -static void -setsection(ns_msg *msg, ns_sect sect) { - msg->_sect = sect; - if (sect == ns_s_max) { - msg->_rrnum = -1; - NS_PTR(msg) = NULL; - } else { - msg->_rrnum = 0; - NS_PTR(msg) = msg->_sections[(int)sect]; - } -} - -#endif diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index f540662dfd2..4c7a65eb264 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -162,7 +162,7 @@ static char *dns_dname_from_msg( ns_msg msg, const unsigned char *pos ) char *str, dname[NS_MAXDNAME] = "."; /* returns *compressed* length, ignore it */ - dns_ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); + ns_name_uncompress( ns_msg_base(msg), ns_msg_end(msg), pos, dname, sizeof(dname) ); len = strlen( dname ); str = heap_alloc( len + 1 ); @@ -282,7 +282,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W r->Data.MINFO.pNameMailbox = dns_dname_from_msg( msg, pos ); if (!r->Data.MINFO.pNameMailbox) return ERROR_NOT_ENOUGH_MEMORY; - if (dns_ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; r->Data.MINFO.pNameErrorsMailbox = dns_dname_from_msg( msg, pos ); @@ -343,7 +343,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W r->Data.SIG.pNameSigner = dns_dname_from_msg( msg, pos ); if (!r->Data.SIG.pNameSigner) return ERROR_NOT_ENOUGH_MEMORY; - if (dns_ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; /* FIXME: byte order? */ @@ -368,7 +368,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W r->Data.SOA.pNamePrimaryServer = dns_dname_from_msg( msg, pos ); if (!r->Data.SOA.pNamePrimaryServer) return ERROR_NOT_ENOUGH_MEMORY; - if (dns_ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; r->Data.SOA.pNameAdministrator = dns_dname_from_msg( msg, pos ); @@ -378,7 +378,7 @@ static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, W return ERROR_NOT_ENOUGH_MEMORY; } - if (dns_ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) + if (ns_name_skip( &pos, ns_msg_end( msg ) ) < 0) return DNS_ERROR_BAD_PACKET; r->Data.SOA.dwSerialNo = ntohl( *(const DWORD *)pos ); pos += sizeof(DWORD); @@ -447,7 +447,7 @@ static DNS_STATUS dns_copy_record( ns_msg msg, ns_sect section, WORD dlen; ns_rr rr; - if (dns_ns_parserr( &msg, section, num, &rr ) < 0) + if (ns_parserr( &msg, section, num, &rr ) < 0) return DNS_ERROR_BAD_PACKET; if (!(record = heap_alloc_zero( dns_get_record_size( &rr ) ))) @@ -615,7 +615,7 @@ static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECOR goto exit; } - if (dns_ns_initparse( answer, len, &msg ) < 0) + if (ns_initparse( answer, len, &msg ) < 0) { ret = DNS_ERROR_BAD_PACKET; goto exit; -- 2.30.2

1 0

[PATCH] mfplat: Add Lock()/Unlock() for d3d11 buffers.
by Nikolay Sivov 30 Mar '21

30 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 65 +++++++++++++++++++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 12 +------ 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 77767c27d94..f428630ea01 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -914,16 +914,73 @@ static void dxgi_surface_buffer_unmap(struct buffer *buffer) static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **data, DWORD *max_length, DWORD *current_length) { - FIXME("%p, %p, %p, %p.\n", iface, data, max_length, current_length); + struct buffer *buffer = impl_from_IMFMediaBuffer(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p.\n", iface, data, max_length, current_length); + + if (!data) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.linear_buffer && buffer->_2d.locks) + hr = MF_E_INVALIDREQUEST; + else if (!buffer->_2d.linear_buffer) + { + if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + { + hr = dxgi_surface_buffer_map(buffer); + if (SUCCEEDED(hr)) + { + MFCopyImage(buffer->_2d.linear_buffer, buffer->_2d.width, buffer->dxgi_surface.map_desc.pData, + buffer->dxgi_surface.map_desc.RowPitch, buffer->_2d.width, buffer->_2d.height); + } + } + } + + if (SUCCEEDED(hr)) + { + ++buffer->_2d.locks; + *data = buffer->_2d.linear_buffer; + if (max_length) + *max_length = buffer->_2d.plane_size; + if (current_length) + *current_length = buffer->_2d.plane_size; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) { - FIXME("%p.\n", iface); + struct buffer *buffer = impl_from_IMFMediaBuffer(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.linear_buffer) + hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + else if (!--buffer->_2d.locks) + { + MFCopyImage(buffer->dxgi_surface.map_desc.pData, buffer->dxgi_surface.map_desc.RowPitch, + buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); + dxgi_surface_buffer_unmap(buffer); + + heap_free(buffer->_2d.linear_buffer); + buffer->_2d.linear_buffer = NULL; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current_length) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1e84acd08fa..c21a57be27f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6479,31 +6479,24 @@ static void test_dxgi_surface_buffer(void) max_length = cur_length = 0; data = NULL; hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(max_length && max_length == cur_length, "Unexpected length %u.\n", max_length); -} if (data) *(DWORD *)data = ~0u; color = get_d3d11_texture_color(texture, 0, 0); ok(!color, "Unexpected texture color %#x.\n", color); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_d3d11_texture_color(texture, 0, 0); -todo_wine ok(color == ~0u, "Unexpected texture color %#x.\n", color); hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); + ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Lock2D()/Unlock2D() */ @@ -6526,7 +6519,6 @@ todo_wine ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); -todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); hr = IMF2DBuffer_Unlock2D(_2d_buffer); @@ -6906,11 +6898,9 @@ todo_wine IMFDXGIBuffer_Release(dxgi_buffer); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample); -- 2.30.2

1 0

[PATCH] gdi32: Do not crash when calling ModifyWorldTransform() with a NULL xform parameter.
by Zhiyi Zhang 30 Mar '21

30 Mar '21

EMFDRV_ModifyWorldTransform() does direct struct copy through pointer dereference. And, when the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/mapping.c | 9 +++------ dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 83582846486..a0feee0abb1 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -276,12 +276,7 @@ BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD switch (mode) { case MWT_IDENTITY: - dc->xformWorld2Wnd.eM11 = 1.0f; - dc->xformWorld2Wnd.eM12 = 0.0f; - dc->xformWorld2Wnd.eM21 = 0.0f; - dc->xformWorld2Wnd.eM22 = 1.0f; - dc->xformWorld2Wnd.eDx = 0.0f; - dc->xformWorld2Wnd.eDy = 0.0f; + dc->xformWorld2Wnd = *xform; break; case MWT_LEFTMULTIPLY: CombineTransform( &dc->xformWorld2Wnd, xform, &dc->xformWorld2Wnd ); @@ -554,10 +549,12 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, */ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) { + static const XFORM identity_xform = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; BOOL ret = FALSE; DC *dc; if (!xform && mode != MWT_IDENTITY) return FALSE; + if (mode == MWT_IDENTITY) xform = &identity_xform; if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pModifyWorldTransform ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n"); -- 2.27.0

2 1

[PATCH] dhtmled.ocx: Add stub IOleControl interface.
by Vijay Kiran Kamuju 30 Mar '21

30 Mar '21

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/edit.c | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 53dcdfc9ac6..e111f0b7979 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleControl IOleControl_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -50,6 +51,11 @@ static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); } +static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -83,6 +89,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IPersistStreamInit_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IOleControl)) + { + dhtml_edit_addref(This); + *out = &This->IOleControl_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -858,6 +870,59 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IOleControl(iface), iid, out); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + return dhtml_edit_addref(impl_from_IOleControl(iface)); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + return dhtml_edit_release(impl_from_IOleControl(iface)); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -874,6 +939,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

1 0

[PATCH 01/10] ntdll: Add stub for RtlLCIDToCultureName.
by Mark Harmstone 30 Mar '21

30 Mar '21

This is a series of patches to support MUI, Microsoft's resource direction feature introduced with Vista. I'm not sure whether this should be staging or not... With these patches, modern versions of Notepad will work, at least up to 1909 or so (which requires some stuff to do with shcore). You will need to have en-US\notepad.exe.mui placed relative to the main EXE. See https://bugs.winehq.org/show_bug.cgi?id=43670 - I couldn't actually get Paint to work as it fails with some (unrelated?) Ribbon stuff, but YMMV. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/mui.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + 3 files changed, 40 insertions(+) create mode 100644 dlls/ntdll/mui.c diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 179d00b29ef..0e7a8bf3b96 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ loader.c \ locale.c \ misc.c \ + mui.c \ nt.c \ path.c \ printf.c \ diff --git a/dlls/ntdll/mui.c b/dlls/ntdll/mui.c new file mode 100644 index 00000000000..4a9af642f47 --- /dev/null +++ b/dlls/ntdll/mui.c @@ -0,0 +1,38 @@ +/* + * MUI functions + * + * Copyright 2021 Mark Harmstone + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mui); + +/*********************************************************************** + * RtlLCIDToCultureName (NTDLL.@) + * + * Return the text name of a numeric language ID. + */ +BOOLEAN WINAPI RtlLCIDToCultureName( LCID lcid, PUNICODE_STRING string ) +{ + FIXME("(%04x, %p)\n", lcid, string); + + return FALSE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c8622ba21f4..d27aaf1da58 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -827,6 +827,7 @@ @ stdcall -arch=win32 -ret64 RtlLargeIntegerShiftRight(int64 long) @ stdcall -arch=win32 -ret64 RtlLargeIntegerSubtract(int64 int64) @ stdcall RtlLargeIntegerToChar(ptr long long ptr) +@ stdcall RtlLCIDToCultureName(long ptr) @ stdcall RtlLeaveCriticalSection(ptr) @ stdcall RtlLengthRequiredSid(long) @ stdcall RtlLengthSecurityDescriptor(ptr) -- 2.26.3

4 18

[PATCH] tdh: add TdhLoadManifestFromBinary stub (resend)
by Austin English 30 Mar '21

30 Mar '21

-- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

1 0

[resend PATCH 1/2] ntdll: Implement NtQuerySystemInformationEx(SystemCpuSetInformation).
by Paul Gofman 29 Mar '21

29 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- resend: - rebased the patch. dlls/ntdll/tests/info.c | 87 +++++++++++++++++++++++++++- dlls/ntdll/unix/system.c | 121 +++++++++++++++++++++++++++++++++++++++ include/winnt.h | 41 +++++++++++++ include/winternl.h | 1 + 4 files changed, 249 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85c523881ef..80ad333031c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -21,6 +21,7 @@ #include "ntdll_test.h" #include <winnls.h> #include <stdio.h> +#include "wine/heap.h" static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); @@ -46,8 +47,8 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); - static BOOL is_wow64; +static const BOOL is_win64 = sizeof(void *) > sizeof(int); /* one_before_last_pid is used to be able to compare values of a still running process with the output of the test_query_process_times and test_query_process_handlecount tests. @@ -1099,6 +1100,89 @@ static void test_query_logicalprocex(void) HeapFree(GetProcessHeap(), 0, infoex_group); } +static void test_query_cpusetinfo(void) +{ + SYSTEM_CPU_SET_INFORMATION *info; + unsigned int i, cpu_count; + ULONG len, expected_len; + NTSTATUS status; + SYSTEM_INFO si; + HANDLE process; + + if (!pNtQuerySystemInformationEx) + return; + + GetSystemInfo(&si); + cpu_count = si.dwNumberOfProcessors; + expected_len = cpu_count * sizeof(*info); + + process = GetCurrentProcess(); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + if (status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemCpuSetInformation is not supported\n"); + return; + } + + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemCpuSetInformation, NULL, 0, &len); + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_INVALID_INFO_CLASS), + "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected len %u.\n", len); + + len = 0xdeadbeef; + process = (HANDLE)0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + process = NULL; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, 4 * sizeof(process), NULL, 0, &len); + ok(status == (is_win64 ? STATUS_INVALID_PARAMETER : STATUS_BUFFER_TOO_SMALL), + "Got unexpected status %#x.\n", status); + ok(len == (is_win64 ? 0xdeadbeef : expected_len), "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, NULL, sizeof(process), NULL, 0, &len); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + len = 0xdeadbeef; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), NULL, + expected_len, &len); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(len == 0xdeadbeef, "Got unexpected length %u.\n", len); + + info = heap_alloc(expected_len); + len = 0; + status = pNtQuerySystemInformationEx(SystemCpuSetInformation, &process, sizeof(process), info, expected_len, &len); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(len == expected_len, "Got unexpected length %u.\n", len); + + for (i = 0; i < cpu_count; ++i) + { + SYSTEM_CPU_SET_INFORMATION *d = &info[i]; + + ok(d->Size == sizeof(*d), "Got unexpected size %u, i %u.\n", d->Size, i); + ok(d->Type == CpuSetInformation, "Got unexpected type %u, i %u.\n", d->Type, i); + ok(d->CpuSet.Id == 0x100 + i, "Got unexpected Id %#x, i %u.\n", d->CpuSet.Id, i); + ok(!d->CpuSet.Group, "Got unexpected Group %u, i %u.\n", d->CpuSet.Group, i); + ok(d->CpuSet.LogicalProcessorIndex == i, "Got unexpected LogicalProcessorIndex %u, i %u.\n", + d->CpuSet.LogicalProcessorIndex, i); + ok(!d->CpuSet.AllFlags, "Got unexpected AllFlags %#x, i %u.\n", d->CpuSet.AllFlags, i); + } + heap_free(info); +} + static void test_query_firmware(void) { static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); @@ -3059,6 +3143,7 @@ START_TEST(info) test_query_regquota(); test_query_logicalproc(); test_query_logicalprocex(); + test_query_cpusetinfo(); test_query_firmware(); test_query_data_alignment(); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6fa71ddfb91..859193944aa 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1166,6 +1166,98 @@ static NTSTATUS create_logical_proc_info( SYSTEM_LOGICAL_PROCESSOR_INFORMATION * } #endif +static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *proc_info; + BYTE core_index, cache_index, max_cache_level; + unsigned int i, j, count; + BYTE *proc_info_buffer; + DWORD cpu_info_size; + ULONG64 cpu_mask; + NTSTATUS status; + + count = NtCurrentTeb()->Peb->NumberOfProcessors; + + cpu_info_size = 3 * sizeof(*proc_info); + if (!(proc_info_buffer = malloc(cpu_info_size))) + return STATUS_NO_MEMORY; + + if ((status = create_logical_proc_info(NULL, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **)&proc_info_buffer, + &cpu_info_size, RelationAll))) + { + free(proc_info_buffer); + return status; + } + + max_cache_level = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; (BYTE *)proc_info != proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationCache) + { + if (max_cache_level < proc_info->u.Cache.Level) + max_cache_level = proc_info->u.Cache.Level; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + memset(info, 0, count * sizeof(*info)); + + core_index = 0; + cache_index = 0; + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)proc_info_buffer; + for (i = 0; i < count; ++i) + { + info[i].Size = sizeof(*info); + info[i].Type = CpuSetInformation; + info[i].u.CpuSet.Id = 0x100 + i; + info[i].u.CpuSet.LogicalProcessorIndex = i; + } + + for (i = 0; (BYTE *)proc_info != (BYTE *)proc_info_buffer + cpu_info_size; ++i) + { + if (proc_info->Relationship == RelationProcessorCore) + { + if (proc_info->u.Processor.GroupCount != 1) + { + FIXME("Unsupported group count %u.\n", proc_info->u.Processor.GroupCount); + continue; + } + cpu_mask = proc_info->u.Processor.GroupMask[0].Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + { + info[j].u.CpuSet.CoreIndex = core_index; + info[j].u.CpuSet.EfficiencyClass = proc_info->u.Processor.EfficiencyClass; + } + ++core_index; + } + else if (proc_info->Relationship == RelationCache) + { + if (proc_info->u.Cache.Level == max_cache_level) + { + cpu_mask = proc_info->u.Cache.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.LastLevelCacheIndex = cache_index; + } + ++cache_index; + } + else if (proc_info->Relationship == RelationNumaNode) + { + cpu_mask = proc_info->u.NumaNode.GroupMask.Mask; + for (j = 0; j < count; ++j) + if (((ULONG64)1 << j) & cpu_mask) + info[j].u.CpuSet.NumaNodeIndex = proc_info->u.NumaNode.NodeNumber; + } + proc_info = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((BYTE *)proc_info + proc_info->Size); + } + + free(proc_info_buffer); + + return STATUS_SUCCESS; +} + #ifdef linux static void copy_smbios_string( char **buffer, char *s, size_t len ) @@ -2651,6 +2743,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + return is_win64 ? NtQuerySystemInformationEx(class, NULL, 0, info, size, ret_size) + : STATUS_INVALID_INFO_CLASS; + case SystemRecommendedSharedDataAlignment: { len = sizeof(DWORD); @@ -2773,6 +2869,31 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, break; } + case SystemCpuSetInformation: + { + unsigned int cpu_count = NtCurrentTeb()->Peb->NumberOfProcessors; + PROCESS_BASIC_INFORMATION pbi; + HANDLE process; + + if (!query || query_len < sizeof(HANDLE) || (is_win64 && query_len != sizeof(HANDLE))) + return STATUS_INVALID_PARAMETER; + + process = *(HANDLE *)query; + if (process && (ret = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL))) + return ret; + + if (size < (len = cpu_count * sizeof(SYSTEM_CPU_SET_INFORMATION))) + { + ret = STATUS_BUFFER_TOO_SMALL; + break; + } + if (!info) + return STATUS_ACCESS_VIOLATION; + + if ((ret = create_cpuset_info(info))) + return ret; + break; + } default: FIXME( "(0x%08x,%p,%u,%p,%u,%p) stub\n", class, query, query_len, info, size, ret_size ); break; diff --git a/include/winnt.h b/include/winnt.h index 0a6027118fe..840966f657b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6726,6 +6726,47 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +typedef enum _CPU_SET_INFORMATION_TYPE +{ + CpuSetInformation, +} CPU_SET_INFORMATION_TYPE, *PCPU_SET_INFORMATION_TYPE; + +typedef struct _SYSTEM_CPU_SET_INFORMATION +{ + DWORD Size; + CPU_SET_INFORMATION_TYPE Type; + union + { + struct + { + DWORD Id; + WORD Group; + BYTE LogicalProcessorIndex; + BYTE CoreIndex; + BYTE LastLevelCacheIndex; + BYTE NumaNodeIndex; + BYTE EfficiencyClass; + union + { + BYTE AllFlags; + struct + { + BYTE Parked : 1; + BYTE Allocated : 1; + BYTE AllocatedToTargetProcess : 1; + BYTE RealTime : 1; + BYTE ReservedFlags : 4; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; + union { + DWORD Reserved; + BYTE SchedulingClass; + }; + DWORD64 AllocationTag; + } CpuSet; + } DUMMYUNIONNAME; +} SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; diff --git a/include/winternl.h b/include/winternl.h index fcdedaec8aa..c8fb7031d91 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemCpuSetInformation = 175, SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -- 2.30.2

3 5

[PATCH v3 1/4] wined3d: Handle different slice pitches in uncompressed texture updates.
by Jan Sikorski 29 Mar '21

29 Mar '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 72 ++++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 752b6b4cf9b..22bd8cc34b7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2137,10 +2137,10 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format, GLenum target, - unsigned int level, unsigned int src_row_pitch, unsigned int dst_x, unsigned int dst_y, - unsigned int dst_z, unsigned int update_w, unsigned int update_h, unsigned int update_d, - const BYTE *addr, BOOL srgb, struct wined3d_texture *dst_texture, - const struct wined3d_gl_info *gl_info) + unsigned int level, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int update_w, + unsigned int update_h, unsigned int update_d, const BYTE *addr, BOOL srgb, + struct wined3d_texture *dst_texture, const struct wined3d_gl_info *gl_info) { const struct wined3d_format_gl *format_gl = wined3d_format_gl(src_format); @@ -2213,17 +2213,19 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format } else { - unsigned int y, y_count; + unsigned int y, y_count, z, z_count; + bool unpacking_rows = false; TRACE("Uploading data, target %#x, level %u, x %u, y %u, z %u, " "w %u, h %u, d %u, format %#x, type %#x, addr %p.\n", target, level, dst_x, dst_y, dst_z, update_w, update_h, update_d, format_gl->format, format_gl->type, addr); - if (src_row_pitch) + if (src_row_pitch && !(src_row_pitch % src_format->byte_count)) { gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / src_format->byte_count); y_count = 1; + unpacking_rows = true; } else { @@ -2231,25 +2233,47 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format update_h = 1; } - for (y = 0; y < y_count; ++y) + if (src_slice_pitch && unpacking_rows && !(src_slice_pitch % src_row_pitch)) { - if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z, - update_w, update_h, update_d, format_gl->format, format_gl->type, addr)); - } - else if (target == GL_TEXTURE_1D) - { - gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, - update_w, format_gl->format, format_gl->type, addr); - } - else + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, src_slice_pitch / src_row_pitch); + z_count = 1; + } + else if (src_slice_pitch && !unpacking_rows && !(src_slice_pitch % (update_w * src_format->byte_count))) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, + src_slice_pitch / (update_w * src_format->byte_count)); + z_count = 1; + } + else + { + z_count = update_d; + update_d = 1; + } + + for (z = 0; z < z_count; ++z) + { + for (y = 0; y < y_count; ++y) { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, - update_w, update_h, format_gl->format, format_gl->type, addr); + const BYTE *upload_addr = &addr[z * src_slice_pitch + y * src_row_pitch]; + if (target == GL_TEXTURE_2D_ARRAY || target == GL_TEXTURE_3D) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y + y, dst_z + z, update_w, + update_h, update_d, format_gl->format, format_gl->type, upload_addr)); + } + else if (target == GL_TEXTURE_1D) + { + gl_info->gl_ops.gl.p_glTexSubImage1D(target, level, dst_x, + update_w, format_gl->format, format_gl->type, upload_addr); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y + y, + update_w, update_h, format_gl->format, format_gl->type, upload_addr); + } } } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0); checkGLcall("Upload texture data"); } } @@ -2462,8 +2486,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, - dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_slice_pitch, dst_x, + dst_y, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); @@ -2477,8 +2501,8 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, + dst_y, dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); if (bo.buffer_object) { -- 2.31.0

4 11

[PATCH 1/7] reg: Use RegOpenKeyExW() instead of RegOpenKeyW()
by Hugh McMaster 29 Mar '21

29 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 6ead3fc6919..0f263e91902 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return 0; } - if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key)) { output_message(STRING_CANNOT_FIND); return 1; -- 2.31.0

2 7

[tools] testbot/TestLauncher: Import some sanity checks from WineTest.
by Francois Gouget 29 Mar '21

29 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- check_wow64_registry() and check_mount_mgr() are the most likely to detect Wine / WoW breakage. check_display_driver() would likely always work... except if the display driver is being actively worked on or something went wrong when setting up the test VM. Similarly running_on_visible_desktop() would likely only trigger if the VM configration went wrong. But I think it makes sense to have the same set of sanity checks as WineTest. --- testbot/src/TestLauncher/TestLauncher.c | 106 ++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2a423d211..b024714ac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -21,6 +21,7 @@ */ #include <stdio.h> +#include <assert.h> #include <errno.h> #include <windows.h> @@ -49,6 +50,90 @@ void Error(const char* Format, ...) } +/* + * Configuration / wineprefix sanity checks (from winetest.exe) + */ + +static BOOL is_wow64(void) +{ + BOOL is_wow64; + BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); + HANDLE hkernel32 = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); + if (!pIsWow64Process || !pIsWow64Process(GetCurrentProcess(), &is_wow64)) + return FALSE; + return is_wow64; +} + +static BOOL running_under_wine (void) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + + if (!module) return FALSE; + return (GetProcAddress(module, "wine_server_call") != NULL); +} + +static BOOL check_mount_mgr(void) +{ + HANDLE handle = CreateFileA( "\\\\.\\MountPointManager", GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + CloseHandle( handle ); + return TRUE; +} + +static BOOL check_wow64_registry(void) +{ + char buffer[MAX_PATH]; + DWORD type, size = MAX_PATH; + HKEY hkey; + BOOL ret; + + if (!is_wow64()) return TRUE; + if (RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey )) + return FALSE; + ret = !RegQueryValueExA( hkey, "ProgramFilesDir (x86)", NULL, &type, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + return ret; +} + +static BOOL check_display_driver(void) +{ + HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + 0, 0, GetModuleHandleA(0), 0 ); + if (!hwnd) return FALSE; + DestroyWindow( hwnd ); + return TRUE; +} + +static BOOL running_on_visible_desktop (void) +{ + HWND desktop; + HMODULE huser32 = GetModuleHandleA("user32.dll"); + HWINSTA (WINAPI *pGetProcessWindowStation)(void); + BOOL (WINAPI *pGetUserObjectInformationA)(HANDLE,INT,LPVOID,DWORD,LPDWORD); + + pGetProcessWindowStation = (void *)GetProcAddress(huser32, "GetProcessWindowStation"); + pGetUserObjectInformationA = (void *)GetProcAddress(huser32, "GetUserObjectInformationA"); + + desktop = GetDesktopWindow(); + if (!GetWindowLongPtrW(desktop, GWLP_WNDPROC)) /* Win9x */ + return IsWindowVisible(desktop); + + if (pGetProcessWindowStation && pGetUserObjectInformationA) + { + DWORD len; + HWINSTA wstation; + USEROBJECTFLAGS uoflags; + + wstation = pGetProcessWindowStation(); + assert(pGetUserObjectInformationA(wstation, UOI_FLAGS, &uoflags, sizeof(uoflags), &len)); + return (uoflags.dwFlags & WSF_VISIBLE) != 0; + } + return IsWindowVisible(desktop); +} + + /* * Missing dll and entry point detection. */ @@ -152,6 +237,8 @@ int main(int argc, char *argv[]) p++; } + /* Command line parsing and validation */ + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -230,6 +317,25 @@ int main(int argc, char *argv[]) return 1; } + /* Configuration / wineprefix sanity checks (from winetest.exe) */ + + if (!running_on_visible_desktop()) + Error("Tests must be run on a visible desktop\n"); + + if (running_under_wine()) + { + if (!check_mount_mgr()) + Error("Mount manager not running, most likely your WINEPREFIX wasn't created correctly\n"); + + if (!check_wow64_registry()) + Error("WoW64 keys missing, most likely your WINEPREFIX wasn't created correctly\n"); + + if (!check_display_driver()) + Error("Unable to create a window, the display driver is not working\n"); + } + + /* Run the test */ + Start = GetTickCount(); printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); -- 2.20.1

1 0

[PATCH] winetest: Clarify the 'version not present' error.
by Francois Gouget 29 Mar '21

29 Mar '21

Most of the time the library is actually missing (or only available in the wrong bitness). Show the error code to help diagnose the other cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index eaf83a48f62..0571c797666 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -135,8 +135,10 @@ static char * get_file_version(char * file_name) heap_free(data); } else sprintf(version, "version error %u", ERROR_OUTOFMEMORY); - } else - sprintf(version, "version not present"); + } else if (GetLastError() == ERROR_FILE_NOT_FOUND) + sprintf(version, "dll is missing"); + else + sprintf(version, "version not present %u", GetLastError()); return version; } -- 2.20.1

1 0

[PATCH] winetest: Detect and report the missing side-by-side version errors.
by Francois Gouget 29 Mar '21

29 Mar '21

This replaces the 'load error 14001' error message with a clearer 'dll is missing' information message. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- Not having the expected dll version is more a test environment issue than a bug in the test, even if in some cases we may want to adjust the test to be less picky. See the following wtbsuite test: WTBS Missing side-by-side version (atl80:atl). --- programs/winetest/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0571c797666..107151c927f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -987,6 +987,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP break; case STATUS_DLL_NOT_FOUND: xprintf (" %s=dll is missing\n", dllname); + /* or it is a side-by-side dll but the test has no manifest */ break; case STATUS_ORDINAL_NOT_FOUND: xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); @@ -994,6 +995,9 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP case STATUS_ENTRYPOINT_NOT_FOUND: xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); break; + case ERROR_SXS_CANT_GEN_ACTCTX: + xprintf (" %s=dll is missing the requested side-by-side version\n", dllname); + break; default: xprintf (" %s=load error %u\n", dllname, err); break; -- 2.20.1

1 0

[PATCH 1/2] mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement.
by Jacek Caban 29 Mar '21

29 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40821 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 32 ++++++++++++++++++++++++-------- dlls/mshtml/tests/dom.js | 8 ++++++++ 2 files changed, 32 insertions(+), 8 deletions(-)

2 1

[PATCH 3/3] mshtml: Support DispHTMLHeadElement interface.
by Jacek Caban 29 Mar '21

29 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50492 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlhead.c | 2 ++ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 3 insertions(+)

2 1

[PATCH 2/3] mshtml: Support deleting object properties.
by Jacek Caban 29 Mar '21

29 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 41 +++++++++-- dlls/mshtml/tests/documentmode.js | 109 ++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 6 deletions(-)

2 1

[PATCH 1/3] mshtml: Don't use UAS_EXACTLEGACY in navigator object.
by Jacek Caban 29 Mar '21

29 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 1 - dlls/mshtml/tests/documentmode.js | 3 ++- dlls/mshtml/tests/dom.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-)

2 1

[PATCH] dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions
by Vijay Kiran Kamuju 29 Mar '21

29 Mar '21

This time without tests as the ocx file is not available from windows 7 & IE 8 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50697 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 2/2] mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent.
by Jacek Caban 29 Mar '21

29 Mar '21

From: Dmitry Kislyuk <dimaki(a)rocketmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50875 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[PATCH] po: Update German translation.
by Julian Rüger 29 Mar '21

29 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] riched20: Destroy the context before sending the notification.
by Huw Davies 29 Mar '21

29 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 979eb3e7365..ad9f504db8e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -104,17 +104,16 @@ void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); } } + + DeleteObject( SelectObject( hDC, brush ) ); + SelectClipRgn( hDC, oldRgn ); + if (oldRgn) DeleteObject( oldRgn ); + ME_DestroyContext( &c ); + if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth; - - DeleteObject( SelectObject( hDC, brush ) ); - SelectClipRgn(hDC, oldRgn); - if (oldRgn) - DeleteObject(oldRgn); - - ME_DestroyContext(&c); } void ME_Repaint(ME_TextEditor *editor) -- 2.23.0

1 0

[PATCH 1/5] dwrite: Introduce callback interface to initialize freetype face objects.
by Nikolay Sivov 29 Mar '21

29 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 17 +++++- dlls/dwrite/font.c | 79 +++++++++++++++++++++++++ dlls/dwrite/freetype.c | 108 ++++++++++++++--------------------- dlls/dwrite/main.c | 6 +- 4 files changed, 141 insertions(+), 69 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 47be661555c..5e41455f66d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -486,9 +486,6 @@ extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) DECLSPEC_HIDDEN; -extern BOOL init_freetype(void) DECLSPEC_HIDDEN; -extern void release_freetype(void) DECLSPEC_HIDDEN; - extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; @@ -734,3 +731,17 @@ extern HRESULT shape_get_typographic_features(struct scriptshaping_context *cont unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *context, const unsigned int *scripts, unsigned int tag, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; + +struct font_data_context; +extern HMODULE dwrite_module DECLSPEC_HIDDEN; + +struct font_callback_funcs +{ + int (CDECL *get_font_data)(void *key, const void **data_ptr, UINT64 *data_size, unsigned int *index, + struct font_data_context **context); + void (CDECL *release_font_data)(struct font_data_context *context); +}; + +extern NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) DECLSPEC_HIDDEN; +extern void init_font_backend(void) DECLSPEC_HIDDEN; +extern void release_font_backend(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 245a59d5f54..ca7ce8ca53a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7958,3 +7958,82 @@ HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 return S_OK; } + +struct font_data_context +{ + IDWriteFontFileStream *stream; + void *context; +}; + +static int CDECL get_font_data_cb(void *key, const void **data_ptr, UINT64 *data_size, + unsigned int *index, struct font_data_context **ret_context) +{ + IDWriteFontFace *fontface = key; + struct font_data_context *context; + IDWriteFontFileStream *stream; + IDWriteFontFile *file; + unsigned int count; + void *data_context; + HRESULT hr; + + *ret_context = NULL; + + count = 1; + if (FAILED(IDWriteFontFace_GetFiles(fontface, &count, &file))) return 1; + + hr = get_filestream_from_file(file, &stream); + IDWriteFontFile_Release(file); + if (FAILED(hr)) return 1; + + hr = IDWriteFontFileStream_GetFileSize(stream, data_size); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + hr = IDWriteFontFileStream_ReadFileFragment(stream, data_ptr, 0, *data_size, &data_context); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + if (!(context = heap_alloc(sizeof(*context)))) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + context->stream = stream; + context->context = data_context; + + *ret_context = context; + *index = IDWriteFontFace_GetIndex(fontface); + + return 0; +} + +static void CDECL release_font_data_cb(struct font_data_context *context) +{ + if (!context) return; + IDWriteFontFileStream_ReleaseFileFragment(context->stream, context->context); + IDWriteFontFileStream_Release(context->stream); + heap_free(context); +} + +struct font_callback_funcs callback_funcs = +{ + get_font_data_cb, + release_font_data_cb, +}; + +void init_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_ATTACH, &callback_funcs, NULL); +} + +void release_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_DETACH, &callback_funcs, NULL); +} diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 9e4001d11c2..c4bbbd4624c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -31,6 +31,8 @@ #include FT_TRUETYPE_TABLES_H #endif /* HAVE_FT2BUILD_H */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "wine/debug.h" @@ -60,6 +62,8 @@ typedef struct FT_Int patch; } FT_Version_t; +static const struct font_callback_funcs *callback_funcs; + #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); @@ -92,86 +96,44 @@ MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR static FT_Error (*pFT_Outline_EmboldenXY)(FT_Outline *, FT_Pos, FT_Pos); -struct face_finalizer_data -{ - IDWriteFontFileStream *stream; - void *context; -}; - static void face_finalizer(void *object) { FT_Face face = object; - struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data; - - IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context); - IDWriteFontFileStream_Release(data->stream); - heap_free(data); + callback_funcs->release_font_data((struct font_data_context *)face->generic.data); } static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) { - IDWriteFontFace *fontface = (IDWriteFontFace*)face_id; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; + struct font_data_context *context; const void *data_ptr; - UINT32 index, count; FT_Error fterror; UINT64 data_size; - void *context; - HRESULT hr; + UINT32 index; *face = NULL; - if (!fontface) { + if (!face_id) + { WARN("NULL fontface requested.\n"); return FT_Err_Ok; } - count = 1; - hr = IDWriteFontFace_GetFiles(fontface, &count, &file); - if (FAILED(hr)) - return FT_Err_Ok; - - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) + if (callback_funcs->get_font_data(face_id, &data_ptr, &data_size, &index, &context)) return FT_Err_Ok; - hr = IDWriteFontFileStream_GetFileSize(stream, &data_size); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - hr = IDWriteFontFileStream_ReadFileFragment(stream, &data_ptr, 0, data_size, &context); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - index = IDWriteFontFace_GetIndex(fontface); fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - if (fterror == FT_Err_Ok) { - struct face_finalizer_data *data; - - data = heap_alloc(sizeof(*data)); - data->stream = stream; - data->context = context; - - (*face)->generic.data = data; + if (fterror == FT_Err_Ok) + { + (*face)->generic.data = context; (*face)->generic.finalizer = face_finalizer; - return fterror; } else - IDWriteFontFileStream_ReleaseFileFragment(stream, context); - -fail: - IDWriteFontFileStream_Release(stream); + callback_funcs->release_font_data(context); return fterror; } -BOOL init_freetype(void) +static BOOL init_freetype(void) { FT_Version_t FT_Version; @@ -243,12 +205,6 @@ sym_not_found: return FALSE; } -void release_freetype(void) -{ - pFTC_Manager_Done(cache_manager); - pFT_Done_FreeType(library); -} - void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { EnterCriticalSection(&freetype_cs); @@ -790,17 +746,22 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return advance; } -#else /* HAVE_FREETYPE */ - -BOOL init_freetype(void) +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - return FALSE; + callback_funcs = ptr_in; + if (!init_freetype()) return STATUS_DLL_NOT_FOUND; + return STATUS_SUCCESS; } -void release_freetype(void) +static NTSTATUS release_freetype_lib(void) { + pFTC_Manager_Done(cache_manager); + pFT_Done_FreeType(library); + return STATUS_SUCCESS; } +#else /* HAVE_FREETYPE */ + void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { } @@ -838,4 +799,23 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return 0; } +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS release_freetype_lib(void) +{ + return STATUS_DLL_NOT_FOUND; +} + #endif /* HAVE_FREETYPE */ + +NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + if (reason == DLL_PROCESS_ATTACH) + return init_freetype_lib(module, reason, ptr_in, ptr_out); + else if (reason == DLL_PROCESS_DETACH) + return release_freetype_lib(); + return STATUS_SUCCESS; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3326b1550ce..41b81ae951b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +HMODULE dwrite_module = 0; static IDWriteFactory7 *shared_factory; static void release_shared_factory(IDWriteFactory7 *factory); @@ -42,14 +43,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) switch (reason) { case DLL_PROCESS_ATTACH: + dwrite_module = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - init_freetype(); + init_font_backend(); init_local_fontfile_loader(); break; case DLL_PROCESS_DETACH: if (reserved) break; release_shared_factory(shared_factory); - release_freetype(); + release_font_backend(); } return TRUE; } -- 2.30.2

1 4

[website] German translation for release 6.5
by Julian Rüger 29 Mar '21

29 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0.4
by Julian Rüger 29 Mar '21

29 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.4
by Julian Rüger 29 Mar '21

29 Mar '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] dwrite/tests: Add some tests for CreateFontCollectionFromFontSet().
by Nikolay Sivov 29 Mar '21

29 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 117 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 27c2a9d0b7d..54e279ea11e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -587,6 +587,20 @@ static BOOL has_face_variations(IDWriteFontFace *fontface) return ret; } +#define check_familymodel(a,b) _check_familymodel(a,b,__LINE__) +static void _check_familymodel(void *iface_ptr, DWRITE_FONT_FAMILY_MODEL expected_model, unsigned int line) +{ + IDWriteFontCollection2 *collection; + DWRITE_FONT_FAMILY_MODEL model; + + if (SUCCEEDED(IUnknown_QueryInterface((IUnknown *)iface_ptr, &IID_IDWriteFontCollection2, (void **)&collection))) + { + model = IDWriteFontCollection2_GetFontFamilyModel(collection); + ok_(__FILE__,line)(model == expected_model, "Unexpected family model %d, expected %d.\n", model, expected_model); + IDWriteFontCollection2_Release(collection); + } +} + struct test_fontenumerator { IDWriteFontFileEnumerator IDWriteFontFileEnumerator_iface; @@ -2441,7 +2455,6 @@ static void test_system_fontcollection(void) IDWriteFontCollection2 *collection2; IDWriteFontCollection3 *collection3; IDWriteFactory *factory, *factory2; - DWRITE_FONT_FAMILY_MODEL model; IDWriteFontFileLoader *loader; IDWriteFontFamily *family; IDWriteFontFace *fontface; @@ -2621,8 +2634,7 @@ static void test_system_fontcollection(void) todo_wine ok(!!event, "Expected event handle.\n"); - model = IDWriteFontCollection3_GetFontFamilyModel(collection3); - ok(model == DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, "Unexpected model.\n"); + check_familymodel(collection3, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE); IDWriteFontCollection3_Release(collection3); } @@ -9423,8 +9435,8 @@ static void test_AnalyzeContainerType(void) static void test_fontsetbuilder(void) { IDWriteFontFaceReference *ref, *ref2, *ref3; - IDWriteFontFaceReference1 *ref1; IDWriteFontCollection1 *collection; + IDWriteFontFaceReference1 *ref1; IDWriteFontSetBuilder1 *builder1; IDWriteFontSetBuilder *builder; DWRITE_FONT_AXIS_VALUE axis_values[4]; @@ -9457,12 +9469,36 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + if (SUCCEEDED(hr)) + { + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 1, "Unexpected family count %u.\n", count); + IDWriteFontCollection1_Release(collection); + } + IDWriteFontSet_Release(fontset); + hr = IDWriteFontSetBuilder1_AddFontFile(builder1, file); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); hr = IDWriteFontSetBuilder1_CreateFontSet(builder1, &fontset); ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + hr = IDWriteFactory3_CreateFontCollectionFromFontSet(factory, fontset, &collection); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + if (SUCCEEDED(hr)) + { + check_familymodel(collection, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 1, "Unexpected family count %u.\n", count); + IDWriteFontCollection1_Release(collection); + } + /* No attempt to eliminate duplicates. */ count = IDWriteFontSet_GetFontCount(fontset); ok(count == 2, "Unexpected font count %u.\n", count); @@ -10139,6 +10175,78 @@ static void test_system_font_set(void) IDWriteFactory3_Release(factory); } +static void test_CreateFontCollectionFromFontSet(void) +{ + unsigned int index, count, refcount; + IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder1 *builder; + DWRITE_FONT_PROPERTY props[1]; + IDWriteFontFaceReference *ref; + IDWriteFactory5 *factory; + IDWriteFontSet *fontset; + IDWriteFontFile *file; + WCHAR *path; + BOOL exists; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory5))) + { + win_skip("_CreateFontCollectionFromFontSet() is not available.\n"); + return; + } + + hr = IDWriteFactory5_CreateFontSetBuilder(factory, &builder); + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + path = create_testfontfile(test_fontfile); + + hr = IDWriteFactory5_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontSetBuilder1_AddFontFile(builder, file); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + /* Add same file, with explicit properties. */ + hr = IDWriteFactory5_CreateFontFaceReference_(factory, file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + props[0].propertyId = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME; + props[0].propertyValue = L"Another Font"; + props[0].localeName = L"en-US"; + hr = IDWriteFontSetBuilder1_AddFontFaceReference_(builder, ref, props, 1); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + IDWriteFontFaceReference_Release(ref); + + hr = IDWriteFontSetBuilder1_CreateFontSet(builder, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFactory5_CreateFontCollectionFromFontSet(factory, fontset, &collection); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + +if (SUCCEEDED(hr)) +{ + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + ok(count == 2, "Unexpected family count %u.\n", count); + + /* Explicit fontset properties are prioritized and not replaced by actual properties from a file. */ + exists = FALSE; + hr = IDWriteFontCollection1_FindFamilyName(collection, L"Another Font", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + ok(!!exists, "Unexpected return value %d.\n", exists); + + IDWriteFontCollection1_Release(collection); +} + IDWriteFontSet_Release(fontset); + + IDWriteFontSetBuilder1_Release(builder); + + IDWriteFontFile_Release(file); + refcount = IDWriteFactory5_Release(factory); + ok(!refcount, "Unexpected factory refcount %u.\n", refcount); + DELETE_FONTFILE(path); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10212,6 +10320,7 @@ START_TEST(font) test_expiration_event(); test_family_font_set(); test_system_font_set(); + test_CreateFontCollectionFromFontSet(); IDWriteFactory_Release(factory); } -- 2.30.2

1 0

[PATCH] mf/session: Handle MF_TOPONODE_DISABLE_PREROLL on sink nodes.
by Nikolay Sivov 29 Mar '21

29 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index aa96ffd33ca..c2334f82d62 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1232,6 +1232,7 @@ static DWORD session_get_object_rate_caps(IUnknown *object) static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) { struct media_sink *media_sink; + unsigned int disable_preroll = 0; DWORD flags; LIST_FOR_EACH_ENTRY(media_sink, &session->presentation.sinks, struct media_sink, entry) @@ -1248,7 +1249,8 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); - if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL) + IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_DISABLE_PREROLL, &disable_preroll); + if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL && !disable_preroll) { if (SUCCEEDED(IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaSinkPreroll, (void **)&media_sink->preroll))) session->presentation.flags |= SESSION_FLAG_NEEDS_PREROLL; -- 2.30.2

1 0

[PATCH v2 1/2] user32/tests: Add more tests of SetClipboardData().
by Jactry Zeng 29 Mar '21

29 Mar '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 201078. v2: - Split tests and fix into two patches. - Fix a format issue. --- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..aa5bbc9a52f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1779,10 +1779,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1895,6 +1899,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = OpenClipboard( hwnd ); + ok( r, "OpenClipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC(0), h, 0, 0, NULL, &bmi, 0 ); + todo_wine ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC(0), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.30.2

2 3

[PATCH] mshtml: Fix NULL offset parent handling in HTMLElement_get_offsetParent()
by Dmitry Kislyuk 28 Mar '21

28 Mar '21

2 1

[PATCH v2 resend 4/4] gdi32: Get rid of redundant ntmCellHeight member.
by Akihiro Sagawa 28 Mar '21

28 Mar '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 3/4] gdi32: Fix text metrics used in EnumFonts families.
by Akihiro Sagawa 28 Mar '21

28 Mar '21

In v2, use the default font height for non-scalable faces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-)

1 0

[PATCH v2 resend 2/4] gdi32: Move otmEMSquare initialization to freetype_load_font.
by Akihiro Sagawa 28 Mar '21

28 Mar '21

In preparation for the next commit. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/4] gdi32/tests: Remove unreliable height tests.
by Akihiro Sagawa 28 Mar '21

28 Mar '21

New in v2 to fix Alexandre's test failures. I decide to remove these tests because we'll add more reliable ones in the later patch. In detail, Latin Modern Math causes test failures at these points. The 212 height is too high. However, this is correct as manual test shows it is the same value in native. Moreover, the upper bound is a heuristic value. So, there might be a font face that is over 212 height. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 -- 1 file changed, 2 deletions(-)

1 0

Wine staging 6.5 release
by Alistair Leslie-Hughes 28 Mar '21

28 Mar '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.5 (661 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * windows.media.speech: Add stub dll. * windows.media.speech: Implement IInstalledVoicesStatic stub. * windows.media.speech: Implement IInstalledVoicesStatic::AllVoices stub. * windows.media.speech: Fake empty IInstalledVoicesStatic::AllVoices vector. * windows.gaming.input: Add stub dll. * windows.gaming.input: Implement IGamepadStatics stubs. * windows.gaming.input: Implement IGamepadStatics::Gamepads stubs. * opencl: Add OpenCL 1.0 function pointer loader. * opencl: Use function pointer instead of call the function directly. * opencl: Add OpenCL 1.1 implementation. * opencl: Add OpenCL 1.2 implementation. * opencl: Expose all extensions list to wine. * windows.gaming.input: Fake empty IGamepadStatics::Gamepads vector. * windows.gaming.input: Fake IEventHandler_Gamepad support. * windows.gaming.input: Implement IRawGameControllerStatics stubs. * windows.gaming.input: Implement IRawGameControllerStatics::RawGameControllers stubs. * windows.gaming.input: Fake empty IRawGameControllerStatics::RawGameControllers vector. * windows.gaming.input: Fake IEventHandler_RawGameController support. * ddraw: Allow setting texture without DDSCAPS_TEXTURE for software device. * windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion semi-stub. * windows.globalization: Implement IGlobalizationPreferencesStatics::Languages semi-stub. * windows.globalization: Fake empty IGlobalizationPreferencesStatics properties. Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 6/6] amstream/tests: Move WINE_NO_NAMELESS_EXTENSION to source file.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/amstream/tests/Makefile.in | 1 - dlls/amstream/tests/amstream.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/5] gdiplus/metafile: Fully initialize record header on allocation.
by Nikolay Sivov 27 Mar '21

27 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 175 ++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 115 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 41950eb31c7..d9fa9e77c91 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -639,7 +639,8 @@ static DWORD METAFILE_AddObjectId(GpMetafile *metafile) return (metafile->next_object_id++) % EmfPlusObjectTableSize; } -static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) +static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, EmfPlusRecordType record_type, + DWORD size, void **result) { DWORD size_needed; EmfPlusRecordHeader *record; @@ -679,6 +680,8 @@ static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void * metafile->comment_data_length += size; record = (EmfPlusRecordHeader*)*result; + record->Type = record_type; + record->Flags = 0; record->Size = size; record->DataSize = size - sizeof(EmfPlusRecordHeader); @@ -708,16 +711,12 @@ static GpStatus METAFILE_WriteHeader(GpMetafile *metafile, HDC hdc) { EmfPlusHeader *header; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusHeader), (void**)&header); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeHeader, sizeof(EmfPlusHeader), (void**)&header); if (stat != Ok) return stat; - header->Header.Type = EmfPlusRecordTypeHeader; - if (metafile->metafile_type == MetafileTypeEmfPlusDual) header->Header.Flags = 1; - else - header->Header.Flags = 0; header->Version = VERSION_MAGIC2; @@ -743,13 +742,10 @@ static GpStatus METAFILE_WriteEndOfFile(GpMetafile *metafile) { EmfPlusRecordHeader *record; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusRecordHeader), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeEndOfFile, sizeof(EmfPlusRecordHeader), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeEndOfFile; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -876,13 +872,10 @@ GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) EmfPlusRecordHeader *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusRecordHeader), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeGetDC, sizeof(EmfPlusRecordHeader), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeGetDC; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -898,12 +891,10 @@ GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) EmfPlusClear *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusClear), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeClear, sizeof(EmfPlusClear), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeClear; - record->Header.Flags = 0; record->Color = color; METAFILE_WriteRecords(metafile); @@ -1063,12 +1054,11 @@ static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GDIPCONST GpBrush stat = METAFILE_PrepareBrushData(brush, &size); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeBrush << 8; METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); return Ok; @@ -1110,13 +1100,12 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, if (integer_rects) flags |= 0x4000; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillRects, sizeof(EmfPlusFillRects) + count * (integer_rects ? sizeof(EmfPlusRect) : sizeof(GpRectF)), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillRects; record->Header.Flags = flags; record->BrushID = brushid; record->Count = count; @@ -1171,13 +1160,11 @@ GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, EmfPlusSetClipRect *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetClipRect), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetClipRect, + sizeof(EmfPlusSetClipRect), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSetClipRect; record->Header.Flags = (mode & 0xf) << 8; record->ClipRect.X = x; record->ClipRect.Y = y; @@ -1201,12 +1188,11 @@ static GpStatus METAFILE_AddRegionObject(GpMetafile *metafile, GpRegion *region, return Ok; size = write_region_data(region, NULL); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.region) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeRegion << 8; write_region_data(region, &object_record->ObjectData.region); return Ok; @@ -1227,10 +1213,9 @@ GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineM stat = METAFILE_AddRegionObject(metafile, region, &region_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetClipRegion, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeSetClipRegion; record->Flags = region_id | mode << 8; METAFILE_WriteRecords(metafile); @@ -1244,13 +1229,11 @@ GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale EmfPlusSetPageTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetPageTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetPageTransform, + sizeof(EmfPlusSetPageTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSetPageTransform; record->Header.Flags = unit; record->PageScale = scale; @@ -1267,14 +1250,11 @@ GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* tr EmfPlusSetWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetWorldTransform, + sizeof(EmfPlusSetWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSetWorldTransform; - record->Header.Flags = 0; memcpy(record->MatrixData, transform->matrix, sizeof(record->MatrixData)); METAFILE_WriteRecords(metafile); @@ -1290,13 +1270,11 @@ GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, Ma EmfPlusScaleWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusScaleWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeScaleWorldTransform, + sizeof(EmfPlusScaleWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeScaleWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->Sx = sx; record->Sy = sy; @@ -1314,13 +1292,11 @@ GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatri EmfPlusMultiplyWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusMultiplyWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeMultiplyWorldTransform, + sizeof(EmfPlusMultiplyWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeMultiplyWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); memcpy(record->MatrixData, matrix->matrix, sizeof(record->MatrixData)); @@ -1337,13 +1313,11 @@ GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixO EmfPlusRotateWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusRotateWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeRotateWorldTransform, + sizeof(EmfPlusRotateWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeRotateWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->Angle = angle; @@ -1360,13 +1334,11 @@ GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy EmfPlusTranslateWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusTranslateWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeTranslateWorldTransform, + sizeof(EmfPlusTranslateWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeTranslateWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->dx = dx; record->dy = dy; @@ -1384,15 +1356,11 @@ GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) EmfPlusRecordHeader *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusRecordHeader), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeResetWorldTransform, + sizeof(EmfPlusRecordHeader), (void **)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeResetWorldTransform; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -1407,11 +1375,10 @@ GpStatus METAFILE_BeginContainer(GpMetafile* metafile, GDIPCONST GpRectF *dstrec EmfPlusBeginContainer *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeBeginContainer, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeBeginContainer; record->Header.Flags = unit & 0xff; record->DestRect = *dstrect; record->SrcRect = *srcrect; @@ -1430,14 +1397,11 @@ GpStatus METAFILE_BeginContainerNoParams(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeBeginContainerNoParams, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeBeginContainerNoParams; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1453,14 +1417,11 @@ GpStatus METAFILE_EndContainer(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeEndContainer, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeEndContainer; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1476,14 +1437,11 @@ GpStatus METAFILE_SaveGraphics(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSave, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSave; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1499,14 +1457,11 @@ GpStatus METAFILE_RestoreGraphics(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeRestore, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeRestore; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -4363,7 +4318,7 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW if (stat != Ok) return stat; aligned_size = (size + 3) & ~3; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image.ImageData.bitmap.BitmapData[aligned_size]), (void**)&object_record); if (stat != Ok) @@ -4374,7 +4329,6 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW memset(object_record->ObjectData.image.ImageData.bitmap.BitmapData + size, 0, aligned_size - size); *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeBitmap; @@ -4394,13 +4348,12 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW size = GetEnhMetaFileBits(hemf, 0, NULL); if (!size) return GenericError; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image.ImageData.metafile.MetafileData[size]), (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeMetafile; @@ -4435,13 +4388,12 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp if (!attrs) return Ok; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image_attributes) + sizeof(EmfPlusImageAttributes), (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | (ObjectTypeImageAttributes << 8); attrs_record = &object_record->ObjectData.image_attributes; attrs_record->Version = VERSION_MAGIC2; @@ -4516,9 +4468,10 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, stat = METAFILE_AddImageAttributesObject(metafile, imageAttributes, &attributes_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawImagePoints, + sizeof(EmfPlusDrawImagePoints), (void **)&draw_image_record); if (stat != Ok) return stat; - draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; + draw_image_record->Header.Flags = image_id; draw_image_record->ImageAttributesID = attributes_id; draw_image_record->SrcUnit = UnitPixel; @@ -4540,10 +4493,9 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, prop, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Type = prop; record->Flags = val; METAFILE_WriteRecords(metafile); @@ -4561,13 +4513,12 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; size = write_path_data(path, NULL); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.path) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePath << 8; write_path_data(path, &object_record->ObjectData.path); return Ok; @@ -4649,13 +4600,12 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i stat = METAFILE_PrepareBrushData(pen->brush, &brush_size); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.pen.data) + pen_data_size + brush_size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePen << 8; object_record->ObjectData.pen.Version = VERSION_MAGIC2; object_record->ObjectData.pen.Type = 0; @@ -4758,7 +4708,8 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawPath), (void**)&draw_path_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawPath, + sizeof(EmfPlusDrawPath), (void **)&draw_path_record); if (stat != Ok) return stat; draw_path_record->Header.Type = EmfPlusRecordTypeDrawPath; draw_path_record->Header.Flags = path_id; @@ -4783,7 +4734,8 @@ GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) stat = METAFILE_AddPenObject(metafile, pen, &pen_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawEllipse), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawEllipse, + sizeof(EmfPlusDrawEllipse), (void **)&record); if (stat != Ok) return stat; record->Header.Type = EmfPlusRecordTypeDrawEllipse; record->Header.Flags = pen_id; @@ -4825,10 +4777,9 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillPath, sizeof(EmfPlusFillPath), (void**)&fill_path_record); if (stat != Ok) return stat; - fill_path_record->Header.Type = EmfPlusRecordTypeFillPath; if (inline_color) { fill_path_record->Header.Flags = 0x8000 | path_id; @@ -4864,9 +4815,8 @@ GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rec if (stat != Ok) return stat; } - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillEllipse), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillEllipse, sizeof(EmfPlusFillEllipse), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillEllipse; if (inline_color) { record->Header.Flags = 0x8000; @@ -4913,10 +4863,10 @@ GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *r is_int_rect = is_integer_rect(rect); - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusFillPie, RectData) + - is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillPie, + FIELD_OFFSET(EmfPlusFillPie, RectData) + is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), + (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillPie; if (inline_color) { record->Header.Flags = 0x8000; @@ -4964,7 +4914,7 @@ static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *f return stat; fn_len = lstrlenW(font->family->FamilyName); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.font.FamilyName[(fn_len + 1) & ~1]), (void**)&object_record); if (stat != Ok) @@ -4972,7 +4922,6 @@ static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *f *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeFont << 8; font_record = &object_record->ObjectData.font; @@ -5044,11 +4993,10 @@ GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, /* Pad record to DWORD alignment. */ alloc_size = (alloc_size + 3) & ~3; - stat = METAFILE_AllocateRecord(metafile, alloc_size, (void**)&draw_string_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawDriverString, alloc_size, (void**)&draw_string_record); if (stat != Ok) return stat; - draw_string_record->Header.Type = EmfPlusRecordTypeDrawDriverString; draw_string_record->Header.Flags = font_id; draw_string_record->DriverStringOptionsFlags = flags; draw_string_record->MatrixPresent = include_matrix; @@ -5129,12 +5077,11 @@ GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* reg if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillRegion), + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillRegion, sizeof(EmfPlusFillRegion), (void**)&fill_region_record); if (stat != Ok) return stat; - fill_region_record->Header.Type = EmfPlusRecordTypeFillRegion; fill_region_record->Header.Flags = region_id; if (inline_color) @@ -5176,13 +5123,12 @@ GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF } } - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawRects, RectData) + + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawRects, FIELD_OFFSET(EmfPlusDrawRects, RectData) + count * (integer_rects ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF)), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeDrawRects; record->Header.Flags = pen_id; if (integer_rects) record->Header.Flags |= 0x4000; @@ -5224,13 +5170,12 @@ GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, integer_rect = is_integer_rect(rect); - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawArc, RectData) + + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawArc, FIELD_OFFSET(EmfPlusDrawArc, RectData) + integer_rect ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeDrawArc; record->Header.Flags = pen_id; if (integer_rect) record->Header.Flags |= 0x4000; -- 2.30.2

2 9

[PATCH 5/6] gdiplus: Use nameless unions.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/image.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 30 deletions(-)

2 1

[PATCH] mscoree: Update Wine Mono to 6.1.0.
by Esme Povirk 27 Mar '21

27 Mar '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..7659efc9541 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "e430d054a14e6859ca3e4f849187ddb8d01032f8305f07684d3b27f0f870ce4a" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..3a5f7d80fcf 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.25.1

3 2

[PATCH 4/6] inetcomm/tests: Use nameless unions.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/inetcomm/tests/Makefile.in | 1 - dlls/inetcomm/tests/mimeintl.c | 16 ++++---- dlls/inetcomm/tests/mimeole.c | 66 ++++++++++++++++----------------- 3 files changed, 41 insertions(+), 42 deletions(-)

1 0

[PATCH 3/6] inetcomm: Use nameless unions.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/inetcomm/Makefile.in | 1 - dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- dlls/inetcomm/mimeole.c | 24 ++++++++++++------------ dlls/inetcomm/pop3transport.c | 12 ++++++------ dlls/inetcomm/protocol.c | 4 ++-- 5 files changed, 30 insertions(+), 31 deletions(-)

1 0

[PATCH 2/6] propsys/tests: Use nameless unions.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propsys.c | 248 ++++++++++++++++----------------- 2 files changed, 124 insertions(+), 125 deletions(-)

1 0

[PATCH 1/6] propsys: Use nameless unions.
by Jacek Caban 27 Mar '21

27 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/propsys/Makefile.in | 1 - dlls/propsys/propvar.c | 140 +++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 71 deletions(-)

1 0

[PATCH] Do not transfer primitive explicit binding handles to the server
by Eric Kohl 27 Mar '21

27 Mar '21

This patch fixes an incompatibility with MIDL. WIDL must not generate code that passes explicit primitive binding handles to the server. Calls to such functions fail on Windows XP. Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> --- tools/widl/typegen.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 26 Mar '21

26 Mar '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 191 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 145 insertions(+), 46 deletions(-) diff --git a/po/fi.po b/po/fi.po index 69a07195ba5..a0cb77c8191 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14196,17 +14196,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14222,7 +14211,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, EXPORT, QUERY\n" +" ADD, DELETE, EXPORT, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -14277,6 +14266,51 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <avain> [/v arvon_nimi | /ve] [/t laji] [/s erotin] [/d data] [/f]\n" +"\n" +" Lisää avaimen rekisteriin tai lisää uuden arvon rekisteriavaimeen.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka lisätään, tai jos [/v] tai [/ve] on annettu,\n" +" avain, johon uusi data lisätään.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Lisättävän rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Lisää nimetön rekisteriarvo. Tämä muokkaa (Oletus)-rekisteriarvoa.\n" +"\n" +" /t <laji>\n" +" Lisättävän datan laji. Jos [/t] annetaan, lajin pitää olla jokin\n" +" seuraavista:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Jos parametria [/t] ei anneta, datan laji on oletuksena REG_SZ.\n" +"\n" +" /s <erotin>\n" +" Merkki, jolla erotetaan merkkijonot tyypin REG_MULTI_SZ datassa.\n" +" Jos parametria [/s] ei anneta, erotin on oletuksena \\0.\n" +"\n" +" /d <data>\n" +" Rekisteriarvoon lisättävä data.\n" +"\n" +" /f\n" +" Muokkaa rekisteriä kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14316,6 +14350,40 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <avain> [/v arvon_nimi | /ve | /va] [/f]\n" +"\n" +" Poistaa rekisteriavaimen (mukaan lukien aliavaimet ja arvot), tai poistaa\n" +" yhden tai useamman arvon annetusta rekisteriavaimesta.\n" +"\n" +" <avain>\n" +" Poistettava rekisteriavain tai, jos [/v], [/ve] tai [/va] on annettu,\n" +" rekisteriavain, josta arvo tai arvot poistetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Poistettavan rekisteriarvon nimi.\n" +"\n" +" /ve\n" +" Poista nimetön rekisteriarvo. Tämä poistaa (Oletus)-rekisteriarvon.\n" +"\n" +" /va\n" +" Poista kaikki arvot annetusta rekisteriavaimesta.\n" +"\n" +" /f\n" +" Poista rekisteriavain (mukaan lukien aliavaimet ja arvot) kysymättä\n" +" vahvistusta.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14351,16 +14419,44 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <avain> [/v arvon_nimi | /ve] [/s]\n" +"\n" +" Hakee annetun rekisteriavaimen ja listaa sen välittömät aliavaimet, arvot\n" +" ja datan. Parametri [/s] hakee rekursiivisesti myös aliavainten sisällön.\n" +"\n" +" <avain>\n" +" Rekisteriavain, joka haetaan.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" /v <arvon_nimi>\n" +" Haettavan rekisteriarvon nimi. Jos ei anneta parametria [/v] eikä [/ve],\n" +" kaikki rekisteriavaimen alaiset arvot haetaan.\n" +"\n" +" /ve\n" +" Hae nimetön rekisteriarvo. Tämä hakee (Oletus)-rekisteriarvon.\n" +"\n" +" /s\n" +" Listaa kaikki rekisterin kohdat avaimen ja sen aliavainten alla.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "reg: Rekisteriavain ei kelpaa\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14469,6 +14565,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <tiedosto> [/y]\n" +"\n" +" Tuo avaimet, arvot ja datan tiedostosta rekisteriin.\n" +"\n" +" <tiedosto>\n" +" Tuotavan rekisteritiedoston nimi ja polku.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14512,6 +14615,32 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <avain> <tiedosto> [/y]\n" +"\n" +" Vie rekisteriavaimen (mukaan lukien aliavaimet ja arvot) tiedostoon.\n" +"\n" +" <avain>\n" +" Vietävä rekisteriavain.\n" +"\n" +" Muoto: JUURI\\Aliavain\n" +"\n" +" JUURI: Jokin seuraavista ennalta määritellyistä rekisteriavaimista:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" +"\n" +" <tiedosto>\n" +" Luotavan rekisteritiedoston nimi ja polku. Tiedostonimen tulee olla\n" +" .reg-päätteinen.\n" +"\n" +" /y\n" +" Ylikirjoita tiedosto kysymättä vahvistusta.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15188,37 +15317,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL:n '%1' asennus purettu\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -15273,6 +15371,7 @@ msgstr "" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" "/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin\n" " Windows Explorer avaisi sen.\n" +"/exec Käynnistä exec-funktiolla (Winen sisäistä käyttöä varten).\n" "/ProgIDOpen Avaa dokumentti määrätyllä progID:llä.\n" "/? Näytä tämä ohje ja lopeta.\n" -- 2.31.0

1 0

[PATCH 7/7] mshtml: Fix navigator.toString() in IE9+ compat modes.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 6/7] mshtml: Use "Netscape" as appName in IE11 compat mode.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-)

2 1

[PATCH] ddraw: Allow texture without DDSCAPS_TEXTURE for ddraw4 and earlier on software device.
by Paul Gofman 26 Mar '21

26 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/device.c | 8 ++- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++ 5 files changed, 418 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c99eafc7524..656d2d35f4a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4858,19 +4858,21 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture); - HRESULT hr; + struct wined3d_texture *wined3d_texture = NULL; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); wined3d_mutex_lock(); - hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface); + if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hardware_device)) + wined3d_texture = tex->draw_texture ? tex->draw_texture : tex->wined3d_texture;; + wined3d_stateblock_set_texture(device->state, stage, wined3d_texture); fixup_texture_alpha_op(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static const struct tss_lookup diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8a53f73d18d..0e0a198add2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14332,6 +14332,122 @@ static void run_for_each_device_type(void (*test_func)(const GUID *)) test_func(&IID_IDirect3DRGBDevice); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static D3DTLVERTEX quad[] = + { + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirect3DExecuteBuffer *execute_buffer; + IDirectDrawSurface *surface, *rt; + D3DTEXTUREHANDLE texture_handle; + D3DCOLOR color, expected_color; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + IDirect3DTexture *texture; + unsigned int inst_length; + IDirect3DDevice *device; + IDirectDraw *ddraw; + DDSURFACEDESC ddsd; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + background = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + viewport_set_background(device, viewport, background); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0xffff0000); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(quad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(quad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + + hr = IDirect3DDevice_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, expected_color, 1), "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture_Release(texture); + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(rt); + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_material(background); + destroy_viewport(device, viewport); + + IDirect3DDevice_Release(device); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -14448,4 +14564,5 @@ START_TEST(ddraw1) test_vtbl_protection(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e3d1438b14c..5536625abdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15285,6 +15285,101 @@ done: IDirectDraw2_Release(ddraw); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static D3DLVERTEX quad[] = + { + {{-1.0f}, {-1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {0.0f}, {1.0f}}, + {{-1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {0.0f}, {0.0f}}, + {{ 1.0f}, {-1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {1.0f}, {1.0f}}, + {{ 1.0f}, { 1.0f}, {0.0f}, 0, {0xffffffff}, {0}, {1.0f}, {0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirectDrawSurface *surface, *rt; + D3DTEXTUREHANDLE texture_handle; + D3DCOLOR color, expected_color; + IDirect3DMaterial2 *background; + IDirect3DViewport2 *viewport; + IDirect3DTexture2 *texture; + IDirect3DDevice2 *device; + IDirectDraw2 *ddraw; + DDSURFACEDESC ddsd; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture2_GetHandle(texture, device, &texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f); + viewport_set_background(device, viewport, background); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0xffff0000); + + hr = IDirect3DDevice2_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, expected_color, 1), "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture2_Release(texture); + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(rt); + destroy_viewport(device, viewport); + destroy_material(background); + IDirectDraw2_Release(ddraw); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(&IID_IDirect3DHALDevice); @@ -15413,4 +15508,5 @@ START_TEST(ddraw2) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5af824c3f78..6b514b15e25 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18326,6 +18326,109 @@ static void run_for_each_device_type(void (*test_func)(const GUID *)) test_func(&IID_IDirect3DRGBDevice); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + IDirectDrawSurface4 *surface, *rt; + D3DCOLOR color, expected_color; + IDirect3DViewport3 *viewport; + IDirect3DTexture2 *texture; + IDirect3DDevice3 *device; + IDirectDraw4 *ddraw; + DDSURFACEDESC2 ddsd; + IDirect3D3 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetTexture(device, 0, texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff; + color = get_surface_color(rt, 320, 240); + ok(color == expected_color, "Got color 0x%08x, expected 0x%08x.\n", color, expected_color); + + IDirect3DTexture2_Release(texture); + IDirectDrawSurface4_Release(surface); + IDirectDrawSurface4_Release(rt); + destroy_viewport(device, viewport); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -18464,4 +18567,5 @@ START_TEST(ddraw4) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d641595baa2..4c42d6f4b64 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18587,6 +18587,101 @@ done: IDirectDraw7_Release(ddraw); } +static void test_texture_wrong_caps(const GUID *device_guid) +{ + static struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f}}, + }; + static DDPIXELFORMAT fmt = + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }; + IDirectDrawSurface7 *surface, *rt; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + DDSURFACEDESC2 ddsd; + IDirect3D7 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; + ddsd.dwHeight = 16; + ddsd.dwWidth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + U4(ddsd).ddpfPixelFormat = fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + fill_surface(surface, 0xff00ff00); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetTexture(device, 0, surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + if (is_software_device_type(device_guid)) + fill_surface(rt, 0x000000ff); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_TEX1, quad, 4, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(color == 0, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(hw_device_guid); @@ -18763,4 +18858,5 @@ START_TEST(ddraw7) test_cursor_clipping(); test_window_position(); test_get_display_mode(); + run_for_each_device_type(test_texture_wrong_caps); } -- 2.30.2

3 2

[PATCH] ddraw: Request read only texture access for read only maps.
by Paul Gofman 26 Mar '21

26 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 19a1ae3d2d2..08e3811436d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1027,6 +1027,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, DWORD flags, HANDLE h) { struct wined3d_map_desc map_desc; + unsigned int wined3d_flags; struct wined3d_box box; HRESULT hr = DD_OK; @@ -1061,9 +1062,12 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) + { + wined3d_flags = wined3dmapflags_from_ddrawmapflags(flags); hr = wined3d_resource_map(wined3d_texture_get_resource - (ddraw_surface_get_default_texture(surface, DDRAW_SURFACE_RW)), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, wined3dmapflags_from_ddrawmapflags(flags)); + (ddraw_surface_get_default_texture(surface, wined3d_flags & WINED3D_MAP_WRITE ? DDRAW_SURFACE_RW + : DDRAW_SURFACE_READ)), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, wined3d_flags); + } if (FAILED(hr)) { wined3d_mutex_unlock(); -- 2.30.2

3 2

[PATCH v2 1/6] wined3d: Introduce wined3d_device_context_set_stream_output().
by Zebediah Figura 26 Mar '21

26 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9766dfada2d..4041a7c0d7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1224,27 +1224,9 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; - TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) - { - WARN("Invalid stream output %u.\n", idx); - return; - } - - stream = &device->cs->c.state->stream_output[idx]; - prev_buffer = stream->buffer; - - if (buffer) - wined3d_buffer_incref(buffer); - stream->buffer = buffer; - stream->offset = offset; - wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_stream_output(&device->cs->c, idx, buffer, offset); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2389,6 +2371,32 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c wined3d_vertex_declaration_decref(prev); } +void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset) +{ + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev_buffer; + + TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + stream = &context->state->stream_output[idx]; + prev_buffer = stream->buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + wined3d_device_context_emit_set_stream_output(context, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + 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 fb9973354a0..289716d1ae2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -178,6 +178,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f8b4a89648..385ac7a8a07 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2579,6 +2579,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context, -- 2.30.2

2 11

[PATCH 5/7] mshtml: Report user agent matching current compat mode.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 25 +++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 12 ++++++++++++ dlls/mshtml/tests/dom.c | 12 ++---------- 3 files changed, 37 insertions(+), 12 deletions(-)

2 1

[PATCH] dinput: Wait for the hook thread to exit when stopping it.
by Rémi Bernon 26 Mar '21

26 Mar '21

FlatOut2 demo calls FreeLibrary on the dinput8 module more times than it has loaded it, and the module reference that the internal thread has is getting decremented before its exit. Having an internal window to destroy also makes it more likely to crash as it takes more time to exit calls the window procedure function. Waiting for the thread to complete when all the dinput instances are destroyed ensures that the thread isn't alive when the game frees the DLL, and prevents the thread from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This could be nicer by using two critical sections instead (one for the acquired devices and one for the hooks / dinput instance list), so the hook thread never enters dinput_hook_crit, and we could wait here inside it, but it's probably more future proof this way. dlls/dinput/dinput_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 45023fc104a..5da60cf1f7c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1861,6 +1861,7 @@ static BOOL check_hook_thread(void) { static HANDLE hook_thread; HMODULE module; + HANDLE wait_handle = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1884,11 +1885,17 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - CloseHandle(hook_thread); + wait_handle = hook_thread; hook_thread = NULL; } LeaveCriticalSection(&dinput_hook_crit); + + if (wait_handle) + { + WaitForSingleObject(wait_handle, INFINITE); + CloseHandle(wait_handle); + } return hook_thread_id != 0; } -- 2.30.2

1 0

[PATCH 2/7] mshtml/tests: Allow typeof(localStorage) to be unknown.
by Jacek Caban 26 Mar '21

26 Mar '21

Fixes tests on some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH resend2 1/3] kernel32: Print processor group in Get(Active|Maximum)ProcessorCount
by Alex Henrie 26 Mar '21

26 Mar '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 41a5b34af19..46ccb04b133 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -620,7 +620,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -631,7 +631,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.31.0

1 3

[PATCH 1/7] mshtml/tests: Allow error when loading an image in events.html.
by Jacek Caban 26 Mar '21

26 Mar '21

Fixes tests on win8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.html | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 1/2] ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.
by Zebediah Figura 26 Mar '21

26 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index da88ca449fb..e2a8071168d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2812,7 +2812,7 @@ static void test___C_specific_handler(void) /* This is heavily based on the i386 exception tests. */ static const struct exception { - BYTE code[18]; /* asm code */ + BYTE code[24]; /* asm code */ BYTE offset; /* offset of faulting instruction */ BYTE length; /* length of faulting instruction */ NTSTATUS status; /* expected status code */ @@ -2921,6 +2921,14 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, + + /* test exception with cleared %ds and %es */ + { { 0x8c, 0xd8, 0x50, 0x8c, 0xc0, 0x50, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, + 0xfa, 0x58, 0x8e, 0xc0, 0x58, 0x8e, 0xd8, 0xc3 }, + /* mov %ds,%eax; pushq %rax; mov %es,%eax; pushq %rax; xorl %eax,%eax; mov %eax,%ds; mov %eax,%es; + * cli; popq %rax; mov %eax,%es; popq %rax; mov %eax,%ds; ret */ + 12, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, @@ -2992,6 +3000,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); + todo_wine ok( context->SegDs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); + if (except->status == STATUS_BREAKPOINT && is_wow64) parameter_count = 1; else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) -- 2.30.2

4 6

[tools] testbot/TestLauncher: Fix the spelling of an error message.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index cfd74ef7e..b024714ac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - Error("Cauld not get the test executable full path %s (error %lu)\n", + Error("Could not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); return 1; } -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix a couple of typos in the documentation.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 81b56c470..dcdd6ccee 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -675,8 +675,8 @@ there is no error one would declare an empty group such as below, though a g 0 tests.report.kernel32 Finally, note that while the error directives are inherited by subcategories, -they are not merged. So if if both win and win32 have error-matching -directives, win32 will not inherit anything from the win category. +they are not merged. So if both win and win32 have error-matching directives, +win32 will not inherit anything from the win category. =item <tasks.(report|log|testbot).Errors> @@ -873,8 +873,8 @@ Checks that the TestBot applied the patch and did not find it necessary to run make_requests and make_opengl. Finally, note that while the Grep* directives are inherited by subcategories, -they are not merged. So if if both win and win32 have Grep directives, win32 -will not inherit anything from the win category. +they are not merged. So if both win and win32 have Grep directives, win32 will +not inherit anything from the win category. =cut -- 2.20.1

1 0

[PATCH] ieframe/tests: Allow non-zero initial session counter value.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/webbrowser.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)

1 0

[PATCH v4 1/3] windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion.
by Rémi Bernon 26 Mar '21

26 Mar '21

Returning the user default country. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Same as v3, fix the error handling but without the stupid typo. dlls/windows.globalization/main.c | 12 ++++++++++-- dlls/windows.globalization/tests/globalization.c | 15 +++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 17bb49a1c4e..84813152047 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -225,8 +225,16 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( IGlobalizationPreferencesStatics *iface, HSTRING* out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + WCHAR country[16]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultGeoName(country, 16)) + return E_FAIL; + + TRACE("returning country %s\n", debugstr_w(country)); + + return WindowsCreateString(country, wcslen(country), out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_WeekStartsOn( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 1918322b7a2..00d9cee5b0d 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -55,14 +55,11 @@ static void test_GlobalizationPreferences(void) BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], country[16]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; - if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); - else country = wcsdup(tmp + 1); - GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + GetUserDefaultGeoName(country, 16); hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -77,7 +74,6 @@ static void test_GlobalizationPreferences(void) win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); pWindowsDeleteString(str); pRoUninitialize(); - free(country); return; } @@ -101,8 +97,7 @@ static void test_GlobalizationPreferences(void) IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); buf = pWindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -113,7 +108,8 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -164,7 +160,6 @@ done: pWindowsDeleteString(str); pRoUninitialize(); - free(country); } START_TEST(globalization) -- 2.30.2

3 8

[PATCH 4/7] include: Add UAS_EXACTLEGACY define.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 4 ++-- dlls/urlmon/tests/misc.c | 4 ++-- include/urlmon.idl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 3/7] urlmon: Fix user agent suffix separator handling.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 19 +++++++++---------- dlls/urlmon/tests/misc.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 26 Mar '21

26 Mar '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 206 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 158 insertions(+), 48 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4622ec87318..237bd4a8535 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-01-30 22:00+0100\n" +"PO-Revision-Date: 2021-03-26 15:45+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14292,17 +14292,6 @@ msgid "Icons (*.ico)" msgstr "Pictogrammen (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14318,7 +14307,7 @@ msgstr "" " REG [opdracht] [parameters]\n" "\n" "Ondersteunde opdrachten:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Voor hulp bij een opdracht, type:\n" " REG [opdracht] /?\n" @@ -14373,6 +14362,55 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <sleutel> [/v waardenaam | /ve] [/t type] [/s scheidingsteken] " +"[/d gegevens] [/f]\n" +"\n" +" Voeg een sleutel toe aan het register of geef een nieuwe waarde aan een " +"registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die toegevoegd wordt. Als [/v] of [/ve] is gegeven,\n" +" de sleutel waaraan de nieuwe registergegevens moeten worden toegevoegd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die moet worden toegevoegd.\n" +"\n" +" /ve\n" +" Voeg een lege registerwaarde toe. Deze optie wijzigt de (Standaard)\n" +" registerwaarde.\n" +"\n" +" /t <type>\n" +" Het gegevenstype van de registersleutel. Als [/t] is gegeven, dan moet\n" +" <type> één van de volgende zijn:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Als [/t] niet is gegeven, dan wordt het type REG_SZ verondersteld.\n" +"\n" +" /s <scheidingsteken>\n" +" Het teken dat gebruikt wordt om gegevens in REG_MULTI_SZ te scheiden.\n" +" Als [/s] niet is gegeven, wordt het standaard teken \\0 verwacht.\n" +"\n" +" /d <gegevens>\n" +" De gevens die toegevoegd moeten worden aan een registerwaarde.\n" +"\n" +" /f\n" +" Wijzig het register zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14412,6 +14450,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <sleutel> [/v waardenaam | /ve | /va] [/f]\n" +"\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes),\n" +" of een waarde van een registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die moet worden verwijderd. Als [/v], [/ve] of [/va]\n" +" is gegeven, de registersleutel waarin de waarde moet worden verwijderd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die verwijderd moet worden.\n" +"\n" +" /ve\n" +" Verwijder een lege registerwaarde. Deze optie haalt de (Standaard)\n" +" registerwaarde weg.\n" +"\n" +" /va\n" +" Verwijder alle waardes van een registersleutel.\n" +"\n" +" /f\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes)\n" +" zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14447,16 +14521,47 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <sleutel> [/v waardenaam | /ve] [/s]\n" +"\n" +" Toon een registersleutel en laat alle directe subsleutels, waardes en\n" +" gegevens zien. Gebruik [/s] om de gegevens van de onderliggende\n" +" subsleutels te tonen.\n" +"\n" +" <sleutel>\n" +" De te tonen registersleutel.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" Toon de gegevens van de registerwaarde. Als noch [/v] noch [/ve] is\n" +" gegeven, worden alle waardes van de <sleutel> getoond.\n" +"\n" +" /ve\n" +" Toon een een lege registerwaarde. Deze optie vraagt de waarde op van\n" +" de (Standaard) registerwaarde.\n" +"\n" +" /s\n" +" Toon alle registervermeldingen onder <sleutel> en zijn subsleutels.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve registersleutel\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14567,6 +14672,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <bestand>\n" +"\n" +" Importeer sleutels, waardes en gegevens uit een bestand in het register.\n" +"\n" +" <bestand>\n" +" De naam en het pad van het registerbestand dat geïmporteerd moet worden.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14610,6 +14722,34 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <sleutel> <bestand> [/y]\n" +"\n" +" Exporteer een registersleutel (inclusief alle subsleutels en waardes)\n" +" naar een bestand.\n" +"\n" +" <sleutel>\n" +" De registersleutel die geëxporteerd moet worden.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" <bestand>\n" +" De naam en pad van het registerbestand dat aangemaakt wordt.\n" +" Dit bestand moet de extensie .reg hebben.\n" +"\n" +" /y\n" +" <bestand> overschrijven zonder een bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15289,37 +15429,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -15350,7 +15459,7 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"Start een programma, of open een document in het programma dat normaal voor\n" +"Start een programma, of open een document met het programma dat normaal voor\n" "deze extensie gebruikt wordt.\n" "Gebruik:\n" "start [opties] programma-naam [...]\n" @@ -15375,6 +15484,7 @@ msgstr "" " met de exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" " Windows Verkenner.\n" +"/exec Voer het opgegeven bestand uit (intern gebruikt in Wine).\n" "/ProgIDOpen Open een document met het specificeerde progID.\n" "/? Toon deze hulp en eindig.\n" -- 2.31.0

1 0

[PATCH 4/6] mmdevapi/tests: Use nameless unions.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/propstore.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)

2 1

[PATCH 3/6] mmdevapi: Use nameless unions.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++------------------ dlls/mmdevapi/spatialaudio.c | 4 +-- 3 files changed, 28 insertions(+), 29 deletions(-)

2 1

[PATCH] atl80/tests: Request an older version of atl80 for compatibility.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some TestBot VMs only have version 8.0.50727.762 which is still sufficient for the current tests. Version .42 is the earliest atl80 version supported by the current crop. --- dlls/atl80/tests/atl80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest index 712793fcb1b..fa833e28927 100644 --- a/dlls/atl80/tests/atl80.manifest +++ b/dlls/atl80/tests/atl80.manifest @@ -12,7 +12,7 @@ <assemblyIdentity type="win32" name="microsoft.vc80.atl" - version="8.0.50727.4053" + version="8.0.50727.42" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b" language="*" -- 2.20.1

2 1

[PATCH v2 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster 26 Mar '21

26 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Fix incorrect variable name causing apply failure. programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..7ae99fad6d5 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

1 1

[PATCH 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster 26 Mar '21

26 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..35d26488771 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*s)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

2 3

[tools] testbot/WineTest: Pass the full path to winetest.exe.
by Francois Gouget 26 Mar '21

26 Mar '21

It is not installed in the wineprefix and thus is not in %PATH%. So Wine needs its full path to find it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- Wine used to be able to find winetest.exe in the build tree but no longer (happened between f69c8f018188 and 12cfe6826773). This lets the TestBot run the tests on Wine VMs again but there is another issue with the WoW64 wineprefix creation. --- testbot/bin/build/WineTest.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index dd41fcf67..498b8afde 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,7 +86,8 @@ sub WineTestSuite($$$$) # there are test failures. my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -96,7 +97,7 @@ sub WineTestSuite($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "winetest.exe", + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -142,7 +143,8 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $BaseName = SetupTest("the tests", $Mission); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") -- 2.20.1

1 0

[PATCH 1/5] kernel32: Implement PackageIdFromFullName().
by Paul Gofman 26 Mar '21

26 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Forza Horizon 4 depends on successfully getting the path for Microsoft.VCLibs.140.00 x64 package by using GetPackagesByPackageFamily(), PackageIdFromFullName(), GetPackagePath(). Since we provide builtin VC runtime 140 in the default prefix it seems reasonable to add the corresponding package info to registry on prefix creation / update. .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/version.c | 173 ++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 116 ++++++++++++ include/appmodel.h | 31 ++++ 7 files changed, 324 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 4c00082a151..99d1d9f3835 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -22,6 +22,6 @@ @ stub PackageFamilyNameFromFullName @ stub PackageFamilyNameFromId @ stub PackageFullNameFromId -@ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) kernel32.PackageIdFromFullName @ stub PackageNameAndPublisherIdFromFamilyName @ stub ParseApplicationUserModelId diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec index 214cd344716..61fd115cca7 100644 --- a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec @@ -18,4 +18,4 @@ @ stub PackageFamilyNameFromFullName @ stub PackageFamilyNameFromId @ stub PackageFullNameFromId -@ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) kernel32.PackageIdFromFullName diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0312e044a86..230a2a09ea2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1152,6 +1152,7 @@ @ stdcall -import PeekConsoleInputW(ptr ptr long ptr) @ stdcall -import PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall -import PostQueuedCompletionStatus(long long ptr ptr) +@ stdcall -import PackageIdFromFullName(wstr long ptr ptr) @ stdcall PowerClearRequest(long long) @ stdcall PowerCreateRequest(ptr) @ stdcall PowerSetRequest(long long) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 861b870b569..835c5398685 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -21,9 +21,11 @@ #include "wine/test.h" #include "winbase.h" #include "winternl.h" +#include "appmodel.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, void *, DWORD); +static LONG (WINAPI * pPackageIdFromFullName)(const WCHAR *, UINT32, UINT32 *, BYTE *); static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); @@ -43,6 +45,7 @@ static void init_function_pointers(void) GET_PROC(GetProductInfo); GET_PROC(GetSystemFirmwareTable); + GET_PROC(PackageIdFromFullName); hmod = GetModuleHandleA("ntdll.dll"); @@ -746,6 +749,175 @@ static void test_GetSystemFirmwareTable(void) HeapFree(GetProcessHeap(), 0, smbios_table); } +static const struct +{ + UINT32 code; + const WCHAR *name; + BOOL broken; +} +arch_data[] = +{ + {PROCESSOR_ARCHITECTURE_INTEL, L"X86"}, + {PROCESSOR_ARCHITECTURE_ARM, L"Arm"}, + {PROCESSOR_ARCHITECTURE_AMD64, L"X64"}, + {PROCESSOR_ARCHITECTURE_NEUTRAL, L"Neutral"}, + {PROCESSOR_ARCHITECTURE_ARM64, L"Arm64", TRUE /* Before Win10. */}, + {PROCESSOR_ARCHITECTURE_UNKNOWN, L"Unknown", TRUE /* Before Win10 1709. */}, +}; + +static const WCHAR *arch_string_from_code(UINT32 arch) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_data); ++i) + if (arch_data[i].code == arch) + return arch_data[i].name; + + return NULL; +} + +static unsigned int get_package_str_size(const WCHAR *str) +{ + return str ? (lstrlenW(str) + 1) * sizeof(*str) : 0; +} + +static unsigned int get_package_id_size(const PACKAGE_ID *id) +{ + return sizeof(*id) + get_package_str_size(id->name) + + get_package_str_size(id->resourceId) + 14 * sizeof(WCHAR); +} + +static void packagefullname_from_packageid(WCHAR *buffer, size_t count, const PACKAGE_ID *id) +{ + swprintf(buffer, count, L"%s_%u.%u.%u.%u_%s_%s_%s", id->name, id->version.Major, + id->version.Minor, id->version.Build, id->version.Revision, + arch_string_from_code(id->processorArchitecture), id->resourceId, + id->publisherId); +} + +static void test_PackageIdFromFullName(void) +{ + static const PACKAGE_ID test_package_id = + { + 0, PROCESSOR_ARCHITECTURE_INTEL, + {{.Major = 1, .Minor = 2, .Build = 3, .Revision = 4}}, + (WCHAR *)L"TestPackage", NULL, + (WCHAR *)L"TestResourceId", (WCHAR *)L"0abcdefghjkme" + }; + UINT32 size, expected_size; + PACKAGE_ID test_id; + WCHAR fullname[512]; + BYTE id_buffer[512]; + unsigned int i; + PACKAGE_ID *id; + LONG ret; + + if (!pPackageIdFromFullName) + { + win_skip("PackageIdFromFullName not available.\n"); + return; + } + + packagefullname_from_packageid(fullname, ARRAY_SIZE(fullname), &test_package_id); + + id = (PACKAGE_ID *)id_buffer; + + memset(id_buffer, 0xcc, sizeof(id_buffer)); + expected_size = get_package_id_size(&test_package_id); + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + ok(size == expected_size, "Got unexpected length %u, expected %u.\n", size, expected_size); + ok(!lstrcmpW(id->name, test_package_id.name), "Got unexpected name %s.\n", debugstr_w(id->name)); + ok(!lstrcmpW(id->resourceId, test_package_id.resourceId), "Got unexpected resourceId %s.\n", + debugstr_w(id->resourceId)); + ok(!lstrcmpW(id->publisherId, test_package_id.publisherId), "Got unexpected publisherId %s.\n", + debugstr_w(id->publisherId)); + ok(!id->publisher, "Got unexpected publisher %s.\n", debugstr_w(id->publisher)); + ok(id->processorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "Got unexpected processorArchitecture %u.\n", + id->processorArchitecture); + ok(id->version.Version == 0x0001000200030004, "Got unexpected Version %s.\n", + wine_dbgstr_longlong(id->version.Version)); + ok((BYTE *)id->name == id_buffer + sizeof(*id), "Got unexpected name %p, buffer %p.\n", id->name, id_buffer); + ok((BYTE *)id->resourceId == (BYTE *)id->name + (lstrlenW(id->name) + 1) * 2, + "Got unexpected resourceId %p, buffer %p.\n", id->resourceId, id_buffer); + ok((BYTE *)id->publisherId == (BYTE *)id->resourceId + (lstrlenW(id->resourceId) + 1) * 2, + "Got unexpected publisherId %p, buffer %p.\n", id->resourceId, id_buffer); + + ret = pPackageIdFromFullName(fullname, 0, NULL, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(NULL, 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == sizeof(id_buffer), "Got unexpected size %u.\n", size); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == sizeof(id_buffer), "Got unexpected size %u.\n", size); + + size = expected_size - 1; + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size - 1, "Got unexpected size %u.\n", size); + + size = expected_size - 1; + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + size = 0; + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + for (i = 0; i < ARRAY_SIZE(arch_data); ++i) + { + test_id = test_package_id; + test_id.processorArchitecture = arch_data[i].code; + packagefullname_from_packageid(fullname, ARRAY_SIZE(fullname), &test_id); + size = expected_size; + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS || broken(arch_data[i].broken && ret == ERROR_INVALID_PARAMETER), + "Got unexpected ret %u.\n", ret); + if (ret != ERROR_SUCCESS) + continue; + ok(size == expected_size, "Got unexpected length %u, expected %u.\n", size, expected_size); + ok(id->processorArchitecture == arch_data[i].code, "Got unexpected processorArchitecture %u, arch %S.\n", + id->processorArchitecture, arch_data[i].name); + } + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkmee", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3_X86_TestResourceId_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkme_", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86__0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + ok(!lstrcmpW(id->resourceId, L""), "Got unexpected resourceId %s.\n", debugstr_w(id->resourceId)); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); +} + START_TEST(version) { init_function_pointers(); @@ -754,4 +926,5 @@ START_TEST(version) test_GetVersionEx(); test_VerifyVersionInfo(); test_GetSystemFirmwareTable(); + test_PackageIdFromFullName(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8cb15fff084..615b928bd22 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1014,7 +1014,7 @@ # @ stub PackageFamilyNameFromProductId # @ stub PackageFullNameFromId # @ stub PackageFullNameFromProductId -# @ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) # @ stub PackageIdFromProductId # @ stub PackageNameAndPublisherIdFromFamilyName # @ stub PackageRelativeApplicationIdFromProductId diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d5bfa081939..1ee82ce019a 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -39,6 +39,7 @@ #include "winnls.h" #include "winternl.h" #include "winerror.h" +#include "appmodel.h" #include "kernelbase.h" #include "wine/debug.h" @@ -1565,3 +1566,118 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFamilyName( HANDLE process, UINT32 FIXME( "(%p %p %p): stub\n", process, length, name ); return APPMODEL_ERROR_NO_PACKAGE; } + + +static const struct +{ + UINT32 code; + const WCHAR *name; +} +arch_names[] = +{ + {PROCESSOR_ARCHITECTURE_INTEL, L"x86"}, + {PROCESSOR_ARCHITECTURE_ARM, L"arm"}, + {PROCESSOR_ARCHITECTURE_AMD64, L"x64"}, + {PROCESSOR_ARCHITECTURE_NEUTRAL, L"neutral"}, + {PROCESSOR_ARCHITECTURE_ARM64, L"arm64"}, + {PROCESSOR_ARCHITECTURE_UNKNOWN, L"unknown"}, +}; + +UINT32 processor_arch_from_string(const WCHAR *str, unsigned int len) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_names); ++i) + if (lstrlenW(arch_names[i].name) == len && !wcsnicmp(str, arch_names[i].name, len)) + return arch_names[i].code; + return ~0u; +} + +/*********************************************************************** + * PackageIdFromFullName (kernelbase.@) + */ +LONG WINAPI PackageIdFromFullName(const WCHAR *full_name, UINT32 flags, UINT32 *buffer_length, BYTE *buffer) +{ + const WCHAR *name, *version_str, *arch_str, *resource_id, *publisher_id, *s; + PACKAGE_ID *id = (PACKAGE_ID *)buffer; + UINT32 size, buffer_size, len; + + TRACE("full_name %s, flags %#x, buffer_length %p, buffer %p.\n", + debugstr_w(full_name), flags, buffer_length, buffer); + + if (flags) + FIXME("Flags %#x are not supported.\n", flags); + + if (!full_name || !buffer_length) + return ERROR_INVALID_PARAMETER; + + if (!buffer && *buffer_length) + return ERROR_INVALID_PARAMETER; + + name = full_name; + if (!(version_str = wcschr(name, L'_'))) + return ERROR_INVALID_PARAMETER; + ++version_str; + + if (!(arch_str = wcschr(version_str, L'_'))) + return ERROR_INVALID_PARAMETER; + ++arch_str; + + if (!(resource_id = wcschr(arch_str, L'_'))) + return ERROR_INVALID_PARAMETER; + ++resource_id; + + if (!(publisher_id = wcschr(resource_id, L'_'))) + return ERROR_INVALID_PARAMETER; + ++publisher_id; + + /* Publisher id length should be 13. */ + size = sizeof(*id) + sizeof(WCHAR) * ((version_str - name) + (publisher_id - resource_id) + 13 + 1); + buffer_size = *buffer_length; + *buffer_length = size; + if (buffer_size < size) + return ERROR_INSUFFICIENT_BUFFER; + + memset(id, 0, sizeof(*id)); + if ((id->processorArchitecture = processor_arch_from_string(arch_str, resource_id - arch_str - 1)) == ~0u) + { + FIXME("Unrecognized arch %s.\n", debugstr_w(arch_str)); + return ERROR_INVALID_PARAMETER; + } + buffer += sizeof(*id); + + id->version.u.s.Major = wcstol(version_str, NULL, 10); + if (!(s = wcschr(version_str, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Minor = wcstol(s, NULL, 10); + if (!(s = wcschr(s, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Build = wcstol(s, NULL, 10); + if (!(s = wcschr(s, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Revision = wcstol(s, NULL, 10); + + id->name = (WCHAR *)buffer; + len = version_str - name - 1; + memcpy(id->name, name, sizeof(*id->name) * len); + id->name[len] = 0; + buffer += sizeof(*id->name) * (len + 1); + + id->resourceId = (WCHAR *)buffer; + len = publisher_id - resource_id - 1; + memcpy(id->resourceId, resource_id, sizeof(*id->resourceId) * len); + id->resourceId[len] = 0; + buffer += sizeof(*id->resourceId) * (len + 1); + + id->publisherId = (WCHAR *)buffer; + len = lstrlenW(publisher_id); + if (len != 13) + return ERROR_INVALID_PARAMETER; + memcpy(id->publisherId, publisher_id, sizeof(*id->publisherId) * len); + id->publisherId[len] = 0; + + return ERROR_SUCCESS; +} diff --git a/include/appmodel.h b/include/appmodel.h index 34da979782d..e4288bbfbb0 100644 --- a/include/appmodel.h +++ b/include/appmodel.h @@ -48,10 +48,41 @@ typedef enum AppPolicyWindowingModel AppPolicyWindowingModel_ClassicPhone = 3 } AppPolicyWindowingModel; +typedef struct PACKAGE_VERSION +{ + union + { + UINT64 Version; + struct + { + USHORT Revision; + USHORT Build; + USHORT Minor; + USHORT Major; + } + DUMMYSTRUCTNAME; + } + DUMMYUNIONNAME; +} +PACKAGE_VERSION; + +typedef struct PACKAGE_ID +{ + UINT32 reserved; + UINT32 processorArchitecture; + PACKAGE_VERSION version; + WCHAR *name; + WCHAR *publisher; + WCHAR *resourceId; + WCHAR *publisherId; +} +PACKAGE_ID; + LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy); LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); LONG WINAPI AppPolicyGetWindowingModel(HANDLE processToken, AppPolicyWindowingModel *policy); +LONG WINAPI PackageIdFromFullName(const WCHAR *full_name, UINT32 flags, UINT32 *buffer_length, BYTE *buffer); #if defined(__cplusplus) } -- 2.30.2

2 9

[tools] testbot: Increase the Windows executable build timeout.
by Francois Gouget 26 Mar '21

26 Mar '21

Even without the configure step a build can take a bit more than 6 minutes. So increase the timeout to 8 minutes to have some margin. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fe4a27cd6..089d792c5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -117,7 +117,7 @@ $ReconfigBuildTimeout = 60; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 6 * 60; +$ExeBuildTimeout = 8 * 60; # - For a single module $ExeModuleTimeout = 30; -- 2.20.1

1 0

[PATCH 6/6] riched20: Remove the windows from the editor structure.
by Huw Davies 26 Mar '21

26 Mar '21

This in turn allows removal of the editor from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 2 -- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 - dlls/riched20/txthost.c | 7 +------ dlls/riched20/txtsrv.c | 6 ++---- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4ac78f3d3cb..28b5cb1512d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2933,8 +2933,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) LONG selbarwidth; HRESULT hr; - ed->hWnd = NULL; - ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; if (ITextHost_QueryInterface( texthost, &IID_ITextHost2, (void **)&ed->texthost ) == S_OK) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e923f35ed94..7a79df83c99 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -395,7 +395,7 @@ BOOL ME_Redo(ME_TextEditor *editor) DECLSPEC_HIDDEN; 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; +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) 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) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index ffafa794015..86b3f0196c7 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -377,7 +377,6 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { - HWND hWnd, hwndParent; ITextHost2 *texthost; IUnknown *reOle; unsigned int bEmulateVersion10 : 1; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c220fe5ec57..a7b91716dab 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -36,7 +36,6 @@ struct host ITextHost2 ITextHost_iface; LONG ref; ITextServices *text_srv; - ME_TextEditor *editor; /* to be removed */ HWND window, parent; unsigned int emulate_10 : 1; unsigned int dialog_mode : 1; @@ -112,7 +111,6 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; - texthost->editor = NULL; host_init_props( texthost ); texthost->event_mask = 0; texthost->use_set_rect = 0; @@ -871,7 +869,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula if (!host) return FALSE; - hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10, &host->editor ); + hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10 ); if (FAILED( hr )) { ITextHost2_Release( &host->ITextHost_iface ); @@ -880,9 +878,6 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula IUnknown_QueryInterface( unk, &IID_ITextServices, (void **)&host->text_srv ); IUnknown_Release( unk ); - host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 4cd19a0d24b..7a979971a0a 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -581,8 +581,7 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetCachedSize) }; -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, - ME_TextEditor **editor ) +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) { struct text_services *services; @@ -595,7 +594,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; services->ITextServices_iface.lpVtbl = &textservices_vtbl; services->editor = ME_MakeEditor( text_host, emulate_10 ); - if (editor) *editor = services->editor; /* To be removed */ if (outer) services->outer_unk = outer; else services->outer_unk = &services->IUnknown_inner; @@ -609,5 +607,5 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** */ HRESULT WINAPI CreateTextServices( IUnknown *outer, ITextHost *text_host, IUnknown **unk ) { - return create_text_services( outer, text_host, unk, FALSE, NULL ); + return create_text_services( outer, text_host, unk, FALSE ); } -- 2.23.0

2 1

[PATCH 5/6] riched20: Retrieve the window from the host.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/richole.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b8b081fc916..b652d5a753a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1195,20 +1195,19 @@ static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) return IOleClientSite_Release(&This->IOleClientSite_iface); } -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow( IOleInPlaceSite *iface, HWND *window ) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - TRACE("(%p)->(%p)\n", This, phwnd); + TRACE( "(%p)->(%p)\n", This, window ); if (!This->child.reole) return CO_E_RELEASED; - if (!phwnd) - return E_INVALIDARG; + if (!window) return E_INVALIDARG; - *phwnd = This->child.reole->editor->hWnd; - return S_OK; + if (!This->child.reole->editor->have_texthost2) return E_NOTIMPL; + return ITextHost2_TxGetWindow( This->child.reole->editor->texthost, window ); } static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) -- 2.23.0

2 1

[PATCH 4/6] riched20: Remove accesses to the editor in TxNotify.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 0618d6031ef..c220fe5ec57 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -467,12 +467,11 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) { struct host *host = impl_from_ITextHost( iface ); - HWND hwnd = host->window; UINT id; - if (!host->editor || !host->editor->hwndParent) return S_OK; + if (!host->parent) return S_OK; - id = GetWindowLongW(hwnd, GWLP_ID); + id = GetWindowLongW( host->window, GWLP_ID ); switch (iNotify) { @@ -490,16 +489,16 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW if (!info) return E_FAIL; - info->hwndFrom = hwnd; + info->hwndFrom = host->window; info->idFrom = id; info->code = iNotify; - SendMessageW( host->editor->hwndParent, WM_NOTIFY, id, (LPARAM)info ); + SendMessageW( host->parent, WM_NOTIFY, id, (LPARAM)info ); break; } case EN_UPDATE: /* Only sent when the window is visible. */ - if (!IsWindowVisible(hwnd)) + if (!IsWindowVisible( host->window )) break; /* Fall through */ case EN_CHANGE: @@ -509,7 +508,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW( host->editor->hwndParent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)hwnd ); + SendMessageW( host->parent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)host->window ); break; case EN_MSGFILTER: -- 2.23.0

2 1

[PATCH 3/6] riched20: Add ITextHost2 support and use it to get the window for WM_CONTEXTMENU.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 60 ++++++----- dlls/riched20/editor.h | 17 +++- dlls/riched20/editstr.h | 3 +- dlls/riched20/paint.c | 2 +- dlls/riched20/txthost.c | 221 ++++++++++++++++++++++++++++++---------- 5 files changed, 222 insertions(+), 81 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4eb90a4c300..4ac78f3d3cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2906,20 +2906,24 @@ static LONG ME_GetSelectionType(ME_TextEditor *editor) static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { - CHARRANGE selrange; - HMENU menu; - int seltype; - - if(!editor->lpOleCallback || !editor->hWnd) - return FALSE; - ME_GetSelectionOfs(editor, &selrange.cpMin, &selrange.cpMax); - seltype = ME_GetSelectionType(editor); - if(SUCCEEDED(IRichEditOleCallback_GetContextMenu(editor->lpOleCallback, seltype, NULL, &selrange, &menu))) - { - TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, editor->hwndParent, NULL); - DestroyMenu(menu); - } - return TRUE; + CHARRANGE selrange; + HMENU menu; + int seltype; + HWND hwnd, parent; + + if (!editor->lpOleCallback || !editor->have_texthost2) return FALSE; + if (FAILED( ITextHost2_TxGetWindow( editor->texthost, &hwnd ))) return FALSE; + parent = GetParent( hwnd ); + if (!parent) parent = hwnd; + + ME_GetSelectionOfs( editor, &selrange.cpMin, &selrange.cpMax ); + seltype = ME_GetSelectionType( editor ); + if (SUCCEEDED( IRichEditOleCallback_GetContextMenu( editor->lpOleCallback, seltype, NULL, &selrange, &menu ) )) + { + TrackPopupMenu( menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, parent, NULL ); + DestroyMenu( menu ); + } + return TRUE; } ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) @@ -2932,16 +2936,26 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hWnd = NULL; ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; - ed->texthost = texthost; + if (ITextHost_QueryInterface( texthost, &IID_ITextHost2, (void **)&ed->texthost ) == S_OK) + { + ITextHost_Release( texthost ); + ed->have_texthost2 = TRUE; + } + else + { + ed->texthost = (ITextHost2 *)texthost; + ed->have_texthost2 = FALSE; + } + ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->in_place_active = FALSE; ed->total_rows = 0; - ITextHost_TxGetPropertyBits( texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | + ITextHost_TxGetPropertyBits( ed->texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, &ed->props ); - ITextHost_TxGetScrollBars( texthost, &ed->scrollbars ); + ITextHost_TxGetScrollBars( ed->texthost, &ed->scrollbars ); ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ @@ -3000,7 +3014,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->password_char = 0; if (ed->props & TXTBIT_USEPASSWORD) - ITextHost_TxGetPasswordChar( texthost, &ed->password_char ); + ITextHost_TxGetPasswordChar( ed->texthost, &ed->password_char ); ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) && (ed->props & TXTBIT_MULTILINE); @@ -3025,20 +3039,20 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { if (ed->scrollbars & WS_VSCROLL) { - ITextHost_TxSetScrollRange( texthost, SB_VERT, 0, 1, TRUE ); - ITextHost_TxEnableScrollBar( texthost, SB_VERT, ESB_DISABLE_BOTH ); + ITextHost_TxSetScrollRange( ed->texthost, SB_VERT, 0, 1, TRUE ); + ITextHost_TxEnableScrollBar( ed->texthost, SB_VERT, ESB_DISABLE_BOTH ); } if (ed->scrollbars & WS_HSCROLL) { - ITextHost_TxSetScrollRange( texthost, SB_HORZ, 0, 1, TRUE ); - ITextHost_TxEnableScrollBar( texthost, SB_HORZ, ESB_DISABLE_BOTH ); + ITextHost_TxSetScrollRange( ed->texthost, SB_HORZ, 0, 1, TRUE ); + ITextHost_TxEnableScrollBar( ed->texthost, SB_HORZ, ESB_DISABLE_BOTH ); } } ed->wheel_remain = 0; ed->back_style = TXTBACK_OPAQUE; - ITextHost_TxGetBackStyle( texthost, &ed->back_style ); + ITextHost_TxGetBackStyle( ed->texthost, &ed->back_style ); list_init( &ed->reobj_list ); OleInitialize(NULL); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index bf713880f8f..e923f35ed94 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -321,8 +321,8 @@ static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) /* txthost.c */ #ifdef __ASM_USE_THISCALL_WRAPPER -extern const struct ITextHostVtbl text_host_stdcall_vtbl DECLSPEC_HIDDEN; -#define TXTHOST_VTABLE(This) (&text_host_stdcall_vtbl) +extern const struct ITextHost2Vtbl text_host2_stdcall_vtbl DECLSPEC_HIDDEN; +#define TXTHOST_VTABLE(This) (&text_host2_stdcall_vtbl) #else #define TXTHOST_VTABLE(This) (This)->lpVtbl #endif @@ -366,6 +366,19 @@ extern const struct ITextHostVtbl text_host_stdcall_vtbl DECLSPEC_HIDDEN; #define ITextHost_TxImmGetContext(This) TXTHOST_VTABLE(This)->TxImmGetContext(This) #define ITextHost_TxImmReleaseContext(This,a) TXTHOST_VTABLE(This)->TxImmReleaseContext(This,a) #define ITextHost_TxGetSelectionBarWidth(This,a) TXTHOST_VTABLE(This)->TxGetSelectionBarWidth(This,a) +/* ITextHost2 */ +#define ITextHost2_TxIsDoubleClickPending(This) TXTHOST_VTABLE(This)->TxIsDoubleClickPending(This) +#define ITextHost2_TxGetWindow(This,a) TXTHOST_VTABLE(This)->TxGetWindow(This,a) +#define ITextHost2_TxSetForegroundWindow(This) TXTHOST_VTABLE(This)->TxSetForegroundWindow(This) +#define ITextHost2_TxGetPalette(This) TXTHOST_VTABLE(This)->TxGetPalette(This) +#define ITextHost2_TxGetEastAsianFlags(This,a) TXTHOST_VTABLE(This)->TxGetEastAsianFlags(This,a) +#define ITextHost2_TxSetCursor2(This,a,b) TXTHOST_VTABLE(This)->TxSetCursor2(This,a,b) +#define ITextHost2_TxFreeTextServicesNotification(This) TXTHOST_VTABLE(This)->TxFreeTextServicesNotification(This) +#define ITextHost2_TxGetEditStyle(This,a,b) TXTHOST_VTABLE(This)->TxGetEditStyle(This,a,b) +#define ITextHost2_TxGetWindowStyles(This,a,b) TXTHOST_VTABLE(This)->TxGetWindowStyles(This,a,b) +#define ITextHost2_TxShowDropCaret(This,a,b,c) TXTHOST_VTABLE(This)->TxShowDropCaret(This,a,b,c) +#define ITextHost2_TxDestroyCaret(This) TXTHOST_VTABLE(This)->TxDestroyCaret(This) +#define ITextHost2_TxGetHorzExtent(This,a) TXTHOST_VTABLE(This)->TxGetHorzExtent(This,a) /* undo.c */ BOOL add_undo_insert_run( ME_TextEditor *, int pos, const WCHAR *str, int len, int flags, ME_Style *style ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 6bf60748f7e..ffafa794015 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -378,10 +378,11 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { HWND hWnd, hwndParent; - ITextHost *texthost; + ITextHost2 *texthost; IUnknown *reOle; unsigned int bEmulateVersion10 : 1; unsigned int in_place_active : 1; + unsigned int have_texthost2 : 1; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; DWORD props; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 7b7882be2b7..979eb3e7365 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1071,7 +1071,7 @@ static void enable_show_scrollbar( ME_TextEditor *editor, INT bar, BOOL enable ) ITextHost_TxShowScrollBar( editor->texthost, bar, enable ); } -static void set_scroll_range_pos( ITextHost *host, INT bar, SCROLLINFO *info, BOOL set_range ) +static void set_scroll_range_pos( ITextHost2 *host, INT bar, SCROLLINFO *info, BOOL set_range ) { LONG max_pos = info->nMax, pos = info->nPos; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index b624fcd377c..0618d6031ef 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); struct host { - ITextHost ITextHost_iface; + ITextHost2 ITextHost_iface; LONG ref; ITextServices *text_srv; ME_TextEditor *editor; /* to be removed */ @@ -52,7 +52,7 @@ struct host WCHAR password_char; }; -static const ITextHostVtbl textHostVtbl; +static const ITextHost2Vtbl textHostVtbl; static BOOL listbox_registered; static BOOL combobox_registered; @@ -124,34 +124,34 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) return texthost; } -static inline struct host *impl_from_ITextHost( ITextHost *iface ) +static inline struct host *impl_from_ITextHost( ITextHost2 *iface ) { return CONTAINING_RECORD( iface, struct host, ITextHost_iface ); } -static HRESULT WINAPI ITextHostImpl_QueryInterface( ITextHost *iface, REFIID riid, void **obj ) +static HRESULT WINAPI ITextHostImpl_QueryInterface( ITextHost2 *iface, REFIID iid, void **obj ) { struct host *host = impl_from_ITextHost( iface ); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) + if (IsEqualIID( iid, &IID_IUnknown ) || IsEqualIID( iid, &IID_ITextHost ) || IsEqualIID( iid, &IID_ITextHost2 )) { *obj = &host->ITextHost_iface; ITextHost_AddRef( (ITextHost *)*obj ); return S_OK; } - FIXME("Unknown interface: %s\n", debugstr_guid(riid)); + FIXME( "Unknown interface: %s\n", debugstr_guid( iid ) ); return E_NOINTERFACE; } -static ULONG WINAPI ITextHostImpl_AddRef(ITextHost *iface) +static ULONG WINAPI ITextHostImpl_AddRef( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); ULONG ref = InterlockedIncrement( &host->ref ); return ref; } -static ULONG WINAPI ITextHostImpl_Release(ITextHost *iface) +static ULONG WINAPI ITextHostImpl_Release( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); ULONG ref = InterlockedDecrement( &host->ref ); @@ -166,35 +166,35 @@ static ULONG WINAPI ITextHostImpl_Release(ITextHost *iface) } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) -DECLSPEC_HIDDEN HDC __thiscall ITextHostImpl_TxGetDC(ITextHost *iface) +DECLSPEC_HIDDEN HDC __thiscall ITextHostImpl_TxGetDC( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return GetDC( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) -DECLSPEC_HIDDEN INT __thiscall ITextHostImpl_TxReleaseDC(ITextHost *iface, HDC hdc) +DECLSPEC_HIDDEN INT __thiscall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ) { struct host *host = impl_from_ITextHost( iface ); return ReleaseDC( host->window, hdc ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost *iface, INT bar, BOOL show ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); return ShowScrollBar( host->window, bar, show ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost *iface, INT bar, INT arrows ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ) { struct host *host = impl_from_ITextHost( iface ); return EnableScrollBar( host->window, bar, arrows ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); SCROLLINFO info = { .cbSize = sizeof(info), .fMask = SIF_PAGE | SIF_RANGE }; @@ -219,7 +219,7 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost *iface } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost *iface, INT bar, INT pos, BOOL redraw ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); DWORD style = GetWindowLongW( host->window, GWL_STYLE ); @@ -244,28 +244,28 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost *iface, } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost *iface, const RECT *rect, BOOL mode ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ) { struct host *host = impl_from_ITextHost( iface ); InvalidateRect( host->window, rect, mode ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxViewChange( ITextHost *iface, BOOL update ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ) { struct host *host = impl_from_ITextHost( iface ); if (update) UpdateWindow( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost *iface, HBITMAP bitmap, INT width, INT height ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ) { struct host *host = impl_from_ITextHost( iface ); return CreateCaret( host->window, bitmap, width, height ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost *iface, BOOL show ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); if (show) return ShowCaret( host->window ); @@ -273,27 +273,27 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost *iface, BOO } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost *iface, INT x, INT y ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ) { return SetCaretPos(x, y); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost *iface, UINT id, UINT timeout ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ) { struct host *host = impl_from_ITextHost( iface ); return SetTimer( host->window, id, timeout, NULL ) != 0; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxKillTimer( ITextHost *iface, UINT id ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ) { struct host *host = impl_from_ITextHost( iface ); KillTimer( host->window, id ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost *iface, INT dx, INT dy, const RECT *scroll, +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN update_rgn, RECT *update_rect, UINT flags ) { @@ -302,7 +302,7 @@ DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost *iface } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost *iface, BOOL capture ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ) { struct host *host = impl_from_ITextHost( iface ); if (capture) SetCapture( host->window ); @@ -310,34 +310,34 @@ DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost *iface, BO } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetFocus(ITextHost *iface) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetFocus( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); SetFocus( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCursor( ITextHost *iface, HCURSOR cursor, BOOL text ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ) { SetCursor( cursor ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost *iface, POINT *pt ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ScreenToClient( host->window, pt ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost *iface, POINT *pt ) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ClientToScreen( host->window, pt ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost *iface, LONG *old_state ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ) { struct host *host = impl_from_ITextHost( iface ); *old_state = HandleToLong( SetActiveWindow( host->window ) ); @@ -345,14 +345,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost *iface, L } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost *iface, LONG new_state ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ) { HWND ret = SetActiveWindow( LongToHandle( new_state ) ); return ret ? S_OK : E_FAIL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost *iface, RECT *rect ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ) { struct host *host = impl_from_ITextHost( iface ); @@ -368,20 +368,20 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost *ifa } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost *iface, RECT *rect ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ) { SetRectEmpty( rect ); return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetCharFormat(ITextHost *iface, const CHARFORMATW **ppCF) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost *iface, const PARAFORMAT **fmt ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ) { struct host *host = impl_from_ITextHost( iface ); *fmt = (const PARAFORMAT *)&host->para_fmt; @@ -389,7 +389,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost *ifa } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) -DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost *iface, int index ) +DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ) { struct host *host = impl_from_ITextHost( iface ); @@ -398,21 +398,21 @@ DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost *ifac } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost *iface, TXTBACKSTYLE *style ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ) { *style = TXTBACK_OPAQUE; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost *iface, DWORD *length ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ) { *length = INFINITE; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbars ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ) { struct host *host = impl_from_ITextHost( iface ); @@ -421,7 +421,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *ifa } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost *iface, WCHAR *c ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ) { struct host *host = impl_from_ITextHost( iface ); @@ -430,32 +430,32 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost *i } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost *iface, LONG *pos ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ) { *pos = -1; return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost *iface, SIZEL *extent ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ) { return E_NOTIMPL; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange(ITextHost *iface, const CHARFORMATW *pcf) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ) { return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange(ITextHost *iface, const PARAFORMAT *ppf) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ) { return S_OK; } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); @@ -464,7 +464,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *i } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) { struct host *host = impl_from_ITextHost( iface ); HWND hwnd = host->window; @@ -522,21 +522,21 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) -DECLSPEC_HIDDEN HIMC __thiscall ITextHostImpl_TxImmGetContext(ITextHost *iface) +DECLSPEC_HIDDEN HIMC __thiscall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return ImmGetContext( host->window ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost *iface, HIMC context ) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ) { struct host *host = impl_from_ITextHost( iface ); ImmReleaseContext( host->window, context ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost *iface, LONG *width ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); @@ -544,6 +544,80 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHo return S_OK; } +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxIsDoubleClickPending,4) +DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ) +{ + return FALSE; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindow,8) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ) +{ + struct host *host = impl_from_ITextHost( iface ); + *hwnd = host->window; + return S_OK; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetForegroundWindow,4) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPalette,4) +DECLSPEC_HIDDEN HPALETTE __thiscall ITextHostImpl_TxGetPalette( ITextHost2 *iface ) +{ + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEastAsianFlags,8) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor2,12) +DECLSPEC_HIDDEN HCURSOR __thiscall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ) +{ + return NULL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxFreeTextServicesNotification,4) +DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ) +{ + return; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEditStyle,12) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindowStyles,12) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowDropCaret,16) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDestroyCaret,4) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ) +{ + return E_NOTIMPL; +} + +DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetHorzExtent,8) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ) +{ + return E_NOTIMPL; +} + #ifdef __ASM_USE_THISCALL_WRAPPER @@ -608,8 +682,21 @@ DEFINE_STDCALL_WRAPPER(38,ITextHostImpl_TxNotify,12) DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4) DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8) DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8) - -const ITextHostVtbl text_host_stdcall_vtbl = +/* ITextHost2 */ +DEFINE_STDCALL_WRAPPER(42,ITextHostImpl_TxIsDoubleClickPending,4) +DEFINE_STDCALL_WRAPPER(43,ITextHostImpl_TxGetWindow,8) +DEFINE_STDCALL_WRAPPER(44,ITextHostImpl_TxSetForegroundWindow,4) +DEFINE_STDCALL_WRAPPER(45,ITextHostImpl_TxGetPalette,4) +DEFINE_STDCALL_WRAPPER(46,ITextHostImpl_TxGetEastAsianFlags,8) +DEFINE_STDCALL_WRAPPER(47,ITextHostImpl_TxSetCursor2,12) +DEFINE_STDCALL_WRAPPER(48,ITextHostImpl_TxFreeTextServicesNotification,4) +DEFINE_STDCALL_WRAPPER(49,ITextHostImpl_TxGetEditStyle,12) +DEFINE_STDCALL_WRAPPER(50,ITextHostImpl_TxGetWindowStyles,12) +DEFINE_STDCALL_WRAPPER(51,ITextHostImpl_TxShowDropCaret,16) +DEFINE_STDCALL_WRAPPER(52,ITextHostImpl_TxDestroyCaret,4) +DEFINE_STDCALL_WRAPPER(53,ITextHostImpl_TxGetHorzExtent,8) + +const ITextHost2Vtbl text_host2_stdcall_vtbl = { NULL, NULL, @@ -653,11 +740,24 @@ const ITextHostVtbl text_host_stdcall_vtbl = STDCALL(ITextHostImpl_TxImmGetContext), STDCALL(ITextHostImpl_TxImmReleaseContext), STDCALL(ITextHostImpl_TxGetSelectionBarWidth), +/* ITextHost2 */ + STDCALL(ITextHostImpl_TxIsDoubleClickPending), + STDCALL(ITextHostImpl_TxGetWindow), + STDCALL(ITextHostImpl_TxSetForegroundWindow), + STDCALL(ITextHostImpl_TxGetPalette), + STDCALL(ITextHostImpl_TxGetEastAsianFlags), + STDCALL(ITextHostImpl_TxSetCursor2), + STDCALL(ITextHostImpl_TxFreeTextServicesNotification), + STDCALL(ITextHostImpl_TxGetEditStyle), + STDCALL(ITextHostImpl_TxGetWindowStyles), + STDCALL(ITextHostImpl_TxShowDropCaret), + STDCALL(ITextHostImpl_TxDestroyCaret), + STDCALL(ITextHostImpl_TxGetHorzExtent) }; #endif /* __ASM_USE_THISCALL_WRAPPER */ -static const ITextHostVtbl textHostVtbl = +static const ITextHost2Vtbl textHostVtbl = { ITextHostImpl_QueryInterface, ITextHostImpl_AddRef, @@ -701,6 +801,19 @@ static const ITextHostVtbl textHostVtbl = THISCALL(ITextHostImpl_TxImmGetContext), THISCALL(ITextHostImpl_TxImmReleaseContext), THISCALL(ITextHostImpl_TxGetSelectionBarWidth), +/* ITextHost2 */ + THISCALL(ITextHostImpl_TxIsDoubleClickPending), + THISCALL(ITextHostImpl_TxGetWindow), + THISCALL(ITextHostImpl_TxSetForegroundWindow), + THISCALL(ITextHostImpl_TxGetPalette), + THISCALL(ITextHostImpl_TxGetEastAsianFlags), + THISCALL(ITextHostImpl_TxSetCursor2), + THISCALL(ITextHostImpl_TxFreeTextServicesNotification), + THISCALL(ITextHostImpl_TxGetEditStyle), + THISCALL(ITextHostImpl_TxGetWindowStyles), + THISCALL(ITextHostImpl_TxShowDropCaret), + THISCALL(ITextHostImpl_TxDestroyCaret), + THISCALL(ITextHostImpl_TxGetHorzExtent) }; static const char * const edit_messages[] = @@ -759,10 +872,10 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula if (!host) return FALSE; - hr = create_text_services( NULL, &host->ITextHost_iface, &unk, emulate_10, &host->editor ); + hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10, &host->editor ); if (FAILED( hr )) { - ITextHost_Release( &host->ITextHost_iface ); + ITextHost2_Release( &host->ITextHost_iface ); return FALSE; } IUnknown_QueryInterface( unk, &IID_ITextServices, (void **)&host->text_srv ); @@ -1031,7 +1144,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case WM_DESTROY: - ITextHost_Release( &host->ITextHost_iface ); + ITextHost2_Release( &host->ITextHost_iface ); return 0; case WM_ERASEBKGND: @@ -1185,7 +1298,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); + ITextHost_TxGetClientRect( &host->ITextHost_iface, &client ); if (msg == WM_PAINT) { -- 2.23.0

2 1

[PATCH 2/6] riched20: Use the text host stored in the editor structure.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txtsrv.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5736964c1b1..4cd19a0d24b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -38,7 +38,6 @@ struct text_services ITextServices ITextServices_iface; IUnknown *outer_unk; LONG ref; - ITextHost *host; ME_TextEditor *editor; char spare[256]; /* for bug #12179 */ }; @@ -150,7 +149,7 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c if (!client) { if (!services->editor->in_place_active) return E_INVALIDARG; - hr = ITextHost_TxGetClientRect( services->host, &rect ); + hr = ITextHost_TxGetClientRect( services->editor->texthost, &rect ); if (FAILED( hr )) return hr; } else rect = *client; @@ -186,7 +185,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (hr == S_OK) rewrap = TRUE; if (!dc && services->editor->in_place_active) - dc = ITextHost_TxGetDC( services->host ); + dc = ITextHost_TxGetDC( services->editor->texthost ); if (!dc) return E_FAIL; if (rewrap) @@ -196,7 +195,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD } editor_draw( services->editor, dc, update ); - if (!draw) ITextHost_TxReleaseDC( services->host, dc ); + if (!draw) ITextHost_TxReleaseDC( services->editor->texthost, dc ); return S_OK; } @@ -389,7 +388,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *if if (hr == S_OK) rewrap = TRUE; if (!dc && services->editor->in_place_active) - dc = ITextHost_TxGetDC( services->host ); + dc = ITextHost_TxGetDC( services->editor->texthost ); if (!dc) return E_FAIL; if (rewrap) @@ -401,7 +400,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *if *width = services->editor->nTotalWidth; *height = services->editor->nTotalLength; - if (!draw) ITextHost_TxReleaseDC( services->host, dc ); + if (!draw) ITextHost_TxReleaseDC( services->editor->texthost, dc ); return S_OK; } @@ -430,14 +429,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic if (mask & TXTBIT_SCROLLBARCHANGE) { - hr = ITextHost_TxGetScrollBars( services->host, &scrollbars ); + hr = ITextHost_TxGetScrollBars( services->editor->texthost, &scrollbars ); if (SUCCEEDED( hr )) { if ((services->editor->scrollbars ^ scrollbars) & WS_HSCROLL) - ITextHost_TxShowScrollBar( services->host, SB_HORZ, (scrollbars & WS_HSCROLL) && + ITextHost_TxShowScrollBar( services->editor->texthost, SB_HORZ, (scrollbars & WS_HSCROLL) && services->editor->nTotalWidth > services->editor->sizeWindow.cx ); if ((services->editor->scrollbars ^ scrollbars) & WS_VSCROLL) - ITextHost_TxShowScrollBar( services->host, SB_VERT, (scrollbars & WS_VSCROLL) && + ITextHost_TxShowScrollBar( services->editor->texthost, SB_VERT, (scrollbars & WS_VSCROLL) && services->editor->nTotalLength > services->editor->sizeWindow.cy ); services->editor->scrollbars = scrollbars; } @@ -449,10 +448,10 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic { LONG width; - hr = ITextHost_TxGetSelectionBarWidth( services->host, &width ); + hr = ITextHost_TxGetSelectionBarWidth( services->editor->texthost, &width ); if (hr == S_OK) { - ITextHost_TxInvalidateRect( services->host, &services->editor->rcFormat, TRUE ); + ITextHost_TxInvalidateRect( services->editor->texthost, &services->editor->rcFormat, TRUE ); services->editor->rcFormat.left -= services->editor->selofs; services->editor->selofs = width ? SELECTIONBAR_WIDTH : 0; /* FIXME: convert from HIMETRIC */ services->editor->rcFormat.left += services->editor->selofs; @@ -468,7 +467,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic if (mask & TXTBIT_USEPASSWORD) { - if (bits & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar( services->host, &services->editor->password_char ); + if (bits & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar( services->editor->texthost, &services->editor->password_char ); else services->editor->password_char = 0; repaint = TRUE; } @@ -593,7 +592,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services = CoTaskMemAlloc( sizeof(*services) ); if (services == NULL) return E_OUTOFMEMORY; services->ref = 1; - services->host = text_host; /* Don't take a ref of the host - this would lead to a mutual dependency */ services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; services->ITextServices_iface.lpVtbl = &textservices_vtbl; services->editor = ME_MakeEditor( text_host, emulate_10 ); -- 2.23.0

2 1

[PATCH v3 1/3] windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion.
by Rémi Bernon 26 Mar '21

26 Mar '21

Returning the user default country. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Fix error handling in PATCH 2. dlls/windows.globalization/main.c | 12 ++++++++++-- dlls/windows.globalization/tests/globalization.c | 15 +++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 17bb49a1c4e..84813152047 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -225,8 +225,16 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( IGlobalizationPreferencesStatics *iface, HSTRING* out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + WCHAR country[16]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultGeoName(country, 16)) + return E_FAIL; + + TRACE("returning country %s\n", debugstr_w(country)); + + return WindowsCreateString(country, wcslen(country), out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_WeekStartsOn( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 1918322b7a2..00d9cee5b0d 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -55,14 +55,11 @@ static void test_GlobalizationPreferences(void) BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], country[16]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; - if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); - else country = wcsdup(tmp + 1); - GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + GetUserDefaultGeoName(country, 16); hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -77,7 +74,6 @@ static void test_GlobalizationPreferences(void) win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); pWindowsDeleteString(str); pRoUninitialize(); - free(country); return; } @@ -101,8 +97,7 @@ static void test_GlobalizationPreferences(void) IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); buf = pWindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -113,7 +108,8 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -164,7 +160,6 @@ done: pWindowsDeleteString(str); pRoUninitialize(); - free(country); } START_TEST(globalization) -- 2.30.2

2 6

[PATCH v2 resend 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang 26 Mar '21

26 Mar '21

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 3 -- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..b8071dc2155 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2783,7 +2783,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f75e8292ca4..2e0e68060b4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2040,13 +2040,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

2 1

[PATCH] po: Update LIthuanian translation
by Aurimas Fišeras 26 Mar '21

26 Mar '21

1 0

[PATCH v2 1/3] windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion.
by Rémi Bernon 26 Mar '21

26 Mar '21

Returning the user default country. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use GetUserDefaultGeoName. dlls/windows.globalization/main.c | 12 ++++++++++-- dlls/windows.globalization/tests/globalization.c | 15 +++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 17bb49a1c4e..84813152047 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -225,8 +225,16 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( IGlobalizationPreferencesStatics *iface, HSTRING* out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + WCHAR country[16]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultGeoName(country, 16)) + return E_FAIL; + + TRACE("returning country %s\n", debugstr_w(country)); + + return WindowsCreateString(country, wcslen(country), out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_WeekStartsOn( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 1918322b7a2..00d9cee5b0d 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -55,14 +55,11 @@ static void test_GlobalizationPreferences(void) BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], country[16]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; - if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); - else country = wcsdup(tmp + 1); - GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + GetUserDefaultGeoName(country, 16); hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -77,7 +74,6 @@ static void test_GlobalizationPreferences(void) win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); pWindowsDeleteString(str); pRoUninitialize(); - free(country); return; } @@ -101,8 +97,7 @@ static void test_GlobalizationPreferences(void) IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); buf = pWindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -113,7 +108,8 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -164,7 +160,6 @@ done: pWindowsDeleteString(str); pRoUninitialize(); - free(country); } START_TEST(globalization) -- 2.30.2

3 10

[PATCH v2 resend 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 26 Mar '21

26 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b233970ace..f75e8292ca4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1996,7 +2001,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2024,6 +2032,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

2 1

[PATCH v3 1/4] mfplat/tests: Add media source rate service tests.
by Giovanni Mascellani 26 Mar '21

26 Mar '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1b24dce2fe0..103441be14c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -93,6 +93,26 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +#define check_service_interface(a, b, c, d) check_service_interface_(__LINE__, a, b, c, d) +static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IMFGetService *gs; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + if (SUCCEEDED(hr = IUnknown_QueryInterface(iface, &IID_IMFGetService, (void **)&gs))) + { + hr = IMFGetService_GetService(gs, service, iid, (void **)&unk); + IMFGetService_Release(gs); + } + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + struct d3d11_resource_readback { ID3D11Resource *resource; @@ -737,6 +757,11 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); +todo_wine { + check_interface(mediasource, &IID_IMFGetService, TRUE); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); +} hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); ok(descriptor != NULL, "got %p\n", descriptor); -- 2.31.0

3 10

[PATCH 1/6] include: Add ITextHost2.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/textserv.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/include/textserv.h b/include/textserv.h index 3abdcee6a30..6198f6900ff 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -31,6 +31,7 @@ extern "C" { EXTERN_C const IID IID_ITextServices; EXTERN_C const IID IID_ITextHost; +EXTERN_C const IID IID_ITextHost2; /***************************************************************************** * ITextServices interface @@ -364,6 +365,80 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) #define ITextHost_Release(p) (p)->lpVtbl->Release(p) #endif +/***************************************************************************** + * ITextHost2 interface + */ +#define INTERFACE ITextHost2 +DECLARE_INTERFACE_(ITextHost2,ITextHost) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)( THIS_ REFIID riid, void** ppvObject ) PURE; + STDMETHOD_(ULONG,AddRef)( THIS ) PURE; + STDMETHOD_(ULONG,Release)( THIS ) PURE; + /*** ITextHost methods ***/ + THISCALLMETHOD_(HDC,TxGetDC)( THIS ) PURE; + THISCALLMETHOD_(INT,TxReleaseDC)( THIS_ HDC hdc ) PURE; + THISCALLMETHOD_(BOOL,TxShowScrollBar)( THIS_ INT fnBar, BOOL fShow ) PURE; + THISCALLMETHOD_(BOOL,TxEnableScrollBar)( THIS_ INT fuSBFlags, INT fuArrowflags ) PURE; + THISCALLMETHOD_(BOOL,TxSetScrollRange)( THIS_ INT fnBar, LONG nMinPos, INT nMaxPos, BOOL fRedraw ) PURE; + THISCALLMETHOD_(BOOL,TxSetScrollPos)( THIS_ INT fnBar, INT nPos, BOOL fRedraw ) PURE; + THISCALLMETHOD_(void,TxInvalidateRect)( THIS_ LPCRECT prc, BOOL fMode ) PURE; + THISCALLMETHOD_(void,TxViewChange)( THIS_ BOOL fUpdate ) PURE; + THISCALLMETHOD_(BOOL,TxCreateCaret)( THIS_ HBITMAP hbmp, INT xWidth, INT yHeight ) PURE; + THISCALLMETHOD_(BOOL,TxShowCaret)( THIS_ BOOL fShow ) PURE; + THISCALLMETHOD_(BOOL,TxSetCaretPos)( THIS_ INT x, INT y ) PURE; + THISCALLMETHOD_(BOOL,TxSetTimer)( THIS_ UINT idTimer, UINT uTimeout ) PURE; + THISCALLMETHOD_(void,TxKillTimer)( THIS_ UINT idTimer ) PURE; + THISCALLMETHOD_(void,TxScrollWindowEx)( THIS_ INT dx, INT dy, LPCRECT lprcScroll, LPCRECT lprcClip, + HRGN hRgnUpdate, LPRECT lprcUpdate, UINT fuScroll ) PURE; + THISCALLMETHOD_(void,TxSetCapture)( THIS_ BOOL fCapture ) PURE; + THISCALLMETHOD_(void,TxSetFocus)( THIS ) PURE; + THISCALLMETHOD_(void,TxSetCursor)( THIS_ HCURSOR hcur, BOOL fText ) PURE; + THISCALLMETHOD_(BOOL,TxScreenToClient)( THIS_ LPPOINT lppt ) PURE; + THISCALLMETHOD_(BOOL,TxClientToScreen)( THIS_ LPPOINT lppt ) PURE; + THISCALLMETHOD_(HRESULT,TxActivate)( THIS_ LONG* plOldState ) PURE; + THISCALLMETHOD_(HRESULT,TxDeactivate)( THIS_ LONG lNewState ) PURE; + THISCALLMETHOD_(HRESULT,TxGetClientRect)( THIS_ LPRECT prc ) PURE; + THISCALLMETHOD_(HRESULT,TxGetViewInset)( THIS_ LPRECT prc ) PURE; + THISCALLMETHOD_(HRESULT,TxGetCharFormat)( THIS_ const CHARFORMATW** ppCF ) PURE; + THISCALLMETHOD_(HRESULT,TxGetParaFormat)( THIS_ const PARAFORMAT** ppPF ) PURE; + THISCALLMETHOD_(COLORREF,TxGetSysColor)( THIS_ int nIndex ) PURE; + THISCALLMETHOD_(HRESULT,TxGetBackStyle)( THIS_ TXTBACKSTYLE* pStyle ) PURE; + THISCALLMETHOD_(HRESULT,TxGetMaxLength)( THIS_ DWORD* plength ) PURE; + THISCALLMETHOD_(HRESULT,TxGetScrollBars)( THIS_ DWORD* pdwScrollBar ) PURE; + THISCALLMETHOD_(HRESULT,TxGetPasswordChar)( THIS_ WCHAR* pch ) PURE; + THISCALLMETHOD_(HRESULT,TxGetAcceleratorPos)( THIS_ LONG* pch ) PURE; + THISCALLMETHOD_(HRESULT,TxGetExtent)( THIS_ LPSIZEL lpExtent ) PURE; + THISCALLMETHOD_(HRESULT,OnTxCharFormatChange)( THIS_ const CHARFORMATW* pcf ) PURE; + THISCALLMETHOD_(HRESULT,OnTxParaFormatChange)( THIS_ const PARAFORMAT* ppf ) PURE; + THISCALLMETHOD_(HRESULT,TxGetPropertyBits)( THIS_ DWORD dwMask, DWORD* pdwBits ) PURE; + THISCALLMETHOD_(HRESULT,TxNotify)( THIS_ DWORD iNotify, void* pv ) PURE; + THISCALLMETHOD_(HIMC,TxImmGetContext)( THIS ) PURE; + THISCALLMETHOD_(void,TxImmReleaseContext)( THIS_ HIMC himc ) PURE; + THISCALLMETHOD_(HRESULT,TxGetSelectionBarWidth)( THIS_ LONG* lSelBarWidth ) PURE; + /* ITextHost2 methods */ + THISCALLMETHOD_(BOOL,TxIsDoubleClickPending)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,TxGetWindow)( THIS_ HWND *hwnd ) PURE; + THISCALLMETHOD_(HRESULT,TxSetForegroundWindow)( THIS ) PURE; + THISCALLMETHOD_(HPALETTE,TxGetPalette)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,TxGetEastAsianFlags)( THIS_ LONG *flags ) PURE; + THISCALLMETHOD_(HCURSOR,TxSetCursor2)( THIS_ HCURSOR cursor, BOOL text ) PURE; + THISCALLMETHOD_(void,TxFreeTextServicesNotification)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,TxGetEditStyle)( THIS_ DWORD item, DWORD *data ) PURE; + THISCALLMETHOD_(HRESULT,TxGetWindowStyles)( THIS_ DWORD *style, DWORD *ex_style ) PURE; + THISCALLMETHOD_(HRESULT,TxShowDropCaret)( THIS_ BOOL show, HDC hdc, const RECT *rect ) PURE; + THISCALLMETHOD_(HRESULT,TxDestroyCaret)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,TxGetHorzExtent)( THIS_ LONG *horz_extent ) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define ITextHost2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ITextHost2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ITextHost2_Release(p) (p)->lpVtbl->Release(p) +#endif + HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**); typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**); -- 2.23.0

1 0

[PATCH] mfreadwrite/reader: Use shared multi-threaded queue internally.
by Nikolay Sivov 26 Mar '21

26 Mar '21

Using dedicated queue prevents potential lockups with event queue, specifically when waiting on event queue for seek to finish blocks events delivery. The issue was diagnosed by Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2819b800eb9..d399b7ad859 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -195,6 +195,7 @@ struct source_reader unsigned int last_read_index; unsigned int stream_count; unsigned int flags; + unsigned int queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -384,8 +385,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) { command->u.sample.stream_index = stream->index; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, - &command->IUnknown_iface))) + if (FAILED(hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface))) WARN("Failed to submit async result, hr %#x.\n", hr); IUnknown_Release(&command->IUnknown_iface); } @@ -1396,6 +1396,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) } source_reader_release_responses(reader, NULL); heap_free(reader->streams); + MFUnlockWorkQueue(reader->queue); DeleteCriticalSection(&reader->cs); heap_free(reader); } @@ -1873,8 +1874,7 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG command->u.seek.format = *format; PropVariantCopy(&command->u.seek.position, position); - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, - &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -1976,7 +1976,7 @@ static HRESULT source_reader_read_sample_async(struct source_reader *reader, uns command->u.read.stream_index = index; command->u.read.flags = flags; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -2040,7 +2040,7 @@ static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned command->u.flush.stream_index = stream_index; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); return hr; @@ -2265,7 +2265,7 @@ static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAll if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) { command->u.sa.stream_index = stream->index; - MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &stream->reader->async_commands_callback, &command->IUnknown_iface); + MFPutWorkItem(stream->reader->queue, &stream->reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } @@ -2406,7 +2406,11 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } } - hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + if (FAILED(hr = MFLockSharedWorkQueue(L"", 0, NULL, &object->queue))) + WARN("Failed to acquired shared queue, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: IMFSourceReader_Release(&object->IMFSourceReader_iface); -- 2.30.2

2 1

[PATCH v2] msado15: Implement _Recordset get/put Bookmark
by Alistair Leslie-Hughes 26 Mar '21

26 Mar '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 22 ++++++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a86936eb037..68d4c22d802 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1029,14 +1029,28 @@ static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) { - FIXME( "%p, %p\n", iface, bookmark ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, bookmark ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + V_VT(bookmark) = VT_I4; + V_I4(bookmark) = recordset->index; + return S_OK; } static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %s\n", iface, debugstr_variant(&bookmark) ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + if (V_VT(&bookmark) != VT_I4) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + recordset->index = V_I4(&bookmark); + return S_OK; } static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bc9b4a24761..db606f21fab 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -74,6 +74,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; + VARIANT bookmark; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -153,6 +154,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -188,6 +197,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %d\n", state ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + count = -1; hr = _Recordset_get_RecordCount( recordset, &count ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.30.2

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel