wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : wined3d: Implement dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: df569853bf6ed84ae4a362c8a8b89049092d72ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df569853bf6ed84ae4a362c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:38 2020 -0500 wined3d: Implement dual source blending. Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++++++---- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..26dde1087a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } @@ -10385,7 +10398,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { string_buffer_sprintf(tmp_name, "color_out%u", i); - GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); + if (state->blend_state && state->blend_state->dual_source) + GL_EXTCALL(glBindFragDataLocationIndexed(program_id, 0, i, tmp_name->buffer)); + else + GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); checkGLcall("glBindFragDataLocation"); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops;

1 0

Nikolay Sivov : mf: Set presentation clock for all node types.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 92d6a8bf8f96d35fc5c94ee26bcf83bfaa406dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d6a8bf8f96d35fc5c94ee2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:38 2020 +0300 mf: Set presentation clock for all node types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2204149dca..db1e5e4fe5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -164,7 +164,7 @@ struct topo_node enum presentation_flags { SESSION_FLAG_SOURCES_SUBSCRIBED = 0x1, - SESSION_FLAG_SINKS_SUBSCRIBED = 0x2, + SESSION_FLAG_PRESENTATION_CLOCK_SET = 0x2, SESSION_FLAG_FINALIZE_SINKS = 0x4, }; @@ -1911,9 +1911,21 @@ static enum object_state session_get_object_state_for_event(MediaEventType event } } +static void session_set_consumed_clock(IUnknown *object, IMFPresentationClock *clock) +{ + IMFClockConsumer *consumer; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFClockConsumer, (void **)&consumer))) + { + IMFClockConsumer_SetPresentationClock(consumer, clock); + IMFClockConsumer_Release(consumer); + } +} + static HRESULT session_start_clock(struct media_session *session) { IMFPresentationTimeSource *time_source = NULL; + struct media_source *source; LONGLONG start_offset = 0; struct media_sink *sink; struct topo_node *node; @@ -1925,8 +1937,9 @@ static HRESULT session_start_clock(struct media_session *session) IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0); } - if (!(session->presentation.flags & SESSION_FLAG_SINKS_SUBSCRIBED)) + if (!(session->presentation.flags & SESSION_FLAG_PRESENTATION_CLOCK_SET)) { + /* Attempt to get time source from the sinks. */ LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { if (SUCCEEDED(IMFMediaSink_QueryInterface(sink->sink, &IID_IMFPresentationTimeSource, @@ -1957,6 +1970,12 @@ static HRESULT session_start_clock(struct media_session *session) } } + /* Set clock for all topology nodes. */ + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + session_set_consumed_clock((IUnknown *)source->source, session->clock); + } + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { if (sink->event_generator && FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(sink->event_generator, @@ -1969,7 +1988,15 @@ static HRESULT session_start_clock(struct media_session *session) WARN("Failed to set presentation clock for the sink, hr %#x.\n", hr); } - session->presentation.flags |= SESSION_FLAG_SINKS_SUBSCRIBED; + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type != MF_TOPOLOGY_TRANSFORM_NODE) + continue; + + session_set_consumed_clock(node->object.object, session->clock); + } + + session->presentation.flags |= SESSION_FLAG_PRESENTATION_CLOCK_SET; } if (IsEqualGUID(&session->presentation.time_format, &GUID_NULL))

1 0

Nikolay Sivov : mf: Forward more Audio Session events from the session.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 69885afbed63d1375117732bcdbe658d1dbbc8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=69885afbed63d1375117732b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:37 2020 +0300 mf: Forward more Audio Session events from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 69d1fdf569..2204149dca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2613,6 +2613,14 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_deliver_sample(session, (IMFMediaStream *)event_source, &value); LeaveCriticalSection(&session->cs); + break; + case MEAudioSessionGroupingParamChanged: + case MEAudioSessionIconChanged: + case MEAudioSessionNameChanged: + case MEAudioSessionVolumeChanged: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + break; case MEAudioSessionDeviceRemoved: case MEAudioSessionDisconnected:

1 0

Nikolay Sivov : mfplat: Add a helper to trace video format name.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: d0a43d1830bfc7de0256c827593b094fcc05a16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a43d1830bfc7de0256c827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:36 2020 +0300 mfplat: Add a helper to trace video format name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 5 ++--- dlls/mfplat/mfplat_private.h | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 64ec436a1e..71bae4c42f 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -642,7 +642,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - TRACE("%u, %u, %#x, %d, %p.\n", width, height, fourcc, bottom_up, buffer); + TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); return create_2d_buffer(width, height, fourcc, bottom_up, buffer); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a5c954161d..ffe9e36d15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1510,7 +1510,7 @@ HRESULT WINAPI MFShutdown(void) */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - TRACE("(%p, %d, %p, %d, %u, %u)\n", dest, deststride, src, srcstride, width, lines); + TRACE("%p, %d, %p, %d, %u, %u.\n", dest, deststride, src, srcstride, width, lines); while (lines--) { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 8c4716e5e1..77753cc499 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -19,7 +19,6 @@ #define COBJMACROS #include "mfplat_private.h" -#include "d3d9types.h" #include "initguid.h" #include "ks.h" @@ -1837,7 +1836,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s struct uncompressed_video_format *format; GUID subtype; - TRACE("%#x, %u, %p.\n", fourcc, width, stride); + TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -1902,7 +1901,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si unsigned int stride; GUID subtype; - TRACE("%#x, %u, %u, %p.\n", fourcc, width, height, size); + TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 0c374f116b..15d81a65b9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -23,6 +23,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "d3d9types.h" #include "wine/heap.h" #include "wine/debug.h" @@ -145,3 +146,39 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); } } + +static inline const char *debugstr_fourcc(DWORD format) +{ + static const struct format_name + { + unsigned int format; + const char *name; + } formats[] = + { + { D3DFMT_R8G8B8, "R8G8B8" }, + { D3DFMT_A8R8G8B8, "A8R8G8B8" }, + { D3DFMT_X8R8G8B8, "X8R8G8B8" }, + { D3DFMT_R5G6B5, "R5G6B5" }, + { D3DFMT_X1R5G5B5, "X1R5G6B5" }, + { D3DFMT_A2B10G10R10, "A2B10G10R10" }, + { D3DFMT_P8, "P8" }, + { D3DFMT_L8, "L8" }, + { D3DFMT_D16, "D16" }, + { D3DFMT_L16, "L16" }, + { D3DFMT_A16B16G16R16F, "A16B16G16R16F" }, + }; + int i; + + if ((format & 0xff) == format) + { + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + if (formats[i].format == format) + return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1)); + } + + return wine_dbg_sprintf("%#x", format); + } + + return wine_dbgstr_an((char *)&format, 4); +}

1 0

Nikolay Sivov : mfplat/tests: Increase wait timeout to help with intermittent test failures.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: af55f88d2a5e5aec846a33962a7e0b5cfb5c430b URL: https://source.winehq.org/git/wine.git/?a=commit;h=af55f88d2a5e5aec846a3396… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:35 2020 +0300 mfplat/tests: Increase wait timeout to help with intermittent test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4cb5499f7c..8e9bf8102a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2066,7 +2066,7 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul state = IMFAsyncResult_GetStateNoAddRef(result); if (state && SUCCEEDED(IUnknown_QueryInterface(state, &IID_IMFMediaEventQueue, (void **)&queue))) { - IMFMediaEvent *event; + IMFMediaEvent *event = NULL, *event2; if (is_win8_plus) { @@ -2079,10 +2079,11 @@ static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResul hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); - hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event); + hr = IMFMediaEventQueue_EndGetEvent(queue, result, &event2); ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - IMFMediaEvent_Release(event); + if (event) + IMFMediaEvent_Release(event); } hr = IMFAsyncResult_GetObject(result, &obj); @@ -2719,7 +2720,7 @@ static void test_event_queue(void) hr = IMFMediaEventQueue_QueueEvent(queue, event); ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - ret = WaitForSingleObject(callback.event, 100); + ret = WaitForSingleObject(callback.event, 500); ok(ret == WAIT_OBJECT_0, "Unexpected return value %#x.\n", ret); CloseHandle(callback.event);

1 0

Nikolay Sivov : mfplat: Improve 2D buffer sizes estimation.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 26a257956a74431a9a4a34004c94fb1cef839283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a257956a74431a9a4a3400… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:34 2020 +0300 mfplat: Improve 2D buffer sizes estimation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 21 +++++++++- dlls/mfplat/mediatype.c | 2 + dlls/mfplat/tests/mfplat.c | 99 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 102 insertions(+), 20 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 05e1ce5fd6..64ec436a1e 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -546,6 +546,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo { unsigned int bpp, max_length, plane_size; struct memory_buffer *object; + unsigned int row_alignment; GUID subtype; BOOL is_yuv; HRESULT hr; @@ -572,10 +573,28 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (!object) return E_OUTOFMEMORY; - pitch = ALIGN_SIZE(width * bpp, MF_64_BYTE_ALIGNMENT); + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','3'): + case MAKEFOURCC('I','M','C','4'): + case MAKEFOURCC('Y','V','1','2'): + row_alignment = MF_128_BYTE_ALIGNMENT; + break; + default: + row_alignment = MF_64_BYTE_ALIGNMENT; + } + + pitch = ALIGN_SIZE(width * bpp, row_alignment); switch (fourcc) { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + max_length = pitch * height * 2; + plane_size *= 2; + break; case MAKEFOURCC('N','V','1','2'): max_length = pitch * height * 3 / 2; break; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 142ee69cf6..8c4716e5e1 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1799,6 +1799,8 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, + { &MFVideoFormat_UYVY, 2, 0, 0, 1 }, + { &MFVideoFormat_YUY2, 2, 0, 0, 1 }, { &MFVideoFormat_YV12, 1, 0, 0, 1 }, { &MFVideoFormat_A16B16G16R16F, 8, 3, 1, 0 }, }; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c5ed883dfa..4cb5499f7c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3475,6 +3475,14 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_YV12, 2, 1, 3 }, { &MFVideoFormat_YV12, 1, 2, 6, 3 }, { &MFVideoFormat_YV12, 4, 3, 18 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, }; unsigned int i; UINT32 size; @@ -3490,23 +3498,22 @@ static void test_MFCalculateImageSize(void) for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { + const struct image_size_test *ptr = &image_size_tests[i]; + /* Those are supported since Win10. */ - BOOL is_broken = IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A16B16G16R16F) || - IsEqualGUID(image_size_tests[i].subtype, &MFVideoFormat_A2R10G10B10); + BOOL is_broken = IsEqualGUID(ptr->subtype, &MFVideoFormat_A16B16G16R16F) || + IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); - hr = MFCalculateImageSize(image_size_tests[i].subtype, image_size_tests[i].width, - image_size_tests[i].height, &size); + hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); - ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, - image_size_tests[i].size); + ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); if (pMFGetPlaneSize) { - unsigned int plane_size = image_size_tests[i].plane_size ? image_size_tests[i].plane_size : - image_size_tests[i].size; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; - hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, - &size); + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); } @@ -4635,16 +4642,51 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int height; unsigned int fourcc; unsigned int contiguous_length; + int pitch; + unsigned int plane_multiplier; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6 }, - { 4, 2, MAKEFOURCC('N','V','1','2'), 12 }, - { 2, 4, MAKEFOURCC('N','V','1','2'), 12 }, - { 1, 3, MAKEFOURCC('N','V','1','2'), 4 }, - - { 2, 4, D3DFMT_A8R8G8B8, 32 }, - { 1, 4, D3DFMT_A8R8G8B8, 16 }, - { 4, 1, D3DFMT_A8R8G8B8, 16 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64 }, + { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, + { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, + + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128 }, + { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, + { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + + { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, + { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128 }, + + { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, + { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64 }, + + { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, + { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64 }, + + { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, + { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64 }, + + { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, + { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, + { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; unsigned int max_length, length, length2; BYTE *buffer_start, *data, *data2; @@ -4838,9 +4880,28 @@ static void test_MFCreate2DMediaBuffer(void) ok(length == ptr->contiguous_length, "%d: unexpected contiguous length %u for %u x %u, format %s.\n", i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + hr = IMFMediaBuffer_Lock(buffer, &data, &length2, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + ok(length == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", + i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); ok(hr == S_OK, "Failed to get plane size, hr %#x.\n", hr); - ok(length2 == length, "%d: contiguous length %u does not match plane size %u.\n", i, length, length2); + if (ptr->plane_multiplier) + length2 *= ptr->plane_multiplier; + ok(length2 == length, "%d: contiguous length %u does not match plane size %u, %u x %u, format %s.\n", i, length, + length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + hr = IMF2DBuffer_Unlock2D(_2dbuffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + ok(pitch == ptr->pitch, "%d: unexpected pitch %d, expected %d, %u x %u, format %s.\n", i, pitch, ptr->pitch, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); ret = TRUE; hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &ret);

1 0

Myah Caron : api-ms-win-core-registry-l2-2-0: Add dll.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: ba4a3334abdb0f2a9e7558ffdb9eac9a8d1c20c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4a3334abdb0f2a9e7558ff… Author: Myah Caron <qsniyg(a)mail.com> Date: Wed Mar 18 11:27:03 2020 +0100 api-ms-win-core-registry-l2-2-0: Add dll. Signed-off-by: Myah Caron <qsniyg(a)mail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-registry-l2-2-0/Makefile.in | 1 + .../api-ms-win-core-registry-l2-2-0.spec | 29 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 34 insertions(+) diff --git a/configure b/configure index 76cfea1c07..1bde1100b9 100755 --- a/configure +++ b/configure @@ -1005,6 +1005,7 @@ enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registry_l2_1_0 +enable_api_ms_win_core_registry_l2_2_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 @@ -20204,6 +20205,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-1-0 enable_api_ms_win_core_registry_l2_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-registry-l2-2-0 enable_api_ms_win_core_registry_l2_2_0 wine_fn_config_makefile dlls/api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 diff --git a/configure.ac b/configure.ac index f722ac5d04..7096e2fb66 100644 --- a/configure.ac +++ b/configure.ac @@ -2905,6 +2905,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registryuserspecific-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-rtlsupport-l1-2-0) diff --git a/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in new file mode 100644 index 0000000000..af9aa28b52 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registry-l2-2-0.dll diff --git a/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec new file mode 100644 index 0000000000..6d9ae1f404 --- /dev/null +++ b/dlls/api-ms-win-core-registry-l2-2-0/api-ms-win-core-registry-l2-2-0.spec @@ -0,0 +1,29 @@ +@ stdcall RegConnectRegistryA(str long ptr) advapi32.RegConnectRegistryA +@ stdcall RegConnectRegistryW(wstr long ptr) advapi32.RegConnectRegistryW +@ stdcall RegCopyTreeA(long str long) advapi32.RegCopyTreeA +@ stdcall RegCreateKeyA(long str ptr) advapi32.RegCreateKeyA +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedA +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) advapi32.RegCreateKeyTransactedW +@ stdcall RegCreateKeyW(long wstr ptr) advapi32.RegCreateKeyW +@ stdcall RegDeleteKeyA(long str) advapi32.RegDeleteKeyA +@ stub RegDeleteKeyTransactedA +@ stub RegDeleteKeyTransactedW +@ stdcall RegDeleteKeyW(long wstr) advapi32.RegDeleteKeyW +@ stdcall RegDisablePredefinedCache() advapi32.RegDisablePredefinedCache +@ stdcall RegEnumKeyA(long long ptr long) advapi32.RegEnumKeyA +@ stdcall RegEnumKeyW(long long ptr long) advapi32.RegEnumKeyW +@ stdcall RegOpenKeyA(long str ptr) advapi32.RegOpenKeyA +@ stub RegOpenKeyTransactedA +@ stub RegOpenKeyTransactedW +@ stdcall RegOpenKeyW(long wstr ptr) advapi32.RegOpenKeyW +@ stdcall RegOverridePredefKey(long long) advapi32.RegOverridePredefKey +@ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesA +@ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) advapi32.RegQueryMultipleValuesW +@ stdcall RegQueryValueA(long str ptr ptr) advapi32.RegQueryValueA +@ stdcall RegQueryValueW(long wstr ptr ptr) advapi32.RegQueryValueW +@ stdcall RegReplaceKeyA(long str str str) advapi32.RegReplaceKeyA +@ stdcall RegReplaceKeyW(long wstr wstr wstr) advapi32.RegReplaceKeyW +@ stdcall RegSaveKeyA(long ptr ptr) advapi32.RegSaveKeyA +@ stdcall RegSaveKeyW(long ptr ptr) advapi32.RegSaveKeyW +@ stdcall RegSetValueA(long str long ptr long) advapi32.RegSetValueA +@ stdcall RegSetValueW(long wstr long ptr long) advapi32.RegSetValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 7fef3a6821..95b210752c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,6 +119,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", + "api-ms-win-core-registry-l2-2-0", "api-ms-win-core-shutdown-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0",

1 0

Alistair Leslie-Hughes : oledb32/tests: Add MSDASQL Enumerator tests.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: b1de215858eca0a79053eaba7ef652c58a518370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1de215858eca0a79053eaba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 18 05:26:06 2020 +0000 oledb32/tests: Add MSDASQL Enumerator tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d9811043a8..c2b7e0598d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1049,6 +1049,42 @@ static void test_odbc_provider(void) IDBProperties_Release(props); } +static void test_odbc_enumerator(void) +{ + HRESULT hr; + ISourcesRowset *source; + IRowset *rowset; + + hr = CoCreateInstance( &CLSID_MSDASQL_ENUMERATOR, NULL, CLSCTX_ALL, &IID_ISourcesRowset, (void **)&source); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (hr == S_OK) + { + IAccessor *accessor; + IRowsetInfo *info; + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IRowsetInfo_Release(info); + + IRowset_Release(rowset); + } + + ISourcesRowset_Release(source); +} + START_TEST(database) { OleInitialize(NULL); @@ -1058,6 +1094,7 @@ START_TEST(database) test_initializationstring(); test_dslocator(); test_odbc_provider(); + test_odbc_enumerator(); /* row position */ test_rowposition();

1 0

Serge Gautherie : ntdll/tests: Remove now useless forced 0x500 API versions.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 71d810319059d171df0e40d85752519e50e58056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d810319059d171df0e40d8… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 18 03:14:26 2020 +0100 ntdll/tests: Remove now useless forced 0x500 API versions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ---- dlls/ntdll/tests/ntdll_test.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4003b0a480..249ba9d7c3 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -21,10 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION diff --git a/dlls/ntdll/tests/ntdll_test.h b/dlls/ntdll/tests/ntdll_test.h index a8066c5714..d403a744aa 100644 --- a/dlls/ntdll/tests/ntdll_test.h +++ b/dlls/ntdll/tests/ntdll_test.h @@ -20,10 +20,6 @@ #include <stdarg.h> -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 /* For NTSTATUS */ -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Alexandre Julliard : make_makefiles: Remove updating codepage list, this is done by make_unicode now.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 134074e553ac37ff54459e6fdda5673ffe30f725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=134074e553ac37ff54459e6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 18 16:39:47 2020 +0100 make_makefiles: Remove updating codepage list, this is done by make_unicode now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index bae52dfdba..79b18778a5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -498,15 +498,6 @@ sub update_wine_inf() push @lines, "\n[SortFiles]", sort grep(/^sort/, @nls_files); push @lines, "\n[WineSourceDirs]\n"; replace_in_file "loader/wine.inf.in", '^\[InfFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines ); - - my @codepages = grep /c_\d+\.nls/, @nls_files; - @lines = ( "[Nls]" ); - foreach my $cp (sort { $a <=> $b; } map { /c_(\d+)\.nls/ && $1; } @codepages) - { - push @lines, sprintf "HKLM,System\\CurrentControlSet\\Control\\Nls\\Codepage,\"%u\",,\"c_%03u.nls\"", $cp, $cp; - } - push @lines, "\n"; - replace_in_file "loader/wine.inf.in", '^\[Nls\]', '^$', join( "\n", @lines ); } my $git_dir = $ENV{GIT_DIR} || ".git";

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020