Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rnaumann] 74243: [EXPLORER] -implement showing the start menu preview
by rnaumann＠svn.reactos.org 29 Mar '17

29 Mar '17

Author: rnaumann Date: Wed Mar 29 18:37:06 2017 New Revision: 74243 URL: http://svn.reactos.org/svn/reactos?rev=74243&view=rev Log: [EXPLORER] -implement showing the start menu preview Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/trayprop.cpp Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Wed Mar 29 18:37:06 2017 @@ -51,6 +51,7 @@ IDB_SYSTRAYPROP_SHOW_SECONDS BITMAP "res/bmp/154.bmp" IDB_SYSTRAYPROP_HIDE_SECONDS BITMAP "res/bmp/155.bmp" IDB_STARTMENU BITMAP "res/bmp/158.bmp" +IDB_STARTPREVIEW BITMAP "res/bmp/171.bmp" // We don't have a proper preview image for the modern start menu yet. Use the classic one so far. IDB_STARTPREVIEW_CLASSIC BITMAP "res/bmp/171.bmp" IDB_SYSTRAYPROP_HIDE_CLOCK BITMAP "res/bmp/180.bmp" IDB_SYSTRAYPROP_HIDE_NOCLOCK BITMAP "res/bmp/181.bmp" Modified: trunk/reactos/base/shell/explorer/trayprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr… ============================================================================== --- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Wed Mar 29 18:37:06 2017 @@ -28,17 +28,18 @@ HBITMAP hTaskbarBitmap; HBITMAP hTrayBitmap; + HBITMAP hStartBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; static BOOL -UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) -{ - HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; - HWND hwndTaskbarBitmap, hwndTrayBitmap; - HWND hwndAdvancedButton; +UpdateBitmaps(PPROPSHEET_INFO pPropInfo) +{ + HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive, hwndModernStart, hwndClassicStart; + HWND hwndTaskbarBitmap, hwndTrayBitmap, hwndStartBitmap; + HWND hwndCustomizeNotifyButton, hwndCustomizeClassicStartButton, hwndCustomizeModernStartButton; BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; - LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; + LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL, lpStartImageName = NULL; BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); @@ -50,7 +51,15 @@ hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); - hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); + hwndCustomizeNotifyButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); + + hwndModernStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENU); + hwndClassicStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENUCLASSIC); + + hwndCustomizeClassicStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCLASSICCUST); + hwndCustomizeModernStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCUST); + + if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { @@ -112,7 +121,7 @@ if (bHideInactive) { - EnableWindow(hwndAdvancedButton, TRUE); + EnableWindow(hwndCustomizeNotifyButton, TRUE); if (bShowClock) { EnableWindow(hwndSeconds, TRUE); @@ -130,7 +139,7 @@ } else { - EnableWindow(hwndAdvancedButton, FALSE); + EnableWindow(hwndCustomizeNotifyButton, FALSE); if (bShowClock) { EnableWindow(hwndSeconds, TRUE); @@ -174,6 +183,49 @@ } } } + + if(hwndClassicStart && hwndModernStart) + { + if(SendMessage(hwndModernStart, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + EnableWindow(hwndCustomizeModernStartButton, TRUE); + EnableWindow(hwndCustomizeClassicStartButton, FALSE); + lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW); + } + else + { + EnableWindow(hwndCustomizeModernStartButton, FALSE); + EnableWindow(hwndCustomizeClassicStartButton, TRUE); + lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW_CLASSIC); + } + + if (lpStartImageName) + { + if (pPropInfo->hStartBitmap) + { + DeleteObject(pPropInfo->hStartBitmap); + } + + pPropInfo->hStartBitmap = (HBITMAP)LoadImageW(hExplorerInstance, + lpStartImageName, + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (pPropInfo->hStartBitmap) + { + hwndStartBitmap = GetDlgItem(pPropInfo->hStartWnd, + IDC_TASKBARPROP_STARTMENU_BITMAP); + if (hwndStartBitmap) + { + SendMessage(hwndStartBitmap, + STM_SETIMAGE, + IMAGE_BITMAP, + (LPARAM)pPropInfo->hStartBitmap); + } + } + } + } return bRet; } @@ -191,7 +243,18 @@ // FIXME: check buttons CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); - UpdateTaskbarBitmap(pPropInfo); + UpdateBitmaps(pPropInfo); +} + +static VOID +OnCreateStartPage(HWND hwnd, + PPROPSHEET_INFO pPropInfo) +{ + pPropInfo->hStartWnd = hwnd; + + CheckDlgButton(hwnd, IDC_TASKBARPROP_STARTMENUCLASSIC, 1); // HACK: This has to be read from registry! + + UpdateBitmaps(pPropInfo); } INT_PTR CALLBACK @@ -228,7 +291,7 @@ case IDC_TASKBARPROP_SECONDS: if (HIWORD(wParam) == BN_CLICKED) { - UpdateTaskbarBitmap(pPropInfo); + UpdateBitmaps(pPropInfo); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -286,6 +349,7 @@ switch (uMsg) { case WM_INITDIALOG: + OnCreateStartPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); break; case WM_COMMAND:

1 0

[hbelusca] 74242: [NDK][XDK]: Add some forgotten RTL bitmap functions.
by hbelusca＠svn.reactos.org 29 Mar '17

29 Mar '17

Author: hbelusca Date: Wed Mar 29 16:36:13 2017 New Revision: 74242 URL: http://svn.reactos.org/svn/reactos?rev=74242&view=rev Log: [NDK][XDK]: Add some forgotten RTL bitmap functions. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/include/xdk/rtlfuncs.h Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Wed Mar 29 16:36:13 2017 @@ -3230,6 +3230,14 @@ NTSYSAPI VOID NTAPI +RtlClearBit( + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber +); + +NTSYSAPI +VOID +NTAPI RtlClearBits( _In_ PRTL_BITMAP BitMapHeader, _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToClear) ULONG StartingIndex, @@ -3289,6 +3297,14 @@ ); NTSYSAPI +ULONG +NTAPI +RtlFindLongestRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _Out_ PULONG StartingIndex +); + +NTSYSAPI CCHAR NTAPI RtlFindMostSignificantBit( @@ -3390,6 +3406,20 @@ _In_ PRTL_BITMAP BitMapHeader, _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitNumber ); + +#if defined(_M_AMD64) +_Must_inspect_result_ +FORCEINLINE +BOOLEAN +RtlCheckBit( + _In_ PRTL_BITMAP BitMapHeader, + _In_range_(<, BitMapHeader->SizeOfBitMap) ULONG BitPosition) +{ + return BitTest64((LONG64 CONST*)BitMapHeader->Buffer, (LONG64)BitPosition); +} +#else +#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP)/32]) >> ((BP)%32)) & 0x1) +#endif /* defined(_M_AMD64) */ // // Timer Functions Modified: trunk/reactos/sdk/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] Wed Mar 29 16:36:13 2017 @@ -949,6 +949,12 @@ _Out_ PTIME_FIELDS TimeFields); NTSYSAPI +USHORT +FASTCALL +RtlUshortByteSwap( + _In_ USHORT Source); + +NTSYSAPI ULONG FASTCALL RtlUlongByteSwap( @@ -1018,12 +1024,6 @@ NTAPI RtlUpcaseUnicodeChar( _In_ WCHAR SourceCharacter); - -NTSYSAPI -USHORT -FASTCALL -RtlUshortByteSwap( - _In_ USHORT Source); _IRQL_requires_max_(APC_LEVEL) _Must_inspect_result_

1 0

[gadamopoulos] 74241: [UXTHEME] -Draw the background glyph inside the content margins. CORE-6000
by gadamopoulos＠svn.reactos.org 29 Mar '17

29 Mar '17

Author: gadamopoulos Date: Wed Mar 29 10:01:00 2017 New Revision: 74241 URL: http://svn.reactos.org/svn/reactos?rev=74241&view=rev Log: [UXTHEME] -Draw the background glyph inside the content margins. CORE-6000 Modified: trunk/reactos/dll/win32/uxtheme/draw.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed Mar 29 10:01:00 2017 @@ -1051,7 +1051,19 @@ hr = E_FAIL; } if(SUCCEEDED(hr)) - hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rt, opts); + { + RECT rcGlyph = *pRect; + MARGINS margin; + hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); + if(SUCCEEDED(hr)) + { + rcGlyph.left += margin.cxLeftWidth; + rcGlyph.right -= margin.cxRightWidth; + rcGlyph.top += margin.cyTopHeight; + rcGlyph.bottom -= margin.cyBottomHeight; + } + hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rcGlyph, opts); + } if(opts->dwFlags & DTBG_CLIPRECT) { if(hasClip == 0) SelectClipRgn(hdc, NULL);

1 0

[gadamopoulos] 74240: [UXTHEME] -Slightly improve the width of the caption buttons by scaling it based on the height of the caption buttons. CORE-6000
by gadamopoulos＠svn.reactos.org 28 Mar '17

28 Mar '17

Author: gadamopoulos Date: Tue Mar 28 21:31:16 2017 New Revision: 74240 URL: http://svn.reactos.org/svn/reactos?rev=74240&view=rev Log: [UXTHEME] -Slightly improve the width of the caption buttons by scaling it based on the height of the caption buttons. CORE-6000 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Tue Mar 28 21:31:16 2017 @@ -216,9 +216,7 @@ { RECT rcPart; INT ButtonWidth, ButtonHeight, iPartId; - - ButtonHeight = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CXSMSIZE : SM_CXSIZE); + SIZE ButtonSize; switch(buttonId) { @@ -254,6 +252,11 @@ //FIXME: Implement Help Button return; } + + GetThemePartSize(pcontext->theme, pcontext->hDC, iPartId, 0, NULL, TS_MIN, &ButtonSize); + + ButtonHeight = GetSystemMetrics( pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); ButtonHeight -= 4; ButtonWidth -= 4;

1 0

[ekohl] 74239: [TRANSLATIONS] Minor corrections in Uzbek. Patch by Kudratov Olimjon. CORE-12907 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 28 Mar '17

28 Mar '17

Author: ekohl Date: Tue Mar 28 18:28:05 2017 New Revision: 74239 URL: http://svn.reactos.org/svn/reactos?rev=74239&view=rev Log: [TRANSLATIONS] Minor corrections in Uzbek. Patch by Kudratov Olimjon. CORE-12907 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls Modified: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Tue Mar 28 18:28:05 2017 @@ -1,4 +1,4 @@ -LANGUAGE LANG_UZBEK, SUBLANG_DEFAULT +LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_LATIN ID_ACCEL ACCELERATORS BEGIN @@ -130,10 +130,10 @@ IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Bloknot ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL "Bloknot ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 @@ -149,14 +149,14 @@ BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ STRING_PAGESETUP_FOOTERVALUE "Sahifa &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 Ð¼Ð¼" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ STRING_NOTEPAD "Bloknot" - STRING_ERROR "ÐÐ¨ÐÐÐÐ" - STRING_WARNING "ÐÐÐÐÐÐÐÐ" - STRING_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" + STRING_ERROR "XATO" + STRING_WARNING "DIQQAT" + STRING_INFO "Axborot" STRING_UNTITLED "Nomsiz" STRING_ALL_FILES "Barcha fayllar(*.*)" STRING_TEXT_FILES_TXT "Matn hujjatlari (*.txt)" Modified: trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/nls/uzb.nls [iso-8859-1] Tue Mar 28 18:28:05 2017 @@ -125,7 +125,7 @@ LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "uz-UZ" LOCALE_SNATIVECTRYNAME "¡çáåêèñòîí" - LOCALE_SNATIVECURRNAME "ðóáëü" + LOCALE_SNATIVECURRNAME "ñ¢ì" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVELANGNAME "¡çáåê" LOCALE_SNEGATIVESIGN "-"

1 0

[gadamopoulos] 74238: [EXPLORER] -Remove a debug print that wasn't supposed to be committed.
by gadamopoulos＠svn.reactos.org 28 Mar '17

28 Mar '17

Author: gadamopoulos Date: Tue Mar 28 10:22:54 2017 New Revision: 74238 URL: http://svn.reactos.org/svn/reactos?rev=74238&view=rev Log: [EXPLORER] -Remove a debug print that wasn't supposed to be committed. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Tue Mar 28 10:22:54 2017 @@ -1641,7 +1641,6 @@ case ABE_BOTTOM: rebarRect.top = rebarRect.bottom - (pRect->bottom - pRect->top - margins.cy); ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); - ERR("rebarRect: %d, %d, %d,%d\n", rebarRect.top, rebarRect.left, rebarRect.right, rebarRect.bottom); pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); break; case ABE_LEFT:

1 0

[gadamopoulos] 74237: [EXPLORER] -Try to fix a crash in explorer. CORE-12991
by gadamopoulos＠svn.reactos.org 28 Mar '17

28 Mar '17

Author: gadamopoulos Date: Tue Mar 28 09:28:06 2017 New Revision: 74237 URL: http://svn.reactos.org/svn/reactos?rev=74237&view=rev Log: [EXPLORER] -Try to fix a crash in explorer. CORE-12991 Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Tue Mar 28 09:28:06 2017 @@ -1162,7 +1162,11 @@ tbm.dwMask = TBMF_BUTTONSPACING; m_TaskBar.GetMetrics(&tbm); - uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (m_ButtonSize.cy + tbm.cyButtonSpacing); + if (m_ButtonSize.cy + tbm.cyButtonSpacing != 0) + uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (m_ButtonSize.cy + tbm.cyButtonSpacing); + else + uiRows = 1; + if (uiRows == 0) uiRows = 1;

1 0

[tfaber] 74236: [NTOS:KE] - Addendum to r74235. CORE-12985
by tfaber＠svn.reactos.org 27 Mar '17

27 Mar '17

Author: tfaber Date: Mon Mar 27 20:23:37 2017 New Revision: 74236 URL: http://svn.reactos.org/svn/reactos?rev=74236&view=rev Log: [NTOS:KE] - Addendum to r74235. CORE-12985 Modified: trunk/reactos/ntoskrnl/ke/amd64/stubs.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/stubs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Mon Mar 27 20:23:37 2017 @@ -115,15 +115,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -161,12 +161,6 @@ /* Go back to DISPATCH_LEVEL */ KeLowerIrql(DISPATCH_LEVEL); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else { Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Mon Mar 27 20:23:37 2017 @@ -155,15 +155,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -195,12 +195,6 @@ /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else {

1 0

[tfaber] 74235: [NTOS:KE] - Make sure to disable interrupts each iteration of the idle loop, since IdleFunction can leave them enabled. CORE-12985 #resolve
by tfaber＠svn.reactos.org 27 Mar '17

27 Mar '17

Author: tfaber Date: Mon Mar 27 20:16:59 2017 New Revision: 74235 URL: http://svn.reactos.org/svn/reactos?rev=74235&view=rev Log: [NTOS:KE] - Make sure to disable interrupts each iteration of the idle loop, since IdleFunction can leave them enabled. CORE-12985 #resolve Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Mon Mar 27 20:16:59 2017 @@ -270,15 +270,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -310,12 +310,6 @@ /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else {

1 0

[gadamopoulos] 74234: [UXTHEME] -Fix drawing the themed scrollbar. CORE-12933
by gadamopoulos＠svn.reactos.org 27 Mar '17

27 Mar '17

Author: gadamopoulos Date: Mon Mar 27 19:56:36 2017 New Revision: 74234 URL: http://svn.reactos.org/svn/reactos?rev=74234&view=rev Log: [UXTHEME] -Fix drawing the themed scrollbar. CORE-12933 Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Mar 27 19:56:36 2017 @@ -182,14 +182,18 @@ { RECT r, rcPart; + /* thumbPos is relative to the edge of the scrollbar */ + r = psbi->rcScrollBar; if (vertical) { + thumbPos += pcontext->wi.rcClient.top - pcontext->wi.rcWindow.top; r.top += psbi->dxyLineButton; r.bottom -= (psbi->dxyLineButton); } else { + thumbPos += pcontext->wi.rcClient.left - pcontext->wi.rcWindow.left; r.left += psbi->dxyLineButton; r.right -= psbi->dxyLineButton; }

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