Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 52679: [uxtheme] - Fix the size of the caption buttons. Now they have the correct size with themes like Luna Inspirat or clear looks
by gadamopoulos＠svn.reactos.org 14 Jul '11

14 Jul '11

Author: gadamopoulos Date: Thu Jul 14 12:15:06 2011 New Revision: 52679 URL: http://svn.reactos.org/svn/reactos?rev=52679&view=rev Log: [uxtheme] - Fix the size of the caption buttons. Now they have the correct size with themes like Luna Inspirat or clear looks Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Jul 14 12:15:06 2011 @@ -229,8 +229,8 @@ RECT rcPart; INT ButtonWidth, ButtonHeight, iPartId; - ButtonHeight = GetThemeSysSize(pcontext->theme, pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = GetThemeSysSize(pcontext->theme, pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CXSMSIZE : SM_CXSIZE); + ButtonHeight = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CXSMSIZE : SM_CXSIZE); switch(buttonId) {

1 0

[ilardig] 52678: [CALC] - Workaround linking to msvcrt in rbuild, patch by Alexander Yastrebov See issue #6358 for more details.
by ilardig＠svn.reactos.org 14 Jul '11

14 Jul '11

Author: ilardig Date: Thu Jul 14 11:36:52 2011 New Revision: 52678 URL: http://svn.reactos.org/svn/reactos?rev=52678&view=rev Log: [CALC] - Workaround linking to msvcrt in rbuild, patch by Alexander Yastrebov See issue #6358 for more details. Modified: trunk/reactos/base/applications/calc/calc.rbuild Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Thu Jul 14 11:36:52 2011 @@ -3,6 +3,7 @@ <module name="calc" type="win32gui" installbase="system32" installname="calc.exe" unicode="yes"> <include base="calc">.</include> <define name="DISABLE_HTMLHELP_SUPPORT">1</define> + <library>msvcrt</library> <library>advapi32</library> <library>gdi32</library> <library>user32</library>

1 0

[gadamopoulos] 52677: [uxtheme] - Add yet another reactos specific hack - Fixes drawing scrollbar items
by gadamopoulos＠svn.reactos.org 14 Jul '11

14 Jul '11

Author: gadamopoulos Date: Thu Jul 14 10:10:07 2011 New Revision: 52677 URL: http://svn.reactos.org/svn/reactos?rev=52677&view=rev Log: [uxtheme] - Add yet another reactos specific hack - Fixes drawing scrollbar items Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Jul 14 10:10:07 2011 @@ -528,7 +528,11 @@ GetMenuItemRect(pcontext->hWnd, Menu, imenu, &Rect); +#ifdef __REACTOS__ + OffsetRect(&Rect, -pcontext->wi.rcClient.left, -pcontext->wi.rcClient.top); +#else OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); +#endif SetBkColor(pcontext->hDC, GetSysColor(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); SetTextColor(pcontext->hDC, GetSysColor(Item.fState & MF_GRAYED ? COLOR_GRAYTEXT : COLOR_MENUTEXT));

1 0

[gadamopoulos] 52676: [apihooksrv] - Call ThemeHooksRemove after the user presses a key
by gadamopoulos＠svn.reactos.org 14 Jul '11

14 Jul '11

Author: gadamopoulos Date: Thu Jul 14 08:46:43 2011 New Revision: 52676 URL: http://svn.reactos.org/svn/reactos?rev=52676&view=rev Log: [apihooksrv] - Call ThemeHooksRemove after the user presses a key 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] Thu Jul 14 08:46:43 2011 @@ -43,7 +43,7 @@ BroadcastSystemMessage(BSF_POSTMESSAGE, &info,WM_SETFOCUS,0,0); - Sleep(36000); + system("pause"); ret = fnRemove(); printf("ThemeHooksRemove returned %d\n", ret);

1 0

[gadamopoulos] 52675: [win32k] - Fix a bug that caused ClientLoadLibrary to be called recursively
by gadamopoulos＠svn.reactos.org 14 Jul '11

14 Jul '11

Author: gadamopoulos Date: Thu Jul 14 08:37:55 2011 New Revision: 52675 URL: http://svn.reactos.org/svn/reactos?rev=52675&view=rev Log: [win32k] - Fix a bug that caused ClientLoadLibrary to be called recursively Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Jul 14 08:37:55 2011 @@ -46,14 +46,22 @@ { if(!Unload && !(ppi->W32PF_flags & W32PF_APIHOOKLOADED)) { + /* A callback in user mode can trigger UserLoadApiHook to be called and + as a result IntLoadHookModule will be called recursively. + To solve this we set the flag that means that the appliaction has + loaded the api hook before the callback and in case of error we remove it */ + ppi->W32PF_flags |= W32PF_APIHOOKLOADED; + /* Call ClientLoadLibrary in user32 */ hmod = co_IntClientLoadLibrary(&strUahModule, &strUahInitFunc, Unload, TRUE); - if(hmod != 0) + DPRINT1("co_IntClientLoadLibrary returned %d\n", hmod ); + if(hmod == 0) { - ppi->W32PF_flags |= W32PF_APIHOOKLOADED; - return TRUE; - } - return FALSE; + /* Remove the flag we set before */ + ppi->W32PF_flags &= ~W32PF_APIHOOKLOADED; + return FALSE; + } + return TRUE; } else if(Unload && (ppi->W32PF_flags & W32PF_APIHOOKLOADED)) { @@ -91,7 +99,7 @@ ULONG_PTR Result; PPROCESSINFO ppiCsr; - DPRINT("IntHookModuleUnloaded: iHookID=%d\n", iHookID); + DPRINT1("IntHookModuleUnloaded: iHookID=%d\n", iHookID); ppiCsr = PsGetProcessWin32Process(CsrProcess); @@ -155,7 +163,7 @@ return FALSE; } - DPRINT("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); + DPRINT1("UserRegisterUserApiHook. Server PID: %d\n", PsGetProcessId(pti->ppi->peProcess)); /* Register the api hook */ gpsi->dwSRVIFlags |= SRVINFO_APIHOOK;

1 0

[tfaber] 52674: [KMTESTS/EX] - ExResource part 2: test concurrent acquisition of a resource in multiple threads - ExInterlocked part 2: check calling convention correctness - these show quite a num...
by tfaber＠svn.reactos.org 13 Jul '11

13 Jul '11

Author: tfaber Date: Wed Jul 13 21:17:55 2011 New Revision: 52674 URL: http://svn.reactos.org/svn/reactos?rev=52674&view=rev Log: [KMTESTS/EX] - ExResource part 2: test concurrent acquisition of a resource in multiple threads - ExInterlocked part 2: check calling convention correctness - these show quite a number of bugs in ReactOS ;) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c Modified: 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 [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Wed Jul 13 21:17:55 2011 @@ -40,6 +40,36 @@ static KSPIN_LOCK SpinLock; +typedef struct +{ + int esi, edi, ebx, ebp, esp; +} PROCESSOR_STATE, *PPROCESSOR_STATE; + +#if defined(_MSC_VER) && defined(_M_IX86) +#define SaveState(State) do \ +{ \ + __asm lea ecx, [State] \ + __asm mov [ecx], esi \ + __asm mov [ecx+4], edi \ + __asm mov [ecx+8], ebx \ + __asm mov [ecx+12], ebp \ + __asm mov [ecx+16], esp \ +} while (0) + +#define CheckState(OldState, NewState) do \ +{ \ + ok_eq_hex((OldState)->esi, (NewState)->esi); \ + ok_eq_hex((OldState)->edi, (NewState)->edi); \ + ok_eq_hex((OldState)->ebx, (NewState)->ebx); \ + ok_eq_hex((OldState)->ebp, (NewState)->ebp); \ + ok_eq_hex((OldState)->esp, (NewState)->esp); \ +} while (0) + +#else +#define SaveState(State) +#define CheckState(OldState, NewState) +#endif + static LARGE_INTEGER Large( @@ -57,7 +87,10 @@ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Ret##Type = Function(&Value##Type, Xchg, Cmp, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -75,8 +108,11 @@ Type Exchange##Type = Xchg; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Ret##Type = Function(&Value##Type, &Exchange##Type, \ &Compare##Type, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -94,7 +130,10 @@ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Ret##Type = Function(&Value##Type, Op, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -110,7 +149,10 @@ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Ret##Type = Function(&Value##Type, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -126,7 +168,10 @@ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Ret##Type = Function(&Value##Type, Op, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -141,7 +186,10 @@ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ + SaveState(OldState); \ Function(&Value##Type, Op, ##__VA_ARGS__); \ + SaveState(NewState); \ + CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ Status = _SEH2_GetExceptionCode(); \ } _SEH2_END; \ @@ -163,6 +211,7 @@ { NTSTATUS Status; PKSPIN_LOCK pSpinLock = &SpinLock; + PROCESSOR_STATE OldState, NewState; /* on x86, most of these are supported intrinsicly and don't need a spinlock! */ #if defined _M_IX86 || defined _M_AMD64 Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Wed Jul 13 21:17:55 2011 @@ -15,6 +15,8 @@ //#define NDEBUG #include <debug.h> + +/* TODO: This is getting pretty long, make it somehow easier to read if possible */ /* TODO: this is the Windows Server 2003 version! ROS should use this! * This declaration can be removed once ROS headers are corrected */ @@ -39,15 +41,15 @@ KSPIN_LOCK SpinLock; } ERESOURCE_2K3, *PERESOURCE_2K3; -#define CheckResourceFields(Res) do \ +#define CheckResourceFields(Res, Reinit) do \ { \ ok_eq_pointer((Res)->SystemResourcesList.Flink->Blink, &(Res)->SystemResourcesList); \ ok_eq_pointer((Res)->SystemResourcesList.Blink->Flink, &(Res)->SystemResourcesList); \ - ok_eq_pointer((Res)->OwnerTable, NULL); \ + if (!Reinit) ok_eq_pointer((Res)->OwnerTable, NULL); \ ok_eq_int((Res)->ActiveCount, 0); \ ok_eq_uint((Res)->Flag, 0); \ - ok_eq_pointer((Res)->SharedWaiters, NULL); \ - ok_eq_pointer((Res)->ExclusiveWaiters, NULL); \ + if (!Reinit) ok_eq_pointer((Res)->SharedWaiters, NULL); \ + if (!Reinit) ok_eq_pointer((Res)->ExclusiveWaiters, NULL); \ ok_eq_pointer((PVOID)(Res)->OwnerThreads[0].OwnerThread, NULL); \ ok_eq_ulong((Res)->OwnerThreads[0].TableSize, 0LU); \ ok_eq_pointer((PVOID)(Res)->OwnerThreads[1].OwnerThread, NULL); \ @@ -206,6 +208,201 @@ CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); } +typedef BOOLEAN (NTAPI *PACQUIRE_FUNCTION)(PERESOURCE, BOOLEAN); + +typedef struct +{ + HANDLE Handle; + PKTHREAD Thread; + PERESOURCE Res; + KEVENT InEvent; + KEVENT OutEvent; + PACQUIRE_FUNCTION AcquireResource; + BOOLEAN Wait; + BOOLEAN RetExpected; +} THREAD_DATA, *PTHREAD_DATA; + +static +VOID +NTAPI +AcquireResourceThread( + PVOID Context) +{ + NTSTATUS Status = STATUS_SUCCESS; + PTHREAD_DATA ThreadData = Context; + BOOLEAN Ret; + + KeEnterCriticalRegion(); + Ret = ThreadData->AcquireResource(ThreadData->Res, ThreadData->Wait); + if (ThreadData->RetExpected) + ok_bool_true(Ret, "AcquireResource returned"); + else + ok_bool_false(Ret, "AcquireResource returned"); + + ok_bool_false(KeSetEvent(&ThreadData->OutEvent, 0, TRUE), "KeSetEvent returned"); + Status = KeWaitForSingleObject(&ThreadData->InEvent, Executive, KernelMode, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + if (Ret) + ExReleaseResource(ThreadData->Res); + KeLeaveCriticalRegion(); +} + +static +VOID +InitThreadData( + PTHREAD_DATA ThreadData, + PERESOURCE Res, + PACQUIRE_FUNCTION AcquireFunction) +{ + ThreadData->Res = Res; + KeInitializeEvent(&ThreadData->InEvent, NotificationEvent, FALSE); + KeInitializeEvent(&ThreadData->OutEvent, NotificationEvent, FALSE); + ThreadData->AcquireResource = AcquireFunction; +} + +static +NTSTATUS +StartThread( + PTHREAD_DATA ThreadData, + PLARGE_INTEGER Timeout, + BOOLEAN Wait, + BOOLEAN RetExpected) +{ + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_ATTRIBUTES Attributes; + + ThreadData->Wait = Wait; + ThreadData->RetExpected = RetExpected; + InitializeObjectAttributes(&Attributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); + Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, AcquireResourceThread, ThreadData); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&ThreadData->Thread, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + return KeWaitForSingleObject(&ThreadData->OutEvent, Executive, KernelMode, FALSE, Timeout); +} + +static +VOID +FinishThread( + PTHREAD_DATA ThreadData) +{ + NTSTATUS Status = STATUS_SUCCESS; + + KeSetEvent(&ThreadData->InEvent, 0, TRUE); + Status = KeWaitForSingleObject(ThreadData->Thread, Executive, KernelMode, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + ObDereferenceObject(ThreadData->Thread); + Status = ZwClose(ThreadData->Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + KeClearEvent(&ThreadData->InEvent); + KeClearEvent(&ThreadData->OutEvent); +} + +static +VOID +TestResourceWithThreads( + IN PERESOURCE Res) +{ + NTSTATUS Status = STATUS_SUCCESS; + THREAD_DATA ThreadDataShared; + THREAD_DATA ThreadDataShared2; + THREAD_DATA ThreadDataExclusive; + THREAD_DATA ThreadDataSharedStarve; + THREAD_DATA ThreadDataSharedWait; + LARGE_INTEGER Timeout; + Timeout.QuadPart = -10 * 1000 * 10; /* 10 ms */ + + InitThreadData(&ThreadDataShared, Res, ExAcquireResourceSharedLite); + InitThreadData(&ThreadDataShared2, Res, ExAcquireResourceSharedLite); + InitThreadData(&ThreadDataExclusive, Res, ExAcquireResourceExclusiveLite); + InitThreadData(&ThreadDataSharedStarve, Res, ExAcquireSharedStarveExclusive); + InitThreadData(&ThreadDataSharedWait, Res, ExAcquireSharedWaitForExclusive); + + /* have a thread acquire the resource shared */ + Status = StartThread(&ThreadDataShared, NULL, FALSE, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + + /* a second thread should be able to acquire the resource shared */ + Status = StartThread(&ThreadDataShared2, NULL, FALSE, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 2); + FinishThread(&ThreadDataShared2); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + + /* now have a thread that tries to acquire the resource exclusive -- it should fail */ + Status = StartThread(&ThreadDataExclusive, NULL, FALSE, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + FinishThread(&ThreadDataExclusive); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + + /* as above, but this time it should block */ + Status = StartThread(&ThreadDataExclusive, &Timeout, TRUE, TRUE); + ok_eq_hex(Status, STATUS_TIMEOUT); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + + /* now try another shared one -- it should fail */ + Status = StartThread(&ThreadDataShared2, NULL, FALSE, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + FinishThread(&ThreadDataShared2); + + /* same for ExAcquireSharedWaitForExclusive */ + Status = StartThread(&ThreadDataSharedWait, NULL, FALSE, FALSE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + FinishThread(&ThreadDataSharedWait); + + /* ExAcquireSharedStarveExclusive must get access though! */ + Status = StartThread(&ThreadDataSharedStarve, NULL, TRUE, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 0LU); + ok_eq_int(Res->ActiveCount, 2); + FinishThread(&ThreadDataSharedStarve); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + + /* block another shared one */ + Status = StartThread(&ThreadDataShared2, &Timeout, TRUE, TRUE); + ok_eq_hex(Status, STATUS_TIMEOUT); + CheckResourceStatus(Res, FALSE, 0LU, 1LU, 1LU); + ok_eq_int(Res->ActiveCount, 1); + + /* finish the very first one */ + FinishThread(&ThreadDataShared); + + /* now the blocked exclusive one should get the resource */ + Status = KeWaitForSingleObject(&ThreadDataExclusive.OutEvent, Executive, KernelMode, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 1LU); + ok_eq_int(Res->ActiveCount, 1); + ok_eq_uint((Res->Flag & ResourceOwnedExclusive) != 0, 1); + + FinishThread(&ThreadDataExclusive); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + + /* now the blocked shared one should resume */ + Status = KeWaitForSingleObject(&ThreadDataShared2.OutEvent, Executive, KernelMode, FALSE, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 1); + FinishThread(&ThreadDataShared2); + CheckResourceStatus(Res, FALSE, 0LU, 0LU, 0LU); + ok_eq_int(Res->ActiveCount, 0); +} + START_TEST(ExResource) { NTSTATUS Status; @@ -228,7 +425,7 @@ memset(&Res, 0x55, sizeof Res); Status = ExInitializeResourceLite(&Res); ok_eq_hex(Status, STATUS_SUCCESS); - CheckResourceFields((PERESOURCE_2K3)&Res); + CheckResourceFields((PERESOURCE_2K3)&Res, FALSE); CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); @@ -246,10 +443,12 @@ ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + TestResourceWithThreads(&Res); + /* ExReinitializeResourceLite cleans up after us */ Status = ExReinitializeResourceLite(&Res); ok_eq_hex(Status, STATUS_SUCCESS); - CheckResourceFields((PERESOURCE_2K3)&Res); + CheckResourceFields((PERESOURCE_2K3)&Res, TRUE); CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); Status = ExDeleteResourceLite(&Res);

1 0

[tfaber] 52673: [KMTESTS/EX] - add a test for hard-error handling - add test for interlocked functions (part 1)
by tfaber＠svn.reactos.org 13 Jul '11

13 Jul '11

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

1 0

[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 13 Jul '11

13 Jul '11

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. */

1 0

[akhaldi] 52671: * Update spec2def.
by akhaldi＠svn.reactos.org 13 Jul '11

13 Jul '11

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], '/');

1 0

[akhaldi] 52670: * Sync with recent trunk (r52669).
by akhaldi＠svn.reactos.org 13 Jul '11

13 Jul '11

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;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs