Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66881: [MAPI32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 16:00:04 2015 New Revision: 66881 URL: http://svn.reactos.org/svn/reactos?rev=66881&view=rev Log: [MAPI32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/mapi32/prop.c Modified: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?r… ============================================================================== --- trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] Wed Mar 25 16:00:04 2015 @@ -1232,7 +1232,7 @@ /* GetLastError - No errors set */ lpError = NULL; - IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError); + sc = IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError); ok(sc == S_OK && !lpError, "GetLastError: Expected S_OK, null, got 0x%08X,%p\n", sc, lpError);

10 years, 1 month

[akhaldi] 66880: [MCIAVI32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 15:59:32 2015 New Revision: 66880 URL: http://svn.reactos.org/svn/reactos?rev=66880&view=rev Log: [MCIAVI32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Wed Mar 25 15:59:32 2015 @@ -69,7 +69,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - DWORD ret; + DWORD ret = MCIERR_UNSUPPORTED_FUNCTION; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -170,7 +170,6 @@ /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); - ret = MCIERR_UNSUPPORTED_FUNCTION; break; } } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 15:59:32 2015 @@ -101,7 +101,7 @@ reactos/dll/win32/localui # Synced to Wine-1.7.27 reactos/dll/win32/lz32 # Synced to Wine-1.7.27 reactos/dll/win32/mapi32 # Synced to Wine-1.7.27 -reactos/dll/win32/mciavi32 # Synced to Wine-1.7.27 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mcicda # Synced to Wine-1.7.27 reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.27 reactos/dll/win32/mciseq # Synced to Wine-1.7.27

10 years, 1 month

[akhaldi] 66879: [LOCALSPL] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 15:58:54 2015 New Revision: 66879 URL: http://svn.reactos.org/svn/reactos?rev=66879&view=rev Log: [LOCALSPL] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Wed Mar 25 15:58:54 2015 @@ -83,9 +83,7 @@ static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; -static const WCHAR default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; static const WCHAR dependent_filesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; -static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; static const WCHAR emptyW[] = {0}; static const WCHAR fmt_driversW[] = { 'S','y','s','t','e','m','\\', @@ -100,13 +98,10 @@ 'P','r','i','n','t','\\', 'E','n','v','i','r','o','n','m','e','n','t','s','\\','%','s','\\', 'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r','s',0 }; -static const WCHAR hardwareidW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR help_fileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR ia64_envnameW[] = {'W','i','n','d','o','w','s',' ','I','A','6','4',0}; static const WCHAR ia64_subdirW[] = {'i','a','6','4',0}; static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR monitorsW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -114,10 +109,6 @@ 'P','r','i','n','t','\\', 'M','o','n','i','t','o','r','s','\\',0}; static const WCHAR monitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static const WCHAR nameW[] = {'N','a','m','e',0}; -static const WCHAR oem_urlW[] = {'O','E','M',' ','U','r','l',0}; -static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 15:58:54 2015 @@ -97,7 +97,7 @@ reactos/dll/win32/jscript # Synced to WineStaging-1.7.37 reactos/dll/win32/jsproxy # Synced to Wine-1.7.27 reactos/dll/win32/loadperf # Synced to Wine-1.7.27 -reactos/dll/win32/localspl # Synced to Wine-1.7.27 +reactos/dll/win32/localspl # Synced to WineStaging-1.7.37 reactos/dll/win32/localui # Synced to Wine-1.7.27 reactos/dll/win32/lz32 # Synced to Wine-1.7.27 reactos/dll/win32/mapi32 # Synced to Wine-1.7.27

10 years, 1 month

[akhaldi] 66878: [JSCRIPT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 15:58:33 2015 New Revision: 66878 URL: http://svn.reactos.org/svn/reactos?rev=66878&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/jscript/cc.js trunk/rostests/winetests/jscript/lang.js trunk/rostests/winetests/jscript/run.c Modified: trunk/rostests/winetests/jscript/cc.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/cc.js?r… ============================================================================== --- trunk/rostests/winetests/jscript/cc.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/cc.js [iso-8859-1] Wed Mar 25 15:58:33 2015 @@ -72,4 +72,241 @@ } ok(tmp, "expected syntax exception"); +ok(isNaN(@test), "@test = " + @test); + +@set @test = 1 +ok(@test === 1, "@test = " + @test); + +@set @test = 0 +ok(@test === 0, "@test = " + @test); + +tmp = false +@set @test = @test tmp=true +ok(@test === 0, "@test = " + @test); +ok(tmp, "expr after @set not evaluated"); + +@set @test = !@test +ok(@test === true, "@test = " + @test); + +@set @test = (@test+1+true) +ok(@test === 3, "@test = " + @test); + +@set + @test + = + 2 +ok(@test === 2, "@test = " + @test); + +@set + @test + = + ( + 2 + + + 2 + ) +ok(@test === 4, "@test = " + @test); + +@set @test = 2.5 +ok(@test === 2.5, "@test = " + @test); + +@set @test = 0x4 +ok(@test === 4, "@test = " + @test); + +@set @test = (2 + 2/2) +ok(@test === 3, "@test = " + @test); + +@set @test = (false+false) +ok(@test === 0, "@test = " + @test); + +@set @test = ((1+1)*((3)+1)) +ok(@test === 8, "@test = " + @test); + +@set @_test = true +ok(@_test === true, "@_test = " + @_test); + +@set @$test = true +ok(@$test === true, "@$test = " + @$test); + +@set @newtest = (@newtest != @newtest) +ok(@newtest === true, "@newtest = " + @newtest); + +@set @test = (false != 0) +ok(@test === false, "@test = " + @test); + +@set @test = (1 != true) +ok(@test === false, "@test = " + @test); + +@set @test = (0 != true) +ok(@test === true, "@test = " + @test); + +@set @test = (true-2) +ok(@test === -1, "@test = " + @test); + +@set @test = (true-@_jscript) +ok(@test === 0, "@test = " + @test); + +@set @test = (true==1) +ok(@test === true, "@test = " + @test); + +@set @test = (1==false+1) +ok(@test === true, "@test = " + @test); + +function expect(val, exval) { + ok(val === exval, "got " + val + " expected " + exval); +} + +@set @test = (false < 0.5) +expect(@test, true); + +@set @test = (true == 0 < 0.5) +expect(@test, true); + +@set @test = (false < 0) +expect(@test, false); + +@set @test = (false > 0.5) +expect(@test, false); + +@set @test = (1 < true) +expect(@test, false); + +@set @test = (1 <= true) +expect(@test, true); + +@set @test = (1 >= true) +expect(@test, true); + +@set @test = (1 >= true-1) +expect(@test, true); + +@if (false) + this wouldn not parse +"@end + +@if (false) "@end + +tmp = "@if (false) @end"; +ok(tmp.length === 16, "tmp.length = " + tmp.length); + +@if(true) +tmp = true +@end +ok(tmp === true, "tmp = " + tmp); + +@if(false) +@if this would not CC parse +this will not parse +@elif(true) +this will also not parse +@else +this also will not parse +@if let me complicate things a bit +@end enough +@end +@end + +@if(false) +this will not parse +@else +tmp = 2 +@else +this will not be parsed +@else +also this +@end +ok(tmp === 2, "tmp = " + tmp); + +@if(true) +tmp = 3; +@else +just skip this +@end +ok(tmp === 3, "tmp = " + tmp); + +@if(true) +tmp = 4; +@elif(true) +this will not parse +@elif nor this +@else +just skip this +@end +ok(tmp === 4, "tmp = " + tmp); + +@if(false) +this will not parse +@elif(false) +nor this would +@elif(true) +tmp = 5; +@elif nor this +@else +just skip this +@end +ok(tmp === 5, "tmp = " + tmp); + +@if (!@_jscript) +this would not parse +@if(true) +@else +@if(false) +@end +@end +@elif (@_jscript) +tmp = 6; +@elif (true) +@if xxx +@else +@if @elif @elif @else @end +@end +@else +this would not parse +@end +ok(tmp === 6, "tmp = " + tmp); + +@if(true) +@if(false) +@else +tmp = 7; +@end +@else +this would not parse +@end +ok(tmp === 7, "tmp = " + tmp); + +var exception_map = { + JS_E_SYNTAX: {type: "SyntaxError", number: -2146827286}, + JS_E_MISSING_LBRACKET: {type: "SyntaxError", number: -2146827283}, + JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, + JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_CCEND: {type: "SyntaxError", number: -2146827259}, + JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} +}; + +function testException(src, id) { + var ex = exception_map[id]; + var ret = "", num = ""; + + try { + eval(src); + } catch(e) { + ret = e.name; + num = e.number; + } + + ok(ret === ex.type, "Exception test, ret = " + ret + ", expected " + ex.type +". Executed code: " + src); + ok(num === ex.number, "Exception test, num = " + num + ", expected " + ex.number + ". Executed function: " + src); +} + +testException("@set test=true", "JS_E_EXPECTED_AT"); +testException("@set @1=true", "JS_E_EXPECTED_IDENTIFIER"); +testException("@set @test x=true", "JS_E_EXPECTED_ASSIGN"); +testException("@if false\n@end", "JS_E_MISSING_LBRACKET"); +testException("@if (false)\n", "JS_E_EXPECTED_CCEND"); +testException("@end\n", "JS_E_SYNTAX"); +testException("@elif\n", "JS_E_SYNTAX"); +testException("@else\n", "JS_E_SYNTAX"); +testException("@if false\n@elif true\n@end", "JS_E_MISSING_LBRACKET"); + reportSuccess(); Modified: trunk/rostests/winetests/jscript/lang.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js… ============================================================================== --- trunk/rostests/winetests/jscript/lang.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/lang.js [iso-8859-1] Wed Mar 25 15:58:33 2015 @@ -1450,6 +1450,24 @@ ok(returnTest() === undefined, "returnTest = " + returnTest()); +ActiveXObject = 1; +ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); + +Boolean = 1; +ok(Boolean === 1, "Boolean = " + Boolean); + +Object = 1; +ok(Object === 1, "Object = " + Object); + +Array = 1; +ok(Array === 1, "Array = " + Array); + +Date = 1; +ok(Date === 1, "Date = " + Date); + +Error = 1; +ok(Error === 1, "Error = " + Error); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined); 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] Wed Mar 25 15:58:33 2015 @@ -87,6 +87,8 @@ DEFINE_EXPECT(global_propget_i); DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); +DEFINE_EXPECT(global_propputref_d); +DEFINE_EXPECT(global_propputref_i); DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_nopropdelete_d); DEFINE_EXPECT(global_success_d); @@ -143,6 +145,8 @@ #define DISPID_GLOBAL_TESTRES 0x1018 #define DISPID_GLOBAL_TESTNORES 0x1019 #define DISPID_GLOBAL_DISPEXFUNC 0x101a +#define DISPID_GLOBAL_TESTPROPPUTREF 0x101b +#define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -151,6 +155,7 @@ #define DISPID_TESTOBJ_ONLYDISPID 0x2001 #define DISPID_TESTOBJ_WITHPROP 0x2002 +#define JS_E_OUT_OF_MEMORY 0x800a03ec #define JS_E_INVALID_CHAR 0x800a03f6 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -164,6 +169,7 @@ static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +static IActiveScript *script_engine; static const CLSID *engine_clsid = &CLSID_JScript; /* Returns true if the user interface is in English. Note that this does not @@ -614,6 +620,12 @@ *pid = DISPID_GLOBAL_TESTPROPPUT; return S_OK; } + if(!strcmp_wa(bstrName, "testPropPutRef")) { + CHECK_EXPECT(global_propputref_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTPROPPUTREF; + return S_OK; + } if(!strcmp_wa(bstrName, "testPropDelete")) { CHECK_EXPECT(global_propdelete_d); test_grfdex(grfdex, fdexNameCaseSensitive); @@ -750,6 +762,11 @@ if(!strcmp_wa(bstrName, "dispexFunc")) { *pid = DISPID_GLOBAL_DISPEXFUNC; + return S_OK; + } + + if(!strcmp_wa(bstrName, "getScriptState")) { + *pid = DISPID_GLOBAL_GETSCRIPTSTATE; return S_OK; } @@ -845,6 +862,21 @@ ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(pdp->rgvarg)=%d\n", V_VT(pdp->rgvarg)); ok(V_I4(pdp->rgvarg) == 1, "V_I4(pdp->rgvarg)=%d\n", V_I4(pdp->rgvarg)); + return S_OK; + + case DISPID_GLOBAL_TESTPROPPUTREF: + CHECK_EXPECT(global_propputref_i); + + ok(wFlags == (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg)=%d\n", V_VT(pdp->rgvarg)); return S_OK; case DISPID_GLOBAL_GETVT: @@ -1090,6 +1122,18 @@ return S_OK; + case DISPID_GLOBAL_GETSCRIPTSTATE: { + SCRIPTSTATE state; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script_engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = state; + return S_OK; + } + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1174,7 +1218,7 @@ return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[4]; + VARIANT args[6], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1210,6 +1254,12 @@ V_UNKNOWN(args+2) = (IUnknown*)&testObj; V_VT(args+3) = VT_UNKNOWN; V_UNKNOWN(args+3) = NULL; + V_VT(args+4) = VT_UI4; + V_UI4(args+4) = 0xffffffff; + V_VT(args+5) = VT_BYREF|VT_VARIANT; + V_VARIANTREF(args+5) = &v; + V_VT(&v) = VT_I4; + V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -1890,7 +1940,48 @@ IActiveScriptParse_Release(parser); } -static HRESULT parse_script_expr(const char *expr, VARIANT *res) +static void test_start(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("ok(getScriptState() === 5, \"getScriptState = \" + getScriptState());\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + +static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; IActiveScript *engine; @@ -1921,56 +2012,195 @@ hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); SysFreeString(str); - IActiveScript_Release(engine); IActiveScriptParse_Release(parser); + if(engine_ret) { + *engine_ret = engine; + }else { + IActiveScript_Close(engine); + IActiveScript_Release(engine); + } return hres; } -static void test_script_exprs(void) -{ +static void test_default_value(void) +{ + DISPPARAMS dp = {0}; + IDispatch *disp; VARIANT v; HRESULT hres; + hres = parse_script_expr("new Date()", &v, NULL); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK || broken(hres == 0x8000ffff), "Invoke failed: %08x\n", hres); + if(hres == S_OK) + { + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + } + + VariantClear(&v); + IDispatch_Release(disp); +} + +static void test_script_exprs(void) +{ + VARIANT v; + HRESULT hres; + testing_expr = TRUE; - hres = parse_script_expr("true", &v); + hres = parse_script_expr("true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); - hres = parse_script_expr("false, true", &v); + hres = parse_script_expr("false, true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", &v); + hres = parse_script_expr("reportSuccess(); true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); - hres = parse_script_expr("if(false) true", &v); + hres = parse_script_expr("if(false) true", &v, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); - hres = parse_script_expr("return testPropGet", &v); + hres = parse_script_expr("return testPropGet", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); - hres = parse_script_expr("reportSuccess(); return true", &v); + hres = parse_script_expr("reportSuccess(); return true", &v, NULL); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - hres = parse_script_expr("reportSuccess(); true", NULL); + hres = parse_script_expr("reportSuccess(); true", NULL, NULL); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + test_default_value(); + testing_expr = FALSE; +} + +static void test_invokeex(void) +{ + DISPID func_id, prop_id; + DISPPARAMS dp = {NULL}; + IActiveScript *script; + IDispatchEx *dispex; + VARIANT v; + BSTR str; + HRESULT hres; + + hres = parse_script_expr("var o = {func: function() {return 3;}, prop: 6}; o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + str = a2bstr("prop"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 3, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr("func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == E_UNEXPECTED || broken(hres == 0x800a1393), "InvokeEx failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); +} + +struct bom_test +{ + WCHAR str[1024]; + HRESULT hres; +}; + +static void run_bom_tests(void) +{ + BSTR src; + int i; + HRESULT hres; + struct bom_test bom_tests[] = { + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0}} + }; + + engine_clsid = &CLSID_JScript; + + for (i = 0; bom_tests[i].str[0]; i++) + { + if(bom_tests[i].hres == S_OK) + { + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + ok(hres == S_OK, "test %s failed with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + } + else + { + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + todo_wine ok(hres == bom_tests[i].hres, "test %s returned with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + } + } } static BOOL run_tests(void) @@ -2004,6 +2234,18 @@ parse_script_a("testPropPut = 1;"); CHECK_CALLED(global_propput_d); CHECK_CALLED(global_propput_i); + + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = new Object();"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); + + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = testObj;"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2143,6 +2385,12 @@ CHECK_CALLED(global_propget_d); CHECK_CALLED(global_propget_i); + SET_EXPECT(global_propputref_d); + SET_EXPECT(global_propputref_i); + parse_script_a("testPropPutRef = nullDisp;"); + CHECK_CALLED(global_propputref_d); + CHECK_CALLED(global_propputref_i); + SET_EXPECT(global_propget_d); SET_EXPECT(global_propget_i); parse_script_a("(function () { this.testPropGet; })();"); @@ -2175,12 +2423,16 @@ CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" " ok(nullunk === null, 'nullunk !== null');" + " ok(getVT(ui4) === 'VT_R8', 'getVT(ui4) = ' + getVT(ui4));" + " ok(ui4 > 0, 'ui4 = ' + ui4);" + " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" + " ok(i4ref === 2, 'i4ref = ' + i4ref);" "});"); CHECK_CALLED(global_testargtypes_i); @@ -2190,6 +2442,14 @@ CHECK_CALLED(testobj_withprop_d); CHECK_CALLED(testobj_withprop_i); + parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("@if(true)\nif(@_jscript) reportSuccess();\n@end"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js"); @@ -2197,6 +2457,7 @@ test_isvisible(FALSE); test_isvisible(TRUE); + test_start(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();"); @@ -2215,6 +2476,7 @@ ok(hres != S_OK, "ParseScriptText have not failed\n"); test_script_exprs(); + test_invokeex(); parse_script_with_error_a( "?", @@ -2257,6 +2519,8 @@ "Microsoft JScript runtime error", "Object expected", NULL); + + run_bom_tests(); return TRUE; }

10 years, 1 month

[akhaldi] 66877: [JSCRIPT] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 15:58:08 2015 New Revision: 66877 URL: http://svn.reactos.org/svn/reactos?rev=66877&view=rev Log: [JSCRIPT] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/reactos/dll/win32/jscript/cc_parser.tab.c (with props) trunk/reactos/dll/win32/jscript/cc_parser.y (with props) trunk/reactos/dll/win32/jscript/parser.h (with props) Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/jscript/array.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/engine.h 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/jsregexp.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc trunk/reactos/dll/win32/jscript/lang/jscript_De.rc trunk/reactos/dll/win32/jscript/lang/jscript_En.rc trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc trunk/reactos/dll/win32/jscript/lang/jscript_He.rc trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc trunk/reactos/dll/win32/jscript/lang/jscript_It.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc trunk/reactos/dll/win32/jscript/lang/jscript_No.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc trunk/reactos/dll/win32/jscript/lang/jscript_Sq.rc trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y trunk/reactos/dll/win32/jscript/resource.h trunk/reactos/dll/win32/jscript/string.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… Added: trunk/reactos/dll/win32/jscript/cc_parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/cc_parse… Added: trunk/reactos/dll/win32/jscript/cc_parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/cc_parse… Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… Modified: trunk/reactos/dll/win32/jscript/jsregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsregexp… Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… Added: trunk/reactos/dll/win32/jscript/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.h… Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… Modified: trunk/reactos/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.y… Modified: trunk/reactos/dll/win32/jscript/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/resource… Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

10 years, 1 month

[akhaldi] 66876: [PSDK] Update mlang.idl. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:59:44 2015 New Revision: 66876 URL: http://svn.reactos.org/svn/reactos?rev=66876&view=rev Log: [PSDK] Update mlang.idl. CORE-9246 Modified: trunk/reactos/include/psdk/mlang.idl Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/mlang.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mlang.idl [iso-8859-1] Wed Mar 25 11:59:44 2015 @@ -395,6 +395,18 @@ MLCONVCHARF_DETECTJPN = 32 } MLCONVCHAR; + typedef enum tagMLCPF + { + MLDETECTF_MAILNEWS = 0x0001, + MLDETECTF_BROWSER = 0x0002, + MLDETECTF_VALID = 0x0004, + MLDETECTF_VALID_NLS = 0x0008, + MLDETECTF_PRESERVE_ORDER = 0x0010, + MLDETECTF_PREFERRED_ONLY = 0x0020, + MLDETECTF_FILTER_SPECIALCHAR = 0x0040, + MLDETECTF_EURO_UTF8 = 0x0080 + } MLCP; + HRESULT Initialize( [in] UINT uiSrcCodePage, [in] UINT uiDstCodePage,

10 years, 1 month

[akhaldi] 66875: [ITSS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:58:28 2015 New Revision: 66875 URL: http://svn.reactos.org/svn/reactos?rev=66875&view=rev Log: [ITSS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/itss/protocol.c Modified: trunk/rostests/winetests/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/protocol.c… ============================================================================== --- trunk/rostests/winetests/itss/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/protocol.c [iso-8859-1] Wed Mar 25 11:58:28 2015 @@ -38,12 +38,6 @@ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ expect_ ## func = FALSE; \ - called_ ## func = TRUE; \ - }while(0) - -#define CHECK_EXPECT2(func) \ - do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0)

10 years, 1 month

[akhaldi] 66874: [IMAGEHLP_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:57:51 2015 New Revision: 66874 URL: http://svn.reactos.org/svn/reactos?rev=66874&view=rev Log: [IMAGEHLP_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/imagehlp/image.c Modified: trunk/rostests/winetests/imagehlp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.… ============================================================================== --- trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imagehlp/image.c [iso-8859-1] Wed Mar 25 11:57:51 2015 @@ -390,10 +390,10 @@ SetLastError(0xdeadbeef); ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, testing_status_routine); - todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || - (GetLastError() == ERROR_INVALID_PARAMETER)), - "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", + GetLastError()); file = create_temp_file(temp_file); if (file == INVALID_HANDLE_VALUE) @@ -415,14 +415,14 @@ testing_status_routine); ok(ret, "BindImageEx failed: %d\n", GetLastError()); - todo_wine ok(status_routine_called[BindImportModule] == 1, - "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); - - todo_wine ok((status_routine_called[BindImportProcedure] == 1) + ok(status_routine_called[BindImportModule] == 1, + "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + + ok((status_routine_called[BindImportProcedure] == 1) #if defined(_WIN64) - || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ + || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ #endif - , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); + , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); DeleteFileA(temp_file); }

10 years, 1 month

[akhaldi] 66873: [IMAGEHLP] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:57:17 2015 New Revision: 66873 URL: http://svn.reactos.org/svn/reactos?rev=66873&view=rev Log: [IMAGEHLP] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Wed Mar 25 11:57:17 2015 @@ -20,10 +20,15 @@ #include "precomp.h" +#include <wine/winternl.h> + static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount); /*********************************************************************** * BindImage (IMAGEHLP.@) + * + * NOTES + * See BindImageEx */ BOOL WINAPI BindImage( PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath) @@ -33,16 +38,113 @@ /*********************************************************************** * BindImageEx (IMAGEHLP.@) + * + * Compute the virtual address of each function imported by a PE image + * + * PARAMS + * + * Flags [in] Bind options + * ImageName [in] File name of the image to be bound + * DllPath [in] Root of the fallback search path in case the ImageName file cannot be opened + * SymbolPath [in] Symbol file root search path + * StatusRoutine [in] Pointer to a status routine which will be called during the binding process + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Binding is not implemented yet, so far this function only enumerates + * all imported dlls/functions and returns TRUE. */ BOOL WINAPI BindImageEx( DWORD Flags, PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { - FIXME("(%d, %s, %s, %s, %p): stub\n", - Flags, debugstr_a(ImageName), debugstr_a(DllPath), - debugstr_a(SymbolPath), StatusRoutine - ); - return TRUE; + LOADED_IMAGE loaded_image; + const IMAGE_IMPORT_DESCRIPTOR *import_desc; + ULONG size; + + FIXME("(%d, %s, %s, %s, %p): semi-stub\n", + Flags, debugstr_a(ImageName), debugstr_a(DllPath), + debugstr_a(SymbolPath), StatusRoutine + ); + + if (!(MapAndLoad(ImageName, DllPath, &loaded_image, TRUE, TRUE))) return FALSE; + + if (!(import_desc = RtlImageDirectoryEntryToData((HMODULE)loaded_image.MappedAddress, FALSE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size))) + { + UnMapAndLoad(&loaded_image); + return TRUE; /* No imported modules means nothing to bind, so we're done. */ + } + + /* FIXME: Does native imagehlp support both 32-bit and 64-bit PE executables? */ +#ifdef _WIN64 + if (loaded_image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) +#else + if (loaded_image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) +#endif + { + FIXME("Wrong architecture in PE header, unable to enumerate imports\n"); + UnMapAndLoad(&loaded_image); + return TRUE; + } + + for (; import_desc->Name && import_desc->FirstThunk; ++import_desc) + { + IMAGE_THUNK_DATA *thunk; + char dll_fullname[MAX_PATH]; + const char *dll_name; + + if (!(dll_name = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, + import_desc->Name, 0))) + { + UnMapAndLoad(&loaded_image); + SetLastError(ERROR_INVALID_ACCESS); /* FIXME */ + return FALSE; + } + + if (StatusRoutine) + StatusRoutine(BindImportModule, ImageName, dll_name, 0, 0); + + if (!SearchPathA(DllPath, dll_name, 0, sizeof(dll_fullname), dll_fullname, 0)) + { + UnMapAndLoad(&loaded_image); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (!(thunk = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, + import_desc->OriginalFirstThunk ? import_desc->OriginalFirstThunk : + import_desc->FirstThunk, 0))) + { + ERR("Can't grab thunk data of %s, going to next imported DLL\n", dll_name); + continue; + } + + for (; thunk->u1.Ordinal; ++thunk) + { + /* Ignoring ordinal imports for now */ + if(!IMAGE_SNAP_BY_ORDINAL(thunk->u1.Ordinal)) + { + IMAGE_IMPORT_BY_NAME *iibn; + + if (!(iibn = ImageRvaToVa(loaded_image.FileHeader, loaded_image.MappedAddress, + thunk->u1.AddressOfData, 0))) + { + ERR("Can't grab import by name info, skipping to next ordinal\n"); + continue; + } + + if (StatusRoutine) + StatusRoutine(BindImportProcedure, ImageName, dll_fullname, 0, (ULONG_PTR)iibn->Name); + } + } + } + + UnMapAndLoad(&loaded_image); + return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 11:57:17 2015 @@ -85,7 +85,7 @@ reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.37 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.27 -reactos/dll/win32/imagehlp # Synced to Wine-1.7.27 +reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to Wine-1.7.27 reactos/dll/win32/inetmib1 # Synced to Wine-1.7.27

10 years, 1 month

[akhaldi] 66872: [IEFRAME] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:56:14 2015 New Revision: 66872 URL: http://svn.reactos.org/svn/reactos?rev=66872&view=rev Log: [IEFRAME] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/ieframe/client.c trunk/reactos/dll/win32/ieframe/dochost.c trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/ieframe/iexplore.c trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/dll/win32/ieframe/oleobject.c trunk/reactos/dll/win32/ieframe/shellbrowser.c trunk/reactos/dll/win32/ieframe/webbrowser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/client.c… ============================================================================== --- trunk/reactos/dll/win32/ieframe/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/client.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -288,7 +288,7 @@ TRACE("(%p)->(%p, %x)\n", This, pfNoRedraw, dwFlags); /* FIXME: Avoid redraw, when possible */ - pfNoRedraw = FALSE; + *pfNoRedraw = FALSE; if (dwFlags) { FIXME("dwFlags not supported (%x)\n", dwFlags); Modified: trunk/reactos/dll/win32/ieframe/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/dochost.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/dochost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/dochost.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -525,11 +525,14 @@ This->document = NULL; } -HRESULT refresh_document(DocHost *This) +HRESULT refresh_document(DocHost *This, const VARIANT *level) { IOleCommandTarget *cmdtrg; VARIANT vin, vout; HRESULT hres; + + if(level && (V_VT(level) != VT_I4 || V_I4(level) != REFRESH_NORMAL)) + FIXME("Unsupported refresh level %s\n", debugstr_variant(level)); if(!This->document) { FIXME("no document\n"); Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -178,14 +178,16 @@ TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, Level); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, Level); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI InternetExplorer_Stop(IWebBrowser2 *iface) Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -281,7 +281,7 @@ HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; HRESULT go_forward(DocHost*) DECLSPEC_HIDDEN; -HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*,const VARIANT*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; @@ -289,6 +289,7 @@ void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; +void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore… ============================================================================== --- trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -700,7 +700,7 @@ wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON)); wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = 0; wc.lpszClassName = szIEWinFrame; wc.lpszMenuName = NULL; Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate… ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -759,6 +759,27 @@ heap_free(task); } +void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +{ + DISPPARAMS dispparams; + VARIANTARG params[2]; + + TRACE("command=%d enable=%d\n", command, enable); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL; + V_BOOL(params) = enable; + + V_VT(params+1) = VT_I4; + V_I4(params+1) = command; + + call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); +} + static void doc_navigate_proc(DocHost *This, task_header_t *t) { task_doc_navigate_t *task = (task_doc_navigate_t*)t; @@ -861,6 +882,9 @@ FIXME("Navigation canceled\n"); return S_OK; } + + on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); + on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); if(This->document) deactivate_document(This); @@ -1053,6 +1077,17 @@ if(!This->doc_navigate) { FIXME("unsupported doc_navigate FALSE\n"); return E_NOTIMPL; + } + + if (travellog_pos < This->travellog.position) + { + on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_FALSE); + on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_TRUE); + } + else if (travellog_pos > This->travellog.position) + { + on_commandstate_change(This, CSC_NAVIGATEBACK, VARIANT_TRUE); + on_commandstate_change(This, CSC_NAVIGATEFORWARD, VARIANT_FALSE); } This->travellog.loading_pos = travellog_pos; Modified: trunk/reactos/dll/win32/ieframe/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/ieframe/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/oleobject.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -282,8 +282,8 @@ typedef struct { IEnumOLEVERB IEnumOLEVERB_iface; - LONG ref; + LONG iter; } EnumOLEVERB; static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) @@ -338,10 +338,20 @@ { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + static const OLEVERB verbs[] = + {{OLEIVERB_PRIMARY},{OLEIVERB_INPLACEACTIVATE},{OLEIVERB_UIACTIVATE},{OLEIVERB_SHOW},{OLEIVERB_HIDE}}; + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + /* There are a few problems with this implementation, but that's how it seems to work in native. See tests. */ if(pceltFetched) *pceltFetched = 0; + + if(This->iter == sizeof(verbs)/sizeof(*verbs)) + return S_FALSE; + + if(celt) + *rgelt = verbs[This->iter++]; return S_OK; } @@ -355,7 +365,10 @@ static HRESULT WINAPI EnumOLEVERB_Reset(IEnumOLEVERB *iface) { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)\n", This); + + This->iter = 0; return S_OK; } @@ -419,6 +432,9 @@ release_client_site(This); if(!pClientSite) { + on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, VARIANT_FALSE); + on_commandstate_change(&This->doc_host, CSC_NAVIGATEFORWARD, VARIANT_FALSE); + if(This->doc_host.document) deactivate_document(&This->doc_host); return S_OK; @@ -589,6 +605,7 @@ ret->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERBVtbl; ret->ref = 1; + ret->iter = 0; *ppEnumOleVerb = &ret->IEnumOLEVERB_iface; return S_OK; Modified: trunk/reactos/dll/win32/ieframe/shellbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shellbro… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shellbrowser.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -703,9 +703,14 @@ V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); TRACE("<<<\n"); + + IShellBrowser_Release(&This->IShellBrowser_iface); SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); @@ -759,6 +764,9 @@ V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); TRACE("<<<\n"); @@ -766,6 +774,7 @@ SysFreeString(url); This->doc_host->busy = VARIANT_FALSE; + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; } Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows… ============================================================================== --- trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -289,14 +289,16 @@ TRACE("(%p)\n", This); - return refresh_document(&This->doc_host); + return refresh_document(&This->doc_host, NULL); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(Level)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(Level)); + + return refresh_document(&This->doc_host, Level); } static HRESULT WINAPI WebBrowser_Stop(IWebBrowser2 *iface) @@ -934,7 +936,12 @@ VARIANT_BOOL *pbRegister) { WebBrowser *This = impl_from_IWebBrowser2(iface); + FIXME("(%p)->(%p)\n", This, pbRegister); + + if(!pbRegister) + return E_INVALIDARG; + *pbRegister=0; return S_OK; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 11:56:14 2015 @@ -83,7 +83,7 @@ reactos/dll/win32/httpapi # Synced to Wine-1.7.27 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 reactos/dll/win32/icmp # Out of sync -reactos/dll/win32/ieframe # Synced to Wine-1.7.27 +reactos/dll/win32/ieframe # Synced to WineStaging-1.7.37 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.27 reactos/dll/win32/imagehlp # Synced to Wine-1.7.27 reactos/dll/win32/imm32 # Synced to Wine-1.7.27

10 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs