Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[rnaumann] 70104: [EXPLORER] -Reactivate the 'show seconds' functionality. -Enable the the controls depending on checkbox states

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Nov 24 22:37:58 2015 New Revision: 70104 URL: http://svn.reactos.org/svn/reactos?rev=70104&view=rev Log: [EXPLORER] -Reactivate the 'show seconds' functionality. -Enable the the controls depending on checkbox states Modified: trunk/reactos/base/shell/explorer/trayprop.cpp 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] Tue Nov 24 22:37:58 2015 @@ -36,6 +36,7 @@ { HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; HWND hwndTaskbarBitmap, hwndTrayBitmap; + HWND hwndAdvancedButton; BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; BOOL bRet = FALSE; @@ -48,6 +49,8 @@ hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK); hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); + + hwndAdvancedButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { @@ -109,10 +112,10 @@ if (bHideInactive) { - /* FIXME: when the customize button is disabled, enable it. */ + EnableWindow(hwndAdvancedButton, TRUE); if(bShowClock) { - /* FIXME: when the seconds checkbox is disabled, enable it. */ + EnableWindow(hwndSeconds, TRUE); if(bShowSeconds) lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS); else @@ -120,16 +123,16 @@ } else { - /* FIXME: when the seconds checkbox is enabled, disable it it. */ + EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK); } } else { - /* FIXME: when the customize button is enabled, disable it. */ + EnableWindow(hwndAdvancedButton, FALSE); if(bShowClock) { - /* FIXME: when the seconds checkbox is disabled, enable it. */ + EnableWindow(hwndSeconds, TRUE); if(bShowSeconds) lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS); else @@ -137,7 +140,7 @@ } else { - /* FIXME: when the seconds checkbox is enabled, disable it it. */ + EnableWindow(hwndSeconds, FALSE); lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK); } } @@ -184,6 +187,7 @@ pPropInfo->hTaskbarWnd = hwnd; // FIXME: check buttons + CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); UpdateTaskbarBitmap(pPropInfo); } @@ -241,6 +245,8 @@ break; case PSN_APPLY: + AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + SaveSettingDword(szAdvancedSettingsKey, TEXT("ShowSeconds"), AdvancedSettings.bShowSeconds); break; }

9 years, 1 month

[tkreuzer] 70103: [WIN32K] "Gracyfully" (i.e. ignore, like Windows does) handle hsem == NULL in EngAcquireSemaphore Should fix crash of QXL Virtual GPU driver installer CORE-9779 #comment Please re...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Nov 24 22:04:39 2015 New Revision: 70103 URL: http://svn.reactos.org/svn/reactos?rev=70103&view=rev Log: [WIN32K] "Gracyfully" (i.e. ignore, like Windows does) handle hsem == NULL in EngAcquireSemaphore Should fix crash of QXL Virtual GPU driver installer CORE-9779 #comment Please retest. Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c Modified: trunk/reactos/win32ss/gdi/eng/semaphor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/semaphor.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/semaphor.c [iso-8859-1] Tue Nov 24 22:04:39 2015 @@ -42,7 +42,14 @@ { // www.osr.com/ddk/graphics/gdifncs_14br.htm PTHREADINFO W32Thread; - ASSERT(hsem); + + /* On Windows a NULL hsem is ignored */ + if (hsem == NULL) + { + DPRINT1("EngAcquireSemaphore called with hsem == NULL!\n"); + return; + } + ExEnterCriticalRegionAndAcquireResourceExclusive((PERESOURCE)hsem); W32Thread = PsGetThreadWin32Thread(PsGetCurrentThread()); if (W32Thread) W32Thread->dwEngAcquireCount++;

9 years, 1 month

[rnaumann] 70102: [EXPLORER] -Fix a parameter of OnCreateTaskbarPage(). Fix by Mark Jansen -Implement showing the notification area preview images. CORE-10560

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Tue Nov 24 21:43:07 2015 New Revision: 70102 URL: http://svn.reactos.org/svn/reactos?rev=70102&view=rev Log: [EXPLORER] -Fix a parameter of OnCreateTaskbarPage(). Fix by Mark Jansen -Implement showing the notification area preview images. CORE-10560 Modified: trunk/reactos/base/shell/explorer/trayprop.cpp 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] Tue Nov 24 21:43:07 2015 @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> + * 2015 Robert Naumann <gonzomdx(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,54 +25,62 @@ { HWND hTaskbarWnd; HWND hStartWnd; - HWND hNotiWnd; - HWND hToolWnd; HBITMAP hTaskbarBitmap; + HBITMAP hTrayBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; static BOOL UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) { - HWND hwndLock, hwndHide, hwndGroup, hwndShowQL; - HWND hwndBitmap; - BOOL bLock, bHide, bGroup, bShowQL; - LPTSTR lpImageName = NULL; + HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive; + HWND hwndTaskbarBitmap, hwndTrayBitmap; + BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; + LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL; BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE); hwndGroup = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_GROUP); hwndShowQL = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SHOWQL); - - if (hwndLock && hwndHide && hwndGroup && hwndShowQL) + + hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK); + hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); + hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); + + if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) { bLock = (SendMessage(hwndLock, BM_GETCHECK, 0, 0) == BST_CHECKED); bHide = (SendMessage(hwndHide, BM_GETCHECK, 0, 0) == BST_CHECKED); bGroup = (SendMessage(hwndGroup, BM_GETCHECK, 0, 0) == BST_CHECKED); bShowQL = (SendMessage(hwndShowQL, BM_GETCHECK, 0, 0) == BST_CHECKED); + + bShowClock = (SendMessage(hwndClock, BM_GETCHECK, 0, 0) == BST_CHECKED); + bShowSeconds = (SendMessage(hwndSeconds, BM_GETCHECK, 0, 0) == BST_CHECKED); + bHideInactive = (SendMessage(hwndHideInactive, BM_GETCHECK, 0, 0) == BST_CHECKED); if (bHide) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_AUTOHIDE); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_AUTOHIDE); else if (bLock && bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_QL); else if (bLock && !bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_NOQL); else if (bLock && bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_GROUP_NOQL); else if (bLock && !bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_LOCK_NOGROUP_QL); else if (!bLock && !bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL); else if (!bLock && bGroup && !bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_NOQL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_NOQL); else if (!bLock && !bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_QL); + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_NOGROUP_QL); else if (!bLock && bGroup && bShowQL) - lpImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_QL); - - if (lpImageName) + lpTaskBarImageName = MAKEINTRESOURCE(IDB_TASKBARPROP_NOLOCK_GROUP_QL); + + + if (lpTaskBarImageName) { if (pPropInfo->hTaskbarBitmap) { @@ -79,21 +88,83 @@ } pPropInfo->hTaskbarBitmap = (HBITMAP)LoadImage(hExplorerInstance, - lpImageName, + lpTaskBarImageName, IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (pPropInfo->hTaskbarBitmap) { - hwndBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, + hwndTaskbarBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_TASKBARBITMAP); - if (hwndBitmap) + if (hwndTaskbarBitmap) { - SendMessage(hwndBitmap, + SendMessage(hwndTaskbarBitmap, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)pPropInfo->hTaskbarBitmap); + } + } + } + + if (bHideInactive) + { + /* FIXME: when the customize button is disabled, enable it. */ + if(bShowClock) + { + /* FIXME: when the seconds checkbox is disabled, enable it. */ + if(bShowSeconds) + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_SECONDS); + else + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_CLOCK); + } + else + { + /* FIXME: when the seconds checkbox is enabled, disable it it. */ + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_HIDE_NOCLOCK); + } + } + else + { + /* FIXME: when the customize button is enabled, disable it. */ + if(bShowClock) + { + /* FIXME: when the seconds checkbox is disabled, enable it. */ + if(bShowSeconds) + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_SECONDS); + else + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_CLOCK); + } + else + { + /* FIXME: when the seconds checkbox is enabled, disable it it. */ + lpTrayImageName = MAKEINTRESOURCE(IDB_SYSTRAYPROP_SHOW_NOCLOCK); + } + } + + if(lpTrayImageName) + { + if (pPropInfo->hTrayBitmap) + { + DeleteObject(pPropInfo->hTrayBitmap); + } + + pPropInfo->hTrayBitmap = (HBITMAP)LoadImage(hExplorerInstance, + lpTrayImageName, + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (pPropInfo->hTrayBitmap) + { + hwndTrayBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, + IDC_TASKBARPROP_NOTIFICATIONBITMAP); + if (hwndTrayBitmap) + { + SendMessage(hwndTrayBitmap, + STM_SETIMAGE, + IMAGE_BITMAP, + (LPARAM)pPropInfo->hTrayBitmap); } } } @@ -136,7 +207,7 @@ switch (uMsg) { case WM_INITDIALOG: - OnCreateTaskbarPage(hwndDlg, (PPROPSHEET_INFO)lParam); + OnCreateTaskbarPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); break; case WM_COMMAND: @@ -146,6 +217,9 @@ case IDC_TASKBARPROP_HIDE: case IDC_TASKBARPROP_GROUP: case IDC_TASKBARPROP_SHOWQL: + case IDC_TASKBARPROP_HIDEICONS: + case IDC_TASKBARPROP_CLOCK: + case IDC_TASKBARPROP_SECONDS: if (HIWORD(wParam) == BN_CLICKED) { UpdateTaskbarBitmap(pPropInfo); @@ -177,6 +251,10 @@ if (pPropInfo->hTaskbarBitmap) { DeleteObject(pPropInfo->hTaskbarBitmap); + } + if (pPropInfo->hTrayBitmap) + { + DeleteObject(pPropInfo->hTrayBitmap); } break;

9 years, 1 month

[gedmurphy] 70101: [CHARMAP_NEW] - Allow the dialog to be resized, which in turn will grow / shrink the grid view and the fonts inside it. This means users can make the grid larger if they don't ha...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Nov 24 21:17:43 2015 New Revision: 70101 URL: http://svn.reactos.org/svn/reactos?rev=70101&view=rev Log: [CHARMAP_NEW] - Allow the dialog to be resized, which in turn will grow / shrink the grid view and the fonts inside it. This means users can make the grid larger if they don't have their glasses on or want to see all the fonts in more detail. We no longer need a large font window popping out from the grid when you click on a cell (which I was never a fan of). - Don't allow scrolling previous to row 0 or after the last row Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/charmap_new/GridView.h trunk/reactos/base/applications/charmap_new/MainWindow.cpp trunk/reactos/base/applications/charmap_new/lang/en-US.rc Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -22,7 +22,8 @@ CGridView::CGridView() : m_xNumCells(20), m_yNumCells(10), - ScrollPosition(0) + m_ScrollPosition(0), + m_NumRows(0) { m_szMapWndClass = L"CharGridWClass"; } @@ -78,7 +79,7 @@ if (hdc == NULL) return false; // Setup the logfont structure - NewFont.Font.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; + NewFont.Font.lfHeight = 0; // This is set in WM_SIZE NewFont.Font.lfCharSet = DEFAULT_CHARSET; StringCchCopyW(NewFont.Font.lfFaceName, LF_FACESIZE, FontName); @@ -127,12 +128,12 @@ NewFont.NumValidGlyphs = j; // Calculate the number of rows required to hold all glyphs - int Rows = NewFont.NumValidGlyphs / m_xNumCells; + m_NumRows = NewFont.NumValidGlyphs / m_xNumCells; if (NewFont.NumValidGlyphs % m_xNumCells) - Rows += 1; + m_NumRows += 1; // Set the scrollbar in relation to the rows - SetScrollRange(m_hwnd, SB_VERT, 0, Rows, FALSE); + SetScrollRange(m_hwnd, SB_VERT, 0, m_NumRows - m_yNumCells, FALSE); // We're done, update the current font m_CurrentFont = NewFont; @@ -224,7 +225,7 @@ // Get the client area we can draw on. The position we set above includes // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us - // the size without the scroll, and it more efficient than getting the + // the size without the scroll, and it's more efficient than getting the // scroll metrics and calculating the size from that RECT ClientRect; GetClientRect(m_hwnd, &ClientRect); @@ -234,6 +235,26 @@ // Let all the cells know about their new coords UpdateCellCoordinates(); + // We scale the font size up or down depending on the cell size + if (m_CurrentFont.hFont) + { + // Delete the existing font + DeleteObject(m_CurrentFont.hFont); + + HDC hdc; + hdc = GetDC(m_hwnd); + if (hdc) + { + // Update the font size with respect to the cell size + m_CurrentFont.Font.lfHeight = (m_CellSize.cy - 5); + m_CurrentFont.hFont = CreateFontIndirectW(&m_CurrentFont.Font); + ReleaseDC(m_hwnd, hdc); + } + } + + // Redraw the whole grid + InvalidateRect(m_hwnd, &ClientRect, TRUE); + return 0; } @@ -242,42 +263,47 @@ _In_ INT Pos) { - INT PrevScrollPosition = ScrollPosition; + INT PrevScrollPosition = m_ScrollPosition; switch (Value) { case SB_LINEUP: - ScrollPosition -= 1; + m_ScrollPosition -= 1; break; case SB_LINEDOWN: - ScrollPosition += 1; + m_ScrollPosition += 1; break; case SB_PAGEUP: - ScrollPosition -= m_yNumCells; + m_ScrollPosition -= m_yNumCells; break; case SB_PAGEDOWN: - ScrollPosition += m_yNumCells; + m_ScrollPosition += m_yNumCells; break; case SB_THUMBTRACK: - ScrollPosition = Pos; + m_ScrollPosition = Pos; break; default: break; } + // Make sure we don't scroll past row 0 or max rows + m_ScrollPosition = max(0, m_ScrollPosition); + m_ScrollPosition = min(m_ScrollPosition, m_NumRows); + + // Check if there's a difference from the previous position INT ScrollDiff; - ScrollDiff = PrevScrollPosition - ScrollPosition; + ScrollDiff = PrevScrollPosition - m_ScrollPosition; if (ScrollDiff) { // Set the new scrollbar position in the scroll box SetScrollPos(m_hwnd, SB_VERT, - ScrollPosition, + m_ScrollPosition, TRUE); // Check if the scrollbar has moved more than the @@ -288,7 +314,7 @@ GetClientRect(m_hwnd, &rect); // Scroll the visible cells which remain within the grid - // and invalid any new ones which appear from the top / bottom + // and invalidate any new ones which appear from the top / bottom ScrollWindowEx(m_hwnd, 0, ScrollDiff * m_CellSize.cy, @@ -441,22 +467,23 @@ { // Calculate which glyph to start at based on scroll position int i; - i = m_xNumCells * ScrollPosition; + i = m_xNumCells * m_ScrollPosition; // Make sure we have the correct font on the DC HFONT hOldFont; hOldFont = (HFONT)SelectFont(PaintStruct->hdc, m_CurrentFont.hFont); - // Traverse all the cells and tell them to paint themselves + // Traverse all the cells for (int y = 0; y < m_yNumCells; y++) for (int x = 0; x < m_xNumCells; x++) { + // Update the glyph for this cell WCHAR ch = (WCHAR)m_CurrentFont.ValidGlyphs[i]; m_Cells[y][x]->SetChar(ch); + // Tell it to paint itself m_Cells[y][x]->OnPaint(*PaintStruct); - i++; } @@ -487,6 +514,7 @@ { // Remove focus from any existing cell m_ActiveCell->SetFocus(false); + InvalidateRect(m_hwnd, m_ActiveCell->GetCellCoordinates(), TRUE); } // Set the new active cell and give it focus Modified: trunk/reactos/base/applications/charmap_new/GridView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -29,8 +29,8 @@ CCell*** m_Cells; // *m_Cells[][]; CCell *m_ActiveCell; - HFONT hFont; - INT ScrollPosition; + INT m_ScrollPosition; + int m_NumRows; CurrentFont m_CurrentFont; @@ -45,6 +45,8 @@ bool SetFont( _In_ CAtlString& FontName ); + + HWND GetHwnd() { return m_hwnd; } private: static LRESULT Modified: trunk/reactos/base/applications/charmap_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -214,7 +214,9 @@ } BOOL -CCharMapWindow::OnSize(void) +CCharMapWindow::OnSize( + _In_ WPARAM wParam + ) { RECT rcClient, rcStatus; INT lvHeight, iStatusHeight; @@ -229,14 +231,11 @@ // Get the full client rect GetClientRect(m_hMainWnd, &rcClient); - // Calculate the remaining height for the treeview + // Calculate the remaining height for the gridview lvHeight = rcClient.bottom - iStatusHeight; - // Resize the device view - //m_GridView->OnSize(0, - // iToolHeight, - // rcClient.right, - // lvHeight); + // Resize the grid view + SendMessageW(m_GridView->GetHwnd(), WM_SIZE, wParam, 0); return TRUE; } @@ -352,7 +351,7 @@ case WM_SIZE: { - return This->OnSize(); + return This->OnSize(wParam); } case WM_NOTIFY: @@ -526,7 +525,7 @@ Length = GetWindowTextLengthW(hCombo); if (!Length) return false; - CAtlStringW FontName;// = L"hahaha"; + CAtlStringW FontName; FontName.Preallocate(Length); SendMessageW(hCombo, Modified: trunk/reactos/base/applications/charmap_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -2,11 +2,11 @@ IDD_CHARMAP DIALOGEX 6, 6, 290, 224 FONT 8, "MS Shell Dlg", 0, 0 -STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX CAPTION "ReactOS Character Map" BEGIN LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "Characters to copy:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |

9 years, 1 month

[akhaldi] 70100: [RTL] Partially sync some timer queue related functions with Wine Staging 1.7.55. Brought to you by Samuel Serapión and Thomas Faber. CORE-10574 CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 20:35:58 2015 New Revision: 70100 URL: http://svn.reactos.org/svn/reactos?rev=70100&view=rev Log: [RTL] Partially sync some timer queue related functions with Wine Staging 1.7.55. Brought to you by Samuel Serapión and Thomas Faber. CORE-10574 CORE-10536 Modified: trunk/reactos/lib/rtl/timerqueue.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=7… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Tue Nov 24 20:35:58 2015 @@ -47,20 +47,22 @@ DWORD period; ULONG flags; ULONGLONG expire; - BOOL destroy; /* timer should be deleted; once set, never unset */ - HANDLE event; /* removal event */ + BOOL destroy; /* timer should be deleted; once set, never unset */ + HANDLE event; /* removal event */ }; struct timer_queue { + DWORD magic; RTL_CRITICAL_SECTION cs; - struct list timers; /* sorted by expiration time */ - BOOL quit; /* queue should be deleted; once set, never unset */ + struct list timers; /* sorted by expiration time */ + BOOL quit; /* queue should be deleted; once set, never unset */ HANDLE event; HANDLE thread; }; #define EXPIRE_NEVER (~(ULONGLONG) 0) +#define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ static void queue_remove_timer(struct queue_timer *t) { @@ -77,7 +79,7 @@ NtSetEvent(t->event, NULL); RtlFreeHeap(RtlGetProcessHeap(), 0, t); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) NtSetEvent(q->event, NULL); } @@ -95,19 +97,18 @@ RtlLeaveCriticalSection(&q->cs); } -static DWORD WINAPI timer_callback_wrapper(LPVOID p) +static VOID WINAPI timer_callback_wrapper(LPVOID p) { struct queue_timer *t = p; t->callback(t->param, TRUE); timer_cleanup_callback(t); - return 0; } static inline ULONGLONG queue_current_time(void) { - LARGE_INTEGER now; - NtQuerySystemTime(&now); - return now.QuadPart / 10000; + LARGE_INTEGER now, freq; + NtQueryPerformanceCounter(&now, &freq); + return now.QuadPart * 1000 / freq.QuadPart; } static void queue_add_timer(struct queue_timer *t, ULONGLONG time, @@ -151,13 +152,21 @@ RtlEnterCriticalSection(&q->cs); if (list_head(&q->timers)) { + ULONGLONG now, next; t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); - if (!t->destroy && t->expire <= queue_current_time()) + if (!t->destroy && t->expire <= ((now = queue_current_time()))) { ++t->runcount; - queue_move_timer( - t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, - FALSE); + if (t->period) + { + next = t->expire + t->period; + /* avoid trigger cascade if overloaded / hibernated */ + if (next < now) + next = now + t->period; + } + else + next = EXPIRE_NEVER; + queue_move_timer(t, next, FALSE); } else t = NULL; @@ -174,7 +183,7 @@ = (t->flags & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINPERSISTENTTHREAD | WT_EXECUTELONGFUNCTION | WT_TRANSFER_IMPERSONATION)); - NTSTATUS status = RtlQueueWorkItem((WORKERCALLBACKFUNC)timer_callback_wrapper, t, flags); + NTSTATUS status = RtlQueueWorkItem(timer_callback_wrapper, t, flags); if (status != STATUS_SUCCESS) timer_cleanup_callback(t); } @@ -203,7 +212,7 @@ return timeout; } -static void WINAPI timer_queue_thread_proc(LPVOID p) +static DWORD WINAPI timer_queue_thread_proc(LPVOID p) { struct timer_queue *q = p; ULONG timeout_ms; @@ -225,7 +234,7 @@ timer got put at the head of the list so we need to adjust our timeout. */ RtlEnterCriticalSection(&q->cs); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) done = TRUE; RtlLeaveCriticalSection(&q->cs); } @@ -240,8 +249,10 @@ NtClose(q->event); RtlDeleteCriticalSection(&q->cs); + q->magic = 0; RtlFreeHeap(RtlGetProcessHeap(), 0, q); RtlpExitThreadFunc(STATUS_SUCCESS); + return 0; } static void queue_destroy_timer(struct queue_timer *t) @@ -281,13 +292,14 @@ RtlInitializeCriticalSection(&q->cs); list_init(&q->timers); q->quit = FALSE; - status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + q->magic = TIMER_QUEUE_MAGIC; + status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); if (status != STATUS_SUCCESS) { RtlFreeHeap(RtlGetProcessHeap(), 0, q); return status; } - status = RtlpStartThreadFunc((PVOID)timer_queue_thread_proc, q, &q->thread); + status = RtlpStartThreadFunc(timer_queue_thread_proc, q, &q->thread); if (status != STATUS_SUCCESS) { NtClose(q->event); @@ -323,7 +335,7 @@ HANDLE thread; NTSTATUS status; - if (!q) + if (!q || q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; thread = q->thread; @@ -360,10 +372,10 @@ return status; } -static struct timer_queue *default_timer_queue; - static struct timer_queue *get_timer_queue(HANDLE TimerQueue) { + static struct timer_queue *default_timer_queue; + if (TimerQueue) return TimerQueue; else @@ -378,7 +390,7 @@ (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ - RtlDeleteTimerQueueEx(p, NULL); + RtlDeleteTimerQueueEx(q, NULL); } } return default_timer_queue; @@ -401,7 +413,7 @@ * after the first callback. If zero, the timer will only * fire once. It still needs to be deleted with * RtlDeleteTimer. - * Flags [I] Flags controling the execution of the callback. In + * Flags [I] Flags controlling the execution of the callback. In * addition to the WT_* thread pool flags (see * RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and * WT_EXECUTEONLYONCE are supported. @@ -418,8 +430,9 @@ NTSTATUS status; struct queue_timer *t; struct timer_queue *q = get_timer_queue(TimerQueue); - if (!q) - return STATUS_NO_MEMORY; + + if (!q) return STATUS_NO_MEMORY; + if (q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; t = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof *t); if (!t) @@ -516,7 +529,11 @@ return STATUS_INVALID_PARAMETER_1; q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) - status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + { + status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); + if (status == STATUS_SUCCESS) + status = STATUS_PENDING; + } else if (CompletionEvent) event = CompletionEvent; @@ -530,7 +547,10 @@ if (CompletionEvent == INVALID_HANDLE_VALUE && event) { if (status == STATUS_PENDING) + { NtWaitForSingleObject(event, FALSE, NULL); + status = STATUS_SUCCESS; + } NtClose(event); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 24 20:35:58 2015 @@ -253,6 +253,7 @@ reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.47 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 +reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.37

9 years, 1 month

[akhaldi] 70099: [KERNEL32_WINETEST] Avoid calling WaitForMultipleObjectsEx with pseudo handle. Brought to you by Sebastian Lackner.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 19:38:03 2015 New Revision: 70099 URL: http://svn.reactos.org/svn/reactos?rev=70099&view=rev Log: [KERNEL32_WINETEST] Avoid calling WaitForMultipleObjectsEx with pseudo handle. Brought to you by Sebastian Lackner. Modified: trunk/rostests/winetests/kernel32/sync.c Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… ============================================================================== --- trunk/rostests/winetests/kernel32/sync.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/sync.c [iso-8859-1] Tue Nov 24 19:38:03 2015 @@ -2526,8 +2526,7 @@ { if (!strcmp(argv[2], "apc_deadlock")) { - HANDLE handle = GetCurrentThread(); - for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + for (;;) SleepEx(INFINITE, TRUE); } return; }

9 years, 1 month

[gedmurphy] 70098: [CHARMAP_NEW] - Implement drawing fonts onto the gridview - Implement scrolling through the grid via the scrollbar - When a new font is selected, setup that font for drawing. Thi...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Nov 24 17:55:27 2015 New Revision: 70098 URL: http://svn.reactos.org/svn/reactos?rev=70098&view=rev Log: [CHARMAP_NEW] - Implement drawing fonts onto the gridview - Implement scrolling through the grid via the scrollbar - When a new font is selected, setup that font for drawing. This includes setting up the DC for painting, getting the valid glyphs for that font (this fixes the bug in the existing viewer which has lots of squares for glyphs), setting up scrollbar info, etc. - Make the cell object more responsible for its own painting CORE-10518 Modified: trunk/reactos/base/applications/charmap_new/Cell.cpp trunk/reactos/base/applications/charmap_new/Cell.h trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/charmap_new/GridView.h trunk/reactos/base/applications/charmap_new/MainWindow.cpp trunk/reactos/base/applications/charmap_new/MainWindow.h trunk/reactos/base/applications/charmap_new/lang/en-US.rc Modified: trunk/reactos/base/applications/charmap_new/Cell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/Cell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/Cell.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -29,7 +29,7 @@ ) : m_hParent(hParent), m_CellCoordinates(CellCoordinates), - ch(L'*'), + m_Char(L'*'), m_bHasFocus(false), m_bIsLarge(false) { @@ -50,21 +50,23 @@ if (NeedsPaint == FALSE) return false; + + // Draw the cell border BOOL b = Rectangle(PaintStruct.hdc, - m_CellCoordinates.left, - m_CellCoordinates.top, - m_CellCoordinates.right, - m_CellCoordinates.bottom); + m_CellCoordinates.left, + m_CellCoordinates.top, + m_CellCoordinates.right, + m_CellCoordinates.bottom); + + // Calculate an internal drawing canvas for the cell + RECT Internal; + CopyRect(&Internal, &m_CellCoordinates); + InflateRect(&Internal, -1, -1); // Check if this cell has focus if (m_bHasFocus) { - // Take a copy of the border dims and make it slightly smaller - RECT Internal; - CopyRect(&Internal, &m_CellCoordinates); - InflateRect(&Internal, -1, -1); - // Draw the smaller cell to make it look selected Rectangle(PaintStruct.hdc, Internal.left, @@ -73,7 +75,14 @@ Internal.bottom); } - return true; + int Success; + Success = DrawTextW(PaintStruct.hdc, + &m_Char, + 1, + &Internal, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + return (Success != 0); } void Modified: trunk/reactos/base/applications/charmap_new/Cell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/Cell.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/Cell.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -7,7 +7,7 @@ bool m_bHasFocus; bool m_bIsLarge; - WCHAR ch; + WCHAR m_Char; public: CCell( @@ -23,6 +23,8 @@ LPRECT GetCellCoordinates() { return &m_CellCoordinates; } void SetFocus(_In_ bool HasFocus) { m_bHasFocus = HasFocus; } + WCHAR GetChar() { return m_Char; } + void SetChar(_In_ WCHAR ch) { m_Char = ch; } bool OnPaint( _In_ PAINTSTRUCT &PaintStruct Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -21,7 +21,8 @@ CGridView::CGridView() : m_xNumCells(20), - m_yNumCells(10) + m_yNumCells(10), + ScrollPosition(0) { m_szMapWndClass = L"CharGridWClass"; } @@ -62,7 +63,94 @@ } bool -CGridView::UpdateGridLayout( +CGridView::SetFont( + _In_ CAtlString& FontName + ) +{ + + // Create a temperary container for the new font + CurrentFont NewFont = { 0 }; + NewFont.FontName = FontName; + + // Get the DC for the full grid window + HDC hdc; + hdc = GetDC(m_hwnd); + if (hdc == NULL) return false; + + // Setup the logfont structure + NewFont.Font.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; + NewFont.Font.lfCharSet = DEFAULT_CHARSET; + StringCchCopyW(NewFont.Font.lfFaceName, LF_FACESIZE, FontName); + + // Get a handle to the new font + NewFont.hFont = CreateFontIndirectW(&NewFont.Font); + if (NewFont.hFont == NULL) + { + ReleaseDC(m_hwnd, hdc); + return false; + } + + // Setup an array of all possible non-BMP indices + WCHAR ch[MAX_GLYPHS]; + for (int i = 0; i < MAX_GLYPHS; i++) + ch[i] = (WCHAR)i; + + HFONT hOldFont; + hOldFont = (HFONT)SelectObject(hdc, NewFont.hFont); + + // Translate all the indices into glyphs + WORD out[MAX_GLYPHS]; + DWORD Status; + Status = GetGlyphIndicesW(hdc, + ch, + MAX_GLYPHS, + out, + GGI_MARK_NONEXISTING_GLYPHS); + ReleaseDC(m_hwnd, hdc); + if (Status == GDI_ERROR) + { + SelectObject(hdc, hOldFont); + return false; + } + + // Loop all the glyphs looking for valid ones + // and store those in our font data + int j = 0; + for (int i = 0; i < MAX_GLYPHS; i++) + { + if (out[i] != 0xffff) + { + NewFont.ValidGlyphs[j] = ch[i]; + j++; + } + } + NewFont.NumValidGlyphs = j; + + // Calculate the number of rows required to hold all glyphs + int Rows = NewFont.NumValidGlyphs / m_xNumCells; + if (NewFont.NumValidGlyphs % m_xNumCells) + Rows += 1; + + // Set the scrollbar in relation to the rows + SetScrollRange(m_hwnd, SB_VERT, 0, Rows, FALSE); + + // We're done, update the current font + m_CurrentFont = NewFont; + + // We changed the font, we'll need to repaint the whole window + InvalidateRect(m_hwnd, + NULL, + TRUE); + + return true; +} + + + +/* PRIVATE METHODS **********************************************/ + +bool +CGridView::UpdateCellCoordinates( ) { // Go through all the cells and calculate @@ -71,10 +159,10 @@ for (int x = 0; x < m_xNumCells; x++) { RECT CellCoordinates; - CellCoordinates.left = x * m_CellSize.cx + 1; - CellCoordinates.top = y * m_CellSize.cy + 1; - CellCoordinates.right = (x + 1) * m_CellSize.cx + 2; - CellCoordinates.bottom = (y + 1) * m_CellSize.cy + 2; + CellCoordinates.left = x * m_CellSize.cx; + CellCoordinates.top = y * m_CellSize.cy; + CellCoordinates.right = (x + 1) * m_CellSize.cx + 1; + CellCoordinates.bottom = (y + 1) * m_CellSize.cy + 1; m_Cells[y][x]->SetCellCoordinates(CellCoordinates); } @@ -125,6 +213,7 @@ m_ClientCoordinates.right = ParentRect.right - m_ClientCoordinates.left - 10; m_ClientCoordinates.bottom = ParentRect.bottom - m_ClientCoordinates.top - 70; + // Resize the grid window SetWindowPos(m_hwnd, NULL, m_ClientCoordinates.left, @@ -133,18 +222,90 @@ m_ClientCoordinates.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); - // Get the client area we can draw on. The position we set above - // includes a scrollbar. GetClientRect gives us the size without - // the scroll, and it more efficient than getting the scroll - // metrics and calculating the size + // Get the client area we can draw on. The position we set above includes + // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us + // the size without the scroll, and it more efficient than getting the + // scroll metrics and calculating the size from that RECT ClientRect; GetClientRect(m_hwnd, &ClientRect); m_CellSize.cx = ClientRect.right / m_xNumCells; m_CellSize.cy = ClientRect.bottom / m_yNumCells; - UpdateGridLayout(); + // Let all the cells know about their new coords + UpdateCellCoordinates(); return 0; +} + +VOID +CGridView::OnVScroll(_In_ INT Value, + _In_ INT Pos) +{ + + INT PrevScrollPosition = ScrollPosition; + + switch (Value) + { + case SB_LINEUP: + ScrollPosition -= 1; + break; + + case SB_LINEDOWN: + ScrollPosition += 1; + break; + + case SB_PAGEUP: + ScrollPosition -= m_yNumCells; + break; + + case SB_PAGEDOWN: + ScrollPosition += m_yNumCells; + break; + + case SB_THUMBTRACK: + ScrollPosition = Pos; + break; + + default: + break; + } + + INT ScrollDiff; + ScrollDiff = PrevScrollPosition - ScrollPosition; + if (ScrollDiff) + { + // Set the new scrollbar position in the scroll box + SetScrollPos(m_hwnd, + SB_VERT, + ScrollPosition, + TRUE); + + // Check if the scrollbar has moved more than the + // number of visible rows (draged or paged) + if (abs(ScrollDiff) < m_yNumCells) + { + RECT rect; + GetClientRect(m_hwnd, &rect); + + // Scroll the visible cells which remain within the grid + // and invalid any new ones which appear from the top / bottom + ScrollWindowEx(m_hwnd, + 0, + ScrollDiff * m_CellSize.cy, + &rect, + &rect, + NULL, + NULL, + SW_INVALIDATE); + } + else + { + // All the cells need to be redrawn + InvalidateRect(m_hwnd, + NULL, + TRUE); + } + } } LRESULT @@ -176,8 +337,10 @@ } } + // Make sure we have a valid DC if (bSuccess) { + // Paint the grid and chars DrawGrid(&PaintStruct); if (LocalHdc) @@ -237,6 +400,16 @@ break; } + case WM_VSCROLL: + { + INT Value, Pos; + Value = LOWORD(wParam); + Pos = HIWORD(wParam); + + This->OnVScroll(Value, Pos); + break; + } + case WM_PAINT: { This->OnPaint((HDC)wParam); @@ -266,12 +439,29 @@ _In_ LPPAINTSTRUCT PaintStruct ) { + // Calculate which glyph to start at based on scroll position + int i; + i = m_xNumCells * ScrollPosition; + + // Make sure we have the correct font on the DC + HFONT hOldFont; + hOldFont = (HFONT)SelectFont(PaintStruct->hdc, + m_CurrentFont.hFont); + // Traverse all the cells and tell them to paint themselves for (int y = 0; y < m_yNumCells; y++) for (int x = 0; x < m_xNumCells; x++) { + WCHAR ch = (WCHAR)m_CurrentFont.ValidGlyphs[i]; + m_Cells[y][x]->SetChar(ch); + m_Cells[y][x]->OnPaint(*PaintStruct); - } + + i++; + } + + SelectObject(PaintStruct->hdc, hOldFont); + } void Modified: trunk/reactos/base/applications/charmap_new/GridView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -1,17 +1,16 @@ #pragma once #include "Cell.h" -//typedef struct _CELL -//{ -// RECT CellExt; -// RECT CellInt; -// BOOL bActive; -// BOOL bLarge; -// WCHAR ch; -// -//} CELL, *PCELL; +#define MAX_GLYPHS 0xFFFF -#define MAX_GLYPHS 0xFFFF +struct CurrentFont +{ + CAtlStringW FontName; + LOGFONTW Font; + HFONT hFont; + USHORT ValidGlyphs[MAX_GLYPHS]; + USHORT NumValidGlyphs; +}; class CGridView @@ -26,17 +25,14 @@ int m_yNumCells; RECT m_ClientCoordinates; - //SIZE ClientSize; SIZE m_CellSize; - CCell*** m_Cells; // m_Cells[][]; + CCell*** m_Cells; // *m_Cells[][]; CCell *m_ActiveCell; HFONT hFont; - LOGFONTW CurrentFont; - INT iYStart; + INT ScrollPosition; - USHORT ValidGlyphs[MAX_GLYPHS]; - USHORT NumValidGlyphs; + CurrentFont m_CurrentFont; public: CGridView(); @@ -44,6 +40,10 @@ bool Create( _In_ HWND hParent + ); + + bool SetFont( + _In_ CAtlString& FontName ); private: @@ -65,11 +65,16 @@ _In_ INT Height ); + VOID OnVScroll( + _In_ INT Value, + _In_ INT Pos + ); + LRESULT OnPaint( _In_opt_ HDC hdc ); - bool UpdateGridLayout( + bool UpdateCellCoordinates( ); void DrawGrid( Modified: trunk/reactos/base/applications/charmap_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -199,6 +199,8 @@ if (!CreateFontComboBox()) return FALSE; + ChangeMapFont(); + // Configure Richedit control for sending notification changes. DWORD evMask; evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0); @@ -281,6 +283,13 @@ switch (Msg) { case IDC_CHECK_ADVANCED: + break; + + case IDC_FONTCOMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + ChangeMapFont(); + } break; default: @@ -504,4 +513,26 @@ 0); return (ret == 1); -} +} + +bool +CCharMapWindow::ChangeMapFont( + ) +{ + HWND hCombo; + hCombo = GetDlgItem(m_hMainWnd, IDC_FONTCOMBO); + + INT Length; + Length = GetWindowTextLengthW(hCombo); + if (!Length) return false; + + CAtlStringW FontName;// = L"hahaha"; + FontName.Preallocate(Length); + + SendMessageW(hCombo, + WM_GETTEXT, + FontName.GetAllocLength(), + (LPARAM)FontName.GetBuffer()); + + return m_GridView->SetFont(FontName); +} Modified: trunk/reactos/base/applications/charmap_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -78,4 +78,7 @@ bool CreateFontComboBox( ); + + bool ChangeMapFont( + ); }; Modified: trunk/reactos/base/applications/charmap_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_CHARMAP DIALOGEX 6, 6, 292, 224 +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 FONT 8, "MS Shell Dlg", 0, 0 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "ReactOS Character Map" @@ -13,17 +13,6 @@ WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - //CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | - // WS_TABSTOP, 8, 208, 95, 10 - //LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 - //COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - //LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8 - //COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - //PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14 - //EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - //LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8 - //LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8 - //EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END STRINGTABLE

9 years, 1 month

[tfaber] 70097: [RTL] - Implement RtlSetIoCompletionCallback. Patch by Samuel Serapión. CORE-10570 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 24 15:51:32 2015 New Revision: 70097 URL: http://svn.reactos.org/svn/reactos?rev=70097&view=rev Log: [RTL] - Implement RtlSetIoCompletionCallback. Patch by Samuel Serapión. CORE-10570 #resolve Modified: trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=700… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Tue Nov 24 15:51:32 2015 @@ -912,8 +912,30 @@ IN PIO_APC_ROUTINE Callback, IN ULONG Flags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + FILE_COMPLETION_INFORMATION FileCompletionInfo; + NTSTATUS Status; + + DPRINT("RtlSetIoCompletionCallback(0x%p, 0x%p, 0x%x)\n", FileHandle, Callback, Flags); + + /* Initialize the thread pool if not already initialized */ + if (!IsThreadPoolInitialized()) + { + Status = RtlpInitializeThreadPool(); + if (!NT_SUCCESS(Status)) + return Status; + } + + FileCompletionInfo.Port = ThreadPoolCompletionPort; + FileCompletionInfo.Key = (PVOID)Callback; + + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileCompletionInfo, + sizeof(FileCompletionInfo), + FileCompletionInformation); + + return Status; } /*

9 years, 1 month

[akhaldi] 70096: [NTDLL_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 15:14:42 2015 New Revision: 70096 URL: http://svn.reactos.org/svn/reactos?rev=70096&view=rev Log: [NTDLL_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/env.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… Modified: trunk/rostests/winetests/ntdll/env.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/env.c?rev… Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… Modified: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev…

9 years, 1 month

[tfaber] 70095: [MSI] - Use the correct attributes when overwriting a read-only file in cabinet_copy_file. Will be sent upstream after the 1.8 release. CORE-10534 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 24 14:57:00 2015 New Revision: 70095 URL: http://svn.reactos.org/svn/reactos?rev=70095&view=rev Log: [MSI] - Use the correct attributes when overwriting a read-only file in cabinet_copy_file. Will be sent upstream after the 1.8 release. CORE-10534 #resolve Modified: trunk/reactos/dll/win32/msi/media.c Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Tue Nov 24 14:57:00 2015 @@ -465,7 +465,7 @@ { TRACE("removing read-only attribute on %s\n", debugstr_w(path)); SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); - handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError();

9 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015