May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : widl: Output a list of binding routines in client files.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 93dd2521169e0bd33248f28f6792b9b67f8c52da URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dd2521169e0bd33248f28f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 12:07:29 2011 +0200 widl: Output a list of binding routines in client files. --- tools/widl/client.c | 23 ++++++++++++++++++++++- tools/widl/header.c | 4 +--- tools/widl/widltypes.h | 3 +++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b5ac0ae..aec379c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -351,7 +351,10 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) indent--; print_client("},\n"); print_client("0,\n"); - print_client("0,\n"); + if (!list_empty( &generic_handle_list )) + print_client("BindingRoutines,\n"); + else + print_client("0,\n"); if (expr_eval_routines) print_client("ExprEvalRoutines,\n"); else @@ -496,6 +499,23 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou } } +static void write_generic_handle_routine_list(void) +{ + generic_handle_t *gh; + + if (list_empty( &generic_handle_list )) return; + print_client( "static const GENERIC_BINDING_ROUTINE_PAIR BindingRoutines[] =\n" ); + print_client( "{\n" ); + indent++; + LIST_FOR_EACH_ENTRY( gh, &generic_handle_list, generic_handle_t, entry ) + { + print_client( "{ (GENERIC_BINDING_ROUTINE)%s_bind, (GENERIC_UNBIND_ROUTINE)%s_unbind },\n", + gh->name, gh->name ); + } + indent--; + print_client( "};\n\n" ); +} + static void write_client_routines(const statement_list_t *stmts) { unsigned int proc_offset = 0; @@ -508,6 +528,7 @@ static void write_client_routines(const statement_list_t *stmts) expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) write_expr_eval_routine_list(client, client_token); + write_generic_handle_routine_list(); write_user_quad_list(client); write_client_ifaces(stmts, expr_eval_routines, &proc_offset); diff --git a/tools/widl/header.c b/tools/widl/header.c index e0322c6..9df03cc 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -36,13 +36,11 @@ #include "expr.h" #include "typetree.h" -typedef struct _user_type_t generic_handle_t; - static int indentation = 0; static int is_object_interface = 0; user_type_list_t user_type_list = LIST_INIT(user_type_list); static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); -static struct list generic_handle_list = LIST_INIT(generic_handle_list); +generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 295ad70..1f3c275 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -48,6 +48,7 @@ typedef struct _importinfo_t importinfo_t; typedef struct _typelib_t typelib_t; typedef struct _user_type_t user_type_t; typedef struct _user_type_t context_handle_t; +typedef struct _user_type_t generic_handle_t; typedef struct _type_list_t type_list_t; typedef struct _statement_t statement_t; @@ -60,6 +61,7 @@ typedef struct list ifref_list_t; typedef struct list array_dims_t; typedef struct list user_type_list_t; typedef struct list context_handle_list_t; +typedef struct list generic_handle_list_t; typedef struct list statement_list_t; enum attr_type @@ -530,6 +532,7 @@ typedef enum { extern syskind_t typelib_kind; extern user_type_list_t user_type_list; +extern generic_handle_list_t generic_handle_list; void check_for_additional_prototype_types(const var_list_t *list); void init_types(void);

1 0

André Hentschel : tools: Add setupapi and cfgmgr to synchronize spec files automatically.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 6d9e2d7fac6c3c67951f1a4ffe143ba7f8ffdf28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9e2d7fac6c3c67951f1a4ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 26 19:23:43 2011 +0200 tools: Add setupapi and cfgmgr to synchronize spec files automatically. --- tools/make_specfiles | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index b03fe54..9e9b8e8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -102,6 +102,10 @@ my @dll_groups = "xinput1_1", "xinput9_1_0", ], + [ + "setupapi", + "cfgmgr32", + ], ); my $update_flags = 0;

1 0

André Hentschel : setupapi: Add stubs for CM_Get_Device_ID_List_SizeA/W.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: c6e38bfee65cf16009cff1fbeb1a39b52c119390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e38bfee65cf16009cff1fbe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 26 19:23:09 2011 +0200 setupapi: Add stubs for CM_Get_Device_ID_List_SizeA/W. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 780312a..21029fe 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -68,8 +68,8 @@ @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW -@ stub CM_Get_Device_ID_List_SizeA -@ stub CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) setupapi.CM_Get_Device_ID_List_SizeA +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW @ stub CM_Get_Device_ID_List_Size_ExA @ stub CM_Get_Device_ID_List_Size_ExW @ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 54083be..9ad5a96 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -79,8 +79,8 @@ @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW -@ stub CM_Get_Device_ID_List_SizeA -@ stub CM_Get_Device_ID_List_SizeW +@ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) @ stub CM_Get_Device_ID_List_Size_ExA @ stub CM_Get_Device_ID_List_Size_ExW @ stdcall CM_Get_Device_ID_Size(ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 8ba17d7..d4e135e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -113,6 +113,26 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListW( } /*********************************************************************** + * CM_Get_Device_ID_List_SizeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags ) +{ + FIXME("%p %s 0x%08x\n", pulLen, debugstr_a(pszFilter), ulFlags); + + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Device_ID_List_SizeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags ) +{ + FIXME("%p %s 0x%08x\n", pulLen, debugstr_w(pszFilter), ulFlags); + + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Parent (SETUPAPI.@) */ DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags)

1 0

Alexandre Julliard : usp10/tests: Load GetGlyphIndicesW dynamically.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 76319e3a8d670bde417365722629b344fa7fb76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76319e3a8d670bde417365722… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 12:19:35 2011 +0200 usp10/tests: Load GetGlyphIndicesW dynamically. --- dlls/usp10/tests/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index bfb2b5c..6b7ed18 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -55,6 +55,8 @@ static HRESULT (WINAPI *pScriptItemizeOpenType)( const WCHAR *pwcInChars, int cI static HRESULT (WINAPI *pScriptShapeOpenType)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, int cRanges, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProps, WORD *pwOutGlyphs, SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs); +static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); + static inline void _test_items_ok(LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD nItems, const itemTest* items, BOOL nItemsToDo, @@ -216,6 +218,7 @@ static void test_ScriptItemize( void ) ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll\n"); pScriptItemizeOpenType = (void*)GetProcAddress(usp10, "ScriptItemizeOpenType"); pScriptShapeOpenType = (void*)GetProcAddress(usp10, "ScriptShapeOpenType"); + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); memset(&Control, 0, sizeof(Control)); memset(&State, 0, sizeof(State)); @@ -493,7 +496,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co WORD glyph = 0; *origFont = SelectObject(hdc,*hfont); - if (GetGlyphIndicesW(hdc, &check, 1, &glyph, 0) == GDI_ERROR || glyph ==0) + if (pGetGlyphIndicesW && (pGetGlyphIndicesW(hdc, &check, 1, &glyph, 0) == GDI_ERROR || glyph ==0)) { winetest_trace(" Font fails to contain required glyphs\n"); SelectObject(hdc,*origFont);

1 0

Marcus Meissner : ntdll: Mark FILE_umask with hidden visibility.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 0f0692716b10249ff99a53d5a8d8eac9bc91fbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0692716b10249ff99a53d5a… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 26 18:15:51 2011 +0200 ntdll: Mark FILE_umask with hidden visibility. --- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 87571de..4c8d727 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2847,7 +2847,6 @@ void __wine_process_init(void) NTSTATUS status; ANSI_STRING func_name; void (* DECLSPEC_NORETURN CDECL init_func)(void); - extern mode_t FILE_umask; main_exe_file = thread_init(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index d8ff179..77f8603 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -232,6 +232,8 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) return (struct ntdll_thread_data *)NtCurrentTeb()->SpareBytes1; } +extern mode_t FILE_umask DECLSPEC_HIDDEN; + /* Register functions */ #ifdef __i386__

1 0

Alexandre Julliard : widl: Add support for top-level conformances.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: c2406be6d44aa182c64d9ee66f50a2de83647445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2406be6d44aa182c64d9ee66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 21:34:51 2011 +0200 widl: Add support for top-level conformances. --- tools/widl/typegen.c | 162 ++++++++++++++++++++++++++++++++++---------------- tools/widl/widl.c | 2 +- tools/widl/widl.h | 2 +- 3 files changed, 113 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2406be6d44aa182c64d9…

1 0

Dylan Smith : d3dxof: Removed function declarations with no definitions.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: cbc78b61e851ee857cb3461f146bb24fc51fa583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc78b61e851ee857cb3461f1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 26 21:20:38 2011 -0400 d3dxof: Removed function declarations with no definitions. --- dlls/d3dxof/d3dxof_private.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index fb5ae77..225ec3f 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -165,8 +165,6 @@ typedef struct { } IDirectXFileSaveObjectImpl; HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj) DECLSPEC_HIDDEN; -HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj) DECLSPEC_HIDDEN; BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; BOOL parse_template(parse_buffer * buf) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : widl: Move the check for already processed types into the type-specific functions .
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: d8059aee3a3201901a293548c4ebc3e5a7e49475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8059aee3a3201901a293548c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 14:59:46 2011 +0200 widl: Move the check for already processed types into the type-specific functions. Fixed a couple of instances where types were printed redundantly or incorrectly reused. --- tools/widl/typegen.c | 59 +++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 36358a8..904eba9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1667,7 +1667,7 @@ static int user_type_has_variable_size(const type_t *t) return FALSE; } -static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) +static unsigned int write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { unsigned int start, absoff, flags; const char *name = NULL; @@ -1678,6 +1678,8 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) unsigned short funoff = user_type_offset(name); short reloff; + if (processed(type)) return type->typestring_offset; + guard_rec(type); if(user_type_has_variable_size(utype)) usize = 0; @@ -1725,6 +1727,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); *tfsoff += 2; + return start; } static void write_member_type(FILE *file, const type_t *cont, @@ -2230,9 +2233,9 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, unsigned int start_offset; unsigned char rtype; type_t *elem_type; + int is_processed = processed(type); start_offset = *typestring_offset; - update_tfsoff(type, start_offset, file); if (is_declptr(type)) { @@ -2250,6 +2253,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "NdrFcShort(0x2),\n"); *typestring_offset += 2; } + is_processed = FALSE; } if (is_array(type)) @@ -2274,6 +2278,8 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, { unsigned int dim = type_array_get_dim(type); + if (is_processed) return start_offset; + /* FIXME: multi-dimensional array */ if (0xffffu < dim) error("array size for parameter %s exceeds %u bytes by %u bytes\n", @@ -2289,6 +2295,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "NdrFcShort(0x%hx),\t/* %d */\n", (unsigned short)dim, dim); *typestring_offset += 2; + update_tfsoff(type, start_offset, file); return start_offset; } else if (is_conformant_array(type)) @@ -2307,10 +2314,13 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, : 0), type, type_array_get_conformance(type)); + update_tfsoff(type, start_offset, file); return start_offset; } else { + if (is_processed) return start_offset; + if (rtype == RPC_FC_WCHAR) WRITE_FCTYPE(file, FC_C_WSTRING, *typestring_offset); else @@ -2318,6 +2328,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; + update_tfsoff(type, start_offset, file); return start_offset; } } @@ -2523,6 +2534,8 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, unsigned char fc = get_struct_fc(type); var_list_t *fields = type_struct_get_fields(type); + if (processed(type)) return type->typestring_offset; + guard_rec(type); current_structure = type; @@ -2682,6 +2695,10 @@ static unsigned int write_union_tfs(FILE *file, type_t *type, unsigned int *tfso short nodeftype = 0xffff; var_t *f; + if (processed(type) && + (type_get_type(type) == TYPE_ENCAPSULATED_UNION || !is_attr(type->attrs, ATTR_SWITCHTYPE))) + return type->typestring_offset; + guard_rec(type); size = type_memsize(type); @@ -2832,6 +2849,8 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t unsigned int start_offset = *typeformat_offset; expr_t *iid = get_attrp(attrs, ATTR_IIDIS); + if (!iid && processed(type)) return type->typestring_offset; + print_start_tfs_comment(file, type, start_offset); if (iid) @@ -2956,8 +2975,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, case TGT_CTXT_HANDLE_POINTER: return write_contexthandle_tfs(file, attrs, type, typeformat_offset); case TGT_USER_TYPE: - write_user_tfs(file, type, typeformat_offset); - return type->typestring_offset; + return write_user_tfs(file, type, typeformat_offset); case TGT_STRING: return write_string_tfs(file, attrs, type, context == TYPE_CONTEXT_TOPLEVELPARAM, @@ -2994,10 +3012,8 @@ static unsigned int write_type_tfs(FILE *file, int indent, return off; } case TGT_STRUCT: - if (processed(type)) return type->typestring_offset; return write_struct_tfs(file, type, name, typeformat_offset); case TGT_UNION: - if (processed(type)) return type->typestring_offset; return write_union_tfs(file, type, typeformat_offset); case TGT_ENUM: case TGT_BASIC: @@ -3013,27 +3029,22 @@ static unsigned int write_type_tfs(FILE *file, int indent, case TGT_IFACE_POINTER: return write_ip_tfs(file, attrs, type, typeformat_offset); case TGT_POINTER: - if (processed(type_pointer_get_ref(type))) - offset = type_pointer_get_ref(type)->typestring_offset; + { + enum type_context ref_context; + if (context == TYPE_CONTEXT_TOPLEVELPARAM) + ref_context = TYPE_CONTEXT_PARAM; + else if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) + ref_context = TYPE_CONTEXT_CONTAINER; else - { - enum type_context ref_context; - if (context == TYPE_CONTEXT_TOPLEVELPARAM) - ref_context = TYPE_CONTEXT_PARAM; - else if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) - ref_context = TYPE_CONTEXT_CONTAINER; - else - ref_context = context; - offset = write_type_tfs( - file, indent, attrs, type_pointer_get_ref(type), name, - ref_context, typeformat_offset); - } + ref_context = context; + offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, + ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) return 0; - else - return write_pointer_tfs(file, attrs, type, offset, - context == TYPE_CONTEXT_TOPLEVELPARAM, - typeformat_offset); + return write_pointer_tfs(file, attrs, type, offset, + context == TYPE_CONTEXT_TOPLEVELPARAM, + typeformat_offset); + } case TGT_INVALID: break; }

1 0

Jacek Caban : shdocvw: Store task list in DocHost object instead of using LPARAM.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: 826f7c0c759c647ea0be757fa2543f2b71c2c32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=826f7c0c759c647ea0be757fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 17:01:42 2011 +0200 shdocvw: Store task list in DocHost object instead of using LPARAM. --- dlls/shdocvw/dochost.c | 27 +++++++++++++++++---------- dlls/shdocvw/iexplore.c | 2 +- dlls/shdocvw/oleobject.c | 2 +- dlls/shdocvw/shdocvw.h | 5 ++++- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6d6c1e6..407bbf9 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -33,26 +33,32 @@ static ATOM doc_view_atom = 0; void push_dochost_task(DocHost *This, task_header_t *task, task_proc_t proc, task_destr_t destr, BOOL send) { + BOOL is_empty; + task->proc = proc; task->destr = destr; - /* FIXME: Don't use lParam */ + is_empty = list_empty(&This->task_queue); + list_add_tail(&This->task_queue, &task->entry); + if(send) - SendMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, (LPARAM)task); - else - PostMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, (LPARAM)task); + SendMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, 0); + else if(is_empty) + PostMessageW(This->frame_hwnd, WM_DOCHOSTTASK, 0, 0); } -LRESULT process_dochost_task(DocHost *This, LPARAM lparam) +LRESULT process_dochost_tasks(DocHost *This) { - task_header_t *task = (task_header_t*)lparam; + task_header_t *task; - task->proc(This, task); + while(!list_empty(&This->task_queue)) { + task = LIST_ENTRY(This->task_queue.next, task_header_t, entry); + list_remove(&task->entry); - if(task->destr) + task->proc(This, task); task->destr(task); - else - heap_free(task); + } + return 0; } @@ -860,6 +866,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c This->container_vtbl = container; This->ready_state = READYSTATE_UNINITIALIZED; + list_init(&This->task_queue); DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index f079e62..0ad1e89 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -649,7 +649,7 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) case WM_NOTIFY: return iewnd_OnNotify(This, wparam, lparam); case WM_DOCHOSTTASK: - return process_dochost_task(&This->doc_host->doc_host, lparam); + return process_dochost_tasks(&This->doc_host->doc_host); case WM_UPDATEADDRBAR: return update_addrbar(This, lparam); } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index df06028..b116486 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -63,7 +63,7 @@ static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, L case WM_SIZE: return resize_window(This, LOWORD(lParam), HIWORD(lParam)); case WM_DOCHOSTTASK: - return process_dochost_task(&This->doc_host, lParam); + return process_dochost_tasks(&This->doc_host); } return DefWindowProcW(hwnd, msg, wParam, lParam); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 118dafb..b127ec3 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -83,6 +83,7 @@ typedef void (*task_proc_t)(DocHost*, struct _task_header_t*); typedef void (*task_destr_t)(struct _task_header_t*); typedef struct _task_header_t { + struct list entry; task_proc_t proc; task_destr_t destr; } task_header_t; @@ -126,6 +127,8 @@ struct DocHost { HWND hwnd; HWND frame_hwnd; + struct list task_queue; + LPOLESTR url; VARIANT_BOOL silent; @@ -247,7 +250,7 @@ void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDE #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; -LRESULT process_dochost_task(DocHost*,LPARAM) DECLSPEC_HIDDEN; +LRESULT process_dochost_tasks(DocHost*) DECLSPEC_HIDDEN; HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : shdocvw: Abort pending tasks on DocHost destruction.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: bcffa12484e311e18f8ef191673028172e05b130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcffa12484e311e18f8ef1916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 17:01:51 2011 +0200 shdocvw: Abort pending tasks on DocHost destruction. --- dlls/shdocvw/dochost.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 407bbf9..97e5f77 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -62,6 +62,16 @@ LRESULT process_dochost_tasks(DocHost *This) return 0; } +static void abort_dochost_tasks(DocHost *This) +{ + task_header_t *task, *cursor; + + LIST_FOR_EACH_ENTRY_SAFE(task, cursor, &This->task_queue, task_header_t, entry) { + list_remove(&task->entry); + task->destr(task); + } +} + static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; @@ -876,6 +886,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c void DocHost_Release(DocHost *This) { + abort_dochost_tasks(This); release_dochost_client(This); DocHost_ClientSite_Release(This);

1 0