Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[pschweitzer] 54718: [KERNEL32] Colon end SEH lines to allow proper static analysis

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 20 21:01:30 2011 New Revision: 54718 URL: http://svn.reactos.org/svn/reactos?rev=54718&view=rev Log: [KERNEL32] Colon end SEH lines to allow proper static analysis Modified: trunk/reactos/dll/win32/kernel32/client/loader.c Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Tue Dec 20 21:01:30 2011 @@ -356,7 +356,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - } _SEH2_END + } _SEH2_END; done:

13 years

[pschweitzer] 54717: [WIN32K] Colon end SEH lines to allow proper static analysis

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 20 21:00:19 2011 New Revision: 54717 URL: http://svn.reactos.org/svn/reactos?rev=54717&view=rev Log: [WIN32K] Colon end SEH lines to allow proper static analysis Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Tue Dec 20 21:00:19 2011 @@ -847,7 +847,7 @@ if (fmt == CF_TEXT) { PCLIP pLocaleEl; - + pLocaleEl = IntIsFormatAvailable(pWinStaObj, CF_LOCALE); if (pLocaleEl && !IS_DATA_DELAYED(pLocaleEl)) pgcd->hLocale = pLocaleEl->hData; @@ -855,7 +855,7 @@ else if (fmt == CF_BITMAP) { PCLIP pPaletteEl; - + pPaletteEl = IntIsFormatAvailable(pWinStaObj, CF_PALETTE); if (pPaletteEl && !IS_DATA_DELAYED(pPaletteEl)) pgcd->hPalette = pPaletteEl->hData; @@ -867,7 +867,7 @@ { SetLastNtError(_SEH2_GetExceptionCode()); } - _SEH2_END + _SEH2_END; cleanup: if(pWinStaObj)

13 years

[pschweitzer] 54716: [STLPORT] Fix misplaced #endif Brought to you by aggro from cppcheck team

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 20 20:52:09 2011 New Revision: 54716 URL: http://svn.reactos.org/svn/reactos?rev=54716&view=rev Log: [STLPORT] Fix misplaced #endif Brought to you by aggro from cppcheck team Modified: trunk/reactos/lib/3rdparty/stlport/test/unit/strstream_test.cpp Modified: trunk/reactos/lib/3rdparty/stlport/test/unit/strstream_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/stlport/test/… ============================================================================== --- trunk/reactos/lib/3rdparty/stlport/test/unit/strstream_test.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/stlport/test/unit/strstream_test.cpp [iso-8859-1] Tue Dec 20 20:52:09 2011 @@ -43,7 +43,7 @@ is >> rval; CPPUNIT_ASSERT( rval == -652208307 ); } +# endif } -# endif #endif

13 years

[rharabien] 54715: [SHELL32] - Fix SHCreateSessionKey [EXPLORER] - Don't run startup applications if StartupHasBeenRun key exists. If it doesn't, create new key. - Make startup code readable See is...

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Dec 20 20:47:48 2011 New Revision: 54715 URL: http://svn.reactos.org/svn/reactos?rev=54715&view=rev Log: [SHELL32] - Fix SHCreateSessionKey [EXPLORER] - Don't run startup applications if StartupHasBeenRun key exists. If it doesn't, create new key. - Make startup code readable See issue #1801 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c trunk/reactos/dll/win32/shell32/shellreg.cpp 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] Tue Dec 20 20:47:48 2011 @@ -55,6 +55,8 @@ #include <stdio.h> #include <windows.h> #include <ctype.h> + +EXTERN_C HRESULT WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey); /** * Performs the rename operations dictated in %SystemRoot%\Wininit.ini. @@ -429,6 +431,8 @@ /* First, set the current directory to SystemRoot */ TCHAR gen_path[MAX_PATH]; DWORD res; + HKEY hSessionKey, hKey; + HRESULT hr; res = GetWindowsDirectory(gen_path, sizeof(gen_path)); @@ -440,13 +444,6 @@ return 100; } - if (res>=sizeof(gen_path)) - { - printf("Windows path too long (%ld)\n", res); - - return 100; - } - if (!SetCurrentDirectory(gen_path)) { wprintf(L"Cannot set the dir to %s (%ld)\n", gen_path, GetLastError()); @@ -454,42 +451,64 @@ return 100; } - if (argc>1) + hr = SHCreateSessionKey(KEY_WRITE, &hSessionKey); + if (SUCCEEDED(hr)) + { + LONG Error; + DWORD dwDisp; + + Error = RegCreateKeyEx(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); + RegCloseKey(hSessionKey); + if (Error == ERROR_SUCCESS) + { + RegCloseKey(hKey); + if (dwDisp == REG_OPENED_EXISTING_KEY) + { + /* Startup programs has already been run */ + return 0; + } + } + } + + if (argc > 1) { switch(argv[1][0]) { case 'r': /* Restart */ - ops=SETUP; + ops = SETUP; break; case 's': /* Full start */ - ops=SESSION_START; + ops = SESSION_START; break; default: - ops=DEFAULT; + ops = DEFAULT; break; } } else - ops=DEFAULT; + ops = DEFAULT; /* do not run certain items in Safe Mode */ if(GetSystemMetrics(SM_CLEANBOOT)) ops.startup = FALSE; /* Perform the ops by order, stopping if one fails, skipping if necessary */ /* Shachar: Sorry for the perl syntax */ - res=(ops.ntonly || !ops.preboot || wininit()) && - (ops.w9xonly || !ops.preboot || pendingRename()) && - (ops.ntonly || !ops.prelogin || - ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE)) && - (ops.ntonly || !ops.prelogin || !ops.startup || - ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE)) && - (!ops.postlogin || - ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE)) && - (!ops.postlogin || !ops.startup || - ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE)) && - (!ops.postlogin || !ops.startup || - ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE)); + res = TRUE; + if (res && !ops.ntonly && ops.preboot) + res = wininit(); + if (res && !ops.w9xonly && ops.preboot) + res = pendingRename(); + if (res && !ops.ntonly && ops.prelogin) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE); + if (res && !ops.ntonly && ops.prelogin && ops.startup) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE); + if (res && ops.postlogin) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE); + if (res && ops.postlogin && ops.startup) + res = ProcessRunKeys(HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], FALSE, FALSE); printf("Operation done\n"); - return res?0:101; + return res ? 0 : 101; } Modified: trunk/reactos/dll/win32/shell32/shellreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellreg… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellreg.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellreg.cpp [iso-8859-1] Tue Dec 20 20:47:48 2011 @@ -149,10 +149,11 @@ WINAPI SHCreateSessionKey(REGSAM samDesired, PHKEY phKey) { - static HKEY hSessionKey = NULL; HRESULT hr = S_OK; + static WCHAR wszSessionKey[256]; + LONG Error; - if (!hSessionKey) + if (!wszSessionKey[0]) // FIXME: Critical Section { HANDLE hToken; @@ -163,16 +164,9 @@ if (GetTokenInformation(hToken, TokenStatistics, &Stats, sizeof(Stats), &ReturnLength)) { - WCHAR wszBuf[256]; - LONG Error; - - swprintf(wszBuf, + swprintf(wszSessionKey, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SessionInfo\\%08x%08x", Stats.AuthenticationId.HighPart, Stats.AuthenticationId.LowPart); - - Error = RegCreateKeyExW(HKEY_LOCAL_MACHINE, wszBuf, 0, NULL, REG_OPTION_VOLATILE, samDesired, NULL, &hSessionKey, NULL); - if (Error != ERROR_SUCCESS) - hr = HRESULT_FROM_WIN32(Error); } else hr = HRESULT_FROM_WIN32(GetLastError()); @@ -183,6 +177,13 @@ hr = HRESULT_FROM_WIN32(GetLastError()); } - *phKey = hSessionKey; + if(SUCCEEDED(hr)) + { + Error = RegCreateKeyExW(HKEY_LOCAL_MACHINE, wszSessionKey, 0, NULL, + REG_OPTION_VOLATILE, samDesired, NULL, phKey, NULL); + if (Error != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(Error); + } + return hr; }

13 years

[rharabien] 54714: [SHELL32] - Implement SHCreateSessionKey - Formatting of shlview.cpp

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Dec 20 19:56:46 2011 New Revision: 54714 URL: http://svn.reactos.org/svn/reactos?rev=54714&view=rev Log: [SHELL32] - Implement SHCreateSessionKey - Formatting of shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shellreg.cpp trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/dll/win32/shell32/stubs.cpp Modified: trunk/reactos/dll/win32/shell32/shellreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellreg… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellreg.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellreg.cpp [iso-8859-1] Tue Dec 20 19:56:46 2011 @@ -135,10 +135,54 @@ /************************************************************************* * SHRegCloseKey [SHELL32.505] NT 4.0 - * */ EXTERN_C HRESULT WINAPI SHRegCloseKey (HKEY hkey) { TRACE("%p\n",hkey); return RegCloseKey( hkey ); } + +/************************************************************************* + * SHCreateSessionKey [SHELL32.723] + */ +EXTERN_C HRESULT +WINAPI +SHCreateSessionKey(REGSAM samDesired, PHKEY phKey) +{ + static HKEY hSessionKey = NULL; + HRESULT hr = S_OK; + + if (!hSessionKey) + { + HANDLE hToken; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken)) + { + TOKEN_STATISTICS Stats; + DWORD ReturnLength; + + if (GetTokenInformation(hToken, TokenStatistics, &Stats, sizeof(Stats), &ReturnLength)) + { + WCHAR wszBuf[256]; + LONG Error; + + swprintf(wszBuf, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\SessionInfo\\%08x%08x", + Stats.AuthenticationId.HighPart, Stats.AuthenticationId.LowPart); + + Error = RegCreateKeyExW(HKEY_LOCAL_MACHINE, wszBuf, 0, NULL, REG_OPTION_VOLATILE, samDesired, NULL, &hSessionKey, NULL); + if (Error != ERROR_SUCCESS) + hr = HRESULT_FROM_WIN32(Error); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + CloseHandle(hToken); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + } + + *phKey = hSessionKey; + return hr; +} 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] Tue Dec 20 19:56:46 2011 @@ -54,13 +54,13 @@ #undef SV_CLASS_NAME -static const WCHAR SV_CLASS_NAME[] = {'S','H','E','L','L','D','L','L','_','D','e','f','V','i','e','w',0}; +static const WCHAR SV_CLASS_NAME[] = {'S', 'H', 'E', 'L', 'L', 'D', 'L', 'L', '_', 'D', 'e', 'f', 'V', 'i', 'e', 'w', 0}; typedef struct { BOOL bIsAscending; INT nHeaderID; INT nLastHeaderID; -}LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; +} LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; #define SHV_CHANGE_NOTIFY WM_USER + 0x1111 @@ -75,199 +75,200 @@ public IViewObject, public IServiceProvider { -private: - CComPtr<IShellFolder> pSFParent; - CComPtr<IShellFolder2> pSF2Parent; - CComPtr<IShellBrowser> pShellBrowser; - CComPtr<ICommDlgBrowser> pCommDlgBrowser; - HWND hWndList; /* ListView control */ - HWND hWndParent; - FOLDERSETTINGS FolderSettings; - HMENU hMenu; - UINT uState; - UINT cidl; - LPITEMIDLIST *apidl; - LISTVIEW_SORT_INFO ListViewSortInfo; - ULONG hNotify; /* change notification handle */ - HANDLE hAccel; - DWORD dwAspects; - DWORD dwAdvf; - CComPtr<IAdviseSink> pAdvSink; - // for drag and drop - CComPtr<IDropTarget> pCurDropTarget; /* The sub-item, which is currently dragged over */ - CComPtr<IDataObject> pCurDataObject; /* The dragged data-object */ - LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ - UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ - POINT ptLastMousePos; /* Mouse position at last DragOver call */ - // - CComPtr<IContextMenu2> pCM; -public: - CDefView(); - ~CDefView(); - HRESULT WINAPI Initialize(IShellFolder *shellFolder); - HRESULT IncludeObject(LPCITEMIDLIST pidl); - HRESULT OnDefaultCommand(); - HRESULT OnStateChange(UINT uFlags); - void CheckToolbar(); - void SetStyle(DWORD dwAdd, DWORD dwRemove); - BOOL CreateList(); - BOOL InitList(); - static INT CALLBACK CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData); - static INT CALLBACK ListViewCompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData); - int LV_FindItemByPidl(LPCITEMIDLIST pidl); - BOOLEAN LV_AddItem(LPCITEMIDLIST pidl); - BOOLEAN LV_DeleteItem(LPCITEMIDLIST pidl); - BOOLEAN LV_RenameItem(LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew); - static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg); - HRESULT FillList(); - HMENU BuildFileMenu(); - void MergeFileMenu(HMENU hSubMenu); - void MergeViewMenu(HMENU hSubMenu); - UINT GetSelections(); - HRESULT OpenSelectedItems(); - void OnDeactivate(); - void DoActivate(UINT uState); - HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IShellView methods *** - virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator(MSG *pmsg); - virtual HRESULT STDMETHODCALLTYPE EnableModeless(BOOL fEnable); - virtual HRESULT STDMETHODCALLTYPE UIActivate(UINT uState); - virtual HRESULT STDMETHODCALLTYPE Refresh(); - virtual HRESULT STDMETHODCALLTYPE CreateViewWindow(IShellView *psvPrevious, LPCFOLDERSETTINGS pfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd); - virtual HRESULT STDMETHODCALLTYPE DestroyViewWindow(); - virtual HRESULT STDMETHODCALLTYPE GetCurrentInfo(LPFOLDERSETTINGS pfs); - virtual HRESULT STDMETHODCALLTYPE AddPropertySheetPages(DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam); - virtual HRESULT STDMETHODCALLTYPE SaveViewState(); - virtual HRESULT STDMETHODCALLTYPE SelectItem(LPCITEMIDLIST pidlItem, SVSIF uFlags); - virtual HRESULT STDMETHODCALLTYPE GetItemObject(UINT uItem, REFIID riid, void **ppv); - - // *** IFolderView methods *** - virtual HRESULT STDMETHODCALLTYPE GetCurrentViewMode(UINT *pViewMode); - virtual HRESULT STDMETHODCALLTYPE SetCurrentViewMode(UINT ViewMode); - virtual HRESULT STDMETHODCALLTYPE GetFolder(REFIID riid, void **ppv); - virtual HRESULT STDMETHODCALLTYPE Item(int iItemIndex, LPITEMIDLIST *ppidl); - virtual HRESULT STDMETHODCALLTYPE ItemCount(UINT uFlags, int *pcItems); - virtual HRESULT STDMETHODCALLTYPE Items(UINT uFlags, REFIID riid, void **ppv); - virtual HRESULT STDMETHODCALLTYPE GetSelectionMarkedItem(int *piItem); - virtual HRESULT STDMETHODCALLTYPE GetFocusedItem(int *piItem); - virtual HRESULT STDMETHODCALLTYPE GetItemPosition(LPCITEMIDLIST pidl, POINT *ppt); - virtual HRESULT STDMETHODCALLTYPE GetSpacing(POINT *ppt); - virtual HRESULT STDMETHODCALLTYPE GetDefaultSpacing(POINT *ppt); - virtual HRESULT STDMETHODCALLTYPE GetAutoArrange(); - virtual HRESULT STDMETHODCALLTYPE SelectItem(int iItem, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IDropTarget methods *** - virtual HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT STDMETHODCALLTYPE DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - virtual HRESULT STDMETHODCALLTYPE DragLeave(); - virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); - - // *** IDropSource methods *** - virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState); - virtual HRESULT STDMETHODCALLTYPE GiveFeedback(DWORD dwEffect); - - // *** IViewObject methods *** - virtual HRESULT STDMETHODCALLTYPE Draw(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, - HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, - BOOL ( STDMETHODCALLTYPE *pfnContinue )(ULONG_PTR dwContinue), ULONG_PTR dwContinue); - virtual HRESULT STDMETHODCALLTYPE GetColorSet(DWORD dwDrawAspect, LONG lindex, void *pvAspect, - DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet); - virtual HRESULT STDMETHODCALLTYPE Freeze(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze); - virtual HRESULT STDMETHODCALLTYPE Unfreeze(DWORD dwFreeze); - virtual HRESULT STDMETHODCALLTYPE SetAdvise(DWORD aspects, DWORD advf, IAdviseSink *pAdvSink); - virtual HRESULT STDMETHODCALLTYPE GetAdvise(DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - // message handlers - LRESULT OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - - static ATL::CWndClassInfo& GetWndClassInfo() - { - static ATL::CWndClassInfo wc = + private: + CComPtr<IShellFolder> pSFParent; + CComPtr<IShellFolder2> pSF2Parent; + CComPtr<IShellBrowser> pShellBrowser; + CComPtr<ICommDlgBrowser> pCommDlgBrowser; + HWND hWndList; /* ListView control */ + HWND hWndParent; + FOLDERSETTINGS FolderSettings; + HMENU hMenu; + UINT uState; + UINT cidl; + LPITEMIDLIST *apidl; + LISTVIEW_SORT_INFO ListViewSortInfo; + ULONG hNotify; /* change notification handle */ + HANDLE hAccel; + DWORD dwAspects; + DWORD dwAdvf; + CComPtr<IAdviseSink> pAdvSink; + // for drag and drop + CComPtr<IDropTarget> pCurDropTarget; /* The sub-item, which is currently dragged over */ + CComPtr<IDataObject> pCurDataObject; /* The dragged data-object */ + LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ + UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT ptLastMousePos; /* Mouse position at last DragOver call */ + // + CComPtr<IContextMenu2> pCM; + public: + CDefView(); + ~CDefView(); + HRESULT WINAPI Initialize(IShellFolder *shellFolder); + HRESULT IncludeObject(LPCITEMIDLIST pidl); + HRESULT OnDefaultCommand(); + HRESULT OnStateChange(UINT uFlags); + void CheckToolbar(); + void SetStyle(DWORD dwAdd, DWORD dwRemove); + BOOL CreateList(); + BOOL InitList(); + static INT CALLBACK CompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData); + static INT CALLBACK ListViewCompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData); + int LV_FindItemByPidl(LPCITEMIDLIST pidl); + BOOLEAN LV_AddItem(LPCITEMIDLIST pidl); + BOOLEAN LV_DeleteItem(LPCITEMIDLIST pidl); + BOOLEAN LV_RenameItem(LPCITEMIDLIST pidlOld, LPCITEMIDLIST pidlNew); + static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg); + HRESULT FillList(); + HMENU BuildFileMenu(); + void MergeFileMenu(HMENU hSubMenu); + void MergeViewMenu(HMENU hSubMenu); + UINT GetSelections(); + HRESULT OpenSelectedItems(); + void OnDeactivate(); + void DoActivate(UINT uState); + HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IShellView methods *** + virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator(MSG *pmsg); + virtual HRESULT STDMETHODCALLTYPE EnableModeless(BOOL fEnable); + virtual HRESULT STDMETHODCALLTYPE UIActivate(UINT uState); + virtual HRESULT STDMETHODCALLTYPE Refresh(); + virtual HRESULT STDMETHODCALLTYPE CreateViewWindow(IShellView *psvPrevious, LPCFOLDERSETTINGS pfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd); + virtual HRESULT STDMETHODCALLTYPE DestroyViewWindow(); + virtual HRESULT STDMETHODCALLTYPE GetCurrentInfo(LPFOLDERSETTINGS pfs); + virtual HRESULT STDMETHODCALLTYPE AddPropertySheetPages(DWORD dwReserved, LPFNSVADDPROPSHEETPAGE pfn, LPARAM lparam); + virtual HRESULT STDMETHODCALLTYPE SaveViewState(); + virtual HRESULT STDMETHODCALLTYPE SelectItem(LPCITEMIDLIST pidlItem, SVSIF uFlags); + virtual HRESULT STDMETHODCALLTYPE GetItemObject(UINT uItem, REFIID riid, void **ppv); + + // *** IFolderView methods *** + virtual HRESULT STDMETHODCALLTYPE GetCurrentViewMode(UINT *pViewMode); + virtual HRESULT STDMETHODCALLTYPE SetCurrentViewMode(UINT ViewMode); + virtual HRESULT STDMETHODCALLTYPE GetFolder(REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE Item(int iItemIndex, LPITEMIDLIST *ppidl); + virtual HRESULT STDMETHODCALLTYPE ItemCount(UINT uFlags, int *pcItems); + virtual HRESULT STDMETHODCALLTYPE Items(UINT uFlags, REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE GetSelectionMarkedItem(int *piItem); + virtual HRESULT STDMETHODCALLTYPE GetFocusedItem(int *piItem); + virtual HRESULT STDMETHODCALLTYPE GetItemPosition(LPCITEMIDLIST pidl, POINT *ppt); + virtual HRESULT STDMETHODCALLTYPE GetSpacing(POINT *ppt); + virtual HRESULT STDMETHODCALLTYPE GetDefaultSpacing(POINT *ppt); + virtual HRESULT STDMETHODCALLTYPE GetAutoArrange(); + virtual HRESULT STDMETHODCALLTYPE SelectItem(int iItem, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IDropTarget methods *** + virtual HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT STDMETHODCALLTYPE DragLeave(); + virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + + // *** IDropSource methods *** + virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState); + virtual HRESULT STDMETHODCALLTYPE GiveFeedback(DWORD dwEffect); + + // *** IViewObject methods *** + virtual HRESULT STDMETHODCALLTYPE Draw(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, + HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, + BOOL ( STDMETHODCALLTYPE *pfnContinue )(ULONG_PTR dwContinue), ULONG_PTR dwContinue); + virtual HRESULT STDMETHODCALLTYPE GetColorSet(DWORD dwDrawAspect, LONG lindex, void *pvAspect, + DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet); + virtual HRESULT STDMETHODCALLTYPE Freeze(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze); + virtual HRESULT STDMETHODCALLTYPE Unfreeze(DWORD dwFreeze); + virtual HRESULT STDMETHODCALLTYPE SetAdvise(DWORD aspects, DWORD advf, IAdviseSink *pAdvSink); + virtual HRESULT STDMETHODCALLTYPE GetAdvise(DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // message handlers + LRESULT OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + + static ATL::CWndClassInfo& GetWndClassInfo() { - { sizeof(WNDCLASSEX), 0, StartWindowProc, - 0, 0, NULL, NULL, - LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_BACKGROUND + 1), NULL, SV_CLASS_NAME, NULL }, - NULL, NULL, IDC_ARROW, TRUE, 0, _T("") - }; - return wc; - } - - virtual WNDPROC GetWindowProc() - { - return WindowProc; - } - - static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) - { - CDefView *pThis; - LRESULT result; - - // must hold a reference during message handling - pThis = reinterpret_cast<CDefView *>(hWnd); - pThis->AddRef(); - result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam); - pThis->Release(); - return result; - } - -BEGIN_MSG_MAP(CDefView) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) - MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_COMMAND, OnCommand) - MESSAGE_HANDLER(SHV_CHANGE_NOTIFY, OnChangeNotify) - MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) - MESSAGE_HANDLER(WM_DRAWITEM, OnCustomItem) - MESSAGE_HANDLER(WM_MEASUREITEM, OnCustomItem) - MESSAGE_HANDLER(WM_SHOWWINDOW, OnShowWindow) - MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) - MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) - MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser) -END_MSG_MAP() - -BEGIN_COM_MAP(CDefView) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView) - COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IDropSource, IDropSource) - COM_INTERFACE_ENTRY_IID(IID_IViewObject, IViewObject) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) -END_COM_MAP() + static ATL::CWndClassInfo wc = + { + { sizeof(WNDCLASSEX), 0, StartWindowProc, + 0, 0, NULL, NULL, + LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_BACKGROUND + 1), NULL, SV_CLASS_NAME, NULL + }, + NULL, NULL, IDC_ARROW, TRUE, 0, _T("") + }; + return wc; + } + + virtual WNDPROC GetWindowProc() + { + return WindowProc; + } + + static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { + CDefView *pThis; + LRESULT result; + + // must hold a reference during message handling + pThis = reinterpret_cast<CDefView *>(hWnd); + pThis->AddRef(); + result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam); + pThis->Release(); + return result; + } + + BEGIN_MSG_MAP(CDefView) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) + MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) + MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) + MESSAGE_HANDLER(SHV_CHANGE_NOTIFY, OnChangeNotify) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) + MESSAGE_HANDLER(WM_DRAWITEM, OnCustomItem) + MESSAGE_HANDLER(WM_MEASUREITEM, OnCustomItem) + MESSAGE_HANDLER(WM_SHOWWINDOW, OnShowWindow) + MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) + MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser) + END_MSG_MAP() + + BEGIN_COM_MAP(CDefView) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView) + COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IDropSource, IDropSource) + COM_INTERFACE_ENTRY_IID(IID_IViewObject, IViewObject) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + END_COM_MAP() }; /* ListView Header ID's */ @@ -293,21 +294,21 @@ Items merged into the toolbar and the filemenu */ typedef struct -{ int idCommand; - int iImage; - int idButtonString; - int idMenuString; - BYTE bState; - BYTE bStyle; +{ int idCommand; + int iImage; + int idButtonString; + int idMenuString; + BYTE bState; + BYTE bStyle; } MYTOOLINFO, *LPMYTOOLINFO; static const MYTOOLINFO Tools[] = { -{ FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON }, -{ FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON }, -{ FCIDM_SHVIEW_LISTVIEW, 0, 0, IDS_VIEW_LIST, TBSTATE_ENABLED, BTNS_BUTTON }, -{ FCIDM_SHVIEW_REPORTVIEW, 0, 0, IDS_VIEW_DETAILS, TBSTATE_ENABLED, BTNS_BUTTON }, -{ -1, 0, 0, 0, 0, 0} + { FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON }, + { FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON }, + { FCIDM_SHVIEW_LISTVIEW, 0, 0, IDS_VIEW_LIST, TBSTATE_ENABLED, BTNS_BUTTON }, + { FCIDM_SHVIEW_REPORTVIEW, 0, 0, IDS_VIEW_DETAILS, TBSTATE_ENABLED, BTNS_BUTTON }, + { -1, 0, 0, 0, 0, 0} }; typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask); @@ -346,7 +347,7 @@ { pSFParent = shellFolder; shellFolder->QueryInterface(IID_IShellFolder2, (LPVOID *)&pSF2Parent); - + return S_OK; } @@ -410,13 +411,13 @@ if (pCommDlgBrowser != NULL) { pShellBrowser->SendControlMsg(FCW_TOOLBAR, TB_CHECKBUTTON, - FCIDM_TB_SMALLICON, (FolderSettings.ViewMode==FVM_LIST)? TRUE : FALSE, &result); + FCIDM_TB_SMALLICON, (FolderSettings.ViewMode == FVM_LIST) ? TRUE : FALSE, &result); pShellBrowser->SendControlMsg(FCW_TOOLBAR, TB_CHECKBUTTON, - FCIDM_TB_REPORTVIEW, (FolderSettings.ViewMode==FVM_DETAILS)? TRUE : FALSE, &result); + FCIDM_TB_REPORTVIEW, (FolderSettings.ViewMode == FVM_DETAILS) ? TRUE : FALSE, &result); pShellBrowser->SendControlMsg(FCW_TOOLBAR, TB_ENABLEBUTTON, - FCIDM_TB_SMALLICON, TRUE, &result); + FCIDM_TB_SMALLICON, TRUE, &result); pShellBrowser->SendControlMsg(FCW_TOOLBAR, TB_ENABLEBUTTON, - FCIDM_TB_REPORTVIEW, TRUE, &result); + FCIDM_TB_REPORTVIEW, TRUE, &result); } } @@ -443,25 +444,25 @@ * - creates the list view window */ BOOL CDefView::CreateList() -{ DWORD dwStyle, dwExStyle; - - TRACE("%p\n",this); +{ DWORD dwStyle, dwExStyle; + + TRACE("%p\n", this); dwStyle = WS_TABSTOP | WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_AUTOARRANGE; - dwExStyle = WS_EX_CLIENTEDGE; - - if (FolderSettings.fFlags & FWF_DESKTOP) - dwStyle |= LVS_ALIGNLEFT; + LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_AUTOARRANGE; + dwExStyle = WS_EX_CLIENTEDGE; + + if (FolderSettings.fFlags & FWF_DESKTOP) + dwStyle |= LVS_ALIGNLEFT; else - dwStyle |= LVS_ALIGNTOP; + dwStyle |= LVS_ALIGNTOP; switch (FolderSettings.ViewMode) { case FVM_ICON: dwStyle |= LVS_ICON; break; - + case FVM_DETAILS: dwStyle |= LVS_REPORT; break; @@ -481,32 +482,32 @@ if (FolderSettings.fFlags & FWF_AUTOARRANGE) dwStyle |= LVS_AUTOARRANGE; - + if (FolderSettings.fFlags & FWF_DESKTOP) - FolderSettings.fFlags |= FWF_NOCLIENTEDGE | FWF_NOSCROLL; - + FolderSettings.fFlags |= FWF_NOCLIENTEDGE | FWF_NOSCROLL; + if (FolderSettings.fFlags & FWF_SINGLESEL) dwStyle |= LVS_SINGLESEL; - + if (FolderSettings.fFlags & FWF_NOCLIENTEDGE) dwExStyle &= ~WS_EX_CLIENTEDGE; - hWndList=CreateWindowExW( dwExStyle, - WC_LISTVIEWW, - NULL, - dwStyle, - 0,0,0,0, - m_hWnd, - (HMENU)ID_LISTVIEW, - shell32_hInstance, - NULL); + hWndList = CreateWindowExW( dwExStyle, + WC_LISTVIEWW, + NULL, + dwStyle, + 0, 0, 0, 0, + m_hWnd, + (HMENU)ID_LISTVIEW, + shell32_hInstance, + NULL); if (!hWndList) return FALSE; - ListViewSortInfo.bIsAscending = TRUE; - ListViewSortInfo.nHeaderID = -1; - ListViewSortInfo.nLastHeaderID = -1; + ListViewSortInfo.bIsAscending = TRUE; + ListViewSortInfo.nHeaderID = -1; + ListViewSortInfo.nLastHeaderID = -1; if (FolderSettings.fFlags & FWF_DESKTOP) { @@ -526,7 +527,7 @@ SendMessageW(hWndList, LVM_SETBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); } - SendMessageW(hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); + SendMessageW(hWndList, LVM_SETTEXTCOLOR, 0, RGB(255, 255, 255)); } /* UpdateShellSettings(); */ @@ -544,7 +545,7 @@ SHELLDETAILS sd; WCHAR szTemp[50]; - TRACE("%p\n",this); + TRACE("%p\n", this); SendMessageW(hWndList, LVM_DELETEALLITEMS, 0, 0); @@ -553,13 +554,13 @@ if (pSF2Parent) { - for (int i=0; 1; i++) + for (int i = 0; 1; i++) { if (FAILED(pSF2Parent->GetDetailsOf(NULL, i, &sd))) break; - + lvColumn.fmt = sd.fmt; - lvColumn.cx = sd.cxChar*8; /* chars->pixel */ + lvColumn.cx = sd.cxChar * 8; /* chars->pixel */ StrRetToStrNW( szTemp, 50, &sd.str, NULL); SendMessageW(hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } @@ -590,8 +591,8 @@ return 0; ret = (SHORT)SCODE_CODE(((IShellFolder *)lpData)->CompareIDs(0, (LPITEMIDLIST)lParam1, (LPITEMIDLIST)lParam2)); - TRACE("ret=%i\n",ret); - + TRACE("ret=%i\n", ret); + return ret; } @@ -621,10 +622,10 @@ */ INT CALLBACK CDefView::ListViewCompareItems(LPVOID lParam1, LPVOID lParam2, LPARAM lpData) { - INT nDiff=0; + INT nDiff = 0; FILETIME fd1, fd2; char strName1[MAX_PATH], strName2[MAX_PATH]; - BOOL bIsFolder1, bIsFolder2,bIsBothFolder; + BOOL bIsFolder1, bIsFolder2, bIsBothFolder; LPITEMIDLIST pItemIdList1 = (LPITEMIDLIST) lParam1; LPITEMIDLIST pItemIdList2 = (LPITEMIDLIST) lParam2; LISTVIEW_SORT_INFO *pSortInfo = (LPLISTVIEW_SORT_INFO) lpData; @@ -703,19 +704,19 @@ LVITEMW lvItem; lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; - + for (lvItem.iItem = 0; - SendMessageW(hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); - lvItem.iItem++) + SendMessageW(hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); + lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; HRESULT hr = pSFParent->CompareIDs(0, pidl, currentpidl); - + if (SUCCEEDED(hr) && !HRESULT_CODE(hr)) { return lvItem.iItem; } - } + } return -1; } @@ -734,7 +735,7 @@ lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ - + if (SendMessageW(hWndList, LVM_INSERTITEMW, 0, (LPARAM)&lvItem) == -1) return FALSE; else @@ -751,7 +752,7 @@ TRACE("(%p)(pidl=%p)\n", this, pidl); nIndex = LV_FindItemByPidl(ILFindLastID(pidl)); - + return (-1 == ListView_DeleteItem(hWndList, nIndex)) ? FALSE : TRUE; } @@ -766,7 +767,7 @@ TRACE("(%p)(pidlold=%p pidlnew=%p)\n", this, pidlOld, pidlNew); nItem = LV_FindItemByPidl(ILFindLastID(pidlOld)); - + if ( -1 != nItem ) { lvItem.mask = LVIF_PARAM; /* only the pidl */ @@ -781,7 +782,7 @@ SendMessageW(hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } - + return FALSE; } @@ -799,7 +800,7 @@ /* in a commdlg This works as a filemask*/ if (pThis->IncludeObject(pidl) == S_OK) pThis->LV_AddItem(pidl); - + SHFree(pidl); return TRUE; } @@ -812,13 +813,13 @@ HRESULT hRes; HDPA hdpa; - TRACE("%p\n",this); + TRACE("%p\n", this); /* get the itemlist from the shfolder*/ hRes = pSFParent->EnumObjects(m_hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList); if (hRes != S_OK) { - if (hRes==S_FALSE) + if (hRes == S_FALSE) return(NOERROR); return(hRes); } @@ -845,7 +846,7 @@ /*turn the listview's redrawing off*/ SendMessageA(hWndList, WM_SETREDRAW, FALSE, 0); - DPA_DestroyCallback( hdpa, fill_list, (void *)this); + DPA_DestroyCallback( hdpa, fill_list, (void *)this); /*turn the listview's redrawing back on and force it to draw*/ SendMessageA(hWndList, WM_SETREDRAW, TRUE, 0); @@ -904,7 +905,7 @@ SHChangeNotifyEntry ntreg; CComPtr<IPersistFolder2> ppf2; - TRACE("%p\n",this); + TRACE("%p\n", this); if(CreateList()) { @@ -940,18 +941,18 @@ * ShellView_BuildFileMenu() */ HMENU CDefView::BuildFileMenu() -{ WCHAR szText[MAX_PATH]; +{ WCHAR szText[MAX_PATH]; MENUITEMINFOW mii; - int nTools,i; + int nTools, i; HMENU hSubMenu; - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); hSubMenu = CreatePopupMenu(); if (hSubMenu) { /*get the number of items in our global array*/ - for(nTools = 0; Tools[nTools].idCommand != -1; nTools++){} + for(nTools = 0; Tools[nTools].idCommand != -1; nTools++) {} /*add the menu items*/ for(i = 0; i < nTools; i++) @@ -974,11 +975,11 @@ mii.fType = MFT_SEPARATOR; } /* tack This item onto the end of the menu */ - InsertMenuItemW(hSubMenu, (UINT)-1, TRUE, &mii); + InsertMenuItemW(hSubMenu, (UINT) - 1, TRUE, &mii); } } - TRACE("-- return (menu=%p)\n",hSubMenu); + TRACE("-- return (menu=%p)\n", hSubMenu); return hSubMenu; } @@ -987,12 +988,12 @@ */ void CDefView::MergeFileMenu(HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p) stub\n",this,hSubMenu); + TRACE("(%p)->(submenu=%p) stub\n", this, hSubMenu); if (hSubMenu) - { /*insert This item at the beginning of the menu */ - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"dummy45", MFS_ENABLED); + { /*insert This item at the beginning of the menu */ + _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"dummy45", MFS_ENABLED); } TRACE("--\n"); @@ -1003,7 +1004,7 @@ */ void CDefView::MergeViewMenu(HMENU hSubMenu) { - TRACE("(%p)->(submenu=%p)\n",this,hSubMenu); + TRACE("(%p)->(submenu=%p)\n", this, hSubMenu); if (hSubMenu) { @@ -1060,7 +1061,7 @@ apidl[i] = (LPITEMIDLIST)lvItem.lParam; i++; if (i == cidl) - break; + break; TRACE("-- selected Item found\n"); } lvItem.iItem++; @@ -1093,12 +1094,12 @@ if (0 == GetSelections()) { - return S_OK; + return S_OK; } hr = pSFParent->GetUIObjectOf(m_hWnd, cidl, - (LPCITEMIDLIST*)apidl, IID_IContextMenu, - 0, (LPVOID *)&cm); + (LPCITEMIDLIST*)apidl, IID_IContextMenu, + 0, (LPVOID *)&cm); if (SUCCEEDED(hr)) { @@ -1143,7 +1144,7 @@ } else ERR("No default context menu item\n"); - + } DestroyMenu( hmenu ); hr = IUnknown_SetSite(cm, NULL); @@ -1153,8 +1154,8 @@ hr = pSFParent->GetUIObjectOf(m_hWnd, cidl, - (LPCITEMIDLIST*)apidl, IID_IDataObject, - 0, (LPVOID *)&selection); + (LPCITEMIDLIST*)apidl, IID_IDataObject, + 0, (LPVOID *)&selection); @@ -1182,19 +1183,19 @@ pIDList = (LPIDA)GlobalLock(stgm.hGlobal); - parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pIDList+pIDList->aoffset[0]); + parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pIDList + pIDList->aoffset[0]); hr = pSFParent->GetAttributesOf(1, &parent_pidl, &attribs); if (SUCCEEDED(hr) && (attribs & SFGAO_FILESYSTEM) && - SHGetPathFromIDListW(parent_pidl, parent_path)) - { - parent_dir = parent_path; + SHGetPathFromIDListW(parent_pidl, parent_path)) + { + parent_dir = parent_path; } for (i = pIDList->cidl; i > 0; --i) { LPCITEMIDLIST pidl; - pidl = (LPCITEMIDLIST)((LPBYTE)pIDList+pIDList->aoffset[i]); + pidl = (LPCITEMIDLIST)((LPBYTE)pIDList + pIDList->aoffset[i]); attribs = SFGAO_FOLDER; hr = pSFParent->GetAttributesOf(1, &pidl, &attribs); @@ -1230,16 +1231,15 @@ */ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - WORD x; - WORD y; - BOOL bDefault; - UINT uCommand; - DWORD wFlags; - HMENU hMenu; - BOOL fExplore; - HWND hwndTree; - CMINVOKECOMMANDINFO cmi; - HRESULT hResult; + WORD x; + WORD y; + UINT uCommand; + DWORD wFlags; + HMENU hMenu; + BOOL fExplore; + HWND hwndTree; + CMINVOKECOMMANDINFO cmi; + HRESULT hResult; // for some reason I haven't figured out, we sometimes recurse into this method if (pCM != NULL) @@ -1247,9 +1247,8 @@ x = LOWORD(lParam); y = HIWORD(lParam); - bDefault = FALSE; - - TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",this, x, y, bDefault); + + TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y); fExplore = FALSE; hwndTree = NULL; @@ -1267,7 +1266,7 @@ if (hMenu) { hResult = IUnknown_SetSite(pCM, (IShellView *)this); - + /* See if we are in Explore or Open mode. If the browser's tree is present, we are in Explore mode.*/ if (SUCCEEDED(pShellBrowser->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) { @@ -1284,28 +1283,18 @@ if (FolderSettings.fFlags & FWF_DESKTOP) SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - if (bDefault) - { - TRACE("-- get menu default command\n"); - uCommand = GetMenuDefaultItem(hMenu, FALSE, GMDI_GOINTOPOPUPS); - } - else - { - TRACE("-- track popup\n"); - uCommand = TrackPopupMenu( hMenu,TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,m_hWnd,NULL); - } + TRACE("-- track popup\n"); + uCommand = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_RETURNCMD, x, y, 0, m_hWnd, NULL); if (uCommand > 0) { TRACE("-- uCommand=%u\n", uCommand); - - if (uCommand==FCIDM_SHVIEW_OPEN && pCommDlgBrowser.p != NULL) + + if (uCommand == FCIDM_SHVIEW_OPEN && pCommDlgBrowser.p != NULL) { TRACE("-- dlg: OnDefaultCommand\n"); if (OnDefaultCommand() != S_OK) - { OpenSelectedItems(); - } } else { @@ -1317,7 +1306,7 @@ pCM->InvokeCommand(&cmi); } } - + hResult = IUnknown_SetSite(pCM, NULL); DestroyMenu(hMenu); } @@ -1332,10 +1321,10 @@ CDefFolderMenu_Create2(NULL, NULL, cidl, (LPCITEMIDLIST*)apidl, pSFParent, NULL, 0, NULL, (IContextMenu**)&pCM); pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); - uCommand = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,m_hWnd,NULL); + uCommand = TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_RETURNCMD, x, y, 0, m_hWnd, NULL); DestroyMenu(hMenu); - TRACE("-- (%p)->(uCommand=0x%08x )\n",this, uCommand); + TRACE("-- (%p)->(uCommand=0x%08x )\n", this, uCommand); ZeroMemory(&cmi, sizeof(cmi)); cmi.cbSize = sizeof(cmi); @@ -1383,7 +1372,7 @@ */ void CDefView::OnDeactivate() { - TRACE("%p\n",this); + TRACE("%p\n", this); if (uState != SVUIA_DEACTIVATE) { @@ -1427,7 +1416,7 @@ TRACE("-- after fnInsertMenusSB\n"); /*build the top level menu get the menu item's text*/ - strcpy(szText,"dummy 31"); + strcpy(szText, "dummy 31"); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -1538,7 +1527,7 @@ dwCmd = GET_WM_COMMAND_CMD(wParam, lParam); hwndCmd = GET_WM_COMMAND_HWND(wParam, lParam); - TRACE("(%p)->(0x%08x 0x%08x %p) stub\n",this, dwCmdID, dwCmd, hwndCmd); + TRACE("(%p)->(0x%08x 0x%08x %p) stub\n", this, dwCmdID, dwCmd, hwndCmd); switch (dwCmdID) { @@ -1566,7 +1555,7 @@ CheckToolbar(); break; - /* the menu-ID's for sorting are 0x30... see shrec.rc */ + /* the menu-ID's for sorting are 0x30... see shrec.rc */ case 0x30: case 0x31: case 0x32: @@ -1578,7 +1567,7 @@ break; default: - TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); + TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); } return 0; @@ -1602,7 +1591,7 @@ lpnmlv = (LPNMLISTVIEW)lpnmh; lpdi = (NMLVDISPINFOW *)lpnmh; - TRACE("%p CtlID=%u lpnmh->code=%x\n",this,CtlID,lpnmh->code); + TRACE("%p CtlID=%u lpnmh->code=%x\n", this, CtlID, lpnmh->code); switch (lpnmh->code) { @@ -1699,12 +1688,12 @@ /* shouldn't happen */ NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",lpdiA->item.pszText); + TRACE("-- text=%s\n", lpdiA->item.pszText); } else /* LVN_GETDISPINFOW */ { StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",debugstr_w(lpdi->item.pszText)); + TRACE("-- text=%s\n", debugstr_w(lpdi->item.pszText)); } } else @@ -1734,11 +1723,11 @@ DWORD dwAttributes = SFGAO_CANLINK; DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; - if (SUCCEEDED(pSFParent->GetUIObjectOf(m_hWnd, cidl, (LPCITEMIDLIST*)apidl, IID_IDataObject,0,(LPVOID *)&pda))) + if (SUCCEEDED(pSFParent->GetUIObjectOf(m_hWnd, cidl, (LPCITEMIDLIST*)apidl, IID_IDataObject, 0, (LPVOID *)&pda))) { IDropSource * pds = (IDropSource *)this; /* own DropSource interface */ - if (SUCCEEDED(pSFParent->GetAttributesOf(cidl, (LPCITEMIDLIST*)apidl, &dwAttributes))) + if (SUCCEEDED(pSFParent->GetAttributesOf(cidl, (LPCITEMIDLIST*)apidl, &dwAttributes))) { if (dwAttributes & SFGAO_CANLINK) { @@ -1785,30 +1774,30 @@ SendMessageW(hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; - hr = pSFParent->SetNameOf(0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidl); + hr = pSFParent->SetNameOf(0, pidl, lpdi->item.pszText, SHGDN_INFOLDER, &pidl); if (SUCCEEDED(hr) && pidl) { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; SendMessageW(hWndList, LVM_SETITEMW, 0, (LPARAM) &lvItem); - + return TRUE; } } - + return FALSE; } case LVN_KEYDOWN: { - /* MSG msg; - msg.hwnd = m_hWnd; - msg.message = WM_KEYDOWN; - msg.wParam = plvKeyDown->wVKey; - msg.lParam = 0; - msg.time = 0; - msg.pt = 0;*/ + /* MSG msg; + msg.hwnd = m_hWnd; + msg.message = WM_KEYDOWN; + msg.wParam = plvKeyDown->wVKey; + msg.lParam = 0; + msg.time = 0; + msg.pt = 0;*/ LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; SHORT ctrl = GetKeyState(VK_CONTROL) & 0x8000; @@ -1829,9 +1818,9 @@ SendMessageW(hWndList, LVM_EDITLABELW, i, 0); } } - #if 0 +#if 0 TranslateAccelerator(m_hWnd, hAccel, &msg) - #endif +#endif else if(plvKeyDown->wVKey == VK_DELETE) { UINT i; @@ -1841,7 +1830,7 @@ ISFHelper *psfhlp; pSFParent->QueryInterface(IID_ISFHelper, - (LPVOID*)&psfhlp); + (LPVOID*)&psfhlp); if (psfhlp == NULL) break; @@ -1851,7 +1840,7 @@ /* allocate memory for the pidl array */ pItems = (LPITEMIDLIST *)HeapAlloc(GetProcessHeap(), 0, - sizeof(LPITEMIDLIST) * i); + sizeof(LPITEMIDLIST) * i); /* retrieve all selected items */ i = 0; @@ -1860,7 +1849,7 @@ { /* get selected item */ item_index = ListView_GetNextItem(hWndList, - item_index, LVNI_SELECTED); + item_index, LVNI_SELECTED); item.iItem = item_index; item.mask = LVIF_PARAM; SendMessageA(hWndList, LVM_GETITEMA, 0, (LPARAM) &item); @@ -2019,7 +2008,7 @@ break; } else - FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey); + FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey); } break; @@ -2098,7 +2087,7 @@ */ HRESULT WINAPI CDefView::GetWindow(HWND *phWnd) { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); *phWnd = m_hWnd; @@ -2107,7 +2096,7 @@ HRESULT WINAPI CDefView::ContextSensitiveHelp(BOOL fEnterMode) { - FIXME("(%p) stub\n",this); + FIXME("(%p) stub\n", this); return E_NOTIMPL; } @@ -2121,12 +2110,12 @@ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg) { #if 0 - FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",this,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); + FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n", this, lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif if (lpmsg->message >= WM_KEYFIRST && lpmsg->message >= WM_KEYLAST) { - TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; + TRACE("-- key=0x04%lx\n", lpmsg->wParam) ; } return S_FALSE; /* not handled */ @@ -2134,20 +2123,20 @@ HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable) { - FIXME("(%p) stub\n",this); + FIXME("(%p) stub\n", this); return E_NOTIMPL; } HRESULT WINAPI CDefView::UIActivate(UINT uState) { -/* - CHAR szName[MAX_PATH]; -*/ + /* + CHAR szName[MAX_PATH]; + */ LRESULT lResult; - int nPartArray[1] = {-1}; - - TRACE("(%p)->(state=%x) stub\n",this, uState); + int nPartArray[1] = { -1}; + + TRACE("(%p)->(state=%x) stub\n", this, uState); /*don't do anything if the state isn't really changing*/ if (uState == uState) @@ -2162,17 +2151,17 @@ if (uState != SVUIA_DEACTIVATE) { - /* - GetFolderPath is not a method of IShellFolder - IShellFolder_GetFolderPath( pSFParent, szName, sizeof(szName) ); - */ + /* + GetFolderPath is not a method of IShellFolder + IShellFolder_GetFolderPath( pSFParent, szName, sizeof(szName) ); + */ /* set the number of parts */ pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETPARTS, 1, (LPARAM)nPartArray, &lResult); /* set the text for the parts */ - /* - pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETTEXTA, 0, (LPARAM)szName, &lResult); - */ + /* + pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETTEXTA, 0, (LPARAM)szName, &lResult); + */ } return S_OK; @@ -2180,7 +2169,7 @@ HRESULT WINAPI CDefView::Refresh() { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); SendMessageW(hWndList, LVM_DELETEALLITEMS, 0, 0); FillList(); @@ -2192,7 +2181,7 @@ { *phWnd = 0; - TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd); + TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n", this, lpPrevView, lpfs, psb, prcView, phWnd); if (lpfs != NULL) TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); @@ -2236,7 +2225,7 @@ HRESULT WINAPI CDefView::DestroyViewWindow() { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); /*Make absolutely sure all our UI is cleaned up.*/ UIActivate(SVUIA_DEACTIVATE); @@ -2255,8 +2244,8 @@ HRESULT WINAPI CDefView::GetCurrentInfo(LPFOLDERSETTINGS lpfs) { - TRACE("(%p)->(%p) vmode=%x flags=%x\n",this, lpfs, - FolderSettings.ViewMode, FolderSettings.fFlags); + TRACE("(%p)->(%p) vmode=%x flags=%x\n", this, lpfs, + FolderSettings.ViewMode, FolderSettings.fFlags); if (!lpfs) return E_INVALIDARG; @@ -2265,16 +2254,16 @@ return NOERROR; } -HRESULT WINAPI CDefView::AddPropertySheetPages(DWORD dwReserved,LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) -{ - FIXME("(%p) stub\n",this); +HRESULT WINAPI CDefView::AddPropertySheetPages(DWORD dwReserved, LPFNADDPROPSHEETPAGE lpfn, LPARAM lparam) +{ + FIXME("(%p) stub\n", this); return E_NOTIMPL; } HRESULT WINAPI CDefView::SaveViewState() { - FIXME("(%p) stub\n",this); + FIXME("(%p) stub\n", this); return S_OK; } @@ -2283,7 +2272,7 @@ { int i; - TRACE("(%p)->(pidl=%p, 0x%08x) stub\n",this, pidl, uFlags); + TRACE("(%p)->(pidl=%p, 0x%08x) stub\n", this, pidl, uFlags); i = LV_FindItemByPidl(pidl); @@ -2292,7 +2281,7 @@ LVITEMW lvItem; if(uFlags & SVSI_ENSUREVISIBLE) - SendMessageW(hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(hWndList, LVM_ENSUREVISIBLE, i, 0); lvItem.mask = LVIF_STATE; lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; @@ -2323,7 +2312,7 @@ if(uFlags & SVSI_EDIT) - SendMessageW(hWndList, LVM_EDITLABELW, i, 0); + SendMessageW(hWndList, LVM_EDITLABELW, i, 0); } return S_OK; @@ -2333,7 +2322,7 @@ { HRESULT hr = E_NOINTERFACE; - TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n",this, uItem, debugstr_guid(&riid), ppvOut); + TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n", this, uItem, debugstr_guid(&riid), ppvOut); *ppvOut = NULL; @@ -2357,7 +2346,7 @@ break; } - TRACE("-- (%p)->(interface=%p)\n",this, *ppvOut); + TRACE("-- (%p)->(interface=%p)\n", this, *ppvOut); return hr; } @@ -2387,10 +2376,18 @@ means. */ switch (ViewMode) { - case FVM_ICON: dwStyle = LVS_ICON; break; - case FVM_DETAILS: dwStyle = LVS_REPORT; break; - case FVM_SMALLICON: dwStyle = LVS_SMALLICON; break; - case FVM_LIST: dwStyle = LVS_LIST; break; + case FVM_ICON: + dwStyle = LVS_ICON; + break; + case FVM_DETAILS: + dwStyle = LVS_REPORT; + break; + case FVM_SMALLICON: + dwStyle = LVS_SMALLICON; + break; + case FVM_LIST: + dwStyle = LVS_LIST; + break; default: { FIXME("ViewMode %d not implemented\n", ViewMode); @@ -2430,7 +2427,7 @@ *ppidl = ILClone((PITEMID_CHILD)item.lParam); return S_OK; } - + *ppidl = 0; return E_INVALIDARG; @@ -2465,7 +2462,7 @@ HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) { TRACE("(%p)->(%p)\n", this, piItem); - + *piItem = SendMessageW(this->hWndList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); return S_OK; @@ -2545,12 +2542,12 @@ HRESULT WINAPI CDefView::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) { FIXME("(%p)->(%p(%s) 0x%08x %p %p\n", - this, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + this, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_INVALIDARG; - for (UINT i=0; i < cCmds; i++) + for (UINT i = 0; i < cCmds; i++) { FIXME("\tprgCmds[%d].cmdID = %d\n", i, prgCmds[i].cmdID); prgCmds[i].cmdf = 0; @@ -2567,20 +2564,20 @@ HRESULT WINAPI CDefView::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", - this, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); + this, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); if (!pguidCmdGroup) return OLECMDERR_E_UNKNOWNGROUP; if (IsEqualIID(*pguidCmdGroup, CGID_Explorer) && - (nCmdID == 0x29) && - (nCmdexecopt == 4) && pvaOut) - return S_OK; - + (nCmdID == 0x29) && + (nCmdexecopt == 4) && pvaOut) + return S_OK; + if (IsEqualIID(*pguidCmdGroup, CGID_ShellDocView) && - (nCmdID == 9) && - (nCmdexecopt == 0)) - return 1; + (nCmdID == 9) && + (nCmdexecopt == 0)) + return 1; return OLECMDERR_E_UNKNOWNGROUP; } @@ -2617,8 +2614,8 @@ /* Send WM_*SCROLL messages every 250 ms during drag-scrolling */ ::GetClientRect(hWndList, &clientRect); if (htinfo.pt.x == ptLastMousePos.x && htinfo.pt.y == ptLastMousePos.y && - (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH || - htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH )) + (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH || + htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH )) { cScrollDelay = (cScrollDelay + 1) % 5; /* DragOver is called every 50 ms */ if (cScrollDelay == 0) @@ -2626,13 +2623,13 @@ /* Mouse did hover another 250 ms over the scroll-area */ if (htinfo.pt.x < SCROLLAREAWIDTH) SendMessageW(hWndList, WM_HSCROLL, SB_LINEUP, 0); - + if (htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH) SendMessageW(hWndList, WM_HSCROLL, SB_LINEDOWN, 0); - + if (htinfo.pt.y < SCROLLAREAWIDTH) SendMessageW(hWndList, WM_VSCROLL, SB_LINEUP, 0); - + if (htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH) SendMessageW(hWndList, WM_VSCROLL, SB_LINEDOWN, 0); } @@ -2661,7 +2658,7 @@ /* We are not above one of the listview's subitems. Bind to the parent folder's * DropTarget interface. */ hr = pSFParent->QueryInterface(IID_IDropTarget, - (LPVOID*)&pCurDropTarget); + (LPVOID*)&pCurDropTarget); } else { @@ -2674,7 +2671,7 @@ /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = pSFParent->GetUIObjectOf(hWndList, 1, - (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&pCurDropTarget); + (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&pCurDropTarget); } /* If anything failed, pCurDropTarget should be NULL now, which ought to be a save state. */ @@ -2737,7 +2734,7 @@ HRESULT WINAPI CDefView::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); if (fEscapePressed) return DRAGDROP_S_CANCEL; @@ -2749,7 +2746,7 @@ HRESULT WINAPI CDefView::GiveFeedback(DWORD dwEffect) { - TRACE("(%p)\n",this); + TRACE("(%p)\n", this); return DRAGDROP_S_USEDEFAULTCURSORS; } @@ -2760,28 +2757,28 @@ HRESULT WINAPI CDefView::Draw(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue) { - FIXME("Stub: this=%p\n",this); + FIXME("Stub: this=%p\n", this); return E_NOTIMPL; } HRESULT WINAPI CDefView::GetColorSet(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDevice, LOGPALETTE **ppColorSet) { - FIXME("Stub: this=%p\n",this); + FIXME("Stub: this=%p\n", this); return E_NOTIMPL; } HRESULT WINAPI CDefView::Freeze(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { - FIXME("Stub: this=%p\n",this); + FIXME("Stub: this=%p\n", this); return E_NOTIMPL; } HRESULT WINAPI CDefView::Unfreeze(DWORD dwFreeze) { - FIXME("Stub: this=%p\n",this); + FIXME("Stub: this=%p\n", this); return E_NOTIMPL; } @@ -2838,24 +2835,24 @@ if (newView == NULL) return E_POINTER; - + *newView = NULL; ATLTRY (theView = new CComObject<CDefView>); - + if (theView == NULL) return E_OUTOFMEMORY; - + hResult = theView->QueryInterface (IID_IShellView, (void **)&result); if (FAILED (hResult)) { delete theView; return hResult; } - + hResult = theView->Initialize (pFolder); if (FAILED (hResult)) return hResult; *newView = result.Detach (); - + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Tue Dec 20 19:56:46 2011 @@ -208,17 +208,6 @@ { FIXME("SHIsTempDisplayMode() stub\n"); return FALSE; -} - -/* - * Unimplemented - */ -EXTERN_C LONG -WINAPI -SHCreateSessionKey(REGSAM regSam, PHKEY phKey) -{ - FIXME("SHCreateSessionKey() stub\n"); - return 0; } /*

13 years

[ion] 54713: [KERNEL32] Part 2 of the Path patch: rewrite SearchPathW to use the RtlDosSearchPath_UStr function implemented last week. No (visible) regressions seen... let's see what Testbot says.

by ion＠svn.reactos.org

Author: ion Date: Tue Dec 20 19:09:13 2011 New Revision: 54713 URL: http://svn.reactos.org/svn/reactos?rev=54713&view=rev Log: [KERNEL32] Part 2 of the Path patch: rewrite SearchPathW to use the RtlDosSearchPath_UStr function implemented last week. No (visible) regressions seen... let's see what Testbot says. Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Tue Dec 20 19:09:13 2011 @@ -1285,206 +1285,161 @@ return PathSize; } -/*********************************************************************** - * ContainsPath (Wine name: contains_pathW) - * - * Check if the file name contains a path; helper for SearchPathW. - * A relative path is not considered a path unless it starts with ./ or ../ - */ -static -BOOL -ContainsPath(LPCWSTR name) -{ - if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; - if (name[0] != '.') return FALSE; - if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE; - return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); -} - -/** - * @name GetDllLoadPath - * - * Internal function to compute the load path to use for a given dll. - * - * @remarks Returned pointer must be freed by caller. - */ - -LPWSTR -GetDllLoadPath(LPCWSTR lpModule) -{ - ULONG Pos = 0, Length = 4, Tmp; - PWCHAR EnvironmentBufferW = NULL; - LPCWSTR lpModuleEnd = NULL; - UNICODE_STRING ModuleName; - DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */ - - // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. - - if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') - { - lpModuleEnd = lpModule + wcslen(lpModule); - } - else - { - ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; - lpModule = ModuleName.Buffer; - lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); - } - - if (lpModule != NULL) - { - while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && - *lpModuleEnd != L'\\' && *lpModuleEnd != L':') - { - --lpModuleEnd; - } - Length = (lpModuleEnd - lpModule) + 1; - } - - Length += GetCurrentDirectoryW(0, NULL); - Length += GetDllDirectoryW(0, NULL); - Length += GetSystemDirectoryW(NULL, 0); - Length += GetWindowsDirectoryW(NULL, 0); - Length += GetEnvironmentVariableW(L"PATH", NULL, 0); - - EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, - (Length + 1) * sizeof(WCHAR)); - if (EnvironmentBufferW == NULL) - { - return NULL; - } - - if (lpModule) - { - RtlCopyMemory(EnvironmentBufferW, lpModule, - (lpModuleEnd - lpModule) * sizeof(WCHAR)); - Pos += lpModuleEnd - lpModule; - EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); - - /* Make sure buffer is null terminated */ - EnvironmentBufferW[Pos++] = UNICODE_NULL; - - - SetLastError(LastError); - return EnvironmentBufferW; -} - /* * @implemented */ DWORD WINAPI -SearchPathW(LPCWSTR lpPath, - LPCWSTR lpFileName, - LPCWSTR lpExtension, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart) -{ - DWORD ret = 0; - - if (!lpFileName || !lpFileName[0]) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - /* If the name contains an explicit path, ignore the path */ - if (ContainsPath(lpFileName)) - { - /* try first without extension */ - if (RtlDoesFileExists_U(lpFileName)) - return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); - - if (lpExtension) - { - LPCWSTR p = wcsrchr(lpFileName, '.'); - if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) - lpExtension = NULL; /* Ignore the specified extension */ - } - - /* Allocate a buffer for the file name and extension */ - if (lpExtension) - { - LPWSTR tmp; - DWORD len = wcslen(lpFileName) + wcslen(lpExtension); - - if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - wcscpy(tmp, lpFileName); - wcscat(tmp, lpExtension); - if (RtlDoesFileExists_U(tmp)) - ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); - RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); - } - } - else if (lpPath && lpPath[0]) /* search in the specified path */ - { - ret = RtlDosSearchPath_U(lpPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - } - else /* search in the default path */ - { - WCHAR *DllPath = GetDllLoadPath(NULL); - - if (DllPath) - { - ret = RtlDosSearchPath_U(DllPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); +SearchPathW(IN LPCWSTR lpPath, + IN LPCWSTR lpFileName, + IN LPCWSTR lpExtension, + IN DWORD nBufferLength, + IN LPWSTR lpBuffer, + OUT LPWSTR *lpFilePart) +{ + UNICODE_STRING FileNameString, ExtensionString, PathString, CallerBuffer; + ULONG Flags, LengthNeeded, FilePartSize; + NTSTATUS Status; + DWORD Result = 0; + + /* Default flags for RtlDosSearchPath_Ustr */ + Flags = 6; + + /* Clear file part in case we fail */ + if (lpFilePart) *lpFilePart = NULL; + + /* Initialize path buffer for free later */ + PathString.Buffer = NULL; + + /* Convert filename to a unicode string and eliminate trailing spaces */ + RtlInitUnicodeString(&FileNameString, lpFileName); + while ((FileNameString.Length >= sizeof(WCHAR)) && + (FileNameString.Buffer[(FileNameString.Length / sizeof(WCHAR)) - 1] == L' ')) + { + FileNameString.Length -= sizeof(WCHAR); + } + + /* Was it all just spaces? */ + if (!FileNameString.Length) + { + /* Fail out */ + BaseSetLastNTError(STATUS_INVALID_PARAMETER); + goto Quickie; + } + + /* Convert extension to a unicode string */ + RtlInitUnicodeString(&ExtensionString, lpExtension); + + /* Check if the user sent a path */ + if (lpPath) + { + /* Convert it to a unicode string too */ + Status = RtlInitUnicodeStringEx(&PathString, lpPath); + if (NT_ERROR(Status)) + { + /* Fail if it was too long */ + BaseSetLastNTError(Status); + goto Quickie; + } + } + else + { + /* A path wasn't sent, so compute it ourselves */ + PathString.Buffer = BaseComputeProcessSearchPath(); + if (!PathString.Buffer) + { + /* Fail if we couldn't compute it */ + BaseSetLastNTError(STATUS_NO_MEMORY); + goto Quickie; + } + + /* See how big the computed path is */ + LengthNeeded = lstrlenW(PathString.Buffer); + if (LengthNeeded > UNICODE_STRING_MAX_CHARS) + { + /* Fail if it's too long */ + BaseSetLastNTError(STATUS_NAME_TOO_LONG); + goto Quickie; + } + + /* Set the path size now that we have it */ + PathString.MaximumLength = PathString.Length = LengthNeeded * sizeof(WCHAR); + + /* Request SxS isolation from RtlDosSearchPath_Ustr */ + Flags |= 1; + } + + /* Create the string that describes the output buffer from the caller */ + CallerBuffer.Length = 0; + CallerBuffer.Buffer = lpBuffer; + + /* How much space does the caller have? */ + if (nBufferLength <= UNICODE_STRING_MAX_CHARS) + { + /* Add it into the string */ + CallerBuffer.MaximumLength = nBufferLength * sizeof(WCHAR); + } + else + { + /* Caller wants too much, limit it to the maximum length of a string */ + CallerBuffer.MaximumLength = UNICODE_STRING_MAX_BYTES; + } + + /* Call Rtl to do the work */ + Status = RtlDosSearchPath_Ustr(Flags, + &PathString, + &FileNameString, + &ExtensionString, + &CallerBuffer, + NULL, + NULL, + &FilePartSize, + &LengthNeeded); + if (NT_ERROR(Status)) + { + /* Check for unusual status codes */ + if ((Status != STATUS_NO_SUCH_FILE) && (Status != STATUS_BUFFER_TOO_SMALL)) + { + /* Print them out since maybe an app needs fixing */ + DbgPrint("%s on file %wZ failed; NTSTATUS = %08lx\n", + __FUNCTION__, + &FileNameString, + Status); + DbgPrint(" Path = %wZ\n", &PathString); + } + + /* Check if the failure was due to a small buffer */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Check if the length was actually too big for Rtl to work with */ + Result = LengthNeeded / sizeof(WCHAR); + if (Result > 0xFFFFFFFF) BaseSetLastNTError(STATUS_NAME_TOO_LONG); } else { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - } - - if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); - - return ret; + /* Some other error, set the error code */ + BaseSetLastNTError(Status); + } + } + else + { + /* It worked! Write the file part now */ + if (lpFilePart) *lpFilePart = &lpBuffer[FilePartSize]; + + /* Convert the final result length */ + Result = CallerBuffer.Length / sizeof(WCHAR); + } + +Quickie: + /* Check if there was a dynamic path stirng to free */ + if ((PathString.Buffer != lpPath) && (PathString.Buffer)) + { + /* And free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, PathString.Buffer); + } + + /* Return the final result lenght */ + return Result; } /*

13 years

[rharabien] 54712: [SYSSETUP] - Create shortcuts after shell32 registration. Fixes shortcuts not being created during installation.

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Dec 20 18:55:09 2011 New Revision: 54712 URL: http://svn.reactos.org/svn/reactos?rev=54712&view=rev Log: [SYSSETUP] - Create shortcuts after shell32 registration. Fixes shortcuts not being created during installation. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Tue Dec 20 18:55:09 2011 @@ -893,12 +893,6 @@ return 0; } - if (!CreateShortcuts()) - { - FatalError("InitializeProfiles() failed"); - return 0; - } - /* Initialize the Security Account Manager (SAM) */ if (!SamInitializeSAM()) { @@ -982,6 +976,12 @@ RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); + + if (!CreateShortcuts()) + { + FatalError("CreateShortcuts() failed"); + return 0; + } /* ROS HACK, as long as NtUnloadKey is not implemented */ { @@ -1020,7 +1020,7 @@ TerminateSetupActionLog(); /* Get shutdown privilege */ - if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) { FatalError("OpenProcessToken() failed!"); return 0;

13 years

[fireball] 54711: [NTOS] - A number of fixes to CmpQueryKeyName(): * Properly check the provided buffer size against needed size. * Don't overwrite user provided buffer. * Write as much data as cou...

by fireball＠svn.reactos.org

Author: fireball Date: Tue Dec 20 18:16:14 2011 New Revision: 54711 URL: http://svn.reactos.org/svn/reactos?rev=54711&view=rev Log: [NTOS] - A number of fixes to CmpQueryKeyName(): * Properly check the provided buffer size against needed size. * Don't overwrite user provided buffer. * Write as much data as could fit into the buffer (this is normal behaviour for any query function in the kernel), returning STATUS_INFO_LENGTH_MISMATCH if not all data were written. Thanks to r3ddr4g0n for identifying the problem, testing with DPH and testing this patch. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue Dec 20 18:16:14 2011 @@ -121,6 +121,7 @@ IN KPROCESSOR_MODE PreviousMode) { PUNICODE_STRING KeyName; + ULONG BytesToCopy; NTSTATUS Status = STATUS_SUCCESS; PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)ObjectBody; PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; @@ -155,16 +156,32 @@ /* Set the returned length */ *ReturnLength = KeyName->Length + sizeof(OBJECT_NAME_INFORMATION) + sizeof(WCHAR); - /* Check if it fits into the provided buffer */ - if ((Length < sizeof(OBJECT_NAME_INFORMATION)) || - (Length < (*ReturnLength - sizeof(OBJECT_NAME_INFORMATION)))) + /* Calculate amount of bytes to copy into the buffer */ + BytesToCopy = KeyName->Length + sizeof(WCHAR); + + /* Check if the provided buffer is too small to fit even anything */ + if ((Length <= sizeof(OBJECT_NAME_INFORMATION)) || + ((Length < (*ReturnLength)) && (BytesToCopy < sizeof(WCHAR)))) { /* Free the buffer allocated by CmpConstructName */ ExFreePool(KeyName); - /* Return buffer length failure */ + /* Return buffer length failure without writing anything there because nothing fits */ return STATUS_INFO_LENGTH_MISMATCH; } + + /* Check if the provided buffer can be partially written */ + if (Length < (*ReturnLength)) + { + /* Yes, indicate so in the return status */ + Status = STATUS_INFO_LENGTH_MISMATCH; + + /* Calculate amount of bytes which the provided buffer could handle */ + BytesToCopy = Length - sizeof(OBJECT_NAME_INFORMATION); + } + + /* Remove the null termination character from the size */ + BytesToCopy -= sizeof(WCHAR); /* Fill in the result */ _SEH2_TRY @@ -177,7 +194,10 @@ /* Copy string content*/ RtlCopyMemory(ObjectNameInfo->Name.Buffer, KeyName->Buffer, - *ReturnLength); + BytesToCopy); + + /* Null terminate it */ + ObjectNameInfo->Name.Buffer[BytesToCopy / sizeof(WCHAR)] = 0; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

13 years

[ion] 54710: [KERNEL32]: Implement some VDM code that will be needed for future CreateProcessInternalW work. Not called yet.

by ion＠svn.reactos.org

Author: ion Date: Tue Dec 20 16:53:11 2011 New Revision: 54710 URL: http://svn.reactos.org/svn/reactos?rev=54710&view=rev Log: [KERNEL32]: Implement some VDM code that will be needed for future CreateProcessInternalW work. Not called yet. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Tue Dec 20 16:53:11 2011 @@ -15,7 +15,293 @@ /* TYPES **********************************************************************/ +typedef struct _ENV_INFO +{ + ULONG NameType; + ULONG NameLength; + PWCHAR Name; +} ENV_INFO, *PENV_INFO; + +/* GLOBALS ********************************************************************/ + +ENV_INFO BasepEnvNameType[] = +{ + {3, sizeof(L"PATH"), L"PATH"}, + {2, sizeof(L"WINDIR"), L"WINDIR"}, + {2, sizeof(L"SYSTEMROOT"), L"SYSTEMROOT"}, + {3, sizeof(L"TEMP"), L"TEMP"}, + {3, sizeof(L"TMP"), L"TMP"}, +}; + +UNICODE_STRING BaseDotComSuffixName = RTL_CONSTANT_STRING(L".com"); +UNICODE_STRING BaseDotPifSuffixName = RTL_CONSTANT_STRING(L".pif"); +UNICODE_STRING BaseDotExeSuffixName = RTL_CONSTANT_STRING(L".exe"); + /* FUNCTIONS ******************************************************************/ + +ULONG +WINAPI +BaseIsDosApplication(IN PUNICODE_STRING PathName, + IN NTSTATUS Status) +{ + UNICODE_STRING String; + + /* Is it a .com? */ + String.Length = BaseDotComSuffixName.Length; + String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; + if (RtlEqualUnicodeString(&String, &BaseDotComSuffixName, TRUE)) return 2; + + /* Is it a .pif? */ + String.Length = BaseDotPifSuffixName.Length; + String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; + if (RtlEqualUnicodeString(&String, &BaseDotPifSuffixName, TRUE)) return 3; + + /* Is it an exe? */ + String.Length = BaseDotExeSuffixName.Length; + String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; + if (RtlEqualUnicodeString(&String, &BaseDotExeSuffixName, TRUE)) return 1; + return 0; +} + +BOOL +WINAPI +BaseCheckForVDM(IN HANDLE hProcess, + OUT LPDWORD lpExitCode) +{ + NTSTATUS Status; + EVENT_BASIC_INFORMATION EventBasicInfo; + + /* It's VDM if the process is actually a wait handle (an event) */ + Status = NtQueryEvent(hProcess, + EventBasicInformation, + &EventBasicInfo, + sizeof(EventBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* FIXME: Send a message to csrss */ + return FALSE; +} + +BOOL +WINAPI +BaseGetVdmConfigInfo(IN LPCWSTR Reserved, + IN ULONG DosSeqId, + IN ULONG BinaryType, + IN PUNICODE_STRING CmdLineString, + OUT PULONG VdmSize) +{ + WCHAR Buffer[MAX_PATH]; + WCHAR CommandLine[MAX_PATH * 2]; + ULONG Length; + + /* Clear the buffer in case we fail */ + CmdLineString->Buffer = 0; + + /* Always return the same size */ + *VdmSize = 0x1000000; + + /* Get the system directory */ + Length = GetSystemDirectoryW(Buffer, MAX_PATH); + if (!(Length) || (Length >= MAX_PATH)) + { + /* Eliminate no path or path too big */ + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + /* Check if this is VDM with a DOS Sequence ID */ + if (DosSeqId) + { + /* Build the VDM string for it */ + _snwprintf(CommandLine, + sizeof(CommandLine), + L"\"%s\\ntvdm.exe\" -i%lx %s%c", + Buffer, + DosSeqId, + (BinaryType == 0x10) ? L" " : L"-w", + (BinaryType == 0x40) ? 's' : ' '); + } + else + { + /* Non-DOS, build the stirng for it without the task ID */ + _snwprintf(CommandLine, + sizeof(CommandLine), + L"\"%s\\ntvdm.exe\" %s%c", + Buffer, + (BinaryType == 0x10) ? L" " : L"-w", + (BinaryType == 0x40) ? 's' : ' '); + } + + /* Create the actual string */ + return RtlCreateUnicodeString(CmdLineString, CommandLine); +} + +UINT +WINAPI +BaseGetEnvNameType_U(IN PWCHAR Name, + IN ULONG NameLength) +{ + PENV_INFO EnvInfo; + ULONG NameType, i; + + /* Start by assuming unknown type */ + NameType = 1; + + /* Loop all the environment names */ + for (i = 0; i < (sizeof(BasepEnvNameType) / sizeof(ENV_INFO)); i++) + { + /* Get this entry */ + EnvInfo = &BasepEnvNameType[i]; + + /* Check if it matches the name */ + if ((EnvInfo->NameLength == NameLength) && + !(_wcsnicmp(EnvInfo->Name, Name, NameLength))) + { + /* It does, return the type */ + NameType = EnvInfo->NameType; + break; + } + } + + /* Return what we found, or unknown if nothing */ + return NameType; +} + +BOOL +NTAPI +BaseDestroyVDMEnvironment(IN PANSI_STRING AnsiEnv, + IN PUNICODE_STRING UnicodeEnv) +{ + ULONG Dummy = 0; + + /* Clear the ASCII buffer since Rtl creates this for us */ + if (AnsiEnv->Buffer) RtlFreeAnsiString(AnsiEnv); + + /* The Unicode buffer is build by hand, though */ + if (UnicodeEnv->Buffer) + { + /* So clear it through the API */ + NtFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&UnicodeEnv->Buffer, + &Dummy, + MEM_RELEASE); + } + + /* All done */ + return TRUE; +} + +BOOL +NTAPI +BaseCreateVDMEnvironment(IN PWCHAR lpEnvironment, + IN PANSI_STRING AnsiEnv, + IN PUNICODE_STRING UnicodeEnv) +{ + BOOL Result; + ULONG RegionSize, EnvironmentSize = 0; + PWCHAR p, Environment, NewEnvironment; + NTSTATUS Status; + + /* Make sure we have both strings */ + if (!(AnsiEnv) || !(UnicodeEnv)) + { + /* Fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Check if an environment was passed in */ + if (!lpEnvironment) + { + /* Nope, create one */ + Status = RtlCreateEnvironment(TRUE, (PWCHAR*)&Environment); + if (!NT_SUCCESS(Status)) goto Quickie; + } + else + { + /* Use the one we got */ + Environment = lpEnvironment; + } + + /* Do we have something now ? */ + if (!Environment) + { + /* Still not, fail out */ + SetLastError(ERROR_BAD_ENVIRONMENT); + goto Quickie; + } + + /* Count how much space the whole environment takes */ + p = Environment; + while ((*p++ != UNICODE_NULL) && (*p != UNICODE_NULL)) EnvironmentSize++; + EnvironmentSize += sizeof(UNICODE_NULL); + + /* Allocate a new copy */ + RegionSize = (EnvironmentSize + MAX_PATH) * sizeof(WCHAR); + if (!NT_SUCCESS(NtAllocateVirtualMemory(NtCurrentProcess(), + (PVOID*)&NewEnvironment, + 0, + &RegionSize, + MEM_COMMIT, + PAGE_READWRITE))) + { + /* We failed, bail out */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + NewEnvironment = NULL; + goto Quickie; + } + + /* Begin parsing the new environment */ + p = NewEnvironment; + + /* FIXME: Code here */ + + /* Terminate it */ + *p++ = UNICODE_NULL; + + /* Initialize the unicode string to hold it */ + EnvironmentSize = (p - NewEnvironment) * sizeof(WCHAR); + RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, EnvironmentSize); + UnicodeEnv->Length = EnvironmentSize; + + /* Create the ASCII version of it */ + Status = RtlUnicodeStringToAnsiString(AnsiEnv, UnicodeEnv, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Set last error if conversion failure */ + BaseSetLastNTError(Status); + } + else + { + /* Everything went okay, so return success */ + Result = TRUE; + NewEnvironment = NULL; + } + +Quickie: + /* Cleanup path starts here, start by destroying the envrionment copy */ + if (!(lpEnvironment) && (Environment)) RtlDestroyEnvironment(Environment); + + /* See if we are here due to failure */ + if (NewEnvironment) + { + /* Initialize the paths to be empty */ + RtlInitEmptyUnicodeString(UnicodeEnv, NULL, 0); + RtlInitEmptyAnsiString(AnsiEnv, NULL, 0); + + /* Free the environment copy */ + RegionSize = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&NewEnvironment, + &RegionSize, + MEM_RELEASE); + ASSERT(NT_SUCCESS(Status)); + } + + /* Return the result */ + return Result; +} /* Check whether a file is an OS/2 or a very old Windows executable

13 years

[pschweitzer] 54709: [TELNETD] Fix handle leaks

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 20 16:37:21 2011 New Revision: 54709 URL: http://svn.reactos.org/svn/reactos?rev=54709&view=rev Log: [TELNETD] Fix handle leaks Modified: trunk/reactos/base/services/telnetd/telnetd.c Modified: trunk/reactos/base/services/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… ============================================================================== --- trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] Tue Dec 20 16:37:21 2011 @@ -359,7 +359,7 @@ */ static void RunShell(client_t *client) { - DWORD threadID; + HANDLE threadHandle; HANDLE hChildStdinRd; HANDLE hChildStdinWr; HANDLE hChildStdoutRd; @@ -432,9 +432,17 @@ if (!CloseHandle(hChildStdinRd)) ErrorExit("Closing handle failed"); - CreateThread(NULL, 0, WriteToPipeThread, client, 0, &threadID); - CreateThread(NULL, 0, ReadFromPipeThread, client, 0, &threadID); - CreateThread(NULL, 0, MonitorChildThread, client, 0, &threadID); + threadHandle = CreateThread(NULL, 0, WriteToPipeThread, client, 0, NULL); + if (threadHandle != NULL) + CloseHandle(threadHandle); + + threadHandle = CreateThread(NULL, 0, ReadFromPipeThread, client, 0, NULL); + if (threadHandle != NULL) + CloseHandle(threadHandle); + + threadHandle = CreateThread(NULL, 0, MonitorChildThread, client, 0, NULL); + if (threadHandle != NULL) + CloseHandle(threadHandle); } /*

13 years

← Newer
1
...
6
7
8
9
10
11
12
...
25
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 2011