Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 16408: - hide the keyboard focus when appropriate
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

- hide the keyboard focus when appropriate - add missing definitions to w32api Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 11:52:16 UTC (rev 16407) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 13:21:14 UTC (rev 16408) @@ -50,6 +50,7 @@ PCHECKITEM FocusedCheckItem; UINT FocusedCheckItemBox; BOOL FocusedPushed; + BOOL FocusVisible; COLORREF TextColor[2]; UINT CheckBoxLeft[2]; @@ -840,7 +841,7 @@ ((Item->State & CIS_ALLOW) ? DFCS_CHECKED : 0) | (IsPushed ? DFCS_PUSHED : 0)); } - if (Item == infoPtr->FocusedCheckItem && + if (Item == infoPtr->FocusedCheckItem && infoPtr->FocusVisible && infoPtr->HasFocus && infoPtr->FocusedCheckItemBox != CLB_DENY) { @@ -895,7 +896,7 @@ ((Item->State & CIS_DENY) ? DFCS_CHECKED : 0) | (IsPushed ? DFCS_PUSHED : 0)); } - if (infoPtr->HasFocus && + if (infoPtr->HasFocus && infoPtr->FocusVisible && Item == infoPtr->FocusedCheckItem && infoPtr->FocusedCheckItemBox == CLB_DENY) { @@ -995,8 +996,8 @@ rcUpdate.left = rcClient.left + infoPtr->CheckBoxLeft[ItemBox] - (infoPtr->ItemHeight / 2); rcUpdate.right = rcUpdate.left + infoPtr->ItemHeight; - rcUpdate.top = ((Index - VisibleFirst) * infoPtr->ItemHeight) + CI_TEXT_MARGIN_HEIGHT; - rcUpdate.bottom = rcUpdate.top + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT); + rcUpdate.top = ((Index - VisibleFirst) * infoPtr->ItemHeight); + rcUpdate.bottom = rcUpdate.top + infoPtr->ItemHeight; RedrawWindow(infoPtr->hSelf, &rcUpdate, @@ -1727,6 +1728,15 @@ Shift, &NewFocusBox); + if (!infoPtr->FocusVisible) + { + /* change the UI status */ + SendMessage(GetAncestor(hwnd, GA_ROOT), + WM_CHANGEUISTATE, + MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS), + 0); + } + ChangeCheckItemFocus(infoPtr, NewFocus, NewFocusBox); @@ -1852,6 +1862,35 @@ TRUE); break; } + + case WM_UPDATEUISTATE: + { + BOOL OldFocusVisible = infoPtr->FocusVisible; + + switch(LOWORD(wParam)) + { + case UIS_CLEAR: + { + infoPtr->FocusVisible = (HIWORD(wParam) & UISF_HIDEFOCUS); + break; + } + case UIS_SET: + case UIS_INITIALIZE: + { + infoPtr->FocusVisible = !(HIWORD(wParam) & UISF_HIDEFOCUS); + break; + } + } + + if (infoPtr->FocusVisible != OldFocusVisible && + infoPtr->FocusedCheckItem != NULL) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } + break; + } case WM_CREATE: { @@ -1908,6 +1947,11 @@ infoPtr->ThemeHandle = NULL; } #endif + + infoPtr->FocusVisible = !(SendMessage(hwnd, + WM_QUERYUISTATE, + 0, + 0) & UISF_HIDEFOCUS); } else { _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-07-04 11:52:16 UTC (rev 16407) +++ trunk/reactos/w32api/include/winuser.h 2005-07-04 13:21:14 UTC (rev 16408) @@ -1316,7 +1316,24 @@ #define WM_CANCELMODE 31 #define WM_CAPTURECHANGED 533 #define WM_CHANGECBCHAIN 781 + +#if (WINVER >= 0x0500) #define WM_CHANGEUISTATE 295 +#define WM_UPDATEUISTATE 296 +#define WM_QUERYUISTATE 297 + +#define UIS_SET 1 +#define UIS_CLEAR 2 +#define UIS_INITIALIZE 3 + +#define UISF_HIDEFOCUS 0x1 +#define UISF_HIDEACCEL 0x2 +#if (WINVER >= 0x0501) +#define UISF_ACTIVE 0x4 +#endif + +#endif + #define WM_CHAR 258 #define WM_CHARTOITEM 47 #define WM_CHILDACTIVATE 34

1 0

[weiden] 16407: fixed some scrolling issues
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

fixed some scrolling issues Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 11:05:04 UTC (rev 16406) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 11:52:16 UTC (rev 16407) @@ -310,17 +310,16 @@ if (DirectlyInCheckBox != NULL) { INT y = ppt->y % infoPtr->ItemHeight; + INT cxBox = infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT); if ((y >= CI_TEXT_MARGIN_HEIGHT && y < infoPtr->ItemHeight - CI_TEXT_MARGIN_HEIGHT) && - (((ppt->x >= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2))) && - (ppt->x < (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2) + - infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)))) + (((ppt->x >= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (cxBox / 2))) && + (ppt->x < (infoPtr->CheckBoxLeft[CLB_ALLOW] - (cxBox / 2) + cxBox))) || - ((ppt->x >= (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2))) && - (ppt->x < (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2) + - infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)))))) + ((ppt->x >= (infoPtr->CheckBoxLeft[CLB_DENY] - (cxBox / 2))) && + (ppt->x < (infoPtr->CheckBoxLeft[CLB_DENY] - (cxBox / 2) + cxBox))))) { *DirectlyInCheckBox = TRUE; } @@ -446,6 +445,7 @@ RECT rcClient; SCROLLINFO ScrollInfo; LONG Style; + INT VisibleItems; GetClientRect(infoPtr->hSelf, &rcClient); @@ -457,33 +457,40 @@ ScrollInfo.nPage = ((rcClient.bottom - rcClient.top) + infoPtr->ItemHeight - 1) / infoPtr->ItemHeight; ScrollInfo.nPos = 0; ScrollInfo.nTrackPos = 0; + + VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; + + if (ScrollInfo.nPage == VisibleItems && ScrollInfo.nMax > 0) + { + ScrollInfo.nMax--; + } + SetScrollInfo(infoPtr->hSelf, + SB_VERT, + &ScrollInfo, + TRUE); + if (AllowChangeStyle) { Style = GetWindowLong(infoPtr->hSelf, GWL_STYLE); /* determine whether the vertical scrollbar has to be visible or not */ - if (ScrollInfo.nMax > ScrollInfo.nPage && + if (ScrollInfo.nMax > VisibleItems && !(Style & WS_VSCROLL)) { SetWindowLong(infoPtr->hSelf, GWL_STYLE, Style | WS_VSCROLL); } - else if (ScrollInfo.nMax < ScrollInfo.nPage && - Style & WS_VSCROLL) + else if (ScrollInfo.nMax <= VisibleItems && + (Style & WS_VSCROLL)) { SetWindowLong(infoPtr->hSelf, GWL_STYLE, Style & ~WS_VSCROLL); } } - - SetScrollInfo(infoPtr->hSelf, - SB_VERT, - &ScrollInfo, - TRUE); RedrawWindow(infoPtr->hSelf, NULL,

1 0

[weiden] 16406: handle resizing of the control
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

handle resizing of the control Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 09:46:50 UTC (rev 16405) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 11:05:04 UTC (rev 16406) @@ -63,8 +63,8 @@ #endif } CHECKLISTWND, *PCHECKLISTWND; -#define CI_TEXT_MARGIN_WIDTH (6) -#define CI_TEXT_MARGIN_HEIGHT (2) +#define CI_TEXT_MARGIN_WIDTH (8) +#define CI_TEXT_MARGIN_HEIGHT (3) static PCHECKITEM FindCheckItemByIndex(IN PCHECKLISTWND infoPtr, @@ -153,10 +153,9 @@ { /* return the Deny checkbox in case both check boxes are enabled! */ *CheckBox = ((!(LastEnabledItem->State & CIS_DENYDISABLED)) ? CLB_DENY : CLB_ALLOW); - return LastEnabledItem; } - return NULL; + return LastEnabledItem; } static PCHECKITEM @@ -631,7 +630,7 @@ } else { - height = 0; + height = 2; } SelectObject(hdc, @@ -655,7 +654,7 @@ if (hOldFont != hFont) { - infoPtr->ItemHeight = 4 + GetIdealItemHeight(infoPtr); + infoPtr->ItemHeight = (2 * CI_TEXT_MARGIN_HEIGHT) + GetIdealItemHeight(infoPtr); } UpdateControl(infoPtr, @@ -762,7 +761,7 @@ Item != NULL && CurrentIndex <= LastTouchedIndex; Item = Item->Next, CurrentIndex++) { - TextRect.bottom = TextRect.top + infoPtr->ItemHeight; + TextRect.bottom = TextRect.top + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT); ItemRect.bottom = ItemRect.top + infoPtr->ItemHeight; SetBrushOrgEx(hDC, @@ -789,15 +788,16 @@ &TextRect, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); + CheckBox.top = TextRect.top; + CheckBox.bottom = TextRect.bottom; + /* draw the Allow checkbox */ IsPushed = (Enabled && Item == infoPtr->FocusedCheckItem && infoPtr->HasFocus && !(Item->State & CIS_ALLOWDISABLED) && infoPtr->FocusedCheckItemBox != CLB_DENY && infoPtr->FocusedPushed); CheckBox.left = infoPtr->CheckBoxLeft[CLB_ALLOW] - ((TextRect.bottom - TextRect.top) / 2); - CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT); - CheckBox.top = TextRect.top; - CheckBox.bottom = CheckBox.top + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT); + CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top); #if SUPPORT_UXTHEME if (infoPtr->ThemeHandle != NULL) { @@ -853,7 +853,7 @@ infoPtr->FocusedPushed); CheckBox.left = infoPtr->CheckBoxLeft[CLB_DENY] - ((TextRect.bottom - TextRect.top) / 2); - CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT); + CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top); #if SUPPORT_UXTHEME if (infoPtr->ThemeHandle != NULL) { @@ -1111,7 +1111,7 @@ #if SUPPORT_UXTHEME /* handle hovering checkboxes */ - if (hWndCapture == NULL) + if (hWndCapture == NULL && infoPtr->ThemeHandle != NULL) { TRACKMOUSEEVENT tme; PCHECKITEM HotTrackItem; @@ -1547,6 +1547,8 @@ infoPtr->HasFocus = FALSE; if (infoPtr->FocusedCheckItem != NULL) { + infoPtr->FocusedPushed = FALSE; + UpdateCheckItem(infoPtr, infoPtr->FocusedCheckItem); } @@ -1836,6 +1838,13 @@ #endif break; } + + case WM_SIZE: + { + UpdateControl(infoPtr, + TRUE); + break; + } case WM_CREATE: {

1 0

[weiden] 16405: get rid of the obsolete Makefile.ros-template files
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

get rid of the obsolete Makefile.ros-template files Deleted: trunk/reactos/lib/icmp/Makefile.ros-template Deleted: trunk/reactos/lib/iphlpapi/Makefile.ros-template Deleted: trunk/reactos/lib/msacm/Makefile.ros-template Deleted: trunk/reactos/lib/msi/Makefile.ros-template Deleted: trunk/reactos/lib/msimg32/Makefile.ros-template Deleted: trunk/reactos/lib/odbc32/Makefile.ros-template Deleted: trunk/reactos/lib/oledlg/Makefile.ros-template Deleted: trunk/reactos/lib/wininet/Makefile.ros-template _____ Deleted: trunk/reactos/lib/icmp/Makefile.ros-template --- trunk/reactos/lib/icmp/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/icmp/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = icmp - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ ws2_32.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32) - -#TARGET_RC_SRCS = @RC_SRCS@ -#TARGET_RC_BINSRC = @RC_BINSRC@ -#TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/iphlpapi/Makefile.ros-template --- trunk/reactos/lib/iphlpapi/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/iphlpapi/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id$ - -TARGET_NAME = iphlpapi - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a rtl.a - -TARGET_BASE = $(TARGET_BASE_LIB_IPHLPAPI) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/msacm/Makefile.ros-template --- trunk/reactos/lib/msacm/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/msacm/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id$ - -TARGET_NAME = msacm32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ ntdll.a wine.a - -TARGET_BASE = $(TARGET_BASE_LIB_MSACM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/msi/Makefile.ros-template --- trunk/reactos/lib/msi/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/msi/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,39 +0,0 @@ -# $Id: Makefile.ros-template - -TARGET_NAME = msi - -TARGET_OBJECTS = @C_SRCS@ @EXTRA_OBJS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_WINMM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -#TARGET_CLEAN = *.tab.c *.tab.h - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk - -# -# Optional use of bison, this will allow independent building from -# Wine. -# -# Bison is requiered for building msi.dll. If MingW32 for windows, -# download bison from http://gnuwin32.sourceforge.net/ -# Make sure bison.exe is placed in your command path for execution. -# -# - -#sql.tab.c sql.tab.h: sql.y -# bison -p SQL_ -d ./sql.y -o sql.tab.c - -#cond.tab.c cond.tab.h: cond.y -# bison -p COND_ -d ./cond.y -o cond.tab.c _____ Deleted: trunk/reactos/lib/msimg32/Makefile.ros-template --- trunk/reactos/lib/msimg32/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/msimg32/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,17 +0,0 @@ -TARGET_NAME = msimg32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_MSIMG32) - -TARGET_NORC = yes - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/odbc32/Makefile.ros-template --- trunk/reactos/lib/odbc32/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/odbc32/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id$ - -TARGET_NAME = odbc32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_ODBC32) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/oledlg/Makefile.ros-template --- trunk/reactos/lib/oledlg/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/oledlg/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = oledlg - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_OLEDLG) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/wininet/Makefile.ros-template --- trunk/reactos/lib/wininet/Makefile.ros-template 2005-07-04 00:30:23 UTC (rev 16404) +++ trunk/reactos/lib/wininet/Makefile.ros-template 2005-07-04 09:46:50 UTC (rev 16405) @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = wininet - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a ws2_32.a - -TARGET_BASE = $(TARGET_BASE_LIB_WININET) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk

1 0

[weiden] 16404: properly handle clicks outside a checkbox
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

properly handle clicks outside a checkbox Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-04 00:06:52 UTC (rev 16403) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 00:30:23 UTC (rev 16404) @@ -1593,7 +1593,7 @@ ChangeFocus = TRUE; } - if (ChangeFocus && GetCapture() == NULL && + if (InCheckBox && ChangeFocus && GetCapture() == NULL && (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONDBLCLK)) { infoPtr->FocusedPushed = TRUE;

1 0

[weiden] 16403: minor bugfixes
by weiden＠svn.reactos.com 04 Jul '05

04 Jul '05

minor bugfixes Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-03 23:29:36 UTC (rev 16402) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 00:06:52 UTC (rev 16403) @@ -1592,6 +1592,13 @@ { ChangeFocus = TRUE; } + + if (ChangeFocus && GetCapture() == NULL && + (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONDBLCLK)) + { + infoPtr->FocusedPushed = TRUE; + Capture = TRUE; + } } else { @@ -1600,14 +1607,6 @@ if (ChangeFocus) { - if (uMsg == WM_LBUTTONDOWN && - InCheckBox && GetCapture() != hwnd) - { - infoPtr->FocusedPushed = TRUE; - - Capture = TRUE; - } - ChangeCheckItemFocus(infoPtr, NewFocus, NewFocusBox); @@ -1637,6 +1636,9 @@ BOOL InCheckBox; POINT pt; + pt.x = (LONG)LOWORD(lParam); + pt.y = (LONG)HIWORD(lParam); + infoPtr->FocusedPushed = FALSE; PtItem = PtToCheckItemBox(infoPtr, @@ -1644,7 +1646,7 @@ &PtItemBox, &InCheckBox); - if (InCheckBox && PtItem == infoPtr->FocusedCheckItem && + if (PtItem == infoPtr->FocusedCheckItem && InCheckBox && PtItemBox == infoPtr->FocusedCheckItemBox) { ChangeCheckBox(infoPtr, @@ -1938,7 +1940,7 @@ ZeroMemory(&wc, sizeof(WNDCLASS)); - wc.style = 0; + wc.style = CS_DBLCLKS; wc.lpfnWndProc = CheckListWndProc; wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(PCHECKLISTWND);

1 0

[weiden] 16402: enable editing of the checkboxes and minor bugfixes
by weiden＠svn.reactos.com 03 Jul '05

03 Jul '05

enable editing of the checkboxes and minor bugfixes Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-03 21:37:16 UTC (rev 16401) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-03 23:29:36 UTC (rev 16402) @@ -49,6 +49,7 @@ BOOL HasFocus; PCHECKITEM FocusedCheckItem; UINT FocusedCheckItemBox; + BOOL FocusedPushed; COLORREF TextColor[2]; UINT CheckBoxLeft[2]; @@ -124,11 +125,11 @@ { /* return the Allow checkbox in case both check boxes are enabled! */ *CheckBox = ((!(CurItem->State & CIS_ALLOWDISABLED)) ? CLB_ALLOW : CLB_DENY); - return CurItem; + break; } } - return NULL; + return CurItem; } static PCHECKITEM @@ -312,13 +313,15 @@ INT y = ppt->y % infoPtr->ItemHeight; if ((y >= CI_TEXT_MARGIN_HEIGHT && - y <= infoPtr->ItemHeight - CI_TEXT_MARGIN_HEIGHT) && + y < infoPtr->ItemHeight - CI_TEXT_MARGIN_HEIGHT) && (((ppt->x >= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2))) && - (ppt->x <= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2) + infoPtr->ItemHeight))) + (ppt->x < (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2) + + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)))) || ((ppt->x >= (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2))) && - (ppt->x <= (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2) + infoPtr->ItemHeight))))) + (ppt->x < (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2) + + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)))))) { *DirectlyInCheckBox = TRUE; } @@ -663,19 +666,24 @@ #if SUPPORT_UXTHEME static INT -CalculateChkBoxStyle(IN BOOL Checked, - IN BOOL Enabled, - IN BOOL HotTrack) +CalculateCheckBoxStyle(IN BOOL Checked, + IN BOOL Enabled, + IN BOOL HotTrack, + IN BOOL Pushed) { INT BtnState; if (Checked) { - BtnState = (Enabled ? (HotTrack ? CBS_CHECKEDHOT : CBS_CHECKEDNORMAL) : CBS_CHECKEDDISABLED); + BtnState = (Enabled ? + (Pushed ? CBS_CHECKEDPRESSED : (HotTrack ? CBS_CHECKEDHOT : CBS_CHECKEDNORMAL)) : + CBS_CHECKEDDISABLED); } else { - BtnState = (Enabled ? (HotTrack ? CBS_UNCHECKEDHOT : CBS_UNCHECKEDNORMAL) : CBS_UNCHECKEDDISABLED); + BtnState = (Enabled ? + (Pushed ? CBS_UNCHECKEDPRESSED : (HotTrack ? CBS_UNCHECKEDHOT : CBS_UNCHECKEDNORMAL)) : + CBS_UNCHECKEDDISABLED); } return BtnState; @@ -721,7 +729,7 @@ HFONT hOldFont; DWORD CurrentIndex; COLORREF OldTextColor; - BOOL Enabled, PrevEnabled; + BOOL Enabled, PrevEnabled, IsPushed; POINT hOldBrushOrg; #if SUPPORT_UXTHEME HRESULT hDrawResult; @@ -780,8 +788,12 @@ -1, &TextRect, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER); - + /* draw the Allow checkbox */ + IsPushed = (Enabled && Item == infoPtr->FocusedCheckItem && infoPtr->HasFocus && + !(Item->State & CIS_ALLOWDISABLED) && infoPtr->FocusedCheckItemBox != CLB_DENY && + infoPtr->FocusedPushed); + CheckBox.left = infoPtr->CheckBoxLeft[CLB_ALLOW] - ((TextRect.bottom - TextRect.top) / 2); CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT); CheckBox.top = TextRect.top; @@ -789,9 +801,10 @@ #if SUPPORT_UXTHEME if (infoPtr->ThemeHandle != NULL) { - INT BtnState = CalculateChkBoxStyle(Item->State & CIS_ALLOW, - Enabled && !(Item->State & CIS_ALLOWDISABLED), - (ItemHovered && infoPtr->HoveredCheckItemBox != CLB_DENY)); + INT BtnState = CalculateCheckBoxStyle(Item->State & CIS_ALLOW, + Enabled && !(Item->State & CIS_ALLOWDISABLED), + (ItemHovered && infoPtr->HoveredCheckItemBox != CLB_DENY), + IsPushed); hDrawResult = DrawThemeBackground(infoPtr->ThemeHandle, @@ -817,10 +830,11 @@ DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_FLAT | ((Item->State & CIS_ALLOWDISABLED) || !Enabled ? DFCS_INACTIVE : 0) | - ((Item->State & CIS_ALLOW) ? DFCS_CHECKED : 0)); + ((Item->State & CIS_ALLOW) ? DFCS_CHECKED : 0) | + (IsPushed ? DFCS_PUSHED : 0)); } - if (infoPtr->HasFocus && - Item == infoPtr->FocusedCheckItem && + if (Item == infoPtr->FocusedCheckItem && + infoPtr->HasFocus && infoPtr->FocusedCheckItemBox != CLB_DENY) { RECT rcFocus = CheckBox; @@ -834,14 +848,19 @@ } /* draw the Deny checkbox */ + IsPushed = (Enabled && Item == infoPtr->FocusedCheckItem && infoPtr->HasFocus && + !(Item->State & CIS_DENYDISABLED) && infoPtr->FocusedCheckItemBox == CLB_DENY && + infoPtr->FocusedPushed); + CheckBox.left = infoPtr->CheckBoxLeft[CLB_DENY] - ((TextRect.bottom - TextRect.top) / 2); CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT); #if SUPPORT_UXTHEME if (infoPtr->ThemeHandle != NULL) { - INT BtnState = CalculateChkBoxStyle(Item->State & CIS_DENY, - Enabled && !(Item->State & CIS_DENYDISABLED), - (ItemHovered && infoPtr->HoveredCheckItemBox == CLB_DENY)); + INT BtnState = CalculateCheckBoxStyle(Item->State & CIS_DENY, + Enabled && !(Item->State & CIS_DENYDISABLED), + (ItemHovered && infoPtr->HoveredCheckItemBox == CLB_DENY), + IsPushed); hDrawResult = DrawThemeBackground(infoPtr->ThemeHandle, hDC, @@ -866,7 +885,8 @@ DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_FLAT | ((Item->State & CIS_DENYDISABLED) || !Enabled ? DFCS_INACTIVE : 0) | - ((Item->State & CIS_DENY) ? DFCS_CHECKED : 0)); + ((Item->State & CIS_DENY) ? DFCS_CHECKED : 0) | + (IsPushed ? DFCS_PUSHED : 0)); } if (infoPtr->HasFocus && Item == infoPtr->FocusedCheckItem && @@ -930,7 +950,6 @@ } } -#if SUPPORT_UXTHEME static VOID UpdateCheckItemBox(IN PCHECKLISTWND infoPtr, IN PCHECKITEM Item, @@ -971,7 +990,6 @@ rcUpdate.right = rcUpdate.left + infoPtr->ItemHeight; rcUpdate.top = ((Index - VisibleFirst) * infoPtr->ItemHeight) + CI_TEXT_MARGIN_HEIGHT; rcUpdate.bottom = rcUpdate.top + infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT); - DbgPrint("Repaint hot item\n"); RedrawWindow(infoPtr->hSelf, &rcUpdate, @@ -982,6 +1000,7 @@ } } +#if SUPPORT_UXTHEME static VOID ChangeCheckItemHotTrack(IN PCHECKLISTWND infoPtr, IN PCHECKITEM NewHotTrack, @@ -1016,6 +1035,22 @@ } #endif +static VOID +ChangeCheckBox(IN PCHECKLISTWND infoPtr, + IN PCHECKITEM CheckItem, + IN UINT CheckItemBox) +{ + DWORD NewState, OldState = CheckItem->State; + DWORD CheckedBit = ((infoPtr->FocusedCheckItemBox == CLB_DENY) ? CIS_DENY : CIS_ALLOW); + BOOL Checked = (CheckItem->State & CheckedBit) != 0; + + NewState = (Checked ? OldState & ~CheckedBit : OldState | CheckedBit); + + /* FIXME - send a notification message */ + + CheckItem->State = NewState; +} + static LRESULT CALLBACK CheckListWndProc(IN HWND hwnd, IN UINT uMsg, @@ -1067,20 +1102,20 @@ case WM_MOUSEMOVE: { -#if SUPPORT_UXTHEME + POINT pt; + BOOL InCheckBox; HWND hWndCapture = GetCapture(); + pt.x = (LONG)LOWORD(lParam); + pt.y = (LONG)HIWORD(lParam); + +#if SUPPORT_UXTHEME /* handle hovering checkboxes */ if (hWndCapture == NULL) { TRACKMOUSEEVENT tme; PCHECKITEM HotTrackItem; UINT HotTrackItemBox; - BOOL InCheckBox; - POINT pt; - - pt.x = (LONG)LOWORD(lParam); - pt.y = (LONG)HIWORD(lParam); HotTrackItem = PtToCheckItemBox(infoPtr, &pt, @@ -1111,6 +1146,30 @@ TrackMouseEvent(&tme); } #endif + + if (hWndCapture == hwnd && infoPtr->FocusedCheckItem != NULL) + { + PCHECKITEM PtItem; + UINT PtItemBox; + BOOL OldPushed; + + PtItem = PtToCheckItemBox(infoPtr, + &pt, + &PtItemBox, + &InCheckBox); + + OldPushed = infoPtr->FocusedPushed; + infoPtr->FocusedPushed = InCheckBox && infoPtr->FocusedCheckItem == PtItem && + infoPtr->FocusedCheckItemBox == PtItemBox; + + if (OldPushed != infoPtr->FocusedPushed) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } + } + break; } @@ -1494,6 +1553,7 @@ break; } + case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: @@ -1504,7 +1564,7 @@ INT NewFocusBox = 0; BOOL InCheckBox; POINT pt; - BOOL ChangeFocus; + BOOL ChangeFocus, Capture = FALSE; pt.x = (LONG)LOWORD(lParam); pt.y = (LONG)HIWORD(lParam); @@ -1540,6 +1600,14 @@ if (ChangeFocus) { + if (uMsg == WM_LBUTTONDOWN && + InCheckBox && GetCapture() != hwnd) + { + infoPtr->FocusedPushed = TRUE; + + Capture = TRUE; + } + ChangeCheckItemFocus(infoPtr, NewFocus, NewFocusBox); @@ -1549,33 +1617,109 @@ { SetFocus(hwnd); } + + if (Capture) + { + SetCapture(hwnd); + } } break; } + case WM_LBUTTONUP: + { + if (GetCapture() == hwnd) + { + if (infoPtr->FocusedCheckItem != NULL && infoPtr->FocusedPushed) + { + PCHECKITEM PtItem; + UINT PtItemBox; + BOOL InCheckBox; + POINT pt; + + infoPtr->FocusedPushed = FALSE; + + PtItem = PtToCheckItemBox(infoPtr, + &pt, + &PtItemBox, + &InCheckBox); + + if (InCheckBox && PtItem == infoPtr->FocusedCheckItem && + PtItemBox == infoPtr->FocusedCheckItemBox) + { + ChangeCheckBox(infoPtr, + PtItem, + PtItemBox); + } + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } + + ReleaseCapture(); + } + break; + } + case WM_KEYDOWN: { switch (wParam) { + case VK_SPACE: + { + if (infoPtr->FocusedCheckItem != NULL && GetCapture() == NULL) + { + BOOL OldPushed = infoPtr->FocusedPushed; + infoPtr->FocusedPushed = TRUE; + + if (infoPtr->FocusedPushed != OldPushed) + { + MakeCheckItemVisible(infoPtr, + infoPtr->FocusedCheckItem); + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } + } + break; + } + case VK_RETURN: { - /* FIXME */ + if (infoPtr->FocusedCheckItem != NULL && GetCapture() == NULL) + { + MakeCheckItemVisible(infoPtr, + infoPtr->FocusedCheckItem); + + ChangeCheckBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } break; } case VK_TAB: { - PCHECKITEM NewFocus; - UINT NewFocusBox = 0; - BOOL Shift = GetKeyState(VK_SHIFT) & 0x8000; - - NewFocus = FindEnabledCheckBox(infoPtr, - Shift, - &NewFocusBox); + if (GetCapture() == NULL) + { + PCHECKITEM NewFocus; + UINT NewFocusBox = 0; + BOOL Shift = GetKeyState(VK_SHIFT) & 0x8000; - ChangeCheckItemFocus(infoPtr, - NewFocus, - NewFocusBox); + NewFocus = FindEnabledCheckBox(infoPtr, + Shift, + &NewFocusBox); + + ChangeCheckItemFocus(infoPtr, + NewFocus, + NewFocusBox); + } break; } @@ -1591,6 +1735,25 @@ break; } + case WM_KEYUP: + { + if (wParam == VK_SPACE && IsWindowEnabled(hwnd) && + infoPtr->FocusedCheckItem != NULL && + infoPtr->FocusedPushed) + { + infoPtr->FocusedPushed = FALSE; + + ChangeCheckBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + } + break; + } + case WM_GETDLGCODE: { INT virtKey; @@ -1631,7 +1794,6 @@ #if SUPPORT_UXTHEME case WM_MOUSELEAVE: { - DbgPrint("WM_MOUSELEAVE\n"); if (infoPtr->HoveredCheckItem != NULL) { /* reset and repaint the hovered check item box */ @@ -1649,7 +1811,7 @@ CloseThemeData(infoPtr->ThemeHandle); infoPtr->ThemeHandle = NULL; } - if (IsThemeActive()) + if (IsAppThemed()) { infoPtr->ThemeHandle = OpenThemeData(infoPtr->hSelf, L"BUTTON"); @@ -1697,6 +1859,7 @@ infoPtr->HasFocus = FALSE; infoPtr->FocusedCheckItem = NULL; infoPtr->FocusedCheckItemBox = 0; + infoPtr->FocusedPushed = FALSE; infoPtr->TextColor[0] = GetSysColor(COLOR_GRAYTEXT); infoPtr->TextColor[1] = GetSysColor(COLOR_WINDOWTEXT); @@ -1717,7 +1880,7 @@ infoPtr->HoverTime = HOVER_DEFAULT; } - if (IsThemeActive()) + if (IsAppThemed()) { infoPtr->ThemeHandle = OpenThemeData(infoPtr->hSelf, L"BUTTON");

1 0

[ekohl] 16401: Remove trailing whitespace and fix indentation
by ekohl＠svn.reactos.com 03 Jul '05

03 Jul '05

Remove trailing whitespace and fix indentation Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/tlbflush.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-07-03 21:35:41 UTC (rev 16400) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-07-03 21:37:16 UTC (rev 16401) @@ -25,16 +25,16 @@ .globl _KiDebugService _KiFastCallEntry: - + /* Set FS to PCR */ movl $PCR_SELECTOR, %ecx movw %cx, %fs - + /* Set the current stack to Kernel Stack */ movl %fs:KPCR_TSS, %ecx movl %ss:KTSS_ESP0(%ecx), %ecx movl %ecx, %esp - + /* Set up a fake INT Stack. */ pushl $USER_DS pushl %edx /* Ring 3 SS:ESP */ @@ -42,13 +42,13 @@ orl $X86_EFLAGS_IF, (%esp) /* Re-enable IRQs in EFLAGS, to fake INT */ pushl $USER_CS pushl $KUSER_SHARED_SYSCALL_RET - + /* User Parameter List */ add $8, %edx - + _KiSystemService: - /* + /* * Construct a trap frame on the stack. * The following are already on the stack. */ @@ -63,11 +63,11 @@ pushl %esi // + 0x20 pushl %edi // + 0x24 pushl %fs // + 0x28 - + /* Load PCR Selector into fs */ movw $PCR_SELECTOR, %bx movw %bx, %fs - + /* Save the previous exception list */ pushl %fs:KPCR_EXCEPTION_LIST // + 0x2C @@ -79,7 +79,7 @@ /* Save the old previous mode */ pushl %ss:KTHREAD_PREVIOUS_MODE(%esi) // + 0x30 - + /* Set the new previous mode based on the saved CS selector */ movl 0x24(%esp), %ebx andl $1, %ebx @@ -120,7 +120,7 @@ movl %ebp, KTHREAD_TRAP_FRAME(%esi) CheckValidCall: - + #ifdef DBG /* * GDB thinks the function starts here and @@ -139,29 +139,29 @@ shrl $8, %edi andl $0x10, %edi movl %edi, %ecx - + /* Now add the thread's base system table to the offset */ addl KTHREAD_SERVICE_TABLE(%esi), %edi - + /* Get the true syscall ID and check it */ movl %eax, %ebx andl $0x0FFF, %eax cmpl 8(%edi), %eax - + /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange /* Users's current stack frame pointer is source */ movl %edx, %esi - + /* Allocate room for argument list from kernel stack */ movl 12(%edi), %ecx movb (%ecx, %eax), %cl movzx %cl, %ecx - + /* Allocate space on our stack */ subl %ecx, %esp - + /* Get pointer to function */ movl (%edi), %edi movl (%edi, %eax, 4), %eax @@ -193,25 +193,25 @@ /* Get the Current Thread */ cli movl %fs:KPCR_CURRENT_THREAD, %esi - + /* Deliver APCs only if we were called from user mode */ testb $1, KTRAP_FRAME_CS(%esp) je KiRosTrapReturn - + /* And only if any are actually pending */ cmpb $0, KTHREAD_PENDING_USER_APC(%esi) je KiRosTrapReturn - + /* Save pointer to Trap Frame */ movl %esp, %ebx - + /* Raise IRQL to APC_LEVEL */ movl $1, %ecx call @KfRaiseIrql@4 - + /* Save old IRQL */ pushl %eax - + /* Deliver APCs */ sti pushl %ebx @@ -219,13 +219,13 @@ pushl $UserMode call _KiDeliverApc@12 cli - + /* Return to old IRQL */ popl %ecx call @KfLowerIrql@4 - + KiRosTrapReturn: - + /* Skip debug information and unsaved registers */ addl $0x30, %esp // + 0x48 popl %gs // + 0x44 @@ -252,11 +252,11 @@ /* Check if previous CS is from user-mode */ testl $1, 4(%esp) - + /* It is, so use Fast Exit */ jnz FastRet - - /* + + /* * Restore what the stub pushed, and return back to it. * Note that we were CALLed, so the first thing on our stack is the ret EIP! */ @@ -264,9 +264,9 @@ pop %ecx // + 0x08 popf // + 0x04 jmp *%edx - + IntRet: - + iret FastRet: @@ -278,15 +278,15 @@ /* Restore FS to TIB */ mov $TEB_SELECTOR, %ecx mov %ecx, %fs - + /* We will be cleaning up the stack ourselves */ popl %edx /* New Ring 3 EIP */ add $0x4, %esp /* Skip Ring 3 DS */ andl $~X86_EFLAGS_IF, (%esp) /* Remove IRQ hack from EFLAGS */ popfl /* Restore old EFLAGS */ - popl %ecx /* Old Ring 3 SS:ESP */ - - /* + popl %ecx /* Old Ring 3 SS:ESP */ + + /* * At this point: * ECX points to the old User Stack. * EDX points to the instruction to execute in usermode after the sysenter @@ -306,41 +306,41 @@ call _KiServiceCheck popl %eax popl %edx - + /* Try the Call again */ jmp CheckValidCall - + InvalidCall: /* Invalid System Call */ movl $0xC000001C, %eax /* STATUS_INVALID_SYSTEM_SERVICE */ movl %eax, KTRAP_FRAME_EAX(%ebp) jmp _KiServiceExit - + _KiServiceExit2: /* Get the Current Thread */ cli movl %fs:KPCR_CURRENT_THREAD, %esi - + /* Deliver APCs only if we were called from user mode */ testb $1, KTRAP_FRAME_CS(%esp) je KiRosTrapReturn - + /* And only if any are actually pending */ cmpb $0, KTHREAD_PENDING_USER_APC(%esi) je KiRosTrapReturn - + /* Save pointer to Trap Frame */ movl %esp, %ebx - + /* Raise IRQL to APC_LEVEL */ movl $1, %ecx call @KfRaiseIrql@4 - + /* Save old IRQL */ pushl %eax - + /* Deliver APCs */ sti pushl %ebx @@ -348,14 +348,14 @@ pushl $UserMode call _KiDeliverApc@12 cli - + /* Return to old IRQL */ popl %ecx call @KfLowerIrql@4 - + /* Skip useless Debug Data */ addl $0x18, %esp // + 0x74 - + /* Restore Debug Registers */ popl %eax // + 0x5C movl %eax, %dr0 @@ -369,7 +369,7 @@ movl %eax, %dr6 popl %eax // + 0x48 movl %eax, %dr7 - + /* Restore Registers */ popl %gs // + 0x44 popl %es // + 0x40 @@ -393,12 +393,12 @@ popl %ebp // + 0x14 add $4, %esp // + 0x10 - /* Return to user-mode */ + /* Return to user-mode */ iret - + .intel_syntax noprefix _KiDebugService: - + /* Create the Trap Frame */ push 0 push ebp @@ -406,18 +406,18 @@ push esi push edi push fs - + /* Switch to correct FS */ mov bx, PCR_SELECTOR mov fs, bx - + /* Save Exception List */ push fs:[KPCR_EXCEPTION_LIST] - + /* Use Old Previous Mode */ mov ebx, fs:[KPCR_CURRENT_THREAD] push [ebx+KTHREAD_PREVIOUS_MODE] - + /* Continue building the Trap Frame */ push eax push ecx @@ -425,28 +425,28 @@ push ds push es push gs - + /* Switch Segments to Kernel */ mov bx, KERNEL_DS mov ds, bx mov es, bx - + /* Save Debug Registers */ mov ebx, eax - mov eax, dr7 + mov eax, dr7 push eax - mov eax, dr6 + mov eax, dr6 push eax - mov eax, dr3 + mov eax, dr3 push eax - mov eax, dr2 + mov eax, dr2 push eax - mov eax, dr1 + mov eax, dr1 push eax - mov eax, dr0 + mov eax, dr0 push eax mov eax, ebx - + /* Skip useless debug data */ sub esp, 0x18 @@ -455,6 +455,6 @@ push ecx push eax call _KdpServiceDispatcher@12 - + /* Exit through common routine */ jmp _KiServiceExit2 _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tlbflush.S --- trunk/reactos/ntoskrnl/ke/i386/tlbflush.S 2005-07-03 21:35:41 UTC (rev 16400) +++ trunk/reactos/ntoskrnl/ke/i386/tlbflush.S 2005-07-03 21:37:16 UTC (rev 16401) @@ -1,7 +1,8 @@ -/* i386-specific implemetation of Translation Buffer Flushing +/* + * i386-specific implemetation of Translation Buffer Flushing * Written By: Alex Ionescu <alex(a)relsoft.net> * Reference: IA-32 Intel« Architecture Software Developer's Manual, Volume 3: System Programming Guide, - * Chapter 10 - Memory Cache Control. Section 10.9 - Invalidating the Translation Lookaside Buffers + * Chapter 10 - Memory Cache Control. Section 10.9 - Invalidating the Translation Lookaside Buffers */ #include <internal/i386/ke.h> @@ -9,24 +10,20 @@ .globl _KeFlushCurrentTb@0 _KeFlushCurrentTb@0: - /* Check for global page support */ - testb $0xff, (_Ke386GlobalPagesEnabled) - jz .L1 + /* Check for global page support */ + testb $0xff, (_Ke386GlobalPagesEnabled) + jz .L1 - /* Modifying the PSE, PGE or PAE Flag in CR4 causes the TLB to be flushed */ - movl %cr4, %eax - andl $~X86_CR4_PGE, %eax - movl %eax, %cr4 - orl $X86_CR4_PGE, %eax - movl %eax, %cr4 - - ret + /* Modifying the PSE, PGE or PAE Flag in CR4 causes the TLB to be flushed */ + movl %cr4, %eax + andl $~X86_CR4_PGE, %eax + movl %eax, %cr4 + orl $X86_CR4_PGE, %eax + movl %eax, %cr4 + ret .L1: /* the old way ... */ - movl %cr3, %eax - movl %eax, %cr3 - ret - - - + movl %cr3, %eax + movl %eax, %cr3 + ret

1 0

[hpoussin] 16400: Delete unused makefiles
by hpoussin＠svn.reactos.com 03 Jul '05

03 Jul '05

Delete unused makefiles Deleted: trunk/reactos/boot/freeldr/bootsect/Makefile.i386 Deleted: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc Deleted: trunk/reactos/lib/pseh/makefile.i386 Deleted: trunk/reactos/lib/rosrtl/makefile.i386 Deleted: trunk/reactos/lib/string/Makefile.i386 _____ Deleted: trunk/reactos/boot/freeldr/bootsect/Makefile.i386 --- trunk/reactos/boot/freeldr/bootsect/Makefile.i386 2005-07-03 21:25:00 UTC (rev 16399) +++ trunk/reactos/boot/freeldr/bootsect/Makefile.i386 2005-07-03 21:35:41 UTC (rev 16400) @@ -1,52 +0,0 @@ -all: $(BIN2C) dosmbr.bin fat.bin fat32.bin isoboot.bin ext2.bin - -$(BIN2C) : - @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - -dosmbr.bin : dosmbr.asm - @echo ===================================================== Assembling dosmbr - @$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm - -fat.bin : fat.asm $(BIN2C) - @echo ===================================================== Assembling fat - @$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm - @$(BIN2C) fat.bin fat.h fat_data - - -fat32.bin : fat32.asm $(BIN2C) - @echo ===================================================== Assembling fat32 - @$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm - @$(BIN2C) fat32.bin fat32.h fat32_data - -isoboot.bin : isoboot.asm - @echo ===================================================== Assembling isoboot - @$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm - -ext2.bin : ext2.asm - @echo ===================================================== Assembling ext2 - @$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm - @$(BIN2C) ext2.bin ext2.h ext2_data - - -.PHONY : bootcd -bootcd: bootcd_dirs isoboot.bin - $(CP) isoboot.bin $(BOOTCD_DIR) - $(CP) dosmbr.bin $(BOOTCD_DIR)/disk/loader - $(CP) ext2.bin $(BOOTCD_DIR)/disk/loader - $(CP) fat.bin $(BOOTCD_DIR)/disk/loader - $(CP) fat32.bin $(BOOTCD_DIR)/disk/loader - $(CP) isoboot.bin $(BOOTCD_DIR)/disk/loader - -.PHONY : bootcd_dirs -bootcd_dirs: - $(MKDIR) $(BOOTCD_DIR) - $(MKDIR) $(BOOTCD_DIR)/disk - $(MKDIR) $(BOOTCD_DIR)/disk/reactos - $(MKDIR) $(BOOTCD_DIR)/disk/install - $(MKDIR) $(BOOTCD_DIR)/disk/bootdisk - $(MKDIR) $(BOOTCD_DIR)/disk/loader - -clean: - @-$(RM) *.bin - @-$(RM) *.h - @echo Clean ALL done. _____ Deleted: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc --- trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-07-03 21:25:00 UTC (rev 16399) +++ trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-07-03 21:35:41 UTC (rev 16400) @@ -1,35 +0,0 @@ -TOOLS=$(PATH_TO_TOP)/tools -SECTIONS= \ - --only-section=.text \ - --only-section=.data \ - --only-section=.bss -LDSECT= -Ttext 0xe00000 -Tdata 0xe10000 -OBJS=ofwboot.o freeldr.o -CFLAGS=-mbig -meabi -fPIC -fno-builtin -I../freeldr/include -FREELDR=../freeldr/freeldr.sys - -.SUFFIXES: .c .o - -all: ofwldr - -hack-coff$(EXEEXT): - $(HOST_CC) -I../freeldr/include hack-coff.c -o $@ - -ofwboot.o: ofwboot.s - $(NASM_CMD) $< -c -o $@ - -$(FREELDR): - $(MAKE) -C ../freeldr - -freeldr.o: $(FREELDR) - $(TOOLS)/ppc-le2be $< freeldr.tmp - $(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common freeldr.tmp $@ - rm freeldr.tmp - -ofwldr: $(OBJS) - $(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf - $(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ - $(TOOLS)/hack-coff $@ - -clean: - rm -rf ofwldr *.o *.elf *.tmp _____ Deleted: trunk/reactos/lib/pseh/makefile.i386 --- trunk/reactos/lib/pseh/makefile.i386 2005-07-03 21:25:00 UTC (rev 16399) +++ trunk/reactos/lib/pseh/makefile.i386 2005-07-03 21:35:41 UTC (rev 16400) @@ -1,5 +0,0 @@ -# $Id$ - -TARGET_ARCH_OBJECTS = $(ARCH)/framebased.o $(ARCH)/setjmp.o - -# EOF _____ Deleted: trunk/reactos/lib/rosrtl/makefile.i386 --- trunk/reactos/lib/rosrtl/makefile.i386 2005-07-03 21:25:00 UTC (rev 16399) +++ trunk/reactos/lib/rosrtl/makefile.i386 2005-07-03 21:35:41 UTC (rev 16400) @@ -1,9 +0,0 @@ -# $Id$ - -THREAD_OBJECTS := \ - $(THREAD_OBJECTS) \ - thread/linearstack.o \ - thread/$(ARCH)/context.o \ - thread/$(ARCH)/stackexit.o - -# EOF _____ Deleted: trunk/reactos/lib/string/Makefile.i386 --- trunk/reactos/lib/string/Makefile.i386 2005-07-03 21:25:00 UTC (rev 16399) +++ trunk/reactos/lib/string/Makefile.i386 2005-07-03 21:35:41 UTC (rev 16400) @@ -1,34 +0,0 @@ -# $Id$ - - -EXCLUDE_FILTER = \ - memchr.o \ - memcpy.o \ - memmove.o \ - memset.o \ - strcat.o \ - strchr.o \ - strcmp.o \ - strcpy.o \ - strlen.o \ - strncat.o \ - strncmp.o \ - strncpy.o \ - strrchr.o \ - strnlen.o \ - wcscat.o \ - wcschr.o \ - wcscmp.o \ - wcscpy.o \ - wcslen.o \ - wcsncat.o \ - wcsncmp.o \ - wcsncpy.o \ - wcsnlen.o \ - wcsrchr.o - - -OBJECTS_ARCH = $(addprefix i386/, $(EXCLUDE_FILTER)) - - -# EOF

1 0

[ekohl] 16399: - Implement PlugPlayControlProperty and PlugPlayControlGetDeviceDepth
by ekohl＠svn.reactos.com 03 Jul '05

03 Jul '05

- Implement PlugPlayControlProperty and PlugPlayControlGetDeviceDepth - Move documentation from NDK headers Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-07-03 20:19:55 UTC (rev 16398) +++ trunk/reactos/include/ndk/zwtypes.h 2005-07-03 21:25:00 UTC (rev 16399) @@ -279,7 +279,8 @@ PlugPlayControlUserResponse = 0x07, PlugPlayControlProperty = 0x0A, PlugPlayControlGetRelatedDevice = 0x0C, - PlugPlayControlDeviceStatus = 0x0E + PlugPlayControlDeviceStatus = 0x0E, + PlugPlayControlGetDeviceDepth } PLUGPLAY_CONTROL_CLASS; /* TYPES *********************************************************************/ @@ -287,34 +288,6 @@ typedef unsigned short LANGID; typedef LANGID *PLANGID; -/* - * Plug and Play event structure used by NtGetPlugPlayEvent. - * - * EventGuid - * Can be one of the following values: - * GUID_HWPROFILE_QUERY_CHANGE - * GUID_HWPROFILE_CHANGE_CANCELLED - * GUID_HWPROFILE_CHANGE_COMPLETE - * GUID_TARGET_DEVICE_QUERY_REMOVE - * GUID_TARGET_DEVICE_REMOVE_CANCELLED - * GUID_TARGET_DEVICE_REMOVE_COMPLETE - * GUID_PNP_CUSTOM_NOTIFICATION - * GUID_PNP_POWER_NOTIFICATION - * GUID_DEVICE_* (see above) - * - * EventCategory - * Type of the event that happened. - * - * Result - * ? - * - * Flags - * ? - * - * TotalSize - * Size of the event block including the device IDs and other - * per category specific fields. - */ typedef struct _PLUGPLAY_EVENT_BLOCK { GUID EventGuid; @@ -1285,4 +1258,11 @@ ULONG DeviceProblem; /* CM_PROB_ see cfg.h */ } PLUGPLAY_CONTROL_STATUS_DATA, *PPLUGPLAY_CONTROL_STATUS_DATA; +/* Class 0x0F */ +typedef struct _PLUGPLAY_CONTOL_DEPTH_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Depth; +} PLUGPLAY_CONTROL_DEPTH_DATA, *PPLUGPLAY_CONTROL_DEPTH_DATA; + #endif _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-07-03 20:19:55 UTC (rev 16398) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-07-03 21:25:00 UTC (rev 16399) @@ -104,6 +104,34 @@ /* + * Plug and Play event structure used by NtGetPlugPlayEvent. + * + * EventGuid + * Can be one of the following values: + * GUID_HWPROFILE_QUERY_CHANGE + * GUID_HWPROFILE_CHANGE_CANCELLED + * GUID_HWPROFILE_CHANGE_COMPLETE + * GUID_TARGET_DEVICE_QUERY_REMOVE + * GUID_TARGET_DEVICE_REMOVE_CANCELLED + * GUID_TARGET_DEVICE_REMOVE_COMPLETE + * GUID_PNP_CUSTOM_NOTIFICATION + * GUID_PNP_POWER_NOTIFICATION + * GUID_DEVICE_* (see above) + * + * EventCategory + * Type of the event that happened. + * + * Result + * ? + * + * Flags + * ? + * + * TotalSize + * Size of the event block including the device IDs and other + * per category specific fields. + */ +/* * NtGetPlugPlayEvent * * Returns one Plug & Play event from a global queue. @@ -312,6 +340,32 @@ static NTSTATUS +IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) +{ + PDEVICE_OBJECT DeviceObject = NULL; + NTSTATUS Status; + + DPRINT("IopGetDeviceProperty() called\n"); + DPRINT("Device name: %wZ\n", &PropertyData->DeviceInstance); + + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&PropertyData->DeviceInstance); + if (DeviceObject == NULL) + return STATUS_NO_SUCH_DEVICE; + + Status = IoGetDeviceProperty(DeviceObject, + PropertyData->Property, + PropertyData->BufferSize, + PropertyData->Buffer, + &PropertyData->BufferSize); + + ObDereferenceObject(DeviceObject); + + return Status; +} + + +static NTSTATUS IopGetRelatedDevice(PPLUGPLAY_CONTROL_RELATED_DEVICE_DATA RelatedDeviceData) { UNICODE_STRING RootDeviceName; @@ -320,7 +374,6 @@ PDEVICE_NODE RelatedDeviceNode; DPRINT("IopGetRelatedDevice() called\n"); - DPRINT("Device name: %wZ\n", &RelatedDeviceData->TargetDeviceInstance); RtlInitUnicodeString(&RootDeviceName, @@ -410,7 +463,6 @@ PDEVICE_NODE DeviceNode; DPRINT("IopDeviceStatus() called\n"); - DPRINT("Device name: %wZ\n", &StatusData->DeviceInstance); /* Get the device object */ @@ -445,6 +497,30 @@ } +static NTSTATUS +IopGetDeviceDepth(PPLUGPLAY_CONTROL_DEPTH_DATA DepthData) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_NODE DeviceNode; + + DPRINT("IopGetDeviceDepth() called\n"); + DPRINT("Device name: %wZ\n", &DepthData->DeviceInstance); + + /* Get the device object */ + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DepthData->DeviceInstance); + if (DeviceObject == NULL) + return STATUS_NO_SUCH_DEVICE; + + DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + + DepthData->Depth = DeviceNode->Level; + + ObDereferenceObject(DeviceObject); + + return STATUS_SUCCESS; +} + + /* * NtPlugPlayControl * @@ -551,6 +627,11 @@ return STATUS_INVALID_PARAMETER; return IopRemovePlugPlayEvent(); + case PlugPlayControlProperty: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)) + return STATUS_INVALID_PARAMETER; + return IopGetDeviceProperty((PPLUGPLAY_CONTROL_PROPERTY_DATA)Buffer); + case PlugPlayControlGetRelatedDevice: if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_RELATED_DEVICE_DATA)) return STATUS_INVALID_PARAMETER; @@ -561,6 +642,11 @@ return STATUS_INVALID_PARAMETER; return IopDeviceStatus((PPLUGPLAY_CONTROL_STATUS_DATA)Buffer); + case PlugPlayControlGetDeviceDepth: + if (!Buffer || BufferLength < sizeof(PLUGPLAY_CONTROL_DEPTH_DATA)) + return STATUS_INVALID_PARAMETER; + return IopGetDeviceDepth((PPLUGPLAY_CONTROL_DEPTH_DATA)Buffer); + default: return STATUS_NOT_IMPLEMENTED; }

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