winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1216 discussions
Start a n
N
ew thread
James Hawkins : msi: Implement the DROP TABLE sql command.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : jscript: Added possibility to run test scripts from file.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : jscript: Fixed backslash handling in regular expressions.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : jscript: Fixed conflict in Block statement that caused problems with empty blocks.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : jscript: Don' t initialize variables without initialiser to undefined in variable_list_eval .
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Huw Davies : ole32: Remove an unneeded WINAPI and remove some useless comments.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : mshtml: Added IHTMLElement2::get_currentStyle implementation.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : mshtml: Added IHTMLStyle2 to IDispatchEx support.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : mshtml: Added IHTMStyle2 stub implementation.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
Jacek Caban : mshtml.idl: Added IHTMLStyle2 interface declaration.
by Alexandre Julliard
06 Oct '08
06 Oct '08
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
0
0
← Newer
1
...
107
108
109
110
111
112
113
...
122
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
Results per page:
10
25
50
100
200