Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[cwittich] 39590: sync jscript_winetest with wine 1.1.15

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:05:50 2009 New Revision: 39590 URL: http://svn.reactos.org/svn/reactos?rev=39590&view=rev Log: sync jscript_winetest with wine 1.1.15 Modified: trunk/rostests/winetests/jscript/api.js trunk/rostests/winetests/jscript/jscript.c 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] Fri Feb 13 12:05:50 2009 @@ -519,6 +519,9 @@ tmp = Math.round(1.1, 3, 4); ok(tmp === 1, "Math.round(1.1, 3, 4) = " + tmp); +tmp = Math.round(); +ok(isNaN(tmp), "Math.round() is not NaN"); + tmp = Math.ceil(0.5); ok(tmp === 1, "Math.ceil(0.5) = " + tmp); @@ -584,6 +587,14 @@ tmp = Math.pow(2, 2, 3); ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); + +tmp = Math.random(); +ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); +ok(0 <= tmp && tmp <= 1, "Math.random() = " + tmp); + +tmp = Math.random(100); +ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); +ok(0 <= tmp && tmp <= 1, "Math.random(100) = " + tmp); var func = function (a) { var a = 1; Modified: trunk/rostests/winetests/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/jscript… ============================================================================== --- trunk/rostests/winetests/jscript/jscript.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/jscript.c [iso-8859-1] Fri Feb 13 12:05:50 2009 @@ -295,14 +295,19 @@ hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(script); + return; + } test_state(script, SCRIPTSTATE_UNINITIALIZED); test_safety(unk); - hres = IActiveScriptParse_InitNew(parse); + hres = IActiveScriptParse64_InitNew(parse); ok(hres == S_OK, "InitNew failed: %08x\n", hres); - hres = IActiveScriptParse_InitNew(parse); + hres = IActiveScriptParse64_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); hres = IActiveScript_SetScriptSite(script, NULL); @@ -340,7 +345,7 @@ test_state(script, SCRIPTSTATE_CLOSED); test_script_dispatch(script, FALSE); - IActiveScriptParse_Release(parse); + IUnknown_Release(parse); IActiveScript_Release(script); ref = IUnknown_Release(unk); @@ -366,6 +371,11 @@ hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(script); + return; + } test_state(script, SCRIPTSTATE_UNINITIALIZED); @@ -377,11 +387,11 @@ test_state(script, SCRIPTSTATE_UNINITIALIZED); SET_EXPECT(OnStateChange_INITIALIZED); - hres = IActiveScriptParse_InitNew(parse); + hres = IActiveScriptParse64_InitNew(parse); ok(hres == S_OK, "InitNew failed: %08x\n", hres); CHECK_CALLED(OnStateChange_INITIALIZED); - hres = IActiveScriptParse_InitNew(parse); + hres = IActiveScriptParse64_InitNew(parse); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); SET_EXPECT(OnStateChange_CONNECTED); @@ -403,7 +413,7 @@ test_state(script, SCRIPTSTATE_CLOSED); test_script_dispatch(script, FALSE); - IActiveScriptParse_Release(parse); + IUnknown_Release(parse); IActiveScript_Release(script); ref = IUnknown_Release(unk); 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] Fri Feb 13 12:05:50 2009 @@ -574,8 +574,13 @@ hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - - hres = IActiveScriptParse_InitNew(parser); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return; + } + + hres = IActiveScriptParse64_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); @@ -588,11 +593,11 @@ hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); - hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IActiveScript_Release(engine); - IActiveScriptParse_Release(parser); + IUnknown_Release(parser); } static void parse_script_a(const char *src) @@ -696,8 +701,13 @@ hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - - hres = IActiveScriptParse_InitNew(parser); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return; + } + + hres = IActiveScriptParse64_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); @@ -717,16 +727,16 @@ if(!global_members) SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse64_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); if(!global_members) CHECK_CALLED(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse64_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IActiveScript_Release(engine); - IActiveScriptParse_Release(parser); + IUnknown_Release(parser); } static void run_tests(void)

15 years, 10 months

[cwittich] 39589: sync shdocvw, mshtml and jscript to wine 1.1.15

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:04:38 2009 New Revision: 39589 URL: http://svn.reactos.org/svn/reactos?rev=39589&view=rev Log: sync shdocvw, mshtml and jscript to wine 1.1.15 Added: trunk/reactos/dll/win32/jscript/date.c (with props) trunk/reactos/dll/win32/mshtml/htmlstyle3.c (with props) Modified: trunk/reactos/dll/win32/jscript/array.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.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lex.c 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/parser.tab.c trunk/reactos/dll/win32/jscript/parser.tab.h trunk/reactos/dll/win32/jscript/parser.y trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/string.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmllocation.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/install.c trunk/reactos/dll/win32/mshtml/mshtml.rbuild trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/script.c trunk/reactos/dll/win32/shdocvw/oleobject.c trunk/reactos/include/psdk/activdbg.idl trunk/reactos/include/psdk/activscp.idl trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl [This mail would be too long, it was shortened to contain the URLs only.] 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/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.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… 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/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… 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/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… 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… 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/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… 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/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Added: trunk/reactos/dll/win32/mshtml/htmlstyle3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/install.c… Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?… Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… Modified: trunk/reactos/include/psdk/activdbg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activdbg.idl?… Modified: trunk/reactos/include/psdk/activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activscp.idl?… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re…

15 years, 10 months

[cwittich] 39588: fix a typo spotted by gabriel_it

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 12:01:14 2009 New Revision: 39588 URL: http://svn.reactos.org/svn/reactos?rev=39588&view=rev Log: fix a typo spotted by gabriel_it Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=395… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Fri Feb 13 12:01:14 2009 @@ -299,7 +299,7 @@ } /* 7.12.3.4 */ - /* We don't need to worry about trucation here: + /* We don't need to worry about truncation here: A NaN stays a NaN. */ __CRT_INLINE int __cdecl __isnan (double _x)

15 years, 10 months

[cwittich] 39587: inline the function

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 11:58:23 2009 New Revision: 39587 URL: http://svn.reactos.org/svn/reactos?rev=39587&view=rev Log: inline the function Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=395… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Fri Feb 13 11:58:23 2009 @@ -282,7 +282,7 @@ /* #define isinf(x) (fpclassify(x) == FP_INFINITE) */ /* we don't have fpclassify */ -static int isinf (double d) { +__CRT_INLINE int isinf (double d) { int expon = 0; double val = frexp (d, &expon); if (expon == 1025) {

15 years, 10 months

[cwittich] 39586: work around missing fpclassify

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 11:55:03 2009 New Revision: 39586 URL: http://svn.reactos.org/svn/reactos?rev=39586&view=rev Log: work around missing fpclassify Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=395… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Fri Feb 13 11:55:03 2009 @@ -279,7 +279,24 @@ #define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) /* 7.12.3.3 */ -#define isinf(x) (fpclassify(x) == FP_INFINITE) +/* #define isinf(x) (fpclassify(x) == FP_INFINITE) */ + + /* we don't have fpclassify */ +static int isinf (double d) { + int expon = 0; + double val = frexp (d, &expon); + if (expon == 1025) { + if (val == 0.5) { + return 1; + } else if (val == -0.5) { + return -1; + } else { + return 0; + } + } else { + return 0; + } +} /* 7.12.3.4 */ /* We don't need to worry about trucation here:

15 years, 10 months

[cfinck] 39585: Create a branch for silverblade for his FOSDEM Hybrid CD

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Feb 13 11:46:58 2009 New Revision: 39585 URL: http://svn.reactos.org/svn/reactos?rev=39585&view=rev Log: Create a branch for silverblade for his FOSDEM Hybrid CD Added: branches/ros-branch-0_3_8-fosdem/ - copied from r39584, tags/ReactOS-0.3.8/

15 years, 10 months

[cfinck] 39584: - Add some checks to prevent crashes in unexpected situations and add useful error messages for them. This should make debugging something like r39578 easier :-) - Prevent some memory leaks in case of failure (well, some memory wasn't even freed in case of success :-P)

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Feb 13 11:39:58 2009 New Revision: 39584 URL: http://svn.reactos.org/svn/reactos?rev=39584&view=rev Log: - Add some checks to prevent crashes in unexpected situations and add useful error messages for them. This should make debugging something like r39578 easier :-) - Prevent some memory leaks in case of failure (well, some memory wasn't even freed in case of success :-P) Modified: trunk/rostests/rosautotest/main.c trunk/rostests/rosautotest/webservice.c trunk/rostests/rosautotest/winetests.c Modified: trunk/rostests/rosautotest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.c?rev=39… ============================================================================== --- trunk/rostests/rosautotest/main.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.c [iso-8859-1] Fri Feb 13 11:39:58 2009 @@ -66,15 +66,19 @@ const CHAR PasswordProp[] = "&password="; const CHAR UserNameProp[] = "&username="; + BOOL ReturnValue = FALSE; DWORD DataLength; DWORD Length; - PCHAR Password; - PCHAR UserName; + PCHAR Password = NULL; + PCHAR UserName = NULL; WCHAR ConfigFile[MAX_PATH]; /* We only need this if the results are going to be submitted */ if(!AppOptions.Submit) - return TRUE; + { + ReturnValue = TRUE; + goto Cleanup; + } /* Build the path to the configuration file from the application's path */ GetModuleFileNameW(NULL, ConfigFile, MAX_PATH); @@ -85,7 +89,7 @@ if(GetFileAttributesW(ConfigFile) == INVALID_FILE_ATTRIBUTES) { StringOut("Missing \"rosautotest.ini\" configuration file!\n"); - return FALSE; + goto Cleanup; } /* Get the required length of the authentication request string */ @@ -95,7 +99,7 @@ if(!Length) { StringOut("UserName is missing in the configuration file\n"); - return FALSE; + goto Cleanup; } /* Some characters might need to be escaped and an escaped character takes 3 bytes */ @@ -107,7 +111,7 @@ if(!Length) { StringOut("Password is missing in the configuration file\n"); - return FALSE; + goto Cleanup; } DataLength += 3 * Length; @@ -121,7 +125,16 @@ strcat(AuthenticationRequestString, PasswordProp); EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], Password); - return TRUE; + ReturnValue = TRUE; + +Cleanup: + if(UserName) + HeapFree(hProcessHeap, 0, UserName); + + if(Password) + HeapFree(hProcessHeap, 0, Password); + + return ReturnValue; } /** @@ -242,7 +255,7 @@ int wmain(int argc, wchar_t* argv[]) { - int Result = 0; + int ReturnValue = 0; UINT i; hProcessHeap = GetProcessHeap(); @@ -263,12 +276,12 @@ break; default: - Result = 1; + ReturnValue = 1; /* Fall through */ case '?': IntPrintUsage(); - goto End; + goto Cleanup; } } else @@ -292,24 +305,23 @@ } else { - Result = 1; + ReturnValue = 1; IntPrintUsage(); - goto End; + goto Cleanup; } } } if(!IntGetConfigurationValues() || !IntGetBuildAndPlatform() || !RunWineTests()) { - Result = 1; - goto End; + ReturnValue = 1; + goto Cleanup; } /* For sysreg */ OutputDebugStringA("SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); -End: - /* Cleanup */ +Cleanup: if(AppOptions.Module) HeapFree(hProcessHeap, 0, AppOptions.Module); @@ -324,7 +336,7 @@ /* Shut down the system if requested */ if(AppOptions.Shutdown && !ShutdownSystem()) - Result = 1; - - return Result; -} + ReturnValue = 1; + + return ReturnValue; +} Modified: trunk/rostests/rosautotest/webservice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/webservice.c?… ============================================================================== --- trunk/rostests/rosautotest/webservice.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/webservice.c [iso-8859-1] Fri Feb 13 11:39:58 2009 @@ -33,9 +33,10 @@ { const WCHAR Headers[] = L"Content-Type: application/x-www-form-urlencoded"; - HINTERNET hHTTP; - HINTERNET hHTTPRequest; - HINTERNET hInet; + BOOL ReturnValue = FALSE; + HINTERNET hHTTP = NULL; + HINTERNET hHTTPRequest = NULL; + HINTERNET hInet = NULL; /* Establish an internet connection to the "testman" server */ hInet = InternetOpenW(L"rosautotest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); @@ -43,7 +44,7 @@ if(!hInet) { StringOut("InternetOpenW failed\n"); - return FALSE; + goto Cleanup; } hHTTP = InternetConnectW(hInet, SERVER_HOSTNAME, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -51,7 +52,7 @@ if(!hHTTP) { StringOut("InternetConnectW failed\n"); - return FALSE; + goto Cleanup; } /* Post our test results to the web service */ @@ -60,22 +61,23 @@ if(!hHTTPRequest) { StringOut("HttpOpenRequestW failed\n"); - return FALSE; + goto Cleanup; } if(!HttpSendRequestW(hHTTPRequest, Headers, wcslen(Headers), *Data, *DataLength)) { StringOut("HttpSendRequestW failed\n"); - return FALSE; + goto Cleanup; } HeapFree(hProcessHeap, 0, *Data); + *Data = NULL; /* Get the response */ if(!InternetQueryDataAvailable(hHTTPRequest, DataLength, 0, 0)) { StringOut("InternetQueryDataAvailable failed\n"); - return FALSE; + goto Cleanup; } *Data = HeapAlloc(hProcessHeap, 0, *DataLength + 1); @@ -83,16 +85,23 @@ if(!InternetReadFile(hHTTPRequest, *Data, *DataLength, DataLength)) { StringOut("InternetReadFile failed\n"); - return FALSE; + goto Cleanup; } (*Data)[*DataLength] = 0; - - InternetCloseHandle(hHTTPRequest); - InternetCloseHandle(hHTTP); - InternetCloseHandle(hInet); - - return TRUE; + ReturnValue = TRUE; + +Cleanup: + if(hHTTPRequest) + InternetCloseHandle(hHTTPRequest); + + if(hHTTP) + InternetCloseHandle(hHTTP); + + if(hInet) + InternetCloseHandle(hInet); + + return ReturnValue; } /** @@ -127,6 +136,7 @@ * * @return * Returns the Test ID as a CHAR array if successful or NULL otherwise. + * The caller needs to HeapFree the returned pointer in case of success. */ PCHAR GetTestID(TESTTYPES TestType) @@ -135,6 +145,7 @@ DWORD DataLength; PCHAR Data; + PCHAR ReturnValue = NULL; /* Build the full request string */ DataLength = sizeof(ActionProp) - 1 + sizeof(GetTestIDAction) - 1; @@ -163,7 +174,7 @@ } if(!IntDoRequest(&Data, &DataLength)) - return NULL; + goto Cleanup; /* Verify that this is really a number */ if(!IsNumber(Data)) @@ -171,11 +182,16 @@ StringOut("Expected Test ID, but received:\n"); StringOut(Data); StringOut("\n"); + goto Cleanup; + } + + ReturnValue = Data; + +Cleanup: + if(Data && ReturnValue != Data) HeapFree(hProcessHeap, 0, Data); - return NULL; - } - - return Data; + + return ReturnValue; } /** @@ -190,6 +206,7 @@ * * @return * Returns the Suite ID as a CHAR array if successful or NULL otherwise. + * The caller needs to HeapFree the returned pointer in case of success. */ PCHAR GetSuiteID(TESTTYPES TestType, const PVOID TestData) @@ -200,6 +217,7 @@ DWORD DataLength; PCHAR Data; + PCHAR ReturnValue = NULL; PWINE_GETSUITEID_DATA WineData; DataLength = sizeof(ActionProp) - 1 + sizeof(GetSuiteIDAction) - 1; @@ -242,7 +260,7 @@ } if(!IntDoRequest(&Data, &DataLength)) - return NULL; + goto Cleanup; /* Verify that this is really a number */ if(!IsNumber(Data)) @@ -250,11 +268,16 @@ StringOut("Expected Suite ID, but received:\n"); StringOut(Data); StringOut("\n"); + goto Cleanup; + } + + ReturnValue = Data; + +Cleanup: + if(Data && ReturnValue != Data) HeapFree(hProcessHeap, 0, Data); - return NULL; - } - - return Data; + + return ReturnValue; } /** @@ -277,6 +300,7 @@ const CHAR SuiteIDProp[] = "&suiteid="; const CHAR LogProp[] = "&log="; + BOOL ReturnValue = FALSE; DWORD DataLength; PCHAR Data; PCHAR pData; @@ -342,7 +366,7 @@ /* Send all the stuff */ if(!IntDoRequest(&Data, &DataLength)) - return FALSE; + goto Cleanup; /* Output the response */ StringOut("The server responded:\n"); @@ -350,9 +374,13 @@ StringOut("\n"); if(!strcmp(Data, "OK")) - return TRUE; - - return FALSE; + ReturnValue = TRUE; + +Cleanup: + if(Data) + HeapFree(hProcessHeap, 0, Data); + + return ReturnValue; } /** @@ -373,6 +401,7 @@ { const CHAR FinishAction[] = "finish"; + BOOL ReturnValue = FALSE; DWORD DataLength; PCHAR Data; PGENERAL_FINISH_DATA GeneralData; @@ -410,10 +439,14 @@ } if(!IntDoRequest(&Data, &DataLength)) - return FALSE; + goto Cleanup; if(!strcmp(Data, "OK")) - return TRUE; - - return FALSE; -} + ReturnValue = TRUE; + +Cleanup: + if(Data) + HeapFree(hProcessHeap, 0, Data); + + return ReturnValue; +} Modified: trunk/rostests/rosautotest/winetests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/winetests.c?r… ============================================================================== --- trunk/rostests/rosautotest/winetests.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/winetests.c [iso-8859-1] Fri Feb 13 11:39:58 2009 @@ -33,13 +33,14 @@ IntRunTest(PWSTR CommandLine, HANDLE hReadPipe, LPSTARTUPINFOW StartupInfo, PWINE_GETSUITEID_DATA GetSuiteIDData, PWINE_SUBMIT_DATA SubmitData) { BOOL BreakLoop = FALSE; + BOOL ReturnValue = FALSE; DWORD BytesAvailable; DWORD LogAvailable = 0; DWORD LogLength = 0; DWORD LogPosition = 0; DWORD Temp; - PCHAR Buffer; - PROCESS_INFORMATION ProcessInfo; + PCHAR Buffer = NULL; + PROCESS_INFORMATION ProcessInfo = {0}; if(AppOptions.Submit) { @@ -55,12 +56,13 @@ sprintf(Buffer, "Running Wine Test, Module: %s, Test: %s\n", GetSuiteIDData->Module, GetSuiteIDData->Test); StringOut(Buffer); HeapFree(hProcessHeap, 0, Buffer); + Buffer = NULL; /* Execute the test */ if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo)) { StringOut("CreateProcessW for running the test failed\n"); - return FALSE; + goto Cleanup; } /* Receive all the data from the pipe */ @@ -78,7 +80,7 @@ if(!PeekNamedPipe(hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) { StringOut("PeekNamedPipe failed for the test run\n"); - return FALSE; + goto Cleanup; } if(BytesAvailable) @@ -89,7 +91,7 @@ if(!ReadFile(hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) { StringOut("ReadFile failed for the test run\n"); - return FALSE; + goto Cleanup; } /* Output all test output through StringOut, even while the test is still running */ @@ -114,13 +116,10 @@ } HeapFree(hProcessHeap, 0, Buffer); + Buffer = NULL; } } while(!BreakLoop); - - /* Close the process handles */ - CloseHandle(ProcessInfo.hProcess); - CloseHandle(ProcessInfo.hThread); if(AppOptions.Submit) { @@ -137,29 +136,47 @@ SubmitData->General.TestID = GetTestID(WineTest); if(!SubmitData->General.TestID) - return FALSE; + goto Cleanup; } /* Get a Suite ID for this combination */ SubmitData->General.SuiteID = GetSuiteID(WineTest, GetSuiteIDData); if(!SubmitData->General.SuiteID) - return FALSE; + goto Cleanup; /* Submit the stuff */ Submit(WineTest, SubmitData); - - /* Cleanup */ - HeapFree(hProcessHeap, 0, SubmitData->General.SuiteID); } - - /* Cleanup */ + } + + StringOut("\n\n"); + + ReturnValue = TRUE; + +Cleanup: + if(Buffer) + HeapFree(hProcessHeap, 0, Buffer); + + if(ProcessInfo.hProcess) + HeapFree(hProcessHeap, 0, ProcessInfo.hProcess); + + if(ProcessInfo.hThread) + HeapFree(hProcessHeap, 0, ProcessInfo.hThread); + + if(SubmitData->General.SuiteID) + { + HeapFree(hProcessHeap, 0, SubmitData->General.SuiteID); + SubmitData->General.SuiteID = NULL; + } + + if(SubmitData->Log) + { HeapFree(hProcessHeap, 0, SubmitData->Log); - } - - StringOut("\n\n"); - - return TRUE; + SubmitData->Log = NULL; + } + + return ReturnValue; } /** @@ -186,15 +203,17 @@ static BOOL IntRunModuleTests(PWSTR File, PWSTR FilePath, HANDLE hReadPipe, LPSTARTUPINFOW StartupInfo, PWINE_SUBMIT_DATA SubmitData) { + BOOL ReturnValue = FALSE; DWORD BytesAvailable; DWORD Length; DWORD Temp; - PCHAR Buffer; + PCHAR Buffer = NULL; PCHAR pStart; PCHAR pEnd; - PROCESS_INFORMATION ProcessInfo; + PROCESS_INFORMATION ProcessInfo = {0}; + PWSTR pUnderscore; size_t FilePosition; - WINE_GETSUITEID_DATA GetSuiteIDData; + WINE_GETSUITEID_DATA GetSuiteIDData = {0}; /* Build the full command line */ FilePosition = wcslen(FilePath); @@ -202,8 +221,25 @@ FilePath[FilePosition] = 0; wcscat(FilePath, L"--list"); + /* Find the underscore in the file name */ + pUnderscore = wcschr(File, L'_'); + + if(!pUnderscore) + { + StringOut("Invalid test file name: "); + + Length = wcslen(File); + Buffer = HeapAlloc(hProcessHeap, 0, Length + 1); + WideCharToMultiByte(CP_ACP, 0, File, Length + 1, Buffer, Length + 1, NULL, NULL); + + StringOut(Buffer); + StringOut("\n"); + + goto Cleanup; + } + /* Store the tested module name */ - Length = wcschr(File, L'_') - File; + Length = pUnderscore - File; GetSuiteIDData.Module = HeapAlloc(hProcessHeap, 0, Length + 1); WideCharToMultiByte(CP_ACP, 0, File, Length, GetSuiteIDData.Module, Length, NULL, NULL); GetSuiteIDData.Module[Length] = 0; @@ -212,33 +248,45 @@ if(!CreateProcessW(NULL, FilePath, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo)) { StringOut("CreateProcessW for getting the available tests failed\n"); - return FALSE; + goto Cleanup; } /* Wait till this process ended */ if(WaitForSingleObject(ProcessInfo.hProcess, INFINITE) == WAIT_FAILED) { StringOut("WaitForSingleObject failed for the test list\n"); - return FALSE; - } - - /* Close the process handles */ - CloseHandle(ProcessInfo.hProcess); - CloseHandle(ProcessInfo.hThread); + goto Cleanup; + } /* Read the output data into a buffer */ if(!PeekNamedPipe(hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) { StringOut("PeekNamedPipe failed for the test list\n"); - return FALSE; - } - + goto Cleanup; + } + + /* Check if we got any */ + if(!BytesAvailable) + { + StringOut("The --list command did not return any data for "); + + Length = wcslen(File); + Buffer = HeapAlloc(hProcessHeap, 0, Length + 1); + WideCharToMultiByte(CP_ACP, 0, File, Length + 1, Buffer, Length + 1, NULL, NULL); + + StringOut(Buffer); + StringOut("\n"); + + goto Cleanup; + } + + /* Read the data */ Buffer = HeapAlloc(hProcessHeap, 0, BytesAvailable); if(!ReadFile(hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) { StringOut("ReadFile failed\n"); - return FALSE; + goto Cleanup; } /* Jump to the first available test */ @@ -267,21 +315,36 @@ FilePath[FilePosition + Length] = 0; if(!IntRunTest(FilePath, hReadPipe, StartupInfo, &GetSuiteIDData, SubmitData)) - return FALSE; + goto Cleanup; } /* Cleanup */ HeapFree(hProcessHeap, 0, GetSuiteIDData.Test); + GetSuiteIDData.Test = NULL; /* Move to the next test */ pStart = pEnd + 6; } - /* Cleanup */ - HeapFree(hProcessHeap, 0, GetSuiteIDData.Module); - HeapFree(hProcessHeap, 0, Buffer); - - return TRUE; + ReturnValue = TRUE; + +Cleanup: + if(GetSuiteIDData.Module) + HeapFree(hProcessHeap, 0, GetSuiteIDData.Module); + + if(GetSuiteIDData.Test) + HeapFree(hProcessHeap, 0, GetSuiteIDData.Test); + + if(Buffer) + HeapFree(hProcessHeap, 0, Buffer); + + if(ProcessInfo.hProcess) + CloseHandle(ProcessInfo.hProcess); + + if(ProcessInfo.hThread) + CloseHandle(ProcessInfo.hThread); + + return ReturnValue; } /** @@ -293,10 +356,11 @@ BOOL RunWineTests() { + BOOL ReturnValue = FALSE; GENERAL_FINISH_DATA FinishData; - HANDLE hFind; - HANDLE hReadPipe; - HANDLE hWritePipe; + HANDLE hFind = NULL; + HANDLE hReadPipe = NULL; + HANDLE hWritePipe = NULL; SECURITY_ATTRIBUTES SecurityAttributes; STARTUPINFOW StartupInfo = {0}; size_t PathPosition; @@ -312,7 +376,7 @@ if(!CreatePipe(&hReadPipe, &hWritePipe, &SecurityAttributes, 0)) { StringOut("CreatePipe failed\n"); - return FALSE; + goto Cleanup; } StartupInfo.cb = sizeof(StartupInfo); @@ -323,7 +387,7 @@ if(GetWindowsDirectoryW(FilePath, MAX_PATH) > MAX_PATH - 60) { StringOut("Windows directory path is too long\n"); - return FALSE; + goto Cleanup; } wcscat(FilePath, L"\\bin\\"); @@ -346,7 +410,7 @@ if(hFind == INVALID_HANDLE_VALUE) { StringOut("FindFirstFileW failed\n"); - return FALSE; + goto Cleanup; } /* Run the tests */ @@ -357,27 +421,33 @@ /* Run it */ if(!IntRunModuleTests(fd.cFileName, FilePath, hReadPipe, &StartupInfo, &SubmitData)) - return FALSE; + goto Cleanup; } while(FindNextFileW(hFind, &fd)); - /* Cleanup */ - FindClose(hFind); - - if(AppOptions.Submit && SubmitData.General.TestID) - { - /* We're done with the tests, so close this test run */ + /* Close this test run if necessary */ + if(SubmitData.General.TestID) + { FinishData.TestID = SubmitData.General.TestID; if(!Finish(WineTest, &FinishData)) - return FALSE; - - /* Cleanup */ - HeapFree(hProcessHeap, 0, FinishData.TestID); - } - - CloseHandle(hReadPipe); - CloseHandle(hWritePipe); - - return TRUE; + goto Cleanup; + } + + ReturnValue = TRUE; + +Cleanup: + if(SubmitData.General.TestID) + HeapFree(hProcessHeap, 0, SubmitData.General.TestID); + + if(hFind && hFind != INVALID_HANDLE_VALUE) + FindClose(hFind); + + if(hReadPipe) + CloseHandle(hReadPipe); + + if(hWritePipe) + CloseHandle(hWritePipe); + + return ReturnValue; }

15 years, 10 months

[cwittich] 39583: sync avifil32 with wine 1.1.15

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 11:14:29 2009 New Revision: 39583 URL: http://svn.reactos.org/svn/reactos?rev=39583&view=rev Log: sync avifil32 with wine 1.1.15 Added: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc (with props) Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Uk.rc trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.c trunk/reactos/dll/win32/avifil32/extrachunk.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/regsvr.c trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,6 +1,6 @@ /* * Copyright 1999 Marcus Meissner - * Copyright 2002-2003 Michael Günnewig + * Copyright 2002-2003 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,6 +1,6 @@ /* * Copyright 1999 Marcus Meissner - * Copyright 2002-2003 Michael Günnewig + * Copyright 2002-2003 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -217,7 +217,7 @@ static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp, LONG count, DWORD pos, BOOL *bAbsolute); static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start, - LPVOID buffer, LONG size); + LPVOID buffer, DWORD size); static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset); static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This); @@ -931,7 +931,7 @@ { IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - LPBITMAPINFOHEADER lpbiNew = (LPBITMAPINFOHEADER)format; + LPBITMAPINFOHEADER lpbiNew = format; TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -976,7 +976,7 @@ return AVIERR_OK; } else { MMCKINFO ck; - LPBITMAPINFOHEADER lpbiOld = (LPBITMAPINFOHEADER)This->lpFormat; + LPBITMAPINFOHEADER lpbiOld = This->lpFormat; RGBQUAD *rgbNew = (RGBQUAD*)((LPBYTE)lpbiNew + lpbiNew->biSize); AVIPALCHANGE *lppc = NULL; UINT n; @@ -1688,7 +1688,7 @@ return AVIERR_MEMORY; pStream->cbHandlerData = ck.cksize; - if (mmioRead(This->hmmio, (HPSTR)pStream->lpHandlerData, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, pStream->lpHandlerData, ck.cksize) != ck.cksize) return AVIERR_FILEREAD; break; case ckidSTREAMFORMAT: @@ -1702,11 +1702,11 @@ return AVIERR_MEMORY; pStream->cbFormat = ck.cksize; - if (mmioRead(This->hmmio, (HPSTR)pStream->lpFormat, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, pStream->lpFormat, ck.cksize) != ck.cksize) return AVIERR_FILEREAD; if (pStream->sInfo.fccType == streamtypeVIDEO) { - LPBITMAPINFOHEADER lpbi = (LPBITMAPINFOHEADER)pStream->lpFormat; + LPBITMAPINFOHEADER lpbi = pStream->lpFormat; /* some corrections to the video format */ if (lpbi->biClrUsed == 0 && lpbi->biBitCount <= 8) @@ -2008,7 +2008,7 @@ } static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, - LPVOID buffer, LONG size) + LPVOID buffer, DWORD size) { /* pre-conditions */ assert(This != NULL); @@ -2059,7 +2059,7 @@ } else { if (mmioSeek(This->paf->hmmio, This->idxFrames[pos].dwChunkOffset + 2 * sizeof(DWORD), SEEK_SET) == -1) return AVIERR_FILEREAD; - if (mmioRead(This->paf->hmmio, (HPSTR)buffer, size) != size) + if (mmioRead(This->paf->hmmio, buffer, size) != size) return AVIERR_FILEREAD; } @@ -2206,7 +2206,7 @@ if (mmioCreateChunk(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; if (pStream->lpFormat != NULL && ck.cksize > 0) { - if (mmioWrite(This->hmmio, (HPSTR)pStream->lpFormat, ck.cksize) != ck.cksize) + if (mmioWrite(This->hmmio, pStream->lpFormat, ck.cksize) != ck.cksize) return AVIERR_FILEWRITE; } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) @@ -2218,7 +2218,7 @@ ck.cksize = pStream->cbHandlerData; if (mmioCreateChunk(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; - if (mmioWrite(This->hmmio, (HPSTR)pStream->lpHandlerData, ck.cksize) != ck.cksize) + if (mmioWrite(This->hmmio, pStream->lpHandlerData, ck.cksize) != ck.cksize) return AVIERR_FILEWRITE; if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; @@ -2227,7 +2227,7 @@ /* ... some optional additional extra chunk for this stream ... */ if (pStream->extra.lp != NULL && pStream->extra.cb > 0) { /* the chunk header(s) are already in the structure */ - if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb) + if (mmioWrite(This->hmmio, pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb) return AVIERR_FILEWRITE; } @@ -2302,7 +2302,7 @@ /* write optional extra file chunks */ if (This->fileextra.lp != NULL && This->fileextra.cb > 0) { /* as for the streams, are the chunk header(s) in the structure */ - if (mmioWrite(This->hmmio, (HPSTR)This->fileextra.lp, This->fileextra.cb) != This->fileextra.cb) + if (mmioWrite(This->hmmio, This->fileextra.lp, This->fileextra.cb) != This->fileextra.cb) return AVIERR_FILEWRITE; } @@ -2562,7 +2562,7 @@ if (mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; if (buffer != NULL && size > 0) { - if (mmioWrite(This->paf->hmmio, (HPSTR)buffer, size) != size) + if (mmioWrite(This->paf->hmmio, buffer, size) != size) return AVIERR_FILEWRITE; } if (mmioAscend(This->paf->hmmio, &ck, 0) != S_OK) Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ja.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -16,35 +16,40 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "³kIvV" -FONT 9, "MS UI Gothic" +CAPTION "å§ç¸®ãªãã·ã§ã³" +FONT 9, "MS Shell Dlg" BEGIN - LTEXT "Xg[ðIð(&C):",-1,2,5,154,10 + LTEXT "ã¹ããªã¼ã ãé¸æ(&C):",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "IvV(&O)...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "C^[[u(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + PUSHBUTTON "ãªãã·ã§ã³(&O)...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "ã¤ã³ã¿ã¼ãªã¼ã(&I)",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "t[",-1,129,43,36,9 - LTEXT "»ÝÌtH[}bg:",-1,3,56,73,9 + LTEXT "ãã¬ã¼ã ",-1,129,43,36,9 + LTEXT "ç¾å¨ã®ãã©ã¼ããã:",-1,3,56,73,9 LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "LZ",IDCANCEL,170,61,50,14 + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "Wavet@C: %s" - IDS_WAVEFILETYPE "Wavet@C" - IDS_ALLMULTIMEDIA "SÄÌ}`fBAt@C" - IDS_ALLFILES "SÄÌt@C (*.*)(a)*.*" - IDS_VIDEO "rfI" - IDS_AUDIO "¹º" + IDS_WAVESTREAMFORMAT "Waveãã¡ã¤ã«: %s" + IDS_WAVEFILETYPE "Waveãã¡ã¤ã«" + IDS_ALLMULTIMEDIA "å¨ã¦ã®ãã«ãã¡ãã£ã¢ãã¡ã¤ã«" + IDS_ALLFILES "å¨ã¦ã®ãã¡ã¤ã« (*.*)(a)*.*" + IDS_VIDEO "ãããª" + IDS_AUDIO "é³å£°" IDS_AVISTREAMFORMAT "%s %s #%d" IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "¢³k" + IDS_UNCOMPRESSED "æªå§ç¸®" } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "¾ÐÃà ¿É¼Ç" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "½ºÆ®¸² ¼±ÅÃ(&C):",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Si.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -28,7 +28,7 @@ LTEXT "&Izbran tok:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&MoÅ¾nosti...",IDC_OPTIONS,170,17,50,14 + PUSHBUTTON "&MoÅ¾nosti ...",IDC_OPTIONS,170,17,50,14 AUTOCHECKBOX "&Prepletanje vsake",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL LTEXT "slike",-1,129,43,36,9 Modified: trunk/reactos/dll/win32/avifil32/avifile_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Uk.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,10 +1,21 @@ /* - * PROJECT: AVI File support library - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/avifil32/avifile_Uk.rc - * PURPOSE: Ukraianian resource file for avifil32 - * TRANSLATOR: Artem Reznikov + * Copyright 2007 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -14,7 +25,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Îáåð³òü ïîò³ê:",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ï&àðàìåòðè...",IDC_OPTIONS,145,17,45,14 AUTOCHECKBOX "&²íòåðâàë ÷åðãóâàííÿ",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP Added: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Zh.rc (added) +++ trunk/reactos/dll/win32/avifil32/avifile_Zh.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,0 +1,90 @@ +/* + * avifile (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "åç¼©éé¡¹" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "éæ©æ¥æº(&C):",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "éé¡¹(&O)...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "äº¤ç»: æ¯",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "å¸§æ°",-1,129,43,36,9 + LTEXT "å½åæ ¼å¼:",-1,3,56,73,9 + LTEXT "(?)",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "ç¡®å®",IDOK,170,42,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "æ³¢å½¢: %s" + IDS_WAVEFILETYPE "æ³¢å½¢" + IDS_ALLMULTIMEDIA "ææå¤åªä½æä»¶" + IDS_ALLFILES "æææä»¶ (*.*)(a)*.*" + IDS_VIDEO "è§é¢" + IDS_AUDIO "é³é¢" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-é»è®¤å¤çå¨" + IDS_UNCOMPRESSED "æªåç¼©" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "å£ç¸®é¸é " +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "é¸æä¾æº(&C):",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "é¸é (&O)...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "äº¤ç¹: æ¯",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "å¹æ¸",-1,129,43,36,9 + LTEXT "ç¶åæ ¼å¼:",-1,3,56,73,9 + LTEXT "(?)",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "ç¢ºå®",IDOK,170,42,50,14 + PUSHBUTTON "åæ¶",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "æ³¢å½¢: %s" + IDS_WAVEFILETYPE "æ³¢å½¢" + IDS_ALLMULTIMEDIA "ææå¤åªé«æªæ¡" + IDS_ALLFILES "æææªæ¡ (*.*)(a)*.*" + IDS_VIDEO "è¦é »" + IDS_AUDIO "é³é »" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-é»èªèçå¨" + IDS_UNCOMPRESSED "æªå£ç¸®" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/avifil32/avifile_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2003 Michael Günnewig + * Copyright 2003 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -261,7 +261,7 @@ if (pg == NULL) return NULL; if (This->pg != NULL) { - if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1)) { + if (IGetFrame_SetFormat(pg, This->lpFrame, NULL, 0, 0, -1, -1) != S_OK) { AVIStreamGetFrameClose(pg); ERR(": IGetFrame_SetFormat failed\n"); return NULL; @@ -793,7 +793,7 @@ if (asi->dwQuality <= ICQUALITY_HIGH) This->sInfo.dwQuality = ICQUALITY_HIGH; CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); - memcpy(&This->sInfo.szName, &asi->szName, sizeof(asi->szName)); + memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++; return AVIERR_OK; @@ -896,7 +896,7 @@ /* map our position to a stream and position in it */ if (AVIFILE_FindStreamInTable(This, pos, &stream, &streamPos, - &streamNr, TRUE)) + &streamNr, TRUE) != S_OK) return -1; /* doesn't exist */ if (This->bDecompress) { @@ -935,7 +935,7 @@ if (! This->bDecompress) return IAVIStream_ReadFormat(stream, n, format, fmtsize); - lp = (LPBITMAPINFOHEADER)AVIFILE_ReadFrame(This, stream, n); + lp = AVIFILE_ReadFrame(This, stream, n); if (lp == NULL) return AVIERR_ERROR; if (lp->biBitCount <= 8) { Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -145,7 +145,7 @@ { FOURCC ckid; FOURCC fccType; - HRESULT hr; + MMRESULT mmr; /* pre-conditions */ assert(extra != NULL); @@ -171,26 +171,32 @@ TRACE(": find ckid=0x%08X fccType=0x%08X\n", ckid, fccType); for (;;) { - hr = mmioDescend(hmmio, lpck, lpckParent, 0); - if (hr != S_OK) { + mmr = mmioDescend(hmmio, lpck, lpckParent, 0); + if (mmr != MMSYSERR_NOERROR) { /* No extra chunks in front of desired chunk? */ - if (flags == 0 && hr == MMIOERR_CHUNKNOTFOUND) - hr = AVIERR_OK; - return hr; + if (flags == 0 && mmr == MMIOERR_CHUNKNOTFOUND) + return AVIERR_OK; + else + return AVIERR_FILEREAD; } /* Have we found what we search for? */ if ((lpck->ckid == ckid) && - (fccType == (FOURCC)0 || lpck->fccType == fccType)) + (fccType == 0 || lpck->fccType == fccType)) return AVIERR_OK; /* Skip padding chunks, the others put into the extrachunk-structure */ if (lpck->ckid == ckidAVIPADDING || lpck->ckid == mmioFOURCC('p','a','d','d')) - hr = mmioAscend(hmmio, lpck, 0); + { + mmr = mmioAscend(hmmio, lpck, 0); + if (mmr != MMSYSERR_NOERROR) return AVIERR_FILEREAD; + } else - hr = ReadChunkIntoExtra(extra, hmmio, lpck); - if (FAILED(hr)) - return hr; + { + HRESULT hr = ReadChunkIntoExtra(extra, hmmio, lpck); + if (FAILED(hr)) + return hr; + } } } Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.h [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2003 Michael Günnewig + * Copyright 2002-2003 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -393,7 +393,7 @@ return hr; } - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, pos); + lpbi = AVIStreamGetFrame(This->pg, pos); if (lpbi == NULL) return AVIERR_MEMORY; @@ -538,7 +538,7 @@ } } else { /* format change -- check that's only the palette */ - LPBITMAPINFOHEADER lpbi = (LPBITMAPINFOHEADER)format; + LPBITMAPINFOHEADER lpbi = format; if (lpbi->biSize != This->lpbiInput->biSize || lpbi->biWidth != This->lpbiInput->biWidth || @@ -611,7 +611,7 @@ /* compress or decompress? */ if (This->hic == NULL) { /* decompress */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, start); + lpbi = AVIStreamGetFrame(This->pg, start); if (lpbi == NULL) return AVIERR_MEMORY; @@ -634,7 +634,7 @@ while (start > This->lCurrent) { HRESULT hr; - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, ++This->lCurrent); + lpbi = AVIStreamGetFrame(This->pg, ++This->lCurrent); if (lpbi == NULL) { AVIFILE_Reset(This); return AVIERR_MEMORY; @@ -821,14 +821,14 @@ do { DWORD idxCkid = 0; - HRESULT hr; - - hr = ICCompress(This->hic,icmFlags,This->lpbiCur,This->lpCur,lpbi,lpBits, - &idxCkid, &idxFlags, This->lCurrent, dwRequest, dwCurQual, - noPrev ? NULL:This->lpbiPrev, noPrev ? NULL:This->lpPrev); - if (hr == ICERR_NEWPALETTE) { + DWORD res; + + res = ICCompress(This->hic,icmFlags,This->lpbiCur,This->lpCur,lpbi,lpBits, + &idxCkid, &idxFlags, This->lCurrent, dwRequest, dwCurQual, + noPrev ? NULL:This->lpbiPrev, noPrev ? NULL:This->lpPrev); + if (res == ICERR_NEWPALETTE) { FIXME(": codec has changed palette -- unhandled!\n"); - } else if (hr != ICERR_OK) + } else if (res != ICERR_OK) return AVIERR_COMPRESSOR; /* need to check for framesize */ @@ -902,7 +902,7 @@ assert(This->lpbiOutput == NULL); /* get input format */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, This->sInfo.dwStart); + lpbi = AVIStreamGetFrame(This->pg, This->sInfo.dwStart); if (lpbi == NULL) return AVIERR_MEMORY; Modified: trunk/reactos/dll/win32/avifil32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/avifil32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/regsvr.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -32,6 +32,7 @@ #include "avifile_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -158,7 +159,7 @@ KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) goto error_close_iid_key; - wsprintfW(buf, fmt, list->num_methods); + sprintfW(buf, fmt, list->num_methods); res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -57,3 +57,4 @@ #include "avifile_Sv.rc" #include "avifile_Tr.rc" #include "avifile_Uk.rc" +#include "avifile_Zh.rc" Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2003 Michael Günnewig + * Copyright 2003 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Fri Feb 13 11:14:29 2009 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -908,7 +908,7 @@ if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) return AVIERR_FILEREAD; - if (mmioRead(This->hmmio, (HPSTR)buffer, buffersize) != buffersize) + if (mmioRead(This->hmmio, buffer, buffersize) != buffersize) return AVIERR_FILEREAD; /* fill out return parameters if given */ @@ -960,7 +960,7 @@ if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) return AVIERR_FILEWRITE; - if (mmioWrite(This->hmmio, (HPSTR)buffer, buffersize) != buffersize) + if (mmioWrite(This->hmmio, buffer, buffersize) != buffersize) return AVIERR_FILEWRITE; This->sInfo.dwLength = max(This->sInfo.dwLength, (DWORD)start + samples);

15 years, 10 months

[cwittich] 39582: revert r39578 as it breaks rosautotest on 3rd stage

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 08:03:35 2009 New Revision: 39582 URL: http://svn.reactos.org/svn/reactos?rev=39582&view=rev Log: revert r39578 as it breaks rosautotest on 3rd stage Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Feb 13 08:03:35 2009 @@ -649,112 +649,9 @@ modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\drivers\green\green.sys 2 optional modules\rosapps\templates\dialog\dialog.exe 1 optional -modules\rostests\apitests\dciman32api\dciman32api.exe 7 optional -modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional -modules\rostests\apitests\user32api\user32api.exe 7 optional - -modules\rostests\apitests\w32kdll\w32kdll_2k3sp2\w32kdll_2k3sp2.dll 1 optional -modules\rostests\apitests\w32kdll\w32kdll_2ksp4\w32kdll_2ksp4.dll 1 optional -modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 1 optional -modules\rostests\apitests\w32kdll\w32kdll_xpsp2\w32kdll_xpsp2.dll 1 optional - -modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional -modules\rostests\apitests\ws2_32\ws2_32_apitests.exe 7 optional -modules\rostests\dibtests\alphablend\alphablend.exe 7 optional -modules\rostests\dibtests\bitblt\bitblt.exe 7 optional -modules\rostests\dibtests\bltrop\bltrop.exe 7 optional -modules\rostests\dibtests\dibtest\dibtest.exe 7 optional -modules\rostests\dibtests\icontest\icontest.exe 7 optional -modules\rostests\dibtests\palbitblt\palbitblt.exe 7 optional -modules\rostests\dibtests\patblt\patblt.exe 7 optional -modules\rostests\dibtests\stretchblt\stretchblt.exe 7 optional -modules\rostests\dibtests\vbltest\vbltest.exe 7 optional -modules\rostests\drivers\csqtest\csqtest.sys 7 optional -modules\rostests\drivers\kmtest\kmtest.sys 7 optional -modules\rostests\drivers\memtest\memtest.sys 7 optional + modules\rostests\rosautotest\rosautotest.exe 1 optional -modules\rostests\tests\accelerator\accelerator.exe 7 optional -modules\rostests\tests\alive\alive.exe 7 optional -modules\rostests\tests\apc\apc.exe 7 optional -modules\rostests\tests\apc2\apc2.exe 7 optional -modules\rostests\tests\args\args.exe 7 optional -modules\rostests\tests\atomtest\atomtest.exe 7 optional -modules\rostests\tests\bench\bench-thread.exe 7 optional -modules\rostests\tests\button\button.exe 7 optional -modules\rostests\tests\button2\buttontst2.exe 7 optional -modules\rostests\tests\capclock\capclock.exe 7 optional -modules\rostests\tests\carets\carets.exe 7 optional -modules\rostests\tests\combotst\combotst.exe 7 optional -modules\rostests\tests\consume\consume.exe 7 optional -modules\rostests\tests\copymove\copymove.exe 7 optional -modules\rostests\tests\count\count.exe 7 optional -modules\rostests\tests\create-links\create-links.exe 7 optional -modules\rostests\tests\D3DParseUnknownCommand_show\D3DParseUnknownCommand_show.exe 7 optional -modules\rostests\tests\dirdlg\dirdlg.exe 7 optional -modules\rostests\tests\diskspeed\diskspeed.exe 7 optional -modules\rostests\tests\dnsapi\dnsapitst.exe 7 optional -modules\rostests\tests\dnsquery\dnsquery.exe 7 optional -modules\rostests\tests\DxHalTest\dxhaltest.exe 7 optional -modules\rostests\tests\edit\edit.exe 7 optional -modules\rostests\tests\enhmetafile\enhmetafile.exe 7 optional -modules\rostests\tests\enumfonts\enumfonts.exe 7 optional -modules\rostests\tests\enumwnd\enumwnd.exe 7 optional -modules\rostests\tests\enumws\enumws.exe 7 optional -modules\rostests\tests\event\event.exe 7 optional -modules\rostests\tests\fiber\fiber.exe 7 optional -modules\rostests\tests\gethostbyname\gethostbyname.exe 7 optional -modules\rostests\tests\global_mem\global_mem.exe 7 optional -modules\rostests\tests\gradient\gradient.exe 7 optional -modules\rostests\tests\hello\hello.exe 7 optional -modules\rostests\tests\hivetest\hivetest.exe 7 optional -modules\rostests\tests\Imagelistviewer\Imagelistviewer.exe 7 optional -modules\rostests\tests\isotest\isotest.exe 7 optional -modules\rostests\tests\lineclip\lineclip.exe 7 optional -modules\rostests\tests\linetest\linetest.exe 7 optional -modules\rostests\tests\map_dup_inherit\map_dup_inherit.exe 7 optional -modules\rostests\tests\mdi\mdi.exe 7 optional -modules\rostests\tests\miditest\miditest.exe 7 optional -modules\rostests\tests\mktime\mktime.exe 7 optional -modules\rostests\tests\moztest\moztest.exe 7 optional -modules\rostests\tests\multithrdwin\multithrdwin.exe 7 optional -modules\rostests\tests\multiwin\multiwin.exe 7 optional -modules\rostests\tests\mutex\mutex.exe 7 optional -modules\rostests\tests\nameserverlist\nameserverlist.exe 7 optional -modules\rostests\tests\noexecute\noexecute.exe 7 optional -modules\rostests\tests\p_dup_handle\p_dup_handle.exe 7 optional -modules\rostests\tests\polytest\polytest.exe 7 optional -modules\rostests\tests\popupmenu\popupmenu.exe 7 optional -modules\rostests\tests\primitives\primitives.exe 7 optional modules\rostests\tests\pseh2\pseh2_test.exe 7 optional -modules\rostests\tests\readconsole\readconsole.exe 7 optional -modules\rostests\tests\regqueryvalue\regqueryvalue.exe 7 optional -modules\rostests\tests\sectest\sectest.exe 7 optional -modules\rostests\tests\sertest\sertest.exe 7 optional -modules\rostests\tests\shaptest\shaptest.exe 7 optional -modules\rostests\tests\statst\statst.exe 7 optional -modules\rostests\tests\statst2\statst2.exe 7 optional -modules\rostests\tests\subclass\subclass.exe 7 optional -modules\rostests\tests\suspend\suspend.exe 7 optional -modules\rostests\tests\tcpsvr\tcpsvr.exe 7 optional -modules\rostests\tests\terminate\terminate.exe 7 optional -modules\rostests\tests\thread\thread.exe 7 optional -modules\rostests\tests\thread_msg\thread_msg.exe 7 optional -modules\rostests\tests\threadwait\threadwait.exe 7 optional -modules\rostests\tests\tmrqueue\tmrqueue.exe 7 optional -modules\rostests\tests\txtscale\txtscale.exe 7 optional -modules\rostests\tests\vmtest\vmtest.exe 7 optional -modules\rostests\tests\wclickat\wclickat.exe 7 optional -modules\rostests\tests\wcstombs-tests\wcstombs-tests.exe 7 optional -modules\rostests\tests\winhello\winhello.exe 7 optional -modules\rostests\tests\wm_erasebkgnd\wm_erasebkgnd.exe 7 optional -modules\rostests\tests\wm_paint\wm_paint.exe 7 optional -modules\rostests\win32\kernel32\queuetest\queuetest.exe 7 optional -modules\rostests\win32\kmtloader\kmtloader.exe 7 optional -modules\rostests\win32\smss\movefile\movefiletest.exe 7 optional -modules\rostests\win32\user32\drawcaption\capicon.exe 7 optional -modules\rostests\win32\user32\drawcaption\drawcap.exe 7 optional -modules\rostests\win32\user32\kbdlayout\kbdlayout.exe 7 optional -modules\rostests\win32\user32\sysicon\sysicon.exe 7 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

15 years, 10 months

[cwittich] 39581: fix a memory leak

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Feb 13 08:02:18 2009 New Revision: 39581 URL: http://svn.reactos.org/svn/reactos?rev=39581&view=rev Log: fix a memory leak Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Fri Feb 13 08:02:18 2009 @@ -285,6 +285,7 @@ else if (Status == STATUS_UNSUCCESSFUL) { /* Note: the directory cache has already been unpinned */ + RtlFreeUnicodeString(&FileToFindUpcase); return Status; }

15 years, 10 months

← Newer
1
...
21
22
23
24
25
26
27
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009