Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 54090: [KMTESTS/RTL] - Add a test for RtlFindCharInUnicodeString
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 11:25:34 2011 New Revision: 54090 URL: http://svn.reactos.org/svn/reactos?rev=54090&view=rev Log: [KMTESTS/RTL] - Add a test for RtlFindCharInUnicodeString Added: trunk/rostests/kmtests/rtl/RtlUnicodeString.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest.rbuild trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/kmtest_drv.rbuild Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Wed Oct 12 11:25:34 2011 @@ -11,7 +11,8 @@ example/GuardedMemory.c rtl/RtlAvlTree.c rtl/RtlMemory.c - rtl/RtlSplayTree.c) + rtl/RtlSplayTree.c + rtl/RtlUnicodeString.c) # # kmtest_drv.sys driver Modified: trunk/rostests/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest.rbuild?rev… ============================================================================== --- trunk/rostests/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest.rbuild [iso-8859-1] Wed Oct 12 11:25:34 2011 @@ -21,5 +21,6 @@ <file>RtlAvlTree.c</file> <file>RtlMemory.c</file> <file>RtlSplayTree.c</file> + <file>RtlUnicodeString.c</file> </directory> </module> Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Wed Oct 12 11:25:34 2011 @@ -12,6 +12,7 @@ KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlSplayTree; +KMT_TESTFUNC Test_RtlUnicodeString; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -21,5 +22,6 @@ { "RtlAvlTree", Test_RtlAvlTree }, { "RtlMemory", Test_RtlMemory }, { "RtlSplayTree", Test_RtlSplayTree }, + { "RtlUnicodeString", Test_RtlUnicodeString }, { NULL, NULL }, }; Modified: trunk/rostests/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv.rbuild… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Oct 12 11:25:34 2011 @@ -56,6 +56,7 @@ <file>RtlAvlTree.c</file> <file>RtlMemory.c</file> <file>RtlSplayTree.c</file> + <file>RtlUnicodeString.c</file> </directory> </module> <module name="kmtest_printf" type="staticlibrary"> Added: trunk/rostests/kmtests/rtl/RtlUnicodeString.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlUnicodeStr… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlUnicodeString.c (added) +++ trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] Wed Oct 12 11:25:34 2011 @@ -1,0 +1,183 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Runtime library unicode string functions test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) + +static +VOID +TestFindCharInUnicodeString(VOID) +{ +#ifdef KMT_USER_MODE + NTSTATUS ExceptionStatus; + NTSTATUS Status; + UNICODE_STRING String = RTL_CONSTANT_STRING(L"I am a string"); + UNICODE_STRING Chars = RTL_CONSTANT_STRING(L"a"); + UNICODE_STRING Chars2 = RTL_CONSTANT_STRING(L"A"); + UNICODE_STRING Chars3 = RTL_CONSTANT_STRING(L"i"); + UNICODE_STRING Chars4 = RTL_CONSTANT_STRING(L"G"); + UNICODE_STRING ZeroLengthString; + USHORT Position; + ULONG LongPosition; + + RtlInitUnicodeString(&ZeroLengthString, NULL); + + /* Basic checks. Covered by Winetests */ + Position = 123; + Status = RtlFindCharInUnicodeString(0, &String, &Chars, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 6); + + Position = 123; + Status = RtlFindCharInUnicodeString(1, &String, &Chars, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 10); + + Position = 123; + Status = RtlFindCharInUnicodeString(2, &String, &Chars, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 2); + + Position = 123; + Status = RtlFindCharInUnicodeString(3, &String, &Chars, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 24); + + /* Show that checks are case sensitive by default */ + Position = 123; + Status = RtlFindCharInUnicodeString(0, &String, &Chars2, &Position); + ok_eq_hex(Status, STATUS_NOT_FOUND); + ok_eq_uint(Position, 0); + + Position = 123; + Status = RtlFindCharInUnicodeString(1, &String, &Chars2, &Position); + ok_eq_hex(Status, STATUS_NOT_FOUND); + ok_eq_uint(Position, 0); + + Position = 123; + Status = RtlFindCharInUnicodeString(2, &String, &Chars3, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 2); + + Position = 123; + Status = RtlFindCharInUnicodeString(3, &String, &Chars4, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 24); + + /* Show that 4 means case insensitive */ + Position = 123; + Status = RtlFindCharInUnicodeString(4, &String, &Chars2, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 6); + + Position = 123; + Status = RtlFindCharInUnicodeString(5, &String, &Chars2, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 10); + + Position = 123; + Status = RtlFindCharInUnicodeString(6, &String, &Chars3, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 4); + + Position = 123; + Status = RtlFindCharInUnicodeString(7, &String, &Chars4, &Position); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Position, 22); + + /* Show that Position is USHORT */ + LongPosition = 0x55555555; + Status = RtlFindCharInUnicodeString(8, &String, &String, (PUSHORT)&LongPosition); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_ulong(LongPosition, 0x55550000UL); + + /* Invalid flags */ + Position = 123; + Status = RtlFindCharInUnicodeString(8, &String, &String, &Position); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_uint(Position, 0); + + Position = 123; + Status = RtlFindCharInUnicodeString(0xFFFFFFF8, &String, &String, &Position); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_uint(Position, 0); + + Position = 123; + Status = RtlFindCharInUnicodeString(0xFFFFFFFF, &String, &String, &Position); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_uint(Position, 0); + + /* NULL for SearchString */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(0, NULL, &String, &Position); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_uint(Position, 0); + + /* NULL for SearchString and invalid flags */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(8, NULL, &String, &Position); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_uint(Position, 0); + ok_eq_uint(Position, 0); + + /* NULL for SearchString with zero-length MatchString */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(0, NULL, &ZeroLengthString, &Position); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_uint(Position, 0); + + /* NULL for MatchString */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(0, &String, NULL, &Position); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_uint(Position, 0); + + /* This crashes in Windows, but not in ROS. I see no reason to add + * additional code or redesign the function to replicate that */ +#if 0 + /* NULL for MatchString with zero-length SearchString */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(0, &ZeroLengthString, NULL, &Position); + EndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_uint(Position, 0); +#endif + + /* NULL for MatchString and invalid flags */ + Position = 123; + StartSeh() + Status = RtlFindCharInUnicodeString(8, &String, NULL, &Position); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + ok_eq_uint(Position, 0); + + /* NULL for Position */ + StartSeh() + Status = RtlFindCharInUnicodeString(0, &String, &String, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + /* NULL for all three */ + StartSeh() + Status = RtlFindCharInUnicodeString(0, NULL, NULL, NULL); + EndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); +#endif +} + +START_TEST(RtlUnicodeString) +{ + TestFindCharInUnicodeString(); +} Propchange: trunk/rostests/kmtests/rtl/RtlUnicodeString.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 54089: [RPCRT4_WINETEST] - Sync to Wine 1.3.30. Fixes crash in rpcrt4:rpc test See issue #5778 for more details.
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 11:02:41 2011 New Revision: 54089 URL: http://svn.reactos.org/svn/reactos?rev=54089&view=rev Log: [RPCRT4_WINETEST] - Sync to Wine 1.3.30. Fixes crash in rpcrt4:rpc test See issue #5778 for more details. Modified: trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl trunk/rostests/winetests/rpcrt4/testlist.c Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Wed Oct 12 11:02:41 2011 @@ -284,8 +284,7 @@ ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "expected RPC_C_AUTHN_LEVEL_PKT_PRIVACY, got %d\n", level); ok(authnsvc == RPC_C_AUTHN_WINNT, "expected RPC_C_AUTHN_WINNT, got %d\n", authnsvc); todo_wine ok(authzsvc == RPC_C_AUTHZ_NAME, "expected RPC_C_AUTHZ_NAME, got %d\n", authzsvc); - - RpcStringFree(&principal); + if (status == RPC_S_OK) RpcStringFree(&principal); status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%u)\n", @@ -596,8 +595,10 @@ ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr); @@ -611,8 +612,10 @@ ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr); @@ -848,7 +851,7 @@ status = RpcBindingFree(&binding); ok(status == RPC_S_INVALID_BINDING, - "RpcBindingFree should have retured RPC_S_INVALID_BINDING instead of %d\n", + "RpcBindingFree should have returned RPC_S_INVALID_BINDING instead of %d\n", status); } Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Wed Oct 12 11:02:41 2011 @@ -340,6 +340,19 @@ return sum; } +int __cdecl s_get_cpsc(int n, cpsc_t *cpsc) +{ + int i, ret; + + cpsc->a = 2 * n; + cpsc->b = 2; + cpsc->c = 1; + cpsc->ca = MIDL_user_allocate( cpsc->a * sizeof(int) ); + for (i = ret = 0; i < cpsc->a; i++) cpsc->ca[i] = i; + for (i = ret = 0; i < cpsc->a; i++) ret += cpsc->ca[i]; + return ret; +} + int __cdecl s_square_puint(puint_t p) { int n = atoi(p); @@ -586,9 +599,14 @@ return (char *)__FILE__; } -int __cdecl s_echo_ranged_int(int n) -{ - return n; +int __cdecl s_echo_ranged_int(int i, int j, int k) +{ + return min( 100, i + j + k ); +} + +int __cdecl s_echo_ranged_int2(int i) +{ + return i; } void __cdecl s_get_ranged_enum(renum_t *re) @@ -921,10 +939,12 @@ ok(!strcmp(str, __FILE__), "get_filename() returned %s instead of %s\n", str, __FILE__); midl_user_free(str); - x = echo_ranged_int(0); + x = echo_ranged_int(0,0,0); ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); - x = echo_ranged_int(100); + x = echo_ranged_int(10,20,100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); + x = echo_ranged_int2(40); + ok(x == 40, "echo_ranged_int() returned %d instead of 40\n", x); if (!old_windows_version) { @@ -1226,6 +1246,7 @@ cs_t *cs; int n; int ca[5] = {1, -2, 3, -4, 5}; + int tmp[10]; doub_carr_t *dc; int *pi; pints_t api[5]; @@ -1292,6 +1313,18 @@ cpsc.c = 0; cpsc.ca = c; ok(sum_cpsc(&cpsc) == 10, "RPC sum_cpsc\n"); + + cpsc.ca = NULL; + ok(get_cpsc(5, &cpsc) == 45, "RPC sum_cpsc\n"); + ok( cpsc.a == 10, "RPC get_cpsc %u\n", cpsc.a ); + for (n = 0; n < 10; n++) ok( cpsc.ca[n] == n, "RPC get_cpsc[%d] = %d\n", n, cpsc.ca[n] ); + + memset( tmp, 0x33, sizeof(tmp) ); + cpsc.ca = tmp; + ok(get_cpsc(4, &cpsc) == 28, "RPC sum_cpsc\n"); + ok( cpsc.a == 8, "RPC get_cpsc %u\n", cpsc.a ); + ok( cpsc.ca == tmp, "RPC get_cpsc %p/%p\n", cpsc.ca, tmp ); + for (n = 0; n < 8; n++) ok( cpsc.ca[n] == n, "RPC get_cpsc[%d] = %d\n", n, cpsc.ca[n] ); ok(sum_toplev_conf_2n(c, 3) == 15, "RPC sum_toplev_conf_2n\n"); ok(sum_toplev_conf_cond(c, 5, 6, 1) == 10, "RPC sum_toplev_conf_cond\n"); Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] Wed Oct 12 11:02:41 2011 @@ -162,6 +162,7 @@ int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); + int get_cpsc(int n, [out] cpsc_t *cpsc ); int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); typedef [wire_marshal(int)] void *puint_t; @@ -362,7 +363,8 @@ const int RE_MAX = RE3; typedef [range(RE_MIN, RE_MAX)] enum renum renum_t; typedef [range(0, 100)] int rint_t; - rint_t echo_ranged_int([range(0, 100)] int n); + rint_t echo_ranged_int([range(0, 10)] int i, [range(0, 20)] int j, [range(0, 100)] int k); + rint_t echo_ranged_int2([range(0, 40)] int i); void get_ranged_enum([out] renum_t *re); void context_handle_test(void); Modified: trunk/rostests/winetests/rpcrt4/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/testlist… ============================================================================== --- trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] Wed Oct 12 11:02:41 2011 @@ -11,6 +11,7 @@ extern void func_ndr_marshall(void); extern void func_rpc(void); extern void func_rpc_async(void); +extern void func_rpc_protseq(void); extern void func_server(void); const struct test winetest_testlist[] = @@ -20,6 +21,7 @@ { "ndr_marshall", func_ndr_marshall }, { "rpc", func_rpc }, { "rpc_async", func_rpc_async }, + { "rpc_protseq", func_rpc_protseq }, { "server", func_server }, { 0, 0 } };

1 0

[tfaber] 54088: [STLPORT] - Do not define min() or max() when standard headers are included. Should fix MSVC build
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 09:05:23 2011 New Revision: 54088 URL: http://svn.reactos.org/svn/reactos?rev=54088&view=rev Log: [STLPORT] - Do not define min() or max() when standard headers are included. Should fix MSVC build Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Oct 12 09:05:23 2011 @@ -98,6 +98,10 @@ /* Define WIN32_NO_STATUS to prevent status codes redefinitions */ # if !defined(WIN32_NO_STATUS) # define WIN32_NO_STATUS +# endif +/* Don't let windows.h define its min and max macros. */ +# if !defined (NOMINMAX) +# define NOMINMAX # endif # include <windef.h>

1 0

[tkreuzer] 54087: [NTOSKRNL] Handle some ros specific codes in KD64 version of KdSystemDebugControl (tab-k, ...)
by tkreuzer＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: tkreuzer Date: Tue Oct 11 21:29:13 2011 New Revision: 54087 URL: http://svn.reactos.org/svn/reactos?rev=54087&view=rev Log: [NTOSKRNL] Handle some ros specific codes in KD64 version of KdSystemDebugControl (tab-k, ...) Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Oct 11 21:29:13 2011 @@ -1948,6 +1948,26 @@ IN OUT PULONG ReturnLength, IN KPROCESSOR_MODE PreviousMode) { + /* handle sime internal commands */ + if (Command == ' soR') + { + switch ((ULONG_PTR)InputBuffer) + { + case 0x30: // ManualBugCheck: + KeBugCheck(MANUALLY_INITIATED_CRASH); + break; + + case 0x25: // EnterDebugger: + DbgBreakPoint(); + break; + + case 0x24: + MmDumpArmPfnDatabase(FALSE); + break; + } + return STATUS_SUCCESS; + } + /* Local kernel debugging is not yet supported */ DbgPrint("KdSystemDebugControl is unimplemented!\n"); return STATUS_NOT_IMPLEMENTED;

1 0

[akhaldi] 54086: [SHELL32] * Igor Paliychuk: Convert shell32 resources to utf-8. See issue #6379 for more details.
by akhaldi＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: akhaldi Date: Tue Oct 11 20:13:47 2011 New Revision: 54086 URL: http://svn.reactos.org/svn/reactos?rev=54086&view=rev Log: [SHELL32] * Igor Paliychuk: Convert shell32 resources to utf-8. See issue #6379 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shell32.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.…

1 0

[gadamopoulos] 54085: [win32k] - do not use RETURN macro in keyboard functions
by gadamopoulos＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: gadamopoulos Date: Tue Oct 11 19:22:07 2011 New Revision: 54085 URL: http://svn.reactos.org/svn/reactos?rev=54085&view=rev Log: [win32k] - do not use RETURN macro in keyboard functions Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Tue Oct 11 19:22:07 2011 @@ -617,17 +617,17 @@ NtUserBlockInput( BOOL BlockIt) { - DECLARE_RETURN(BOOLEAN); + BOOL ret; TRACE("Enter NtUserBlockInput\n"); UserEnterExclusive(); - RETURN( IntBlockInput(PsGetCurrentThreadWin32Thread(), BlockIt)); - -CLEANUP: - TRACE("Leave NtUserBlockInput, ret=%i\n", _ret_); + ret = IntBlockInput(PsGetCurrentThreadWin32Thread(), BlockIt); + UserLeave(); - END_CLEANUP; + TRACE("Leave NtUserBlockInput, ret=%i\n", ret); + + return ret; } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Oct 11 19:22:07 2011 @@ -591,30 +591,28 @@ NtUserGetAsyncKeyState(INT Key) { WORD wRet = 0; - DECLARE_RETURN(SHORT); TRACE("Enter NtUserGetAsyncKeyState\n"); + + if (Key >= 0x100) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + ERR("Invalid parameter Key\n"); + return 0; + } + UserEnterExclusive(); - if (Key < 0x100) - { - if (IS_KEY_DOWN(gafAsyncKeyState, Key)) - wRet |= 0x8000; // If down, windows returns 0x8000. - if (gafAsyncKeyStateRecentDown[Key / 8] & (1 << (Key % 8))) - wRet |= 0x1; - gafAsyncKeyStateRecentDown[Key / 8] &= ~(1 << (Key % 8)); - } - else - { - EngSetLastError(ERROR_INVALID_PARAMETER); - } - - RETURN(wRet); - -CLEANUP: - TRACE("Leave NtUserGetAsyncKeyState, ret=%i\n", _ret_); + if (IS_KEY_DOWN(gafAsyncKeyState, Key)) + wRet |= 0x8000; // If down, windows returns 0x8000. + if (gafAsyncKeyStateRecentDown[Key / 8] & (1 << (Key % 8))) + wRet |= 0x1; + gafAsyncKeyStateRecentDown[Key / 8] &= ~(1 << (Key % 8)); + UserLeave(); - END_CLEANUP; + + TRACE("Leave NtUserGetAsyncKeyState, ret=%i\n", wRet); + return wRet; } /* @@ -1101,7 +1099,7 @@ NtUserMapVirtualKeyEx(UINT uCode, UINT uType, DWORD keyboardId, HKL dwhkl) { PKBDTABLES pKbdTbl = NULL; - DECLARE_RETURN(UINT); + UINT ret = 0; TRACE("Enter NtUserMapVirtualKeyEx\n"); UserEnterExclusive(); @@ -1123,15 +1121,12 @@ pKbdTbl = pKbl->KBTables; } - if (!pKbdTbl) - RETURN(0); - - RETURN(IntMapVirtualKeyEx(uCode, uType, pKbdTbl)); - -CLEANUP: - TRACE("Leave NtUserMapVirtualKeyEx, ret=%i\n", _ret_); + if (pKbdTbl) + ret = IntMapVirtualKeyEx(uCode, uType, pKbdTbl); + UserLeave(); - END_CLEANUP; + TRACE("Leave NtUserMapVirtualKeyEx, ret=%i\n", ret); + return ret; } /* @@ -1155,16 +1150,14 @@ PWCHAR pwszBuff = NULL; INT i, iRet = 0; PKBL pKbl = NULL; - NTSTATUS Status = STATUS_SUCCESS; - DECLARE_RETURN(INT); TRACE("Enter NtUserSetKeyboardState\n"); - UserEnterShared(); /* Return 0 if SC_KEY_UP bit is set */ - if (wScanCode & SC_KEY_UP) - { - RETURN(0); + if (wScanCode & SC_KEY_UP || wVirtKey >= 0x100) + { + ERR("Invalid parameter\n"); + return 0; } _SEH2_TRY @@ -1181,55 +1174,45 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + ERR("Cannot copy key state\n"); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return 0); } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - ERR("Cannot copy key state\n"); - SetLastNtError(Status); - RETURN(0); - } - - /* Virtual code is correct? */ - if (wVirtKey < 0x100) - { - pwszBuff = ExAllocatePoolWithTag(NonPagedPool, sizeof(WCHAR) * cchBuff, TAG_STRING); - if (!pwszBuff) - { - ERR("ExAllocatePoolWithTag(%d) failed\n", sizeof(WCHAR) * cchBuff); - RETURN(0); - } - RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff); - - if (dwhkl) - pKbl = UserHklToKbl(dwhkl); - - if (!pKbl) - { - pti = PsGetCurrentThreadWin32Thread(); - pKbl = pti->KeyboardLayout; - } - - iRet = IntToUnicodeEx(wVirtKey, - wScanCode, - afKeyState, - pwszBuff, - cchBuff, - wFlags, - pKbl ? pKbl->KBTables : NULL); - - MmCopyToCaller(pwszBuffUnsafe, pwszBuff, cchBuff * sizeof(WCHAR)); - ExFreePoolWithTag(pwszBuff, TAG_STRING); - } - - RETURN(iRet); - -CLEANUP: - TRACE("Leave NtUserSetKeyboardState, ret=%i\n", _ret_); + pwszBuff = ExAllocatePoolWithTag(NonPagedPool, sizeof(WCHAR) * cchBuff, TAG_STRING); + if (!pwszBuff) + { + ERR("ExAllocatePoolWithTag(%d) failed\n", sizeof(WCHAR) * cchBuff); + return 0; + } + RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff); + + UserEnterShared(); + + if (dwhkl) + pKbl = UserHklToKbl(dwhkl); + + if (!pKbl) + { + pti = PsGetCurrentThreadWin32Thread(); + pKbl = pti->KeyboardLayout; + } + + iRet = IntToUnicodeEx(wVirtKey, + wScanCode, + afKeyState, + pwszBuff, + cchBuff, + wFlags, + pKbl ? pKbl->KBTables : NULL); + + MmCopyToCaller(pwszBuffUnsafe, pwszBuff, cchBuff * sizeof(WCHAR)); + ExFreePoolWithTag(pwszBuff, TAG_STRING); + UserLeave(); - END_CLEANUP; + TRACE("Leave NtUserSetKeyboardState, ret=%i\n", iRet); + return iRet; } /* @@ -1249,17 +1232,20 @@ VSC_LPWSTR *pKeyNames = NULL; CONST WCHAR *pKeyName = NULL; WCHAR KeyNameBuf[2]; - DECLARE_RETURN(DWORD); TRACE("Enter NtUserGetKeyNameText\n"); - UserEnterShared(); /* Get current keyboard layout */ pti = PsGetCurrentThreadWin32Thread(); pKbdTbl = pti ? pti->KeyboardLayout->KBTables : 0; if (!pKbdTbl || cchSize < 1) - RETURN(0); + { + ERR("Invalid parameter\n"); + return 0; + } + + UserEnterShared(); /* "Do not care" flag */ if(lParam & LP_DO_NOT_CARE_BIT) @@ -1323,12 +1309,9 @@ EngSetLastError(ERROR_INVALID_PARAMETER); } - RETURN(dwRet); - -CLEANUP: - TRACE("Leave NtUserGetKeyNameText, ret=%i\n", _ret_); UserLeave(); - END_CLEANUP; + TRACE("Leave NtUserGetKeyNameText, ret=%i\n", dwRet); + return dwRet; } /*

1 0

[akhaldi] 54084: [CMAKE] * Fix a typo.
by akhaldi＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: akhaldi Date: Tue Oct 11 18:52:28 2011 New Revision: 54084 URL: http://svn.reactos.org/svn/reactos?rev=54084&view=rev Log: [CMAKE] * Fix a typo. Modified: trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt Modified: trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/writing_CmakeLists_f… ============================================================================== --- trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt [iso-8859-1] (original) +++ trunk/reactos/cmake/writing_CmakeLists_for_ReactOS.txt [iso-8859-1] Tue Oct 11 18:52:28 2011 @@ -1,4 +1,4 @@ -CMake is used to build rectos. +CMake is used to build ReactOS. Here you will find what you'll need to write nice CMakeLists.txt files for ReactOS. CMake standard functions are available too. See http://www.cmake.org/, or type cmake --help-html in your shell to get the full documentation. @@ -10,13 +10,13 @@ This set the type of the module, and take cares of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to reactos build. -ARGUMENTS : -<target> : name of the target. The module must have been added with add_executable or add_library before calling this function. -<type> : one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver -UNICODE : provide this if the module was written for unicode API -<baseaddress> : provide this if you want your module to have a different base address than the defualt one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. -<entrypoint> : name of the function which will be the entr point of the module. If it's not provided, it's guessed from the module type. -<stacksize> : Size of stack required for the parameters of <entrypoint>. +ARGUMENTS: +<target>: name of the target. The module must have been added with add_executable or add_library before calling this function. +<type>: one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver +UNICODE: provide this if the module was written for unicode API +<baseaddress>: provide this if you want your module to have a different base address than the defualt one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. +<entrypoint>: name of the function which will be the entr point of the module. If it's not provided, it's guessed from the module type. +<stacksize>: Size of stack required for the parameters of <entrypoint>. -TYPICAL USE : +TYPICAL USE: set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)

1 0

[akhaldi] 54083: [FREELDR] * Comment out some unused variables.
by akhaldi＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: akhaldi Date: Tue Oct 11 18:43:34 2011 New Revision: 54083 URL: http://svn.reactos.org/svn/reactos?rev=54083&view=rev Log: [FREELDR] * Comment out some unused variables. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] Tue Oct 11 18:43:34 2011 @@ -425,7 +425,8 @@ ULONG ImageSize; INT i, j; PLOADER_MODULE ModuleData; - int phsize, phnum, shsize, shnum, relsize, SectionAddr = 0; + //int phsize, phnum; + int shsize, shnum, relsize, SectionAddr = 0; PCHAR sptr; Elf32_Ehdr ehdr; Elf32_Shdr *shdr; @@ -457,8 +458,8 @@ } /* Start by getting elf headers */ - phsize = ehdr.e_phentsize; - phnum = ehdr.e_phnum; + //phsize = ehdr.e_phentsize; + //phnum = ehdr.e_phnum; shsize = ehdr.e_shentsize; shnum = ehdr.e_shnum; sptr = (PCHAR)MmHeapAlloc(shnum * shsize); Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c [iso-8859-1] Tue Oct 11 18:43:34 2011 @@ -318,14 +318,15 @@ int PpcVirt2phys( int virt, int inst ) { int msr = GetMSR(); int txmask = inst ? 0x20 : 0x10; - int i, bath, batl, sr, sdr1, physbase, vahi, valo; - int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int i, bath, batl, sr, sdr1, physbase, valo; + int hash, hashmask, ptehi, ptelo, ptegaddr; + //int vahi, npteg; int vsid, pteh, ptevsid, pteapi; if( msr & txmask ) { sr = GetSR( virt >> 28 ); vsid = sr & 0xfffffff; - vahi = vsid >> 4; + //vahi = vsid >> 4; valo = (vsid << 28) | (virt & 0xfffffff); if( sr & 0x80000000 ) { return valo; @@ -343,7 +344,7 @@ physbase = sdr1 & ~0xffff; hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); - npteg = hashmask + 1; + //npteg = hashmask + 1; for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { ptegaddr = ((hashmask & hash) * 64) + physbase;

1 0

[akhaldi] 54082: [CMAKE] * Use the gcc toolchain-provided STL. * Use STLport only on MSVC builds. [KSPROXY] * Set imagebase, properly set its entry point, use set_cpp() instead of hardcoded definit...
by akhaldi＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: akhaldi Date: Tue Oct 11 18:31:35 2011 New Revision: 54082 URL: http://svn.reactos.org/svn/reactos?rev=54082&view=rev Log: [CMAKE] * Use the gcc toolchain-provided STL. * Use STLport only on MSVC builds. [KSPROXY] * Set imagebase, properly set its entry point, use set_cpp() instead of hardcoded definition/includes and add no exceptions/rtti gcc flags. [GLU32] * Use set_cpp() instead of the hardcoded target_link_libraries(). [PORTCLS] * Use set_module_type() with proper entry point, instead of expanded macro calls, and get rid of hardcoded target_link_libraries(). * Commit Dedicated to Olaf Siejka (Caemyr). Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/lib/3rdparty/CMakeLists.txt Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -13,7 +13,6 @@ sndrec32.cpp rsrc.rc) -target_link_libraries(sndrec32 stlport) set_module_type(sndrec32 win32gui UNICODE) add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32) add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -1,10 +1,12 @@ macro(set_cpp) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) set(IS_CPP 1) - add_definitions( - -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ - -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) + if(MSVC) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) + add_definitions( + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) + endif() endmacro() function(add_dependency_node _node) Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=54082&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -150,7 +150,7 @@ function(set_module_type_toolchain MODULE TYPE) if(IS_CPP) - target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) + target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex) endif() if(${TYPE} STREQUAL kernelmodedriver) Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -1,11 +1,7 @@ + +set_cpp() spec2def(ksproxy.ax ksproxy.spec) - -add_definitions( - -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ - -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) - -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) add_library(ksproxy SHARED allocator.cpp @@ -28,17 +24,16 @@ qualityforward.cpp ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def) -set_entrypoint(ksproxy 0) +set_module_type(ksproxy win32dll ENTRYPOINT 0) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") + if(MSVC) add_target_compile_flags(ksproxy "/GR-") else() - #FIXME : can't build if this is enabled, check if this is needed - #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") - target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames) + add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") endif() -target_link_libraries(ksproxy stlport strmiids) +target_link_libraries(ksproxy strmiids) add_importlibs(ksproxy advapi32 @@ -49,6 +44,4 @@ kernel32 ntdll) -add_dependencies(ksproxy psdk) - add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -1,3 +1,5 @@ + +set_cpp() add_definitions( -DRESOLVE_3D_TEXTURE_SUPPORT @@ -110,10 +112,6 @@ allow_warnings(glu32) set_module_type(glu32 win32dll ENTRYPOINT 0 ) -if(NOT MSVC) - target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) -endif() - add_importlibs(glu32 opengl32 gdi32 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -53,20 +53,15 @@ target_link_libraries(portcls libcntpr - stlport ${PSEH_LIB}) if(MSVC) add_target_compile_flags(portcls "/GR-") else() - target_link_libraries(portcls -lgcc) add_target_compile_flags(portcls "-fno-exceptions -fno-rtti") -endif(MSVC) +endif() +set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) add_pch(portcls private.hpp) -set_entrypoint(portcls 0) -set_image_base(portcls 0x00010000) -set_subsystem(portcls native) -set_target_properties(portcls PROPERTIES SUFFIX ".sys") add_importlibs(portcls ntoskrnl ks drmk hal) -add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Tue Oct 11 18:31:35 2011 @@ -9,5 +9,7 @@ add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) -add_subdirectory(stlport) +if(MSVC) + add_subdirectory(stlport) +endif() add_subdirectory(zlib)

1 0

[tkreuzer] 54081: [NTOSKRNL] Implement SystemTimeAdjustmentInformation case in NtSetSystemInformation. This silences the annoying messages caused by VBoxService
by tkreuzer＠svn.reactos.org 11 Oct '11

11 Oct '11

Author: tkreuzer Date: Tue Oct 11 16:11:59 2011 New Revision: 54081 URL: http://svn.reactos.org/svn/reactos?rev=54081&view=rev Log: [NTOSKRNL] Implement SystemTimeAdjustmentInformation case in NtSetSystemInformation. This silences the annoying messages caused by VBoxService Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Oct 11 16:11:59 2011 @@ -1391,7 +1391,7 @@ /* Give time values to our caller */ TimeInfo->TimeIncrement = KeMaximumIncrement; TimeInfo->TimeAdjustment = KeTimeAdjustment; - TimeInfo->Enable = TRUE; + TimeInfo->Enable = !KiTimeAdjustmentEnabled; return STATUS_SUCCESS; } @@ -1399,8 +1399,8 @@ SSI_DEF(SystemTimeAdjustmentInformation) { KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); - /*PSYSTEM_SET_TIME_ADJUST_INFORMATION TimeInfo = - (PSYSTEM_SET_TIME_ADJUST_INFORMATION)Buffer;*/ + PSYSTEM_SET_TIME_ADJUST_INFORMATION TimeInfo = + (PSYSTEM_SET_TIME_ADJUST_INFORMATION)Buffer; /* Check size of a buffer, it must match our expectations */ if (sizeof(SYSTEM_SET_TIME_ADJUST_INFORMATION) != Size) @@ -1416,9 +1416,24 @@ } } - /* TODO: Set time adjustment information */ - DPRINT1("Setting of SystemTimeAdjustmentInformation is not implemented yet!\n"); - return STATUS_NOT_IMPLEMENTED; + /* FIXME: behaviour suggests the member be named 'Disable' */ + if (TimeInfo->Enable) + { + /* Disable time adjustment and set default value */ + KiTimeAdjustmentEnabled = FALSE; + KeTimeAdjustment = KeMaximumIncrement; + } + else + { + /* Check if a valid time adjustment value is given */ + if (TimeInfo->TimeAdjustment == 0) return STATUS_INVALID_PARAMETER_2; + + /* Enable time adjustment and set the adjustment value */ + KiTimeAdjustmentEnabled = TRUE; + KeTimeAdjustment = TimeInfo->TimeAdjustment; + } + + return STATUS_SUCCESS; } /* Class 29 - Summary Memory Information */ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Oct 11 16:11:59 2011 @@ -132,6 +132,7 @@ extern PVOID KeRaiseUserExceptionDispatcher; extern ULONG KeTimeIncrement; extern ULONG KeTimeAdjustment; +extern BOOLEAN KiTimeAdjustmentEnabled; extern LONG KiTickOffset; extern ULONG_PTR KiBugCheckData[5]; extern ULONG KiFreezeFlag; Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=540… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Oct 11 16:11:59 2011 @@ -16,6 +16,7 @@ LONG KiTickOffset; ULONG KeTimeAdjustment; +BOOLEAN KiTimeAdjustmentEnabled = FALSE; /* FUNCTIONS ******************************************************************/ @@ -23,12 +24,12 @@ FASTCALL KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, IN ULONG Increment, - IN KIRQL Irql) + IN KIRQL Irql) { PKPRCB Prcb = KeGetCurrentPrcb(); ULARGE_INTEGER CurrentTime, InterruptTime; ULONG Hand, OldTickCount; - + /* Add the increment time to the shared data */ InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; @@ -36,10 +37,10 @@ SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; - + /* Update tick count */ InterlockedExchangeAdd(&KiTickOffset, -(LONG)Increment); - + /* Check for incomplete tick */ OldTickCount = KeTickCount.LowPart; if (KiTickOffset <= 0) @@ -51,7 +52,7 @@ SharedUserData->SystemTime.High2Time = CurrentTime.HighPart; SharedUserData->SystemTime.LowPart = CurrentTime.LowPart; SharedUserData->SystemTime.High1Time = CurrentTime.HighPart; - + /* Update the tick count */ CurrentTime.HighPart = KeTickCount.High1Time; CurrentTime.LowPart = OldTickCount; @@ -59,50 +60,50 @@ KeTickCount.High2Time = CurrentTime.HighPart; KeTickCount.LowPart = CurrentTime.LowPart; KeTickCount.High1Time = CurrentTime.HighPart; - + /* Update it in the shared user data */ SharedUserData->TickCount.High2Time = CurrentTime.HighPart; SharedUserData->TickCount.LowPart = CurrentTime.LowPart; SharedUserData->TickCount.High1Time = CurrentTime.HighPart; - + /* Check for timer expiration */ Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) { /* Check if we are already doing expiration */ if (!Prcb->TimerRequest) - { + { /* Request a DPC to handle this */ Prcb->TimerRequest = (ULONG_PTR)TrapFrame; Prcb->TimerHand = Hand; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } } - + /* Check for expiration with the new tick count as well */ OldTickCount++; } - + /* Check for timer expiration */ Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) { /* Check if we are already doing expiration */ if (!Prcb->TimerRequest) - { + { /* Request a DPC to handle this */ Prcb->TimerRequest = (ULONG_PTR)TrapFrame; Prcb->TimerHand = Hand; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } } - + /* Check if this was a full tick */ if (KiTickOffset <= 0) { /* Update the tick offset */ KiTickOffset += KeMaximumIncrement; - + /* Update system runtime */ KeUpdateRunTime(TrapFrame, Irql); } @@ -111,7 +112,7 @@ /* Increase interrupt count and exit */ Prcb->InterruptCount++; } - + /* Disable interrupts and end the interrupt */ KiEndInterrupt(Irql, TrapFrame); } @@ -126,7 +127,7 @@ /* Increase interrupt count */ Prcb->InterruptCount++; - + /* Check if we came from user mode */ #ifndef _M_ARM if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) @@ -158,19 +159,19 @@ Prcb->DpcTime++; } } - + /* Update DPC rates */ Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + Prcb->DpcRequestRate) >> 1; Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - + /* Check if the queue is large enough */ if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) { /* Request a DPC */ Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - + /* Fix the maximum queue depth */ if ((Prcb->DpcRequestRate < KiIdealDpcRate) && (Prcb->MaximumDpcQueueDepth > 1)) @@ -193,7 +194,7 @@ } } } - + /* Decrement the thread quantum */ Thread->Quantum -= CLOCK_QUANTUM_DECREMENT;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs