Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[ekohl] 74167: [NTOS:IO] IopGetDeviceRelations: - Use captured parameters to probe for write. - Do not check IopInitiatePnpIrp for STATUS_PENDING.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 13 21:23:15 2017 New Revision: 74167 URL: http://svn.reactos.org/svn/reactos?rev=74167&view=rev Log: [NTOS:IO] IopGetDeviceRelations: - Use captured parameters to probe for write. - Do not check IopInitiatePnpIrp for STATUS_PENDING. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Mon Mar 13 21:23:15 2017 @@ -670,9 +670,7 @@ BufferSize = RelationsData->BufferSize; Buffer = RelationsData->Buffer; - ProbeForWrite(RelationsData->Buffer, - RelationsData->BufferSize, - sizeof(CHAR)); + ProbeForWrite(Buffer, BufferSize, sizeof(CHAR)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -723,7 +721,7 @@ &IoStatusBlock, IRP_MN_QUERY_DEVICE_RELATIONS, &Stack); - if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + if (!NT_SUCCESS(Status)) { DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); goto done;

7 years, 9 months

[gadamopoulos] 74166: [EXPLORER} -Cleanup some code that I forgot in the previous commit.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 13 21:21:50 2017 New Revision: 74166 URL: http://svn.reactos.org/svn/reactos?rev=74166&view=rev Log: [EXPLORER} -Cleanup some code that I forgot in the previous commit. 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] Mon Mar 13 21:21:50 2017 @@ -2704,9 +2704,6 @@ } AdjustSizerRect(rc, m_Position); - - if (wParam == FALSE) - return 0; return 0; }

7 years, 9 months

[gadamopoulos] 74165: [EXPLORER] - CTrayWindow: Implement handling WM_NCCALCSIZE to get rid of the three unneeded borders when themes are enabled and the taskbar is not locked. Use GetWindowDC to d...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 13 21:14:15 2017 New Revision: 74165 URL: http://svn.reactos.org/svn/reactos?rev=74165&view=rev Log: [EXPLORER] - CTrayWindow: Implement handling WM_NCCALCSIZE to get rid of the three unneeded borders when themes are enabled and the taskbar is not locked. Use GetWindowDC to draw the grip properly. Misc size fixes. Patch by Sylvain Deverre with fixes by me. CORE-9668 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] Mon Mar 13 21:14:15 2017 @@ -847,6 +847,26 @@ return hMon; } + VOID AdjustSizerRect(RECT *rc, DWORD pos) + { + switch (pos) + { + case ABE_TOP: + rc->bottom -= GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_BOTTOM: + rc->top += GetSystemMetrics(SM_CXSIZEFRAME); + break; + case ABE_LEFT: + rc->right -= GetSystemMetrics(SM_CYSIZEFRAME); + break; + case ABE_RIGHT: + rc->left += GetSystemMetrics(SM_CYSIZEFRAME); + break; + } + + } + VOID MakeTrayRectWithSize(IN DWORD Position, IN const SIZE *pTraySize, IN OUT RECT *pRect) @@ -882,10 +902,13 @@ *pRect = *pScreen; - /* Move the border outside of the screen */ - InflateRect(pRect, - GetSystemMetrics(SM_CXEDGE), - GetSystemMetrics(SM_CYEDGE)); + if(!IsThemeActive()) + { + /* Move the border outside of the screen */ + InflateRect(pRect, + GetSystemMetrics(SM_CXEDGE), + GetSystemMetrics(SM_CYEDGE)); + } MakeTrayRectWithSize(Position, pTraySize, pRect); } @@ -1374,8 +1397,18 @@ entire window size, not just the client size. However, we use a thinner border than a standard thick border, so that the start button and bands are not stuck to the screen border. */ - sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); - sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + if(!IsThemeActive()) + { + sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); + sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + } + else + { + sr.Size.cx = StartBtnSize.cx - EdgeSize.cx; + sr.Size.cy = StartBtnSize.cy - EdgeSize.cy; + if(!Locked) + sr.Size.cy += GetSystemMetrics(SM_CYSIZEFRAME); + } /* Use the primary screen by default */ rcScreen.left = 0; @@ -1402,8 +1435,16 @@ loaded from the registry are at least. The windows explorer behaves the same way, it allows the user to save a zero width vertical tray window, but not a zero height horizontal tray window. */ - WndSize.cx = 2 * (EdgeSize.cx + DlgFrameSize.cx); - WndSize.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + if(!IsThemeActive()) + { + WndSize.cx = 2 * (EdgeSize.cx + DlgFrameSize.cx); + WndSize.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + } + else + { + WndSize.cx = StartBtnSize.cx; + WndSize.cy = StartBtnSize.cy - EdgeSize.cx; + } if (WndSize.cx < sr.Size.cx) WndSize.cx = sr.Size.cx; @@ -1828,7 +1869,7 @@ GetWindowRect(&rect); OffsetRect(&rect, -rect.left, -rect.top); - hdc = GetDCEx(hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + hdc = GetWindowDC(); switch (m_Position) { @@ -1889,8 +1930,11 @@ if (AlwaysOnTop) dwExStyle |= WS_EX_TOPMOST; - DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - WS_BORDER | WS_THICKFRAME; + DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + if(!IsThemeActive()) + { + dwStyle |= WS_THICKFRAME | WS_BORDER; + } ZeroMemory(&rcWnd, sizeof(rcWnd)); if (m_Position != (DWORD) -1) @@ -1957,16 +2001,31 @@ } } - if (Locked && m_Theme) - { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); - } - else - { - SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); - } - SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); - + if (m_Theme) + { + /* Update cached tray sizes */ + for(DWORD Pos = ABE_LEFT; Pos <= ABE_BOTTOM; Pos++) + { + RECT rcGripper = {0}; + AdjustSizerRect(&rcGripper, Pos); + + if(Locked) + { + m_TrayRects[Pos].top += rcGripper.top; + m_TrayRects[Pos].left += rcGripper.left; + m_TrayRects[Pos].bottom += rcGripper.bottom; + m_TrayRects[Pos].right += rcGripper.right; + } + else + { + m_TrayRects[Pos].top -= rcGripper.top; + m_TrayRects[Pos].left -= rcGripper.left; + m_TrayRects[Pos].bottom -= rcGripper.bottom; + m_TrayRects[Pos].right -= rcGripper.right; + } + } + } + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER); } return bPrevLock; @@ -2068,7 +2127,7 @@ else m_Theme = NULL; - if (Locked && m_Theme) + if (m_Theme) { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, 0); } @@ -2618,6 +2677,38 @@ bHandled = FALSE; return TRUE; + } + + LRESULT OnNcCalcSize(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + RECT *rc = NULL; + /* Ignore WM_NCCALCSIZE if we are not themed or locked */ + if(!IsThemeActive() || Locked) + { + bHandled = FALSE; + return 0; + } + if(!wParam) + { + rc = (RECT*)wParam; + } + else + { + NCCALCSIZE_PARAMS *prms = (NCCALCSIZE_PARAMS*)lParam; + if(prms->lppos->flags & SWP_NOSENDCHANGING) + { + bHandled = FALSE; + return 0; + } + rc = &prms->rgrc[0]; + } + + AdjustSizerRect(rc, m_Position); + + if (wParam == FALSE) + return 0; + + return 0; } LRESULT OnRebarAutoSize(INT code, LPNMHDR nmhdr, BOOL& bHandled) @@ -2723,6 +2814,7 @@ MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) MESSAGE_HANDLER(WM_CLOSE, OnDoExitWindows) MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) + MESSAGE_HANDLER(WM_NCCALCSIZE, OnNcCalcSize) ALT_MSG_MAP(1) END_MSG_MAP()

7 years, 9 months

[gadamopoulos] 74164: [SHELL32] -Fix redrawing the desktop when its size changes. This was broken in 72834.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 13 21:04:35 2017 New Revision: 74164 URL: http://svn.reactos.org/svn/reactos?rev=74164&view=rev Log: [SHELL32] -Fix redrawing the desktop when its size changes. This was broken in 72834. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Mon Mar 13 21:04:35 2017 @@ -157,8 +157,8 @@ GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); } - ::MoveWindow(m_hWnd, rcNewSize.left, rcNewSize.top, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, FALSE); - ::MoveWindow(m_hWndShellView, 0, 0, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, FALSE); + ::MoveWindow(m_hWnd, rcNewSize.left, rcNewSize.top, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, TRUE); + ::MoveWindow(m_hWndShellView, 0, 0, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, TRUE); if (cMonitors != 1) { @@ -176,8 +176,8 @@ #else SystemParametersInfoW(SPI_GETWORKAREA, 0, &rcNewSize, 0); - ::MoveWindow(m_hWnd, rcNewSize.left, rcNewSize.top, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, FALSE); - ::MoveWindow(m_hWndShellView, 0, 0, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, FALSE); + ::MoveWindow(m_hWnd, rcNewSize.left, rcNewSize.top, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, TRUE); + ::MoveWindow(m_hWndShellView, 0, 0, rcNewSize.right - rcNewSize.left, rcNewSize.bottom - rcNewSize.top, TRUE); #endif return S_OK;

7 years, 9 months

[dreimer] 74163: [RAPPS] Last one... slow like hell, but here it is... Foxit Reader

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Mar 13 19:28:09 2017 New Revision: 74163 URL: http://svn.reactos.org/svn/reactos?rev=74163&view=rev Log: [RAPPS] Last one... slow like hell, but here it is... Foxit Reader Modified: trunk/reactos/media/rapps/foxit.txt Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/foxit.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/foxit.txt [iso-8859-1] Mon Mar 13 19:28:09 2017 @@ -3,54 +3,53 @@ Version = 7.3.4 License = Freeware Description = Alternative PDF reader, rivaling Adobe Reader functionality-wise. -Size = 49.4 MiB +Size = 51.6 MiB Category = 6 URLSite = http://www.foxitsoftware.com/Secure_PDF_Reader/ URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/en_us/F… -SHA1 = e9fe8e878f9f057ad6bd2cb06d750e8f19a1d31d +SHA1 = ed6a6ca77dbd3f6fbd2ff923b661cb384adaeb05 CDPath = none [Section.0407] -Version = 7.2.5.0930 +Version = 7.3.6 Description = Alternativer PDF Reader. Neben Adobe Reader der beste PDF Reader. -Size = 58,9 MiB -URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.2/L10N/Fo… -SHA1 = 57d26745910841cefb3e7d86067da024d31fb267 +Size = 172 MiB +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/L10N/Fo… +SHA1 = 6295bb977a12460a3aee8d3d1209d453832e4095 [Section.0a] -Version = 7.2.5.0930 +Version = 7.3.6 License = Gratuito Description = Uno de los mejores lectores de PDF, parecido a Adobe Reader. -Size = 58.9 MiB -URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.2/L10N/Fo… -SHA1 = 57d26745910841cefb3e7d86067da024d31fb267 +Size = 172 MiB +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/L10N/Fo… +SHA1 = 6295bb977a12460a3aee8d3d1209d453832e4095 [Section.0418] License = GratuitÄ Description = Lector PDF, rivalizÃ¢nd Ã®n funcÈionalitate cu Adobe Reader. -Size = 49,4 Mio [Section.0419] -Version = 7.3.6.321 +Version = 7.3.6 License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾ Description = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¾Ð² Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ PDF. -URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/L10N/Fo… -SHA1 = 23e6992e8e47c3295145c9c44b9a05cc630b8dc6 -Size = 60,0 ÐÐ¸Ð +Size = 172 ÐÐ¸Ð +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/L10N/Fo… +SHA1 = 6295bb977a12460a3aee8d3d1209d453832e4095 [Section.041f] Name = Foxit Okuyucu -Version = 7.2.5.0930 +Version = 7.3.6 License = Ãcretsiz Description = BaÅka PDF okuyucusu, iÅlevlilik yÃ¶ntemi olarak Adobe Okuyucu'yla yarÄ±ÅÄ±yor. -Size = 58,9 MiB -URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.2/L10N/Fo… -SHA1 = 57d26745910841cefb3e7d86067da024d31fb267 +Size = 172 MiB +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/L10N/Fo… +SHA1 = 6295bb977a12460a3aee8d3d1209d453832e4095 [Section.0804] -Version = 7.3.1.125 +Version = 7.3.8.425 Description = æ¿ä»£ç PDF éè¯»å¨ï¼åª²ç¾ Adobe Reader åè½æºèã -Size = 47.7 MiB -URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/zh_cn/F… -SHA1 = 9492df6056a40166031ebc8cd06afdd9aaaa225b +Size = 47.5 MiB +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/7.x/7.3/zh_cn/F… +SHA1 = ac6b2a98e78beb01108d919d3ad18bfbfa63b0ae

7 years, 9 months

[dreimer] 74162: [RAPPS] ... welcome back WinXP support.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Mar 13 19:09:07 2017 New Revision: 74162 URL: http://svn.reactos.org/svn/reactos?rev=74162&view=rev Log: [RAPPS] ... welcome back WinXP support. Modified: trunk/reactos/media/rapps/tsvn.txt Modified: trunk/reactos/media/rapps/tsvn.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tsvn.txt?rev=7… ============================================================================== --- trunk/reactos/media/rapps/tsvn.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/tsvn.txt [iso-8859-1] Mon Mar 13 19:09:07 2017 @@ -1,16 +1,16 @@ [Section] Name = TortoiseSVN -Version = 1.9.5 +Version = 1.8.12 License = GPL Description = Graphical SVN client for code synchronization/updating. -Size = 14.7 MiB +Size = 14.9 MiB Category = 7 URLSite = http://www.tortoisesvn.net/ -URLDownload = https://download.sourceforge.net/project/tortoisesvn/1.9.5/Application/Tort… -SHA1 = be765bff3e7145646bd7f569d628b870c3b1751f +URLDownload = https://download.sourceforge.net/project/tortoisesvn/1.8.12/Application/Tor… +SHA1 = 5caa4cf8c30c2ced5a439016a7f43b309bf83293 CDPath = none [Section.0407] Description = Grafischer SVN Client fÃ¼r Code Synchronisation/Aktualisierung. -Size = 14,7 MiB +Size = 14,9 MiB

7 years, 9 months

[dreimer] 74161: [RAPPS] Add "TortoiseSVN" in "ReactOS App Manager" CORE-11748 #resolve #comment Added, thx ^^ Add NET framework 4.0 to RAPPS CORE-11523 #resolve #comment Added, thx ^^ [RAPPS-DB] U...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Mar 13 18:38:09 2017 New Revision: 74161 URL: http://svn.reactos.org/svn/reactos?rev=74161&view=rev Log: [RAPPS] Add "TortoiseSVN" in "ReactOS App Manager" CORE-11748 #resolve #comment Added, thx ^^ Add NET framework 4.0 to RAPPS CORE-11523 #resolve #comment Added, thx ^^ [RAPPS-DB] UltraVNC 1.2.1.0 link is dead CORE-11642 #resolve #comment Added, thx ^^ And Fixed LibreOffce d/l again... Added: trunk/reactos/media/rapps/net40.txt (with props) trunk/reactos/media/rapps/tsvn.txt (with props) Modified: trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/libreofficestill.txt trunk/reactos/media/rapps/ultravnc.txt Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… ============================================================================== --- trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreoffice.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -1,25 +1,25 @@ [Section] Name = LibreOffice -Version = 5.2.4 +Version = 5.3.0 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 213.4 MiB +Size = 211.0 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = 24046b82ba16a89f9d7fc7c95f62994a9d14949d +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = b81bc9e4a91a013e46cd0ffe319635b85eb339d4 CDPath = none [Section.0407] Description = Vorher bekannt als OpenOffice. Quelloffene Office Suite. -Size = 213,4 MiB +Size = 211,0 MiB [Section.0a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. Descendiente de OpenOffice. [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 213,4 Mio +Size = 211,0 Mio [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,15 +32,15 @@ [Section.0418] Description = SuitÄ completÄ de aplicaÈii de biroticÄ, cu surse deschise. ReprezintÄ o bifurcare a dezvoltÄrii OpenOffice. -Size = 213,4 Mio +Size = 211,0 Mio [Section.0419] Description = ÐÑÐ¾ÑÐ¿Ð»Ð°ÑÑÐ¾ÑÐ¼ÐµÐ½Ð½ÑÐ¹, ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼ÑÐ¹ Ð¾ÑÐ¸ÑÐ½ÑÐ¹ Ð¿Ð°ÐºÐµÑ Ñ Ð¾ÑÐºÑÑÑÑÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐ¹ ÐºÐ°Ðº Ð¾ÑÐ²ÐµÑÐ²Ð»ÐµÐ½Ð¸Ðµ OpenOffice. -Size = 213,4 ÐÐ¸Ð +Size = 211,0 ÐÐ¸Ð [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir ofis paketi. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 213,4 MiB +Size = 211,0 MiB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… ============================================================================== --- trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreofficehelp.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -1,21 +1,21 @@ [Section] Name = LibreOffice Help Pack -Version = 5.2.4 +Version = 5.3.0 License = GPLv3 Description = Offline help content of LibreOffice. Size = 5.1 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = 542fc52f862a5e6f67eac858afa7d1a5ea7efc51 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = b04981410bab3dd941942cea88b1b9cbe8313019 CDPath = none [Section.0407] Name = LibreOffice Help Pack Description = Offline Hilfe fÃ¼r LibreOffice. -Size = 7,1 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = d0fed4e46c22337bed590290c3520efd70aebf25 +Size = 7,2 MiB +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = 4ba3cfa801d403da1ff0cfef74596ef77f19d5df [Section.0418] Description = ConÈinut de asistenÈÄ Èi ajutor (Ã®n limba englezÄ) pentru LibreOffice. @@ -25,28 +25,28 @@ Name = LibreOffice Ð¡Ð¿ÑÐ°Ð²Ð¾ÑÐ½ÑÐ¹ Ð¿Ð°ÐºÐµÑ Description = ÐÑÑÐ»Ð°Ð¹Ð½ ÑÐ¿ÑÐ°Ð²ÐºÐ° Ð´Ð»Ñ LibreOffice. Size = 7,3 ÐÐ¸Ð -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = 4035a3570caca7f66bcdd676ad79f49dc72d2f93 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = ec63e42c1f2d87ea8a1d630ded23b83a7c72fee8 [Section.0a] Name = LibreOffice â Paquete de ayuda Description = PÃ¡ginas de ayuda para LibreOffice. Size = 7.1 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = e4847e337ae94442bcf29f926bd8a4b4025e684c +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = 1ad24e19dc73688f8aa0c0f3917782deefc0eb08 [Section.041f] Name = LibreOffice YardÄ±m Paketi License = GPL sÃ¼rÃ¼m 3 Description = LibreOffice'in Ã§evrim dÄ±ÅÄ± yardÄ±m iÃ§eriÄi. Size = 7,0 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = 52c9827ca6ab72c9e1d6412efd1eb4f193afec73 +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = 06033e0e9eb25179047cca753a011cd57095fa0f [Section.0804] Name = LibreOffice å¸®å©å Description = LibreOffice çè±æºå¸®å©åå®¹ã Size = 9.6 MiB -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.4/win/x86/Lib… -SHA1 = fc1cfde805967bc18f95fff72cb2c4471e19dc0f +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.3.0/win/x86/Lib… +SHA1 = c88420a80f15b73710bfc063e4f82719474e4c82 Modified: trunk/reactos/media/rapps/libreofficestill.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficesti… ============================================================================== --- trunk/reactos/media/rapps/libreofficestill.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/libreofficestill.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -1,25 +1,25 @@ [Section] Name = LibreOffice -Version = 5.1.6 +Version = 5.2.6 License = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 212.2 MiB +Size = 213.4 MiB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.1.6/win/x86/Lib… -SHA1 = 926f2a33f52d1f8bbf98724c0b286d65aa91701f +URLDownload = http://download.documentfoundation.org/libreoffice/stable/5.2.6/win/x86/Lib… +SHA1 = a68330bf78eb449ba1a42b75b9ddc60bfba225fb CDPath = none [Section.0407] Description = Vorher bekannt als OpenOffice. Quelloffene Office Suite. -Size = 212,2 MiB +Size = 213,4 MiB [Section.0a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. Descendiente de OpenOffice. [Section.040c] Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. -Size = 212,2 Mio +Size = 213,4 Mio [Section.0410] Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. @@ -32,15 +32,15 @@ [Section.0418] Description = SuitÄ completÄ de aplicaÈii de biroticÄ, cu surse deschise. ReprezintÄ o bifurcare a dezvoltÄrii OpenOffice. -Size = 212,2 Mio +Size = 213,4 Mio [Section.0419] Description = ÐÑÐ¾ÑÐ¿Ð»Ð°ÑÑÐ¾ÑÐ¼ÐµÐ½Ð½ÑÐ¹, ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼ÑÐ¹ Ð¾ÑÐ¸ÑÐ½ÑÐ¹ Ð¿Ð°ÐºÐµÑ Ñ Ð¾ÑÐºÑÑÑÑÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼, ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÐ¹ ÐºÐ°Ðº Ð¾ÑÐ²ÐµÑÐ²Ð»ÐµÐ½Ð¸Ðµ OpenOffice. -Size = 212,2 ÐÐ¸Ð +Size = 213,4 ÐÐ¸Ð [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir ofis paketi. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 212,2 MiB +Size = 213,4 MiB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Added: trunk/reactos/media/rapps/net40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net40.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/net40.txt (added) +++ trunk/reactos/media/rapps/net40.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -0,0 +1,57 @@ +[Section] +Name = Microsoft .NET Framework Version 4.0 +Version = 4.0 +License = Unknown +Description = Components needed to run managed Windows applications compiled in an Intermediate language like C#. +Size = 48.1 MiB +Category = 14 +URLSite = http://www.microsoft.com/en-US/download/details.aspx?id=17718 +URLDownload = https://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA9… +SHA1 = 58da3d74db353aad03588cbb5cea8234166d8b99 +CDPath = none + +[Section.0407] +Description = Runtime fÃ¼r C# Windows Anwendungen. +URLSite = http://www.microsoft.com/de-DE/download/details.aspx?id=17718 +Size = 48,1 MiB + +[Section.0a] +Description = Componentes necesarios para ejecutar programas escritos en lenguajes intermedios como C#. +URLSite = http://www.microsoft.com/es-ES/download/details.aspx?id=17718 + +[Section.040c] +Description = Microsoft .NET Framework version 4.0 +URLSite = http://www.microsoft.com/fr-FR/download/details.aspx?id=17718 +Size = 48,1 Mio + +[Section.0410] +Description = Microsoft .NET Framework Version 4.0 +URLSite = http://www.microsoft.com/it-IT/download/details.aspx?id=17718 + +[Section.0415] +Description = Microsoft .NET Framework Wersja 4.0 +URLSite = http://www.microsoft.com/pl-PL/download/details.aspx?id=17718 + +[Section.0418] +License = NespecificatÄ +Description = Pachet necesar pentru execuÈia Ã®n Windows a aplicaÈiilor gestionate, scrise Ã®ntr-un limbaj ca C#. +Size = 48,1 Mio + +[Section.0419] +License = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ +Description = ÐÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ, Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÐµ Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ Windows Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹. +URLSite = https://www.microsoft.com/ru-RU/download/details.aspx?id=17718 +Size = 48,1 ÐÐ¸Ð + +[Section.041f] +Name = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 4.0 +License = Bilinmiyor +Description = C# gibi orta dÃ¼zey bir dilde derlenmiÅ yÃ¶netilen Windows uygulamalarÄ±nÄ± Ã§alÄ±ÅtÄ±rmak iÃ§in gerekli bileÅenler. +URLSite = http://www.microsoft.com/tr-TR/download/details.aspx?id=17718 +Size = 48,1 MiB + +[Section.0804] +License = æªç¥ +Description = è¿è¡å¨ä¸é´çè¯è¨ï¼å¦ C# ä¸ç¼è¯æç®¡ç Windows åºç¨ç¨åºæéçç»ä»¶ã +URLSite = https://www.microsoft.com/zh-CN/download/details.aspx?id=1639 + Propchange: trunk/reactos/media/rapps/net40.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/reactos/media/rapps/tsvn.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tsvn.txt?rev=7… ============================================================================== --- trunk/reactos/media/rapps/tsvn.txt (added) +++ trunk/reactos/media/rapps/tsvn.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -0,0 +1,16 @@ +[Section] +Name = TortoiseSVN +Version = 1.9.5 +License = GPL +Description = Graphical SVN client for code synchronization/updating. +Size = 14.7 MiB +Category = 7 +URLSite = http://www.tortoisesvn.net/ +URLDownload = https://download.sourceforge.net/project/tortoisesvn/1.9.5/Application/Tort… +SHA1 = be765bff3e7145646bd7f569d628b870c3b1751f +CDPath = none + +[Section.0407] +Description = Grafischer SVN Client fÃ¼r Code Synchronisation/Aktualisierung. +Size = 14,7 MiB + Propchange: trunk/reactos/media/rapps/tsvn.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] Mon Mar 13 18:38:09 2017 @@ -3,23 +3,23 @@ Version = 1.2.1.1 License = GPL Description = Open source VNC client/server. -Size = 41.0 KiB +Size = 3.1 MiB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://www.uvnc.eu/download/1211/UltraVNC_1_2_11_X86_Setup.exe -SHA1 = c91787ed1e87b8d80348c4857b1a98bd0f2d307b +URLDownload = http://www.dpfox.com/files/VNC/UltraVNC_1_2_11_X86_Setup.exe +SHA1 = 24c774bc3d5b16e84f4dc734dda520dd54e5b7f9 CDPath = none [Section.0407] Description = Quelloffener VNC Client/Server. -Size = 41,0 KiB +Size = 3,1 MiB [Section.0a] Description = Cliente/servidor VNC de cÃ³digo abierto. [Section.040c] Description = Client/serveur VNC open source. -Size = 41,0 Kio +Size = 3,1 Mio [Section.0410] Description = Client/server VNC open source. @@ -32,15 +32,15 @@ [Section.0418] Description = Sistem client/server computaÈional de reÈea virtualÄ (VNC) cu surse deschise. -Size = 41,0 Kio +Size = 3,1 Mio [Section.0419] Description = VNC ÐºÐ»Ð¸ÐµÐ½Ñ/ÑÐµÑÐ²ÐµÑ Ñ Ð¾ÑÐºÑÑÑÑÐ¼ Ð¸ÑÑÐ¾Ð´Ð½ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼. -Size = 41,0 ÐÐ¸Ð +Size = 3,1 ÐÐ¸Ð [Section.041f] Description = AÃ§Ä±k kaynak VNC istemcisi ve sunucusu. -Size = 41,0 KiB +Size = 3,1 MiB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ VNC ÐºÐ»ÑÑÐ½Ñ/ÑÐµÑÐ²ÐµÑ.

7 years, 9 months

[gadamopoulos] 74160: {EXPLORER] -Fix gcc build.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 13 13:19:12 2017 New Revision: 74160 URL: http://svn.reactos.org/svn/reactos?rev=74160&view=rev Log: {EXPLORER] -Fix gcc build. 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] Mon Mar 13 13:19:12 2017 @@ -118,7 +118,7 @@ SetWindowTheme(m_hWnd, L"Start", NULL); /* Get the system fonts, we use the caption font, always bold, though. */ - NONCLIENTMETRICS ncm {sizeof(ncm)}; + NONCLIENTMETRICS ncm = {sizeof(ncm)}; if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) { ncm.lfCaptionFont.lfWeight = FW_BOLD;

7 years, 9 months

[gadamopoulos] 74159: [EXPLORER] -Remove the old way that the start button was painted. Keep some very simple fallback code in case the text couldn't be loaded or when the optimal size can't be det...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 13 13:07:55 2017 New Revision: 74159 URL: http://svn.reactos.org/svn/reactos?rev=74159&view=rev Log: [EXPLORER] -Remove the old way that the start button was painted. Keep some very simple fallback code in case the text couldn't be loaded or when the optimal size can't be determined. 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] Mon Mar 13 13:07:55 2017 @@ -105,254 +105,37 @@ if (m_ImageList == NULL || !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { - Size.cx = 2 * GetSystemMetrics(SM_CXEDGE); - Size.cy = 2 * GetSystemMetrics(SM_CYEDGE); - - if (hbmStart == NULL) - { - hbmStart = (HBITMAP) SendMessageW(BM_GETIMAGE, IMAGE_BITMAP, 0); - } - - if (hbmStart != NULL) - { - BITMAP bmp; - - if (GetObject(hbmStart, sizeof(bmp), &bmp) != 0) - { - Size.cx += bmp.bmWidth; - Size.cy += max(bmp.bmHeight, GetSystemMetrics(SM_CYCAPTION)); - } - else - { - /* Huh?! Shouldn't happen... */ - goto DefSize; - } - } - else - { -DefSize: - Size.cx += GetSystemMetrics(SM_CXMINIMIZED); - Size.cy += GetSystemMetrics(SM_CYCAPTION); - } + Size.cx = 2 * GetSystemMetrics(SM_CXEDGE) + GetSystemMetrics(SM_CYCAPTION) * 3; + Size.cy = 2 * GetSystemMetrics(SM_CYEDGE) + GetSystemMetrics(SM_CYCAPTION); } /* Save the size of the start button */ m_Size = Size; } - BOOL CreateImageList() - { - HICON hIconStart; - SIZE IconSize; - - if (m_ImageList != NULL) - return TRUE; - - IconSize.cx = GetSystemMetrics(SM_CXSMICON); - IconSize.cy = GetSystemMetrics(SM_CYSMICON); - - /* Load the start button icon and create a image list for it */ - hIconStart = (HICON) LoadImageW(hExplorerInstance, - MAKEINTRESOURCEW(IDI_START), - IMAGE_ICON, - IconSize.cx, - IconSize.cy, - LR_SHARED | LR_DEFAULTCOLOR); - - if (hIconStart == NULL) - return FALSE; - - m_ImageList = ImageList_Create(IconSize.cx, - IconSize.cy, - ILC_COLOR32 | ILC_MASK, - 1, 1); - if (m_ImageList == NULL) - return FALSE; - - int s = ImageList_ReplaceIcon(m_ImageList, -1, hIconStart); - if (s < 0) - { - /* Failed to add the icon! */ - ImageList_Destroy(m_ImageList); - m_ImageList = NULL; - - return FALSE; - } - - return TRUE; - } - - HBITMAP CreateBitmap() - { - WCHAR szStartCaption[32]; - HFONT hFontOld; - HDC hDC = NULL; - HDC hDCScreen = NULL; - SIZE Size, SmallIcon; - HBITMAP hbmpOld, hbmp = NULL; - HBITMAP hBitmap = NULL; - HICON hIconStart; - BOOL Ret; - UINT Flags; - RECT rcButton; - - /* NOTE: this is the backwards compatibility code that is used if the - Common Controls Version 6.0 are not available! */ - - if (!LoadStringW(hExplorerInstance, - IDS_START, - szStartCaption, - _countof(szStartCaption))) - { - return NULL; - } - - /* Load the start button icon */ - SmallIcon.cx = GetSystemMetrics(SM_CXSMICON); - SmallIcon.cy = GetSystemMetrics(SM_CYSMICON); - hIconStart = (HICON) LoadImageW(hExplorerInstance, - MAKEINTRESOURCEW(IDI_START), - IMAGE_ICON, - SmallIcon.cx, - SmallIcon.cy, - LR_SHARED | LR_DEFAULTCOLOR); - - hDCScreen = ::GetDC(NULL); - if (hDCScreen == NULL) - goto Cleanup; - - hDC = CreateCompatibleDC(hDCScreen); - if (hDC == NULL) - goto Cleanup; - - hFontOld = (HFONT) SelectObject(hDC, m_Font); - - Ret = GetTextExtentPoint32(hDC, - szStartCaption, - wcslen(szStartCaption), - &Size); - - SelectObject(hDC, hFontOld); - if (!Ret) - goto Cleanup; - - /* Make sure the height is at least the size of a caption icon. */ - if (hIconStart != NULL) - Size.cx += SmallIcon.cx + 4; - Size.cy = max(Size.cy, SmallIcon.cy); - - /* Create the bitmap */ - hbmp = CreateCompatibleBitmap(hDCScreen, - Size.cx, - Size.cy); - if (hbmp == NULL) - goto Cleanup; - - /* Calculate the button rect */ - rcButton.left = 0; - rcButton.top = 0; - rcButton.right = Size.cx; - rcButton.bottom = Size.cy; - - /* Draw the button */ - hbmpOld = (HBITMAP) SelectObject(hDC, hbmp); - - Flags = DC_TEXT | DC_INBUTTON; - if (hIconStart != NULL) - Flags |= DC_ICON; - - Ret = DrawCaptionTemp(NULL, - hDC, - &rcButton, - m_Font, - hIconStart, - szStartCaption, - Flags); - - SelectObject(hDC, hbmpOld); - - if (!Ret) - goto Cleanup; - - /* We successfully created the bitmap! */ - hBitmap = hbmp; - hbmp = NULL; - -Cleanup: - if (hDCScreen != NULL) - { - ::ReleaseDC(NULL, hDCScreen); - } - - if (hbmp != NULL) - DeleteObject(hbmp); - - if (hDC != NULL) - DeleteDC(hDC); - - return hBitmap; - } - VOID Initialize() { - NONCLIENTMETRICS ncm; - SetWindowTheme(m_hWnd, L"Start", NULL); - if (m_Font == NULL) - { - /* Get the system fonts, we use the caption font, always bold, though. */ - ncm.cbSize = sizeof(ncm); - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) - { - ncm.lfCaptionFont.lfWeight = FW_BOLD; - m_Font = CreateFontIndirect(&ncm.lfCaptionFont); - } + /* Get the system fonts, we use the caption font, always bold, though. */ + NONCLIENTMETRICS ncm {sizeof(ncm)}; + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) + { + ncm.lfCaptionFont.lfWeight = FW_BOLD; + m_Font = CreateFontIndirect(&ncm.lfCaptionFont); } SetFont(m_Font, FALSE); - if (CreateImageList()) - { - BUTTON_IMAGELIST bil; - - /* Try to set the start button image. this requires the Common - Controls 6.0 to be present (XP and later) */ - bil.himl = m_ImageList; - bil.margin.left = bil.margin.right = 1; - bil.margin.top = bil.margin.bottom = 1; - bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - - if (SendMessageW(BCM_SETIMAGELIST, 0, (LPARAM) &bil)) - { - SIZE Size = { 0, 0 }; - if (SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) - { - /* We're using the image list, remove the BS_BITMAP style and - don't center it horizontally */ - SetWindowStyle(m_hWnd, BS_BITMAP | BS_RIGHT, 0); - - UpdateSize(); - return; - } - } - - /* Fall back to the deprecated method on older systems that don't - support Common Controls 6.0 */ - ImageList_Destroy(m_ImageList); - m_ImageList = NULL; - } - - HBITMAP hbmStart = CreateBitmap(); - if (hbmStart != NULL) - { - UpdateSize(hbmStart); - - HBITMAP hbmOld = (HBITMAP) SendMessageW(BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hbmStart); - - if (hbmOld != NULL) - DeleteObject(hbmOld); - } + m_ImageList = ImageList_LoadImageW(hExplorerInstance, + MAKEINTRESOURCEW(IDB_START), + 0, 0, 0, + IMAGE_BITMAP, + LR_LOADTRANSPARENT | LR_CREATEDIBSECTION); + + BUTTON_IMAGELIST bil = {m_ImageList, {1,1,1,1}, BUTTON_IMAGELIST_ALIGN_LEFT}; + SendMessageW(BCM_SETIMAGELIST, 0, (LPARAM) &bil); + UpdateSize(); } HWND Create(HWND hwndParent) @@ -363,10 +146,10 @@ szStartCaption, _countof(szStartCaption))) { - szStartCaption[0] = L'\0'; - } - - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | BS_PUSHBUTTON | BS_CENTER | BS_VCENTER | BS_BITMAP; + wcscpy(szStartCaption, L"Start"); + } + + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | BS_PUSHBUTTON | BS_LEFT | BS_VCENTER; m_hWnd = CreateWindowEx( 0,

7 years, 9 months

[rnaumann] 74158: [EXPLORER] use a checkmark instead of a radio button for the "Lock the taskbar" option. CORE-12760 #resolve

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Mon Mar 13 10:36:46 2017 New Revision: 74158 URL: http://svn.reactos.org/svn/reactos?rev=74158&view=rev Log: [EXPLORER] use a checkmark instead of a radio button for the "Lock the taskbar" option. CORE-12760 #resolve 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] Mon Mar 13 10:36:46 2017 @@ -3091,8 +3091,6 @@ TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); - mii.fType |= MFT_RADIOCHECK; - ::InsertMenuItemW(hPopup, i + 1, TRUE, &mii); }

7 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
26
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 March 2017