wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Owen Rudge : oledb32/tests: Add conversion tests to DBTYPE_I1.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: b4b5ad5980059d5608100cfb5379e13b70ebb5c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b5ad5980059d5608100cfb… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 30 09:53:47 2019 +0100 oledb32/tests: Add conversion tests to DBTYPE_I1. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 312 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 312 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b5ad5980059d560810…

1 0

Owen Rudge : oledb32: Implement support for converting to DBTYPE_I1.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 8ece2fa15538f8afc5d3e680bf178e91e3cffb33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ece2fa15538f8afc5d3e680… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 30 09:53:40 2019 +0100 oledb32: Implement support for converting to DBTYPE_I1. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..a53d926 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -249,6 +249,37 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(dst_type) { + case DBTYPE_I1: + { + signed char *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: *d = *(signed char*)src; hr = S_OK; break; + case DBTYPE_I2: hr = VarI1FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarI1FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarI1FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarI1FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarI1FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarI1FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarI1FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarI1FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarI1FromDec((DECIMAL*)src, d); break; + case DBTYPE_UI1: hr = VarI1FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarI1FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarI1FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarI1FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarI1FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I1)) == S_OK) + *d = V_I1(&tmp); + break; + default: FIXME("Unimplemented conversion %04x -> I1\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_I2: { signed short *d = dst;

1 0

Zebediah Figura : ntoskrnl.exe: Move PNP code to a separate file.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 3b2592a2bcc6fe510eda99a05a08ef05e9ed7ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2592a2bcc6fe510eda99a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 20:49:03 2019 -0500 ntoskrnl.exe: Move PNP code to a separate file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 1 + dlls/ntoskrnl.exe/ntoskrnl.c | 705 +--------------------------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 14 + dlls/ntoskrnl.exe/pnp.c | 718 +++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 5 files changed, 735 insertions(+), 704 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b2592a2bcc6fe510eda…

1 0

Henri Verbeet : wined3d: Properly check whether a context was created in swapchain_init().
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: d88c403e548cfe2171ac22603197ffbc0e70b4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88c403e548cfe2171ac2260… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:23 2019 +0430 wined3d: Properly check whether a context was created in swapchain_init(). This fixes commit db201072655946662c041a66ee434c30c245e5b0, but the underlying issue was of course present before that commit. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4cefd80..481b3b7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -904,7 +904,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!swapchain->context[0]) + if (!swapchain->num_contexts) { hr = WINED3DERR_NOTAVAILABLE; goto err;

1 0

Henri Verbeet : wined3d: Move the WGL fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: de035b71abc50334700aba54afc268b613a6ca3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=de035b71abc50334700aba54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:22 2019 +0430 wined3d: Move the WGL fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 240 +++++++++++++++++--------------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 10 +- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_private.h | 31 ++--- 6 files changed, 135 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de035b71abc50334700a…

1 0

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

03 Jun '19

Module: wine Branch: master Commit: 7d3eda5783a8ca4d13278ac03d10d074f68df9c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3eda5783a8ca4d13278ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_activate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ba3ac80..2f3ed39 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4211,23 +4211,21 @@ static void context_setup_target(struct wined3d_context *context, context_set_render_offscreen(context, render_offscreen); } -static void context_activate(struct wined3d_context *context, +static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); - context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) + context_setup_target(&context_gl->c, texture, sub_resource_idx); + if (!context_gl->c.valid) return; - if (context != context_get_current()) + if (&context_gl->c != context_get_current()) { - if (!context_set_current(context)) + if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context->needs_set) + else if (context_gl->c.needs_set) { wined3d_context_gl_set_gl_context(context_gl); } @@ -4292,7 +4290,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return NULL; } - context_activate(context, texture, sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), texture, sub_resource_idx); return context; } @@ -4309,7 +4307,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, if (context->current_rt.texture) { - context_activate(context, context->current_rt.texture, context->current_rt.sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), + context->current_rt.texture, context->current_rt.sub_resource_idx); return context; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl strcuture to find_draw_buffers_mask().
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 4a9d8fedee6f38108f7e684c73c210cdb472f15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a9d8fedee6f38108f7e684c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:20 2019 +0430 wined3d: Pass a wined3d_context_gl strcuture to find_draw_buffers_mask(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c069740..ba3ac80 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3141,18 +3141,17 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, return TRUE; } -static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); - else if (!context->render_offscreen) + else if (!context_gl->c.render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; @@ -3173,7 +3172,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int rt_mask = find_draw_buffers_mask(context, state); + uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; @@ -3473,12 +3472,12 @@ static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *co void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - DWORD rt_mask, *cur_mask; + uint32_t rt_mask, *cur_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - rt_mask = find_draw_buffers_mask(context, state); + rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask);

1 0

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

03 Jun '19

Module: wine Branch: master Commit: 8b6b124e2bb0c27d0e6aa3ed257e5fc9b94a77e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6b124e2bb0c27d0e6aa3ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_generate_rt_mask_no_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7960305..c069740 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2747,10 +2747,9 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) +static uint32_t wined3d_context_gl_generate_rt_mask_no_fbo(const struct wined3d_context_gl *context_gl, + struct wined3d_resource *rt) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) @@ -2764,8 +2763,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; + uint32_t rt_mask, *cur_mask; struct wined3d_texture *rt; - DWORD rt_mask, *cur_mask; unsigned int sampler; SIZE rt_size; @@ -2796,7 +2795,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(context, &rt->resource); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &rt->resource); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3029,7 +3028,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, struct wined3d_rendertarget_view * const *rts = fb->render_targets; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - DWORD rt_mask = 0, *cur_mask; + uint32_t rt_mask = 0, *cur_mask; unsigned int i; if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != state->fb @@ -3088,7 +3087,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -3102,7 +3101,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3144,6 +3143,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3151,7 +3151,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, rts[0]->resource); + return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource);

1 0

Nikolay Sivov : mf/tests: Add some tests for video processor MFT.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 9175a5f9932c36339c2e024fc69df25db263f810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9175a5f9932c36339c2e024f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:11:34 2019 +0300 mf/tests: Add some tests for video processor MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 + include/mferror.h | 28 +++++++++ include/mfidl.idl | 2 + include/mftransform.idl | 7 ++- 5 files changed, 193 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9175a5f9932c36339c2e…

1 0

Nikolay Sivov : mf: Add rate support for presentation clock.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: d9cd07fd4ef77cb24b3faf1725a37edb7c95037e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9cd07fd4ef77cb24b3faf17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:11:33 2019 +0300 mf: Add rate support for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 107 +++++++++++++++++++++++++++++++++++++++-------------- dlls/mf/tests/mf.c | 52 ++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cd07fd4ef77cb24b3f…

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