June 2019 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : winebus.sys: Increase buffer size to match max length available.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a1e5d943724f8cb5e51fe8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 05:20:59 2019 +0000 winebus.sys: Increase buffer size to match max length available. The current buffer is 1024, however the ioctl call can handle a max length of 8191. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47013 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a3255df..08ad876 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -880,7 +880,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer; - BYTE buffer[1024]; + BYTE buffer[8192]; if (id == 0) {

1 0

Zebediah Figura : qcap/tests: Add some tests for IEnumMediaTypes().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 85d631cfe1a2f45ba76cd3545ac354c005605112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d631cfe1a2f45ba76cd354… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 27 20:22:27 2019 -0500 qcap/tests: Add some tests for IEnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 72 ++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 109 +++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 45 ++++++++++++++++ 3 files changed, 226 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 837c86d..1040289 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -584,6 +584,77 @@ static void test_media_types(IBaseFilter *filter) IPin_Release(pin); } +static void test_enum_media_types(IBaseFilter *filter) +{ + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -625,6 +696,7 @@ START_TEST(avico) test_find_pin(filter); test_pin_info(filter); test_media_types(filter); + test_enum_media_types(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 8218d0e..98a7754 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -556,6 +556,114 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_avi_mux(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 2, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + CoTaskMemFree(mts[0]); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + CoTaskMemFree(mts[0]); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, sink0_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -700,6 +808,7 @@ START_TEST(avimux) test_find_pin(); test_pin_info(); test_media_types(); + test_enum_media_types(); test_seeking(); CoUninitialize(); diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index b3b0584..361b060 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -418,6 +418,50 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2336,6 +2380,7 @@ START_TEST(smartteefilter) test_enum_pins(); test_find_pin(); test_pin_info(); + test_enum_media_types(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : quartz/tests: Add some tests for VMR9 media types.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 0e9b605de9b9ec5c08d41b3ce55e3927273baf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e9b605de9b9ec5c08d41b3c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 27 20:22:25 2019 -0500 quartz/tests: Add some tests for VMR9 media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d14a970..aeea414 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -663,6 +663,77 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_RGB8; + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -684,6 +755,7 @@ START_TEST(vmr9) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add some tests for VMR7 media types.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: c299104938be6123537877605b9614730b3abe8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c299104938be612353787760… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 27 20:22:24 2019 -0500 quartz/tests: Add some tests for VMR7 media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index e702be7..9574a29 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -661,6 +661,75 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr7(0); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + VIDEOINFOHEADER vih = + { + {0}, {0}, 0, 0, 0, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + }; + IEnumMediaTypes *enummt; + unsigned int i; + HRESULT hr; + ULONG ref; + IPin *pin; + + static const GUID *subtype_tests[] = + { + &MEDIASUBTYPE_NULL, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + req_mt.majortype = MEDIATYPE_Video; + req_mt.formattype = FORMAT_VideoInfo; + req_mt.cbFormat = sizeof(VIDEOINFOHEADER); + req_mt.pbFormat = (BYTE *)&vih; + + for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) + { + req_mt.subtype = *subtype_tests[i]; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_OK, "Got hr %#x for subtype %s.\n", hr, wine_dbgstr_guid(subtype_tests[i])); + } + + req_mt.subtype = MEDIASUBTYPE_RGB8; + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.subtype = MEDIASUBTYPE_RGB24; + + req_mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Video; + + req_mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &req_mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); @@ -671,6 +740,7 @@ START_TEST(vmr7) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: c85df2edc602a2aa90e16ec80d61afb5099370d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85df2edc602a2aa90e16ec8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:25 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6f0c46..f72d6eb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7870,15 +7870,14 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -8479,11 +8478,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args) { - UINT i; - DWORD new_size; - DWORD use_map = context->stream_info.use_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_vs_compiled_shader *gl_shaders, *new_array; + uint32_t use_map = context->stream_info.use_map; struct glsl_shader_private *shader_data; + unsigned int i, new_size; GLuint ret; if (!shader->backend_data) @@ -8534,7 +8533,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh gl_shaders[shader_data->num_gl_shaders].args = *args; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_vshader(context, priv, shader, args); + ret = shader_glsl_generate_vertex_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Alexandre Julliard : xpsprint: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: c2f9afd1f863e2ae5a3cba55281d15f41604b8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f9afd1f863e2ae5a3cba55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:47 2019 +0200 xpsprint: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpsprint/Makefile.in | 2 ++ dlls/xpsprint/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xpsprint/Makefile.in b/dlls/xpsprint/Makefile.in index db1ac26..12639f1 100644 --- a/dlls/xpsprint/Makefile.in +++ b/dlls/xpsprint/Makefile.in @@ -1,5 +1,7 @@ MODULE = xpsprint.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/xpsprint/main.c b/dlls/xpsprint/main.c index be70473..734d922 100644 --- a/dlls/xpsprint/main.c +++ b/dlls/xpsprint/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : xolehlp: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 335388cacac169d6716b9c076865facc940401f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335388cacac169d6716b9c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:33 2019 +0200 xolehlp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/Makefile.in | 2 ++ dlls/xolehlp/xolehlp.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index 58651a1..37b1d01 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,4 +1,6 @@ MODULE = xolehlp.dll IMPORTS = adsiid uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = xolehlp.c diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2a741f4..4baf31f 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -23,7 +23,6 @@ #include "transact.h" #include "initguid.h" #include "txdtc.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); @@ -662,8 +661,8 @@ static BOOL is_local_machineW( const WCHAR *server ) WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !strcmpW( server, dotW )) return TRUE; - if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; + if (!server || !wcscmp( server, dotW )) return TRUE; + if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; }

1 0

Alexandre Julliard : wtsapi32: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 7a750836546efd9096c6883c9a3bff6b6aac9559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a750836546efd9096c6883c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:06 2019 +0200 wtsapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/Makefile.in | 2 ++ dlls/wtsapi32/wtsapi32.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index e54c088..674db68 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -2,5 +2,7 @@ MODULE = wtsapi32.dll IMPORTLIB = wtsapi32 IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wtsapi32.c diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf921..2f5e73d 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -15,7 +15,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdlib.h> #include "windef.h"

1 0

Alexandre Julliard : wsock32: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 2490febab4dc6588968537ade50d4a1ddd74d2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2490febab4dc6588968537ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:56 2019 +0200 wsock32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsock32/Makefile.in | 2 ++ dlls/wsock32/protocol.c | 25 +------------------------ dlls/wsock32/service.c | 2 -- dlls/wsock32/socket.c | 2 -- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index b5a9c43..9a04994 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -2,6 +2,8 @@ MODULE = wsock32.dll IMPORTLIB = wsock32 IMPORTS = mswsock ws2_32 iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ protocol.c \ service.c \ diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 16109e3..637d683 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -19,20 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define USE_WS_PREFIX - -#include "config.h" - #include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif #include "windef.h" #include "winbase.h" @@ -40,7 +27,6 @@ #include "nspapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -49,13 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); */ UINT WINAPI WSOCK32_inet_network(const char *cp) { -#ifdef HAVE_INET_NETWORK - return inet_network(cp); -#elif defined(HAVE_INET_ADDR) return ntohl( inet_addr( cp ) ); -#else - return 0; -#endif } /***************************************************************************** @@ -63,11 +43,8 @@ UINT WINAPI WSOCK32_inet_network(const char *cp) */ struct netent * WINAPI WSOCK32_getnetbyname(const char *name) { -#ifdef HAVE_GETNETBYNAME - return getnetbyname(name); -#else + ERR( "%s: not supported\n", debugstr_a(name) ); return NULL; -#endif } static DWORD map_service(DWORD wsaflags) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 17fea61..2b6e4e7 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 74df2e3..88ddf5b 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wow32: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: ffd6a3ebdf8487dae07bb4af38a6b3cba8ad7a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd6a3ebdf8487dae07bb4af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:56 2019 +0200 wow32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a..db153da 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -2,4 +2,6 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wow_main.c

1 0