Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 42851: sync wrc to wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:35:17 2009 New Revision: 42851 URL: http://svn.reactos.org/svn/reactos?rev=42851&view=rev Log: sync wrc to wine 1.1.28 Modified: trunk/reactos/tools/wrc/genres.c trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/utils.h trunk/reactos/tools/wrc/wrc.c trunk/reactos/tools/wrc/wrc.h Modified: trunk/reactos/tools/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=428… ============================================================================== --- trunk/reactos/tools/wrc/genres.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/genres.c [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -317,6 +317,9 @@ if (!check_unicode_conversion( str, newstr, codepage )) error( "String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead\n", str->str.cstr, codepage ); + if (check_valid_utf8( str, codepage )) + warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.\n", + str->str.cstr, codepage ); } if (!isterm) put_word(res, newstr->size); for(cnt = 0; cnt < newstr->size; cnt++) Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=428… ============================================================================== --- trunk/reactos/tools/wrc/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/lex.yy.c [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -2672,6 +2672,9 @@ if (!check_unicode_conversion( str, str_w, current_codepage )) parser_error("String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead", str->str.cstr, current_codepage ); + if (check_valid_utf8( str, current_codepage )) + parser_warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.", + str->str.cstr, current_codepage ); free_string( str ); return str_w; } Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=428… ============================================================================== --- trunk/reactos/tools/wrc/parser.l [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/parser.l [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -637,6 +637,9 @@ if (!check_unicode_conversion( str, str_w, current_codepage )) parser_error("String %s does not convert identically to Unicode and back in codepage %d. " "Try using a Unicode string instead", str->str.cstr, current_codepage ); + if (check_valid_utf8( str, current_codepage )) + parser_warning( "string \"%s\" seems to be UTF-8 but codepage %u is in use.", + str->str.cstr, current_codepage ); free_string( str ); return str_w; } Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=4285… ============================================================================== --- trunk/reactos/tools/wrc/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/utils.c [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -311,6 +311,29 @@ free( str ); } +/* check if the string is valid utf8 despite a different codepage being in use */ +int check_valid_utf8( const string_t *str, int codepage ) +{ + unsigned int i; + + if (!check_utf8) return 0; + if (!codepage) return 0; + if (!wine_cp_get_table( codepage )) return 0; + + for (i = 0; i < str->size; i++) + { + if ((unsigned char)str->str.cstr[i] >= 0xf5) goto done; + if ((unsigned char)str->str.cstr[i] >= 0xc2) break; + if ((unsigned char)str->str.cstr[i] >= 0x80) goto done; + } + if (i == str->size) return 0; /* no 8-bit chars at all */ + + if (wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0) return 1; + +done: + check_utf8 = 0; /* at least one 8-bit non-utf8 string found, stop checking */ + return 0; +} int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage ) { Modified: trunk/reactos/tools/wrc/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.h?rev=4285… ============================================================================== --- trunk/reactos/tools/wrc/utils.h [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/utils.h [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -45,6 +45,7 @@ int compare_name_id(const name_id_t *n1, const name_id_t *n2); string_t *convert_string(const string_t *str, enum str_e type, int codepage); void free_string( string_t *str ); +int check_valid_utf8( const string_t *str, int codepage ); int check_unicode_conversion( const string_t *str_a, const string_t *str_w, int codepage ); int get_language_codepage( unsigned short lang, unsigned short sublang ); Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=42851&… ============================================================================== --- trunk/reactos/tools/wrc/wrc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.c [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -155,6 +155,8 @@ */ int no_preprocess = 0; +int check_utf8 = 1; /* whether to check for valid utf8 */ + static int verify_translations_mode; char *output_name = NULL; /* The name given by the -o option */ @@ -292,6 +294,7 @@ /* Reset the language */ currentlanguage = dup_language( defaultlanguage ); + check_utf8 = 1; /* Go from .rc to .res */ chat("Starting parse\n"); @@ -514,14 +517,11 @@ } if (load_file( input_name, output_name )) exit(1); } - /* stdin special case. NULL means "stdin" for wpp. */ - if (nb_files == 0) { + if (nb_files == 0) + { if(!output_name && !preprocess_only) - { - output_name = dup_basename("stdin", ".rc"); - strcat(output_name, ".res"); - } + output_name = strdup("wrc.tab.res"); if (load_file( NULL, output_name )) exit(1); } Modified: trunk/reactos/tools/wrc/wrc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.h?rev=42851&… ============================================================================== --- trunk/reactos/tools/wrc/wrc.h [iso-8859-1] (original) +++ trunk/reactos/tools/wrc/wrc.h [iso-8859-1] Sat Aug 22 17:35:17 2009 @@ -43,6 +43,7 @@ extern int byteorder; extern int preprocess_only; extern int no_preprocess; +extern int check_utf8; extern char *output_name; extern char *input_name;

1 0

[cwittich] 42850: sync jscript winetest with wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:26:35 2009 New Revision: 42850 URL: http://svn.reactos.org/svn/reactos?rev=42850&view=rev Log: sync jscript winetest with wine 1.1.28 Modified: trunk/rostests/winetests/jscript/api.js trunk/rostests/winetests/jscript/regexp.js trunk/rostests/winetests/jscript/run.c Modified: trunk/rostests/winetests/jscript/api.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/api.js?… ============================================================================== --- trunk/rostests/winetests/jscript/api.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/api.js [iso-8859-1] Sat Aug 22 17:26:35 2009 @@ -76,6 +76,14 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); + +var obj = new Object(); +obj.toString = function (x) { + ok(arguments.length === 0, "arguments.length = " + arguments.length); + return "test"; +}; +ok((tmp = obj.toLocaleString()) === "test", "obj.toLocaleString() = " + tmp); +ok((tmp = obj.toLocaleString(1)) === "test", "obj.toLocaleString(1) = " + tmp); ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); @@ -1345,4 +1353,203 @@ exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); +function testObjectInherit(obj, ts, tls, vo) { + ok(obj.hasOwnProperty === Object.prototype.hasOwnProperty, + "obj.hasOwnProperty !== Object.prototype.hasOwnProprty"); + ok(obj.isPrototypeOf === Object.prototype.isPrototypeOf, + "obj.isPrototypeOf !== Object.prototype.isPrototypeOf"); + ok(obj.propertyIsEnumerable === Object.prototype.propertyIsEnumerable, + "obj.propertyIsEnumerable !== Object.prototype.propertyIsEnumerable"); + + if(ts) + ok(obj.toString === Object.prototype.toString, + "obj.toString !== Object.prototype.toString"); + else + ok(obj.toString != Object.prototype.toString, + "obj.toString == Object.prototype.toString"); + + if(tls) + ok(obj.toLocaleString === Object.prototype.toLocaleString, + "obj.toLocaleString !== Object.prototype.toLocaleString"); + else + ok(obj.toLocaleString != Object.prototype.toLocaleString, + "obj.toLocaleString == Object.prototype.toLocaleString"); + + if(vo) + ok(obj.valueOf === Object.prototype.valueOf, + "obj.valueOf !== Object.prototype.valueOf"); + else + ok(obj.valueOf != Object.prototype.valueOf, + "obj.valueOf == Object.prototype.valueOf"); + + ok(obj._test === "test", "obj.test = " + obj._test); +} + +Object.prototype._test = "test"; +testObjectInherit(new String("test"), false, true, false); +testObjectInherit(/test/g, false, true, true); +testObjectInherit(new Number(1), false, false, false); +testObjectInherit(new Date(), false, false, false); +testObjectInherit(new Boolean(true), false, true, false); +testObjectInherit(new Array(), false, false, true); +testObjectInherit(new Error(), false, true, true); +testObjectInherit(testObjectInherit, false, true, true); +testObjectInherit(Math, true, true, true); + +function testFunctions(obj, arr) { + var l; + + for(var i=0; i<arr.length; i++) { + l = obj[arr[i][0]].length; + ok(l === arr[i][1], arr[i][0] + ".length = " + l); + } +} + +testFunctions(Boolean.prototype, [ + ["valueOf", 0], + ["toString", 0] + ]); + +testFunctions(Number.prototype, [ + ["valueOf", 0], + ["toString", 1], + ["toExponential", 1], + ["toLocaleString", 0], + ["toPrecision", 1] + ]); + +testFunctions(String.prototype, [ + ["valueOf", 0], + ["toString", 0], + ["anchor", 1], + ["big", 0], + ["blink", 0], + ["bold", 0], + ["charAt", 1], + ["charCodeAt", 1], + ["concat", 1], + ["fixed", 0], + ["fontcolor", 1], + ["fontsize", 1], + ["indexOf", 2], + ["italics", 0], + ["lastIndexOf", 2], + ["link", 1], + ["localeCompare", 1], + ["match", 1], + ["replace", 1], + ["search", 0], + ["slice", 0], + ["small", 0], + ["split", 2], + ["strike", 0], + ["sub", 0], + ["substr", 2], + ["substring", 2], + ["sup", 0], + ["toLocaleLowerCase", 0], + ["toLocaleUpperCase", 0], + ["toLowerCase", 0], + ["toUpperCase", 0] + ]); + +testFunctions(RegExp.prototype, [ + ["toString", 0], + ["exec", 1], + ["test", 1] + ]); + +testFunctions(Date.prototype, [ + ["getDate", 0], + ["getDay", 0], + ["getFullYear", 0], + ["getHours", 0], + ["getMilliseconds", 0], + ["getMinutes", 0], + ["getMonth", 0], + ["getSeconds", 0], + ["getTime", 0], + ["getTimezoneOffset", 0], + ["getUTCDate", 0], + ["getUTCDay", 0], + ["getUTCFullYear", 0], + ["getUTCHours", 0], + ["getUTCMilliseconds", 0], + ["getUTCMinutes", 0], + ["getUTCMonth", 0], + ["getUTCSeconds", 0], + ["setDate", 1], + ["setFullYear", 3], + ["setHours", 4], + ["setMilliseconds", 1], + ["setMinutes", 3], + ["setMonth", 2], + ["setSeconds", 2], + ["setTime", 1], + ["setUTCDate", 1], + ["setUTCFullYear", 3], + ["setUTCHours", 4], + ["setUTCMilliseconds", 1], + ["setUTCMinutes", 3], + ["setUTCMonth", 2], + ["setUTCSeconds", 2], + ["toDateString", 0], + ["toLocaleDateString", 0], + ["toLocaleString", 0], + ["toLocaleTimeString", 0], + ["toString", 0], + ["toTimeString", 0], + ["toUTCString", 0], + ["valueOf", 0] + ]); + +testFunctions(Array.prototype, [ + ["concat", 1], + ["join", 1], + ["push", 1], + ["pop", 0], + ["reverse", 0], + ["shift", 0], + ["slice", 2], + ["sort", 1], + ["splice", 2], + ["toLocaleString", 0], + ["toString", 0], + ["unshift", 1] + ]); + +testFunctions(Error.prototype, [ + ["toString", 0] + ]); + +testFunctions(Math, [ + ["abs", 1], + ["acos", 1], + ["asin", 1], + ["atan", 1], + ["atan2", 2], + ["ceil", 1], + ["cos", 1], + ["exp", 1], + ["floor", 1], + ["log", 1], + ["max", 2], + ["min", 2], + ["pow", 2], + ["random", 0], + ["round", 1], + ["sin", 1], + ["sqrt", 1], + ["tan", 1] + ]); + +testFunctions(Object.prototype, [ + ["hasOwnProperty", 1], + ["isPrototypeOf", 1], + ["propertyIsEnumerable", 1], + ["toLocaleString", 0], + ["toString", 0], + ["valueOf", 0] + ]); + reportSuccess(); Modified: trunk/rostests/winetests/jscript/regexp.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.… ============================================================================== --- trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/regexp.js [iso-8859-1] Sat Aug 22 17:26:35 2009 @@ -158,6 +158,39 @@ r = "[test1] [test2]".replace(/\[([^\[]+)\]/g, replaceFunc2); ok(r === "r0 r1", "r = '" + r + "' expected 'r0 r1'"); +r = "$1,$2".replace(/(\$(\d))/g, "$$1-$1$2"); +ok(r === "$1-$11,$1-$22", "r = '" + r + "' expected '$1-$11,$1-$22'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$&"); +ok(r === "abc &1 123", "r = '" + r + "' expected 'abc &1 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$'"); +ok(r === "abc 123 123", "r = '" + r + "' expected 'abc 123 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$`"); +ok(r === "abc abc 123", "r = '" + r + "' expected 'abc abc 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$3"); +ok(r === "abc $3 123", "r = '" + r + "' expected 'abc $3 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$"); +ok(r === "abc $ 123", "r = '" + r + "' expected 'abc $ 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$a"); +ok(r === "abc $a 123", "r = '" + r + "' expected 'abc $a 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$11"); +ok(r === "abc &11 123", "r = '" + r + "' expected 'abc &11 123'"); + +r = "abc &1 123".replace(/(\&(\d))/g, "$0"); +ok(r === "abc $0 123", "r = '" + r + "' expected 'abc $0 123'"); + +r = "1 2 3".replace("2", "$&"); +ok(r === "1 $& 3", "r = '" + r + "' expected '1 $& 3'"); + +r = "1 2 3".replace("2", "$'"); +ok(r === "1 $' 3", "r = '" + r + "' expected '1 $' 3'"); + r = "1,,2,3".split(/,+/g); ok(r.length === 3, "r.length = " + r.length); ok(r[0] === "1", "r[0] = " + r[0]); @@ -175,4 +208,12 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); +var re; + +re = /abc[^d]/g; +ok(re.source === "abc[^d]", "re.source = '" + re.source + "', expected 'abc[^d]'"); + +re = /a\bc[^d]/g; +ok(re.source === "a\\bc[^d]", "re.source = '" + re.source + "', expected 'a\\bc[^d]'"); + reportSuccess(); Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/jscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/run.c [iso-8859-1] Sat Aug 22 17:26:35 2009 @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); +DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(GetItemInfo_testVal); @@ -83,17 +84,6 @@ static BOOL strict_dispid_check; static const char *test_name = "(null)"; -static const char *debugstr_w(LPCWSTR str) -{ - static char buf[1024]; - - if(!str) - return "(null)"; - - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -168,7 +158,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", debugstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; } @@ -219,7 +209,7 @@ { CHECK_EXPECT(testobj_delete); - ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", debugstr_w(bstrName)); + ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", wine_dbgstr_w(bstrName)); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); return S_OK; } @@ -288,9 +278,14 @@ *pid = DISPID_GLOBAL_NULL_BSTR; return S_OK; } + if(!strcmp_wa(bstrName, "notExists")) { + CHECK_EXPECT(global_notexists_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + return DISP_E_UNKNOWNNAME; + } if(strict_dispid_check) - ok(0, "unexpected call %s\n", debugstr_w(bstrName)); + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } @@ -313,7 +308,7 @@ ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, debugstr_w(V_BSTR(pdp->rgvarg))); + ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; @@ -329,7 +324,7 @@ ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); if(V_VT(pdp->rgvarg) == VT_BSTR) - trace("%s: %s\n", test_name, debugstr_w(V_BSTR(pdp->rgvarg))); + trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; @@ -507,7 +502,7 @@ if(!strcmp_wa(pstrName, test_valA)) CHECK_EXPECT(GetItemInfo_testVal); else if(strcmp_wa(pstrName, testA)) - ok(0, "unexpected pstrName %s\n", debugstr_w(pstrName)); + ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; return S_OK; @@ -835,6 +830,18 @@ parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); + parse_script_a("function reportSuccess() {}; reportSuccess();"); + + SET_EXPECT(global_propget_d); + parse_script_a("var testPropGet"); + CHECK_CALLED(global_propget_d); + + SET_EXPECT(global_notexists_d); + parse_script_a("var notExists; notExists = 1;"); + CHECK_CALLED(global_notexists_d); + + parse_script_a("function f() { var testPropGet; }"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

[cwittich] 42849: sync jscript with wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:25:26 2009 New Revision: 42849 URL: http://svn.reactos.org/svn/reactos?rev=42849&view=rev Log: sync jscript with wine 1.1.28 Modified: trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/bool.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/error.c trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript_Nl.rc trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/string.c Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -43,10 +43,6 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR default_separatorW[] = {',',0}; @@ -743,27 +739,6 @@ return E_NOTIMPL; } -static HRESULT Array_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Array_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Array_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -809,22 +784,19 @@ } static const builtin_prop_t Array_props[] = { - {concatW, Array_concat, PROPF_METHOD}, - {hasOwnPropertyW, Array_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Array_isPrototypeOf, PROPF_METHOD}, - {joinW, Array_join, PROPF_METHOD}, + {concatW, Array_concat, PROPF_METHOD|1}, + {joinW, Array_join, PROPF_METHOD|1}, {lengthW, Array_length, 0}, {popW, Array_pop, PROPF_METHOD}, - {propertyIsEnumerableW, Array_propertyIsEnumerable, PROPF_METHOD}, - {pushW, Array_push, PROPF_METHOD}, + {pushW, Array_push, PROPF_METHOD|1}, {reverseW, Array_reverse, PROPF_METHOD}, {shiftW, Array_shift, PROPF_METHOD}, - {sliceW, Array_slice, PROPF_METHOD}, - {sortW, Array_sort, PROPF_METHOD}, - {spliceW, Array_splice, PROPF_METHOD}, + {sliceW, Array_slice, PROPF_METHOD|2}, + {sortW, Array_sort, PROPF_METHOD|1}, + {spliceW, Array_splice, PROPF_METHOD|2}, {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, {toStringW, Array_toString, PROPF_METHOD}, - {unshiftW, Array_unshift, PROPF_METHOD}, + {unshiftW, Array_unshift, PROPF_METHOD|1}, }; static const builtin_info_t Array_info = { @@ -888,7 +860,7 @@ return S_OK; } -static HRESULT alloc_array(script_ctx_t *ctx, BOOL use_constr, ArrayInstance **ret) +static HRESULT alloc_array(script_ctx_t *ctx, DispatchEx *object_prototype, ArrayInstance **ret) { ArrayInstance *array; HRESULT hres; @@ -897,8 +869,8 @@ if(!array) return E_OUTOFMEMORY; - if(use_constr) - hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); + if(object_prototype) + hres = init_dispex(&array->dispex, ctx, &Array_info, object_prototype); else hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->object_constr); @@ -911,12 +883,12 @@ return S_OK; } -HRESULT create_array_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_array_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { ArrayInstance *array; HRESULT hres; - hres = alloc_array(ctx, FALSE, &array); + hres = alloc_array(ctx, object_prototype, &array); if(FAILED(hres)) return hres; @@ -931,7 +903,7 @@ ArrayInstance *array; HRESULT hres; - hres = alloc_array(ctx, TRUE, &array); + hres = alloc_array(ctx, NULL, &array); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -30,12 +30,7 @@ } BoolInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; /* ECMA-262 3rd Edition 15.6.4.2 */ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -66,13 +61,6 @@ return S_OK; } -static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return Bool_toString(dispex, lcid, flags, dp, retv, ei, sp); -} - /* ECMA-262 3rd Edition 15.6.4.3 */ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -90,27 +78,6 @@ } return S_OK; -} - -static HRESULT Bool_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Bool_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Bool_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; } static HRESULT Bool_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -131,10 +98,6 @@ } static const builtin_prop_t Bool_props[] = { - {hasOwnPropertyW, Bool_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Bool_isPrototypeOf, PROPF_METHOD}, - {propertyIsEnumerableW, Bool_propertyIsEnumerable, PROPF_METHOD}, - {toLocaleStringW, Bool_toLocaleString, PROPF_METHOD}, {toStringW, Bool_toString, PROPF_METHOD}, {valueOfW, Bool_valueOf, PROPF_METHOD} }; @@ -188,7 +151,7 @@ return S_OK; } -static HRESULT alloc_bool(script_ctx_t *ctx, BOOL use_constr, BoolInstance **ret) +static HRESULT alloc_bool(script_ctx_t *ctx, DispatchEx *object_prototype, BoolInstance **ret) { BoolInstance *bool; HRESULT hres; @@ -197,10 +160,10 @@ if(!bool) return E_OUTOFMEMORY; - if(use_constr) + if(object_prototype) + hres = init_dispex(&bool->dispex, ctx, &Bool_info, object_prototype); + else hres = init_dispex_from_constr(&bool->dispex, ctx, &Bool_info, ctx->bool_constr); - else - hres = init_dispex(&bool->dispex, ctx, &Bool_info, NULL); if(FAILED(hres)) { heap_free(bool); @@ -211,12 +174,12 @@ return S_OK; } -HRESULT create_bool_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_bool_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { BoolInstance *bool; HRESULT hres; - hres = alloc_bool(ctx, FALSE, &bool); + hres = alloc_bool(ctx, object_prototype, &bool); if(FAILED(hres)) return hres; @@ -231,7 +194,7 @@ BoolInstance *bool; HRESULT hres; - hres = alloc_bool(ctx, TRUE, &bool); + hres = alloc_bool(ctx, NULL, &bool); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include <math.h> @@ -44,7 +47,6 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; @@ -649,27 +651,6 @@ return S_OK; } -static HRESULT Date_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Date_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -2073,24 +2054,21 @@ {getUTCMonthW, Date_getUTCMonth, PROPF_METHOD}, {getUTCSecondsW, Date_getUTCSeconds, PROPF_METHOD}, {getYearW, Date_getYear, PROPF_METHOD}, - {hasOwnPropertyW, Date_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Date_isPrototypeOf, PROPF_METHOD}, - {propertyIsEnumerableW, Date_propertyIsEnumerable, PROPF_METHOD}, - {setDateW, Date_setDate, PROPF_METHOD}, - {setFullYearW, Date_setFullYear, PROPF_METHOD}, - {setHoursW, Date_setHours, PROPF_METHOD}, - {setMillisecondsW, Date_setMilliseconds, PROPF_METHOD}, - {setMinutesW, Date_setMinutes, PROPF_METHOD}, - {setMonthW, Date_setMonth, PROPF_METHOD}, - {setSecondsW, Date_setSeconds, PROPF_METHOD}, - {setTimeW, Date_setTime, PROPF_METHOD}, - {setUTCDateW, Date_setUTCDate, PROPF_METHOD}, - {setUTCFullYearW, Date_setUTCFullYear, PROPF_METHOD}, - {setUTCHoursW, Date_setUTCHours, PROPF_METHOD}, - {setUTCMillisecondsW, Date_setUTCMilliseconds, PROPF_METHOD}, - {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD}, - {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD}, - {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD}, + {setDateW, Date_setDate, PROPF_METHOD|1}, + {setFullYearW, Date_setFullYear, PROPF_METHOD|3}, + {setHoursW, Date_setHours, PROPF_METHOD|4}, + {setMillisecondsW, Date_setMilliseconds, PROPF_METHOD|1}, + {setMinutesW, Date_setMinutes, PROPF_METHOD|3}, + {setMonthW, Date_setMonth, PROPF_METHOD|2}, + {setSecondsW, Date_setSeconds, PROPF_METHOD|2}, + {setTimeW, Date_setTime, PROPF_METHOD|1}, + {setUTCDateW, Date_setUTCDate, PROPF_METHOD|1}, + {setUTCFullYearW, Date_setUTCFullYear, PROPF_METHOD|3}, + {setUTCHoursW, Date_setUTCHours, PROPF_METHOD|4}, + {setUTCMillisecondsW, Date_setUTCMilliseconds, PROPF_METHOD|1}, + {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD|3}, + {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD|2}, + {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD|2}, {toDateStringW, Date_toDateString, PROPF_METHOD}, {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, {toLocaleStringW, Date_toLocaleString, PROPF_METHOD}, @@ -2110,7 +2088,7 @@ NULL }; -static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, DispatchEx **ret) +static HRESULT create_date(script_ctx_t *ctx, DispatchEx *object_prototype, DOUBLE time, DispatchEx **ret) { DateInstance *date; HRESULT hres; @@ -2122,10 +2100,10 @@ if(!date) return E_OUTOFMEMORY; - if(use_constr) + if(object_prototype) + hres = init_dispex(&date->dispex, ctx, &Date_info, object_prototype); + else hres = init_dispex_from_constr(&date->dispex, ctx, &Date_info, ctx->date_constr); - else - hres = init_dispex(&date->dispex, ctx, &Date_info, NULL); if(FAILED(hres)) { heap_free(date); return hres; @@ -2537,7 +2515,7 @@ lltime = ((LONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime; - hres = create_date(dispex->ctx, TRUE, lltime/10000-TIME_EPOCH, &date); + hres = create_date(dispex->ctx, NULL, lltime/10000-TIME_EPOCH, &date); if(FAILED(hres)) return hres; break; @@ -2560,7 +2538,7 @@ if(FAILED(hres)) return hres; - hres = create_date(dispex->ctx, TRUE, time_clip(num_val(&num)), &date); + hres = create_date(dispex->ctx, NULL, time_clip(num_val(&num)), &date); if(FAILED(hres)) return hres; break; @@ -2573,7 +2551,7 @@ DateConstr_UTC(dispex, lcid, flags, dp, &ret_date, ei, sp); - hres = create_date(dispex->ctx, TRUE, num_val(&ret_date), &date); + hres = create_date(dispex->ctx, NULL, num_val(&ret_date), &date); if(FAILED(hres)) return hres; @@ -2620,12 +2598,12 @@ NULL }; -HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { DispatchEx *date; HRESULT hres; - hres = create_date(ctx, FALSE, 0.0, &date); + hres = create_date(ctx, object_prototype, 0.0, &date); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -844,6 +844,23 @@ return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller); } +HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, + jsexcept_t *ei, IServiceProvider *caller) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(disp, name, TRUE, &prop); + if(FAILED(hres)) + return hres; + + memset(ei, 0, sizeof(*ei)); + if(retv) + V_VT(retv) = VT_EMPTY; + + return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller); +} + HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -356,6 +356,26 @@ return S_OK; } +static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) +{ + named_item_t *item; + DISPID id; + HRESULT hres; + + for(item = ctx->named_items; item; item = item->next) { + if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { + hres = disp_get_id(item->disp, identifier, 0, &id); + if(SUCCEEDED(hres)) { + if(ret) + exprval_set_idref(ret, item->disp, id); + return TRUE; + } + } + } + + return FALSE; +} + HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -387,8 +407,15 @@ for(var = source->variables; var; var = var->next) { DISPID id = 0; - - hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + BSTR name; + + name = SysAllocString(var->identifier); + if(!name) + return E_OUTOFMEMORY; + + if(!lookup_global_members(parser->script, name, NULL)) + hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + SysFreeString(name); if(FAILED(hres)) return hres; } @@ -493,24 +520,14 @@ } } - for(item = ctx->parser->script->named_items; item; item = item->next) { - if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { - hres = disp_get_id(item->disp, identifier, 0, &id); - if(SUCCEEDED(hres)) - break; - } - } - - if(item) { - exprval_set_idref(ret, item->disp, id); - return S_OK; - } - hres = jsdisp_get_id(ctx->parser->script->script_disp, identifier, 0, &id); if(SUCCEEDED(hres)) { exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->script_disp), id); return S_OK; } + + if(lookup_global_members(ctx->parser->script, identifier, ret)) + return S_OK; if(flags & EXPR_NEWREF) { hres = jsdisp_get_id(ctx->var_disp, identifier, fdexNameEnsure, &id); Modified: trunk/reactos/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/error.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -38,10 +38,6 @@ static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -116,28 +112,6 @@ return S_OK; } -static HRESULT Error_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Error_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - - -static HRESULT Error_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Error_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -166,11 +140,8 @@ static const builtin_prop_t Error_props[] = { {descriptionW, Error_description, 0}, - {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, {numberW, Error_number, 0}, - {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -185,11 +156,8 @@ static const builtin_prop_t ErrorInst_props[] = { {descriptionW, Error_description, 0}, - {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, {numberW, Error_number, 0}, - {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD} }; static const builtin_info_t ErrorInst_info = { @@ -201,21 +169,21 @@ NULL }; -static HRESULT alloc_error(script_ctx_t *ctx, BOOL error_prototype, +static HRESULT alloc_error(script_ctx_t *ctx, DispatchEx *prototype, DispatchEx *constr, ErrorInstance **ret) { ErrorInstance *err; - DispatchEx *inherit; HRESULT hres; err = heap_alloc_zero(sizeof(ErrorInstance)); if(!err) return E_OUTOFMEMORY; - inherit = error_prototype ? ctx->object_constr : ctx->error_constr; - hres = init_dispex_from_constr(&err->dispex, ctx, - error_prototype ? &Error_info : &ErrorInst_info, - constr ? constr : inherit); + if(prototype) + hres = init_dispex(&err->dispex, ctx, &Error_info, prototype); + else + hres = init_dispex_from_constr(&err->dispex, ctx, &ErrorInst_info, + constr ? constr : ctx->error_constr); if(FAILED(hres)) { heap_free(err); return hres; @@ -231,7 +199,7 @@ ErrorInstance *err; HRESULT hres; - hres = alloc_error(ctx, FALSE, constr, &err); + hres = alloc_error(ctx, NULL, constr, &err); if(FAILED(hres)) return hres; @@ -366,7 +334,7 @@ dispex->ctx->uri_error_constr); } -HRESULT init_error_constr(script_ctx_t *ctx) +HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) { static const WCHAR nameW[] = {'n','a','m','e',0}; static const WCHAR ErrorW[] = {'E','r','r','o','r',0}; @@ -392,7 +360,7 @@ HRESULT hres; for(i=0; i<7; i++) { - hres = alloc_error(ctx, i==0, NULL, &err); + hres = alloc_error(ctx, i==0 ? object_prototype : NULL, NULL, &err); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… ============================================================================== --- trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -40,12 +40,8 @@ static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; static const WCHAR applyW[] = {'a','p','p','l','y',0}; static const WCHAR callW[] = {'c','a','l','l',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static IDispatch *get_this(DISPPARAMS *dp) { @@ -290,42 +286,14 @@ return S_OK; } -static HRESULT Function_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Function_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Function_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Function_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -394,11 +362,7 @@ static const builtin_prop_t Function_props[] = { {applyW, Function_apply, PROPF_METHOD}, {callW, Function_call, PROPF_METHOD}, - {hasOwnPropertyW, Function_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Function_isPrototypeOf, PROPF_METHOD}, {lengthW, Function_length, 0}, - {propertyIsEnumerableW, Function_propertyIsEnumerable, PROPF_METHOD}, - {toLocaleStringW, Function_toLocaleString, PROPF_METHOD}, {toStringW, Function_toString, PROPF_METHOD} }; Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -754,31 +754,31 @@ if(FAILED(hres)) return hres; - hres = create_array_constr(ctx, &ctx->array_constr); - if(FAILED(hres)) - return hres; - - hres = create_bool_constr(ctx, &ctx->bool_constr); - if(FAILED(hres)) - return hres; - - hres = create_date_constr(ctx, &ctx->date_constr); - if(FAILED(hres)) - return hres; - - hres = init_error_constr(ctx); - if(FAILED(hres)) - return hres; - - hres = create_number_constr(ctx, &ctx->number_constr); - if(FAILED(hres)) - return hres; - - hres = create_regexp_constr(ctx, &ctx->regexp_constr); - if(FAILED(hres)) - return hres; - - hres = create_string_constr(ctx, &ctx->string_constr); + hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); + if(FAILED(hres)) + return hres; + + hres = create_bool_constr(ctx, object_prototype, &ctx->bool_constr); + if(FAILED(hres)) + return hres; + + hres = create_date_constr(ctx, object_prototype, &ctx->date_constr); + if(FAILED(hres)) + return hres; + + hres = init_error_constr(ctx, object_prototype); + if(FAILED(hres)) + return hres; + + hres = create_number_constr(ctx, object_prototype, &ctx->number_constr); + if(FAILED(hres)) + return hres; + + hres = create_regexp_constr(ctx, object_prototype, &ctx->regexp_constr); + if(FAILED(hres)) + return hres; + + hres = create_string_constr(ctx, object_prototype, &ctx->string_constr); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -131,6 +131,7 @@ HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_call(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_call_name(DispatchEx*,const WCHAR*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget(DispatchEx*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); @@ -225,14 +226,14 @@ HRESULT init_function_constr(script_ctx_t*,DispatchEx*); HRESULT create_object_prototype(script_ctx_t*,DispatchEx**); -HRESULT create_array_constr(script_ctx_t*,DispatchEx**); -HRESULT create_bool_constr(script_ctx_t*,DispatchEx**); -HRESULT create_date_constr(script_ctx_t*,DispatchEx**); -HRESULT init_error_constr(script_ctx_t*); -HRESULT create_number_constr(script_ctx_t*,DispatchEx**); +HRESULT create_array_constr(script_ctx_t*,DispatchEx*,DispatchEx**); +HRESULT create_bool_constr(script_ctx_t*,DispatchEx*,DispatchEx**); +HRESULT create_date_constr(script_ctx_t*,DispatchEx*,DispatchEx**); +HRESULT init_error_constr(script_ctx_t*,DispatchEx*); +HRESULT create_number_constr(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_object_constr(script_ctx_t*,DispatchEx*,DispatchEx**); -HRESULT create_regexp_constr(script_ctx_t*,DispatchEx**); -HRESULT create_string_constr(script_ctx_t*,DispatchEx**); +HRESULT create_regexp_constr(script_ctx_t*,DispatchEx*,DispatchEx**); +HRESULT create_string_constr(script_ctx_t*,DispatchEx*,DispatchEx**); typedef struct { const WCHAR *str; Modified: trunk/reactos/dll/win32/jscript/jscript_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript_Nl.rc [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -30,6 +30,7 @@ IDS_SEMICOLON "';' verwacht" IDS_LBRACKET "'(' verwacht" IDS_RBRACKET "')' verwacht" + IDS_UNTERMINATED_STR "Onafgesloten tekenreeksconstante" IDS_NOT_FUNC "Functie verwacht" IDS_NOT_DATE "'[object]' is geen datum object" IDS_NOT_NUM "Getal verwacht" Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -571,24 +571,24 @@ {PIW, Math_PI, 0}, {SQRT1_2W, Math_SQRT1_2, 0}, {SQRT2W, Math_SQRT2, 0}, - {absW, Math_abs, PROPF_METHOD}, - {acosW, Math_acos, PROPF_METHOD}, - {asinW, Math_asin, PROPF_METHOD}, - {atanW, Math_atan, PROPF_METHOD}, - {atan2W, Math_atan2, PROPF_METHOD}, - {ceilW, Math_ceil, PROPF_METHOD}, - {cosW, Math_cos, PROPF_METHOD}, - {expW, Math_exp, PROPF_METHOD}, - {floorW, Math_floor, PROPF_METHOD}, - {logW, Math_log, PROPF_METHOD}, - {maxW, Math_max, PROPF_METHOD}, - {minW, Math_min, PROPF_METHOD}, - {powW, Math_pow, PROPF_METHOD}, + {absW, Math_abs, PROPF_METHOD|1}, + {acosW, Math_acos, PROPF_METHOD|1}, + {asinW, Math_asin, PROPF_METHOD|1}, + {atanW, Math_atan, PROPF_METHOD|1}, + {atan2W, Math_atan2, PROPF_METHOD|2}, + {ceilW, Math_ceil, PROPF_METHOD|1}, + {cosW, Math_cos, PROPF_METHOD|1}, + {expW, Math_exp, PROPF_METHOD|1}, + {floorW, Math_floor, PROPF_METHOD|1}, + {logW, Math_log, PROPF_METHOD|1}, + {maxW, Math_max, PROPF_METHOD|2}, + {minW, Math_min, PROPF_METHOD|2}, + {powW, Math_pow, PROPF_METHOD|2}, {randomW, Math_random, PROPF_METHOD}, - {roundW, Math_round, PROPF_METHOD}, - {sinW, Math_sin, PROPF_METHOD}, - {sqrtW, Math_sqrt, PROPF_METHOD}, - {tanW, Math_tan, PROPF_METHOD} + {roundW, Math_round, PROPF_METHOD|1}, + {sinW, Math_sin, PROPF_METHOD|1}, + {sqrtW, Math_sqrt, PROPF_METHOD|1}, + {tanW, Math_tan, PROPF_METHOD|1} }; static const builtin_info_t Math_info = { @@ -602,5 +602,19 @@ HRESULT create_math(script_ctx_t *ctx, DispatchEx **ret) { - return create_dispex(ctx, &Math_info, NULL, ret); -} + DispatchEx *math; + HRESULT hres; + + math = heap_alloc_zero(sizeof(DispatchEx)); + if(!math) + return E_OUTOFMEMORY; + + hres = init_dispex_from_constr(math, ctx, &Math_info, ctx->object_constr); + if(FAILED(hres)) { + heap_free(math); + return hres; + } + + *ret = math; + return S_OK; +} Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h" @@ -36,10 +39,6 @@ static const WCHAR toExponentialW[] = {'t','o','E','x','p','o','n','e','n','t','i','a','l',0}; static const WCHAR toPrecisionW[] = {'t','o','P','r','e','c','i','s','i','o','n',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; #define NUMBER_TOSTRING_BUF_SIZE 64 /* ECMA-262 3rd Edition 15.7.4.2 */ @@ -214,27 +213,6 @@ return S_OK; } -static HRESULT Number_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Number_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Number_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -256,14 +234,11 @@ } static const builtin_prop_t Number_props[] = { - {hasOwnPropertyW, Number_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Number_isPrototypeOf, PROPF_METHOD}, - {propertyIsEnumerableW, Number_propertyIsEnumerable, PROPF_METHOD}, - {toExponentialW, Number_toExponential, PROPF_METHOD}, + {toExponentialW, Number_toExponential, PROPF_METHOD|1}, {toFixedW, Number_toFixed, PROPF_METHOD}, {toLocaleStringW, Number_toLocaleString, PROPF_METHOD}, - {toPrecisionW, Number_toPrecision, PROPF_METHOD}, - {toStringW, Number_toString, PROPF_METHOD}, + {toPrecisionW, Number_toPrecision, PROPF_METHOD|1}, + {toStringW, Number_toString, PROPF_METHOD|1}, {valueOfW, Number_valueOf, PROPF_METHOD} }; @@ -330,7 +305,7 @@ return S_OK; } -static HRESULT alloc_number(script_ctx_t *ctx, BOOL use_constr, NumberInstance **ret) +static HRESULT alloc_number(script_ctx_t *ctx, DispatchEx *object_prototype, NumberInstance **ret) { NumberInstance *number; HRESULT hres; @@ -339,10 +314,10 @@ if(!number) return E_OUTOFMEMORY; - if(use_constr) + if(object_prototype) + hres = init_dispex(&number->dispex, ctx, &Number_info, object_prototype); + else hres = init_dispex_from_constr(&number->dispex, ctx, &Number_info, ctx->number_constr); - else - hres = init_dispex(&number->dispex, ctx, &Number_info, NULL); if(FAILED(hres)) return hres; @@ -350,12 +325,12 @@ return S_OK; } -HRESULT create_number_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_number_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { NumberInstance *number; HRESULT hres; - hres = alloc_number(ctx, FALSE, &number); + hres = alloc_number(ctx, object_prototype, &number); if(FAILED(hres)) return hres; @@ -371,7 +346,7 @@ NumberInstance *number; HRESULT hres; - hres = alloc_number(ctx, TRUE, &number); + hres = alloc_number(ctx, NULL, &number); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -74,8 +74,11 @@ static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - TRACE("\n"); - return Object_toString(dispex, lcid, flags, dp, retv, ei, sp); + DISPPARAMS params = {NULL, NULL, 0, 0}; + + TRACE("\n"); + + return jsdisp_call_name(dispex, toStringW, lcid, DISPATCH_METHOD, &params, retv, ei, sp); } static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -142,9 +145,9 @@ } static const builtin_prop_t Object_props[] = { - {hasOwnPropertyW, Object_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Object_isPrototypeOf, PROPF_METHOD}, - {propertyIsEnumerableW, Object_propertyIsEnumerable, PROPF_METHOD}, + {hasOwnPropertyW, Object_hasOwnProperty, PROPF_METHOD|1}, + {isPrototypeOfW, Object_isPrototypeOf, PROPF_METHOD|1}, + {propertyIsEnumerableW, Object_propertyIsEnumerable, PROPF_METHOD|1}, {toLocaleStringW, Object_toLocaleString, PROPF_METHOD}, {toStringW, Object_toString, PROPF_METHOD}, {valueOfW, Object_valueOf, PROPF_METHOD} Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -90,11 +90,6 @@ static const WCHAR multilineW[] = {'m','u','l','t','i','l','i','n','e',0}; static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR execW[] = {'e','x','e','c',0}; static const WCHAR testW[] = {'t','e','s','t',0}; @@ -3432,67 +3427,55 @@ static HRESULT RegExp_source(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + RegExpInstance *This = (RegExpInstance*)dispex; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(This->str); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + break; + } + default: + FIXME("Unimplemnted flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT RegExp_global(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_global(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_ignoreCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_ignoreCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_multiline(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_multiline(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT RegExp_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT RegExp_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT RegExp_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT RegExp_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -3540,17 +3523,13 @@ } static const builtin_prop_t RegExp_props[] = { - {execW, RegExp_exec, PROPF_METHOD}, + {execW, RegExp_exec, PROPF_METHOD|1}, {globalW, RegExp_global, 0}, - {hasOwnPropertyW, RegExp_hasOwnProperty, PROPF_METHOD}, {ignoreCaseW, RegExp_ignoreCase, 0}, - {isPrototypeOfW, RegExp_isPrototypeOf, PROPF_METHOD}, {lastIndexW, RegExp_lastIndex, 0}, {multilineW, RegExp_multiline, 0}, - {propertyIsEnumerableW, RegExp_propertyIsEnumerable, PROPF_METHOD}, {sourceW, RegExp_source, 0}, - {testW, RegExp_test, PROPF_METHOD}, - {toLocaleStringW, RegExp_toLocaleString, PROPF_METHOD}, + {testW, RegExp_test, PROPF_METHOD|1}, {toStringW, RegExp_toString, PROPF_METHOD} }; @@ -3563,7 +3542,7 @@ NULL }; -static HRESULT alloc_regexp(script_ctx_t *ctx, BOOL use_constr, RegExpInstance **ret) +static HRESULT alloc_regexp(script_ctx_t *ctx, DispatchEx *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; HRESULT hres; @@ -3572,10 +3551,10 @@ if(!regexp) return E_OUTOFMEMORY; - if(use_constr) + if(object_prototype) + hres = init_dispex(&regexp->dispex, ctx, &RegExp_info, object_prototype); + else hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExp_info, ctx->regexp_constr); - else - hres = init_dispex(&regexp->dispex, ctx, &RegExp_info, NULL); if(FAILED(hres)) { heap_free(regexp); @@ -3593,7 +3572,7 @@ TRACE("%s %x\n", debugstr_w(exp), flags); - hres = alloc_regexp(ctx, TRUE, &regexp); + hres = alloc_regexp(ctx, NULL, &regexp); if(FAILED(hres)) return hres; @@ -3694,12 +3673,12 @@ return S_OK; } -HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { RegExpInstance *regexp; HRESULT hres; - hres = alloc_regexp(ctx, FALSE, &regexp); + hres = alloc_regexp(ctx, object_prototype, &regexp); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] Sat Aug 22 17:25:26 2009 @@ -62,10 +62,6 @@ static const WCHAR toLocaleLowerCaseW[] = {'t','o','L','o','c','a','l','e','L','o','w','e','r','C','a','s','e',0}; static const WCHAR toLocaleUpperCaseW[] = {'t','o','L','o','c','a','l','e','U','p','p','e','r','C','a','s','e',0}; static const WCHAR localeCompareW[] = {'l','o','c','a','l','e','C','o','m','p','a','r','e',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; static const WCHAR fromCharCodeW[] = {'f','r','o','m','C','h','a','r','C','o','d','e',0}; static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -802,7 +798,7 @@ DWORD parens_cnt = 0, parens_size=0, rep_len=0, length; BSTR rep_str = NULL, match_str = NULL, ret_str, val_str = NULL; DispatchEx *rep_func = NULL, *regexp = NULL; - match_result_t *parens = NULL, match; + match_result_t *parens = NULL, match, **parens_ptr = &parens; strbuf_t ret = {NULL,0,0}; BOOL gcheck = FALSE; VARIANT *arg_var; @@ -884,12 +880,9 @@ if(FAILED(hres)) break; - if(strchrW(rep_str, '$')) { - FIXME("unsupported $ in replace string\n"); - hres = E_NOTIMPL; - } - rep_len = SysStringLen(rep_str); + if(!strchrW(rep_str, '$')) + parens_ptr = NULL; } } @@ -900,7 +893,7 @@ while(1) { if(regexp) { - hres = regexp_match_next(regexp, gcheck, str, length, &cp, rep_func ? &parens : NULL, + hres = regexp_match_next(regexp, gcheck, str, length, &cp, parens_ptr, &parens_size, &parens_cnt, &match); gcheck = TRUE; @@ -932,6 +925,64 @@ hres = strbuf_append(&ret, cstr, SysStringLen(cstr)); SysFreeString(cstr); + if(FAILED(hres)) + break; + }else if(rep_str && regexp) { + const WCHAR *ptr = rep_str, *ptr2; + + while((ptr2 = strchrW(ptr, '$'))) { + hres = strbuf_append(&ret, ptr, ptr2-ptr); + if(FAILED(hres)) + break; + + switch(ptr2[1]) { + case '$': + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+2; + break; + case '&': + hres = strbuf_append(&ret, match.str, match.len); + ptr = ptr2+2; + break; + case '`': + hres = strbuf_append(&ret, str, match.str-str); + ptr = ptr2+2; + break; + case '\'': + hres = strbuf_append(&ret, ecp, (str+length)-ecp); + ptr = ptr2+2; + break; + default: { + DWORD idx; + + if(!isdigitW(ptr2[1])) { + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+1; + break; + } + + idx = ptr2[1] - '0'; + if(isdigitW(ptr[3]) && idx*10 + (ptr[2]-'0') <= parens_cnt) { + idx = idx*10 + (ptr[2]-'0'); + ptr = ptr2+3; + }else if(idx && idx <= parens_cnt) { + ptr = ptr2+2; + }else { + hres = strbuf_append(&ret, ptr2, 1); + ptr = ptr2+1; + break; + } + + hres = strbuf_append(&ret, parens[idx-1].str, parens[idx-1].len); + } + } + + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres)) + hres = strbuf_append(&ret, ptr, (rep_str+rep_len)-ptr); if(FAILED(hres)) break; }else if(rep_str) { @@ -1456,27 +1507,6 @@ return E_NOTIMPL; } -static HRESULT String_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT String_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT String_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT String_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -1513,35 +1543,32 @@ } static const builtin_prop_t String_props[] = { - {anchorW, String_anchor, PROPF_METHOD}, + {anchorW, String_anchor, PROPF_METHOD|1}, {bigW, String_big, PROPF_METHOD}, {blinkW, String_blink, PROPF_METHOD}, {boldW, String_bold, PROPF_METHOD}, - {charAtW, String_charAt, PROPF_METHOD}, - {charCodeAtW, String_charCodeAt, PROPF_METHOD}, - {concatW, String_concat, PROPF_METHOD}, + {charAtW, String_charAt, PROPF_METHOD|1}, + {charCodeAtW, String_charCodeAt, PROPF_METHOD|1}, + {concatW, String_concat, PROPF_METHOD|1}, {fixedW, String_fixed, PROPF_METHOD}, - {fontcolorW, String_fontcolor, PROPF_METHOD}, - {fontsizeW, String_fontsize, PROPF_METHOD}, - {hasOwnPropertyW, String_hasOwnProperty, PROPF_METHOD}, - {indexOfW, String_indexOf, PROPF_METHOD}, - {isPrototypeOfW, String_isPrototypeOf, PROPF_METHOD}, + {fontcolorW, String_fontcolor, PROPF_METHOD|1}, + {fontsizeW, String_fontsize, PROPF_METHOD|1}, + {indexOfW, String_indexOf, PROPF_METHOD|2}, {italicsW, String_italics, PROPF_METHOD}, - {lastIndexOfW, String_lastIndexOf, PROPF_METHOD}, + {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, {lengthW, String_length, 0}, - {linkW, String_link, PROPF_METHOD}, - {localeCompareW, String_localeCompare, PROPF_METHOD}, - {matchW, String_match, PROPF_METHOD}, - {propertyIsEnumerableW, String_propertyIsEnumerable, PROPF_METHOD}, - {replaceW, String_replace, PROPF_METHOD}, + {linkW, String_link, PROPF_METHOD|1}, + {localeCompareW, String_localeCompare, PROPF_METHOD|1}, + {matchW, String_match, PROPF_METHOD|1}, + {replaceW, String_replace, PROPF_METHOD|1}, {searchW, String_search, PROPF_METHOD}, {sliceW, String_slice, PROPF_METHOD}, {smallW, String_small, PROPF_METHOD}, - {splitW, String_split, PROPF_METHOD}, + {splitW, String_split, PROPF_METHOD|2}, {strikeW, String_strike, PROPF_METHOD}, {subW, String_sub, PROPF_METHOD}, - {substrW, String_substr, PROPF_METHOD}, - {substringW, String_substring, PROPF_METHOD}, + {substrW, String_substr, PROPF_METHOD|2}, + {substringW, String_substring, PROPF_METHOD|2}, {supW, String_sup, PROPF_METHOD}, {toLocaleLowerCaseW, String_toLocaleLowerCase, PROPF_METHOD}, {toLocaleUpperCaseW, String_toLocaleUpperCase, PROPF_METHOD}, @@ -1648,7 +1675,7 @@ return S_OK; } -static HRESULT string_alloc(script_ctx_t *ctx, BOOL use_constr, StringInstance **ret) +static HRESULT string_alloc(script_ctx_t *ctx, DispatchEx *object_prototype, StringInstance **ret) { StringInstance *string; HRESULT hres; @@ -1657,10 +1684,10 @@ if(!string) return E_OUTOFMEMORY; - if(use_constr) + if(object_prototype) + hres = init_dispex(&string->dispex, ctx, &String_info, object_prototype); + else hres = init_dispex_from_constr(&string->dispex, ctx, &String_info, ctx->string_constr); - else - hres = init_dispex(&string->dispex, ctx, &String_info, NULL); if(FAILED(hres)) { heap_free(string); return hres; @@ -1683,12 +1710,12 @@ NULL }; -HRESULT create_string_constr(script_ctx_t *ctx, DispatchEx **ret) +HRESULT create_string_constr(script_ctx_t *ctx, DispatchEx *object_prototype, DispatchEx **ret) { StringInstance *string; HRESULT hres; - hres = string_alloc(ctx, FALSE, &string); + hres = string_alloc(ctx, object_prototype, &string); if(FAILED(hres)) return hres; @@ -1703,7 +1730,7 @@ StringInstance *string; HRESULT hres; - hres = string_alloc(ctx, TRUE, &string); + hres = string_alloc(ctx, NULL, &string); if(FAILED(hres)) return hres;

1 0

[cwittich] 42848: sync msxml3 winetest with wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:18:26 2009 New Revision: 42848 URL: http://svn.reactos.org/svn/reactos?rev=42848&view=rev Log: sync msxml3 winetest with wine 1.1.28 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/saxreader.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Sat Aug 22 17:18:26 2009 @@ -150,6 +150,37 @@ "<?xml version=\"1.0\" encoding=\"utf-8\"?>" "<string>Wine</string>"; +static const CHAR szBasicTransformSSXMLPart1[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\"/>\n" +"<xsl:template match=\"/\">" +"<HTML><BODY><TABLE>" +" <xsl:apply-templates select='document(\""; + +static const CHAR szBasicTransformSSXMLPart2[] = +"\")/bottle/wine'>" +" <xsl:sort select=\"cost\"/><xsl:sort select=\"name\"/>" +" </xsl:apply-templates>" +"</TABLE></BODY></HTML>" +"</xsl:template>" +"<xsl:template match=\"bottle\">" +" <TR><xsl:apply-templates select=\"name\" /><xsl:apply-templates select=\"cost\" /></TR>" +"</xsl:template>" +"<xsl:template match=\"name\">" +" <TD><xsl:apply-templates /></TD>" +"</xsl:template>" +"<xsl:template match=\"cost\">" +" <TD><xsl:apply-templates /></TD>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const CHAR szBasicTransformXML[] = +"<?xml version=\"1.0\"?><bottle><wine><name>Wine</name><cost>$25.00</cost></wine></bottle>"; + +static const CHAR szBasicTransformOutput[] = +"<HTML><BODY><TABLE><TD>Wine</TD><TD>$25.00</TD></TABLE></BODY></HTML>"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -514,7 +545,11 @@ ok( r == S_OK, "should be a document element\n"); if( element ) { + IObjectIdentity *ident; BSTR tag = NULL; + + r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); + ok( r == E_NOINTERFACE, "ret %08x\n", r); /* check if the tag is correct */ r = IXMLDOMElement_get_tagName( element, &tag ); @@ -3945,6 +3980,98 @@ IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + +static void test_TransformWithLoadingLocalFile(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMDocument2 *xsl = NULL; + IXMLDOMNode *pNode; + VARIANT_BOOL bSucc; + HRESULT hr; + HANDLE file; + DWORD dwWritten; + char lpPathBuffer[MAX_PATH]; + int i; + + /* Create a Temp File. */ + GetTempPathA(MAX_PATH, lpPathBuffer); + strcat(lpPathBuffer, "customers.xml" ); + + file = CreateFile(lpPathBuffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + if(file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, szBasicTransformXML, strlen(szBasicTransformXML), &dwWritten, NULL); + CloseHandle(file); + + /* Correct path to not include a escape character. */ + for(i=0; i < strlen(lpPathBuffer); i++) + { + if(lpPathBuffer[i] == '\\') + lpPathBuffer[i] = '/'; + } + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&xsl ); + if( hr != S_OK ) + { + IXMLDOMDocument2_Release(doc); + return; + } + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + if(bSucc == VARIANT_TRUE) + { + BSTR sXSL; + BSTR sPart1 = _bstr_(szBasicTransformSSXMLPart1); + BSTR sPart2 = _bstr_(szBasicTransformSSXMLPart2); + BSTR sFileName = _bstr_(lpPathBuffer); + int nLegnth = lstrlenW(sPart1) + lstrlenW(sPart2) + lstrlenW(sFileName) + 1; + + sXSL = SysAllocStringLen(NULL, nLegnth); + lstrcpyW(sXSL, sPart1); + lstrcatW(sXSL, sFileName); + lstrcatW(sXSL, sPart2); + + hr = IXMLDOMDocument2_loadXML(xsl, sXSL, &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); + if(bSucc == VARIANT_TRUE) + { + BSTR sResult; + + hr = IXMLDOMDocument_QueryInterface(xsl, &IID_IXMLDOMNode, (LPVOID*)&pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + /* This will load the temp file via the XSL */ + hr = IXMLDOMDocument2_transformNode(doc, pNode, &sResult); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + ok( compareIgnoreReturns( sResult, _bstr_(szBasicTransformOutput)), "Stylesheet output not correct\n"); + SysFreeString(sResult); + } + + IXMLDOMNode_Release(pNode); + } + } + + SysFreeString(sXSL); + } + + IXMLDOMDocument2_Release(doc); + IXMLDOMDocument2_Release(xsl); + + DeleteFile(lpPathBuffer); free_bstrs(); } @@ -3977,6 +4104,7 @@ test_Namespaces(); test_FormattingXML(); test_NodeTypeValue(); + test_TransformWithLoadingLocalFile(); CoUninitialize(); } Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Sat Aug 22 17:18:26 2009 @@ -117,13 +117,6 @@ static content_handler_test *expectCall; static ISAXLocator *locator; -static const char *debugstr_wn(const WCHAR *szStr, int len) -{ - static char buf[1024]; - WideCharToMultiByte(CP_ACP, 0, szStr, len, buf, sizeof(buf), NULL, NULL); - return buf; -} - static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char *szTest) { WCHAR buf[1024]; @@ -142,7 +135,7 @@ MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n", - debugstr_wn(szStr, nStr), szTest); + wine_dbgstr_wn(szStr, nStr), szTest); } static BOOL test_expect_call(CH id)

1 0

[cwittich] 42847: sync test.h with wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:18:03 2009 New Revision: 42847 URL: http://svn.reactos.org/svn/reactos?rev=42847&view=rev Log: sync test.h with wine 1.1.28 Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sat Aug 22 17:18:03 2009 @@ -61,6 +61,9 @@ extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); extern void winetest_wait_child_process( HANDLE process ); + +extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); +static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } #ifdef STANDALONE #define START_TEST(name) \ @@ -196,6 +199,8 @@ int current_line; /* line of current check */ int todo_level; /* current todo nesting level */ int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ } tls_data; static DWORD tls_index; @@ -208,11 +213,31 @@ data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(tls_data)); + data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data)); + data->todo_level = 0; + data->str_pos = data->strings; TlsSetValue(tls_index,data); } SetLastError(last_error); return data; +} + +/* allocate some tmp space for a string */ +static char *get_temp_buffer( size_t n ) +{ + tls_data *data = get_tls_data(); + char *res = data->str_pos; + + if (res + n >= &data->strings[sizeof(data->strings)]) res = data->strings; + data->str_pos = res + n; + return res; +} + +/* release extra space that we requested in gimme1() */ +static void release_temp_buffer( char *ptr, size_t size ) +{ + tls_data *data = get_tls_data(); + data->str_pos = ptr + size; } static void exit_process( int code ) @@ -407,6 +432,62 @@ } } +const char *wine_dbgstr_wn( const WCHAR *str, int n ) +{ + char *dst, *res; + size_t size; + + if (!((ULONG_PTR)str >> 16)) + { + if (!str) return "(null)"; + res = get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); + return res; + } + if (n == -1) + { + const WCHAR *end = str; + while (*end) end++; + n = end - str; + } + if (n < 0) n = 0; + size = 12 + min( 300, n * 5 ); + dst = res = get_temp_buffer( size ); + *dst++ = 'L'; + *dst++ = '"'; + while (n-- > 0 && dst <= res + size - 10) + { + WCHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c >= ' ' && c <= 126) + *dst++ = c; + else + { + *dst++ = '\\'; + sprintf(dst,"%04x",c); + dst+=4; + } + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst++ = 0; + release_temp_buffer( res, dst - res ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

[cwittich] 42846: sync msxml3 with wine 1.1.28
by cwittich＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: cwittich Date: Sat Aug 22 17:10:54 2009 New Revision: 42846 URL: http://svn.reactos.org/svn/reactos?rev=42846&view=rev Log: sync msxml3 with wine 1.1.28 Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/regsvr.c trunk/reactos/dll/win32/msxml3/text.c Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… ============================================================================== --- trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -547,7 +547,7 @@ IUnknown* create_attribute( xmlNodePtr attribute ) { domattr *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -556,22 +556,15 @@ This->lpVtbl = &domattr_vtbl; This->ref = 1; - This->node_unk = create_basic_node( attribute, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( attribute, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -770,7 +770,7 @@ IUnknown* create_cdata( xmlNodePtr text ) { domcdata *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -779,22 +779,15 @@ This->lpVtbl = &domcdata_vtbl; This->ref = 1; - This->node_unk = create_basic_node( text, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( text, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -768,7 +768,7 @@ IUnknown* create_comment( xmlNodePtr comment ) { domcomment *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -777,22 +777,15 @@ This->lpVtbl = &domcomment_vtbl; This->ref = 1; - This->node_unk = create_basic_node( comment, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( comment, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -634,6 +634,9 @@ }else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) { TRACE("(%p)->(IID_UndocumentedScriptIface %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if (IsEqualGUID(&IID_IObjectIdentity, riid)) { + TRACE("IID_IObjectIdentity not supported returning NULL\n"); + *ppv = NULL; }else { return FALSE; } Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -520,7 +520,7 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment ) { domfrag *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -529,22 +529,15 @@ This->lpVtbl = &domfrag_vtbl; This->ref = 1; - This->node_unk = create_basic_node( fragment, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( fragment, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -64,8 +64,7 @@ VARIANT_BOOL resolving; VARIANT_BOOL preserving; BOOL bUseXPath; - IUnknown *node_unk; - IXMLDOMNode *node; + xmlnode *node; IXMLDOMSchemaCollection *schema; bsc_t *bsc; HRESULT error; @@ -210,16 +209,14 @@ return S_FALSE; } -static HRESULT attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) -{ - xmlnode *This = impl_from_IXMLDOMNode( node ); - - if(This->node) - xmldoc_release(This->node->doc); - - This->node = (xmlNodePtr) xml; - if(This->node) - xmldoc_add_ref(This->node->doc); +static HRESULT attach_xmldoc( xmlnode *node, xmlDocPtr xml ) +{ + if(node->node) + xmldoc_release(node->node->doc); + + node->node = (xmlNodePtr) xml; + if(node->node) + xmldoc_add_ref(node->node->doc); return S_OK; } @@ -231,7 +228,7 @@ static inline xmlDocPtr get_doc( domdoc *This ) { - return (xmlDocPtr) xmlNodePtr_from_domnode( This->node, XML_DOCUMENT_NODE ); + return (xmlDocPtr)This->node->node; } static inline domdoc *impl_from_IPersistStream(IPersistStream *iface) @@ -363,7 +360,7 @@ TRACE("(%p, %p, %d)\n", iface, pStm, fClearDirty); - hr = IXMLDOMNode_get_xml( This->node, &xmlString ); + hr = IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), &xmlString ); if(hr == S_OK) { DWORD count; @@ -455,7 +452,7 @@ } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); + *ppvObject = IXMLDOMNode_from_impl(This->node); } else if (IsEqualGUID(&IID_IPersistStream, riid)) { @@ -484,7 +481,7 @@ return E_NOINTERFACE; } - IXMLDOMDocument_AddRef( iface ); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -515,7 +512,7 @@ if (This->site) IUnknown_Release( This->site ); - IUnknown_Release( This->node_unk ); + IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if (This->stream) IStream_Release(This->stream); HeapFree( GetProcessHeap(), 0, This ); @@ -613,7 +610,7 @@ BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeName( This->node, name ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), name ); } @@ -622,7 +619,7 @@ VARIANT* value ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeValue( This->node, value ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), value ); } @@ -631,7 +628,7 @@ VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_nodeValue( This->node, value ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), value ); } @@ -640,7 +637,7 @@ DOMNodeType* type ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeType( This->node, type ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), type ); } @@ -649,7 +646,7 @@ IXMLDOMNode** parent ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_parentNode( This->node, parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); } @@ -658,7 +655,7 @@ IXMLDOMNodeList** childList ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_childNodes( This->node, childList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), childList ); } @@ -667,7 +664,7 @@ IXMLDOMNode** firstChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_firstChild( This->node, firstChild ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), firstChild ); } @@ -676,7 +673,7 @@ IXMLDOMNode** lastChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_lastChild( This->node, lastChild ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), lastChild ); } @@ -685,7 +682,7 @@ IXMLDOMNode** previousSibling ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_previousSibling( This->node, previousSibling ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), previousSibling ); } @@ -694,7 +691,7 @@ IXMLDOMNode** nextSibling ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nextSibling( This->node, nextSibling ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), nextSibling ); } @@ -703,7 +700,7 @@ IXMLDOMNamedNodeMap** attributeMap ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_attributes( This->node, attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); } @@ -714,7 +711,7 @@ IXMLDOMNode** outNewChild ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_insertBefore( This->node, newChild, refChild, outNewChild ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newChild, refChild, outNewChild ); } @@ -725,7 +722,7 @@ IXMLDOMNode** outOldChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_replaceChild( This->node, newChild, oldChild, outOldChild ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newChild, oldChild, outOldChild ); } @@ -735,7 +732,7 @@ IXMLDOMNode** oldChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_removeChild( This->node, childNode, oldChild ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), childNode, oldChild ); } @@ -745,7 +742,7 @@ IXMLDOMNode** outNewChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_appendChild( This->node, newChild, outNewChild ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newChild, outNewChild ); } @@ -754,7 +751,7 @@ VARIANT_BOOL* hasChild) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_hasChildNodes( This->node, hasChild ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), hasChild ); } @@ -763,7 +760,7 @@ IXMLDOMDocument** DOMDocument) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_ownerDocument( This->node, DOMDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), DOMDocument ); } @@ -773,7 +770,7 @@ IXMLDOMNode** cloneRoot) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_cloneNode( This->node, deep, cloneRoot ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), deep, cloneRoot ); } @@ -782,7 +779,7 @@ BSTR* nodeType ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeTypeString( This->node, nodeType ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), nodeType ); } @@ -791,7 +788,7 @@ BSTR* text ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_text( This->node, text ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), text ); } @@ -800,7 +797,7 @@ BSTR text ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_text( This->node, text ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), text ); } @@ -809,7 +806,7 @@ VARIANT_BOOL* isSpecified ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_specified( This->node, isSpecified ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), isSpecified ); } @@ -818,7 +815,7 @@ IXMLDOMNode** definitionNode ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_definition( This->node, definitionNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), definitionNode ); } @@ -827,7 +824,7 @@ VARIANT* typedValue ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_nodeTypedValue( This->node, typedValue ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), typedValue ); } static HRESULT WINAPI domdoc_put_nodeTypedValue( @@ -835,7 +832,7 @@ VARIANT typedValue ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_nodeTypedValue( This->node, typedValue ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), typedValue ); } @@ -844,7 +841,7 @@ VARIANT* dataTypeName ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_dataType( This->node, dataTypeName ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), dataTypeName ); } @@ -853,7 +850,7 @@ BSTR dataTypeName ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_put_dataType( This->node, dataTypeName ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), dataTypeName ); } @@ -862,7 +859,7 @@ BSTR* xmlString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_xml( This->node, xmlString ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), xmlString ); } @@ -872,7 +869,7 @@ BSTR* xmlString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_transformNode( This->node, styleSheet, xmlString ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), styleSheet, xmlString ); } @@ -882,7 +879,7 @@ IXMLDOMNodeList** resultList ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_selectNodes( This->node, queryString, resultList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), queryString, resultList ); } @@ -892,7 +889,7 @@ IXMLDOMNode** resultNode ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_selectSingleNode( This->node, queryString, resultNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), queryString, resultNode ); } @@ -901,7 +898,7 @@ VARIANT_BOOL* isParsed ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_parsed( This->node, isParsed ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), isParsed ); } @@ -910,7 +907,7 @@ BSTR* namespaceURI ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_namespaceURI( This->node, namespaceURI ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), namespaceURI ); } @@ -919,7 +916,7 @@ BSTR* prefixString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_prefix( This->node, prefixString ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), prefixString ); } @@ -928,7 +925,7 @@ BSTR* nameString ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_get_baseName( This->node, nameString ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), nameString ); } @@ -938,7 +935,7 @@ VARIANT outputObject) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); - return IXMLDOMNode_transformNodeToObject( This->node, stylesheet, outputObject ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), stylesheet, outputObject ); } @@ -2198,7 +2195,6 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document) { domdoc *doc; - HRESULT hr; doc = HeapAlloc( GetProcessHeap(), 0, sizeof (*doc) ); if( !doc ) @@ -2222,25 +2218,14 @@ doc->safeopt = 0; doc->bsc = NULL; - doc->node_unk = create_basic_node( (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl ); - if(!doc->node_unk) + doc->node = create_basic_node( (xmlNodePtr)xmldoc, (IUnknown*)&doc->lpVtbl ); + if(!doc->node) { HeapFree(GetProcessHeap(), 0, doc); return E_FAIL; } - hr = IUnknown_QueryInterface(doc->node_unk, &IID_IXMLDOMNode, (LPVOID*)&doc->node); - if(FAILED(hr)) - { - IUnknown_Release(doc->node_unk); - HeapFree( GetProcessHeap(), 0, doc ); - return E_FAIL; - } - init_dispex(&doc->dispex, (IUnknown*)&doc->lpVtbl, &domdoc_dispex); - - /* The ref on doc->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(doc->node); *document = (IXMLDOMDocument2*)&doc->lpVtbl; Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -44,8 +44,7 @@ const struct IUnknownVtbl *lpInternalUnkVtbl; IUnknown *pUnkOuter; LONG ref; - IUnknown *node_unk; - IXMLDOMNode *node; + xmlnode *node; } domelem; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) @@ -60,7 +59,7 @@ static inline xmlNodePtr get_element( domelem *This ) { - return xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); + return This->node->node; } static HRESULT WINAPI domelem_QueryInterface( @@ -170,7 +169,7 @@ BSTR* p ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeName( This->node, p ); + return IXMLDOMNode_get_nodeName( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_nodeValue( @@ -178,7 +177,7 @@ VARIANT* var1 ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeValue( This->node, var1 ); + return IXMLDOMNode_get_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); } static HRESULT WINAPI domelem_put_nodeValue( @@ -186,7 +185,7 @@ VARIANT var1 ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_nodeValue( This->node, var1 ); + return IXMLDOMNode_put_nodeValue( IXMLDOMNode_from_impl(This->node), var1 ); } static HRESULT WINAPI domelem_get_nodeType( @@ -194,7 +193,7 @@ DOMNodeType* domNodeType ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeType( This->node, domNodeType ); + return IXMLDOMNode_get_nodeType( IXMLDOMNode_from_impl(This->node), domNodeType ); } static HRESULT WINAPI domelem_get_parentNode( @@ -202,7 +201,7 @@ IXMLDOMNode** parent ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_parentNode( This->node, parent ); + return IXMLDOMNode_get_parentNode( IXMLDOMNode_from_impl(This->node), parent ); } static HRESULT WINAPI domelem_get_childNodes( @@ -210,7 +209,7 @@ IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_childNodes( This->node, outList ); + return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(This->node), outList ); } static HRESULT WINAPI domelem_get_firstChild( @@ -218,7 +217,7 @@ IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_firstChild( This->node, domNode ); + return IXMLDOMNode_get_firstChild( IXMLDOMNode_from_impl(This->node), domNode ); } static HRESULT WINAPI domelem_get_lastChild( @@ -226,7 +225,7 @@ IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_lastChild( This->node, domNode ); + return IXMLDOMNode_get_lastChild( IXMLDOMNode_from_impl(This->node), domNode ); } static HRESULT WINAPI domelem_get_previousSibling( @@ -234,7 +233,7 @@ IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_previousSibling( This->node, domNode ); + return IXMLDOMNode_get_previousSibling( IXMLDOMNode_from_impl(This->node), domNode ); } static HRESULT WINAPI domelem_get_nextSibling( @@ -242,7 +241,7 @@ IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nextSibling( This->node, domNode ); + return IXMLDOMNode_get_nextSibling( IXMLDOMNode_from_impl(This->node), domNode ); } static HRESULT WINAPI domelem_get_attributes( @@ -250,7 +249,7 @@ IXMLDOMNamedNodeMap** attributeMap) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_attributes( This->node, attributeMap ); + return IXMLDOMNode_get_attributes( IXMLDOMNode_from_impl(This->node), attributeMap ); } static HRESULT WINAPI domelem_insertBefore( @@ -259,7 +258,7 @@ IXMLDOMNode** outOldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_insertBefore( This->node, newNode, var1, outOldNode ); + return IXMLDOMNode_insertBefore( IXMLDOMNode_from_impl(This->node), newNode, var1, outOldNode ); } static HRESULT WINAPI domelem_replaceChild( @@ -269,7 +268,7 @@ IXMLDOMNode** outOldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_replaceChild( This->node, newNode, oldNode, outOldNode ); + return IXMLDOMNode_replaceChild( IXMLDOMNode_from_impl(This->node), newNode, oldNode, outOldNode ); } static HRESULT WINAPI domelem_removeChild( @@ -277,7 +276,7 @@ IXMLDOMNode* domNode, IXMLDOMNode** oldNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_removeChild( This->node, domNode, oldNode ); + return IXMLDOMNode_removeChild( IXMLDOMNode_from_impl(This->node), domNode, oldNode ); } static HRESULT WINAPI domelem_appendChild( @@ -285,7 +284,7 @@ IXMLDOMNode* newNode, IXMLDOMNode** outNewNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_appendChild( This->node, newNode, outNewNode ); + return IXMLDOMNode_appendChild( IXMLDOMNode_from_impl(This->node), newNode, outNewNode ); } static HRESULT WINAPI domelem_hasChildNodes( @@ -293,7 +292,7 @@ VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_hasChildNodes( This->node, pbool ); + return IXMLDOMNode_hasChildNodes( IXMLDOMNode_from_impl(This->node), pbool ); } static HRESULT WINAPI domelem_get_ownerDocument( @@ -301,7 +300,7 @@ IXMLDOMDocument** domDocument) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_ownerDocument( This->node, domDocument ); + return IXMLDOMNode_get_ownerDocument( IXMLDOMNode_from_impl(This->node), domDocument ); } static HRESULT WINAPI domelem_cloneNode( @@ -309,7 +308,7 @@ VARIANT_BOOL pbool, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_cloneNode( This->node, pbool, outNode ); + return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(This->node), pbool, outNode ); } static HRESULT WINAPI domelem_get_nodeTypeString( @@ -317,7 +316,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeTypeString( This->node, p ); + return IXMLDOMNode_get_nodeTypeString( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_text( @@ -325,7 +324,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_text( This->node, p ); + return IXMLDOMNode_get_text( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_put_text( @@ -333,7 +332,7 @@ BSTR p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_text( This->node, p ); + return IXMLDOMNode_put_text( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_specified( @@ -341,7 +340,7 @@ VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_specified( This->node, pbool ); + return IXMLDOMNode_get_specified( IXMLDOMNode_from_impl(This->node), pbool ); } static HRESULT WINAPI domelem_get_definition( @@ -349,7 +348,7 @@ IXMLDOMNode** domNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_definition( This->node, domNode ); + return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(This->node), domNode ); } static HRESULT WINAPI domelem_get_nodeTypedValue( @@ -357,7 +356,7 @@ VARIANT* var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_nodeTypedValue( This->node, var1 ); + return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); } static HRESULT WINAPI domelem_put_nodeTypedValue( @@ -365,7 +364,7 @@ VARIANT var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_nodeTypedValue( This->node, var1 ); + return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(This->node), var1 ); } static HRESULT WINAPI domelem_get_dataType( @@ -373,7 +372,7 @@ VARIANT* var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_dataType( This->node, var1 ); + return IXMLDOMNode_get_dataType( IXMLDOMNode_from_impl(This->node), var1 ); } static HRESULT WINAPI domelem_put_dataType( @@ -381,7 +380,7 @@ BSTR p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_dataType( This->node, p ); + return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_xml( @@ -389,7 +388,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_xml( This->node, p ); + return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_transformNode( @@ -397,7 +396,7 @@ IXMLDOMNode* domNode, BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_transformNode( This->node, domNode, p ); + return IXMLDOMNode_transformNode( IXMLDOMNode_from_impl(This->node), domNode, p ); } static HRESULT WINAPI domelem_selectNodes( @@ -405,7 +404,7 @@ BSTR p, IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectNodes( This->node, p, outList ); + return IXMLDOMNode_selectNodes( IXMLDOMNode_from_impl(This->node), p, outList ); } static HRESULT WINAPI domelem_selectSingleNode( @@ -413,7 +412,7 @@ BSTR p, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectSingleNode( This->node, p, outNode ); + return IXMLDOMNode_selectSingleNode( IXMLDOMNode_from_impl(This->node), p, outNode ); } static HRESULT WINAPI domelem_get_parsed( @@ -421,7 +420,7 @@ VARIANT_BOOL* pbool) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_parsed( This->node, pbool ); + return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(This->node), pbool ); } static HRESULT WINAPI domelem_get_namespaceURI( @@ -429,7 +428,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_namespaceURI( This->node, p ); + return IXMLDOMNode_get_namespaceURI( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_prefix( @@ -437,7 +436,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_prefix( This->node, p ); + return IXMLDOMNode_get_prefix( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_get_baseName( @@ -445,7 +444,7 @@ BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_baseName( This->node, p ); + return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(This->node), p ); } static HRESULT WINAPI domelem_transformNodeToObject( @@ -453,7 +452,7 @@ IXMLDOMNode* domNode, VARIANT var1) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_transformNodeToObject( This->node, domNode, var1 ); + return IXMLDOMNode_transformNodeToObject( IXMLDOMNode_from_impl(This->node), domNode, var1 ); } static HRESULT WINAPI domelem_get_tagName( @@ -744,7 +743,7 @@ } else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { - return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); + *ppvObject = IXMLDOMNode_from_impl(This->node); } else { @@ -773,7 +772,7 @@ ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IUnknown_Release( This->node_unk ); + IXMLDOMNode_Release( IXMLDOMNode_from_impl(This->node) ); HeapFree( GetProcessHeap(), 0, This ); } @@ -790,7 +789,6 @@ IUnknown* create_element( xmlNodePtr element, IUnknown *pUnkOuter ) { domelem *This; - HRESULT hr; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -805,23 +803,13 @@ else This->pUnkOuter = (IUnknown *)&This->lpInternalUnkVtbl; - This->node_unk = create_basic_node( element, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl ); + if(!This->node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); - return (IUnknown*) &This->lpInternalUnkVtbl; } Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… ============================================================================== --- trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -519,7 +519,7 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) { entityref *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -528,22 +528,15 @@ This->lpVtbl = &entityref_vtbl; This->ref = 1; - This->node_unk = create_basic_node( entity, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( entity, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -32,12 +32,75 @@ #include "msxml.h" #include "msxml2.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" #include "msxml_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +#ifdef HAVE_LIBXML2 + +/* Support for loading xml files from a Wine Windows drive */ +static int wineXmlMatchCallback (char const * filename) +{ + int nRet = 0; + + TRACE("%s\n", filename); + + /* + * We will deal with loading XML files from the file system + * We only care about files that linux cannot find. + * e.g. C:,D: etc + */ + if(isalpha(filename[0]) && filename[1] == ':') + nRet = 1; + + return nRet; +} + +static void *wineXmlOpenCallback (char const * filename) +{ + BSTR sFilename = bstr_from_xmlChar( (xmlChar*)filename); + HANDLE hFile; + + TRACE("%s\n", debugstr_w(sFilename)); + + hFile = CreateFileW(sFilename, GENERIC_READ,FILE_SHARE_READ, NULL, + OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL, NULL); + if(hFile == INVALID_HANDLE_VALUE) hFile = 0; + SysFreeString(sFilename); + return hFile; +} + +static int wineXmlReadCallback(void * context, char * buffer, int len) +{ + DWORD dwBytesRead; + + TRACE("%p %s %d\n", context, buffer, len); + + if ((context == NULL) || (buffer == NULL)) + return(-1); + + if(!ReadFile( context, buffer,len, &dwBytesRead, NULL)) + { + ERR("Failed to read file\n"); + return -1; + } + + TRACE("Read %d\n", dwBytesRead); + + return dwBytesRead; +} + +static int wineXmlFileCloseCallback (void * context) +{ + return CloseHandle(context) ? 0 : -1; +} + +#endif + HRESULT WINAPI DllCanUnloadNow(void) { @@ -96,6 +159,12 @@ for this thread and as default for new threads */ xmlTreeIndentString = "\t"; xmlThrDefTreeIndentString("\t"); + + /* Register callbacks for loading XML files */ + if(xmlRegisterInputCallbacks(wineXmlMatchCallback, wineXmlOpenCallback, + wineXmlReadCallback, wineXmlFileCloseCallback) == -1) + WARN("Failed to register callbacks\n"); + #endif init_libxslt(); DisableThreadLibraryCalls(hInstDLL); @@ -110,6 +179,10 @@ } #endif #ifdef HAVE_LIBXML2 + /* Restore default Callbacks */ + xmlCleanupInputCallbacks(); + xmlRegisterDefaultInputCallbacks(); + xmlCleanupParser(); #endif release_typelib(); Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml_private.h [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -39,7 +39,6 @@ extern IUnknown *create_domdoc( xmlNodePtr document ); extern IUnknown *create_xmldoc( void ); extern IXMLDOMNode *create_node( xmlNodePtr node ); -extern IUnknown *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter ); extern IUnknown *create_element( xmlNodePtr element, IUnknown *pUnkOuter ); extern IUnknown *create_attribute( xmlNodePtr attribute ); extern IUnknown *create_text( xmlNodePtr text ); @@ -59,7 +58,6 @@ /* helpers */ extern xmlChar *xmlChar_from_wchar( LPWSTR str ); -extern BSTR bstr_from_xmlChar( const xmlChar *buf ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); @@ -85,7 +83,28 @@ return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); } +static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) +{ + return (IXMLDOMNode*)&This->lpVtbl; +} + +extern xmlnode *create_basic_node(xmlNodePtr,IUnknown*); + extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); + +static inline BSTR bstr_from_xmlChar(const xmlChar *str) +{ + BSTR ret = NULL; + + if(str) { + DWORD len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + if(ret) + MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)str, -1, ret, len); + } + + return ret; +} #endif Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -245,25 +245,6 @@ return S_FALSE; return S_OK; -} - -BSTR bstr_from_xmlChar( const xmlChar *buf ) -{ - DWORD len; - LPWSTR str; - BSTR bstr; - - if ( !buf ) - return NULL; - - len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, NULL, 0 ); - str = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); - if ( !str ) - return NULL; - MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) buf, -1, str, len ); - bstr = SysAllocString( str ); - HeapFree( GetProcessHeap(), 0, str ); - return bstr; } static HRESULT WINAPI xmlnode_get_nodeValue( @@ -1561,7 +1542,7 @@ Internal_Release }; -IUnknown *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter ) +xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter ) { xmlnode *This; @@ -1583,7 +1564,7 @@ This->ref = 1; This->node = node; - return (IUnknown*)&This->lpInternalUnkVtbl; + return This; } IXMLDOMNode *create_node( xmlNodePtr node ) @@ -1618,7 +1599,7 @@ break; default: FIXME("only creating basic node for type %d\n", node->type); - pUnk = create_basic_node( node, NULL ); + pUnk = (IUnknown*)&create_basic_node( node, NULL )->lpInternalUnkVtbl; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -605,7 +605,7 @@ IUnknown* create_pi( xmlNodePtr pi ) { dom_pi *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -614,22 +614,15 @@ This->lpVtbl = &dom_pi_vtbl; This->ref = 1; - This->node_unk = create_basic_node( pi, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( pi, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; } Modified: trunk/reactos/dll/win32/msxml3/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/regsvr.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -572,6 +572,22 @@ "Msxml2.SAXXMLReader", "3.0" }, + { &CLSID_MXXMLWriter, + "IMXWriter interface", + NULL, + "msxml3.dll", + "Both", + "Msxml2.MXXMLWriter", + "3.0" + }, + { &CLSID_MXXMLWriter30, + "IMXWriter interface 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.MXXMLWriter", + "3.0" + }, { NULL } /* list terminator */ }; @@ -669,6 +685,16 @@ { "Msxml2.SAXXMLReader.3.0", "SAX XML Reader 3.0", &CLSID_SAXXMLReader30, + NULL + }, + { "Msxml2.MXXMLWriter", + "MXXMLWriter", + &CLSID_MXXMLWriter, + "Msxml2.MXXMLWriter.3.0" + }, + { "Msxml2.MXXMLWriter.3.0", + "MXXMLWriter 3.0", + &CLSID_MXXMLWriter30, NULL }, Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Sat Aug 22 17:10:54 2009 @@ -772,7 +772,7 @@ IUnknown* create_text( xmlNodePtr text ) { domtext *This; - HRESULT hr; + xmlnode *node; This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); if ( !This ) @@ -781,22 +781,15 @@ This->lpVtbl = &domtext_vtbl; This->ref = 1; - This->node_unk = create_basic_node( text, (IUnknown*)&This->lpVtbl ); - if(!This->node_unk) + node = create_basic_node( text, (IUnknown*)&This->lpVtbl ); + if(!node) { HeapFree(GetProcessHeap(), 0, This); return NULL; } - hr = IUnknown_QueryInterface(This->node_unk, &IID_IXMLDOMNode, (LPVOID*)&This->node); - if(FAILED(hr)) - { - IUnknown_Release(This->node_unk); - HeapFree( GetProcessHeap(), 0, This ); - return NULL; - } - /* The ref on This->node is actually looped back into this object, so release it */ - IXMLDOMNode_Release(This->node); + This->node_unk = (IUnknown*)&node->lpInternalUnkVtbl; + This->node = IXMLDOMNode_from_impl(node); return (IUnknown*) &This->lpVtbl; }

1 0

[sginsberg] 42845: - combotst: Fix uninitialized variable usage spotted by MSVC - tmrqueue: Don't use empty structures, MSVC doe - w32knapi: Implement IntSyscall in MSVC assembly, be compatible with C89 variable initialization and use '%' instead of '\%' to avoid a msvc warning.
by sginsberg＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: sginsberg Date: Sat Aug 22 16:40:56 2009 New Revision: 42845 URL: http://svn.reactos.org/svn/reactos?rev=42845&view=rev Log: - combotst: Fix uninitialized variable usage spotted by MSVC - tmrqueue: Don't use empty structures, MSVC doe - w32knapi: Implement IntSyscall in MSVC assembly, be compatible with C89 variable initialization and use '%' instead of '\%' to avoid a msvc warning. Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/tests/combotst/combotst.c trunk/rostests/tests/tmrqueue/tmrqueue.c Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserToUnicodeEx.c [iso-8859-1] Sat Aug 22 16:40:56 2009 @@ -139,7 +139,7 @@ TEST(NtUserToUnicodeEx(52, 5, KeyState, Buffer, 10, 0, hkl) == 1); TEST(Buffer[0] == '$'); TEST(NtUserToUnicodeEx(53, 6, KeyState, Buffer, 10, 0, hkl) == 1); - TEST(Buffer[0] == '\%'); + TEST(Buffer[0] == '%'); TEST(NtUserToUnicodeEx(54, 7, KeyState, Buffer, 10, 0, hkl) == 1); TEST(Buffer[0] == '^'); TEST(NtUserToUnicodeEx(55, 8, KeyState, Buffer, 10, 0, hkl) == 1); Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] Sat Aug 22 16:40:56 2009 @@ -49,8 +49,9 @@ static DWORD WINAPI IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) { - DWORD ret; + DWORD retval; +#ifdef __GNUC__ asm volatile ( "pushfl;" // Save flags @@ -62,21 +63,37 @@ "rep movsd;" // Copy params to the stack "call *%%edx;" // Call function "popfl;" // Restore flags - : "=a" (ret) + : "=a" (retval) : "S" (pFirstParam), "c" (cParams), "d"(proc) : "%edi" ); +#else + __asm + { + pushf + mov eax, cParams + shl eax, 2 + sub esp, eax + mov edi, esp + cld + rep movsd + call proc + mov retval, eax + popf + }; +#endif - return ret; + return retval; } DWORD Syscall(LPWSTR pszFunction, int cParams, void* pParams) { char szFunctionName[MAX_PATH]; + FARPROC proc; sprintf(szFunctionName, "%ls", pszFunction); - FARPROC proc = (FARPROC)GetProcAddress(g_hModule, szFunctionName); + proc = (FARPROC)GetProcAddress(g_hModule, szFunctionName); if (!proc) { printf("Couldn't find proc: %s\n", szFunctionName); Modified: trunk/rostests/tests/combotst/combotst.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/combotst/combotst.c… ============================================================================== --- trunk/rostests/tests/combotst/combotst.c [iso-8859-1] (original) +++ trunk/rostests/tests/combotst/combotst.c [iso-8859-1] Sat Aug 22 16:40:56 2009 @@ -115,7 +115,7 @@ VOID HandlePrintRect(HWND handle,DWORD Msg,WPARAM wParam,LPARAM lParam) { - RECT rect; + RECT rect = *(RECT*)lParam; TextBuffer[8] = (char)(BUFFERLEN - 8); /* Setting the max size to put chars in first byte */ SendMessage(handle,Msg,wParam,lParam); Modified: trunk/rostests/tests/tmrqueue/tmrqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/tmrqueue/tmrqueue.c… ============================================================================== --- trunk/rostests/tests/tmrqueue/tmrqueue.c [iso-8859-1] (original) +++ trunk/rostests/tests/tmrqueue/tmrqueue.c [iso-8859-1] Sat Aug 22 16:40:56 2009 @@ -102,7 +102,7 @@ { struct { - /* nothing */ + HANDLE Dummy; } Test1; struct {

1 0

[gbrunmar] 42844: - Implemented MSVC version of fmod
by gbrunmar＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: gbrunmar Date: Sat Aug 22 15:21:01 2009 New Revision: 42844 URL: http://svn.reactos.org/svn/reactos?rev=42844&view=rev Log: - Implemented MSVC version of fmod Modified: trunk/reactos/lib/sdk/crt/math/i386/fmod.c Modified: trunk/reactos/lib/sdk/crt/math/i386/fmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fmod… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/fmod.c [iso-8859-1] Sat Aug 22 15:21:01 2009 @@ -33,7 +33,16 @@ "jp 1b" : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); #else -#error IMPLEMENT ME + __asm + { + fld __y + fld __x +L1: fprem1 + fstsw ax + sahf + jp L1 + fstp __val + } #endif /*__GNUC__*/ return __val; }

1 0

[gbrunmar] 42843: - Implemented MSVC version of exp
by gbrunmar＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: gbrunmar Date: Sat Aug 22 15:06:11 2009 New Revision: 42843 URL: http://svn.reactos.org/svn/reactos?rev=42843&view=rev Log: - Implemented MSVC version of exp Modified: trunk/reactos/lib/sdk/crt/math/i386/exp.c Modified: trunk/reactos/lib/sdk/crt/math/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/exp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/exp.c [iso-8859-1] Sat Aug 22 15:06:11 2009 @@ -42,6 +42,22 @@ return __value; #else -#error IMPLEMENT ME + register double __val; + __asm + { + fld1 // store 1.0 for later use + fld __x + fldl2e // e^x = 2^(x * log2(e)) + fmul st,st(1) // x * log2(e) + fld st(0) + frndint // int(x * log2(e)) + fsub st,st(1) // fract(x * log2(e)) + fxch + f2xm1 // 2^(fract(x * log2(e))) - 1 + fadd st,st(3) // + 1.0 + fscale + fstp __val + } + return __val; #endif /*__GNUC__*/ }

1 0

[gbrunmar] 42842: - Implemented MSVC version of ldexp
by gbrunmar＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: gbrunmar Date: Sat Aug 22 12:16:11 2009 New Revision: 42842 URL: http://svn.reactos.org/svn/reactos?rev=42842&view=rev Log: - Implemented MSVC version of ldexp Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ldex… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] Sat Aug 22 12:16:11 2009 @@ -30,7 +30,14 @@ ("fscale" : "=t" (__val) : "0" (__x), "u" ((double) __y)); #else -#error IMPLEMENT ME + register double __dy = (double)__y; + __asm + { + fld __dy + fld __x + fscale + fstp __val + } #endif /*__GNUC__*/ return __val; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs