wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Alexandre Julliard : widl: Pass a structure containing the parameters to NdrClientCall instead of accessing the stack .
by Alexandre Julliard 09 Jun '11

09 Jun '11

Module: wine Branch: master Commit: 59171bd9f5ae3b8a32d9b2c62635ad0eb14b0dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=59171bd9f5ae3b8a32d9b2c62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 11:42:21 2011 +0200 widl: Pass a structure containing the parameters to NdrClientCall instead of accessing the stack. --- tools/widl/proxy.c | 3 ++- tools/widl/typegen.c | 41 ++++++++++++++++++++++++++++++++--------- tools/widl/typegen.h | 3 ++- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0043e6a..7bc7753 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -502,7 +502,8 @@ static void gen_stub_thunk( type_t *iface, const var_t *func, unsigned int proc_ iface->name, get_name(func) ); print_proxy( "{\n"); indent++; - write_func_param_struct( proxy, iface, func->type, "pParamStruct" ); + write_func_param_struct( proxy, iface, func->type, + "*pParamStruct = (struct _PARAM_STRUCT *)pStubMsg->StackTop", has_ret ); print_proxy( "%s%s_%s_Stub( pParamStruct->This", has_ret ? "pParamStruct->_RetVal = " : "", iface->name, callas->name ); indent++; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index abe84d9..04e014a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4661,8 +4661,10 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char } -void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ) +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, + const char *var_decl, int add_retval ) { + type_t *rettype = type_function_get_rettype( func ); const var_list_t *args = type_get_function_args( func ); const var_t *arg; @@ -4682,13 +4684,16 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun else fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); } - if (!is_void( type_function_get_rettype( func ))) + if (add_retval && !is_void( rettype )) { print_file(file, 2, "%s", ""); - write_type_decl( file, type_function_get_rettype( func ), "_RetVal" ); - fprintf( file, ";\n" ); + write_type_decl( file, rettype, "_RetVal" ); + if (is_array( rettype ) || is_ptr( rettype ) || type_memsize( rettype ) == pointer_size) + fprintf( file, ";\n" ); + else + fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); } - print_file(file, 1, "} *%s = (struct _PARAM_STRUCT *)pStubMsg->StackTop;\n\n", var_name ); + print_file(file, 1, "} %s;\n\n", var_decl ); } int write_expr_eval_routines(FILE *file, const char *iface) @@ -4709,7 +4714,8 @@ int write_expr_eval_routines(FILE *file, const char *iface) print_file(file, 0, "{\n"); if (type_get_type( eval->cont_type ) == TYPE_FUNCTION) { - write_func_param_struct( file, eval->iface, eval->cont_type, "pS" ); + write_func_param_struct( file, eval->iface, eval->cont_type, + "*pS = (struct _PARAM_STRUCT *)pStubMsg->StackTop", FALSE ); } else { @@ -4813,16 +4819,33 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu int has_ret = !is_void( rettype ); const var_list_t *args = type_get_function_args( func->type ); const var_t *arg; - int len; + int len, needs_params = 0; + + /* we need a param structure if we have more than one arg */ + if (pointer_size == 4 && args) needs_params = is_object( iface ) || list_count( args ) > 1; print_file( file, 0, "{\n"); - if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + if (needs_params) + { + if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n" ); + write_func_param_struct( file, iface, func->type, "__params", FALSE ); + if (is_object( iface )) print_file( file, 1, "__params.This = This;\n" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + print_file( file, 1, "__params.%s = %s;\n", arg->name, arg->name ); + } + else if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + len = fprintf( file, " %s%s( ", has_ret ? "_RetVal = " : "", get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall" ); fprintf( file, "&%s_StubDesc,", prefix ); fprintf( file, "\n%*s&__MIDL_ProcFormatString.Format[%u]", len, "", proc_offset ); - if (pointer_size == 8) + if (needs_params) + { + fprintf( file, ",\n%*s&__params", len, "" ); + } + else if (pointer_size == 8) { if (is_object( iface )) fprintf( file, ",\n%*sThis", len, "" ); if (args) diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 6c7242e..3efd421 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -75,7 +75,8 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_ unsigned int get_size_typeformatstring(const statement_list_t *stmts, type_pred_t pred); void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char *local_var_prefix ); void declare_stub_args( FILE *file, int indent, const var_t *func ); -void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_name ); +void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, + const char *var_decl, int add_retval ); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file);

1 0

Alexandre Julliard : widl: Add a helper function for generating a stub that uses NdrClientCall.
by Alexandre Julliard 09 Jun '11

09 Jun '11

Module: wine Branch: master Commit: 9f99d74a2037524ae8502de071564da3396eb3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f99d74a2037524ae8502de07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 10:12:48 2011 +0200 widl: Add a helper function for generating a stub that uses NdrClientCall. --- tools/widl/client.c | 32 +------------------------------- tools/widl/proxy.c | 26 +------------------------- tools/widl/typegen.c | 42 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 2 ++ 4 files changed, 46 insertions(+), 56 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 0ea8cbc..30f24b3 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -97,43 +97,13 @@ static void write_function_stub( const type_t *iface, const var_t *func, unsigned char explicit_fc, implicit_fc; int has_full_pointer = is_full_pointer_function(func); type_t *rettype = type_function_get_rettype(func->type); - const var_list_t *args = type_get_function_args(func->type); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); int has_ret = !is_void(rettype); if (is_interpreted_func( iface, func )) { write_client_func_decl( iface, func ); - fprintf(client, "{\n"); - indent++; - if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u]", - has_ret ? "_RetVal = " : "", - get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", - iface->name, proc_offset ); - if (args) - { - const var_t *arg; - if (pointer_size == 8) - { - LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - fprintf( client, ",\n%*s%s", 4 * indent + 16, "", arg->name ); - } - else - { - arg = LIST_ENTRY( list_head(args), const var_t, entry ); - fprintf( client, ", &%s", arg->name ); - } - } - fprintf( client, " );\n" ); - if (has_ret) - { - print_client( "return (" ); - write_type_decl_left(client, rettype); - fprintf( client, ")*(LONG_PTR *)&_RetVal;\n" ); - } - indent--; - print_client( "}\n\n"); + write_client_call_routine( client, iface, func, iface->name, proc_offset ); return; } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 549bfaa..0043e6a 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -266,31 +266,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); write_args(proxy, args, iface->name, 1, TRUE); print_proxy( ")\n"); - print_proxy( "{\n"); - indent++; - if (has_ret) print_proxy( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u],", - has_ret ? "_RetVal = " : "", - get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", - proc_offset ); - if (pointer_size == 8) - { - const var_t *arg; - fprintf( proxy, "\n%*sThis", 4 * indent + 16, "" ); - if (args) - LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - fprintf( proxy, ",\n%*s%s", 4 * indent + 16, "", arg->name ); - } - else fprintf( proxy, " &This" ); - fprintf( proxy, " );\n" ); - if (has_ret) - { - print_proxy( "return (" ); - write_type_decl_left(proxy, rettype); - fprintf( proxy, ")*(LONG_PTR *)&_RetVal;\n" ); - } - indent--; - print_proxy( "}\n\n"); + write_client_call_routine( proxy, iface, func, "Object", proc_offset ); return; } print_proxy( "static void __finally_%s_%s_Proxy( struct __proxy_frame *__frame )\n", diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 59de872..abe84d9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4806,6 +4806,48 @@ error: error("Invalid endpoint syntax '%s'\n", endpoint->str); } +void write_client_call_routine( FILE *file, const type_t *iface, const var_t *func, + const char *prefix, unsigned int proc_offset ) +{ + type_t *rettype = type_function_get_rettype( func->type ); + int has_ret = !is_void( rettype ); + const var_list_t *args = type_get_function_args( func->type ); + const var_t *arg; + int len; + + print_file( file, 0, "{\n"); + if (has_ret) print_file( file, 1, "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); + len = fprintf( file, " %s%s( ", + has_ret ? "_RetVal = " : "", + get_stub_mode() == MODE_Oif ? "NdrClientCall2" : "NdrClientCall" ); + fprintf( file, "&%s_StubDesc,", prefix ); + fprintf( file, "\n%*s&__MIDL_ProcFormatString.Format[%u]", len, "", proc_offset ); + if (pointer_size == 8) + { + if (is_object( iface )) fprintf( file, ",\n%*sThis", len, "" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( file, ",\n%*s%s", len, "", arg->name ); + } + else + { + if (is_object( iface )) fprintf( file, ",\n%*s&This", len, "" ); + else if (args) + { + arg = LIST_ENTRY( list_head(args), const var_t, entry ); + fprintf( file, ",\n%*s&%s", len, "", arg->name ); + } + } + fprintf( file, " );\n" ); + if (has_ret) + { + print_file( file, 1, "return (" ); + write_type_decl_left(file, rettype); + fprintf( file, ")%s;\n", pointer_size == 8 ? "_RetVal.Simple" : "*(LONG_PTR *)&_RetVal" ); + } + print_file( file, 0, "}\n\n"); +} + void write_exceptions( FILE *file ) { fprintf( file, "#ifndef USE_COMPILER_EXCEPTIONS\n"); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 7f3aed1..6c7242e 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -80,6 +80,8 @@ int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file); void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ); +void write_client_call_routine( FILE *file, const type_t *iface, const var_t *func, + const char *prefix, unsigned int proc_offset ); void write_exceptions( FILE *file ); unsigned int type_memsize(const type_t *t); int decl_indirect(const type_t *t);

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DMaterial3 iface.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: d9fb7b9b92dd4c886fe8d79361de5fbb3864f984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fb7b9b92dd4c886fe8d7936… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:38:16 2011 +0200 ddraw: COM cleanup for the IDirect3DMaterial3 iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 73 +++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fb7b9b92dd4c886fe8d…

1 0

Michael Stefaniuc : ddraw: Avoid "unsafe" IDirect3DMaterial3 to object casts.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 8d91f8b614d0cb22e6623a0c104ac8e71f595615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d91f8b614d0cb22e6623a0c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:33:26 2011 +0200 ddraw: Avoid "unsafe" IDirect3DMaterial3 to object casts. --- dlls/ddraw/ddraw.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d3ee861..1ff43c4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4616,37 +4616,46 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 return D3D_OK; } -static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, IUnknown *outer_unknown) +static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 **material, + IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); - IDirect3DMaterial3 *material3; - HRESULT hr; + IDirect3DMaterialImpl *object; TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial2_iface : NULL; + object = d3d_material_create(This); + if (!object) + { + ERR("Failed to allocate material memory.\n"); + return DDERR_OUTOFMEMORY; + } - TRACE("Returning material %p.\n", *material); + TRACE("Created material %p.\n", object); + *material = &object->IDirect3DMaterial2_iface; - return hr; + return D3D_OK; } -static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial **material, IUnknown *outer_unknown) +static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial **material, + IUnknown *outer_unknown) { - IDirect3DMaterial3 *material3; - HRESULT hr; - IDirectDrawImpl *This = impl_from_IDirect3D(iface); + IDirect3DMaterialImpl *object; TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); - hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial_iface : NULL; + object = d3d_material_create(This); + if (!object) + { + ERR("Failed to allocate material memory.\n"); + return DDERR_OUTOFMEMORY; + } - TRACE("Returning material %p.\n", *material); + TRACE("Created material %p.\n", object); + *material = &object->IDirect3DMaterial_iface; - return hr; + return D3D_OK; } /*****************************************************************************

1 0

Michael Stefaniuc : ddraw: Rename d3d_material_init() and have it allocate the object too.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: db15ce658035ca018abc418f11c88d124ea7531c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db15ce658035ca018abc418f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:29:20 2011 +0200 ddraw: Rename d3d_material_init() and have it allocate the object too. --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 10 +++++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 51e8c8c..d3ee861 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4603,15 +4603,13 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 if (outer_unknown) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = d3d_material_create(This); if (!object) { ERR("Failed to allocate material memory.\n"); return DDERR_OUTOFMEMORY; } - d3d_material_init(object, This); - TRACE("Created material %p.\n", object); *material = (IDirect3DMaterial3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cce8574..0da8f55 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -429,7 +429,7 @@ struct IDirect3DMaterialImpl /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; -void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; +IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 10ce340..42e4809 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -507,11 +507,19 @@ static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = IDirect3DMaterialImpl_Unreserve }; -void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) +IDirect3DMaterialImpl *d3d_material_create(IDirectDrawImpl *ddraw) { + IDirect3DMaterialImpl *material; + + material = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*material)); + if (!material) + return NULL; + material->lpVtbl = &d3d_material3_vtbl; material->IDirect3DMaterial2_iface.lpVtbl = &d3d_material2_vtbl; material->IDirect3DMaterial_iface.lpVtbl = &d3d_material1_vtbl; material->ref = 1; material->ddraw = ddraw; + + return material; }

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDrawGammaControl iface.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: abe0ee33eb0ab8ac19bd97323bdde6ca7f31ed1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0ee33eb0ab8ac19bd97323… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 17:23:17 2011 +0200 ddraw: COM cleanup for the IDirectDrawGammaControl iface. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d2b6ea9..cce8574 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -155,7 +155,7 @@ struct IDirectDrawSurfaceImpl IDirectDrawSurface7 IDirectDrawSurface7_iface; IDirectDrawSurface4 IDirectDrawSurface4_iface; IDirectDrawSurface3 IDirectDrawSurface3_iface; - const IDirectDrawGammaControlVtbl *IDirectDrawGammaControl_vtbl; + IDirectDrawGammaControl IDirectDrawGammaControl_iface; const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 74d9dc0..89a6bd1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -31,10 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static inline IDirectDrawSurfaceImpl *surface_from_gamma_control(IDirectDrawGammaControl *iface) +static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectDrawGammaControl *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirectDrawGammaControl_vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); } /***************************************************************************** @@ -98,7 +97,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) ) { IUnknown_AddRef(iface); - *obj = &This->IDirectDrawGammaControl_vtbl; + *obj = &This->IDirectDrawGammaControl_iface; TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj); return S_OK; } @@ -159,9 +158,11 @@ static HRESULT WINAPI ddraw_surface3_QueryInterface(IDirectDrawSurface3 *iface, return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); } -static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, REFIID riid, void **object) +static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, + REFIID riid, void **object) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); @@ -230,7 +231,8 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p.\n", iface); return ddraw_surface7_AddRef(&This->IDirectDrawSurface7_iface); @@ -448,7 +450,8 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { - IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawGammaControl(iface); + TRACE("iface %p.\n", iface); return ddraw_surface7_Release(&This->IDirectDrawSurface7_iface); @@ -3410,7 +3413,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl *iface, DWORD flags, DDGAMMARAMP *gamma_ramp) { - IDirectDrawSurfaceImpl *surface = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirectDrawGammaControl(iface); TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp); @@ -3452,7 +3455,7 @@ static HRESULT WINAPI ddraw_gamma_control_GetGammaRamp(IDirectDrawGammaControl * static HRESULT WINAPI ddraw_gamma_control_SetGammaRamp(IDirectDrawGammaControl *iface, DWORD flags, DDGAMMARAMP *gamma_ramp) { - IDirectDrawSurfaceImpl *surface = surface_from_gamma_control(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirectDrawGammaControl(iface); TRACE("iface %p, flags %#x, gamma_ramp %p.\n", iface, flags, gamma_ramp); @@ -4135,7 +4138,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; - surface->IDirectDrawGammaControl_vtbl = &ddraw_gamma_control_vtbl; + surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl; surface->ref = 1;

1 0

Adam Martinson : ole32: Don't call IDropTarget::QueryInterface() in RegisterDragDrop().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: e85668b4630266845c44c23450f8006505ee73fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85668b4630266845c44c2345… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Jun 6 11:57:27 2011 -0500 ole32: Don't call IDropTarget::QueryInterface() in RegisterDragDrop(). --- dlls/ole32/ole2.c | 128 ++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/dragdrop.c | 2 +- 2 files changed, 120 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 3254619..b449a76 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -6,6 +6,7 @@ * Copyright 1999 Noel Borthwick * Copyright 1999, 2000 Marcus Meissner * Copyright 2005 Juan Lang + * Copyright 2011 Adam Martinson for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -377,6 +378,116 @@ static HRESULT create_stream_from_map(HANDLE map, IStream **stream) return hr; } +/* This is to work around apps which break COM rules by not implementing + * IDropTarget::QueryInterface(). Windows doesn't expose this because it + * doesn't call CoMarshallInterface() in RegisterDragDrop(). + * The wrapper is only used internally, and only exists for the life of + * the marshal. */ +typedef struct { + IDropTarget IDropTarget_iface; + IDropTarget* inner; + LONG refs; +} DropTargetWrapper; + +static inline DropTargetWrapper* impl_from_IDropTarget(IDropTarget* iface) +{ + return CONTAINING_RECORD(iface, DropTargetWrapper, IDropTarget_iface); +} + +static HRESULT WINAPI DropTargetWrapper_QueryInterface(IDropTarget* iface, + REFIID riid, + void** ppvObject) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDropTarget)) + { + IDropTarget_AddRef(&This->IDropTarget_iface); + *ppvObject = &This->IDropTarget_iface; + return S_OK; + } + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI DropTargetWrapper_AddRef(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI DropTargetWrapper_Release(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + IDropTarget_Release(This->inner); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static HRESULT WINAPI DropTargetWrapper_DragEnter(IDropTarget* iface, + IDataObject* pDataObj, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragEnter(This->inner, pDataObj, grfKeyState, pt, pdwEffect); +} + +static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragOver(This->inner, grfKeyState, pt, pdwEffect); +} + +static HRESULT WINAPI DropTargetWrapper_DragLeave(IDropTarget* iface) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_DragLeave(This->inner); +} + +static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, + IDataObject* pDataObj, + DWORD grfKeyState, + POINTL pt, + DWORD* pdwEffect) +{ + DropTargetWrapper* This = impl_from_IDropTarget(iface); + return IDropTarget_Drop(This->inner, pDataObj, grfKeyState, pt, pdwEffect); +} + +static const IDropTargetVtbl DropTargetWrapperVTbl = +{ + DropTargetWrapper_QueryInterface, + DropTargetWrapper_AddRef, + DropTargetWrapper_Release, + DropTargetWrapper_DragEnter, + DropTargetWrapper_DragOver, + DropTargetWrapper_DragLeave, + DropTargetWrapper_Drop +}; + +static IDropTarget* WrapDropTarget(IDropTarget* inner) +{ + DropTargetWrapper* This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + + if (This) + { + IDropTarget_AddRef(inner); + This->IDropTarget_iface.lpVtbl = &DropTargetWrapperVTbl; + This->inner = inner; + This->refs = 1; + } + return &This->IDropTarget_iface; +} + /*********************************************************************** * get_droptarget_pointer * @@ -409,7 +520,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) HRESULT hr; IStream *stream; HANDLE map; - IUnknown *unk; + IDropTarget *wrapper; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -450,16 +561,15 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hr)) return hr; - unk = NULL; - hr = IDropTarget_QueryInterface(pDropTarget, &IID_IUnknown, (void**)&unk); - if (SUCCEEDED(hr) && !unk) hr = E_NOINTERFACE; - if(FAILED(hr)) + /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ + wrapper = WrapDropTarget(pDropTarget); + if(!wrapper) { - IStream_Release(stream); - return hr; + IStream_Release(stream); + return E_OUTOFMEMORY; } - hr = CoMarshalInterface(stream, &IID_IDropTarget, unk, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); - IUnknown_Release(unk); + hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)wrapper, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + IDropTarget_Release(wrapper); if(SUCCEEDED(hr)) { diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 0c56cb4..b0e1259 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -39,7 +39,7 @@ static int droptarget_refs; static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, void** ppvObject) { - todo_wine ok(0, "DropTarget_QueryInterface() shouldn't be called\n"); + ok(0, "DropTarget_QueryInterface() shouldn't be called\n"); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDropTarget)) {

1 0

Louis Lenders : netapi32/tests: Add small conformance test for NetLocalGroupGetInfo and LocalGroupGetMembers .
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: de2c4015278ee774133c7bf4c6474fe0f0060108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2c4015278ee774133c7bf4c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 5 09:58:33 2011 +0200 netapi32/tests: Add small conformance test for NetLocalGroupGetInfo and LocalGroupGetMembers. --- dlls/netapi32/tests/access.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b721c19..e8324d3 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -63,6 +63,8 @@ static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=N static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; static int init_access_tests(void) { @@ -320,6 +322,31 @@ static void run_userhandling_tests(void) ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } +static void run_localgroupgetinfo_tests(void) +{ + NET_API_STATUS status; + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + PLOCALGROUP_INFO_1 lgi = NULL; + PLOCALGROUP_MEMBERS_INFO_3 buffer = NULL; + DWORD entries_read = 0, total_entries =0; + int i; + + status = pNetLocalGroupGetInfo(NULL, admins, 1, (LPBYTE *)&lgi); + ok(status == NERR_Success, "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + + trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); + trace("Comment: %s\n", wine_dbgstr_w( lgi->lgrpi1_comment)); + + pNetApiBufferFree(lgi); + + status = pNetLocalGroupGetMembers(NULL, admins, 3, (LPBYTE *)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); + + for(i=0;i<entries_read;i++) + trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -331,6 +358,8 @@ START_TEST(access) pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); + pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); + pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -346,6 +375,7 @@ START_TEST(access) run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); + run_localgroupgetinfo_tests(); } FreeLibrary(hnetapi32);

1 0

Louis Lenders : netapi32: Fill the data buffer with something useful in NetLocalGroupGetInfo.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 4680f63939dc8fd6b26d17125a4d0d9f95702217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4680f63939dc8fd6b26d17125… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Jun 5 10:43:57 2011 +0200 netapi32: Fill the data buffer with something useful in NetLocalGroupGetInfo. --- dlls/netapi32/local_group.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index e125de5..7f7d3c1 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -145,8 +145,24 @@ NET_API_STATUS WINAPI NetLocalGroupGetInfo( DWORD level, LPBYTE* bufptr) { - FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername), + static const WCHAR commentW[]={'N','o',' ','c','o','m','m','e','n','t',0}; + LOCALGROUP_INFO_1* info; + DWORD size; + + FIXME("(%s %s %d %p) semi-stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); + + size = sizeof(*info) + sizeof(WCHAR) * (lstrlenW(groupname)+1) + sizeof(commentW); + NetApiBufferAllocate(size, (LPVOID*)&info); + + info->lgrpi1_name = (LPWSTR)(info + 1); + lstrcpyW(info->lgrpi1_name, groupname); + + info->lgrpi1_comment = info->lgrpi1_name + lstrlenW(groupname) + 1; + lstrcpyW(info->lgrpi1_comment, commentW); + + *bufptr = (LPBYTE)info; + return NERR_Success; }

1 0

Aric Stewart : usp10: Bengali initial form is only applied to the beginning of words.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 4fbb13a2c85effcb7b0aed1d95eb54456995c6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbb13a2c85effcb7b0aed1d9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 10:12:27 2011 -0500 usp10: Bengali initial form is only applied to the beginning of words. --- dlls/usp10/shape.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bc22b4a..5d0c3d4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -471,7 +471,6 @@ static OPENTYPE_FEATURE_RECORD bengali_features[] = { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ - { MS_MAKE_TAG('i','n','i','t'), 1}, { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -2204,6 +2203,19 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; + /* Step 3: Initial form is only applied to the beginning of words */ + for (cCount = cCount - 1 ; cCount >= 0; cCount --) + { + if (cCount == 0 || input[cCount] == 0x0020) /* space */ + { + int index = cCount; + int gCount = 1; + if (index > 0) index++; + + apply_GSUB_feature_to_glyph(hdc, psa, psc, &pwOutGlyphs[index], 0, 1, &gCount, "init"); + } + } + HeapFree(GetProcessHeap(),0,input); }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
81
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 2011