Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[gadamopoulos] 67024: [SHELL32] - Implement handling ctrl+A in the shell view control.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 3 16:49:24 2015 New Revision: 67024 URL: http://svn.reactos.org/svn/reactos?rev=67024&view=rev Log: [SHELL32] - Implement handling ctrl+A in the shell view control. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Fri Apr 3 16:49:24 2015 @@ -1601,6 +1601,10 @@ m_ListView.SortItems(ListViewCompareItems, &m_sortInfo); break; + case FCIDM_SHVIEW_SELECTALL: + m_ListView.SetItemState(-1, LVIS_SELECTED, LVIS_SELECTED); + break; + case FCIDM_SHVIEW_REFRESH: Refresh(); break;

9 years, 8 months

[cwittich] 67023: [MYCOMPUT] now do it properly

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 3 14:48:39 2015 New Revision: 67023 URL: http://svn.reactos.org/svn/reactos?rev=67023&view=rev Log: [MYCOMPUT] now do it properly Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:48:39 2015 @@ -4,5 +4,4 @@ set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0) -set_module_type(mycomput win32dll UNICODE) add_cd_file(TARGET mycomput DESTINATION reactos/system32 FOR all)

9 years, 8 months

[cwittich] 67022: [MYCOMPUT] fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 3 14:47:47 2015 New Revision: 67022 URL: http://svn.reactos.org/svn/reactos?rev=67022&view=rev Log: [MYCOMPUT] fix build Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt Modified: trunk/reactos/dll/win32/mycomput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:47:47 2015 @@ -2,5 +2,7 @@ add_library(mycomput SHARED mycomput.rc) +set_module_type(mycomput win32dll UNICODE ENTRYPOINT 0) + set_module_type(mycomput win32dll UNICODE) add_cd_file(TARGET mycomput DESTINATION reactos/system32 FOR all)

9 years, 8 months

[cwittich] 67021: [SHELL32] make "Manage" translatable by Giannis and me

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 3 14:38:20 2015 New Revision: 67021 URL: http://svn.reactos.org/svn/reactos?rev=67021&view=rev Log: [SHELL32] make "Manage" translatable by Giannis and me Added: trunk/reactos/dll/win32/mycomput/ (with props) trunk/reactos/dll/win32/mycomput/CMakeLists.txt (with props) trunk/reactos/dll/win32/mycomput/lang/ (with props) trunk/reactos/dll/win32/mycomput/lang/de-DE.rc (with props) trunk/reactos/dll/win32/mycomput/lang/en-US.rc (with props) trunk/reactos/dll/win32/mycomput/mycomput.rc (with props) trunk/reactos/dll/win32/mycomput/resource.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -126,6 +126,7 @@ add_subdirectory(msxml3) add_subdirectory(msxml4) add_subdirectory(msxml6) +add_subdirectory(mycomput) add_subdirectory(nddeapi) add_subdirectory(netapi32) add_subdirectory(netcfgx) Propchange: trunk/reactos/dll/win32/mycomput/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 3 14:38:20 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/mycomput/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/mycomput/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/mycomput/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/mycomput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mycomput/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/mycomput/CMakeLists.txt [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -0,0 +1,6 @@ + +add_library(mycomput SHARED + mycomput.rc) + +set_module_type(mycomput win32dll UNICODE) +add_cd_file(TARGET mycomput DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/mycomput/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/mycomput/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Apr 3 14:38:20 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/win32/mycomput/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/win32/mycomput/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/win32/mycomput/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/mycomput/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/de… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/de-DE.rc [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -0,0 +1,6 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_MANAGE "Verwalten" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mycomput/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/en… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/en-US.rc [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -0,0 +1,6 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_MANAGE "Manage" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… ============================================================================== --- trunk/reactos/dll/win32/mycomput/mycomput.rc (added) +++ trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -0,0 +1,18 @@ +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif + Propchange: trunk/reactos/dll/win32/mycomput/mycomput.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mycomput/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/resourc… ============================================================================== --- trunk/reactos/dll/win32/mycomput/resource.h (added) +++ trunk/reactos/dll/win32/mycomput/resource.h [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -0,0 +1,3 @@ +#pragma once + +#define IDS_MANAGE 400 Propchange: trunk/reactos/dll/win32/mycomput/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -657,10 +657,26 @@ if (SUCCEEDED(hr)) { + HKEY hkVerb; DWORD cbVerb = sizeof(wszVerb); - - if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, NULL, RRF_RT_REG_SZ, NULL, wszVerb, &cbVerb) == ERROR_SUCCESS) - mii.dwTypeData = wszVerb; /* use description for the menu entry */ + LONG res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkVerb); + if (res == ERROR_SUCCESS) + { + res = RegLoadMUIStringW(hkVerb, + NULL, + wszVerb, + cbVerb, + NULL, + 0, + NULL); + if (res == ERROR_SUCCESS) + { + /* use description for the menu entry */ + mii.dwTypeData = wszVerb; + } + + RegCloseKey(hkVerb); + } } } Modified: trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs [iso-8859-1] Fri Apr 3 14:38:20 2015 @@ -28,7 +28,7 @@ 'topic' = s 'AppProperties' } } - 'Manage' + 'Manage' = e '@%%SystemRoot%%\system32\mycomput.dll,-400' { 'command' = e 'explorer.exe /n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{D20EA4E1-3957-11d2-A40B-0C5020524153}' val 'SuppressionPolicy' = d '&H4000003c'

9 years, 8 months

[hbelusca] 67020: [CMD] - GOTO command: Add a lower-bound test when skipping trailing spaces and such. - CD/CHDIR command: Fix the helper SetRootPath function so that it fails if getting the full p...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Apr 3 13:27:21 2015 New Revision: 67020 URL: http://svn.reactos.org/svn/reactos?rev=67020&view=rev Log: [CMD] - GOTO command: Add a lower-bound test when skipping trailing spaces and such. - CD/CHDIR command: Fix the helper SetRootPath function so that it fails if getting the full path string fails, and remove trailing whitespace from directory string. Fixes stuff like: cd .. && echo success cd ".. " && echo success etc... CORE-6810 Modified: trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Fri Apr 3 13:27:21 2015 @@ -85,7 +85,7 @@ /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; - while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) + while (tmp > textline && (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':')))) tmp--; *(tmp + 1) = _T('\0'); Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Fri Apr 3 13:27:21 2015 @@ -141,7 +141,7 @@ #ifdef INCLUDE_CMD_CHDIR -/* help functions for getting current path from drive +/* helper functions for getting current path from drive without changing drive. Return code 0 = ok, 1 = fail. INT GetRootPath("C:",outbuffer,chater size of outbuffer); the first param can have any size, if the the two frist @@ -184,28 +184,29 @@ TCHAR OutPath[MAX_PATH]; TCHAR OutPathTemp[MAX_PATH]; - /* The use of both of these together will correct the case of a path - where as one alone or GetFullPath will not. Exameple: - c:\windows\SYSTEM32 => C:\WINDOWS\system32 */ - if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL)) - { - GetPathCase(OutPathTemp, OutPath); - - /* Use _tchdir, since unlike SetCurrentDirectory it updates - * the current-directory-on-drive environment variables. */ - if (_tchdir(OutPath) != 0) - { - ConErrFormatMessage(GetLastError()); - nErrorLevel = 1; - return FALSE; - } - - /* Keep original drive in ordinary CD/CHDIR (without /D switch). */ - if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) - SetCurrentDirectory(oldpath); - } + /* Retrieve the full path name from the (possibly relative) InPath */ + if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL) == 0) + goto Fail; + + /* Convert the full path to its correct case. + * Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 */ + GetPathCase(OutPathTemp, OutPath); + + /* Use _tchdir, since unlike SetCurrentDirectory it updates + * the current-directory-on-drive environment variables. */ + if (_tchdir(OutPath) != 0) + goto Fail; + + /* Keep original drive in ordinary CD/CHDIR (without /D switch). */ + if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) + SetCurrentDirectory(oldpath); return TRUE; + +Fail: + ConErrFormatMessage(GetLastError()); + nErrorLevel = 1; + return FALSE; } @@ -215,8 +216,9 @@ */ INT cmd_chdir (LPTSTR param) { + BOOL bChangeDrive = FALSE; + LPTSTR tmp; TCHAR szCurrent[MAX_PATH]; - BOOL bChangeDrive = FALSE; /* Filter out special cases first */ @@ -227,8 +229,12 @@ return 0; } - /* Remove " */ + /* Remove extra quotes and strip trailing whitespace */ StripQuotes(param); + tmp = param + _tcslen(param) - 1; + while (tmp > param && _istspace(*tmp)) + tmp--; + *(tmp + 1) = _T('\0'); /* Set Error Level to Success */ nErrorLevel = 0; @@ -263,7 +269,10 @@ } if (!SetRootPath(bChangeDrive ? NULL : szCurrent, param)) + { + nErrorLevel = 1; return 1; + } return 0; } @@ -324,8 +333,8 @@ if (argc == 0) { ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); + freep(p); nErrorLevel = 1; - freep(p); return 1; }

9 years, 8 months

[tfaber] 67019: [BROWSEUI] - Correctly handle progress dialog message strings CORE-9252

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 3 12:54:42 2015 New Revision: 67019 URL: http://svn.reactos.org/svn/reactos?rev=67019&view=rev Log: [BROWSEUI] - Correctly handle progress dialog message strings CORE-9252 Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] Fri Apr 3 12:54:42 2015 @@ -50,8 +50,8 @@ this->cancelMsg = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); this->title = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, BUFFER_SIZE); - this->lines[0][0] = this->lines[1][0] = this->lines[2][0] = 0; - this->cancelMsg[0] = this->title[0]; + this->lines[0][0] = this->lines[1][0] = this->lines[2][0] = UNICODE_NULL; + this->cancelMsg[0] = this->title[0] = UNICODE_NULL; this->clockHand = -1; this->progressClock[29].ullMark = 0ull; @@ -76,12 +76,11 @@ { if (!string) { - buffer[0] = 0; + (*buffer)[0] = UNICODE_NULL; return; } - ULONG len = max((wcslen(string) + 1)*sizeof(WCHAR), BUFFER_SIZE); - StringCchCopyW(*buffer, len, string); + StringCbCopyW(*buffer, BUFFER_SIZE, string); } struct create_params

9 years, 8 months

[gadamopoulos] 67018: [SHELL32] - Explicitly check for pidl type in GetAttributesOf method of CDesktopFolder and CDrivesFolder

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 3 12:18:07 2015 New Revision: 67018 URL: http://svn.reactos.org/svn/reactos?rev=67018&view=rev Log: [SHELL32] - Explicitly check for pidl type in GetAttributesOf method of CDesktopFolder and CDrivesFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Fri Apr 3 12:18:07 2015 @@ -550,8 +550,12 @@ *rgfInOut &= dwMyComputerAttributes; else if (_ILIsNetHood(apidl[i])) *rgfInOut &= dwMyNetPlacesAttributes; + else if (_ILIsSpecialFolder(apidl[i])) + SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); + else if(_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i])) + SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); else - SHELL32_GetItemAttributes((IShellFolder *)this, apidl[i], rgfInOut); + ERR("Got an unknown pidl type!!!\n"); } } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Fri Apr 3 12:18:07 2015 @@ -375,11 +375,10 @@ *rgfInOut &= dwDriveAttributes; else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; + else if (_ILIsSpecialFolder(*apidl)) + SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); else - { - pdump(apidl[i]); - SHELL32_GetItemAttributes(this, apidl[i], rgfInOut); - } + ERR("Got unknown pidl type!\n"); } }

9 years, 8 months

[gadamopoulos] 67017: [SHELL32] - CFSFolder: Explicitly check for the supported pidl types. A CFSFolder can be created by a drive pidl. Handle this case and return the appropriate attributes in Get...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 3 11:44:30 2015 New Revision: 67017 URL: http://svn.reactos.org/svn/reactos?rev=67017&view=rev Log: [SHELL32] - CFSFolder: Explicitly check for the supported pidl types. A CFSFolder can be created by a drive pidl. Handle this case and return the appropriate attributes in GetAttributesOf. CORE-9458 Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Apr 3 11:44:30 2015 @@ -369,6 +369,9 @@ PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; + static const DWORD dwDriveAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); @@ -389,7 +392,13 @@ hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); + if (_ILIsDrive(rpidl)) + *rgfInOut &= dwDriveAttributes; + if (_ILIsFolder(rpidl) || _ILIsValue(rpidl)) + SHELL32_GetItemAttributes(this, rpidl, rgfInOut); + else + ERR("Got an unknown type of pidl!!!\n"); + psfParent->Release(); } } @@ -398,7 +407,10 @@ while (cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + if(_ILIsFolder(*apidl) || _ILIsValue(*apidl)) + SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + else + ERR("Got an unknown type of pidl!!!\n"); apidl++; cidl--; }

9 years, 8 months

[gadamopoulos] 67016: [SHELL32] - CControlPanelFolder: Factor out CCPLItemMenu class. Use it if the user selected a cpl item and use the default context menu otherwise. - CControlPanelFolder: Use E...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 3 11:40:00 2015 New Revision: 67016 URL: http://svn.reactos.org/svn/reactos?rev=67016&view=rev Log: [SHELL32] - CControlPanelFolder: Factor out CCPLItemMenu class. Use it if the user selected a cpl item and use the default context menu otherwise. - CControlPanelFolder: Use ExpandEnvironmentStrings when enumerating applets from the registry. Patch by Christoph. - CCPLItemMenu: Call Control_RunDLLA directly so as to be able to run control panel applets that don't use the cpl extension. CORE-7755 CORE-9466 Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Fri Apr 3 11:40:00 2015 @@ -190,9 +190,15 @@ { DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; + char buffer[MAX_PATH]; if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) break; + + if (ExpandEnvironmentStringsA(value, buffer, MAX_PATH)) + { + strcpy(value, buffer); + } if (RegisterCPanelApp(value)) ++cnt; @@ -285,9 +291,6 @@ CControlPanelFolder::CControlPanelFolder() { pidlRoot = NULL; /* absolute pidl */ - dwAttributes = 0; /* attributes returned by GetAttributesOf FIXME: use it */ - apidl = NULL; - cidl = 0; } CControlPanelFolder::~CControlPanelFolder() @@ -521,14 +524,21 @@ *ppvOut = NULL; if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { - // TODO - // create a seperate item struct - // - pObj = (IContextMenu *)this; - this->apidl = apidl; - this->cidl = cidl; - pObj->AddRef(); - hr = S_OK; + + /* HACK: We should use callbacks from CDefaultContextMenu instead of creating one on our own */ + BOOL bHasCpl = FALSE; + for (UINT i = 0; i < cidl; i++) + { + if(_ILIsCPanelStruct(apidl[i])) + { + bHasCpl = TRUE; + } + } + + if (bHasCpl) + hr = ShellObjectCreatorInit<CCPLItemMenu>(cidl, apidl, riid, &pObj); + else + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { @@ -777,14 +787,29 @@ return S_OK; } -/************************************************************************** -* IContextMenu2 Implementation -*/ - -/************************************************************************** -* ICPanel_IContextMenu_QueryContextMenu() -*/ -HRESULT WINAPI CControlPanelFolder::QueryContextMenu( + +CCPLItemMenu::CCPLItemMenu() +{ + m_apidl = NULL; + m_cidl = 0; +} + +HRESULT WINAPI CCPLItemMenu::Initialize(UINT cidl, PCUITEMID_CHILD_ARRAY apidl) +{ + m_cidl = cidl; + m_apidl = const_cast<PCUITEMID_CHILD_ARRAY>(_ILCopyaPidl(apidl, m_cidl)); + if (m_cidl && !m_apidl) + return E_OUTOFMEMORY; + + return S_OK; +} + +CCPLItemMenu::~CCPLItemMenu() +{ + _ILFreeaPidl(const_cast<PITEMID_CHILD *>(m_apidl), m_cidl); +} + +HRESULT WINAPI CCPLItemMenu::QueryContextMenu( HMENU hMenu, UINT indexMenu, UINT idCmdFirst, @@ -818,43 +843,37 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); } +EXTERN_C +void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow); + /************************************************************************** * ICPanel_IContextMenu_InvokeCommand() */ -HRESULT WINAPI CControlPanelFolder::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT WINAPI CCPLItemMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { WCHAR szPath[MAX_PATH]; char szTarget[MAX_PATH]; - STRRET strret; WCHAR* pszPath; INT Length, cLength; CComPtr<IPersistFile> ppf; CComPtr<IShellLinkA> isl; HRESULT hResult; - PIDLCPanelStruct *pcpanel = _ILGetCPanelPointer(apidl[0]); + PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(m_apidl[0]); + if(!pCPanel) + return E_FAIL; TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n", this, lpcmi, lpcmi->lpVerb, lpcmi->hwnd); if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME { - LPITEMIDLIST lpIDList = ILCombine(pidlRoot, apidl[0]); - - if (!pcpanel) - { - /* UGLY HACK! */ - LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - HRESULT hr; - - if (lpSB == NULL) - return E_FAIL; - - hr = lpSB->BrowseObject(lpIDList, 0); - return hr; - } - - /* Note: we pass the applet name to Control_RunDLL to distinguish between multiple applets in one .cpl file */ - ShellExecuteA(NULL, "cplopen", pcpanel->szName, pcpanel->szName + pcpanel->offsDispName, NULL, 0); + CHAR szParams[MAX_PATH]; + + strcpy(szParams, pCPanel->szName); + strcat(szParams, ","); + strcat(szParams, pCPanel->szName + pCPanel->offsDispName); + + Control_RunDLLA (NULL, NULL, szParams, SW_NORMAL); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME { @@ -865,18 +884,17 @@ if (!pszPath) return E_FAIL; - if (GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strret) != S_OK) - return E_FAIL; + CHAR* pszDisplayName = pCPanel->szName + pCPanel->offsDispName; Length = MAX_PATH - (pszPath - szPath); - cLength = strlen(strret.cStr); + cLength = strlen(pszDisplayName); if (Length < cLength + 5) { FIXME("\n"); return E_FAIL; } - if (MultiByteToWideChar(CP_ACP, 0, strret.cStr, cLength + 1, pszPath, Length)) + if (MultiByteToWideChar(CP_ACP, 0, pszDisplayName, cLength + 1, pszPath, Length)) { pszPath += cLength; Length -= cLength; @@ -893,16 +911,8 @@ } wcscpy(pszPath, L".lnk"); - pcpanel = _ILGetCPanelPointer(ILFindLastID(apidl[0])); - if (pcpanel) - { - strncpy(szTarget, pcpanel->szName, MAX_PATH); - } - else - { - FIXME("Couldn't retrieve pointer to cpl structure\n"); - return E_FAIL; - } + strncpy(szTarget, pCPanel->szName, MAX_PATH); + hResult = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkA, &isl)); if (SUCCEEDED(hResult)) { @@ -919,7 +929,7 @@ * ICPanel_IContextMenu_GetCommandString() * */ -HRESULT WINAPI CControlPanelFolder::GetCommandString( +HRESULT WINAPI CCPLItemMenu::GetCommandString( UINT_PTR idCommand, UINT uFlags, UINT* lpReserved, @@ -935,7 +945,7 @@ /************************************************************************** * ICPanel_IContextMenu_HandleMenuMsg() */ -HRESULT WINAPI CControlPanelFolder::HandleMenuMsg( +HRESULT WINAPI CCPLItemMenu::HandleMenuMsg( UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] Fri Apr 3 11:40:00 2015 @@ -26,15 +26,12 @@ public CComCoClass<CControlPanelFolder, &CLSID_ControlPanel>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2, - public IContextMenu2 + public IPersistFolder2 { private: /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ - LPCITEMIDLIST *apidl; - UINT cidl; HRESULT WINAPI ExecuteFromIdList(LPCITEMIDLIST pidl); @@ -73,14 +70,6 @@ // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - DECLARE_REGISTRY_RESOURCEID(IDR_CONTROLPANEL) DECLARE_NOT_AGGREGATABLE(CControlPanelFolder) @@ -92,9 +81,35 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) END_COM_MAP() }; +class CCPLItemMenu: + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu2 +{ +private: + LPCITEMIDLIST *m_apidl; + UINT m_cidl; + +public: + CCPLItemMenu(); + ~CCPLItemMenu(); + HRESULT WINAPI Initialize(UINT cidl, PCUITEMID_CHILD_ARRAY apidl); + HRESULT WINAPI FinalConstruct(); + + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + + // IContextMenu2 + virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); + + BEGIN_COM_MAP(CCPLItemMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + END_COM_MAP() +}; + #endif /* _SHFLDR_CPANEL_H_ */

9 years, 8 months

[gadamopoulos] 67015: [SHELL32] - CControlPanelFolder: Explicitly check the pidl type in GetAttributesOf. Do not call the generic SHELL32_GetItemAttributes for cpl items.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Apr 3 10:20:30 2015 New Revision: 67015 URL: http://svn.reactos.org/svn/reactos?rev=67015&view=rev Log: [SHELL32] - CControlPanelFolder: Explicitly check the pidl type in GetAttributesOf. Do not call the generic SHELL32_GetItemAttributes for cpl items. Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Fri Apr 3 10:20:30 2015 @@ -478,7 +478,12 @@ while(cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + if (_ILIsCPanelStruct(*apidl)) + *rgfInOut &= SFGAO_CANLINK; + else if (_ILIsSpecialFolder(*apidl)) + SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + else + ERR("Got an unkown pidl here!\n"); apidl++; cidl--; }

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015