Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[gadamopoulos] 75706: [EXPLORER] -Fix a comment typo. CORE-13566
by gadamopoulos＠svn.reactos.org 29 Aug '17

29 Aug '17

Author: gadamopoulos Date: Tue Aug 29 09:11:57 2017 New Revision: 75706 URL: http://svn.reactos.org/svn/reactos?rev=75706&view=rev Log: [EXPLORER] -Fix a comment typo. CORE-13566 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 Aug 29 09:11:57 2017 @@ -746,7 +746,7 @@ void UpdateFonts() { - /* There is nothing to do if themes are not enabled */ + /* There is nothing to do if themes are enabled */ if (m_Theme) return;

1 0

[hbelusca] 75705: [CMD]: Russian translation for the START command, adapted from amber CORE-13248, jperm CORE-13560 and reviewed by Alexander Shaposhnikov (sanchaez). Thank you all :) Addendum to r...
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 20:31:34 2017 New Revision: 75705 URL: http://svn.reactos.org/svn/reactos?rev=75705&view=rev Log: [CMD]: Russian translation for the START command, adapted from amber CORE-13248, jperm CORE-13560 and reviewed by Alexander Shaposhnikov (sanchaez). Thank you all :) Addendum to r75369. Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Mon Aug 28 20:31:34 2017 @@ -385,18 +385,18 @@ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¡ÑÑÐ¾ÐºÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð¿ÑÐ¸ÑÐ²Ð°Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹.\n\n\ SET Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐµÐºÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½ÑÑ ÑÑÐµÐ´Ñ.\n" STRING_START_HELP1 "ÐÐ°Ð¿ÑÑÐº ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n\n\ -START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ - [command/program] [parameters]\n\n\ - ""title"" Title of the window.\n\ - path Specifies the startup directory.\n\ - I Uses the original environment given to cmd.exe,\n\ - instead of the current environment.\n\ - B Starts the command or program without creating any window.\n\ - MIN Starts with a minimized window.\n\ - MAX Starts with a maximized window.\n\ - WAIT Starts the command or program and waits for its termination.\n\ - ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n\ - parameters Specifies the parameters to be given to the command or program.\n" +START [""Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº""] [/D Ð¿ÑÑÑ] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ + [ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°/Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°] [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ]\n\n\ + ""Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº"" ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð°.\n\ + Ð¿ÑÑÑ ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð·Ð°Ð¿ÑÑÐºÐ°.\n\ + I ÐÐ¾Ð²Ð¾Ð¹ ÑÑÐµÐ´Ð¾Ð¹ ÑÑÐ°Ð½ÐµÑ Ð¸ÑÑÐ¾Ð´Ð½Ð°Ñ ÑÑÐµÐ´Ð°, Ð¿ÐµÑÐµÐ´Ð°Ð½Ð½Ð°Ñ cmd.exe\n\ + Ð²Ð¼ÐµÑÑÐ¾ ÑÐµÐºÑÑÐµÐ¹ ÑÑÐµÐ´Ñ.\n\ + B ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¾ÐºÐ½Ð°.\n\ + MIN ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð² ÑÐ²ÐµÑÐ½ÑÑÐ¾Ð¼ Ð¾ÐºÐ½Ðµ.\n\ + MAX ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð² ÑÐ°Ð·Ð²ÐµÑÐ½ÑÑÐ¾Ð¼ Ð¾ÐºÐ½Ðµ.\n\ + WAIT ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¸ Ð¶Ð´Ð°ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ.\n\ + ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n\ + Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ, Ð¿ÐµÑÐµÐ´Ð°Ð²Ð°ÐµÐ¼ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ Ð¸Ð»Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ.\n" STRING_TITLE_HELP "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð¾ÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸.\n\n\ TITLE [ÑÑÑÐ¾ÐºÐ°]\n\n\ ÑÑÑÐ¾ÐºÐ° ÐÑÐ´ÑÑÐ¸Ð¹ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº Ð¾ÐºÐ½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸.\n"

1 0

[tfaber] 75704: [INF] - Properly set svn:eol-style. These files are text, so they shouldn't be marked as binary, and they need to have CRLF line endings since they go on the iso.
by tfaber＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: tfaber Date: Mon Aug 28 19:42:35 2017 New Revision: 75704 URL: http://svn.reactos.org/svn/reactos?rev=75704&view=rev Log: [INF] - Properly set svn:eol-style. These files are text, so they shouldn't be marked as binary, and they need to have CRLF line endings since they go on the iso. Modified: trunk/reactos/media/inf/defltws.inf (contents, props changed) trunk/reactos/media/inf/font.inf (props changed) trunk/reactos/media/inf/hdaudbus.inf (props changed) trunk/reactos/media/inf/intl.inf (props changed) trunk/reactos/media/inf/layout.inf (props changed) trunk/reactos/media/inf/syssetup.inf.tpl (contents, props changed) Modified: trunk/reactos/media/inf/defltws.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/defltws.inf?rev=… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/defltws.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Mon Aug 28 19:42:35 2017 @@ -1 +1 @@ -native +CRLF Propchange: trunk/reactos/media/inf/defltws.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Propchange: trunk/reactos/media/inf/font.inf ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: trunk/reactos/media/inf/font.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Propchange: trunk/reactos/media/inf/hdaudbus.inf ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: trunk/reactos/media/inf/hdaudbus.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Propchange: trunk/reactos/media/inf/intl.inf ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: trunk/reactos/media/inf/intl.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Propchange: trunk/reactos/media/inf/layout.inf ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: trunk/reactos/media/inf/layout.inf ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/inf/syssetup.inf.tpl ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: trunk/reactos/media/inf/syssetup.inf.tpl ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream

1 0

[hbelusca] 75703: Sync with trunk r75702.
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 18:35:55 2017 New Revision: 75703 URL: http://svn.reactos.org/svn/reactos?rev=75703&view=rev Log: Sync with trunk r75702. Added: branches/setup_improvements/dll/win32/browseui/res/214.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/214.bmp branches/setup_improvements/dll/win32/browseui/res/215.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/215.bmp branches/setup_improvements/dll/win32/browseui/res/216.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/216.bmp branches/setup_improvements/dll/win32/browseui/res/217.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/217.bmp branches/setup_improvements/dll/win32/browseui/res/230.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/230.bmp branches/setup_improvements/dll/win32/browseui/res/231.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/231.bmp branches/setup_improvements/dll/win32/browseui/res/240.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/240.bmp branches/setup_improvements/dll/win32/browseui/res/241.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/241.bmp branches/setup_improvements/dll/win32/browseui/res/242.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/242.bmp branches/setup_improvements/dll/win32/browseui/res/245.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/245.bmp branches/setup_improvements/dll/win32/browseui/res/246.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/246.bmp branches/setup_improvements/dll/win32/browseui/res/247.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/247.bmp branches/setup_improvements/media/rapps/utorrent.txt (props changed) - copied unchanged from r75702, trunk/reactos/media/rapps/utorrent.txt Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/214.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/215.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/216.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/217.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/230.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/231.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/240.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/241.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/242.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/245.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/246.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/247.bmp Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/boot/bootdata/bootcd/unattend.inf branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf branches/setup_improvements/dll/win32/browseui/addressband.cpp branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp branches/setup_improvements/dll/win32/browseui/addresseditbox.h branches/setup_improvements/dll/win32/browseui/brandband.cpp branches/setup_improvements/dll/win32/browseui/browseui.rc branches/setup_improvements/dll/win32/browseui/explorerband.cpp branches/setup_improvements/dll/win32/browseui/resource.h branches/setup_improvements/dll/win32/browseui/toolsband.cpp branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp branches/setup_improvements/dll/win32/shell32/bitmap_res.rc branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp branches/setup_improvements/dll/win32/shell32/shresdef.h branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc branches/setup_improvements/dll/win32/uxtheme/msstyles.c branches/setup_improvements/dll/win32/uxtheme/nonclient.c branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c branches/setup_improvements/win32ss/user/ntuser/msgqueue.c branches/setup_improvements/win32ss/user/user32/windows/defwnd.c Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 28 18:35:55 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74526-75648 +/trunk/reactos:74526-75702 Modified: branches/setup_improvements/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… ============================================================================== --- branches/setup_improvements/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = no Modified: branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdat… ============================================================================== --- branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$" +; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = yes Modified: branches/setup_improvements/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -529,7 +529,7 @@ const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; HINSTANCE shellInstance; - shellInstance = GetModuleHandle(_T("shell32.dll")); + shellInstance = _AtlBaseModule.GetResourceInstance(); m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), Modified: branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -26,21 +26,22 @@ /* TODO: - Handle listbox dropdown message and fill contents Add drag and drop of icon in edit box Handle change notifies to update appropriately - Fix so selection in combo listbox navigates */ CAddressEditBox::CAddressEditBox() : fCombobox(NULL, this, 1), fEditWindow(NULL, this, 1), - fSite(NULL) + fSite(NULL), + pidlLastParsed(NULL) { } CAddressEditBox::~CAddressEditBox() { + if (pidlLastParsed) + ILFree(pidlLastParsed); } HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *pOwner) @@ -74,6 +75,7 @@ fCombobox.SubclassWindow(comboboxEx); fEditWindow.SubclassWindow(editControl); fSite = param18; + hComboBoxEx = comboboxEx; SHAutoComplete(fEditWindow.m_hWnd, SHACF_FILESYSTEM | SHACF_URLALL | SHACF_USETAB); @@ -258,21 +260,42 @@ switch (uMsg) { - case WM_NOTIFY: - hdr = (LPNMHDR) lParam; - if (hdr->code == CBEN_ENDEDIT) - { - NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; - if (endEdit->iWhy == CBENF_RETURN) + case WM_COMMAND: + { + if (HIWORD(wParam) == CBN_SELCHANGE) { + UINT selectedIndex = SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); + pidlLastParsed = ILClone((LPITEMIDLIST)SendMessageW((HWND)lParam, CB_GETITEMDATA, selectedIndex, 0)); Execute(0); } - else if (endEdit->iWhy == CBENF_ESCAPE) + break; + } + case WM_NOTIFY: + { + hdr = (LPNMHDR) lParam; + if (hdr->code == CBEN_ENDEDIT) { - /* Reset the contents of the combo box */ + NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; + if (endEdit->iWhy == CBENF_RETURN) + { + Execute(0); + } + else if (endEdit->iWhy == CBENF_ESCAPE) + { + /* Reset the contents of the combo box */ + } } + else if (hdr->code == CBEN_DELETEITEM) + { + PNMCOMBOBOXEX pCBEx = (PNMCOMBOBOXEX) lParam; + LPITEMIDLIST itemPidl = (LPITEMIDLIST)pCBEx->ceItem.lParam; + if (itemPidl) + { + ILFree(itemPidl); + } + } + break; } - break; } return S_OK; } @@ -320,12 +343,8 @@ CComPtr<IBrowserService> isb; CComPtr<IShellFolder> sf; HRESULT hr; - INT indexClosed, indexOpen, itemExists, oldIndex; - DWORD result; - COMBOBOXEXITEMW item; PIDLIST_ABSOLUTE absolutePIDL; LPCITEMIDLIST pidlChild; - LPITEMIDLIST pidlPrevious; STRRET ret; WCHAR buf[4096]; @@ -336,23 +355,12 @@ { case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: + + if (pidlLastParsed) + ILFree(pidlLastParsed); pidlLastParsed = NULL; - oldIndex = fCombobox.SendMessage(CB_GETCURSEL, 0, 0); - - itemExists = FALSE; - pidlPrevious = NULL; - - ZeroMemory(&item, sizeof(item)); - item.mask = CBEIF_LPARAM; - item.iItem = 0; - if (fCombobox.SendMessage(CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) - { - pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); - if (pidlPrevious) - itemExists = TRUE; - } - + /* Get the current pidl of the browser */ hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -361,6 +369,28 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* Fill the combobox */ + PopulateComboBox(absolutePIDL); + + /* Find the current item in the combobox and select it */ + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = psfDesktop->GetDisplayNameOf(absolutePIDL, SHGDN_FORADDRESSBAR, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = StrRetToBufW(&ret, absolutePIDL, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + int index = SendMessageW(hComboBoxEx, CB_FINDSTRINGEXACT, 0, (LPARAM)buf); + if (index != -1) + SendMessageW(hComboBoxEx, CB_SETCURSEL, index, 0); + + /* Add the item that will be visible when the combobox is not expanded */ hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -373,37 +403,17 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + INT indexClosed, indexOpen; indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + COMBOBOXEXITEMW item = {0}; item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = 0; + item.iItem = -1; item.iImage = indexClosed; item.iSelectedImage = indexOpen; item.pszText = buf; item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - - if (itemExists) - { - result = fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); - oldIndex = 0; - - if (result) - { - ILFree(pidlPrevious); - } - } - else - { - oldIndex = fCombobox.SendMessage(CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); - - if (oldIndex < 0) - DbgPrint("ERROR %d\n", GetLastError()); - } - - fCombobox.SendMessage(CB_SETCURSEL, -1, 0); - fCombobox.SendMessage(CB_SETCURSEL, oldIndex, 0); - - //fAddressEditBox->SetCurrentDir(index); + fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); } return S_OK; } @@ -435,3 +445,150 @@ { return E_NOTIMPL; } + +void CAddressEditBox::PopulateComboBox(LPITEMIDLIST pidlCurrent) +{ + HRESULT hr; + LPITEMIDLIST pidl; + int indent = 0; + int index; + + index = SendMessageW(hComboBoxEx, CB_GETCOUNT, 0, 0); + for (int i = 0; i < index; i++) + SendMessageW(hComboBoxEx, CBEM_DELETEITEM, i, 0); + SendMessageW(hComboBoxEx, CB_RESETCONTENT, 0, 0); + + /* Calculate the indent level. No need to clone the pidl */ + pidl = pidlCurrent; + do + { + if(!pidl->mkid.cb) + break; + pidl = ILGetNext(pidl); + indent++; + } while (pidl); + index = indent; + + /* Add every id from the pidl in the combo box */ + pidl = ILClone(pidlCurrent); + do + { + AddComboBoxItem(pidl, 0, index); + ILRemoveLastID(pidl); + index--; + } while (index >= 0); + ILFree(pidl); + + /* Add the items of the desktop */ + FillOneLevel(0, 1, indent); + + /* Add the items of My Computer */ + hr = SHGetSpecialFolderLocation(0, CSIDL_DRIVES, &pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + for(LPITEMIDLIST i = GetItemData(0); i; i = GetItemData(index)) + { + if (ILIsEqual(i, pidl)) + { + FillOneLevel(index, 2, indent); + break; + } + index++; + } + ILFree(pidl); +} + +void CAddressEditBox::AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent) +{ + HRESULT hr; + WCHAR buf[4096]; + + LPCITEMIDLIST pidlChild; + CComPtr<IShellFolder> sf; + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + STRRET strret; + hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = StrRetToBufW(&strret, pidlChild, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + COMBOBOXEXITEMW item = {0}; + item.mask = CBEIF_LPARAM | CBEIF_INDENT | CBEIF_SELECTEDIMAGE | CBEIF_IMAGE | CBEIF_TEXT; + item.iImage = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &item.iSelectedImage); + item.pszText = buf; + item.lParam = (LPARAM)(ILClone(pidl)); + item.iIndent = indent; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_INSERTITEMW, 0, (LPARAM)&item); +} + +void CAddressEditBox::FillOneLevel(int index, int levelIndent, int indent) +{ + HRESULT hr; + ULONG numObj; + int count; + LPITEMIDLIST pidl, pidl2, pidl3, pidl4; + + count = index + 1; + pidl = GetItemData(index); + pidl2 = GetItemData(count); + if(pidl) + { + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfItem; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + if (!pidl->mkid.cb) + { + psfItem = psfDesktop; + } + else + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfItem)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + } + + CComPtr<IEnumIDList> pEnumIDList; + hr = psfItem->EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_INCLUDEHIDDEN, &pEnumIDList); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + do + { + hr = pEnumIDList->Next(1, &pidl3, &numObj); + if(hr != S_OK || !numObj) + break; + + pidl4 = ILCombine(pidl, pidl3); + if (pidl2 && ILIsEqual(pidl4, pidl2)) + count += (indent - levelIndent); + else + AddComboBoxItem(pidl4, count, levelIndent); + count++; + ILFree(pidl3); + ILFree(pidl4); + } while (true); + } +} + +LPITEMIDLIST CAddressEditBox::GetItemData(int index) +{ + COMBOBOXEXITEMW item; + + memset(&item, 0, sizeof(COMBOBOXEXITEMW)); + item.mask = CBEIF_LPARAM; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_GETITEMW, 0, (LPARAM)&item); + return (LPITEMIDLIST)item.lParam; +} Modified: branches/setup_improvements/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addresseditbox.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -38,10 +38,15 @@ DWORD fAdviseCookie; CComPtr<IUnknown> fSite; LPITEMIDLIST pidlLastParsed; + HWND hComboBoxEx; public: CAddressEditBox(); ~CAddressEditBox(); private: + void PopulateComboBox(LPITEMIDLIST pidl); + void AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent); + void FillOneLevel(int index, int levelIndent, int indent); + LPITEMIDLIST GetItemData(int index); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *); Modified: branches/setup_improvements/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/brandband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -85,7 +85,6 @@ int clientWidth; int clientHeight; int clientSize; - HINSTANCE shell32Instance; BITMAP bitmapInfo; int resourceID; @@ -102,8 +101,7 @@ resourceID += 2; else if (clientSize >= gMediumImageSize) resourceID += 1; - shell32Instance = GetModuleHandle(L"shell32.dll"); - fImageBitmap = LoadBitmap(shell32Instance, MAKEINTRESOURCE(resourceID)); + fImageBitmap = LoadBitmap(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(resourceID)); GetObjectW(fImageBitmap, sizeof(bitmapInfo), &bitmapInfo); fBitmapSize = bitmapInfo.bmWidth; fMaxFrameCount = bitmapInfo.bmHeight / fBitmapSize; Modified: branches/setup_improvements/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/browseui.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -110,3 +110,15 @@ /* Include band button bitmaps */ IDB_BANDBUTTONS BITMAP "res/barbtn.bmp" +IDB_SHELL_EXPLORER_LG BITMAP "res/214.bmp" +IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/215.bmp" +IDB_SHELL_EXPLORER_SM BITMAP "res/216.bmp" +IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/217.bmp" +IDB_SHELL_GO BITMAP "res/230.bmp" +IDB_SHELL_GO_HOT BITMAP "res/231.bmp" +IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/240.bmp" +/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/241.bmp" +IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/242.bmp" +IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/245.bmp" +IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/246.bmp" +IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/247.bmp"*/ Modified: branches/setup_improvements/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/explorerband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -574,11 +574,14 @@ /* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) - { - ERR("Failed to get node name\n"); + STRRET strret; + hr = psfParent->GetDisplayNameOf(pEltRelative, SHGDN_INFOLDER, &strret); + if (FAILED_UNEXPECTEDLY(hr)) return NULL; - } + + hr = StrRetToBufW(&strret, pEltRelative, wszDisplayName, MAX_PATH); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; /* Get the icon of the node */ INT iIcon = SHMapPIDLToSystemImageListIndex(psfParent, pEltRelative, NULL); Modified: branches/setup_improvements/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/resource.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -129,3 +129,15 @@ #define IDC_ICONOPTIONS 4097 #define IDB_BANDBUTTONS 545 +#define IDB_SHELL_EXPLORER_LG 214 +#define IDB_SHELL_EXPLORER_LG_HOT 215 +#define IDB_SHELL_EXPLORER_SM 216 +#define IDB_SHELL_EXPLORER_SM_HOT 217 +#define IDB_SHELL_GO 230 +#define IDB_SHELL_GO_HOT 231 +#define IDB_SHELL_BRANDBAND_SM_HI 240 +/*#define IDB_SHELL_BRANDBAND_MD_HI 241 +#define IDB_SHELL_BRANDBAND_LG_HI 242 +#define IDB_SHELL_BRANDBAND_SM_LO 245 +#define IDB_SHELL_BRANDBAND_MD_LO 246 +#define IDB_SHELL_BRANDBAND_LG_LO 247*/ Modified: branches/setup_improvements/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/br… ============================================================================== --- branches/setup_improvements/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/toolsband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -295,12 +295,13 @@ SendMessage(TB_SETMAXTEXTROWS, 1, 0); SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); - HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); - - m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot); Modified: branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== --- branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -394,12 +394,12 @@ HRESULT WINAPI CIDLDataObj::StartOperation(IBindCtx *pbcReserved) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; } HRESULT WINAPI CIDLDataObj::EndOperation(HRESULT hResult, IBindCtx *pbcReserved, DWORD dwEffects) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; } Modified: branches/setup_improvements/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== --- branches/setup_improvements/dll/win32/shell32/bitmap_res.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/bitmap_res.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -4,19 +4,7 @@ IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206.bmp" IDB_SHELL_IEXPLORE_SM_HOT BITMAP "res/bitmaps/207.bmp" -IDB_SHELL_EXPLORER_LG BITMAP "res/bitmaps/214.bmp" -IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/bitmaps/215.bmp" -IDB_SHELL_EXPLORER_SM BITMAP "res/bitmaps/216.bmp" -IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/bitmaps/217.bmp" IDB_SHELL_EDIT_LG BITMAP "res/bitmaps/225.bmp" IDB_SHELL_EDIT_LG_HOT BITMAP "res/bitmaps/226.bmp" IDB_SHELL_EDIT_SM BITMAP "res/bitmaps/227.bmp" IDB_SHELL_EDIT_SM_HOT BITMAP "res/bitmaps/228.bmp" -IDB_SHELL_GO BITMAP "res/bitmaps/230.bmp" -IDB_SHELL_GO_HOT BITMAP "res/bitmaps/231.bmp" -IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/bitmaps/240.bmp" -/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/bitmaps/241.bmp" -IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/bitmaps/242.bmp" -IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/bitmaps/245.bmp" -IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/bitmaps/246.bmp" -IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/bitmaps/247.bmp"*/ Modified: branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== --- branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -885,13 +885,19 @@ return FALSE; } - if (GetDriveTypeW(wszPath) != DRIVE_FIXED) + // Only keep the base path. + WCHAR wszRootPathName[MAX_PATH]; + strcpyW(wszRootPathName, wszPath); + PathRemoveFileSpecW(wszRootPathName); + PathAddBackslashW(wszRootPathName); + + if (GetDriveTypeW(wszRootPathName) != DRIVE_FIXED) { /* no bitbucket on removable media */ return FALSE; } - if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) + if (!GetVolumeInformationW(wszRootPathName, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { ERR("GetVolumeInformationW failed with %u\n", GetLastError()); return FALSE; Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/214.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/215.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/216.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/217.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/230.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/231.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/240.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/241.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/242.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/245.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/246.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/247.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== Binary file - no diff available. Modified: branches/setup_improvements/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/sh… ============================================================================== --- branches/setup_improvements/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -31,22 +31,10 @@ #define IDB_SHELL_IEXPLORE_LG_HOT 205 #define IDB_SHELL_IEXPLORE_SM 206 #define IDB_SHELL_IEXPLORE_SM_HOT 207 -#define IDB_SHELL_EXPLORER_LG 214 -#define IDB_SHELL_EXPLORER_LG_HOT 215 -#define IDB_SHELL_EXPLORER_SM 216 -#define IDB_SHELL_EXPLORER_SM_HOT 217 #define IDB_SHELL_EDIT_LG 225 #define IDB_SHELL_EDIT_LG_HOT 226 #define IDB_SHELL_EDIT_SM 227 #define IDB_SHELL_EDIT_SM_HOT 228 -#define IDB_SHELL_GO 230 -#define IDB_SHELL_GO_HOT 231 -#define IDB_SHELL_BRANDBAND_SM_HI 240 -/*#define IDB_SHELL_BRANDBAND_MD_HI 241 -#define IDB_SHELL_BRANDBAND_LG_HI 242 -#define IDB_SHELL_BRANDBAND_SM_LO 245 -#define IDB_SHELL_BRANDBAND_MD_LO 246 -#define IDB_SHELL_BRANDBAND_LG_LO 247*/ /* Strings */ Modified: branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/us… ============================================================================== --- branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -4,7 +4,7 @@ BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" IDS_APPDATA "Application Data" - IDS_DESKTOP "Desktop" + IDS_DESKTOP "Ð Ð¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»" IDS_FAVORITES "ÐÐ±ÑÐ°Ð½Ðµ" IDS_MYDOCUMENTS "ÐÐ¾Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸" IDS_NETHOOD "NetHood" Modified: branches/setup_improvements/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… ============================================================================== --- branches/setup_improvements/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/uxtheme/msstyles.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -875,7 +875,6 @@ /* nothing to do */ return TRUE; - *hasAlpha = TRUE; p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ @@ -886,6 +885,9 @@ p[1] = (p[1] * a) >> 8; p[2] = (p[2] * a) >> 8; p += 4; + + if (a != 256) + *hasAlpha = TRUE; } return TRUE; Modified: branches/setup_improvements/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/ux… ============================================================================== --- branches/setup_improvements/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -217,6 +217,7 @@ INT ButtonWidth, ButtonHeight, iPartId, i; WINDOWINFO wi = {sizeof(wi)}; RECT rcCurrent; + SIZE ButtonSize; /* First of all check if we have something to do here */ style = GetWindowLongW(hWnd, GWL_STYLE); @@ -243,36 +244,18 @@ InflateRect(&rcCurrent, -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE, -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE); + iPartId = wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; + + GetThemePartSize(htheme, NULL, iPartId, 0, NULL, TS_MIN, &ButtonSize); + + ButtonHeight = GetSystemMetrics( wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); + + ButtonHeight -= 4; + ButtonWidth -= 4; + for (i = CLOSEBUTTON; i <= HELPBUTTON; i++) { - SIZE ButtonSize; - - switch(i) - { - case CLOSEBUTTON: - iPartId = wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; - break; - - case MAXBUTTON: - iPartId = wi.dwStyle & WS_MAXIMIZE ? WP_RESTOREBUTTON : WP_MAXBUTTON; - break; - - case MINBUTTON: - iPartId = wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON; - break; - - default: - iPartId = WP_HELPBUTTON ; - } - - GetThemePartSize(htheme, NULL, iPartId, 0, NULL, TS_MIN, &ButtonSize); - - ButtonHeight = GetSystemMetrics( wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); - - ButtonHeight -= 4; - ButtonWidth -= 4; - SetRect(&pwndData->rcCaptionButtons[i], rcCurrent.right - ButtonWidth, rcCurrent.top, Propchange: branches/setup_improvements/media/rapps/utorrent.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF Propchange: branches/setup_improvements/media/rapps/utorrent.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Aug 28 18:35:55 2017 @@ -0,0 +1,26 @@ +/branches/GSoC_2011/GSoC_Network/media/rapps/utorrent.txt:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/media/rapps/utorrent.txt:51550 +/branches/GSoC_2011/TcpIpDriver/media/rapps/utorrent.txt:51551-53074,53076-53119 +/branches/GSoC_2016/AHCI/media/rapps/utorrent.txt:71203-73603 +/branches/GSoC_2016/USB/media/rapps/utorrent.txt:72365-73604 +/branches/GSoC_Network/media/rapps/utorrent.txt:51545-51546 +/branches/cmake-bringup/media/rapps/utorrent.txt:50484,50693,50719,51544-52564 +/branches/colins-printing-for-freedom/reactos/media/rapps/utorrent.txt:67543-68405,68407-68414,68417-70595 +/branches/condrv_restructure/media/rapps/utorrent.txt:63104-65657 +/branches/header-work/media/rapps/utorrent.txt:45691-47721 +/branches/kd++/media/rapps/utorrent.txt:58883-58973 +/branches/kernel-fun/reactos/media/rapps/utorrent.txt:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm/media/rapps/utorrent.txt:59241-63176 +/branches/reactos-yarotows/media/rapps/utorrent.txt:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/media/rapps/utorrent.txt:49994-49995 +/branches/ros-amd64-bringup/media/rapps/utorrent.txt:36852 +/branches/ros-amd64-bringup/reactos/media/rapps/utorrent.txt:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013/media/rapps/utorrent.txt:59059 +/branches/ros-csrss/media/rapps/utorrent.txt:57561-58762 +/branches/shell-experiments/media/rapps/utorrent.txt:61927-65494 +/branches/shell32_new-bringup/media/rapps/utorrent.txt:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/media/rapps/utorrent.txt:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/media/rapps/utorrent.txt:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk/media/rapps/utorrent.txt:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup/media/rapps/utorrent.txt:54809-54998 +/trunk/reactos/media/rapps/utorrent.txt:74526-75648,75691-75702 Modified: branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/… ============================================================================== --- branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -786,6 +786,10 @@ break; info->state.mode = pSetMapMode->iMode; EMF_SetMapMode(hdc, info); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETBKMODE: @@ -887,12 +891,16 @@ info->state.wndOrgY = pSetWindowOrgEx->ptlOrigin.y; TRACE("SetWindowOrgEx: %d,%d\n", info->state.wndOrgX, info->state.wndOrgY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETWINDOWEXTEX: { const EMRSETWINDOWEXTEX *pSetWindowExtEx = (const EMRSETWINDOWEXTEX *)mr; - + if (info->state.mode != MM_ISOTROPIC && info->state.mode != MM_ANISOTROPIC) break; info->state.wndExtX = pSetWindowExtEx->szlExtent.cx; @@ -901,6 +909,10 @@ EMF_FixIsotropic(hdc, info); TRACE("SetWindowExtEx: %d,%d\n",info->state.wndExtX, info->state.wndExtY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETVIEWPORTORGEX: @@ -910,6 +922,10 @@ info->state.vportOrgX = pSetViewportOrgEx->ptlOrigin.x; info->state.vportOrgY = pSetViewportOrgEx->ptlOrigin.y; TRACE("SetViewportOrgEx: %d,%d\n", info->state.vportOrgX, info->state.vportOrgY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETVIEWPORTEXTEX: @@ -923,6 +939,10 @@ if (info->state.mode == MM_ISOTROPIC) EMF_FixIsotropic(hdc, info); TRACE("SetViewportExtEx: %d,%d\n", info->state.vportExtX, info->state.vportExtY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_CREATEPEN: @@ -1259,6 +1279,10 @@ { const EMRSETWORLDTRANSFORM *lpXfrm = (const EMRSETWORLDTRANSFORM *)mr; info->state.world_transform = lpXfrm->xform; + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } @@ -1414,6 +1438,9 @@ lpScaleViewportExtEx->xNum,lpScaleViewportExtEx->xDenom, lpScaleViewportExtEx->yNum,lpScaleViewportExtEx->yDenom); + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } @@ -1439,6 +1466,9 @@ lpScaleWindowExtEx->xNum,lpScaleWindowExtEx->xDenom, lpScaleWindowExtEx->yNum,lpScaleWindowExtEx->yDenom); + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } @@ -1451,14 +1481,20 @@ info->state.world_transform.eM11 = info->state.world_transform.eM22 = 1; info->state.world_transform.eM12 = info->state.world_transform.eM21 = 0; info->state.world_transform.eDx = info->state.world_transform.eDy = 0; + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); break; case MWT_LEFTMULTIPLY: CombineTransform(&info->state.world_transform, &lpModifyWorldTrans->xform, &info->state.world_transform); + if (!IS_WIN9X()) + ModifyWorldTransform(hdc, &lpModifyWorldTrans->xform, MWT_LEFTMULTIPLY); break; case MWT_RIGHTMULTIPLY: CombineTransform(&info->state.world_transform, &info->state.world_transform, &lpModifyWorldTrans->xform); + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); break; default: FIXME("Unknown imode %d\n", lpModifyWorldTrans->iMode); @@ -2435,11 +2471,6 @@ TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize); ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data); offset += emr->nSize; - - /* WinNT - update the transform (win9x updates when the next graphics - output record is played). */ - if (hdc && !IS_WIN9X()) - EMF_Update_MF_Xform(hdc, info); } if (hdc) Modified: branches/setup_improvements/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user… ============================================================================== --- branches/setup_improvements/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -2216,9 +2216,7 @@ if (pti->pEThread) { BOOL Ret = TRUE; - ObReferenceObject(pti->pEThread); if (!(pti->pEThread->Tcb.SuspendCount) && !PsGetThreadFreezeCount(pti->pEThread)) Ret = FALSE; - ObDereferenceObject(pti->pEThread); return Ret; } return FALSE; @@ -2347,7 +2345,7 @@ { CurrentSentMessage->flags |= SMF_RECEIVERFREE; } - + if (!(CurrentSentMessage->flags & SMF_RECEIVERFREE)) { @@ -2385,7 +2383,7 @@ /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->HardwareMessagesListHead)) { - CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; + CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); ERR("MQ Cleanup Post Messages %p\n",CurrentMessage); MsqDestroyMessage(CurrentMessage); Modified: branches/setup_improvements/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user… ============================================================================== --- branches/setup_improvements/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -50,7 +50,6 @@ return gpsi->ahbrSystem[nIndex]; } - SetLastError(ERROR_INVALID_PARAMETER); return NULL; }

1 0

[ashaposhnikov] 75702: [RAPPS] Final commit - Removed atlex
by ashaposhnikov＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: ashaposhnikov Date: Mon Aug 28 15:12:23 2017 New Revision: 75702 URL: http://svn.reactos.org/svn/reactos?rev=75702&view=rev Log: [RAPPS] Final commit - Removed atlex Removed: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/

1 0

[hbelusca] 75701: [SETUPLIB][USETUP]: Move the settings code from usetup to setuplib (since it'll be needed for 1st-stage GUI installer as well...), apart from the code dealing with keyboard layout...
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 14:46:49 2017 New Revision: 75701 URL: http://svn.reactos.org/svn/reactos?rev=75701&view=rev Log: [SETUPLIB][USETUP]: Move the settings code from usetup to setuplib (since it'll be needed for 1st-stage GUI installer as well...), apart from the code dealing with keyboard layouts, since the latter uses MUI* functions from usetup. I'll try to think how to include that in setuplib... Added: branches/setup_improvements/base/setup/lib/settings.c - copied, changed from r75700, branches/setup_improvements/base/setup/usetup/settings.c branches/setup_improvements/base/setup/lib/settings.h - copied, changed from r75700, branches/setup_improvements/base/setup/usetup/settings.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/settings.c branches/setup_improvements/base/setup/usetup/settings.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -15,6 +15,7 @@ bootsup.c fsutil.c registry.c + settings.c setuplib.c precomp.h) Copied: branches/setup_improvements/base/setup/lib/settings.c (from r75700, branches/setup_improvements/base/setup/usetup/settings.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -26,14 +26,21 @@ /* INCLUDES *****************************************************************/ -#include "usetup.h" +#include "precomp.h" +#include "genlist.h" +#include "infsupp.h" +#include "registry.h" + +#include "settings.h" #define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/ +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup ULONG DefaultLanguageIndex = 0; +#endif /* FUNCTIONS ****************************************************************/ @@ -308,22 +315,6 @@ } -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - LONG AddEntriesFromInfSection( IN OUT PGENERIC_LIST List, @@ -394,7 +385,7 @@ return TotalCount; } -static UCHAR +UCHAR NTAPI DefaultProcessEntry( IN PWCHAR KeyName, @@ -1063,6 +1054,9 @@ return List; } + +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup + ULONG GetDefaultLanguageIndex(VOID) { @@ -1167,6 +1161,7 @@ return List; } + PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -1271,6 +1266,8 @@ return TRUE; } + +#endif #if 0 BOOLEAN Copied: branches/setup_improvements/base/setup/lib/settings.h (from r75700, branches/setup_improvements/base/setup/usetup/settings.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -27,6 +27,43 @@ #pragma once +/* + * Return values: + * 0x00: Failure, stop the enumeration; + * 0x01: Add the entry and continue the enumeration; + * 0x02: Skip the entry but continue the enumeration. + */ +typedef UCHAR +(NTAPI *PPROCESS_ENTRY_ROUTINE)( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + +LONG +AddEntriesFromInfSection( + IN OUT PGENERIC_LIST List, + IN HINF InfFile, + IN PCWSTR SectionName, + IN PINFCONTEXT pContext, + IN PPROCESS_ENTRY_ROUTINE ProcessEntry, + IN PVOID Parameter OPTIONAL); + +UCHAR +NTAPI +DefaultProcessEntry( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + + PGENERIC_LIST CreateComputerTypeList( HINF InfFile); @@ -50,6 +87,8 @@ CreateKeyboardDriverList( HINF InfFile); +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup + PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -64,15 +103,17 @@ GetDefaultLanguageIndex(VOID); BOOLEAN -ProcessLocaleRegistry( - PGENERIC_LIST List); - -BOOLEAN ProcessKeyboardLayoutRegistry( PGENERIC_LIST List); BOOLEAN ProcessKeyboardLayoutFiles( + PGENERIC_LIST List); + +#endif + +BOOLEAN +ProcessLocaleRegistry( PGENERIC_LIST List); BOOLEAN Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -41,6 +41,7 @@ #include "utils/osdetect.h" #include "utils/regutil.h" #include "registry.h" +#include "settings.h" /* DEFINES ******************************************************************/ Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -37,1032 +37,6 @@ /* FUNCTIONS ****************************************************************/ -static -BOOLEAN -IsAcpiComputer(VOID) -{ - UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); - UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); - UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_BASIC_INFORMATION pDeviceInformation = NULL; - ULONG DeviceInfoLength = sizeof(KEY_BASIC_INFORMATION) + 50 * sizeof(WCHAR); - PKEY_VALUE_PARTIAL_INFORMATION pValueInformation = NULL; - ULONG ValueInfoLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 50 * sizeof(WCHAR); - ULONG RequiredSize; - ULONG IndexDevice = 0; - UNICODE_STRING DeviceName, ValueName; - HANDLE hDevicesKey = NULL; - HANDLE hDeviceKey = NULL; - NTSTATUS Status; - BOOLEAN ret = FALSE; - - InitializeObjectAttributes(&ObjectAttributes, - &MultiKeyPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&hDevicesKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - while (TRUE) - { - Status = NtEnumerateKey(hDevicesKey, - IndexDevice, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - DeviceInfoLength = RequiredSize; - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = NtEnumerateKey(hDevicesKey, - IndexDevice, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - IndexDevice++; - - /* Open device key */ - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; - DeviceName.Buffer = pDeviceInformation->Name; - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - OBJ_CASE_INSENSITIVE, - hDevicesKey, - NULL); - Status = NtOpenKey(&hDeviceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Read identifier */ - Status = NtQueryValueKey(hDeviceKey, - &IdentifierU, - KeyValuePartialInformation, - pValueInformation, - ValueInfoLength, - &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - ValueInfoLength = RequiredSize; - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = NtQueryValueKey(hDeviceKey, - &IdentifierU, - KeyValuePartialInformation, - pValueInformation, - ValueInfoLength, - &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryValueKey() failed with status 0x%08lx\n", Status); - goto nextdevice; - } - else if (pValueInformation->Type != REG_SZ) - { - DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_SZ); - goto nextdevice; - } - - ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; - ValueName.Buffer = (PWCHAR)pValueInformation->Data; - if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - ValueName.Length -= sizeof(WCHAR); - if (RtlEqualUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE)) - { - DPRINT("Found ACPI BIOS\n"); - ret = TRUE; - goto cleanup; - } - -nextdevice: - NtClose(hDeviceKey); - hDeviceKey = NULL; - } - -cleanup: - if (pDeviceInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - if (pValueInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - if (hDevicesKey) - NtClose(hDevicesKey); - if (hDeviceKey) - NtClose(hDeviceKey); - return ret; -} - -static -BOOLEAN -GetComputerIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - LPCWSTR ComputerIdentifier; - HANDLE ProcessorsKey; - PKEY_FULL_INFORMATION pFullInfo; - ULONG Size, SizeNeeded; - NTSTATUS Status; - - DPRINT("GetComputerIdentifier() called\n"); - - Size = sizeof(KEY_FULL_INFORMATION); - pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); - if (!pFullInfo) - { - DPRINT("RtlAllocateHeap() failed\n"); - return FALSE; - } - - /* Open the processors key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&ProcessorsKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Get number of subkeys */ - Status = NtQueryKey(ProcessorsKey, - KeyFullInformation, - pFullInfo, - Size, - &Size); - NtClose(ProcessorsKey); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) - { - DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Find computer identifier */ - if (pFullInfo->SubKeys == 0) - { - /* Something strange happened. No processor detected */ - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - if (IsAcpiComputer()) - { - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"ACPI UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"ACPI MP"; - } - } - else - { - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"PC UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"PC MP"; - } - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - - /* Copy computer identifier to return buffer */ - SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); - if (SizeNeeded > IdentifierLength) - return FALSE; - - RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); - - return TRUE; -} - - -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - -LONG -AddEntriesFromInfSection( - IN OUT PGENERIC_LIST List, - IN HINF InfFile, - IN PCWSTR SectionName, - IN PINFCONTEXT pContext, - IN PPROCESS_ENTRY_ROUTINE ProcessEntry, - IN PVOID Parameter OPTIONAL) -{ - LONG TotalCount = 0; - PWCHAR KeyName; - PWCHAR KeyValue; - PVOID UserData; - BOOLEAN Current; - UCHAR RetVal; - CHAR DisplayText[128]; - - if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) - return -1; - - do - { - /* - * NOTE: Do not use INF_GetData() as it expects INF entries of exactly - * two fields ("key = value"); however we expect to be able to deal with - * entries having more than two fields, the only requirement being that - * the second field (field number 1) contains the field description. - */ - if (!INF_GetDataField(pContext, 0, &KeyName)) - { - DPRINT("INF_GetDataField() failed\n"); - return -1; - } - - if (!INF_GetDataField(pContext, 1, &KeyValue)) - { - DPRINT("INF_GetDataField() failed\n"); - INF_FreeData(KeyName); - return -1; - } - - UserData = NULL; - Current = FALSE; - RetVal = ProcessEntry(KeyName, - KeyValue, - DisplayText, - sizeof(DisplayText), - &UserData, - &Current, - Parameter); - INF_FreeData(KeyName); - INF_FreeData(KeyValue); - - if (RetVal == 0) - { - DPRINT("ProcessEntry() failed\n"); - return -1; - } - else if (RetVal == 1) - { - AppendGenericListEntry(List, DisplayText, UserData, Current); - ++TotalCount; - } - // else if (RetVal == 2), skip the entry. - - } while (SetupFindNextLine(pContext, pContext)); - - return TotalCount; -} - -static UCHAR -NTAPI -DefaultProcessEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL) -{ - PWSTR CompareKey = (PWSTR)Parameter; - - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) - { - /* Failure, stop enumeration */ - DPRINT1("RtlAllocateHeap() failed\n"); - return 0; - } - - wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); - - *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); - - /* Add the entry */ - return 1; -} - - -PGENERIC_LIST -CreateComputerTypeList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - WCHAR ComputerIdentifier[128]; - WCHAR ComputerKey[32]; - - /* Get the computer identification */ - if (!GetComputerIdentifier(ComputerIdentifier, 128)) - { - ComputerIdentifier[0] = 0; - } - - DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - BOOLEAN FoundId; - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - FoundId = !!wcsstr(ComputerIdentifier, KeyValue); - INF_FreeData(KeyValue); - - if (!FoundId) - continue; - - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - INF_FreeData(KeyName); - } while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Computer", - &Context, - DefaultProcessEntry, - ComputerKey) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - -static -BOOLEAN -GetDisplayIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - WCHAR Buffer[32]; - HANDLE BusKey; - HANDLE BusInstanceKey; - HANDLE ControllerKey; - HANDLE ControllerInstanceKey; - ULONG BusInstance; - ULONG ControllerInstance; - ULONG BufferLength; - ULONG ReturnedLength; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - NTSTATUS Status; - - DPRINT("GetDisplayIdentifier() called\n"); - - /* Open the bus key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&BusKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - BusInstance = 0; - while (TRUE) - { - swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusKey, - NULL); - - Status = NtOpenKey(&BusInstanceKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(BusKey); - return FALSE; - } - - /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, L"DisplayController"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusInstanceKey, - NULL); - - Status = NtOpenKey(&ControllerKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - ControllerInstance = 0; - - while (TRUE) - { - /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerKey, - NULL); - - Status = NtOpenKey(&ControllerInstanceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, L"Identifier"); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - 256 * sizeof(WCHAR); - ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferLength); - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - Status = NtQueryValueKey(ControllerInstanceKey, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); - - BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory(Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); - Identifier[BufferLength] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return TRUE; - } - - NtClose(ControllerInstanceKey); - - ControllerInstance++; - } - - NtClose(ControllerKey); - } - - NtClose(BusInstanceKey); - - BusInstance++; - } - - NtClose(BusKey); - - return FALSE; -} - -PGENERIC_LIST -CreateDisplayDriverList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - WCHAR DisplayIdentifier[128]; - WCHAR DisplayKey[32]; - - /* Get the display identification */ - if (!GetDisplayIdentifier(DisplayIdentifier, 128)) - { - DisplayIdentifier[0] = 0; - } - - DPRINT("Display identifier: '%S'\n", DisplayIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - BOOLEAN FoundId; - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - FoundId = !!wcsstr(DisplayIdentifier, KeyValue); - INF_FreeData(KeyValue); - - if (!FoundId) - continue; - - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - INF_FreeData(KeyName); - } while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Display", - &Context, - DefaultProcessEntry, - DisplayKey) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - -#if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); -#endif - - return List; -} - - -BOOLEAN -ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName) -{ - PGENERIC_LIST_ENTRY Entry; - static WCHAR SectionName[128]; - - DPRINT("ProcessComputerFiles() called\n"); - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - { - DPRINT("GetCurrentListEntry() failed\n"); - return FALSE; - } - - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); - *AdditionalSectionName = SectionName; - - return TRUE; -} - -BOOLEAN -ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List) -{ - NTSTATUS Status; - PGENERIC_LIST_ENTRY Entry; - INFCONTEXT Context; - PWCHAR Buffer; - PWCHAR ServiceName; - ULONG StartValue; - ULONG Width, Height, Bpp; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE KeyHandle; - WCHAR RegPath[255]; - - DPRINT("ProcessDisplayRegistry() called\n"); - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - { - DPRINT1("GetCurrentListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) - { - DPRINT1("SetupFindFirstLineW() failed\n"); - return FALSE; - } - - /* Enable the correct driver */ - if (!INF_GetDataField(&Context, 3, &ServiceName)) - { - DPRINT1("INF_GetDataField() failed\n"); - return FALSE; - } - - ASSERT(wcslen(ServiceName) < 10); - DPRINT1("Service name: '%S'\n", ServiceName); - - swprintf(RegPath, L"System\\CurrentControlSet\\Services\\%s", ServiceName); - RtlInitUnicodeString(&KeyName, RegPath); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - StartValue = 1; - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"Start", - REG_DWORD, - &StartValue, - sizeof(StartValue)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set the resolution */ - - if (!INF_GetDataField(&Context, 4, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - return FALSE; - } - - swprintf(RegPath, - L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", - ServiceName); - DPRINT1("RegPath: '%S'\n", RegPath); - RtlInitUnicodeString(&KeyName, RegPath); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - Width = wcstoul(Buffer, NULL, 10); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.XResolution", - REG_DWORD, - &Width, - sizeof(Width)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - if (!INF_GetDataField(&Context, 5, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - NtClose(KeyHandle); - return FALSE; - } - - Height = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.YResolution", - REG_DWORD, - &Height, - sizeof(Height)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - if (!INF_GetDataField(&Context, 6, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - NtClose(KeyHandle); - return FALSE; - } - - Bpp = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.BitsPerPel", - REG_DWORD, - &Bpp, - sizeof(Bpp)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - DPRINT("ProcessDisplayRegistry() done\n"); - - return TRUE; -} - -BOOLEAN -ProcessLocaleRegistry( - PGENERIC_LIST List) -{ - PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - - HANDLE KeyHandle; - NTSTATUS Status; - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - return FALSE; - - LanguageId = (PWCHAR)GetListEntryUserData(Entry); - if (LanguageId == NULL) - return FALSE; - - DPRINT("LanguageId: %S\n", LanguageId); - - /* Open the default users locale key */ - RtlInitUnicodeString(&KeyName, - L".DEFAULT\\Control Panel\\International"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default user locale */ - RtlInitUnicodeString(&ValueName, L"Locale"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Skip first 4 zeroes */ - if (wcslen(LanguageId) >= 4) - LanguageId += 4; - - /* Open the NLS language key */ - RtlInitUnicodeString(&KeyName, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default language */ - RtlInitUnicodeString(&ValueName, L"Default"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* Set install language */ - RtlInitUnicodeString(&ValueName, L"InstallLanguage"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - -PGENERIC_LIST -CreateKeyboardDriverList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Keyboard", - &Context, - DefaultProcessEntry, - NULL) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - ULONG GetDefaultLanguageIndex(VOID) { @@ -1166,6 +140,7 @@ return List; } + PGENERIC_LIST CreateKeyboardLayoutList( @@ -1281,82 +256,4 @@ } #endif -BOOLEAN -SetGeoID( - PWCHAR Id) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE KeyHandle; - - RtlInitUnicodeString(&Name, - L".DEFAULT\\Control Panel\\International\\Geo"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&Name, L"Nation"); - Status = NtSetValueKey(KeyHandle, - &Name, - 0, - REG_SZ, - (PVOID)Id, - (wcslen(Id) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - -BOOLEAN -SetDefaultPagefile( - WCHAR Drive) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"PagingFiles"); - WCHAR ValueBuffer[] = L"?:\\pagefile.sys 0 0\0"; - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return FALSE; - - ValueBuffer[0] = Drive; - - NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)&ValueBuffer, - sizeof(ValueBuffer)); - - NtClose(KeyHandle); - return TRUE; -} - /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] Mon Aug 28 14:46:49 2017 @@ -28,29 +28,6 @@ #pragma once PGENERIC_LIST -CreateComputerTypeList( - HINF InfFile); - -PGENERIC_LIST -CreateDisplayDriverList( - HINF InfFile); - -BOOLEAN -ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName); - -BOOLEAN -ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List); - -PGENERIC_LIST -CreateKeyboardDriverList( - HINF InfFile); - -PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, WCHAR *DefaultKBLayout); @@ -64,10 +41,6 @@ GetDefaultLanguageIndex(VOID); BOOLEAN -ProcessLocaleRegistry( - PGENERIC_LIST List); - -BOOLEAN ProcessKeyboardLayoutRegistry( PGENERIC_LIST List); @@ -75,12 +48,4 @@ ProcessKeyboardLayoutFiles( PGENERIC_LIST List); -BOOLEAN -SetGeoID( - PWCHAR Id); - -BOOLEAN -SetDefaultPagefile( - WCHAR Drive); - /* EOF */

1 0

[hbelusca] 75700: [USETUP]: Add an AddEntriesFromInfSection() helper, inspired by the reactos/reactos.c!LoadGenEntry() function, that enumerates the entries of a given INF section, and adds these i...
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 14:01:30 2017 New Revision: 75700 URL: http://svn.reactos.org/svn/reactos?rev=75700&view=rev Log: [USETUP]: Add an AddEntriesFromInfSection() helper, inspired by the reactos/reactos.c!LoadGenEntry() function, that enumerates the entries of a given INF section, and adds these into a (user-allocated) GENERIC_LIST after some pre-processing. Use this helper in the different Create*List() functions. Modified: branches/setup_improvements/base/setup/usetup/settings.c Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 28 14:01:30 2017 @@ -308,16 +308,132 @@ } +/* + * Return values: + * 0x00: Failure, stop the enumeration; + * 0x01: Add the entry and continue the enumeration; + * 0x02: Skip the entry but continue the enumeration. + */ +typedef UCHAR +(NTAPI *PPROCESS_ENTRY_ROUTINE)( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + +LONG +AddEntriesFromInfSection( + IN OUT PGENERIC_LIST List, + IN HINF InfFile, + IN PCWSTR SectionName, + IN PINFCONTEXT pContext, + IN PPROCESS_ENTRY_ROUTINE ProcessEntry, + IN PVOID Parameter OPTIONAL) +{ + LONG TotalCount = 0; + PWCHAR KeyName; + PWCHAR KeyValue; + PVOID UserData; + BOOLEAN Current; + UCHAR RetVal; + CHAR DisplayText[128]; + + if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) + return -1; + + do + { + /* + * NOTE: Do not use INF_GetData() as it expects INF entries of exactly + * two fields ("key = value"); however we expect to be able to deal with + * entries having more than two fields, the only requirement being that + * the second field (field number 1) contains the field description. + */ + if (!INF_GetDataField(pContext, 0, &KeyName)) + { + DPRINT("INF_GetDataField() failed\n"); + return -1; + } + + if (!INF_GetDataField(pContext, 1, &KeyValue)) + { + DPRINT("INF_GetDataField() failed\n"); + INF_FreeData(KeyName); + return -1; + } + + UserData = NULL; + Current = FALSE; + RetVal = ProcessEntry(KeyName, + KeyValue, + DisplayText, + sizeof(DisplayText), + &UserData, + &Current, + Parameter); + INF_FreeData(KeyName); + INF_FreeData(KeyValue); + + if (RetVal == 0) + { + DPRINT("ProcessEntry() failed\n"); + return -1; + } + else if (RetVal == 1) + { + AppendGenericListEntry(List, DisplayText, UserData, Current); + ++TotalCount; + } + // else if (RetVal == 2), skip the entry. + + } while (SetupFindNextLine(pContext, pContext)); + + return TotalCount; +} + +static UCHAR +NTAPI +DefaultProcessEntry( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL) +{ + PWSTR CompareKey = (PWSTR)Parameter; + + *UserData = RtlAllocateHeap(ProcessHeap, 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (*UserData == NULL) + { + /* Failure, stop enumeration */ + DPRINT1("RtlAllocateHeap() failed\n"); + return 0; + } + + wcscpy((PWCHAR)*UserData, KeyName); + sprintf(DisplayText, "%S", KeyValue); + + *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); + + /* Add the entry */ + return 1; +} + + PGENERIC_LIST CreateComputerTypeList( HINF InfFile) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; WCHAR ComputerIdentifier[128]; WCHAR ComputerKey[32]; @@ -370,38 +486,16 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Computer", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - INF_FreeData(KeyName); - - sprintf(Buffer, "%S", KeyValue); - INF_FreeData(KeyValue); - - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(UserData, ComputerKey) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); + if (AddEntriesFromInfSection(List, + InfFile, + L"Computer", + &Context, + DefaultProcessEntry, + ComputerKey) == -1) + { + DestroyGenericList(List, TRUE); + return NULL; + } return List; } @@ -534,9 +628,9 @@ DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory (Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); + RtlCopyMemory(Identifier, + ValueInfo->Data, + BufferLength * sizeof(WCHAR)); Identifier[BufferLength] = 0; RtlFreeHeap(RtlGetProcessHeap(), @@ -572,12 +666,10 @@ CreateDisplayDriverList( HINF InfFile) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; WCHAR DisplayIdentifier[128]; WCHAR DisplayKey[32]; @@ -630,48 +722,16 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Display", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - DPRINT1("INF_GetDataField() failed\n"); - INF_FreeData(KeyName); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - DPRINT1("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, TRUE); - INF_FreeData(KeyValue); - INF_FreeData(KeyName); - return NULL; - } - - wcscpy(UserData, KeyName); - INF_FreeData(KeyName); - - sprintf(Buffer, "%S", KeyValue); - INF_FreeData(KeyValue); - - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(UserData, DisplayKey) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); + if (AddEntriesFromInfSection(List, + InfFile, + L"Display", + &Context, + DefaultProcessEntry, + DisplayKey) == -1) + { + DestroyGenericList(List, TRUE); + return NULL; + } #if 0 AppendGenericListEntry(List, "Other display driver", NULL, TRUE); @@ -982,45 +1042,23 @@ CreateKeyboardDriverList( HINF InfFile) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; List = CreateGenericList(); if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Keyboard", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); - } while (SetupFindNextLine(&Context, &Context)); + if (AddEntriesFromInfSection(List, + InfFile, + L"Keyboard", + &Context, + DefaultProcessEntry, + NULL) == -1) + { + DestroyGenericList(List, TRUE); + return NULL; + } return List; } @@ -1029,6 +1067,54 @@ GetDefaultLanguageIndex(VOID) { return DefaultLanguageIndex; +} + +typedef struct _LANG_ENTRY_PARAM +{ + ULONG uIndex; + PWCHAR DefaultLanguage; +} LANG_ENTRY_PARAM, *PLANG_ENTRY_PARAM; + +static UCHAR +NTAPI +ProcessLangEntry( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL) +{ + PLANG_ENTRY_PARAM LangEntryParam = (PLANG_ENTRY_PARAM)Parameter; + + if (!IsLanguageAvailable(KeyName)) + { + /* The specified language is unavailable, skip the entry */ + return 2; + } + + *UserData = RtlAllocateHeap(ProcessHeap, 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (*UserData == NULL) + { + /* Failure, stop enumeration */ + DPRINT1("RtlAllocateHeap() failed\n"); + return 0; + } + + wcscpy((PWCHAR)*UserData, KeyName); + sprintf(DisplayText, "%S", KeyValue); + + *Current = FALSE; + + if (!_wcsicmp(KeyName, LangEntryParam->DefaultLanguage)) + DefaultLanguageIndex = LangEntryParam->uIndex; + + LangEntryParam->uIndex++; + + /* Add the entry */ + return 1; } PGENERIC_LIST @@ -1036,13 +1122,14 @@ HINF InfFile, WCHAR *DefaultLanguage) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData = NULL; - ULONG uIndex = 0; + + LANG_ENTRY_PARAM LangEntryParam; + + LangEntryParam.uIndex = 0; + LangEntryParam.DefaultLanguage = DefaultLanguage; /* Get default language id */ if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) @@ -1052,58 +1139,29 @@ return NULL; wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Language", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - if (IsLanguageAvailable(KeyName)) - { - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - if (!_wcsicmp(KeyName, DefaultLanguage)) - DefaultLanguageIndex = uIndex; - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - FALSE); - uIndex++; - } - } while (SetupFindNextLine(&Context, &Context)); + if (AddEntriesFromInfSection(List, + InfFile, + L"Language", + &Context, + ProcessLangEntry, + &LangEntryParam) == -1) + { + DestroyGenericList(List, TRUE); + return NULL; + } /* Only one language available, make it the default one */ - if (uIndex == 1 && UserData != NULL) + if (LangEntryParam.uIndex == 1) { DefaultLanguageIndex = 0; - wcscpy(DefaultLanguage, UserData); + wcscpy(DefaultLanguage, + (PWSTR)GetListEntryUserData(GetFirstListEntry(List))); } return List; @@ -1114,15 +1172,11 @@ HINF InfFile, WCHAR *DefaultKBLayout) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; const MUI_LAYOUTS * LayoutsList; ULONG uIndex = 0; - BOOL KeyboardLayoutsFound = FALSE; /* Get default layout id */ if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) @@ -1141,55 +1195,28 @@ do { - if (!SetupFindFirstLineW(InfFile, L"KeyboardLayout", NULL, &Context)) - { - DestroyGenericList(List, FALSE); + // NOTE: See https://svn.reactos.org/svn/reactos?view=revision&revision=68354 + if (AddEntriesFromInfSection(List, + InfFile, + L"KeyboardLayout", + &Context, + DefaultProcessEntry, + DefaultKBLayout) == -1) + { + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - DestroyGenericList(List, FALSE); - return NULL; - } - - { - UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - DPRINT("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, FALSE); - return NULL; - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - KeyboardLayoutsFound = TRUE; - } - - } while (SetupFindNextLine(&Context, &Context)); - uIndex++; } while (LayoutsList[uIndex].LangID != NULL); + /* Check whether some keyboard layouts have been found */ /* FIXME: Handle this case */ - if (!KeyboardLayoutsFound) + if (GetNumberOfListEntries(List) == 0) { DPRINT1("No keyboard layouts have been found\n"); - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; }

1 0

[hbelusca] 75699: [USETUP]: Whitespace fixes.
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 13:54:53 2017 New Revision: 75699 URL: http://svn.reactos.org/svn/reactos?rev=75699&view=rev Log: [USETUP]: Whitespace fixes. Modified: branches/setup_improvements/base/setup/usetup/mui.c Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] Mon Aug 28 13:54:53 2017 @@ -58,7 +58,7 @@ } lngIndex++; - }while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].MuiPages != NULL); return 0; } @@ -76,7 +76,7 @@ return TRUE; lngIndex++; - }while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].MuiPages != NULL); return FALSE; } @@ -100,7 +100,7 @@ return Pages[muiIndex].MuiEntry; muiIndex++; - }while (Pages[muiIndex].MuiEntry != NULL); + } while (Pages[muiIndex].MuiEntry != NULL); return NULL; }

1 0

[hbelusca] 75698: [USETUP]: Simplify code.
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 13:51:25 2017 New Revision: 75698 URL: http://svn.reactos.org/svn/reactos?rev=75698&view=rev Log: [USETUP]: Simplify code. Modified: branches/setup_improvements/base/setup/usetup/settings.c Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 28 13:51:25 2017 @@ -338,6 +338,8 @@ do { + BOOLEAN FoundId; + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ @@ -346,21 +348,22 @@ } DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(ComputerIdentifier, KeyValue)) - { - INF_FreeData(KeyValue); - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - INF_FreeData(KeyName); - } + FoundId = !!wcsstr(ComputerIdentifier, KeyValue); INF_FreeData(KeyValue); + + if (!FoundId) + continue; + + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("Computer key: %S\n", KeyName); + wcscpy(ComputerKey, KeyName); + INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); @@ -595,6 +598,8 @@ do { + BOOLEAN FoundId; + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ @@ -603,21 +608,22 @@ } DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(DisplayIdentifier, KeyValue)) - { - INF_FreeData(KeyValue); - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - INF_FreeData(KeyName); - } + FoundId = !!wcsstr(DisplayIdentifier, KeyValue); INF_FreeData(KeyValue); + + if (!FoundId) + continue; + + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("Display key: %S\n", KeyName); + wcscpy(DisplayKey, KeyName); + INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList();

1 0

[hbelusca] 75697: [USETUP]: Formatting fixes only.
by hbelusca＠svn.reactos.org 28 Aug '17

28 Aug '17

Author: hbelusca Date: Mon Aug 28 13:50:40 2017 New Revision: 75697 URL: http://svn.reactos.org/svn/reactos?rev=75697&view=rev Log: [USETUP]: Formatting fixes only. Modified: branches/setup_improvements/base/setup/usetup/settings.c Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Mon Aug 28 13:50:40 2017 @@ -71,113 +71,136 @@ goto cleanup; } - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - while (TRUE) - { - Status = NtEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - DeviceInfoLength = RequiredSize; - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; + pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); + if (!pDeviceInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); + if (!pValueInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + while (TRUE) + { + Status = NtEnumerateKey(hDevicesKey, + IndexDevice, + KeyBasicInformation, + pDeviceInformation, + DeviceInfoLength, + &RequiredSize); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); + DeviceInfoLength = RequiredSize; + pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); + if (!pDeviceInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = NtEnumerateKey(hDevicesKey, + IndexDevice, + KeyBasicInformation, + pDeviceInformation, + DeviceInfoLength, + &RequiredSize); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("NtEnumerateKey() failed with status 0x%08lx\n", Status); goto cleanup; - } - Status = NtEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - IndexDevice++; - - /* Open device key */ - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; - DeviceName.Buffer = pDeviceInformation->Name; - InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_CASE_INSENSITIVE, hDevicesKey, NULL); - Status = NtOpenKey( - &hDeviceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Read identifier */ - Status = NtQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - ValueInfoLength = RequiredSize; - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; + } + IndexDevice++; + + /* Open device key */ + DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; + DeviceName.Buffer = pDeviceInformation->Name; + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + OBJ_CASE_INSENSITIVE, + hDevicesKey, + NULL); + Status = NtOpenKey(&hDeviceKey, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; - } - Status = NtQueryValueKey(hDeviceKey, &IdentifierU, KeyValuePartialInformation, pValueInformation, ValueInfoLength, &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryValueKey() failed with status 0x%08lx\n", Status); - goto nextdevice; - } - else if (pValueInformation->Type != REG_SZ) - { - DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_SZ); - goto nextdevice; - } - - ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; - ValueName.Buffer = (PWCHAR)pValueInformation->Data; - if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - ValueName.Length -= sizeof(WCHAR); - if (RtlCompareUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE) == 0) - { - DPRINT("Found ACPI BIOS\n"); - ret = TRUE; - goto cleanup; - } + } + + /* Read identifier */ + Status = NtQueryValueKey(hDeviceKey, + &IdentifierU, + KeyValuePartialInformation, + pValueInformation, + ValueInfoLength, + &RequiredSize); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); + ValueInfoLength = RequiredSize; + pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); + if (!pValueInformation) + { + DPRINT("RtlAllocateHeap() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = NtQueryValueKey(hDeviceKey, + &IdentifierU, + KeyValuePartialInformation, + pValueInformation, + ValueInfoLength, + &RequiredSize); + } + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryValueKey() failed with status 0x%08lx\n", Status); + goto nextdevice; + } + else if (pValueInformation->Type != REG_SZ) + { + DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_SZ); + goto nextdevice; + } + + ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; + ValueName.Buffer = (PWCHAR)pValueInformation->Data; + if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) + ValueName.Length -= sizeof(WCHAR); + if (RtlEqualUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE)) + { + DPRINT("Found ACPI BIOS\n"); + ret = TRUE; + goto cleanup; + } nextdevice: - NtClose(hDeviceKey); - hDeviceKey = NULL; - } + NtClose(hDeviceKey); + hDeviceKey = NULL; + } cleanup: - if (pDeviceInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - if (pValueInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - if (hDevicesKey) - NtClose(hDevicesKey); - if (hDeviceKey) - NtClose(hDeviceKey); - return ret; + if (pDeviceInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); + if (pValueInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); + if (hDevicesKey) + NtClose(hDevicesKey); + if (hDeviceKey) + NtClose(hDeviceKey); + return ret; } static @@ -344,7 +367,7 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Computer", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -424,8 +447,7 @@ while (TRUE) { swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, - Buffer); + RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -443,8 +465,7 @@ } /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, - L"DisplayController"); + RtlInitUnicodeString(&KeyName, L"DisplayController"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -462,8 +483,7 @@ { /* Open the pointer controller instance key */ swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, - Buffer); + RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -483,8 +503,7 @@ } /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, - L"Identifier"); + RtlInitUnicodeString(&KeyName, L"Identifier"); BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 256 * sizeof(WCHAR); @@ -605,7 +624,7 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Display", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -968,7 +987,7 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Keyboard", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -976,7 +995,7 @@ do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); @@ -1020,10 +1039,10 @@ ULONG uIndex = 0; /* Get default language id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) + if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) + return NULL; + + if (!INF_GetData(&Context, NULL, &KeyValue)) return NULL; wcscpy(DefaultLanguage, KeyValue); @@ -1034,7 +1053,7 @@ if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Language", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -1042,7 +1061,7 @@ do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); @@ -1100,10 +1119,10 @@ BOOL KeyboardLayoutsFound = FALSE; /* Get default layout id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) + if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) + return NULL; + + if (!INF_GetData(&Context, NULL, &KeyValue)) return NULL; wcscpy(DefaultKBLayout, KeyValue); @@ -1124,7 +1143,7 @@ do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017