Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [IDL] Add the undocumented struct _SAMPR_USER_INTERNAL2_INFORMATION to sam.idl
by Eric Kohl 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=791f331d67e0546a68103… commit 791f331d67e0546a68103506dba9c75dd8088830 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Sep 2 11:58:30 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Sep 2 11:59:19 2018 +0200 [IDL] Add the undocumented struct _SAMPR_USER_INTERNAL2_INFORMATION to sam.idl --- sdk/include/reactos/idl/sam.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/include/reactos/idl/sam.idl b/sdk/include/reactos/idl/sam.idl index 7322379bf8..31cb7d3ce2 100644 --- a/sdk/include/reactos/idl/sam.idl +++ b/sdk/include/reactos/idl/sam.idl @@ -644,6 +644,15 @@ typedef struct _SAMPR_USER_INTERNAL1_INFORMATION BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL1_INFORMATION, *PSAMPR_USER_INTERNAL1_INFORMATION; +typedef struct _SAMPR_USER_INTERNAL2_INFORMATION +{ + unsigned long Flags; + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + unsigned short BadPasswordCount; + unsigned short LogonCount; +} SAMPR_USER_INTERNAL2_INFORMATION, *PSAMPR_USER_INTERNAL2_INFORMATION; + typedef struct _SAMPR_USER_INTERNAL4_INFORMATION { SAMPR_USER_ALL_INFORMATION I1; @@ -723,6 +732,7 @@ typedef [switch_type(USER_INFORMATION_CLASS)] union _SAMPR_USER_INFO_BUFFER [case(UserControlInformation)] USER_CONTROL_INFORMATION Control; [case(UserExpiresInformation)] USER_EXPIRES_INFORMATION Expires; [case(UserInternal1Information)] SAMPR_USER_INTERNAL1_INFORMATION Internal1; + [case(UserInternal2Information)] SAMPR_USER_INTERNAL2_INFORMATION Internal2; [case(UserParametersInformation)] SAMPR_USER_PARAMETERS_INFORMATION Parameters; [case(UserAllInformation)] SAMPR_USER_ALL_INFORMATION All; [case(UserInternal4Information)] SAMPR_USER_INTERNAL4_INFORMATION Internal4;

1 0

01/01: [KMTESTS:CC] Add tests showing our CcMapData/CcPinRead raise invalid status
by Pierre Schweitzer 02 Sep '18

02 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01c73317cc106f6cf5456… commit 01c73317cc106f6cf545687327c83273d4294f33 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Sep 2 11:48:16 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Sep 2 11:50:23 2018 +0200 [KMTESTS:CC] Add tests showing our CcMapData/CcPinRead raise invalid status --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 43 +++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcMapData_user.c | 3 +- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 43 +++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcPinRead_user.c | 3 +- 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 516d55fe22..3e86a3a55c 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -326,6 +326,49 @@ PerformTest( ExFreePool(TestContext); } } + else if (TestId == 4) + { + /* Map after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + CcUnpinData(Bcb); + } + + /* Map a VACB after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok(Ret == FALSE, "CcMapData succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Map more than a VACB */ + Ret = FALSE; + Offset.QuadPart = 0x0; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcMapData succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c index b1d2685f76..dee2a93d5e 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_user.c @@ -20,8 +20,9 @@ START_TEST(CcMapData) /* 3 tests for offset * 1 test for BCB + * 1 test for length/offset */ - for (TestId = 0; TestId < 4; ++TestId) + for (TestId = 0; TestId < 5; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 58f8808fcd..9c338fe785 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -477,6 +477,49 @@ PerformTest( CcUnpinData(Bcb); } } + else if (TestId == 5) + { + /* Pin after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + CcUnpinData(Bcb); + } + + /* Pin a VACB after EOF */ + Ret = FALSE; + Offset.QuadPart = FileSizes.FileSize.QuadPart + 0x1000 + VACB_MAPPING_GRANULARITY; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + /* Pin more than a VACB */ + Ret = FALSE; + Offset.QuadPart = 0x0; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, 0x1000 + VACB_MAPPING_GRANULARITY, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c index 78818164e8..e8e78cbc44 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c @@ -21,8 +21,9 @@ START_TEST(CcPinRead) /* 3 tests for offset * 1 test for BCB * 1 test for pinning access + * 1 test for length/offset */ - for (TestId = 0; TestId < 5; ++TestId) + for (TestId = 0; TestId < 6; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

03/03: [WIN32K:NTUSER] co_UserDestroyWindow(): Simplify the destruction of the owned windows.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d48b88bfbfcb6845e874… commit 4d48b88bfbfcb6845e8742f78154156e984f6363 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:45:11 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:21 2018 +0200 [WIN32K:NTUSER] co_UserDestroyWindow(): Simplify the destruction of the owned windows. --- win32ss/user/ntuser/window.c | 81 +++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 49 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 4776b8e9d3..7d6ac87155 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2740,58 +2740,41 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) return TRUE; } - /* Recursively destroy owned windows */ - - if (! (Window->style & WS_CHILD)) - { - for (;;) - { - BOOL GotOne = FALSE; - HWND *Children; - HWND *ChildHandle; - PWND Child, Desktop; - - Desktop = IntIsDesktopWindow(Window) ? Window : - UserGetWindowObject(IntGetDesktopWindow()); - Children = IntWinListChildren(Desktop); + /* Recursively destroy owned windows */ + if (!(Window->style & WS_CHILD)) + { + HWND* List; + HWND* phWnd; + PWND pWnd; - if (Children) - { - for (ChildHandle = Children; *ChildHandle; ++ChildHandle) + List = IntWinListOwnedPopups(Window); + if (List) + { + for (phWnd = List; *phWnd; ++phWnd) { - Child = UserGetWindowObject(*ChildHandle); - if (Child == NULL) - continue; - if (Child->spwndOwner != Window) - { - continue; - } - - if (IntWndBelongsToThread(Child, PsGetCurrentThreadWin32Thread())) - { - USER_REFERENCE_ENTRY ChildRef; - UserRefObjectCo(Child, &ChildRef); // Temp HACK? - co_UserDestroyWindow(Child); - UserDerefObjectCo(Child); // Temp HACK? - - GotOne = TRUE; - continue; - } - - if (Child->spwndOwner != NULL) - { - Child->spwndOwner = NULL; - } - + pWnd = ValidateHwndNoErr(*phWnd); + if (pWnd == NULL) + continue; + ASSERT(pWnd->spwndOwner == Window); + ASSERT(pWnd != Window); + + pWnd->spwndOwner = NULL; + if (IntWndBelongsToThread(pWnd, PsGetCurrentThreadWin32Thread())) + { + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(pWnd, &Ref); // Temp HACK? + co_UserDestroyWindow(pWnd); + UserDerefObjectCo(pWnd); // Temp HACK? + } + else + { + ERR("IntWndBelongsToThread(0x%p) is FALSE, ignoring.\n", pWnd); + } } - ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); - } - if (! GotOne) - { - break; - } - } - } + + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + } /* Generate mouse move message for the next window */ msg.message = WM_MOUSEMOVE;

1 0

02/03: [WIN32K:NTUSER] Optimize IntWinListOwnedPopups() a little bit. Improve a trace.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e286c4c5202ac2d6e7909… commit e286c4c5202ac2d6e7909ee05cdc95f76b8f4897 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:42:11 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:20 2018 +0200 [WIN32K:NTUSER] Optimize IntWinListOwnedPopups() a little bit. Improve a trace. --- win32ss/user/ntuser/window.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 40a7459dd2..4776b8e9d3 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -288,16 +288,19 @@ IntWinListOwnedPopups(PWND Window) { PWND Child, Desktop; HWND *List; - UINT Index, NumChildren = 0; + UINT Index, NumOwned = 0; Desktop = co_GetDesktopWindow(Window); if (!Desktop) return NULL; for (Child = Desktop->spwndChild; Child; Child = Child->spwndNext) - ++NumChildren; + { + if (Child->spwndOwner == Window) + ++NumOwned; + } - List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); + List = ExAllocatePoolWithTag(PagedPool, (NumOwned + 1) * sizeof(HWND), USERTAG_WINDOWLIST); if (!List) { ERR("Failed to allocate memory for children array\n"); @@ -2626,7 +2629,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) hWnd = Window->head.h; ti = PsGetCurrentThreadWin32Thread(); - TRACE("co_UserDestroyWindow \n"); + TRACE("co_UserDestroyWindow(Window = 0x%p, hWnd = 0x%p)\n", Window, hWnd); /* Check for owner thread */ if ( Window->head.pti != PsGetCurrentThreadWin32Thread())

1 0

01/03: [WIN32K:NTUSER] Code formatting only.
by Hermès Bélusca-Maïto 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f644a50cd77492dc06615… commit f644a50cd77492dc06615a632ca500a1687aa63b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 1 23:39:38 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 1 23:46:17 2018 +0200 [WIN32K:NTUSER] Code formatting only. --- win32ss/user/ntuser/window.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 95ffa02fb7..40a7459dd2 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -254,29 +254,33 @@ IntEnableWindow( HWND hWnd, BOOL bEnable ) HWND* FASTCALL IntWinListChildren(PWND Window) { - PWND Child; - HWND *List; - UINT Index, NumChildren = 0; + PWND Child; + HWND *List; + UINT Index, NumChildren = 0; - if (!Window) return NULL; + if (!Window) return NULL; - for (Child = Window->spwndChild; Child; Child = Child->spwndNext) - ++NumChildren; + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) + { + ++NumChildren; + } - List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); - if(!List) - { - ERR("Failed to allocate memory for children array\n"); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - for (Child = Window->spwndChild, Index = 0; - Child != NULL; - Child = Child->spwndNext, ++Index) - List[Index] = Child->head.h; - List[Index] = NULL; + List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); + if(!List) + { + ERR("Failed to allocate memory for children array\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Index = 0; + for (Child = Window->spwndChild; Child; Child = Child->spwndNext) + { + List[Index++] = Child->head.h; + } + List[Index] = NULL; - return List; + return List; } HWND* FASTCALL @@ -2682,7 +2686,7 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) } } - // Adjust last active. + /* Adjust last active */ if ((pwndTemp = Window->spwndOwner)) { while (pwndTemp->spwndOwner)

1 0

01/01: [KMTESTS:CC] Add tests for BCB extension
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ab21d67aef7db1f7621c… commit 9ab21d67aef7db1f7621c22aade1a2ed4c5babcb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 21:52:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 21:52:39 2018 +0200 [KMTESTS:CC] Add tests for BCB extension --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 15 +++++ modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 74 ++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 0d84f21c31..516d55fe22 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -212,6 +212,21 @@ MapInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + Offset.QuadPart = 0x1500; + TestContext->Length -= 0x500; + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); + + CcUnpinData(Bcb); + } + return; } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 68e666c1b3..58f8808fcd 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -214,6 +214,45 @@ PinInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + Offset.QuadPart = 0x1500; + TestContext->Length -= 0x500; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_WAIT | PIN_IF_BCB, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); + + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); + + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_EXCLUSIVE, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); + + CcUnpinData(Bcb); + } + return; } @@ -261,6 +300,41 @@ PinInAnotherThreadExclusive(IN PVOID Context) CcUnpinData(Bcb); } + Offset.QuadPart = 0x1500; + TestContext->Length -= 0x500; + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_IF_BCB, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, (PVOID)((ULONG_PTR)TestContext->Buffer + 0x500)); + + CcUnpinData(Bcb); + } + return; }

1 0

01/01: [KMTESTS:CC] Add more tests crossing CcPinRead and CcMapData
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04a192fa3075bd53f0318… commit 04a192fa3075bd53f031898bec2271f94cfb1379 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 21:26:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 21:27:24 2018 +0200 [KMTESTS:CC] Add more tests crossing CcPinRead and CcMapData --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 34 ++++++++++++++++++++++++ modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 24 +++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 6624b10e70..0d84f21c31 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -178,6 +178,40 @@ MapInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_IF_BCB, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_EXCLUSIVE, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + return; } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index ecaceb38fb..68e666c1b3 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -202,6 +202,18 @@ PinInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + return; } @@ -237,6 +249,18 @@ PinInAnotherThreadExclusive(IN PVOID Context) CcUnpinData(Bcb); } + KmtStartSeh(); + Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, 0, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcMapData failed\n")) + { + ok(Bcb != TestContext->Bcb, "Returned same BCB!\n"); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + return; }

1 0

01/01: [MSGINA] Display the 'account expired' message when a user tries to log on using an expired account.
by Eric Kohl 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f4d70b405d3479e69ae0… commit 6f4d70b405d3479e69ae0423fd1f306b43c13695 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Sep 1 21:08:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Sep 1 21:10:42 2018 +0200 [MSGINA] Display the 'account expired' message when a user tries to log on using an expired account. --- dll/win32/msgina/gui.c | 8 ++++++++ dll/win32/msgina/lang/bg-BG.rc | 1 + dll/win32/msgina/lang/cs-CZ.rc | 1 + dll/win32/msgina/lang/de-DE.rc | 1 + dll/win32/msgina/lang/en-US.rc | 1 + dll/win32/msgina/lang/es-ES.rc | 1 + dll/win32/msgina/lang/fr-FR.rc | 1 + dll/win32/msgina/lang/he-IL.rc | 1 + dll/win32/msgina/lang/id-ID.rc | 1 + dll/win32/msgina/lang/it-IT.rc | 1 + dll/win32/msgina/lang/ja-JP.rc | 1 + dll/win32/msgina/lang/no-NO.rc | 1 + dll/win32/msgina/lang/pl-PL.rc | 1 + dll/win32/msgina/lang/ro-RO.rc | 1 + dll/win32/msgina/lang/ru-RU.rc | 1 + dll/win32/msgina/lang/sk-SK.rc | 1 + dll/win32/msgina/lang/sq-AL.rc | 1 + dll/win32/msgina/lang/tr-TR.rc | 1 + dll/win32/msgina/lang/uk-UA.rc | 1 + dll/win32/msgina/lang/zh-CN.rc | 1 + dll/win32/msgina/lang/zh-TW.rc | 1 + dll/win32/msgina/resource.h | 1 + 22 files changed, 29 insertions(+) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index a2466e8c47..cafced9aa2 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -932,6 +932,14 @@ DoLogon( goto done; } } + else if (SubStatus == STATUS_ACCOUNT_EXPIRED) + { + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONEXCLAMATION, + IDS_LOGONTITLE, + IDS_ACCOUNTEXPIRED); + } else { TRACE("Other error!\n"); diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 9c740958da..97da77a593 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index ed7faa0087..e80492613b 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -203,6 +203,7 @@ BEGIN IDS_LOGONUSERDISABLED "Tento účet byl vypnut. Prosím kontaktujte administrátora tohoto systému." IDS_PASSWORDMUSTCHANGE "Při prvním přihlášení je nutné změnit heslo." IDS_PASSWORDEXPIRED "Heslu vypršela platnost a musí být změněno." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index c1308c1ccf..5308a8e468 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Ihr Konto wurde deaktiviert. Wenden Sie sich an Ihren Systemadministrator." IDS_PASSWORDMUSTCHANGE "Sie müssen Ihr Passwort bei der ersten Anmeldung ändern." IDS_PASSWORDEXPIRED "Ihr Passwort ist abgelaufen und muss geändert werden." + IDS_ACCOUNTEXPIRED "Ihr Konto ist abgelaufen. Bitte wenden Sie sich an Ihren Systemadministrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index 8960dd6901..b7c5e92260 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -199,6 +199,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 2539dbe40f..c9a5a6ffb5 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -199,6 +199,7 @@ BEGIN IDS_LOGONUSERDISABLED "La cuenta ha sido desactivada. Contacte con su administrador del sistema." IDS_PASSWORDMUSTCHANGE "Es necesario cambiar la contraseña en el primer inicio de sesión." IDS_PASSWORDEXPIRED "La contraseña ha expirado y debe cambiarse." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 03b6b88964..98c9916875 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Votre compte est désactivé. Voyez votre administrateur système." IDS_PASSWORDMUSTCHANGE "Vous devez changer votre mot de passe à la première connexion." IDS_PASSWORDEXPIRED "Votre mot de passe a expiré et doit être changé." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 708dc9274e..23c24f9985 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index f705fda24b..02660b5dd2 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index a21b8e7920..866f037547 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -207,6 +207,7 @@ BEGIN IDS_LOGONUSERDISABLED "Il tuo account è stato disattivato. Per favore contatti l'amministratore di sistema." IDS_PASSWORDMUSTCHANGE "Ti è chiesto di cambiare password al primo login." IDS_PASSWORDEXPIRED "La tua password è scaduta e devi cambiarla." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index c5a265d02e..38de8b4abb 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index 2772b08b18..f3b6bf9670 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -198,6 +198,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 75d8cbe3d6..e2d52236d6 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -208,6 +208,7 @@ BEGIN IDS_LOGONUSERDISABLED "Twoje konto zostało wyłączone. Skontaktuj się z administratorem systemu." IDS_PASSWORDMUSTCHANGE "Jesteś zobowiązany do zmiany hasła przy pierwszym logowaniu." IDS_PASSWORDEXPIRED "Twoje hasło wygasło i musi zostać zmienione." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index bdbfc8a024..5b111d527a 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -207,6 +207,7 @@ BEGIN IDS_LOGONUSERDISABLED "Contul dumneavoastră a fost dezactivat. Contactați administratorul de sistem." IDS_PASSWORDMUSTCHANGE "Este imperativ să vă schimbați parola la prima autentificare." IDS_PASSWORDEXPIRED "Parola v-a expirat și trebuie schimbată." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 7672eb13d0..be7272f8a0 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -200,6 +200,7 @@ BEGIN IDS_LOGONUSERDISABLED "Ваш аккаунт отключен. Пожалуйста, обратитесь к системному администратору." IDS_PASSWORDMUSTCHANGE "Вы должны сменить пароль при следующем входе." IDS_PASSWORDEXPIRED "Срок действия вашего пароля истек, необходимо его изменить." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 655251b568..789443de47 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -203,6 +203,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index cd3d7ee467..b4474db1b7 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -202,6 +202,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index b3e75f3607..de1b088d46 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -200,6 +200,7 @@ BEGIN IDS_LOGONUSERDISABLED "Hesâbınız edilginleştirildi. Lütfen dizge yöneticinizi görünüz." IDS_PASSWORDMUSTCHANGE "İlk oturum açmada şifrenizi değiştirmeniz gerekir." IDS_PASSWORDEXPIRED "Şifrenizin süresi doldu ve şifreniz değiştirilmelidir." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 68956efb2a..96f093b43f 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -206,6 +206,7 @@ BEGIN IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon." IDS_PASSWORDEXPIRED "Your password has expired and must be changed." + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 50446c4770..b9d11ffe00 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -201,6 +201,7 @@ BEGIN IDS_LOGONUSERDISABLED "您的帐户已被禁用。请参阅您的系统管理员。" IDS_PASSWORDMUSTCHANGE "您需要更改您在首次登录的密码。" IDS_PASSWORDEXPIRED "您的密码已过期，必须更改。" + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index c6f6d5940c..c5b4e1e83d 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -200,6 +200,7 @@ BEGIN IDS_LOGONUSERDISABLED "您的帳戶已被禁用。請參閱您的系統管理員。" IDS_PASSWORDMUSTCHANGE "您需要更改您在首次登入的密碼。" IDS_PASSWORDEXPIRED "您的密碼已過期，必須更改。" + IDS_ACCOUNTEXPIRED "Your account has expired. Please see your system administrator." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 49ae3a8c44..cdba2c0b66 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -86,6 +86,7 @@ #define IDS_LOGONUSERDISABLED 40017 #define IDS_PASSWORDMUSTCHANGE 40018 #define IDS_PASSWORDEXPIRED 40019 +#define IDS_ACCOUNTEXPIRED 40020 #define IDS_SHUTDOWN_SHUTDOWN 50000 #define IDS_SHUTDOWN_LOGOFF 50001

1 0

02/02: [USBOHCI_NEW] Avoid storing pointers as ULONG and physical addresses as pointers.
by Thomas Faber 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c188e387e3b80ce4a776d… commit c188e387e3b80ce4a776d74375d2649f8ffe8d7a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 1 18:23:25 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 1 18:23:25 2018 +0200 [USBOHCI_NEW] Avoid storing pointers as ULONG and physical addresses as pointers. --- drivers/usb/usbohci_new/usbohci.c | 72 +++++++++++++++++++-------------------- drivers/usb/usbohci_new/usbohci.h | 6 ++-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index ef123288b2..e4bed31d6d 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -239,7 +239,7 @@ OHCI_InitializeTDs(IN POHCI_ENDPOINT OhciEndpoint, TdVA = OhciEndpoint->FirstTD; - TdPA = (ULONG)EndpointProperties->BufferPA + sizeof(OHCI_HCD_ED); + TdPA = EndpointProperties->BufferPA + sizeof(OHCI_HCD_ED); for (ix = 0; ix < TdCount; ix++) { @@ -673,9 +673,9 @@ OHCI_StartController(IN PVOID ohciExtension, } OhciExtension->HcResourcesVA = (POHCI_HC_RESOURCES)Resources->StartVA; - OhciExtension->HcResourcesPA = (POHCI_HC_RESOURCES)Resources->StartPA; + OhciExtension->HcResourcesPA = Resources->StartPA; - DPRINT_OHCI("OHCI_StartController: HcResourcesVA - %p, HcResourcesPA - %p\n", + DPRINT_OHCI("OHCI_StartController: HcResourcesVA - %p, HcResourcesPA - %lx\n", OhciExtension->HcResourcesVA, OhciExtension->HcResourcesPA); @@ -685,7 +685,7 @@ OHCI_StartController(IN PVOID ohciExtension, for (ix = 0; ix < INTERRUPT_ENDPOINTs; ix++) { IntED = &OhciExtension->HcResourcesVA->InterrruptHeadED[ix]; - IntEdPA = (ULONG_PTR)&OhciExtension->HcResourcesPA->InterrruptHeadED[ix]; + IntEdPA = OhciExtension->HcResourcesPA + FIELD_OFFSET(OHCI_HC_RESOURCES, InterrruptHeadED[ix]); if (ix == (ENDPOINT_INTERRUPT_1ms - 1)) { @@ -819,7 +819,7 @@ OHCI_StartController(IN PVOID ohciExtension, /* Setup HcHCCA register */ WRITE_REGISTER_ULONG(&OperationalRegs->HcHCCA, - (ULONG)&OhciExtension->HcResourcesPA->HcHCCA); + OhciExtension->HcResourcesPA + FIELD_OFFSET(OHCI_HC_RESOURCES, HcHCCA)); /* Setup HcInterruptEnable register */ Interrupts.AsULONG = 0; @@ -1249,7 +1249,7 @@ OHCI_RemainTDs(IN POHCI_EXTENSION OhciExtension, DPRINT_OHCI("OHCI_RemainTDs: ... \n"); MaxTDs = OhciEndpoint->MaxTransferDescriptors; - TD = (POHCI_HCD_TD)OhciEndpoint->FirstTD; + TD = OhciEndpoint->FirstTD; RemainTDs = 0; @@ -1273,7 +1273,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, IN PUSBPORT_SCATTER_GATHER_LIST SGList) { POHCI_HCD_TD FirstTD; - POHCI_HCD_TD FirstTdPA; + ULONG FirstTdPA; POHCI_HCD_TD TD; POHCI_HCD_TD TD2; POHCI_HCD_TD PrevTD; @@ -1302,7 +1302,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, FirstTD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; FirstTD->NextHcdTD = 0; - FirstTD->OhciTransfer = (ULONG)OhciTransfer; + FirstTD->OhciTransfer = OhciTransfer; FirstTD->HwTD.Padded[0] = 0; FirstTD->HwTD.Padded[1] = 0; @@ -1313,12 +1313,12 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, &TransferParameters->SetupPacket, sizeof(FirstTD->HwTD.SetupPacket)); - FirstTdPA = (POHCI_HCD_TD)FirstTD->PhysicalAddress; + FirstTdPA = FirstTD->PhysicalAddress; - FirstTD->HwTD.gTD.CurrentBuffer = (ULONG)&FirstTdPA->HwTD.SetupPacket; + FirstTD->HwTD.gTD.CurrentBuffer = FirstTdPA + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket); - BufferEnd = (ULONG_PTR)&FirstTdPA->HwTD.SetupPacket + - sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) - 1; + BufferEnd = FirstTdPA + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket) + + sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) - 1; FirstTD->HwTD.gTD.BufferEnd = BufferEnd; @@ -1336,7 +1336,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD2->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; TD2->NextHcdTD = 0; - TD2->OhciTransfer = (ULONG)OhciTransfer; + TD2->OhciTransfer = OhciTransfer; RtlZeroMemory(&TD2->HwTD.SetupPacket, sizeof(TD2->HwTD.SetupPacket)); @@ -1348,7 +1348,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD = TD2; PrevTD->HwTD.gTD.NextTD = TD2->PhysicalAddress; - PrevTD->NextHcdTD = (ULONG)TD2; + PrevTD->NextHcdTD = TD2; MaxPacketSize = OhciEndpoint->EndpointProperties.TotalMaxPacketSize; @@ -1387,7 +1387,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; TD->NextHcdTD = 0; - TD->OhciTransfer = (ULONG)OhciTransfer; + TD->OhciTransfer = OhciTransfer; TD->HwTD.gTD.CurrentBuffer = 0; TD->HwTD.gTD.BufferEnd = 0; @@ -1399,7 +1399,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.Padded[1] = 0; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = (ULONG)TD; + PrevTD->NextHcdTD = TD; } if (TransferParameters->TransferFlags & USBD_SHORT_TRANSFER_OK) @@ -1435,7 +1435,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, NextTD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); TD->HwTD.gTD.NextTD = NextTD->PhysicalAddress; - TD->NextHcdTD = (ULONG)NextTD; + TD->NextHcdTD = NextTD; NextTD->NextHcdTD = 0; NextTD->HwTD.gTD.NextTD = 0; @@ -1503,7 +1503,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.Padded[1] = 0; TD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; - TD->OhciTransfer = (ULONG)OhciTransfer; + TD->OhciTransfer = OhciTransfer; TD->NextHcdTD = 0; if (TransferParameters->TransferBufferLength) @@ -1533,7 +1533,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, OhciTransfer->PendingTDs++; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = (ULONG)TD; + PrevTD->NextHcdTD = TD; } while (TransferedLen < TransferParameters->TransferBufferLength); @@ -1545,7 +1545,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, PrevTD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_IMMEDIATE; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = (ULONG)TD; + PrevTD->NextHcdTD = TD; TD->HwTD.gTD.NextTD = 0; TD->NextHcdTD = 0; @@ -1630,7 +1630,7 @@ OHCI_ProcessDoneTD(IN POHCI_EXTENSION OhciExtension, DPRINT_OHCI("OHCI_ProcessDoneTD: ... \n"); - OhciTransfer = (POHCI_TRANSFER)TD->OhciTransfer; + OhciTransfer = TD->OhciTransfer; OhciEndpoint = OhciTransfer->OhciEndpoint; OhciTransfer->PendingTDs--; @@ -1735,7 +1735,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, OhciExtension, OhciEndpoint); - if (NextTD->OhciTransfer == (ULONG)OhciTransfer) + if (NextTD->OhciTransfer == OhciTransfer) { LastTD = OhciTransfer->NextTD; @@ -1748,7 +1748,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, { TD = &OhciEndpoint->FirstTD[ix]; - if (TD->OhciTransfer == (ULONG)OhciTransfer) + if (TD->OhciTransfer == OhciTransfer) { if (IsIsoEndpoint) OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); @@ -1768,10 +1768,10 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, do { - if (TD->OhciTransfer == (ULONG)ohciTransfer) + if (TD->OhciTransfer == ohciTransfer) { PrevTD = TD; - TD = (POHCI_HCD_TD)TD->NextHcdTD; + TD = TD->NextHcdTD; if (PrevTD == OhciEndpoint->HcdHeadP) OhciEndpoint->HcdHeadP = TD; @@ -1785,7 +1785,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, } else { - TD = (POHCI_HCD_TD)TD->NextHcdTD; + TD = TD->NextHcdTD; } } while (TD != NextTD); @@ -1799,7 +1799,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, while (TD != OhciEndpoint->HcdTailP) { - if (TD->OhciTransfer == (ULONG)OhciTransfer) + if (TD->OhciTransfer == OhciTransfer) { td = TD; break; @@ -1807,7 +1807,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, LastTD = TD; - TD = (POHCI_HCD_TD)TD->NextHcdTD; + TD = TD->NextHcdTD; } TD = td; @@ -1818,19 +1818,19 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, break; PrevTD = TD; - TD = (POHCI_HCD_TD)TD->NextHcdTD; + TD = TD->NextHcdTD; if (IsIsoEndpoint) OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); else OHCI_ProcessDoneTD(OhciExtension, PrevTD, FALSE); } - while (TD->OhciTransfer == (ULONG)OhciTransfer); + while (TD->OhciTransfer == OhciTransfer); - TmpTransfer = (POHCI_TRANSFER)LastTD->OhciTransfer; + TmpTransfer = LastTD->OhciTransfer; TmpTransfer->NextTD = TD; - LastTD->NextHcdTD = (ULONG)TD; + LastTD->NextHcdTD = TD; LastTD->HwTD.gTD.NextTD = TD->PhysicalAddress; } @@ -1991,7 +1991,7 @@ OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, IsResetOnHalt = (ED->Flags & OHCI_HCD_ED_FLAG_RESET_ON_HALT) != 0; DPRINT1("PollAsyncEndpoint: IsResetOnHalt %x\n", IsResetOnHalt); - for (TD = OhciEndpoint->HcdHeadP; ; TD = (POHCI_HCD_TD)TD->NextHcdTD) + for (TD = OhciEndpoint->HcdHeadP; ; TD = TD->NextHcdTD) { if (!TD) { @@ -2005,7 +2005,7 @@ OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, goto HandleDoneList; } - OhciTransfer = (POHCI_TRANSFER)TD->OhciTransfer; + OhciTransfer = TD->OhciTransfer; ConditionCode = TD->HwTD.gTD.Control.ConditionCode; DPRINT("TD - %p, ConditionCode - %X\n", TD, ConditionCode); @@ -2056,7 +2056,7 @@ OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, do { - transfer = (POHCI_TRANSFER)transfer->NextTD->OhciTransfer; + transfer = transfer->NextTD->OhciTransfer; NextTD = transfer->NextTD; } while (transfer && TransferNumber == @@ -2111,7 +2111,7 @@ ProcessListTDs: OHCI_DumpHcdTD(TD); TD->Flags |= OHCI_HCD_TD_FLAG_DONE; InsertTailList(&OhciEndpoint->TDList, &TD->DoneLink); - TD = (POHCI_HCD_TD)TD->NextHcdTD; + TD = TD->NextHcdTD; } HandleDoneList: diff --git a/drivers/usb/usbohci_new/usbohci.h b/drivers/usb/usbohci_new/usbohci.h index 8bf703e6a5..fffcb18b61 100644 --- a/drivers/usb/usbohci_new/usbohci.h +++ b/drivers/usb/usbohci_new/usbohci.h @@ -58,8 +58,8 @@ typedef struct _OHCI_HCD_TD { /* Software part */ ULONG PhysicalAddress; ULONG Flags; - ULONG OhciTransfer; - ULONG NextHcdTD; + POHCI_TRANSFER OhciTransfer; + struct _OHCI_HCD_TD *NextHcdTD; ULONG TransferLen; LIST_ENTRY DoneLink; ULONG Pad[1]; @@ -144,7 +144,7 @@ typedef struct _OHCI_EXTENSION { ULONG FrameHighPart; ULONG HcdFmNumber; POHCI_HC_RESOURCES HcResourcesVA; - POHCI_HC_RESOURCES HcResourcesPA; + ULONG HcResourcesPA; OHCI_STATIC_ED IntStaticED[63]; OHCI_STATIC_ED ControlStaticED; OHCI_STATIC_ED BulkStaticED;

1 0

01/02: [USBHUB_NEW] Fix x64 warnings.
by Thomas Faber 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dfa7356c8c05acdfd63d… commit 0dfa7356c8c05acdfd63de2102ef133095b77d3a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 1 18:01:40 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 1 18:23:14 2018 +0200 [USBHUB_NEW] Fix x64 warnings. --- drivers/usb/usbhub_new/debug.c | 6 +++--- drivers/usb/usbhub_new/ioctl.c | 6 +++--- drivers/usb/usbhub_new/pnp.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/usb/usbhub_new/debug.c b/drivers/usb/usbhub_new/debug.c index 5113a37210..55803b9a0a 100644 --- a/drivers/usb/usbhub_new/debug.c +++ b/drivers/usb/usbhub_new/debug.c @@ -112,8 +112,8 @@ NTAPI USBHUB_DumpingIDs(IN PVOID Id) { PWSTR Ptr; - ULONG Length; - ULONG TotalLength = 0; + size_t Length; + size_t TotalLength = 0; Ptr = Id; DPRINT("USBHUB_DumpingIDs:\n"); @@ -127,6 +127,6 @@ USBHUB_DumpingIDs(IN PVOID Id) TotalLength += Length; } - DPRINT("TotalLength: %hu\n", TotalLength); + DPRINT("TotalLength: %Iu\n", TotalLength); DPRINT("\n"); } diff --git a/drivers/usb/usbhub_new/ioctl.c b/drivers/usb/usbhub_new/ioctl.c index e7736b86c0..4f48c98e7d 100644 --- a/drivers/usb/usbhub_new/ioctl.c +++ b/drivers/usb/usbhub_new/ioctl.c @@ -560,12 +560,12 @@ USBH_IoctlGetNodeName(IN PUSBHUB_FDO_EXTENSION HubExtension, PUSB_NODE_CONNECTION_NAME ConnectionName; PDEVICE_OBJECT PortDevice; PUSBHUB_PORT_PDO_EXTENSION PortExtension; - ULONG LengthSkip; + size_t LengthSkip; PWCHAR Buffer; ULONG BufferLength; PWCHAR BufferEnd; - ULONG LengthReturned; - ULONG LengthName; + ULONG_PTR LengthReturned; + size_t LengthName; ULONG Length; NTSTATUS Status; PIO_STACK_LOCATION IoStack; diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub_new/pnp.c index f4377524db..16cd2b17b9 100644 --- a/drivers/usb/usbhub_new/pnp.c +++ b/drivers/usb/usbhub_new/pnp.c @@ -1558,7 +1558,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, WCHAR Buffer[200]; PWCHAR EndBuffer; size_t Remaining = sizeof(Buffer); - ULONG Length; + size_t Length; PWCHAR Id = NULL; NTSTATUS Status = STATUS_SUCCESS; PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; @@ -1855,8 +1855,8 @@ USBH_PdoQueryDeviceText(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension, PWCHAR DeviceText; UCHAR iProduct = 0; NTSTATUS Status; - ULONG NumSymbols; - ULONG Length; + size_t NumSymbols; + size_t Length; DPRINT("USBH_PdoQueryDeviceText ... \n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018