Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20046: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Shut off some debug messages Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac e.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac e.c --- branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac e.c 2005-12-10 22:24:51 UTC (rev 20045) +++ branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac e.c 2005-12-10 22:28:26 UTC (rev 20046) @@ -140,7 +140,8 @@ *OutLen = 0; - printf("so->so_state %x\n", ((struct socket *)connection)->so_state); + OS_DbgPrint(OSK_MID_TRACE, + ("so->so_state %x\n", ((struct socket *)connection)->so_state)); if( Flags & OSK_MSG_OOB ) tcp_flags |= MSG_OOB; if( Flags & OSK_MSG_DONTWAIT ) tcp_flags |= MSG_DONTWAIT; _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c --- branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-10 22:24:51 UTC (rev 20045) +++ branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-10 22:28:26 UTC (rev 20046) @@ -377,7 +377,9 @@ MiniSendResourcesAvailable( IN NDIS_HANDLE MiniportAdapterHandle) { +/* UNIMPLEMENTED +*/ } _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c --- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-10 22:24:51 UTC (rev 20045) +++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-10 22:28:26 UTC (rev 20046) @@ -386,7 +386,8 @@ TI_DbgPrint(DEBUG_DATALINK, ("Work item inserted %x %x\n", &LanWorkItem, WQItem)); } else { - DbgPrint("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem); + TI_DbgPrint(DEBUG_DATALINK, + ("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem)); } TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); }

18 years, 9 months

[gvg] 20045: Shut off some debug messages

by gvg＠svn.reactos.com

Shut off some debug messages Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-12-10 22:21:55 UTC (rev 20044) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-12-10 22:24:51 UTC (rev 20045) @@ -140,7 +140,8 @@ *OutLen = 0; - printf("so->so_state %x\n", ((struct socket *)connection)->so_state); + OS_DbgPrint(OSK_MID_TRACE, + ("so->so_state %x\n", ((struct socket *)connection)->so_state)); if( Flags & OSK_MSG_OOB ) tcp_flags |= MSG_OOB; if( Flags & OSK_MSG_DONTWAIT ) tcp_flags |= MSG_DONTWAIT; _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-10 22:21:55 UTC (rev 20044) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-10 22:24:51 UTC (rev 20045) @@ -377,7 +377,9 @@ MiniSendResourcesAvailable( IN NDIS_HANDLE MiniportAdapterHandle) { +/* UNIMPLEMENTED +*/ } _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-10 22:21:55 UTC (rev 20044) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-12-10 22:24:51 UTC (rev 20045) @@ -386,7 +386,8 @@ TI_DbgPrint(DEBUG_DATALINK, ("Work item inserted %x %x\n", &LanWorkItem, WQItem)); } else { - DbgPrint("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem); + TI_DbgPrint(DEBUG_DATALINK, + ("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem)); } TcpipReleaseSpinLock( &LanWorkLock, OldIrql ); }

18 years, 9 months

[gvg] 20044: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Multiple interrupt status bits can be active at the same time, process them all instead of just one and ignoring the rest. On an active network card, this would eventually cause all transmit buffers to be marked "in use", blocking all transmits. Sinds no TCP acks would go out, it would block TCP receives too. Modified: branches/ros-branch-0_2_9/reactos/drivers/net/dd/pcnet/pcnet.c _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/dd/pcnet/pcnet.c --- branches/ros-branch-0_2_9/reactos/drivers/net/dd/pcnet/pcnet.c 2005-12-10 22:21:28 UTC (rev 20043) +++ branches/ros-branch-0_2_9/reactos/drivers/net/dd/pcnet/pcnet.c 2005-12-10 22:21:55 UTC (rev 20044) @@ -87,11 +87,11 @@ if (Data & CSR0_CERR) Adapter->Statistics.XmtCollisions++; } - else if(Data & CSR0_IDON) + if(Data & CSR0_IDON) { DPRINT("IDON\n"); } - else if(Data & CSR0_RINT) + if(Data & CSR0_RINT) { DPRINT("receive interrupt\n"); @@ -147,7 +147,7 @@ Adapter->Statistics.RcvGoodFrames++; } } - else if(Data & CSR0_TINT) + if(Data & CSR0_TINT) { PTRANSMIT_DESCRIPTOR Descriptor; @@ -201,10 +201,9 @@ } NdisMSendResourcesAvailable(Adapter->MiniportAdapterHandle); } - else + if(Data & ~(CSR0_ERR | CSR0_IDON | CSR0_RINT | CSR0_TINT)) { - DPRINT1("UNHANDLED INTERRUPT\n"); - ASSERT(FALSE); + DPRINT("UNHANDLED INTERRUPT CSR0 0x%x\n", Data); } NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); @@ -1081,7 +1080,7 @@ (Adapter->CurrentTransmitEndIndex == NUMBER_OF_BUFFERS - 1 && Adapter->CurrentTransmitStartIndex == 0)) { - DPRINT("No free space in circular buffer\n"); + DPRINT1("No free space in circular buffer\n"); NdisDprReleaseSpinLock(&Adapter->Lock); return NDIS_STATUS_RESOURCES; }

18 years, 9 months

[gvg] 20043: Multiple interrupt status bits can be active at the same time, process them

by gvg＠svn.reactos.com

Multiple interrupt status bits can be active at the same time, process them all instead of just one and ignoring the rest. On an active network card, this would eventually cause all transmit buffers to be marked "in use", blocking all transmits. Sinds no TCP acks would go out, it would block TCP receives too. Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c --- trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-12-10 20:44:57 UTC (rev 20042) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-12-10 22:21:28 UTC (rev 20043) @@ -87,11 +87,11 @@ if (Data & CSR0_CERR) Adapter->Statistics.XmtCollisions++; } - else if(Data & CSR0_IDON) + if(Data & CSR0_IDON) { DPRINT("IDON\n"); } - else if(Data & CSR0_RINT) + if(Data & CSR0_RINT) { DPRINT("receive interrupt\n"); @@ -147,7 +147,7 @@ Adapter->Statistics.RcvGoodFrames++; } } - else if(Data & CSR0_TINT) + if(Data & CSR0_TINT) { PTRANSMIT_DESCRIPTOR Descriptor; @@ -201,10 +201,9 @@ } NdisMSendResourcesAvailable(Adapter->MiniportAdapterHandle); } - else + if(Data & ~(CSR0_ERR | CSR0_IDON | CSR0_RINT | CSR0_TINT)) { - DPRINT1("UNHANDLED INTERRUPT\n"); - ASSERT(FALSE); + DPRINT("UNHANDLED INTERRUPT CSR0 0x%x\n", Data); } NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); @@ -1081,7 +1080,7 @@ (Adapter->CurrentTransmitEndIndex == NUMBER_OF_BUFFERS - 1 && Adapter->CurrentTransmitStartIndex == 0)) { - DPRINT("No free space in circular buffer\n"); + DPRINT1("No free space in circular buffer\n"); NdisDprReleaseSpinLock(&Adapter->Lock); return NDIS_STATUS_RESOURCES; }

18 years, 9 months

[sgasiorek] 20042: merged changes from wine to edit control.

by sgasiorek＠svn.reactos.com

merged changes from wine to edit control. Modified: trunk/reactos/lib/user32/controls/edit.c _____ Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-12-10 19:22:43 UTC (rev 20041) +++ trunk/reactos/lib/user32/controls/edit.c 2005-12-10 20:44:57 UTC (rev 20042) @@ -20,20 +20,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * * TODO: - * - ES_CENTER - * - ES_RIGHT + * - EDITBALLOONTIP structure + * - EM_GETCUEBANNER/Edit_GetCueBannerText + * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip + * - EM_SETCUEBANNER/Edit_SetCueBannerText + * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip + * - EM_GETIMESTATUS, EM_SETIMESTATUS + * - EN_ALIGN_LTR_EC + * - EN_ALIGN_RTL_EC * - ES_OEMCONVERT - * -!ES_AUTOVSCROLL (every multi line control *is* auto vscroll) - * -!ES_AUTOHSCROLL (every single line control *is* auto hscroll) * - * When there is no autoscrolling, the control should first check whether - * the new text would fit. If not, an EN_MAXTEXT should be sent. - * However, currently this would require the actual change to be made, - * then call EDIT_BuildLineDefs() and then find out that the new text doesn't - * fit. After all this, things should be put back in the state before the - * changes. Note that for multi line controls !ES_AUTOHSCROLL works : wordwrap. - * */ #include <user32.h> @@ -142,12 +148,12 @@ #define ORDER_UINT(x,y) do { if ((UINT)(y) < (UINT)(x)) SWAP_UINT32((x),(y)); } while(0) /* used for disabled or read-only edit control */ -#define EDIT_NOTIFY_PARENT(es, wNotifyCode, str) \ +#define EDIT_NOTIFY_PARENT(es, wNotifyCode) \ do \ { /* Notify parent which has created this edit control */ \ - TRACE("notification " str " sent to hwnd=%p\n", es->hwndParent); \ + TRACE("notification " #wNotifyCode " sent to hwnd=%p\n", es->hwndParent); \ SendMessageW(es->hwndParent, WM_COMMAND, \ - MAKEWPARAM(GetWindowLongW((es->hwndSelf),GWL_ID), wNotifyCode), \ + MAKEWPARAM(GetWindowLongPtrW((es->hwndSelf),GWLP_ID), wNotifyCode), \ (LPARAM)(es->hwndSelf)); \ } while(0) @@ -210,7 +216,7 @@ #ifndef __REACTOS__ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es); #endif -static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPARAM lParam, BOOL unicode); +static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPWSTR dst, BOOL unicode); static LRESULT EDIT_EM_GetSel(EDITSTATE *es, PUINT start, PUINT end); static LRESULT EDIT_EM_GetThumb(EDITSTATE *es); static INT EDIT_EM_LineFromChar(EDITSTATE *es, INT index); @@ -227,14 +233,14 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); #endif static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); -static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right); +static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); #ifndef __REACTOS__ static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, LPINT16 tabs); #endif -static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, LPARAM lParam); +static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp); #ifndef __REACTOS__ static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp); #endif @@ -249,7 +255,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name); static LRESULT EDIT_WM_Destroy(EDITSTATE *es); static LRESULT EDIT_WM_EraseBkGnd(EDITSTATE *es, HDC dc); -static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPARAM lParam, BOOL unicode); +static INT EDIT_WM_GetText(EDITSTATE *es, INT count, LPWSTR dst, BOOL unicode); static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos); static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key); static LRESULT EDIT_WM_KillFocus(EDITSTATE *es); @@ -259,11 +265,11 @@ static LRESULT EDIT_WM_MButtonDown(EDITSTATE *es); static LRESULT EDIT_WM_MouseMove(EDITSTATE *es, INT x, INT y); static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode); -static void EDIT_WM_Paint(EDITSTATE *es, WPARAM wParam); +static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc); static void EDIT_WM_Paste(EDITSTATE *es); static void EDIT_WM_SetFocus(EDITSTATE *es); static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw); -static void EDIT_WM_SetText(EDITSTATE *es, LPARAM lParam, BOOL unicode); +static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode); static void EDIT_WM_Size(EDITSTATE *es, UINT action, INT width, INT height); static LRESULT EDIT_WM_StyleChanged(EDITSTATE *es, WPARAM which, const STYLESTRUCT *style); static LRESULT EDIT_WM_SysKeyDown(EDITSTATE *es, INT key, DWORD key_data); @@ -390,6 +396,7 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) { + HBRUSH hbrush; UINT msg; if ( get_app_version() >= 0x40000 && (!es->bEnableState || (es->style & ES_READONLY))) @@ -398,7 +405,10 @@ msg = WM_CTLCOLOREDIT; /* why do we notify to es->hwndParent, and we send this one to GetParent()? */ - return (HBRUSH)SendMessageW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); + hbrush = (HBRUSH)SendMessageW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); + if (!hbrush) + hbrush = (HBRUSH)DefWindowProcW(GetParent(es->hwndSelf), msg, (WPARAM)hdc, (LPARAM)es->hwndSelf); + return hbrush; } static __inline LRESULT DefWindowProcT(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) @@ -425,21 +435,16 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { - EDITSTATE *es = (EDITSTATE *)GetWindowLongW( hwnd, 0 ); + EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; //TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); - else if (msg == WM_NCCREATE) - return EDIT_WM_NCCreate(hwnd, (LPCREATESTRUCTW)lParam, unicode); - else if (msg == WM_DESTROY) - return EDIT_WM_Destroy(es); + if (es && (msg != WM_DESTROY)) EDIT_LockBuffer(es); - if (es) EDIT_LockBuffer(es); - switch (msg) { #ifndef __REACTOS__ case EM_GETSEL16: @@ -649,7 +654,7 @@ /* fall through */ #endif case EM_GETLINE: - result = (LRESULT)EDIT_EM_GetLine(es, (INT)wParam, lParam, unicode); + result = (LRESULT)EDIT_EM_GetLine(es, (INT)wParam, (LPWSTR)lParam, unicode); break; #ifndef __REACTOS__ @@ -756,7 +761,7 @@ break; #endif case EM_SETWORDBREAKPROC: - EDIT_EM_SetWordBreakProc(es, lParam); + EDIT_EM_SetWordBreakProc(es, (void *)lParam); break; #ifndef __REACTOS__ @@ -790,7 +795,7 @@ /* The following EM_xxx are new to win95 and don't exist for 16 bit */ case EM_SETMARGINS: - EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam)); + EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam), TRUE); break; case EM_GETMARGINS: @@ -802,7 +807,9 @@ break; case EM_POSFROMCHAR: - result = EDIT_EM_PosFromChar(es, (INT)wParam, FALSE); + result = strlenW(es->text); + if ((INT)wParam >= result) result = -1; + else result = EDIT_EM_PosFromChar(es, (INT)wParam, FALSE); break; case EM_CHARFROMPOS: @@ -813,6 +820,15 @@ * are these in? vaguely alphabetical? */ + case WM_NCCREATE: + result = EDIT_WM_NCCreate(hwnd, (LPCREATESTRUCTW)lParam, unicode); + break; + + case WM_DESTROY: + result = EDIT_WM_Destroy(es); + es = NULL; + break; + case WM_GETDLGCODE: result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS; @@ -900,8 +916,7 @@ MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW); } result = EDIT_WM_Create(es, nameW); - if(nameW) - HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, nameW); } break; @@ -923,7 +938,7 @@ break; case WM_GETTEXT: - result = (LRESULT)EDIT_WM_GetText(es, (INT)wParam, lParam, unicode); + result = (LRESULT)EDIT_WM_GetText(es, (INT)wParam, (LPWSTR)lParam, unicode); break; case WM_GETTEXTLENGTH: @@ -960,16 +975,13 @@ result = EDIT_WM_MButtonDown(es); break; - case WM_MOUSEACTIVATE: - result = MA_ACTIVATE; - break; - case WM_MOUSEMOVE: result = EDIT_WM_MouseMove(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case WM_PRINTCLIENT: case WM_PAINT: - EDIT_WM_Paint(es, wParam); + EDIT_WM_Paint(es, (HDC)wParam); break; case WM_PASTE: @@ -989,7 +1001,7 @@ break; case WM_SETTEXT: - EDIT_WM_SetText(es, lParam, unicode); + EDIT_WM_SetText(es, (LPCWSTR)lParam, unicode); result = TRUE; break; @@ -1309,7 +1321,10 @@ rc.top = es->format_rect.top + nstart_line * es->line_height - (es->y_offset * es->line_height); /* Adjust for vertical scrollbar */ rc.bottom = rc.top + es->line_height; - rc.left = es->format_rect.left + (INT)LOWORD(GetTabbedTextExtentW(dc, + if ((es->style & ES_CENTER) || (es->style & ES_RIGHT)) + rc.left = es->format_rect.left; + else + rc.left = es->format_rect.left + (INT)LOWORD(GetTabbedTextExtentW(dc, es->text + nstart_index, istart - nstart_index, es->tabs_count, es->tabs)) - es->x_offset; /* Adjust for horz scroll */ rc.right = es->format_rect.right; @@ -1328,6 +1343,7 @@ rc.bottom = line_count * es->line_height; else rc.bottom = line_index * es->line_height; + rc.bottom += es->format_rect.top; rc.bottom -= (es->y_offset * es->line_height); /* Adjust for vertical scrollbar */ tmphrgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom); CombineRgn(hrgn, hrgn, tmphrgn, RGN_OR); @@ -1347,7 +1363,27 @@ */ static void EDIT_CalcLineWidth_SL(EDITSTATE *es) { - es->text_width = (short)LOWORD(EDIT_EM_PosFromChar(es, strlenW(es->text), FALSE)); + SIZE size; + LPWSTR text; + HDC dc; + HFONT old_font = 0; + + text = EDIT_GetPasswordPointer_SL(es); + + dc = GetDC(es->hwndSelf); + if (es->font) + old_font = SelectObject(dc, es->font); + + GetTextExtentPoint32W(dc, text, strlenW(text), &size); + + if (es->font) + SelectObject(dc, old_font); + ReleaseDC(es->hwndSelf, dc); + + if (es->style & ES_PASSWORD) + HeapFree(GetProcessHeap(), 0, text); + + es->text_width = size.cx; } /********************************************************************* @@ -1450,6 +1486,7 @@ INT index; HDC dc; HFONT old_font = 0; + INT x_high = 0, x_low = 0; if (es->style & ES_MULTILINE) { INT line = (y - es->format_rect.top) / es->line_height + es->y_offset; @@ -1462,6 +1499,10 @@ line--; } x += es->x_offset - es->format_rect.left; + if (es->style & ES_RIGHT) + x -= (es->format_rect.right - es->format_rect.left) - line_def->width; + else if (es->style & ES_CENTER) + x -= ((es->format_rect.right - es->format_rect.left) - line_def->width) / 2; if (x >= line_def->width) { if (after_wrap) *after_wrap = (line_def->ending == END_WRAP); @@ -1475,15 +1516,24 @@ dc = GetDC(es->hwndSelf); if (es->font) old_font = SelectObject(dc, es->font); - low = line_index + 1; + low = line_index; high = line_index + line_def->net_length + 1; while (low < high - 1) { INT mid = (low + high) / 2; - if (LOWORD(GetTabbedTextExtentW(dc, es->text + line_index,mid - line_index, es->tabs_count, es->tabs)) > x) high = mid; - else low = mid; + INT x_now = LOWORD(GetTabbedTextExtentW(dc, es->text + line_index, mid - line_index, es->tabs_count, es->tabs)); + if (x_now > x) { + high = mid; + x_high = x_now; + } else { + low = mid; + x_low = x_now; + } } - index = low; + if (abs(x_high - x) + 1 <= abs(x_low - x)) + index = high; + else + index = low; if (after_wrap) *after_wrap = ((index == line_index + line_def->net_length) && @@ -1496,6 +1546,16 @@ x -= es->format_rect.left; if (!x) return es->x_offset; + + if (!es->x_offset) + { + INT indent = (es->format_rect.right - es->format_rect.left) - es->text_width; + if (es->style & ES_RIGHT) + x -= indent; + else if (es->style & ES_CENTER) + x -= indent / 2; + } + text = EDIT_GetPasswordPointer_SL(es); dc = GetDC(es->hwndSelf); if (es->font) @@ -1509,10 +1569,18 @@ INT mid = (low + high) / 2; GetTextExtentPoint32W( dc, text + mid, es->x_offset - mid, &size ); - if (size.cx > -x) low = mid; - else high = mid; + if (size.cx > -x) { + low = mid; + x_low = size.cx; + } else { + high = mid; + x_high = size.cx; + } } - index = low; + if (abs(x_high + x) <= abs(x_low + x) + 1) + index = high; + else + index = low; } else { @@ -1523,10 +1591,18 @@ INT mid = (low + high) / 2; GetTextExtentPoint32W( dc, text + es->x_offset, mid - es->x_offset, &size ); - if (size.cx > x) high = mid; - else low = mid; + if (size.cx > x) { + high = mid; + x_high = size.cx; + } else { + low = mid; + x_low = size.cx; + } } - index = low; + if (abs(x_high - x) <= abs(x_low - x) + 1) + index = high; + else + index = low; } if (es->style & ES_PASSWORD) HeapFree(GetProcessHeap(), 0, text); @@ -1829,7 +1905,7 @@ if (es->buffer_size < size) { WARN("FAILED ! We now have %d+1\n", es->buffer_size); - EDIT_NOTIFY_PARENT(es, EN_ERRSPACE, "EN_ERRSPACE"); + EDIT_NOTIFY_PARENT(es, EN_ERRSPACE); return FALSE; } else { TRACE("We now have %d+1\n", es->buffer_size); @@ -2230,50 +2306,16 @@ /********************************************************************* * - * EDIT_SetRectNP + * EDIT_AdjustFormatRect * - * note: this is not (exactly) the handler called on EM_SETRECTNP - * it is also used to set the rect of a single line control + * Adjusts the format rectangle for the current font and the + * current client rectangle. * */ -static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc) +static void EDIT_AdjustFormatRect(EDITSTATE *es) { RECT ClientRect; - LONG_PTR ExStyle; - - CopyRect(&es->format_rect, rc); - if (es->style & ES_MULTILINE) - { - if (es->style & WS_BORDER) { - INT bw = GetSystemMetrics(SM_CXBORDER) + 1; - es->format_rect.left += bw; - es->format_rect.right -= bw; - es->format_rect.top += bw; - es->format_rect.bottom -= bw; - } - } - else - { - ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE); - if (ExStyle & WS_EX_CLIENTEDGE) { - if (es->line_height + 2 <= - es->format_rect.bottom - es->format_rect.top) { - es->format_rect.top++; - es->format_rect.bottom--; - } - } else if (es->style & WS_BORDER) { - INT bw = GetSystemMetrics(SM_CXBORDER) + 1; - es->format_rect.left += bw; - es->format_rect.right -= bw; - if (es->line_height + 2 * bw <= - es->format_rect.bottom - es->format_rect.top) { - es->format_rect.top += bw; - es->format_rect.bottom -= bw; - } - } - } - es->format_rect.left += es->left_margin; - es->format_rect.right -= es->right_margin; + es->format_rect.right = max(es->format_rect.right, es->format_rect.left + es->char_width); if (es->style & ES_MULTILINE) { @@ -2308,11 +2350,59 @@ if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + + EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } /********************************************************************* * + * EDIT_SetRectNP + * + * note: this is not (exactly) the handler called on EM_SETRECTNP + * it is also used to set the rect of a single line control + * + */ +static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc) +{ + LONG_PTR ExStyle; + INT bw, bh; + ExStyle = GetWindowLongPtrW(es->hwndSelf, GWL_EXSTYLE); + + CopyRect(&es->format_rect, rc); + + if (ExStyle & WS_EX_CLIENTEDGE) { + es->format_rect.left++; + es->format_rect.right--; + + if (es->format_rect.bottom - es->format_rect.top + >= es->line_height + 2) + { + es->format_rect.top++; + es->format_rect.bottom--; + } + } + else if (es->style & WS_BORDER) { + bw = GetSystemMetrics(SM_CXBORDER) + 1; + bh = GetSystemMetrics(SM_CYBORDER) + 1; + es->format_rect.left += bw; + es->format_rect.right -= bw; + if (es->format_rect.bottom - es->format_rect.top + >= es->line_height + 2 * bh) + { + es->format_rect.top += bh; + es->format_rect.bottom -= bh; + } + } + + es->format_rect.left += es->left_margin; + es->format_rect.right -= es->right_margin; + EDIT_AdjustFormatRect(es); +} + + +/********************************************************************* + * * EDIT_UnlockBuffer * */ @@ -2686,7 +2776,7 @@ * EM_GETLINE * */ -static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPARAM lParam, BOOL unicode) +static INT EDIT_EM_GetLine(EDITSTATE *es, INT line, LPWSTR dst, BOOL unicode) { LPWSTR src; INT line_len, dst_len; @@ -2700,10 +2790,9 @@ i = EDIT_EM_LineIndex(es, line); src = es->text + i; line_len = EDIT_EM_LineLength(es, i); - dst_len = *(WORD *)lParam; + dst_len = *(WORD *)dst; if(unicode) { - LPWSTR dst = (LPWSTR)lParam; if(dst_len <= line_len) { memcpy(dst, src, dst_len * sizeof(WCHAR)); @@ -2718,13 +2807,11 @@ } else { - LPSTR dst = (LPSTR)lParam; - INT ret; - ret = WideCharToMultiByte(CP_ACP, 0, src, line_len, dst, dst_len, NULL, NULL); - if(!ret) /* Insufficient buffer size */ + INT ret = WideCharToMultiByte(CP_ACP, 0, src, line_len, (LPSTR)dst, dst_len, NULL, NULL); + if(!ret && line_len) /* Insufficient buffer size */ return dst_len; if(ret < dst_len) /* Append 0 if enough space */ - dst[ret] = 0; + ((LPSTR)dst)[ret] = 0; return ret; } } @@ -2939,9 +3026,9 @@ EDIT_UpdateScrollInfo(es); } if (dx && !(es->flags & EF_HSCROLL_TRACK)) - EDIT_NOTIFY_PARENT(es, EN_HSCROLL, "EN_HSCROLL"); + EDIT_NOTIFY_PARENT(es, EN_HSCROLL); if (dy && !(es->flags & EF_VSCROLL_TRACK)) - EDIT_NOTIFY_PARENT(es, EN_VSCROLL, "EN_VSCROLL"); + EDIT_NOTIFY_PARENT(es, EN_VSCROLL); return TRUE; } @@ -2958,9 +3045,13 @@ INT li; INT x; INT y = 0; + INT w; + INT lw = 0; + INT ll = 0; HDC dc; HFONT old_font = 0; SIZE size; + LINEDEF *line_def; index = min(index, len); dc = GetDC(es->hwndSelf); @@ -2972,7 +3063,7 @@ li = EDIT_EM_LineIndex(es, l); if (after_wrap && (li == index) && l) { INT l2 = l - 1; - LINEDEF *line_def = es->first_line_def; + line_def = es->first_line_def; while (l2) { line_def = line_def->next; l2--; @@ -2983,8 +3074,32 @@ li = EDIT_EM_LineIndex(es, l); } } - x = LOWORD(GetTabbedTextExtentW(dc, es->text + li, index - li, + + line_def = es->first_line_def; + while (line_def->index != li) + line_def = line_def->next; + + ll = line_def->net_length; + lw = line_def->width; + + w = es->format_rect.right - es->format_rect.left; + if (es->style & ES_RIGHT) + { + x = LOWORD(GetTabbedTextExtentW(dc, es->text + li + (index - li), ll - (index - li), es->tabs_count, es->tabs)) - es->x_offset; + x = w - x; + } + else if (es->style & ES_CENTER) + { + x = LOWORD(GetTabbedTextExtentW(dc, es->text + li, index - li, + es->tabs_count, es->tabs)) - es->x_offset; + x += (w - lw) / 2; + } + else /* ES_LEFT */ + { + x = LOWORD(GetTabbedTextExtentW(dc, es->text + li, index - li, + es->tabs_count, es->tabs)) - es->x_offset; + } } else { LPWSTR text = EDIT_GetPasswordPointer_SL(es); if (index < es->x_offset) { @@ -2995,6 +3110,18 @@ GetTextExtentPoint32W(dc, text + es->x_offset, index - es->x_offset, &size); x = size.cx; + + if (!es->x_offset && (es->style & (ES_RIGHT | ES_CENTER))) + { + w = es->format_rect.right - es->format_rect.left; + if (w > es->text_width) + { + if (es->style & ES_RIGHT) + x += w - es->text_width; + else if (es->style & ES_CENTER) + x += (w - es->text_width) / 2; + } + } } y = 0; if (es->style & ES_PASSWORD) @@ -3027,6 +3154,8 @@ UINT size; LPWSTR p; HRGN hrgn = 0; + LPWSTR buf = NULL; + UINT bufl = 0; TRACE("%s, can_undo %d, send_update %d\n", debugstr_w(lpsz_replace), can_undo, send_update); @@ -3039,11 +3168,14 @@ ORDER_UINT(s, e); + size = tl - (e - s) + strl; + if (!size) + es->text_width = 0; + /* Issue the EN_MAXTEXT notification and continue with replacing text * such that buffer limit is honored. */ - size = tl - (e - s) + strl; if ((honor_limit) && (es->buffer_limit > 0) && (size > es->buffer_limit)) { - EDIT_NOTIFY_PARENT(es, EN_MAXTEXT, "EN_MAXTEXT"); + EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); strl = es->buffer_limit - (tl - (e-s)); } @@ -3053,12 +3185,71 @@ if (e != s) { /* there is something to be deleted */ TRACE("deleting stuff.\n"); + bufl = e - s; + buf = HeapAlloc(GetProcessHeap(), 0, (bufl + 1) * sizeof(WCHAR)); + if (!buf) return; + memcpy(buf, es->text + s, bufl * sizeof(WCHAR)); + buf[bufl] = 0; /* ensure 0 termination */ + /* now delete */ + strcpyW(es->text + s, es->text + e); + } + if (strl) { + /* there is an insertion */ + tl = strlenW(es->text); + TRACE("inserting stuff (tl %d, strl %d, selstart %d ('%s'), text '%s')\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); + for (p = es->text + tl ; p >= es->text + s ; p--) + p[strl] = p[0]; + for (i = 0 , p = es->text + s ; i < strl ; i++) + p[i] = lpsz_replace[i]; + if(es->style & ES_UPPERCASE) + CharUpperBuffW(p, strl); + else if(es->style & ES_LOWERCASE) + CharLowerBuffW(p, strl); + } + if (es->style & ES_MULTILINE) + { + INT st = min(es->selection_start, es->selection_end); + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + + hrgn = CreateRectRgn(0, 0, 0, 0); + EDIT_BuildLineDefs_ML(es, st, st + strl, + strl - abs(es->selection_end - es->selection_start), hrgn); + /* if text is too long undo all changes */ + if (honor_limit && !(es->style & ES_AUTOVSCROLL) && (es->line_count > vlc)) { + if (strl) + strcpyW(es->text + e, es->text + e + strl); + if (e != s) + for (i = 0 , p = es->text ; i < e - s ; i++) + p[i + s] = buf[i]; + EDIT_BuildLineDefs_ML(es, s, e, + abs(es->selection_end - es->selection_start) - strl, hrgn); + strl = 0; + e = s; + hrgn = CreateRectRgn(0, 0, 0, 0); + EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); + } + } + else { + INT fw = es->format_rect.right - es->format_rect.left; + EDIT_CalcLineWidth_SL(es); + /* remove chars that don't fit */ + if (honor_limit && !(es->style & ES_AUTOHSCROLL) && (es->text_width > fw)) { + while ((es->text_width > fw) && s + strl >= s) { + strcpyW(es->text + s + strl - 1, es->text + s + strl); + strl--; + EDIT_CalcLineWidth_SL(es); + } + EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); + } + } + + if (e != s) { if (can_undo) { utl = strlenW(es->undo_text); if (!es->undo_insert_count && (*es->undo_text && (s == es->undo_position))) { /* undo-buffer is extended to the right */ EDIT_MakeUndoFit(es, utl + e - s); - strncpyW(es->undo_text + utl, es->text + s, e - s + 1); + memcpy(es->undo_text + utl, buf, (e - s)*sizeof(WCHAR)); (es->undo_text + utl)[e - s] = 0; /* ensure 0 termination */ } else if (!es->undo_insert_count && (*es->undo_text && (e == es->undo_position))) { /* undo-buffer is extended to the left */ @@ -3066,12 +3257,12 @@ for (p = es->undo_text + utl ; p >= es->undo_text ; p--) p[e - s] = p[0]; for (i = 0 , p = es->undo_text ; i < e - s ; i++) - p[i] = (es->text + s)[i]; + p[i] = buf[i]; es->undo_position = s; } else { /* new undo-buffer */ EDIT_MakeUndoFit(es, e - s); - strncpyW(es->undo_text, es->text + s, e - s + 1); + memcpy(es->undo_text, buf, (e - s)*sizeof(WCHAR)); es->undo_text[e - s] = 0; /* ensure 0 termination */ es->undo_position = s; } @@ -3079,16 +3270,12 @@ es->undo_insert_count = 0; } else EDIT_EM_EmptyUndoBuffer(es); - - /* now delete */ - strcpyW(es->text + s, es->text + e); } if (strl) { - /* there is an insertion */ if (can_undo) { if ((s == es->undo_position) || - ((es->undo_insert_count) && - (s == es->undo_position + es->undo_insert_count))) + ((es->undo_insert_count) && + (s == es->undo_position + es->undo_insert_count))) /* * insertion is new and at delete position or * an extension to either left or right @@ -3103,30 +3290,26 @@ } } else EDIT_EM_EmptyUndoBuffer(es); + } - /* now insert */ - tl = strlenW(es->text); - TRACE("inserting stuff (tl %d, strl %d, selstart %d ('%s'), text '%s')\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); - for (p = es->text + tl ; p >= es->text + s ; p--) - p[strl] = p[0]; - for (i = 0 , p = es->text + s ; i < strl ; i++) - p[i] = lpsz_replace[i]; - if(es->style & ES_UPPERCASE) - CharUpperBuffW(p, strl); - else if(es->style & ES_LOWERCASE) - CharLowerBuffW(p, strl); - s += strl; - } - if (es->style & ES_MULTILINE) + if (bufl) + HeapFree(GetProcessHeap(), 0, buf); + + s += strl; + + /* If text has been deleted and we're right or center aligned then scroll rightward */ + if (es->style & (ES_RIGHT | ES_CENTER)) { - INT s = min(es->selection_start, es->selection_end); + INT delta = strl - abs(es->selection_end - es->selection_start); - hrgn = CreateRectRgn(0, 0, 0, 0); - EDIT_BuildLineDefs_ML(es, s, s + strl, - strl - abs(es->selection_end - es->selection_start), hrgn); + if (delta < 0 && es->x_offset) + { + if (abs(delta) > es->x_offset) + es->x_offset = 0; + else + es->x_offset += delta; + } } - else - EDIT_CalcLineWidth_SL(es); EDIT_EM_SetSel(es, s, s, FALSE); es->flags |= EF_MODIFIED; @@ -3145,10 +3328,10 @@ EDIT_UpdateScrollInfo(es); - if(es->flags & EF_UPDATE) + if(send_update || (es->flags & EF_UPDATE)) { es->flags &= ~EF_UPDATE; - EDIT_NOTIFY_PARENT(es, EN_CHANGE, "EN_CHANGE"); + EDIT_NOTIFY_PARENT(es, EN_CHANGE); } } @@ -3235,12 +3418,12 @@ dx = x - es->format_rect.left - ww / HSCROLL_FRACTION / cw * cw; if (x > es->format_rect.right) dx = x - es->format_rect.left - (HSCROLL_FRACTION - 1) * ww / HSCROLL_FRACTION / cw * cw; - if (dy || dx) + if (dy || dx || (es->y_offset && (es->line_count - es->y_offset < vlc))) { /* check if we are going to move too far */ if(es->x_offset + dx + ww > es->text_width) dx = es->text_width - ww - es->x_offset; - if(dx || dy) + if(dx || dy || (es->y_offset && (es->line_count - es->y_offset < vlc))) EDIT_EM_LineScroll_internal(es, dx, dy); } } else { @@ -3248,9 +3431,6 @@ INT goal; INT format_width; - if (!(es->style & ES_AUTOHSCROLL)) - return; - x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE)); format_width = es->format_rect.right - es->format_rect.left; if (x < es->format_rect.left) { @@ -3475,7 +3655,7 @@ * */ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, - INT left, INT right) + INT left, INT right, BOOL repaint) { TEXTMETRICW tm; INT default_left_margin = 0; /* in pixels */ @@ -3497,18 +3677,28 @@ } if (action & EC_LEFTMARGIN) { + es->format_rect.left -= es->left_margin; if (left != EC_USEFONTINFO) es->left_margin = left; else es->left_margin = default_left_margin; + es->format_rect.left += es->left_margin; } if (action & EC_RIGHTMARGIN) { + es->format_rect.right += es->right_margin; if (right != EC_USEFONTINFO) es->right_margin = right; else es->right_margin = default_right_margin; + es->format_rect.right -= es->right_margin; } + + if (action & (EC_LEFTMARGIN | EC_RIGHTMARGIN)) { + EDIT_AdjustFormatRect(es); + if (repaint) EDIT_UpdateText(es, NULL, TRUE); + } + TRACE("left=%d, right=%d\n", es->left_margin, es->right_margin); } @@ -3569,11 +3759,23 @@ es->flags |= EF_AFTER_WRAP; else es->flags &= ~EF_AFTER_WRAP; -/* This is a little bit more efficient than before, not sure if it can be improved. FIXME? */ - ORDER_UINT(start, end); + /* Compute the necessary invalidation region. */ + /* Note that we don't need to invalidate regions which have + * "never" been selected, or those which are "still" selected. + * In fact, every time we hit a selection boundary, we can + * *toggle* whether we need to invalidate. Thus we can optimize by + * *sorting* the interval endpoints. Let's assume that we sort them + * in this order: + * start <= end <= old_start <= old_end + * Knuth 5.3.1 (p 183) asssures us that this can be done optimally + * in 5 comparisons; ie it's impossible to do better than the + * following: */ ORDER_UINT(end, old_end); ORDER_UINT(start, old_start); ORDER_UINT(old_start, old_end); + ORDER_UINT(start, end); + /* Note that at this point 'end' and 'old_start' are not in order, but + * start is definitely the min. and old_end is definitely the max. */ if (end != old_start) { /* @@ -3582,6 +3784,7 @@ * EDIT_InvalidateText(es, start, end); * EDIT_InvalidateText(es, old_start, old_end); * in place of the following if statement. + * (That would complete the optimal five-comparison four-element sort.) */ if (old_start > end ) { @@ -3607,8 +3810,7 @@ { if (!(es->style & ES_MULTILINE)) return FALSE; - if (es->tabs) - HeapFree(GetProcessHeap(), 0, es->tabs); + HeapFree(GetProcessHeap(), 0, es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; @@ -3651,12 +3853,12 @@ * EM_SETWORDBREAKPROC * */ -static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, LPARAM lParam) +static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) { - if (es->word_break_proc == (void *)lParam) + if (es->word_break_proc == wbp) return; - es->word_break_proc = (void *)lParam; + es->word_break_proc = wbp; #ifndef __REACTOS__ es->word_break_proc16 = NULL; #endif @@ -3718,7 +3920,7 @@ EDIT_EM_ReplaceSel(es, TRUE, utext, TRUE, TRUE); EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); /* send the notification after the selection start and end are set */ - EDIT_NOTIFY_PARENT(es, EN_CHANGE, "EN_CHANGE"); + EDIT_NOTIFY_PARENT(es, EN_CHANGE); EDIT_EM_ScrollCaret(es); HeapFree(GetProcessHeap(), 0, utext); @@ -3897,13 +4099,15 @@ INT e = max(es->selection_start, es->selection_end); HGLOBAL hdst; LPWSTR dst; + DWORD len; if (e == s) return; - hdst = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (DWORD)(e - s + 1) * sizeof(WCHAR)); + len = e - s; + hdst = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (len + 1) * sizeof(WCHAR)); dst = GlobalLock(hdst); - strncpyW(dst, es->text + s, e - s); - dst[e - s] = 0; /* ensure 0 termination */ [truncated at 1000 lines; 468 more skipped]

18 years, 9 months

[fireball] 20041: Fix for bug #932 (should go into 0.2.9 also)

by fireball＠svn.reactos.com

Fix for bug #932 (should go into 0.2.9 also) Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-pci.c Modified: trunk/reactos/drivers/usb/usbport/hcd.h _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-pci.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci-pci.c 2005-12-10 17:09:35 UTC (rev 20040) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-pci.c 2005-12-10 19:22:43 UTC (rev 20041) @@ -312,7 +312,7 @@ /*---------------------------------------------------------------------- ---*/ -static const struct hc_driver ohci_pci_hc_driver = { +static struct hc_driver ohci_pci_hc_driver = { .description = hcd_name, /* _____ Modified: trunk/reactos/drivers/usb/usbport/hcd.h --- trunk/reactos/drivers/usb/usbport/hcd.h 2005-12-10 17:09:35 UTC (rev 20040) +++ trunk/reactos/drivers/usb/usbport/hcd.h 2005-12-10 19:22:43 UTC (rev 20041) @@ -458,7 +458,10 @@ if (dev->parent) { PDEVICE_OBJECT Pdo = (PDEVICE_OBJECT)dev->parent->dev.dev_ext; - IoInvalidateDeviceRelations(Pdo, BusRelations); + if (Pdo) + IoInvalidateDeviceRelations(Pdo, BusRelations); + else + DPRINT1("Pdo == NULL, not sending IoInvalidateDeviceRelations()!"); } } static inline void usbfs_remove_device(struct usb_device *dev) {}

18 years, 9 months

[weiden] 20040: fixed calls to NtDuplicateObject

by weiden＠svn.reactos.com

fixed calls to NtDuplicateObject Modified: trunk/reactos/drivers/net/ndis/ndis/config.c Modified: trunk/reactos/lib/kernel32/misc/handle.c Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/config.c --- trunk/reactos/drivers/net/ndis/ndis/config.c 2005-12-10 17:00:54 UTC (rev 20039) +++ trunk/reactos/drivers/net/ndis/ndis/config.c 2005-12-10 17:09:35 UTC (rev 20040) @@ -180,7 +180,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); *Status = ZwDuplicateObject(NtCurrentProcess(), RootKeyHandle, - NtCurrentProcess(), &KeyHandle, 0, FALSE, + NtCurrentProcess(), &KeyHandle, 0, 0, DUPLICATE_SAME_ACCESS); if(!NT_SUCCESS(*Status)) { _____ Modified: trunk/reactos/lib/kernel32/misc/handle.c --- trunk/reactos/lib/kernel32/misc/handle.c 2005-12-10 17:00:54 UTC (rev 20039) +++ trunk/reactos/lib/kernel32/misc/handle.c 2005-12-10 17:09:35 UTC (rev 20040) @@ -232,7 +232,7 @@ hTargetProcessHandle, lpTargetHandle, dwDesiredAccess, - (BOOLEAN)bInheritHandle, + bInheritHandle ? OBJ_INHERIT : 0, dwOptions); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-12-10 17:00:54 UTC (rev 20039) +++ trunk/reactos/lib/rtl/registry.c 2005-12-10 17:09:35 UTC (rev 20040) @@ -44,7 +44,7 @@ NtCurrentProcess(), KeyHandle, 0, - FALSE, + 0, DUPLICATE_SAME_ACCESS); #ifndef NDEBUG if(!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-12-10 17:00:54 UTC (rev 20039) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-12-10 17:09:35 UTC (rev 20040) @@ -121,7 +121,7 @@ CsrProcessHandle, Handle, DesiredAccess, - TRUE, + OBJ_INHERIT, 0); /* Close our handle to CSRSS */

18 years, 9 months

[weiden] 20039: don't touch the key handle in NtOpenKey in failure cases

by weiden＠svn.reactos.com

don't touch the key handle in NtOpenKey in failure cases Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-10 16:38:04 UTC (rev 20038) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-10 17:00:54 UTC (rev 20039) @@ -1256,7 +1256,7 @@ UNICODE_STRING RemainingPath; KPROCESSOR_MODE PreviousMode; PVOID Object = NULL; - HANDLE hKey; + HANDLE hKey = NULL; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; @@ -1333,8 +1333,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because CmpFindObject returns STATUS_UNSUCCESSFUL */ - hKey = *KeyHandle; /* Preserve hkResult value */ + Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ goto openkey_cleanup; } @@ -1346,7 +1345,6 @@ { RtlFreeUnicodeString(&RemainingPath); Status = STATUS_OBJECT_NAME_NOT_FOUND; - hKey = NULL; goto openkey_cleanup; } @@ -1356,7 +1354,6 @@ if (((PKEY_OBJECT)Object)->Flags & KO_MARKED_FOR_DELETE) { Status = STATUS_UNSUCCESSFUL; - hKey = NULL; goto openkey_cleanup; } @@ -1365,9 +1362,6 @@ ObjectCreateInfo.Attributes, &hKey); - if (!NT_SUCCESS(Status)) - hKey = NULL; - openkey_cleanup: ObpReleaseCapturedAttributes(&ObjectCreateInfo); @@ -1381,15 +1375,18 @@ ObDereferenceObject(Object); } - _SEH_TRY + if (NT_SUCCESS(Status)) { - *KeyHandle = hKey; + _SEH_TRY + { + *KeyHandle = hKey; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; return Status; }

18 years, 9 months

[weiden] 20038: - support for kernel handles

by weiden＠svn.reactos.com

- support for kernel handles - attach to owning process before accessing the handle table if necessary Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-10 15:53:27 UTC (rev 20037) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-12-10 16:38:04 UTC (rev 20038) @@ -247,7 +247,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - goto Cleanup; + return Status; } PostCreateKeyInfo.CompleteName = &ObjectName; @@ -255,7 +255,6 @@ Status = CmiCallRegisteredCallbacks(RegNtPreCreateKey, &PreCreateKeyInfo); if (!NT_SUCCESS(Status)) { - ObpReleaseCapturedAttributes(&ObjectCreateInfo); goto Cleanup; } @@ -264,7 +263,6 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (!NT_SUCCESS(Status)) { PostCreateKeyInfo.Object = NULL; @@ -291,11 +289,10 @@ goto Cleanup; } - Status = ObpCreateHandle(PsGetCurrentProcess(), - Object, - DesiredAccess, - TRUE, - &hKey); + Status = ObpCreateHandle(Object, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); if (!NT_SUCCESS(Status)) DPRINT1("ObpCreateHandle failed Status 0x%x\n", Status); @@ -466,6 +463,7 @@ _SEH_END; Cleanup: + ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (Class != NULL) { ReleaseCapturedUnicodeString(&CapturedClass, @@ -1332,7 +1330,6 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); @@ -1363,17 +1360,17 @@ goto openkey_cleanup; } - Status = ObpCreateHandle(PsGetCurrentProcess(), - Object, - DesiredAccess, - TRUE, - &hKey); + Status = ObpCreateHandle(Object, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); if (!NT_SUCCESS(Status)) hKey = NULL; openkey_cleanup: + ObpReleaseCapturedAttributes(&ObjectCreateInfo); PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; PostOpenKeyInfo.Status = Status; CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-12-10 15:53:27 UTC (rev 20037) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-12-10 16:38:04 UTC (rev 20038) @@ -429,10 +429,9 @@ RTL_USER_PROCESS_INFORMATION Info; /* Create a handle to the process */ - Status = ObpCreateHandle(PsGetCurrentProcess(), - PsInitialSystemProcess, + Status = ObpCreateHandle(PsInitialSystemProcess, PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION, - FALSE, + OBJ_KERNEL_HANDLE, &SystemProcessHandle); if(!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-12-10 15:53:27 UTC (rev 20037) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-12-10 16:38:04 UTC (rev 20038) @@ -51,6 +51,8 @@ ((ProcessorMode) == KernelMode)) #define ObKernelHandleToHandle(Handle) \ (HANDLE)((ULONG_PTR)(Handle) & ~KERNEL_HANDLE_FLAG) +#define ObMarkHandleAsKernelHandle(Handle) \ + (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) extern PDIRECTORY_OBJECT NameSpaceRoot; extern POBJECT_TYPE ObSymbolicLinkType; @@ -75,10 +77,9 @@ NTSTATUS NTAPI ObpCreateHandle( - struct _EPROCESS* Process, PVOID ObjectBody, ACCESS_MASK GrantedAccess, - BOOLEAN Inherit, + ULONG HandleAttributes, PHANDLE Handle ); @@ -134,7 +135,7 @@ HANDLE SourceHandle, PHANDLE TargetHandle, ACCESS_MASK DesiredAccess, - BOOLEAN InheritHandle, + ULONG HandleAttributes, ULONG Options ); _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-12-10 15:53:27 UTC (rev 20037) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-12-10 16:38:04 UTC (rev 20038) @@ -89,42 +89,57 @@ ObpQueryHandleAttributes(HANDLE Handle, POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) { - PHANDLE_TABLE HandleTable; PHANDLE_TABLE_ENTRY HandleTableEntry; + PEPROCESS Process, CurrentProcess; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("ObpQueryHandleAttributes(Handle %x)\n", Handle); + DPRINT("ObpQueryHandleAttributes(Handle %p)\n", Handle); + CurrentProcess = PsGetCurrentProcess(); + KeEnterCriticalRegion(); + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) { - HandleTable = ObpKernelHandleTable; + Process = PsInitialSystemProcess; Handle = ObKernelHandleToHandle(Handle); + + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } } else { - HandleTable = PsGetCurrentProcess()->ObjectTable; + Process = CurrentProcess; } - KeEnterCriticalRegion(); - - HandleTableEntry = ExMapHandleToPointer(HandleTable, + HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, Handle); - if (HandleTableEntry == NULL) - { - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; - } + if (HandleTableEntry != NULL) + { + HandleInfo->Inherit = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + HandleInfo->ProtectFromClose = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; - HandleInfo->Inherit = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - HandleInfo->ProtectFromClose = (HandleTableEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; + ExUnlockHandleTableEntry(Process->ObjectTable, + HandleTableEntry); + } + else + Status = STATUS_INVALID_HANDLE; - ExUnlockHandleTableEntry(HandleTable, - HandleTableEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } KeLeaveCriticalRegion(); - return STATUS_SUCCESS; + return Status; } @@ -133,75 +148,92 @@ ObpSetHandleAttributes(HANDLE Handle, POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) { - PHANDLE_TABLE HandleTable; PHANDLE_TABLE_ENTRY HandleTableEntry; + PEPROCESS Process, CurrentProcess; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("ObpSetHandleAttributes(Handle %x)\n", Handle); + DPRINT("ObpSetHandleAttributes(Handle %p)\n", Handle); + CurrentProcess = PsGetCurrentProcess(); + KeEnterCriticalRegion(); + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) { - HandleTable = ObpKernelHandleTable; + Process = PsInitialSystemProcess; Handle = ObKernelHandleToHandle(Handle); + + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } } else { - HandleTable = PsGetCurrentProcess()->ObjectTable; + Process = CurrentProcess; } - KeEnterCriticalRegion(); - - HandleTableEntry = ExMapHandleToPointer(HandleTable, + HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, Handle); - if (HandleTableEntry == NULL) - { - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; - } + if (HandleTableEntry != NULL) + { + if (HandleInfo->Inherit) + HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + else + HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - if (HandleInfo->Inherit) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + if (HandleInfo->ProtectFromClose) + HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + else + HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - if (HandleInfo->ProtectFromClose) - HandleTableEntry->u1.ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + /* FIXME: Do we need to set anything in the object header??? */ + + ExUnlockHandleTableEntry(Process->ObjectTable, + HandleTableEntry); + } else - HandleTableEntry->u1.ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + Status = STATUS_INVALID_HANDLE; - /* FIXME: Do we need to set anything in the object header??? */ + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } - ExUnlockHandleTableEntry(HandleTable, - HandleTableEntry); - KeLeaveCriticalRegion(); - return STATUS_SUCCESS; + return Status; } static NTSTATUS -ObpDeleteHandle(PHANDLE_TABLE HandleTable, - HANDLE Handle) +ObpDeleteHandle(HANDLE Handle) { PHANDLE_TABLE_ENTRY HandleEntry; PVOID Body; POBJECT_HEADER ObjectHeader; + PHANDLE_TABLE ObjectTable; PAGED_CODE(); - DPRINT("ObpDeleteHandle(Handle %x)\n",Handle); + DPRINT("ObpDeleteHandle(Handle %p)\n",Handle); + ObjectTable = PsGetCurrentProcess()->ObjectTable; + KeEnterCriticalRegion(); - HandleEntry = ExMapHandleToPointer(HandleTable, + HandleEntry = ExMapHandleToPointer(ObjectTable, Handle); if(HandleEntry != NULL) { if(HandleEntry->u1.ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) { - ExUnlockHandleTableEntry(HandleTable, + ExUnlockHandleTableEntry(ObjectTable, HandleEntry); KeLeaveCriticalRegion(); @@ -212,13 +244,13 @@ ObjectHeader = EX_HTE_TO_HDR(HandleEntry); Body = &ObjectHeader->Body; - ObpDecrementHandleCount(Body); - - /* destroy and unlock the handle entry */ - ExDestroyHandleByEntry(HandleTable, + /* destroy and unlock the handle entry */ + ExDestroyHandleByEntry(ObjectTable, HandleEntry, Handle); + ObpDecrementHandleCount(Body); + KeLeaveCriticalRegion(); return STATUS_SUCCESS; @@ -235,35 +267,48 @@ HANDLE SourceHandle, PHANDLE TargetHandle, ACCESS_MASK DesiredAccess, - BOOLEAN InheritHandle, + ULONG HandleAttributes, ULONG Options) { - PHANDLE_TABLE SourceHandleTable; PHANDLE_TABLE_ENTRY SourceHandleEntry; HANDLE_TABLE_ENTRY NewHandleEntry; + BOOLEAN AttachedToProcess = FALSE; PVOID ObjectBody; POBJECT_HEADER ObjectHeader; ULONG NewHandleCount; HANDLE NewTargetHandle; + PEPROCESS CurrentProcess; + KAPC_STATE ApcState; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - if(ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) + if(SourceProcess == NULL || + ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) { - SourceHandleTable = ObpKernelHandleTable; + SourceProcess = PsInitialSystemProcess; SourceHandle = ObKernelHandleToHandle(SourceHandle); } - else - { - SourceHandleTable = SourceProcess->ObjectTable; - } + CurrentProcess = PsGetCurrentProcess(); + KeEnterCriticalRegion(); - SourceHandleEntry = ExMapHandleToPointer(SourceHandleTable, + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, SourceHandle); if (SourceHandleEntry == NULL) { + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + KeLeaveCriticalRegion(); return STATUS_INVALID_HANDLE; } @@ -272,7 +317,7 @@ ObjectBody = &ObjectHeader->Body; NewHandleEntry.u1.Object = SourceHandleEntry->u1.Object; - if(InheritHandle) + if(HandleAttributes & OBJ_INHERIT) NewHandleEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else NewHandleEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; @@ -305,27 +350,54 @@ NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); ASSERT(NewHandleCount >= 2); - ExUnlockHandleTableEntry(SourceHandleTable, + ExUnlockHandleTableEntry(SourceProcess->ObjectTable, SourceHandleEntry); - KeLeaveCriticalRegion(); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + if (TargetProcess != CurrentProcess) + { + KeStackAttachProcess(&TargetProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + /* attempt to create the new handle */ NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, &NewHandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + if (NewTargetHandle != NULL) { if (Options & DUPLICATE_CLOSE_SOURCE) { - ObpDeleteHandle(SourceHandleTable, - SourceHandle); + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + /* delete the source handle */ + ObpDeleteHandle(SourceHandle); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } } ObDereferenceObject(ObjectBody); *TargetHandle = NewTargetHandle; - - return STATUS_SUCCESS; } else { @@ -337,8 +409,12 @@ } ObDereferenceObject(ObjectBody); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; } + + KeLeaveCriticalRegion(); + + return Status; } /* @@ -350,7 +426,7 @@ IN HANDLE TargetProcessHandle, OUT PHANDLE TargetHandle OPTIONAL, IN ACCESS_MASK DesiredAccess, - IN ULONG InheritHandle, + IN ULONG HandleAttributes, IN ULONG Options) /* * FUNCTION: Copies a handle from one process space to another @@ -364,8 +440,7 @@ * TargetHandle (OUT) = Caller should supply storage for the * duplicated handle. * DesiredAccess = The desired access to the handle. - * InheritHandle = Indicates wheter the new handle will be inheritable - * or not. + * HandleAttributes = The desired handle attributes. * Options = Specifies special actions upon duplicating the handle. * Can be one of the values DUPLICATE_CLOSE_SOURCE | * DUPLICATE_SAME_ACCESS. DUPLICATE_CLOSE_SOURCE specifies @@ -379,8 +454,11 @@ { PEPROCESS SourceProcess; PEPROCESS TargetProcess; + PEPROCESS CurrentProcess; HANDLE hTarget; + BOOLEAN AttachedToProcess = FALSE; KPROCESSOR_MODE PreviousMode; + KAPC_STATE ApcState; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -428,6 +506,8 @@ return(Status); } + CurrentProcess = PsGetCurrentProcess(); + /* Check for magic handle first */ if (SourceHandle == NtCurrentThread() || SourceHandle == NtCurrentProcess()) @@ -458,18 +538,42 @@ &ObjectType->TypeInfo.GenericMapping); } } - Status = ObpCreateHandle(TargetProcess, - ObjectBody, + + if (TargetProcess != CurrentProcess) + { + KeStackAttachProcess(&TargetProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + Status = ObpCreateHandle(ObjectBody, DesiredAccess, - InheritHandle, + HandleAttributes, &hTarget); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + ObDereferenceObject(ObjectBody); if (Options & DUPLICATE_CLOSE_SOURCE) { - ObpDeleteHandle(SourceProcess->ObjectTable, - SourceHandle); + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + ObpDeleteHandle(SourceHandle); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } } } } @@ -480,7 +584,7 @@ SourceHandle, &hTarget, DesiredAccess, - InheritHandle, + HandleAttributes, Options); } @@ -591,11 +695,10 @@ NTSTATUS NTAPI -ObpCreateHandle(PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - BOOLEAN Inherit, - PHANDLE HandleReturn) +ObpCreateHandle(PVOID ObjectBody, + ACCESS_MASK GrantedAccess, + ULONG HandleAttributes, + PHANDLE HandleReturn) /* * FUNCTION: Add a handle referencing an object * ARGUMENTS: @@ -605,18 +708,23 @@ */ { HANDLE_TABLE_ENTRY NewEntry; + PEPROCESS Process, CurrentProcess; POBJECT_HEADER ObjectHeader; HANDLE Handle; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; PAGED_CODE(); - DPRINT("ObpCreateHandle(Process %x, obj %x)\n",Process,ObjectBody); + DPRINT("ObpCreateHandle(obj %p)\n",ObjectBody); - ASSERT(Process); ASSERT(ObjectBody); + CurrentProcess = PsGetCurrentProcess(); + ObjectHeader = BODY_TO_HEADER(ObjectBody); + /* check that this is a valid kernel pointer */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); if (GrantedAccess & MAXIMUM_ALLOWED) @@ -632,23 +740,49 @@ } NewEntry.u1.Object = ObjectHeader; - if(Inherit) + if(HandleAttributes & OBJ_INHERIT) NewEntry.u1.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; else NewEntry.u1.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; NewEntry.u2.GrantedAccess = GrantedAccess; + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && + ExGetPreviousMode == KernelMode) + { + Process = PsInitialSystemProcess; + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + Process = CurrentProcess; + /* mask out the OBJ_KERNEL_HANDLE attribute */ + HandleAttributes &= ~OBJ_KERNEL_HANDLE; + } + Handle = ExCreateHandle(Process->ObjectTable, &NewEntry); - DPRINT("ObCreateHandle(0x%x)==0x%x [HT:0x%x]\n", ObjectHeader, Handle, Process->ObjectTable); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + if(Handle != NULL) { + if (HandleAttributes & OBJ_KERNEL_HANDLE) + { + /* mark the handle value */ + Handle = ObMarkHandleAsKernelHandle(Handle); + } + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) { - ObReferenceObjectByPointer(ObjectBody, - 0, - NULL, - UserMode); + ObReferenceObject(ObjectBody); } *HandleReturn = Handle; @@ -668,16 +802,34 @@ OUT PBOOLEAN GenerateOnClose) { PHANDLE_TABLE_ENTRY HandleEntry; - PEPROCESS Process; + PEPROCESS Process, CurrentProcess; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("ObQueryObjectAuditingByHandle(Handle %x)\n", Handle); + DPRINT("ObQueryObjectAuditingByHandle(Handle %p)\n", Handle); - Process = PsGetCurrentProcess(); + CurrentProcess = PsGetCurrentProcess(); KeEnterCriticalRegion(); + if(ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + Process = PsInitialSystemProcess; + Handle = ObKernelHandleToHandle(Handle); + + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + } + else + Process = CurrentProcess; + HandleEntry = ExMapHandleToPointer(Process->ObjectTable, Handle); if(HandleEntry != NULL) @@ -686,15 +838,18 @@ ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); + } + else + Status = STATUS_INVALID_HANDLE; - KeLeaveCriticalRegion(); - - return STATUS_SUCCESS; + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); } KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; + return Status; } @@ -723,29 +878,32 @@ { PHANDLE_TABLE_ENTRY HandleEntry; POBJECT_HEADER ObjectHeader; - PHANDLE_TABLE HandleTable; PVOID ObjectBody; ACCESS_MASK GrantedAccess; ULONG Attributes; + PEPROCESS CurrentProcess, Process; + BOOLEAN AttachedToProcess = FALSE; + KAPC_STATE ApcState; PAGED_CODE(); - DPRINT("ObReferenceObjectByHandle(Handle %x, DesiredAccess %x, " - "ObjectType %x, AccessMode %d, Object %x)\n",Handle,DesiredAccess, + DPRINT("ObReferenceObjectByHandle(Handle %p, DesiredAccess %x, " + "ObjectType %p, AccessMode %d, Object %p)\n",Handle,DesiredAccess, ObjectType,AccessMode,Object); if (Handle == NULL) { return STATUS_INVALID_HANDLE; } + + CurrentProcess = PsGetCurrentProcess(); + /* * Handle special handle names */ if (Handle == NtCurrentProcess() && (ObjectType == PsProcessType || ObjectType == NULL)) { - PEPROCESS CurrentProcess = PsGetCurrentProcess(); - ObReferenceObject(CurrentProcess); if (HandleInformation != NULL) @@ -755,7 +913,7 @@ } *Object = CurrentProcess; - DPRINT("Referencing current process %x\n", CurrentProcess); + DPRINT("Referencing current process %p\n", CurrentProcess); return STATUS_SUCCESS; } else if (Handle == NtCurrentProcess()) @@ -796,37 +954,53 @@ if(ObIsKernelHandle(Handle, AccessMode)) { - HandleTable = ObpKernelHandleTable; + Process = PsInitialSystemProcess; Handle = ObKernelHandleToHandle(Handle); } else { - HandleTable = PsGetCurrentProcess()->ObjectTable; + Process = CurrentProcess; } KeEnterCriticalRegion(); - HandleEntry = ExMapHandleToPointer(HandleTable, + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + HandleEntry = ExMapHandleToPointer(Process->ObjectTable, Handle); if (HandleEntry == NULL) { + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } KeLeaveCriticalRegion(); - DPRINT("ExMapHandleToPointer() failed for handle 0x%x\n", Handle); + DPRINT("ExMapHandleToPointer() failed for handle 0x%p\n", Handle); return(STATUS_INVALID_HANDLE); } ObjectHeader = EX_HTE_TO_HDR(HandleEntry); ObjectBody = &ObjectHeader->Body; - DPRINT("locked1: ObjectHeader: 0x%x [HT:0x%x]\n", ObjectHeader, HandleTable); + DPRINT("locked1: ObjectHeader: 0x%p [HT:0x%p]\n", ObjectHeader, Process->ObjectTable); if (ObjectType != NULL && ObjectType != ObjectHeader->Type) { - DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%x)\n", &ObjectType->Name, ObjectHeader->Type ? &ObjectHeader->Type->Name : NULL, Handle); + DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%p)\n", &ObjectType->Name, ObjectHeader->Type ? &ObjectHeader->Type->Name : NULL, Handle); - ExUnlockHandleTableEntry(HandleTable, + ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + KeLeaveCriticalRegion(); return(STATUS_OBJECT_TYPE_MISMATCH); @@ -845,9 +1019,14 @@ rights than the handle can grant */ if(AccessMode != KernelMode && (~GrantedAccess & DesiredAccess)) { - ExUnlockHandleTableEntry(HandleTable, + ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + KeLeaveCriticalRegion(); DPRINT1("GrantedAccess: 0x%x, ~GrantedAccess: 0x%x, DesiredAccess: 0x%x, denied: 0x%x\n", GrantedAccess, ~GrantedAccess, DesiredAccess, ~GrantedAccess & DesiredAccess); @@ -861,9 +1040,14 @@ EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - ExUnlockHandleTableEntry(HandleTable, + ExUnlockHandleTableEntry(Process->ObjectTable, HandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + KeLeaveCriticalRegion(); if (HandleInformation != NULL) @@ -897,27 +1081,43 @@ NTSTATUS STDCALL NtClose(IN HANDLE Handle) { - PHANDLE_TABLE HandleTable; + PEPROCESS Process, CurrentProcess; + BOOLEAN AttachedToProcess = FALSE; + KAPC_STATE ApcState; NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; PAGED_CODE(); - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) + PreviousMode = ExGetPreviousMode(); + CurrentProcess = PsGetCurrentProcess(); + + if(ObIsKernelHandle(Handle, PreviousMode)) { - HandleTable = ObpKernelHandleTable; + Process = PsInitialSystemProcess; Handle = ObKernelHandleToHandle(Handle); + + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } } else + Process = CurrentProcess; + + Status = ObpDeleteHandle(Handle); + + if (AttachedToProcess) { - HandleTable = PsGetCurrentProcess()->ObjectTable; + KeUnstackDetachProcess(&ApcState); } - Status = ObpDeleteHandle(HandleTable, - Handle); if (!NT_SUCCESS(Status)) { - if((ExGetPreviousMode() != KernelMode) && - (PsGetCurrentProcess()->ExceptionPort)) + if((PreviousMode != KernelMode) && + (CurrentProcess->ExceptionPort)) { KeRaiseUserException(Status); } @@ -1128,10 +1328,9 @@ DPRINT("Creating handle\n"); if (Handle != NULL) { - Status = ObpCreateHandle(PsGetCurrentProcess(), - &Header->Body, + Status = ObpCreateHandle(&Header->Body, DesiredAccess, - ObjectCreateInfo->Attributes & OBJ_INHERIT, + ObjectCreateInfo->Attributes, Handle); DPRINT("handle Created: %d. refcount. handlecount %d %d\n", *Handle, Header->PointerCount, Header->HandleCount); _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-12-10 15:53:27 UTC (rev 20037) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-12-10 16:38:04 UTC (rev 20038) @@ -183,19 +183,18 @@ &Object, &RemainingPath, ObjectType); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT("ObFindObject() failed (Status %lx)\n", Status); - return Status; + goto Cleanup; } - DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); + DPRINT("OBject: %p, Remaining Path: %wZ\n", Object, &RemainingPath); if (Object == NULL) { - RtlFreeUnicodeString(&RemainingPath); - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; } if (RemainingPath.Buffer != NULL) { @@ -203,19 +202,21 @@ Status = STATUS_OBJECT_NAME_NOT_FOUND; else Status =STATUS_OBJECT_PATH_NOT_FOUND; - RtlFreeUnicodeString(&RemainingPath); - ObDereferenceObject(Object); - return Status; + goto Cleanup; } - Status = ObpCreateHandle(PsGetCurrentProcess(), - Object, - DesiredAccess, - FALSE, - Handle); [truncated at 1000 lines; 107 more skipped]

18 years, 9 months

[weiden] 20037: fixed compiling with -Wwrite-strings

by weiden＠svn.reactos.com

fixed compiling with -Wwrite-strings Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c 2005-12-10 15:40:52 UTC (rev 20036) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c 2005-12-10 15:53:27 UTC (rev 20037) @@ -196,8 +196,8 @@ // r = Red, g = Green, o = Orange, x = Off // This func is taken from cromwell, all credits goes for them void -XboxSetLED(UCHAR *pattern) { - char *x = pattern; +XboxSetLED(PCSTR pattern) { + const char *x = pattern; int r, g; if(strlen(pattern) == 4) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h 2005-12-10 15:40:52 UTC (rev 20036) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h 2005-12-10 15:53:27 UTC (rev 20037) @@ -60,7 +60,7 @@ VOID XboxHwDetect(VOID); -VOID XboxSetLED(UCHAR *Pattern); +VOID XboxSetLED(PCSTR Pattern); #endif /* __I386_HWXBOX_H_ */

18 years, 9 months

← Newer
1
...
43
44
45
46
47
48
49
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005