Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[hyperion] 38670: Preparing for future widl sync modified ReactOS-i386.rbuild Define USE_COMPILER_EXCEPTIONS because we don't need SEH hacks in RPC stubs (neener neener) modified include/psdk/wtypes.idl modified include/psdk/xmldom.idl Include guard format will change in widl: pre-emptively work around it

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Jan 9 10:50:17 2009 New Revision: 38670 URL: http://svn.reactos.org/svn/reactos?rev=38670&view=rev Log: Preparing for future widl sync modified ReactOS-i386.rbuild Define USE_COMPILER_EXCEPTIONS because we don't need SEH hacks in RPC stubs (neener neener) modified include/psdk/wtypes.idl modified include/psdk/xmldom.idl Include guard format will change in widl: pre-emptively work around it Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/include/psdk/wtypes.idl trunk/reactos/include/psdk/xmldom.idl Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=38… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Fri Jan 9 10:50:17 2009 @@ -13,6 +13,8 @@ <define name="_X86_" /> <define name="__i386__" /> <define name="TARGET_i386" host="true" /> + + <define name="USE_COMPILER_EXCEPTIONS" /> <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?re… ============================================================================== --- trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] Fri Jan 9 10:50:17 2009 @@ -20,6 +20,10 @@ import "basetsd.h"; import "guiddef.h"; + +cpp_quote("#ifndef __wtypes_h__") +cpp_quote("#define __wtypes_h__") +cpp_quote("#endif") [ uuid(D3980A60-910C-1068-9341-00DD010F2F1C), @@ -789,7 +793,7 @@ DWORD dwVersionLo; } QUERYCONTEXT; -typedef [v1_enum] enum tagTYSPEC +typedef [v1_enum] enum tagTYSPEC { TYSPEC_CLSID, TYSPEC_FILEEXT, Modified: trunk/reactos/include/psdk/xmldom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldom.idl?re… ============================================================================== --- trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmldom.idl [iso-8859-1] Fri Jan 9 10:50:17 2009 @@ -20,6 +20,10 @@ #include <idispids.h> import "ocidl.idl"; + +cpp_quote("#ifndef __xmldom_h__") +cpp_quote("#define __xmldom_h__") +cpp_quote("#endif") interface IXMLDOMImplementation; interface IXMLDOMNode;

15 years, 8 months

[hyperion] 38669: modified tests/pseh2/psehtest.c Don't obscure the names of testcases with macro trickery. It gets old fast Regression test for #4004 (fixed in r38668)

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Jan 9 10:38:28 2009 New Revision: 38669 URL: http://svn.reactos.org/svn/reactos?rev=38669&view=rev Log: modified tests/pseh2/psehtest.c Don't obscure the names of testcases with macro trickery. It gets old fast Regression test for #4004 (fixed in r38668) Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Fri Jan 9 10:38:28 2009 @@ -64,52 +64,52 @@ static int call_test(int (*)(void)); -#define DEFINE_TEST(NAME_) static int test_ ## NAME_(void) +#define DEFINE_TEST(NAME_) static int NAME_(void) /* Empty statements *///{{{ -DEFINE_TEST(empty_1) +DEFINE_TEST(test_empty_1) { _SEH2_TRY { } _SEH2_EXCEPT(0) { } _SEH2_END; return 1; } -DEFINE_TEST(empty_2) +DEFINE_TEST(test_empty_2) { _SEH2_TRY { } _SEH2_EXCEPT(-1) { } _SEH2_END; return 1; } -DEFINE_TEST(empty_3) +DEFINE_TEST(test_empty_3) { _SEH2_TRY { } _SEH2_EXCEPT(1) { } _SEH2_END; return 1; } -DEFINE_TEST(empty_4) +DEFINE_TEST(test_empty_4) { _SEH2_TRY { } _SEH2_FINALLY { } _SEH2_END; return 1; } -DEFINE_TEST(empty_5) +DEFINE_TEST(test_empty_5) { _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(0) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; return 1; } -DEFINE_TEST(empty_6) +DEFINE_TEST(test_empty_6) { _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(-1) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; return 1; } -DEFINE_TEST(empty_7) +DEFINE_TEST(test_empty_7) { _SEH2_TRY { _SEH2_TRY { } _SEH2_EXCEPT(1) { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; return 1; } -DEFINE_TEST(empty_8) +DEFINE_TEST(test_empty_8) { _SEH2_TRY { _SEH2_TRY { } _SEH2_FINALLY { } _SEH2_END; } _SEH2_FINALLY { } _SEH2_END; return 1; @@ -117,27 +117,27 @@ //}}} /* Static exception filters *///{{{ -DEFINE_TEST(execute_handler_1) -{ - static int ret; - - ret = return_zero(); - - _SEH2_TRY - { - RaiseException(0xE00DEAD0, 0, 0, NULL); - ret = return_zero(); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ret = return_positive(); - } - _SEH2_END; - - return ret == return_positive(); -} - -DEFINE_TEST(continue_execution_1) +DEFINE_TEST(test_execute_handler_1) +{ + static int ret; + + ret = return_zero(); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + ret = return_zero(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = return_positive(); + } + _SEH2_END; + + return ret == return_positive(); +} + +DEFINE_TEST(test_continue_execution_1) { static int ret; @@ -157,7 +157,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_1) +DEFINE_TEST(test_continue_search_1) { static int ret; @@ -185,7 +185,7 @@ return ret == return_positive(); } -DEFINE_TEST(execute_handler_2) +DEFINE_TEST(test_execute_handler_2) { static int ret; @@ -205,7 +205,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_2) +DEFINE_TEST(test_continue_execution_2) { static int ret; @@ -227,7 +227,7 @@ //}}} /* Dynamic exception filters *///{{{ -DEFINE_TEST(execute_handler_3) +DEFINE_TEST(test_execute_handler_3) { static int ret; @@ -247,7 +247,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_3) +DEFINE_TEST(test_continue_execution_3) { static int ret; @@ -267,7 +267,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_2) +DEFINE_TEST(test_continue_search_2) { static int ret; @@ -295,7 +295,7 @@ return ret == return_positive(); } -DEFINE_TEST(execute_handler_4) +DEFINE_TEST(test_execute_handler_4) { static int ret; @@ -315,7 +315,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_4) +DEFINE_TEST(test_continue_execution_4) { static int ret; @@ -337,7 +337,7 @@ //}}} /* Dynamic exception filters, using _SEH2_GetExceptionInformation() *///{{{ -DEFINE_TEST(execute_handler_5) +DEFINE_TEST(test_execute_handler_5) { static int ret; @@ -357,7 +357,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_5) +DEFINE_TEST(test_continue_execution_5) { static int ret; @@ -377,7 +377,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_3) +DEFINE_TEST(test_continue_search_3) { static int ret; @@ -405,7 +405,7 @@ return ret == return_positive(); } -DEFINE_TEST(execute_handler_6) +DEFINE_TEST(test_execute_handler_6) { static int ret; @@ -425,7 +425,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_6) +DEFINE_TEST(test_continue_execution_6) { static int ret; @@ -447,7 +447,7 @@ //}}} /* Dynamic exception filters, using _SEH2_GetExceptionCode() *///{{{ -DEFINE_TEST(execute_handler_7) +DEFINE_TEST(test_execute_handler_7) { static int ret; @@ -467,7 +467,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_7) +DEFINE_TEST(test_continue_execution_7) { static int ret; @@ -487,7 +487,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_4) +DEFINE_TEST(test_continue_search_4) { static int ret; @@ -515,7 +515,7 @@ return ret == return_positive(); } -DEFINE_TEST(execute_handler_8) +DEFINE_TEST(test_execute_handler_8) { static int ret; @@ -535,7 +535,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_8) +DEFINE_TEST(test_continue_execution_8) { static int ret; @@ -557,7 +557,7 @@ //}}} /* Dynamic exception filters, using _SEH2_GetExceptionInformation() and _SEH2_GetExceptionCode() *///{{{ -DEFINE_TEST(execute_handler_9) +DEFINE_TEST(test_execute_handler_9) { static int ret; @@ -577,7 +577,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_9) +DEFINE_TEST(test_continue_execution_9) { static int ret; @@ -597,7 +597,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_5) +DEFINE_TEST(test_continue_search_5) { static int ret; @@ -625,7 +625,7 @@ return ret == return_positive(); } -DEFINE_TEST(execute_handler_10) +DEFINE_TEST(test_execute_handler_10) { static int ret; @@ -645,7 +645,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_10) +DEFINE_TEST(test_continue_execution_10) { static int ret; @@ -667,7 +667,7 @@ //}}} /* Constant exception filters with side effects *///{{{ -DEFINE_TEST(execute_handler_11) +DEFINE_TEST(test_execute_handler_11) { static int ret; @@ -687,7 +687,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_11) +DEFINE_TEST(test_continue_execution_11) { static int ret; @@ -707,7 +707,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_search_6) +DEFINE_TEST(test_continue_search_6) { static int ret; static int ret2; @@ -740,7 +740,7 @@ return ret == return_positive() && ret2 == return_positive(); } -DEFINE_TEST(execute_handler_12) +DEFINE_TEST(test_execute_handler_12) { static int ret; @@ -760,7 +760,7 @@ return ret == return_positive(); } -DEFINE_TEST(continue_execution_12) +DEFINE_TEST(test_continue_execution_12) { static int ret; @@ -782,7 +782,7 @@ //}}} /* _SEH2_LEAVE *///{{{ -DEFINE_TEST(leave_1) +DEFINE_TEST(test_leave_1) { static int ret; @@ -803,7 +803,7 @@ return ret == return_positive(); } -DEFINE_TEST(leave_2) +DEFINE_TEST(test_leave_2) { static int ret; @@ -826,7 +826,7 @@ return ret == return_positive(); } -DEFINE_TEST(leave_3) +DEFINE_TEST(test_leave_3) { static int ret; @@ -850,7 +850,7 @@ return ret == return_positive(); } -DEFINE_TEST(leave_4) +DEFINE_TEST(test_leave_4) { static int ret; @@ -881,7 +881,7 @@ return ret == return_positive(); } -DEFINE_TEST(leave_5) +DEFINE_TEST(test_leave_5) { static int ret; @@ -907,7 +907,7 @@ return ret == return_positive(); } -DEFINE_TEST(leave_6) +DEFINE_TEST(test_leave_6) { static int ret; @@ -954,7 +954,7 @@ return return_zero(); } -DEFINE_TEST(yield_1) +DEFINE_TEST(test_yield_1) { return test_yield_1_helper() == return_positive(); } @@ -976,7 +976,7 @@ return return_zero(); } -DEFINE_TEST(yield_2) +DEFINE_TEST(test_yield_2) { return test_yield_2_helper() == return_positive(); } @@ -1007,7 +1007,7 @@ return return_zero(); } -DEFINE_TEST(yield_3) +DEFINE_TEST(test_yield_3) { return test_yield_3_helper() == return_positive(); } @@ -1039,7 +1039,7 @@ return return_zero(); } -DEFINE_TEST(yield_4) +DEFINE_TEST(test_yield_4) { return test_yield_4_helper() == return_positive(); } @@ -1064,7 +1064,7 @@ return return_zero(); } -DEFINE_TEST(yield_5) +DEFINE_TEST(test_yield_5) { return test_yield_5_helper() == return_positive() && test_yield_5_ret == return_positive(); } @@ -1097,14 +1097,14 @@ return return_zero(); } -DEFINE_TEST(yield_6) +DEFINE_TEST(test_yield_6) { return test_yield_6_helper() == return_positive() && test_yield_6_ret == return_positive() + return_one(); } //}}} /* Termination blocks *///{{{ -DEFINE_TEST(finally_1) +DEFINE_TEST(test_finally_1) { static int ret; @@ -1123,7 +1123,7 @@ return ret == return_positive(); } -DEFINE_TEST(finally_2) +DEFINE_TEST(test_finally_2) { static int ret; @@ -1143,7 +1143,7 @@ return ret == return_positive(); } -DEFINE_TEST(finally_3) +DEFINE_TEST(test_finally_3) { static int ret; @@ -1184,12 +1184,12 @@ return return_zero(); } -DEFINE_TEST(finally_4) +DEFINE_TEST(test_finally_4) { return test_finally_4_helper() == return_positive() && test_finally_4_ret; } -DEFINE_TEST(finally_5) +DEFINE_TEST(test_finally_5) { static int ret; @@ -1217,7 +1217,7 @@ return ret == return_positive(); } -DEFINE_TEST(finally_6) +DEFINE_TEST(test_finally_6) { static int ret; @@ -1246,7 +1246,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(finally_7) +DEFINE_TEST(test_finally_7) { static int ret; @@ -1276,7 +1276,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(finally_8) +DEFINE_TEST(test_finally_8) { static int ret; @@ -1337,12 +1337,12 @@ return return_zero(); } -DEFINE_TEST(finally_9) +DEFINE_TEST(test_finally_9) { return test_finally_9_helper() == return_positive() && test_finally_9_ret == return_positive() + return_one(); } -DEFINE_TEST(finally_10) +DEFINE_TEST(test_finally_10) { static int ret; @@ -1380,7 +1380,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(finally_11) +DEFINE_TEST(test_finally_11) { static int ret; @@ -1418,7 +1418,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(finally_12) +DEFINE_TEST(test_finally_12) { static int ret; @@ -1492,7 +1492,7 @@ test_finally_13_ret = return_zero(); } -DEFINE_TEST(finally_13) +DEFINE_TEST(test_finally_13) { static int ret; @@ -1557,7 +1557,7 @@ test_finally_14_ret = return_arg(test_finally_14_ret); } -DEFINE_TEST(finally_14) +DEFINE_TEST(test_finally_14) { static int ret; @@ -1599,7 +1599,7 @@ return filter; } -DEFINE_TEST(xpointers_1) +DEFINE_TEST(test_xpointers_1) { static int ret; @@ -1618,7 +1618,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_2) +DEFINE_TEST(test_xpointers_2) { static int ret; @@ -1637,7 +1637,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_3) +DEFINE_TEST(test_xpointers_3) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1657,7 +1657,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_4) +DEFINE_TEST(test_xpointers_4) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1677,7 +1677,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_5) +DEFINE_TEST(test_xpointers_5) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1697,7 +1697,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_6) +DEFINE_TEST(test_xpointers_6) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1717,7 +1717,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_7) +DEFINE_TEST(test_xpointers_7) { static int ret; @@ -1737,7 +1737,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_8) +DEFINE_TEST(test_xpointers_8) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1758,7 +1758,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_9) +DEFINE_TEST(test_xpointers_9) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1779,7 +1779,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_10) +DEFINE_TEST(test_xpointers_10) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1800,7 +1800,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_11) +DEFINE_TEST(test_xpointers_11) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1821,7 +1821,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_12) +DEFINE_TEST(test_xpointers_12) { static int ret; @@ -1848,7 +1848,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_13) +DEFINE_TEST(test_xpointers_13) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1876,7 +1876,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_14) +DEFINE_TEST(test_xpointers_14) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1904,7 +1904,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_15) +DEFINE_TEST(test_xpointers_15) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1932,7 +1932,7 @@ return ret == return_positive(); } -DEFINE_TEST(xpointers_16) +DEFINE_TEST(test_xpointers_16) { static int ret; static const ULONG_PTR args[] = { 1, 2, 12345 }; @@ -1973,7 +1973,7 @@ return filter; } -DEFINE_TEST(xcode_1) +DEFINE_TEST(test_xcode_1) { static int ret; @@ -1993,7 +1993,7 @@ return ret == return_positive(); } -DEFINE_TEST(xcode_2) +DEFINE_TEST(test_xcode_2) { static int ret; @@ -2013,7 +2013,7 @@ return ret == return_positive(); } -DEFINE_TEST(xcode_3) +DEFINE_TEST(test_xcode_3) { static int ret; @@ -2043,7 +2043,7 @@ //}}} /* _SEH2_AbnormalTermination() *///{{{ -DEFINE_TEST(abnorm_1) +DEFINE_TEST(test_abnorm_1) { static int ret; @@ -2062,7 +2062,7 @@ return ret == return_positive(); } -DEFINE_TEST(abnorm_2) +DEFINE_TEST(test_abnorm_2) { static int ret; @@ -2081,7 +2081,7 @@ return ret == return_positive(); } -DEFINE_TEST(abnorm_3) +DEFINE_TEST(test_abnorm_3) { static int ret; @@ -2101,7 +2101,7 @@ return ret == return_positive(); } -DEFINE_TEST(abnorm_4) +DEFINE_TEST(test_abnorm_4) { static int ret; @@ -2129,7 +2129,7 @@ return ret == return_positive(); } -DEFINE_TEST(abnorm_5) +DEFINE_TEST(test_abnorm_5) { static int ret; @@ -2156,7 +2156,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(abnorm_6) +DEFINE_TEST(test_abnorm_6) { static int ret; @@ -2183,7 +2183,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(abnorm_7) +DEFINE_TEST(test_abnorm_7) { static int ret; @@ -2211,7 +2211,7 @@ return ret == return_positive() + return_one(); } -DEFINE_TEST(abnorm_8) +DEFINE_TEST(test_abnorm_8) { static int ret; @@ -2254,6 +2254,56 @@ /* CPU faults *///{{{ // TODO +//}}} + +/* Past bugs, to detect regressions *///{{{ +/* #4004: volatile registers clobbered when catching across frames (originally misreported) *///{{{ +static +void test_bug_4004_helper_1(void) +{ + int i1, i2, i3; + + i1 = return_positive(); + i2 = return_positive(); + i3 = return_positive(); + (void)return_arg(i1 + i2 + i3); + + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + } + _SEH2_FINALLY + { + } + _SEH2_END; +} + +static +void test_bug_4004_helper_2(void) +{ + _SEH2_TRY + { + test_bug_4004_helper_1(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; +} + +DEFINE_TEST(test_bug_4004) +{ + int i1, i2, i3; + + i1 = return_positive(); + i2 = return_positive(); + i3 = return_positive(); + + test_bug_4004_helper_2(); + + return return_arg(i1) + return_arg(i2) + return_arg(i3) == return_positive() * 3; +} +//}}} //}}} static @@ -2334,7 +2384,7 @@ #define USE_TEST_NAME_(NAME_) # NAME_ #define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) -#define USE_TEST(NAME_) { USE_TEST_NAME(test_ ## NAME_), test_ ## NAME_ } +#define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } struct subtest { @@ -2346,109 +2396,111 @@ { const struct subtest testsuite[] = { - USE_TEST(empty_1), - USE_TEST(empty_2), - USE_TEST(empty_3), - USE_TEST(empty_4), - USE_TEST(empty_5), - USE_TEST(empty_6), - USE_TEST(empty_7), - USE_TEST(empty_8), - - USE_TEST(execute_handler_1), - USE_TEST(continue_execution_1), - USE_TEST(continue_search_1), - USE_TEST(execute_handler_2), - USE_TEST(continue_execution_2), - - USE_TEST(execute_handler_3), - USE_TEST(continue_execution_3), - USE_TEST(continue_search_2), - USE_TEST(execute_handler_4), - USE_TEST(continue_execution_4), - - USE_TEST(execute_handler_5), - USE_TEST(continue_execution_5), - USE_TEST(continue_search_3), - USE_TEST(execute_handler_6), - USE_TEST(continue_execution_6), - - USE_TEST(execute_handler_7), - USE_TEST(continue_execution_7), - USE_TEST(continue_search_4), - USE_TEST(execute_handler_8), - USE_TEST(continue_execution_8), - - USE_TEST(execute_handler_9), - USE_TEST(continue_execution_9), - USE_TEST(continue_search_5), - USE_TEST(execute_handler_10), - USE_TEST(continue_execution_10), - - USE_TEST(execute_handler_11), - USE_TEST(continue_execution_11), - USE_TEST(continue_search_6), - USE_TEST(execute_handler_12), - USE_TEST(continue_execution_12), - - USE_TEST(leave_1), - USE_TEST(leave_2), - USE_TEST(leave_3), - USE_TEST(leave_4), - USE_TEST(leave_5), - USE_TEST(leave_6), - - USE_TEST(yield_1), - USE_TEST(yield_2), - USE_TEST(yield_3), - USE_TEST(yield_4), - USE_TEST(yield_5), - USE_TEST(yield_6), - - USE_TEST(finally_1), - USE_TEST(finally_2), - USE_TEST(finally_3), - USE_TEST(finally_4), - USE_TEST(finally_5), - USE_TEST(finally_6), - USE_TEST(finally_7), - USE_TEST(finally_8), - USE_TEST(finally_9), - USE_TEST(finally_10), - USE_TEST(finally_11), - USE_TEST(finally_12), - USE_TEST(finally_13), - USE_TEST(finally_14), - - USE_TEST(xpointers_1), - USE_TEST(xpointers_2), - USE_TEST(xpointers_3), - USE_TEST(xpointers_4), - USE_TEST(xpointers_5), - USE_TEST(xpointers_6), - USE_TEST(xpointers_7), - USE_TEST(xpointers_8), - USE_TEST(xpointers_9), - USE_TEST(xpointers_10), - USE_TEST(xpointers_11), - USE_TEST(xpointers_12), - USE_TEST(xpointers_13), - USE_TEST(xpointers_14), - USE_TEST(xpointers_15), - USE_TEST(xpointers_16), - - USE_TEST(xcode_1), - USE_TEST(xcode_2), - USE_TEST(xcode_3), - - USE_TEST(abnorm_1), - USE_TEST(abnorm_2), - USE_TEST(abnorm_3), - USE_TEST(abnorm_4), - USE_TEST(abnorm_5), - USE_TEST(abnorm_6), - USE_TEST(abnorm_7), - USE_TEST(abnorm_8), + USE_TEST(test_empty_1), + USE_TEST(test_empty_2), + USE_TEST(test_empty_3), + USE_TEST(test_empty_4), + USE_TEST(test_empty_5), + USE_TEST(test_empty_6), + USE_TEST(test_empty_7), + USE_TEST(test_empty_8), + + USE_TEST(test_execute_handler_1), + USE_TEST(test_continue_execution_1), + USE_TEST(test_continue_search_1), + USE_TEST(test_execute_handler_2), + USE_TEST(test_continue_execution_2), + + USE_TEST(test_execute_handler_3), + USE_TEST(test_continue_execution_3), + USE_TEST(test_continue_search_2), + USE_TEST(test_execute_handler_4), + USE_TEST(test_continue_execution_4), + + USE_TEST(test_execute_handler_5), + USE_TEST(test_continue_execution_5), + USE_TEST(test_continue_search_3), + USE_TEST(test_execute_handler_6), + USE_TEST(test_continue_execution_6), + + USE_TEST(test_execute_handler_7), + USE_TEST(test_continue_execution_7), + USE_TEST(test_continue_search_4), + USE_TEST(test_execute_handler_8), + USE_TEST(test_continue_execution_8), + + USE_TEST(test_execute_handler_9), + USE_TEST(test_continue_execution_9), + USE_TEST(test_continue_search_5), + USE_TEST(test_execute_handler_10), + USE_TEST(test_continue_execution_10), + + USE_TEST(test_execute_handler_11), + USE_TEST(test_continue_execution_11), + USE_TEST(test_continue_search_6), + USE_TEST(test_execute_handler_12), + USE_TEST(test_continue_execution_12), + + USE_TEST(test_leave_1), + USE_TEST(test_leave_2), + USE_TEST(test_leave_3), + USE_TEST(test_leave_4), + USE_TEST(test_leave_5), + USE_TEST(test_leave_6), + + USE_TEST(test_yield_1), + USE_TEST(test_yield_2), + USE_TEST(test_yield_3), + USE_TEST(test_yield_4), + USE_TEST(test_yield_5), + USE_TEST(test_yield_6), + + USE_TEST(test_finally_1), + USE_TEST(test_finally_2), + USE_TEST(test_finally_3), + USE_TEST(test_finally_4), + USE_TEST(test_finally_5), + USE_TEST(test_finally_6), + USE_TEST(test_finally_7), + USE_TEST(test_finally_8), + USE_TEST(test_finally_9), + USE_TEST(test_finally_10), + USE_TEST(test_finally_11), + USE_TEST(test_finally_12), + USE_TEST(test_finally_13), + USE_TEST(test_finally_14), + + USE_TEST(test_xpointers_1), + USE_TEST(test_xpointers_2), + USE_TEST(test_xpointers_3), + USE_TEST(test_xpointers_4), + USE_TEST(test_xpointers_5), + USE_TEST(test_xpointers_6), + USE_TEST(test_xpointers_7), + USE_TEST(test_xpointers_8), + USE_TEST(test_xpointers_9), + USE_TEST(test_xpointers_10), + USE_TEST(test_xpointers_11), + USE_TEST(test_xpointers_12), + USE_TEST(test_xpointers_13), + USE_TEST(test_xpointers_14), + USE_TEST(test_xpointers_15), + USE_TEST(test_xpointers_16), + + USE_TEST(test_xcode_1), + USE_TEST(test_xcode_2), + USE_TEST(test_xcode_3), + + USE_TEST(test_abnorm_1), + USE_TEST(test_abnorm_2), + USE_TEST(test_abnorm_3), + USE_TEST(test_abnorm_4), + USE_TEST(test_abnorm_5), + USE_TEST(test_abnorm_6), + USE_TEST(test_abnorm_7), + USE_TEST(test_abnorm_8), + + USE_TEST(test_bug_4004), }; size_t i;

15 years, 8 months

[hyperion] 38668: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Don't save just ESP and EBP, save all volatile registers because we might catch an exception thrown by another frame and end up clobbering all volatile registers (thanks to Dmitry Gorbachev for bug report and test case) Conversely, save volatile registers for _SEH2_EXCEPT scopes only Specialized frame setup routines, to reduce the amount of inline code a

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Jan 9 10:36:21 2009 New Revision: 38668 URL: http://svn.reactos.org/svn/reactos?rev=38668&view=rev Log: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Don't save just ESP and EBP, save all volatile registers because we might catch an exception thrown by another frame and end up clobbering all volatile registers (thanks to Dmitry Gorbachev for bug report and test case) Conversely, save volatile registers for _SEH2_EXCEPT scopes only Specialized frame setup routines, to reduce the amount of inline code and only de-optimize when strictly necessary Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Fri Jan 9 10:36:21 2009 @@ -56,17 +56,28 @@ volatile struct __SEH2TryLevel * ST_Next; void * ST_Filter; void * ST_Body; - void * volatile ST_Ebp; - void * volatile ST_Esp; } _SEH2TryLevel_t; + +typedef struct __SEH2HandleTryLevel +{ + _SEH2TryLevel_t SHT_Common; + void * volatile SHT_Esp; + void * volatile SHT_Ebp; + void * volatile SHT_Ebx; + void * volatile SHT_Esi; + void * volatile SHT_Edi; +} +_SEH2HandleTryLevel_t; #ifdef __cplusplus extern "C" { #endif -extern __attribute__((returns_twice)) void __cdecl _SEH2EnterFrame(_SEH2Frame_t *); +extern int __cdecl _SEH2EnterFrameAndTrylevel(_SEH2Frame_t *, volatile _SEH2TryLevel_t *); +extern __attribute__((returns_twice)) int __cdecl _SEH2EnterFrameAndHandleTrylevel(_SEH2Frame_t *, volatile _SEH2HandleTryLevel_t *, void *); +extern __attribute__((returns_twice)) int __cdecl _SEH2EnterHandleTrylevel(_SEH2Frame_t *, volatile _SEH2HandleTryLevel_t *, void *); extern void __cdecl _SEH2LeaveFrame(void); extern void __cdecl _SEH2Return(void); @@ -174,8 +185,25 @@ __SEH_BARRIER; _SEH2FrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ } -#define __SEH_ENTER_TRYLEVEL() __SEH_SET_TRYLEVEL(&_SEHTryLevel) -#define __SEH_LEAVE_TRYLEVEL() __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP) +#define __SEH_ENTER_FRAME_AND_TRYLEVEL(TRYLEVEL_) (_SEH2EnterFrameAndTrylevel(_SEH2FrameP, (TRYLEVEL_))) +#define __SEH_ENTER_TRYLEVEL(TRYLEVEL_) ((__SEH_SET_TRYLEVEL((TRYLEVEL_))), 0) + +#define __SEH_ENTER_FRAME_AND_HANDLE_TRYLEVEL(TRYLEVEL_, HANDLE_) _SEH2EnterFrameAndHandleTrylevel(_SEH2FrameP, (TRYLEVEL_), (HANDLE_)) +#define __SEH_ENTER_HANDLE_TRYLEVEL(TRYLEVEL_, HANDLE_) _SEH2EnterHandleTrylevel(_SEH2FrameP, (TRYLEVEL_), (HANDLE_)) + +#define __SEH_ENTER_SCOPE(TRYLEVEL_) (_SEHTopTryLevel ? __SEH_ENTER_FRAME_AND_TRYLEVEL(TRYLEVEL_) : __SEH_ENTER_TRYLEVEL(TRYLEVEL_)) +#define __SEH_ENTER_HANDLE_SCOPE(TRYLEVEL_, HANDLE_) (({ __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" ((TRYLEVEL_)->SHT_Esp)); __SEH_BARRIER; }), (_SEHTopTryLevel ? __SEH_ENTER_FRAME_AND_HANDLE_TRYLEVEL((TRYLEVEL_), (HANDLE_)) : __SEH_ENTER_HANDLE_TRYLEVEL((TRYLEVEL_), (HANDLE_)))) + +#define __SEH_LEAVE_SCOPE() \ + if(_SEHTopTryLevel) \ + { \ + _SEH2LeaveFrame(); \ + __asm__ __volatile__("mov %0, %%esp" : : "g" (_SEHStackPointer)); \ + } \ + else \ + { \ + __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP); \ + } \ #define __SEH_END_SCOPE_CHAIN \ static __attribute__((unused)) const int _SEH2ScopeKind = 1; \ @@ -200,27 +228,23 @@ __label__ _SEHAfterTry; \ static const int _SEH2ScopeKind = 0; \ volatile _SEH2TryLevel_t _SEHTryLevel; \ + volatile _SEH2HandleTryLevel_t _SEHHandleTryLevel; \ void * _SEHStackPointer; \ - volatile _SEH2TryLevel_t * const _SEH2TryLevelP = &_SEHTryLevel; \ + volatile _SEH2TryLevel_t * _SEH2TryLevelP; \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? \ ({ __asm__ __volatile__("mov %%esp, %0" : "=g" (_SEHStackPointer)); __builtin_alloca(sizeof(_SEH2Frame_t)); }) : \ _SEHCurFrameP; \ \ (void)_SEH2ScopeKind; \ (void)_SEHTryLevel; \ + (void)_SEHHandleTryLevel; \ (void)_SEHStackPointer; \ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \ - if(_SEHTopTryLevel) \ - _SEH2EnterFrame(_SEH2FrameP); \ - \ - _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ goto _SEHBeforeTry; \ \ - _SEHDoTry:; \ - \ - __SEH_ENTER_TRYLEVEL(); + _SEHDoTry:; #define __SEH_END_SCOPE \ } \ @@ -254,6 +278,9 @@ \ _SEHTryLevel.ST_Filter = 0; \ _SEHTryLevel.ST_Body = &_SEHFinally; \ + _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ + __SEH_ENTER_SCOPE(&_SEHTryLevel); \ + _SEH2TryLevelP = &_SEHTryLevel; \ \ _SEHAbnormalTermination = 1; \ \ @@ -262,12 +289,7 @@ \ _SEHAbnormalTermination = 0; \ \ - if(_SEHTopTryLevel) \ - _SEH2LeaveFrame(); \ - else \ - { \ - __SEH_LEAVE_TRYLEVEL(); \ - } \ + __SEH_LEAVE_SCOPE(); \ \ _SEHFinally(); \ goto _SEHEndExcept; \ @@ -296,64 +318,51 @@ { \ __attribute__((unused)) struct _EXCEPTION_POINTERS * volatile _SEHExceptionInformation; \ \ - if(__builtin_constant_p((__VA_ARGS__))) \ + if(__builtin_constant_p((__VA_ARGS__)) && (__VA_ARGS__) <= 0) \ { \ - if((__VA_ARGS__) > 0) \ - { \ - _SEHTryLevel.ST_Filter = (void *)1; \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_USE_LABEL(_SEHBeginExcept); \ - } \ - else if((__VA_ARGS__) < 0) \ + if((__VA_ARGS__) < 0) \ { \ _SEHTryLevel.ST_Filter = (void *)-1; \ - _SEHTryLevel.ST_Body = NULL; \ + _SEHTryLevel.ST_Body = 0; \ } \ else \ { \ _SEHTryLevel.ST_Filter = (void *)0; \ - _SEHTryLevel.ST_Body = NULL; \ + _SEHTryLevel.ST_Body = 0; \ } \ + \ + _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ + __SEH_ENTER_SCOPE(&_SEHTryLevel); \ + _SEH2TryLevelP = &_SEHTryLevel; \ } \ else \ { \ - __SEH_DEFINE_EXCEPT(_SEHExcept) \ + if(__builtin_constant_p((__VA_ARGS__)) && (__VA_ARGS__) > 0) \ + _SEHHandleTryLevel.SHT_Common.ST_Filter = (void *)1; \ + else \ { \ - __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + } \ + \ + _SEHHandleTryLevel.SHT_Common.ST_Filter = &_SEHExcept; \ } \ \ - _SEHTryLevel.ST_Filter = &_SEHExcept; \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_USE_LABEL(_SEHBeginExcept); \ + _SEHHandleTryLevel.SHT_Common.ST_Next = _SEHPrevTryLevelP; \ + _SEH2TryLevelP = &_SEHHandleTryLevel.SHT_Common; \ + \ + if(__builtin_expect(__SEH_ENTER_HANDLE_SCOPE(&_SEHHandleTryLevel, &&_SEHBeginExcept), 0)) \ + goto _SEHBeginExcept; \ } \ } \ \ - __SEH_BARRIER; \ - \ - __asm__ __volatile__ \ - ( \ - "mov %%ebp, %0\n" \ - "mov %%esp, %1" : \ - "=m" (_SEHTryLevel.ST_Ebp), \ - "=m" (_SEHTryLevel.ST_Esp) \ - ); \ - \ - __SEH_BARRIER; \ - \ goto _SEHDoTry; \ \ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ \ _SEHAfterTry:; \ - if(_SEHTopTryLevel) \ - { \ - _SEH2LeaveFrame(); \ - __asm__ __volatile__("mov %0, %%esp" : : "g" (_SEHStackPointer)); \ - } \ - else \ - { \ - __SEH_LEAVE_TRYLEVEL(); \ - } \ + __SEH_LEAVE_SCOPE(); \ \ goto _SEHEndExcept; \ \ Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Fri Jan 9 10:36:21 2009 @@ -38,7 +38,7 @@ #define EXCEPTION_UNWINDING 2 #endif -extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); +extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *, void *, void *, void *); extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); extern int __cdecl __SEH2UnwindHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); @@ -188,9 +188,20 @@ static DECLSPEC_NORETURN void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { + volatile _SEH2HandleTryLevel_t * fulltrylevel = CONTAINING_RECORD(trylevel, _SEH2HandleTryLevel_t, SHT_Common); + _SEH2GlobalUnwind(frame); - _SEH2LocalUnwind(frame, trylevel); - __SEH2Handle(trylevel->ST_Body, trylevel->ST_Ebp, trylevel->ST_Esp); + _SEH2LocalUnwind(frame, &fulltrylevel->SHT_Common); + + __SEH2Handle + ( + fulltrylevel->SHT_Common.ST_Body, + fulltrylevel->SHT_Esp, + fulltrylevel->SHT_Ebp, + fulltrylevel->SHT_Ebx, + fulltrylevel->SHT_Esi, + fulltrylevel->SHT_Edi + ); } extern @@ -241,12 +252,19 @@ void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) { frame->SF_Registration.SER_Handler = __SEH2FrameHandler; - frame->SF_TopTryLevel = 0; frame->SF_Code = 0; __SEH2EnterFrame(&frame->SF_Registration); } extern +int __cdecl _SEH2EnterFrameAndTrylevel(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) +{ + frame->SF_TopTryLevel = trylevel; + _SEH2EnterFrame(frame); + return 0; +} + +extern void __cdecl _SEH2LeaveFrame(void) { __SEH2LeaveFrame(); Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Fri Jan 9 10:36:21 2009 @@ -21,12 +21,48 @@ .text .intel_syntax noprefix +.func _SEH2EnterHandleTrylevel +.globl __SEH2EnterHandleTrylevel +__SEH2EnterHandleTrylevel: + mov eax, [esp+8] + mov ecx, [esp+12] + mov [eax+8], ecx + mov [eax+16], ebp + mov [eax+20], ebx + mov [eax+24], esi + mov [eax+28], edi + + mov edx, [esp+4] + mov [edx+8], eax + + xor eax, eax + ret +.endfunc + +.func _SEH2EnterFrameAndHandleTrylevel +.globl __SEH2EnterFrameAndHandleTrylevel +__SEH2EnterFrameAndHandleTrylevel: + mov eax, [esp+8] + mov ecx, [esp+12] + mov [eax+8], ecx + mov [eax+16], ebp + mov [eax+20], ebx + mov [eax+24], esi + mov [eax+28], edi + +.extern __SEH2EnterFrameAndTrylevel + jmp __SEH2EnterFrameAndTrylevel +.endfunc + .func __SEH2Handle .globl ___SEH2Handle ___SEH2Handle: mov eax, [esp+4] - mov ebp, [esp+8] - mov esp, [esp+12] + mov ebp, [esp+12] + mov ebx, [esp+16] + mov esi, [esp+20] + mov edi, [esp+24] + mov esp, [esp+8] jmp eax .endfunc

15 years, 8 months

[dgorbachev] 38667: In co_MsqPostKeyboardMessage(), do not forget to release lock - this should cure the "blue death" and the "black death" diseases (bug #3995, bug #3997).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Jan 9 09:39:28 2009 New Revision: 38667 URL: http://svn.reactos.org/svn/reactos?rev=38667&view=rev Log: In co_MsqPostKeyboardMessage(), do not forget to release lock - this should cure the "blue death" and the "black death" diseases (bug #3995, bug #3997). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Jan 9 09:39:28 2009 @@ -738,12 +738,18 @@ LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; EVENTMSG Event; + BOOLEAN Entered = FALSE; DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", uMsg, wParam, lParam); // Condition may arise when calling MsqPostMessage and waiting for an event. - if (!UserIsEntered()) UserEnterExclusive(); // Fixme: Not sure ATM if this thread is locked. + if (!UserIsEntered()) + { + // Fixme: Not sure ATM if this thread is locked. + UserEnterExclusive(); + Entered = TRUE; + } FocusMessageQueue = IntGetFocusMessageQueue(); @@ -781,12 +787,14 @@ { DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, Msg.wParam, Msg.lParam); + if (Entered) UserLeave(); return; } if (FocusMessageQueue == NULL) { DPRINT("No focus message queue\n"); + if (Entered) UserLeave(); return; } @@ -805,7 +813,9 @@ { DPRINT("Invalid focus window handle\n"); } - if (UserIsEntered()) UserLeave(); + + if (Entered) UserLeave(); + return; } VOID FASTCALL

15 years, 8 months

[pschweitzer] 38666: That file got lost during commit... Me or RapidSVN, we'll never know the truth!

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jan 9 09:01:08 2009 New Revision: 38666 URL: http://svn.reactos.org/svn/reactos?rev=38666&view=rev Log: That file got lost during commit... Me or RapidSVN, we'll never know the truth! Modified: branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h Modified: branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… ============================================================================== --- branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Fri Jan 9 09:01:08 2009 @@ -52,12 +52,39 @@ // // Internal structure for NOTIFY_SYNC // -typedef struct _INT_NOTIFY_SYNC +typedef struct _REAL_NOTIFY_SYNC { FAST_MUTEX FastMutex; ULONG_PTR OwningThread; ULONG OwnerCount; -} INT_NOTIFY_SYNC, * PINT_NOTIFY_SYNC; +} REAL_NOTIFY_SYNC, * PREAL_NOTIFY_SYNC; + +// +// Internal structure for notifications +// +typedef struct _NOTIFY_CHANGE +{ + PREAL_NOTIFY_SYNC NotifySync; + PVOID FsContext; + PVOID StreamID; + PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback; + PSECURITY_SUBJECT_CONTEXT SubjectContext; + PSTRING FullDirectoryName; + PLIST_ENTRY NotifyList; + PLIST_ENTRY NotifyIrps; + PFILTER_REPORT_CHANGE FilterCallback; + USHORT Flags; + UCHAR CharacterSize; + ULONG CompletionFilter; + PVOID AllocatedBuffer; + PVOID Buffer; + ULONG BufferLength; + ULONG ThisBufferLength; + ULONG DataLength; + ULONG LastEntry; + ULONG ReferenceCount; + PEPROCESS OwningProcess; +} NOTIFY_CHANGE, *PNOTIFY_CHANGE; // // Internal structure for MCB Mapping pointer

15 years, 8 months

[pschweitzer] 38665: - Added NOTIFY_CHANGE structure - Removed all calls to FsRtlAllocatePoolWithTag, use ExAllocatePoolWithTag with a flag instead - Renamed INT_NOTIFY_SYNC structure to REAL_NOTIFY_SYNC

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jan 9 08:53:01 2009 New Revision: 38665 URL: http://svn.reactos.org/svn/reactos?rev=38665&view=rev Log: - Added NOTIFY_CHANGE structure - Removed all calls to FsRtlAllocatePoolWithTag, use ExAllocatePoolWithTag with a flag instead - Renamed INT_NOTIFY_SYNC structure to REAL_NOTIFY_SYNC Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c branches/pierre-fsd/ntoskrnl/fsrtl/notify.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Fri Jan 9 08:53:01 2009 @@ -114,7 +114,9 @@ } else { - Mcb->Mapping = FsRtlAllocatePoolWithTag(PoolType, sizeof(INT_MAPPING) * MAXIMUM_PAIR_COUNT, TAG('F', 'S', 'B', 'C')); + Mcb->Mapping = ExAllocatePoolWithTag(PoolType | POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(INT_MAPPING) * MAXIMUM_PAIR_COUNT, + TAG('F', 'S', 'B', 'C')); } Mcb->PoolType = PoolType; Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Fri Jan 9 08:53:01 2009 @@ -368,16 +368,17 @@ NTAPI FsRtlNotifyInitializeSync(IN PNOTIFY_SYNC *NotifySync) { - PINT_NOTIFY_SYNC IntNotifySync; + PREAL_NOTIFY_SYNC RealNotifySync; *NotifySync = NULL; - IntNotifySync = FsRtlAllocatePoolWithTag(NonPagedPool, sizeof(INT_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); - ExInitializeFastMutex(&(IntNotifySync->FastMutex)); - IntNotifySync->OwningThread = 0; - IntNotifySync->OwnerCount = 0; - - *NotifySync = IntNotifySync; + RealNotifySync = ExAllocatePoolWithTag(NonPagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(REAL_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); + ExInitializeFastMutex(&(RealNotifySync->FastMutex)); + RealNotifySync->OwningThread = 0; + RealNotifySync->OwnerCount = 0; + + *NotifySync = RealNotifySync; } /*++

15 years, 8 months

[cwittich] 38664: fix msvc build

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 9 08:38:59 2009 New Revision: 38664 URL: http://svn.reactos.org/svn/reactos?rev=38664&view=rev Log: fix msvc build Modified: trunk/reactos/base/services/audiosrv/debug.c trunk/reactos/include/reactos/libs/audiosrv/audiosrv.h Modified: trunk/reactos/base/services/audiosrv/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/deb… ============================================================================== --- trunk/reactos/base/services/audiosrv/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/debug.c [iso-8859-1] Fri Jan 9 08:38:59 2009 @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdarg.h> +#include <windows.h> void logmsg(char* string, ...) { @@ -9,11 +10,19 @@ FILE* debug_file = fopen("c:\\audiosrv-debug.txt", "a"); - va_start(args, string); - - vfprintf(debug_file, string, args); - - va_end(args); - - fclose(debug_file); + if (debug_file) + { + va_start(args, string); + vfprintf(debug_file, string, args); + va_end(args); + fclose(debug_file); + } + else + { + char buf[256]; + va_start(args, string); + vsprintf(buf, string, args); + OutputDebugStringA(buf); + va_end(args); + } } Modified: trunk/reactos/include/reactos/libs/audiosrv/audiosrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/audio… ============================================================================== --- trunk/reactos/include/reactos/libs/audiosrv/audiosrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/audiosrv/audiosrv.h [iso-8859-1] Fri Jan 9 08:38:59 2009 @@ -35,7 +35,7 @@ DWORD size; /* Size of the shared mem */ DWORD max_size; /* Amount of mem available */ DWORD device_count; /* Number of devices */ - PnP_AudioDevice first_device[]; + PnP_AudioDevice *first_device; } PnP_AudioHeader;

15 years, 8 months

[dchapyshev] 38663: - Cleanup user32, direct call to kernel space

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Jan 9 05:33:50 2009 New Revision: 38663 URL: http://svn.reactos.org/svn/reactos?rev=38663&view=rev Log: - Cleanup user32, direct call to kernel space Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/misc/dde.c trunk/reactos/dll/win32/user32/misc/ddeserver.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/object.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/misc/timer.c trunk/reactos/dll/win32/user32/misc/winsta.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/accel.c trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/caret.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddes… Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… Modified: trunk/reactos/dll/win32/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/obje… Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… Modified: trunk/reactos/dll/win32/user32/misc/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/time… Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins… Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a… Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… Modified: trunk/reactos/dll/win32/user32/windows/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…

15 years, 8 months

[mjmartin] 38662: - Dont call KeWaitForSingleObject with WaitMode of KernelMode, as threads cannot be terminated if request was made from user mode. Use Ipr->RequestorMode instead.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Fri Jan 9 05:04:11 2009 New Revision: 38662 URL: http://svn.reactos.org/svn/reactos?rev=38662&view=rev Log: - Dont call KeWaitForSingleObject with WaitMode of KernelMode, as threads cannot be terminated if request was made from user mode. Use Ipr->RequestorMode instead. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Fri Jan 9 05:04:11 2009 @@ -169,7 +169,7 @@ { KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, - KernelMode, + Irp->RequestorMode, FALSE, NULL); } Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Fri Jan 9 05:04:11 2009 @@ -357,9 +357,15 @@ ExReleaseFastMutex(&Ccb->DataListLock); Status = KeWaitForSingleObject(&Event, Executive, - KernelMode, + Irp->RequestorMode, FALSE, NULL); + + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + { + Status = STATUS_CANCELLED; + goto done; + } if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -439,17 +445,28 @@ DPRINT("Waiting for readable data (%wZ)\n", &Ccb->Fcb->PipeName); Status = KeWaitForSingleObject(&Ccb->ReadEvent, UserRequest, - KernelMode, + Irp->RequestorMode, FALSE, NULL); DPRINT("Finished waiting (%wZ)! Status: %x\n", &Ccb->Fcb->PipeName, Status); ExAcquireFastMutex(&Ccb->DataListLock); + + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + { + Status = STATUS_CANCELLED; + break; + } + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } } else { Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; Context->WaitEvent = &Ccb->ReadEvent; + Status = NpfsAddWaitingReadWriteRequest(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -735,11 +752,20 @@ DPRINT("Waiting for buffer space (%S)\n", Fcb->PipeName.Buffer); Status = KeWaitForSingleObject(&Ccb->WriteEvent, UserRequest, - KernelMode, + Irp->RequestorMode, FALSE, NULL); DPRINT("Finished waiting (%S)! Status: %x\n", Fcb->PipeName.Buffer, Status); + if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) + { + Status = STATUS_CANCELLED; + break; + } + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } /* * It's possible that the event was signaled because the * other side of pipe was closed.

15 years, 8 months

[fireball] 38661: - Fix inversed failure logic in MmAllocatePagesForMdl. See issue #4009 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 9 02:54:03 2009 New Revision: 38661 URL: http://svn.reactos.org/svn/reactos?rev=38661&view=rev Log: - Fix inversed failure logic in MmAllocatePagesForMdl. See issue #4009 for more details. Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Fri Jan 9 02:54:03 2009 @@ -599,7 +599,7 @@ } /* If nothing was allocated, fail */ - if (NumberOfPagesAllocated) + if (NumberOfPagesWanted) { /* Free our MDL */ ExFreePool(Mdl);

15 years, 8 months

← Newer
1
...
56
57
58
59
60
61
62
...
76
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 January 2009