Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[dquintana] 66397: Revert a change that never happened, and apply it to the right file. ; P

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Feb 21 21:26:18 2015 New Revision: 66397 URL: http://svn.reactos.org/svn/reactos?rev=66397&view=rev Log: Revert a change that never happened, and apply it to the right file. ;P Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/CMak… ============================================================================== --- trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] Sat Feb 21 21:26:18 2015 @@ -24,9 +24,6 @@ lanstatusui.cpp precomp.h) -list(APPEND atl_rc_deps - ${CMAKE_CURRENT_SOURCE_DIR}/resources/rgs/ntobjectfolder.rgs) - add_library(netshell SHARED ${SOURCE} netshell.rc Modified: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/CMa… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] Sat Feb 21 21:26:18 2015 @@ -21,6 +21,9 @@ ntobjshex.rc ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def) +list(APPEND atl_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/resources/rgs/ntobjectfolder.rgs) + set_module_type(ntobjshex win32dll UNICODE) target_link_libraries(ntobjshex uuid wine atlnew)

9 years, 10 months

[dquintana] 66396: [NTOBJSHEX] * Introduce a shell extension that allows the user to browse the NT Object namespace from within the shell. CORE-9243 #resolve

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Feb 21 21:21:02 2015 New Revision: 66396 URL: http://svn.reactos.org/svn/reactos?rev=66396&view=rev Log: [NTOBJSHEX] * Introduce a shell extension that allows the user to browse the NT Object namespace from within the shell. CORE-9243 #resolve Added: trunk/reactos/dll/shellext/ntobjshex/ (with props) trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt (with props) trunk/reactos/dll/shellext/ntobjshex/lang/ (with props) trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjns.h (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjshex.spec (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp (with props) trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h (with props) trunk/reactos/dll/shellext/ntobjshex/precomp.h (with props) trunk/reactos/dll/shellext/ntobjshex/resource.h (with props) trunk/reactos/dll/shellext/ntobjshex/resources/ (with props) trunk/reactos/dll/shellext/ntobjshex/resources/1.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/2.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/3.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/4.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/5.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/6.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ (with props) trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs (with props) Modified: trunk/reactos/dll/shellext/CMakeLists.txt trunk/reactos/dll/shellext/netshell/CMakeLists.txt trunk/reactos/include/reactos/shellutils.h Modified: trunk/reactos/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -4,5 +4,6 @@ add_subdirectory(devcpux) add_subdirectory(fontext) add_subdirectory(netshell) +add_subdirectory(ntobjshex) add_subdirectory(slayer) add_subdirectory(stobject) Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/CMak… ============================================================================== --- trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -24,6 +24,9 @@ lanstatusui.cpp precomp.h) +list(APPEND atl_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/resources/rgs/ntobjectfolder.rgs) + add_library(netshell SHARED ${SOURCE} netshell.rc Propchange: trunk/reactos/dll/shellext/ntobjshex/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 21:21:02 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/ntobjshex/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/ntobjshex/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/ntobjshex/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/CMa… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt (added) +++ trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,41 @@ + +project(SHELL) + +set_cpp(WITH_RUNTIME) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/atl + ${REACTOS_SOURCE_DIR}) + +spec2def(ntobjshex.dll ntobjshex.spec) + +add_library(ntobjshex SHARED + ntobjns.cpp + ntobjshex.cpp + ntobjutil.cpp + ntobjshex.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def) + +set_module_type(ntobjshex win32dll UNICODE) +target_link_libraries(ntobjshex uuid wine atlnew) + +add_importlibs(ntobjshex + advapi32 + winmm + ole32 + oleaut32 + shlwapi + shell32 + comctl32 + msvcrt + gdi32 + user32 + kernel32 + ntdll) + +add_cd_file(TARGET ntobjshex DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 21:21:02 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc (added) +++ trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,6 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_NAME "NT Object Namespace" +END Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,1253 @@ +/* +* PROJECT: ReactOS shell extensions +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll\shellext\ntobjshex\ntobjns.cpp +* PURPOSE: NT Object Namespace shell extension +* PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> +*/ + +#include "precomp.h" +#include "ntobjutil.h" +#include <ntquery.h> + +#define SHCIDS_ALLFIELDS 0x80000000L +#define SHCIDS_CANONICALONLY 0x10000000L + +#define GET_SHGDN_FOR(dwFlags) ((DWORD)dwFlags & (DWORD)0x0000FF00) +#define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) + +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + +// {845B0FB2-66E0-416B-8F91-314E23F7C12D} +const GUID CLSID_NtObjectFolder = { 0x845b0fb2, 0x66e0, 0x416b, { 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d } }; + +// {F4C430C3-3A8D-4B56-A018-E598DA60C2E0} +static const GUID GUID_NtObjectColumns = { 0xf4c430c3, 0x3a8d, 0x4b56, { 0xa0, 0x18, 0xe5, 0x98, 0xda, 0x60, 0xc2, 0xe0 } }; + +enum NtObjectColumns +{ + PID_NTOBJECT_NAME = 1, + PID_NTOBJECT_TYPE = 2, + PID_NTOBJECT_CREATEDATE = 3, + PID_NTOBJECT_LINKTARGET = 4, +}; + +static HRESULT MakeStrRetFromString(LPCWSTR string, DWORD cbLength, STRRET * str) +{ + str->uType = STRRET_WSTR; + + DWORD blen = cbLength + sizeof(WCHAR); + str->pOleStr = (LPWSTR) CoTaskMemAlloc(blen); + return StringCbCopyNW(str->pOleStr, blen, string, cbLength); +} + +static HRESULT MakeStrRetFromString(LPCWSTR string, STRRET * str) +{ + DWORD stringLength = lstrlenW(string) * sizeof(WCHAR); + return MakeStrRetFromString(string, stringLength, str); +} + +static HRESULT MakeVariantString(VARIANT * pv, PCWSTR string) +{ + V_VT(pv) = VT_BSTR; + V_BSTR(pv) = SysAllocString(string); + return S_OK; +} + +static HRESULT GetFullName(LPCITEMIDLIST pidl, DWORD uFlags, PWSTR strName, DWORD cchName) +{ + CComPtr<IShellFolder> psfDesktop; + STRRET str; + HRESULT hr; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psfDesktop->GetDisplayNameOf(pidl, uFlags, &str); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return StrRetToBufW(&str, pidl, strName, cchName); +} + +class CNtObjectFolderContextMenu : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IContextMenu +{ + LPCITEMIDLIST pcidlFolder; + LPCITEMIDLIST pcidlChild; + UINT idFirst; + +public: + CNtObjectFolderContextMenu() : + pcidlFolder(NULL), + pcidlChild(NULL), + idFirst(0) + { + + } + + virtual ~CNtObjectFolderContextMenu() + { + if (pcidlFolder) + ILFree((LPITEMIDLIST) pcidlFolder); + if (pcidlChild) + ILFree((LPITEMIDLIST) pcidlChild); + } + + HRESULT Initialize(LPITEMIDLIST parent, UINT cidl, LPCITEMIDLIST *apidl) + { + pcidlFolder = ILClone(parent); + if (cidl != 1) + return E_FAIL; + pcidlChild = ILClone(apidl[0]); + return S_OK; + } + + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) + { + idFirst = idCmdFirst; + + const NtPidlEntry * entry = (NtPidlEntry *) pcidlChild; + + if ((entry->objectType == DIRECTORY_OBJECT) || + (entry->objectType == SYMBOLICLINK_OBJECT)) + { + MENUITEMINFOW mii; + + WCHAR open [] = L"Open"; + WCHAR opennewwindow [] = L"Open in new window"; + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; + mii.fType = MFT_STRING; + mii.wID = idCmdFirst++; + mii.dwTypeData = open; + mii.cch = _countof(open); + mii.fState = MFS_ENABLED | MFS_DEFAULT; + mii.hSubMenu = NULL; + InsertMenuItemW(hmenu, idCmdFirst, TRUE, &mii); + + if (!(uFlags & CMF_DEFAULTONLY) && idCmdFirst <= idCmdLast) + { + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; + mii.fType = MFT_STRING; + mii.wID = idCmdFirst++; + mii.dwTypeData = opennewwindow; + mii.cch = _countof(opennewwindow); + mii.fState = MFS_ENABLED; + mii.hSubMenu = NULL; + InsertMenuItemW(hmenu, idCmdFirst, FALSE, &mii); + } + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - idFirst); + } + + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) + { + if (LOWORD(lpici->lpVerb) == idFirst || !lpici->lpVerb) + { + LPITEMIDLIST fullPidl = ILCombine(pcidlFolder, pcidlChild); + + SHELLEXECUTEINFO sei = { 0 }; + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; + sei.lpIDList = fullPidl; + sei.lpClass = L"folder"; + sei.hwnd = lpici->hwnd; + sei.nShow = lpici->nShow; + sei.lpVerb = L"open"; + BOOL bRes = ::ShellExecuteEx(&sei); + + ILFree(fullPidl); + + return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + else if (LOWORD(lpici->lpVerb) == (idFirst + 1)) + { + LPITEMIDLIST fullPidl = ILCombine(pcidlFolder, pcidlChild); + + SHELLEXECUTEINFO sei = { 0 }; + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; + sei.lpIDList = fullPidl; + sei.lpClass = L"folder"; + sei.hwnd = lpici->hwnd; + sei.nShow = lpici->nShow; + sei.lpVerb = L"opennewwindow"; + BOOL bRes = ::ShellExecuteEx(&sei); + + ILFree(fullPidl); + + return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + return E_NOTIMPL; + } + + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) + { + if (idCmd == idFirst) + { + if (uType == GCS_VERBW) + { + StringCchCopyW((LPWSTR) pszName, cchMax, L"open"); + return S_OK; + } + } + else if (idCmd == (idFirst + 1)) + { + if (uType == GCS_VERBW) + { + StringCchCopyW((LPWSTR) pszName, cchMax, L"opennewwindow"); + return S_OK; + } + } + return E_NOTIMPL; + } + + DECLARE_NOT_AGGREGATABLE(CNtObjectFolderContextMenu) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNtObjectFolderContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + END_COM_MAP() + +}; + +class CNtObjectFolderExtractIcon : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IExtractIconW +{ + LPCITEMIDLIST pcidlFolder; + LPCITEMIDLIST pcidlChild; + +public: + CNtObjectFolderExtractIcon() : + pcidlFolder(NULL), + pcidlChild(NULL) + { + + } + + virtual ~CNtObjectFolderExtractIcon() + { + if (pcidlFolder) + ILFree((LPITEMIDLIST) pcidlFolder); + if (pcidlChild) + ILFree((LPITEMIDLIST) pcidlChild); + } + + HRESULT Initialize(LPITEMIDLIST parent, UINT cidl, LPCITEMIDLIST *apidl) + { + pcidlFolder = ILClone(parent); + if (cidl != 1) + return E_FAIL; + pcidlChild = ILClone(apidl[0]); + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetIconLocation( + UINT uFlags, + LPWSTR szIconFile, + UINT cchMax, + INT *piIndex, + UINT *pwFlags) + { + const NtPidlEntry * entry = (NtPidlEntry *) pcidlChild; + if (entry->magic != NT_OBJECT_PIDL_MAGIC) + return E_FAIL; + + switch (entry->objectType) + { + case DIRECTORY_OBJECT: + case SYMBOLICLINK_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -((uFlags & GIL_OPENICON) ? IDI_NTOBJECTDIROPEN : IDI_NTOBJECTDIR); + *pwFlags = 0; + return S_OK; + case DEVICE_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTDEVICE; + *pwFlags = 0; + return S_OK; + case PORT_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTPORT; + *pwFlags = 0; + return S_OK; + default: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_NTOBJECTITEM; + *pwFlags = 0; + return S_OK; + } + } + + virtual HRESULT STDMETHODCALLTYPE Extract( + LPCWSTR pszFile, + UINT nIconIndex, + HICON *phiconLarge, + HICON *phiconSmall, + UINT nIconSize) + { + return SHDefExtractIconW(pszFile, nIconIndex, 0, phiconLarge, phiconSmall, nIconSize); + } + + DECLARE_NOT_AGGREGATABLE(CNtObjectFolderExtractIcon) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNtObjectFolderExtractIcon) + COM_INTERFACE_ENTRY_IID(IID_IExtractIconW, IExtractIconW) + END_COM_MAP() + +}; + +class CNtObjectPidlManager +{ +private: + PWSTR m_ntPath; + + HDPA m_hDpa; + UINT m_hDpaCount; + + int DpaDeleteCallback(NtPidlEntry * info) + { + CoTaskMemFree(info); + return 0; + } + + static int CALLBACK s_DpaDeleteCallback(void *pItem, void *pData) + { + CNtObjectPidlManager * mf = (CNtObjectPidlManager*) pData; + NtPidlEntry * item = (NtPidlEntry*) pItem; + return mf->DpaDeleteCallback(item); + } + +public: + CNtObjectPidlManager() : + m_ntPath(NULL), + m_hDpa(NULL), + m_hDpaCount(0) + { + } + + ~CNtObjectPidlManager() + { + DPA_DestroyCallback(m_hDpa, s_DpaDeleteCallback, this); + } + + HRESULT Initialize(PWSTR ntPath) + { + m_ntPath = ntPath; + + m_hDpa = DPA_Create(10); + + if (!m_hDpa) + return E_FAIL; + + HRESULT hr = EnumerateNtDirectory(m_hDpa, m_ntPath, &m_hDpaCount); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; + } + + HRESULT FindPidlInList(LPCITEMIDLIST pcidl, NtPidlEntry ** pinfo) + { + HRESULT hr; + + if (!m_hDpa) + { + return E_FAIL; + } + + TRACE("Searching for pidl { cb=%d } in a list of %d items\n", pcidl->mkid.cb, m_hDpaCount); + + for (int i = 0; i < (int) m_hDpaCount; i++) + { + NtPidlEntry * pInfo = (NtPidlEntry *) DPA_GetPtr(m_hDpa, i); + if (!pInfo) + return E_FAIL; + + hr = CompareIDs(0, pInfo, pcidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hr == S_OK) + { + *pinfo = pInfo; + return S_OK; + } + else + { + TRACE("Comparison returned %d\n", (int) (short) (hr & 0xFFFF)); + } + } + + TRACE("Pidl not found\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + HRESULT FindByName(LPCWSTR strParsingName, NtPidlEntry ** pinfo) + { + if (!m_hDpa) + { + return E_FAIL; + } + + TRACE("Searching for '%S' in a list of %d items\n", strParsingName, m_hDpaCount); + + for (int i = 0; i < (int) m_hDpaCount; i++) + { + NtPidlEntry * pInfo = (NtPidlEntry *) DPA_GetPtr(m_hDpa, i); + if (!pInfo) + return E_FAIL; + + int order = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, + pInfo->entryName, lstrlenW(pInfo->entryName), + strParsingName, lstrlenW(strParsingName)); + + if (order == CSTR_EQUAL) + { + *pinfo = pInfo; + return S_OK; + } + } + + TRACE("Pidl not found\n"); + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + HRESULT GetPidl(UINT index, NtPidlEntry ** pEntry) + { + *pEntry = NULL; + + NtPidlEntry * entry = (NtPidlEntry *) DPA_GetPtr(m_hDpa, index); + if (!entry) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + *pEntry = entry; + return S_OK; + } + + HRESULT GetCount(UINT * count) + { + *count = m_hDpaCount; + return S_OK; + } + + + static LPITEMIDLIST CreatePidlFromItem(NtPidlEntry * entry) + { + LPITEMIDLIST idl = (LPITEMIDLIST) CoTaskMemAlloc(entry->cb + 2); + if (!idl) + return NULL; + memset(idl, 0, entry->cb + 2); + memcpy(idl, entry, entry->cb); + return idl; + } + + HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second) + { + if (LOWORD(lParam) != 0) + return E_FAIL; + + if (second->cb > first->cb) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->cb < first->cb) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (HIWORD(lParam) == SHCIDS_ALLFIELDS) + { + int ord = memcmp(second, first, first->cb); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) + { + int ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + else + { + int ord = (int) second->objectType - (int) first->objectType; + + if (ord > 0) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (ord < 0) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength/sizeof(WCHAR)); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + } + + return S_OK; + } + + HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, LPCITEMIDLIST pcidl) + { + LPCITEMIDLIST p = (pcidl); + NtPidlEntry * second = (NtPidlEntry*) &(p->mkid); + if (second->magic != NT_OBJECT_PIDL_MAGIC) + return E_FAIL; + + return CompareIDs(lParam, first, second); + } + + HRESULT CompareIDs(LPARAM lParam, LPCITEMIDLIST pcidl1, LPCITEMIDLIST pcidl2) + { + LPCITEMIDLIST p = (pcidl1); + NtPidlEntry * first = (NtPidlEntry*) &(p->mkid); + if (first->magic != NT_OBJECT_PIDL_MAGIC) + return E_FAIL; + + return CompareIDs(lParam, first, pcidl2); + } + + ULONG ConvertAttributes(OBJECT_TYPE Type, ULONG Attributes, PULONG inMask) + { + ULONG mask = inMask ? *inMask : 0xFFFFFFFF; + ULONG flags = 0; + + if (Type == DIRECTORY_OBJECT) + flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + + if (Type == SYMBOLICLINK_OBJECT) + flags |= SFGAO_LINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + + return flags & mask; + } + +}; + +class CNtObjectFolderEnum : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IEnumIDList +{ +private: + CComPtr<CNtObjectFolder> m_Folder; + + HWND m_HwndOwner; + SHCONTF m_Flags; + + UINT m_Index; + UINT m_Count; + +public: + CNtObjectFolderEnum() : + m_HwndOwner(NULL), + m_Flags(0), + m_Index(0), + m_Count(0) + { + } + + virtual ~CNtObjectFolderEnum() + { + } + + HRESULT Initialize(CNtObjectFolder * folder, HWND hwndOwner, SHCONTF flags) + { + m_Folder = folder; + + m_Folder->GetManager().GetCount(&m_Count); + + m_HwndOwner = hwndOwner; + m_Flags = flags; + + return Reset(); + } + + virtual HRESULT STDMETHODCALLTYPE Next( + ULONG celt, + LPITEMIDLIST *rgelt, + ULONG *pceltFetched) + { + if (pceltFetched) + *pceltFetched = 0; + + if (m_Index >= m_Count) + return S_FALSE; + + for (int i = 0; i < (int) celt;) + { + NtPidlEntry * tinfo; + BOOL flagsOk = FALSE; + + do { + HRESULT hr = m_Folder->GetManager().GetPidl(m_Index++, &tinfo); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + switch (tinfo->objectType) + { + case SYMBOLICLINK_OBJECT: + case DIRECTORY_OBJECT: + flagsOk = (m_Flags & SHCONTF_FOLDERS) != 0; + break; + default: + flagsOk = (m_Flags & SHCONTF_NONFOLDERS) != 0; + break; + } + } while (m_Index < m_Count && !flagsOk); + + if (m_Index < m_Count) + { + if (rgelt) + rgelt[i] = m_Folder->GetManager().CreatePidlFromItem(tinfo); + i++; + } + + if (m_Index == m_Count) + { + if (pceltFetched) + *pceltFetched = i; + return (i == (int) celt) ? S_OK : S_FALSE; + } + } + + if (pceltFetched) *pceltFetched = celt; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt) + { + return Next(celt, NULL, NULL); + } + + virtual HRESULT STDMETHODCALLTYPE Reset() + { + m_Index = 0; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum) + { + return ShellObjectCreatorInit<CNtObjectFolderEnum>(m_Folder, m_HwndOwner, m_Flags, IID_PPV_ARG(IEnumIDList, ppenum)); + } + + DECLARE_NOT_AGGREGATABLE(CNtObjectFolderEnum) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNtObjectFolderEnum) + COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) + END_COM_MAP() + +}; + +//----------------------------------------------------------------------------- +// CNtObjectFolder + +extern "C" +HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CNtObjectFolder>(riid, ppv); +} + +CNtObjectFolder::CNtObjectFolder() : + m_PidlManager(NULL), + m_shellPidl(NULL) +{ +} + +CNtObjectFolder::~CNtObjectFolder() +{ +} + +// IShellFolder +HRESULT STDMETHODCALLTYPE CNtObjectFolder::ParseDisplayName( + HWND hwndOwner, + LPBC pbcReserved, + LPOLESTR lpszDisplayName, + ULONG *pchEaten, + LPITEMIDLIST *ppidl, + ULONG *pdwAttributes) +{ + HRESULT hr; + NtPidlEntry * info; + + if (!ppidl) + return E_FAIL; + + if (pchEaten) + *pchEaten = 0; + + if (pdwAttributes) + *pdwAttributes = 0; + + TRACE("ParseDisplayName name=%S\n", lpszDisplayName); + + hr = m_PidlManager->FindByName(lpszDisplayName, &info); + if (FAILED(hr)) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + *ppidl = m_PidlManager->CreatePidlFromItem(info); + + if (pchEaten) + *pchEaten = lstrlenW(info->entryName); + + if (pdwAttributes) + *pdwAttributes = m_PidlManager->ConvertAttributes(info->objectType, info->objectInformation.Attributes, pdwAttributes); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::EnumObjects( + HWND hwndOwner, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList) +{ + return ShellObjectCreatorInit<CNtObjectFolderEnum>(this, hwndOwner, grfFlags, IID_PPV_ARG(IEnumIDList, ppenumIDList)); +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::BindToObject( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvOut) +{ + NtPidlEntry * info; + HRESULT hr; + + if (IsEqualIID(riid, IID_IShellFolder)) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!(info->objectInformation.GrantedAccess & (STANDARD_RIGHTS_READ | FILE_LIST_DIRECTORY))) + return E_ACCESSDENIED; + + LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, pidl); + + WCHAR path[MAX_PATH]; + + if (info->objectType == SYMBOLICLINK_OBJECT) + { + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + + if (symlink->targetNameLength > 0) + { + StringCbCopyW(path, _countof(path), symlink->targetName); + } + else + { + return E_FAIL; + } + } + else + { + StringCbCopyW(path, _countof(path), m_NtPath); + + PathAppendW(path, info->entryName); + + DbgPrint("BindToObject for Directory %S\n", path); + } + + return ShellObjectCreatorInit<CNtObjectFolder>(fullPidl, path, riid, ppvOut); + } + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::BindToStorage( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvObj) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::CompareIDs( + LPARAM lParam, + LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2) +{ + TRACE("CompareIDs\n"); + return m_PidlManager->CompareIDs(lParam, pidl1, pidl2); +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppvOut) +{ + if (!IsEqualIID(riid, IID_IShellView)) + return E_NOINTERFACE; + + SFV_CREATE sfv; + sfv.cbSize = sizeof(sfv); + sfv.pshf = this; + sfv.psvOuter = NULL; + sfv.psfvcb = NULL; + + return SHCreateShellFolderView(&sfv, (IShellView**) ppvOut); +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetAttributesOf( + UINT cidl, + LPCITEMIDLIST *apidl, + SFGAOF *rgfInOut) +{ + NtPidlEntry * info; + HRESULT hr; + + TRACE("GetAttributesOf\n"); + + if (cidl == 0) + { + *rgfInOut &= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; + return S_OK; + } + + for (int i = 0; i < (int) cidl; i++) + { + LPCITEMIDLIST pidl = apidl[i]; + + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + // Update attributes. + *rgfInOut = m_PidlManager->ConvertAttributes(info->objectType, info->objectInformation.Attributes, rgfInOut); + } + + return S_OK; +} + +HRESULT CALLBACK ContextMenuCallback( + _In_opt_ IShellFolder *psf, + _In_opt_ HWND hwnd, + _In_opt_ IDataObject *pdtobj, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + LPCITEMIDLIST *apidl, + REFIID riid, + UINT *prgfInOut, + void **ppvOut) +{ + TRACE("GetUIObjectOf\n"); + + if (IsEqualIID(riid, IID_IContextMenu)) + { + return ShellObjectCreatorInit<CNtObjectFolderContextMenu>(m_shellPidl, cidl, apidl, riid, ppvOut); + //return CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, ContextMenuCallback, 0, NULL, (IContextMenu**) ppvOut); + } + + if (IsEqualIID(riid, IID_IExtractIconW)) + { + return ShellObjectCreatorInit<CNtObjectFolderExtractIcon>(m_shellPidl, cidl, apidl, riid, ppvOut); + } + + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDisplayNameOf( + LPCITEMIDLIST pidl, + SHGDNF uFlags, + STRRET *lpName) +{ + NtPidlEntry * info; + HRESULT hr; + + TRACE("GetDisplayNameOf %p\n", pidl); + + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)) + { + WCHAR path[MAX_PATH] = { 0 }; + + hr = GetFullName(m_shellPidl, uFlags, path, _countof(path)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PathAppendW(path, info->entryName); + + hr = MakeStrRetFromString(path, lpName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + LPCITEMIDLIST pidlNext = ILGetNext(pidl); + + if (pidlNext && pidlNext->mkid.cb > 0) + { + CComPtr<IShellFolder> psfChild; + hr = BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + WCHAR temp[MAX_PATH]; + STRRET childName; + + hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + PathAppendW(path, temp); + } + } + else + { + MakeStrRetFromString(info->entryName, info->entryNameLength, lpName); + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::SetNameOf( + HWND hwnd, + LPCITEMIDLIST pidl, + LPCOLESTR lpszName, + SHGDNF uFlags, + LPITEMIDLIST *ppidlOut) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// IPersist +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetClassID(CLSID *lpClassId) +{ + if (!lpClassId) + return E_POINTER; + + *lpClassId = CLSID_NtObjectFolder; + return S_OK; +} + +// IPersistFolder +HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl) +{ + static WCHAR slash [] = L"\\"; + return Initialize(pidl, slash); +} + +// Internal +HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl, PWSTR ntPath) +{ + m_shellPidl = ILClone(pidl); + StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); + + if (!m_PidlManager) + m_PidlManager = new CNtObjectPidlManager(); + + return m_PidlManager->Initialize(m_NtPath); +} + +// IPersistFolder2 +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetCurFolder(LPITEMIDLIST * pidl) +{ + if (pidl) + *pidl = ILClone(m_shellPidl); + if (!m_shellPidl) + return S_FALSE; + return S_OK; +} + +// IShellFolder2 +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDefaultSearchGUID( + GUID *lpguid) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::EnumSearches( + IEnumExtraSearch **ppenum) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDefaultColumn( + DWORD dwReserved, + ULONG *pSort, + ULONG *pDisplay) +{ + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDefaultColumnState( + UINT iColumn, + SHCOLSTATEF *pcsFlags) +{ + switch (iColumn) + { + case 0: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + case 1: + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + case 2: + *pcsFlags = SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT; + return S_OK; + case 3: + *pcsFlags = SHCOLSTATE_TYPE_STR; + return S_OK; + } + + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDetailsEx( + LPCITEMIDLIST pidl, + const SHCOLUMNID *pscid, + VARIANT *pv) +{ + NtPidlEntry * info; + HRESULT hr; + + TRACE("GetDetailsEx\n"); + + if (pidl) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + static const GUID storage = PSGUID_STORAGE; + if (IsEqualGUID(pscid->fmtid, storage)) + { + if (pscid->pid == PID_STG_NAME) + { + return MakeVariantString(pv, info->entryName); + } + else if (pscid->pid == PID_STG_STORAGETYPE) + { + if (info->objectType < 0) + { + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + + if (td->typeNameLength > 0) + { + return MakeVariantString(pv, td->typeName); + } + else + { + return MakeVariantString(pv, L"Unknown"); + } + } + else + { + return MakeVariantString(pv, ObjectTypeNames[info->objectType]); + } + } + else if (pscid->pid == PID_STG_WRITETIME) + { + DOUBLE varTime; + SYSTEMTIME stime; + FileTimeToSystemTime((FILETIME*) &(info->objectInformation.CreateTime), &stime); + SystemTimeToVariantTime(&stime, &varTime); + + V_VT(pv) = VT_DATE; + V_DATE(pv) = varTime; + return S_OK; + } + } + else if (IsEqualGUID(pscid->fmtid, GUID_NtObjectColumns)) + { + if (pscid->pid == PID_NTOBJECT_LINKTARGET) + { + if (info->objectType == SYMBOLICLINK_OBJECT) + { + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + + if (symlink->targetNameLength > 0) + { + return MakeVariantString(pv, symlink->targetName); + } + } + + return MakeVariantString(pv, L""); + } + } + } + + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDetailsOf( + LPCITEMIDLIST pidl, + UINT iColumn, + SHELLDETAILS *psd) +{ + NtPidlEntry * info; + HRESULT hr; + + TRACE("GetDetailsOf\n"); + + if (pidl) + { + hr = m_PidlManager->FindPidlInList(pidl, &info); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + switch (iColumn) + { + case 0: + psd->fmt = LVCFMT_LEFT; + + MakeStrRetFromString(info->entryName, info->entryNameLength, &(psd->str)); + return S_OK; + case 1: + psd->fmt = LVCFMT_LEFT; + + if (info->objectType < 0) + { + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + + if (td->typeNameLength > 0) + MakeStrRetFromString(td->typeName, td->typeNameLength, &(psd->str)); + else + MakeStrRetFromString(L"Unknown", &(psd->str)); + } + else + MakeStrRetFromString(ObjectTypeNames[info->objectType], &(psd->str)); + return S_OK; + case 2: + psd->fmt = LVCFMT_LEFT; + + if (info->objectInformation.CreateTime.QuadPart != 0) + { + WCHAR dbuff[128]; + PWSTR tbuff; + SYSTEMTIME stime; + FileTimeToSystemTime((LPFILETIME) &(info->objectInformation.CreateTime), &stime); + GetDateFormat(LOCALE_USER_DEFAULT, 0, &stime, NULL, dbuff, _countof(dbuff)); + tbuff = dbuff + lstrlenW(dbuff); + *tbuff++ = L' '; + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &stime, NULL, tbuff, _countof(dbuff) - (tbuff - dbuff)); + + MakeStrRetFromString(dbuff, &(psd->str)); + return S_OK; + } + + MakeStrRetFromString(L"", &(psd->str)); + return S_OK; + + case 3: + psd->fmt = LVCFMT_LEFT; + + if (info->objectType == SYMBOLICLINK_OBJECT) + { + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + sizeof(NtPidlEntry) + info->entryNameLength + sizeof(WCHAR)); + + if (symlink->targetNameLength > 0) + { + MakeStrRetFromString(symlink->targetName, symlink->targetNameLength, &(psd->str)); + return S_OK; + } + } + + MakeStrRetFromString(L"", &(psd->str)); + return S_OK; + } + } + else + { + switch (iColumn) + { + case 0: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 30; + + // TODO: Make localizable + MakeStrRetFromString(L"Object Name", &(psd->str)); + return S_OK; + case 1: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; + + // TODO: Make localizable + MakeStrRetFromString(L"Object Type", &(psd->str)); + return S_OK; + case 2: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 20; + + // TODO: Make localizable + MakeStrRetFromString(L"Creation Time", &(psd->str)); + return S_OK; + case 3: + psd->fmt = LVCFMT_LEFT; + psd->cxChar = 30; + + // TODO: Make localizable + MakeStrRetFromString(L"Symlink Target", &(psd->str)); + return S_OK; + } + } + + return E_FAIL; +} + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::MapColumnToSCID( + UINT iColumn, + SHCOLUMNID *pscid) +{ + static const GUID storage = PSGUID_STORAGE; + switch (iColumn) + { + case 0: + pscid->fmtid = storage; + pscid->pid = PID_STG_NAME; + return S_OK; + case 1: + pscid->fmtid = storage; + pscid->pid = PID_STG_STORAGETYPE; + return S_OK; + case 2: + pscid->fmtid = storage; + pscid->pid = PID_STG_WRITETIME; + return S_OK; + case 3: + pscid->fmtid = GUID_NtObjectColumns; + pscid->pid = PID_NTOBJECT_LINKTARGET; + return S_OK; + } + return E_FAIL; +} Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,149 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\stobject.cpp + * PURPOSE: Systray shell service object + * PROGRAMMERS: Robert Naumann + David Quintana <gigaherz(a)gmail.com> + */ +#pragma once + +extern const GUID CLSID_NtObjectFolder; + +class CNtObjectPidlManager; + +class CNtObjectFolder : + public CComCoClass<CNtObjectFolder, &CLSID_NtObjectFolder>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellFolder2, + public IPersistFolder2 +{ + CNtObjectPidlManager * m_PidlManager; + + WCHAR m_NtPath[MAX_PATH]; + + LPITEMIDLIST m_shellPidl; + +public: + + CNtObjectFolder(); + virtual ~CNtObjectFolder(); + + CNtObjectPidlManager& GetManager() { return *m_PidlManager; } + + // IShellFolder + virtual HRESULT STDMETHODCALLTYPE ParseDisplayName( + HWND hwndOwner, + LPBC pbcReserved, + LPOLESTR lpszDisplayName, + ULONG *pchEaten, + LPITEMIDLIST *ppidl, + ULONG *pdwAttributes); + + virtual HRESULT STDMETHODCALLTYPE EnumObjects( + HWND hwndOwner, + SHCONTF grfFlags, + IEnumIDList **ppenumIDList); + + virtual HRESULT STDMETHODCALLTYPE BindToObject( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE BindToStorage( + LPCITEMIDLIST pidl, + LPBC pbcReserved, + REFIID riid, + void **ppvObj); + + virtual HRESULT STDMETHODCALLTYPE CompareIDs( + LPARAM lParam, + LPCITEMIDLIST pidl1, + LPCITEMIDLIST pidl2); + + virtual HRESULT STDMETHODCALLTYPE CreateViewObject( + HWND hwndOwner, + REFIID riid, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE GetAttributesOf( + UINT cidl, + LPCITEMIDLIST *apidl, + SFGAOF *rgfInOut); + + virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf( + HWND hwndOwner, + UINT cidl, + LPCITEMIDLIST *apidl, + REFIID riid, + UINT *prgfInOut, + void **ppvOut); + + virtual HRESULT STDMETHODCALLTYPE GetDisplayNameOf( + LPCITEMIDLIST pidl, + SHGDNF uFlags, + STRRET *lpName); + + virtual HRESULT STDMETHODCALLTYPE SetNameOf( + HWND hwnd, + LPCITEMIDLIST pidl, + LPCOLESTR lpszName, + SHGDNF uFlags, + LPITEMIDLIST *ppidlOut); + + // IShellFolder2 + virtual HRESULT STDMETHODCALLTYPE GetDefaultSearchGUID( + GUID *lpguid); + + virtual HRESULT STDMETHODCALLTYPE EnumSearches( + IEnumExtraSearch **ppenum); + + virtual HRESULT STDMETHODCALLTYPE GetDefaultColumn( + DWORD dwReserved, + ULONG *pSort, + ULONG *pDisplay); + + virtual HRESULT STDMETHODCALLTYPE GetDefaultColumnState( + UINT iColumn, + SHCOLSTATEF *pcsFlags); + + virtual HRESULT STDMETHODCALLTYPE GetDetailsEx( + LPCITEMIDLIST pidl, + const SHCOLUMNID *pscid, + VARIANT *pv); + + virtual HRESULT STDMETHODCALLTYPE GetDetailsOf( + LPCITEMIDLIST pidl, + UINT iColumn, + SHELLDETAILS *psd); + + virtual HRESULT STDMETHODCALLTYPE MapColumnToSCID( + UINT iColumn, + SHCOLUMNID *pscid); + + // IPersist + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *lpClassId); + + // IPersistFolder + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl); + + // IPersistFolder2 + virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); + + // Internal + HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PWSTR ntPath); + + DECLARE_REGISTRY_RESOURCEID(IDR_NTOBJECTFOLDER) + DECLARE_NOT_AGGREGATABLE(CNtObjectFolder) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CNtObjectFolder) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + END_COM_MAP() + +}; Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjns.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,74 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\stobject.cpp + * PURPOSE: COM registration services for STobject.dll + * PROGRAMMERS: Robert Naumann + David Quintana <gigaherz(a)gmail.com> + */ + +#include "precomp.h" + +#include <atlwin.h> + +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_NtObjectFolder, CNtObjectFolder) +END_OBJECT_MAP() + +HINSTANCE g_hInstance; +CComModule g_Module; + +void *operator new (size_t, void *buf) +{ + return buf; +} + +STDAPI_(BOOL) +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + if (fdwReason == DLL_PROCESS_ATTACH) + { + g_hInstance = hinstDLL; + DisableThreadLibraryCalls(g_hInstance); + + /* HACK - the global constructors don't run, so I placement new them here */ + new (&g_Module) CComModule; + new (&_AtlWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + + g_Module.Init(ObjectMap, g_hInstance, NULL); + } + else if (fdwReason == DLL_PROCESS_DETACH) + { + g_hInstance = NULL; + g_Module.Term(); + } + return TRUE; +} + +STDAPI +DllRegisterServer(void) +{ + return g_Module.DllRegisterServer(FALSE); +} + +STDAPI +DllUnregisterServer(void) +{ + return g_Module.DllUnregisterServer(FALSE); +} + +STDAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return g_Module.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI +DllCanUnloadNow(void) +{ + return g_Module.DllCanUnloadNow(); +} Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,23 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_NTOBJECTFOLDER ICON "resources/1.ico" +IDI_NTOBJECTDIR ICON "resources/2.ico" +IDI_NTOBJECTDIROPEN ICON "resources/3.ico" +IDI_NTOBJECTITEM ICON "resources/4.ico" +IDI_NTOBJECTDEVICE ICON "resources/5.ico" +IDI_NTOBJECTPORT ICON "resources/6.ico" + +IDR_NTOBJECTFOLDER REGISTRY "resources/rgs/ntobjectfolder.rgs" + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.spec (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.spec [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,244 @@ +/* + * Copyright 2004, 2005 Martin Fuchs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <precomp.h> + +#include "ntobjutil.h" +#include <strsafe.h> + +WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); + +typedef NTSTATUS(__stdcall* pfnNtGenericOpen)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); +typedef NTSTATUS(__stdcall* pfnNtOpenFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, ULONG, ULONG); + +const LPCWSTR ObjectTypeNames [] = { + L"Directory", L"SymbolicLink", + L"Mutant", L"Section", L"Event", L"Semaphore", + L"Timer", L"Key", L"EventPair", L"IoCompletion", + L"Device", L"File", L"Controller", L"Profile", + L"Type", L"Desktop", L"WindowStatiom", L"Driver", + L"Token", L"Process", L"Thread", L"Adapter", L"Port", + 0 +}; + +static DWORD NtOpenObject(OBJECT_TYPE type, HANDLE* phandle, DWORD access, LPCWSTR path) +{ + UNICODE_STRING ustr; + + RtlInitUnicodeString(&ustr, path); + + OBJECT_ATTRIBUTES open_struct = { sizeof(OBJECT_ATTRIBUTES), 0x00, &ustr, 0x40 }; + + if (type != FILE_OBJECT) + access |= STANDARD_RIGHTS_READ; + + IO_STATUS_BLOCK ioStatusBlock; + + switch (type) + { + case DIRECTORY_OBJECT: return NtOpenDirectoryObject(phandle, access, &open_struct); + case SYMBOLICLINK_OBJECT: return NtOpenSymbolicLinkObject(phandle, access, &open_struct); + case MUTANT_OBJECT: return NtOpenMutant(phandle, access, &open_struct); + case SECTION_OBJECT: return NtOpenSection(phandle, access, &open_struct); + case EVENT_OBJECT: return NtOpenEvent(phandle, access, &open_struct); + case SEMAPHORE_OBJECT: return NtOpenSemaphore(phandle, access, &open_struct); + case TIMER_OBJECT: return NtOpenTimer(phandle, access, &open_struct); + case KEY_OBJECT: return NtOpenKey(phandle, access, &open_struct); + case EVENTPAIR_OBJECT: return NtOpenEventPair(phandle, access, &open_struct); + case IOCOMPLETITION_OBJECT: return NtOpenIoCompletion(phandle, access, &open_struct); + case FILE_OBJECT: return NtOpenFile(phandle, access, &open_struct, &ioStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0); + default: + return ERROR_INVALID_FUNCTION; + } +} + +OBJECT_TYPE MapTypeNameToType(LPCWSTR TypeName, DWORD cbTypeName) +{ + if (!TypeName) + return UNKNOWN_OBJECT_TYPE; + + for (UINT i = 0; i < _countof(ObjectTypeNames); i++) + { + LPCWSTR typeName = ObjectTypeNames[i]; + if (!StrCmpNW(typeName, TypeName, cbTypeName / sizeof(WCHAR))) + { + return (OBJECT_TYPE) i; + } + } + + return UNKNOWN_OBJECT_TYPE; +} + +HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount) +{ + WCHAR buffer[MAX_PATH]; + PWSTR pend; + + *hdpaCount = 0; + + StringCbCopyExW(buffer, sizeof(buffer), path, &pend, NULL, 0); + + ULONG enumContext = 0; + HANDLE directory = NULL; + + DWORD err = NtOpenObject(DIRECTORY_OBJECT, &directory, FILE_LIST_DIRECTORY, buffer); + if (!NT_SUCCESS(err)) + { + ERR("NtOpenDirectoryObject failed for path %S with status=%x\n", buffer, err); + return HRESULT_FROM_NT(err); + } + + if (pend[-1] != '\\') + *pend++ = '\\'; + + + BYTE dirbuffer[2048]; + + BOOL first = TRUE; + while (NtQueryDirectoryObject(directory, dirbuffer, 2048, TRUE, first, &enumContext, NULL) == STATUS_SUCCESS) + { + first = FALSE; + POBJECT_DIRECTORY_INFORMATION info = (POBJECT_DIRECTORY_INFORMATION) dirbuffer; + //for (; info->Name.Buffer != NULL; info++) + { + if (info->Name.Buffer) + { + StringCbCopyNW(pend, sizeof(buffer), info->Name.Buffer, info->Name.Length); + } + + OBJECT_TYPE otype = MapTypeNameToType(info->TypeName.Buffer, info->TypeName.Length); + OBJECT_BASIC_INFORMATION object = { 0 }; + + WCHAR wbLink[_MAX_PATH] = { 0 }; + UNICODE_STRING link; + RtlInitEmptyUnicodeString(&link, wbLink, sizeof(wbLink)); + + DWORD entryBufferLength = sizeof(NtPidlEntry) + sizeof(WCHAR); + if (info->Name.Buffer) + entryBufferLength += info->Name.Length; + + if (otype < 0) + { + entryBufferLength += sizeof(NtPidlTypeData) + sizeof(WCHAR); + + if (info->TypeName.Buffer) + { + entryBufferLength += info->TypeName.Length; + } + } + + if (otype == SYMBOLICLINK_OBJECT) + { + entryBufferLength += sizeof(NtPidlSymlinkData) + sizeof(WCHAR); + } + + DWORD access = STANDARD_RIGHTS_READ; + if ((otype == DIRECTORY_OBJECT) || + (otype == SYMBOLICLINK_OBJECT)) + access |= FILE_LIST_DIRECTORY; + + HANDLE handle; + if (!NtOpenObject(otype, &handle, access, buffer)) + { + DWORD read; + + if (!NT_SUCCESS(NtQueryObject(handle, ObjectBasicInformation, &object, sizeof(OBJECT_BASIC_INFORMATION), &read))) + { + ZeroMemory(&object, sizeof(OBJECT_BASIC_INFORMATION)); + } + + if (otype == SYMBOLICLINK_OBJECT) + { + if (NtQuerySymbolicLinkObject(handle, &link, NULL) == STATUS_SUCCESS) + { + entryBufferLength += link.Length; + } + else + { + link.Length = 0; + } + } + + NtClose(handle); + } + + NtPidlEntry* entry = (NtPidlEntry*) CoTaskMemAlloc(entryBufferLength); + if (!entry) + return E_OUTOFMEMORY; + + memset(entry, 0, entryBufferLength); + + entry->cb = sizeof(NtPidlEntry); + entry->magic = NT_OBJECT_PIDL_MAGIC; + entry->objectType = otype; + entry->objectInformation = object; + memset(entry->objectInformation.Reserved, 0, sizeof(entry->objectInformation.Reserved)); + + if (info->Name.Buffer) + { + entry->entryNameLength = info->Name.Length; + StringCbCopyNW(entry->entryName, entryBufferLength, info->Name.Buffer, info->Name.Length); + entry->cb += entry->entryNameLength + sizeof(WCHAR); + } + else + { + entry->entryNameLength = 0; + entry->entryName[0] = 0; + entry->cb += sizeof(WCHAR); + } + + if (otype < 0) + { + NtPidlTypeData * typedata = (NtPidlTypeData*) ((PBYTE) entry + entry->cb); + DWORD remainingSpace = entryBufferLength - ((PBYTE) (typedata->typeName) - (PBYTE) entry); + + if (info->TypeName.Buffer) + { + typedata->typeNameLength = info->TypeName.Length; + StringCbCopyNW(typedata->typeName, remainingSpace, info->TypeName.Buffer, info->TypeName.Length); + + entry->cb += typedata->typeNameLength + sizeof(WCHAR); + } + else + { + typedata->typeNameLength = 0; + typedata->typeName[0] = 0; + entry->cb += typedata->typeNameLength + sizeof(WCHAR); + } + } + + if (otype == SYMBOLICLINK_OBJECT) + { + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) ((PBYTE) entry + entry->cb); + DWORD remainingSpace = entryBufferLength - ((PBYTE) (symlink->targetName) - (PBYTE) entry); + + symlink->targetNameLength = link.Length; + StringCbCopyNW(symlink->targetName, remainingSpace, link.Buffer, link.Length); + + entry->cb += symlink->targetNameLength + sizeof(WCHAR); + } + + DPA_AppendPtr(hdpa, entry); + (*hdpaCount)++; + } + } + + NtClose(directory); + + return S_OK; +} Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,70 @@ +/* + * Copyright 2004 Martin Fuchs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +extern "C" { +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> +} + +// All the possible values are defined here because I want the type field to be +// "persistable" and not change if more types are added in the future. +enum OBJECT_TYPE { + DIRECTORY_OBJECT, SYMBOLICLINK_OBJECT, + MUTANT_OBJECT, SECTION_OBJECT, EVENT_OBJECT, SEMAPHORE_OBJECT, + TIMER_OBJECT, KEY_OBJECT, EVENTPAIR_OBJECT, IOCOMPLETITION_OBJECT, + DEVICE_OBJECT, FILE_OBJECT, CONTROLLER_OBJECT, PROFILE_OBJECT, + TYPE_OBJECT, DESKTOP_OBJECT, WINDOWSTATION_OBJECT, DRIVER_OBJECT, + TOKEN_OBJECT, PROCESS_OBJECT, THREAD_OBJECT, ADAPTER_OBJECT, PORT_OBJECT, + + UNKNOWN_OBJECT_TYPE = -1 +}; +extern const LPCWSTR ObjectTypeNames []; + +#define NT_OBJECT_PIDL_MAGIC (USHORT)0x9A03 + +#include <pshpack1.h> +struct NtPidlEntry +{ + SHORT cb; + USHORT magic; // 0x9A03 ~~~ "NTOB" + + // If this is -1, there will be a NtPidlTypeData following this, and before any other extensions + OBJECT_TYPE objectType; + + OBJECT_BASIC_INFORMATION objectInformation; + + USHORT entryNameLength; + WCHAR entryName[0]; + +}; + +struct NtPidlTypeData +{ + USHORT typeNameLength; + WCHAR typeName[0]; +}; + +struct NtPidlSymlinkData +{ + USHORT targetNameLength; + WCHAR targetName[0]; +}; +#include <poppack.h> + +HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount); Propchange: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/pre… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/precomp.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/precomp.h [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,49 @@ +#pragma once + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <tchar.h> + +#define COBJMACROS +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define NTOS_MODE_USER + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> +#include <ddeml.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi_undoc.h> +#include <tchar.h> +#include <strsafe.h> +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <undocshell.h> +#include <shellutils.h> + +#include <shellapi.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "resource.h" + +#undef DbgPrint + +extern HINSTANCE g_hInstance; + +#define ID_ICON_VOLUME (WM_APP + 0x4CB) + +// {845B0FB2-66E0-416B-8F91-314E23F7C12D} +DEFINE_GUID(CLSID_NtObjectFolder, + 0x845b0fb2, 0x66e0, 0x416b, 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d); + +#include "ntobjns.h" Propchange: trunk/reactos/dll/shellext/ntobjshex/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/shellext/ntobjshex/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resource.h (added) +++ trunk/reactos/dll/shellext/ntobjshex/resource.h [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,12 @@ +#pragma once + +#define IDI_NTOBJECTFOLDER 1 +#define IDI_NTOBJECTDIR 2 +#define IDI_NTOBJECTDIROPEN 3 +#define IDI_NTOBJECTITEM 4 +#define IDI_NTOBJECTDEVICE 5 +#define IDI_NTOBJECTPORT 6 + +#define IDS_NAME 101 + +#define IDR_NTOBJECTFOLDER 1001 Propchange: trunk/reactos/dll/shellext/ntobjshex/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 21:21:02 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/ntobjshex/resources/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/2.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/3.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/4.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/5.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/6.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 21 21:21:02 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs (added) +++ trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -0,0 +1,47 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace Extension' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + val InfoTip = s 'Allows browsing of the NT Object Namespace' + DefaultIcon = s '%MODULE%,0' + ShellFolder + { + val Attributes = d '0xA8000000' + val BrowserFlags = d '0x22' + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove CurrentVersion + { + NoRemove Explorer + { + NoRemove MyComputer + { + NoRemove NameSpace + { + ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace Extension' + { + } + } + } + } + } + } + } + } +} Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/shellutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shellutils… ============================================================================== --- trunk/reactos/include/reactos/shellutils.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shellutils.h [iso-8859-1] Sat Feb 21 21:21:02 2015 @@ -32,7 +32,7 @@ #endif #if 1 -#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE)) +#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (Win32DbgPrint(__FILE__, __LINE__, "Unexpected failure %08x.\n", hr), TRUE)) #else #define FAILED_UNEXPECTEDLY(hr) FAILED(hr) #endif @@ -263,6 +263,52 @@ return S_OK; } +template<class T, class T1, class T2> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, REFIID riid, void ** ppv) +{ + CComPtr<T> obj; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new _CComObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, ppv); + if (FAILED(hResult)) + return hResult; + + hResult = obj->Initialize(initArg1, initArg2); + if (FAILED(hResult)) + return hResult; + + return S_OK; +} + +template<class T, class T1, class T2, class T3> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, REFIID riid, void ** ppv) +{ + CComPtr<T> obj; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new _CComObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, ppv); + if (FAILED(hResult)) + return hResult; + + hResult = obj->Initialize(initArg1, initArg2, initArg3); + if (FAILED(hResult)) + return hResult; + + return S_OK; +} + template<class T, class T1, class R> HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, R ** ppv) {

9 years, 10 months

[janderwald] 66395: [INF] - add swenum to critical device database

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 21 17:54:42 2015 New Revision: 66395 URL: http://svn.reactos.org/svn/reactos?rev=66395&view=rev Log: [INF] - add swenum to critical device database Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif 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] Sat Feb 21 17:54:42 2015 @@ -97,6 +97,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F03","Service",0x00000000,"i8042prt" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F03","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\ROOT#SWENUM","Service",0x00000000,"swenum" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\ROOT#SWENUM","ClassGUID",0x00000000,"{4d36e97d-e325-11ce-bfc1-08002be10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe" @@ -1335,6 +1339,13 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" + +; SWENUM driver +HKLM,"SYSTEM\CurrentControlSet\Services\swenum","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\swenum","ImagePath",0x00020000,"system32\drivers\swenum.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001 + ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Feb 21 17:54:42 2015 @@ -90,6 +90,7 @@ USB\Class_03 = hidusb GENERIC_HID_DEVICE = hidusb *PNP0303 = i8042prt +ROOT\SWENUM = swenum [BootBusExtenders.Load] acpi = acpi.sys

9 years, 10 months

[tfaber] 66394: [DESK.CPL] - Load wallpapers using GDI+ and convert them to bitmap format as needed. We now support PNG and JPEG (and more) wallpapers! Patch by Ricardo Hanke, small modifications b...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 21 17:47:57 2015 New Revision: 66394 URL: http://svn.reactos.org/svn/reactos?rev=66394&view=rev Log: [DESK.CPL] - Load wallpapers using GDI+ and convert them to bitmap format as needed. We now support PNG and JPEG (and more) wallpapers! Patch by Ricardo Hanke, small modifications by me. CORE-8802 #resolve Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/dibitmap.c trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -30,6 +30,6 @@ set_module_type(desk cpl UNICODE) target_link_libraries(desk uuid) -add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme msvcrt kernel32 ntdll) +add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme gdiplus msvcrt kernel32 ntdll) add_pch(desk desk.h SOURCE) add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -58,9 +58,109 @@ HBITMAP hBitmap; int cxSource; int cySource; + + ULONG_PTR gdipToken; } DATA, *PDATA; GLOBAL_DATA g_GlobalData; + + +HRESULT +GdipGetEncoderClsid(PCWSTR MimeType, CLSID *pClsid) +{ + UINT num; + UINT size; + UINT i; + ImageCodecInfo *codecInfo; + + if (GdipGetImageEncodersSize(&num, &size) != Ok || + size == 0) + { + return E_FAIL; + } + + codecInfo = HeapAlloc(GetProcessHeap(), 0, size); + if (!codecInfo) + { + return E_OUTOFMEMORY; + } + + if (GdipGetImageEncoders(num, size, codecInfo) != Ok) + { + HeapFree(GetProcessHeap(), 0, codecInfo); + return E_FAIL; + } + + for (i = 0; i < num; i++) + { + if (!_wcsicmp(codecInfo[i].MimeType, MimeType)) + { + *pClsid = codecInfo[i].Clsid; + HeapFree(GetProcessHeap(), 0, codecInfo); + return S_OK; + } + } + + HeapFree(GetProcessHeap(), 0, codecInfo); + return E_FAIL; +} + + +LPWSTR +GdipGetSupportedFileExtensions(VOID) +{ + ImageCodecInfo *codecInfo; + UINT num; + UINT size; + UINT i; + LPWSTR lpBuffer = NULL; + + if (GdipGetImageDecodersSize(&num, &size) != Ok || + size == 0) + { + return NULL; + } + + codecInfo = HeapAlloc(GetProcessHeap(), 0, size); + if (!codecInfo) + { + return NULL; + } + + if (GdipGetImageDecoders(num, size, codecInfo) != Ok) + { + HeapFree(GetProcessHeap(), 0, codecInfo); + return NULL; + } + + size = 0; + for (i = 0; i < num; ++i) + { + size = size + wcslen(codecInfo[i].FilenameExtension) + 1; + } + + size = (size + 1) * sizeof(WCHAR); + + lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!lpBuffer) + { + HeapFree(GetProcessHeap(), 0, codecInfo); + return NULL; + } + + for (i = 0; i < num; ++i) + { + StringCbCatW(lpBuffer, size, codecInfo[i].FilenameExtension); + if (i < (num - 1)) + { + StringCbCatW(lpBuffer, size, L";"); + } + } + + HeapFree(GetProcessHeap(), 0, codecInfo); + + return lpBuffer; +} /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ @@ -70,7 +170,7 @@ WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; - TCHAR szFileTypes[MAX_PATH]; + LPTSTR szFileTypes = NULL; LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; @@ -119,7 +219,7 @@ listItem.lParam = pData->listViewItemCount; (void)ListView_InsertItem(hwndBackgroundList, &listItem); - ListView_SetItemState(hwndBackgroundList, + ListView_SetItemState(hwndBackgroundList, pData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); @@ -224,19 +324,30 @@ /* Add all the images in the C:\ReactOS directory. */ - LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); + szFileTypes = GdipGetSupportedFileExtensions(); + if (!szFileTypes) + { + return; + } token = _tcstok(szFileTypes, separators); while (token != NULL) { GetWindowsDirectory(szSearchPath, MAX_PATH); - + hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\")); if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, szFileTypes); return; + } + hr = StringCbCat(szSearchPath, sizeof(szSearchPath), token); if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, szFileTypes); return; + } hFind = FindFirstFile(szSearchPath, &fd); while (hFind != INVALID_HANDLE_VALUE) @@ -249,12 +360,14 @@ if (FAILED(hr)) { FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); return; } hr = StringCbCat(filename, sizeof(filename), fd.cFileName); if (FAILED(hr)) { FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); return; } @@ -284,6 +397,7 @@ if (FAILED(hr)) { FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); return; } p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); @@ -293,6 +407,7 @@ if (FAILED(hr)) { FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); return; } @@ -316,6 +431,8 @@ token = _tcstok(NULL, separators); FindClose(hFind); } + + HeapFree(GetProcessHeap(), 0, szFileTypes); } @@ -488,13 +605,19 @@ OPENFILENAME ofn; TCHAR filename[MAX_PATH]; TCHAR fileTitle[256]; - TCHAR filter[MAX_PATH]; + LPTSTR filter; + LPTSTR extensions; BackgroundItem *backgroundItem = NULL; SHFILEINFO sfi; LV_ITEM listItem; HWND hwndBackgroundList; TCHAR *p; HRESULT hr; + TCHAR filterdesc[MAX_PATH]; + TCHAR *c; + UINT sizeRemain; + DWORD buffersize; + BOOL success; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -504,7 +627,44 @@ ofn.hwndOwner = hwndDlg; ofn.lpstrFile = filename; - LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filter, sizeof(filter) / sizeof(TCHAR)); + LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filterdesc, sizeof(filterdesc) / sizeof(TCHAR)); + + extensions = GdipGetSupportedFileExtensions(); + if (!extensions) + { + return; + } + + buffersize = (_tcslen(extensions) * 2 + 6) * sizeof(TCHAR) + sizeof(filterdesc); + + filter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + if (!filter) + { + HeapFree(GetProcessHeap(), 0, extensions); + return; + } + + sizeRemain = buffersize; + c = filter; + + if (FAILED(StringCbPrintfEx(c, sizeRemain, &c, &sizeRemain, 0, L"%ls (%ls)", filterdesc, extensions))) + { + HeapFree(GetProcessHeap(), 0, extensions); + HeapFree(GetProcessHeap(), 0, filter); + return; + } + + c++; + sizeRemain -= sizeof(*c); + + if (FAILED(StringCbPrintfEx(c, sizeRemain, &c, &sizeRemain, 0, L"%ls", extensions))) + { + HeapFree(GetProcessHeap(), 0, extensions); + HeapFree(GetProcessHeap(), 0, filter); + return; + } + + HeapFree(GetProcessHeap(), 0, extensions); /* Set lpstrFile[0] to '\0' so that GetOpenFileName does not * use the contents of szFile to initialize itself */ @@ -517,7 +677,10 @@ ofn.lpstrInitialDir = NULL; ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - if (GetOpenFileName(&ofn) == TRUE) + success = GetOpenFileName(&ofn); + HeapFree(GetProcessHeap(), 0, filter); + + if (success) { /* Check if there is already a entry that holds this filename */ if (CheckListViewFilenameExists(hwndBackgroundList, ofn.lpstrFileTitle) == TRUE) @@ -747,6 +910,22 @@ SetWallpaper(PDATA pData) { HKEY regKey; + TCHAR szWallpaper[MAX_PATH]; + GpImage *image; + CLSID encoderClsid; + size_t length = 0; + GpStatus status; + + + if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, szWallpaper))) + { + return; + } + + if (FAILED(StringCbCat(szWallpaper, MAX_PATH, TEXT("\\Wallpaper1.bmp")))) + { + return; + } RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); @@ -768,19 +947,50 @@ RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("2"), sizeof(TCHAR) * 2); } + if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == TRUE) + { + GdipLoadImageFromFile(pData->backgroundItems[pData->backgroundSelection].szFilename, &image); + if (!image) + { + RegCloseKey(regKey); + return; + } + + if (FAILED(GdipGetEncoderClsid(L"image/bmp", &encoderClsid))) + { + GdipDisposeImage(image); + RegCloseKey(regKey); + return; + } + + status = GdipSaveImageToFile(image, szWallpaper, &encoderClsid, NULL); + + GdipDisposeImage(image); + + if (status != Ok) + { + RegCloseKey(regKey); + return; + } + + if (SUCCEEDED(StringCchLength(pData->backgroundItems[pData->backgroundSelection].szFilename, MAX_PATH, &length))) + { + RegSetValueEx(regKey, TEXT("ConvertedWallpaper"), 0, REG_SZ, (BYTE*)pData->backgroundItems[pData->backgroundSelection].szFilename, (length + 1) * sizeof(TCHAR)); + } + + if (SUCCEEDED(StringCchLength(szWallpaper, MAX_PATH, &length))) + { + RegSetValueEx(regKey, TEXT("OriginalWallpaper"), 0, REG_SZ, (BYTE *)szWallpaper, (length + 1) * sizeof(TCHAR)); + } + + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, szWallpaper, SPIF_UPDATEINIFILE); + } + else + { + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (void*) TEXT(""), SPIF_UPDATEINIFILE); + } + RegCloseKey(regKey); - - if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == TRUE) - { - SystemParametersInfo(SPI_SETDESKWALLPAPER, - 0, - pData->backgroundItems[pData->backgroundSelection].szFilename, - SPIF_UPDATEINIFILE); - } - else - { - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (void*) TEXT(""), SPIF_UPDATEINIFILE); - } } @@ -821,6 +1031,7 @@ LPARAM lParam) { PDATA pData; + struct GdiplusStartupInput gdipStartup; pData = (PDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -829,6 +1040,11 @@ case WM_INITDIALOG: pData = (DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); + gdipStartup.GdiplusVersion = 1; + gdipStartup.DebugEventCallback = NULL; + gdipStartup.SuppressBackgroundThread = FALSE; + gdipStartup.SuppressExternalCodecs = FALSE; + GdiplusStartup(&pData->gdipToken, &gdipStartup, NULL); InitBackgroundDialog(hwndDlg, pData); break; @@ -908,6 +1124,7 @@ DibFreeImage(pData->pWallpaperBitmap); DeleteObject(pData->hBitmap); + GdiplusShutdown(pData->gdipToken); HeapFree(GetProcessHeap(), 0, pData); break; } Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=66… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -23,6 +23,7 @@ #include <regstr.h> #include <dll/desk/deskcplx.h> #include <strsafe.h> +#include <gdiplus.h> #include "appearance.h" #include "preview.h" @@ -41,11 +42,10 @@ typedef struct _DIBITMAP { - BITMAPFILEHEADER *header; BITMAPINFO *info; BYTE *bits; - int width; - int height; + UINT width; + UINT height; } DIBITMAP, *PDIBITMAP; extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/desk/dibitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/dibitmap.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/dibitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/dibitmap.c [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -12,71 +12,75 @@ PDIBITMAP DibLoadImage(LPTSTR lpFilename) { - BOOL bSuccess; - DWORD dwFileSize, dwHighSize, dwBytesRead; - HANDLE hFile; PDIBITMAP lpBitmap; + GpBitmap *bitmap; + BitmapData lock; - hFile = CreateFile(lpFilename, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - if (hFile == INVALID_HANDLE_VALUE) - return NULL; - - dwFileSize = GetFileSize(hFile, &dwHighSize); - - if (dwHighSize) + if (GdipCreateBitmapFromFile(lpFilename, &bitmap) != Ok) { - CloseHandle(hFile); return NULL; } lpBitmap = HeapAlloc(GetProcessHeap(), 0, sizeof(DIBITMAP)); if (lpBitmap == NULL) { - CloseHandle(hFile); + GdipDisposeImage((GpImage*)bitmap); return NULL; } - lpBitmap->header = HeapAlloc(GetProcessHeap(), 0, dwFileSize); - if (lpBitmap->header == NULL) + lpBitmap->info = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); + if (lpBitmap->info == NULL) { HeapFree(GetProcessHeap(), 0, lpBitmap); - CloseHandle(hFile); + GdipDisposeImage((GpImage*)bitmap); return NULL; } - bSuccess = ReadFile(hFile, lpBitmap->header, dwFileSize, &dwBytesRead, NULL); - CloseHandle(hFile); - - if (!bSuccess || - (dwBytesRead != dwFileSize) || - (lpBitmap->header->bfType != * (WORD *) "BM") || - (lpBitmap->header->bfSize != dwFileSize)) + if (GdipGetImageWidth((GpImage*)bitmap, &lpBitmap->width) != Ok || + GdipGetImageHeight((GpImage*)bitmap, &lpBitmap->height) != Ok) { - HeapFree(GetProcessHeap(), 0, lpBitmap->header); + HeapFree(GetProcessHeap(), 0, lpBitmap->info); HeapFree(GetProcessHeap(), 0, lpBitmap); + GdipDisposeImage((GpImage*)bitmap); return NULL; } - lpBitmap->info = (BITMAPINFO *)(lpBitmap->header + 1); - lpBitmap->bits = (BYTE *)lpBitmap->header + lpBitmap->header->bfOffBits; + lpBitmap->bits = HeapAlloc(GetProcessHeap(), 0, lpBitmap->width * lpBitmap->height * 4); + if (!lpBitmap->bits) + { + HeapFree(GetProcessHeap(), 0, lpBitmap->info); + HeapFree(GetProcessHeap(), 0, lpBitmap); + GdipDisposeImage((GpImage*)bitmap); + return NULL; + } - /* Get the DIB width and height */ - if (lpBitmap->info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + ZeroMemory(lpBitmap->info, sizeof(BITMAPINFO)); + lpBitmap->info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + lpBitmap->info->bmiHeader.biWidth = lpBitmap->width; + lpBitmap->info->bmiHeader.biHeight = -lpBitmap->height; + lpBitmap->info->bmiHeader.biPlanes = 1; + lpBitmap->info->bmiHeader.biBitCount = 32; + lpBitmap->info->bmiHeader.biCompression = BI_RGB; + lpBitmap->info->bmiHeader.biSizeImage = lpBitmap->width * lpBitmap->height * 4; + + lock.Width = lpBitmap->width; + lock.Height = lpBitmap->height; + lock.Stride = lpBitmap->width * 4; + lock.PixelFormat = PixelFormat32bppPARGB; + lock.Scan0 = lpBitmap->bits; + lock.Reserved = 0; + + if (GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead | ImageLockModeUserInputBuf, PixelFormat32bppPARGB, &lock) != Ok) { - lpBitmap->width = ((BITMAPCOREHEADER *)lpBitmap->info)->bcWidth; - lpBitmap->height = ((BITMAPCOREHEADER *)lpBitmap->info)->bcHeight; + HeapFree(GetProcessHeap(), 0, lpBitmap->bits); + HeapFree(GetProcessHeap(), 0, lpBitmap->info); + HeapFree(GetProcessHeap(), 0, lpBitmap); + GdipDisposeImage((GpImage*)bitmap); + return NULL; } - else - { - lpBitmap->width = lpBitmap->info->bmiHeader.biWidth; - lpBitmap->height = abs(lpBitmap->info->bmiHeader.biHeight); - } + + GdipBitmapUnlockBits(bitmap, &lock); + GdipDisposeImage((GpImage*)bitmap); return lpBitmap; } @@ -88,9 +92,13 @@ if (lpBitmap == NULL) return; - /* Free the header */ - if (lpBitmap->header != NULL) - HeapFree(GetProcessHeap(), 0, lpBitmap->header); + /* Free the image data */ + if (lpBitmap->bits != NULL) + HeapFree(GetProcessHeap(), 0, lpBitmap->bits); + + /* Free the bitmap info */ + if (lpBitmap->info != NULL) + HeapFree(GetProcessHeap(), 0, lpBitmap->info); /* Free the bitmap structure */ if (lpBitmap != NULL) Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -216,8 +216,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ObrÃ¡zky (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ObrÃ¡zky" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Bilddateien (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Bilddateien" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ÎÎ¹ÎºÏÎ½ÎµÏ (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ÎÎ¹ÎºÏÎ½ÎµÏ" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Pictures" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ImÃ¡genes (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ImÃ¡genes" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Images (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Images" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "×ª××× ××ª (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "×ª××× ××ª" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "KÃ©pek (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "KÃ©pek" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Gambar (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Gambar" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Immagini (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Immagini" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ç»å (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ç»å" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Pictures" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Bilder (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Bilder" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -219,8 +219,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pliki tÅa (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Pliki tÅa" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -215,8 +215,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Imagini (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Imagini" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -210,8 +210,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ (*.bmp;*.dib)\000*.bmp;*.dib" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ObrÃ¡zky (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ObrÃ¡zky" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -214,8 +214,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Pictures" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Pictures" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -212,8 +212,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Resimler (*.bmp, *.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Resimler" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -218,8 +218,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ÐÐ°Ð»ÑÐ½ÐºÐ¸ (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ÐÐ°Ð»ÑÐ½ÐºÐ¸" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -217,8 +217,7 @@ STRINGTABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "ä½å¾ (*.bmp;*.dib)\0*.bmp;*.dib\0" - IDS_SUPPORTED_EXT "*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "ä½å¾" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sat Feb 21 17:47:57 2015 @@ -33,7 +33,6 @@ #define IDC_COLOR_BUTTON 1004 #define IDC_PLACEMENT_COMBO 1005 #define IDS_BACKGROUND_COMDLG_FILTER 1006 -#define IDS_SUPPORTED_EXT 1007 /* Screensaver Page */ #define IDC_SCREENS_PREVIEW 1010

9 years, 10 months

[tkreuzer] 66393: [WIN32K] Fix release build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 21 17:28:37 2015 New Revision: 66393 URL: http://svn.reactos.org/svn/reactos?rev=66393&view=rev Log: [WIN32K] Fix release build Modified: trunk/reactos/win32ss/user/ntuser/win32kdebug.h Modified: trunk/reactos/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32k… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Sat Feb 21 17:28:37 2015 @@ -6,7 +6,7 @@ This information includes which of the win32k debug channels will be enabled for the current process and which level of a channel will be active. This information will be stored in ppi->DbgChannelLevel. - In this way user mode can control how win32k debugging will work when + In this way user mode can control how win32k debugging will work when the following macros are used: ERR, FIXME, WARN, TRACE By default only the ERR channel will be active. Remember that other @@ -21,7 +21,7 @@ The operation to enable/disable (+/-) and the name of the channel is required Channels are devided by commas No spaces are allowed - The syntax is case sensitive. Levels must be lowercase and + The syntax is case sensitive. Levels must be lowercase and the names of the channels must be exactly like they are defined in DBG_DEFAULT_CHANNEL This syntax can be mixed with wine debug channels without problems @@ -118,7 +118,7 @@ DbgChUserWinpos, DbgChCount }; - + #define DISABLED_LEVEL 0x0 #define ERR_LEVEL 0x1 #define FIXME_LEVEL 0x2 @@ -157,34 +157,32 @@ #define STUB DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__RELFILE__,__LINE__); #else - #define DBG_GET_PPI + #define DBG_GET_PPI #define DBG_DEFAULT_CHANNEL(x) #define DBG_ENABLE_CHANNEL(ppi,ch,level) #define DBG_DISABLE_CHANNEL(ppi,ch,level) #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) - #define DBG_PRINT(ppi,ch,level) + #define DBG_PRINT(ppi,ch,level) - #define ERR(fmt, ...) - #define FIXME(fmt, ...) - #define WARN(fmt, ...) - #define TRACE(fmt, ...) + #define ERR(fmt, ...) + #define FIXME(fmt, ...) + #define WARN(fmt, ...) + #define TRACE(fmt, ...) - #define ERR_CH(ch,fmt, ...) + #define ERR_CH(ch,fmt, ...) #define FIXME_CH(ch,fmt, ...) - #define WARN_CH(ch,fmt, ...) + #define WARN_CH(ch,fmt, ...) #define TRACE_CH(ch,fmt, ...) - #define ERR_PPI(ppi,ch,fmt, ...) - #define FIXME_PPI(ppi,ch,fmt, ...) - #define WARN_PPI(ppi,ch,fmt, ...) - #define TRACE_PPI(ppi,ch,fmt, ...) + #define ERR_PPI(ppi,ch,fmt, ...) + #define FIXME_PPI(ppi,ch,fmt, ...) + #define WARN_PPI(ppi,ch,fmt, ...) + #define TRACE_PPI(ppi,ch,fmt, ...) #define STUB #endif -#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) - BOOL DbgInitDebugChannels();

9 years, 10 months

[akhaldi] 66392: [SHELL32] Addendum to r66383. CORE-4476

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 21 17:27:41 2015 New Revision: 66392 URL: http://svn.reactos.org/svn/reactos?rev=66392&view=rev Log: [SHELL32] Addendum to r66383. CORE-4476 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½Ðµ Ð·Ð°Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° ÑÐ°Ð¹Ð»Ð°" IDS_OVERWRITEFOLDER_TEXT "Ð¢Ð°Ð·Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ð²ÐµÑÐµ ÑÑÐ´ÑÑÐ¶Ð° Ð¿Ð°Ð¿ÐºÐ° Ñ Ð¸Ð¼Ðµ '%1'.\n\nÐÐºÐ¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð² ÑÐµÐ»ÐµÐ²Ð°ÑÐ° Ð¿Ð°Ð¿ÐºÐ° Ð¸Ð¼Ð°Ñ ÑÑÑÐ¸ÑÐµ Ð¸Ð¼ÐµÐ½Ð° ÐºÐ°ÑÐ¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð²\nÐ¸Ð·Ð±ÑÐ°Ð½Ð°ÑÐ° Ð¿Ð°Ð¿ÐºÐ°, ÑÐµ ÑÐµ Ð±ÑÐ´Ð°Ñ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¸. ÐÑÐµ Ð¾ÑÐµ Ð»Ð¸ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ\nÐ¸Ð»Ð¸ Ð¿ÑÐµÐ·Ð°Ð¿Ð¸ÑÐµÑÐµ Ð¿Ð°Ð¿ÐºÐ°ÑÐ°?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ÐÑÐµÐ·Ð°Ð¿ÑÑÐº" IDS_RESTART_PROMPT "ÐÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½ÐµÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°?" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -699,6 +699,13 @@ IDS_OVERWRITEFILE_CAPTION "Potvrdit pÅepsÃ¡nÃ souboru" IDS_OVERWRITEFOLDER_TEXT "Tato sloÅ¾ka jiÅ¾ obsahuje sloÅ¾ku s nÃ¡zvem '%1'.\n\nPokud majÃ soubory v cÃlovÃ© sloÅ¾ce stejnÃ© nÃ¡zvy jako soubory ve zvolenÃ©\nsloÅ¾ce, budou pÅepsÃ¡ny. Opravdu chcete pÅesunout nebo zkopÃrovat tuto sloÅ¾ku?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restartovat" IDS_RESTART_PROMPT "Opravdu chcete restartovat systÃ©m?" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -699,6 +699,13 @@ IDS_OVERWRITEFILE_CAPTION "BekrÃ¦ft overskrivelse af fil" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Genstart" IDS_RESTART_PROMPT "Ãnsker du at Genstarte Systemet?" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "BestÃ¤tigung: Datei Ã¼berschreiben" IDS_OVERWRITEFOLDER_TEXT "Dieser Ordner enthÃ¤lt bereits einen Ordner namens '%1'.\n\nWenn Dateien im Zielordner die gleichen Namen haben, wie Dateien\nim gewÃ¤hlten Ordner, werden diese ersetzt. Soll der Vorgang fortgesetzt werden?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Neu starten" IDS_RESTART_PROMPT "MÃ¶chten Sie das System neu starten?" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎµÎ¯Î¿Ï" IDS_OVERWRITEFOLDER_TEXT "ÎÏÏÏÏ Î¿ ÏÎ¬ÎºÎµÎ»Î¿Ï ÏÎµÏÎ¹ÎÏÎµÎ¹ Î®Î´Î· ÎÎ½Î±Î½ ÏÎ¬ÎºÎµÎ»Î¿ ed '%1'.\n\nÎÎ½ ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ ÏÏÎ¿Î¿ÏÎ¹ÏÎ¼Î¿Ï ÎÏÎ¿ÏÎ½ Î¯Î´Î¹Î± Î¿Î½ÏÎ¼Î±ÏÎ± Î¼Îµ ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿Î½\nÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿ ÏÎ¬ÎºÎµÎ»Î¿ Î¸Î± Î±Î½ÏÎ¹ÎºÎ±ÏÎ±ÏÏÎ±Î¸Î¿ÏÎ½. ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ;\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ÎÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ·" IDS_RESTART_PROMPT "ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± ÎµÏÎ±Î½ÎµÎºÎºÎ¹Î½Î®ÏÎµÏÎµ ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï;" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,11 +693,11 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" /* message box strings */ Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -694,6 +694,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar el reemplazo de archivo" IDS_OVERWRITEFOLDER_TEXT "Esta carpeta ya contiene una carpeta con el nombre '%1'.\n\nSi los archivos de la carpeta existente tienen el mismo nombre que los\narchivos de la carpeta que estÃ¡ moviendo o copiando, serÃ¡n\nreemplazados. Â¿Desea mover o copiar la carpeta de todas formas?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "Â¿Desea reiniciar el equipo?" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "KÃ¤ynnistÃ¤ uudestaan" IDS_RESTART_PROMPT "Haluatko simuloida Windows:n uudelleenkÃ¤ynnistÃ¤mistÃ¤?" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirmer l'Ã©crasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient dÃ©jÃ un dossier nommÃ© '%1'.\n\nSi les fichiers dans le dossier de destination ont les mÃªmes noms que ceux dans le\ndossier sÃ©lectionnÃ©, ils seront remplacÃ©s. Voulez-vous toujours dÃ©placer ou copier\nle dossier?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "RedÃ©marrer" IDS_RESTART_PROMPT "Voulez-vous redÃ©marrer votre ordinateur ?" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "××¤×¢×× ××××©" IDS_RESTART_PROMPT "××× ××¨×¦×× × ×××¤×¢×× ××××© ××ª ×××¢×¨××ª?" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "ÃllomÃ¡ny felÃ¼lÃrÃ¡sa" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ÃjraindÃtÃ¡s" IDS_RESTART_PROMPT "Ãjra szeretnÃ©d indÃtani a rendszert?" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrittura del File" IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene giÃ una cartella con nome '%1'.\n\nSe i file nella cartella di destinazione hanno gli stessi nomi di quelli della \ncartella selezionata saranno sovrascritti. Volete procedere comunque?\n" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Riavvia" IDS_RESTART_PROMPT "Volete riavviare il sistema?" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "ãã¡ã¤ã«ä¸æ¸ãã®ç¢ºèª" IDS_OVERWRITEFOLDER_TEXT "ãã®ãã©ã«ãã«ã¯æ¢ã«ãã©ã«ã'%1'ãå«ã¾ãã¦ãã¾ãã\n\nãã£ã¬ã¯ããªãã©ã«ãåã®ãã¡ã¤ã«åãé¸æããããã©ã«ãåã®ãã¡ã¤ã«å\nã¨åãæã¯ç½®ãæãããã¾ããããã§ãããã©ã«ããç§»åã¾ãã¯\nã³ãã¼ãã¾ãã?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "åèµ·å" IDS_RESTART_PROMPT "ã·ã¹ãã ãåèµ·åãã¾ãã?" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" IDS_OVERWRITEFOLDER_TEXT "Denne mappen inneholder allerede en mappe som heter '%1'.\n\nHvis filene i destinasjon mappen har samme navn filer i \nvalgte mapper her vil bli overskrevet. Ãnsker du fortsatt Ã¥ flytte eller kopiere \ndenne mappen?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Starte pÃ¥ nytt" IDS_RESTART_PROMPT "Vil du starte datamaskinen pÃ¥ nytt?" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "PotwierdÅº zastÄpienie pliku" IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera juÅ¼ katalog o nazwie '%1'.\n\nJeÅ¼eli w docelowym folderze wystÄpiÄ pliki o takich samych nazwach jak\nw wybranym folderze, to zostanÄ one zastÄpione. Czy chcesz mimo to przenieÅÄ\nlub skopiowaÄ folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Uruchom ponownie" IDS_RESTART_PROMPT "Czy chcesz zrestartowaÄ system?" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "VocÃª quer simular a reinicializaÃ§Ã£o do Windows?" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar substituiÃ§Ã£o de ficheiro" IDS_OVERWRITEFOLDER_TEXT "Esta pasta jÃ¡ contÃ©m uma pasta com o nome '%1'.\n\nSe os ficheiros na pasta de destino tiverem o mesmo nome dos ficheiros na\npasta seleccionada, serÃ£o substituÃdos. Ainda assim pretende mover ou copiar\na pasta?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "Deseja simular a reinicializaÃ§Ã£o do Windows?" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -695,6 +695,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirmarea Ã®nlocuirii fiÈierului" IDS_OVERWRITEFOLDER_TEXT "Acest dosar deja conÈine un sub-dosar cu numele â%1â.\n\nDacÄ fiÈierele din dosarul de destinaÈie au acelaÈi nume ca cele din\ndosarul selectat, ele vor fi Ã®nlocuite. Sigur doriÈi sÄ copiaÈi sau\nsÄ mutaÈi dosarul?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Repornire" IDS_RESTART_PROMPT "DoriÈi sÄ reporniÈi sistemul?" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -695,6 +695,13 @@ IDS_OVERWRITEFILE_CAPTION "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð°Ð¼ÐµÐ½Ñ ÑÐ°Ð¹Ð»Ð°" IDS_OVERWRITEFOLDER_TEXT "ÐÑÐ° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¶Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ñ Ð¿Ð°Ð¿ÐºÑ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%1'.\n\nÐÑÐ»Ð¸ Ð² Ð¿Ð°Ð¿ÐºÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸, ÑÐ¾ Ð¾Ð½Ð¸ ÑÐ°Ðº Ð¶Ðµ Ð±ÑÐ´ÑÑ\nÐ·Ð°Ð¼ÐµÐ½ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" IDS_RESTART_PROMPT "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ReactOS?" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Potvrdenie prepÃsania sÃºboru" IDS_OVERWRITEFOLDER_TEXT "Tento prieÄinok uÅ¾ obsahuje prieÄinok s nÃ¡zvom '%1'.\n\nAk budÃº maÅ¥ sÃºbory v cieÄ¾ovom prieÄinku rovnakÃ© nÃ¡zvy ako sÃºbory\nvo vybranom prieÄinku, tak budÃº nahradenÃ©. StÃ¡le chcete presunÃºÅ¥\nalebo skopÃrovaÅ¥ prieÄinok?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ReÅ¡tartovaÅ¥" IDS_RESTART_PROMPT "Naozaj chcete reÅ¡tartovaÅ¥ systÃ©m?" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -697,6 +697,13 @@ IDS_OVERWRITEFILE_CAPTION "Konfirmo mbishkrim dokumenti" IDS_OVERWRITEFOLDER_TEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dosje me emrin '%1'.\n\nNÃ«se dosjet nÃ« dosjen e destinacionit kanÃ« emÃ«r tÃ« njÃ«jtÃ« me dokumentet nÃ« dosje\npÃ«rzgjedh ata qÃ« do tÃ« zÃ«vendÃ«sohen. A doni ende tÃ« hyni ose kopjoni\nkÃ«tÃ« dosje?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Rifillo" IDS_RESTART_PROMPT "Doni tÃ« rifilloni sistemin?" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Restart" IDS_RESTART_PROMPT "Do you want to restart the system?" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "Dosya Ãzerine YazmayÄ± Onayla" IDS_OVERWRITEFOLDER_TEXT "Bu klasÃ¶r zaten '%2' adÄ±nda bir klasÃ¶r iÃ§eriyor.\n\nVarolan klasÃ¶rdeki dosyalar, taÅÄ±yacaÄÄ±nÄ±z ya da kopyalayacaÄÄ±nÄ±z klasÃ¶rdeki dosyalarla aynÄ± adÄ± taÅÄ±yorsa, yenileriyle deÄiÅtirilir. KlasÃ¶rÃ¼ taÅÄ±mak ya da kopyalamak istiyor musunuz?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "Yeniden BaÅlat" IDS_RESTART_PROMPT "Oturumunuzu sonlandÄ±rÄ±r, ReactOS'Ä± kapatÄ±r, ve ReactOS'Ä± yeniden baÅlatÄ±r." Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -693,6 +693,13 @@ IDS_OVERWRITEFILE_CAPTION "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑ Ð¤Ð°Ð¹Ð»Ñ" IDS_OVERWRITEFOLDER_TEXT "Ð¦Ñ Ð¿Ð°Ð¿ÐºÐ° Ð²Ð¶Ðµ Ð¼ÑÑÑÐ¸ÑÑ Ð¿Ð°Ð¿ÐºÑ Ð· ÑÐ¼'ÑÐ¼ '%1'.\n\nÐ¯ÐºÑÐ¾ ÑÐ°Ð¹Ð»Ð¸ Ð² Ð¿Ð°Ð¿ÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð¼Ð°ÑÑÑ ÑÑ Ð¶ ÑÐ¼ÐµÐ½Ð°, ÑÐ¾ ÑÐ°Ð¹Ð»Ð¸ Ñ Ð²Ð¸Ð±ÑÐ°Ð½ÑÐ¹ Ð¿Ð°Ð¿ÑÑ,\nÐ²Ð¾Ð½Ð¸ Ð±ÑÐ´ÑÑÑ Ð·Ð°Ð¼ÑÐ½ÐµÐ½Ñ. ÐÐ¸ Ð²ÑÐµ ÑÐµ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ Ð°Ð±Ð¾\nÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð°Ð¿ÐºÑ?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸" IDS_RESTART_PROMPT "ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ?" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -702,6 +702,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "éæ°å¯å¨" IDS_RESTART_PROMPT "æ¯å¦éæ°å¯å¨ç³»ç»?" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Feb 21 17:27:41 2015 @@ -701,6 +701,13 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" + IDS_FILEOOP_COPYING "Copying" + IDS_FILEOOP_MOVING "Moving" + IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_FROM_TO "From %1 to %2" + IDS_FILEOOP_FROM "From %1" + IDS_FILEOOP_PREFLIGHT "Preflight" + /* message box strings */ IDS_RESTART_TITLE "éæ°åå" IDS_RESTART_PROMPT "Do you want to restart the system?"

9 years, 10 months

[tfaber] 66391: [LIBJPEG] - Restore the ros-diff lost in a sync. Fixes libjpeg.dll exports on MSVC builds. CORE-9242 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 21 17:18:38 2015 New Revision: 66391 URL: http://svn.reactos.org/svn/reactos?rev=66391&view=rev Log: [LIBJPEG] - Restore the ros-diff lost in a sync. Fixes libjpeg.dll exports on MSVC builds. CORE-9242 #resolve Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h [iso-8859-1] Sat Feb 21 17:18:38 2015 @@ -238,14 +238,62 @@ * or code profilers that require it. */ +#ifdef _WIN32 +# if defined(ALL_STATIC) +# if defined(JPEG_DLL) +# undef JPEG_DLL +# endif +# if !defined(JPEG_STATIC) +# define JPEG_STATIC +# endif +# endif +# if defined(JPEG_DLL) +# if defined(JPEG_STATIC) +# undef JPEG_STATIC +# endif +# endif +# if defined(JPEG_DLL) +/* building a DLL */ +# define JPEG_IMPEXP __declspec(dllexport) +# elif defined(JPEG_STATIC) +/* building or linking to a static library */ +# define JPEG_IMPEXP +# else +/* linking to the DLL */ +# define JPEG_IMPEXP __declspec(dllimport) +# endif +# if !defined(JPEG_API) +# define JPEG_API __cdecl +# endif +/* The only remaining magic that is necessary for cygwin */ +#elif defined(__CYGWIN__) +# if !defined(JPEG_IMPEXP) +# define JPEG_IMPEXP +# endif +# if !defined(JPEG_API) +# define JPEG_API __cdecl +# endif +#endif + +/* Ensure our magic doesn't hurt other platforms */ +#if !defined(JPEG_IMPEXP) +# define JPEG_IMPEXP +#endif +#if !defined(JPEG_API) +# define JPEG_API +#endif + /* a function called through method pointers: */ #define METHODDEF(type) static type /* a function used only in its module: */ #define LOCAL(type) static type /* a function referenced thru EXTERNs: */ -#define GLOBAL(type) type +#define GLOBAL(type) type JPEG_API /* a reference to a GLOBAL function: */ -#define EXTERN(type) extern type +#ifndef EXTERN +# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API +/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ +#endif /* EXTERN */ /* This macro is used to declare a "method", that is, a function pointer. Modified: trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… ============================================================================== --- trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch [iso-8859-1] Sat Feb 21 17:18:38 2015 @@ -1,8 +1,8 @@ -Index: libs/libjpeg/jmorecfg.h +Index: include/reactos/libs/libjpeg/jmorecfg.h =================================================================== ---- libs/libjpeg/jmorecfg.h (revision 48026) -+++ libs/libjpeg/jmorecfg.h (working copy) -@@ -191,14 +191,63 @@ +--- include/reactos/libs/libjpeg/jmorecfg.h (revision 66390) ++++ include/reactos/libs/libjpeg/jmorecfg.h (working copy) +@@ -238,14 +238,62 @@ * or code profilers that require it. */ @@ -61,10 +61,9 @@ /* a reference to a GLOBAL function: */ -#define EXTERN(type) extern type +#ifndef EXTERN -+# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API ++# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API +/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ +#endif /* EXTERN */ -+#define EXTERN_1(type) extern type JPEG_API /* This macro is used to declare a "method", that is, a function pointer.

9 years, 10 months

[tfaber] 66390: [STREAMCI] - Revert r66381 since the build failure was the builder's fault, not the code's

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 21 15:07:28 2015 New Revision: 66390 URL: http://svn.reactos.org/svn/reactos?rev=66390&view=rev Log: [STREAMCI] - Revert r66381 since the build failure was the builder's fault, not the code's Modified: trunk/reactos/dll/win32/streamci/streamci.c Modified: trunk/reactos/dll/win32/streamci/streamci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/streamci/streamc… ============================================================================== --- trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/streamci/streamci.c [iso-8859-1] Sat Feb 21 15:07:28 2015 @@ -50,7 +50,7 @@ { HDEVINFO hDevInfo; SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; - // GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; HANDLE hDevice; PSWENUM_INSTALL_INTERFACE InstallInterface; @@ -64,7 +64,7 @@ } DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, NULL, 0, &DeviceInterfaceData)) + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) { // failed SetupDiDestroyDeviceInfoList(hDevInfo);

9 years, 10 months

[akhaldi] 66389: [CMAKE] Move ccache related handling to the gcc set.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 21 14:40:14 2015 New Revision: 66389 URL: http://svn.reactos.org/svn/reactos?rev=66389&view=rev Log: [CMAKE] Move ccache related handling to the gcc set. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66389&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 21 14:40:14 2015 @@ -101,11 +101,6 @@ #useful stuff! include(CMakeParseArguments) - - if(ENABLE_CCACHE) - set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF) - set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF) - endif() # Default to Debug for the build type set(CMAKE_BUILD_TYPE "Debug" CACHE STRING Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66389&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Feb 21 14:40:14 2015 @@ -2,6 +2,8 @@ # Show a note about ccache build if(ENABLE_CCACHE) message("-- Enabling ccache build - done") + set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF) + set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF) endif() # PDB style debug info

9 years, 10 months

[gadamopoulos] 66388: [SHELL32] - Fix crash during shell32:shlfileop test. CORE-4476

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 21 14:36:22 2015 New Revision: 66388 URL: http://svn.reactos.org/svn/reactos?rev=66388&view=rev Log: [SHELL32] - Fix crash during shell32:shlfileop test. CORE-4476 Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Feb 21 14:36:22 2015 @@ -1714,6 +1714,10 @@ if (!lpFileOp) return ERROR_INVALID_PARAMETER; + ret = CoInitialize(NULL); + if (FAILED(ret)) + return ret; + check_flags(lpFileOp->fFlags); ZeroMemory(&flFrom, sizeof(FILE_LIST)); @@ -1732,7 +1736,13 @@ op.bManyItems = (flFrom.dwNumFiles > 1); if (lpFileOp->wFunc != FO_RENAME && !(lpFileOp->fFlags & FOF_SILENT)) { - CoCreateInstance(CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, IID_IProgressDialog, (void**) &op.progress); + ret = CoCreateInstance(CLSID_ProgressDialog, + NULL, + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IProgressDialog, &op.progress)); + if (FAILED(ret)) + goto cleanup; + op.progress->StartProgressDialog(op.req->hwnd, NULL, PROGDLG_NORMAL & PROGDLG_AUTOTIME, NULL); _SetOperationTitle(&op); _FileOpCountManager(&op, &flFrom); @@ -1762,6 +1772,7 @@ op.progress->Release(); } +cleanup: destroy_file_list(&flFrom); if (lpFileOp->wFunc != FO_DELETE) @@ -1769,6 +1780,8 @@ if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; + + CoUninitialize(); return ret; }

9 years, 10 months

← Newer
1
...
9
10
11
12
13
14
15
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015