Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 75364: [MSVCRT_APITEST]: Commit a simple test for popen(), by Andreas Maier. CORE-11568
by hbelusca＠svn.reactos.org 17 Jul '17

17 Jul '17

Author: hbelusca Date: Mon Jul 17 15:27:40 2017 New Revision: 75364 URL: http://svn.reactos.org/svn/reactos?rev=75364&view=rev Log: [MSVCRT_APITEST]: Commit a simple test for popen(), by Andreas Maier. CORE-11568 Added: trunk/rostests/apitests/msvcrt/popen.c (with props) Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt trunk/rostests/apitests/msvcrt/testlist.c Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeList… ============================================================================== --- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Mon Jul 17 15:27:40 2017 @@ -4,6 +4,7 @@ list(APPEND SOURCE CommandLine.c ieee.c + popen.c splitpath.c testlist.c) Added: trunk/rostests/apitests/msvcrt/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/popen.c?r… ============================================================================== --- trunk/rostests/apitests/msvcrt/popen.c (added) +++ trunk/rostests/apitests/msvcrt/popen.c [iso-8859-1] Mon Jul 17 15:27:40 2017 @@ -0,0 +1,38 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: See COPYING in the top level directory + * PURPOSE: Test for CRT process handling. + * PROGRAMMER: Andreas Maier <andy1.m(a)gmx.de> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> + +static void Test_popen() +{ + FILE * f; + int r; + char str[20]; + + /* NOTE: We suppose that the NT test installation has an accessible cmd.exe */ + f = _popen("cmd.exe /C \"echo Hallo\"", "r"); + ok(f != NULL, "_popen returns NULL!\n"); + + ZeroMemory(str, sizeof(str)); + fgets(str, sizeof(str) - 1, f); + ok(lstrcmp(str, "Hallo\n") == 0, "fgets: expected \"Hallo\", got %s.\n", str); + + r = _pclose(f); + ok(r == 0, "_pclose: expected 0, got %i.\n", r); + r = *_errno(); + ok(r == 0, "_errno: expected 0, got %i,\n", r); +} + +START_TEST(popen) +{ + Test_popen(); +} + +/* EOF */ Propchange: trunk/rostests/apitests/msvcrt/popen.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Mon Jul 17 15:27:40 2017 @@ -5,12 +5,14 @@ extern void func_CommandLine(void); extern void func_ieee(void); +extern void func_popen(void); extern void func_splitpath(void); const struct test winetest_testlist[] = { { "CommandLine", func_CommandLine }, { "ieee", func_ieee }, + { "popen", func_popen }, { "splitpath", func_splitpath }, { 0, 0 }

1 0

[hbelusca] 75363: [RXCE]: Fix bug, thanks MSVC! (warning C4553)
by hbelusca＠svn.reactos.org 17 Jul '17

17 Jul '17

Author: hbelusca Date: Mon Jul 17 12:47:18 2017 New Revision: 75363 URL: http://svn.reactos.org/svn/reactos?rev=75363&view=rev Log: [RXCE]: Fix bug, thanks MSVC! (warning C4553) Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Mon Jul 17 12:47:18 2017 @@ -7228,7 +7228,7 @@ /* Otherwise, we're inactive again */ else { - Scavenger->State == RDBSS_SCAVENGER_INACTIVE; + Scavenger->State = RDBSS_SCAVENGER_INACTIVE; } }

1 0

[ekohl] 75362: [NETAPI32] DsAddressToSiteNamesExW: Remove dead code. This bug was found by Christian Bosch. Thanks a lot!
by ekohl＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: ekohl Date: Sun Jul 16 21:48:30 2017 New Revision: 75362 URL: http://svn.reactos.org/svn/reactos?rev=75362&view=rev Log: [NETAPI32] DsAddressToSiteNamesExW: Remove dead code. This bug was found by Christian Bosch. Thanks a lot! Modified: trunk/reactos/dll/win32/netapi32/netlogon.c Modified: trunk/reactos/dll/win32/netapi32/netlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netlogo… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netlogon.c [iso-8859-1] Sun Jul 16 21:48:30 2017 @@ -271,8 +271,6 @@ RpcEndExcept; return status; - - return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

[ashaposhnikov] 75361: [ATL] [3RDPARTY] Updated & moved atlex to sdk/lib/3rdparty
by ashaposhnikov＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: ashaposhnikov Date: Sun Jul 16 15:38:38 2017 New Revision: 75361 URL: http://svn.reactos.org/svn/reactos?rev=75361&view=rev Log: [ATL] [3RDPARTY] Updated & moved atlex to sdk/lib/3rdparty Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/ branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/Doxyfile (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/LICENSE (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/README.md (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlcrypt.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atleap.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlex.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlmsi.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlsec.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlshlwapi.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlwin.h (with props) branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlwlan.h (with props) Removed: branches/GSoC_2017/rapps/reactos/sdk/include/reactos/atlex/ [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/Doxyfile URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/LICENSE URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/README.md URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlcrypt.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atleap.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlex.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlmsi.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlsec.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlshlwapi.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlwin.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib… Added: branches/GSoC_2017/rapps/reactos/sdk/lib/3rdparty/atlex/atlwlan.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/sdk/lib…

1 0

[gadamopoulos] 75360: [SHELL32] -CRegFolder: Implement CRegFolder::EnumObjects. Change its constructor to receive an extra parameter for the name of the key that should be enumerated. -CEnumIDListB...
by gadamopoulos＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: gadamopoulos Date: Sun Jul 16 15:13:02 2017 New Revision: 75360 URL: http://svn.reactos.org/svn/reactos?rev=75360&view=rev Log: [SHELL32] -CRegFolder: Implement CRegFolder::EnumObjects. Change its constructor to receive an extra parameter for the name of the key that should be enumerated. -CEnumIDListBase: Add a new method called AppendItemsFromEnumerator to facilitate merging the contents from one IEnumIDList to another. -Use the above in the enumerators of CControlPanelFolder, CDesktopFolder and CDrivesFolder to make them significantly simpler. Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp trunk/reactos/dll/win32/shell32/CEnumIDListBase.h trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.cpp [iso-8859-1] Sun Jul 16 15:13:02 2017 @@ -123,6 +123,22 @@ return FALSE; } +HRESULT CEnumIDListBase::AppendItemsFromEnumerator(IEnumIDList* pEnum) +{ + LPITEMIDLIST pidl; + DWORD dwFetched; + + if (!pEnum) + return E_INVALIDARG; + + pEnum->Reset(); + + while((S_OK == pEnum->Next(1, &pidl, &dwFetched)) && dwFetched) + AddToEnumList(pidl); + + return S_OK; +} + /************************************************************************** * IEnumIDList_fnNext */ Modified: trunk/reactos/dll/win32/shell32/CEnumIDListBase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CEnumIDL… ============================================================================== --- trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CEnumIDListBase.h [iso-8859-1] Sun Jul 16 15:13:02 2017 @@ -37,6 +37,7 @@ BOOL AddToEnumList(LPITEMIDLIST pidl); BOOL DeleteList(); BOOL HasItemWithCLSID(LPITEMIDLIST pidl); + HRESULT AppendItemsFromEnumerator(IEnumIDList* pEnum); // *** IEnumIDList methods *** virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched); 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] Sun Jul 16 15:13:02 2017 @@ -33,10 +33,9 @@ public: CControlPanelEnum(); ~CControlPanelEnum(); - HRESULT WINAPI Initialize(DWORD dwFlags); + HRESULT WINAPI Initialize(DWORD dwFlags, IEnumIDList* pRegEnumerator); BOOL RegisterCPanelApp(LPCWSTR path); int RegisterRegistryCPanelApps(HKEY hkey_root, LPCWSTR szRepPath); - int RegisterCPanelFolders(HKEY hkey_root, LPCWSTR szRepPath); BOOL CreateCPanelEnumList(DWORD dwFlags); BEGIN_COM_MAP(CControlPanelEnum) @@ -63,10 +62,11 @@ { } -HRESULT WINAPI CControlPanelEnum::Initialize(DWORD dwFlags) +HRESULT WINAPI CControlPanelEnum::Initialize(DWORD dwFlags, IEnumIDList* pRegEnumerator) { if (CreateCPanelEnumList(dwFlags) == FALSE) return E_FAIL; + AppendItemsFromEnumerator(pRegEnumerator); return S_OK; } @@ -203,35 +203,6 @@ return cnt; } -int CControlPanelEnum::RegisterCPanelFolders(HKEY hkey_root, LPCWSTR szRepPath) -{ - WCHAR name[MAX_PATH]; - HKEY hkey; - - int cnt = 0; - - if (RegOpenKeyW(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) - { - for (int idx = 0; ; idx++) - { - if (RegEnumKeyW(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS) - break; - - if (*name == '{') - { - LPITEMIDLIST pidl = _ILCreateGuidFromStrW(name); - - if (pidl && AddToEnumList(pidl)) - ++cnt; - } - } - - RegCloseKey(hkey); - } - - return cnt; -} - /************************************************************************** * CControlPanelEnum::CreateCPanelEnumList() */ @@ -242,10 +213,6 @@ HANDLE hFile; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - /* enumerate control panel folders */ - if (dwFlags & SHCONTF_FOLDERS) - RegisterCPanelFolders(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS) @@ -311,7 +278,10 @@ */ HRESULT WINAPI CControlPanelFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CControlPanelEnum>(dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + CComPtr<IEnumIDList> pRegEnumerator; + m_regFolder->EnumObjects(hwndOwner, dwFlags, &pRegEnumerator); + + return ShellObjectCreatorInit<CControlPanelEnum>(dwFlags, pRegEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** @@ -657,6 +627,7 @@ hr = CRegFolder_CreateInstance(&CLSID_ControlPanel, pidlRoot, pszCPanelPath, + L"ControlPanel", IID_PPV_ARG(IShellFolder2, &m_regFolder)); if (FAILED_UNEXPECTEDLY(hr)) return hr; 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] Sun Jul 16 15:13:02 2017 @@ -44,6 +44,40 @@ /* Undocumented functions from shdocvw */ extern "C" HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); +static const WCHAR ClassicStartMenuW[] = L"SOFTWARE\\Microsoft\\Windows\\" + L"CurrentVersion\\Explorer\\HideDesktopIcons\\ClassicStartMenu"; + +static INT +IsNamespaceExtensionHidden(const WCHAR *iid) +{ + DWORD Result, dwResult; + dwResult = sizeof(DWORD); + + if (RegGetValueW(HKEY_CURRENT_USER, /* FIXME use NewStartPanel when activated */ + ClassicStartMenuW, + iid, + RRF_RT_DWORD, + NULL, + &Result, + &dwResult) != ERROR_SUCCESS) + { + return -1; + } + + return Result; +} + +static INT IsNamespaceExtensionHidden(LPCITEMIDLIST pidl) +{ + GUID const *clsid = _ILGetGUIDPointer (pidl); + if (!clsid) + return -1; + + WCHAR pwszGuid[CHARS_IN_GUID]; + SHELL32_GUIDToStringW(*clsid, pwszGuid); + return IsNamespaceExtensionHidden(pwszGuid); +} + class CDesktopFolderEnum : public CEnumIDListBase { @@ -51,9 +85,42 @@ // CComPtr fDesktopEnumerator; // CComPtr fCommonDesktopEnumerator; public: - CDesktopFolderEnum(); - ~CDesktopFolderEnum(); - HRESULT WINAPI Initialize(HWND hwndOwner, DWORD dwFlags, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator); + HRESULT WINAPI Initialize(DWORD dwFlags,IEnumIDList * pRegEnumerator, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) + { + BOOL ret = TRUE; + LPITEMIDLIST pidl; + + static const WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; + + TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); + + /* enumerate the root folders */ + if (dwFlags & SHCONTF_FOLDERS) + { + AddToEnumList(_ILCreateMyComputer()); + if (IsNamespaceExtensionHidden(MyDocumentsClassString) < 1) + AddToEnumList(_ILCreateMyDocuments()); + + DWORD dwFetched; + while((S_OK == pRegEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) + { + if (IsNamespaceExtensionHidden(pidl) < 1) + { + if (!HasItemWithCLSID(pidl)) + AddToEnumList(pidl); + else + SHFree(pidl); + } + } + } + + /* Enumerate the items in the two fs folders */ + AppendItemsFromEnumerator(pDesktopEnumerator); + AppendItemsFromEnumerator(pCommonDesktopEnumerator); + + return ret ? S_OK : E_FAIL; + } + BEGIN_COM_MAP(CDesktopFolderEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) @@ -83,178 +150,6 @@ SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_CANLINK; - -CDesktopFolderEnum::CDesktopFolderEnum() -{ -} - -CDesktopFolderEnum::~CDesktopFolderEnum() -{ -} - -static const WCHAR ClassicStartMenuW[] = L"SOFTWARE\\Microsoft\\Windows\\" - L"CurrentVersion\\Explorer\\HideDesktopIcons\\ClassicStartMenu"; - -static INT -IsNamespaceExtensionHidden(const WCHAR *iid) -{ - DWORD Result, dwResult; - dwResult = sizeof(DWORD); - - if (RegGetValueW(HKEY_CURRENT_USER, /* FIXME use NewStartPanel when activated */ - ClassicStartMenuW, - iid, - RRF_RT_DWORD, - NULL, - &Result, - &dwResult) != ERROR_SUCCESS) - { - return -1; - } - - return Result; -} - -/************************************************************************** - * CreateDesktopEnumList() - */ - -HRESULT WINAPI CDesktopFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) -{ - BOOL ret = TRUE; - LPITEMIDLIST pidl; - - static const WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; - static const WCHAR Desktop_NameSpaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\Namespace"; - - TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - /* enumerate the root folders */ - if (dwFlags & SHCONTF_FOLDERS) - { - HKEY hkey; - UINT i; - DWORD dwResult; - - /* create the pidl for This item */ - if (IsNamespaceExtensionHidden(MyDocumentsClassString) < 1) - { - ret = AddToEnumList(_ILCreateMyDocuments()); - } - ret = AddToEnumList(_ILCreateMyComputer()); - - for (i = 0; i < 2; i++) - { - if (i == 0) - dwResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Desktop_NameSpaceW, 0, KEY_READ, &hkey); - else - dwResult = RegOpenKeyExW(HKEY_CURRENT_USER, Desktop_NameSpaceW, 0, KEY_READ, &hkey); - - if (dwResult == ERROR_SUCCESS) - { - WCHAR iid[50]; - int i = 0; - - while (ret) - { - DWORD size; - LONG r; - - size = sizeof (iid) / sizeof (iid[0]); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) - { - if (IsNamespaceExtensionHidden(iid) < 1) - { - pidl = _ILCreateGuidFromStrW(iid); - if (pidl != NULL) - { - if (!HasItemWithCLSID(pidl)) - { - ret = AddToEnumList(pidl); - } - else - { - SHFree(pidl); - } - } - } - } - else if (ERROR_NO_MORE_ITEMS == r) - break; - else - ret = FALSE; - i++; - } - RegCloseKey(hkey); - } - } - for (i = 0; i < 2; i++) - { - if (i == 0) - dwResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ClassicStartMenuW, 0, KEY_READ, &hkey); - else - dwResult = RegOpenKeyExW(HKEY_CURRENT_USER, ClassicStartMenuW, 0, KEY_READ, &hkey); - - if (dwResult == ERROR_SUCCESS) - { - DWORD j = 0, dwVal, Val, dwType, dwIID; - LONG r; - WCHAR iid[50]; - - while(ret) - { - dwVal = sizeof(Val); - dwIID = sizeof(iid) / sizeof(WCHAR); - - r = RegEnumValueW(hkey, j++, iid, &dwIID, NULL, &dwType, (LPBYTE)&Val, &dwVal); - if (r == ERROR_SUCCESS) - { - if (Val == 0 && dwType == REG_DWORD) - { - pidl = _ILCreateGuidFromStrW(iid); - if (pidl != NULL) - { - if (!HasItemWithCLSID(pidl)) - { - AddToEnumList(pidl); - } - else - { - SHFree(pidl); - } - } - } - } - else if (ERROR_NO_MORE_ITEMS == r) - break; - else - ret = FALSE; - } - RegCloseKey(hkey); - } - - } - } - - DWORD dwFetched; - - /* Enumerate the items in the two fs folders */ - if (pDesktopEnumerator) - { - while((S_OK == pDesktopEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) - AddToEnumList(pidl); - } - - if (pCommonDesktopEnumerator) - { - while((S_OK == pCommonDesktopEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) - AddToEnumList(pidl); - } - - return ret ? S_OK : E_FAIL; -} - CDesktopFolder::CDesktopFolder() : sPathTarget(NULL), pidlRoot(NULL) @@ -295,6 +190,7 @@ hr = CRegFolder_CreateInstance(&CLSID_ShellDesktop, pidlRoot, L"", + L"Desktop", IID_PPV_ARG(IShellFolder2, &m_regFolder)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -446,10 +342,15 @@ */ HRESULT WINAPI CDesktopFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { + CComPtr<IEnumIDList> pRegEnumerator; CComPtr<IEnumIDList> pDesktopEnumerator; CComPtr<IEnumIDList> pCommonDesktopEnumerator; HRESULT hr; + hr = m_regFolder->EnumObjects(hwndOwner, dwFlags, &pRegEnumerator); + if (FAILED(hr)) + ERR("EnumObjects for reg folder failed\n"); + hr = m_DesktopFSFolder->EnumObjects(hwndOwner, dwFlags, &pDesktopEnumerator); if (FAILED(hr)) ERR("EnumObjects for desktop fs folder failed\n"); @@ -458,7 +359,7 @@ if (FAILED(hr)) ERR("EnumObjects for shared desktop fs folder failed\n"); - return ShellObjectCreatorInit<CDesktopFolderEnum>(hwndOwner, dwFlags, pDesktopEnumerator, pCommonDesktopEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + return ShellObjectCreatorInit<CDesktopFolderEnum>(dwFlags,pRegEnumerator, pDesktopEnumerator, pCommonDesktopEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** 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] Sun Jul 16 15:13:02 2017 @@ -167,10 +167,28 @@ public CEnumIDListBase { public: - CDrivesFolderEnum(); - ~CDrivesFolderEnum(); - HRESULT WINAPI Initialize(HWND hwndOwner, DWORD dwFlags); - BOOL CreateMyCompEnumList(DWORD dwFlags); + HRESULT WINAPI Initialize(HWND hwndOwner, DWORD dwFlags, IEnumIDList* pRegEnumerator) + { + /* enumerate the folders */ + if (dwFlags & SHCONTF_FOLDERS) + { + WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; + DWORD dwDrivemap = GetLogicalDrives(); + + while (wszDriveName[0] <= 'Z') + { + if(dwDrivemap & 0x00000001L) + AddToEnumList(_ILCreateDrive(wszDriveName)); + wszDriveName[0]++; + dwDrivemap = dwDrivemap >> 1; + } + } + + /* Enumerate the items of the reg folder */ + AppendItemsFromEnumerator(pRegEnumerator); + + return S_OK; + } BEGIN_COM_MAP(CDrivesFolderEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) @@ -200,92 +218,6 @@ SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK; -CDrivesFolderEnum::CDrivesFolderEnum() -{ -} - -CDrivesFolderEnum::~CDrivesFolderEnum() -{ -} - -HRESULT WINAPI CDrivesFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags) -{ - if (CreateMyCompEnumList(dwFlags) == FALSE) - return E_FAIL; - - return S_OK; -} - -/************************************************************************** - * CDrivesFolderEnum::CreateMyCompEnumList() - */ - -BOOL CDrivesFolderEnum::CreateMyCompEnumList(DWORD dwFlags) -{ - BOOL bRet = TRUE; - static const WCHAR MyComputer_NameSpaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\Namespace"; - - TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - /* enumerate the folders */ - if (dwFlags & SHCONTF_FOLDERS) - { - WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; - DWORD dwDrivemap = GetLogicalDrives(); - HKEY hKey; - UINT i; - - while (bRet && wszDriveName[0] <= 'Z') - { - if(dwDrivemap & 0x00000001L) - bRet = AddToEnumList(_ILCreateDrive(wszDriveName)); - wszDriveName[0]++; - dwDrivemap = dwDrivemap >> 1; - } - - TRACE("-- (%p)-> enumerate (mycomputer shell extensions)\n", this); - for (i = 0; i < 2; i++) - { - if (bRet && ERROR_SUCCESS == RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, - MyComputer_NameSpaceW, 0, KEY_READ, &hKey)) - { - WCHAR wszBuf[50]; - DWORD dwSize, j = 0; - LONG ErrorCode; - LPITEMIDLIST pidl; - - while (bRet) - { - dwSize = sizeof(wszBuf) / sizeof(wszBuf[0]); - ErrorCode = RegEnumKeyExW(hKey, j, wszBuf, &dwSize, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == ErrorCode) - { - if (wszBuf[0] != L'{') - { - dwSize = sizeof(wszBuf); - RegGetValueW(hKey, wszBuf, NULL, RRF_RT_REG_SZ, NULL, wszBuf, &dwSize); - } - - /* FIXME: shell extensions - the type should be PT_SHELLEXT (tested) */ - pidl = _ILCreateGuidFromStrW(wszBuf); - if (pidl != NULL) - bRet = AddToEnumList(pidl); - else - ERR("Invalid MyComputer namespace extesion: %s\n", wszBuf); - j++; - } - else if (ERROR_NO_MORE_ITEMS == ErrorCode) - break; - else - bRet = FALSE; - } - RegCloseKey(hKey); - } - } - } - return bRet; -} - CDrivesFolder::CDrivesFolder() { pidlRoot = NULL; @@ -306,6 +238,7 @@ HRESULT hr = CRegFolder_CreateInstance(&CLSID_MyComputer, pidlRoot, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + L"MyComputer", IID_PPV_ARG(IShellFolder2, &m_regFolder)); return hr; @@ -376,7 +309,10 @@ */ HRESULT WINAPI CDrivesFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return ShellObjectCreatorInit<CDrivesFolderEnum>(hwndOwner, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); + CComPtr<IEnumIDList> pRegEnumerator; + m_regFolder->EnumObjects(hwndOwner, dwFlags, &pRegEnumerator); + + return ShellObjectCreatorInit<CDrivesFolderEnum>(hwndOwner, dwFlags, pRegEnumerator, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } /************************************************************************** Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Sun Jul 16 15:13:02 2017 @@ -181,6 +181,80 @@ return initIcon->QueryInterface(iid, ppvOut); } +class CRegFolderEnum : + public CEnumIDListBase +{ + public: + CRegFolderEnum(); + ~CRegFolderEnum(); + HRESULT Initialize(LPCWSTR lpszEnumKeyName, DWORD dwFlags); + HRESULT AddItemsFromKey(HKEY hkey_root, LPCWSTR szRepPath); + + BEGIN_COM_MAP(CRegFolderEnum) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() +}; + +CRegFolderEnum::CRegFolderEnum() +{ +} + +CRegFolderEnum::~CRegFolderEnum() +{ +} + +HRESULT CRegFolderEnum::Initialize(LPCWSTR lpszEnumKeyName, DWORD dwFlags) +{ + WCHAR KeyName[MAX_PATH]; + static const WCHAR KeyNameFormat[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\Namespace"; + + if (!(dwFlags & SHCONTF_FOLDERS)) + return S_OK; + + HRESULT hr = StringCchPrintfW(KeyName, MAX_PATH, KeyNameFormat, lpszEnumKeyName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + AddItemsFromKey(HKEY_LOCAL_MACHINE, KeyName); + AddItemsFromKey(HKEY_CURRENT_USER, KeyName); + + return S_OK; +} + +HRESULT CRegFolderEnum::AddItemsFromKey(HKEY hkey_root, LPCWSTR szRepPath) +{ + WCHAR name[MAX_PATH]; + HKEY hkey; + + if (RegOpenKeyW(hkey_root, szRepPath, &hkey) != ERROR_SUCCESS) + return S_FALSE; + + for (int idx = 0; ; idx++) + { + if (RegEnumKeyW(hkey, idx, name, MAX_PATH) != ERROR_SUCCESS) + break; + + /* If the name of the key is not a guid try to get the default value of the key */ + if (name[0] != L'{') + { + DWORD dwSize = sizeof(name); + RegGetValueW(hkey, name, NULL, RRF_RT_REG_SZ, NULL, name, &dwSize); + } + + if (*name == '{') + { + LPITEMIDLIST pidl = _ILCreateGuidFromStrW(name); + + if (pidl) + AddToEnumList(pidl); + } + } + + RegCloseKey(hkey); + + return S_OK; +} + class CRegFolder : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2 @@ -188,13 +262,14 @@ private: GUID m_guid; CAtlStringW m_rootPath; + CAtlStringW m_enumKeyName; CComHeapPtr<ITEMIDLIST> m_pidlRoot; HRESULT GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes); public: CRegFolder(); ~CRegFolder(); - HRESULT WINAPI Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath); + HRESULT WINAPI Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName); // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes); @@ -235,7 +310,7 @@ { } -HRESULT WINAPI CRegFolder::Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath) +HRESULT WINAPI CRegFolder::Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName) { memcpy(&m_guid, pGuid, sizeof(m_guid)); @@ -243,6 +318,10 @@ if (!m_rootPath) return E_OUTOFMEMORY; + m_enumKeyName = lpszEnumKeyName; + if (!m_enumKeyName) + return E_OUTOFMEMORY; + m_pidlRoot.Attach(ILClone(pidlRoot)); if (!m_pidlRoot) return E_OUTOFMEMORY; @@ -319,7 +398,7 @@ HRESULT WINAPI CRegFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { - return E_NOTIMPL; + return ShellObjectCreatorInit<CRegFolderEnum>(m_enumKeyName, dwFlags, IID_PPV_ARG(IEnumIDList, ppEnumIDList)); } HRESULT WINAPI CRegFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) @@ -677,7 +756,7 @@ } /* In latest windows version this is exported but it takes different arguments! */ -HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv) -{ - return ShellObjectCreatorInit<CRegFolder>(pGuid, pidlRoot, lpszPath, riid, ppv); -} +HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CRegFolder>(pGuid, pidlRoot, lpszPath, lpszEnumKeyName, riid, ppv); +} Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Sun Jul 16 15:13:02 2017 @@ -78,7 +78,7 @@ HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; -HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv); +HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, LPCWSTR lpszEnumKeyName, REFIID riid, void **ppv); /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \

1 0

[mjansen] 75359: [SHIMENG] Pass shim commandline to shims. CORE-11329
by mjansen＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: mjansen Date: Sun Jul 16 13:56:08 2017 New Revision: 75359 URL: http://svn.reactos.org/svn/reactos?rev=75359&view=rev Log: [SHIMENG] Pass shim commandline to shims. CORE-11329 Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Sun Jul 16 13:56:08 2017 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2017 Mark Jansen + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -790,13 +790,13 @@ TAGID ShimRef; if (SdbTagRefToTagID(hsdb, Data[n], &pdb, &ShimRef)) { - LPCWSTR ShimName, DllName; + LPCWSTR ShimName, DllName, CommandLine = NULL; TAGID ShimTag; WCHAR FullNameBuffer[MAX_PATH]; UNICODE_STRING UnicodeDllName; PVOID BaseAddress; PSHIMMODULE pShimInfo = NULL; - const char* szCommandLine = ""; + ANSI_STRING AnsiCommandLine = RTL_CONSTANT_STRING(""); PHOOKAPIEX pHookApi; DWORD dwHookCount; @@ -805,6 +805,21 @@ { SHIMENG_FAIL("Failed to retrieve the name for 0x%x\n", Data[n]); continue; + } + + CommandLine = SeiGetStringPtr(pdb, ShimRef, TAG_COMMAND_LINE); + if (CommandLine && *CommandLine) + { + RtlInitUnicodeString(&UnicodeDllName, CommandLine); + if (NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiCommandLine, &UnicodeDllName, TRUE))) + { + SHIMENG_INFO("COMMAND LINE %s for %S", AnsiCommandLine.Buffer, ShimName); + } + else + { + AnsiCommandLine.Buffer = ""; + CommandLine = NULL; + } } ShimTag = SeiGetDWORD(pdb, ShimRef, TAG_SHIM_TAGID); @@ -828,11 +843,6 @@ SHIMENG_WARN("Failed to build a full path for %S\n", ShimName); continue; } - - /* TODO: - SeiGetShimCommandLine(); - [SeiInit] COMMAND_LINE VirtualRegistry(WINNT;VistaRTMLie) from AcLayers.DLL - */ RtlInitUnicodeString(&UnicodeDllName, FullNameBuffer); if (NT_SUCCESS(LdrGetDllHandle(NULL, NULL, &UnicodeDllName, &BaseAddress))) @@ -857,11 +867,13 @@ SHIMENG_INFO("Shim DLL 0x%p \"%wZ\" loaded\n", BaseAddress, &UnicodeDllName); SHIMENG_INFO("Using SHIM \"%S!%S\"\n", DllName, ShimName); - - pHookApi = pShimInfo->pGetHookAPIs(szCommandLine, ShimName, &dwHookCount); + pHookApi = pShimInfo->pGetHookAPIs(AnsiCommandLine.Buffer, ShimName, &dwHookCount); SHIMENG_INFO("GetHookAPIs returns %d hooks for DLL \"%wZ\" SHIM \"%S\"\n", dwHookCount, &UnicodeDllName, ShimName); if (dwHookCount) SeiAppendHookInfo(pShimInfo, pHookApi, dwHookCount); + + if (CommandLine && *CommandLine) + RtlFreeAnsiString(&AnsiCommandLine); dwTotalHooks += dwHookCount; /*SeiBuildInclExclList*/

1 0

[mjansen] 75358: [SHIMLIB] Add debug print functionality for shims. CORE-11329
by mjansen＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: mjansen Date: Sun Jul 16 13:50:23 2017 New Revision: 75358 URL: http://svn.reactos.org/svn/reactos?rev=75358&view=rev Log: [SHIMLIB] Add debug print functionality for shims. CORE-11329 Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h Modified: trunk/reactos/dll/appcompat/apphelp/shimeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/shim… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/shimeng.c [iso-8859-1] Sun Jul 16 13:50:23 2017 @@ -19,6 +19,7 @@ #define WIN32_NO_STATUS #include "windows.h" #include "ntndk.h" +#define IN_APPHELP #include "shimlib.h" #include <strsafe.h> /* Make sure we don't include apphelp logging */ Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] Sun Jul 16 13:50:23 2017 @@ -3,13 +3,15 @@ * PROJECT: ReactOS Shim library * FILE: dll/appcompat/shims/shimlib/shimlib.c * PURPOSE: Shim helper functions - * PROGRAMMER: Mark Jansen + * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) */ +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <shimlib.h> #include <strsafe.h> +#include <ndk/rtlfuncs.h> typedef struct UsedShim { @@ -21,6 +23,7 @@ } UsedShim, *pUsedShim; +ULONG g_ShimEngDebugLevel = 0xffffffff; static HANDLE g_ShimLib_Heap; static PSLIST_HEADER g_UsedShims; @@ -146,3 +149,89 @@ return TRUE; } + + +VOID SeiInitDebugSupport(VOID) +{ + static const UNICODE_STRING DebugKey = RTL_CONSTANT_STRING(L"SHIM_DEBUG_LEVEL"); + UNICODE_STRING DebugValue; + NTSTATUS Status; + ULONG NewLevel = 0; + WCHAR Buffer[40]; + + RtlInitEmptyUnicodeString(&DebugValue, Buffer, sizeof(Buffer)); + + Status = RtlQueryEnvironmentVariable_U(NULL, &DebugKey, &DebugValue); + + if (NT_SUCCESS(Status)) + { + if (!NT_SUCCESS(RtlUnicodeStringToInteger(&DebugValue, 10, &NewLevel))) + NewLevel = 0; + } + g_ShimEngDebugLevel = NewLevel; +} + + +/** +* Outputs diagnostic info. +* +* @param [in] Level The level to log this message with, choose any of [SHIM_ERR, +* SHIM_WARN, SHIM_INFO]. +* @param [in] FunctionName The function this log should be attributed to. +* @param [in] Format The format string. +* @param ... Variable arguments providing additional information. +* +* @return Success: TRUE Failure: FALSE. +*/ +BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR Function, PCSTR Format, ...) +{ + char Buffer[512]; + char* Current = Buffer; + const char* LevelStr; + size_t Length = sizeof(Buffer); + va_list ArgList; + HRESULT hr; + + if (g_ShimEngDebugLevel == 0xffffffff) + SeiInitDebugSupport(); + + if (Level > g_ShimEngDebugLevel) + return FALSE; + + switch (Level) + { + case SEI_MSG: + LevelStr = "MSG "; + break; + case SEI_FAIL: + LevelStr = "FAIL"; + break; + case SEI_WARN: + LevelStr = "WARN"; + break; + case SEI_INFO: + LevelStr = "INFO"; + break; + default: + LevelStr = "USER"; + break; + } + + if (Function) + hr = StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s] [%s] ", LevelStr, Function); + else + hr = StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "[%s] ", LevelStr); + + if (!SUCCEEDED(hr)) + return FALSE; + + va_start(ArgList, Format); + hr = StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); + va_end(ArgList); + if (!SUCCEEDED(hr)) + return FALSE; + + DbgPrint("%s", Buffer); + return TRUE; +} + Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] Sun Jul 16 13:50:23 2017 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Shim Engine * FILE: dll/appcompat/shims/shimlib/shimlib.h * PURPOSE: ReactOS Shim Engine - * PROGRAMMER: Mark Jansen + * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -58,12 +58,19 @@ BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR Function, PCSTR Format, ...); extern ULONG g_ShimEngDebugLevel; +#if defined(IN_APPHELP) +/* Apphelp shimeng logging uses the function name */ #define SHIMENG_MSG(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_MSG, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #define SHIMENG_FAIL(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_FAIL, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #define SHIMENG_WARN(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #define SHIMENG_INFO(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) - - +#else +/* Shims use the shim name */ +#define SHIM_MSG(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_MSG, SHIM_OBJ_NAME(g_szModuleName), fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_FAIL(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_FAIL, SHIM_OBJ_NAME(g_szModuleName), fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_WARN(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_WARN, SHIM_OBJ_NAME(g_szModuleName), fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_INFO(fmt, ...) do { if (g_ShimEngDebugLevel) SeiDbgPrint(SEI_INFO, SHIM_OBJ_NAME(g_szModuleName), fmt, ##__VA_ARGS__ ); } while (0) +#endif typedef PHOOKAPI (WINAPI* _PVGetHookAPIs)(DWORD, PCSTR, PDWORD); typedef BOOL (WINAPI* _PVNotify)(DWORD, PVOID);

1 0

[mjansen] 75357: [ACPPAGE] Usability: Convert the edit box to a combobox, ask the user if they want to add the layer when closing the dialog.
by mjansen＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: mjansen Date: Sun Jul 16 13:47:16 2017 New Revision: 75357 URL: http://svn.reactos.org/svn/reactos?rev=75357&view=rev Log: [ACPPAGE] Usability: Convert the edit box to a combobox, ask the user if they want to add the layer when closing the dialog. Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc trunk/reactos/dll/shellext/acppage/lang/de-DE.rc trunk/reactos/dll/shellext/acppage/lang/en-US.rc trunk/reactos/dll/shellext/acppage/lang/es-ES.rc trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc trunk/reactos/dll/shellext/acppage/lang/he-IL.rc trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc trunk/reactos/dll/shellext/acppage/lang/id-ID.rc trunk/reactos/dll/shellext/acppage/lang/it-IT.rc trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc trunk/reactos/dll/shellext/acppage/lang/no-NO.rc trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc trunk/reactos/dll/shellext/acppage/resource.h Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -1,5 +1,5 @@ /* - * Copyright 2015-2017 Mark Jansen + * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -442,9 +442,36 @@ EnableWindow(GetDlgItem(hWnd, IDC_DELETE), Sel >= 0); } +static void OnAdd(HWND hWnd) +{ + HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + + int Length = ComboBox_GetTextLength(Combo); + CComBSTR Str(Length); + ComboBox_GetText(Combo, Str, Length+1); + HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); + int Index = ListBox_FindStringExact(List, -1, Str); + if (Index == LB_ERR) + Index = ListBox_AddString(List, Str); + ListBox_SetCurSel(List, Index); + ListboxChanged(hWnd); + ComboBox_SetText(Combo, TEXT("")); + SetFocus(Combo); +} + +static BOOL ComboHasData(HWND hWnd) +{ + HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + if (ComboBox_GetCurSel(Combo) >= 0) + return TRUE; + ULONG Len = ComboBox_GetTextLength(Combo); + return Len > 0; +} + INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CLayerUIPropPage* page = NULL; + switch (uMsg) { case WM_INITDIALOG: @@ -452,19 +479,16 @@ page->AddRef(); SetProp(hWnd, ACP_WNDPROP, page); { - CComPtr<IAutoComplete> autoComplete; - HRESULT hr = CoCreateInstance(CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAutoComplete, &autoComplete)); - if (SUCCEEDED(hr)) - { - CComPtr<IAutoComplete2> autoComplete2; - hr = autoComplete->QueryInterface(IID_PPV_ARG(IAutoComplete2, &autoComplete2)); - if (SUCCEEDED(hr)) - { - autoComplete2->SetOptions(ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST); - HWND Edit = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - CComObject<CLayerStringList>* pList = new CComObject<CLayerStringList>(); - hr = autoComplete2->Init(Edit, pList, NULL, NULL); - } + HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + CComObject<CLayerStringList> pList; + + while (TRUE) + { + CComBSTR str; + HRESULT hr = pList.Next(1, &str, NULL); + if (hr != S_OK) + break; + ComboBox_AddString(Combo, str); } HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); @@ -483,24 +507,12 @@ RemoveProp(hWnd, ACP_WNDPROP); page->Release(); break; + case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_ADD: - { - HWND Edit = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - int Length = GetWindowTextLengthW(Edit); - CComBSTR Str(Length); - GetWindowTextW(Edit, Str, Length+1); - HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); - int Index = ListBox_FindStringExact(List, -1, Str); - if (Index == LB_ERR) - Index = ListBox_AddString(List, Str); - ListBox_SetCurSel(List, Index); - ListboxChanged(hWnd); - Edit_SetText(Edit, TEXT("")); - SetFocus(Edit); - } + OnAdd(hWnd); break; case IDC_EDIT: { @@ -510,11 +522,11 @@ CComBSTR Str(Length); ListBox_GetText(List, Cur, Str); ListBox_DeleteString(List, Cur); - HWND Edit = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); - Edit_SetText(Edit, Str); + HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE); + ComboBox_SetText(Combo, Str); ListboxChanged(hWnd); - Edit_SetSel(Edit, 30000, 30000); - SetFocus(Edit); + ComboBox_SetEditSel(Combo, 30000, 30000); + SetFocus(Combo); } break; case IDC_DELETE: @@ -528,11 +540,31 @@ ListboxChanged(hWnd); break; case IDC_NEWCOMPATIBILITYMODE: - EnableWindow(GetDlgItem(hWnd, IDC_ADD), Edit_GetTextLength(GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE)) > 0); + { + EnableWindow(GetDlgItem(hWnd, IDC_ADD), ComboHasData(hWnd)); + } break; case IDOK: /* Copy from list! */ { + if (ComboHasData(hWnd)) + { + CComBSTR question, title; + title.LoadString(g_hModule, IDS_TABTITLE); + question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); + int result = MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); + switch (result) + { + case IDYES: + OnAdd(hWnd); + break; + case IDNO: + break; + case IDCANCEL: + return FALSE; + } + } + page = (CLayerUIPropPage*)GetProp(hWnd, ACP_WNDPROP); HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE); Modified: trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "ÐÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° ÑÐµÐ¶Ð¸Ð¼Ð¸ÑÐµ Ð·Ð° ÑÑÐ²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -27,7 +27,7 @@ CAPTION "Upravit reÅ¾imy kompatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&PÅidat...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Upravit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -41,4 +41,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "KompatibilitÃ¤tsmodus Ã¤ndern" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&HinzufÃ¼gen...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Ãndern...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Edit Compatibility Modes" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,5 +36,6 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "Editar modos de compatibilidad" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&AÃ±adir...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Editar...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Konpatibilitate moduak editatu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Gehitu...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Editatu...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Editer les Modes de compatibilitÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Editer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "×¢×¨×××ª ××¦×× ×ª×××××ª" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "×××¡×£...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "×¢×¨××...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "SÃ©mÃ¡k szerkesztÃ©se" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&HozzÃ¡adÃ¡s...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&SzerkesztÃ©s...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Edit Mode Kompatibilitas" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Tambah...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "Modifica la modalitÃ compatibile" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Aggiungi...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Modifica...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Edit Compatibility Modes" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Rediger kompaktibilitetsmodus" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Legg til...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Rediger...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,4 +36,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "Edycja trybÃ³w zgodnoÅci" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Dodaj...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Edytuj...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -22,7 +22,7 @@ CAPTION "Modurile de compatibilitate" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&AdÄugareâ¦", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "E&ditareâ¦", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -36,5 +36,6 @@ IDS_TABTITLE "Compatibilitate" IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece rezidÄ pe o unitate de stocare Ã®n reÈea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece este parte din ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐµÐ¶Ð¸Ð¼Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" IDS_FAILED_NETWORK "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð½Ð° ÑÐµÑÐµÐ²Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_FAILED_PROTECTED "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -29,7 +29,7 @@ CAPTION "Ãprava reÅ¾imov kompatibility" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "Prid&aÅ¥...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&UpraviÅ¥...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -43,4 +43,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -26,7 +26,7 @@ CAPTION "Modifiko Mjetin e Pajtueshmerise" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "Shto...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "Modifiko...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -40,4 +40,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "Redigera kompatibilitetslÃ¤gen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&LÃ¤gg till...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Ãndra...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "Uyumluluk Kiplerini DÃ¼zenle" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Ekle...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&DÃ¼zenle...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,5 +38,6 @@ IDS_TABTITLE "Uyumluluk" IDS_FAILED_NETWORK "Bir aÄ sÃ¼rÃ¼cÃ¼sÃ¼ Ã¼zerinde olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." IDS_FAILED_PROTECTED "ReactOS'un bir parÃ§asÄ± olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -30,7 +30,7 @@ CAPTION "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°Ð½Ð½Ñ ÑÐµÐ¶Ð¸Ð¼ÑÐ² ÑÑÐ¼ÑÑÐ½Ð¾ÑÑÑ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&ÐÐ¾Ð´Ð°ÑÐ¸...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "&Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -44,4 +44,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "ç¼è¾å¼å®¹æ¨¡å¼" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "æ·»å ...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "ç¼è¾...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -24,7 +24,7 @@ CAPTION "ç·¨è¼¯ç¸å®¹æ¨¡å¼" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, ES_AUTOHSCROLL + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "æ·»å ...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED PUSHBUTTON "ç·¨è¼¯...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED @@ -38,4 +38,5 @@ IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/resou… ============================================================================== --- trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] Sun Jul 16 13:47:16 2017 @@ -23,6 +23,7 @@ #define IDS_TABTITLE 2000 #define IDS_FAILED_NETWORK 2001 #define IDS_FAILED_PROTECTED 2002 +#define IDS_YOU_DID_NOT_ADD 2003 /* registry stuff */

1 0

[mjansen] 75356: [SHELL32] Do not dereference a nullpointer for logging. CORE-13552
by mjansen＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: mjansen Date: Sun Jul 16 13:44:18 2017 New Revision: 75356 URL: http://svn.reactos.org/svn/reactos?rev=75356&view=rev Log: [SHELL32] Do not dereference a nullpointer for logging. CORE-13552 Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] Sun Jul 16 13:44:18 2017 @@ -423,7 +423,7 @@ TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, - psfi, psfi->dwAttributes, sizeofpsfi, flags); + psfi, psfi ? psfi->dwAttributes : 0, sizeofpsfi, flags); if (!path) return FALSE;

1 0

[spetreolle] 75355: Patch by Serge Gautherie: [BOOTDATA] hivesys.inf: Put 'Mup' service back in 'File System' group. (Fix r72450) Fixes installation of Vmware Tools which was always hanging. CORE-1...
by spetreolle＠svn.reactos.org 16 Jul '17

16 Jul '17

Author: spetreolle Date: Sun Jul 16 13:37:29 2017 New Revision: 75355 URL: http://svn.reactos.org/svn/reactos?rev=75355&view=rev Log: Patch by Serge Gautherie: [BOOTDATA] hivesys.inf: Put 'Mup' service back in 'File System' group. (Fix r72450) Fixes installation of Vmware Tools which was always hanging. CORE-12107 #resolve Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Jul 16 13:37:29 2017 @@ -1579,7 +1579,7 @@ ; Multiple UNC provider driver HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs