wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_bo_address().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: fd29561e9741b222ef55ff307f7319c59b8b1e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd29561e9741b222ef55ff30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:28 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- dlls/wined3d/texture.c | 18 ++++++++++++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 42 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd29561e9741b222ef55…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 6ffc6cd5d2dc3837add288a2518e4caf94b85071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ffc6cd5d2dc3837add288a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:27 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_end_transform_feedback(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context.c | 14 ++++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9fcd96b..8e1ac48 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,6 +144,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_resource *resource = &buffer_gl->b.resource; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -179,7 +180,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer_gl); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b443fcd..18a1716 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4085,20 +4085,22 @@ static BOOL use_transform_feedback(const struct wined3d_state *state) return shader->u.gs.so_desc.element_count; } -void context_end_transform_feedback(struct wined3d_context *context) +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (context->transform_feedback_active) + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + + if (context_gl->c.transform_feedback_active) { GL_EXTCALL(glEndTransformFeedback()); checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - context->transform_feedback_paused = 0; + context_gl->c.transform_feedback_active = 0; + context_gl->c.transform_feedback_paused = 0; } } static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (!context->transform_feedback_active || context->transform_feedback_paused) @@ -4115,7 +4117,7 @@ static void context_pause_transform_feedback(struct wined3d_context *context, BO WARN("Cannot pause transform feedback operations.\n"); if (force) - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); } static void context_setup_target(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b01caa..a31f085 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4448,13 +4448,14 @@ static void state_uav_warn(struct wined3d_context *context, const struct wined3d static void state_so(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer; unsigned int offset, size, i; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - context_end_transform_feedback(context); + wined3d_context_gl_end_transform_feedback(context_gl); for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 588d7e5..dad878c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2091,6 +2091,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; +void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2250,7 +2251,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances().
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 258f0d209db3e81f68f0a67999e10bbc6e224da1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258f0d209db3e81f68f0a679… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 11 01:03:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_enable_clip_distances(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/state.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 933bf13..b443fcd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2401,17 +2401,18 @@ static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *cont size->cy = wined3d_texture_get_level_height(rt, level); } -void context_enable_clip_distances(struct wined3d_context *context, unsigned int enable_mask) +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t enable_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int clip_distance_count = gl_info->limits.user_clip_distances; - unsigned int i, disable_mask, current_mask; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + unsigned int clip_distance_count, i; + uint32_t disable_mask, current_mask; + clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; enable_mask &= (1u << clip_distance_count) - 1; disable_mask &= (1u << clip_distance_count) - 1; - current_mask = context->clip_distance_mask; - context->clip_distance_mask = enable_mask; + current_mask = context_gl->c.clip_distance_mask; + context_gl->c.clip_distance_mask = enable_mask; enable_mask &= ~current_mask; while (enable_mask) @@ -2850,7 +2851,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab62c1c..bb510ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10533,6 +10533,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha static void shader_glsl_select(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; @@ -10552,7 +10553,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex program_id = glsl_program->id; current_vertex_color_clamp = glsl_program->vs.vertex_color_clamp; if (glsl_program->shader_controlled_clip_distances) - context_enable_clip_distances(context, glsl_program->clip_distance_mask); + wined3d_context_gl_enable_clip_distances(context_gl, glsl_program->clip_distance_mask); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c52e25d..2b01caa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -693,7 +693,8 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - unsigned int enable_mask; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + uint32_t enable_mask; if (use_vs(state) && !context->d3d_info->vs_clipping) { @@ -721,7 +722,7 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state */ enable_mask = state->render_states[WINED3D_RS_CLIPPING] ? state->render_states[WINED3D_RS_CLIPPLANEENABLE] : 0; - context_enable_clip_distances(context, enable_mask); + wined3d_context_gl_enable_clip_distances(context_gl, enable_mask); } static void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -3864,6 +3865,7 @@ static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL useVertexShaderFunction = use_vs(state); BOOL updateFog = FALSE; @@ -3940,7 +3942,7 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine /* Disable all clip planes to get defined results on all drivers. See comment in the * state_clipping state handler */ - context_enable_clip_distances(context, 0); + wined3d_context_gl_enable_clip_distances(context_gl, 0); if (!warned && state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6315738..588d7e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2090,6 +2090,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t mask) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2249,7 +2250,6 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN;

1 0

Michael Muller : ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps() .
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 50dfd232a4f2052b767a96e7dd8ec186d15fbe69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50dfd232a4f2052b767a96e7… Author: Michael Muller <michael(a)fds-team.de> Date: Mon Jun 10 23:54:22 2019 +0430 ddraw: Properly set DDCAPS.ddsOldCaps in ddraw7_GetCaps(). Signed-off-by: David Adam <david.adam.cnrs(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6..8dce5ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1510,6 +1510,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps |= DDCAPS_ALIGNSTRIDE; caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT; + caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps; + if(DriverCaps) { DD_STRUCT_COPY_BYSIZE(DriverCaps, &caps); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68428e2..860e101 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12874,6 +12874,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12984,4 +13009,5 @@ START_TEST(ddraw1) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d056949..2c047a5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13750,6 +13750,30 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw2 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw2_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw2_Release(ddraw); +} START_TEST(ddraw2) { @@ -13868,4 +13892,5 @@ START_TEST(ddraw2) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 823af43..fa6cca6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16170,6 +16170,31 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw4 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -16302,4 +16327,5 @@ START_TEST(ddraw4) test_gdi_surface(); test_alphatest(); test_clipper_refcount(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e8c36dc..b0fc634 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16264,6 +16264,31 @@ static void test_begin_end_state_block(void) DestroyWindow(window); } +static void test_caps(void) +{ + DDCAPS hal_caps, hel_caps; + IDirectDraw7 *ddraw; + HRESULT hr; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + + memset(&hal_caps, 0, sizeof(hal_caps)); + memset(&hel_caps, 0, sizeof(hel_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hal_caps.ddsOldCaps.dwCaps == hal_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hal_caps.ddsOldCaps.dwCaps, hal_caps.ddsCaps.dwCaps); + ok(hel_caps.ddsOldCaps.dwCaps == hel_caps.ddsCaps.dwCaps, + "Got unexpected caps %#x, expected %#x.\n", + hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16410,4 +16435,5 @@ START_TEST(ddraw7) test_alphatest(); test_clipper_refcount(); test_begin_end_state_block(); + test_caps(); }

1 0

Alexandre Julliard : mprapi: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 5afcbaa30f922187ab3f362ba8d3fd0f1fb244b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5afcbaa30f922187ab3f362b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:36 2019 +0200 mprapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mprapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index 2bf309f..e33e57e 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = mprapi.dll IMPORTLIB = mprapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mprapi.c

1 0

Alexandre Julliard : mpr: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 1e117a5682e829cb5b92eedb2d562757cf9076aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e117a5682e829cb5b92eedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:30 2019 +0200 mpr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/Makefile.in | 2 ++ dlls/mpr/nps.c | 3 --- dlls/mpr/wnet.c | 51 +++++++++++++++++++++++++-------------------------- 3 files changed, 27 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e117a5682e829cb5b92…

1 0

Alexandre Julliard : mouse.drv: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c1a01fd399725f69979edcdffbba80be95fda191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a01fd399725f69979edcdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:29:02 2019 +0200 mouse.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mouse.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in index 7fe1386..ce1ea19 100644 --- a/dlls/mouse.drv16/Makefile.in +++ b/dlls/mouse.drv16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mouse.drv16 IMPORTS = user32 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = mouse.c

1 0

Alexandre Julliard : monodebg.vxd: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: 15287e0fd214bdbf28676a76344b69db8f2bcf4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15287e0fd214bdbf28676a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:46 2019 +0200 monodebg.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/monodebg.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index ccbfdba..8fea327 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = monodebg.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ monodebg.c

1 0

Alexandre Julliard : mmsystem: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: c1df11c167346df70bbdbb3e939417ba7ad593f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1df11c167346df70bbdbb3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:28:37 2019 +0200 mmsystem: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/message16.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in index 1eb0ce9..e1033b4 100644 --- a/dlls/mmsystem.dll16/Makefile.in +++ b/dlls/mmsystem.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = mmsystem.dll16 IMPORTS = winmm user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll C_SRCS = \ driver.c \ diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 012d3dc..32c5192 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -844,7 +844,7 @@ static LRESULT CALLBACK MMSYSTDRV_Callback3216(struct mmsystdrv_thunk* thunk, HD SetEvent((HANDLE)thunk->callback); break; default: - WARN("Unknown callback type %x\n", thunk->flags & CALLBACK_TYPEMASK); + WARN("Unknown callback type %x\n", thunk->flags); return FALSE; } TRACE("Done\n");

1 0

Alexandre Julliard : mmdevapi: Build with msvcrt.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: wine Branch: master Commit: eae787f9134340d27e8a41c45fbb6dddf2b41e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae787f9134340d27e8a41c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 08:27:51 2019 +0200 mmdevapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 2 ++ dlls/mmdevapi/audiovolume.c | 2 -- dlls/mmdevapi/devenum.c | 7 ++----- dlls/mmdevapi/main.c | 7 +------ dlls/mmdevapi/mmdevapi.h | 4 ---- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 530f767..5f44f7b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ audiovolume.c \ devenum.c \ diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 76f9f4e..24d210a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -26,7 +25,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "ole2.h" #include "mmdeviceapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 685ec27..82e1bb9 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION @@ -28,7 +26,6 @@ #include "winreg.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "initguid.h" #include "ole2.h" @@ -448,7 +445,7 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (strlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); memcpy(name, pv.u.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, @@ -1431,7 +1428,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR RegCloseKey(propkey); buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[39]); + key->pid = wcstol(&buffer[39], NULL, 10); return S_OK; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 8886975..7680b45 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -17,16 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/library.h" #include "ole2.h" #include "olectl.h" @@ -44,7 +40,6 @@ #include "mmdevapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -139,7 +134,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) TRACE("Loading driver list %s\n", wine_dbgstr_w(driver_list)); for(next = p = driver_list; next; p = next + 1){ - next = strchrW(p, ','); + next = wcschr(p, ','); if(next) *next = '\0'; diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index b85c757..bc9788e 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,10 +16,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 - extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
87
Older →

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 June 2019