Ros-diffs April 2016

ros-diffs@reactos.org

13 participants
133 discussions

[spetreolle] 71180: Make the bootcd_extras, livecd_extras, hybridcd_extras actually work. CORE-9527 Cannot be used for the AHK suite test bot, cdmake cannot add directories. ONLINE-567 Arch, #TestY...

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Apr 19 21:41:46 2016 New Revision: 71180 URL: http://svn.reactos.org/svn/reactos?rev=71180&view=rev Log: Make the bootcd_extras, livecd_extras, hybridcd_extras actually work. CORE-9527 Cannot be used for the AHK suite test bot, cdmake cannot add directories. ONLINE-567 Arch, #TestYourCode :) Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Tue Apr 19 21:41:46 2016 @@ -16,18 +16,18 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*) foreach(item ${EXTRA_FILES}) - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/${item} DESTINATION extras NAME_ON_CD ${item} FOR bootcd regtest) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR bootcd regtest) endforeach(item) endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/*) foreach(item ${EXTRA_FILES}) - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/${item} DESTINATION extras NAME_ON_CD ${item} FOR livecd) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR livecd) endforeach(item) endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/*) foreach(item ${EXTRA_FILES}) - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NAME_ON_CD ${item} FOR hybridcd) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd) endforeach(item) endif()

8 years, 5 months

[pschweitzer] 71179: [NTOSKRNL] Typo--;

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Apr 19 06:25:18 2016 New Revision: 71179 URL: http://svn.reactos.org/svn/reactos?rev=71179&view=rev Log: [NTOSKRNL] Typo--; Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Tue Apr 19 06:25:18 2016 @@ -213,7 +213,7 @@ /* finally insert the resulting run */ RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); - ++Mcb->PairCount + ++Mcb->PairCount; ASSERT(NewElement); // NB: Two consecutive runs can only be merged, if actual LBNs also match!

8 years, 5 months

[pschweitzer] 71178: [NTOSKRNL] Use the PairCount variable of the MCB to store the current amount of runs in the table. This will be properly used later on. CORE-11002

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Apr 18 20:49:14 2016 New Revision: 71178 URL: http://svn.reactos.org/svn/reactos?rev=71178&view=rev Log: [NTOSKRNL] Use the PairCount variable of the MCB to store the current amount of runs in the table. This will be properly used later on. CORE-11002 Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Mon Apr 18 20:49:14 2016 @@ -191,6 +191,7 @@ Node.StartingLbn.QuadPart = LowerRun->StartingLbn.QuadPart; Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, LowerRun); + --Mcb->PairCount; DPRINT("Intersecting lower run found (%I64d,%I64d) Lbn: %I64d\n", LowerRun->RunStartVbn.QuadPart, LowerRun->RunEndVbn.QuadPart, LowerRun->StartingLbn.QuadPart); } @@ -205,12 +206,14 @@ Node.RunEndVbn.QuadPart = HigherRun->RunEndVbn.QuadPart; Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HigherRun); + --Mcb->PairCount; DPRINT("Intersecting higher run found (%I64d,%I64d) Lbn: %I64d\n", HigherRun->RunStartVbn.QuadPart, HigherRun->RunEndVbn.QuadPart, HigherRun->StartingLbn.QuadPart); } Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; /* finally insert the resulting run */ RtlInsertElementGenericTable(&Mcb->Mapping->Table, &Node, sizeof(Node), &NewElement); + ++Mcb->PairCount ASSERT(NewElement); // NB: Two consecutive runs can only be merged, if actual LBNs also match! @@ -847,12 +850,11 @@ { PBASE_MCB_INTERNAL Mcb = (PBASE_MCB_INTERNAL)OpaqueMcb; LONGLONG LbnAtVbn0 = -1; - ULONG Nodes = RtlNumberGenericTableElements(&Mcb->Mapping->Table); ULONG NumberOfRuns = 0; DPRINT("FsRtlNumberOfRunsInBaseMcb(%p)\n", OpaqueMcb); - if (Nodes == 0) goto quit; + if (Mcb->PairCount == 0) goto quit; FsRtlLookupBaseMcbEntry(OpaqueMcb, 0, /* Vbn */ @@ -865,7 +867,7 @@ /* Return the number of 'real' and 'hole' runs. * If we do not have sector 0 as 'real' emulate a 'hole' there. */ - NumberOfRuns = Nodes * 2 - (LbnAtVbn0 != -1 ? 1 : 0); /* include holes as runs */ + NumberOfRuns = Mcb->PairCount * 2 - (LbnAtVbn0 != -1 ? 1 : 0); /* include holes as runs */ quit: DPRINT("FsRtlNumberOfRunsInBaseMcb(%p) = %d\n", OpaqueMcb, NumberOfRuns); @@ -954,6 +956,7 @@ //ASSERT(NeedleRun.RunEndVbn.QuadPart <= HaystackRun->RunEndVbn.QuadPart); Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HaystackRun); + --Mcb->PairCount; Mcb->Mapping->Table.CompareRoutine = McbMappingIntersectCompare; } } @@ -1069,7 +1072,10 @@ } if (InsertLowerRun) + { ExistingRun = RtlInsertElementGenericTable(&Mcb->Mapping->Table, InsertLowerRun, sizeof(*InsertLowerRun), &NewElement); + ++Mcb->PairCount; + } ASSERT(ExistingRun == NULL);

8 years, 5 months

[pschweitzer] 71177: [KMTESTS:FSRTL] Add more failing tests for MCB. These are pretty basics and deal with holes. They are pretty handy to show how broken the current MCB implementation is, in rega...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Apr 17 21:17:49 2016 New Revision: 71177 URL: http://svn.reactos.org/svn/reactos?rev=71177&view=rev Log: [KMTESTS:FSRTL] Add more failing tests for MCB. These are pretty basics and deal with holes. They are pretty handy to show how broken the current MCB implementation is, in regard to holes management: it fails at properly counting runs when there are holes and it creates virtual runs (hence the broken count) for each hole. This shouldn't happen. CORE-11002 Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Sun Apr 17 21:17:49 2016 @@ -318,6 +318,52 @@ DumpAllRuns(&LargeMcb); FsRtlUninitializeLargeMcb(&LargeMcb); + + FsRtlInitializeLargeMcb(&LargeMcb, PagedPool); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 0, "Expected 0 runs, got: %lu\n", NbRuns); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 0, 1, 1) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 1, "Expected 1 runs, got: %lu\n", NbRuns); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + DumpAllRuns(&LargeMcb); + + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1, 10, 1) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 1, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 10, "Expected Lbn 10, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + DumpAllRuns(&LargeMcb); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 2, 20, 1) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 3, "Expected 3 runs, got: %lu\n", NbRuns); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 1, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 10, "Expected Lbn 10, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 2, "Expected Vbn 2, got: %I64d\n", Vbn); + ok(Lbn == 20, "Expected Lbn 20, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + DumpAllRuns(&LargeMcb); + + FsRtlUninitializeLargeMcb(&LargeMcb); } static VOID FsRtlLargeMcbTestsExt2()

8 years, 5 months

[tkreuzer] 71176: [XDK/DDK] Fix copy pasta

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 17 21:14:51 2016 New Revision: 71176 URL: http://svn.reactos.org/svn/reactos?rev=71176&view=rev Log: [XDK/DDK] Fix copy pasta Modified: trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sun Apr 17 21:14:51 2016 @@ -3306,7 +3306,7 @@ #undef ASSERT #define ASSERT NT_ASSERT #undef ASSERTMSG -#define ASSERTMSG NT_ASSERT +#define ASSERTMSG NT_ASSERTMSG #undef ASSERTMSGW #define ASSERTMSGW NT_ASSERTMSGW #undef RTL_VERIFY

8 years, 5 months

[tfaber] 71175: [NTOS:KE] - In debug builds, restore EBP early in KiSwitchThreads to get a sensible backtrace CORE-11123

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Apr 17 09:55:13 2016 New Revision: 71175 URL: http://svn.reactos.org/svn/reactos?rev=71175&view=rev Log: [NTOS:KE] - In debug builds, restore EBP early in KiSwitchThreads to get a sensible backtrace CORE-11123 Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Sun Apr 17 09:55:13 2016 @@ -63,6 +63,10 @@ @KiSwitchThreads@8: /* Load the new kernel stack and switch OS to new thread */ mov esp, edx +#if DBG + /* Restore the frame pointer early to get sensible backtraces */ + mov ebp, [esp+12] +#endif call @KiSwapContextExit@8 /* Now we're on the new thread. Return to the caller to restore registers */

8 years, 5 months

[tkreuzer] 71174: [NTOSKRNL] Modify the ret8 interrupt return path in KiTrapExitStub, so that nested interrupts (e.g. as a result of an interrupt storm from a broken driver) will work more "like on...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 16 22:38:11 2016 New Revision: 71174 URL: http://svn.reactos.org/svn/reactos?rev=71174&view=rev Log: [NTOSKRNL] Modify the ret8 interrupt return path in KiTrapExitStub, so that nested interrupts (e.g. as a result of an interrupt storm from a broken driver) will work more "like on Windows", i.e., now the broken driver will not cause stack exhaustion anymore, but a proper system hang! And it will be an even more efficient system hang than Windows has! This is not the '90s. You can't just walk up and crash the system, you have to do something cool first and do it properly "like Windows does", even if you're not using the same assembly instructions. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Sat Apr 16 22:38:11 2016 @@ -264,6 +264,8 @@ #define KI_RESTORE_VOLATILES (KI_RESTORE_EAX OR KI_RESTORE_ECX_EDX) MACRO(KiTrapExitStub, Name, Flags) + LOCAL ret8_instruction + LOCAL not_nested_int PUBLIC @&Name&@4 @&Name&@4: @@ -357,6 +359,18 @@ if (Flags AND KI_EXIT_RET8) + /* Check if we return from a nested interrupt, i.e. an interrupt + that occurred in the ret8 return path between restoring + EFLAGS and returning with the ret instruction. */ + cmp dword ptr [esp], offset ret8_instruction + jne not_nested_int + + /* This is a nested interrupt, so we have 2 IRET frames. + Skip the first, and go directly to the previous return address. + Do not pass Go. Do not collect $200 */ + add esp, 12 + +not_nested_int: /* We are at the IRET frame, so push EFLAGS first */ push dword ptr [esp + 8] @@ -387,6 +401,7 @@ elseif (Flags AND KI_EXIT_RET8) /* Return to kernel mode with a ret 8 */ +ret8_instruction: ret 8 elseif (Flags AND KI_EXIT_RET)

8 years, 5 months

[tfaber] 71173: [USER32_APITEST] - Add a test for window station reference counts CORE-11124

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 16 20:30:11 2016 New Revision: 71173 URL: http://svn.reactos.org/svn/reactos?rev=71173&view=rev Log: [USER32_APITEST] - Add a test for window station reference counts CORE-11124 Modified: trunk/rostests/apitests/user32/desktop.c Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Sat Apr 16 20:30:11 2016 @@ -3,16 +3,19 @@ * LICENSE: GPL - See COPYING in the top level directory * PURPOSE: Test for desktop objects * PROGRAMMERS: Giannis Adamopoulos + * Thomas Faber */ +#define WIN32_NO_STATUS #include <apitest.h> #include <stdio.h> #include <wingdi.h> #include <winuser.h> #include "helper.h" - -#define STATUS_DLL_INIT_FAILED (0xC0000142) +#include <ndk/umtypes.h> +#include <ndk/obfuncs.h> + #define DESKTOP_ALL_ACCESS 0x01ff struct test_info { @@ -196,6 +199,148 @@ } +static HWINSTA open_winsta(PCWSTR winstaName, DWORD *error) +{ + HWINSTA hwinsta; + SetLastError(0xfeedf00d); + hwinsta = OpenWindowStationW(winstaName, FALSE, WINSTA_ALL_ACCESS); + *error = GetLastError(); + return hwinsta; +} + +static HWINSTA create_winsta(PCWSTR winstaName, DWORD *error) +{ + HWINSTA hwinsta; + SetLastError(0xfeedf00d); + hwinsta = CreateWindowStationW(winstaName, 0, WINSTA_ALL_ACCESS, NULL); + *error = GetLastError(); + return hwinsta; +} + +static HDESK open_desk(PCWSTR deskName, DWORD *error) +{ + HDESK hdesk; + SetLastError(0xfeedf00d); + hdesk = OpenDesktopW(deskName, 0, FALSE, DESKTOP_ALL_ACCESS); + *error = GetLastError(); + return hdesk; +} + +static HDESK create_desk(PCWSTR deskName, DWORD *error) +{ + HDESK hdesk; + SetLastError(0xfeedf00d); + hdesk = CreateDesktopW(deskName, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + *error = GetLastError(); + return hdesk; +} + +static void Test_References(void) +{ + PCWSTR winstaName = L"RefTestWinsta"; + PCWSTR deskName = L"RefTestDesktop"; + HWINSTA hwinsta; + HWINSTA hwinsta2; + HWINSTA hwinstaProcess; + DWORD error; + NTSTATUS status; + OBJECT_BASIC_INFORMATION objectInfo = { 0 }; + HDESK hdesk; + BOOL ret; + ULONG baseRefs; + +#define check_ref(handle, hdlcnt, ptrcnt) \ + status = NtQueryObject(handle, ObjectBasicInformation, &objectInfo, sizeof(objectInfo), NULL); \ + ok(status == STATUS_SUCCESS, "status = %lx\n", status); \ + ok(objectInfo.HandleCount == (hdlcnt), "HandleCount = %lx\n", objectInfo.HandleCount); \ + ok(objectInfo.PointerCount == (ptrcnt), "PointerCount = %lx\n", objectInfo.PointerCount); + + /* Winsta shouldn't exist */ + hwinsta = open_winsta(winstaName, &error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + + /* Create it -- we get 1/4 instead of 1/3 because Winstas are kept in a list */ + hwinsta = create_winsta(winstaName, &error); + ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + check_ref(hwinsta, 1, 4); + baseRefs = objectInfo.PointerCount; + ok(baseRefs == 4, "Window station initially has %lu references, expected 4\n", baseRefs); + check_ref(hwinsta, 1, baseRefs); + + /* Open a second handle */ + hwinsta2 = open_winsta(winstaName, &error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + check_ref(hwinsta, 2, baseRefs + 1); + + /* Close second handle -- back to 1/4 */ + ret = CloseHandle(hwinsta2); + ok(ret == TRUE, "ret = %d\n", ret); + check_ref(hwinsta, 1, baseRefs); + + /* Same game but using CloseWindowStation */ + hwinsta2 = open_winsta(winstaName, &error); + ok(hwinsta2 != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hwinsta, error); + check_ref(hwinsta, 2, baseRefs + 1); + ret = CloseWindowStation(hwinsta2); + ok(ret == TRUE, "ret = %d\n", ret); + check_ref(hwinsta, 1, baseRefs); + + /* Set it as the process Winsta */ + hwinstaProcess = GetProcessWindowStation(); + SetProcessWindowStation(hwinsta); + check_ref(hwinsta, 2, baseRefs + 2); + + /* Create a desktop. It takes a reference */ + hdesk = create_desk(deskName, &error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + check_ref(hwinsta, 2, baseRefs + 3); + + /* CloseHandle fails, must use CloseDesktop */ + ret = CloseHandle(hdesk); + ok(ret == FALSE, "ret = %d\n", ret); + check_ref(hwinsta, 2, baseRefs + 3); + ret = CloseDesktop(hdesk); + ok(ret == TRUE, "ret = %d\n", ret); + check_ref(hwinsta, 2, baseRefs + 2); // 2/7 on Win7? + + /* Desktop no longer exists */ + hdesk = open_desk(deskName, &error); + ok(hdesk == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hdesk, error); + check_ref(hwinsta, 2, baseRefs + 2); + + /* Restore the original process Winsta */ + SetProcessWindowStation(hwinstaProcess); + check_ref(hwinsta, 1, baseRefs); + + /* Close our last handle */ + ret = CloseHandle(hwinsta); + ok(ret == TRUE, "ret = %d\n", ret); + + /* Winsta no longer exists */ + hwinsta = open_winsta(winstaName, &error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); + + /* Create the Winsta again, and close it while there's still a desktop */ + hwinsta = create_winsta(winstaName, &error); + ok(hwinsta != NULL && error == NO_ERROR, "Got %p, %lu\n", hwinsta, error); + check_ref(hwinsta, 1, baseRefs); + hwinstaProcess = GetProcessWindowStation(); + SetProcessWindowStation(hwinsta); + check_ref(hwinsta, 2, baseRefs + 2); + + hdesk = create_desk(deskName, &error); + ok(hdesk != NULL && error == 0xfeedf00d, "Got %p, %lu\n", hdesk, error); + check_ref(hwinsta, 2, baseRefs + 3); + + /* The reference from the desktop is still there, hence 1/5 */ + SetProcessWindowStation(hwinstaProcess); + check_ref(hwinsta, 1, baseRefs + 1); + ret = CloseHandle(hwinsta); + ok(ret == TRUE, "ret = %d\n", ret); + hwinsta = open_winsta(winstaName, &error); + ok(hwinsta == NULL && error == ERROR_FILE_NOT_FOUND, "Got %p, %lu\n", hwinsta, error); +} + START_TEST(desktop) { char **test_argv; @@ -216,4 +361,5 @@ Test_InitialDesktop(test_argv[0]); Test_OpenInputDesktop(); -} + Test_References(); +}

8 years, 5 months

[tkreuzer] 71172: [XDK/DDK] Update ASSERT definitions based on latest WDK (with some modifications regarding cast to void and macro parameter expansion). Use NT_ASSERT for ASSERT globally on reacto...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Apr 16 15:53:32 2016 New Revision: 71172 URL: http://svn.reactos.org/svn/reactos?rev=71172&view=rev Log: [XDK/DDK] Update ASSERT definitions based on latest WDK (with some modifications regarding cast to void and macro parameter expansion). Use NT_ASSERT for ASSERT globally on reactos MSVC builds. Modified: trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -159,33 +159,34 @@ #define MAXIMUM_WAIT_OBJECTS 64 -#define ASSERT_APC(Object) NT_ASSERT((Object)->Type == ApcObject) +#define ASSERT_APC(Object) \ + NT_ASSERT((Object)->Type == ApcObject) #define ASSERT_DPC(Object) \ - ASSERT(((Object)->Type == 0) || \ - ((Object)->Type == DpcObject) || \ - ((Object)->Type == ThreadedDpcObject)) - -#define ASSERT_GATE(object) \ - NT_ASSERT((((object)->Header.Type & KOBJECT_TYPE_MASK) == GateObject) || \ - (((object)->Header.Type & KOBJECT_TYPE_MASK) == EventSynchronizationObject)) + NT_ASSERT(((Object)->Type == 0) || \ + ((Object)->Type == DpcObject) || \ + ((Object)->Type == ThreadedDpcObject)) + +#define ASSERT_GATE(Object) \ + NT_ASSERT((((Object)->Header.Type & KOBJECT_TYPE_MASK) == GateObject) || \ + (((Object)->Header.Type & KOBJECT_TYPE_MASK) == EventSynchronizationObject)) #define ASSERT_DEVICE_QUEUE(Object) \ NT_ASSERT((Object)->Type == DeviceQueueObject) -#define ASSERT_TIMER(E) \ - NT_ASSERT(((E)->Header.Type == TimerNotificationObject) || \ - ((E)->Header.Type == TimerSynchronizationObject)) - -#define ASSERT_MUTANT(E) \ - NT_ASSERT((E)->Header.Type == MutantObject) - -#define ASSERT_SEMAPHORE(E) \ - NT_ASSERT((E)->Header.Type == SemaphoreObject) - -#define ASSERT_EVENT(E) \ - NT_ASSERT(((E)->Header.Type == NotificationEvent) || \ - ((E)->Header.Type == SynchronizationEvent)) +#define ASSERT_TIMER(Object) \ + NT_ASSERT(((Object)->Header.Type == TimerNotificationObject) || \ + ((Object)->Header.Type == TimerSynchronizationObject)) + +#define ASSERT_MUTANT(Object) \ + NT_ASSERT((Object)->Header.Type == MutantObject) + +#define ASSERT_SEMAPHORE(Object) \ + NT_ASSERT((Object)->Header.Type == SemaphoreObject) + +#define ASSERT_EVENT(Object) \ + NT_ASSERT(((Object)->Header.Type == NotificationEvent) || \ + ((Object)->Header.Type == SynchronizationEvent)) #define DPC_NORMAL 0 #define DPC_THREADED 1 Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -3188,43 +3188,6 @@ #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) -#if DBG - -#define RTL_VERIFY(exp) \ - ((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) - -#define RTL_VERIFYMSG(msg, exp) \ - ((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) - -#define RTL_SOFT_VERIFY(exp) \ - ((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) - -#define RTL_SOFT_VERIFYMSG(msg, exp) \ - ((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) - -/* The ASSERTs must be cast to void to avoid warnings about unused results. - * We also cannot invoke the VERIFY versions because the indirection messes - * with stringify. */ -#define ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE)) - -#define ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE)) - -#define RTL_SOFT_ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE)) - -#define RTL_SOFT_ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE)) - #if defined(_MSC_VER) # define __assert_annotationA(msg) __annotation(L"Debug", L"AssertFail", L ## msg) # define __assert_annotationW(msg) __annotation(L"Debug", L"AssertFail", msg) @@ -3236,65 +3199,119 @@ #endif #ifdef _PREFAST_ -#define __analysis_unreachable() __assume(0) +# define NT_ANALYSIS_ASSUME(_exp) _Analysis_assume_(_exp) +#elif DBG +# define NT_ANALYSIS_ASSUME(_exp) ((void)0) #else -#define __analysis_unreachable() ((void)0) +# define NT_ANALYSIS_ASSUME(_exp) __noop(_exp) #endif -#define NT_VERIFY(exp) \ +#define NT_ASSERT_ACTION(exp) \ + (NT_ANALYSIS_ASSUME(exp), \ ((!(exp)) ? \ (__assert_annotationA(#exp), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_VERIFYMSG(msg, exp) \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSG_ACTION(msg, exp) \ + (NT_ANALYSIS_ASSUME(exp), \ ((!(exp)) ? \ (__assert_annotationA(msg), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -#define NT_VERIFYMSGW(msg, exp) \ - ((!(exp)) ? \ - (__assert_annotationW(msg), \ - DbgRaiseAssertionFailure(), FALSE) : TRUE) - -/* Can't reuse verify, see above */ -#define NT_ASSERT(exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationA(#exp), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) - -#define NT_ASSERTMSG(msg, exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationA(msg), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) - -#define NT_ASSERTMSGW(msg, exp) \ - ((VOID)((!(exp)) ? \ - (__assert_annotationW(msg), \ - DbgRaiseAssertionFailure(), __analysis_unreachable(), FALSE) : TRUE)) + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#define NT_ASSERTMSGW_ACTION(msg, exp) \ + (NT_ANALYSIS_ASSUME(exp), \ + ((!(exp)) ? \ + (__assert_annotationW(msg), \ + DbgRaiseAssertionFailure(), FALSE) : TRUE)) + +#if DBG + +#define RTL_VERIFY(exp) \ + ((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) + +#define RTL_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ + RtlAssert( (PVOID)#exp, (PVOID)__FILE__, __LINE__, (PCHAR)msg ), FALSE : TRUE) + +#define RTL_SOFT_VERIFY(exp) \ + ((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) + +#define RTL_SOFT_VERIFYMSG(msg, exp) \ + ((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE : TRUE) + +/* The ASSERTs must be cast to void to avoid warnings about unused results. */ +#define ASSERT (void)RTL_VERIFY +#define ASSERTMSG (void)RTL_VERIFYMSG +#define RTL_SOFT_ASSERT (void)RTL_SOFT_VERIFY +#define RTL_SOFT_ASSERTMSG (void)RTL_SOFT_VERIFYMSG + +#define NT_VERIFY NT_ASSERT_ACTION +#define NT_VERIFYMSG NT_ASSERTMSG_ACTION +#define NT_VERIFYMSGW NT_ASSERTMSGW_ACTION + +#define NT_ASSERT_ASSUME (void)NT_ASSERT_ACTION +#define NT_ASSERTMSG_ASSUME (void)NT_ASSERTMSG_ACTION +#define NT_ASSERTMSGW_ASSUME (void)NT_ASSERTMSGW_ACTION + +#define NT_ASSERT_NOASSUME (void)NT_ASSERT_ACTION +#define NT_ASSERTMSG_NOASSUME (void)NT_ASSERTMSG_ACTION +#define NT_ASSERTMSGW_NOASSUME (void)NT_ASSERTMSGW_ACTION #else /* !DBG */ -#define ASSERT(exp) ((VOID) 0) -#define ASSERTMSG(msg, exp) ((VOID) 0) - -#define RTL_SOFT_ASSERT(exp) ((VOID) 0) -#define RTL_SOFT_ASSERTMSG(msg, exp) ((VOID) 0) - -#define RTL_VERIFY(exp) ((exp) ? TRUE : FALSE) -#define RTL_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) - -#define RTL_SOFT_VERIFY(exp) ((exp) ? TRUE : FALSE) +#define ASSERT(exp) ((void)0) +#define ASSERTMSG(msg, exp) ((void)0) + +#define RTL_SOFT_ASSERT(exp) ((void)0) +#define RTL_SOFT_ASSERTMSG(msg, exp) ((void)0) + +#define RTL_VERIFY(exp) ((exp) ? TRUE : FALSE) +#define RTL_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) + +#define RTL_SOFT_VERIFY(exp) ((exp) ? TRUE : FALSE) #define RTL_SOFT_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE) -#define NT_ASSERT(exp) ((VOID)0) -#define NT_ASSERTMSG(msg, exp) ((VOID)0) -#define NT_ASSERTMSGW(msg, exp) ((VOID)0) - -#define NT_VERIFY(_exp) ((_exp) ? TRUE : FALSE) -#define NT_VERIFYMSG(_msg, _exp ) ((_exp) ? TRUE : FALSE) -#define NT_VERIFYMSGW(_msg, _exp) ((_exp) ? TRUE : FALSE) +#define NT_VERIFY(exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) +#define NT_VERIFYMSG(msg, exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) +#define NT_VERIFYMSGW(msg, exp) (NT_ANALYSIS_ASSUME(exp), ((exp) ? TRUE : FALSE)) + +#define NT_ASSERT_ASSUME(exp) (NT_ANALYSIS_ASSUME(exp), (void)0) +#define NT_ASSERTMSG_ASSUME(msg, exp) (NT_ANALYSIS_ASSUME(exp), (void)0) +#define NT_ASSERTMSGW_ASSUME(msg, exp) (NT_ANALYSIS_ASSUME(exp), (void)0) + +#define NT_ASSERT_NOASSUME(exp) ((void)0) +#define NT_ASSERTMSG_NOASSUME(msg, exp) ((void)0) +#define NT_ASSERTMSGW_NOASSUME(msg, exp) ((void)0) #endif /* DBG */ + +#define NT_FRE_ASSERT (void)NT_ASSERT_ACTION +#define NT_FRE_ASSERTMSG (void)NT_ASSERTMSG_ACTION +#define NT_FRE_ASSERTMSGW (void)NT_ASSERTMSGW_ACTION + +#ifdef NT_ASSERT_ALWAYS_ASSUMES +# define NT_ASSERT NT_ASSERT_ASSUME +# define NT_ASSERTMSG NT_ASSERTMSG_ASSUME +# define NT_ASSERTMSGW NT_ASSERTMSGW_ASSUME +#else +# define NT_ASSERT NT_ASSERT_NOASSUME +# define NT_ASSERTMSG NT_ASSERTMSG_NOASSUME +# define NT_ASSERTMSGW NT_ASSERTMSGW_NOASSUME +#endif /* NT_ASSERT_ALWAYS_ASSUMES */ + +#if defined(_MSC_VER) && (defined(__REACTOS__) || defined(ASSERT_ALWAYS_NT_ASSERT)) +#undef ASSERT +#define ASSERT NT_ASSERT +#undef ASSERTMSG +#define ASSERTMSG NT_ASSERT +#undef ASSERTMSGW +#define ASSERTMSGW NT_ASSERTMSGW +#undef RTL_VERIFY +#define RTL_VERIFY NT_VERIFY +#endif #define InitializeListHead32(ListHead) (\ (ListHead)->Flink = (ListHead)->Blink = PtrToUlong((ListHead))) Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Sat Apr 16 15:53:32 2016 @@ -94,15 +94,6 @@ #define ExRaiseStatus RtlRaiseStatus // -// NT_ASSERT Best Assert -// -#if defined(_MSC_VER) -#undef ASSERT -#define ASSERT NT_ASSERT -#endif - - -// // Switch for enabling global page support //

8 years, 5 months

[tfaber] 71171: [CMLIB] - Turn down a noisy DPRINT

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 16 14:19:47 2016 New Revision: 71171 URL: http://svn.reactos.org/svn/reactos?rev=71171&view=rev Log: [CMLIB] - Turn down a noisy DPRINT Modified: trunk/reactos/lib/cmlib/cmse.c Modified: trunk/reactos/lib/cmlib/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmse.c?rev=71171… ============================================================================== --- trunk/reactos/lib/cmlib/cmse.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmse.c [iso-8859-1] Sat Apr 16 14:19:47 2016 @@ -84,7 +84,7 @@ // a BSOD at the end... if (CellData->Security == HCELL_NIL) { - DPRINT1("Cell 0x%08x (data 0x%p) has no security block!\n", Cell, CellData); + DPRINT("Cell 0x%08x (data 0x%p) has no security block!\n", Cell, CellData); HvReleaseCell(Hive, Cell); return; }

8 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
14
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 April 2016