wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Stefan Dösinger : wined3d: Pass the state and private data to shader_select.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 6fce4d45474d1d933d04264b12869bd9a6a485b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fce4d45474d1d933d04264b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 17:38:19 2013 +0200 wined3d: Pass the state and private data to shader_select. --- dlls/wined3d/arb_program_shader.c | 25 ++++++++++--------------- dlls/wined3d/context.c | 4 +--- dlls/wined3d/glsl_shader.c | 28 +++++++++++++--------------- dlls/wined3d/shader.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 10 ++-------- 5 files changed, 31 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6fce4d45474d1d933d042…

1 0

Stefan Dösinger : wined3d: Add a separate function for disabling shaders.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 47f385adf0f8c764600740c6e19746556a9ed84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f385adf0f8c764600740c6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 17:38:18 2013 +0200 wined3d: Add a separate function for disabling shaders. --- dlls/wined3d/arb_program_shader.c | 41 ++++++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 4 +- dlls/wined3d/glsl_shader.c | 29 ++++++++++++++++++++++--- dlls/wined3d/shader.c | 14 +++++++++++- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 79 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47f385adf0f8c76460074…

1 0

Stefan Dösinger : wined3d: Explicitly pass the state to shader_load_constants.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 036a62a245b39ccb294bd5ce4635563314ac34d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=036a62a245b39ccb294bd5ce4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 17:38:17 2013 +0200 wined3d: Explicitly pass the state to shader_load_constants. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/context.c | 3 ++- dlls/wined3d/glsl_shader.c | 21 +++++++++------------ dlls/wined3d/shader.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7dc253..d7959cf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -719,13 +719,13 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, } } -static void shader_arb_load_constants(const struct wined3d_context *context, BOOL ps, BOOL vs) +static void shader_arb_load_constants(void *shader_priv, const struct wined3d_context *context, + const struct wined3d_state *state) { - struct wined3d_device *device = context->swapchain->device; - const struct wined3d_stateblock *stateblock = device->stateBlock; - const struct wined3d_state *state = &stateblock->state; + BOOL vs = use_vs(state); + BOOL ps = use_ps(state); - shader_arb_load_constants_internal(device->shader_priv, context, state, ps, vs, FALSE); + shader_arb_load_constants_internal(shader_priv, context, state, ps, vs, FALSE); } static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6d30f1c..3cfdb04 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2411,7 +2411,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (context->load_constants) { - device->shader_backend->shader_load_constants(context, use_ps(state), use_vs(state)); + device->shader_backend->shader_load_constants(device->shader_priv, + context, state); context->load_constants = 0; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 16054ed..674f263 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -725,14 +725,11 @@ static void shader_glsl_load_np2fixup_constants(void *shader_priv, } /* Context activation is done by the caller (state handler). */ -static void shader_glsl_load_constants(const struct wined3d_context *context, - BOOL usePixelShader, BOOL useVertexShader) +static void shader_glsl_load_constants(void *shader_priv, const struct wined3d_context *context, + const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = context->swapchain->device; - struct wined3d_stateblock *stateBlock = device->stateBlock; - const struct wined3d_state *state = &stateBlock->state; - struct shader_glsl_priv *priv = device->shader_priv; + struct shader_glsl_priv *priv = shader_priv; float position_fixup[4]; GLhandleARB programId; @@ -747,7 +744,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, programId = prog->programId; constant_version = prog->constant_version; - if (useVertexShader) + if (use_vs(state)) { const struct wined3d_shader *vshader = state->vertex_shader; @@ -757,11 +754,11 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Load DirectX 9 integer constants/uniforms for vertex shader */ shader_glsl_load_constantsI(vshader, gl_info, prog->vs.uniform_i_locations, state->vs_consts_i, - stateBlock->changed.vertexShaderConstantsI & vshader->reg_maps.integer_constants); + vshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ shader_glsl_load_constantsB(vshader, gl_info, programId, state->vs_consts_b, - stateBlock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants); + vshader->reg_maps.boolean_constants); /* Upload the position fixup params */ shader_get_position_fixup(context, state, position_fixup); @@ -769,7 +766,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, checkGLcall("glUniform4fvARB"); } - if (usePixelShader) + if (use_ps(state)) { const struct wined3d_shader *pshader = state->pixel_shader; @@ -779,11 +776,11 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, /* Load DirectX 9 integer constants/uniforms for pixel shader */ shader_glsl_load_constantsI(pshader, gl_info, prog->ps.uniform_i_locations, state->ps_consts_i, - stateBlock->changed.pixelShaderConstantsI & pshader->reg_maps.integer_constants); + pshader->reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for pixel shader */ shader_glsl_load_constantsB(pshader, gl_info, programId, state->ps_consts_b, - stateBlock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants); + pshader->reg_maps.boolean_constants); /* Upload the environment bump map matrix if needed. The needsbumpmat * member specifies the texture stage to load the matrix from. It diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9528d2..515caed 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1509,7 +1509,8 @@ static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d static void shader_none_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) {} -static void shader_none_load_constants(const struct wined3d_context *context, BOOL usePS, BOOL useVS) {} +static void shader_none_load_constants(void *shader_priv, const struct wined3d_context *context, + const struct wined3d_state *state) {} static void shader_none_load_np2fixup_constants(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} static void shader_none_destroy(struct wined3d_shader *shader) {} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abf44c9..9af9e79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5,6 +5,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2002-2003, 2004 Jason Edmeades * Copyright 2005 Oliver Stieber + * Copyright 2006-2011, 2013 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -806,7 +807,8 @@ struct wined3d_shader_backend_ops void (*shader_deselect_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info); void (*shader_update_float_vertex_constants)(struct wined3d_device *device, UINT start, UINT count); void (*shader_update_float_pixel_constants)(struct wined3d_device *device, UINT start, UINT count); - void (*shader_load_constants)(const struct wined3d_context *context, BOOL usePS, BOOL useVS); + void (*shader_load_constants)(void *shader_priv, const struct wined3d_context *context, + const struct wined3d_state *state); void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state); void (*shader_destroy)(struct wined3d_shader *shader);

1 0

Stefan Dösinger : wined3d: Don' t access the stateblock from shader_arb_load_constants_internal.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 5d138799ea5e901a51ac266a69c44d0bd6c22686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d138799ea5e901a51ac266a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 17:38:16 2013 +0200 wined3d: Don't access the stateblock from shader_arb_load_constants_internal. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6756927..a7dc253 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -650,24 +650,20 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 * worry about the Integers or Booleans */ /* Context activation is done by the caller (state handler). */ -static void shader_arb_load_constants_internal(const struct wined3d_context *context, +static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, + const struct wined3d_context *context, const struct wined3d_state *state, BOOL usePixelShader, BOOL useVertexShader, BOOL from_shader_select) { - struct wined3d_device *device = context->swapchain->device; - const struct wined3d_stateblock *stateblock = device->stateBlock; - const struct wined3d_state *state = &stateblock->state; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - struct shader_arb_priv *priv = device->shader_priv; + const struct wined3d_gl_info *gl_info = context->gl_info; if (!from_shader_select) { const struct wined3d_shader *vshader = state->vertex_shader, *pshader = state->pixel_shader; if (vshader - && (stateblock->changed.vertexShaderConstantsB & vshader->reg_maps.boolean_constants + && (vshader->reg_maps.boolean_constants || (!gl_info->supported[NV_VERTEX_PROGRAM2_OPTION] - && (stateblock->changed.vertexShaderConstantsI - & vshader->reg_maps.integer_constants & ~vshader->reg_maps.local_int_consts)))) + && (vshader->reg_maps.integer_constants & ~vshader->reg_maps.local_int_consts)))) { TRACE("bool/integer vertex shader constants potentially modified, forcing shader reselection.\n"); shader_arb_select(context, @@ -675,10 +671,9 @@ static void shader_arb_load_constants_internal(const struct wined3d_context *con usePixelShader ? WINED3D_SHADER_MODE_SHADER : WINED3D_SHADER_MODE_FFP); } else if (pshader - && (stateblock->changed.pixelShaderConstantsB & pshader->reg_maps.boolean_constants + && (pshader->reg_maps.boolean_constants || (!gl_info->supported[NV_FRAGMENT_PROGRAM_OPTION] - && (stateblock->changed.pixelShaderConstantsI - & pshader->reg_maps.integer_constants & ~pshader->reg_maps.local_int_consts)))) + && (pshader->reg_maps.integer_constants & ~pshader->reg_maps.local_int_consts)))) { TRACE("bool/integer pixel shader constants potentially modified, forcing shader reselection.\n"); shader_arb_select(context, @@ -726,7 +721,11 @@ static void shader_arb_load_constants_internal(const struct wined3d_context *con static void shader_arb_load_constants(const struct wined3d_context *context, BOOL ps, BOOL vs) { - shader_arb_load_constants_internal(context, ps, vs, FALSE); + struct wined3d_device *device = context->swapchain->device; + const struct wined3d_stateblock *stateblock = device->stateBlock; + const struct wined3d_state *state = &stateblock->state; + + shader_arb_load_constants_internal(device->shader_priv, context, state, ps, vs, FALSE); } static void shader_arb_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) @@ -4654,7 +4653,7 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3 priv->pshader_const_dirty[i] = 1; } /* Also takes care of loading local constants */ - shader_arb_load_constants_internal(context, TRUE, FALSE, TRUE); + shader_arb_load_constants_internal(device->shader_priv, context, state, TRUE, FALSE, TRUE); } else {

1 0

Hans Leidekker : wbemprox: Add stub implementations of IWbemServices:: ExecNotificationQueryAsync and IWbemServices::CancelAsyncCall.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 0083d4b092892404a09d6154fe02b86e915c167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0083d4b092892404a09d6154f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 14 14:01:50 2013 +0200 wbemprox: Add stub implementations of IWbemServices::ExecNotificationQueryAsync and IWbemServices::CancelAsyncCall. --- dlls/wbemprox/services.c | 13 +++++-- dlls/wbemprox/tests/query.c | 72 +++++++++++++++++++++++++++++++++++++++++++ include/wbemcli.idl | 18 +++++++++++ 3 files changed, 99 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index bf202be..fc964ac 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -221,8 +221,10 @@ static HRESULT WINAPI wbem_services_CancelAsyncCall( IWbemServices *iface, IWbemObjectSink *pSink ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("%p, %p\n", iface, pSink); + + IWbemObjectSink_Release( pSink ); + return S_OK; } static HRESULT WINAPI wbem_services_QueryObjectSink( @@ -562,8 +564,11 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync( IWbemContext *pCtx, IWbemObjectSink *pResponseHandler ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), + lFlags, pCtx, pResponseHandler); + + IWbemObjectSink_AddRef( pResponseHandler ); + return S_OK; } static HRESULT WINAPI wbem_services_ExecMethod( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index dd3424f..933f315 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -516,6 +516,77 @@ static void test_StdRegProv( IWbemServices *services ) SysFreeString( class ); } +static HRESULT WINAPI sink_QueryInterface( + IWbemObjectSink *iface, REFIID riid, void **ppv ) +{ + *ppv = NULL; + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IWbemObjectSink, riid )) + { + *ppv = iface; + IWbemObjectSink_AddRef( iface ); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG sink_refs; + +static ULONG WINAPI sink_AddRef( + IWbemObjectSink *iface ) +{ + return ++sink_refs; +} + +static ULONG WINAPI sink_Release( + IWbemObjectSink *iface ) +{ + return --sink_refs; +} + +static HRESULT WINAPI sink_Indicate( + IWbemObjectSink *iface, LONG count, IWbemClassObject **objects ) +{ + trace("%d, %p\n", count, objects); + return S_OK; +} + +static HRESULT WINAPI sink_SetStatus( + IWbemObjectSink *iface, LONG flags, HRESULT hresult, BSTR str_param, IWbemClassObject *obj_param ) +{ + trace("%08x, %08x, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param); + return S_OK; +} + +static IWbemObjectSinkVtbl sink_vtbl = +{ + sink_QueryInterface, + sink_AddRef, + sink_Release, + sink_Indicate, + sink_SetStatus +}; + +static IWbemObjectSink sink = { &sink_vtbl }; + +static void test_notification_query_async( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','e','v','i','c','e','C','h','a','n','g','e','E','v','e','n','t',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + HRESULT hr; + + hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( sink_refs, "got %u\n", sink_refs ); + + hr = IWbemServices_CancelAsyncCall( services, &sink ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( wql ); + SysFreeString( query ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -545,6 +616,7 @@ START_TEST(query) test_Win32_Process( services ); test_Win32_Service( services ); test_StdRegProv( services ); + test_notification_query_async( services ); SysFreeString( path ); IWbemServices_Release( services ); diff --git a/include/wbemcli.idl b/include/wbemcli.idl index af5e5bc..0390e1e 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -290,6 +290,24 @@ interface IWbemStatusCodeText : IUnknown [out] BSTR *MessageText); }; +[ + object, + restricted, + uuid(7c857801-7381-11cf-884d-00aa004b2e24) +] +interface IWbemObjectSink : IUnknown +{ + HRESULT Indicate( + [in] long lObjectCount, + [in, size_is(lObjectCount)] IWbemClassObject **apObjArray); + + HRESULT SetStatus( + [in] long lFlags, + [in] HRESULT hResult, + [in] BSTR strParam, + [in] IWbemClassObject *pObjParam); +}; + typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE { WBEM_FLAG_RETURN_WBEM_COMPLETE = 0,

1 0

Hans Leidekker : wmiutils: Accept namespaces without a leading slash.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: d816192eccbe48b26a345e3887aeb8b19da3aa8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816192eccbe48b26a345e388… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 14 14:01:08 2013 +0200 wmiutils: Accept namespaces without a leading slash. --- dlls/wmiutils/path.c | 17 +++++++++++++++++ dlls/wmiutils/tests/path.c | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index dcade46..988d2e6 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -420,6 +420,11 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) path->flags |= WBEMPATH_INFO_PATH_HAD_SERVER; } p = q; + if (*q && *q != '\\' && *q != '/' && *q != ':') + { + path->num_namespaces = 1; + q++; + } while (*q && *q != ':') { if (*q == '\\' || *q == '/') path->num_namespaces++; @@ -432,6 +437,18 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) i = 0; q = p; + if (*q && *q != '\\' && *q != '/' && *q != ':') + { + p = q; + while (*p && *p != '\\' && *p != '/' && *p != ':') p++; + len = p - q; + if (!(path->namespaces[i] = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + memcpy( path->namespaces[i], q, len * sizeof(WCHAR) ); + path->namespaces[i][len] = 0; + path->len_namespaces[i] = len; + q = p; + i++; + } while (*q && *q != ':') { if (*q == '\\' || *q == '/') diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 935ee52..54c0e9a 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -122,7 +122,8 @@ static void test_IWbemPath_SetText(void) { path8, WBEMPATH_TREAT_SINGLE_IDENT_AS_NS + 1, S_OK }, { path9, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, { path10, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, WBEM_E_INVALID_PARAMETER, 1 }, - { path11, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK } + { path11, WBEMPATH_CREATE_ACCEPT_ABSOLUTE, S_OK }, + { path15, WBEMPATH_CREATE_ACCEPT_ALL, S_OK } }; IWbemPath *path; HRESULT hr; @@ -167,6 +168,8 @@ static void test_IWbemPath_GetText(void) static const WCHAR expected2W[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', 'D','e','v','i','c','e','I','d','=','"','C',':','"',0}; + static const WCHAR expected3W[] = + {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; WCHAR buf[128]; ULONG len, count; IWbemPath *path; @@ -306,6 +309,16 @@ static void test_IWbemPath_GetText(void) ok( !lstrcmpW( buf, expected2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); ok( len == lstrlenW( expected2W ) + 1, "unexpected length %u\n", len ); + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path15 ); + ok( hr == S_OK, "got %08x\n", hr ); + + len = sizeof(buf)/sizeof(buf[0]); + memset( buf, 0x55, sizeof(buf) ); + hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, expected3W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( expected3W ) + 1, "unexpected length %u\n", len ); + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path18 ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BYTES-> DBTYPE_BYTES.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: c476d1785e3aece8eccb611b3086f0d7064599bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c476d1785e3aece8eccb611b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 11:22:47 2013 +1000 oledb32: Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES. --- dlls/oledb32/convert.c | 20 ++++++++++++++++++++ dlls/oledb32/tests/convert.c | 24 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 65a2bf6..1f50202 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -794,6 +794,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_BYTES: + { + BYTE *d = dst; + + switch(src_type) + { + case DBTYPE_BYTES: + if( src_len > dst_max_len) + *dst_status = DBSTATUS_S_TRUNCATED; + else + *dst_status = DBSTATUS_S_OK; + + *dst_len = src_len; + memcpy(d, src, min(src_len, dst_max_len)); + + return S_OK; + default: FIXME("Unimplemented conversion %04x -> DBTYPE_BYTES\n", src_type); return E_NOTIMPL; + } + break; + } default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 64562b1..b4331b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2424,6 +2424,29 @@ static void test_getconversionsize(void) } +static void test_converttobytes(void) +{ + DBLENGTH dst_len; + HRESULT hr; + BYTE byte_src[] = {0, 1, 2, 4, 5}; + BYTE dst[10] = {0}; + DBSTATUS dst_status; + + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES, sizeof(byte_src), &dst_len, byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(byte_src), "got %ld\n", dst_len); + ok(!memcmp(byte_src, dst, dst_len ), "bytes differ\n"); + + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES, sizeof(byte_src), &dst_len, byte_src, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == sizeof(byte_src), "got %ld\n", dst_len); + ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n"); +} + static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; @@ -2559,6 +2582,7 @@ START_TEST(convert) test_converttocy(); test_converttoui8(); test_converttovar(); + test_converttobytes(); test_getconversionsize(); IDataConvert_Release(convert);

1 0

Nikolay Sivov : comdlg32: Simplify more internal helpers.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 3dea8a69ec0ef0dfe82ec78c6ec0715443133be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dea8a69ec0ef0dfe82ec78c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 13:33:25 2013 +0400 comdlg32: Simplify more internal helpers. --- dlls/comdlg32/colordlg.c | 266 ++++++++++++++++++++++------------------------ 1 files changed, 127 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dea8a69ec0ef0dfe82ec…

1 0

Ken Thomases : winemac: Fix disabling of resizable windows.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 1ac1cd69addcfd65ea78a114625488e486929f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac1cd69addcfd65ea78a1146… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 14 03:35:03 2013 -0500 winemac: Fix disabling of resizable windows. --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 52 ++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 2d95e1a..21bcf44 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -26,7 +26,6 @@ @interface WineWindow : NSPanel <NSWindowDelegate> { - NSUInteger normalStyleMask; BOOL disabled; BOOL noActivate; BOOL floating; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ae69479..8ebda3b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -460,7 +460,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) defer:YES] autorelease]; if (!window) return nil; - window->normalStyleMask = [window styleMask]; /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ @@ -515,22 +514,37 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) adjustFeaturesForState { - NSUInteger style = normalStyleMask; - - if (self.disabled) - style &= ~NSResizableWindowMask; - if (style != [self styleMask]) - [self setStyleMask:style]; + NSUInteger style = [self styleMask]; if (style & NSClosableWindowMask) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; if (style & NSMiniaturizableWindowMask) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; + if (style & NSResizableWindowMask) + [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; } - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - normalStyleMask = style_mask_for_features(wf); + NSUInteger currentStyle = [self styleMask]; + NSUInteger newStyle = style_mask_for_features(wf); + + if (newStyle != currentStyle) + { + BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + { + // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. + // If transitioning from NSTitledWindowMask | NSResizableWindowMask to + // just NSTitledWindowMask, the window buttons should disappear rather + // than just being disabled. But they don't. Similarly in reverse. + // The workaround is to also toggle NSClosableWindowMask at the same time. + [self setStyleMask:newStyle ^ NSClosableWindowMask]; + } + [self setStyleMask:newStyle]; + } + [self adjustFeaturesForState]; [self setHasShadow:wf->shadow]; } @@ -791,6 +805,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { disabled = newValue; [self adjustFeaturesForState]; + + if (disabled) + { + NSSize size = [self frame].size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + else + { + [self setMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [self setMinSize:NSZeroSize]; + } } } @@ -1165,8 +1191,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowDidResize:(NSNotification *)notification { macdrv_event* event; - NSRect frame = [self contentRectForFrameRect:[self frame]]; + NSRect frame = [self frame]; + + if (self.disabled) + { + NSSize size = frame.size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + frame = [self contentRectForFrameRect:frame]; [[WineApplicationController sharedController] flipRect:&frame]; /* Coalesce events by discarding any previous ones still in the queue. */

1 0

Dmitry Timoshkov : kernel32: Add a test for holding process heap lock before calling ExitProcess.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 462ad39949d3c9378607ba3ea78f38e07d42de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ad39949d3c9378607ba3ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:45:45 2013 +0900 kernel32: Add a test for holding process heap lock before calling ExitProcess. --- dlls/kernel32/tests/loader.c | 70 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ac171bd..d481f08 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1060,12 +1060,12 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock; +HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[3]; + HANDLE wait_list[4]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -1076,11 +1076,12 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[0] = stop_event; wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; + wait_list[3] = heap_lock_event; while (1) { trace("%04u: mutex_thread_proc: still alive\n", GetCurrentThreadId()); - ret = WaitForMultipleObjects(3, wait_list, FALSE, 50); + ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { @@ -1098,6 +1099,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_peb_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 3) + { + trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + HeapLock(GetProcessHeap()); + inside_heap_lock++; + SetEvent(ack_event); + } } trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -1169,6 +1177,18 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) break; } + /* The process should already deadlock at this point */ + if (test_dll_phase == 6) + { + /* In reality, code below never gets executed, probably some other + * code tries to access process heap and deadlocks earlier, even XP + * doesn't call the DLL entry point on process detach either. + */ + HeapLock(GetProcessHeap()); + ok(0, "dll_entry_point: process should already deadlock\n"); + break; + } + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) ok(param != NULL, "dll: param %p\n", param); else @@ -1444,6 +1464,10 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(peb_lock_event != 0, "CreateEvent error %d\n", GetLastError()); SetLastError(0xdeadbeef); + heap_lock_event = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ack_event = CreateEvent(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -1644,6 +1668,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 6: + trace("setting heap_lock_event\n"); + SetEvent(heap_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_heap_lock != 0, "inside_heap_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should cause a deadlock */ + trace("call ExitProcess(1)\n"); + ExitProcess(1); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -1923,6 +1961,30 @@ static void test_ExitProcess(void) else win_skip("RtlAcquirePebLock/RtlReleasePebLock are not available on this platform\n"); + /* phase 6 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 6", argv[0], dll_name, target_offset); + ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 5000); + ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 201); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcess(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
50
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 May 2013