Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 56665: - Turn of debugs.
by jimtabor＠svn.reactos.org 28 May '12

28 May '12

Author: jimtabor Date: Mon May 28 04:53:13 2012 New Revision: 56665 URL: http://svn.reactos.org/svn/reactos?rev=56665&view=rev Log: - Turn of debugs. Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Mon May 28 04:53:13 2012 @@ -569,9 +569,9 @@ break; case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: - ERR("co_IntSetForegroundWindow 1 %p\n",hWnd); + TRACE("co_IntSetForegroundWindow 1 %p\n",hWnd); Ret = co_IntSetForegroundWindow(Window); - ERR("co_IntSetForegroundWindow 2 \n"); + TRACE("co_IntSetForegroundWindow 2 \n"); break; case HWNDLOCK_ROUTINE_UPDATEWINDOW:

1 0

[jimtabor] 56664: [Win32SS] - Add utility of setting and clearing the state bits from user space. Use this later. Fix build.
by jimtabor＠svn.reactos.org 28 May '12

28 May '12

Author: jimtabor Date: Mon May 28 04:51:31 2012 New Revision: 56664 URL: http://svn.reactos.org/svn/reactos?rev=56664&view=rev Log: [Win32SS] - Add utility of setting and clearing the state bits from user space. Use this later. Fix build. Modified: trunk/reactos/win32ss/user/ntuser/misc.c Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Mon May 28 04:51:31 2012 @@ -446,6 +446,48 @@ END_CLEANUP; } +VOID FASTCALL +IntSetWindowState(PWND pWnd, UINT Flag) +{ + UINT bit; + if (gptiCurrent->ppi != pWnd->head.pti->ppi) return; + bit = 1 << LOWORD(Flag); + TRACE("SWS %x\n",bit); + switch(HIWORD(Flag)) + { + case 0: + pWnd->state |= bit; + break; + case 1: + pWnd->state2 |= bit; + break; + case 2: + pWnd->ExStyle2 |= bit; + break; + } +} + +VOID FASTCALL +IntClearWindowState(PWND pWnd, UINT Flag) +{ + UINT bit; + if (gptiCurrent->ppi != pWnd->head.pti->ppi) return; + bit = 1 << LOWORD(Flag); + TRACE("CWS %x\n",bit); + switch(HIWORD(Flag)) + { + case 0: + pWnd->state &= ~bit; + break; + case 1: + pWnd->state2 &= ~bit; + break; + case 2: + pWnd->ExStyle2 &= ~bit; + break; + } +} + NTSTATUS FASTCALL IntSafeCopyUnicodeString(PUNICODE_STRING Dest, PUNICODE_STRING Source)

1 0

[jimtabor] 56663: [Win32SS] - Add utility of setting and clearing the state bits from user space. Use this later.
by jimtabor＠svn.reactos.org 28 May '12

28 May '12

Author: jimtabor Date: Mon May 28 04:49:15 2012 New Revision: 56663 URL: http://svn.reactos.org/svn/reactos?rev=56663&view=rev Log: [Win32SS] - Add utility of setting and clearing the state bits from user space. Use this later. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/user32/include/ntwrapper.h trunk/reactos/win32ss/user/user32/misc/misc.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Mon May 28 04:49:15 2012 @@ -521,6 +521,8 @@ #define WNDS_ANSICREATOR 0x20000000 #define WNDS_MAXIMIZESTOMONITOR 0x40000000 #define WNDS_DESTROYED 0x80000000 + +#define WNDSACTIVEFRAME 0x00000006 // State2 Flags !Not Implemented! #define WNDS2_WMPAINTSENT 0X00000001 Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Mon May 28 04:49:15 2012 @@ -569,9 +569,9 @@ break; case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: - TRACE("co_IntSetForegroundWindow 1 %p\n",hWnd); + ERR("co_IntSetForegroundWindow 1 %p\n",hWnd); Ret = co_IntSetForegroundWindow(Window); - TRACE("co_IntSetForegroundWindow 2 \n"); + ERR("co_IntSetForegroundWindow 2 \n"); break; case HWNDLOCK_ROUTINE_UPDATEWINDOW: @@ -749,6 +749,24 @@ UserLeave(); return 0; } + case HWNDPARAM_ROUTINE_CLEARWINDOWSTATE: + { + PWND pWnd; + UserEnterExclusive(); + pWnd = UserGetWindowObject(hWnd); + if (pWnd) IntClearWindowState(pWnd, (UINT)Param); + UserLeave(); + return 0; + } + case HWNDPARAM_ROUTINE_SETWINDOWSTATE: + { + PWND pWnd; + UserEnterExclusive(); + pWnd = UserGetWindowObject(hWnd); + if (pWnd) IntSetWindowState(pWnd, (UINT)Param); + UserLeave(); + return 0; + } } STUB; Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Mon May 28 04:49:15 2012 @@ -81,6 +81,9 @@ PVOID pvParam, UINT fWinIni); +VOID FASTCALL IntSetWindowState(PWND, UINT); +VOID FASTCALL IntClearWindowState(PWND, UINT); + /*************** MESSAGE.C ***************/ BOOL FASTCALL Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Mon May 28 04:49:15 2012 @@ -6,6 +6,8 @@ #error #endif +BOOL FASTCALL TestState(PWND, UINT); + EXTINLINE BOOL WINAPI GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) { @@ -732,6 +734,18 @@ return NtUserCallHwnd(hWnd, HWND_ROUTINE_SETMSGBOX); } +EXTINLINE VOID NtUserxClearWindowState(PWND pWnd, UINT Flag) +{ + if (!TestState(pWnd, Flag)) return; + NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_CLEARWINDOWSTATE); +} + +EXTINLINE VOID NtUserxSetWindowState(PWND pWnd, UINT Flag) +{ + if (TestState(pWnd, Flag)) return; + NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_SETWINDOWSTATE); +} + EXTINLINE HWND NtUserxSetTaskmanWindow(HWND hWnd) { return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Mon May 28 04:49:15 2012 @@ -255,6 +255,24 @@ else return (NtUserQueryWindow(Wnd->head.h, QUERY_WINDOW_UNIQUE_PROCESS_ID) == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess ); +} + +BOOL +FASTCALL +TestState(PWND pWnd, UINT Flag) +{ + UINT bit; + bit = 1 << LOWORD(Flag); + switch(HIWORD(Flag)) + { + case 0: + return (pWnd->state & bit); + case 1: + return (pWnd->state2 & bit); + case 2: + return (pWnd->ExStyle2 & bit); + } + return FALSE; } PUSER_HANDLE_ENTRY

1 0

[jimtabor] 56662: [Win32k] - Fix the remaining wine Win test_NCRedraw test. Broken since r6737. - Miscellaneous fixes and changes.
by jimtabor＠svn.reactos.org 28 May '12

28 May '12

Author: jimtabor Date: Mon May 28 03:34:04 2012 New Revision: 56662 URL: http://svn.reactos.org/svn/reactos?rev=56662&view=rev Log: [Win32k] - Fix the remaining wine Win test_NCRedraw test. Broken since r6737. - Miscellaneous fixes and changes. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Mon May 28 03:34:04 2012 @@ -223,6 +223,7 @@ if (Wnd->hrgnUpdate != NULL || Wnd->state & WNDS_INTERNALPAINT) { + Wnd->state2 |= WNDS2_WMPAINTSENT; co_IntSendMessage(hWnd, WM_PAINT, 0, 0); } } @@ -232,9 +233,7 @@ { TempRegion = IntGetNCUpdateRgn(Wnd, TRUE); Wnd->state &= ~WNDS_SENDNCPAINT; - MsqDecPaintCountQueue(Wnd->head.pti->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); - } if (Wnd->state & WNDS_SENDERASEBACKGROUND) @@ -303,10 +302,10 @@ IntInvalidateWindows(PWND Wnd, HRGN hRgn, ULONG Flags) { INT RgnType; - BOOL HadPaintMessage, HadNCPaintMessage; - BOOL HasPaintMessage, HasNCPaintMessage; + BOOL HadPaintMessage; TRACE("IntInvalidateWindows start\n"); + /* * If the nonclient is not to be redrawn, clip the region to the client * rect @@ -347,67 +346,79 @@ * Save current state of pending updates */ - HadPaintMessage = Wnd->hrgnUpdate != NULL || - Wnd->state & WNDS_INTERNALPAINT; - HadNCPaintMessage = Wnd->state & WNDS_SENDNCPAINT; + HadPaintMessage = IntIsWindowDirty(Wnd); /* * Update the region and flags */ - if (Flags & RDW_INVALIDATE && RgnType != NULLREGION) - { - if (Wnd->hrgnUpdate == NULL) - { - Wnd->hrgnUpdate = IntSysCreateRectRgn(0, 0, 0, 0); - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); - } - - if (NtGdiCombineRgn(Wnd->hrgnUpdate, Wnd->hrgnUpdate, - hRgn, RGN_OR) == NULLREGION) - { - IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Wnd->hrgnUpdate); - Wnd->hrgnUpdate = NULL; - } - - if (Flags & RDW_FRAME) - Wnd->state |= WNDS_SENDNCPAINT; - if (Flags & RDW_ERASE) - Wnd->state |= WNDS_SENDERASEBACKGROUND; - - Flags |= RDW_FRAME; - } - - if (Flags & RDW_VALIDATE && RgnType != NULLREGION) - { - if (Wnd->hrgnUpdate != NULL) - { + // The following flags are used to invalidate the window. + if (Flags & (RDW_INVALIDATE|RDW_INTERNALPAINT|RDW_ERASE|RDW_FRAME)) + { + if (Flags & RDW_INTERNALPAINT) + { + Wnd->state |= WNDS_INTERNALPAINT; + } + + if (Flags & RDW_INVALIDATE && RgnType != NULLREGION) + { + /* If not the same thread set it dirty. */ + if (Wnd->head.pti != PsGetCurrentThreadWin32Thread()) + { + Wnd->state |= WNDS_UPDATEDIRTY; + } + + if (Flags & RDW_FRAME) + Wnd->state |= WNDS_SENDNCPAINT; + if (Flags & RDW_ERASE) + Wnd->state |= WNDS_SENDERASEBACKGROUND; + + if (Wnd->hrgnUpdate == NULL) + { + Wnd->hrgnUpdate = IntSysCreateRectRgn(0, 0, 0, 0); + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_PUBLIC); + } + if (NtGdiCombineRgn(Wnd->hrgnUpdate, Wnd->hrgnUpdate, - hRgn, RGN_DIFF) == NULLREGION) + hRgn, RGN_OR) == NULLREGION) { IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Wnd->hrgnUpdate); Wnd->hrgnUpdate = NULL; } - } - - if (Wnd->hrgnUpdate == NULL) - Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - if (Flags & RDW_NOFRAME) - Wnd->state &= ~WNDS_SENDNCPAINT; - if (Flags & RDW_NOERASE) - Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); - } - - if (Flags & RDW_INTERNALPAINT) - { - Wnd->state |= WNDS_INTERNALPAINT; - } - - if (Flags & RDW_NOINTERNALPAINT) - { - Wnd->state &= ~WNDS_INTERNALPAINT; + Flags |= RDW_FRAME; // For children. + } + } // The following flags are used to validate the window. + else if (Flags & (RDW_VALIDATE|RDW_NOINTERNALPAINT|RDW_NOERASE|RDW_NOFRAME)) + { + /* FIXME: Handle WNDS_UPDATEDIRTY */ + + if (Flags & RDW_NOINTERNALPAINT) + { + Wnd->state &= ~WNDS_INTERNALPAINT; + } + + if (Flags & RDW_VALIDATE && RgnType != NULLREGION) + { + if (Flags & RDW_NOFRAME) + Wnd->state &= ~WNDS_SENDNCPAINT; + if (Flags & RDW_NOERASE) + Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + + if (Wnd->hrgnUpdate != NULL) + { + if (NtGdiCombineRgn(Wnd->hrgnUpdate, Wnd->hrgnUpdate, + hRgn, RGN_DIFF) == NULLREGION) + { + IntGdiSetRegionOwner(Wnd->hrgnUpdate, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Wnd->hrgnUpdate); + Wnd->hrgnUpdate = NULL; + } + } + + if (Wnd->hrgnUpdate == NULL) + Wnd->state &= ~(WNDS_SENDERASEBACKGROUND|WNDS_ERASEBACKGROUND); + } } /* @@ -431,7 +442,6 @@ IntInvalidateWindows(Child, hRgnTemp, Flags); GreDeleteObject(hRgnTemp); } - } } @@ -439,21 +449,9 @@ * Fake post paint messages to window message queue if needed */ - HasPaintMessage = Wnd->hrgnUpdate != NULL || - Wnd->state & WNDS_INTERNALPAINT; - HasNCPaintMessage = Wnd->state & WNDS_SENDNCPAINT; - - if (HasPaintMessage != HadPaintMessage) + if (HadPaintMessage != IntIsWindowDirty(Wnd)) { if (HadPaintMessage) - MsqDecPaintCountQueue(Wnd->head.pti->MessageQueue); - else - MsqIncPaintCountQueue(Wnd->head.pti->MessageQueue); - } - - if (HasNCPaintMessage != HadNCPaintMessage) - { - if (HadNCPaintMessage) MsqDecPaintCountQueue(Wnd->head.pti->MessageQueue); else MsqIncPaintCountQueue(Wnd->head.pti->MessageQueue); @@ -594,16 +592,16 @@ BOOL FASTCALL IntIsWindowDirty(PWND Wnd) { - return (Wnd->style & WS_VISIBLE) && - ((Wnd->hrgnUpdate != NULL) || - (Wnd->state & WNDS_INTERNALPAINT) || - (Wnd->state & WNDS_SENDNCPAINT)); -} - -HWND FASTCALL + return ( Wnd->style & WS_VISIBLE && + ( Wnd->hrgnUpdate != NULL || + Wnd->state & WNDS_INTERNALPAINT || + Wnd->state & WNDS_SENDNCPAINT ) ); +} + +PWND FASTCALL IntFindWindowToRepaint(PWND Window, PTHREADINFO Thread) { - HWND hChild; + PWND hChild; PWND TempWindow; for (; Window != NULL; Window = Window->spwndNext) @@ -621,12 +619,12 @@ IntWndBelongsToThread(TempWindow, Thread) && IntIsWindowDirty(TempWindow)) { - return TempWindow->head.h; + return TempWindow; } } } - return Window->head.h; + return Window; } if (Window->spwndChild) @@ -636,8 +634,7 @@ return hChild; } } - - return NULL; + return Window; } BOOL FASTCALL @@ -649,14 +646,20 @@ MSG *Message, BOOL Remove) { - if (!Thread->cPaintsReady) - return FALSE; + PWND PaintWnd; if ((MsgFilterMin != 0 || MsgFilterMax != 0) && (MsgFilterMin > WM_PAINT || MsgFilterMax < WM_PAINT)) return FALSE; - Message->hwnd = IntFindWindowToRepaint(UserGetDesktopWindow(), PsGetCurrentThreadWin32Thread()); + if (Thread->TIF_flags & TIF_SYSTEMTHREAD ) + { + ERR("WM_PAINT is in a System Thread!\n"); + } + + PaintWnd = IntFindWindowToRepaint(UserGetDesktopWindow(), Thread); + + Message->hwnd = PaintWnd ? UserHMGetHandle(PaintWnd) : NULL; if (Message->hwnd == NULL) { @@ -666,12 +669,19 @@ return FALSE; } - if (Window != NULL && Message->hwnd != Window->head.h) + if (Window != NULL && PaintWnd != Window) return FALSE; + if (PaintWnd->state & WNDS_INTERNALPAINT) + { + PaintWnd->state &= ~WNDS_INTERNALPAINT; + if (!PaintWnd->hrgnUpdate) + MsqDecPaintCountQueue(Thread->MessageQueue); + } + PaintWnd->state2 &= ~WNDS2_WMPAINTSENT; + PaintWnd->state &= ~WNDS_UPDATEDIRTY; + Message->wParam = Message->lParam = 0; Message->message = WM_PAINT; - Message->wParam = Message->lParam = 0; - return TRUE; } @@ -831,19 +841,26 @@ co_UserHideCaret(Window); + Window->state2 |= WNDS2_STARTPAINT; + Window->state &= ~WNDS_PAINTNOTPROCESSED; + if (Window->state & WNDS_SENDNCPAINT) { HRGN hRgn; + Window->state &= ~WNDS_UPDATEDIRTY; hRgn = IntGetNCUpdateRgn(Window, FALSE); Window->state &= ~WNDS_SENDNCPAINT; - MsqDecPaintCountQueue(Window->head.pti->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); if (hRgn != HRGN_WINDOW && hRgn != NULL && GreIsHandleValid(hRgn)) { /* NOTE: The region can already by deleted! */ GreDeleteObject(hRgn); } + } + else + { + Window->state &= ~WNDS_UPDATEDIRTY; } RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); @@ -894,6 +911,7 @@ PWND Child; for (Child = Window->spwndChild; Child; Child = Child->spwndNext) { + if (Child->hrgnUpdate == NULL && Child->state & WNDS_SENDNCPAINT) // Helped fixing test_redrawnow. IntInvalidateWindows(Child, Window->hrgnUpdate, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); } } @@ -958,6 +976,8 @@ UserReleaseDC(Window, hdc, TRUE); + Window->state2 &= ~(WNDS2_WMPAINTSENT|WNDS2_STARTPAINT); + UserRefObjectCo(Window, &Ref); co_UserShowCaret(Window); UserDerefObjectCo(Window); @@ -1019,6 +1039,8 @@ RECTL Rect; ASSERT_REFS_CO(Window); + + Window->state &= ~WNDS_UPDATEDIRTY; if (Window->hrgnUpdate == NULL) { @@ -1100,6 +1122,8 @@ { RETURN(FALSE); } + + Window->state &= ~WNDS_UPDATEDIRTY; if (Window->hrgnUpdate == NULL) { @@ -1974,8 +1998,13 @@ if (hwnd) { - Window = UserGetWindowObject(hwnd); - // TODO: Add Desktop and MessageBox check via FNID's. + if (!(Window = UserGetWindowObject(hwnd)) || // FIXME: + Window == UserGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Window == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + goto Exit; + } + if ( Window ) { /* Validate flags and check it as a mask for 0 or 1. */ @@ -1985,7 +2014,7 @@ EngSetLastError(ERROR_INVALID_PARAMETER); } } - +Exit: UserLeave(); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Mon May 28 03:34:04 2012 @@ -7,3 +7,4 @@ INT FASTCALL co_UserGetUpdateRgn(PWND, HRGN, BOOL); VOID FASTCALL co_IntPaintWindows(PWND Window, ULONG Flags, BOOL Recurse); BOOL FASTCALL IntValidateParent(PWND Child, HRGN hValidateRgn, BOOL Recurse); +BOOL FASTCALL IntIsWindowDirty(PWND);

1 0

[ekohl] 56661: [SAMLIB] - Implement SamCloseHandle, SamConnect and SamOpenDomain. [SAMSRV] - Implement SamrCloseHandle, SamrConnect and SamrOpenDomain. - Start the SAM RPC Server.
by ekohl＠svn.reactos.org 27 May '12

27 May '12

Author: ekohl Date: Sun May 27 05:33:07 2012 New Revision: 56661 URL: http://svn.reactos.org/svn/reactos?rev=56661&view=rev Log: [SAMLIB] - Implement SamCloseHandle, SamConnect and SamOpenDomain. [SAMSRV] - Implement SamrCloseHandle, SamrConnect and SamrOpenDomain. - Start the SAM RPC Server. Added: trunk/reactos/dll/win32/samsrv/database.c (with props) Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun May 27 05:33:07 2012 @@ -387,7 +387,21 @@ NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("SamCloseHandle(%p)\n", SamHandle); + + RpcTryExcept + { + Status = SamrCloseHandle((SAMPR_HANDLE *)&SamHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } NTSTATUS @@ -397,7 +411,52 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("SamConnect(%p,%p,0x%08x,%p)\n", + ServerName, ServerHandle, DesiredAccess, ObjectAttributes); + + RpcTryExcept + { + Status = SamrConnect((PSAMPR_SERVER_NAME)ServerName, + (SAMPR_HANDLE *)ServerHandle, + DesiredAccess); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + +NTSTATUS +NTAPI +SamOpenDomain(IN SAM_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN PSID DomainId, + OUT PSAM_HANDLE DomainHandle) +{ + NTSTATUS Status; + + TRACE("SamOpenDomain(%p,0x%08x,%p,%p)\n", + ServerHandle, DesiredAccess, DomainId, DomainHandle); + + RpcTryExcept + { + Status = SamrOpenDomain((SAMPR_HANDLE)ServerHandle, + DesiredAccess, + (PRPC_SID)DomainId, + (SAMPR_HANDLE *)DomainHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } NTSTATUS Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun May 27 05:33:07 2012 @@ -29,7 +29,7 @@ @ stub SamLookupIdsInDomain @ stub SamLookupNamesInDomain @ stub SamOpenAlias -@ stub SamOpenDomain +@ stdcall SamOpenDomain(ptr long ptr ptr) @ stub SamOpenGroup @ stub SamOpenUser @ stub SamQueryDisplayInformation Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sun May 27 05:33:07 2012 @@ -8,6 +8,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + database.c samrpc.c samsrv.c setup.c Added: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c (added) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sun May 27 05:33:07 2012 @@ -1,0 +1,672 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/database.c + * PURPOSE: SAM object database + * COPYRIGHT: Copyright 2012 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* GLOBALS *****************************************************************/ + +static HANDLE SamKeyHandle = NULL; + + +/* FUNCTIONS ***************************************************************/ + +static NTSTATUS +SampOpenSamKey(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SAM"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = RtlpNtOpenKey(&SamKeyHandle, + KEY_READ | KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes, + 0); + + return Status; +} + +#if 0 +static BOOLEAN +LsapIsDatabaseInstalled(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE KeyHandle; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + L"Policy"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SecurityKeyHandle, + NULL); + + Status = RtlpNtOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes, + 0); + if (!NT_SUCCESS(Status)) + return FALSE; + + NtClose(KeyHandle); + + return TRUE; +} + + +static NTSTATUS +LsapCreateDatabaseKeys(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE PolicyKeyHandle = NULL; + HANDLE AccountsKeyHandle = NULL; + HANDLE DomainsKeyHandle = NULL; + HANDLE SecretsKeyHandle = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsapInstallDatabase()\n"); + + /* Create the 'Policy' key */ + RtlInitUnicodeString(&KeyName, + L"Policy"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SecurityKeyHandle, + NULL); + + Status = NtCreateKey(&PolicyKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Policy' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Accounts' key */ + RtlInitUnicodeString(&KeyName, + L"Accounts"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&AccountsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Accounts' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Domains' key */ + RtlInitUnicodeString(&KeyName, + L"Domains"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&DomainsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Domains' key (Status: 0x%08lx)\n", Status); + goto Done; + } + + /* Create the 'Secrets' key */ + RtlInitUnicodeString(&KeyName, + L"Secrets"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + PolicyKeyHandle, + NULL); + + Status = NtCreateKey(&SecretsKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the 'Secrets' key (Status: 0x%08lx)\n", Status); + goto Done; + } + +Done: + if (SecretsKeyHandle != NULL) + NtClose(SecretsKeyHandle); + + if (DomainsKeyHandle != NULL) + NtClose(DomainsKeyHandle); + + if (AccountsKeyHandle != NULL) + NtClose(AccountsKeyHandle); + + if (PolicyKeyHandle != NULL) + NtClose(PolicyKeyHandle); + + TRACE("LsapInstallDatabase() done (Status: 0x%08lx)\n", Status); + + return Status; +} + + +static NTSTATUS +LsapCreateDatabaseObjects(VOID) +{ + PLSA_DB_OBJECT PolicyObject; + NTSTATUS Status; + + /* Open the 'Policy' object */ + Status = LsapOpenDbObject(NULL, + L"Policy", + LsaDbPolicyObject, + 0, + &PolicyObject); + if (!NT_SUCCESS(Status)) + return Status; + + LsapSetObjectAttribute(PolicyObject, + L"PolPrDmN", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolPrDmS", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolAcDmN", + NULL, + 0); + + LsapSetObjectAttribute(PolicyObject, + L"PolAcDmS", + NULL, + 0); + + /* Close the 'Policy' object */ + LsapCloseDbObject(PolicyObject); + + return STATUS_SUCCESS; +} + + +static NTSTATUS +LsapUpdateDatabase(VOID) +{ + return STATUS_SUCCESS; +} +#endif + + +NTSTATUS +SampInitDatabase(VOID) +{ + NTSTATUS Status; + + TRACE("SampInitDatabase()\n"); + + Status = SampOpenSamKey(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open the SAM key (Status: 0x%08lx)\n", Status); + return Status; + } + +#if 0 + if (!LsapIsDatabaseInstalled()) + { + Status = LsapCreateDatabaseKeys(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the LSA database keys (Status: 0x%08lx)\n", Status); + return Status; + } + + Status = LsapCreateDatabaseObjects(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to create the LSA database objects (Status: 0x%08lx)\n", Status); + return Status; + } + } + else + { + Status = LsapUpdateDatabase(); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to update the LSA database (Status: 0x%08lx)\n", Status); + return Status; + } + } +#endif + + TRACE("SampInitDatabase() done\n"); + + return STATUS_SUCCESS; +} + + +NTSTATUS +SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, + IN LPWSTR ObjectName, + IN SAM_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *DbObject) +{ + PSAM_DB_OBJECT NewObject; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ParentKeyHandle; + HANDLE ObjectKeyHandle; + NTSTATUS Status; + + if (DbObject == NULL) + return STATUS_INVALID_PARAMETER; + + if (ParentObject == NULL) + ParentKeyHandle = SamKeyHandle; + else + ParentKeyHandle = ParentObject->KeyHandle; + + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + NewObject = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(SAM_DB_OBJECT)); + if (NewObject == NULL) + { + NtClose(ObjectKeyHandle); + return STATUS_NO_MEMORY; + } + + NewObject->Signature = SAMP_DB_SIGNATURE; + NewObject->RefCount = 1; + NewObject->ObjectType = ObjectType; + NewObject->Access = DesiredAccess; + NewObject->KeyHandle = ObjectKeyHandle; + NewObject->ParentObject = ParentObject; + + if (ParentObject != NULL) + ParentObject->RefCount++; + + *DbObject = NewObject; + + return STATUS_SUCCESS; +} + + +NTSTATUS +SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, + IN LPWSTR ObjectName, + IN SAM_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *DbObject) +{ + PSAM_DB_OBJECT NewObject; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE ParentKeyHandle; + HANDLE ContainerKeyHandle = NULL; + HANDLE ObjectKeyHandle; + NTSTATUS Status; + + if (DbObject == NULL) + return STATUS_INVALID_PARAMETER; + + if (ParentObject == NULL) + ParentKeyHandle = SamKeyHandle; + else + ParentKeyHandle = ParentObject->KeyHandle; + + if (ContainerName != NULL) + { + /* Open the container key */ + RtlInitUnicodeString(&KeyName, + ContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + + NtClose(ContainerKeyHandle); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + NewObject = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(SAM_DB_OBJECT)); + if (NewObject == NULL) + { + NtClose(ObjectKeyHandle); + return STATUS_NO_MEMORY; + } + + NewObject->Signature = SAMP_DB_SIGNATURE; + NewObject->RefCount = 1; + NewObject->ObjectType = ObjectType; + NewObject->Access = DesiredAccess; + NewObject->KeyHandle = ObjectKeyHandle; + NewObject->ParentObject = ParentObject; + + if (ParentObject != NULL) + ParentObject->RefCount++; + + *DbObject = NewObject; + + return STATUS_SUCCESS; +} + + +NTSTATUS +SampValidateDbObject(SAMPR_HANDLE Handle, + SAM_DB_OBJECT_TYPE ObjectType, + ACCESS_MASK DesiredAccess, + PSAM_DB_OBJECT *DbObject) +{ + PSAM_DB_OBJECT LocalObject = (PSAM_DB_OBJECT)Handle; + BOOLEAN bValid = FALSE; + + _SEH2_TRY + { + if (LocalObject->Signature == SAMP_DB_SIGNATURE) + { + if ((ObjectType == SamDbIgnoreObject) || + (LocalObject->ObjectType == ObjectType)) + bValid = TRUE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bValid = FALSE; + } + _SEH2_END; + + if (bValid == FALSE) + return STATUS_INVALID_HANDLE; + + if (DesiredAccess != 0) + { + /* Check for granted access rights */ + if ((LocalObject->Access & DesiredAccess) != DesiredAccess) + { + ERR("SampValidateDbObject access check failed %08lx %08lx\n", + LocalObject->Access, DesiredAccess); + return STATUS_ACCESS_DENIED; + } + } + + if (DbObject != NULL) + *DbObject = LocalObject; + + return STATUS_SUCCESS; +} + + +NTSTATUS +SampCloseDbObject(PSAM_DB_OBJECT DbObject) +{ + PSAM_DB_OBJECT ParentObject = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DbObject->RefCount--; + + if (DbObject->RefCount > 0) + return STATUS_SUCCESS; + + if (DbObject->KeyHandle != NULL) + NtClose(DbObject->KeyHandle); + + if (DbObject->ParentObject != NULL) + ParentObject = DbObject->ParentObject; + + RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); + + if (ParentObject != NULL) + { + ParentObject->RefCount--; + + if (ParentObject->RefCount == 0) + Status = SampCloseDbObject(ParentObject); + } + + return Status; +} + + +#if 0 +NTSTATUS +LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + ULONG AttributeSize) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE AttributeKey; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + AttributeName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DbObject->KeyHandle, + NULL); + + Status = NtCreateKey(&AttributeKey, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + + return Status; + } + + Status = RtlpNtSetValueKey(AttributeKey, + REG_NONE, + AttributeData, + AttributeSize); + + NtClose(AttributeKey); + + return Status; +} + + +NTSTATUS +LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject, + LPWSTR AttributeName, + LPVOID AttributeData, + PULONG AttributeSize) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE AttributeKey; + ULONG ValueSize; + NTSTATUS Status; + + RtlInitUnicodeString(&KeyName, + AttributeName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + DbObject->KeyHandle, + NULL); + + Status = NtOpenKey(&AttributeKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + ValueSize = *AttributeSize; + Status = RtlpNtQueryValueKey(AttributeKey, + NULL, + NULL, + &ValueSize, + 0); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + goto Done; + } + + if (AttributeData == NULL || *AttributeSize == 0) + { + *AttributeSize = ValueSize; + Status = STATUS_SUCCESS; + goto Done; + } + else if (*AttributeSize < ValueSize) + { + *AttributeSize = ValueSize; + Status = STATUS_BUFFER_OVERFLOW; + goto Done; + } + + Status = RtlpNtQueryValueKey(AttributeKey, + NULL, + AttributeData, + &ValueSize, + 0); + if (NT_SUCCESS(Status)) + { + *AttributeSize = ValueSize; + } + +Done: + NtClose(AttributeKey); + + return Status; +} +#endif + +/* EOF */ + Propchange: trunk/reactos/dll/win32/samsrv/database.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/database.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun May 27 05:33:07 2012 @@ -13,8 +13,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); +/* GLOBALS ********************************************************************/ + +static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; /* FUNCTIONS ***************************************************************/ + +VOID +SampStartRpcServer(VOID) +{ + RPC_STATUS Status; + + TRACE("SampStartRpcServer() called\n"); + + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 10, + L"\\pipe\\samr", + NULL); + if (Status != RPC_S_OK) + { + WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerRegisterIf(samr_v1_0_s_ifspec, + NULL, + NULL); + if (Status != RPC_S_OK) + { + WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + WARN("RpcServerListen() failed (Status %lx)\n", Status); + return; + } + + TRACE("SampStartRpcServer() done\n"); +} + void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { @@ -38,8 +78,24 @@ OUT SAMPR_HANDLE *ServerHandle, IN ACCESS_MASK DesiredAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("SamrConnect(%p %p %lx)\n", + ServerName, ServerHandle, DesiredAccess); + + Status = SampOpenDbObject(NULL, + NULL, + L"SAM", + SamDbServerObject, + DesiredAccess, + &ServerObject); + if (NT_SUCCESS(Status)) + *ServerHandle = (SAMPR_HANDLE)ServerObject; + + TRACE("SamrConnect done (Status 0x%08lx)\n", Status); + + return Status; } /* Function 1 */ @@ -47,8 +103,24 @@ NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DbObject; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrCloseHandle(%p)\n", SamHandle); + + Status = SampValidateDbObject(*SamHandle, + SamDbIgnoreObject, + 0, + &DbObject); + if (Status == STATUS_SUCCESS) + { + Status = SampCloseDbObject(DbObject); + *SamHandle = NULL; + } + + TRACE("SamrCloseHandle done (Status 0x%08lx)\n", Status); + + return Status; } /* Function 2 */ @@ -114,8 +186,67 @@ IN PRPC_SID DomainId, OUT SAMPR_HANDLE *DomainHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + PSAM_DB_OBJECT DomainObject; + NTSTATUS Status; + + TRACE("SamrOpenDomain(%p %lx %p %p)\n", + ServerHandle, DesiredAccess, DomainId, DomainHandle); + + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_LOOKUP_DOMAIN, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* Validate the Domain SID */ + if ((DomainId->Revision != SID_REVISION) || + (DomainId->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES) || + (memcmp(&DomainId->IdentifierAuthority, &NtSidAuthority, sizeof(SID_IDENTIFIER_AUTHORITY)) != 0)) + return STATUS_INVALID_PARAMETER; + + /* Open the domain object */ + if ((DomainId->SubAuthorityCount == 1) && + (DomainId->SubAuthority[0] == SECURITY_BUILTIN_DOMAIN_RID)) + { + /* Builtin domain object */ + TRACE("Opening the builtin domain object.\n"); + + Status = SampOpenDbObject(ServerObject, + L"Domains", + L"Builtin", + SamDbServerObject, + DesiredAccess, + &DomainObject); + } + else if ((DomainId->SubAuthorityCount == 4) && + (DomainId->SubAuthority[0] == SECURITY_NT_NON_UNIQUE)) + { + /* Account domain object */ + TRACE("Opening the account domain object.\n"); + + /* FIXME: Check the account domain sub authorities!!! */ + + Status = SampOpenDbObject(ServerObject, + L"Domains", + L"Account", + SamDbServerObject, + DesiredAccess, + &DomainObject); + } + else + { + /* No vaild domain SID */ + Status = STATUS_INVALID_PARAMETER; + } + + if (NT_SUCCESS(Status)) + *DomainHandle = (SAMPR_HANDLE)DomainObject; + + TRACE("SamrOpenDomain done (Status 0x%08lx)\n", Status); + + return Status; } /* Function 8 */ @@ -168,7 +299,7 @@ /* Function 12 */ NTSTATUS -__stdcall +NTAPI SamrCreateUserInDomain(IN SAMPR_HANDLE DomainHandle, IN PRPC_UNICODE_STRING Name, IN ACCESS_MASK DesiredAccess, @@ -181,7 +312,7 @@ /* Function 13 */ NTSTATUS -__stdcall +NTAPI SamrEnumerateUsersInDomain(IN SAMPR_HANDLE DomainHandle, IN OUT unsigned long *EnumerationContext, IN unsigned long UserAccountControl, @@ -195,7 +326,7 @@ /* Function 14 */ NTSTATUS -__stdcall +NTAPI SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, IN PRPC_UNICODE_STRING AccountName, IN ACCESS_MASK DesiredAccess, @@ -208,7 +339,7 @@ /* Function 15 */ NTSTATUS -__stdcall +NTAPI SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, IN OUT unsigned long *EnumerationContext, OUT PSAMPR_ENUMERATION_BUFFER *Buffer, @@ -221,7 +352,7 @@ /* Function 16 */ NTSTATUS -__stdcall +NTAPI SamrGetAliasMembership(IN SAMPR_HANDLE DomainHandle, IN PSAMPR_PSID_ARRAY SidArray, OUT PSAMPR_ULONG_ARRAY Membership) @@ -232,7 +363,7 @@ /* Function 17 */ NTSTATUS -__stdcall +NTAPI SamrLookupNamesInDomain(IN SAMPR_HANDLE DomainHandle, IN unsigned long Count, IN RPC_UNICODE_STRING Names[], @@ -245,7 +376,7 @@ /* Function 18 */ NTSTATUS -__stdcall +NTAPI SamrLookupIdsInDomain(IN SAMPR_HANDLE DomainHandle, IN unsigned long Count, IN unsigned long *RelativeIds, @@ -258,7 +389,7 @@ /* Function 19 */ NTSTATUS -__stdcall +NTAPI SamrOpenGroup(IN SAMPR_HANDLE DomainHandle, IN ACCESS_MASK DesiredAccess, IN unsigned long GroupId, @@ -270,7 +401,7 @@ /* Function 20 */ NTSTATUS -__stdcall +NTAPI SamrQueryInformationGroup(IN SAMPR_HANDLE GroupHandle, IN GROUP_INFORMATION_CLASS GroupInformationClass, OUT PSAMPR_GROUP_INFO_BUFFER *Buffer) @@ -281,7 +412,7 @@ /* Function 21 */ NTSTATUS -__stdcall +NTAPI SamrSetInformationGroup(IN SAMPR_HANDLE GroupHandle, IN GROUP_INFORMATION_CLASS GroupInformationClass, IN PSAMPR_GROUP_INFO_BUFFER Buffer) Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun May 27 05:33:07 2012 @@ -34,8 +34,19 @@ TRACE("SamIInitialize() called\n"); if (SampIsSetupRunning()) + { Status = SampInitializeRegistry(); + if (!NT_SUCCESS(Status)) + return Status; + } + /* Initialize the SAM database */ + Status = SampInitDatabase(); + if (!NT_SUCCESS(Status)) + return Status; + + /* Start the RPC server */ + SampStartRpcServer(); return Status; } Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun May 27 05:33:07 2012 @@ -10,7 +10,11 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <ndk/umtypes.h> +#include <ddk/ntsam.h> #include <samsrv/samsrv.h> @@ -18,6 +22,61 @@ #include <wine/debug.h> +typedef enum _SAM_DB_OBJECT_TYPE +{ + SamDbIgnoreObject, + SamDbContainerObject, + SamDbServerObject, + SamDbDomainObject, + SamDbAliasObject, + SamDbGroupObject, + SamDbUserObject +} SAM_DB_OBJECT_TYPE; + +typedef struct _SAM_DB_OBJECT +{ + ULONG Signature; + SAM_DB_OBJECT_TYPE ObjectType; + ULONG RefCount; + ACCESS_MASK Access; + HANDLE KeyHandle; + struct _SAM_DB_OBJECT *ParentObject; +} SAM_DB_OBJECT, *PSAM_DB_OBJECT; + +#define SAMP_DB_SIGNATURE 0x87654321 + +/* database.c */ + +NTSTATUS +SampInitDatabase(VOID); + +NTSTATUS +SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, + IN LPWSTR ObjectName, + IN SAM_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *DbObject); + +NTSTATUS +SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, + IN LPWSTR ObjectName, + IN SAM_DB_OBJECT_TYPE ObjectType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *DbObject); + +NTSTATUS +SampValidateDbObject(SAMPR_HANDLE Handle, + SAM_DB_OBJECT_TYPE ObjectType, + ACCESS_MASK DesiredAccess, + PSAM_DB_OBJECT *DbObject); + +NTSTATUS +SampCloseDbObject(PSAM_DB_OBJECT DbObject); + +/* samspc.c */ +VOID SampStartRpcServer(VOID); /* setup.c */ BOOL SampIsSetupRunning(VOID); Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun May 27 05:33:07 2012 @@ -5,6 +5,14 @@ #ifdef __cplusplus extern "C" { #endif + +#define SAM_SERVER_CONNECT 1 +#define SAM_SERVER_SHUTDOWN 2 +#define SAM_SERVER_INITIALIZE 4 +#define SAM_SERVER_CREATE_DOMAIN 8 +#define SAM_SERVER_ENUMERATE_DOMAINS 16 +#define SAM_SERVER_LOOKUP_DOMAIN 32 + typedef PVOID SAM_HANDLE, *PSAM_HANDLE; @@ -21,6 +29,21 @@ NTSTATUS NTAPI +SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE UserHandle, + OUT PULONG RelativeId); + +NTSTATUS +NTAPI +SamOpenDomain(IN SAM_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN PSID DomainId, + OUT PSAM_HANDLE DomainHandle); + +NTSTATUS +NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle);

1 0

[tfaber] 56660: [LIBUSB] - Implement URB_FUNCTION_VENDOR_DEVICE - Sensibly handle unknown requests in HandleClassDevice - DPRINT fixes
by tfaber＠svn.reactos.org 26 May '12

26 May '12

Author: tfaber Date: Sat May 26 17:19:41 2012 New Revision: 56660 URL: http://svn.reactos.org/svn/reactos?rev=56660&view=rev Log: [LIBUSB] - Implement URB_FUNCTION_VENDOR_DEVICE - Sensibly handle unknown requests in HandleClassDevice - DPRINT fixes Modified: trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat May 26 17:19:41 2012 @@ -27,7 +27,7 @@ // Get the original Irp // OriginalIrp = (PIRP)Context; - + // // Update it to match what was returned for the IRP that was passed to RootHub // @@ -224,7 +224,7 @@ // Urb = (PURB)Stack->Parameters.Others.Argument1; ASSERT(Urb); - + // // Set the real device handle // @@ -274,10 +274,13 @@ } */ break; - + } case URB_FUNCTION_CLASS_INTERFACE: DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + break; + case URB_FUNCTION_VENDOR_DEVICE: + DPRINT1("URB_FUNCTION_VENDOR_DEVICE\n"); break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); @@ -323,11 +326,11 @@ *PortStatusBits += (((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)) + (((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); - + } } } - + DPRINT1("Arg1 %x\n", *PortStatusBits); Status = STATUS_SUCCESS; break; @@ -609,7 +612,7 @@ case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); - + Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; break; Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat May 26 17:19:41 2012 @@ -69,6 +69,7 @@ NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleVendorDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClearStall(IN OUT PIRP Irp, PURB Urb); @@ -94,7 +95,7 @@ PDEVICE_OBJECT m_HubControllerDeviceObject; PDRIVER_OBJECT m_DriverObject; - PVOID m_HubCallbackContext; + PVOID m_HubCallbackContext; PRH_INIT_CALLBACK m_HubCallbackRoutine; USB_DEVICE_DESCRIPTOR m_DeviceDescriptor; @@ -433,7 +434,7 @@ { DPRINT("[USBLIB] HandlePnp IRP_MN_START_DEVICE\n"); // - // register device interface + // register device interface // Status = SetDeviceInterface(TRUE); break; @@ -776,7 +777,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleIsochronousTransfer( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { PUSBDEVICE UsbDevice; @@ -825,7 +826,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleBulkOrInterruptTransfer( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { PUSBDEVICE UsbDevice; @@ -889,7 +890,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleClassOther( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { NTSTATUS Status = STATUS_NOT_IMPLEMENTED; @@ -1032,7 +1033,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleSelectConfiguration( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { PUSBDEVICE UsbDevice; @@ -1110,7 +1111,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleSelectInterface( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { PUSBDEVICE UsbDevice; @@ -1160,7 +1161,7 @@ //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleGetStatusFromDevice( - IN OUT PIRP Irp, + IN OUT PIRP Irp, PURB Urb) { PUSHORT DeviceStatus; @@ -1381,7 +1382,52 @@ break; } default: - DPRINT1("[USBLIB] HandleClassDevice Type %x not implemented\n", Urb->UrbControlVendorClassRequest.Request); + { + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + // + // generate setup packet + // + CtrlSetup.bmRequestType.B = 0; + CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; + CtrlSetup.bmRequestType._BM.Type = BMREQUEST_CLASS; + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) + { + // + // data direction is device to host + // + CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; + } + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + + break; + } } return Status; @@ -1740,6 +1786,70 @@ return Status; } +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleVendorDevice( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + + DPRINT("CHubController::HandleVendorDevice Request %x\n", Urb->UrbControlVendorClassRequest.Request); + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("[USBLIB] HandleVendorDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0; + CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; + CtrlSetup.bmRequestType._BM.Type = BMREQUEST_VENDOR; + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + if (Urb->UrbControlVendorClassRequest.TransferFlags & USBD_TRANSFER_DIRECTION_IN) + { + // + // data direction is device to host + // + CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; + } + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(NT_SUCCESS(Status)); + + return Status; +} + +//----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleSyncResetAndClearStall( IN OUT PIRP Irp, @@ -1780,7 +1890,7 @@ // DPRINT1("[USBLIB] failed to reset pipe %x\n", Status); } - + // // get endpoint descriptor @@ -1812,6 +1922,7 @@ return Status; } +//----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleAbortPipe( IN OUT PIRP Irp, @@ -2098,6 +2209,9 @@ case URB_FUNCTION_CLASS_ENDPOINT: Status = HandleClassEndpoint(Irp, Urb); break; + case URB_FUNCTION_VENDOR_DEVICE: + Status = HandleVendorDevice(Irp, Urb); + break; default: DPRINT1("[USBLIB] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); break; @@ -2167,7 +2281,7 @@ // // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver - // requests this ioctl to deliver the number of presents. + // requests this ioctl to deliver the number of presents. if (IoStack->Parameters.Others.Argument1) { @@ -3097,7 +3211,7 @@ // // sanity checks - // + // PC_ASSERT(HubInformationBuffer); PC_ASSERT(HubInformationBufferLength == sizeof(USB_EXTHUB_INFORMATION_0)); PC_ASSERT(LengthReturned); @@ -3427,8 +3541,8 @@ NTSTATUS USB_BUSIFFN USBDI_EnumLogEntry( - PVOID BusContext, - ULONG DriverTag, + PVOID BusContext, + ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev… ============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sat May 26 17:19:41 2012 @@ -76,7 +76,7 @@ LONG m_Ref; PHUBCONTROLLER m_HubController; PUSBHARDWAREDEVICE m_Device; - PVOID m_Parent; + PVOID m_Parent; ULONG m_Port; UCHAR m_DeviceAddress; PVOID m_Data; @@ -103,9 +103,9 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::Initialize( - IN PHUBCONTROLLER HubController, - IN PUSBHARDWAREDEVICE Device, - IN PVOID Parent, + IN PHUBCONTROLLER HubController, + IN PUSBHARDWAREDEVICE Device, + IN PVOID Parent, IN ULONG Port, IN ULONG PortStatus) { @@ -309,7 +309,7 @@ UCHAR OldAddress; UCHAR Index; - DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); + DPRINT1("CUSBDevice::SetDeviceAddress> Address %x\n", DeviceAddress); CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBLIB); if (!CtrlSetup) @@ -332,7 +332,7 @@ if (!NT_SUCCESS(Status)) { // failed to set device address - DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %x Address %x\n", Status, DeviceAddress); + DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %lx Address %x\n", Status, DeviceAddress); return Status; } @@ -349,7 +349,7 @@ Status = CreateDeviceDescriptor(); if (!NT_SUCCESS(Status)) { - DPRINT1("CUSBbDevice::SetDeviceAddress> failed to retrieve device descriptor with device address set Error %x\n", Status); + DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve device descriptor with device address set Error %lx\n", Status); // return error status return Status; } @@ -360,7 +360,7 @@ m_DeviceDescriptor.bNumConfigurations == 0) { // failed to retrieve device descriptor - DPRINT1("CUSBbDevice::SetDeviceAddress> device returned bogus device descriptor\n"); + DPRINT1("CUSBDevice::SetDeviceAddress> device returned bogus device descriptor\n"); DumpDeviceDescriptor(&m_DeviceDescriptor); // return error status @@ -430,7 +430,7 @@ // // no queue, wtf? // - DPRINT1("CUSBDevice::CommitUrb> no queue / dma !!!\n"); + DPRINT1("CUSBDevice::CommitIrp> no queue / dma !!!\n"); return STATUS_UNSUCCESSFUL; } @@ -443,7 +443,7 @@ // // failed to build request // - DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + DPRINT1("CUSBDevice::CommitIrp> CreateUSBRequest failed with %lx\n", Status); return Status; } @@ -466,7 +466,7 @@ // // failed to add request // - DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + DPRINT1("CUSBDevice::CommitIrp> failed add request to queue with %lx\n", Status); Request->Release(); return Status; } @@ -502,12 +502,13 @@ return Status; } + //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::CommitSetupPacket( IN PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, - IN ULONG BufferLength, + IN ULONG BufferLength, IN OUT PMDL Mdl) { NTSTATUS Status; @@ -669,7 +670,7 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::GetConfigurationDescriptor( - IN UCHAR ConfigurationIndex, + IN UCHAR ConfigurationIndex, IN USHORT BufferSize, IN PVOID Buffer) { @@ -873,8 +874,8 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::SubmitSetupPacket( - IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, - IN OUT ULONG BufferLength, + IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, + IN OUT ULONG BufferLength, OUT PVOID Buffer) { NTSTATUS Status; @@ -965,7 +966,7 @@ if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { // bogus configuration descriptor - DPRINT1("[USBEHCI] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, + DPRINT1("[USBLIB] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); // failed @@ -1037,7 +1038,7 @@ if (!Found) { - DPRINT1("[USBUHCI] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("[USBLIB] invalid configuration value %lu\n", ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } @@ -1059,13 +1060,13 @@ if (!ConfigurationDescriptor) { // unconfigure request - DPRINT1("CUsbDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); + DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); m_ConfigurationIndex = 0; return Status; } // informal debug print - DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationIndex, m_ConfigurationIndex, Status); + DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationIndex, m_ConfigurationIndex, Status); if (!NT_SUCCESS(Status)) { // @@ -1161,7 +1162,7 @@ if (!Found) { // invalid handle passed - DPRINT1("[USBEHCI] Invalid configuration handle passed %p\n", ConfigurationHandle); + DPRINT1("[USBLIB] Invalid configuration handle passed %p\n", ConfigurationHandle); return STATUS_INVALID_PARAMETER; }

1 0

[jimtabor] 56659: - Silence debug traces, SMWCB is the one to tracked.
by jimtabor＠svn.reactos.org 25 May '12

25 May '12

Author: jimtabor Date: Fri May 25 20:27:47 2012 New Revision: 56659 URL: http://svn.reactos.org/svn/reactos?rev=56659&view=rev Log: - Silence debug traces, SMWCB is the one to tracked. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri May 25 20:27:47 2012 @@ -601,7 +601,7 @@ pWnd == UserGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND return 0; - ERR("Internal Event Msg %p\n",msg); + TRACE("Internal Event Msg %p\n",msg); switch(msg) { @@ -1257,7 +1257,7 @@ if (Msg & 0x80000000) { - ERR("SMTS: Internal Message!\n"); + TRACE("SMTS: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); if (uResult) *uResult = Result; RETURN( TRUE);

1 0

[jimtabor] 56658: [Win32k] - Fix the remaining wine Win test_SetFocus to does.
by jimtabor＠svn.reactos.org 25 May '12

25 May '12

Author: jimtabor Date: Fri May 25 19:52:24 2012 New Revision: 56658 URL: http://svn.reactos.org/svn/reactos?rev=56658&view=rev Log: [Win32k] - Fix the remaining wine Win test_SetFocus to does. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri May 25 19:52:24 2012 @@ -1711,7 +1711,7 @@ } } - if (!(WinPos.flags & SWP_NOACTIVATE))//(SWP_NOACTIVATE|SWP_HIDEWINDOW))) + if (!(WinPos.flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW))) { if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) { @@ -1848,6 +1848,15 @@ Swp |= SWP_NOACTIVATE; if (!(style & WS_MINIMIZE)) { + // Fix wine Win test_SetFocus todo #1 & #2, + if (Cmd == SW_SHOWMINIMIZED) + { + if ((style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + co_UserSetFocus(Wnd->spwndParent); + else + co_UserSetFocus(0); + } + Swp |= co_WinPosMinMaximize(Wnd, SW_MINIMIZE, &NewPos) | SWP_FRAMECHANGED; } @@ -1965,7 +1974,7 @@ { Parent = Wnd->spwndParent; if (Wnd->spwndParent == UserGetDesktopWindow()) Parent = 0; - co_UserSetFocus(Parent); + co_UserSetFocus(Parent); } } @@ -1978,8 +1987,12 @@ } /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) co_UserSetFocus(Wnd); - + if (style & WS_MINIMIZE) + { + co_UserSetFocus(Wnd); + // Fix wine Win test_SetFocus todo #3, + if (!(style & WS_CHILD)) co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_ACTIVATE, WA_ACTIVE, 0); + } return(WasVisible); }

1 0

[ion] 56657: [NDK]: Missing define.
by ion＠svn.reactos.org 25 May '12

25 May '12

Author: ion Date: Fri May 25 19:26:42 2012 New Revision: 56657 URL: http://svn.reactos.org/svn/reactos?rev=56657&view=rev Log: [NDK]: Missing define. Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Fri May 25 19:26:42 2012 @@ -78,6 +78,12 @@ // Activation Context Frame Flags // #define RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER \ + 0x1 + +// +// RtlActivateActivationContextEx Flags +// +#define RTL_ACTIVATE_ACTIVATION_CONTEXT_EX_FLAG_RELEASE_ON_STACK_DEALLOCATION \ 0x1 //

1 0

[ion] 56656: [KERNEL32]: Enable SxS support in CreateRemoteThread, and other misc. cleanups.
by ion＠svn.reactos.org 24 May '12

24 May '12

Author: ion Date: Thu May 24 19:20:33 2012 New Revision: 56656 URL: http://svn.reactos.org/svn/reactos?rev=56656&view=rev Log: [KERNEL32]: Enable SxS support in CreateRemoteThread, and other misc. cleanups. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu May 24 19:20:33 2012 @@ -417,7 +417,7 @@ @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) -;@ stdcall RtlActivateActivationContextEx +@ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Thu May 24 19:20:33 2012 @@ -153,13 +153,13 @@ */ HANDLE WINAPI -CreateRemoteThread(HANDLE hProcess, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - DWORD dwStackSize, - LPTHREAD_START_ROUTINE lpStartAddress, - LPVOID lpParameter, - DWORD dwCreationFlags, - LPDWORD lpThreadId) +CreateRemoteThread(IN HANDLE hProcess, + IN LPSECURITY_ATTRIBUTES lpThreadAttributes, + IN DWORD dwStackSize, + IN LPTHREAD_START_ROUTINE lpStartAddress, + IN LPVOID lpParameter, + IN DWORD dwCreationFlags, + OUT LPDWORD lpThreadId) { NTSTATUS Status; INITIAL_TEB InitialTeb; @@ -169,7 +169,12 @@ POBJECT_ATTRIBUTES ObjectAttributes; HANDLE hThread; ULONG Dummy; - + PTEB Teb; + THREAD_BASIC_INFORMATION ThreadBasicInfo; + PVOID ActivationContextStack = NULL; + ACTIVATION_CONTEXT_BASIC_INFORMATION ActCtxInfo; + ULONG_PTR Cookie; + ULONG ReturnLength; DPRINT("CreateRemoteThread: hProcess: %ld dwStackSize: %ld lpStartAddress" ": %p lpParameter: %lx, dwCreationFlags: %lx\n", hProcess, dwStackSize, lpStartAddress, lpParameter, dwCreationFlags); @@ -182,10 +187,10 @@ /* Create the Stack */ Status = BaseCreateStack(hProcess, - dwStackSize, - dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION ? - dwStackSize : 0, - &InitialTeb); + dwStackSize, + dwCreationFlags & STACK_SIZE_PARAM_IS_A_RESERVATION ? + dwStackSize : 0, + &InitialTeb); if(!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); @@ -194,15 +199,15 @@ /* Create Initial Context */ BaseInitializeContext(&Context, - lpParameter, - lpStartAddress, - InitialTeb.StackBase, - 1); + lpParameter, + lpStartAddress, + InitialTeb.StackBase, + 1); /* initialize the attributes for the thread object */ ObjectAttributes = BaseFormatObjectAttributes(&LocalObjectAttributes, - lpThreadAttributes, - NULL); + lpThreadAttributes, + NULL); /* Create the Kernel Thread Object */ Status = NtCreateThread(&hThread, @@ -213,8 +218,9 @@ &Context, &InitialTeb, TRUE); - if(!NT_SUCCESS(Status)) - { + if (!NT_SUCCESS(Status)) + { + /* Fail the kernel create */ BaseFreeThreadStack(hProcess, &InitialTeb); BaseSetLastNTError(Status); return NULL; @@ -223,71 +229,82 @@ /* Are we in the same process? */ if (hProcess == NtCurrentProcess()) { - PTEB Teb; - PVOID ActivationContextStack = NULL; - THREAD_BASIC_INFORMATION ThreadBasicInfo; -#ifndef SXS_SUPPORT_FIXME - ACTIVATION_CONTEXT_BASIC_INFORMATION ActivationCtxInfo; - ULONG_PTR Cookie; -#endif - ULONG retLen; - /* Get the TEB */ Status = NtQueryInformationThread(hThread, ThreadBasicInformation, &ThreadBasicInfo, sizeof(ThreadBasicInfo), - &retLen); - if (NT_SUCCESS(Status)) - { - /* Allocate the Activation Context Stack */ - Status = RtlAllocateActivationContextStack(&ActivationContextStack); - } - - if (NT_SUCCESS(Status)) - { - Teb = ThreadBasicInfo.TebBaseAddress; - - /* Save it */ - Teb->ActivationContextStackPointer = ActivationContextStack; -#ifndef SXS_SUPPORT_FIXME - /* Query the Context */ - Status = RtlQueryInformationActivationContext(1, - 0, - NULL, - ActivationContextBasicInformation, - &ActivationCtxInfo, - sizeof(ActivationCtxInfo), - &retLen); - if (NT_SUCCESS(Status)) + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("SXS: %s - Failing thread create because " + "NtQueryInformationThread() failed with status %08lx\n", + __FUNCTION__, Status); + while (TRUE); + } + + /* Allocate the Activation Context Stack */ + Status = RtlAllocateActivationContextStack(&ActivationContextStack); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("SXS: %s - Failing thread create because " + "RtlAllocateActivationContextStack() failed with status %08lx\n", + __FUNCTION__, Status); + while (TRUE); + } + + /* Save it */ + Teb = ThreadBasicInfo.TebBaseAddress; + Teb->ActivationContextStackPointer = ActivationContextStack; + + /* Query the Context */ + // WARNING!!! THIS IS USING THE WIN32 FLAG BECAUSE REACTOS CONTINUES TO BE A POS!!! /// + Status = RtlQueryInformationActivationContext(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, + NULL, + 0, + ActivationContextBasicInformation, + &ActCtxInfo, + sizeof(ActCtxInfo), + &ReturnLength); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("SXS: %s - Failing thread create because " + "RtlQueryInformationActivationContext() failed with status %08lx\n", + __FUNCTION__, Status); + while (TRUE); + } + + /* Does it need to be activated? */ + if ((ActCtxInfo.hActCtx) && !(ActCtxInfo.dwFlags & 1)) + { + /* Activate it */ + Status = RtlActivateActivationContextEx(RTL_ACTIVATE_ACTIVATION_CONTEXT_EX_FLAG_RELEASE_ON_STACK_DEALLOCATION, + Teb, + ActCtxInfo.hActCtx, + &Cookie); + if (!NT_SUCCESS(Status)) { - /* Does it need to be activated? */ - if (!ActivationCtxInfo.hActCtx) - { - /* Activate it */ - Status = RtlActivateActivationContext(1, - ActivationCtxInfo.hActCtx, - &Cookie); - if (!NT_SUCCESS(Status)) - DPRINT1("RtlActivateActivationContext failed %x\n", Status); - } + /* Fail */ + DbgPrint("SXS: %s - Failing thread create because " + "RtlActivateActivationContextEx() failed with status %08lx\n", + __FUNCTION__, Status); + while (TRUE); } - else - DPRINT1("RtlQueryInformationActivationContext failed %x\n", Status); -#endif - } - else - DPRINT1("RtlAllocateActivationContextStack failed %x\n", Status); + } } /* Notify CSR */ if (!BaseRunningInServerProcess) { + /* Notify CSR */ Status = BasepNotifyCsrOfThread(hThread, &ClientId); + ASSERT(NT_SUCCESS(Status)); } else { - DPRINT("Server thread in Server. Handle: %lx\n", hProcess); if (hProcess != NtCurrentProcess()) { PCSR_CREATE_REMOTE_THREAD CsrCreateRemoteThread; @@ -300,23 +317,16 @@ { /* Call it instead of going through LPC */ Status = CsrCreateRemoteThread(hThread, &ClientId); + ASSERT(NT_SUCCESS(Status)); } } } - if (!NT_SUCCESS(Status)) - { - ASSERT(FALSE); - } - /* Success */ - if(lpThreadId) *lpThreadId = HandleToUlong(ClientId.UniqueThread); + if (lpThreadId) *lpThreadId = HandleToUlong(ClientId.UniqueThread); /* Resume it if asked */ - if (!(dwCreationFlags & CREATE_SUSPENDED)) - { - NtResumeThread(hThread, &Dummy); - } + if (!(dwCreationFlags & CREATE_SUSPENDED)) NtResumeThread(hThread, &Dummy); /* Return handle to thread */ return hThread;

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