Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[weiden] 29670: Tweak the ScrollDC implementation a bit so that it produces a better output. The implementation still is completely incorrect as it should call the driver for this operation instead of doing a BitBlt operation...
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 07:23:04 2007 New Revision: 29670 URL: http://svn.reactos.org/svn/reactos?rev=29670&view=rev Log: Tweak the ScrollDC implementation a bit so that it produces a better output. The implementation still is completely incorrect as it should call the driver for this operation instead of doing a BitBlt operation... Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Fri Oct 19 07:23:04 2007 @@ -1132,27 +1132,39 @@ { PDC pDC; RECT rcScroll, rcSrc, rcDst; + SIZE szSrcOrg; INT Result; IntGdiGetClipBox(hDC, &rcScroll); + if (prcClip) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + } + if (prcScroll) { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcScroll); - } - if (prcClip) - { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); - } - - rcDst = rcScroll; + IntGdiIntersectRect(&rcSrc, &rcScroll, prcScroll); + } + else + { + rcSrc = rcScroll; + } + + rcDst = rcSrc; IntGdiOffsetRect(&rcDst, dx, dy); + if (rcDst.left < rcScroll.left) + szSrcOrg.cx = rcScroll.left - rcDst.left; + else + szSrcOrg.cx = 0; + if (rcDst.top < rcScroll.top) + szSrcOrg.cy = rcScroll.top - rcDst.top; + else + szSrcOrg.cy = 0; IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); - rcSrc = rcDst; - IntGdiOffsetRect(&rcSrc, -dx, -dy); if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, - hDC, rcSrc.left, rcSrc.top, SRCCOPY, 0, 0)) + hDC, rcSrc.left + szSrcOrg.cx, rcSrc.top + szSrcOrg.cy, SRCCOPY, 0, 0)) { return ERROR; }

1 0

[weiden] 29669: Extend hack in NtUserEnumDisplayDevices to fail enumerating monitors. Fixes an infinite loop in deskmon.dll
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:51:48 2007 New Revision: 29669 URL: http://svn.reactos.org/svn/reactos?rev=29669&view=rev Log: Extend hack in NtUserEnumDisplayDevices to fail enumerating monitors. Fixes an infinite loop in deskmon.dll Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Oct 19 06:51:48 2007 @@ -216,6 +216,11 @@ { /* Only one display device present */ return FALSE; + } + else if (lpDevice->Length != 0) + { + /* Can't enumerate monitors :( */ + return FALSE; } if (lpDisplayDevice->cb < sizeof(DISPLAY_DEVICE)) return FALSE;

1 0

[weiden] 29668: Port RegLoadMUIStringA/W from WINE HEAD and adjust parameter names
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:40:23 2007 New Revision: 29668 URL: http://svn.reactos.org/svn/reactos?rev=29668&view=rev Log: Port RegLoadMUIStringA/W from WINE HEAD and adjust parameter names Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Fri Oct 19 06:40:23 2007 @@ -4848,11 +4848,53 @@ return ERROR_SUCCESS; } +/****************************************************************************** + * load_string [Internal] + * + * This is basically a copy of user32/resource.c's LoadStringW. Necessary to + * avoid importing user32, which is higher level than advapi32. Helper for + * RegLoadMUIString. + */ +static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +{ + HGLOBAL hMemory; + HRSRC hResource; + WCHAR *pString; + int idxString; + + /* Negative values have to be inverted. */ + if (HIWORD(resId) == 0xffff) + resId = (UINT)(-((INT)resId)); + + /* Load the resource into memory and get a pointer to it. */ + hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); + if (!hResource) return 0; + hMemory = LoadResource(hModule, hResource); + if (!hMemory) return 0; + pString = LockResource(hMemory); + + /* Strings are length-prefixed. Lowest nibble of resId is an index. */ + idxString = resId & 0xf; + while (idxString--) pString += *pString + 1; + + /* If no buffer is given, return length of the string. */ + if (!pwszBuffer) return *pString; + + /* Else copy over the string, respecting the buffer size. */ + cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); + if (cMaxChars >= 0) { + memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); + pwszBuffer[cMaxChars] = L'\0'; + } + + return cMaxChars; +} + /************************************************************************ * RegLoadMUIStringW * - * @unimplemented + * @implemented */ LONG STDCALL RegLoadMUIStringW(IN HKEY hKey, @@ -4863,16 +4905,85 @@ IN DWORD Flags, IN LPCWSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwValueType, cbData; + LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; + LONG result; + + /* Parameter sanity checks. */ + if (!hKey || !pszOutBuf) + return ERROR_INVALID_PARAMETER; + + if (pszDirectory && *pszDirectory) { + FIXME("BaseDir parameter not yet supported!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszTempBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + + /* Expand environment variables, if appropriate, or copy the original string over. */ + if (dwValueType == REG_EXPAND_SZ) { + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszExpandedBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + } else { + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + } + + /* If the value references a resource based string, parse the value and load the string. + * Else just copy over the original value. */ + result = ERROR_SUCCESS; + if (*pwszExpandedBuffer != L'@') { /* '@' is the prefix for resource based string entries. */ + lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); + } else { + WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); + UINT uiStringId; + HMODULE hModule; + + /* Format of the expanded value is 'path_to_dll,-resId' */ + if (!pComma || pComma[1] != L'-') { + result = ERROR_BADKEY; + goto cleanup; + } + + uiStringId = _wtoi(pComma+2); + *pComma = L'\0'; + + hModule = LoadLibraryW(pwszExpandedBuffer + 1); + if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) + result = ERROR_BADKEY; + FreeLibrary(hModule); + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszTempBuffer); + HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); + return result; } /************************************************************************ * RegLoadMUIStringA * - * @unimplemented + * @implemented */ LONG STDCALL RegLoadMUIStringA(IN HKEY hKey, @@ -4883,9 +4994,35 @@ IN DWORD Flags, IN LPCSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING valueW, baseDirW; + WCHAR *pwszBuffer; + DWORD cbData = cbOutBuf * sizeof(WCHAR); + LONG result; + + valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; + if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || + !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) || + !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData))) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags, + baseDirW.Buffer); + + if (result == ERROR_SUCCESS) { + cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL); + if (pcbData) + *pcbData = cbData; + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszBuffer); + RtlFreeUnicodeString(&baseDirW); + RtlFreeUnicodeString(&valueW); + + return result; }

1 0

[weiden] 29667: Initialize the COM library
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:16:54 2007 New Revision: 29667 URL: http://svn.reactos.org/svn/reactos?rev=29667&view=rev Log: Initialize the COM library Modified: trunk/reactos/dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Fri Oct 19 06:16:54 2007 @@ -214,6 +214,7 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); RegisterPreviewControl(hInstDLL); // case DLL_THREAD_ATTACH: hApplet = hInstDLL; @@ -221,6 +222,7 @@ case DLL_PROCESS_DETACH: UnregisterPreviewControl(hInstDLL); + CoUninitialize(); break; }

1 0

[weiden] 29666: Allow selecting monitors using the keyboard
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Fri Oct 19 03:39:16 2007 New Revision: 29666 URL: http://svn.reactos.org/svn/reactos?rev=29666&view=rev Log: Allow selecting monitors using the keyboard Modified: trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/monslctl.h Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 03:39:16 2007 @@ -626,7 +626,7 @@ infoPtr->SelectedMonitor = -1; infoPtr->DraggingMonitor = -1; infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED | MSLM_EX_HIDENUMBERONSINGLE | - MSLM_EX_SELECTONRIGHTCLICK; + MSLM_EX_SELECTONRIGHTCLICK | MSLM_EX_SELECTBYARROWKEY; return; } @@ -1251,6 +1251,9 @@ INT Index; POINT pt; + if (!infoPtr->HasFocus) + SetFocus(infoPtr->hSelf); + pt.x = (LONG)LOWORD(lParam); pt.y = (LONG)HIWORD(lParam); @@ -1317,6 +1320,9 @@ } Ret |= DLGC_WANTARROWS; + + if (infoPtr->ControlExStyle & MSLM_EX_SELECTBYNUMKEY) + Ret |= DLGC_WANTCHARS; break; } @@ -1400,6 +1406,78 @@ if (OldEnabled != infoPtr->Enabled) MonSelRepaint(infoPtr); + } + break; + } + + case WM_KEYDOWN: + { + INT Index; + + if (infoPtr->ControlExStyle & MSLM_EX_SELECTBYARROWKEY) + { + switch (wParam) + { + case VK_UP: + case VK_LEFT: + { + Index = infoPtr->SelectedMonitor; + + if (infoPtr->MonitorsCount != 0) + { + if (Index < 0) + Index = 0; + else if (Index > 0) + Index--; + } + + if (Index >= 0) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } + break; + } + + case VK_DOWN: + case VK_RIGHT: + { + Index = infoPtr->SelectedMonitor; + + if (infoPtr->MonitorsCount != 0) + { + if (Index < 0) + Index = (INT)infoPtr->MonitorsCount - 1; + else if (Index < (INT)infoPtr->MonitorsCount - 1) + Index++; + } + + if (infoPtr->SelectedMonitor < infoPtr->MonitorsCount) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } + break; + } + } + } + break; + } + + case WM_CHAR: + { + if ((infoPtr->ControlExStyle & MSLM_EX_SELECTBYNUMKEY) && + wParam >= '1' && wParam <= '9') + { + INT Index = (INT)(wParam - '1'); + if (Index < (INT)infoPtr->MonitorsCount) + { + MonSelSetCurSelMonitor(infoPtr, + Index, + TRUE); + } } break; } Modified: trunk/reactos/dll/cpl/desk/monslctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.h (original) +++ trunk/reactos/dll/cpl/desk/monslctl.h Fri Oct 19 03:39:16 2007 @@ -7,6 +7,8 @@ #define MSLM_EX_HIDENUMBERONSINGLE 0x4 #define MSLM_EX_HIDENUMBERS 0x8 #define MSLM_EX_SELECTONRIGHTCLICK 0x10 +#define MSLM_EX_SELECTBYNUMKEY 0x20 +#define MSLM_EX_SELECTBYARROWKEY 0x40 /* MONSL_MONINFO Flags */ #define MSL_MIF_DISABLED 0x1 @@ -177,6 +179,11 @@ * * MSLM_EX_SELECTONRIGHTCLICK * Selects a monitor when the user right clicks * on it. + * * MSLM_EX_SELECTBYNUMKEY + * Allows selecting a monitor by using the keys + * '1' to '9'. + * * MSLM_EX_SELECTBYARROWKEY + * Allows selecting a monitor using the arrow keys. * * Returns non-zero value if successful. */

1 0

[weiden] 29665: Add very basic dragging support to the monitor selection control
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Fri Oct 19 02:59:33 2007 New Revision: 29665 URL: http://svn.reactos.org/svn/reactos?rev=29665&view=rev Log: Add very basic dragging support to the monitor selection control Modified: trunk/reactos/dll/cpl/desk/monslctl.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 02:59:33 2007 @@ -27,11 +27,17 @@ UINT Enabled : 1; UINT HasFocus : 1; UINT CanDisplay : 1; + UINT LeftBtnDown : 1; + UINT IsDraggingMonitor : 1; }; }; DWORD ControlExStyle; DWORD MonitorsCount; INT SelectedMonitor; + INT DraggingMonitor; + RECT rcDragging; + POINT ptDrag, ptDragBegin; + SIZE DraggingMargin; PMONSL_MONINFO MonitorInfo; PMONSL_MON Monitors; RECT rcExtent; @@ -265,15 +271,34 @@ IN DWORD Index) { RECT rc; + BOOL NoRepaint = FALSE; if (Index < infoPtr->MonitorsCount) { - MonSelRectToScreen(infoPtr, - &infoPtr->Monitors[Index].rc, - &rc); - InvalidateRect(infoPtr->hSelf, - &rc, - TRUE); + if (Index == (DWORD)infoPtr->DraggingMonitor) + { + if (infoPtr->IsDraggingMonitor) + { + MonSelRectToScreen(infoPtr, + &infoPtr->rcDragging, + &rc); + } + else + NoRepaint = TRUE; + } + else + { + MonSelRectToScreen(infoPtr, + &infoPtr->Monitors[Index].rc, + &rc); + } + + if (!NoRepaint) + { + InvalidateRect(infoPtr->hSelf, + &rc, + TRUE); + } } } @@ -369,6 +394,9 @@ { DWORD Index; BOOL Ret = TRUE; + + if (infoPtr->DraggingMonitor >= 0) + return FALSE; if (infoPtr->MonitorInfo != NULL) { @@ -466,7 +494,8 @@ IN INT Index, IN const MONSL_MONINFO *MonitorsInfo) { - if (Index >= 0 && Index < (INT)infoPtr->MonitorsCount) + if (infoPtr->DraggingMonitor < 0 && + Index >= 0 && Index < (INT)infoPtr->MonitorsCount) { CopyMemory(&infoPtr->MonitorInfo[Index], MonitorsInfo, @@ -531,7 +560,8 @@ BOOL PreventSelect = FALSE; BOOL Ret = FALSE; - if (Index == -1 || Index < (INT)infoPtr->MonitorsCount) + if (infoPtr->DraggingMonitor < 0 && + (Index == -1 || Index < (INT)infoPtr->MonitorsCount)) { if (Index != infoPtr->SelectedMonitor) { @@ -594,6 +624,7 @@ infoPtr->SelectionFrame.cx = infoPtr->SelectionFrame.cy = 4; infoPtr->Margin.cx = infoPtr->Margin.cy = 20; infoPtr->SelectedMonitor = -1; + infoPtr->DraggingMonitor = -1; infoPtr->ControlExStyle = MSLM_EX_ALLOWSELECTDISABLED | MSLM_EX_HIDENUMBERONSINGLE | MSLM_EX_SELECTONRIGHTCLICK; return; @@ -624,6 +655,9 @@ MonSelSetExtendedStyle(IN OUT PMONITORSELWND infoPtr, IN DWORD dwExtendedStyle) { + if (infoPtr->DraggingMonitor >= 0) + return FALSE; + if (dwExtendedStyle != infoPtr->ControlExStyle) { infoPtr->ControlExStyle = dwExtendedStyle; @@ -725,12 +759,91 @@ } static VOID +MonSelPaintMonitor(IN OUT PMONITORSELWND infoPtr, + IN HDC hDC, + IN DWORD Index, + IN OUT PRECT prc, + IN COLORREF crDefFontColor, + IN BOOL bHideNumber) +{ + HFONT hFont, hPrevFont; + COLORREF crPrevText; + + if ((INT)Index == infoPtr->SelectedMonitor) + { + FillRect(hDC, + prc, + (HBRUSH)(COLOR_HIGHLIGHT + 1)); + + if (infoPtr->HasFocus && !(infoPtr->UIState & UISF_HIDEFOCUS)) + { + /* NOTE: We need to switch the text color to the default, because + DrawFocusRect draws a solid line if the text is white! */ + + crPrevText = SetTextColor(hDC, + crDefFontColor); + + DrawFocusRect(hDC, + prc); + + SetTextColor(hDC, + crPrevText); + } + } + + InflateRect(prc, + -infoPtr->SelectionFrame.cx, + -infoPtr->SelectionFrame.cy); + + Rectangle(hDC, + prc->left, + prc->top, + prc->right, + prc->bottom); + + InflateRect(prc, + -1, + -1); + + if (!bHideNumber) + { + hFont = MonSelGetMonitorFont(infoPtr, + hDC, + Index); + if (hFont != NULL) + { + hPrevFont = SelectObject(hDC, + hFont); + + DrawText(hDC, + infoPtr->Monitors[Index].szCaption, + -1, + prc, + DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + + SelectObject(hDC, + hPrevFont); + } + } + + if (infoPtr->MonitorInfo[Index].Flags & MSL_MIF_DISABLED) + { + InflateRect(prc, + 1, + 1); + + MonSelDrawDisabledRect(infoPtr, + hDC, + prc); + } +} + +static VOID MonSelPaint(IN OUT PMONITORSELWND infoPtr, IN HDC hDC, IN const RECT *prcUpdate) { - COLORREF crPrevText, crPrevText2; - HFONT hFont, hPrevFont; + COLORREF crPrevText; HBRUSH hbBk, hbOldBk; HPEN hpFg, hpOldFg; DWORD Index; @@ -757,83 +870,47 @@ for (Index = 0; Index < infoPtr->MonitorsCount; Index++) { + if (infoPtr->IsDraggingMonitor && + (DWORD)infoPtr->DraggingMonitor == Index) + { + continue; + } + MonSelRectToScreen(infoPtr, &infoPtr->Monitors[Index].rc, &rc); - if (!IntersectRect(&rctmp, - &rc, - prcUpdate)) - { - continue; - } - - if ((INT)Index == infoPtr->SelectedMonitor) - { - FillRect(hDC, - &rc, - (HBRUSH)(COLOR_HIGHLIGHT + 1)); - - if (infoPtr->HasFocus && !(infoPtr->UIState & UISF_HIDEFOCUS)) - { - /* NOTE: We need to switch the text color to the default, because - DrawFocusRect draws a solid line if the text is white! */ - - crPrevText2 = SetTextColor(hDC, - crPrevText); - - DrawFocusRect(hDC, - &rc); - - SetTextColor(hDC, - crPrevText2); - } - } - - InflateRect(&rc, - -infoPtr->SelectionFrame.cx, - -infoPtr->SelectionFrame.cy); - - Rectangle(hDC, - rc.left, - rc.top, - rc.right, - rc.bottom); - - InflateRect(&rc, - -1, - -1); - - if (!bHideNumber) - { - hFont = MonSelGetMonitorFont(infoPtr, - hDC, - Index); - if (hFont != NULL) - { - hPrevFont = SelectObject(hDC, - hFont); - - DrawText(hDC, - infoPtr->Monitors[Index].szCaption, - -1, - &rc, - DT_VCENTER | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); - - SelectObject(hDC, - hPrevFont); - } - } - - if (infoPtr->MonitorInfo[Index].Flags & MSL_MIF_DISABLED) - { - InflateRect(&rc, - 1, - 1); - - MonSelDrawDisabledRect(infoPtr, - hDC, - &rc); + if (IntersectRect(&rctmp, + &rc, + prcUpdate)) + { + MonSelPaintMonitor(infoPtr, + hDC, + Index, + &rc, + crPrevText, + bHideNumber); + } + } + + /* Paint the dragging monitor last */ + if (infoPtr->IsDraggingMonitor && + (DWORD)infoPtr->DraggingMonitor >= 0) + { + MonSelRectToScreen(infoPtr, + &infoPtr->rcDragging, + &rc); + + if (IntersectRect(&rctmp, + &rc, + prcUpdate)) + { + MonSelPaintMonitor(infoPtr, + hDC, + (DWORD)infoPtr->DraggingMonitor, + &rc, + crPrevText, + bHideNumber); } } @@ -882,6 +959,202 @@ nm.pt.y)); } +static VOID +MonSelApplyCursorClipping(IN PMONITORSELWND infoPtr, + IN BOOL bClip) +{ + RECT rc; + + if (bClip) + { + rc.left = rc.top = 0; + rc.right = infoPtr->ClientSize.cx; + rc.bottom = infoPtr->ClientSize.cy; + + if (MapWindowPoints(infoPtr->hSelf, + NULL, + (LPPOINT)&rc, + 2)) + { + ClipCursor(&rc); + } + } + else + { + ClipCursor(NULL); + } +} + +static VOID +MonSelMoveDragRect(IN OUT PMONITORSELWND infoPtr, + IN PPOINT ppt) +{ + RECT rcPrev, rcUpdate, *prc; + HRGN hRgnPrev; + HDC hDC; + + if (infoPtr->CanDisplay) + { + hDC = GetDC(infoPtr->hSelf); + if (hDC != NULL) + { + if (infoPtr->ptDrag.x != ppt->x || + infoPtr->ptDrag.y != ppt->y) + { + infoPtr->ptDrag = *ppt; + + rcPrev = infoPtr->rcDragging; + + /* Calculate updated dragging rectangle */ + prc = &infoPtr->Monitors[infoPtr->DraggingMonitor].rc; + infoPtr->rcDragging.left = ppt->x - infoPtr->DraggingMargin.cx; + infoPtr->rcDragging.top = ppt->y - infoPtr->DraggingMargin.cy; + infoPtr->rcDragging.right = infoPtr->rcDragging.left + (prc->right - prc->left); + infoPtr->rcDragging.bottom = infoPtr->rcDragging.top + (prc->bottom - prc->top); + + hRgnPrev = CreateRectRgn(rcPrev.left, + rcPrev.top, + rcPrev.right, + rcPrev.bottom); + + if (hRgnPrev != NULL) + { + if (!ScrollDC(hDC, + infoPtr->rcDragging.left - rcPrev.left, + infoPtr->rcDragging.top - rcPrev.top, + &rcPrev, + NULL, + hRgnPrev, + &rcUpdate) || + !InvalidateRgn(infoPtr->hSelf, + hRgnPrev, + TRUE)) + { + DeleteObject(hRgnPrev); + goto InvRects; + } + + DeleteObject(hRgnPrev); + } + else + { +InvRects: + InvalidateRect(infoPtr->hSelf, + &rcPrev, + TRUE); + InvalidateRect(infoPtr->hSelf, + &infoPtr->rcDragging, + TRUE); + } + } + + ReleaseDC(infoPtr->hSelf, + hDC); + } + } +} + +static VOID +MonSelCancelDragging(IN OUT PMONITORSELWND infoPtr) +{ + DWORD Index; + + if (infoPtr->DraggingMonitor >= 0) + { + MonSelMoveDragRect(infoPtr, + &infoPtr->ptDragBegin); + + Index = (DWORD)infoPtr->DraggingMonitor; + infoPtr->DraggingMonitor = -1; + + if (infoPtr->CanDisplay) + { + /* Repaint the area where the monitor was last dragged */ + MonSelRepaintMonitor(infoPtr, + Index); + + infoPtr->IsDraggingMonitor = FALSE; + + /* Repaint the area where the monitor is located */ + MonSelRepaintMonitor(infoPtr, + Index); + } + else + infoPtr->IsDraggingMonitor = FALSE; + + ReleaseCapture(); + + MonSelApplyCursorClipping(infoPtr, + FALSE); + } +} + +static VOID +MonSelInitDragging(IN OUT PMONITORSELWND infoPtr, + IN DWORD Index, + IN PPOINT ppt) +{ + POINT pt; + + MonSelCancelDragging(infoPtr); + infoPtr->IsDraggingMonitor = FALSE; + + MonSelScreenToPt(infoPtr, + ppt, + &pt); + + infoPtr->ptDrag = infoPtr->ptDragBegin = pt; + infoPtr->DraggingMonitor = (INT)Index; + + infoPtr->DraggingMargin.cx = ppt->x - infoPtr->Monitors[Index].rc.left; + infoPtr->DraggingMargin.cy = ppt->y - infoPtr->Monitors[Index].rc.top; + infoPtr->rcDragging = infoPtr->Monitors[Index].rc; + + MonSelApplyCursorClipping(infoPtr, + TRUE); +} + +static VOID +MonSelDrag(IN OUT PMONITORSELWND infoPtr, + IN PPOINT ppt) +{ + SIZE szDrag; + POINT pt; + RECT rcDrag; + + if (infoPtr->DraggingMonitor >= 0) + { + MonSelScreenToPt(infoPtr, + ppt, + &pt); + + if (!infoPtr->IsDraggingMonitor) + { + szDrag.cx = GetSystemMetrics(SM_CXDRAG); + szDrag.cy = GetSystemMetrics(SM_CYDRAG); + + rcDrag.left = infoPtr->Monitors[infoPtr->DraggingMonitor].rc.left + infoPtr->DraggingMargin.cx - (szDrag.cx / 2); + rcDrag.top = infoPtr->Monitors[infoPtr->DraggingMonitor].rc.top + infoPtr->DraggingMargin.cy - (szDrag.cy / 2); + rcDrag.right = rcDrag.left + szDrag.cx; + rcDrag.bottom = rcDrag.top + szDrag.cy; + + if (!PtInRect(&rcDrag, + pt)) + { + /* The user started moving around the mouse: Begin dragging */ + infoPtr->IsDraggingMonitor = TRUE; + MonSelMoveDragRect(infoPtr, + &pt); + } + } + else + { + MonSelMoveDragRect(infoPtr, + &pt); + } + } +} + static LRESULT CALLBACK MonitorSelWndProc(IN HWND hwnd, IN UINT uMsg, @@ -942,6 +1215,28 @@ break; } + case WM_MOUSEMOVE: + { + POINT pt; + + if (!(wParam & MK_LBUTTON)) + { + MonSelCancelDragging(infoPtr); + break; + } + + if (infoPtr->LeftBtnDown) + { + pt.x = (LONG)LOWORD(lParam); + pt.y = (LONG)HIWORD(lParam); + + MonSelDrag(infoPtr, + &pt); + } + + break; + } + case WM_RBUTTONDOWN: { if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK)) @@ -968,6 +1263,14 @@ TRUE); } + if (Index >= 0 && (uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONDBLCLK)) + { + infoPtr->LeftBtnDown = TRUE; + MonSelInitDragging(infoPtr, + (DWORD)Index, + &pt); + } + /* fall through */ } @@ -983,6 +1286,13 @@ MonSelContextMenu(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + break; + } + + case WM_LBUTTONUP: + { + MonSelCancelDragging(infoPtr); + infoPtr->LeftBtnDown = FALSE; break; } @@ -1020,6 +1330,7 @@ case WM_KILLFOCUS: { infoPtr->HasFocus = FALSE; + MonSelCancelDragging(infoPtr); MonSelRepaintSelected(infoPtr); break; }

1 0

[cfinck] 29664: Use StretchBlt with fixed values for drawing the card backs in the Deck Options dialog. This way the dialog looks normally, also with bigger cards like the Bavarian ones.
by cfinck＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: cfinck Date: Fri Oct 19 02:04:50 2007 New Revision: 29664 URL: http://svn.reactos.org/svn/reactos?rev=29664&view=rev Log: Use StretchBlt with fixed values for drawing the card backs in the Deck Options dialog. This way the dialog looks normally, also with bigger cards like the Bavarian ones. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Oct 19 02:04:50 2007 @@ -323,15 +323,17 @@ rc.right, rc.bottom); - BitBlt(hdc, - 2, - 2, - __cardwidth, - __cardheight, - __hdcCardBitmaps, - pCardBack->hdcNum * __cardwidth, - 0, - SRCCOPY); + StretchBlt(hdc, + 2, + 2, + CARDBACK_OPTIONS_WIDTH, + CARDBACK_OPTIONS_HEIGHT, + __hdcCardBitmaps, + pCardBack->hdcNum * __cardwidth, + 0, + __cardwidth, + __cardheight, + SRCCOPY); SelectObject(hdc, hOldPen); SelectObject(hdc, hOldBrush); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Fri Oct 19 02:04:50 2007 @@ -5,12 +5,14 @@ extern TCHAR szAppName[]; extern bool fGameStarted; -#define OPTION_SHOW_STATUS 4 -#define OPTION_THREE_CARDS 8 -#define CARDBACK_START IDC_CARDBACK1 -#define CARDBACK_END IDC_CARDBACK4 -#define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) -#define CARDBACK_RES_START 53 +#define OPTION_SHOW_STATUS 4 +#define OPTION_THREE_CARDS 8 +#define CARDBACK_START IDC_CARDBACK1 +#define CARDBACK_END IDC_CARDBACK4 +#define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) +#define CARDBACK_RES_START 53 +#define CARDBACK_OPTIONS_WIDTH 72 +#define CARDBACK_OPTIONS_HEIGHT 96 extern DWORD dwOptions;

1 0

[cfinck] 29663: - Fix a bug in Solitaire: When you used the 1-card-mode before, there never was a card behind the one, which you drag from the pile. Now Solitaire collects all the cards from the deck in the 1-card-mode like Windows Solitaire does. - Make it possible to use CS_EI_CIRC (the O sign) and CS_EI_X (the X sign) as empty images for a deck. Actually make use of CS_EI_CIRC for the Solitaire deck.
by cfinck＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: cfinck Date: Fri Oct 19 01:54:39 2007 New Revision: 29663 URL: http://svn.reactos.org/svn/reactos?rev=29663&view=rev Log: - Fix a bug in Solitaire: When you used the 1-card-mode before, there never was a card behind the one, which you drag from the pile. Now Solitaire collects all the cards from the deck in the 1-card-mode like Windows Solitaire does. - Make it possible to use CS_EI_CIRC (the O sign) and CS_EI_X (the X sign) as empty images for a deck. Actually make use of CS_EI_CIRC for the Solitaire deck. Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h Fri Oct 19 01:54:39 2007 @@ -8,14 +8,13 @@ #define CS_EI_NONE 0 #define CS_EI_SUNK 1 +#define CS_EI_CIRC 67 +#define CS_EI_X 66 #define CS_DEFXOFF 12 //x-offset #define CS_DEFYOFF 18 //y-offset #define CS_NO3D 1 //default 3d counts (recommened) #define CS_DEF3D 10 //(best for decks) - -//#define CS_EI_CIRC 2 -//#define CS_EI_X 3 #define CS_DRAG_NONE 0 #define CS_DRAG_TOP 1 Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp Fri Oct 19 01:54:39 2007 @@ -365,7 +365,10 @@ { switch(uImage) { - case CS_EI_NONE: case CS_EI_SUNK: + case CS_EI_NONE: + case CS_EI_SUNK: + case CS_EI_CIRC: + case CS_EI_X: uEmptyImage = uImage; break; Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp Fri Oct 19 01:54:39 2007 @@ -347,15 +347,21 @@ switch(uEmptyImage) { - default: case CS_EI_NONE: + default: + case CS_EI_NONE: //this wipes the RECT variable, so watch out! //SetRect(&rect, x, y, x+__cardwidth, y+__cardheight); //PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd)); parentWnd.PaintCardRgn(hdc, x, y, __cardwidth, __cardheight, x, y); break; - case CS_EI_SUNK: //case CS_EI_CIRC: case CS_EI_X: + case CS_EI_SUNK: DrawCard(hdc, x, y, __hdcPlaceHolder, __cardwidth, __cardheight); + break; + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, x, y, uEmptyImage); break; } @@ -466,6 +472,11 @@ case CS_EI_SUNK: DrawCard(hdcBackGnd, xoff, yoff, __hdcPlaceHolder, __cardwidth, __cardheight); break; + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, xoff, yoff, uEmptyImage); + break; } } @@ -559,7 +570,7 @@ // // If there are no cards under this one, just draw the place holder // - if(numcards == 0) + if(numcards == 0) { switch(uEmptyImage) { @@ -573,7 +584,11 @@ case CS_EI_SUNK: DrawCard(hdcBackGnd, 0, 0, __hdcPlaceHolder, __cardwidth, __cardheight); break; - + + case CS_EI_CIRC: + case CS_EI_X: + CardBlt(hdc, 0, 0, uEmptyImage); + break; } } Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp Fri Oct 19 01:54:39 2007 @@ -30,7 +30,7 @@ yRowStackCardOffset = (int)(__cardheight / 6.7); pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1); - pDeck->SetEmptyImage(CS_EI_SUNK); + pDeck->SetEmptyImage(CS_EI_CIRC); pDeck->SetThreedCount(6); pDeck->SetDragRule(CS_DRAG_NONE, 0); pDeck->SetDropRule(CS_DROP_NONE, 0); Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Fri Oct 19 01:54:39 2007 @@ -50,7 +50,11 @@ //put the other cards onto the deck pDeck->SetCardStack(deck); pDeck->Update(); - + + // For the 1-card-mode, all cards need to be completely overlapped + if(!(dwOptions & OPTION_THREE_CARDS)) + pPile->SetOffsets(0, 0); + SolWnd.Redraw(); fGameStarted = false; @@ -331,7 +335,8 @@ fGameStarted = true; //reset the face-up pile to represent 3 cards - pPile->SetOffsets(CS_DEFXOFF, 1); + if(dwOptions & OPTION_THREE_CARDS) + pPile->SetOffsets(CS_DEFXOFF, 1); if(cardstack.NumCards() == 0) { @@ -350,7 +355,9 @@ temp = cardstack.Pop(numcards); temp.Reverse(); - pile.Clear(); + if(dwOptions & OPTION_THREE_CARDS) + pile.Clear(); + pile.Push(temp); //remove the top 3 from deck

1 0

[janderwald] 29662: - only register hotkey when setup is active - should fix bug 2684 See issue #2684 for more details.
by janderwald＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: janderwald Date: Fri Oct 19 01:09:45 2007 New Revision: 29662 URL: http://svn.reactos.org/svn/reactos?rev=29662&view=rev Log: - only register hotkey when setup is active - should fix bug 2684 See issue #2684 for more details. Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Fri Oct 19 01:09:45 2007 @@ -873,13 +873,14 @@ /* Save the Session pointer */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); - if (GetSetupType() == 0) + if (GetSetupType()) return TRUE; return RegisterHotKeys(Session, hwndDlg); } case WM_DESTROY: { - UnregisterHotKeys(Session, hwndDlg); + if (!GetSetupType()) + UnregisterHotKeys(Session, hwndDlg); return TRUE; } case WM_SETTINGCHANGE:

1 0

[mnordell] 29661: Fix logical error in a hack.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 19:37:52 2007 New Revision: 29661 URL: http://svn.reactos.org/svn/reactos?rev=29661&view=rev Log: Fix logical error in a hack. Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c (original) +++ trunk/reactos/drivers/bus/pci/fdo.c Thu Oct 18 19:37:52 2007 @@ -369,7 +369,8 @@ AllocatedResources = IoGetCurrentIrpStackLocation(Irp)->Parameters.StartDevice.AllocatedResources; /* HACK due to a bug in ACPI driver, which doesn't report the bus number */ - if (!FoundBuggyAllocatedResourcesList || !AllocatedResources || AllocatedResources->Count == 0) + if (!FoundBuggyAllocatedResourcesList && + (!AllocatedResources || AllocatedResources->Count == 0)) { FoundBuggyAllocatedResourcesList = TRUE; DPRINT1("No bus number resource found (bug in acpi.sys?), assuming bus number #0\n");

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007