October 2008 - Wine-Commits

James Hawkins : msi: Implement the DROP TABLE sql command.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 62c544cf4f16662e4656737017a9dc20c0a1b124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c544cf4f16662e465673701… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 2 15:56:54 2008 -0500 msi: Implement the DROP TABLE sql command. --- dlls/msi/Makefile.in | 1 + dlls/msi/alter.c | 1 + dlls/msi/create.c | 8 +++- dlls/msi/delete.c | 3 +- dlls/msi/distinct.c | 1 + dlls/msi/drop.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/insert.c | 1 + dlls/msi/join.c | 1 + dlls/msi/msipriv.h | 5 ++ dlls/msi/query.h | 2 + dlls/msi/select.c | 1 + dlls/msi/sql.y | 18 ++++++- dlls/msi/storages.c | 1 + dlls/msi/streams.c | 1 + dlls/msi/table.c | 61 ++++++++++++++++++++---- dlls/msi/tests/db.c | 89 +++++++++++++++++++++++++++++++++++ dlls/msi/tokenize.c | 2 + dlls/msi/update.c | 1 + dlls/msi/where.c | 1 + 19 files changed, 308 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62c544cf4f16662e46567…

1 0

Jacek Caban : jscript: Added possibility to run test scripts from file.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 68525652a15bcc332f1d48571bdb0f2da86bce47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68525652a15bcc332f1d48571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 16:24:02 2008 +0200 jscript: Added possibility to run test scripts from file. With this patch it's possible to test scripts by running wine jscript_test.exe.so run <file_name> Although it's not what Wine tests are for, it proved to be very useful for me. --- dlls/jscript/tests/run.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c40653a..3904a36 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -578,7 +578,7 @@ static void parse_script(BSTR script_str) ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); - ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); @@ -594,6 +594,56 @@ static void parse_script_a(const char *src) SysFreeString(tmp); } +static BSTR get_script_from_file(const char *filename) +{ + DWORD size, len; + HANDLE file, map; + const char *file_map; + BSTR ret; + + file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) { + trace("Could not open file: %u\n", GetLastError()); + return NULL; + } + + size = GetFileSize(file, NULL); + + map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if(map == INVALID_HANDLE_VALUE) { + trace("Could not create file mapping: %u\n", GetLastError()); + return NULL; + } + + file_map = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + CloseHandle(map); + if(!file_map) { + trace("MapViewOfFile failed: %u\n", GetLastError()); + return NULL; + } + + len = MultiByteToWideChar(CP_ACP, 0, file_map, size, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, file_map, size, ret, len); + + UnmapViewOfFile(file_map); + + return ret; +} + +static void run_from_file(const char *filename) +{ + BSTR script_str = get_script_from_file(filename); + + strict_dispid_check = FALSE; + + if(script_str) + parse_script(script_str); + + SysFreeString(script_str); +} + static void run_from_res(const char *name) { const char *data; @@ -659,9 +709,17 @@ static void run_tests(void) START_TEST(run) { + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + CoInitialize(NULL); - run_tests(); + if(argc > 2) + run_from_file(argv[2]); + else + run_tests(); CoUninitialize(); }

1 0

Jacek Caban : jscript: Fixed backslash handling in regular expressions.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 31b3071552b92fcd03988ee97764eb6249b80f57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b3071552b92fcd03988ee97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 16:23:15 2008 +0200 jscript: Fixed backslash handling in regular expressions. --- dlls/jscript/lex.c | 6 ++++-- dlls/jscript/tests/regexp.js | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 4ad9fe5..93397a3 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -709,8 +709,10 @@ literal_t *parse_regexp(parser_ctx_t *ctx) TRACE("\n"); re = ctx->ptr; - while(ctx->ptr < ctx->end && (*ctx->ptr != '/' || *(ctx->ptr-1) == '\\')) - ctx->ptr++; + while(ctx->ptr < ctx->end && *ctx->ptr != '/') { + if(*ctx->ptr++ == '\\' && ctx->ptr < ctx->end) + ctx->ptr++; + } if(ctx->ptr == ctx->end) { WARN("unexpected end of file\n"); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index a5be6ac..e797723 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -47,10 +47,16 @@ ok(m["1"] === "ab", "m[1] is not \"ab\""); m = "aaabcabc".match(/a+b/g); ok(typeof(m) === "object", "typeof m is not object"); -ok(m.length === 2, "m.length is not 1"); +ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "aaab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +m = "aaa\\\\cabc".match(/\\/g); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length is not 2"); +ok(m["0"] === "\\", "m[0] is not \"\\\""); +ok(m["1"] === "\\", "m[1] is not \"\\\""); + m = "abcabc".match(new RegExp("ab")); ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 1, "m.length is not 1");

1 0

Jacek Caban : jscript: Fixed conflict in Block statement that caused problems with empty blocks.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 383de2d79a35aa4ea82eb8ddba2e4107a2b4afa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383de2d79a35aa4ea82eb8ddb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 16:22:45 2008 +0200 jscript: Fixed conflict in Block statement that caused problems with empty blocks. --- dlls/jscript/parser.y | 4 ++-- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 98ee250..2123e9c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -325,8 +325,8 @@ StatementList_opt /* ECMA-262 3rd Edition 12.1 */ Block - : '{' StatementList_opt '}' - { $$ = new_block_statement(ctx, $2); } + : '{' StatementList '}' { $$ = new_block_statement(ctx, $2); } + | '{' '}' { $$ = new_block_statement(ctx, NULL) } /* ECMA-262 3rd Edition 12.2 */ VariableStatement diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d9c3689..c9d9455 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -175,6 +175,10 @@ if(true) tmp = 1; ok(tmp === 1, "tmp !== 1, if(true) not evaluated?"); +if(false) { +}else { +} + var obj3 = { prop1: 1, prop2: typeof(false) }; ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\"");

1 0

Jacek Caban : mshtml: Added IHTMLStyle2 to IDispatchEx support.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 3203524bb5937750e287a4ed180d65592c7b40ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3203524bb5937750e287a4ed1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 12:37:44 2008 +0200 mshtml: Added IHTMLStyle2 to IDispatchEx support. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b95a0cb..5bc8ea7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -103,6 +103,7 @@ static REFIID tid_ids[] = { &IID_IHTMLOptionElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, + &IID_IHTMLStyle2, &IID_IHTMLTable, &IID_IHTMLTableRow, &IID_IHTMLTextContainer, diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ad6dc84..1d2ea9f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1890,6 +1890,7 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { static const tid_t HTMLStyle_iface_tids[] = { IHTMLStyle_tid, + IHTMLStyle2_tid, 0 }; static dispex_static_data_t HTMLStyle_dispex = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9cd4ec5..31df9e4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -99,6 +99,7 @@ typedef enum { IHTMLOptionElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, + IHTMLStyle2_tid, IHTMLTable_tid, IHTMLTableRow_tid, IHTMLTextContainer_tid,

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_currentStyle implementation.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 56d1e9ec861e046c83b44203ea7d1e8ddcbac371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d1e9ec861e046c83b44203e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 15:27:17 2008 +0200 mshtml: Added IHTMLElement2::get_currentStyle implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlcurstyle.c | 880 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem2.c | 6 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 26 ++- 5 files changed, 911 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56d1e9ec861e046c83b44…

1 0

Huw Davies : ole32: Remove an unneeded WINAPI and remove some useless comments.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: ec73ad29e028f242a8f8516afbd0f9efc48edc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec73ad29e028f242a8f8516af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 2 14:02:54 2008 -0500 ole32: Remove an unneeded WINAPI and remove some useless comments. --- dlls/ole32/defaulthandler.c | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index afacc51..fcff476 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -123,12 +123,6 @@ struct DefaultHandler typedef struct DefaultHandler DefaultHandler; -/* - * Here, I define utility functions to help with the casting of the - * "This" parameter. - * There is a version to accommodate all of the VTables implemented - * by this object. - */ static inline DefaultHandler *impl_from_IOleObject( IOleObject *iface ) { return (DefaultHandler *)((char*)iface - FIELD_OFFSET(DefaultHandler, lpVtbl)); @@ -186,7 +180,6 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( { DefaultHandler *This = impl_from_NDIUnknown(iface); - /* Perform a sanity check on the parameters. */ if (!ppvObject) return E_INVALIDARG; @@ -258,7 +251,6 @@ static ULONG WINAPI DefaultHandler_NDIUnknown_Release( DefaultHandler *This = impl_from_NDIUnknown(iface); ULONG ref; - /* Decrease the reference count on this object. */ ref = InterlockedDecrement(&This->ref); if (!ref) DefaultHandler_Destroy(This); @@ -361,7 +353,6 @@ static HRESULT WINAPI DefaultHandler_GetClientSite( { DefaultHandler *This = impl_from_IOleObject(iface); - /* Sanity check. */ if (!ppClientSite) return E_POINTER; @@ -402,7 +393,6 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( HeapFree( GetProcessHeap(), 0, This->containerObj ); This->containerObj = NULL; - /* Copy the string supplied. */ if (szContainerApp) { if ((This->containerApp = HeapAlloc( GetProcessHeap(), 0, @@ -419,8 +409,8 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( return S_OK; } -/* undos the work done by DefaultHandler_Run */ -static void WINAPI DefaultHandler_Stop(DefaultHandler *This) +/* undoes the work done by DefaultHandler_Run */ +static void DefaultHandler_Stop(DefaultHandler *This) { if (!object_is_running(This)) return; @@ -668,7 +658,6 @@ static HRESULT WINAPI DefaultHandler_GetUserClassID( if (object_is_running(This)) return IOleObject_GetUserClassID(This->pOleDelegate, pClsid); - /* Sanity check. */ if (!pClsid) return E_POINTER; @@ -764,9 +753,6 @@ static HRESULT WINAPI DefaultHandler_GetExtent( targetDevice, psizel); - /* - * Cleanup - */ IViewObject2_Release(cacheView); return hres; @@ -845,7 +831,6 @@ static HRESULT WINAPI DefaultHandler_EnumAdvise( TRACE("(%p, %p)\n", iface, ppenumAdvise); - /* Sanity check */ if (!ppenumAdvise) return E_POINTER; @@ -1202,7 +1187,6 @@ static HRESULT WINAPI DefaultHandler_EnumDAdvise( TRACE("(%p, %p)\n", iface, ppenumAdvise); - /* Sanity check */ if (!ppenumAdvise) return E_POINTER; @@ -1696,9 +1680,6 @@ static DefaultHandler* DefaultHandler_Construct( DefaultHandler* This = NULL; HRESULT hr; - /* - * Allocate space for the object. - */ This = HeapAlloc(GetProcessHeap(), 0, sizeof(DefaultHandler)); if (!This) @@ -1741,9 +1722,7 @@ static DefaultHandler* DefaultHandler_Construct( hr = IUnknown_QueryInterface(This->dataCache, &IID_IPersistStorage, (void**)&This->dataCache_PersistStg); if(FAILED(hr)) ERR("Unexpected error creating data cache\n"); - /* - * Initialize the other data members of the class. - */ + This->clsid = *clsid; This->clientSite = NULL; This->oleAdviseHolder = NULL; @@ -1765,13 +1744,11 @@ static void DefaultHandler_Destroy( /* release delegates */ DefaultHandler_Stop(This); - /* Free the strings idenfitying the object */ HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL; HeapFree( GetProcessHeap(), 0, This->containerObj ); This->containerObj = NULL; - /* Release our reference to the data cache. */ if (This->dataCache) { IPersistStorage_Release(This->dataCache_PersistStg); @@ -1780,28 +1757,24 @@ static void DefaultHandler_Destroy( This->dataCache = NULL; } - /* Same thing for the client site. */ if (This->clientSite) { IOleClientSite_Release(This->clientSite); This->clientSite = NULL; } - /* And the advise holder. */ if (This->oleAdviseHolder) { IOleAdviseHolder_Release(This->oleAdviseHolder); This->oleAdviseHolder = NULL; } - /* And the data advise holder. */ if (This->dataAdviseHolder) { IDataAdviseHolder_Release(This->dataAdviseHolder); This->dataAdviseHolder = NULL; } - /* Free the actual default handler structure. */ HeapFree(GetProcessHeap(), 0, This); } @@ -1819,9 +1792,6 @@ HRESULT WINAPI OleCreateDefaultHandler( TRACE("(%s, %p, %s, %p)\n", debugstr_guid(clsid), pUnkOuter, debugstr_guid(riid), ppvObj); - /* - * Sanity check - */ if (!ppvObj) return E_POINTER;

1 0

Jacek Caban : jscript: Don' t initialize variables without initialiser to undefined in variable_list_eval .
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 47b842bff7f93ac65b60230b506e4cf683c18817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b842bff7f93ac65b60230b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 16:22:27 2008 +0200 jscript: Don't initialize variables without initialiser to undefined in variable_list_eval. --- dlls/jscript/engine.c | 24 +++++++++++------------- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 212ad10..d84e65b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -517,25 +517,23 @@ HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t static HRESULT variable_list_eval(exec_ctx_t *ctx, variable_declaration_t *var_list, jsexcept_t *ei) { variable_declaration_t *iter; - HRESULT hres = E_FAIL; + HRESULT hres = S_OK; for(iter = var_list; iter; iter = iter->next) { + exprval_t exprval; VARIANT val; - if(iter->expr) { - exprval_t exprval; + if(!iter->expr) + continue; - hres = expr_eval(ctx, iter->expr, 0, ei, &exprval); - if(FAILED(hres)) - break; + hres = expr_eval(ctx, iter->expr, 0, ei, &exprval); + if(FAILED(hres)) + break; - hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - break; - }else { - V_VT(&val) = VT_EMPTY; - } + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + break; hres = jsdisp_propput_name(ctx->var_disp, iter->identifier, ctx->parser->script->lcid, &val, ei, NULL/*FIXME*/); VariantClear(&val); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f7ae2be..d9c3689 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -741,6 +741,8 @@ function varTestFunc(varTest3) { var varTest4; } +varTestFunc(3); + deleteTest = 1; delete deleteTest; try {

1 0

Jacek Caban : mshtml: Added IHTMStyle2 stub implementation.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 239f7f70e77cdfe7466a6358d499fc5adb24d6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=239f7f70e77cdfe7466a6358d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 12:37:35 2008 +0200 mshtml: Added IHTMStyle2 stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlstyle.c | 17 +- dlls/mshtml/htmlstyle2.c | 605 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 15 + dlls/mshtml/tests/dom.c | 10 + 5 files changed, 636 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=239f7f70e77cdfe7466a6…

1 0

Jacek Caban : mshtml.idl: Added IHTMLStyle2 interface declaration.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: cbeeac0ebfec70c816ef6e656f75bbe80d4b0d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeeac0ebfec70c816ef6e656… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 12:37:15 2008 +0200 mshtml.idl: Added IHTMLStyle2 interface declaration. --- include/mshtml.idl | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 208 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 6a87cfd..a7f5505 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -628,6 +628,214 @@ interface IHTMLStyle : IDispatch } /***************************************************************************** + * IHTMLStyle2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4a2-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStyle2 : IDispatch +{ + [propput, id(DISPID_IHTMLSTYLE2_TABLELAYOUT), displaybind, bindable] + HRESULT tableLayout([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_TABLELAYOUT), displaybind, bindable] + HRESULT tableLayout([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_BORDERCOLLAPSE), displaybind, bindable] + HRESULT borderCollapse([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_BORDERCOLLAPSE), displaybind, bindable] + HRESULT borderCollapse([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_DIRECTION), displaybind, bindable] + HRESULT direction([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_DIRECTION), displaybind, bindable] + HRESULT direction([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_BEHAVIOR), displaybind, bindable] + HRESULT behavior([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_BEHAVIOR), displaybind, bindable] + HRESULT behavior([out, retval] BSTR *p); + + [id(DISPID_IHTMLSTYLE2_SETEXPRESSION)] + HRESULT setExpression( + [in] BSTR propname, + [in] BSTR expression, + [in, defaultvalue("")] BSTR language); + + [id(DISPID_IHTMLSTYLE2_GETEXPRESSION)] + HRESULT getExpression( + [in] BSTR propname, + [out, retval] VARIANT *expression); + + [id(DISPID_IHTMLSTYLE2_REMOVEEXPRESSION)] + HRESULT removeExpression( + [in] BSTR propname, + [out, retval] VARIANT_BOOL *pfSuccess); + + [propput, id(DISPID_IHTMLSTYLE2_POSITION), displaybind, bindable] + HRESULT position([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_POSITION), displaybind, bindable] + HRESULT position([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_UNICODEBIDI), displaybind, bindable] + HRESULT unicodeBidi([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_UNICODEBIDI), displaybind, bindable] + HRESULT unicodeBidi([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_BOTTOM), displaybind, bindable] + HRESULT bottom([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE2_BOTTOM), displaybind, bindable] + HRESULT bottom([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLE2_RIGHT), displaybind, bindable] + HRESULT right([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE2_RIGHT), displaybind, bindable] + HRESULT right([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLE2_PIXELBOTTOM), displaybind, bindable, hidden] + HRESULT pixelBottom([in] long v); + + [propget, id(DISPID_IHTMLSTYLE2_PIXELBOTTOM), displaybind, bindable, hidden] + HRESULT pixelBottom([out, retval] long *p); + + [propput, id(DISPID_IHTMLSTYLE2_PIXELRIGHT), displaybind, bindable, hidden] + HRESULT pixelRight([in] long v); + + [propget, id(DISPID_IHTMLSTYLE2_PIXELRIGHT), displaybind, bindable, hidden] + HRESULT pixelRight([out, retval] long *p); + + [propput, id(DISPID_IHTMLSTYLE2_POSBOTTOM), displaybind, bindable] + HRESULT posBottom([in] float v); + + [propget, id(DISPID_IHTMLSTYLE2_POSBOTTOM), displaybind, bindable] + HRESULT posBottom([out, retval] float *p); + + [propput, id(DISPID_IHTMLSTYLE2_POSRIGHT), displaybind, bindable] + HRESULT posRight([in] float v); + + [propget, id(DISPID_IHTMLSTYLE2_POSRIGHT), displaybind, bindable] + HRESULT posRight([out, retval] float *p); + + [propput, id(DISPID_IHTMLSTYLE2_IMEMODE), displaybind, bindable] + HRESULT imeMode([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_IMEMODE), displaybind, bindable] + HRESULT imeMode([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_RUBYALIGN), displaybind, bindable] + HRESULT rubyAlign([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_RUBYALIGN), displaybind, bindable] + HRESULT rubyAlign([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_RUBYPOSITION), displaybind, bindable] + HRESULT rubyPosition([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_RUBYPOSITION), displaybind, bindable] + HRESULT rubyPosition([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_RUBYOVERHANG), displaybind, bindable] + HRESULT rubyOverhang([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_RUBYOVERHANG), displaybind, bindable] + HRESULT rubyOverhang([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDCHAR), displaybind, bindable] + HRESULT layoutGridChar([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDCHAR), displaybind, bindable] + HRESULT layoutGridChar([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDLINE), displaybind, bindable] + HRESULT layoutGridLine([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDLINE), displaybind, bindable] + HRESULT layoutGridLine([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDMODE), displaybind, bindable] + HRESULT layoutGridMode([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDMODE), displaybind, bindable] + HRESULT layoutGridMode([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDTYPE), displaybind, bindable] + HRESULT layoutGridType([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_LAYOUTGRIDTYPE), displaybind, bindable] + HRESULT layoutGridType([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_LAYOUTGRID), displaybind, bindable, nonbrowsable] + HRESULT layoutGrid([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_LAYOUTGRID), displaybind, bindable, nonbrowsable] + HRESULT layoutGrid([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_WORDBREAK), displaybind, bindable] + HRESULT wordBreak([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_WORDBREAK), displaybind, bindable] + HRESULT wordBreak([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_LINEBREAK), displaybind, bindable] + HRESULT lineBreak([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_LINEBREAK), displaybind, bindable] + HRESULT lineBreak([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_TEXTJUSTIFY), displaybind, bindable] + HRESULT textJustify([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_TEXTJUSTIFY), displaybind, bindable] + HRESULT textJustify([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_TEXTJUSTIFYTRIM), displaybind, bindable] + HRESULT textJustifyTrim([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_TEXTJUSTIFYTRIM), displaybind, bindable] + HRESULT textJustifyTrim([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_TEXTKASHIDA), displaybind, bindable] + HRESULT textKashida([in] VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE2_TEXTKASHIDA), displaybind, bindable] + HRESULT textKashida([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLSTYLE2_TEXTAUTOSPACE), displaybind, bindable] + HRESULT textAutospace([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_TEXTAUTOSPACE), displaybind, bindable] + HRESULT textAutospace([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_OVERFLOWX), displaybind, bindable] + HRESULT overflowX([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_OVERFLOWX), displaybind, bindable] + HRESULT overflowX([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_OVERFLOWY), displaybind, bindable] + HRESULT overflowY([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_OVERFLOWY), displaybind, bindable] + HRESULT overflowY([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLSTYLE2_ACCELERATOR), displaybind, bindable] + HRESULT accelerator([in] BSTR v); + + [propget, id(DISPID_IHTMLSTYLE2_ACCELERATOR), displaybind, bindable] + HRESULT accelerator([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLRuleStyle interface */ [

1 0