October 2007 - Wine-commits

Lei Zhang : comctl32: Fix monthcal hit tests.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 4b8ca91d036f3e0098023abce4c992466ce4517d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8ca91d036f3e0098023abce… Author: Lei Zhang <thestig(a)google.com> Date: Sun Oct 7 05:36:19 2007 -0700 comctl32: Fix monthcal hit tests. --- dlls/comctl32/tests/monthcal.c | 152 +++++++++++++++++++++++---------------- 1 files changed, 90 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b8ca91d036f3e0098023…

1 0

Rob Shearman : ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn' t intialised, instead of CO_E_NOTINITIALIZED.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 5e2d890e5d6371263cf9a131c6fea915af562b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2d890e5d6371263cf9a131c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Oct 7 16:52:28 2007 +0200 ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn't intialised, instead of CO_E_NOTINITIALIZED. --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/dragdrop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e58385b..e8793fc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -284,7 +284,7 @@ HRESULT WINAPI RegisterDragDrop( if (!COM_CurrentApt()) { ERR("COM not initialized\n"); - return CO_E_NOTINITIALIZED; + return E_OUTOFMEMORY; } if (!pDropTarget) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 48b308c..1561066 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -113,7 +113,7 @@ START_TEST(dragdrop) HRESULT hr; hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); - ok(hr == CO_E_NOTINITIALIZED, "RegisterDragDrop without OLE initialized should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); OleInitialize(NULL);

1 0

Dan Hipschman : widl: Keep track of every allocated type_t to simplify set_all_tfswrite.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 2226ddcadfeaf2029f67838bc5dc73094c8df366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2226ddcadfeaf2029f67838bc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Oct 8 16:47:28 2007 -0700 widl: Keep track of every allocated type_t to simplify set_all_tfswrite. --- tools/widl/parser.y | 23 +++++++++++++++++++++- tools/widl/typegen.c | 49 +---------------------------------------------- tools/widl/typelib.c | 2 +- tools/widl/widltypes.h | 2 + 4 files changed, 27 insertions(+), 49 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 68ef0cb..06f1f77 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1249,9 +1249,30 @@ static array_dims_t *append_array(array_dims_t *list, expr_t *expr) return list; } +static struct list type_pool = LIST_INIT(type_pool); +typedef struct +{ + type_t data; + struct list link; +} type_pool_node_t; + +type_t *alloc_type(void) +{ + type_pool_node_t *node = xmalloc(sizeof *node); + list_add_tail(&type_pool, &node->link); + return &node->data; +} + +void set_all_tfswrite(int val) +{ + type_pool_node_t *node; + LIST_FOR_EACH_ENTRY(node, &type_pool, type_pool_node_t, link) + node->data.tfswrite = val; +} + static type_t *make_type(unsigned char type, type_t *ref) { - type_t *t = xmalloc(sizeof(type_t)); + type_t *t = alloc_type(); t->name = NULL; t->kind = TKIND_PRIMITIVE; t->type = type; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ba2c983..f3ca74f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2095,36 +2095,6 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f offset, typeformat_offset); } -static void set_tfswrite(type_t *type, int val) -{ - while (type->tfswrite != val) - { - type_t *utype = get_user_type(type, NULL); - - type->tfswrite = val; - - if (utype) - set_tfswrite(utype, val); - - if (type->kind == TKIND_ALIAS) - type = type->orig; - else if (is_ptr(type) || is_array(type)) - type = type->ref; - else - { - if (type->fields) - { - var_t *v; - LIST_FOR_EACH_ENTRY( v, type->fields, var_t, entry ) - if (v->type) - set_tfswrite(v->type, val); - } - - return; - } - } -} - static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, const char *name, int write_ptr, unsigned int *tfsoff) { @@ -2180,21 +2150,6 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty return retmask; } -static void set_all_tfswrite(const ifref_list_t *ifaces, int val) -{ - const ifref_t * iface; - const func_t *func; - const var_t *var; - - if (ifaces) - LIST_FOR_EACH_ENTRY( iface, ifaces, const ifref_t, entry ) - if (iface->iface->funcs) - LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) - if (func->args) - LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - set_tfswrite(var->type, val); -} - static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, int for_objects) { const var_t *var; @@ -2242,7 +2197,7 @@ void write_typeformatstring(FILE *file, const ifref_list_t *ifaces, int for_obje indent++; print_file(file, indent, "NdrFcShort(0x0),\n"); - set_all_tfswrite(ifaces, TRUE); + set_all_tfswrite(TRUE); process_tfs(file, ifaces, for_objects); print_file(file, indent, "0x0\n"); @@ -2859,7 +2814,7 @@ size_t get_size_procformatstring(const ifref_list_t *ifaces, int for_objects) size_t get_size_typeformatstring(const ifref_list_t *ifaces, int for_objects) { - set_all_tfswrite(ifaces, FALSE); + set_all_tfswrite(FALSE); return process_tfs(NULL, ifaces, for_objects); } diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 5341720..7130e50 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -52,7 +52,7 @@ static typelib_t *typelib; type_t *duptype(type_t *t, int dupname) { - type_t *d = xmalloc(sizeof *d); + type_t *d = alloc_type(); *d = *t; if (dupname && t->name) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index a7e8d59..4145be2 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -313,6 +313,8 @@ extern user_type_list_t user_type_list; void check_for_user_types_and_context_handles(const var_list_t *list); void init_types(void); +type_t *alloc_type(void); +void set_all_tfswrite(int val); type_t *duptype(type_t *t, int dupname); type_t *alias(type_t *t, const char *name);

1 0

Dan Hipschman : widl: Implement pointer_default functionality.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 24ce74e96a49db7007a2e86399e9481d9a81e95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ce74e96a49db7007a2e8639… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Oct 8 16:46:23 2007 -0700 widl: Implement pointer_default functionality. --- tools/widl/parser.h | 6 ++++++ tools/widl/parser.y | 23 +++++++++++++++-------- tools/widl/typelib.c | 4 ++++ tools/widl/widltypes.h | 2 ++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 5baf655..c46364a 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -21,6 +21,12 @@ #ifndef __WIDL_PARSER_H #define __WIDL_PARSER_H +typedef struct +{ + type_t *interface; + unsigned char old_pointer_default; +} interface_info_t; + int parser_parse(void); extern FILE *parser_in; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8399b40..68ef0cb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -155,6 +155,7 @@ static void check_all_user_types(ifref_list_t *ifaces); UUID *uuid; unsigned int num; double dbl; + interface_info_t ifinfo; } %token <str> aIDENTIFIER @@ -247,7 +248,8 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <expr> m_expr expr expr_const %type <expr_list> m_exprs /* exprs expr_list */ expr_list_const %type <array_dims> array array_list -%type <type> inherit interface interfacehdr interfacedef interfacedec +%type <ifinfo> interfacehdr +%type <type> inherit interface interfacedef interfacedec %type <type> dispinterface dispinterfacehdr dispinterfacedef %type <type> module modulehdr moduledef %type <type> base_type int_std @@ -795,32 +797,37 @@ interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = | tINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } ; -interfacehdr: attributes interface { $$ = $2; - if ($$->defined) yyerror("multiple definition error"); - $$->attrs = $1; - $$->defined = TRUE; - if (!parse_only && do_header) write_forward($$); +interfacehdr: attributes interface { $$.interface = $2; + $$.old_pointer_default = pointer_default; + if (is_attr($1, ATTR_POINTERDEFAULT)) + pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); + if ($2->defined) yyerror("multiple definition error"); + $2->attrs = $1; + $2->defined = TRUE; + if (!parse_only && do_header) write_forward($2); } ; interfacedef: interfacehdr inherit - '{' int_statements '}' { $$ = $1; + '{' int_statements '}' { $$ = $1.interface; $$->ref = $2; $$->funcs = $4; compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && do_idfile) write_iid($$); + pointer_default = $1.old_pointer_default; } /* MIDL is able to import the definition of a base class from inside the * definition of a derived class, I'll try to support it with this rule */ | interfacehdr ':' aIDENTIFIER - '{' import int_statements '}' { $$ = $1; + '{' import int_statements '}' { $$ = $1.interface; $$->ref = find_type2($3, 0); if (!$$->ref) yyerror("base class '%s' not found in import", $3); $$->funcs = $6; compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && do_idfile) write_iid($$); + pointer_default = $1.old_pointer_default; } | dispinterfacedef { $$ = $1; } ; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 7afeef6..5341720 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -252,6 +252,9 @@ void start_typelib(char *name, attr_list_t *attrs) typelib->attrs = attrs; list_init( &typelib->entries ); list_init( &typelib->importlibs ); + + if (is_attr(attrs, ATTR_POINTERDEFAULT)) + pointer_default = get_attrv(attrs, ATTR_POINTERDEFAULT); } void end_typelib(void) @@ -260,6 +263,7 @@ void end_typelib(void) if (!typelib) return; create_msft_typelib(typelib); + pointer_default = RPC_FC_UP; return; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5dc634c..a7e8d59 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -307,6 +307,8 @@ struct _user_type_t { const char *name; }; +extern unsigned char pointer_default; + extern user_type_list_t user_type_list; void check_for_user_types_and_context_handles(const var_list_t *list);

1 0

Rob Shearman : oleaut32: Add a check for a test that depends on the decimal separator being a dot.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: ce2cba7a09ea9aff97eda844a55469a37e22fc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2cba7a09ea9aff97eda844a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Oct 7 16:30:12 2007 +0200 oleaut32: Add a check for a test that depends on the decimal separator being a dot. --- dlls/oleaut32/tests/vartest.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 5ec765b..511fe47 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3107,6 +3107,7 @@ static void test_VarRound(void) HRESULT hres; VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); + char buff[8]; CHECKPTR(VarRound); @@ -3138,8 +3139,14 @@ static void test_VarRound(void) * compare the first few digits. */ VARROUND(DATE,1.451,1,DATE,1.5); VARROUND(DATE,-1.45,1,DATE,-1.4); - VARROUND(BSTR,(BSTR)szNumMin,1,R8,-1.40); - if (0) { VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); + if (buff[0] != '.' || buff[1]) + skip("Skipping VarRound(BSTR) as decimal separator is '%s'\n", buff); + else + { + VARROUND(BSTR,(BSTR)szNumMin,1,R8,-1.40); + if (0) { VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } + } VARROUND(R4,1.23456f,0,R4,1.0f); VARROUND(R4,1.23456f,1,R4,1.2f);

1 0

Huw Davies : comctl32/tests: Don' t assume that the default font height is 16 pixels.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: e31d8d8f5bc4a1000096d6041473edf4a48d4f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31d8d8f5bc4a1000096d6041… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Oct 7 15:31:43 2007 +0100 comctl32/tests: Don't assume that the default font height is 16 pixels. --- dlls/comctl32/tests/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 4f99e0d..17d33a5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -141,7 +141,7 @@ static const struct message TestGetSetItemHeightSeq[] = { { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 }, { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0xffffffff, 0x00000000 }, { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 }, - { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0x00000020, 0x00000000 }, + { TVM_SETITEMHEIGHT, sent|lparam, 0xcccccccc, 0x00000000 }, { TVM_GETITEMHEIGHT, sent|wparam|lparam, 0x00000000, 0x00000000 }, { TVM_SETITEMHEIGHT, sent|wparam|lparam, 0x00000009, 0x00000000 }, { WM_WINDOWPOSCHANGING, sent|defwinproc },

1 0

Dan Hipschman : widl: Allow quoted UUIDs.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: cfa54572707404bfabe89ccd522ed8e6f00fb0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa54572707404bfabe89ccd5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Oct 8 16:45:09 2007 -0700 widl: Allow quoted UUIDs. --- tools/widl/parser.l | 2 +- tools/widl/parser.y | 26 +++++++++++++++++++++++++- tools/widl/utils.h | 3 +++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4cd98bb..e9bfb1f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -78,7 +78,7 @@ int import_stack_ptr = 0; static void pop_import(void); -static UUID* parse_uuid(const char*u) +UUID *parse_uuid(const char *u) { UUID* uuid = xmalloc(sizeof(UUID)); char b[3]; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ae7f8f1..8399b40 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -265,6 +265,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version %type <str> libraryhdr +%type <uuid> uuid_string %left ',' %right '?' ':' @@ -498,7 +499,7 @@ attribute: { $$ = NULL; } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, $3); } | tTRANSMITAS '(' type ')' { $$ = make_attrp(ATTR_TRANSMITAS, $3); } - | tUUID '(' aUUID ')' { $$ = make_attrp(ATTR_UUID, $3); } + | tUUID '(' uuid_string ')' { $$ = make_attrp(ATTR_UUID, $3); } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } @@ -506,6 +507,12 @@ attribute: { $$ = NULL; } | pointer_type { $$ = make_attrv(ATTR_POINTERTYPE, $1); } ; +uuid_string: + aUUID + | aSTRING { if (!is_valid_uuid($1)) + yyerror("invalid UUID: %s", $1); + $$ = parse_uuid($1); } + callconv: | tSTDCALL ; @@ -2037,3 +2044,20 @@ static void check_all_user_types(ifref_list_t *ifrefs) check_for_user_types_and_context_handles(f->args); } } + +int is_valid_uuid(const char *s) +{ + int i; + + for (i = 0; i < 36; ++i) + if (i == 8 || i == 13 || i == 18 || i == 23) + { + if (s[i] != '-') + return FALSE; + } + else + if (!isxdigit(s[i])) + return FALSE; + + return s[i] == '\0'; +} diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 3641aae..aa1d6b4 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -42,4 +42,7 @@ void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); +UUID *parse_uuid(const char *u); +int is_valid_uuid(const char *s); + #endif

1 0

Jacek Caban : mshtml: Move most code from handle_editor_load to exec_editmode.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 99e6592c9d73b7b4b0a7d174f64c9cab7c83c9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e6592c9d73b7b4b0a7d174f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 10:48:35 2007 +0200 mshtml: Move most code from handle_editor_load to exec_editmode. --- dlls/mshtml/editor.c | 23 ----------------------- dlls/mshtml/olecmd.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 239bba5..20db6ee 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -505,29 +505,6 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_load(HTMLDocument *This) { get_editor_controller(This->nscontainer); - - if(This->ui_active) { - OLECHAR wszHTMLDocument[30]; - RECT rcBorderWidths; - - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); - if(This->hostui) - IDocHostUIHandler_HideUI(This->hostui); - - if(This->hostui) - IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), - This->frame, This->ip_window); - - LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, - sizeof(wszHTMLDocument)/sizeof(WCHAR)); - - if(This->ip_window) - IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); - - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); - IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); - } } static void set_ns_fontname(NSContainer *This, const char *fontname) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a137057..c56dce2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -583,7 +583,35 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, update_doc(This, UPDATE_UI); - return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); + hres = IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); + IMoniker_Release(mon); + if(FAILED(hres)) + return hres; + + if(This->ui_active) { + OLECHAR wszHTMLDocument[30]; + RECT rcBorderWidths; + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + if(This->hostui) + IDocHostUIHandler_HideUI(This->hostui); + + if(This->hostui) + IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), + This->frame, This->ip_window); + + LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, + sizeof(wszHTMLDocument)/sizeof(WCHAR)); + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); + } + + return S_OK; } static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : mshtml: Skip tests if we can' t get body object - it means that there is no Gecko available.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: df4bdad94d049444d29cbec95f4a4fd6bc2e6a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4bdad94d049444d29cbec95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 10:49:04 2007 +0200 mshtml: Skip tests if we can't get body object - it means that there is no Gecko available. --- dlls/mshtml/tests/dom.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fefe054..966831e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -597,8 +597,10 @@ typedef void (*domtest_t)(IHTMLDocument2*); static void run_domtest(const char *str, domtest_t test) { IHTMLDocument2 *doc; + IHTMLElement *body = NULL; ULONG ref; MSG msg; + HRESULT hres; doc = create_doc_with_string(str); do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); @@ -608,7 +610,15 @@ static void run_domtest(const char *str, domtest_t test) DispatchMessage(&msg); } - test(doc); + hres = IHTMLDocument2_get_body(doc, &body); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + if(body) { + IHTMLElement_Release(body); + test(doc); + }else { + skip("Could not get document body. Assuming no Gecko installed.\n"); + } ref = IHTMLDocument2_Release(doc); ok(!ref, "ref = %d\n", ref);

1 0

Jacek Caban : actctx: Rename version to assembly_version.
by Alexandre Julliard 09 Oct '07

09 Oct '07

Module: wine Branch: master Commit: 791be37a4636eefb15378cc4ef0318fe2d57e11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=791be37a4636eefb15378cc4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 15:55:50 2007 +0200 actctx: Rename version to assembly_version. --- dlls/ntdll/actctx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4f0901b..2021cb8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -72,7 +72,7 @@ struct file_info WCHAR *info; }; -struct version +struct assembly_version { USHORT major; USHORT minor; @@ -87,7 +87,7 @@ struct assembly_identity WCHAR *public_key; WCHAR *language; WCHAR *type; - struct version version; + struct assembly_version version; BOOL optional; }; @@ -272,7 +272,7 @@ static inline const char* debugstr_xmlstr(const xmlstr_t* str) return debugstr_wn(str->ptr, str->len); } -static inline const char* debugstr_version(const struct version *ver) +static inline const char* debugstr_version(const struct assembly_version *ver) { return wine_dbg_sprintf("%u.%u.%u.%u", ver->major, ver->minor, ver->build, ver->revision); } @@ -743,7 +743,7 @@ static BOOL parse_text_content(xmlbuf_t* xmlbuf, xmlstr_t* content) return TRUE; } -static BOOL parse_version(const xmlstr_t *str, struct version *version) +static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) { unsigned int ver[4]; unsigned int pos;

1 0