Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[tfaber] 52673: [KMTESTS/EX] - add a test for hard-error handling - add test for interlocked functions (part 1)

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jul 13 20:08:05 2011 New Revision: 52673 URL: http://svn.reactos.org/svn/reactos?rev=52673&view=rev Log: [KMTESTS/EX] - add a test for hard-error handling - add test for interlocked functions (part 1) Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 13 20:08:05 2011 @@ -14,6 +14,8 @@ kmtest_drv/testlist.c example/Example.c + ntos_ex/ExHardError.c + ntos_ex/ExInterlocked.c ntos_ex/ExPools.c ntos_ex/ExResource.c ntos_ex/ExTimer.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Jul 13 20:08:05 2011 @@ -13,6 +13,8 @@ <file>Example.c</file> </directory> <directory name="ntos_ex"> + <file>ExHardError.c</file> + <file>ExInterlocked.c</file> <file>ExPools.c</file> <file>ExResource.c</file> <file>ExTimer.c</file> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Wed Jul 13 20:08:05 2011 @@ -9,6 +9,9 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_ExHardError; +KMT_TESTFUNC Test_ExHardErrorInteractive; +KMT_TESTFUNC Test_ExInterlocked; KMT_TESTFUNC Test_ExPools; KMT_TESTFUNC Test_ExResource; KMT_TESTFUNC Test_ExTimer; @@ -25,6 +28,9 @@ const KMT_TEST TestList[] = { { "Example", Test_Example }, + { "ExHardError", Test_ExHardError }, + { "-ExHardErrorInteractive", Test_ExHardErrorInteractive }, + { "ExInterlocked", Test_ExInterlocked }, { "ExPools", Test_ExPools }, { "ExResource", Test_ExResource }, { "ExTimer", Test_ExTimer }, Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] Wed Jul 13 20:08:05 2011 @@ -1,0 +1,253 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Hard error message test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> +#include <ntifs.h> +#include <ndk/exfuncs.h> +#include <pseh/pseh2.h> + +#include <kmt_test.h> + +/* TODO: don't require user interaction, test Io* routines, + * test NTSTATUS values with special handling */ + +/* TODO: this belongs in ndk/exfuncs.h?! */ +NTSTATUS +NTAPI +ExRaiseHardError(IN NTSTATUS ErrorStatus, + IN ULONG NumberOfParameters, + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response); + +/* TODO: this belongs in HARDERROR_RESPONSE_OPTION in ndk/extypes.h */ +#define OptionBalloonNotification 7 +#define OptionCancelTryAgainContinue 8 + +static +VOID +SetParameters( + OUT PULONG_PTR Parameters, + IN INT Count, + ...) +{ + INT i; + va_list Arguments; + va_start(Arguments, Count); + for (i = 0; i < Count; ++i) + Parameters[i] = va_arg(Arguments, ULONG_PTR); + va_end(Arguments); +} + +#define NoResponse 27 + +#define CheckHardError(ErrStatus, UnicodeStringMask, ResponseOption, \ + ExpectedStatus, ExpectedResponse, \ + NumberOfParameters, ...) do \ +{ \ + SetParameters(HardErrorParameters, NumberOfParameters, __VA_ARGS__);\ + Response = NoResponse; \ + _SEH2_TRY { \ + Status = ExRaiseHardError(ErrStatus, \ + NumberOfParameters, \ + UnicodeStringMask, \ + HardErrorParameters, \ + ResponseOption, \ + &Response); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, ExpectedStatus); \ + ok_eq_ulong(Response, (ULONG)ExpectedResponse); \ +} while (0) + +#define CheckInformationalHardError(ErrStatus, String, Thread, \ + ExpectedStatus, ExpectedRet) do \ +{ \ + Status = STATUS_SUCCESS; \ + Ret = !ExpectedRet; \ + _SEH2_TRY { \ + Ret = IoRaiseInformationalHardError(ErrStatus, \ + String, \ + Thread); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, ExpectedStatus); \ + ok_eq_bool(Ret, ExpectedRet); \ +} while (0) + +static +VOID +TestHardError( + BOOLEAN InteractivePart1, + BOOLEAN InteractivePart2, + BOOLEAN InteractivePart3, + BOOLEAN InteractivePart4) +{ + NTSTATUS Status; + ULONG Response; + WCHAR StringBuffer1[] = L"Parameter1+Garbage"; + CHAR StringBuffer1Ansi[] = "Parameter1+Garbage"; + WCHAR StringBuffer2[] = L"Parameter2+Garbage"; + UNICODE_STRING String1 = RTL_CONSTANT_STRING(StringBuffer1); + ANSI_STRING String1Ansi = RTL_CONSTANT_STRING(StringBuffer1Ansi); + UNICODE_STRING String2 = RTL_CONSTANT_STRING(StringBuffer2); + ULONG_PTR HardErrorParameters[6]; + BOOLEAN Ret; + + String1.Length = sizeof L"Parameter1" - sizeof UNICODE_NULL; + String1Ansi.Length = sizeof "Parameter1" - sizeof ANSI_NULL; + String2.Length = sizeof L"Parameter2" - sizeof UNICODE_NULL; + + if (InteractivePart1) + { + CheckHardError(0x40000000, 0, OptionOk, STATUS_SUCCESS, ResponseOk, 0, 0); // outputs a box :| + CheckHardError(0x40000001, 0, OptionOk, STATUS_SUCCESS, ResponseOk, 4, 1, 2, 3, 4); // outputs a box :| + CheckHardError(0x40000002, 0, OptionOk, STATUS_SUCCESS, ResponseOk, 5, 1, 2, 3, 4, 5); // outputs a box :| + } + CheckHardError(0x40000003, 0, OptionOk, STATUS_SUCCESS, ResponseNotHandled, 6, 1, 2, 3, 4, 5, 6); + + CheckHardError(0x40000004, 0, OptionShutdownSystem, STATUS_PRIVILEGE_NOT_HELD, ResponseNotHandled, 0, 0); + CheckHardError(0x40000005, 0, OptionBalloonNotification, STATUS_SUCCESS, ResponseOk, 0, 0); // outputs a balloon notification + CheckHardError(0x4000000f, 0, OptionBalloonNotification, STATUS_SUCCESS, ResponseOk, 0, 0); // outputs a balloon notification + if (InteractivePart1) + { + CheckHardError(0x40000006, 0, OptionAbortRetryIgnore, STATUS_SUCCESS, ResponseAbort, 0, 0); // outputs a box :| + CheckHardError(0x40000006, 0, OptionAbortRetryIgnore, STATUS_SUCCESS, ResponseRetry, 0, 0); // outputs a box :| + CheckHardError(0x40000006, 0, OptionAbortRetryIgnore, STATUS_SUCCESS, ResponseIgnore, 0, 0); // outputs a box :| + CheckHardError(0x40000008, 0, OptionCancelTryAgainContinue, STATUS_SUCCESS, ResponseCancel, 0, 0); // outputs a box :| + CheckHardError(0x40000008, 0, OptionCancelTryAgainContinue, STATUS_SUCCESS, ResponseTryAgain, 0, 0); // outputs a box :| + CheckHardError(0x40000008, 0, OptionCancelTryAgainContinue, STATUS_SUCCESS, ResponseContinue, 0, 0); // outputs a box :| + CheckHardError(0x40000010, 0, OptionOkCancel, STATUS_SUCCESS, ResponseOk, 0, 0); // outputs a box :| + CheckHardError(0x40000010, 0, OptionOkCancel, STATUS_SUCCESS, ResponseCancel, 0, 0); // outputs a box :| + CheckHardError(0x40000011, 0, OptionRetryCancel, STATUS_SUCCESS, ResponseRetry, 0, 0); // outputs a box :| + CheckHardError(0x40000011, 0, OptionRetryCancel, STATUS_SUCCESS, ResponseCancel, 0, 0); // outputs a box :| + CheckHardError(0x40000012, 0, OptionYesNo, STATUS_SUCCESS, ResponseYes, 0, 0); // outputs a box :| + CheckHardError(0x40000012, 0, OptionYesNo, STATUS_SUCCESS, ResponseNo, 0, 0); // outputs a box :| + CheckHardError(0x40000013, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 0, 0); // outputs a box :| + CheckHardError(0x40000013, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 0, 0); // outputs a box :| + CheckHardError(0x40000013, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 0, 0); // outputs a box :| + } + CheckHardError(0x40000009, 0, 9, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + CheckHardError(0x4000000a, 0, 10, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + CheckHardError(0x4000000b, 0, 11, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + CheckHardError(0x4000000c, 0, 12, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + CheckHardError(0x4000000d, 0, MAXULONG / 2 + 1, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + CheckHardError(0x4000000d, 0, MAXULONG, STATUS_SUCCESS, ResponseNotHandled, 0, 0); + + if (InteractivePart2) + { + /* try a message with one parameter */ + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 1, &String1); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, &String1); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 0, &String1); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 0, &String1); // outputs a box :| + /* give too many parameters */ + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 2, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 4, &String1, &String2, 0, 0); // outputs a box :| + /* try with stuff that's not a UNICODE_STRING */ + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, 1234); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, NULL); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, 1234); // outputs a box :| + CheckHardError(STATUS_DLL_NOT_FOUND, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, NULL); // outputs a box :| + } + if (InteractivePart3) + { + /* try a message with one parameter */ + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, &String1); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, &String1); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 0, &String1); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 0, &String1); // outputs a box :| + /* give too many parameters */ + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 2, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseOk, 3, &String1, &String2, 0); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseOk, 4, &String1, &String2, 0, 0); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 3, OptionBalloonNotification, STATUS_SUCCESS, ResponseOk, 4, &String1, &String2, 0, 0); // outputs a balloon notification + /* try with stuff that's not a UNICODE_STRING */ + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, 1234); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, NULL); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, 1234); // outputs a box :| + CheckHardError(STATUS_SERVICE_NOTIFICATION, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseNotHandled, 1, NULL); // outputs a box :| + } + if (InteractivePart4) + { + /* try a message with one parameter */ + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 1, &String1); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, &String1); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 0, &String1); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 0, &String1); // outputs a box :| + /* give too many parameters */ + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 2, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 2, &String1, &String2); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 3, OptionYesNoCancel, STATUS_SUCCESS, ResponseYes, 4, &String1, &String2, 0, 0); // outputs a box :| + /* try with stuff that's not a UNICODE_STRING */ + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_SUCCESS, ResponseNo, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, 1234); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, NULL); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, &String1Ansi); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, L"Parameter1"); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, "Parameter1"); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, 1234); // outputs a box :| + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseCancel, 1, NULL); // outputs a box :| + } + + CheckInformationalHardError(STATUS_WAIT_0, NULL, NULL, STATUS_SUCCESS, TRUE); // outputs a balloon notification + CheckInformationalHardError(STATUS_DLL_NOT_FOUND, &String1, NULL, STATUS_SUCCESS, TRUE); // outputs a balloon notification + CheckInformationalHardError(STATUS_DLL_NOT_FOUND, NULL, NULL, STATUS_SUCCESS, TRUE); // outputs a balloon notification + CheckInformationalHardError(STATUS_SERVICE_NOTIFICATION, &String1, NULL, STATUS_SUCCESS, FALSE); + + ok_bool_true(IoSetThreadHardErrorMode(TRUE), "IoSetThreadHardErrorMode returned"); + ok_bool_true(IoSetThreadHardErrorMode(FALSE), "IoSetThreadHardErrorMode returned"); + ok_bool_false(IoSetThreadHardErrorMode(FALSE), "IoSetThreadHardErrorMode returned"); + CheckHardError(STATUS_FATAL_APP_EXIT, 0, OptionYesNoCancel, STATUS_SUCCESS, ResponseReturnToCaller, 0, 0); + CheckHardError(STATUS_FATAL_APP_EXIT, 1, OptionYesNoCancel, STATUS_ACCESS_VIOLATION, NoResponse, 1, NULL); + CheckInformationalHardError(STATUS_WAIT_0, NULL, NULL, STATUS_SUCCESS, FALSE); + CheckInformationalHardError(STATUS_DLL_NOT_FOUND, &String1, NULL, STATUS_SUCCESS, FALSE); + CheckInformationalHardError(STATUS_DLL_NOT_FOUND, NULL, NULL, STATUS_SUCCESS, FALSE); + CheckInformationalHardError(STATUS_SERVICE_NOTIFICATION, &String1, NULL, STATUS_SUCCESS, FALSE); + ok_bool_false(IoSetThreadHardErrorMode(TRUE), "IoSetThreadHardErrorMode returned"); +} + +START_TEST(ExHardError) +{ + TestHardError(FALSE, FALSE, FALSE, FALSE); +} + +/* Here's how to do the interactive test: + * - First there will be a few messages random messages. If there's + * multiple options available, the same box will appear multiple times -- + * click the buttons in order from left to right + * - After that, you must verify the error parameters. You should always + * see Parameter1 or Parameter2 for strings, and 0x12345678 for numbers. + * if there's a message saying an exception occured during processing, + * click cancel. If there's a bad parameter (Parameter1+, Parameter1+Garbage + * or an empty string for example), click no. Otherwise click yes. */ +START_TEST(ExHardErrorInteractive) +{ + TestHardError(TRUE, TRUE, TRUE, TRUE); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Wed Jul 13 20:08:05 2011 @@ -1,0 +1,289 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Interlocked function test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +/* missing prototypes >:| */ +#ifndef _MSC_VER +typedef long long __int64; +#endif +struct _KSPIN_LOCK; +__declspec(dllimport) long __fastcall InterlockedCompareExchange(volatile long *, long, long); +__declspec(dllimport) __int64 __fastcall ExInterlockedCompareExchange64(volatile __int64 *, __int64 *, __int64 *, void *); +__declspec(dllimport) __int64 __fastcall ExfInterlockedCompareExchange64(volatile __int64 *, __int64 *, __int64 *); +__declspec(dllimport) long __fastcall InterlockedExchange(volatile long *, long); +__declspec(dllimport) unsigned long __stdcall ExInterlockedExchangeUlong(unsigned long *, unsigned long, void *); +__declspec(dllimport) long __fastcall InterlockedExchangeAdd(volatile long *, long); +__declspec(dllimport) unsigned long __stdcall ExInterlockedAddUlong(unsigned long *, unsigned long, void *); +__declspec(dllimport) unsigned long __stdcall Exi386InterlockedExchangeUlong(unsigned long *, unsigned long); +__declspec(dllimport) long __fastcall InterlockedIncrement(long *); +__declspec(dllimport) long __fastcall InterlockedDecrement(long *); +__declspec(dllimport) int __stdcall ExInterlockedIncrementLong(long *, void *); +__declspec(dllimport) int __stdcall ExInterlockedDecrementLong(long *, void *); +__declspec(dllimport) int __stdcall Exi386InterlockedIncrementLong(long *); +__declspec(dllimport) int __stdcall Exi386InterlockedDecrementLong(long *); + +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#include <ntddk.h> +#include <pseh/pseh2.h> + +#include <kmt_test.h> + +/* TODO: There are quite some changes needed for other architectures! + ExInterlockedAddLargeInteger, ExInterlockedAddUlong are the only two + functions actually exported by my win7/x64 kernel! */ + +/* TODO: stress-testing */ + +static KSPIN_LOCK SpinLock; + +static +LARGE_INTEGER +Large( + ULONGLONG Value) +{ + LARGE_INTEGER Ret; + Ret.QuadPart = Value; + return Ret; +} + +#define CheckInterlockedCmpXchg(Function, Type, Print, Val, Cmp, Xchg, \ + ExpectedValue, ExpectedRet, ...) do \ +{ \ + Type Ret##Type = 0; \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Ret##Type = Function(&Value##Type, Xchg, Cmp, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Ret##Type, ExpectedRet, Print); \ + ok_eq_print(Value##Type, ExpectedValue, Print); \ +} while (0) + +#define CheckInterlockedCmpXchgI(Function, Type, Print, Val, Cmp, Xchg, \ + ExpectedValue, ExpectedRet, ...) do \ +{ \ + Type Ret##Type = 0; \ + Type Value##Type = Val; \ + Type Compare##Type = Cmp; \ + Type Exchange##Type = Xchg; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Ret##Type = Function(&Value##Type, &Exchange##Type, \ + &Compare##Type, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Ret##Type, ExpectedRet, Print); \ + ok_eq_print(Value##Type, ExpectedValue, Print); \ + ok_eq_print(Exchange##Type, Xchg, Print); \ + ok_eq_print(Compare##Type, Cmp, Print); \ +} while(0) + +#define CheckInterlockedOp(Function, Type, Print, Val, Op, \ + ExpectedValue, ExpectedRet, ...) do \ +{ \ + Type Ret##Type = 0; \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Ret##Type = Function(&Value##Type, Op, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Ret##Type, ExpectedRet, Print); \ + ok_eq_print(Value##Type, ExpectedValue, Print); \ +} while (0) + +#define CheckInterlockedOpNoArg(Function, Type, Print, Val, \ + ExpectedValue, ExpectedRet, ...) do \ +{ \ + Type Ret##Type = 0; \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Ret##Type = Function(&Value##Type, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Ret##Type, ExpectedRet, Print); \ + ok_eq_print(Value##Type, ExpectedValue, Print); \ +} while (0) + +#define CheckInterlockedOpLarge(Function, Type, Print, Val, Op, \ + ExpectedValue, ExpectedRet, ...) do \ +{ \ + Type Ret##Type = Large(0); \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Ret##Type = Function(&Value##Type, Op, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Ret##Type.QuadPart, ExpectedRet, Print); \ + ok_eq_print(Value##Type.QuadPart, ExpectedValue, Print); \ +} while (0) + +#define CheckInterlockedOpLargeNoRet(Function, Type, Print, Val, Op, \ + ExpectedValue, ...) do \ +{ \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + Function(&Value##Type, Op, ##__VA_ARGS__); \ + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ + Status = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_print(Value##Type.QuadPart, ExpectedValue, Print); \ +} while (0) + +/* TODO: missing in wdm.h! */ +#define InterlockedCompareExchangeAcquire InterlockedCompareExchange +#define InterlockedCompareExchangeRelease InterlockedCompareExchange +#define InterlockedIncrementAcquire InterlockedIncrement +#define InterlockedIncrementRelease InterlockedIncrement +#define InterlockedDecrementAcquire InterlockedDecrement +#define InterlockedDecrementRelease InterlockedDecrement + +static +VOID +TestInterlockedFunctional(VOID) +{ + NTSTATUS Status; + PKSPIN_LOCK pSpinLock = &SpinLock; + + /* on x86, most of these are supported intrinsicly and don't need a spinlock! */ +#if defined _M_IX86 || defined _M_AMD64 + pSpinLock = NULL; +#endif + + /* CompareExchange */ + /* macro version */ + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 6, 8, 5L, 5L); + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 5, 9, 9L, 5L); + /* exported function */ +#undef InterlockedCompareExchange + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 6, 8, 5L, 5L); + CheckInterlockedCmpXchg(InterlockedCompareExchange, LONG, "%ld", 5, 5, 9, 9L, 5L); + /* these only exist as macros on x86 */ + CheckInterlockedCmpXchg(InterlockedCompareExchangeAcquire, LONG, "%ld", 16, 9, 12, 16L, 16L); + CheckInterlockedCmpXchg(InterlockedCompareExchangeAcquire, LONG, "%ld", 16, 16, 4, 4L, 16L); + CheckInterlockedCmpXchg(InterlockedCompareExchangeRelease, LONG, "%ld", 27, 123, 38, 27L, 27L); + CheckInterlockedCmpXchg(InterlockedCompareExchangeRelease, LONG, "%ld", 27, 27, 39, 39L, 27L); + /* only exists as a macro */ + CheckInterlockedCmpXchg(InterlockedCompareExchangePointer, PVOID, "%p", (PVOID)117, (PVOID)711, (PVOID)12, (PVOID)117, (PVOID)117); + CheckInterlockedCmpXchg(InterlockedCompareExchangePointer, PVOID, "%p", (PVOID)117, (PVOID)117, (PVOID)228, (PVOID)228, (PVOID)117); + /* macro version */ + CheckInterlockedCmpXchgI(ExInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL, pSpinLock); + CheckInterlockedCmpXchgI(ExInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL, pSpinLock); + /* exported function */ + CheckInterlockedCmpXchgI((ExInterlockedCompareExchange64), LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL, pSpinLock); + CheckInterlockedCmpXchgI((ExInterlockedCompareExchange64), LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL, pSpinLock); + /* fastcall version */ + CheckInterlockedCmpXchgI(ExfInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 4LL, 20LL, 17LL, 17LL); + CheckInterlockedCmpXchgI(ExfInterlockedCompareExchange64, LONGLONG, "%I64d", 17, 17LL, 21LL, 21LL, 17LL); + + /* Exchange */ + CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); +#undef InterlockedExchange + CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); + CheckInterlockedOp(InterlockedExchangePointer, PVOID, "%p", (PVOID)700, (PVOID)93, (PVOID)93, (PVOID)700); + CheckInterlockedOp(ExInterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU, pSpinLock); + CheckInterlockedOp((ExInterlockedExchangeUlong), ULONG, "%lu", 212, 121, 121LU, 212LU, pSpinLock); +#ifdef _M_IX86 + CheckInterlockedOp(Exi386InterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU); + CheckInterlockedOp(Exfi386InterlockedExchangeUlong, ULONG, "%lu", 212, 121, 121LU, 212LU); +#endif + + /* ExchangeAdd */ + /* TODO: ExInterlockedExchangeAddLargeInteger? */ + CheckInterlockedOp(InterlockedExchangeAdd, LONG, "%ld", 312, 7, 319L, 312L); +#undef InterlockedExchangeAdd + CheckInterlockedOp(InterlockedExchangeAdd, LONG, "%ld", 312, 7, 319L, 312L); + + /* Add */ + /* these DO need a valid spinlock even on x86 */ + CheckInterlockedOpLarge(ExInterlockedAddLargeInteger, LARGE_INTEGER, "%I64d", Large(23), Large(7), 30LL, 23LL, &SpinLock); + CheckInterlockedOpLargeNoRet(ExInterlockedAddLargeStatistic, LARGE_INTEGER, "%I64d", Large(15), 17LL, 32LL); + CheckInterlockedOp(ExInterlockedAddUlong, ULONG, "%lu", 239, 44, 283LU, 239LU, &SpinLock); +#undef ExInterlockedAddUlong + CheckInterlockedOp(ExInterlockedAddUlong, ULONG, "%lu", 239, 44, 283LU, 239LU, &SpinLock); + + /* Increment */ + CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", 2341L, 2342L, 2342L); + CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)MINLONG); +#undef InterlockedIncrement + CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", 2341L, 2342L, 2342L); + CheckInterlockedOpNoArg(InterlockedIncrement, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)MINLONG); + CheckInterlockedOpNoArg(InterlockedIncrementAcquire, LONG, "%ld", 2341L, 2342L, 2342L); + CheckInterlockedOpNoArg(InterlockedIncrementRelease, LONG, "%ld", 2341L, 2342L, 2342L); + CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", -2L, -1L, (LONG)ResultNegative, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", -1L, 0L, (LONG)ResultZero, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", 0L, 1L, (LONG)ResultPositive, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedIncrementLong, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)ResultNegative, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", -2L, -1L, (LONG)ResultNegative, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", -1L, 0L, (LONG)ResultZero, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", 0L, 1L, (LONG)ResultPositive, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedIncrementLong), LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)ResultNegative, pSpinLock); +#ifdef _M_IX86 + CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", -2L, -1L, (LONG)ResultNegative); + CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", -1L, 0L, (LONG)ResultZero); + CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", 0L, 1L, (LONG)ResultPositive); + CheckInterlockedOpNoArg(Exi386InterlockedIncrementLong, LONG, "%ld", (LONG)MAXLONG, (LONG)MINLONG, (LONG)ResultNegative); +#endif + + /* Decrement */ + CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", 1745L, 1744L, 1744L); + CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)MAXLONG); +#undef InterlockedDecrement + CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", 1745L, 1744L, 1744L); + CheckInterlockedOpNoArg(InterlockedDecrement, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)MAXLONG); + CheckInterlockedOpNoArg(InterlockedDecrementAcquire, LONG, "%ld", 1745L, 1744L, 1744L); + CheckInterlockedOpNoArg(InterlockedDecrementRelease, LONG, "%ld", 1745L, 1744L, 1744L); + CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)ResultPositive, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", 0L, -1L, (LONG)ResultNegative, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", 1L, 0L, (LONG)ResultZero, pSpinLock); + CheckInterlockedOpNoArg(ExInterlockedDecrementLong, LONG, "%ld", 2L, 1L, (LONG)ResultPositive, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)ResultPositive, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 0L, -1L, (LONG)ResultNegative, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 1L, 0L, (LONG)ResultZero, pSpinLock); + CheckInterlockedOpNoArg((ExInterlockedDecrementLong), LONG, "%ld", 2L, 1L, (LONG)ResultPositive, pSpinLock); +#ifdef _M_IX86 + CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", (LONG)MINLONG, (LONG)MAXLONG, (LONG)ResultPositive); + CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", 0L, -1L, (LONG)ResultNegative); + CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", 1L, 0L, (LONG)ResultZero); + CheckInterlockedOpNoArg(Exi386InterlockedDecrementLong, LONG, "%ld", 2L, 1L, (LONG)ResultPositive); +#endif + + /* And, Or, Xor */ + CheckInterlockedOp(InterlockedAnd, LONG, "0x%lx", 0x1234L, 0x1111L, 0x1010L, 0x1234L); + CheckInterlockedOp(InterlockedOr, LONG, "0x%lx", 0x1234L, 0x1111L, 0x1335L, 0x1234L); + CheckInterlockedOp(InterlockedXor, LONG, "0x%lx", 0x1234L, 0x1111L, 0x0325L, 0x1234L); +#ifdef _WIN64 + CheckInterlockedOp(InterlockedXor64, LONGLONG, "0x%I64x", 0x200001234LL, 0x100001111LL, 0x300000325LL, 0x200001234LL); +#endif +} + +START_TEST(ExInterlocked) +{ + KIRQL Irql; + KeInitializeSpinLock(&SpinLock); + + /* functional testing */ + TestInterlockedFunctional(); + KeRaiseIrql(HIGH_LEVEL, &Irql); + TestInterlockedFunctional(); + KeLowerIrql(Irql); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 2 months

[gadamopoulos] 52672: [ntdll] - Disable Server to server calls in csr because they do not work yet as our csr is not compatible with windows. [user32] - Call CsrClientConnectToServer when the dll i...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jul 13 17:57:40 2011 New Revision: 52672 URL: http://svn.reactos.org/svn/reactos?rev=52672&view=rev Log: [ntdll] - Disable Server to server calls in csr because they do not work yet as our csr is not compatible with windows. [user32] - Call CsrClientConnectToServer when the dll is initialized in order to connect with the server and determine if user32 is running in the server process. - Do not load user api hook if we are in the server process - Fixes drawing the console window Modified: branches/GSoC_2011/ThemesSupport/dll/ntdll/csr/connect.c branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c Modified: branches/GSoC_2011/ThemesSupport/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/ntd… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/ntdll/csr/connect.c [iso-8859-1] Wed Jul 13 17:57:40 2011 @@ -74,7 +74,9 @@ ApiMessage->Header.u1.s1.TotalLength); /* Check if we are already inside a CSR Server */ +#if 0 if (!InsideCsrProcess) +#endif { /* Check if we got a a Capture Buffer */ if (CaptureBuffer) @@ -148,6 +150,7 @@ ApiMessage->Status = Status; } } +#if 0 else { /* This is a server-to-server call. Save our CID and do a direct call */ @@ -163,6 +166,7 @@ ApiMessage->Status = Status; } } +#endif /* Return the CSR Result */ DPRINT("Got back: 0x%lx\n", ApiMessage->Status); Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/include/user32.h [iso-8859-1] Wed Jul 13 17:57:40 2011 @@ -48,7 +48,7 @@ extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO gpsi; -extern BOOL gfServerProcess; +extern BOOLEAN gfServerProcess; #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) #define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId) ||\ @@ -75,11 +75,9 @@ if(IsInsideUserApiHook()) return; - /* HACK! Please remove when gfServerProcess is correct */ -#if 0 if(gfServerProcess) return; -#endif + if(RtlIsThreadWithinLoaderCallout()) return; Modified: branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/user32/misc/dllmain.c [iso-8859-1] Wed Jul 13 17:57:40 2011 @@ -13,7 +13,7 @@ PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO gpsi = NULL; ULONG_PTR g_ulSharedDelta; -BOOL gfServerProcess = FALSE; +BOOLEAN gfServerProcess = FALSE; WCHAR szAppInit[KEY_LENGTH]; @@ -198,7 +198,7 @@ { USERCONNECT UserCon; PVOID *KernelCallbackTable; - + /* Set up the kernel callbacks. */ KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = @@ -231,8 +231,8 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); RtlInitializeCriticalSection(&gcsUserApiHook); - gfServerProcess = TRUE; // FIXME HAX! Used in CsrClientConnectToServer(,,,,&gfServerProcess); - + + CsrClientConnectToServer(L"\\Windows", 0, NULL, 0, &gfServerProcess); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); /* Allocate an index for user32 thread local data. */

13 years, 2 months

[akhaldi] 52671: * Update spec2def.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 13 12:00:42 2011 New Revision: 52671 URL: http://svn.reactos.org/svn/reactos?rev=52671&view=rev Log: * Update spec2def. Modified: branches/GSoC_2011/ThemesSupport/tools/spec2def/spec2def.c Modified: branches/GSoC_2011/ThemesSupport/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/tools/s… ============================================================================== --- branches/GSoC_2011/ThemesSupport/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/tools/spec2def/spec2def.c [iso-8859-1] Wed Jul 13 12:00:42 2011 @@ -10,7 +10,7 @@ typedef struct { char *pcName; - int nNameLength; + size_t nNameLength; char *pcRedirection; int nRedirectionLength; int nCallingConvention; @@ -21,14 +21,25 @@ unsigned int uFlags; } EXPORT; +enum _ARCH +{ + ARCH_X86, + ARCH_AMD64, + ARCH_IA64, + ARCH_ARM, + ARCH_PPC +}; + typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbKillAt = 0; -int gbUseDeco = 0; int gbMSComp = 0; +int gbImportLib = 0; int no_redirections = 0; +int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; char *pszDllName = 0; +char *gpszUnderscore = ""; enum { @@ -151,7 +162,7 @@ (pexp->uFlags & FL_STUB) == 0) return 0; fprintf(file, "int "); - if (strcmp(pszArchString, "i386") == 0 && + if ((giArch == ARCH_X86) && pexp->nCallingConvention == CC_STDCALL) { fprintf(file, "__stdcall "); @@ -218,8 +229,12 @@ void OutputHeader_asmstub(FILE *file, char *libname) { - fprintf(file, "; File generated automatically, do not edit! \n\n" - ".586\n.model flat\n.code\n"); + fprintf(file, "; File generated automatically, do not edit! \n\n"); + + if (giArch == ARCH_X86) + fprintf(file, ".586\n.model flat\n"); + + fprintf(file, ".code\n"); } int @@ -228,31 +243,37 @@ /* Handle autoname */ if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') { - fprintf(fileDest, "PUBLIC ordinal%d\nordinal%d: nop\n", - pexp->nOrdinal, pexp->nOrdinal); + fprintf(fileDest, "PUBLIC %sordinal%d\n%sordinal%d: nop\n", + gpszUnderscore, pexp->nOrdinal, gpszUnderscore, pexp->nOrdinal); + } + else if (giArch != ARCH_X86) + { + fprintf(fileDest, "PUBLIC _stub_%.*s\n_stub_%.*s: nop\n", + pexp->nNameLength, pexp->pcName, + pexp->nNameLength, pexp->pcName); } else if (pexp->nCallingConvention == CC_STDCALL) { - fprintf(fileDest, "PUBLIC _%.*s@%d\n_%.*s@%d: nop\n", + fprintf(fileDest, "PUBLIC __stub_%.*s@%d\n__stub_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_FASTCALL) { - fprintf(fileDest, "PUBLIC @%.*s@%d\n@%.*s@%d: nop\n", + fprintf(fileDest, "PUBLIC @_stub_%.*s@%d\n@_stub_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_CDECL || pexp->nCallingConvention == CC_STUB) { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s: nop\n", + fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s: nop\n", pexp->nNameLength, pexp->pcName, pexp->nNameLength, pexp->pcName); } else if (pexp->nCallingConvention == CC_EXTERN) { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s:\n", + fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s:\n", pexp->nNameLength, pexp->pcName, pexp->nNameLength, pexp->pcName); } @@ -271,18 +292,26 @@ } void -PrintName(FILE *fileDest, EXPORT *pexp, int fRedir, int fDeco) +PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco) { char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; - int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; - - if (fDeco && pexp->nCallingConvention == CC_FASTCALL) - fprintf(fileDest, "@"); - fprintf(fileDest, "%.*s", nNameLength, pcName); - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && fDeco) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); + size_t nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; + + /* Handle autoname */ + if (nNameLength == 1 && pcName[0] == '@') + { + fprintf(fileDest, "ordinal%d", pexp->nOrdinal); + } + else + { + if (fDeco && pexp->nCallingConvention == CC_FASTCALL) + fprintf(fileDest, "@"); + fprintf(fileDest, "%s%.*s", pszPrefix, nNameLength, pcName); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && fDeco) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } } } @@ -291,29 +320,26 @@ { fprintf(fileDest, " "); - /* Handle autoname */ - if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') - { - fprintf(fileDest, "ordinal%d", pexp->nOrdinal); - } - else - { - PrintName(fileDest, pexp, 0, gbUseDeco && !gbKillAt); - } - - if (pexp->pcRedirection && !no_redirections) - { - int fDeco = (gbUseDeco && !ScanToken(pexp->pcRedirection, '.')); - + PrintName(fileDest, pexp, "", 0, (giArch == ARCH_X86) && !gbKillAt); + + if (gbImportLib) + { fprintf(fileDest, "="); - PrintName(fileDest, pexp, 1, fDeco && !gbMSComp); - } - else if (gbUseDeco && gbKillAt && !gbMSComp && + PrintName(fileDest, pexp, "_stub_", 0, 0); + } + else if (pexp->pcRedirection) + { + int fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + } + else if ((giArch == ARCH_X86) && gbKillAt && !gbMSComp && (pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL)) { fprintf(fileDest, "="); - PrintName(fileDest, pexp, 0, 1); + PrintName(fileDest, pexp, "", 0, 1); } if (pexp->nOrdinal != -1) @@ -450,7 +476,7 @@ } else if (CompareToken(pc, "-i386")) { - if (strcasecmp(pszArchString, "i386") != 0) included = 0; + if (giArch != ARCH_X86) included = 0; } else if (CompareToken(pc, "-private")) { @@ -530,7 +556,7 @@ CompareToken(pc, "str") || CompareToken(pc, "wstr")) { - exp.nStackBytes += sizeof(void*); + exp.nStackBytes += 4; // sizeof(void*) on x86 exp.anArgs[exp.nArgCount] = ARG_PTR; // FIXME: handle strings } else if (CompareToken(pc, "int64")) @@ -572,7 +598,7 @@ { /* Check for stdcall name */ char *p = strchr(pc, '@'); - if (p && (p - pc < exp.nNameLength)) + if (p && ((size_t)(p - pc) < exp.nNameLength)) { int i; exp.nNameLength = p - pc; @@ -671,6 +697,11 @@ { pszDllName = argv[i] + 3; } + else if ((strcasecmp(argv[i], "--implib") == 0)) + { + no_redirections = 1; + gbImportLib = 1; + } else if ((strcasecmp(argv[i], "--kill-at") == 0)) { gbKillAt = 1; @@ -694,24 +725,28 @@ } } - if ((strcasecmp(pszArchString, "x86_64") == 0) || - (strcasecmp(pszArchString, "ia64") == 0)) + if (strcasecmp(pszArchString, "i386") == 0) + { + giArch = ARCH_X86; + gpszUnderscore = "_"; + } + else if (strcasecmp(pszArchString, "x86_64") == 0) giArch = ARCH_AMD64; + else if (strcasecmp(pszArchString, "ia64") == 0) giArch = ARCH_IA64; + else if (strcasecmp(pszArchString, "arm") == 0) giArch = ARCH_ARM; + else if (strcasecmp(pszArchString, "ppc") == 0) giArch = ARCH_PPC; + + if ((giArch == ARCH_AMD64) || (giArch == ARCH_IA64)) { pszArchString2 = "win64"; } else pszArchString2 = "win32"; - if (strcasecmp(pszArchString, "i386") == 0) - { - gbUseDeco = 1; - } - /* Set a default dll name */ if (!pszDllName) { char *p1, *p2; - int len; + size_t len; p1 = strrchr(argv[i], '\\'); if (!p1) p1 = strrchr(argv[i], '/');

13 years, 2 months

[akhaldi] 52670: * Sync with recent trunk (r52669).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 13 11:58:32 2011 New Revision: 52670 URL: http://svn.reactos.org/svn/reactos?rev=52670&view=rev Log: * Sync with recent trunk (r52669). Modified: branches/GSoC_2011/ThemesSupport/ (props changed) branches/GSoC_2011/ThemesSupport/base/setup/usetup/bootsup.c branches/GSoC_2011/ThemesSupport/dll/ntdll/ldr/ldrpe.c branches/GSoC_2011/ThemesSupport/drivers/filesystems/npfs/create.c branches/GSoC_2011/ThemesSupport/drivers/network/tcpip/tcpip/main.c branches/GSoC_2011/ThemesSupport/lib/drivers/ip/network/receive.c branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/ThemesSupport/ntoskrnl/include/internal/mm.h branches/GSoC_2011/ThemesSupport/ntoskrnl/io/iomgr/driver.c branches/GSoC_2011/ThemesSupport/ntoskrnl/kdbg/kdb_symbols.cmake.c branches/GSoC_2011/ThemesSupport/ntoskrnl/ke/i386/trap.s branches/GSoC_2011/ThemesSupport/ntoskrnl/mm/anonmem.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/napi.h Propchange: branches/GSoC_2011/ThemesSupport/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 13 11:58:32 2011 @@ -4,4 +4,4 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:48236-52637 +/trunk/reactos:48236-52669 Modified: branches/GSoC_2011/ThemesSupport/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -494,11 +494,13 @@ L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #if DBG +#ifndef _WINKD_ /* ReactOS_KdSerial */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); +#endif /* ReactOS_LogFile */ CreateFreeLoaderEntry(IniCache, IniSection, Modified: branches/GSoC_2011/ThemesSupport/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/ntd… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -681,9 +681,9 @@ DPRINT("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry); /* Set up the Act Ctx */ + RtlZeroMemory(&ActCtx, sizeof(ActCtx)); ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); /* Check if we have a manifest prober routine */ if (LdrpManifestProberRoutine) Modified: branches/GSoC_2011/ThemesSupport/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/drivers… ============================================================================== --- branches/GSoC_2011/ThemesSupport/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/drivers/filesystems/npfs/create.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -984,7 +984,8 @@ /* Disconnect the pipes */ if (Ccb->OtherSide) { - ASSERT(Ccb->OtherSide->OtherSide == Ccb); + /* FIXME: Timo wants it rewritten */ + /*ASSERT(Ccb->OtherSide->OtherSide == Ccb);*/ NpfsCcbSetOtherSide(Ccb->OtherSide, NULL); NpfsCcbSetOtherSide(Ccb, NULL); } Modified: branches/GSoC_2011/ThemesSupport/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/drivers… ============================================================================== --- branches/GSoC_2011/ThemesSupport/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -662,14 +662,14 @@ EntityMax = MAX_TDI_ENTITIES; /* Allocate NDIS packet descriptors */ - NdisAllocatePacketPool(&NdisStatus, &GlobalPacketPool, 100, sizeof(PACKET_CONTEXT)); + NdisAllocatePacketPoolEx(&NdisStatus, &GlobalPacketPool, 500, 1500, sizeof(PACKET_CONTEXT)); if (NdisStatus != NDIS_STATUS_SUCCESS) { TiUnload(DriverObject); return STATUS_INSUFFICIENT_RESOURCES; } /* Allocate NDIS buffer descriptors */ - NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 100); + NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 2000); if (NdisStatus != NDIS_STATUS_SUCCESS) { TiUnload(DriverObject); return STATUS_INSUFFICIENT_RESOURCES; Modified: branches/GSoC_2011/ThemesSupport/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/lib/dri… ============================================================================== --- branches/GSoC_2011/ThemesSupport/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/lib/drivers/ip/network/receive.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -293,6 +293,9 @@ TI_DbgPrint(DEBUG_IP, ("Continueing assembly.\n")); /* We have a reassembly structure */ TcpipAcquireSpinLock(&IPDR->Lock, &OldIrql); + + /* Reset the timeout since we received a fragment */ + IPDR->TimeoutCount = 0; } else { TI_DbgPrint(DEBUG_IP, ("Starting new assembly.\n")); Modified: branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/lib/dri… ============================================================================== --- branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -78,25 +78,36 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", Connection->SocketContext)); - AddressToBind.sin_family = AF_INET; - memcpy( &AddressToBind.sin_addr, - &Connection->AddressFile->Address.Address.IPv4Address, - sizeof(AddressToBind.sin_addr) ); - AddressToBind.sin_port = Connection->AddressFile->Port; + if (Connection->AddressFile->Port) + { + AddressToBind.sin_family = AF_INET; + memcpy( &AddressToBind.sin_addr, + &Connection->AddressFile->Address.Address.IPv4Address, + sizeof(AddressToBind.sin_addr) ); + AddressToBind.sin_port = Connection->AddressFile->Port; + TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); - TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); + /* Perform an explicit bind */ + Status = TCPTranslateError(OskitTCPBind(Connection->SocketContext, + &AddressToBind, + sizeof(AddressToBind))); + } + else + { + /* An implicit bind will be performed */ + Status = STATUS_SUCCESS; + } - Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, - &AddressToBind, - sizeof(AddressToBind) ) ); + if (NT_SUCCESS(Status)) + Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); + if (NT_SUCCESS(Status)) { /* Check if we had an unspecified port */ if (!Connection->AddressFile->Port) { /* We did, so we need to copy back the port */ - Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE))) { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); @@ -106,9 +117,6 @@ } } } - - if (NT_SUCCESS(Status)) - Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); UnlockObject(Connection, OldIrql); Modified: branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/lib/dri… ============================================================================== --- branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -723,7 +723,7 @@ USHORT RemotePort; TA_IP_ADDRESS LocalAddress; PTDI_BUCKET Bucket; - PNEIGHBOR_CACHE_ENTRY NCE; + PNEIGHBOR_CACHE_ENTRY NCE = NULL; KIRQL OldIrql; TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); @@ -762,37 +762,36 @@ UnlockObject(Connection, OldIrql); return STATUS_NETWORK_UNREACHABLE; } - - AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + } + + if (Connection->AddressFile->Port) + { + /* See if we had an unspecified bind address */ + if (NCE) + { + /* We did, so use the interface unicast address associated with the route */ + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + } + else + { + /* Bind address was explicit so use it */ + AddressToBind.sin_addr.s_addr = Connection->AddressFile->Address.Address.IPv4Address; + } + + AddressToBind.sin_port = Connection->AddressFile->Port; + + /* Perform an explicit bind */ + Status = TCPTranslateError(OskitTCPBind(Connection->SocketContext, + &AddressToBind, + sizeof(AddressToBind))); } else { - AddressToBind.sin_addr.s_addr = Connection->AddressFile->Address.Address.IPv4Address; - } - - AddressToBind.sin_port = Connection->AddressFile->Port; - - Status = TCPTranslateError - ( OskitTCPBind( Connection->SocketContext, - &AddressToBind, - sizeof(AddressToBind) ) ); - - if (NT_SUCCESS(Status)) { - /* Check if we had an unspecified port */ - if (!Connection->AddressFile->Port) - { - /* We did, so we need to copy back the port */ - Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); - if (NT_SUCCESS(Status)) - { - /* Allocate the port in the port bitmap */ - Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - - /* This should never fail */ - ASSERT(Connection->AddressFile->Port != 0xFFFF); - } - } - + /* An implicit bind will be performed */ + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) { if (NT_SUCCESS(Status)) { memcpy( &AddressToConnect.sin_addr, @@ -804,7 +803,31 @@ ( OskitTCPConnect( Connection->SocketContext, &AddressToConnect, sizeof(AddressToConnect) ) ); - + + if (NT_SUCCESS(Status)) + { + /* Check if we had an unspecified port */ + if (!Connection->AddressFile->Port) + { + /* We did, so we need to copy back the port */ + if (NT_SUCCESS(TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE))) + { + /* Allocate the port in the port bitmap */ + Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + + /* This should never fail */ + ASSERT(Connection->AddressFile->Port != 0xFFFF); + } + } + + /* Check if the address was unspecified */ + if (AddrIsUnspecified(&Connection->AddressFile->Address)) + { + /* It is, so store the address of the outgoing NIC */ + Connection->AddressFile->Address = NCE->Interface->Unicast; + } + } + if (Status == STATUS_PENDING) { Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); Modified: branches/GSoC_2011/ThemesSupport/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/ntoskrn… ============================================================================== --- branches/GSoC_2011/ThemesSupport/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -1121,10 +1121,6 @@ NTSTATUS NTAPI -MmWritePagePhysicalAddress(PFN_NUMBER Page); - -NTSTATUS -NTAPI MmPageOutPhysicalAddress(PFN_NUMBER Page); /* freelist.c **********************************************************/ Modified: branches/GSoC_2011/ThemesSupport/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/ntoskrn… ============================================================================== --- branches/GSoC_2011/ThemesSupport/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -850,7 +850,6 @@ DPRINT1("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return(Status); } - DeviceNode->ServiceName = ServiceName; /* * Initialize the driver @@ -1834,8 +1833,6 @@ cur--; } - IopDisplayLoadingMessage(&ServiceName); - /* * Get service type. */ @@ -1881,21 +1878,6 @@ DPRINT("FullImagePath: '%wZ'\n", &ImagePath); DPRINT("Type: %lx\n", Type); - - /* - * Create device node - */ - - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } /* Get existing DriverObject pointer (in case the driver has already been loaded and initialized) */ @@ -1916,23 +1898,29 @@ if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - IopFreeDeviceNode(DeviceNode); LoadParams->Status = Status; (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); return; } - - /* - * Set a service name for the device node - */ - - RtlCreateUnicodeString(&DeviceNode->ServiceName, ServiceName.Buffer); /* * Initialize the driver module if it's loaded for the first time */ if (Status != STATUS_IMAGE_ALREADY_LOADED) { + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + IopDisplayLoadingMessage(&DeviceNode->ServiceName); + Status = IopInitializeDriverModule( DeviceNode, ModuleObject, @@ -1950,11 +1938,11 @@ (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); return; } + + /* Initialize and start device */ + IopInitializeDevice(DeviceNode, DriverObject); + Status = IopStartDevice(DeviceNode); } - - /* Initialize and start device */ - IopInitializeDevice(DeviceNode, DriverObject); - Status = IopStartDevice(DeviceNode); } else { @@ -1962,9 +1950,6 @@ /* IopGetDriverObject references the DriverObject, so dereference it */ ObDereferenceObject(DriverObject); - - /* Free device node since driver loading failed */ - IopFreeDeviceNode(DeviceNode); } /* Pass status to the caller and signal the event */ Modified: branches/GSoC_2011/ThemesSupport/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/ntoskrn… ============================================================================== --- branches/GSoC_2011/ThemesSupport/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -17,8 +17,6 @@ #include <debug.h> /* GLOBALS ******************************************************************/ - -#define CURRENT_PROCESS ((HANDLE)~0) typedef struct _IMAGE_SYMBOL_INFO_CACHE { @@ -637,69 +635,14 @@ /* Nothing here */ } -typedef struct { - PMDL Mdl; - SIZE_T Size; - PVOID OriginalMapping; -} KdbpMallocHeader; - -static PVOID KdbpSymAllocMem(ULONG_PTR Size) -{ - KdbpMallocHeader *Hdr; - if (Size < PAGE_SIZE) - { - PVOID Result = ExAllocatePoolWithTag(NonPagedPool, Size + sizeof(KdbpMallocHeader), 'RSYM'); - if (!Result) return NULL; - Hdr = (KdbpMallocHeader*)Result; - Hdr->Mdl = NULL; - Hdr->Size = Size; - return &Hdr[1]; - } - else - { - PVOID Base = NULL; - SIZE_T RegionSize = Size + sizeof(KdbpMallocHeader); - NTSTATUS Status = NtAllocateVirtualMemory - (CURRENT_PROCESS, &Base, 0, &RegionSize, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return NULL; - Hdr = (KdbpMallocHeader*)Base; - Hdr->Mdl = IoAllocateMdl(Base, RegionSize, FALSE, FALSE, NULL); - if (!Hdr->Mdl) { - NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); - return NULL; - } - Hdr->Size = RegionSize; - Hdr->OriginalMapping = Base; - MmProbeAndLockPages(Hdr->Mdl, KernelMode, IoModifyAccess); - KdbpMallocHeader *MappedHdr = (KdbpMallocHeader*)MmMapLockedPages(Hdr->Mdl, KernelMode); - if (!MappedHdr) { - MmUnlockPages(Hdr->Mdl); - IoFreeMdl(Hdr->Mdl); - NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); - return NULL; - } - return &MappedHdr[1]; - } +static PVOID KdbpSymAllocMem(ULONG_PTR size) +{ + return ExAllocatePoolWithTag(NonPagedPool, size, 'RSYM'); } static VOID KdbpSymFreeMem(PVOID Area) { - PCHAR HdrPtr = ((PCHAR)Area) - sizeof(KdbpMallocHeader); - KdbpMallocHeader *Hdr = (KdbpMallocHeader*)HdrPtr; - if (Hdr->Size < PAGE_SIZE) - { - ExFreePool(Hdr); - } - else - { - PMDL Mdl = Hdr->Mdl; - PVOID BaseAddress = Hdr->OriginalMapping; - SIZE_T RegionSize = Hdr->Size; - MmUnmapLockedPages(Hdr, Mdl); - MmUnlockPages(Mdl); - NtFreeVirtualMemory(CURRENT_PROCESS, &BaseAddress, &RegionSize, MEM_RELEASE); - IoFreeMdl(Mdl); - } + return ExFreePool(Area); } static BOOLEAN KdbpSymReadMem(PVOID FileContext, PVOID TargetDebug, PVOID SourceMem, ULONG Size) Modified: branches/GSoC_2011/ThemesSupport/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/ntoskrn… ============================================================================== --- branches/GSoC_2011/ThemesSupport/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/ntoskrnl/ke/i386/trap.s [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -31,6 +31,8 @@ .data ASSUME nothing + +.align 16 PUBLIC _KiIdt _KiIdt: Modified: branches/GSoC_2011/ThemesSupport/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/ntoskrn… ============================================================================== --- branches/GSoC_2011/ThemesSupport/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -50,89 +50,6 @@ NTSTATUS NTAPI -MmWritePageVirtualMemory(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp) -{ - SWAPENTRY SwapEntry; - PFN_NUMBER Page; - NTSTATUS Status; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - - /* - * Check for paging out from a deleted virtual memory area. - */ - if (MemoryArea->DeleteInProgress) - { - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - Page = MmGetPfnForProcess(Process, Address); - - /* - * Get that the page actually is dirty. - */ - if (!MmIsDirtyPage(Process, Address)) - { - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } - - /* - * Speculatively set the mapping to clean. - */ - MmSetCleanPage(Process, Address); - - /* - * If necessary, allocate an entry in the paging file for this page - */ - SwapEntry = MmGetSavedSwapEntryPage(Page); - if (SwapEntry == 0) - { - SwapEntry = MmAllocSwapPage(); - if (SwapEntry == 0) - { - MmSetDirtyPage(Process, Address); - PageOp->Status = STATUS_PAGEFILE_QUOTA_EXCEEDED; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_PAGEFILE_QUOTA_EXCEEDED); - } - } - - /* - * Write the page to the pagefile - */ - Status = MmWriteToSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); - MmSetDirtyPage(Process, Address); - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* - * Otherwise we have succeeded. - */ - MmSetSavedSwapEntryPage(Page, SwapEntry); - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI MmPageOutVirtualMemory(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/napi.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/napi.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/include/napi.h [iso-8859-1] Wed Jul 13 11:58:32 2011 @@ -16,7 +16,7 @@ #include "w32ksvc.h" }; -#define MIN_SYSCALL_NUMBER 0 +#define MIN_SYSCALL_NUMBER 0x1000 #define NUMBER_OF_SYSCALLS (sizeof(Win32kSSPT) / sizeof(Win32kSSPT[0])) -#define MAX_SYSCALL_NUMBER (NUMBER_OF_SYSCALLS - 1) +#define MAX_SYSCALL_NUMBER 0x1000 + (NUMBER_OF_SYSCALLS - 1) ULONG Win32kNumberOfSysCalls = NUMBER_OF_SYSCALLS;

13 years, 2 months

[osiejka] 52669: [NPFS] - Comment out ASSERT, requested by Timo;

by osiejka＠svn.reactos.org

Author: osiejka Date: Tue Jul 12 22:33:53 2011 New Revision: 52669 URL: http://svn.reactos.org/svn/reactos?rev=52669&view=rev Log: [NPFS] - Comment out ASSERT, requested by Timo; Modified: trunk/reactos/drivers/filesystems/npfs/create.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Tue Jul 12 22:33:53 2011 @@ -984,7 +984,8 @@ /* Disconnect the pipes */ if (Ccb->OtherSide) { - ASSERT(Ccb->OtherSide->OtherSide == Ccb); + /* FIXME: Timo wants it rewritten */ + /*ASSERT(Ccb->OtherSide->OtherSide == Ccb);*/ NpfsCcbSetOtherSide(Ccb->OtherSide, NULL); NpfsCcbSetOtherSide(Ccb, NULL); }

13 years, 2 months

[cgutman] 52668: [WS2_32_WINETEST] - Fix check to catch WSAEnumProtocols failure

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jul 12 21:46:42 2011 New Revision: 52668 URL: http://svn.reactos.org/svn/reactos?rev=52668&view=rev Log: [WS2_32_WINETEST] - Fix check to catch WSAEnumProtocols failure Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Tue Jul 12 21:46:42 2011 @@ -1310,7 +1310,7 @@ ok(ret != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - if (ret == 0) { + if (ret <= 0) { skip("No protocols enumerated.\n"); HeapFree(GetProcessHeap(), 0, pi); return;

13 years, 2 months

[cgutman] 52667: [IP] - Store the address of an outgoing NIC properly (gethostname() fix) - Don't do an explicit bind if we don't have to (ws2_32_winetest sock hang fix)

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jul 12 21:31:36 2011 New Revision: 52667 URL: http://svn.reactos.org/svn/reactos?rev=52667&view=rev Log: [IP] - Store the address of an outgoing NIC properly (gethostname() fix) - Don't do an explicit bind if we don't have to (ws2_32_winetest sock hang fix) Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Tue Jul 12 21:31:36 2011 @@ -78,25 +78,36 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", Connection->SocketContext)); - AddressToBind.sin_family = AF_INET; - memcpy( &AddressToBind.sin_addr, - &Connection->AddressFile->Address.Address.IPv4Address, - sizeof(AddressToBind.sin_addr) ); - AddressToBind.sin_port = Connection->AddressFile->Port; + if (Connection->AddressFile->Port) + { + AddressToBind.sin_family = AF_INET; + memcpy( &AddressToBind.sin_addr, + &Connection->AddressFile->Address.Address.IPv4Address, + sizeof(AddressToBind.sin_addr) ); + AddressToBind.sin_port = Connection->AddressFile->Port; + TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); - TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); + /* Perform an explicit bind */ + Status = TCPTranslateError(OskitTCPBind(Connection->SocketContext, + &AddressToBind, + sizeof(AddressToBind))); + } + else + { + /* An implicit bind will be performed */ + Status = STATUS_SUCCESS; + } - Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, - &AddressToBind, - sizeof(AddressToBind) ) ); + if (NT_SUCCESS(Status)) + Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); + if (NT_SUCCESS(Status)) { /* Check if we had an unspecified port */ if (!Connection->AddressFile->Port) { /* We did, so we need to copy back the port */ - Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE))) { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); @@ -106,9 +117,6 @@ } } } - - if (NT_SUCCESS(Status)) - Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); UnlockObject(Connection, OldIrql); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Jul 12 21:31:36 2011 @@ -723,7 +723,7 @@ USHORT RemotePort; TA_IP_ADDRESS LocalAddress; PTDI_BUCKET Bucket; - PNEIGHBOR_CACHE_ENTRY NCE; + PNEIGHBOR_CACHE_ENTRY NCE = NULL; KIRQL OldIrql; TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); @@ -762,37 +762,36 @@ UnlockObject(Connection, OldIrql); return STATUS_NETWORK_UNREACHABLE; } - - AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + } + + if (Connection->AddressFile->Port) + { + /* See if we had an unspecified bind address */ + if (NCE) + { + /* We did, so use the interface unicast address associated with the route */ + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + } + else + { + /* Bind address was explicit so use it */ + AddressToBind.sin_addr.s_addr = Connection->AddressFile->Address.Address.IPv4Address; + } + + AddressToBind.sin_port = Connection->AddressFile->Port; + + /* Perform an explicit bind */ + Status = TCPTranslateError(OskitTCPBind(Connection->SocketContext, + &AddressToBind, + sizeof(AddressToBind))); } else { - AddressToBind.sin_addr.s_addr = Connection->AddressFile->Address.Address.IPv4Address; - } - - AddressToBind.sin_port = Connection->AddressFile->Port; - - Status = TCPTranslateError - ( OskitTCPBind( Connection->SocketContext, - &AddressToBind, - sizeof(AddressToBind) ) ); - - if (NT_SUCCESS(Status)) { - /* Check if we had an unspecified port */ - if (!Connection->AddressFile->Port) - { - /* We did, so we need to copy back the port */ - Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); - if (NT_SUCCESS(Status)) - { - /* Allocate the port in the port bitmap */ - Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - - /* This should never fail */ - ASSERT(Connection->AddressFile->Port != 0xFFFF); - } - } - + /* An implicit bind will be performed */ + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) { if (NT_SUCCESS(Status)) { memcpy( &AddressToConnect.sin_addr, @@ -804,7 +803,31 @@ ( OskitTCPConnect( Connection->SocketContext, &AddressToConnect, sizeof(AddressToConnect) ) ); - + + if (NT_SUCCESS(Status)) + { + /* Check if we had an unspecified port */ + if (!Connection->AddressFile->Port) + { + /* We did, so we need to copy back the port */ + if (NT_SUCCESS(TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE))) + { + /* Allocate the port in the port bitmap */ + Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + + /* This should never fail */ + ASSERT(Connection->AddressFile->Port != 0xFFFF); + } + } + + /* Check if the address was unspecified */ + if (AddrIsUnspecified(&Connection->AddressFile->Address)) + { + /* It is, so store the address of the outgoing NIC */ + Connection->AddressFile->Address = NCE->Interface->Unicast; + } + } + if (Status == STATUS_PENDING) { Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG );

13 years, 2 months

[gadamopoulos] 52666: remove test command

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 12 21:27:46 2011 New Revision: 52666 URL: http://svn.reactos.org/svn/reactos?rev=52666&view=rev Log: remove test command Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c [iso-8859-1] Tue Jul 12 21:27:46 2011 @@ -16,8 +16,6 @@ return 0; } - - //hmodRosTheme = LoadLibrary(L"C:\\Reactos\\src\\themes-priv\\output-MinGW-i386\\reactos\\dll\\win32\\uxtheme\\rostheme.dll"); hmodRosTheme = LoadLibrary(argv[1]); if(!hmodRosTheme) {

13 years, 2 months

[gadamopoulos] 52665: [apihooksrv] - Commit a test utility that can install user api hooks and give for the first time real themes support. This is a temporary test program till the same functional...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 12 21:25:51 2011 New Revision: 52665 URL: http://svn.reactos.org/svn/reactos?rev=52665&view=rev Log: [apihooksrv] - Commit a test utility that can install user api hooks and give for the first time real themes support. This is a temporary test program till the same functionality is integrated to winlogon. To use it someone has to activate themes with themecfg and then run "apihook uxtheme.dll". Also note that it is possible to use this tool in windows for testing purposes Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/ (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/CMakeLists.txt (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Tue Jul 12 21:25:51 2011 @@ -1,5 +1,6 @@ add_subdirectory(themecfg) +add_subdirectory(apihooksrv) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 12 21:25:51 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/CMakeLists.txt (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/CMakeLists.txt [iso-8859-1] Tue Jul 12 21:25:51 2011 @@ -1,0 +1,13 @@ + +set_rc_compiler() + +list(APPEND SOURCE + apihooksrv.c) + +add_executable(apihooksrv ${SOURCE}) + +set_module_type(apihooksrv win32cui) + +add_importlibs(apihooksrv msvcrt user32 kernel32) + +add_cd_file(TARGET apihooksrv DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c [iso-8859-1] Tue Jul 12 21:25:51 2011 @@ -1,0 +1,57 @@ +#include <stdio.h> +#include <tchar.h> +#include <windows.h> + +typedef BOOL (WINAPI * PTHEMESHOOKINSTALL) (); + +int _tmain(int argc, _TCHAR* argv[]) +{ + HMODULE hmodRosTheme; + PTHEMESHOOKINSTALL fnInstall, fnRemove; + BOOL ret; + DWORD info = BSM_APPLICATIONS; + + if ( argc != 2 ) + { + return 0; + } + + + //hmodRosTheme = LoadLibrary(L"C:\\Reactos\\src\\themes-priv\\output-MinGW-i386\\reactos\\dll\\win32\\uxtheme\\rostheme.dll"); + hmodRosTheme = LoadLibrary(argv[1]); + if(!hmodRosTheme) + { + printf("failed to load rostheme\n"); + return 0; + } + + fnInstall = GetProcAddress(hmodRosTheme, (LPCSTR)34); + fnRemove = GetProcAddress(hmodRosTheme, (LPCSTR)35); + + if(!fnInstall) + { + printf("failed to get ThemeHooksInstall\n"); + return 0; + } + + if(!fnRemove) + { + printf("failed to get ThemeHooksRemove\n"); + return 0; + } + + ret = fnInstall(); + printf("ThemeHooksInstall returned %d\n", ret); + + BroadcastSystemMessage(BSF_POSTMESSAGE, &info,WM_SETFOCUS,0,0); + + Sleep(36000); + + ret = fnRemove(); + printf("ThemeHooksRemove returned %d\n", ret); + + BroadcastSystemMessage(BSF_POSTMESSAGE, &info,WM_SETFOCUS,0,0); + + return 0; +} + Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/apihooksrv/apihooksrv.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 2 months

[gadamopoulos] 52664: [themecfg] - Add a test utility called themecfg that can configure themes. This is a small part of winecfg from wine. With this utility we can test themes support now. In the ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 12 21:09:43 2011 New Revision: 52664 URL: http://svn.reactos.org/svn/reactos?rev=52664&view=rev Log: [themecfg] - Add a test utility called themecfg that can configure themes. This is a small part of winecfg from wine. With this utility we can test themes support now. In the future this functionality will become part of desk.cpl Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/ (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/CMakeLists.txt (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/resource.h (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/theme.c (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.c (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.rc (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,3 +1,5 @@ + +add_subdirectory(themecfg) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 12 21:09:43 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/CMakeLists.txt (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/CMakeLists.txt [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,0 +1,15 @@ + +set_rc_compiler() + +list(APPEND SOURCE + theme.c + themecfg.c + themecfg.rc) + +add_executable(themecfg ${SOURCE}) + +set_module_type(themecfg win32gui) + +add_importlibs(themecfg msvcrt user32 gdi32 comctl32 kernel32 uxtheme shell32 ole32 comdlg32 shlwapi) + +add_cd_file(TARGET themecfg DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/resource.h (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/resource.h [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,0 +1,257 @@ +/* + * WineCfg resource definitions + * + * Copyright 2002 Jaco Greeff + * Copyright 2003 Dimitrie O. Paun + * Copyright 2003 Mark Westcott + * Copyright 2004 Mike Hearn + * Copyright 2005 Raphael Junqueira + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define IDC_STATIC -1 +#define IDS_TAB_APPLICATIONS 2 +#define IDS_TAB_DLLS 3 +#define IDS_TAB_DRIVES 4 +#define IDS_CHOOSE_PATH 5 +#define IDS_SHOW_ADVANCED 6 +#define IDS_HIDE_ADVANCED 7 +#define IDS_NOTHEME 8 +#define IDS_TAB_GRAPHICS 9 +#define IDS_TAB_DESKTOP_INTEGRATION 10 +#define IDS_TAB_AUDIO 11 +#define IDS_TAB_ABOUT 12 +#define IDS_WINECFG_TITLE 13 +#define IDS_THEMEFILE 14 +#define IDS_THEMEFILE_SELECT 15 +#define IDS_SHELL_FOLDER 16 +#define IDS_LINKS_TO 17 +#define IDS_WINECFG_TITLE_APP 18 /* App specific title */ +#define IDD_MAINDLG 101 +#define IDB_WINE 104 +#define IDD_ABOUTCFG 107 +#define IDD_APPCFG 108 +#define IDD_AUDIOCFG 109 +#define IDD_GRAPHCFG 110 +#define IDD_DLLCFG 111 +#define IDD_DRIVECFG 112 +#define IDD_DESKTOP_INTEGRATION 115 +#define IDB_WINE_LOGO 200 +#define IDC_TABABOUT 1001 +#define IDC_APPLYBTN 1002 +#define IDC_WINVER 1012 +#define IDC_SYSCOLORS 1017 +#define IDC_PRIVATEMAP 1018 +#define IDC_PERFECTGRAPH 1019 +#define IDC_MANAGED 1022 +#define IDC_DESKTOP_WIDTH 1023 +#define IDC_DESKTOP_HEIGHT 1024 +#define IDC_DESKTOP_SIZE 1025 +#define IDC_DESKTOP_BY 1026 +#define IDC_XDGA 1027 +#define IDC_XSHM 1028 + +/* dll editing */ +#define IDC_RAD_BUILTIN 1029 +#define IDC_RAD_NATIVE 1030 +#define IDC_RAD_BUILTIN_NATIVE 1031 +#define IDC_RAD_NATIVE_BUILTIN 1032 +#define IDC_RAD_DISABLE 1033 +#define IDC_DLLS_LIST 1034 +#define IDC_DLLS_ADDDLL 8001 +#define IDC_DLLS_EDITDLL 8002 +#define IDC_DLLS_REMOVEDLL 8003 +#define IDC_DLLCOMBO 8004 +#define IDD_LOADORDER 8005 +#define IDS_DLL_WARNING 8010 +#define IDS_DLL_WARNING_CAPTION 8011 +#define IDS_DLL_NATIVE 8012 +#define IDS_DLL_BUILTIN 8013 +#define IDS_DLL_NATIVE_BUILTIN 8014 +#define IDS_DLL_BUILTIN_NATIVE 8015 +#define IDS_DLL_DISABLED 8016 +#define IDS_DEFAULT_SETTINGS 8017 +#define IDS_EXECUTABLE_FILTER 8018 +#define IDS_USE_GLOBAL_SETTINGS 8019 +#define IDS_SELECT_EXECUTABLE 8020 + +/* drive editing */ +#define IDC_STATIC_MOUNTMGR_ERROR 1041 +#define IDC_LIST_DRIVES 1042 +#define IDC_BUTTON_ADD 1043 +#define IDC_BUTTON_REMOVE 1044 +#define IDC_BUTTON_EDIT 1045 +#define IDC_BUTTON7 1046 +#define IDC_BUTTON_AUTODETECT 1046 +#define IDC_DRIVE_ADD 1047 +#define IDC_DRIVE_REMOVE 1048 +#define IDC_DRIVE_EDIT 1049 +#define IDC_DRIVE_EDIT_NAME 1050 +#define IDC_DRIVE_EDIT_LABEL 1051 +#define IDC_DRIVE_EDIT_TYPE 1052 +#define IDC_DRIVE_EDIT_FS 1053 +#define IDC_DRIVE_EDIT_PATH 1054 +#define IDC_DRIVE_EDIT_DEVICE 1055 +#define ID_DRIVE_OK 1056 +#define ID_DRIVE_CANCEL 1057 +#define ID_BUTTON_CANCEL 1058 +#define ID_BUTTON_OK 1059 +#define IDC_EDIT_LABEL 1060 +#define IDC_EDIT_PATH 1061 +#define IDC_EDIT_SERIAL 1062 +#define IDC_STATIC_PATH 1063 +#define IDC_COMBO_TYPE 1065 +#define IDC_EDIT_DEVICE 1066 +#define IDC_BUTTON_BROWSE_PATH 1067 +#define IDC_RADIO_AUTODETECT 1068 +#define IDC_RADIO_ASSIGN 1069 +#define IDC_BUTTON_BROWSE_DEVICE 1070 +#define IDC_STATIC_SERIAL 1072 +#define IDC_STATIC_LABEL 1073 +#define IDC_ENABLE_DESKTOP 1074 +#define IDS_DRIVE_NO_C 1075 +#define IDC_BUTTON_SHOW_HIDE_ADVANCED 1076 +#define IDC_STATIC_TYPE 1077 +#define IDC_LABELSERIAL_STATIC 1078 +#define IDC_SHOW_DOT_FILES 1080 + +#define IDC_DRIVE_LABEL 1078 + +#define IDS_DRIVE_UNKNOWN 8200 +#define IDS_DRIVE_FIXED 8201 +#define IDS_DRIVE_REMOTE 8202 +#define IDS_DRIVE_REMOVABLE 8203 +#define IDS_DRIVE_CDROM 8204 +#define IDS_DRIVE_LETTERS_EXCEEDED 8205 +#define IDS_SYSTEM_DRIVE_LABEL 8206 +#define IDS_CONFIRM_DELETE_C 8207 +#define IDS_COL_DRIVELETTER 8208 +#define IDS_COL_DRIVEMAPPING 8209 +#define IDS_NO_DRIVE_C 8210 + +/* graphics */ +#define IDC_ENABLE_MANAGED 1100 +#define IDC_ENABLE_DECORATED 1101 +#define IDC_DX_MOUSE_GRAB 1102 +#define IDC_USE_TAKE_FOCUS 1103 +#define IDC_DOUBLE_BUFFER 1104 +#define IDC_D3D_VSHADER_MODE 1105 +#define IDC_D3D_PSHADER_MODE 1106 +#define IDS_SHADER_MODE_HARDWARE 8100 +#define IDS_SHADER_MODE_NONE 8101 + +#define IDC_RES_TRACKBAR 1107 +#define IDC_RES_DPIEDIT 1108 +#define IDC_RES_FONT_PREVIEW 1109 + +/* applications tab */ +#define IDC_APP_LISTVIEW 1200 +#define IDC_APP_ADDAPP 1201 +#define IDC_APP_REMOVEAPP 1202 + +/* audio tab */ +#define IDC_AUDIO_CONFIGURE 1300 +#define IDC_AUDIO_TEST 1301 +#define IDC_AUDIO_CONTROL_PANEL 1302 +#define IDC_DSOUND_HW_ACCEL 1303 +#define IDC_DSOUND_DRV_EMUL 1304 +#define IDC_AUDIO_TREE 1305 +#define IDR_WINECFG 1306 +#define IDB_CHECKBOX 1307 +#define IDB_DEVICE 1308 +#define IDS_AUDIO_MISSING 1309 +#define IDC_DSOUND_RATES 1310 +#define IDC_DSOUND_BITS 1311 +#define IDW_TESTSOUND 1312 +#define IDS_ACCEL_FULL 8300 +#define IDS_ACCEL_STANDARD 8301 +#define IDS_ACCEL_BASIC 8302 +#define IDS_ACCEL_EMULATION 8303 +#define IDS_DRIVER_ALSA 8304 + +#define IDS_DRIVER_ESOUND 8306 +#define IDS_DRIVER_OSS 8307 +#define IDS_DRIVER_JACK 8308 +#define IDS_DRIVER_NAS 8309 +#define IDS_DRIVER_AUDIOIO 8310 +#define IDS_DRIVER_COREAUDIO 8311 +#define IDS_OPEN_DRIVER_ERROR 8312 +#define IDS_SOUNDDRIVERS 8313 +#define IDS_DEVICES_WAVEOUT 8314 +#define IDS_DEVICES_WAVEIN 8315 +#define IDS_DEVICES_MIDIOUT 8316 +#define IDS_DEVICES_MIDIIN 8317 +#define IDS_DEVICES_AUX 8318 +#define IDS_DEVICES_MIXER 8319 +#define IDS_UNAVAILABLE_DRIVER 8320 +#define IDS_WARNING 8321 + +/* desktop integration tab */ +#define IDC_THEME_COLORCOMBO 1401 +#define IDC_THEME_COLORTEXT 1402 +#define IDC_THEME_SIZECOMBO 1403 +#define IDC_THEME_SIZETEXT 1404 +#define IDC_THEME_THEMECOMBO 1405 +#define IDC_THEME_INSTALL 1406 +#define IDC_LIST_SFPATHS 1407 +#define IDC_LINK_SFPATH 1408 +#define IDC_EDIT_SFPATH 1409 +#define IDC_BROWSE_SFPATH 1410 +#define IDC_SYSPARAM_COMBO 1411 +#define IDC_SYSPARAM_SIZE_TEXT 1412 +#define IDC_SYSPARAM_SIZE 1413 +#define IDC_SYSPARAM_SIZE_UD 1414 +#define IDC_SYSPARAM_COLOR_TEXT 1415 +#define IDC_SYSPARAM_COLOR 1416 +#define IDC_SYSPARAM_FONT 1417 + +#define IDC_SYSPARAMS_BUTTON 8400 +#define IDC_SYSPARAMS_BUTTON_TEXT 8401 +#define IDC_SYSPARAMS_DESKTOP 8402 +#define IDC_SYSPARAMS_MENU 8403 +#define IDC_SYSPARAMS_MENU_TEXT 8404 +#define IDC_SYSPARAMS_SCROLLBAR 8405 +#define IDC_SYSPARAMS_SELECTION 8406 +#define IDC_SYSPARAMS_SELECTION_TEXT 8407 +#define IDC_SYSPARAMS_TOOLTIP 8408 +#define IDC_SYSPARAMS_TOOLTIP_TEXT 8409 +#define IDC_SYSPARAMS_WINDOW 8410 +#define IDC_SYSPARAMS_WINDOW_TEXT 8411 +#define IDC_SYSPARAMS_ACTIVE_TITLE 8412 +#define IDC_SYSPARAMS_ACTIVE_TITLE_TEXT 8413 +#define IDC_SYSPARAMS_INACTIVE_TITLE 8414 +#define IDC_SYSPARAMS_INACTIVE_TITLE_TEXT 8415 +#define IDC_SYSPARAMS_MSGBOX_TEXT 8416 +#define IDC_SYSPARAMS_APPWORKSPACE 8417 +#define IDC_SYSPARAMS_WINDOW_FRAME 8418 +#define IDC_SYSPARAMS_ACTIVE_BORDER 8419 +#define IDC_SYSPARAMS_INACTIVE_BORDER 8420 +#define IDC_SYSPARAMS_BUTTON_SHADOW 8421 +#define IDC_SYSPARAMS_GRAY_TEXT 8422 +#define IDC_SYSPARAMS_BUTTON_HILIGHT 8423 +#define IDC_SYSPARAMS_BUTTON_DARK_SHADOW 8424 +#define IDC_SYSPARAMS_BUTTON_LIGHT 8425 +#define IDC_SYSPARAMS_BUTTON_ALTERNATE 8426 +#define IDC_SYSPARAMS_HOT_TRACKING 8427 +#define IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT 8428 +#define IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT 8429 +#define IDC_SYSPARAMS_MENU_HILIGHT 8430 +#define IDC_SYSPARAMS_MENUBAR 8431 + +/* About tab */ +#define IDC_ABT_OWNER 8432 +#define IDC_ABT_ORG 8433 Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/theme.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/theme.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/theme.c [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,0 +1,1217 @@ +/* + * Desktop Integration + * - Theme configuration code + * - User Shell Folder mapping + * + * Copyright (c) 2005 by Frank Richter + * Copyright (c) 2006 by Michael Jung + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> + +#define COBJMACROS + +#include <windows.h> +#include <uxtheme.h> +#include <tmschema.h> +#include <shlobj.h> +#include <shlwapi.h> +#include "resource.h" + +/* UXTHEME functions not in the headers */ + +typedef struct tagTHEMENAMES +{ + WCHAR szName[MAX_PATH+1]; + WCHAR szDisplayName[MAX_PATH+1]; + WCHAR szTooltip[MAX_PATH+1]; +} THEMENAMES, *PTHEMENAMES; + +typedef void* HTHEMEFILE; +typedef BOOL (CALLBACK *EnumThemeProc)(LPVOID lpReserved, + LPCWSTR pszThemeFileName, + LPCWSTR pszThemeName, + LPCWSTR pszToolTip, LPVOID lpReserved2, + LPVOID lpData); + +HRESULT WINAPI EnumThemeColors (LPCWSTR pszThemeFileName, LPWSTR pszSizeName, + DWORD dwColorNum, PTHEMENAMES pszColorNames); +HRESULT WINAPI EnumThemeSizes (LPCWSTR pszThemeFileName, LPWSTR pszColorName, + DWORD dwSizeNum, PTHEMENAMES pszSizeNames); +HRESULT WINAPI ApplyTheme (HTHEMEFILE hThemeFile, char* unknown, HWND hWnd); +HRESULT WINAPI OpenThemeFile (LPCWSTR pszThemeFileName, LPCWSTR pszColorName, + LPCWSTR pszSizeName, HTHEMEFILE* hThemeFile, + DWORD unknown); +HRESULT WINAPI CloseThemeFile (HTHEMEFILE hThemeFile); +HRESULT WINAPI EnumThemes (LPCWSTR pszThemePath, EnumThemeProc callback, + LPVOID lpData); + +/* A struct to keep both the internal and "fancy" name of a color or size */ +typedef struct +{ + WCHAR* name; + WCHAR* fancyName; +} ThemeColorOrSize; + +/* wrapper around DSA that also keeps an item count */ +typedef struct +{ + HDSA dsa; + int count; +} WrappedDsa; + +static void set_text(HWND dialog, WORD id, const char *text) +{ + SetWindowText(GetDlgItem(dialog, id), text); +} + +static char *get_text(HWND dialog, WORD id) +{ + HWND item = GetDlgItem(dialog, id); + int len = GetWindowTextLength(item) + 1; + char *result = len ? HeapAlloc(GetProcessHeap(), 0, len) : NULL; + if (!result || GetWindowText(item, result, len) == 0) return NULL; + return result; +} + +/* Some helper functions to deal with ThemeColorOrSize structs in WrappedDSAs */ + +static void color_or_size_dsa_add (WrappedDsa* wdsa, const WCHAR* name, + const WCHAR* fancyName) +{ + ThemeColorOrSize item; + + item.name = HeapAlloc (GetProcessHeap(), 0, + (lstrlenW (name) + 1) * sizeof(WCHAR)); + lstrcpyW (item.name, name); + + item.fancyName = HeapAlloc (GetProcessHeap(), 0, + (lstrlenW (fancyName) + 1) * sizeof(WCHAR)); + lstrcpyW (item.fancyName, fancyName); + + DSA_InsertItem (wdsa->dsa, wdsa->count, &item); + wdsa->count++; +} + +static int CALLBACK dsa_destroy_callback (LPVOID p, LPVOID pData) +{ + ThemeColorOrSize* item = p; + HeapFree (GetProcessHeap(), 0, item->name); + HeapFree (GetProcessHeap(), 0, item->fancyName); + return 1; +} + +static void free_color_or_size_dsa (WrappedDsa* wdsa) +{ + DSA_DestroyCallback (wdsa->dsa, dsa_destroy_callback, NULL); +} + +static void create_color_or_size_dsa (WrappedDsa* wdsa) +{ + wdsa->dsa = DSA_Create (sizeof (ThemeColorOrSize), 1); + wdsa->count = 0; +} + +static ThemeColorOrSize* color_or_size_dsa_get (WrappedDsa* wdsa, int index) +{ + return DSA_GetItemPtr (wdsa->dsa, index); +} + +static int color_or_size_dsa_find (WrappedDsa* wdsa, const WCHAR* name) +{ + int i = 0; + for (; i < wdsa->count; i++) + { + ThemeColorOrSize* item = color_or_size_dsa_get (wdsa, i); + if (lstrcmpiW (item->name, name) == 0) break; + } + return i; +} + +/* A theme file, contains file name, display name, color and size scheme names */ +typedef struct +{ + WCHAR* themeFileName; + WCHAR* fancyName; + WrappedDsa colors; + WrappedDsa sizes; +} ThemeFile; + +static HDSA themeFiles = NULL; +static int themeFilesCount = 0; + +static int CALLBACK theme_dsa_destroy_callback (LPVOID p, LPVOID pData) +{ + ThemeFile* item = p; + HeapFree (GetProcessHeap(), 0, item->themeFileName); + HeapFree (GetProcessHeap(), 0, item->fancyName); + free_color_or_size_dsa (&item->colors); + free_color_or_size_dsa (&item->sizes); + return 1; +} + +/* Free memory occupied by the theme list */ +static void free_theme_files(void) +{ + if (themeFiles == NULL) return; + + DSA_DestroyCallback (themeFiles , theme_dsa_destroy_callback, NULL); + themeFiles = NULL; + themeFilesCount = 0; +} + +typedef HRESULT (WINAPI * EnumTheme) (LPCWSTR, LPWSTR, DWORD, PTHEMENAMES); + +/* fill a string list with either colors or sizes of a theme */ +static void fill_theme_string_array (const WCHAR* filename, + WrappedDsa* wdsa, + EnumTheme enumTheme) +{ + DWORD index = 0; + THEMENAMES names; + +// WINE_TRACE ("%s %p %p\n", wine_dbgstr_w (filename), wdsa, enumTheme); + + while (SUCCEEDED (enumTheme (filename, NULL, index++, &names))) + { +// WINE_TRACE ("%s: %s\n", wine_dbgstr_w (names.szName), +// wine_dbgstr_w (names.szDisplayName)); + color_or_size_dsa_add (wdsa, names.szName, names.szDisplayName); + } +} + +/* Theme enumeration callback, adds theme to theme list */ +static BOOL CALLBACK myEnumThemeProc (LPVOID lpReserved, + LPCWSTR pszThemeFileName, + LPCWSTR pszThemeName, + LPCWSTR pszToolTip, + LPVOID lpReserved2, LPVOID lpData) +{ + ThemeFile newEntry; + + /* fill size/color lists */ + create_color_or_size_dsa (&newEntry.colors); + fill_theme_string_array (pszThemeFileName, &newEntry.colors, EnumThemeColors); + create_color_or_size_dsa (&newEntry.sizes); + fill_theme_string_array (pszThemeFileName, &newEntry.sizes, EnumThemeSizes); + + newEntry.themeFileName = HeapAlloc (GetProcessHeap(), 0, + (lstrlenW (pszThemeFileName) + 1) * sizeof(WCHAR)); + lstrcpyW (newEntry.themeFileName, pszThemeFileName); + + newEntry.fancyName = HeapAlloc (GetProcessHeap(), 0, + (lstrlenW (pszThemeName) + 1) * sizeof(WCHAR)); + lstrcpyW (newEntry.fancyName, pszThemeName); + + /*list_add_tail (&themeFiles, &newEntry->entry);*/ + DSA_InsertItem (themeFiles, themeFilesCount, &newEntry); + themeFilesCount++; + + return TRUE; +} + +/* Scan for themes */ +static void scan_theme_files(void) +{ + static const WCHAR themesSubdir[] = { '\\','T','h','e','m','e','s',0 }; + WCHAR themesPath[MAX_PATH]; + + free_theme_files(); + + if (FAILED (SHGetFolderPathW (NULL, CSIDL_RESOURCES, NULL, + SHGFP_TYPE_CURRENT, themesPath))) return; + + themeFiles = DSA_Create (sizeof (ThemeFile), 1); + lstrcatW (themesPath, themesSubdir); + + EnumThemes (themesPath, myEnumThemeProc, 0); +} + +/* fill the color & size combo boxes for a given theme */ +static void fill_color_size_combos (ThemeFile* theme, HWND comboColor, + HWND comboSize) +{ + int i; + + SendMessageW (comboColor, CB_RESETCONTENT, 0, 0); + for (i = 0; i < theme->colors.count; i++) + { + ThemeColorOrSize* item = color_or_size_dsa_get (&theme->colors, i); + SendMessageW (comboColor, CB_ADDSTRING, 0, (LPARAM)item->fancyName); + } + + SendMessageW (comboSize, CB_RESETCONTENT, 0, 0); + for (i = 0; i < theme->sizes.count; i++) + { + ThemeColorOrSize* item = color_or_size_dsa_get (&theme->sizes, i); + SendMessageW (comboSize, CB_ADDSTRING, 0, (LPARAM)item->fancyName); + } +} + +/* Select the item of a combo box that matches a theme's color and size + * scheme. */ +static void select_color_and_size (ThemeFile* theme, + const WCHAR* colorName, HWND comboColor, + const WCHAR* sizeName, HWND comboSize) +{ + SendMessageW (comboColor, CB_SETCURSEL, + color_or_size_dsa_find (&theme->colors, colorName), 0); + SendMessageW (comboSize, CB_SETCURSEL, + color_or_size_dsa_find (&theme->sizes, sizeName), 0); +} + +/* Fill theme, color and sizes combo boxes with the know themes and select + * the entries matching the currently active theme. */ +static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) +{ + WCHAR textNoTheme[256]; + int themeIndex = 0; + BOOL ret = TRUE; + int i; + WCHAR currentTheme[MAX_PATH]; + WCHAR currentColor[MAX_PATH]; + WCHAR currentSize[MAX_PATH]; + ThemeFile* theme = NULL; + + LoadStringW (GetModuleHandle (NULL), IDS_NOTHEME, textNoTheme, + sizeof(textNoTheme) / sizeof(WCHAR)); + + SendMessageW (comboTheme, CB_RESETCONTENT, 0, 0); + SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)textNoTheme); + + for (i = 0; i < themeFilesCount; i++) + { + ThemeFile* item = DSA_GetItemPtr (themeFiles, i); + SendMessageW (comboTheme, CB_ADDSTRING, 0, + (LPARAM)item->fancyName); + } + + if (IsThemeActive () && SUCCEEDED (GetCurrentThemeName (currentTheme, + sizeof(currentTheme) / sizeof(WCHAR), + currentColor, sizeof(currentColor) / sizeof(WCHAR), + currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + { + /* Determine the index of the currently active theme. */ + BOOL found = FALSE; + for (i = 0; i < themeFilesCount; i++) + { + theme = DSA_GetItemPtr (themeFiles, i); + if (lstrcmpiW (theme->themeFileName, currentTheme) == 0) + { + found = TRUE; + themeIndex = i+1; + break; + } + } + if (!found) + { + /* Current theme not found?... add to the list, then... */ +// WINE_TRACE("Theme %s not in list of enumerated themes\n", +// wine_dbgstr_w (currentTheme)); + myEnumThemeProc (NULL, currentTheme, currentTheme, + currentTheme, NULL, NULL); + themeIndex = themeFilesCount; + theme = DSA_GetItemPtr (themeFiles, themeFilesCount-1); + } + fill_color_size_combos (theme, comboColor, comboSize); + select_color_and_size (theme, currentColor, comboColor, + currentSize, comboSize); + } + else + { + /* No theme selected */ + ret = FALSE; + } + + SendMessageW (comboTheme, CB_SETCURSEL, themeIndex, 0); + return ret; +} + +/* Update the color & size combo boxes when the selection of the theme + * combo changed. Selects the current color and size scheme if the theme + * is currently active, otherwise the first color and size. */ +static BOOL update_color_and_size (int themeIndex, HWND comboColor, + HWND comboSize) +{ + if (themeIndex == 0) + { + return FALSE; + } + else + { + WCHAR currentTheme[MAX_PATH]; + WCHAR currentColor[MAX_PATH]; + WCHAR currentSize[MAX_PATH]; + ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex - 1); + + fill_color_size_combos (theme, comboColor, comboSize); + + if ((SUCCEEDED (GetCurrentThemeName (currentTheme, + sizeof(currentTheme) / sizeof(WCHAR), + currentColor, sizeof(currentColor) / sizeof(WCHAR), + currentSize, sizeof(currentSize) / sizeof(WCHAR)))) + && (lstrcmpiW (currentTheme, theme->themeFileName) == 0)) + { + select_color_and_size (theme, currentColor, comboColor, + currentSize, comboSize); + } + else + { + SendMessageW (comboColor, CB_SETCURSEL, 0, 0); + SendMessageW (comboSize, CB_SETCURSEL, 0, 0); + } + } + return TRUE; +} + +/* Apply a theme from a given theme, color and size combo box item index. */ +static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) +{ + static char b[] = "\0"; + + if (themeIndex == 0) + { + /* no theme */ + ApplyTheme (NULL, b, NULL); + } + else + { + ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex-1); + const WCHAR* themeFileName = theme->themeFileName; + const WCHAR* colorName = NULL; + const WCHAR* sizeName = NULL; + HTHEMEFILE hTheme; + ThemeColorOrSize* item; + + item = color_or_size_dsa_get (&theme->colors, colorIndex); + colorName = item->name; + + item = color_or_size_dsa_get (&theme->sizes, sizeIndex); + sizeName = item->name; + + if (SUCCEEDED (OpenThemeFile (themeFileName, colorName, sizeName, + &hTheme, 0))) + { + ApplyTheme (hTheme, b, NULL); + CloseThemeFile (hTheme); + } + else + { + ApplyTheme (NULL, b, NULL); + } + } +} + +int updating_ui; +BOOL theme_dirty; + +static void enable_size_and_color_controls (HWND dialog, BOOL enable) +{ + EnableWindow (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), enable); + EnableWindow (GetDlgItem (dialog, IDC_THEME_COLORTEXT), enable); + EnableWindow (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), enable); + EnableWindow (GetDlgItem (dialog, IDC_THEME_SIZETEXT), enable); +} + +static void init_dialog (HWND dialog) +{ + updating_ui = TRUE; + + scan_theme_files(); + if (!fill_theme_list (GetDlgItem (dialog, IDC_THEME_THEMECOMBO), + GetDlgItem (dialog, IDC_THEME_COLORCOMBO), + GetDlgItem (dialog, IDC_THEME_SIZECOMBO))) + { + SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + enable_size_and_color_controls (dialog, FALSE); + } + else + { + enable_size_and_color_controls (dialog, TRUE); + } + theme_dirty = FALSE; + + SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETBUDDY, (WPARAM)GetDlgItem(dialog, IDC_SYSPARAM_SIZE), 0); + SendDlgItemMessageW(dialog, IDC_SYSPARAM_SIZE_UD, UDM_SETRANGE, 0, MAKELONG(100, 8)); + + updating_ui = FALSE; +} + +static void on_theme_changed(HWND dialog) { + int index = SendMessageW (GetDlgItem (dialog, IDC_THEME_THEMECOMBO), + CB_GETCURSEL, 0, 0); + if (!update_color_and_size (index, GetDlgItem (dialog, IDC_THEME_COLORCOMBO), + GetDlgItem (dialog, IDC_THEME_SIZECOMBO))) + { + SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + enable_size_and_color_controls (dialog, FALSE); + } + else + { + enable_size_and_color_controls (dialog, TRUE); + } + theme_dirty = TRUE; +} + +static void apply_theme(HWND dialog) +{ + int themeIndex, colorIndex, sizeIndex; + + if (!theme_dirty) return; + + themeIndex = SendMessageW (GetDlgItem (dialog, IDC_THEME_THEMECOMBO), + CB_GETCURSEL, 0, 0); + colorIndex = SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), + CB_GETCURSEL, 0, 0); + sizeIndex = SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), + CB_GETCURSEL, 0, 0); + + do_apply_theme (themeIndex, colorIndex, sizeIndex); + theme_dirty = FALSE; +} + +static struct +{ + int sm_idx, color_idx; + const char *color_reg; + int size; + COLORREF color; + LOGFONTW lf; +} metrics[] = +{ + {-1, COLOR_BTNFACE, "ButtonFace" }, /* IDC_SYSPARAMS_BUTTON */ + {-1, COLOR_BTNTEXT, "ButtonText" }, /* IDC_SYSPARAMS_BUTTON_TEXT */ + {-1, COLOR_BACKGROUND, "Background" }, /* IDC_SYSPARAMS_DESKTOP */ + {SM_CXMENUSIZE, COLOR_MENU, "Menu" }, /* IDC_SYSPARAMS_MENU */ + {-1, COLOR_MENUTEXT, "MenuText" }, /* IDC_SYSPARAMS_MENU_TEXT */ + {SM_CXVSCROLL, COLOR_SCROLLBAR, "Scrollbar" }, /* IDC_SYSPARAMS_SCROLLBAR */ + {-1, COLOR_HIGHLIGHT, "Hilight" }, /* IDC_SYSPARAMS_SELECTION */ + {-1, COLOR_HIGHLIGHTTEXT, "HilightText" }, /* IDC_SYSPARAMS_SELECTION_TEXT */ + {-1, COLOR_INFOBK, "InfoWindow" }, /* IDC_SYSPARAMS_TOOLTIP */ + {-1, COLOR_INFOTEXT, "InfoText" }, /* IDC_SYSPARAMS_TOOLTIP_TEXT */ + {-1, COLOR_WINDOW, "Window" }, /* IDC_SYSPARAMS_WINDOW */ + {-1, COLOR_WINDOWTEXT, "WindowText" }, /* IDC_SYSPARAMS_WINDOW_TEXT */ + {SM_CXSIZE, COLOR_ACTIVECAPTION, "ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ + {-1, COLOR_CAPTIONTEXT, "TitleText" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_TEXT */ + {-1, COLOR_INACTIVECAPTION, "InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ + {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ + {-1, -1, "MsgBoxText" }, /* IDC_SYSPARAMS_MSGBOX_TEXT */ + {-1, COLOR_APPWORKSPACE, "AppWorkSpace" }, /* IDC_SYSPARAMS_APPWORKSPACE */ + {-1, COLOR_WINDOWFRAME, "WindowFrame" }, /* IDC_SYSPARAMS_WINDOW_FRAME */ + {-1, COLOR_ACTIVEBORDER, "ActiveBorder" }, /* IDC_SYSPARAMS_ACTIVE_BORDER */ + {-1, COLOR_INACTIVEBORDER, "InactiveBorder" }, /* IDC_SYSPARAMS_INACTIVE_BORDER */ + {-1, COLOR_BTNSHADOW, "ButtonShadow" }, /* IDC_SYSPARAMS_BUTTON_SHADOW */ + {-1, COLOR_GRAYTEXT, "GrayText" }, /* IDC_SYSPARAMS_GRAY_TEXT */ + {-1, COLOR_BTNHILIGHT, "ButtonHilight" }, /* IDC_SYSPARAMS_BUTTON_HILIGHT */ + {-1, COLOR_3DDKSHADOW, "ButtonDkShadow" }, /* IDC_SYSPARAMS_BUTTON_DARK_SHADOW */ + {-1, COLOR_3DLIGHT, "ButtonLight" }, /* IDC_SYSPARAMS_BUTTON_LIGHT */ + {-1, -1, "ButtonAlternateFace" }, /* IDC_SYSPARAMS_BUTTON_ALTERNATE */ + {-1, COLOR_HOTLIGHT, "HotTrackingColor" }, /* IDC_SYSPARAMS_HOT_TRACKING */ + {-1, COLOR_GRADIENTACTIVECAPTION, "GradientActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT */ + {-1, COLOR_GRADIENTINACTIVECAPTION, "GradientInactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT */ + {-1, COLOR_MENUHILIGHT, "MenuHilight" }, /* IDC_SYSPARAMS_MENU_HILIGHT */ + {-1, COLOR_MENUBAR, "MenuBar" }, /* IDC_SYSPARAMS_MENUBAR */ +}; + +static void save_sys_color(int idx, COLORREF clr) +{ + //char buffer[13]; + + //sprintf(buffer, "%d %d %d", GetRValue (clr), GetGValue (clr), GetBValue (clr)); + //set_reg_key(HKEY_CURRENT_USER, "Control Panel\\Colors", metrics[idx].color_reg, buffer); +} + +static void set_color_from_theme(WCHAR *keyName, COLORREF color) +{ + char *keyNameA = NULL; + int keyNameSize=0, i=0; + + keyNameSize = WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, 0, NULL, NULL); + keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize); + WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, keyNameSize, NULL, NULL); + + for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) + { + if (lstrcmpiA(metrics[i].color_reg, keyNameA)==0) + { + metrics[i].color = color; + save_sys_color(i, color); + break; + } + } + HeapFree(GetProcessHeap(), 0, keyNameA); +} + +static void do_parse_theme(WCHAR *file) +{ + static const WCHAR colorSect[] = { + 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'C','o','l','o','r','s',0}; + WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; + WCHAR *keyNamePtr = NULL; + char *keyNameValueA = NULL; + int keyNameValueSize = 0; + int red = 0, green = 0, blue = 0; + COLORREF color; + +// WINE_TRACE("%s\n", wine_dbgstr_w(file)); + + GetPrivateProfileStringW(colorSect, NULL, NULL, keyName, + MAX_PATH, file); + + keyNamePtr = keyName; + while (*keyNamePtr!=0) { + GetPrivateProfileStringW(colorSect, keyNamePtr, NULL, keyNameValue, + MAX_PATH, file); + + keyNameValueSize = WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, + keyNameValueA, 0, NULL, NULL); + keyNameValueA = HeapAlloc(GetProcessHeap(), 0, keyNameValueSize); + WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, keyNameValueSize, NULL, NULL); + +// WINE_TRACE("parsing key: %s with value: %s\n", +// wine_dbgstr_w(keyNamePtr), wine_dbgstr_w(keyNameValue)); + + sscanf(keyNameValueA, "%d %d %d", &red, &green, &blue); + + color = RGB((BYTE)red, (BYTE)green, (BYTE)blue); + + HeapFree(GetProcessHeap(), 0, keyNameValueA); + + set_color_from_theme(keyNamePtr, color); + + keyNamePtr+=lstrlenW(keyNamePtr); + keyNamePtr++; + } +} + +static void on_theme_install(HWND dialog) +{ + static const WCHAR filterMask[] = {0,'*','.','m','s','s','t','y','l','e','s',';', + '*','.','t','h','e','m','e',0,0}; + static const WCHAR themeExt[] = {'.','T','h','e','m','e',0}; + const int filterMaskLen = sizeof(filterMask)/sizeof(filterMask[0]); + OPENFILENAMEW ofn; + WCHAR filetitle[MAX_PATH]; + WCHAR file[MAX_PATH]; + WCHAR filter[100]; + WCHAR title[100]; + + LoadStringW (GetModuleHandle (NULL), IDS_THEMEFILE, + filter, sizeof (filter) / sizeof (filter[0]) - filterMaskLen); + memcpy (filter + lstrlenW (filter), filterMask, + filterMaskLen * sizeof (WCHAR)); + LoadStringW (GetModuleHandle (NULL), IDS_THEMEFILE_SELECT, + title, sizeof (title) / sizeof (title[0])); + + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = 0; + ofn.hInstance = 0; + ofn.lpstrFilter = filter; + ofn.lpstrCustomFilter = NULL; + ofn.nMaxCustFilter = 0; + ofn.nFilterIndex = 0; + ofn.lpstrFile = file; + ofn.lpstrFile[0] = '\0'; + ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); + ofn.lpstrFileTitle = filetitle; + ofn.lpstrFileTitle[0] = '\0'; + ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]); + ofn.lpstrInitialDir = NULL; + ofn.lpstrTitle = title; + ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; + ofn.nFileOffset = 0; + ofn.nFileExtension = 0; + ofn.lpstrDefExt = NULL; + ofn.lCustData = 0; + ofn.lpfnHook = NULL; + ofn.lpTemplateName = NULL; + + if (GetOpenFileNameW(&ofn)) + { + static const WCHAR themesSubdir[] = { '\\','T','h','e','m','e','s',0 }; + static const WCHAR backslash[] = { '\\',0 }; + WCHAR themeFilePath[MAX_PATH]; + SHFILEOPSTRUCTW shfop; + + if (FAILED (SHGetFolderPathW (NULL, CSIDL_RESOURCES|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_CURRENT, themeFilePath))) return; + + if (lstrcmpiW(PathFindExtensionW(filetitle), themeExt)==0) + { + do_parse_theme(file); + SendMessage(GetParent(dialog), PSM_CHANGED, 0, 0); + return; + } + + PathRemoveExtensionW (filetitle); + + lstrcatW (themeFilePath, themesSubdir); + lstrcatW (themeFilePath, backslash); + lstrcatW (themeFilePath, filetitle); + + /* Create the directory */ + SHCreateDirectoryExW (dialog, themeFilePath, NULL); + + /* Append theme file name itself */ + lstrcatW (themeFilePath, backslash); + lstrcatW (themeFilePath, PathFindFileNameW (file)); + /* SHFileOperation() takes lists as input, so double-nullterminate */ + themeFilePath[lstrlenW (themeFilePath)+1] = 0; + file[lstrlenW (file)+1] = 0; + + /* Do the copying */ +// WINE_TRACE("copying: %s -> %s\n", wine_dbgstr_w (file), +// wine_dbgstr_w (themeFilePath)); + shfop.hwnd = dialog; + shfop.wFunc = FO_COPY; + shfop.pFrom = file; + shfop.pTo = themeFilePath; + shfop.fFlags = FOF_NOCONFIRMMKDIR; + if (SHFileOperationW (&shfop) == 0) + { + scan_theme_files(); + if (!fill_theme_list (GetDlgItem (dialog, IDC_THEME_THEMECOMBO), + GetDlgItem (dialog, IDC_THEME_COLORCOMBO), + GetDlgItem (dialog, IDC_THEME_SIZECOMBO))) + { + SendMessageW (GetDlgItem (dialog, IDC_THEME_COLORCOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_SETCURSEL, (WPARAM)-1, 0); + enable_size_and_color_controls (dialog, FALSE); + } + else + { + enable_size_and_color_controls (dialog, TRUE); + } + } +// else +// WINE_TRACE("copy operation failed\n"); + } +// else WINE_TRACE("user cancelled\n"); +} + +/* Information about symbolic link targets of certain User Shell Folders. */ +struct ShellFolderInfo { + int nFolder; + char szLinkTarget[FILENAME_MAX]; /* in unix locale */ +}; +/* +static struct ShellFolderInfo asfiInfo[] = { + { CSIDL_DESKTOP, "" }, + { CSIDL_PERSONAL, "" }, + { CSIDL_MYPICTURES, "" }, + { CSIDL_MYMUSIC, "" }, + { CSIDL_MYVIDEO, "" } +};*/ +/* +static struct ShellFolderInfo *psfiSelected = NULL; +*/ +#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) + +/* create a unicode string from a string in Unix locale *//* +static WCHAR *strdupU2W(const char *unix_str) +{ + WCHAR *unicode_str; + int lenW; + + lenW = MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, NULL, 0); + unicode_str = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (unicode_str) + MultiByteToWideChar(CP_UNIXCP, 0, unix_str, -1, unicode_str, lenW); + return unicode_str; +}*/ +/* +static void init_shell_folder_listview_headers(HWND dialog) { + LVCOLUMN listColumn; + RECT viewRect; + char szShellFolder[64] = "Shell Folder"; + char szLinksTo[64] = "Links to"; + int width; + + LoadString(GetModuleHandle(NULL), IDS_SHELL_FOLDER, szShellFolder, sizeof(szShellFolder)); + LoadString(GetModuleHandle(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)); + + GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); + width = (viewRect.right - viewRect.left) / 4; + + listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + listColumn.pszText = szShellFolder; + listColumn.cchTextMax = lstrlen(listColumn.pszText); + listColumn.cx = width; + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMN, 0, (LPARAM) &listColumn); + + listColumn.pszText = szLinksTo; + listColumn.cchTextMax = lstrlen(listColumn.pszText); + listColumn.cx = viewRect.right - viewRect.left - width - 1; + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMN, 1, (LPARAM) &listColumn); +}*/ + +/* Reads the currently set shell folder symbol link targets into asfiInfo. */ +/* +static void read_shell_folder_link_targets(void) { + WCHAR wszPath[MAX_PATH]; + HRESULT hr; + int i; + + for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + asfiInfo[i].szLinkTarget[0] = '\0'; + hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, + SHGFP_TYPE_CURRENT, wszPath); + if (SUCCEEDED(hr)) {*/ +/* char *pszUnixPath = wine_get_unix_file_name(wszPath); + if (pszUnixPath) { + struct stat statPath; + if (!lstat(pszUnixPath, &statPath) && S_ISLNK(statPath.st_mode)) { + int cLen = readlink(pszUnixPath, asfiInfo[i].szLinkTarget, FILENAME_MAX-1); + if (cLen >= 0) asfiInfo[i].szLinkTarget[cLen] = '\0'; + } + HeapFree(GetProcessHeap(), 0, pszUnixPath); + } + */ /*} + } +} +*//* +static void update_shell_folder_listview(HWND dialog) { + int i; + LVITEMW item; + LONG lSelected = SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, (WPARAM)-1, + MAKELPARAM(LVNI_SELECTED,0)); + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); + + for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + WCHAR buffer[MAX_PATH]; + HRESULT hr; + LPITEMIDLIST pidlCurrent; + + hr = SHGetFolderLocation(dialog, asfiInfo[i].nFolder, NULL, 0, &pidlCurrent); + if (SUCCEEDED(hr)) { + LPSHELLFOLDER psfParent; + LPCITEMIDLIST pidlLast; + hr = SHBindToParent(pidlCurrent, &IID_IShellFolder, (LPVOID*)&psfParent, &pidlLast); + if (SUCCEEDED(hr)) { + STRRET strRet; + hr = IShellFolder_GetDisplayNameOf(psfParent, pidlLast, SHGDN_FORADDRESSBAR, &strRet); + if (SUCCEEDED(hr)) { + hr = StrRetToBufW(&strRet, pidlLast, buffer, MAX_PATH); + } + IShellFolder_Release(psfParent); + } + ILFree(pidlCurrent); + } + + if (FAILED(hr)) { + hr = SHGetFolderPathW(dialog, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, + SHGFP_TYPE_CURRENT, buffer); + } + + item.mask = LVIF_TEXT | LVIF_PARAM; + item.iItem = i; + item.iSubItem = 0; + item.pszText = buffer; + item.lParam = (LPARAM)&asfiInfo[i]; + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_INSERTITEMW, 0, (LPARAM)&item); + + item.mask = LVIF_TEXT; + item.iItem = i; + item.iSubItem = 1; + item.pszText = strdupU2W(asfiInfo[i].szLinkTarget); + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_SETITEMW, 0, (LPARAM)&item); + HeapFree(GetProcessHeap(), 0, item.pszText); + } + + if (lSelected >= 0) { + item.mask = LVIF_STATE; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_SETITEMSTATE, (WPARAM)lSelected, + (LPARAM)&item); + } +} + +static void on_shell_folder_selection_changed(HWND hDlg, LPNMLISTVIEW lpnm) { + if (lpnm->uNewState & LVIS_SELECTED) { + psfiSelected = (struct ShellFolderInfo *)lpnm->lParam; + EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 1); + if (strlen(psfiSelected->szLinkTarget)) { + WCHAR *link; + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_CHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 1); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 1); + link = strdupU2W(psfiSelected->szLinkTarget); + set_textW(hDlg, IDC_EDIT_SFPATH, link); + HeapFree(GetProcessHeap(), 0, link); + } else { + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 0); + set_text(hDlg, IDC_EDIT_SFPATH, ""); + } + } else { + psfiSelected = NULL; + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + set_text(hDlg, IDC_EDIT_SFPATH, ""); + EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 0); + } +} + +static void on_shell_folder_edit_changed(HWND hDlg) { + LVITEMW item; + WCHAR *text = get_textW(hDlg, IDC_EDIT_SFPATH); + LONG iSel = SendDlgItemMessage(hDlg, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVNI_SELECTED,0)); + + if (!text || !psfiSelected || iSel < 0) { + HeapFree(GetProcessHeap(), 0, text); + return; + } + + WideCharToMultiByte(CP_UNIXCP, 0, text, -1, + psfiSelected->szLinkTarget, FILENAME_MAX, NULL, NULL); + + item.mask = LVIF_TEXT; + item.iItem = iSel; + item.iSubItem = 1; + item.pszText = text; + SendDlgItemMessage(hDlg, IDC_LIST_SFPATHS, LVM_SETITEMW, 0, (LPARAM)&item); + + HeapFree(GetProcessHeap(), 0, text); + + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); +} +*/ +static void read_sysparams(HWND hDlg) +{ + WCHAR buffer[256]; + HWND list = GetDlgItem(hDlg, IDC_SYSPARAM_COMBO); + NONCLIENTMETRICSW nonclient_metrics; + int i, idx; + + for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + { + LoadStringW(GetModuleHandle(NULL), i + IDC_SYSPARAMS_BUTTON, buffer, + sizeof(buffer) / sizeof(buffer[0])); + idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)buffer); + if (idx != CB_ERR) SendMessageW(list, CB_SETITEMDATA, idx, i); + + if (metrics[i].sm_idx != -1) + metrics[i].size = GetSystemMetrics(metrics[i].sm_idx); + if (metrics[i].color_idx != -1) + metrics[i].color = GetSysColor(metrics[i].color_idx); + } + + nonclient_metrics.cbSize = sizeof(NONCLIENTMETRICSW); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &nonclient_metrics, 0); + + memcpy(&(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfMenuFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfCaptionFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfStatusFont), sizeof(LOGFONTW)); + memcpy(&(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), + &(nonclient_metrics.lfMessageFont), sizeof(LOGFONTW)); +} + +static void apply_sysparams(void) +{ + NONCLIENTMETRICSW nonclient_metrics; + int i, cnt = 0; + int colors_idx[sizeof(metrics) / sizeof(metrics[0])]; + COLORREF colors[sizeof(metrics) / sizeof(metrics[0])]; + + nonclient_metrics.cbSize = sizeof(nonclient_metrics); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, 0); + + nonclient_metrics.iMenuWidth = nonclient_metrics.iMenuHeight = + metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size; + nonclient_metrics.iCaptionWidth = nonclient_metrics.iCaptionHeight = + metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size; + nonclient_metrics.iScrollWidth = nonclient_metrics.iScrollHeight = + metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size; + + memcpy(&(nonclient_metrics.lfMenuFont), + &(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfCaptionFont), + &(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfStatusFont), + &(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + memcpy(&(nonclient_metrics.lfMessageFont), + &(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), + sizeof(LOGFONTW)); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + + for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + if (metrics[i].color_idx != -1) + { + colors_idx[cnt] = metrics[i].color_idx; + colors[cnt++] = metrics[i].color; + } + SetSysColors(cnt, colors_idx, colors); +} + +static void on_sysparam_change(HWND hDlg) +{ + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + + updating_ui = TRUE; + + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_COLOR_TEXT), metrics[index].color_idx != -1); + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_COLOR), metrics[index].color_idx != -1); + InvalidateRect(GetDlgItem(hDlg, IDC_SYSPARAM_COLOR), NULL, TRUE); + + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_SIZE_TEXT), metrics[index].sm_idx != -1); + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_SIZE), metrics[index].sm_idx != -1); + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_SIZE_UD), metrics[index].sm_idx != -1); + if (metrics[index].sm_idx != -1) + SendDlgItemMessageW(hDlg, IDC_SYSPARAM_SIZE_UD, UDM_SETPOS, 0, MAKELONG(metrics[index].size, 0)); + else + set_text(hDlg, IDC_SYSPARAM_SIZE, ""); + + EnableWindow(GetDlgItem(hDlg, IDC_SYSPARAM_FONT), + index == IDC_SYSPARAMS_MENU_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_ACTIVE_TITLE_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_TOOLTIP_TEXT-IDC_SYSPARAMS_BUTTON || + index == IDC_SYSPARAMS_MSGBOX_TEXT-IDC_SYSPARAMS_BUTTON + ); + + updating_ui = FALSE; +} + +static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) +{ + static HBRUSH black_brush = 0; + LPDRAWITEMSTRUCT draw_info = (LPDRAWITEMSTRUCT)lParam; + + if (!black_brush) black_brush = CreateSolidBrush(0); + + if (draw_info->CtlID == IDC_SYSPARAM_COLOR) + { + UINT state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + + if (draw_info->itemState & ODS_DISABLED) + state |= DFCS_INACTIVE; + else + state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + + DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + + if (!(draw_info->itemState & ODS_DISABLED)) + { + HBRUSH brush; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + brush = CreateSolidBrush(metrics[index].color); + + InflateRect(&draw_info->rcItem, -1, -1); + FrameRect(draw_info->hDC, &draw_info->rcItem, black_brush); + InflateRect(&draw_info->rcItem, -1, -1); + FillRect(draw_info->hDC, &draw_info->rcItem, brush); + DeleteObject(brush); + } + } +} + +static void on_select_font(HWND hDlg) +{ + CHOOSEFONTW cf; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + + ZeroMemory(&cf, sizeof(cf)); + cf.lStructSize = sizeof(CHOOSEFONTW); + cf.hwndOwner = hDlg; + cf.lpLogFont = &(metrics[index].lf); + cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL; + + ChooseFontW(&cf); +} + +INT_PTR CALLBACK +ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) { + case WM_INITDIALOG: +// read_shell_folder_link_targets(); +// init_shell_folder_listview_headers(hDlg); +// update_shell_folder_listview(hDlg); + read_sysparams(hDlg); + break; + + case WM_DESTROY: + free_theme_files(); + break; + + case WM_COMMAND: + switch(HIWORD(wParam)) { + case CBN_SELCHANGE: { + if (updating_ui) break; + switch (LOWORD(wParam)) + { + case IDC_THEME_THEMECOMBO: on_theme_changed(hDlg); break; + case IDC_THEME_COLORCOMBO: /* fall through */ + case IDC_THEME_SIZECOMBO: theme_dirty = TRUE; break; + case IDC_SYSPARAM_COMBO: on_sysparam_change(hDlg); return FALSE; + } + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + } + case EN_CHANGE: { + if (updating_ui) break; + switch (LOWORD(wParam)) + { + //case IDC_EDIT_SFPATH: on_shell_folder_edit_changed(hDlg); break; + case IDC_SYSPARAM_SIZE: + { + char *text = get_text(hDlg, IDC_SYSPARAM_SIZE); + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + metrics[index].size = atoi(text); + HeapFree(GetProcessHeap(), 0, text); + + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + } + } + break; + } + case BN_CLICKED: + switch (LOWORD(wParam)) + { + case IDC_THEME_INSTALL: + on_theme_install (hDlg); + break; + + case IDC_SYSPARAM_FONT: + on_select_font(hDlg); + break; +/* + case IDC_BROWSE_SFPATH: + { + WCHAR link[FILENAME_MAX]; + if (browse_for_unix_folder(hDlg, link)) { + WideCharToMultiByte(CP_UNIXCP, 0, link, -1, + psfiSelected->szLinkTarget, FILENAME_MAX, + NULL, NULL); + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } + break; + } + + case IDC_LINK_SFPATH: + if (IsDlgButtonChecked(hDlg, IDC_LINK_SFPATH)) { + WCHAR link[FILENAME_MAX]; + if (browse_for_unix_folder(hDlg, link)) { + WideCharToMultiByte(CP_UNIXCP, 0, link, -1, + psfiSelected->szLinkTarget, FILENAME_MAX, + NULL, NULL); + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } else { + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + } + } else { + psfiSelected->szLinkTarget[0] = '\0'; + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } + break; +*/ + case IDC_SYSPARAM_COLOR: + { + static COLORREF user_colors[16]; + CHOOSECOLORW c_color; + int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0); + + index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); + + memset(&c_color, 0, sizeof(c_color)); + c_color.lStructSize = sizeof(c_color); + c_color.lpCustColors = user_colors; + c_color.rgbResult = metrics[index].color; + c_color.Flags = CC_ANYCOLOR | CC_RGBINIT; + c_color.hwndOwner = hDlg; + if (ChooseColorW(&c_color)) + { + metrics[index].color = c_color.rgbResult; + save_sys_color(index, metrics[index].color); + InvalidateRect(GetDlgItem(hDlg, IDC_SYSPARAM_COLOR), NULL, TRUE); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } + break; + } + } + break; + } + break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) { + case PSN_KILLACTIVE: { + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + break; + } + case PSN_APPLY: { + /*apply();*/ + apply_theme(hDlg); + /*apply_shell_folder_changes();*/ + apply_sysparams(); + //read_shell_folder_link_targets(); + //update_shell_folder_listview(hDlg); + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); + break; + } +// case LVN_ITEMCHANGED: { +// if (wParam == IDC_LIST_SFPATHS) +// on_shell_folder_selection_changed(hDlg, (LPNMLISTVIEW)lParam); +// break; +// } + case PSN_SETACTIVE: { + init_dialog (hDlg); + break; + } + } + break; + + case WM_DRAWITEM: + on_draw_item(hDlg, wParam, lParam); + break; + + default: + break; + } + return FALSE; +} Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/theme.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.c [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,0 +1,97 @@ + +#define WIN32_LEAN_AND_MEAN + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> +#include <commctrl.h> +#include <objbase.h> +#include "resource.h" + +WCHAR* load_string (UINT id) +{ + WCHAR buf[1024]; + int len; + WCHAR* newStr; + + LoadStringW (GetModuleHandle (NULL), id, buf, sizeof(buf)/sizeof(buf[0])); + + len = lstrlenW (buf); + newStr = HeapAlloc (GetProcessHeap(), 0, (len + 1) * sizeof (WCHAR)); + memcpy (newStr, buf, len * sizeof (WCHAR)); + newStr[len] = 0; + return newStr; +} + +static INT CALLBACK +PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) +{ + switch (uMsg) + { + /* + * hWnd = NULL, lParam == dialog resource + */ + case PSCB_PRECREATE: + break; + + case PSCB_INITIALIZED: + break; + + default: + break; + } + return 0; +} + +INT_PTR CALLBACK +ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +static INT_PTR +doPropertySheet (HINSTANCE hInstance, HWND hOwner) +{ + PROPSHEETPAGEW psp[1]; + PROPSHEETHEADERW psh; + int pg = 0; /* start with page 0 */ + + psp[pg].dwSize = sizeof (PROPSHEETPAGEW); + psp[pg].dwFlags = PSP_USETITLE; + psp[pg].hInstance = hInstance; + psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); + psp[pg].u2.pszIcon = NULL; + psp[pg].pfnDlgProc = ThemeDlgProc; + psp[pg].pszTitle = load_string (IDS_TAB_DESKTOP_INTEGRATION); + psp[pg].lParam = 0; + + + /* + * Fill out the PROPSHEETHEADER + */ + psh.dwSize = sizeof (PROPSHEETHEADERW); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; + psh.hwndParent = hOwner; + psh.hInstance = hInstance; + psh.u.pszIcon = NULL; + psh.pszCaption = load_string (IDS_WINECFG_TITLE); + psh.nPages = 1; + psh.u3.ppsp = psp; + psh.pfnCallback = PropSheetCallback; + psh.u2.nStartPage = 0; + + + /* + * Display the modal property sheet + */ + return PropertySheetW (&psh); +} + +int WINAPI +WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) +{ + InitCommonControls (); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + doPropertySheet (hInstance, NULL); + CoUninitialize(); + ExitProcess (0); + return 0; +} Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.rc (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.rc [iso-8859-1] Tue Jul 12 21:09:43 2011 @@ -1,0 +1,84 @@ +#include <windows.h> +#include "commctrl.h" +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_DESKTOP_INTEGRATION DIALOGEX 0, 0, 260, 132 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "&Theme:",IDC_STATIC,15,16,130,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,23,93,14 + LTEXT "&Color:",IDC_THEME_COLORTEXT,15,40,112,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,135,40,110,8 + COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,64,112,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + CONTROL "",IDC_SYSPARAM_COLOR,"Button",BS_OWNERDRAW | WS_DISABLED | WS_TABSTOP,135,74,25,13 + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPLICATIONS "Applications" + IDS_TAB_DLLS "Libraries" + IDS_TAB_DRIVES "Drives" + IDS_CHOOSE_PATH "Select the unix target directory, please." + IDS_HIDE_ADVANCED "Hide &Advanced" + IDS_SHOW_ADVANCED "Show &Advanced" + IDS_NOTHEME "(No Theme)" + IDS_TAB_GRAPHICS "Graphics" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_AUDIO "Audio" + IDS_TAB_ABOUT "About" + IDS_WINECFG_TITLE "Wine configuration" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_THEMEFILE "Theme files" + IDS_THEMEFILE_SELECT "Select a theme file" + IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." + IDS_SHELL_FOLDER "Folder" + IDS_LINKS_TO "Links to" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Controls Background" + IDC_SYSPARAMS_BUTTON_TEXT "Controls Text" + IDC_SYSPARAMS_DESKTOP "Desktop" + IDC_SYSPARAMS_MENU "Menu Background" + IDC_SYSPARAMS_MENU_TEXT "Menu Text" + IDC_SYSPARAMS_SCROLLBAR "Scrollbar" + IDC_SYSPARAMS_SELECTION "Selection Background" + IDC_SYSPARAMS_SELECTION_TEXT "Selection Text" + IDC_SYSPARAMS_TOOLTIP "ToolTip Background" + IDC_SYSPARAMS_TOOLTIP_TEXT "ToolTip Text" + IDC_SYSPARAMS_WINDOW "Window Background" + IDC_SYSPARAMS_WINDOW_TEXT "Window Text" + IDC_SYSPARAMS_ACTIVE_TITLE "Active Title Bar" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" + IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_APPWORKSPACE "Application Workspace" + IDC_SYSPARAMS_WINDOW_FRAME "Window Frame" + IDC_SYSPARAMS_ACTIVE_BORDER "Active Border" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" + IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" + IDC_SYSPARAMS_GRAY_TEXT "Gray Text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Highlight" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" + IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" + IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Title Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" + IDC_SYSPARAMS_MENUBAR "Menu Bar" +END Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themecfg/themecfg.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 2 months

← Newer
1
...
32
33
34
35
36
37
38
...
52
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 July 2011