Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[tfaber] 61299: [DLLS] - Warnings are not okay [SHELL32] - Comment out unused variables in WIP code

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Dec 19 19:42:33 2013 New Revision: 61299 URL: http://svn.reactos.org/svn/reactos?rev=61299&view=rev Log: [DLLS] - Warnings are not okay [SHELL32] - Comment out unused variables in WIP code Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/advpack/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -58,9 +58,3 @@ add_dependencies(quartz dxsdk quartz_idlheader stdole2) add_pch(quartz quartz_private.h) add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(quartz) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -13,12 +13,6 @@ add_library(aclui SHARED ${SOURCE} aclui.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(aclui) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(aclui win32dll UNICODE) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) add_pch(aclui precomp.h) Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -13,7 +13,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) add_library(advpack SHARED ${SOURCE}) -allow_warnings(advpack) set_module_type(advpack win32dll) target_link_libraries(advpack wine) add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -74,12 +74,6 @@ add_library(dbghelp SHARED ${SOURCE} version.rc) - if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(dbghelp) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") - endif() - set_module_type(dbghelp win32dll) target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames zlib) add_delay_importlibs(dbghelp version) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -20,12 +20,6 @@ set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(framedyn "-Wno-deprecated-declarations") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations") -endif() - add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) if(MSVC) Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -18,9 +18,3 @@ target_link_libraries(localspl wine) add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(localspl) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -53,10 +53,3 @@ add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll) add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) - - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(rpcrt4) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -79,12 +79,6 @@ ${SOURCE} shell32.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(shell32) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -413,7 +413,7 @@ BOOL CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey) { - + WCHAR wszName[MAX_PATH], wszBuf[MAX_PATH], *pwszClsid; DWORD cchName; HRESULT hr; @@ -636,7 +636,7 @@ { WCHAR wszKey[256]; HRESULT hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"%s\\shell\\%s", pEntry->szClass, pEntry->szVerb); - + if (SUCCEEDED(hr)) { DWORD cbVerb = sizeof(wszVerb); @@ -1004,7 +1004,7 @@ FORMATETC formatetc2; STGMEDIUM medium2; InitFormatEtc(formatetc2, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); - + DWORD dwKey= 0; if (SUCCEEDED(pda->GetData(&formatetc2, &medium2))) @@ -1104,7 +1104,7 @@ ERR("no IDropTarget Interface\n"); return hr; } - DWORD link = DROPEFFECT_LINK; + //DWORD link = DROPEFFECT_LINK; SHSimulateDrop(pDT, pDataObj, MK_CONTROL|MK_SHIFT, NULL, NULL); NotifyShellViewWindow(lpcmi, TRUE); @@ -1278,7 +1278,7 @@ if (!pidlParent) { IPersistFolder2 *pf; - + /* pidlFolder is optional */ if (SUCCEEDED(m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pf)))) { @@ -1400,7 +1400,7 @@ return E_FAIL; } -DWORD +DWORD CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) { LPSHELLBROWSER lpSB; @@ -1436,7 +1436,7 @@ return 0; } -HRESULT +HRESULT CDefaultContextMenu::TryToBrowse( LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) { @@ -1451,7 +1451,7 @@ return hr; } -HRESULT +HRESULT CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) { LPITEMIDLIST pidlFull = ILCombine(m_Dcm.pidlFolder, pidl); @@ -1462,7 +1462,7 @@ WCHAR wszPath[MAX_PATH]; BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); - + WCHAR wszDir[MAX_PATH]; if(bHasPath) { @@ -1526,7 +1526,7 @@ if (wFlags > 0) { /* In xp if we have browsed, we don't open any more folders . - * In win7 we browse to the first folder we find and + * In win7 we browse to the first folder we find and * open new windows fo for each of the rest of the folders */ if (bBrowsed) continue; Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -1353,7 +1353,7 @@ */ BOOL CDesktopFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { - /* TODO Windows does different drop effects if dragging across drives. + /* TODO Windows does different drop effects if dragging across drives. i.e., it will copy instead of move if the directories are on different disks. */ DWORD dwEffect = DROPEFFECT_MOVE; @@ -1436,24 +1436,24 @@ return E_FAIL; } - /* We only want to really move files around if they don't already + /* We only want to really move files around if they don't already come from the desktop, or we're linking or copying */ if ((!_ILIsDesktop(pidl)) || (dwKeyState & MK_CONTROL)) { LPITEMIDLIST pidl = NULL; WCHAR szPath[MAX_PATH]; - LPWSTR pathPtr; + //LPWSTR pathPtr; /* build a complete path to create a simple pidl */ lstrcpynW(szPath, sPathTarget, MAX_PATH); - pathPtr = PathAddBackslashW(szPath); + /*pathPtr = */PathAddBackslashW(szPath); //hr = _ILCreateFromPathW(szPath, &pidl); hr = this->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); if (SUCCEEDED(hr)) { - IDropTarget *pDT; + IDropTarget *pDT; hr = this->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*)&pDT); CoTaskMemFree(pidl); if (SUCCEEDED(hr)) @@ -1465,7 +1465,7 @@ ERR("Error creating from %s\n", debugstr_w(szPath)); } - /* Todo, rewrite the registry such that the icons are well placed. + /* Todo, rewrite the registry such that the icons are well placed. Blocked by no bags implementation. */ SHFree(pidl); Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -56,12 +56,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(windowscodecs) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_library(windowscodecs SHARED ${SOURCE} version.rc) set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine uuid ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Thu Dec 19 19:42:33 2013 @@ -21,12 +21,6 @@ ${SOURCE} winmm_res.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(winmm) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(winmm win32dll) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)

10 years, 9 months

[akhaldi] 61298: [EXPLORER] * Remove unneeded header inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 19 19:17:38 2013 New Revision: 61298 URL: http://svn.reactos.org/svn/reactos?rev=61298&view=rev Log: [EXPLORER] * Remove unneeded header inclusion. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Thu Dec 19 19:17:38 2013 @@ -54,7 +54,6 @@ #include <stdio.h> #include <windows.h> -#include <ctype.h> EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey);

10 years, 9 months

[akhaldi] 61297: [APPLICATIONS] * Add Albanian translation for notepad, taskkill and wmic. By Ardit Dani. CORE-7712 #resolve #comment Committed in r61297. Thanks !

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 19 19:11:37 2013 New Revision: 61297 URL: http://svn.reactos.org/svn/reactos?rev=61297&view=rev Log: [APPLICATIONS] * Add Albanian translation for notepad, taskkill and wmic. By Ardit Dani. CORE-7712 #resolve #comment Committed in r61297. Thanks ! Added: trunk/reactos/base/applications/cmdutils/taskkill/lang/sq-AL.rc - copied, changed from r61236, trunk/reactos/base/applications/cmdutils/taskkill/lang/en-US.rc trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc - copied, changed from r61236, trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc trunk/reactos/base/applications/notepad/lang/sq-AL.rc - copied, changed from r61227, trunk/reactos/base/applications/notepad/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc trunk/reactos/base/applications/cmdutils/wmic/wmic.rc trunk/reactos/base/applications/notepad/rsrc.rc Copied: trunk/reactos/base/applications/cmdutils/taskkill/lang/sq-AL.rc (from r61236, trunk/reactos/base/applications/cmdutils/taskkill/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/taskkill/lang/sq-AL.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -1,19 +1,23 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +* DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN STRING_USAGE "taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" - STRING_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - STRING_INVALID_PARAM "Error: Invalid command line parameter specified.\n" - STRING_MISSING_OPTION "Error: One of options /im or /pid must be specified.\n" - STRING_MISSING_PARAM "Error: Option %1 expects a command line parameter.\n" - STRING_MUTUAL_EXCLUSIVE "Error: Options /im and /pid are mutually exclusive.\n" - STRING_CLOSE_PID_SEARCH "Close message sent to top-level windows of process with PID %1!u!.\n" - STRING_CLOSE_PROC_SRCH "Close message sent to top-level windows of process ""%1"" with PID %2!u!.\n" - STRING_TERM_PID_SEARCH "Process with PID %1!u! was forcibly terminated.\n" - STRING_TERM_PROC_SEARCH "Process ""%1"" with PID %2!u! was forcibly terminated.\n" - STRING_SEARCH_FAILED "Error: Could not find process ""%1"".\n" - STRING_ENUM_FAILED "Error: Unable to enumerate the process list.\n" - STRING_TERMINATE_FAILED "Error: Unable to terminate process ""%1"".\n" - STRING_SELF_TERMINATION "Error: Process self-termination is not permitted.\n" + STRING_INVALID_OPTION "Gabim: Panjohur ose i pavlefshÃ«m opsioni linjes komandes i specifikuar.\n" + STRING_INVALID_PARAM "Gabim: PavlefshÃ«m parametri i specifikuar ne linjen e komandes.\n" + STRING_MISSING_OPTION "Gabim: Njera nga opsionet /im ose /pid duhet te specifikohet.\n" + STRING_MISSING_PARAM "Gabim: Opsioni %1 kalon parametrin i linjes se komandes.\n" + STRING_MUTUAL_EXCLUSIVE "Gabim: Opsioni /im dhe /pid janÃ« exclusiv reciprokisht.\n" + STRING_CLOSE_PID_SEARCH "Mbyll mesazhin e derguar ne dritaren e nivelin-lart te proceseve me PID %1!u!.\n" + STRING_CLOSE_PROC_SRCH "Mbyll mesazhin e derguar ne dritaren e nivelin-lart te proceseve ""%1"" me PID %2!u!.\n" + STRING_TERM_PID_SEARCH "Proceso me PID %1!u! u mbyll me force.\n" + STRING_TERM_PROC_SEARCH "Proces ""%1"" me PID %2!u! u mbyll me force.\n" + STRING_SEARCH_FAILED "Gabim: Nuk u gjend procesi ""%1"".\n" + STRING_ENUM_FAILED "Gabim: NÃ« pamundÃ«si pÃ«r tÃ« numÃ«ruar listÃ«n proceseve.\n" + STRING_TERMINATE_FAILED "Gabim: Pamundur mbyllja e proceseve ""%1"".\n" + STRING_SELF_TERMINATION "Gabim: Procesi vetÃ«-pÃ«rfundimi nuk Ã«shtÃ« i lejuar.\n" END Modified: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -36,3 +36,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGAUGE_SQ_AL + #include "lang/sq-AL.rc" +#endif Copied: trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc (from r61236, trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -1,8 +1,12 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +* DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_CMDLINE_NOT_SUPPORTED "Error: Command line not supported\n" - STRING_ALIAS_NOT_FOUND "Error: Alias not found\n" - STRING_INVALID_QUERY "Error: Invalid query\n" + STRING_CMDLINE_NOT_SUPPORTED "Gabim: Linja e komandave jo e mbÃ«shtetur\n" + STRING_ALIAS_NOT_FOUND "Gabim: Pseudonimi nuk u gjend\n" + STRING_INVALID_QUERY "Gabim: KÃ«rkim pa vlere\n" END Modified: trunk/reactos/base/applications/cmdutils/wmic/wmic.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -34,3 +34,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif Copied: trunk/reactos/base/applications/notepad/lang/sq-AL.rc (from r61227, trunk/reactos/base/applications/notepad/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -1,4 +1,8 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +* DATE OF TR: 05-12-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN @@ -22,50 +26,50 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "&New\tCtrl+N", CMD_NEW - MENUITEM "&Open...\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM "E Re\tCtrl+N", CMD_NEW + MENUITEM "Hap...\tCtrl+O", CMD_OPEN + MENUITEM "Ruaj\tCtrl+S", CMD_SAVE + MENUITEM "Ruaj si...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "&Print\tCtrl+P", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM "Konfigurim Faqes...", CMD_PAGE_SETUP + MENUITEM "&Printo\tCtrl+P", CMD_PRINT + MENUITEM "Konfigurim P&rinter...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT + MENUITEM "Dil", CMD_EXIT END - POPUP "&Edit" + POPUP "Modifiko" BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM "Rikthe\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM "Prej\tCtrl+X", CMD_CUT + MENUITEM "Kopjo\tCtrl+C", CMD_COPY + MENUITEM "Ngjit\tCtrl+V", CMD_PASTE + MENUITEM "Fshi\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", CMD_SEARCH - MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM "Gjej...\tCtrl+F", CMD_SEARCH + MENUITEM "Gjej Tjetren\tF3", CMD_SEARCH_NEXT + MENUITEM "Ndrysho\tCtrl+H", CMD_REPLACE + MENUITEM "Shko tek...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + MENUITEM "Perzgjidh te gjith\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Ora/Data\tF5", CMD_TIME_DATE END POPUP "F&ormat" BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "Paketo linjat e gjata", CMD_WRAP MENUITEM "&Font...", CMD_FONT END - POPUP "&View" + POPUP "&VÃ«zhgo" BEGIN MENUITEM "Status&bar", CMD_STATUSBAR END - POPUP "&Help" + POPUP "NdihmÃ«" BEGIN - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM "pÃ«rmbajtje", CMD_HELP_CONTENTS + MENUITEM "Kerko...", CMD_HELP_SEARCH + MENUITEM "NdihmÃ« pÃ«r ndihmÃ«", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT + MENUITEM "Rreth", CMD_ABOUT MENUITEM "Inf&o", CMD_ABOUT_WINE END END @@ -74,24 +78,24 @@ DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Konfigurim Faqe" BEGIN - LTEXT "&Header:", 0x140, 10, 07, 40, 15 + LTEXT "KokÃ«:", 0x140, 10, 07, 40, 15 EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP - LTEXT "&Footer:", 0x142, 10, 24, 40, 15 + LTEXT "KÃ«mbÃ«:", 0x142, 10, 24, 40, 15 EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP - GROUPBOX "&Margins:", 0x144, 10, 43, 160, 45 - LTEXT "&Left:", 0x145, 20, 55, 30, 10, WS_CHILD + GROUPBOX "KufijtÃ«:", 0x144, 10, 43, 160, 45 + LTEXT "Majtas:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD + LTEXT "Lart:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "&Right:", 0x14B, 100, 55, 30, 10, WS_CHILD + LTEXT "Djathtas:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "&Bottom:", 0x14E, 100, 73, 30, 10, WS_CHILD + LTEXT "PoshtÃ«:", 0x14E, 100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP - PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15, WS_TABSTOP + PUSHBUTTON "Anulo", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP + PUSHBUTTON "NdihmÃ«", IDHELP, 180, 39, 40, 15, WS_TABSTOP END /* Dialog 'Encoding' */ @@ -110,58 +114,58 @@ DIALOG_GOTO DIALOGEX 0, 0, 165, 50 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Goto line" +CAPTION "Shko tek linja" BEGIN EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + LTEXT "Numri i linjes:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" +CAPTION "Rreth ReactOS Notepad" FONT 8, "MS Shell Dlg" BEGIN CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP + CONTROL " ", -1, "Statik", 0x50000000, 8, 48, 272, 11 + DEFPUSHBUTTON "Mbyll", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL END STRINGTABLE BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + STRING_LICENSE "Ky program Ã«shtÃ« software falas, ju mund ta shpÃ«rndani dhe/ose modifikoni sipas kushteve tÃ« GNU General Public License tÃ« publikuar nga Fondacioni Free Software;. Sipas versionit 2 tÃ« LiÃ§encÃ«s, ose (sipas opinionit tuaj) Ã§do versioni tÃ« mÃ«vonshÃ«m\r\n\r\nKy program shpÃ«rndahet me shpresÃ«n qÃ« do t'ju jetÃ« i dobishÃ«m, por PA ASNJÃ GARANCI; madje edhe pa garancinÃ« preÃ§ize tÃ« SHITJES apo PÃRDORIMIT PÃR NJÃ QÃLLIM TÃ CAKTUAR. Shiko LiÃ§encÃ«n Publike tÃ« PÃ«rgjithshme GNU pÃ«r hollÃ«si\r\n\r\nJu duhet tÃ« keni marrÃ« njÃ« kopje tÃ« LiÃ§ensÃ«s sÃ« PÃ«rgjithshme Publike GNU sÃ« bashku me kÃ«tÃ« program, nÃ«se jo, shkruani nÃ« Free Software Foundation, Inc, 51 Franklin Rruga , kati i pestÃ«, Boston, MA 02110-1301 USA." END STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Faqe &s" /* FIXME */ STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ STRING_NOTEPAD "Notepad" STRING_ERROR "ERROR" - STRING_WARNING "WARNING" - STRING_INFO "Information" - STRING_UNTITLED "Untitled" - STRING_ALL_FILES "All files (*.*)" - STRING_TEXT_FILES_TXT "Text files (*.txt)" - STRING_TOOLARGE "File '%s' is too large for notepad.\n \ -Please use a different editor." - STRING_NOTEXT "You didn't enter any text. \ -\nPlease type something and try again" - STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" - STRING_NOTSAVED "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" - STRING_NOTFOUND "'%s' can not be found." - STRING_OUT_OF_MEMORY "Not enough memory to complete this \ -task. \nClose one or more applications to increase the amount of \nfree memory." - STRING_CANNOTFIND "Cannot find '%s'" + STRING_WARNING "KUJDES" + STRING_INFO "Info" + STRING_UNTITLED "Pa emer" + STRING_ALL_FILES "Te gjith dokumentat (*.*)" + STRING_TEXT_FILES_TXT "Dokumenta teksti (*.txt)" + STRING_TOOLARGE "Dokumenti '%s' Ã«shtÃ« shume i madh pÃ«r notepad.\n \ +Ju lutem perdorni editor tjeter." + STRING_NOTEXT "Nuk keni shkruaj ndonje tekst. \ +\nJu lutem shkruani diqka dhe provoni perseri" + STRING_DOESNOTEXIST "Dokumenti '%s'\nnuk ekziston\n\n \ +Doni te krijoni nje dokument te ri ?" + STRING_NOTSAVED "Dokumenti '%s'\nÃ«shtÃ« modifikuar\n\n \ +Doni te ruani ndryshimet ?" + STRING_NOTFOUND "'%s' nuk gjindet." + STRING_OUT_OF_MEMORY "Nuk ka memorie te mjaftueshme per te kompletuar kete \ +detyrÃ«. \nMbyll nje ose me shume programe te rrisesh shumÃ«n e \nmemories." + STRING_CANNOTFIND "Nuk u gjet '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" @@ -169,5 +173,5 @@ STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" - STRING_LINE_COLUMN "Line %d, column %d" + STRING_LINE_COLUMN "Linje %d, kolonÃ« %d" END Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Thu Dec 19 19:11:37 2013 @@ -124,6 +124,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif

10 years, 9 months

[jgardou] 61296: [SHELL32] - Fix a GCC warning.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Dec 19 18:52:57 2013 New Revision: 61296 URL: http://svn.reactos.org/svn/reactos?rev=61296&view=rev Log: [SHELL32] - Fix a GCC warning. Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] Thu Dec 19 18:52:57 2013 @@ -206,7 +206,7 @@ * * Gets the icon for a filetype, szName can be NULL, in which case the default icon is loaded */ -static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx) +static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx) { DWORD dwType; WCHAR sTemp[MAX_PATH]; @@ -230,7 +230,7 @@ return FALSE; } -static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx) +static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPCSTR szName, DWORD len, int* picon_idx) { DWORD dwType; char sTemp[MAX_PATH]; @@ -254,7 +254,7 @@ return FALSE; } -BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx) +BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx) { static const WCHAR swDefaultIcon[] = L"\\DefaultIcon"; HKEY hKey; @@ -280,7 +280,7 @@ return ret; } -BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx) +BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* picon_idx) { HKEY hKey; char sTemp[MAX_PATH]; Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Thu Dec 19 18:52:57 2013 @@ -224,9 +224,11 @@ riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); - WCHAR* iconname = NULL; + const WCHAR* iconname = NULL; if (_ILIsBitBucket(pSimplePidl)) { + static const WCHAR szFull[] = {'F','u','l','l',0}; + static const WCHAR szEmpty[] = {'E','m','p','t','y',0}; IEnumIDList *EnumIDList = NULL; CoInitialize(NULL); @@ -244,9 +246,9 @@ if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK) { CoTaskMemFree(pidl); - iconname = L"Full"; + iconname = szFull; } else { - iconname = L"Empty"; + iconname = szEmpty; } if (psfDesktop) Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Thu Dec 19 18:52:57 2013 @@ -46,13 +46,13 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot); BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); -BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx); +BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx); BOOL HCR_GetIconFromGUIDW(REFIID riid, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx); BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len); /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot); -BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR sName, DWORD len, int* picon_idx); +BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR sName, DWORD len, int* picon_idx); BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len); BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes);

10 years, 9 months

[akhaldi] 61295: [FASTFAT] * Do not include debug.h into the main header.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 19 16:20:28 2013 New Revision: 61295 URL: http://svn.reactos.org/svn/reactos?rev=61295&view=rev Log: [FASTFAT] * Do not include debug.h into the main header. Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/dir.c trunk/reactos/drivers/filesystems/fastfat/direntry.c trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/ea.c trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/drivers/filesystems/fastfat/fat.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/flush.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/iface.c trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/drivers/filesystems/fastfat/pnp.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/shutdown.c trunk/reactos/drivers/filesystems/fastfat/string.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -8,8 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -8,8 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -25,8 +25,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -10,8 +10,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -10,8 +10,10 @@ /* ------------------------------------------------------- INCLUDES */ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> ULONG vfatDirEntryGetFirstCluster( Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -8,8 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* * update an existing FAT entry Modified: trunk/reactos/drivers/filesystems/fastfat/ea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/ea.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/ea.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -25,8 +25,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -6,8 +6,10 @@ * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) */ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> static FAST_IO_CHECK_IF_POSSIBLE VfatFastIoCheckIfPossible; Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -10,12 +10,14 @@ /* ------------------------------------------------------- INCLUDES */ +#include "vfat.h" + +#define NDEBUG +#include <debug.h> + #ifdef __GNUC__ #include <wctype.h> /* towlower prototype */ #endif - -#define NDEBUG -#include "vfat.h" /* -------------------------------------------------------- DEFINES */ Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -10,8 +10,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -8,8 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -25,8 +25,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/iface.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -25,8 +25,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* GLOBALS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* * Uncomment to enable strict verification of cluster/offset pair Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -8,8 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/string.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/string.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -1,7 +1,6 @@ #include <ntifs.h> #include <bugcodes.h> #include <ntdddisk.h> -#include <debug.h> #include <dos.h> #define USE_ROS_CC_AND_FS Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Thu Dec 19 16:20:28 2013 @@ -9,8 +9,10 @@ /* INCLUDES *****************************************************************/ +#include "vfat.h" + #define NDEBUG -#include "vfat.h" +#include <debug.h> /* FUNCTIONS ****************************************************************/

10 years, 9 months

[akhaldi] 61294: [SHELL32] * Initial go at the Drag & Drop support. Work is still ongoing here. Brought to you by Huw Campbell. CORE-3760

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 19 12:51:32 2013 New Revision: 61294 URL: http://svn.reactos.org/svn/reactos?rev=61294&view=rev Log: [SHELL32] * Initial go at the Drag & Drop support. Work is still ongoing here. Brought to you by Huw Campbell. CORE-3760 Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -58,8 +58,7 @@ UINT BuildBackgroundContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); - HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi); - HRESULT DoPasteLink(LPCMINVOKECOMMANDINFO lpcmi); + HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoDelete(LPCMINVOKECOMMANDINFO lpcmi); @@ -947,7 +946,7 @@ HRESULT CDefaultContextMenu::DoPaste( - LPCMINVOKECOMMANDINFO lpcmi) + LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink) { HRESULT hr; @@ -956,56 +955,12 @@ if (FAILED(hr)) return hr; - STGMEDIUM medium; - FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - hr = pda->GetData(&formatetc, &medium); + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfTarget = NULL; + + hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) return hr; - - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the data into pidl */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - CComPtr<IShellFolder> psfDesktop; - CComPtr<IShellFolder> psfFrom = NULL; - CComPtr<IShellFolder> psfTarget = NULL; - CComPtr<ISFHelper> psfhlpdst; - CComPtr<ISFHelper> psfhlpsrc; - bool bCopy = TRUE; - - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - goto cleanup; - - /* Find source folder */ - if (_ILIsDesktop(pidl)) - { - /* use desktop shellfolder */ - psfFrom = psfDesktop; - } - else - { - hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); - if (FAILED(hr)) - { - ERR("no IShellFolder\n"); - goto cleanup; - } - } /* Find target folder */ if (m_Dcm.cidl) @@ -1043,350 +998,117 @@ if (FAILED(hr)) { ERR("no IShellFolder\n"); - goto cleanup; - } - - /* get source and destination shellfolder */ - hr = psfTarget->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlpdst)); - if (FAILED(hr)) - { - ERR("no IID_ISFHelper for destination\n"); - goto cleanup; - } - - hr = psfFrom->QueryInterface(IID_PPV_ARG(ISFHelper, &psfhlpsrc)); - if (FAILED(hr)) - { - ERR("no IID_ISFHelper for source\n"); - goto cleanup; + return hr; } FORMATETC formatetc2; STGMEDIUM medium2; InitFormatEtc(formatetc2, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECT), TYMED_HGLOBAL); - - if SUCCEEDED(pda->GetData(&formatetc2, &medium2)) + + DWORD dwKey= 0; + + if (SUCCEEDED(pda->GetData(&formatetc2, &medium2))) { DWORD * pdwFlag = (DWORD*)GlobalLock(medium2.hGlobal); if (pdwFlag) { - TRACE("Current drop effect flag %i\n", *pdwFlag); - if (*pdwFlag & DROPEFFECT_MOVE) - bCopy = FALSE; + if (*pdwFlag == DROPEFFECT_COPY) + dwKey = MK_CONTROL; + else + dwKey = MK_SHIFT; + } + else { + ERR("No drop effect obtained"); } GlobalUnlock(medium2.hGlobal); } - hr = psfhlpdst->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); - + if (bLink) + { + dwKey = MK_CONTROL|MK_SHIFT; + } + + IDropTarget *pdrop; + hr = psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pdrop)); + if (FAILED(hr)) + { + ERR("Error getting IDropTarget interface\n"); + return hr; + } + + SHSimulateDrop(pdrop, pda, dwKey, NULL, NULL); NotifyShellViewWindow(lpcmi, TRUE); - -cleanup: - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); TRACE("CP result %x\n", hr); return S_OK; } -BOOL -GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) -{ - WCHAR wszLink[40]; - - if (!bShortcut) - { - if (!LoadStringW(shell32_hInstance, IDS_LNK_FILE, wszLink, _countof(wszLink))) - wszLink[0] = L'\0'; - } - - if (!bShortcut) - swprintf(pwszTarget, L"%s%s%s", wszLink, pwszBasePath, pwszExt); - else - swprintf(pwszTarget, L"%s%s", pwszBasePath, pwszExt); - - for (UINT i = 2; PathFileExistsW(pwszTarget); ++i) - { - if (!bShortcut) - swprintf(pwszTarget, L"%s%s (%u)%s", wszLink, pwszBasePath, i, pwszExt); - else - swprintf(pwszTarget, L"%s (%u)%s", pwszBasePath, i, pwszExt); - } - - return TRUE; -} - -HRESULT -CDefaultContextMenu::DoPasteLink( +HRESULT +CDefaultContextMenu::DoOpenOrExplore( LPCMINVOKECOMMANDINFO lpcmi) { + UNIMPLEMENTED; + return E_FAIL; +} + +HRESULT +CDefaultContextMenu::DoCreateLink( + LPCMINVOKECOMMANDINFO lpcmi) +{ + LPDATAOBJECT pDataObj; + IDropTarget *pDT; HRESULT hr; - WCHAR wszPath[MAX_PATH]; - WCHAR wszTarget[MAX_PATH]; - - CComPtr<IDataObject> pda; - hr = OleGetClipboard(&pda); + CComPtr<IPersistFolder2> ppf2 = NULL; + LPITEMIDLIST pidl; + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfTarget = NULL; + + hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) return hr; - STGMEDIUM medium; - FORMATETC formatetc; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - hr = pda->GetData(&formatetc, &medium); - if (FAILED(hr)) - return hr; - - /* lock the handle */ - LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the clipboard data into pidl (pointer to id list) */ - LPITEMIDLIST pidl; - LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - if (!apidl) - { - ReleaseStgMedium(&medium); - return E_FAIL; - } - - CComPtr<IShellFolder> psfDesktop; - CComPtr<IPersistFolder2> ppf2 = NULL; - CComPtr<IShellFolder> psfFrom = NULL; - - /* Grab the desktop shell folder */ - hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - { - ERR("SHGetDesktopFolder failed\n"); - goto cleanup; - } - - /* Find source folder, this is where the clipboard data was copied from */ - if (_ILIsDesktop(pidl)) - { - /* use desktop shell folder */ - psfFrom = psfDesktop; - } - else - { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); - if (FAILED(hr)) - { - ERR("no IShellFolder\n"); - goto cleanup; - } - } - - /* Find the target path, where we will be saving the new links (where the user right clicked) */ - STRRET strFile; - WCHAR wszTargetPath[MAX_PATH]; - - LPITEMIDLIST targetpidl; - - hr = m_Dcm.psf->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); - if (SUCCEEDED(hr)) - { - hr = ppf2->GetCurFolder(&targetpidl); - if (SUCCEEDED(hr)) - { - hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); - ILFree(targetpidl); - if (SUCCEEDED(hr)) - { - hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); - } - } - } - - if (FAILED(hr)) - { - ERR("Error obtaining target path"); - goto cleanup; - } - TRACE("target path = %s", debugstr_w(wszTargetPath)); - - /* We need to create a link for each pidl in the copied items, so step through the pidls from the clipboard */ - for (UINT i = 0; i < lpcida->cidl; i++) - { - //Find out which file we're copying - STRRET strFile; - hr = psfFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strFile); - if (FAILED(hr)) - { - ERR("Error source obtaining path"); - break; - } - - hr = StrRetToBufW(&strFile, apidl[i], wszPath, _countof(wszPath)); - if (FAILED(hr)) - { - ERR("Error putting source path into buffer"); - break; - } - TRACE("source path = %s", debugstr_w(wszPath)); - - // Creating a buffer to hold the combined path - WCHAR buffer_1[MAX_PATH] = L""; - WCHAR *lpStr1; - lpStr1 = buffer_1; - - LPWSTR pwszFileName = PathFindFileNameW(wszPath); - LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, wszTargetPath, pwszFileName); - CComPtr<IPersistFile> ppf; - - //Check to see if it's already a link. - if (!wcsicmp(pwszExt, L".lnk")) - { - //It's a link so, we create a new one which copies the old. - if(!GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) - { - ERR("Error getting unique file name"); - hr = E_FAIL; - break; - } - hr = IShellLink_ConstructFromFile(NULL, IID_IPersistFile, ILCombine(pidl, apidl[i]), (LPVOID*)&ppf); - if (FAILED(hr)) { - ERR("Error constructing link from file"); - break; - } - - hr = ppf->Save(wszTarget, FALSE); - } - else - { - //It's not a link, so build a new link using the creator class and fill it in. - //Create a file name for the link - if (!GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) - { - ERR("Error creating unique file name"); - hr = E_FAIL; - break; - } - - CComPtr<IShellLinkW> pLink; - hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); - if (FAILED(hr)) { - ERR("Error instantiating IShellLinkW"); - break; - } - - WCHAR szDirPath[MAX_PATH], *pwszFile; - GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); - if (pwszFile) pwszFile[0] = 0; - - hr = pLink->SetPath(wszPath); - if(FAILED(hr)) - break; - - hr = pLink->SetWorkingDirectory(szDirPath); - if(FAILED(hr)) - break; - - hr = pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); - if(FAILED(hr)) - break; - - hr = ppf->Save(wszTarget, TRUE); - } - } - - NotifyShellViewWindow(lpcmi, TRUE); - -cleanup: - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - - return hr; -} - -HRESULT -CDefaultContextMenu::DoOpenOrExplore( - LPCMINVOKECOMMANDINFO lpcmi) -{ - UNIMPLEMENTED; - return E_FAIL; -} - -HRESULT -CDefaultContextMenu::DoCreateLink( - LPCMINVOKECOMMANDINFO lpcmi) -{ - WCHAR wszTarget[MAX_PATH]; - IPersistFile *ppf; - HRESULT hr; - STRRET strFile; - - hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile); - if (FAILED(hr)) - { - ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); - return hr; - } - - WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, _countof(wszPath)); - if (FAILED(hr)) - return hr; - - LPWSTR pwszExt = PathFindExtensionW(wszPath); - - if (!wcsicmp(pwszExt, L".lnk")) - { - if (!GetUniqueFileName(wszPath, pwszExt, wszTarget, TRUE)) - return E_FAIL; - - IPersistFolder2 *ppf2 = NULL; - LPITEMIDLIST pidl; + if (SUCCEEDED(hr = SHCreateDataObject(m_Dcm.pidlFolder, m_Dcm.cidl, m_Dcm.apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj)))) + { hr = m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&pidl); - ppf2->Release(); if (SUCCEEDED(hr)) - hr = IShellLink_ConstructFromFile(NULL, IID_IPersistFile, ILCombine(pidl, m_Dcm.apidl[0]), (LPVOID*)&ppf); - } - if (FAILED(hr)) - return hr; - - hr = ppf->Save(wszTarget, FALSE); - ppf->Release(); - NotifyShellViewWindow(lpcmi, TRUE); + { + if (_ILIsDesktop(pidl)) + { + /* use desktop shellfolder */ + psfTarget = psfDesktop; + } + else + { + /* retrieve target desktop folder */ + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfTarget)); + } + TRACE("psfTarget %x %p, Desktop %u\n", hr, psfTarget.p, _ILIsDesktop(pidl)); + ILFree(pidl); + } + } + + } + + if (FAILED(hr)) + { + ERR("no IShellFolder\n"); return hr; } - else - { - if (!GetUniqueFileName(wszPath, L".lnk", wszTarget, TRUE)) - return E_FAIL; - - IShellLinkW *pLink; - hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); - if (hr != S_OK) - return hr; - - WCHAR szDirPath[MAX_PATH], *pwszFile; - GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); - if (pwszFile) pwszFile[0] = 0; - - if (SUCCEEDED(pLink->SetPath(wszPath)) && - SUCCEEDED(pLink->SetWorkingDirectory(szDirPath))) - { - if (SUCCEEDED(pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)))) - { - hr = ppf->Save(wszTarget, TRUE); - ppf->Release(); - } - } - pLink->Release(); - NotifyShellViewWindow(lpcmi, TRUE); + + psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pDT)); + if (FAILED(hr)) + { + ERR("no IDropTarget Interface\n"); return hr; } + DWORD link = DROPEFFECT_LINK; + SHSimulateDrop(pDT, pDataObj, MK_CONTROL|MK_SHIFT, NULL, NULL); + NotifyShellViewWindow(lpcmi, TRUE); + + return S_OK; } HRESULT @@ -1843,9 +1565,9 @@ case FCIDM_SHVIEW_REFRESH: return NotifyShellViewWindow(lpcmi, FALSE); case FCIDM_SHVIEW_INSERT: - return DoPaste(lpcmi); + return DoPaste(lpcmi, FALSE); case FCIDM_SHVIEW_INSERTLINK: - return DoPasteLink(lpcmi); + return DoPaste(lpcmi, TRUE); case FCIDM_SHVIEW_OPEN: case FCIDM_SHVIEW_EXPLORE: return DoOpenOrExplore(lpcmi); Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -254,10 +254,21 @@ return ret ? S_OK : E_FAIL; } +void CDesktopFolder::SF_RegisterClipFmt() +{ + TRACE ("(%p)\n", this); + + if (!cfShellIDList) + cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); +} + CDesktopFolder::CDesktopFolder() { pidlRoot = NULL; sPathTarget = NULL; + cfShellIDList = 0; + SF_RegisterClipFmt(); + fAcceptFmt = FALSE; } CDesktopFolder::~CDesktopFolder() @@ -512,8 +523,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - WARN ("IDropTarget not implemented\n"); - hr = E_NOTIMPL; + hr = this->QueryInterface (IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, IID_IContextMenu)) { @@ -638,9 +648,12 @@ SHFree (pidl); hr = S_OK; } - else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) - { - hr = this->QueryInterface (IID_IDropTarget, (LPVOID *)&pObj); + else if (IsEqualIID (riid, IID_IDropTarget)) + { + /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ + if (cidl == 1 && SUCCEEDED(this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj))); + else + hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) @@ -1326,3 +1339,137 @@ } return E_FAIL; } + +/**************************************************************************** + * IDropTarget implementation + * + * This should allow two somewhat separate things, copying files to the users directory, + * as well as allowing icons to be moved anywhere and updating the registry to save. + * + * The first thing I think is best done using fs.cpp to prevent WET code. So we'll simulate + * a drop to the user's home directory. The second will look at the pointer location and + * set sensible places for the icons to live. + * + */ +BOOL CDesktopFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) +{ + /* TODO Windows does different drop effects if dragging across drives. + i.e., it will copy instead of move if the directories are on different disks. */ + + DWORD dwEffect = DROPEFFECT_MOVE; + + *pdwEffect = DROPEFFECT_NONE; + + if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ + *pdwEffect = KeyStateToDropEffect (dwKeyState); + + if (*pdwEffect == DROPEFFECT_NONE) + *pdwEffect = dwEffect; + + /* ... matches the desired effect ? */ + if (dwEffect & *pdwEffect) { + return TRUE; + } + } + return FALSE; +} + +HRESULT WINAPI CDesktopFolder::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + FORMATETC fmt; + + InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); + fAcceptFmt = (S_OK == pDataObject->QueryGetData(&fmt)) ? + TRUE : FALSE; + + QueryDrop(dwKeyState, pdwEffect); + return S_OK; +} + +HRESULT WINAPI CDesktopFolder::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + + if (!pdwEffect) + return E_INVALIDARG; + + QueryDrop(dwKeyState, pdwEffect); + + return S_OK; +} + +HRESULT WINAPI CDesktopFolder::DragLeave() +{ + TRACE("(%p)\n", this); + fAcceptFmt = FALSE; + return S_OK; +} + +HRESULT WINAPI CDesktopFolder::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p) object dropped desktop\n", this); + + STGMEDIUM medium; + FORMATETC formatetc; + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + HRESULT hr = pDataObject->GetData(&formatetc, &medium); + if (FAILED(hr)) + return hr; + + /* lock the handle */ + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the clipboard data into pidl (pointer to id list) */ + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (!apidl) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* We only want to really move files around if they don't already + come from the desktop, or we're linking or copying */ + if ((!_ILIsDesktop(pidl)) || (dwKeyState & MK_CONTROL)) + { + LPITEMIDLIST pidl = NULL; + + WCHAR szPath[MAX_PATH]; + LPWSTR pathPtr; + + /* build a complete path to create a simple pidl */ + lstrcpynW(szPath, sPathTarget, MAX_PATH); + pathPtr = PathAddBackslashW(szPath); + //hr = _ILCreateFromPathW(szPath, &pidl); + hr = this->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); + + if (SUCCEEDED(hr)) + { + IDropTarget *pDT; + hr = this->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*)&pDT); + CoTaskMemFree(pidl); + if (SUCCEEDED(hr)) + SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); + else + ERR("Error Binding"); + } + else + ERR("Error creating from %s\n", debugstr_w(szPath)); + } + + /* Todo, rewrite the registry such that the icons are well placed. + Blocked by no bags implementation. */ + + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return hr; +} Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -28,15 +28,19 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, + public IDropTarget, public ISFHelper { private: /* both paths are parsible from the desktop */ LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + + UINT cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL fAcceptFmt; /* flag for pending Drop */ + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + void SF_RegisterClipFmt(); -// CComPtr<IShellFolder2> fDesktopFolder; -// CComPtr<IShellFolder2> fCommonDesktopFolder; public: CDesktopFolder(); ~CDesktopFolder(); @@ -72,6 +76,13 @@ // *** IPersistFolder2 methods *** virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + + // *** ISFHelper methods *** virtual HRESULT WINAPI GetUniqueName(LPWSTR pwszName, UINT uLen); virtual HRESULT WINAPI AddFolder(HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST *ppidlOut); @@ -89,6 +100,7 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) COM_INTERFACE_ENTRY_IID(IID_ISFHelper, ISFHelper) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -79,6 +79,7 @@ sPathTarget = NULL; pidlRoot = NULL; cfShellIDList = 0; + SF_RegisterClipFmt(); fAcceptFmt = FALSE; } @@ -498,10 +499,15 @@ SHFree (pidl); hr = S_OK; } - else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) - hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + else if (IsEqualIID (riid, IID_IDropTarget)) + { + /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ + if (cidl == 1 && SUCCEEDED(hr = this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj))); + else + hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + } else if ((IsEqualIID(riid, IID_IShellLinkW) || - IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) + IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); @@ -571,9 +577,9 @@ { /*FIXME: MSDN also mentions SHGDN_FOREDITING which is not yet handled. */ if (!(dwFlags & SHGDN_FORPARSING) && - ((dwFlags & SHGDN_INFOLDER) || (dwFlags == SHGDN_NORMAL))) { - if (SHELL_FS_HideExtension(szPath) && szPath[0] != '.') - PathRemoveExtensionW(szPath); + ((dwFlags & SHGDN_INFOLDER) || (dwFlags == SHGDN_NORMAL))) { + if (SHELL_FS_HideExtension(szPath) && szPath[0] != '.') + PathRemoveExtensionW(szPath); } } @@ -808,7 +814,7 @@ { case 0: /* name */ hr = GetDisplayNameOf (pidl, - SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); + SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; case 1: /* size */ _ILGetFileSize(pidl, psd->str.cStr, MAX_PATH); @@ -931,7 +937,7 @@ LoadStringW(shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, _countof(wszTempText)); LoadStringW(shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, - _countof(wszCaption)); + _countof(wszCaption)); swprintf(wszText, wszTempText, wszNewDir); MessageBoxW(hwnd, wszText, wszCaption, MB_OK | MB_ICONEXCLAMATION); } @@ -1314,17 +1320,50 @@ return E_NOTIMPL; } +BOOL +CFSFolder::GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +{ + WCHAR wszLink[40]; + + if (!bShortcut) + { + if (!LoadStringW(shell32_hInstance, IDS_LNK_FILE, wszLink, _countof(wszLink))) + wszLink[0] = L'\0'; + } + + if (!bShortcut) + swprintf(pwszTarget, L"%s%s%s", wszLink, pwszBasePath, pwszExt); + else + swprintf(pwszTarget, L"%s%s", pwszBasePath, pwszExt); + + for (UINT i = 2; PathFileExistsW(pwszTarget); ++i) + { + if (!bShortcut) + swprintf(pwszTarget, L"%s%s (%u)%s", wszLink, pwszBasePath, i, pwszExt); + else + swprintf(pwszTarget, L"%s (%u)%s", pwszBasePath, i, pwszExt); + } + + return TRUE; +} + /**************************************************************************** - * ISFDropTarget implementation + * IDropTarget implementation */ BOOL CFSFolder::QueryDrop(DWORD dwKeyState, LPDWORD pdwEffect) { - DWORD dwEffect = *pdwEffect; + /* TODO Windows does different drop effects if dragging across drives. + i.e., it will copy instead of move if the directories are on different disks. */ + + DWORD dwEffect = DROPEFFECT_MOVE; *pdwEffect = DROPEFFECT_NONE; if (fAcceptFmt) { /* Does our interpretation of the keystate ... */ *pdwEffect = KeyStateToDropEffect (dwKeyState); + + if (*pdwEffect == DROPEFFECT_NONE) + *pdwEffect = dwEffect; /* ... matches the desired effect ? */ if (dwEffect & *pdwEffect) { @@ -1338,16 +1377,18 @@ DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { FORMATETC fmt; - TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); - InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL); - fAcceptFmt = (S_OK == pDataObject->QueryGetData(&fmt)) ? - TRUE : FALSE; + fAcceptFmt = (S_OK == pDataObject->QueryGetData(&fmt)) ? TRUE : FALSE; + + if (!fAcceptFmt) + { + InitFormatEtc(fmt, RegisterClipboardFormatW(CFSTR_FILEDESCRIPTOR), TYMED_HGLOBAL); + fAcceptFmt = (S_OK == pDataObject->QueryGetData(&fmt)) ? TRUE : FALSE; + } QueryDrop(dwKeyState, pdwEffect); - return S_OK; } @@ -1376,7 +1417,219 @@ HRESULT WINAPI CFSFolder::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { - FIXME("(%p) object dropped\n", this); - - return E_NOTIMPL; -} + TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect); + + HRESULT hr; + bool bCopy = TRUE; + bool bLinking = FALSE; + + STGMEDIUM medium; + FORMATETC formatetc; + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + hr = pDataObject->GetData(&formatetc, &medium); + if (FAILED(hr)) + return hr; + + /* lock the handle */ + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the data into pidl */ + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (!apidl) + { + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* Figure out what drop operation we're doing */ + if (pdwEffect) + { + TRACE("Current drop effect flag %i\n", *pdwEffect); + if (*pdwEffect & DROPEFFECT_MOVE) + bCopy = FALSE; + if (*pdwEffect & DROPEFFECT_LINK) + bLinking = TRUE; + } + + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfFrom = NULL; + CComPtr<IShellFolder> psfTarget = NULL; + + hr = this->QueryInterface(IID_PPV_ARG(IShellFolder, &psfTarget)); + if (FAILED(hr)) + { + ERR("psfTarget setting failed\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* Grab the desktop shell folder */ + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + { + ERR("SHGetDesktopFolder failed\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* Find source folder, this is where the clipboard data was copied from */ + if (_ILIsDesktop(pidl)) + { + /* use desktop shell folder */ + psfFrom = psfDesktop; + } + else + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + if (FAILED(hr)) + { + ERR("no IShellFolder\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + } + + if (bLinking) + { + CComPtr<IPersistFolder2> ppf2 = NULL; + STRRET strFile; + WCHAR wszTargetPath[MAX_PATH]; + LPITEMIDLIST targetpidl; + WCHAR wszPath[MAX_PATH]; + WCHAR wszTarget[MAX_PATH]; + + hr = this->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + if (SUCCEEDED(hr)) + { + hr = ppf2->GetCurFolder(&targetpidl); + if (SUCCEEDED(hr)) + { + hr = psfDesktop->GetDisplayNameOf(targetpidl, SHGDN_FORPARSING, &strFile); + ILFree(targetpidl); + if (SUCCEEDED(hr)) + { + hr = StrRetToBufW(&strFile, NULL, wszTargetPath, _countof(wszTargetPath)); + } + } + } + + if (FAILED(hr)) + { + ERR("Error obtaining target path"); + + } + TRACE("target path = %s", debugstr_w(wszTargetPath)); + + /* We need to create a link for each pidl in the copied items, so step through the pidls from the clipboard */ + for (UINT i = 0; i < lpcida->cidl; i++) + { + //Find out which file we're copying + STRRET strFile; + hr = psfFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strFile); + if (FAILED(hr)) + { + ERR("Error source obtaining path"); + break; + } + + hr = StrRetToBufW(&strFile, apidl[i], wszPath, _countof(wszPath)); + if (FAILED(hr)) + { + ERR("Error putting source path into buffer"); + break; + } + TRACE("source path = %s", debugstr_w(wszPath)); + + // Creating a buffer to hold the combined path + WCHAR buffer_1[MAX_PATH] = L""; + WCHAR *lpStr1; + lpStr1 = buffer_1; + + LPWSTR pwszFileName = PathFindFileNameW(wszPath); + LPWSTR pwszExt = PathFindExtensionW(wszPath); + LPWSTR placementPath = PathCombineW(lpStr1, wszTargetPath, pwszFileName); + CComPtr<IPersistFile> ppf; + + //Check to see if it's already a link. + if (!wcsicmp(pwszExt, L".lnk")) + { + //It's a link so, we create a new one which copies the old. + if(!GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) + { + ERR("Error getting unique file name"); + hr = E_FAIL; + break; + } + hr = IShellLink_ConstructFromFile(NULL, IID_IPersistFile, ILCombine(pidl, apidl[i]), (LPVOID*)&ppf); + if (FAILED(hr)) { + ERR("Error constructing link from file"); + break; + } + + hr = ppf->Save(wszTarget, FALSE); + } + else + { + //It's not a link, so build a new link using the creator class and fill it in. + //Create a file name for the link + if (!GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) + { + ERR("Error creating unique file name"); + hr = E_FAIL; + break; + } + + CComPtr<IShellLinkW> pLink; + hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); + if (FAILED(hr)) { + ERR("Error instantiating IShellLinkW"); + break; + } + + WCHAR szDirPath[MAX_PATH], *pwszFile; + GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); + if (pwszFile) pwszFile[0] = 0; + + hr = pLink->SetPath(wszPath); + if(FAILED(hr)) + break; + + hr = pLink->SetWorkingDirectory(szDirPath); + if(FAILED(hr)) + break; + + hr = pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); + if(FAILED(hr)) + break; + + hr = ppf->Save(wszTarget, TRUE); + } + } + } + else + { + hr = this->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl, bCopy); + } + + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + + return hr; +} + +DWORD CFSFolder::_DoDropThreadProc(LPVOID lpParameter) { + return 0; +} Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -43,11 +43,15 @@ UINT cfShellIDList; /* clipboardformat for IDropTarget */ BOOL fAcceptFmt; /* flag for pending Drop */ + BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + void SF_RegisterClipFmt(); + BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + DWORD _DoDropThreadProc(LPVOID lpParameter); + public: CFSFolder(); ~CFSFolder(); - void SF_RegisterClipFmt(); - BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + // IShellFolder virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); @@ -107,6 +111,7 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder3, IPersistFolder3) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) COM_INTERFACE_ENTRY_IID(IID_ISFHelper, ISFHelper) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -94,8 +94,9 @@ #define KeyStateToDropEffect(kst)\ ((((kst)&(MK_CONTROL|MK_SHIFT))==(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_LINK :\ - (((kst)&(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_COPY :\ - DROPEFFECT_MOVE)) + (((kst)&(MK_CONTROL)) ? DROPEFFECT_COPY :\ + (((kst)&(MK_SHIFT)) ? DROPEFFECT_MOVE :\ + DROPEFFECT_NONE))) HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Dec 19 12:51:32 2013 @@ -937,7 +937,10 @@ } if (SUCCEEDED(QueryInterface(IID_PPV_ARG(IDropTarget, &pdt)))) - RegisterDragDrop(m_hWnd, pdt); + { + if (FAILED(RegisterDragDrop(m_hWnd, pdt))) + ERR("Registering Drag Drop Failed"); + } /* register for receiving notifications */ m_pSFParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); @@ -1688,6 +1691,8 @@ { DWORD dwEffect2; DoDragDrop(pda, pds, dwEffect, &dwEffect2); + if ((dwEffect2 & DROPEFFECT_MOVE) == DROPEFFECT_MOVE) + this->Refresh(); } pda->Release(); } @@ -2482,10 +2487,11 @@ { m_pCurDropTarget->Drop(pDataObject, grfKeyState, pt, pdwEffect); m_pCurDropTarget.Release(); - } - - m_pCurDataObject.Release(); - m_iDragOverItem = 0; + + this->Refresh(); + } + + m_pCurDataObject.Release(); m_iDragOverItem = 0; return S_OK; }

10 years, 9 months

[akhaldi] 61293: [SHELL32] * Make the Recycle Bin icon reflect whether the bin is empty or not. Brought to you by Huw Campbell. CORE-3712 #resolve #comment Committed in r61293. Cheers ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 19 11:44:30 2013 New Revision: 61293 URL: http://svn.reactos.org/svn/reactos?rev=61293&view=rev Log: [SHELL32] * Make the Recycle Bin icon reflect whether the bin is empty or not. Brought to you by Huw Campbell. CORE-3712 #resolve #comment Committed in r61293. Cheers ;) Modified: trunk/reactos/dll/win32/shell32/classes.cpp trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/classes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.cpp [iso-8859-1] Thu Dec 19 11:44:30 2013 @@ -188,11 +188,6 @@ return ret; } -/*************************************************************************************** -* HCR_GetDefaultIcon [internal] -* -* Gets the icon for a filetype -*/ static BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey) { WCHAR xriid[50]; @@ -206,13 +201,18 @@ return (RegOpenKeyExW(HKEY_CLASSES_ROOT, xriid, 0, KEY_READ, hkey) == ERROR_SUCCESS); } -static BOOL HCR_RegGetDefaultIconW(HKEY hkey, LPWSTR szDest, DWORD len, int* picon_idx) +/*************************************************************************************** +* HCR_GetIcon [internal] +* +* Gets the icon for a filetype, szName can be NULL, in which case the default icon is loaded +*/ +static BOOL HCR_RegGetIconW(HKEY hkey, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx) { DWORD dwType; WCHAR sTemp[MAX_PATH]; WCHAR sNum[7]; - if (!RegQueryValueExW(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExW(hkey, szName, 0, &dwType, (LPBYTE)szDest, &len)) { if (dwType == REG_EXPAND_SZ) { @@ -230,13 +230,13 @@ return FALSE; } -static BOOL HCR_RegGetDefaultIconA(HKEY hkey, LPSTR szDest, DWORD len, int* picon_idx) +static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx) { DWORD dwType; char sTemp[MAX_PATH]; char sNum[5]; - if (!RegQueryValueExA(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) + if (!RegQueryValueExA(hkey, szName, 0, &dwType, (LPBYTE)szDest, &len)) { if (dwType == REG_EXPAND_SZ) { @@ -254,7 +254,7 @@ return FALSE; } -BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, int* picon_idx) +BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx) { static const WCHAR swDefaultIcon[] = L"\\DefaultIcon"; HKEY hKey; @@ -268,7 +268,7 @@ if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, sTemp, 0, KEY_READ, &hKey)) { - ret = HCR_RegGetDefaultIconW(hKey, szDest, len, picon_idx); + ret = HCR_RegGetIconW(hKey, szDest, szName, len, picon_idx); RegCloseKey(hKey); } @@ -280,7 +280,7 @@ return ret; } -BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx) +BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR szName, DWORD len, int* picon_idx) { HKEY hKey; char sTemp[MAX_PATH]; @@ -292,21 +292,21 @@ if (!RegOpenKeyExA(HKEY_CLASSES_ROOT, sTemp, 0, KEY_READ, &hKey)) { - ret = HCR_RegGetDefaultIconA(hKey, szDest, len, picon_idx); + ret = HCR_RegGetIconA(hKey, szDest, szName, len, picon_idx); RegCloseKey(hKey); } TRACE("-- %s %i\n", szDest, *picon_idx); return ret; } -BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, int* picon_idx) +BOOL HCR_GetIconFromGUIDW(REFIID riid, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx) { HKEY hKey; BOOL ret = FALSE; if (HCR_RegOpenClassIDKey(riid, &hKey)) { - ret = HCR_RegGetDefaultIconW(hKey, szDest, len, picon_idx); + ret = HCR_RegGetIconW(hKey, szDest, szName, len, picon_idx); RegCloseKey(hKey); } TRACE("-- %s %i\n", debugstr_w(szDest), *picon_idx); Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Thu Dec 19 11:44:30 2013 @@ -48,13 +48,13 @@ } else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetDefaultIconW(wszCLSIDValue, szIconFile, cchMax, &icon_idx)) + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) { *piIndex = icon_idx; } else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetDefaultIconW(wszCLSIDValue, szIconFile, cchMax, &icon_idx)) + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) { *piIndex = icon_idx; } @@ -62,7 +62,7 @@ { static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; - if (!HCR_GetDefaultIconW(folder, szIconFile, cchMax, &icon_idx)) + if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) { lstrcpynW(szIconFile, swShell32Name, cchMax); icon_idx = -IDI_SHELL_FOLDER; @@ -224,7 +224,40 @@ riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); - if (HCR_GetDefaultIconW(xriid, wTemp, MAX_PATH, &icon_idx)) + WCHAR* iconname = NULL; + if (_ILIsBitBucket(pSimplePidl)) + { + IEnumIDList *EnumIDList = NULL; + CoInitialize(NULL); + + IShellFolder2 *psfRecycleBin = NULL; + IShellFolder *psfDesktop = NULL; + hr = SHGetDesktopFolder(&psfDesktop); + + if (SUCCEEDED(hr)) + hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_IShellFolder2, (void**) &psfRecycleBin); + if (SUCCEEDED(hr)) + hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList); + + ULONG itemcount; + LPITEMIDLIST pidl = NULL; + if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK) + { + CoTaskMemFree(pidl); + iconname = L"Full"; + } else { + iconname = L"Empty"; + } + + if (psfDesktop) + psfDesktop->Release(); + if (psfRecycleBin) + psfRecycleBin->Release(); + if (EnumIDList) + EnumIDList->Release(); + } + + if (HCR_GetIconW(xriid, wTemp, iconname, MAX_PATH, &icon_idx)) { initIcon->SetNormalIcon(wTemp, icon_idx); } @@ -274,7 +307,7 @@ } else { - if (HCR_GetDefaultIconW(drive, wTemp, MAX_PATH, &icon_idx)) + if (HCR_GetIconW(drive, wTemp, NULL, MAX_PATH, &icon_idx)) initIcon->SetNormalIcon(wTemp, icon_idx); else initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_DRIVE); @@ -324,7 +357,7 @@ else if (_ILGetExtension(pSimplePidl, sTemp, MAX_PATH)) { if (HCR_MapTypeToValueA(sTemp, sTemp, MAX_PATH, TRUE) - && HCR_GetDefaultIconA(sTemp, sTemp, MAX_PATH, &icon_idx)) + && HCR_GetIconA(sTemp, sTemp, NULL, MAX_PATH, &icon_idx)) { if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ { Modified: trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs [iso-8859-1] Thu Dec 19 11:44:30 2013 @@ -6,14 +6,14 @@ { val 'InfoTip' = e '@%%SystemRoot%%\system32\SHELL32.dll,-22915' val 'IntroText' = e '@%%SystemRoot%%\system32\SHELL32.dll,-31748' - val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-8964' - DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,31' - { - val Empty = e '%%SystemRoot%%\System32\shell32.dll,31' - val Full = e '%%SystemRoot%%\System32\shell32.dll,32' - } - InprocServer32 = s '%MODULE%' - { + val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-8964' + DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,31' + { + val Empty = e '%%SystemRoot%%\System32\shell32.dll,30' + val Full = e '%%SystemRoot%%\System32\shell32.dll,31' + } + InprocServer32 = s '%MODULE%' + { val ThreadingModel = s 'Apartment' } 'ShellFolder' Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Thu Dec 19 11:44:30 2013 @@ -584,7 +584,7 @@ TRACE("szExt=%s\n", debugstr_w(szExt)); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && - HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &psfi->iIcon)) + HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &psfi->iIcon)) { if (lstrcmpW(p1W, sTemp)) wcscpy(psfi->szDisplayName, sTemp); @@ -640,7 +640,7 @@ szExt = PathFindExtensionW(sTemp); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && - HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx)) + HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &icon_idx)) { if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ wcscpy(sTemp, szFullPath); Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Thu Dec 19 11:44:30 2013 @@ -46,17 +46,16 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot); BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); -BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, int* picon_idx); -BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, int* picon_idx); +BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx); +BOOL HCR_GetIconFromGUIDW(REFIID riid, LPWSTR szDest, LPWSTR szName, DWORD len, int* picon_idx); BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len); /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot); -BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx); +BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPSTR sName, DWORD len, int* picon_idx); BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len); BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes); - INT_PTR CALLBACK AboutDlgProc(HWND,UINT,WPARAM,LPARAM); DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len); DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len);

10 years, 9 months

[jimtabor] 61292: [User32] - Fixes TC 8 and GetWindowText issues. See CORE-7447 and CORE-7695.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 19 03:35:27 2013 New Revision: 61292 URL: http://svn.reactos.org/svn/reactos?rev=61292&view=rev Log: [User32] - Fixes TC 8 and GetWindowText issues. See CORE-7447 and CORE-7695. Modified: trunk/reactos/win32ss/user/user32/windows/message.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Dec 19 03:35:27 2013 @@ -565,6 +565,9 @@ return TRUE; } +// +// Ansi to Unicode -> callout +// static BOOL FASTCALL MsgiAnsiToUnicodeMessage(HWND hwnd, LPMSG UnicodeMsg, LPMSG AnsiMsg) { @@ -579,7 +582,8 @@ { LPWSTR Buffer; if (!AnsiMsg->lParam) break; - Buffer = RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam * sizeof(WCHAR)); + Buffer = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, AnsiMsg->wParam * sizeof(WCHAR)); + //ERR("WM_GETTEXT A2U Size %d\n",AnsiMsg->wParam); if (!Buffer) return FALSE; UnicodeMsg->lParam = (LPARAM)Buffer; break; @@ -587,32 +591,32 @@ case LB_GETTEXT: { - DWORD Size; + DWORD Size = 1024 * sizeof(WCHAR); if (!AnsiMsg->lParam || !listbox_has_strings( AnsiMsg->hwnd )) break; - Size = SendMessageW( AnsiMsg->hwnd, LB_GETTEXTLEN, AnsiMsg->wParam, 0 ); + /*Size = SendMessageW( AnsiMsg->hwnd, LB_GETTEXTLEN, AnsiMsg->wParam, 0 ); if (Size == LB_ERR) { ERR("LB_GETTEXT LB_ERR\n"); Size = sizeof(ULONG_PTR); } - Size = (Size + 1) * sizeof(WCHAR); - UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + Size = (Size + 1) * sizeof(WCHAR);*/ + UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); if (!UnicodeMsg->lParam) return FALSE; break; } case CB_GETLBTEXT: { - DWORD Size; + DWORD Size = 1024 * sizeof(WCHAR); if (!AnsiMsg->lParam || !combobox_has_strings( AnsiMsg->hwnd )) break; - Size = SendMessageW( AnsiMsg->hwnd, CB_GETLBTEXTLEN, AnsiMsg->wParam, 0 ); + /*Size = SendMessageW( AnsiMsg->hwnd, CB_GETLBTEXTLEN, AnsiMsg->wParam, 0 ); if (Size == LB_ERR) { ERR("CB_GETTEXT LB_ERR\n"); Size = sizeof(ULONG_PTR); } - Size = (Size + 1) * sizeof(WCHAR); - UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + Size = (Size + 1) * sizeof(WCHAR);*/ + UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); if (!UnicodeMsg->lParam) return FALSE; break; } @@ -747,6 +751,10 @@ case WM_IME_CHAR: UnicodeMsg->wParam = map_wparam_AtoW( AnsiMsg->message, AnsiMsg->wParam ); break; + case EM_GETLINE: + ERR("FIXME EM_GETLINE A2U\n"); + break; + } return TRUE; @@ -861,7 +869,7 @@ } /* - * Unicode Result to Ansi Result + * callout return -> Unicode Result to Ansi Result */ static BOOL FASTCALL MsgiAnsiToUnicodeReply(LPMSG UnicodeMsg, LPMSG AnsiMsg, LRESULT *Result) @@ -877,9 +885,10 @@ if (UnicodeMsg->wParam) { DWORD len = 0; - if (*Result) RtlUnicodeToMultiByteN( AnsiBuffer, UnicodeMsg->wParam - 1, &len, Buffer, strlenW(Buffer) * sizeof(WCHAR) ); + if (*Result) RtlUnicodeToMultiByteN( AnsiBuffer, UnicodeMsg->wParam - 1, &len, Buffer, strlenW(Buffer) * sizeof(WCHAR)); AnsiBuffer[len] = 0; *Result = len; + //ERR("WM_GETTEXT U2A Result %d Size %d\n",*Result,AnsiMsg->wParam); } break; } @@ -912,6 +921,9 @@ return TRUE; } +// +// Unicode to Ansi callout -> +// static BOOL FASTCALL MsgiUnicodeToAnsiMessage(HWND hwnd, LPMSG AnsiMsg, LPMSG UnicodeMsg) { @@ -979,40 +991,40 @@ { if (!UnicodeMsg->lParam) break; /* Ansi string might contain MBCS chars so we need 2 * the number of chars */ - AnsiMsg->wParam = UnicodeMsg->wParam * 2; - AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam); + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, UnicodeMsg->wParam * 2); + //ERR("WM_GETTEXT U2A Size %d\n",AnsiMsg->wParam); if (!AnsiMsg->lParam) return FALSE; break; } case LB_GETTEXT: { - DWORD Size; + DWORD Size = 1024; if (!UnicodeMsg->lParam || !listbox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageA( UnicodeMsg->hwnd, LB_GETTEXTLEN, UnicodeMsg->wParam, 0 ); + /*Size = SendMessageA( UnicodeMsg->hwnd, LB_GETTEXTLEN, UnicodeMsg->wParam, 0 ); if (Size == LB_ERR) { ERR("LB_GETTEXT LB_ERR\n"); Size = sizeof(ULONG_PTR); } - Size = (Size + 1) * sizeof(WCHAR); - AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + Size = (Size + 1) * sizeof(WCHAR);*/ + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); if (!AnsiMsg->lParam) return FALSE; break; } case CB_GETLBTEXT: { - DWORD Size; + DWORD Size = 1024; if (!UnicodeMsg->lParam || !combobox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageA( UnicodeMsg->hwnd, CB_GETLBTEXTLEN, UnicodeMsg->wParam, 0 ); + /*Size = SendMessageA( UnicodeMsg->hwnd, CB_GETLBTEXTLEN, UnicodeMsg->wParam, 0 ); if (Size == LB_ERR) { ERR("CB_GETTEXT LB_ERR\n"); Size = sizeof(ULONG_PTR); } - Size = (Size + 1) * sizeof(WCHAR); - AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + Size = (Size + 1) * sizeof(WCHAR);*/ + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); if (!AnsiMsg->lParam) return FALSE; break; } @@ -1168,6 +1180,9 @@ case WM_IME_CHAR: AnsiMsg->wParam = map_wparam_char_WtoA(UnicodeMsg->wParam,2); break; + case EM_GETLINE: + ERR("FIXME EM_GETLINE U2A\n"); + break; } return TRUE; } @@ -1273,7 +1288,7 @@ } /* - * Ansi Result to Unicode Result + * callout return -> Ansi Result to Unicode Result */ static BOOL FASTCALL MsgiUnicodeToAnsiReply(LPMSG AnsiMsg, LPMSG UnicodeMsg, LRESULT *Result) @@ -1286,13 +1301,14 @@ case WM_GETTEXT: case WM_ASKCBFORMATNAME: { - DWORD len = AnsiMsg->wParam * 2; + DWORD len = AnsiMsg->wParam;// * 2; if (len) { if (*Result) { RtlMultiByteToUnicodeN( UBuffer, AnsiMsg->wParam*sizeof(WCHAR), &len, Buffer, strlen(Buffer)+1 ); *Result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ + //ERR("WM_GETTEXT U2A Result %d Size %d\n",*Result,AnsiMsg->wParam); } UBuffer[*Result] = 0; } @@ -2377,7 +2393,8 @@ if ( Window != NULL && Window->head.pti == ti && - !IsThreadHooked(GetWin32ClientInfo()) && // This is why HOOKs are bad! They slow the system down! + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure @@ -2440,7 +2457,8 @@ if ( Window != NULL && Window->head.pti == ti && - !IsThreadHooked(GetWin32ClientInfo()) && // This is why HOOKs are bad! They slow the system down! + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Thu Dec 19 03:35:27 2013 @@ -1171,7 +1171,7 @@ pwi->cxWindowBorders = Size.cx; pwi->cyWindowBorders = Size.cy; pwi->dwWindowStatus = 0; - if (pWnd->state & WNDS_ACTIVEFRAME) + if (pWnd->state & WNDS_ACTIVEFRAME || (GetActiveWindow() == hWnd)) pwi->dwWindowStatus = WS_ACTIVECAPTION; pwi->atomWindowType = (pCls ? pCls->atomClassName : 0 ); @@ -1237,7 +1237,6 @@ return GetModuleFileNameW( Wnd->hModule, lpszFileName, cchFileNameMax ); } - /* * @implemented */ @@ -1264,7 +1263,6 @@ return TRUE; } - /* * @implemented */ @@ -1272,68 +1270,34 @@ GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount) { PWND Wnd; - PCWSTR Buffer; INT Length = 0; - if (lpString == NULL) + if (lpString == NULL || nMaxCount == 0) return 0; Wnd = ValidateHwnd(hWnd); if (!Wnd) return 0; - _SEH2_TRY - { - if (!TestWindowProcess( Wnd)) - { - if (nMaxCount > 0) - { - /* do not send WM_GETTEXT messages to other processes */ - Length = Wnd->strName.Length / sizeof(WCHAR); - if (Length != 0) - { - Buffer = DesktopPtrToUser(Wnd->strName.Buffer); - if (Buffer != NULL) - { - if (!WideCharToMultiByte(CP_ACP, - 0, - Buffer, - Length + 1, - lpString, - nMaxCount, - NULL, - NULL)) - { - lpString[nMaxCount - 1] = '\0'; - } - } - else - { - Length = 0; - lpString[0] = '\0'; - } - } - else - lpString[0] = '\0'; - } - - Wnd = NULL; /* Don't send a message */ - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - lpString[0] = '\0'; - Length = 0; - Wnd = NULL; /* Don't send a message */ - } - _SEH2_END; - - if (Wnd != NULL) - Length = SendMessageA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); - + lpString[0] = '\0'; + + if (!TestWindowProcess( Wnd)) + { + _SEH2_TRY + { + Length = DefWindowProcA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Length = 0; + } + _SEH2_END; + } + else + Length = SendMessageA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + //ERR("GWTA Len %d : %s\n",Length,lpString); return Length; } - /* * @implemented @@ -1344,7 +1308,6 @@ return(SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0)); } - /* * @implemented */ @@ -1354,7 +1317,6 @@ return(SendMessageW(hWnd, WM_GETTEXTLENGTH, 0, 0)); } - /* * @implemented */ @@ -1362,57 +1324,32 @@ GetWindowTextW(HWND hWnd, LPWSTR lpString, int nMaxCount) { PWND Wnd; - PCWSTR Buffer; INT Length = 0; - if (lpString == NULL) + if (lpString == NULL || nMaxCount == 0) return 0; Wnd = ValidateHwnd(hWnd); if (!Wnd) return 0; - _SEH2_TRY - { - if (!TestWindowProcess( Wnd)) - { - if (nMaxCount > 0) - { - /* do not send WM_GETTEXT messages to other processes */ - Length = Wnd->strName.Length / sizeof(WCHAR); - if (Length != 0) - { - Buffer = DesktopPtrToUser(Wnd->strName.Buffer); - if (Buffer != NULL) - { - RtlCopyMemory(lpString, - Buffer, - (Length + 1) * sizeof(WCHAR)); - } - else - { - Length = 0; - lpString[0] = '\0'; - } - } - else - lpString[0] = '\0'; - } - - Wnd = NULL; /* Don't send a message */ - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - lpString[0] = '\0'; - Length = 0; - Wnd = NULL; /* Don't send a message */ - } - _SEH2_END; - - if (Wnd != NULL) - Length = SendMessageW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); - + lpString[0] = L'\0'; + + if (!TestWindowProcess( Wnd)) + { + _SEH2_TRY + { + Length = DefWindowProcW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Length = 0; + } + _SEH2_END; + } + else + Length = SendMessageW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + //ERR("GWTW Len %d : %S\n",Length,lpString); return Length; }

10 years, 9 months

[ekohl] 61291: [ADVAPI32] ConvertStringSidToSidW: Fix a wrong entry in the SID table.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 18 22:27:11 2013 New Revision: 61291 URL: http://svn.reactos.org/svn/reactos?rev=61291&view=rev Log: [ADVAPI32] ConvertStringSidToSidW: Fix a wrong entry in the SID table. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Wed Dec 18 22:27:11 2013 @@ -1827,7 +1827,7 @@ { SDDL_DOMAIN_GUESTS, WinAccountDomainGuestsSid /* FIXME: DOMAIN_GROUP_RID_GUESTS */ }, { SDDL_DOMAIN_USERS, WinAccountDomainUsersSid /* FIXME: DOMAIN_GROUP_RID_USERS */ }, { SDDL_ENTERPRISE_ADMINS, WinAccountEnterpriseAdminsSid /* FIXME: DOMAIN_GROUP_RID_ENTERPRISE_ADMINS */ }, - { SDDL_ENTERPRISE_DOMAIN_CONTROLLERS, WinLogonIdsSid /* FIXME: SECURITY_SERVER_LOGON_RID */ }, + { SDDL_ENTERPRISE_DOMAIN_CONTROLLERS, WinEnterpriseControllersSid }, { SDDL_EVERYONE, WinWorldSid }, { SDDL_GROUP_POLICY_ADMINS, WinAccountPolicyAdminsSid /* FIXME: DOMAIN_GROUP_RID_POLICY_ADMINS */ }, { SDDL_INTERACTIVE, WinInteractiveSid },

10 years, 9 months

[hbelusca] 61290: [NTVDM] Hackplement BOP_CMD function 0x08: "Launch external command". Still WIP. Explanation: Launching a command from command.com starts (under certain conditions not implemented...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 18 01:16:54 2013 New Revision: 61290 URL: http://svn.reactos.org/svn/reactos?rev=61290&view=rev Log: [NTVDM] Hackplement BOP_CMD function 0x08: "Launch external command". Still WIP. Explanation: Launching a command from command.com starts (under certain conditions not implemented there) "cmd.exe /c <the_command>" See https://groups.google.com/forum/#!topic/microsoft.public.win2000.cmdprompt.… and http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection1231211… subsection "CMD.EXE and COMMAND.COM": "Be aware that a command shell is not an MS-DOS command prompt, even though it shares the same icon. The Windows NT command shell is a full 32-bit Windows NT console application that resides in the CMD.EXE executable file. The MS-DOS command prompt is a 16-bit DOS application that resides in the COMMAND.COM executable file. Because COMMAND.COM is a 16-bit DOS executable, Windows NT executes this shell within a Windows NT virtual DOS machine (VDM). COMMAND.COM is supplied primarily for compatibility with MS-DOS. [...] This behavior reveals a quite subtle feature of Windows NT that is very important. The 16-bit MS-DOS shell (COMMAND.COM) that ships with Windows NT is specially designed for Windows NT. When a command is entered for execution by this shell, it does not actually execute it. Instead, it packages the command text and sends it to a 32-bit CMD.EXE command shell for execution. Because all commands are actually executed by CMD.EXE (the Windows NT command shell), the 16-bit shell inherits all the features and facilities of the full Windows NT shell." Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Wed Dec 18 01:16:54 2013 @@ -1422,7 +1422,77 @@ BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); setIP(getIP() + 1); - DPRINT1("Unknown DOS CMD Interpreter BOP Function: 0x%02X\n", FuncNum); + switch (FuncNum) + { + case 0x08: // Launch external command + { +#define CMDLINE_LENGTH 1024 + + BOOL Result; + DWORD dwExitCode; + + LPSTR Command = (LPSTR)SEG_OFF_TO_PTR(getDS(), getSI()); + CHAR CommandLine[CMDLINE_LENGTH] = ""; + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DPRINT1("CMD Run Command '%s'\n", Command); + + Command[strlen(Command)-1] = 0; + + strcpy(CommandLine, "cmd.exe /c "); + strcat(CommandLine, Command); + + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); + + StartupInfo.cb = sizeof(StartupInfo); + + DosPrintCharacter('\n'); + + Result = CreateProcessA(NULL, + CommandLine, + NULL, + NULL, + TRUE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (Result) + { + DPRINT1("Command '%s' launched successfully\n"); + + /* Wait for process termination */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + + /* Get the exit code */ + GetExitCodeProcess(ProcessInformation.hProcess, &dwExitCode); + + /* Close handles */ + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); + } + else + { + DPRINT1("Failed when launched command '%s'\n"); + dwExitCode = GetLastError(); + } + + DosPrintCharacter('\n'); + + setAL((UCHAR)dwExitCode); + + break; + } + + default: + { + DPRINT1("Unknown DOS CMD Interpreter BOP Function: 0x%02X\n", FuncNum); + // setCF(1); // Disable, otherwise we enter an infinite loop + break; + } + } } VOID WINAPI DosInt20h(LPWORD Stack)

10 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
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 December 2013