diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index f279379188b..1ce83928aff 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -53,8 +53,8 @@ typedef struct
 
 #define SHV_CHANGE_NOTIFY WM_USER + 0x1111
 
-/* For the context menu of the def view, the id of the items are based on 1 because we need
-   to call TrackPopupMenu and let it use the 0 value as an indication that the menu was canceled */
+// For the context menu of the def view, the id of the items are based on 1 because we need
+// to call TrackPopupMenu and let it use the 0 value as an indication that the menu was canceled
 #define CONTEXT_MENU_BASE_ID 1
 
 class CDefView :
@@ -69,290 +69,289 @@ class CDefView :
     public IViewObject,
     public IServiceProvider
 {
-    private:
-        CComPtr<IShellFolder>     m_pSFParent;
-        CComPtr<IShellFolder2>    m_pSF2Parent;
-        CComPtr<IShellFolderViewCB> m_pShellFolderViewCB;
-        CComPtr<IShellBrowser>    m_pShellBrowser;
-        CComPtr<ICommDlgBrowser>  m_pCommDlgBrowser;
-        CComPtr<IShellFolderViewDual> m_pShellFolderViewDual;
-        CListView                 m_ListView;
-        HWND                      m_hWndParent;
-        FOLDERSETTINGS            m_FolderSettings;
-        HMENU                     m_hMenu;                /* Handle to the menu bar of the browser */
-        HMENU                     m_hMenuArrangeModes;    /* Handle to the popup menu with the arrange modes */
-        HMENU                     m_hMenuViewModes;       /* Handle to the popup menu with the view modes */
-        HMENU                     m_hContextMenu;         /* Handle to the open context menu */
-        BOOL                      m_bmenuBarInitialized;
-        UINT                      m_uState;
-        UINT                      m_cidl;
-        PCUITEMID_CHILD          *m_apidl;
-        PIDLIST_ABSOLUTE          m_pidlParent;
-        LISTVIEW_SORT_INFO        m_sortInfo;
-        ULONG                     m_hNotify;            /* Change notification handle */
-        HACCEL                    m_hAccel;
-        DWORD                     m_dwAspects;
-        DWORD                     m_dwAdvf;
-        CComPtr<IAdviseSink>      m_pAdvSink;
-        // for drag and drop
-        CComPtr<IDataObject>      m_pSourceDataObject;
-        CComPtr<IDropTarget>      m_pCurDropTarget;     /* The sub-item, which is currently dragged over */
-        CComPtr<IDataObject>      m_pCurDataObject;     /* The dragged data-object */
-        LONG                      m_iDragOverItem;      /* Dragged over item's index, iff m_pCurDropTarget != NULL */
-        UINT                      m_cScrollDelay;       /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */
-        POINT                     m_ptLastMousePos;     /* Mouse position at last DragOver call */
-        POINT                     m_ptFirstMousePos;    /* Mouse position when the drag operation started */
-        DWORD                     m_grfKeyState;
-        //
-        CComPtr<IContextMenu>     m_pCM;
+private:
+    CComPtr<IShellFolder>     m_pSFParent;
+    CComPtr<IShellFolder2>    m_pSF2Parent;
+    CComPtr<IShellFolderViewCB> m_pShellFolderViewCB;
+    CComPtr<IShellBrowser>    m_pShellBrowser;
+    CComPtr<ICommDlgBrowser>  m_pCommDlgBrowser;
+    CComPtr<IShellFolderViewDual> m_pShellFolderViewDual;
+    CListView                 m_ListView;
+    HWND                      m_hWndParent;
+    FOLDERSETTINGS            m_FolderSettings;
+    HMENU                     m_hMenu;                // Handle to the menu bar of the browser
+    HMENU                     m_hMenuArrangeModes;    // Handle to the popup menu with the arrange modes
+    HMENU                     m_hMenuViewModes;       // Handle to the popup menu with the view modes
+    HMENU                     m_hContextMenu;         // Handle to the open context menu
+    BOOL                      m_bmenuBarInitialized;
+    UINT                      m_uState;
+    UINT                      m_cidl;
+    PCUITEMID_CHILD          *m_apidl;
+    PIDLIST_ABSOLUTE          m_pidlParent;
+    LISTVIEW_SORT_INFO        m_sortInfo;
+    ULONG                     m_hNotify;            // Change notification handle
+    HACCEL                    m_hAccel;
+    DWORD                     m_dwAspects;
+    DWORD                     m_dwAdvf;
+    CComPtr<IAdviseSink>      m_pAdvSink;
+    // for drag and drop
+    CComPtr<IDataObject>      m_pSourceDataObject;
+    CComPtr<IDropTarget>      m_pCurDropTarget;     // The sub-item, which is currently dragged over
+    CComPtr<IDataObject>      m_pCurDataObject;     // The dragged data-object
+    LONG                      m_iDragOverItem;      // Dragged over item's index, if m_pCurDropTarget != NULL
+    UINT                      m_cScrollDelay;       // Send a WM_*SCROLL msg every 250 ms during drag-scroll
+    POINT                     m_ptLastMousePos;     // Mouse position at last DragOver call
+    POINT                     m_ptFirstMousePos;    // Mouse position when the drag operation started
+    DWORD                     m_grfKeyState;
+    //
+    CComPtr<IContextMenu>     m_pCM;
 
-        BOOL                      m_isEditing;
+    BOOL                      m_isEditing;
 
-        CLSID m_Category;
-        BOOL  m_Destroyed;
+    CLSID m_Category;
+    BOOL  m_Destroyed;
 
-    private:
-        HRESULT _MergeToolbar();
-        BOOL _Sort();
-        VOID _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
+    HRESULT _MergeToolbar();
+    BOOL _Sort();
+    VOID _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
 
-    public:
-        CDefView();
-        ~CDefView();
-        HRESULT WINAPI Initialize(IShellFolder *shellFolder);
-        HRESULT IncludeObject(PCUITEMID_CHILD pidl);
-        HRESULT OnDefaultCommand();
-        HRESULT OnStateChange(UINT uFlags);
-        void UpdateStatusbar();
-        void CheckToolbar();
-        void SetStyle(DWORD dwAdd, DWORD dwRemove);
-        BOOL CreateList();
-        void UpdateListColors();
-        BOOL InitList();
-        static INT CALLBACK ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData);
+public:
+    CDefView();
+    ~CDefView();
+    HRESULT WINAPI Initialize(IShellFolder *shellFolder);
+    HRESULT IncludeObject(PCUITEMID_CHILD pidl);
+    HRESULT OnDefaultCommand();
+    HRESULT OnStateChange(UINT uFlags);
+    void UpdateStatusbar();
+    void CheckToolbar();
+    void SetStyle(DWORD dwAdd, DWORD dwRemove);
+    BOOL CreateList();
+    void UpdateListColors();
+    BOOL InitList();
+    static INT CALLBACK ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData);
 
-        PCUITEMID_CHILD _PidlByItem(int i);
-        PCUITEMID_CHILD _PidlByItem(LVITEM& lvItem);
-        int LV_FindItemByPidl(PCUITEMID_CHILD pidl);
-        BOOLEAN LV_AddItem(PCUITEMID_CHILD pidl);
-        BOOLEAN LV_DeleteItem(PCUITEMID_CHILD pidl);
-        BOOLEAN LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew);
-        BOOLEAN LV_ProdItem(PCUITEMID_CHILD pidl);
-        static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg);
-        HRESULT FillList();
-        HRESULT FillFileMenu();
-        HRESULT FillEditMenu();
-        HRESULT FillViewMenu();
-        HRESULT FillArrangeAsMenu(HMENU hmenuArrange);
-        HRESULT CheckViewMode(HMENU hmenuView);
-        UINT GetSelections();
-        HRESULT OpenSelectedItems();
-        void OnDeactivate();
-        void DoActivate(UINT uState);
-        HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
-        HRESULT InvokeContextMenuCommand(UINT uCommand);
-        LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection);
+    PCUITEMID_CHILD _PidlByItem(int i);
+    PCUITEMID_CHILD _PidlByItem(LVITEM& lvItem);
+    int LV_FindItemByPidl(PCUITEMID_CHILD pidl);
+    BOOLEAN LV_AddItem(PCUITEMID_CHILD pidl);
+    BOOLEAN LV_DeleteItem(PCUITEMID_CHILD pidl);
+    BOOLEAN LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew);
+    BOOLEAN LV_ProdItem(PCUITEMID_CHILD pidl);
+    static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg);
+    HRESULT FillList();
+    HRESULT FillFileMenu();
+    HRESULT FillEditMenu();
+    HRESULT FillViewMenu();
+    HRESULT FillArrangeAsMenu(HMENU hmenuArrange);
+    HRESULT CheckViewMode(HMENU hmenuView);
+    UINT GetSelections();
+    HRESULT OpenSelectedItems();
+    void OnDeactivate();
+    void DoActivate(UINT uState);
+    HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
+    HRESULT InvokeContextMenuCommand(UINT uCommand);
+    LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection);
 
-        // *** IOleWindow methods ***
-        virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd);
-        virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+    // *** 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(PCUITEMID_CHILD pidlItem, SVSIF uFlags);
-        virtual HRESULT STDMETHODCALLTYPE GetItemObject(UINT uItem, REFIID riid, void **ppv);
+    // *** 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(PCUITEMID_CHILD pidlItem, SVSIF uFlags);
+    virtual HRESULT STDMETHODCALLTYPE GetItemObject(UINT uItem, REFIID riid, void **ppv);
 
-        // *** IShellView2 methods ***
-        virtual HRESULT STDMETHODCALLTYPE GetView(SHELLVIEWID *view_guid, ULONG view_type);
-        virtual HRESULT STDMETHODCALLTYPE CreateViewWindow2(LPSV2CVW2_PARAMS view_params);
-        virtual HRESULT STDMETHODCALLTYPE HandleRename(LPCITEMIDLIST new_pidl);
-        virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItem(LPCITEMIDLIST item, UINT flags, POINT *point);
+    // *** IShellView2 methods ***
+    virtual HRESULT STDMETHODCALLTYPE GetView(SHELLVIEWID *view_guid, ULONG view_type);
+    virtual HRESULT STDMETHODCALLTYPE CreateViewWindow2(LPSV2CVW2_PARAMS view_params);
+    virtual HRESULT STDMETHODCALLTYPE HandleRename(LPCITEMIDLIST new_pidl);
+    virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItem(LPCITEMIDLIST item, UINT flags, POINT *point);
 
-        // *** IShellView3 methods ***
-        virtual HRESULT STDMETHODCALLTYPE CreateViewWindow3(IShellBrowser *psb, IShellView *psvPrevious, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, RECT *prcView, HWND *hwnd);
+    // *** IShellView3 methods ***
+    virtual HRESULT STDMETHODCALLTYPE CreateViewWindow3(IShellBrowser *psb, IShellView *psvPrevious, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, RECT *prcView, HWND *hwnd);
 
-        // *** 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, PITEMID_CHILD *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(PCUITEMID_CHILD 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, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags);
+    // *** 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, PITEMID_CHILD *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(PCUITEMID_CHILD 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, PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD dwFlags);
 
-        // *** IShellFolderView methods ***
-        virtual HRESULT STDMETHODCALLTYPE Rearrange(LPARAM sort);
-        virtual HRESULT STDMETHODCALLTYPE GetArrangeParam(LPARAM *sort);
-        virtual HRESULT STDMETHODCALLTYPE ArrangeGrid();
-        virtual HRESULT STDMETHODCALLTYPE AutoArrange();
-        virtual HRESULT STDMETHODCALLTYPE AddObject(PITEMID_CHILD pidl, UINT *item);
-        virtual HRESULT STDMETHODCALLTYPE GetObject(PITEMID_CHILD *pidl, UINT item);
-        virtual HRESULT STDMETHODCALLTYPE RemoveObject(PITEMID_CHILD pidl, UINT *item);
-        virtual HRESULT STDMETHODCALLTYPE GetObjectCount(UINT *count);
-        virtual HRESULT STDMETHODCALLTYPE SetObjectCount(UINT count, UINT flags);
-        virtual HRESULT STDMETHODCALLTYPE UpdateObject(PITEMID_CHILD pidl_old, PITEMID_CHILD pidl_new, UINT *item);
-        virtual HRESULT STDMETHODCALLTYPE RefreshObject(PITEMID_CHILD pidl, UINT *item);
-        virtual HRESULT STDMETHODCALLTYPE SetRedraw(BOOL redraw);
-        virtual HRESULT STDMETHODCALLTYPE GetSelectedCount(UINT *count);
-        virtual HRESULT STDMETHODCALLTYPE GetSelectedObjects(PCUITEMID_CHILD **pidl, UINT *items);
-        virtual HRESULT STDMETHODCALLTYPE IsDropOnSource(IDropTarget *drop_target);
-        virtual HRESULT STDMETHODCALLTYPE GetDragPoint(POINT *pt);
-        virtual HRESULT STDMETHODCALLTYPE GetDropPoint(POINT *pt);
-        virtual HRESULT STDMETHODCALLTYPE MoveIcons(IDataObject *obj);
-        virtual HRESULT STDMETHODCALLTYPE SetItemPos(PCUITEMID_CHILD pidl, POINT *pt);
-        virtual HRESULT STDMETHODCALLTYPE IsBkDropTarget(IDropTarget *drop_target);
-        virtual HRESULT STDMETHODCALLTYPE SetClipboard(BOOL move);
-        virtual HRESULT STDMETHODCALLTYPE SetPoints(IDataObject *obj);
-        virtual HRESULT STDMETHODCALLTYPE GetItemSpacing(ITEMSPACING *spacing);
-        virtual HRESULT STDMETHODCALLTYPE SetCallback(IShellFolderViewCB *new_cb, IShellFolderViewCB **old_cb);
-        virtual HRESULT STDMETHODCALLTYPE Select(UINT flags);
-        virtual HRESULT STDMETHODCALLTYPE QuerySupport(UINT *support);
-        virtual HRESULT STDMETHODCALLTYPE SetAutomationObject(IDispatch *disp);
+    // *** IShellFolderView methods ***
+    virtual HRESULT STDMETHODCALLTYPE Rearrange(LPARAM sort);
+    virtual HRESULT STDMETHODCALLTYPE GetArrangeParam(LPARAM *sort);
+    virtual HRESULT STDMETHODCALLTYPE ArrangeGrid();
+    virtual HRESULT STDMETHODCALLTYPE AutoArrange();
+    virtual HRESULT STDMETHODCALLTYPE AddObject(PITEMID_CHILD pidl, UINT *item);
+    virtual HRESULT STDMETHODCALLTYPE GetObject(PITEMID_CHILD *pidl, UINT item);
+    virtual HRESULT STDMETHODCALLTYPE RemoveObject(PITEMID_CHILD pidl, UINT *item);
+    virtual HRESULT STDMETHODCALLTYPE GetObjectCount(UINT *count);
+    virtual HRESULT STDMETHODCALLTYPE SetObjectCount(UINT count, UINT flags);
+    virtual HRESULT STDMETHODCALLTYPE UpdateObject(PITEMID_CHILD pidl_old, PITEMID_CHILD pidl_new, UINT *item);
+    virtual HRESULT STDMETHODCALLTYPE RefreshObject(PITEMID_CHILD pidl, UINT *item);
+    virtual HRESULT STDMETHODCALLTYPE SetRedraw(BOOL redraw);
+    virtual HRESULT STDMETHODCALLTYPE GetSelectedCount(UINT *count);
+    virtual HRESULT STDMETHODCALLTYPE GetSelectedObjects(PCUITEMID_CHILD **pidl, UINT *items);
+    virtual HRESULT STDMETHODCALLTYPE IsDropOnSource(IDropTarget *drop_target);
+    virtual HRESULT STDMETHODCALLTYPE GetDragPoint(POINT *pt);
+    virtual HRESULT STDMETHODCALLTYPE GetDropPoint(POINT *pt);
+    virtual HRESULT STDMETHODCALLTYPE MoveIcons(IDataObject *obj);
+    virtual HRESULT STDMETHODCALLTYPE SetItemPos(PCUITEMID_CHILD pidl, POINT *pt);
+    virtual HRESULT STDMETHODCALLTYPE IsBkDropTarget(IDropTarget *drop_target);
+    virtual HRESULT STDMETHODCALLTYPE SetClipboard(BOOL move);
+    virtual HRESULT STDMETHODCALLTYPE SetPoints(IDataObject *obj);
+    virtual HRESULT STDMETHODCALLTYPE GetItemSpacing(ITEMSPACING *spacing);
+    virtual HRESULT STDMETHODCALLTYPE SetCallback(IShellFolderViewCB *new_cb, IShellFolderViewCB **old_cb);
+    virtual HRESULT STDMETHODCALLTYPE Select(UINT flags);
+    virtual HRESULT STDMETHODCALLTYPE QuerySupport(UINT *support);
+    virtual HRESULT STDMETHODCALLTYPE SetAutomationObject(IDispatch *disp);
 
-        // *** 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);
+    // *** 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);
+    // *** 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);
+    // *** 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);
+    // *** 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);
+    // *** 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 OnNCCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
-        LRESULT OnNCDestroy(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);
-        LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
-        LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    // 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 OnNCCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT OnNCDestroy(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);
+    LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+    LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 
-        static ATL::CWndClassInfo& GetWndClassInfo()
+    static ATL::CWndClassInfo& GetWndClassInfo()
+    {
+        static ATL::CWndClassInfo wc =
         {
-            static ATL::CWndClassInfo wc =
-            {
-                {   sizeof(WNDCLASSEX), CS_PARENTDC, StartWindowProc,
-                    0, 0, NULL, NULL,
-                    LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_WINDOW + 1), NULL, SV_CLASS_NAME, NULL
-                },
-                NULL, NULL, IDC_ARROW, TRUE, 0, _T("")
-            };
-            return wc;
-        }
+            {   sizeof(WNDCLASSEX), CS_PARENTDC, StartWindowProc,
+                0, 0, NULL, NULL,
+                LoadCursor(NULL, IDC_ARROW), (HBRUSH)(COLOR_WINDOW + 1), NULL, SV_CLASS_NAME, NULL
+            },
+            NULL, NULL, IDC_ARROW, TRUE, 0, _T("")
+        };
+        return wc;
+    }
 
-        virtual WNDPROC GetWindowProc()
-        {
-            return WindowProc;
-        }
+    virtual WNDPROC GetWindowProc()
+    {
+        return WindowProc;
+    }
 
-        static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-        {
-            CDefView *pThis;
-            LRESULT  result;
+    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;
-        }
+        // 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_NCCREATE, OnNCCreate)
-        MESSAGE_HANDLER(WM_NCDESTROY, OnNCDestroy)
-        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)
-        MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
-        MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup)
-        END_MSG_MAP()
+    BEGIN_MSG_MAP(CDefView)
+    MESSAGE_HANDLER(WM_SIZE, OnSize)
+    MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus)
+    MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus)
+    MESSAGE_HANDLER(WM_NCCREATE, OnNCCreate)
+    MESSAGE_HANDLER(WM_NCDESTROY, OnNCDestroy)
+    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)
+    MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
+    MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup)
+    END_MSG_MAP()
 
-        BEGIN_COM_MAP(CDefView)
-        // Windows returns E_NOINTERFACE for IOleWindow
-        // COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
-        COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView)
-        COM_INTERFACE_ENTRY_IID(IID_CDefView, IShellView)
-        COM_INTERFACE_ENTRY_IID(IID_IShellView2, IShellView2)
-        COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView)
-        COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView)
-        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()
+    BEGIN_COM_MAP(CDefView)
+    // Windows returns E_NOINTERFACE for IOleWindow
+    // COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
+    COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView)
+    COM_INTERFACE_ENTRY_IID(IID_CDefView, IShellView)
+    COM_INTERFACE_ENTRY_IID(IID_IShellView2, IShellView2)
+    COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView)
+    COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView)
+    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()
 };
 
-/*menu items */
+// menu items
 #define IDM_VIEW_FILES  (FCIDM_SHVIEWFIRST + 0x500)
 #define IDM_VIEW_IDW    (FCIDM_SHVIEWFIRST + 0x501)
 #define IDM_MYFILEITEM  (FCIDM_SHVIEWFIRST + 0x502)
 
 #define ID_LISTVIEW     1
 
-/*windowsx.h */
+// windowsx.h
 #define GET_WM_COMMAND_ID(wp, lp)       LOWORD(wp)
 #define GET_WM_COMMAND_HWND(wp, lp)     (HWND)(lp)
 #define GET_WM_COMMAND_CMD(wp, lp)      HIWORD(wp)
@@ -406,10 +405,8 @@ HRESULT WINAPI CDefView::Initialize(IShellFolder *shellFolder)
     return S_OK;
 }
 
-/**********************************************************
- *
- * ##### helperfunctions for communication with ICommDlgBrowser #####
- */
+// ##### helperfunctions for communication with ICommDlgBrowser #####
+
 HRESULT CDefView::IncludeObject(PCUITEMID_CHILD pidl)
 {
     HRESULT ret = S_OK;
@@ -418,7 +415,6 @@ HRESULT CDefView::IncludeObject(PCUITEMID_CHILD pidl)
     {
         TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl);
         ret = m_pCommDlgBrowser->IncludeObject(this, pidl);
-        TRACE("--0x%08x\n", ret);
     }
 
     return ret;
@@ -432,7 +428,6 @@ HRESULT CDefView::OnDefaultCommand()
     {
         TRACE("ICommDlgBrowser::OnDefaultCommand\n");
         ret = m_pCommDlgBrowser->OnDefaultCommand(this);
-        TRACE("-- returns %08x\n", ret);
     }
 
     return ret;
@@ -496,13 +491,10 @@ void CDefView::UpdateStatusbar()
     m_pShellBrowser->SetStatusTextSB(szObjects);
 }
 
-/**********************************************************
- *
- * ##### helperfunctions for initializing the view #####
- */
-/**********************************************************
- *    change the style of the listview control
- */
+
+// ##### helperfunctions for initializing the view #####
+
+// change the style of the listview control
 void CDefView::SetStyle(DWORD dwAdd, DWORD dwRemove)
 {
     DWORD tmpstyle;
@@ -513,11 +505,7 @@ void CDefView::SetStyle(DWORD dwAdd, DWORD dwRemove)
     ::SetWindowLongPtrW(m_ListView, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
 }
 
-/**********************************************************
-* ShellView_CreateList()
-*
-* - creates the list view window
-*/
+// creates the list view window
 BOOL CDefView::CreateList()
 {
     DWORD dwStyle, dwExStyle;
@@ -538,19 +526,15 @@ BOOL CDefView::CreateList()
         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:
             dwStyle |= LVS_LIST;
             break;
@@ -622,11 +606,7 @@ void CDefView::UpdateListColors()
     }
 }
 
-/**********************************************************
-* ShellView_InitList()
-*
-* - adds all needed columns to the shellview
-*/
+// adds all needed columns to the shellview
 BOOL CDefView::InitList()
 {
     SHELLDETAILS sd;
@@ -707,7 +687,7 @@ BOOL CDefView::_Sort()
     hHeader = (HWND)m_ListView.SendMessage(LVM_GETHEADER, 0, 0);
     ZeroMemory(&hColumn, sizeof(hColumn));
 
-    /* If the sorting column changed, remove the sorting style from the old column */
+    // If the sorting column changed, remove sorting style from the old column
     if ( (m_sortInfo.nLastHeaderID != -1) &&
          (m_sortInfo.nLastHeaderID != m_sortInfo.nHeaderID) )
     {
@@ -740,9 +720,6 @@ PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem)
     return reinterpret_cast<PCUITEMID_CHILD>(lvItem.lParam);
 }
 
-/**********************************************************
-*  LV_FindItemByPidl()
-*/
 int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl)
 {
     int cItems = m_ListView.GetItemCount();
@@ -751,30 +728,24 @@ int CDefView::LV_FindItemByPidl(PCUITEMID_CHILD pidl)
     {
         PCUITEMID_CHILD currentpidl = _PidlByItem(i);
         HRESULT hr = m_pSFParent->CompareIDs(0, pidl, currentpidl);
-
         if (SUCCEEDED(hr) && !HRESULT_CODE(hr))
-        {
             return i;
-        }
     }
     return -1;
 }
 
-/**********************************************************
-* LV_AddItem()
-*/
 BOOLEAN CDefView::LV_AddItem(PCUITEMID_CHILD pidl)
 {
     LVITEMW lvItem;
 
     TRACE("(%p)(pidl=%p)\n", this, pidl);
 
-    lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;    /*set the mask*/
-    lvItem.iItem = m_ListView.GetItemCount();             /*add the item to the end of the list*/
+    lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;    // set mask
+    lvItem.iItem = m_ListView.GetItemCount();             // add item to lists end
     lvItem.iSubItem = 0;
-    lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(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*/
+    lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidl)); // set item's data
+    lvItem.pszText = LPSTR_TEXTCALLBACKW;                 // get text on a callback basis
+    lvItem.iImage = I_IMAGECALLBACK;                      // get image on a callback basis
     lvItem.stateMask = LVIS_CUT;
 
     if (m_ListView.InsertItem(&lvItem) == -1)
@@ -783,9 +754,6 @@ BOOLEAN CDefView::LV_AddItem(PCUITEMID_CHILD pidl)
         return TRUE;
 }
 
-/**********************************************************
-* LV_DeleteItem()
-*/
 BOOLEAN CDefView::LV_DeleteItem(PCUITEMID_CHILD pidl)
 {
     int nIndex;
@@ -797,9 +765,6 @@ BOOLEAN CDefView::LV_DeleteItem(PCUITEMID_CHILD pidl)
     return (-1 == m_ListView.DeleteItem(nIndex)) ? FALSE : TRUE;
 }
 
-/**********************************************************
-* LV_RenameItem()
-*/
 BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew)
 {
     int nItem;
@@ -809,9 +774,9 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew
 
     nItem = LV_FindItemByPidl(pidlOld);
 
-    if ( -1 != nItem )
+    if (-1 != nItem)
     {
-        lvItem.mask = LVIF_PARAM;        /* only the pidl */
+        lvItem.mask = LVIF_PARAM; // only the pidl
         lvItem.iItem = nItem;
         lvItem.iSubItem = 0;
         m_ListView.GetItem(&lvItem);
@@ -820,19 +785,16 @@ BOOLEAN CDefView::LV_RenameItem(PCUITEMID_CHILD pidlOld, PCUITEMID_CHILD pidlNew
         lvItem.mask = LVIF_PARAM|LVIF_IMAGE;
         lvItem.iItem = nItem;
         lvItem.iSubItem = 0;
-        lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidlNew));    /* set the item's data */
+        lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidlNew)); // set item's data
         lvItem.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidlNew, 0);
         m_ListView.SetItem(&lvItem);
         m_ListView.Update(nItem);
-        return TRUE;                    /* FIXME: better handling */
+        return TRUE; // FIXME: better handling
     }
 
     return FALSE;
 }
 
-/**********************************************************
-* LV_ProdItem()
-*/
 BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
 {
     int nItem;
@@ -856,19 +818,12 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
     return FALSE;
 }
 
-/**********************************************************
-* ShellView_FillList()
-*
-* - gets the objectlist from the shellfolder
-* - sorts the list
-* - fills the list into the view
-*/
 INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg)
 {
     PITEMID_CHILD pidl = static_cast<PITEMID_CHILD>(ptr);
     CDefView *pThis = static_cast<CDefView *>(arg);
 
-    /* in a commdlg This works as a filemask*/
+    // in a commdlg this works as a filemask
     if (pThis->IncludeObject(pidl) == S_OK)
         pThis->LV_AddItem(pidl);
 
@@ -876,6 +831,10 @@ INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg)
     return TRUE;
 }
 
+///
+// - gets the objectlist from the shellfolder
+// - sorts the list
+// - fills the list into the view
 HRESULT CDefView::FillList()
 {
     CComPtr<IEnumIDList> pEnumIDList;
@@ -888,7 +847,7 @@ HRESULT CDefView::FillList()
 
     TRACE("%p\n", this);
 
-    /* determine if there is a setting to show all the hidden files/folders */
+    // determine if there is a setting to show all the hidden files/folders
     if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
         DWORD dataLength, flagVal;
@@ -896,19 +855,17 @@ HRESULT CDefView::FillList()
         dataLength = sizeof(flagVal);
         if (RegQueryValueExW(hKey, L"Hidden", NULL, NULL, (LPBYTE)&flagVal, &dataLength) == ERROR_SUCCESS)
         {
-            /* if the value is 1, then show all hidden files/folders */
+            // if the value is 1, then show all hidden files/folders
             if (flagVal == 1)
             {
                 dFlags |= SHCONTF_INCLUDEHIDDEN;
                 m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0);
             }
         }
-
-        /* close the key */
         RegCloseKey(hKey);
     }
 
-    /* get the itemlist from the shfolder */
+    // get the itemlist from the shfolder
     hRes = m_pSFParent->EnumObjects(m_hWnd, dFlags, &pEnumIDList);
     if (hRes != S_OK)
     {
@@ -917,14 +874,12 @@ HRESULT CDefView::FillList()
         return(hRes);
     }
 
-    /* create a pointer array */
+    // create a pointer array
     hdpa = DPA_Create(16);
     if (!hdpa)
-    {
         return(E_OUTOFMEMORY);
-    }
 
-    /* copy the items into the array*/
+    // copy the items into the array
     while((S_OK == pEnumIDList->Next(1, &pidl, &dwFetched)) && dwFetched)
     {
         if (DPA_InsertPtr(hdpa, 0x7fff, pidl) == -1)
@@ -933,7 +888,7 @@ HRESULT CDefView::FillList()
         }
     }
 
-    /*turn the listview's redrawing off*/
+    // turn listview's redrawing off
     m_ListView.SetRedraw(FALSE);
 
     DPA_DestroyCallback( hdpa, fill_list, this);
@@ -950,7 +905,7 @@ HRESULT CDefView::FillList()
     m_sortInfo.bIsAscending = TRUE;
     _Sort();
 
-    /*turn the listview's redrawing back on and force it to draw*/
+    // turn listview's redrawing back on and force it to draw
     m_ListView.SetRedraw(TRUE);
 
     _DoFolderViewCB(SFVM_LISTREFRESHED, NULL, NULL);
@@ -1028,9 +983,6 @@ LRESULT CDefView::OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHa
     return 0;
 }
 
-/**********************************************************
-*  ShellView_OnCreate()
-*/
 LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     CComPtr<IDropTarget>     pdt;
@@ -1050,7 +1002,7 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
     if (SUCCEEDED(QueryInterface(IID_PPV_ARG(IDropTarget, &pdt))))
     {
         if (FAILED(RegisterDragDrop(m_hWnd, pdt)))
-            ERR("Registering Drag Drop Failed");
+            ERR("Error Registering DragDrop\n");
     }
 
     /* register for receiving notifications */
@@ -1063,8 +1015,6 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
         m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_InterruptLevel | SHCNRF_ShellLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg);
     }
 
-    /* _DoFolderViewCB(SFVM_GETNOTIFY, ??  ??) */
-
     m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW));
 
     UpdateStatusbar();
@@ -1072,9 +1022,7 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
     return S_OK;
 }
 
-/**********************************************************
- *    #### Handling of the menus ####
- */
+// #### Handling of the menus ####
 
 extern "C" DWORD WINAPI SHMenuIndexFromID(HMENU hMenu, UINT uID);
 
@@ -1087,8 +1035,8 @@ HMENU GetSubmenuByID(HMENU hmenu, UINT id)
     return NULL;
 }
 
-/* ReallyGetMenuItemID returns the id of an item even if it opens a submenu,
-   GetMenuItemID returns -1 if the specified item opens a submenu */
+// ReallyGetMenuItemID returns the id of an item even if it opens a submenu,
+// GetMenuItemID returns -1 if the specified item opens a submenu
 UINT ReallyGetMenuItemID(HMENU hmenu, int i)
 {
     MENUITEMINFOW mii = {sizeof(mii), MIIM_ID};
@@ -1112,7 +1060,7 @@ HRESULT CDefView::FillFileMenu()
             DeleteMenu(hFileMenu, i, MF_BYPOSITION);
     }
 
-    /* Store the context menu in m_pCM and keep it in order to invoke the selected command later on */
+    // Store context menu in m_pCM and keep it to invoke the selected command later on
     HRESULT hr = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pCM));
     if (FAILED_UNEXPECTEDLY(hr))
         return hr;
@@ -1196,14 +1144,11 @@ HRESULT CDefView::CheckViewMode(HMENU hmenuView)
     return S_OK;
 }
 
-/**********************************************************
-*   ShellView_GetSelections()
-*
-* - fills the m_apidl list with the selected objects
-*
-* RETURNS
-*  number of selected items
-*/
+///
+// - fills the m_apidl list with the selected objects
+//
+// RETURNS
+//  number of selected items
 UINT CDefView::GetSelections()
 {
     SHFree(m_apidl);
@@ -1254,9 +1199,6 @@ HRESULT CDefView::InvokeContextMenuCommand(UINT uCommand)
     return S_OK;
 }
 
-/**********************************************************
- *    ShellView_OpenSelectedItems()
- */
 HRESULT CDefView::OpenSelectedItems()
 {
     HMENU hMenu;
@@ -1293,7 +1235,6 @@ HRESULT CDefView::OpenSelectedItems()
     InvokeContextMenuCommand(uCommand);
 
 cleanup:
-
     if (hMenu)
         DestroyMenu(hMenu);
 
@@ -1306,9 +1247,6 @@ cleanup:
     return hResult;
 }
 
-/**********************************************************
- *    ShellView_DoContextMenu()
- */
 LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     WORD    x, y;
@@ -1318,19 +1256,18 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
     x = LOWORD(lParam);
     y = HIWORD(lParam);
 
-    TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y);
+    TRACE("(%p)\n", this);
 
     m_hContextMenu = CreatePopupMenu();
     if (!m_hContextMenu)
         return E_FAIL;
 
     m_cidl = m_ListView.GetSelectedCount();
-
-    hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
+    hResult = GetItemObject(m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
     if (FAILED_UNEXPECTEDLY(hResult))
         goto cleanup;
 
-    /* Use 1 as the first id as we want 0 the mean that the user canceled the menu */
+    // Use 1 as the first id we want. 0 means that user canceled the menu
     hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, CONTEXT_MENU_BASE_ID, FCIDM_SHVIEWLAST, CMF_NORMAL);
     if (FAILED_UNEXPECTEDLY(hResult))
         goto cleanup;
@@ -1367,8 +1304,8 @@ LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection)
     HRESULT hResult;
     HMENU hMenu = NULL;
 
-    hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
-    if (FAILED_UNEXPECTEDLY( hResult))
+    hResult = GetItemObject(bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM));
+    if (FAILED_UNEXPECTEDLY(hResult))
         goto cleanup;
     if ((uCommand != FCIDM_SHVIEW_DELETE) && (uCommand != FCIDM_SHVIEW_RENAME))
     {
@@ -1396,13 +1333,8 @@ cleanup:
     return 0;
 }
 
-/**********************************************************
- *    ##### message handling #####
- */
+// ##### message handling #####
 
-/**********************************************************
-*  ShellView_OnSize()
-*/
 LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     WORD wWidth, wHeight;
@@ -1414,21 +1346,14 @@ LRESULT CDefView::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled
 
     /* Resize the ListView to fit our window */
     if (m_ListView)
-    {
         ::MoveWindow(m_ListView, 0, 0, wWidth, wHeight, TRUE);
-    }
 
     _DoFolderViewCB(SFVM_SIZE, 0, 0);
 
     return 0;
 }
 
-/**********************************************************
-* ShellView_OnDeactivate()
-*
-* NOTES
-*  internal
-*/
+// internal
 void CDefView::OnDeactivate()
 {
     TRACE("%p\n", this);
@@ -1436,7 +1361,6 @@ void CDefView::OnDeactivate()
     if (m_uState != SVUIA_DEACTIVATE)
     {
         // TODO: cleanup menu after deactivation
-
         m_uState = SVUIA_DEACTIVATE;
     }
 }
@@ -1445,7 +1369,7 @@ void CDefView::DoActivate(UINT uState)
 {
     TRACE("%p uState=%x\n", this, uState);
 
-    /*don't do anything if the state isn't really changing */
+    // don't do anything if the state isn't really changing
     if (m_uState == uState)
     {
         return;
@@ -1475,19 +1399,12 @@ void CDefView::DoActivate(UINT uState)
     TRACE("--\n");
 }
 
-/**********************************************************
-* ShellView_OnActivate()
-*/
 LRESULT CDefView::OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     DoActivate(SVUIA_ACTIVATE_FOCUS);
     return 0;
 }
 
-/**********************************************************
-*  ShellView_OnSetFocus()
-*
-*/
 LRESULT CDefView::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     TRACE("%p\n", this);
@@ -1508,9 +1425,6 @@ LRESULT CDefView::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHan
     return 0;
 }
 
-/**********************************************************
-* ShellView_OnKillFocus()
-*/
 LRESULT CDefView::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     TRACE("(%p) stub\n", this);
@@ -1522,12 +1436,7 @@ LRESULT CDefView::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHa
     return 0;
 }
 
-/**********************************************************
-* ShellView_OnCommand()
-*
-* NOTES
-*    the CmdID's are the ones from the context menu
-*/
+// the CmdID's are the ones from the context menu
 LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     DWORD dwCmdID;
@@ -1545,28 +1454,24 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
     {
         case FCIDM_SHVIEW_SMALLICON:
             m_FolderSettings.ViewMode = FVM_SMALLICON;
-            SetStyle (LVS_SMALLICON, LVS_TYPEMASK);
+            SetStyle(LVS_SMALLICON, LVS_TYPEMASK);
             CheckToolbar();
             break;
-
         case FCIDM_SHVIEW_BIGICON:
             m_FolderSettings.ViewMode = FVM_ICON;
-            SetStyle (LVS_ICON, LVS_TYPEMASK);
+            SetStyle(LVS_ICON, LVS_TYPEMASK);
             CheckToolbar();
             break;
-
         case FCIDM_SHVIEW_LISTVIEW:
             m_FolderSettings.ViewMode = FVM_LIST;
-            SetStyle (LVS_LIST, LVS_TYPEMASK);
+            SetStyle(LVS_LIST, LVS_TYPEMASK);
             CheckToolbar();
             break;
-
         case FCIDM_SHVIEW_REPORTVIEW:
             m_FolderSettings.ViewMode = FVM_DETAILS;
-            SetStyle (LVS_REPORT, LVS_TYPEMASK);
+            SetStyle(LVS_REPORT, LVS_TYPEMASK);
             CheckToolbar();
             break;
-
         /* the menu-ID's for sorting are 0x30... see shrec.rc */
         case 0x30:
         case 0x31:
@@ -1576,7 +1481,6 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
             m_sortInfo.bIsAscending = TRUE;
             _Sort();
             break;
-
         case FCIDM_SHVIEW_SNAPTOGRID:
         case FCIDM_SHVIEW_AUTOARRANGE:
             //FIXME
@@ -1584,52 +1488,42 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHand
         case FCIDM_SHVIEW_SELECTALL:
             m_ListView.SetItemState(-1, LVIS_SELECTED, LVIS_SELECTED);
             break;
-
         case FCIDM_SHVIEW_INVERTSELECTION:
             nCount = m_ListView.GetItemCount();
             for (int i=0; i < nCount; i++)
                 m_ListView.SetItemState(i, m_ListView.GetItemState(i, LVIS_SELECTED) ? 0 : LVIS_SELECTED, LVIS_SELECTED);
             break;
-
         case FCIDM_SHVIEW_REFRESH:
             Refresh();
             break;
-
         case FCIDM_SHVIEW_DELETE:
         case FCIDM_SHVIEW_CUT:
         case FCIDM_SHVIEW_COPY:
         case FCIDM_SHVIEW_RENAME:
         case FCIDM_SHVIEW_PROPERTIES:
             return OnExplorerCommand(dwCmdID, TRUE);
-
         case FCIDM_SHVIEW_INSERT:
         case FCIDM_SHVIEW_UNDO:
         case FCIDM_SHVIEW_INSERTLINK:
         case FCIDM_SHVIEW_NEWFOLDER:
             return OnExplorerCommand(dwCmdID, FALSE);
         default:
-            /* WM_COMMAND messages from the file menu are routed to the CDefView so as to let m_pCM handle the command */
+            // WM_COMMAND messages from file menu are routed to CDefView to let m_pCM handle them
             if (m_pCM && dwCmd == 0)
-            {
                 InvokeContextMenuCommand(dwCmdID);
-            }
     }
 
     return 0;
 }
 
-/**********************************************************
-* ShellView_OnNotify()
-*/
-
 LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
-    UINT                                CtlID;
-    LPNMHDR                                lpnmh;
-    LPNMLISTVIEW                        lpnmlv;
-    NMLVDISPINFOW                        *lpdi;
-    PCUITEMID_CHILD                     pidl;
-    BOOL                                unused;
+    UINT             CtlID;
+    LPNMHDR          lpnmh;
+    LPNMLISTVIEW     lpnmlv;
+    NMLVDISPINFOW    *lpdi;
+    PCUITEMID_CHILD  pidl;
+    BOOL             unused;
 
     CtlID = wParam;
     lpnmh = (LPNMHDR)lParam;
@@ -1644,67 +1538,50 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
             TRACE("-- NM_SETFOCUS %p\n", this);
             OnSetFocus(0, 0, 0, unused);
             break;
-
         case NM_KILLFOCUS:
             TRACE("-- NM_KILLFOCUS %p\n", this);
             OnDeactivate();
             /* Notify the ICommDlgBrowser interface */
             OnStateChange(CDBOSC_KILLFOCUS);
             break;
-
         case NM_CUSTOMDRAW:
             TRACE("-- NM_CUSTOMDRAW %p\n", this);
             return CDRF_DODEFAULT;
-
         case NM_RELEASEDCAPTURE:
             TRACE("-- NM_RELEASEDCAPTURE %p\n", this);
             break;
-
         case NM_CLICK:
             TRACE("-- NM_CLICK %p\n", this);
             break;
-
         case NM_RCLICK:
             TRACE("-- NM_RCLICK %p\n", this);
             break;
-
         case NM_DBLCLK:
             TRACE("-- NM_DBLCLK %p\n", this);
             OpenSelectedItems();
             break;
-
         case NM_RETURN:
             TRACE("-- NM_RETURN %p\n", this);
             OpenSelectedItems();
             break;
-
         case HDN_ENDTRACKW:
             TRACE("-- HDN_ENDTRACKW %p\n", this);
-            /*nColumn1 = m_ListView.GetColumnWidth(0);
-            nColumn2 = m_ListView.GetColumnWidth(1);*/
             break;
-
         case LVN_DELETEITEM:
             TRACE("-- LVN_DELETEITEM %p\n", this);
-
             /*delete the pidl because we made a copy of it*/
             SHFree(reinterpret_cast<LPVOID>(lpnmlv->lParam));
-
             break;
-
         case LVN_DELETEALLITEMS:
             TRACE("-- LVN_DELETEALLITEMS %p\n", this);
             return FALSE;
-
         case LVN_INSERTITEM:
             TRACE("-- LVN_INSERTITEM (STUB)%p\n", this);
             break;
-
         case LVN_ITEMACTIVATE:
             TRACE("-- LVN_ITEMACTIVATE %p\n", this);
-            OnStateChange(CDBOSC_SELCHANGE);  /* the browser will get the IDataObject now */
+            OnStateChange(CDBOSC_SELCHANGE); // browser will get the IDataObject
             break;
-
         case LVN_COLUMNCLICK:
             m_sortInfo.nHeaderID = lpnmlv->iSubItem;
             if (m_sortInfo.nLastHeaderID == m_sortInfo.nHeaderID)
@@ -1713,7 +1590,6 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
                 m_sortInfo.bIsAscending = TRUE;
             _Sort();
             break;
-
         case LVN_GETDISPINFOA:
         case LVN_GETDISPINFOW:
             TRACE("-- LVN_GETDISPINFO %p\n", this);
@@ -1755,25 +1631,20 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
                 if (SUCCEEDED(m_pSFParent->GetAttributesOf(1, &pidl, &attributes)))
                 {
                     if (attributes & SFGAO_HIDDEN)
-                    {
                         lpdi->item.state |= LVIS_CUT;
-                    }
                 }
             }
             lpdi->item.mask |= LVIF_DI_SETITEM;
             break;
-
         case LVN_ITEMCHANGED:
             TRACE("-- LVN_ITEMCHANGED %p\n", this);
-            OnStateChange(CDBOSC_SELCHANGE);  /* the browser will get the IDataObject now */
+            OnStateChange(CDBOSC_SELCHANGE); // browser will get the IDataObject
             UpdateStatusbar();
             _DoFolderViewCB(SFVM_SELECTIONCHANGED, NULL/* FIXME */, NULL/* FIXME */);
             break;
-
         case LVN_BEGINDRAG:
         case LVN_BEGINRDRAG:
             TRACE("-- LVN_BEGINDRAG\n");
-
             if (GetSelections())
             {
                 CComPtr<IDataObject> pda;
@@ -1785,15 +1656,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
                     LPNMLISTVIEW params = (LPNMLISTVIEW)lParam;
 
                     if (SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &dwAttributes)))
-                    {
                         dwEffect |= dwAttributes & (SFGAO_CANCOPY | SFGAO_CANLINK);
-                    }
 
                     CComPtr<IAsyncOperation> piaso;
                     if (SUCCEEDED(pda->QueryInterface(IID_PPV_ARG(IAsyncOperation, &piaso))))
-                    {
                         piaso->SetAsyncMode(TRUE);
-                    }
 
                     DWORD dwEffect2;
 
@@ -1809,14 +1676,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
                     m_ListView.GetItemPosition(params->iItem, &ptItem);
 
                     ImageList_BeginDrag(big_icons, iIcon, params->ptAction.x - ptItem.x, params->ptAction.y - ptItem.y);
-
                     DoDragDrop(pda, this, dwEffect, &dwEffect2);
-
                     m_pSourceDataObject.Release();
                 }
             }
             break;
-
         case LVN_BEGINLABELEDITW:
         {
             DWORD dwAttr = SFGAO_CANRENAME;
@@ -1832,11 +1696,9 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
             }
             return TRUE;
         }
-
         case LVN_ENDLABELEDITW:
         {
             TRACE("-- LVN_ENDLABELEDITW %p\n", this);
-
             m_isEditing = FALSE;
 
             if (lpdi->item.pszText)
@@ -1863,7 +1725,6 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
 
             return FALSE;
         }
-
         default:
             TRACE("-- %p WM_COMMAND %x unhandled\n", this, lpnmh->code);
             break;
@@ -1872,12 +1733,10 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
     return 0;
 }
 
-/*
- * This is just a quick hack to make the desktop work correctly.
- * ITranslateShellChangeNotify's IsChildID is undocumented, but most likely the way that
- * a folder should know if it should update upon a change notification.
- * It is exported by merged folders at a minimum.
- */
+// This is just a quick hack to make the desktop work correctly.
+// ITranslateShellChangeNotify's IsChildID is undocumented, but most likely the
+// way that a folder should know if it should update upon a change notification.
+// It is exported by merged folders at a minimum.
 static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE pidl2)
 {
     if (!pidl1 || !pidl2)
@@ -1906,9 +1765,6 @@ static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE
     return FALSE;
 }
 
-/**********************************************************
-* ShellView_OnChange()
-*/
 LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     PCIDLIST_ABSOLUTE *Pidls = reinterpret_cast<PCIDLIST_ABSOLUTE*>(wParam);
@@ -1924,22 +1780,16 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
             if (bParent0)
             {
                 if (LV_FindItemByPidl(ILFindLastID(Pidls[0])) == -1)
-                {
                     LV_AddItem(ILFindLastID(Pidls[0]));
-                }
                 else
-                {
                     LV_ProdItem(ILFindLastID(Pidls[0]));
-                }
             }
             break;
-
         case SHCNE_RMDIR:
         case SHCNE_DELETE:
             if (bParent0)
                 LV_DeleteItem(ILFindLastID(Pidls[0]));
             break;
-
         case SHCNE_RENAMEFOLDER:
         case SHCNE_RENAMEITEM:
             if (bParent0 && bParent1)
@@ -1949,12 +1799,10 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
             else if (bParent1)
                 LV_AddItem(ILFindLastID(Pidls[1]));
             break;
-
         case SHCNE_UPDATEITEM:
             if (bParent0)
                 LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[0]));
             break;
-
         case SHCNE_UPDATEDIR:
             Refresh();
             break;
@@ -1965,20 +1813,17 @@ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &
 HRESULT SHGetMenuIdFromMenuMsg(UINT uMsg, LPARAM lParam, UINT *CmdId);
 HRESULT SHSetMenuIdInMenuMsg(UINT uMsg, LPARAM lParam, UINT CmdId);
 
-/**********************************************************
-*  CDefView::OnCustomItem
-*/
 LRESULT CDefView::OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     if (!m_pCM.p)
     {
         /* no menu */
-        ERR("no menu!!!\n");
+        ERR("no menu\n");
         return FALSE;
     }
 
-    /* The lParam of WM_DRAWITEM WM_MEASUREITEM contain a menu id and this also needs to
-       be changed to a menu identifier offset */
+    // lParam of WM_DRAWITEM WM_MEASUREITEM contains a menu id and
+    // this also needs to be changed to a menu identifier offset
     UINT CmdID;
     HRESULT hres = SHGetMenuIdFromMenuMsg(uMsg, lParam, &CmdID);
     if (SUCCEEDED(hres))
@@ -2000,9 +1845,6 @@ LRESULT CDefView::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
     return S_OK;
 }
 
-/**********************************************************
-*  CDefView::OnInitMenuPopup
-*/
 LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
     HMENU hmenu = (HMENU) wParam;
@@ -2040,18 +1882,9 @@ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
     return FALSE;
 }
 
-/**********************************************************
-*
-*
-*  The INTERFACE of the IShellView object
-*
-*
-**********************************************************
-*/
 
-/**********************************************************
-*  ShellView_GetWindow
-*/
+// The INTERFACE of the IShellView object
+
 HRESULT WINAPI CDefView::GetWindow(HWND *phWnd)
 {
     TRACE("(%p)\n", this);
@@ -2068,12 +1901,7 @@ HRESULT WINAPI CDefView::ContextSensitiveHelp(BOOL fEnterMode)
     return E_NOTIMPL;
 }
 
-/**********************************************************
-* IShellView_TranslateAccelerator
-*
-* FIXME:
-*  use the accel functions
-*/
+// FIXME: use the accel functions
 HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg)
 {
     if (m_isEditing)
@@ -2083,8 +1911,6 @@ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg)
     {
         if (::TranslateAcceleratorW(m_hWnd, m_hAccel, lpmsg) != 0)
             return S_OK;
-
-        TRACE("-- key=0x04%lx\n", lpmsg->wParam) ;
     }
 
     return m_pShellBrowser->TranslateAcceleratorSB(lpmsg, 0);
@@ -2092,43 +1918,36 @@ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg)
 
 HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable)
 {
-    FIXME("(%p) stub\n", this);
-
+    FIXME("(%p)\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);
+    TRACE("(%p)->(state=%x)\n", this, uState);
 
-    /* don't do anything if the state isn't really changing */
+    // don't do anything if the state isn't changing
     if (m_uState == uState)
-    {
         return S_OK;
-    }
 
-    /* OnActivate handles the menu merging and internal state */
+    // OnActivate handles the menu merging and internal state
     DoActivate(uState);
 
-    /* only do This if we are active */
+    // only do this if we are active
     if (uState != SVUIA_DEACTIVATE)
     {
+        //GetFolderPath is not a method of IShellFolder
+        //IShellFolder_GetFolderPath(m_pSFParent, szName, sizeof(szName));
 
-        /*
-            GetFolderPath is not a method of IShellFolder
-            IShellFolder_GetFolderPath( m_pSFParent, szName, sizeof(szName) );
-        */
-        /* set the number of parts */
+        // set the number of parts
         m_pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETPARTS, 1, (LPARAM)nPartArray, &lResult);
 
-        /* set the text for the parts */
-        /*
-            m_pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETTEXTA, 0, (LPARAM)szName, &lResult);
-        */
+        // set the text for the parts
+        //m_pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETTEXTA, 0, (LPARAM)szName, &lResult);
     }
 
     return S_OK;
@@ -2159,7 +1978,7 @@ HRESULT WINAPI CDefView::DestroyViewWindow()
 
     if (m_hAccel)
     {
-        // "Accelerator tables loaded from resources are freed automatically when the application terminates." -- MSDN
+        // MSDN: Accelerator tables loaded from resources are freed automatically when application terminates
         m_hAccel = NULL;
     }
 
@@ -2301,7 +2120,6 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut)
                 hr = m_pShellFolderViewDual->QueryInterface(riid, ppvOut);
             }
             break;
-
         case SVGIO_SELECTION:
             GetSelections();
             hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, riid, 0, ppvOut);
@@ -2519,9 +2337,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, PCUITEMID_
     return S_OK;
 }
 
-/**********************************************************
- * IShellView2 implementation
- */
+
+// IShellView2 implementation
 
 HRESULT STDMETHODCALLTYPE CDefView::GetView(SHELLVIEWID *view_guid, ULONG view_type)
 {
@@ -2628,9 +2445,8 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItem(LPCITEMIDLIST item, UI
     return E_NOTIMPL;
 }
 
-/**********************************************************
- * IShellFolderView implementation
- */
+// IShellFolderView implementation
+
 HRESULT STDMETHODCALLTYPE CDefView::Rearrange(LPARAM sort)
 {
     FIXME("(%p)->(%ld) stub\n", this, sort);
@@ -2645,19 +2461,19 @@ HRESULT STDMETHODCALLTYPE CDefView::GetArrangeParam(LPARAM *sort)
 
 HRESULT STDMETHODCALLTYPE CDefView::ArrangeGrid()
 {
-    FIXME("(%p) stub\n", this);
+    FIXME("(%p)\n", this);
     return E_NOTIMPL;
 }
 
 HRESULT STDMETHODCALLTYPE CDefView::AutoArrange()
 {
-    FIXME("(%p) stub\n", this);
+    FIXME("(%p)\n", this);
     return E_NOTIMPL;
 }
 
 HRESULT STDMETHODCALLTYPE CDefView::AddObject(PITEMID_CHILD pidl, UINT *item)
 {
-    FIXME("(%p)->(%p %p) stub\n", this, pidl, item);
+    FIXME("(%p)->(%p %p)\n", this, pidl, item);
     return E_NOTIMPL;
 }
 
@@ -2669,7 +2485,6 @@ HRESULT STDMETHODCALLTYPE CDefView::GetObject(PITEMID_CHILD *pidl, UINT item)
 
 HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item)
 {
-
     TRACE("(%p)->(%p %p)\n", this, pidl, item);
 
     if (pidl)
@@ -2834,9 +2649,6 @@ HRESULT STDMETHODCALLTYPE CDefView::SetAutomationObject(IDispatch *disp)
     return E_NOTIMPL;
 }
 
-/**********************************************************
- * ISVOleCmdTarget_QueryStatus (IOleCommandTarget)
- */
 HRESULT WINAPI CDefView::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText)
 {
     FIXME("(%p)->(%p(%s) 0x%08x %p %p\n",
@@ -2854,11 +2666,10 @@ HRESULT WINAPI CDefView::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLE
     return OLECMDERR_E_UNKNOWNGROUP;
 }
 
-/**********************************************************
- * ISVOleCmdTarget_Exec (IOleCommandTarget)
- *
- * nCmdID is the OLECMDID_* enumeration
- */
+///
+// ISVOleCmdTarget_Exec(IOleCommandTarget)
+//
+// nCmdID is the OLECMDID_* enumeration
 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",
@@ -2880,7 +2691,7 @@ HRESULT WINAPI CDefView::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCm
 
             if (m_hMenuViewModes)
             {
-                /* Duplicate all but the last two items of the view modes menu */
+                // Duplicate all but the last two items of the view modes menu
                 HMENU hmenuViewPopup = CreatePopupMenu();
                 Shell_MergeMenus(hmenuViewPopup, m_hMenuViewModes, 0, 0, 0xFFFF, 0);
                 DeleteMenu(hmenuViewPopup, GetMenuItemCount(hmenuViewPopup) - 1, MF_BYPOSITION);
@@ -2933,8 +2744,8 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
        to remember the last key state when the button was pressed */
     m_grfKeyState = grfKeyState;
 
-    /* Map from global to client coordinates and query the index of the listview-item, which is
-     * currently under the mouse cursor. */
+    // Map from global to client coordinates and query the index of the
+    // listview-item, which is currently under the mouse cursor.
     LVHITTESTINFO htinfo = {{pt.x, pt.y}, LVHT_ONITEM};
     ScreenToClient(&htinfo.pt);
     lResult = m_ListView.HitTest(&htinfo);
@@ -2943,9 +2754,9 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
     ::GetClientRect(m_ListView, &clientRect);
     if (htinfo.pt.x == m_ptLastMousePos.x && htinfo.pt.y == m_ptLastMousePos.y &&
             (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH ||
-             htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH ))
+             htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH))
     {
-        m_cScrollDelay = (m_cScrollDelay + 1) % 5; /* DragOver is called every 50 ms */
+        m_cScrollDelay = (m_cScrollDelay + 1) % 5; // DragOver is called every 50 ms
         if (m_cScrollDelay == 0)
         {
             /* Mouse did hover another 250 ms over the scroll-area */
@@ -2964,7 +2775,7 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
     }
     else
     {
-        m_cScrollDelay = 0; /* Reset, if the cursor is not over the listview's scroll-area */
+        m_cScrollDelay = 0; // Reset, if cursor is not over the listview's scroll-area
     }
 
     m_ptLastMousePos = htinfo.pt;
@@ -2985,11 +2796,11 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
         }
     }
 
-    /* If we are still over the previous sub-item, notify it via DragOver and return. */
+    // If we are still over the previous sub-item, notify it via DragOver and return
     if (m_pCurDropTarget && lResult == m_iDragOverItem)
         return m_pCurDropTarget->DragOver(grfKeyState, pt, pdwEffect);
 
-    /* We've left the previous sub-item, notify it via DragLeave and Release it. */
+    // We've left the previous sub-item, notify it via DragLeave and release it
     if (m_pCurDropTarget)
     {
         PCUITEMID_CHILD pidl = _PidlByItem(m_iDragOverItem);
@@ -3004,23 +2815,23 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
 
     if (lResult == -1)
     {
-        /* We are not above one of the listview's subitems. Bind to the parent folder's
-         * DropTarget interface. */
+        // We are not above one of the listview's subitems. Bind to the
+        // parent folder's DropTarget interface.
         hr = m_pSFParent->CreateViewObject(NULL, IID_PPV_ARG(IDropTarget,&m_pCurDropTarget));
     }
     else
     {
-        /* Query the relative PIDL of the shellfolder object represented by the currently
-         * dragged over listview-item ... */
+        // Query the relative PIDL of the shellfolder object represented
+        // by the currently dragged over listview-item ...
         PCUITEMID_CHILD pidl = _PidlByItem(lResult);
 
-        /* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */
+        // ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object
         hr = m_pSFParent->GetUIObjectOf(m_ListView, 1, &pidl, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget));
     }
 
     IUnknown_SetSite(m_pCurDropTarget, (IShellView *)this);
 
-    /* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */
+    // If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state
     if (FAILED(hr))
     {
         *pdwEffect = DROPEFFECT_NONE;
@@ -3032,7 +2843,7 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf
         SelectItem(m_iDragOverItem, SVSI_SELECT);
     }
 
-    /* Notify the item just entered via DragEnter. */
+    // Notify the item just entered via DragEnter
     return m_pCurDropTarget->DragEnter(m_pCurDataObject, grfKeyState, pt, pdwEffect);
 }
 
@@ -3095,12 +2906,12 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT
             m_pCurDropTarget.Release();
         }
 
-        /* Restore the selection */
+        // Restore selection
         m_ListView.SetItemState(-1, 0, LVIS_SELECTED);
         for (UINT i = 0 ; i < m_cidl; i++)
             SelectItem(m_apidl[i], SVSI_SELECT);
 
-        /* Reposition the items */
+        // Reposition items
         int lvIndex = -1;
         while ((lvIndex = m_ListView.GetNextItem(lvIndex,  LVNI_SELECTED)) > -1)
         {
@@ -3124,10 +2935,6 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT
     return S_OK;
 }
 
-/**********************************************************
- * ISVDropSource implementation
- */
-
 HRESULT WINAPI CDefView::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
 {
     TRACE("(%p)\n", this);
@@ -3147,43 +2954,33 @@ HRESULT WINAPI CDefView::GiveFeedback(DWORD dwEffect)
     return DRAGDROP_S_USEDEFAULTCURSORS;
 }
 
-/**********************************************************
- * ISVViewObject implementation
- */
-
 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);
-
     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);
-
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI CDefView::Freeze(DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze)
 {
     FIXME("Stub: this=%p\n", this);
-
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI CDefView::Unfreeze(DWORD dwFreeze)
 {
     FIXME("Stub: this=%p\n", this);
-
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI CDefView::SetAdvise(DWORD aspects, DWORD advf, IAdviseSink *pAdvSink)
 {
-    FIXME("partial stub: %p %08x %08x %p\n", this, aspects, advf, pAdvSink);
-
-    /* FIXME: we set the AdviseSink, but never use it to send any advice */
+    // FIXME: we set the AdviseSink, but never use it to send any advice
     m_pAdvSink = pAdvSink;
     m_dwAspects = aspects;
     m_dwAdvf = advf;
@@ -3261,8 +3058,8 @@ HRESULT CDefView_CreateInstance(IShellFolder *pFolder, REFIID riid, LPVOID * ppv
 }
 
 HRESULT WINAPI SHCreateShellFolderViewEx(
-    LPCSFV psvcbi,    /* [in] shelltemplate struct */
-    IShellView **ppsv) /* [out] IShellView pointer */
+    LPCSFV psvcbi,     // [in] shelltemplate struct
+    IShellView **ppsv) // [out] IShellView pointer
 {
     CComPtr<IShellView> psv;
     HRESULT hRes;
@@ -3281,7 +3078,7 @@ HRESULT WINAPI SHCreateShellFolderViewEx(
 }
 
 HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv,
-                        IShellView **ppsv)
+    IShellView **ppsv)
 {
     CComPtr<IShellView> psv;
     HRESULT hRes;
diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
index 5636cdf548a..d5c93eaceeb 100644
--- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp
+++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
@@ -133,8 +133,8 @@ CDefViewBckgrndMenu::SetSite(IUnknown *pUnkSite)
     return S_OK;
 }
 
-HRESULT 
-WINAPI 
+HRESULT
+WINAPI
 CDefViewBckgrndMenu::GetSite(REFIID riid, void **ppvSite)
 {
     if (!m_site)
@@ -152,12 +152,12 @@ CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFir
     UINT cIds = 0;
 
     /* This is something the implementations of IContextMenu should never really do.
-       However CDefViewBckgrndMenu is more or less an overengineering result, its code could really be part of the 
+       However CDefViewBckgrndMenu is more or less an overengineering result, its code could really be part of the
        CDefView. Given this, I think that abusing the interface here is not that bad since only CDefView is the ony
-       user of this class. Here we need to do two things to keep things as simple as possible. 
+       user of this class. Here we need to do two things to keep things as simple as possible.
        First we want the menu part added by the shell folder to be the first to add so as to make as few id translations
-       as possible. Second, we want to add the default part of the background menu without shifted ids, so as 
-       to let the CDefView fill some parts like filling the arrange modes or checking the view mode. In order 
+       as possible. Second, we want to add the default part of the background menu without shifted ids, so as
+       to let the CDefView fill some parts like filling the arrange modes or checking the view mode. In order
        for that to work we need to save idCmdFirst because our caller will pass id offsets to InvokeCommand.
        This makes it impossible to concatenate the CDefViewBckgrndMenu with other menus since it abuses IContextMenu
        but as stated above, its sole user is CDefView and should really be that way. */
diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp
index 93ce54c9843..4866b3adca9 100644
--- a/dll/win32/shell32/CDefaultContextMenu.cpp
+++ b/dll/win32/shell32/CDefaultContextMenu.cpp
@@ -58,7 +58,6 @@ struct _StaticInvokeCommandMap_
     { "rename", FCIDM_SHVIEW_RENAME},
 };
 
-
 class CDefaultContextMenu :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IContextMenu3,
@@ -160,7 +159,6 @@ CDefaultContextMenu::CDefaultContextMenu() :
     m_iIdCBLast(0),
     m_iIdDfltFirst(0),
     m_iIdDfltLast(0)
-
 {
 }
 
@@ -515,7 +513,7 @@ UINT
 CDefaultContextMenu::AddStaticContextMenusToMenu(
     HMENU hMenu,
     UINT* pIndexMenu,
-    UINT iIdCmdFirst, 
+    UINT iIdCmdFirst,
     UINT iIdCmdLast)
 {
     MENUITEMINFOW mii;
@@ -773,7 +771,7 @@ HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink)
                 dwKey = MK_SHIFT;
         }
         else {
-            ERR("No drop effect obtained");
+            ERR("No drop effect obtained\n");
         }
         GlobalUnlock(medium2.hGlobal);
     }
diff --git a/dll/win32/shell32/CFolderOptions.h b/dll/win32/shell32/CFolderOptions.h
index 37e4b5efb1d..ea21ac6f3e9 100644
--- a/dll/win32/shell32/CFolderOptions.h
+++ b/dll/win32/shell32/CFolderOptions.h
@@ -45,7 +45,7 @@ class CFolderOptions :
         // IShellPropSheetExt
         virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam);
         virtual HRESULT STDMETHODCALLTYPE ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam);
-        
+
         // IShellExtInit
         virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID);
 
diff --git a/dll/win32/shell32/CIDLDataObj.cpp b/dll/win32/shell32/CIDLDataObj.cpp
index a446adaf7bd..446b81f4419 100644
--- a/dll/win32/shell32/CIDLDataObj.cpp
+++ b/dll/win32/shell32/CIDLDataObj.cpp
@@ -1,24 +1,5 @@
-/*
- *    IEnumFORMATETC, IDataObject
- *
- * selecting and droping objects within the shell and/or common dialogs
- *
- *    Copyright 1998, 1999    <juergen.schmied@metronet.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
+// LICENSE:   LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
+// COPYRIGHT: 1998-1999 <juergen.schmied@metronet.de>
 
 #include "precomp.h"
 
@@ -65,7 +46,7 @@ IEnumFORMATETCImpl::~IEnumFORMATETCImpl()
 
 HRESULT WINAPI IEnumFORMATETCImpl::Initialize(UINT cfmt, const FORMATETC afmt[])
 {
-    DWORD                        size;
+    DWORD size;
 
     size = cfmt * sizeof(FORMATETC);
     countFmt = cfmt;
@@ -89,7 +70,7 @@ HRESULT WINAPI IEnumFORMATETCImpl::Next(ULONG celt, FORMATETC *rgelt, ULONG *pce
 
     for(i = 0; posFmt < countFmt && celt > i; i++)
     {
-      *rgelt++ = pFmt[posFmt++];
+        *rgelt++ = pFmt[posFmt++];
     }
 
     if (pceltFethed) *pceltFethed = i;
@@ -110,13 +91,13 @@ HRESULT WINAPI IEnumFORMATETCImpl::Reset()
 {
     TRACE("(%p)->()\n", this);
 
-        posFmt = 0;
-        return S_OK;
+    posFmt = 0;
+    return S_OK;
 }
 
 HRESULT WINAPI IEnumFORMATETCImpl::Clone(LPENUMFORMATETC* ppenum)
 {
-    HRESULT                                    hResult;
+    HRESULT hResult;
 
     TRACE("(%p)->(ppenum=%p)\n", this, ppenum);
 
@@ -143,7 +124,7 @@ HRESULT IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[], IEnumFORMA
 class CIDLDataObj :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IDataObject,
-    public IAsyncOperation 
+    public IAsyncOperation
 {
 private:
     LPITEMIDLIST    pidl;
@@ -245,7 +226,7 @@ static HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags)
 */
 HRESULT WINAPI CIDLDataObj::GetData(LPFORMATETC pformatetcIn, STGMEDIUM *pmedium)
 {
-    char    szTemp[256];
+    char szTemp[256];
 
     szTemp[0] = 0;
     GetClipboardFormatNameA (pformatetcIn->cfFormat, szTemp, 256);
@@ -256,22 +237,22 @@ HRESULT WINAPI CIDLDataObj::GetData(LPFORMATETC pformatetcIn, STGMEDIUM *pmedium
       if (cidl < 1) return(E_UNEXPECTED);
       pmedium->hGlobal = RenderSHELLIDLIST(pidl, apidl, cidl);
     }
-    else if    (pformatetcIn->cfFormat == CF_HDROP)
+    else if (pformatetcIn->cfFormat == CF_HDROP)
     {
       if (cidl < 1) return(E_UNEXPECTED);
       pmedium->hGlobal = RenderHDROP(pidl, apidl, cidl);
     }
-    else if    (pformatetcIn->cfFormat == cfFileNameA)
+    else if (pformatetcIn->cfFormat == cfFileNameA)
     {
       if (cidl < 1) return(E_UNEXPECTED);
       pmedium->hGlobal = RenderFILENAMEA(pidl, apidl, cidl);
     }
-    else if    (pformatetcIn->cfFormat == cfFileNameW)
+    else if (pformatetcIn->cfFormat == cfFileNameW)
     {
       if (cidl < 1) return(E_UNEXPECTED);
       pmedium->hGlobal = RenderFILENAMEW(pidl, apidl, cidl);
     }
-    else if    (pformatetcIn->cfFormat == cfPreferredDropEffect)
+    else if (pformatetcIn->cfFormat == cfPreferredDropEffect)
     {
       pmedium->hGlobal = RenderPREFEREDDROPEFFECT(dropeffect);
     }
@@ -385,7 +366,7 @@ HRESULT WINAPI CIDLDataObj::InOperation(BOOL *pfInAsyncOp)
     FIXME("(%p)->()\n", this);
     return E_NOTIMPL;
 }
-HRESULT WINAPI CIDLDataObj::SetAsyncMode(BOOL fDoOpAsync) 
+HRESULT WINAPI CIDLDataObj::SetAsyncMode(BOOL fDoOpAsync)
 {
     TRACE("(%p)->()\n", this);
     doasync = fDoOpAsync;
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 1788b9be422..4d704ed0524 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -31,8 +31,8 @@ list(APPEND SOURCE
     dialogs/dialogs.cpp
     dialogs/drive.cpp
     dialogs/drvdefext.cpp
-    dialogs/folder_options.cpp
     dialogs/filedefext.cpp
+    dialogs/folder_options.cpp
     dialogs/fprop.cpp
     dialogs/recycler_prop.cpp
     CDropTargetHelper.cpp
diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp
index 4a17e9b58b2..bc9dcc68cdb 100644
--- a/dll/win32/shell32/CNewMenu.cpp
+++ b/dll/win32/shell32/CNewMenu.cpp
@@ -65,7 +65,6 @@ void CNewMenu::UnloadAllItems()
     {
         pCurItem = m_pItems;
         m_pItems = m_pItems->pNext;
-
         UnloadItem(pCurItem);
     }
 
@@ -201,9 +200,9 @@ CNewMenu::CacheItems()
             }
         }
     }
-    
+
     dwSize++;
-    
+
     lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR));
     if (!lpValues)
         return FALSE;
@@ -222,17 +221,17 @@ CNewMenu::CacheItems()
         HeapFree(GetProcessHeap(), 0, lpValues);
         return FALSE;
     }
-    
+
     if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize * sizeof(WCHAR)) != ERROR_SUCCESS)
     {
         HeapFree(GetProcessHeap(), 0, lpValues);
         RegCloseKey(hKey);
         return FALSE;
     }
-    
+
     HeapFree(GetProcessHeap(), 0, lpValues);
     RegCloseKey(hKey);
-    
+
     return TRUE;
 }
 
@@ -245,17 +244,17 @@ CNewMenu::LoadCachedItems()
     HKEY hKey;
     SHELLNEW_ITEM *pNewItem;
     SHELLNEW_ITEM *pCurItem = NULL;
-    
-    if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) 
+
+    if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
         return FALSE;
-    
+
     if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, NULL, &dwSize) != ERROR_SUCCESS)
         return FALSE;
-    
+
     lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwSize);
     if (!lpValues)
         return FALSE;
-    
+
     if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, (LPBYTE)lpValues, &dwSize) != ERROR_SUCCESS)
     {
         HeapFree(GetProcessHeap(), 0, lpValues);
@@ -287,10 +286,10 @@ CNewMenu::LoadCachedItems()
             }
         }
     }
-    
+
     HeapFree(GetProcessHeap(), 0, lpValues);
     RegCloseKey(hKey);
-    
+
     return TRUE;
 }
 
@@ -299,12 +298,12 @@ CNewMenu::LoadAllItems()
 {
     /* If there are any unload them */
     UnloadAllItems();
-    
+
     if (!LoadCachedItems())
     {
         CacheItems();
     }
-    
+
     if (!m_pLinkItem)
     {
         m_pLinkItem = static_cast<SHELLNEW_ITEM *>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM)));
@@ -445,7 +444,7 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici)
     WCHAR wszName[MAX_PATH];
     WCHAR wszNewFolder[25];
     HRESULT hr;
-    
+
     /* Get folder path */
     hr = SHGetPathFromIDListW(m_pidlFolder, wszPath);
     if (FAILED_UNEXPECTEDLY(hr))
@@ -708,7 +707,7 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes
             DWORD id = LOWORD(lpdis->itemID);
             HICON hIcon = 0;
             if (id == 0)
-                hIcon = m_hiconFolder;  
+                hIcon = m_hiconFolder;
             else if (id == 1)
                 hIcon = m_hiconLink;
             else
@@ -721,12 +720,12 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes
             if (!hIcon)
                 break;
 
-            DrawIconEx(lpdis->hDC, 
-                       2, 
-                       lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, 
-                       hIcon, 
-                       16, 
-                       16, 
+            DrawIconEx(lpdis->hDC,
+                       2,
+                       lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2,
+                       hIcon,
+                       16,
+                       16,
                        0, NULL, DI_NORMAL);
 
             if(plResult)
diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp
index 3cf5da3b7d0..088b0538877 100644
--- a/dll/win32/shell32/COpenWithMenu.cpp
+++ b/dll/win32/shell32/COpenWithMenu.cpp
@@ -111,7 +111,7 @@ COpenWithList::~COpenWithList()
 BOOL COpenWithList::Load()
 {
     HKEY hKey;
-    WCHAR wszName[256], wszBuf[100];;
+    WCHAR wszName[256], wszBuf[100];
     DWORD i = 0, cchName, dwSize;
     SApp *pApp;
 
@@ -696,7 +696,7 @@ BOOL COpenWithList::SetDefaultHandler(SApp *pApp, LPCWSTR pwszFilename)
     /* Create file extension key */
     if (RegCreateKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS)
     {
-        ERR("Cannot open ext key");
+        ERR("Can't open ext key\n");
         return FALSE;
     }
 
@@ -850,7 +850,7 @@ BOOL COpenWithDialog::IsNoOpen(HWND hwnd)
             return TRUE;
         else if (dReturnValue == -1)
         {
-            ERR("IsNoOpen failed to load the dialog box.");
+            ERR("IsNoOpen failed to load dialog box\n");
             return TRUE;
         }
     }
diff --git a/dll/win32/shell32/CQueryAssociations.cpp b/dll/win32/shell32/CQueryAssociations.cpp
index 0593e277c0a..a11a79a65fd 100644
--- a/dll/win32/shell32/CQueryAssociations.cpp
+++ b/dll/win32/shell32/CQueryAssociations.cpp
@@ -80,17 +80,17 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::Init(
                                     debugstr_w(pszAssoc),
                                     hkeyProgid,
                                     hWnd);
-                                    
+
     if (hWnd != NULL)
     {
         FIXME("hwnd != NULL not supported\n");
     }
-    
+
     if (cfFlags != 0)
     {
         FIXME("unsupported flags: %x\n", cfFlags);
     }
-    
+
     RegCloseKey(this->hkeySource);
     RegCloseKey(this->hkeyProgID);
     this->hkeySource = this->hkeyProgID = NULL;
@@ -98,7 +98,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::Init(
     {
         WCHAR *progId;
         HRESULT hr;
-        
+
         LONG ret = RegOpenKeyExW(HKEY_CLASSES_ROOT,
                             pszAssoc,
                             0,
@@ -108,7 +108,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::Init(
         {
             return S_OK;
         }
-        
+
         /* if this is a progid */
         if (*pszAssoc != '.' && *pszAssoc != '{')
         {
@@ -195,12 +195,12 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString(
     {
         FIXME("%08x: unimplemented flags\n", flags & unimplemented_flags);
     }
-    
+
     if (!pcchOut)
     {
         return E_UNEXPECTED;
     }
-    
+
     if (!this->hkeySource && !this->hkeyProgID)
     {
         return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION);
@@ -395,7 +395,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString(
 
             hr = CLSIDFromString(pszExtra, &clsid);
             if (FAILED(hr))
-            {            
+            {
                 return hr;
             }
             strcpyW(keypath, shellexW);
@@ -414,7 +414,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString(
             }
             return this->ReturnString(flags, pszOut, pcchOut, guid, size / sizeof(WCHAR));
         }
-        
+
         default:
         {
             FIXME("assocstr %d unimplemented!\n", str);
@@ -476,8 +476,8 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA
     {
         FIXME("Unsupported flags: %x\n", cfFlags);
     }
-    
-    switch(assocdata) 
+
+    switch(assocdata)
     {
         case ASSOCDATA_EDITFLAGS:
         {
@@ -485,7 +485,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA
             {
                 return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION);
             }
-            
+
             void *data;
             DWORD size;
             HRESULT hres = this->GetValue(this->hkeyProgID, edit_flags, &data, &size);
@@ -493,13 +493,13 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA
             {
                 return hres;
             }
-            
+
             if (!pcbOut)
             {
                 HeapFree(GetProcessHeap(), 0, data);
                 return hres;
             }
-            
+
             hres = this->ReturnData(pvOut, pcbOut, data, size);
             HeapFree(GetProcessHeap(), 0, data);
             return hres;
@@ -609,12 +609,12 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command)
     {
         ret = RegOpenKeyExW(this->hkeySource, shellW, 0, KEY_READ, &hkeyShell);
     }
-    
+
     if (ret)
-    {    
+    {
         return HRESULT_FROM_WIN32(ret);
     }
-    
+
     if (!extra)
     {
         /* check for default verb */
@@ -654,7 +654,7 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command)
     ret = RegOpenKeyExW(hkeyShell, extra, 0, KEY_READ, &hkeyVerb);
     HeapFree(GetProcessHeap(), 0, extra_from_reg);
     RegCloseKey(hkeyShell);
-    if (ret) 
+    if (ret)
     {
         return HRESULT_FROM_WIN32(ret);
     }
@@ -662,7 +662,7 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command)
     ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand);
     RegCloseKey(hkeyVerb);
     if (ret)
-    {    
+    {
         return HRESULT_FROM_WIN32(ret);
     }
     hr = this->GetValue(hkeyCommand, NULL, (void**)command, NULL);
@@ -681,7 +681,7 @@ HRESULT CQueryAssociations::GetExecutable(LPCWSTR pszExtra, LPWSTR path, DWORD p
     {
         return hr;
     }
-    
+
     DWORD expLen = ExpandEnvironmentStringsW(pszCommand, NULL, 0);
     if (expLen > 0)
     {
@@ -691,7 +691,7 @@ HRESULT CQueryAssociations::GetExecutable(LPCWSTR pszExtra, LPWSTR path, DWORD p
         HeapFree(GetProcessHeap(), 0, pszCommand);
         pszCommand = buf;
     }
-    
+
     /* cleanup pszCommand */
     if (pszCommand[0] == '"')
     {
@@ -782,11 +782,11 @@ HRESULT CQueryAssociations::ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen
     {
         len = datalen;
     }
-    
+
     if (len)
     {
         memcpy(out, data, len*sizeof(WCHAR));
     }
-    
+
     return hr;
 }
\ No newline at end of file
diff --git a/dll/win32/shell32/CQueryAssociations.h b/dll/win32/shell32/CQueryAssociations.h
index 630d6891e39..f877ca4ddca 100644
--- a/dll/win32/shell32/CQueryAssociations.h
+++ b/dll/win32/shell32/CQueryAssociations.h
@@ -14,18 +14,18 @@ private:
     HRESULT GetExecutable(LPCWSTR pszExtra, LPWSTR path, DWORD pathlen, DWORD *len);
     HRESULT ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen);
     HRESULT ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWSTR data, DWORD datalen);
-    
+
 public:
     CQueryAssociations();
     ~CQueryAssociations();
-    
+
     // *** IQueryAssociations methods ***
     virtual HRESULT STDMETHODCALLTYPE Init(ASSOCF flags, LPCWSTR pwszAssoc, HKEY hkProgid, HWND hwnd);
     virtual HRESULT STDMETHODCALLTYPE GetString(ASSOCF flags, ASSOCSTR str, LPCWSTR pwszExtra, LPWSTR pwszOut, DWORD *pcchOut);
     virtual HRESULT STDMETHODCALLTYPE GetKey(ASSOCF flags, ASSOCKEY key, LPCWSTR pwszExtra, HKEY *phkeyOut);
     virtual HRESULT STDMETHODCALLTYPE GetData(ASSOCF flags, ASSOCDATA data, LPCWSTR pwszExtra, void *pvOut, DWORD *pcbOut);
     virtual HRESULT STDMETHODCALLTYPE GetEnum(ASSOCF cfFlags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID *ppvOut);
-    
+
 DECLARE_REGISTRY_RESOURCEID(IDR_QUERYASSOCIATIONS)
 DECLARE_NOT_AGGREGATABLE(CQueryAssociations)
 DECLARE_PROTECT_FINAL_CONSTRUCT()
diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp
index d0ecf3a57ab..fc969d1b818 100644
--- a/dll/win32/shell32/CShellLink.cpp
+++ b/dll/win32/shell32/CShellLink.cpp
@@ -1202,7 +1202,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCSTR pszArgs)
         if (!m_sArgs)
             return E_OUTOFMEMORY;
     }
-
     m_bDirty = TRUE;
 
     return S_OK;
@@ -1939,7 +1938,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i
         }
     }
 
-    /* Store the original icon path location (this one may contain unexpanded environment strings) */
+    /* Store the original icon path location (may contain unexpanded environment strings) */
     if (pszIconPath)
     {
         m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION;
@@ -2427,7 +2426,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetPath(LPCWSTR pszFile)
             if (hr == S_OK)
                 m_Header.dwFlags |= SLDF_HAS_EXP_SZ;
 
-            /* Now, make pszFile point to the expanded buffer */
+            /* Now, make pszFile point to the expanded path */
             pszFile = szPath;
         }
         else
@@ -2607,7 +2606,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::InvokeCommand(LPCMINVOKECOMMANDINFO lpici)
     HRESULT hr = Resolve(lpici->hwnd, 0);
     if (FAILED(hr))
     {
-        TRACE("failed to resolve component with error 0x%08x", hr);
+        TRACE("failed to resolve component error 0x%08x\n", hr);
         return hr;
     }
 
diff --git a/dll/win32/shell32/CShellLink.h b/dll/win32/shell32/CShellLink.h
index c8ce27efadf..fdb944739e8 100644
--- a/dll/win32/shell32/CShellLink.h
+++ b/dll/win32/shell32/CShellLink.h
@@ -51,14 +51,12 @@ public:
     /* Link file formats */
 
     #include "pshpack1.h"
-
     struct volume_info
     {
         DWORD type;
         DWORD serial;
         WCHAR label[12];  /* assume 8.3 */
     };
-
     #include "poppack.h"
 
 private:
diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp
index 75e3683f30c..c890b877c53 100644
--- a/dll/win32/shell32/dialogs/dialogs.cpp
+++ b/dll/win32/shell32/dialogs/dialogs.cpp
@@ -53,8 +53,7 @@ typedef struct
 BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule,
     LPCWSTR lpszType,
     LPWSTR lpszName,
-    LONG_PTR lParam
-)
+    LONG_PTR lParam)
 {
     WCHAR szName[100];
     int index;
@@ -97,8 +96,7 @@ DestroyIconList(HWND hDlgCtrl)
 INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
     UINT uMsg,
     WPARAM wParam,
-    LPARAM lParam
-)
+    LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmis;
     LPDRAWITEMSTRUCT lpdis;
@@ -147,7 +145,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
             break;
         case IDC_PICKICON_LIST:
             if (HIWORD(wParam) == LBN_SELCHANGE)
-                InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT
+                InvalidateRect((HWND)lParam, NULL, TRUE);
             break;
         case IDC_BUTTON_PATH:
             szText[0] = 0;
@@ -157,9 +155,9 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
             ofn.hwndOwner = hwndDlg;
             ofn.lpstrFile = szText;
             ofn.nMaxFile = MAX_PATH;
-            LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, sizeof(szTitle) / sizeof(WCHAR));
+            LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, _countof(szTitle));
             ofn.lpstrTitle = szTitle;
-            LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR));
+            LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter));
             ofn.lpstrFilter = szFilter;
             if (GetOpenFileNameW(&ofn))
             {
@@ -188,16 +186,14 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
         }
         break;
         case WM_MEASUREITEM:
-            lpmis = (LPMEASUREITEMSTRUCT) lParam;
+            lpmis = (LPMEASUREITEMSTRUCT)lParam;
             lpmis->itemHeight = 32;
             lpmis->itemWidth = 64;
             return TRUE;
         case WM_DRAWITEM:
-            lpdis = (LPDRAWITEMSTRUCT) lParam;
+            lpdis = (LPDRAWITEMSTRUCT)lParam;
             if (lpdis->itemID == (UINT)-1)
-            {
                 break;
-            }
             switch (lpdis->itemAction)
             {
                 case ODA_SELECT:
diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp
index 679afe6a578..85418d56607 100644
--- a/dll/win32/shell32/dialogs/drive.cpp
+++ b/dll/win32/shell32/dialogs/drive.cpp
@@ -139,7 +139,7 @@ SH_ShowDriveProperties(WCHAR *pwszDrive, LPCITEMIDLIST pidlFolder, PCUITEMID_CHI
         psh.pszCaption = wszName;
         psh.dwFlags |= PSH_PROPTITLE;
     }
-    
+
     ILFree(completePidl);
 
     CComPtr<IDataObject> pDataObj;
@@ -633,5 +633,3 @@ SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options)
 
     return result;
 }
-
-
diff --git a/dll/win32/shell32/dialogs/drvdefext.cpp b/dll/win32/shell32/dialogs/drvdefext.cpp
index ef4c2c6b7cf..469950fdb6b 100644
--- a/dll/win32/shell32/dialogs/drvdefext.cpp
+++ b/dll/win32/shell32/dialogs/drvdefext.cpp
@@ -261,7 +261,7 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem)
                     pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10);
 
             SelectObject(pDrawItem->hDC, hMagBrush);
-            
+
             if (m_FreeSpacePerc > 0)
             {
                 Pie(pDrawItem->hDC, pDrawItem->rcItem.left, pDrawItem->rcItem.top, pDrawItem->rcItem.right,
@@ -315,14 +315,14 @@ CDrvDefExt::InitGeneralPage(HWND hwndDlg)
     {
         /* volume label textbox */
         SendMessage(GetDlgItem(hwndDlg, 14000), EM_SETREADONLY, TRUE, 0);
-        
+
         /* disk compression */
         ShowWindow(GetDlgItem(hwndDlg, 14011), FALSE);
 
         /* index */
         ShowWindow(GetDlgItem(hwndDlg, 14012), FALSE);
     }
-    
+
     HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IconId), IMAGE_ICON, 32, 32, LR_SHARED);
     if (hIcon)
         SendDlgItemMessageW(hwndDlg, 14016, STM_SETICON, (WPARAM)hIcon, 0);
@@ -379,7 +379,7 @@ CDrvDefExt::InitGeneralPage(HWND hwndDlg)
     GetDlgItemTextW(hwndDlg, 14009, wszFormat, _countof(wszFormat));
     swprintf(wszBuf, wszFormat, m_wszDrive[0]);
     SetDlgItemTextW(hwndDlg, 14009, wszBuf);
-    
+
     /* show disk cleanup button only for fixed drives */
     ShowWindow(GetDlgItem(hwndDlg, 14010), DriveType == DRIVE_FIXED);
 }
diff --git a/dll/win32/shell32/dialogs/filedefext.h b/dll/win32/shell32/dialogs/filedefext.h
index 4a1c7100656..b2dec0a73ac 100644
--- a/dll/win32/shell32/dialogs/filedefext.h
+++ b/dll/win32/shell32/dialogs/filedefext.h
@@ -27,7 +27,7 @@ class CFileVersionInfo
         PVOID m_pInfo;
         WORD m_wLang, m_wCode;
         WCHAR m_wszLang[64];
-        
+
         typedef struct _LANGANDCODEPAGE_
         {
             WORD wLang;
diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp
index cffee8bee11..d8dcd593e39 100644
--- a/dll/win32/shell32/dialogs/folder_options.cpp
+++ b/dll/win32/shell32/dialogs/folder_options.cpp
@@ -777,11 +777,11 @@ UpdateGeneralIcons(HWND hDlg)
     if (lpTaskIconName)
     {
         hTaskIcon = (HICON)LoadImage(shell32_hInstance,
-                                              lpTaskIconName,
-                                              IMAGE_ICON,
-                                              0,
-                                              0,
-                                              LR_DEFAULTCOLOR);
+                                     lpTaskIconName,
+                                     IMAGE_ICON,
+                                     0,
+                                     0,
+                                     LR_DEFAULTCOLOR);
         if (hTaskIcon)
         {
             hwndTaskIcon = GetDlgItem(hDlg,
@@ -795,21 +795,21 @@ UpdateGeneralIcons(HWND hDlg)
             }
         }
     }
-    
+
     // show Folder setting icons
     if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW) == BST_CHECKED)
         lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_SOME_WINDOW);
     else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_OWNWINDOW) == BST_CHECKED)
         lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_NEW_WINDOW);
-    
+
     if (lpFolderIconName)
     {
         hFolderIcon = (HICON)LoadImage(shell32_hInstance,
-                                              lpFolderIconName,
-                                              IMAGE_ICON,
-                                              0,
-                                              0,
-                                              LR_DEFAULTCOLOR);
+                                       lpFolderIconName,
+                                       IMAGE_ICON,
+                                       0,
+                                       0,
+                                       LR_DEFAULTCOLOR);
         if (hFolderIcon)
         {
             hwndFolderIcon = GetDlgItem(hDlg,
@@ -833,11 +833,11 @@ UpdateGeneralIcons(HWND hDlg)
     if (lpClickIconName)
     {
         hClickIcon = (HICON)LoadImage(shell32_hInstance,
-                                              lpClickIconName,
-                                              IMAGE_ICON,
-                                              0,
-                                              0,
-                                              LR_DEFAULTCOLOR);
+                                      lpClickIconName,
+                                      IMAGE_ICON,
+                                      0,
+                                      0,
+                                      LR_DEFAULTCOLOR);
         if (hClickIcon)
         {
             hwndClickIcon = GetDlgItem(hDlg,
@@ -859,8 +859,6 @@ UpdateGeneralIcons(HWND hDlg)
         DeleteObject(hFolderIcon);
     if(hClickIcon)
         DeleteObject(hClickIcon);
-    
-    return;
 }
 
 INT_PTR
@@ -877,7 +875,6 @@ FolderOptionsGeneralDlg(
         case WM_INITDIALOG:
             // FIXME
             break;
-            
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
@@ -897,7 +894,6 @@ FolderOptionsGeneralDlg(
                     break;
             }
             break;
-
         case WM_NOTIFY:
         {
             LPNMHDR pnmh = (LPNMHDR)lParam;
@@ -912,12 +908,10 @@ FolderOptionsGeneralDlg(
             }
             break;
         }
-        
         case WM_DESTROY:
             break;
-         
-         default: 
-             return FALSE;
+        default:
+            return FALSE;
     }
     return FALSE;
 }
@@ -1168,7 +1162,7 @@ static BOOL CALLBACK RefreshBrowsersCallback (HWND hWnd, LPARAM msg)
     WCHAR ClassName[100];
     if (GetClassName(hWnd, ClassName, 100))
     {
-        if (!wcscmp(ClassName, L"Progman") || 
+        if (!wcscmp(ClassName, L"Progman") ||
             !wcscmp(ClassName, L"CabinetWClass") ||
             !wcscmp(ClassName, L"ExploreWClass"))
         {
@@ -1236,7 +1230,7 @@ ViewDlg_Apply(HWND hwndDlg)
 
     // notify all
     SendMessage(HWND_BROADCAST, WM_WININICHANGE, 0, 0);
-    
+
     EnumWindows(RefreshBrowsersCallback, NULL);
 }
 
@@ -1951,7 +1945,6 @@ FolderOptionsFileTypesDlg(
             if (pItem == NULL || (pItem->EditFlags & 0x00000010)) // FTA_NoRemove
                 EnableWindow(GetDlgItem(hwndDlg, IDC_FILETYPES_DELETE), FALSE);
             return TRUE;
-
         case WM_COMMAND:
             switch(LOWORD(wParam))
             {
@@ -1984,7 +1977,6 @@ FolderOptionsFileTypesDlg(
                     break;
             }
             break;
-
         case WM_NOTIFY:
             lppl = (LPNMLISTVIEW) lParam;
 
@@ -2065,8 +2057,8 @@ ShowFolderOptionsDialog(HWND hWnd, HINSTANCE hInst)
         hppages[num_pages++] = hpage;
 
     szOptions[0] = L'\0';
-    LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR));
-    szOptions[(sizeof(szOptions)/sizeof(WCHAR))-1] = L'\0';
+    LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, _countof(szOptions));
+    szOptions[_countof(szOptions) - 1] = L'\0';
 
     memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW));
     pinfo.dwSize = sizeof(PROPSHEETHEADERW);
@@ -2089,7 +2081,7 @@ Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow)
             break;
         case 1:
             // show taskbar options dialog
-            FIXME("notify explorer to show taskbar options dialog");
+            FIXME("notify explorer to show taskbar options dlg\n");
             //PostMessage(GetShellWindow(), WM_USER+22, fOptions, 0);
             break;
         default:
@@ -2100,7 +2092,8 @@ Options_RunDLLCommon(HWND hWnd, HINSTANCE hInst, int fOptions, DWORD nCmdShow)
 /*************************************************************************
  *              Options_RunDLL (SHELL32.@)
  */
-EXTERN_C VOID WINAPI Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow)
+EXTERN_C VOID WINAPI
+Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow)
 {
     Options_RunDLLCommon(hWnd, hInst, StrToIntA(cmd), nCmdShow);
 }
@@ -2108,7 +2101,8 @@ EXTERN_C VOID WINAPI Options_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWOR
 /*************************************************************************
  *              Options_RunDLLA (SHELL32.@)
  */
-EXTERN_C VOID WINAPI Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow)
+EXTERN_C VOID WINAPI
+Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow)
 {
     Options_RunDLLCommon(hWnd, hInst, StrToIntA(cmd), nCmdShow);
 }
@@ -2116,7 +2110,8 @@ EXTERN_C VOID WINAPI Options_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWO
 /*************************************************************************
  *              Options_RunDLLW (SHELL32.@)
  */
-EXTERN_C VOID WINAPI Options_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow)
+EXTERN_C VOID WINAPI
+Options_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow)
 {
     Options_RunDLLCommon(hWnd, hInst, StrToIntW(cmd), nCmdShow);
 }
diff --git a/dll/win32/shell32/dialogs/recycler_prop.cpp b/dll/win32/shell32/dialogs/recycler_prop.cpp
index d249e05f396..2df33f642d1 100644
--- a/dll/win32/shell32/dialogs/recycler_prop.cpp
+++ b/dll/win32/shell32/dialogs/recycler_prop.cpp
@@ -46,7 +46,6 @@ static void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable)
     }
 }
 
-
 static VOID
 InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive)
 {
@@ -70,12 +69,12 @@ InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive)
 
     hDlgCtrl = GetDlgItem(hwndDlg, 14000);
 
-    if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_LOCATION, szVolume, sizeof(szVolume) / sizeof(WCHAR)))
+    if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_LOCATION, szVolume, _countof(szVolume)))
         szVolume[0] = 0;
 
     GetClientRect(hDlgCtrl, &rect);
 
-    memset(&lc, 0, sizeof(LV_COLUMN) );
+    memset(&lc, 0, sizeof(lc));
     lc.mask = LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT;
 
     columnSize = 140; //FIXME
@@ -86,7 +85,7 @@ InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive)
     lc.pszText    = szVolume;
     (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMNW, 0, (LPARAM)&lc);
 
-    if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_DISKSPACE, szVolume, sizeof(szVolume) / sizeof(WCHAR)))
+    if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_DISKSPACE, szVolume, _countof(szVolume)))
         szVolume[0] = 0;
 
     lc.iSubItem   = 1;
@@ -99,29 +98,28 @@ InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive)
     itemCount = 0;
     do
     {
-        if ((dwDrives & 0x1))
+        if (dwDrives & 0x1)
         {
             UINT Type = GetDriveTypeW(szDrive);
             if (Type == DRIVE_FIXED) //FIXME
             {
-                if (!GetVolumeInformationW(szDrive, szName, sizeof(szName) / sizeof(WCHAR), &dwSerial, &MaxComponent, &Flags, NULL, 0))
+                if (!GetVolumeInformationW(szDrive, szName, _countof(szName), &dwSerial, &MaxComponent, &Flags, NULL, 0))
                 {
                     szName[0] = 0;
                     dwSerial = -1;
                 }
 
                 swprintf(szVolume, L"%s (%c:)", szName, szDrive[0]);
-                memset(&li, 0x0, sizeof(LVITEMW));
+                memset(&li, 0x0, sizeof(li));
                 li.mask = LVIF_TEXT | LVIF_PARAM;
                 li.iSubItem = 0;
                 li.pszText = szVolume;
                 li.iItem = itemCount;
                 SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li);
-                if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable , &TotalNumberOfBytes, &TotalNumberOfFreeBytes))
+                if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes))
                 {
-                    if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, szVolume, sizeof(szVolume) / sizeof(WCHAR)))
+                    if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, szVolume, _countof(szVolume)))
                     {
-
                         pItem = (DRIVE_ITEM_CONTEXT *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DRIVE_ITEM_CONTEXT));
                         if (pItem)
                         {
@@ -167,11 +165,10 @@ InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive)
     }
     ZeroMemory(&li, sizeof(li));
     li.mask = LVIF_STATE;
-    li.stateMask = (UINT) - 1;
+    li.stateMask = (UINT)-1;
     li.state = LVIS_FOCUSED | LVIS_SELECTED;
     li.iItem = defIndex;
     (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
-
 }
 
 static BOOL StoreDriveSettings(HWND hwndDlg)
@@ -184,7 +181,6 @@ static BOOL StoreDriveSettings(HWND hwndDlg)
     WCHAR szSerial[20];
     DWORD dwSize;
 
-
     if (RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS)
         return FALSE;
 
@@ -212,7 +208,6 @@ static BOOL StoreDriveSettings(HWND hwndDlg)
     }
     RegCloseKey(hKey);
     return TRUE;
-
 }
 
 static VOID FreeDriveItemContext(HWND hwndDlg)
@@ -231,13 +226,13 @@ static VOID FreeDriveItemContext(HWND hwndDlg)
         li.iItem = iIndex;
         if (SendMessageW(hDlgCtrl, LVM_GETITEMW, 0, (LPARAM)&li))
         {
-            HeapFree(GetProcessHeap(), 0, (LPVOID)li.lParam);
+            HeapFree(GetProcessHeap(), 0, (PVOID)li.lParam);
         }
     }
 }
 
 static INT
-GetDefaultItem(HWND hwndDlg, LVITEMW * li)
+GetDefaultItem(HWND hwndDlg, LVITEMW* li)
 {
     HWND hDlgCtrl;
     UINT iItemCount, iIndex;
@@ -252,7 +247,7 @@ GetDefaultItem(HWND hwndDlg, LVITEMW * li)
 
     ZeroMemory(li, sizeof(LVITEMW));
     li->mask = LVIF_PARAM | LVIF_STATE;
-    li->stateMask = (UINT) - 1;
+    li->stateMask = (UINT)-1;
     for (iIndex = 0; iIndex < iItemCount; iIndex++)
     {
         li->iItem = iIndex;
@@ -263,7 +258,6 @@ GetDefaultItem(HWND hwndDlg, LVITEMW * li)
         }
     }
     return -1;
-
 }
 
 static INT_PTR CALLBACK
@@ -271,8 +265,7 @@ RecycleBinDlg(
     HWND hwndDlg,
     UINT uMsg,
     WPARAM wParam,
-    LPARAM lParam
-)
+    LPARAM lParam)
 {
     LPPSHNOTIFY lppsn;
     LPNMLISTVIEW lppl;
@@ -383,12 +376,10 @@ BOOL SH_ShowRecycleBinProperties(WCHAR sDrive)
     HPROPSHEETPAGE hpsp[1];
     PROPSHEETHEADERW psh;
     HPROPSHEETPAGE hprop;
-
     BOOL ret;
 
-
-    ZeroMemory(&psh, sizeof(PROPSHEETHEADERW));
-    psh.dwSize = sizeof(PROPSHEETHEADERW);
+    ZeroMemory(&psh, sizeof(psh));
+    psh.dwSize = sizeof(psh);
     psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE;
     psh.pszCaption = MAKEINTRESOURCEW(IDS_RECYCLEBIN_FOLDER_NAME);
     psh.hwndParent = NULL;
@@ -404,10 +395,6 @@ BOOL SH_ShowRecycleBinProperties(WCHAR sDrive)
     hpsp[psh.nPages] = hprop;
     psh.nPages++;
 
-
     ret = PropertySheetW(&psh);
-    if (ret < 0)
-        return FALSE;
-    else
-        return TRUE;
+    return (ret >= 0);
 }
diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp
index 59e1d3f1a10..d4aeeaaf7f8 100644
--- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp
+++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp
@@ -67,8 +67,6 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl,
     //Double NULL terminate.
     wszTargetPath[wcslen(wszTargetPath) + 1] = '\0';
 
-    TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl);
-
     STRRET strretFrom;
     hr = pSFFrom->GetDisplayNameOf(NULL, SHGDN_FORPARSING, &strretFrom);
     if (FAILED_UNEXPECTEDLY(hr))
@@ -446,7 +444,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
     if (SUCCEEDED(pDataObject->QueryGetData(&fmt)))
     {
         hr = pDataObject->GetData(&fmt, &medium);
-        TRACE("CFSTR_SHELLIDLIST.\n");
+        TRACE("CFSTR_SHELLIDLIST\n");
 
         /* lock the handle */
         LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal);
@@ -500,33 +498,26 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
 
         if (bLinking)
         {
-            WCHAR wszTargetPath[MAX_PATH];
             WCHAR wszPath[MAX_PATH];
             WCHAR wszTarget[MAX_PATH];
 
-            wcscpy(wszTargetPath, m_sPathTarget);
-
-            TRACE("target path = %s", debugstr_w(wszTargetPath));
+            TRACE("target path = %s\n", debugstr_w(m_sPathTarget));
 
             /* 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
+                //Find out which file we're linking
                 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");
+                    ERR("Error to put source path into buffer\n");
                     break;
                 }
-                TRACE("source path = %s", debugstr_w(wszPath));
 
                 // Creating a buffer to hold the combined path
                 WCHAR buffer_1[MAX_PATH] = L"";
@@ -544,20 +535,20 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
                     //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");
+                        ERR("Error to get unique filename\n");
                         hr = E_FAIL;
                         break;
                     }
                     hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf));
                     if (FAILED(hr)) {
-                        ERR("Error constructing link from file");
+                        ERR("Error constructing link from file\n");
                         break;
                     }
 
                     hr = ppf->Save(wszTarget, FALSE);
-					if (FAILED(hr))
-						break;
-					SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
+                    if (FAILED(hr))
+                        break;
+                    SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
                 }
                 else
                 {
@@ -565,7 +556,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
                     //Create a file name for the link
                     if (!_GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE))
                     {
-                        ERR("Error creating unique file name");
+                        ERR("Error creating unique filename\n");
                         hr = E_FAIL;
                         break;
                     }
@@ -573,7 +564,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
                     CComPtr<IShellLinkW> pLink;
                     hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink));
                     if (FAILED(hr)) {
-                        ERR("Error instantiating IShellLinkW");
+                        ERR("Error instantiating IShellLinkW\n");
                         break;
                     }
 
@@ -594,9 +585,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
                         break;
 
                     hr = ppf->Save(wszTarget, TRUE);
-					if (FAILED(hr))
-						break;
-					SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
+                    if (FAILED(hr))
+                        break;
+                    SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL);
                 }
             }
         }
@@ -646,7 +637,7 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject,
     }
     else
     {
-        ERR("No viable drop format.\n");
+        ERR("No viable drop format\n");
         hr = E_FAIL;
     }
     return hr;
diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp
index 9a46c56b5bc..77bcef97583 100644
--- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp
+++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp
@@ -149,7 +149,7 @@ class CRecyclerDropTarget :
             TRACE("(%p)->(DataObject=%p)\n", this, pDataObject);
             InitFormatEtc (fmt, cfShellIDList, TYMED_HGLOBAL);
 
-            /* Handle cfShellIDList Drop objects here, otherwise send the approriate message to other software */
+            /* Handle cfShellIDList Drop objects here, otherwise send the appropriate message to other software */
             if (SUCCEEDED(pDataObject->QueryGetData(&fmt)))
             {
                 DWORD fMask = 0;
diff --git a/dll/win32/shell32/droptargets/CexeDropHandler.cpp b/dll/win32/shell32/droptargets/CexeDropHandler.cpp
index 83f9723e631..bf228e44bd3 100644
--- a/dll/win32/shell32/droptargets/CexeDropHandler.cpp
+++ b/dll/win32/shell32/droptargets/CexeDropHandler.cpp
@@ -55,7 +55,7 @@ HRESULT WINAPI CExeDropHandler::DragLeave()
 
 HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect)
 {
-    TRACE ("(%p)\n", this);    
+    TRACE ("(%p)\n", this);
     FORMATETC fmt;
     STGMEDIUM medium;
     LPWSTR pszSrcList;
@@ -78,7 +78,7 @@ HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState,
                 StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"\"%ls\" ", pszSrcList);
             else
                 StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"%ls ", pszSrcList);
-            
+
             pszSrcList += wcslen(pszSrcList) + 1;
         }
     }
diff --git a/dll/win32/shell32/folders/CAdminToolsFolder.cpp b/dll/win32/shell32/folders/CAdminToolsFolder.cpp
index 47a6415f6a3..be03188356f 100644
--- a/dll/win32/shell32/folders/CAdminToolsFolder.cpp
+++ b/dll/win32/shell32/folders/CAdminToolsFolder.cpp
@@ -68,9 +68,9 @@ HRESULT WINAPI CAdminToolsFolder::CreateViewObject(HWND hwndOwner, REFIID riid,
 HRESULT WINAPI CAdminToolsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut)
 {
     static const DWORD dwAdminToolsAttributes =
-        SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | 
+        SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR |
         SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER;
-        
+
     if(cidl)
         return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut);
 
@@ -174,7 +174,7 @@ HRESULT WINAPI CAdminToolsFolder::Initialize(LPCITEMIDLIST pidl)
     if (!m_pidlInner)
         return E_OUTOFMEMORY;
 
-    return SHELL32_CoCreateInitSF(m_pidlInner, 
+    return SHELL32_CoCreateInitSF(m_pidlInner,
                                   &CLSID_ShellFSFolder,
                                   CSIDL_COMMON_ADMINTOOLS,
                                   IID_PPV_ARG(IShellFolder2, &m_pisfInner));
diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp
index 51ea31a3006..5770869c204 100644
--- a/dll/win32/shell32/folders/CControlPanelFolder.cpp
+++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp
@@ -155,9 +155,9 @@ BOOL CControlPanelEnum::RegisterCPanelApp(LPCWSTR wpath)
             else
                 iconIdx = 0;
 
-            LPITEMIDLIST pidl = _ILCreateCPanelApplet(wpath, 
-                                                      applet->info[i].name, 
-                                                      applet->info[i].info, 
+            LPITEMIDLIST pidl = _ILCreateCPanelApplet(wpath,
+                                                      applet->info[i].name,
+                                                      applet->info[i].info,
                                                       iconIdx);
 
             if (pidl)
@@ -328,7 +328,7 @@ HRESULT WINAPI CControlPanelFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE
         return E_INVALIDARG;
 
     int result;
-    switch(LOWORD(lParam)) 
+    switch(LOWORD(lParam))
     {
         case 0:        /* name */
             result = wcsicmp(pData1->szName + pData1->offsDispName, pData2->szName + pData2->offsDispName);
@@ -406,7 +406,7 @@ HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_A
             else if (_ILIsSpecialFolder(*apidl))
                 m_regFolder->GetAttributesOf(1, apidl, rgfInOut);
             else
-                ERR("Got an unkown pidl here!\n");
+                ERR("Got unknown pidl\n");
             apidl++;
             cidl--;
         }
@@ -443,7 +443,6 @@ HRESULT WINAPI CControlPanelFolder::GetUIObjectOf(HWND hwndOwner,
         *ppvOut = NULL;
 
         if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) {
-            
             /* HACK: We should use callbacks from CDefaultContextMenu instead of creating one on our own */
             BOOL bHasCpl = FALSE;
             for (UINT i = 0; i < cidl; i++)
@@ -560,7 +559,7 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iCol
     if (!psd || iColumn >= CONROLPANELSHELLVIEWCOLUMNS)
         return E_INVALIDARG;
 
-    if (!pidl) 
+    if (!pidl)
     {
         psd->fmt = ControlPanelSFHeader[iColumn].fmt;
         psd->cxChar = ControlPanelSFHeader[iColumn].cxChar;
@@ -570,14 +569,14 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iCol
     {
         return m_regFolder->GetDetailsOf(pidl, iColumn, psd);
     }
-    else 
+    else
     {
         PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(pidl);
 
         if (!pCPanel)
             return E_FAIL;
 
-        switch(iColumn) 
+        switch(iColumn)
         {
             case 0:        /* name */
                 return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsDispName);
@@ -626,7 +625,7 @@ HRESULT WINAPI CControlPanelFolder::Initialize(LPCITEMIDLIST pidl)
     static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}";
     hr = CRegFolder_CreateInstance(&CLSID_ControlPanel,
                                    pidlRoot,
-                                   pszCPanelPath, 
+                                   pszCPanelPath,
                                    L"ControlPanel",
                                    IID_PPV_ARG(IShellFolder2, &m_regFolder));
     if (FAILED_UNEXPECTEDLY(hr))
diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp
index 277499fbc41..130f65cd810 100644
--- a/dll/win32/shell32/folders/CDesktopFolder.cpp
+++ b/dll/win32/shell32/folders/CDesktopFolder.cpp
@@ -211,7 +211,7 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
         return E_OUTOFMEMORY;
 
     /* Create the inner fs folder */
-    hr = SHELL32_CoCreateInitSF(pidlRoot, 
+    hr = SHELL32_CoCreateInitSF(pidlRoot,
                                 &CLSID_ShellFSFolder,
                                 CSIDL_DESKTOPDIRECTORY,
                                 IID_PPV_ARG(IShellFolder2, &m_DesktopFSFolder));
@@ -219,7 +219,7 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
         return hr;
 
     /* Create the inner shared fs folder. Dont fail on failure. */
-    hr = SHELL32_CoCreateInitSF(pidlRoot, 
+    hr = SHELL32_CoCreateInitSF(pidlRoot,
                                 &CLSID_ShellFSFolder,
                                 CSIDL_COMMON_DESKTOPDIRECTORY,
                                 IID_PPV_ARG(IShellFolder2, &m_SharedDesktopFSFolder));
@@ -229,7 +229,7 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct()
     /* Create the inner reg folder */
     hr = CRegFolder_CreateInstance(&CLSID_ShellDesktop,
                                    pidlRoot,
-                                   L"", 
+                                   L"",
                                    L"Desktop",
                                    IID_PPV_ARG(IShellFolder2, &m_regFolder));
     if (FAILED_UNEXPECTEDLY(hr))
@@ -829,7 +829,7 @@ HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl)
 {
     TRACE ("(%p)->(%p)\n", this, pidl);
 
-    if (!pidl) 
+    if (!pidl)
         return E_INVALIDARG; /* xp doesn't have this check and crashes on NULL */
     *pidl = ILClone (pidlRoot);
     return S_OK;
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
index 50e1651f369..4c00174c513 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -23,7 +23,7 @@
 
 #include <precomp.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL (shell);
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*
 CDrivesFolder should create a CRegFolder to represent the virtual items that exist only in
@@ -387,7 +387,7 @@ CDrivesFolder::CDrivesFolder()
 
 CDrivesFolder::~CDrivesFolder()
 {
-    TRACE ("-- destroying IShellFolder(%p)\n", this);
+    TRACE("-- destroying IShellFolder(%p)\n", this);
     SHFree(pidlRoot);
 }
 
@@ -397,9 +397,9 @@ HRESULT WINAPI CDrivesFolder::FinalConstruct()
     if (pidlRoot == NULL)
         return E_OUTOFMEMORY;
 
-    HRESULT hr = CRegFolder_CreateInstance(&CLSID_MyComputer, 
-                                           pidlRoot, 
-                                           L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", 
+    HRESULT hr = CRegFolder_CreateInstance(&CLSID_MyComputer,
+                                           pidlRoot,
+                                           L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
                                            L"MyComputer",
                                            IID_PPV_ARG(IShellFolder2, &m_regFolder));
 
@@ -455,13 +455,13 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST
             else if (_ILIsSpecialFolder(pidlTemp))
                 m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes);
             else
-                ERR("Got an unkown pidl here!\n");
+                ERR("Got unknown pidl\n");
         }
     }
 
     *ppidl = pidlTemp;
 
-    TRACE ("(%p)->(-- ret=0x%08x)\n", this, hr);
+    TRACE("(%p)->(-- ret=0x%08x)\n", this, hr);
 
     return hr;
 }
@@ -489,7 +489,7 @@ HRESULT WINAPI CDrivesFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcRese
         return m_regFolder->BindToObject(pidl, pbcReserved, riid, ppvOut);
 
     CHAR* pchDrive = _ILGetDataPointer(pidl)->u.drive.szDriveName;
-    
+
     PERSIST_FOLDER_TARGET_INFO pfti = {0};
     pfti.dwAttributes = -1;
     pfti.csidl = -1;
@@ -545,7 +545,7 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1
     CHAR* pszDrive2 = _ILGetDataPointer(pidl2)->u.drive.szDriveName;
 
     int result;
-    switch(LOWORD(lParam)) 
+    switch(LOWORD(lParam))
     {
         case 0:        /* name */
         {
@@ -639,7 +639,7 @@ HRESULT WINAPI CDrivesFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVO
             SFV_CREATE sfvparams = {sizeof(SFV_CREATE), this};
             hr = SHCreateShellFolderView(&sfvparams, (IShellView**)ppvOut);
     }
-    TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut);
+    TRACE("-- (%p)->(interface=%p)\n", this, ppvOut);
     return hr;
 }
 
@@ -659,8 +659,8 @@ static BOOL _ILIsControlPanel(LPCITEMIDLIST pidl)
 */
 HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut)
 {
-    TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n",
-           this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
+    TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n",
+          this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
 
     if (cidl && !apidl)
         return E_INVALIDARG;
@@ -689,7 +689,7 @@ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a
     /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
     *rgfInOut &= ~SFGAO_VALIDATE;
 
-    TRACE ("-- result=0x%08x\n", *rgfInOut);
+    TRACE("-- result=0x%08x\n", *rgfInOut);
     return S_OK;
 }
 
@@ -729,8 +729,8 @@ HRESULT WINAPI CDrivesFolder::GetUIObjectOf(HWND hwndOwner,
     }
     else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1))
     {
-        hr = IDataObject_Constructor (hwndOwner,
-                                      pidlRoot, apidl, cidl, (IDataObject **)&pObj);
+        hr = IDataObject_Constructor(hwndOwner,
+                                     pidlRoot, apidl, cidl, (IDataObject **)&pObj);
     }
     else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1))
     {
@@ -755,7 +755,7 @@ HRESULT WINAPI CDrivesFolder::GetUIObjectOf(HWND hwndOwner,
         hr = E_OUTOFMEMORY;
 
     *ppvOut = pObj;
-    TRACE ("(%p)->hr=0x%08x\n", this, hr);
+    TRACE("(%p)->hr=0x%08x\n", this, hr);
     return hr;
 }
 
@@ -767,7 +767,7 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla
     LPWSTR pszPath;
     HRESULT hr = S_OK;
 
-    TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet);
+    TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", this, pidl, dwFlags, strRet);
     pdump (pidl);
 
     if (!strRet)
@@ -805,9 +805,9 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla
         lstrcpynW(wszDrive, pszPath, 4);
         pszPath[0] = L'\0';
         GetVolumeInformationW(wszDrive, pszPath,
-                                MAX_PATH - 7,
-                                &dwVolumeSerialNumber,
-                                &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0);
+                              MAX_PATH - 7,
+                              &dwVolumeSerialNumber,
+                              &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0);
         pszPath[MAX_PATH-1] = L'\0';
         if (!wcslen(pszPath))
         {
@@ -834,10 +834,10 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla
                     pszPath[MAX_PATH-7] = L'\0';
             }
         }
-        wcscat (pszPath, wszOpenBracket);
+        wcscat(pszPath, wszOpenBracket);
         wszDrive[2] = L'\0';
-        wcscat (pszPath, wszDrive);
-        wcscat (pszPath, wszCloseBracket);
+        wcscat(pszPath, wszDrive);
+        wcscat(pszPath, wszCloseBracket);
     }
 
     if (SUCCEEDED(hr))
@@ -883,19 +883,19 @@ HRESULT WINAPI CDrivesFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl,
 
 HRESULT WINAPI CDrivesFolder::GetDefaultSearchGUID(GUID * pguid)
 {
-    FIXME ("(%p)\n", this);
+    FIXME("(%p)\n", this);
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI CDrivesFolder::EnumSearches(IEnumExtraSearch ** ppenum)
 {
-    FIXME ("(%p)\n", this);
+    FIXME("(%p)\n", this);
     return E_NOTIMPL;
 }
 
 HRESULT WINAPI CDrivesFolder::GetDefaultColumn (DWORD dwRes, ULONG *pSort, ULONG *pDisplay)
 {
-    TRACE ("(%p)\n", this);
+    TRACE("(%p)\n", this);
 
     if (pSort)
         *pSort = 0;
@@ -906,7 +906,7 @@ HRESULT WINAPI CDrivesFolder::GetDefaultColumn (DWORD dwRes, ULONG *pSort, ULONG
 
 HRESULT WINAPI CDrivesFolder::GetDefaultColumnState(UINT iColumn, DWORD * pcsFlags)
 {
-    TRACE ("(%p)\n", this);
+    TRACE("(%p)\n", this);
 
     if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS)
         return E_INVALIDARG;
@@ -916,7 +916,7 @@ HRESULT WINAPI CDrivesFolder::GetDefaultColumnState(UINT iColumn, DWORD * pcsFla
 
 HRESULT WINAPI CDrivesFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID * pscid, VARIANT * pv)
 {
-    FIXME ("(%p)\n", this);
+    FIXME("(%p)\n", this);
     return E_NOTIMPL;
 }
 
@@ -924,7 +924,7 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S
 {
     HRESULT hr;
 
-    TRACE ("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd);
+    TRACE("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd);
 
     if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS)
         return E_INVALIDARG;
@@ -989,7 +989,7 @@ HRESULT WINAPI CDrivesFolder::MapColumnToSCID(UINT column, SHCOLUMNID * pscid)
  */
 HRESULT WINAPI CDrivesFolder::GetClassID(CLSID *lpClassId)
 {
-    TRACE ("(%p)\n", this);
+    TRACE("(%p)\n", this);
 
     if (!lpClassId)
         return E_POINTER;
diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp
index a33f66cf57d..9fa848ac324 100644
--- a/dll/win32/shell32/folders/CFSFolder.cpp
+++ b/dll/win32/shell32/folders/CFSFolder.cpp
@@ -132,8 +132,9 @@ HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pcl
     return GetCLSIDForFileTypeFromExtension(pExtension, KeyName, pclsid);
 }
 
-static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags,
-                                        LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags)
+static HRESULT
+getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags,
+                         LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags)
 {
     static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 };
     static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 };
@@ -209,32 +210,32 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE
 
     if (_ILIsFolder (pidl))
     {
-        if (SUCCEEDED(getIconLocationForFolder(psf, 
+        if (SUCCEEDED(getIconLocationForFolder(psf,
                           pidl, 0, wTemp, _countof(wTemp),
                           &icon_idx,
                           &flags)))
         {
             initIcon->SetNormalIcon(wTemp, icon_idx);
-            // FIXME: if/when getIconLocationForFolder does something for 
+            // FIXME: if/when getIconLocationForFolder does something for
             //        GIL_FORSHORTCUT, code below should be uncommented. and
             //        the following line removed.
             initIcon->SetShortcutIcon(wTemp, icon_idx);
         }
-        if (SUCCEEDED(getIconLocationForFolder(psf, 
+        if (SUCCEEDED(getIconLocationForFolder(psf,
                           pidl, GIL_DEFAULTICON, wTemp, _countof(wTemp),
                           &icon_idx,
                           &flags)))
         {
             initIcon->SetDefaultIcon(wTemp, icon_idx);
         }
-        // if (SUCCEEDED(getIconLocationForFolder(psf, 
+        // if (SUCCEEDED(getIconLocationForFolder(psf,
         //                   pidl, GIL_FORSHORTCUT, wTemp, _countof(wTemp),
         //                   &icon_idx,
         //                   &flags)))
         // {
         //     initIcon->SetShortcutIcon(wTemp, icon_idx);
         // }
-        if (SUCCEEDED(getIconLocationForFolder(psf, 
+        if (SUCCEEDED(getIconLocationForFolder(psf,
                           pidl, GIL_OPENICON, wTemp, _countof(wTemp),
                           &icon_idx,
                           &flags)))
@@ -322,7 +323,7 @@ private:
                 hr = SHELL32_GetCLSIDForDirectory(Tmp, L"CLSID", &clsidFolder);
                 if (SUCCEEDED(hr))
                 {
-                    ERR("SHOULD DO SOMETHING WITH CLSID?\n");
+                    ERR("Got CLSID override\n");
                 }
             }
         }
@@ -706,7 +707,7 @@ HRESULT WINAPI CFSFolder::ParseDisplayName(HWND hwndOwner,
         if (pidlTemp != NULL)
         {
             /* We are creating an id list without ensuring that the items exist.
-               If we have a remaining path, this must be a folder. 
+               If we have a remaining path, this must be a folder.
                We have to do it now because it is set as a file by default */
             if (szNext)
             {
@@ -898,7 +899,7 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam,
         case 2: /* Type */
             pExtension1 = PathFindExtensionW(pDataW1->wszName);
             pExtension2 = PathFindExtensionW(pDataW2->wszName);
-            result = wcsicmp(pExtension1, pExtension2); 
+            result = wcsicmp(pExtension1, pExtension2);
             break;
         case 3: /* Size */
             result = pData1->u.file.dwFileSize - pData2->u.file.dwFileSize;
@@ -1138,7 +1139,7 @@ HRESULT WINAPI CFSFolder::GetUIObjectOf(HWND hwndOwner,
         }
         else if (IsEqualIID (riid, IID_IDataObject))
         {
-            if (cidl >= 1) 
+            if (cidl >= 1)
             {
                 hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj);
             }
@@ -1201,7 +1202,7 @@ BOOL SHELL_FS_HideExtension(LPWSTR szPath)
     if (!RegCreateKeyExW(HKEY_CURRENT_USER, AdvancedW, 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0)) {
         if (!RegQueryValueExW(hKey, HideFileExtW, 0, 0, (LPBYTE) &dwData, &dwDataSize))
             doHide = dwData;
-        RegCloseKey (hKey);
+        RegCloseKey(hKey);
     }
 
     if (!doHide) {
@@ -1244,7 +1245,6 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags)
 * FIXME
 *  if the name is in the pidl the ret value should be a STRRET_OFFSET
 */
-
 HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl,
         DWORD dwFlags, LPSTRRET strRet)
 {
@@ -1259,7 +1259,7 @@ HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl,
     else if (pidl && !pidl->mkid.cb) /* empty pidl */
     {
         /* If it is an empty pidl return only the path of the folder */
-        if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && 
+        if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) &&
             (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER) &&
             sPathTarget)
         {
@@ -1267,7 +1267,7 @@ HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl,
         }
         return E_INVALIDARG;
     }
-    
+
     int len = 0;
     LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR));
     if (!pszPath)
@@ -1637,7 +1637,7 @@ HRESULT CFSFolder::_CreateExtensionUIObject(PCUIDLIST_RELATIVE pidl, REFIID riid
     return S_OK;
 }
 
-HRESULT CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) 
+HRESULT CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut)
 {
     HRESULT hr;
 
@@ -1665,7 +1665,7 @@ HRESULT CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut)
     return S_OK;
 }
 
-HRESULT CFSFolder::_GetIconHandler(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) 
+HRESULT CFSFolder::_GetIconHandler(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut)
 {
     CLSID clsid;
     HRESULT hr;
diff --git a/dll/win32/shell32/folders/CFSFolder.h b/dll/win32/shell32/folders/CFSFolder.h
index 01cab234e12..00e97e2d50b 100644
--- a/dll/win32/shell32/folders/CFSFolder.h
+++ b/dll/win32/shell32/folders/CFSFolder.h
@@ -34,7 +34,7 @@ class CFSFolder :
     public:
         CFSFolder();
         ~CFSFolder();
-        
+
         // IShellFolder
         virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes);
         virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList);
diff --git a/dll/win32/shell32/folders/CFontsFolder.cpp b/dll/win32/shell32/folders/CFontsFolder.cpp
index 3b9a3d83434..967abfabec3 100644
--- a/dll/win32/shell32/folders/CFontsFolder.cpp
+++ b/dll/win32/shell32/folders/CFontsFolder.cpp
@@ -68,9 +68,9 @@ HRESULT WINAPI CFontsFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOI
 HRESULT WINAPI CFontsFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut)
 {
     static const DWORD dwFontsAttributes =
-        SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | 
+        SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR |
         SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER;
-    
+
     if(cidl)
         return m_pisfInner->GetAttributesOf(cidl, apidl, rgfInOut);
 
diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp
index fb8c1d8dc18..538de6c6688 100644
--- a/dll/win32/shell32/folders/CRecycleBin.cpp
+++ b/dll/win32/shell32/folders/CRecycleBin.cpp
@@ -38,14 +38,14 @@ typedef struct
 
 static const columninfo RecycleBinColumns[] =
 {
-    {IDS_SHV_COLUMN_NAME,        &FMTID_Storage,   PID_STG_NAME,       SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  30},
-    {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  30},
-    {IDS_SHV_COLUMN_DELDATE, &FMTID_Displaced, PID_DISPLACED_DATE, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT,  20},
-    {IDS_SHV_COLUMN_SIZE,        &FMTID_Storage,   PID_STG_SIZE,       SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_RIGHT, 20},
-    {IDS_SHV_COLUMN_TYPE,        &FMTID_Storage,   PID_STG_STORAGETYPE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  20},
-    {IDS_SHV_COLUMN_MODIFIED,        &FMTID_Storage,   PID_STG_WRITETIME,  SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT,  20},
-    /*    {"creation time",  &FMTID_Storage,   PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE,                        LVCFMT_LEFT,  20}, */
-    /*    {"attribs",        &FMTID_Storage,   PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR,                         LVCFMT_LEFT,  20},       */
+    {IDS_SHV_COLUMN_NAME,     &FMTID_Storage,   PID_STG_NAME,        SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  30},
+    {IDS_SHV_COLUMN_DELFROM,  &FMTID_Displaced, PID_DISPLACED_FROM,  SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  30},
+    {IDS_SHV_COLUMN_DELDATE,  &FMTID_Displaced, PID_DISPLACED_DATE,  SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT,  20},
+    {IDS_SHV_COLUMN_SIZE,     &FMTID_Storage,   PID_STG_SIZE,        SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_RIGHT, 20},
+    {IDS_SHV_COLUMN_TYPE,     &FMTID_Storage,   PID_STG_STORAGETYPE, SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT,  LVCFMT_LEFT,  20},
+    {IDS_SHV_COLUMN_MODIFIED, &FMTID_Storage,   PID_STG_WRITETIME,   SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT,  20},
+    /* {"creation time",  &FMTID_Storage,   PID_STG_CREATETIME, SHCOLSTATE_TYPE_DATE, LVCFMT_LEFT,  20}, */
+    /* {"attribs",        &FMTID_Storage,   PID_STG_ATTRIBUTES, SHCOLSTATE_TYPE_STR,  LVCFMT_LEFT,  20}, */
 };
 
 #define COLUMN_NAME    0
@@ -319,30 +319,30 @@ HRESULT WINAPI CRecycleBinItemContextMenu::QueryContextMenu(HMENU hMenu, UINT in
 
     TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
 
-    if (LoadStringW(shell32_hInstance, IDS_RESTORE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))
+    if (LoadStringW(shell32_hInstance, IDS_RESTORE, szBuffer, _countof(szBuffer)))
     {
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+        szBuffer[_countof(szBuffer)-1] = L'\0';
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED);
         Count++;
     }
 
-    if (LoadStringW(shell32_hInstance, IDS_CUT, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))
+    if (LoadStringW(shell32_hInstance, IDS_CUT, szBuffer, _countof(szBuffer)))
     {
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED);
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+        szBuffer[_countof(szBuffer)-1] = L'\0';
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED);
     }
 
-    if (LoadStringW(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))
+    if (LoadStringW(shell32_hInstance, IDS_DELETE, szBuffer, _countof(szBuffer)))
     {
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+        szBuffer[_countof(szBuffer)-1] = L'\0';
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED);
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED);
     }
 
-    if (LoadStringW(shell32_hInstance, IDS_PROPERTIES, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)))
+    if (LoadStringW(shell32_hInstance, IDS_PROPERTIES, szBuffer, _countof(szBuffer)))
     {
-        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+        szBuffer[_countof(szBuffer)-1] = L'\0';
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED);
         _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT);
     }
@@ -795,7 +795,7 @@ HRESULT WINAPI CRecycleBin::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT i
     mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE;
     mii.fState = RecycleBinIsEmpty() ? MFS_DISABLED : MFS_ENABLED;
     szBuffer[0] = L'\0';
-    LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer) / sizeof(WCHAR));
+    LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, _countof(szBuffer));
     mii.dwTypeData = szBuffer;
     mii.cch = wcslen(mii.dwTypeData);
     mii.wID = idCmdFirst + id++;
@@ -883,7 +883,7 @@ TRASH_CanTrashFile(LPCWSTR wszPath)
         return FALSE;
     }
 
-    // Only keep the base path.
+    // Only keep the base path
     WCHAR wszRootPathName[MAX_PATH];
     strcpyW(wszRootPathName, wszPath);
     PathRemoveFileSpecW(wszRootPathName);
@@ -1110,7 +1110,7 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags)
         if (dwType != REG_EXPAND_SZ) /* type dismatch */
             return S_OK;
 
-        szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0';
+        szPath[_countof(szPath)-1] = L'\0';
         PlaySoundW(szPath, NULL, SND_FILENAME);
     }
     return S_OK;
@@ -1149,8 +1149,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR
 {
     FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo);
 
-    if (!(pszRootPath) || (pszRootPath[0] == 0) ||
-        !(pSHQueryRBInfo) || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO)))
+    if (!pszRootPath || (pszRootPath[0] == 0) ||
+        !pSHQueryRBInfo || (pSHQueryRBInfo->cbSize < sizeof(SHQUERYRBINFO)))
     {
         return E_INVALIDARG;
     }
diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp
index fe292e87fd6..d5729f7c8ef 100644
--- a/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/dll/win32/shell32/folders/CRegFolder.cpp
@@ -503,7 +503,7 @@ HRESULT WINAPI CRegFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apid
         if (_ILIsSpecialFolder(*apidl))
             GetGuidItemAttributes(*apidl, rgfInOut);
         else
-            ERR("Got an unkown pidl here!\n");
+            ERR("Got unknown pidl\n");
         apidl++;
         cidl--;
     }
@@ -593,7 +593,7 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags,
     GUID const *clsid = _ILGetGUIDPointer (pidl);
 
     /* First of all check if we need to query the name from the child item */
-    if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING && 
+    if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING &&
         GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL)
     {
         int bWantsForParsing = FALSE;
@@ -750,7 +750,7 @@ HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHEL
 
     if (iColumn >= 3)
     {
-        /* Return an empty string when we area asked for a column we don't support. 
+        /* Return an empty string when we area asked for a column we don't support.
            Only  the regfolder is supposed to do this as it supports less columns compared to other folder
            and its contents are supposed to be presented alongside items that support more columns. */
         return SHSetStrRet(&psd->str, "");
diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp
index 6c5a85dd9d7..ee61ec03291 100644
--- a/dll/win32/shell32/iconcache.cpp
+++ b/dll/win32/shell32/iconcache.cpp
@@ -71,9 +71,9 @@ static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam)
     if (e1->dwSourceIndex != e2->dwSourceIndex)
       return (e1->dwSourceIndex < e2->dwSourceIndex) ? -1 : 1;
 
-    if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) 
+    if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT))
       return ((e1->dwFlags & GIL_FORSHORTCUT) < (e2->dwFlags & GIL_FORSHORTCUT)) ? -1 : 1;
-  
+
     return wcsicmp(e1->sSourceFile,e2->sSourceFile);
 }
 
@@ -89,7 +89,7 @@ static int SIC_LoadOverlayIcon(int icon_idx);
  * FIXME: This should go to the ImageList implementation!
  */
 static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
-{    
+{
     ICONINFO ShortcutIconInfo, TargetIconInfo;
     HICON ShortcutIcon = NULL, TargetIcon;
     BITMAP TargetBitmapInfo, ShortcutBitmapInfo;
@@ -106,7 +106,7 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
      * We will write over the source bitmaps to get the final ones */
     if (! GetIconInfo(SourceIcon, &TargetIconInfo))
         return NULL;
-    
+
     /* Is it possible with the ImageList implementation? */
     if(!TargetIconInfo.hbmColor)
     {
@@ -114,7 +114,7 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
         FIXME("1bpp icon wants its overlay!\n");
         goto fail;
     }
-        
+
     if(!GetObjectW(TargetIconInfo.hbmColor, sizeof(BITMAP), &TargetBitmapInfo))
     {
         goto fail;
@@ -140,7 +140,7 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
     {
         goto fail;
     }
-    
+
     /* Is it possible with the ImageLists ? */
     if(!ShortcutIconInfo.hbmColor)
     {
@@ -148,7 +148,7 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
         FIXME("Should draw 1bpp overlay!\n");
         goto fail;
     }
-    
+
     if(!GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo))
     {
         goto fail;
@@ -191,7 +191,7 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
         PVOID bits;
         PULONG pixel;
         INT i, j;
-        
+
         /* Find if the source bitmap has an alpha channel */
         if(TargetBitmapInfo.bmBitsPixel != 32) add_alpha = FALSE;
         else
@@ -202,21 +202,21 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
             lpbmi->bmiHeader.biHeight = TargetBitmapInfo.bmHeight;
             lpbmi->bmiHeader.biPlanes = 1;
             lpbmi->bmiHeader.biBitCount = 32;
-            
+
             bits = HeapAlloc(GetProcessHeap(), 0, TargetBitmapInfo.bmHeight * TargetBitmapInfo.bmWidthBytes);
-            
+
             if(!bits) goto fail;
-            
+
             if(!GetDIBits(TargetDC, TargetIconInfo.hbmColor, 0, TargetBitmapInfo.bmHeight, bits, lpbmi, DIB_RGB_COLORS))
             {
                 ERR("GetBIBits failed!\n");
                 HeapFree(GetProcessHeap(), 0, bits);
                 goto fail;
             }
-            
+
             i = j = 0;
             pixel = (PULONG)bits;
-            
+
             for(i=0; i<TargetBitmapInfo.bmHeight; i++)
             {
                 for(j=0; j<TargetBitmapInfo.bmWidth; j++)
@@ -228,25 +228,25 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
             }
             HeapFree(GetProcessHeap(), 0, bits);
         }
-        
+
         /* Allocate the bits */
         bits = HeapAlloc(GetProcessHeap(), 0, ShortcutBitmapInfo.bmHeight*ShortcutBitmapInfo.bmWidthBytes);
         if(!bits) goto fail;
-        
+
         ZeroMemory(buffer, sizeof(buffer));
         lpbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
         lpbmi->bmiHeader.biWidth = ShortcutBitmapInfo.bmWidth;
         lpbmi->bmiHeader.biHeight = ShortcutBitmapInfo.bmHeight;
         lpbmi->bmiHeader.biPlanes = 1;
         lpbmi->bmiHeader.biBitCount = 32;
-        
+
         if(!GetDIBits(TargetDC, ShortcutIconInfo.hbmColor, 0, ShortcutBitmapInfo.bmHeight, bits, lpbmi, DIB_RGB_COLORS))
         {
             ERR("GetBIBits failed!\n");
             HeapFree(GetProcessHeap(), 0, bits);
             goto fail;
         }
-        
+
         pixel = (PULONG)bits;
         /* Remove alpha channel component or make it totally opaque */
         for(i=0; i<ShortcutBitmapInfo.bmHeight; i++)
@@ -257,10 +257,10 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large)
                 else *pixel++ &= 0x00FFFFFF;
             }
         }
-        
+
         /* GetDIBits return BI_BITFIELDS with masks set to 0, and SetDIBits fails when masks are 0. The irony... */
         lpbmi->bmiHeader.biCompression = BI_RGB;
-        
+
         /* Set the bits again */
         if(!SetDIBits(TargetDC, ShortcutIconInfo.hbmColor, 0, ShortcutBitmapInfo.bmHeight, bits, lpbmi, DIB_RGB_COLORS))
         {
@@ -553,7 +553,7 @@ BOOL SIC_Initialize(void)
         ERR("Failed to create the big icon list.\n");
         goto end;
     }
-    
+
     /* Load the document icon, which is used as the default if an icon isn't found. */
     hSm = (HICON)LoadImageW(shell32_hInstance,
                             MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT),
@@ -589,15 +589,15 @@ BOOL SIC_Initialize(void)
         ERR("Failed to add IDI_SHELL_DOCUMENT icon to cache.\n");
         goto end;
     }
-    
+
     /* Everything went fine */
     result = TRUE;
-    
+
 end:
     /* The image list keeps a copy of the icons, we must destroy them */
     if(hSm) DestroyIcon(hSm);
     if(hLg) DestroyIcon(hLg);
-    
+
     /* Clean everything if something went wrong */
     if(!result)
     {
@@ -675,13 +675,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
         /* read icon path and index */
         if (RegQueryValueExW(hKeyShellIcons, wszIdx, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS)
         {
-        LPWSTR p = wcschr(buffer, ',');
+            LPWSTR p = wcschr(buffer, ',');
 
-        if (p)
-            *p++ = 0;
+            if (p)
+                *p++ = 0;
 
-        iconPath = buffer;
-        iconIdx = _wtoi(p);
+            iconPath = buffer;
+            iconIdx = _wtoi(p);
         }
 
         RegCloseKey(hKeyShellIcons);
@@ -698,13 +698,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
  *
  */
 BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
-{    TRACE("(%p,%p)\n",lpBigList,lpSmallList);
+{
+    TRACE("(%p,%p)\n",lpBigList,lpSmallList);
     if (lpBigList)
-    { *lpBigList = ShellBigIconList;
-    }
+        *lpBigList = ShellBigIconList;
+
     if (lpSmallList)
-    { *lpSmallList = ShellSmallIconList;
-    }
+        *lpSmallList = ShellSmallIconList;
 
     return TRUE;
 }
diff --git a/dll/win32/shell32/res/avis/Licence/Tango.txt b/dll/win32/shell32/res/avis/Licence/Tango.txt
index 642b2937a84..4a17ccab6fd 100644
--- a/dll/win32/shell32/res/avis/Licence/Tango.txt
+++ b/dll/win32/shell32/res/avis/Licence/Tango.txt
@@ -1,4 +1,4 @@
-The following avi's use icons from the Tango project and are 
+The following avi's use icons from the Tango project and are
 released under Creative Commons Attribution-ShareAlike 2.5 License.
 Please see COPYING for details
 
@@ -7,4 +7,3 @@ Please see COPYING for details
 163.avi
 164+169.avi
 170.avi
-
diff --git a/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt b/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt
index 741a163dfbb..ea08a169f1b 100644
--- a/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt
+++ b/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt
@@ -1,4 +1,4 @@
-The following icons are the property of the Tango project and are 
+The following icons are the property of the Tango project and are
 released under Creative Commons Attribution-ShareAlike 2.5 License.
 Please see COPYING for details
 
diff --git a/dll/win32/shell32/res/rgs/openwithmenu.rgs b/dll/win32/shell32/res/rgs/openwithmenu.rgs
index 6de83f8ecf8..7c26941bf4d 100644
--- a/dll/win32/shell32/res/rgs/openwithmenu.rgs
+++ b/dll/win32/shell32/res/rgs/openwithmenu.rgs
@@ -18,7 +18,7 @@ HKCR
 				}
 			}
 		}
-		
+
 		ForceRemove Applications
 		{
 		}
diff --git a/dll/win32/shell32/shell32.rc b/dll/win32/shell32/shell32.rc
index 6d3cf110fcd..3306effe53c 100644
--- a/dll/win32/shell32/shell32.rc
+++ b/dll/win32/shell32/shell32.rc
@@ -44,9 +44,9 @@ BEGIN
     "A", FCIDM_SHVIEW_SELECTALL, VIRTKEY, CONTROL
     VK_F1, FCIDM_SHVIEW_HELP, VIRTKEY
 
-    /* FIXME: the following accelerator doesn't belong here. This accelerator 
+    /* FIXME: the following accelerator doesn't belong here. This accelerator
      * table is used by the shell view control. F5 should be handled by the
-     * a different accelerator table thats translated in IShellBrowser::TranslateAcceleratorSB 
+     * a different accelerator table thats translated in IShellBrowser::TranslateAcceleratorSB
      * but will put it here until the shell work fine */
     VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY
 END
diff --git a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
index e452039aa6f..2a53eed9314 100644
--- a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
+++ b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
@@ -25,8 +25,6 @@
 #include <atlcoll.h>
 #endif
 
-
-
 WINE_DEFAULT_DEBUG_CHANNEL(desktop);
 
 static const WCHAR szProgmanClassName[]  = L"Progman";
@@ -104,7 +102,7 @@ END_COM_MAP()
 };
 
 CDesktopBrowser::CDesktopBrowser():
-    m_hAccel(NULL),    
+    m_hAccel(NULL),
     m_hWndShellView(NULL)
 {
 }
@@ -184,7 +182,7 @@ HRESULT CDesktopBrowser::_Resize()
 }
 
 HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk)
-{  
+{
     CComPtr<IShellFolder> psfDesktop;
     HRESULT hRet;
     hRet = SHGetDesktopFolder(&psfDesktop);
@@ -284,7 +282,7 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT
      * find an open shell window that shows the requested pidl and activate it
      */
 
-    DWORD dwFlags = ((wFlags & SBSP_EXPLOREMODE) != 0) ? SH_EXPLORER_CMDLINE_FLAG_E : 0; 
+    DWORD dwFlags = ((wFlags & SBSP_EXPLOREMODE) != 0) ? SH_EXPLORER_CMDLINE_FLAG_E : 0;
     return SHOpenNewFrame(ILClone(pidl), NULL, 0, dwFlags);
 }
 
diff --git a/dll/win32/shell32/shelldesktop/CMakeLists.txt b/dll/win32/shell32/shelldesktop/CMakeLists.txt
index b1eb11f57e7..311a09f1f4b 100644
--- a/dll/win32/shell32/shelldesktop/CMakeLists.txt
+++ b/dll/win32/shell32/shelldesktop/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 project(SHELL)
 set_cpp(WITH_RUNTIME)
 add_definitions(-DUNICODE -D_UNICODE)
diff --git a/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp b/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp
index 2b0777db3f8..02e8717eccb 100644
--- a/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp
@@ -203,7 +203,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient)
             return hr;
 
         pDeskBandClient->SetDeskBarSite(NULL);
-        
+
         pDeskBandClient = NULL;
         m_Client = NULL;
     }
@@ -284,7 +284,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, void **ppvSite)
 
 static void AdjustForExcludeArea(BOOL alignLeft, BOOL alignTop, BOOL preferVertical, PINT px, PINT py, INT cx, INT cy, RECTL rcExclude) {
     RECT rcWindow = { *px, *py, *px + cx, *py + cy };
-    
+
     if (rcWindow.right > rcExclude.left && rcWindow.left < rcExclude.right &&
         rcWindow.bottom > rcExclude.top && rcWindow.top < rcExclude.bottom)
     {
@@ -419,7 +419,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
         AdjustForExcludeArea(alignLeft, alignTop, preferVertical, &x, &y, cx, cy, *prcExclude);
 
     // Verify that it doesn't escape the work area, and flip.
-    if (alignLeft) 
+    if (alignLeft)
     {
         if (x < rcWorkArea.left && (ppt->x+cx) <= rcWorkArea.right)
         {
@@ -813,7 +813,7 @@ LRESULT CMenuDeskBar::_OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, B
 
 LRESULT CMenuDeskBar::_OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
 {
-    /* If it is a flat style menu we need to handle WM_NCPAINT 
+    /* If it is a flat style menu we need to handle WM_NCPAINT
      * and paint the border with the right colour */
     if ((GetStyle() & WS_BORDER) == 0)
     {
diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
index 5b65bc33bdd..c6cb0f25141 100644
--- a/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* 
+/*
 This file implements the CMenuFocusManager class.
 
 This class manages the shell menus, by overriding the hot-tracking behaviour.
@@ -169,7 +169,7 @@ HRESULT CMenuFocusManager::PopFromArray(StackEntryType * pType, CMenuBand ** pMb
     {
         if (pMb) *pMb = m_bandStack[m_bandCount].mb;
     }
-    
+
     return S_OK;
 }
 
@@ -559,7 +559,7 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL
     BOOL isLButton = FALSE;
     if (nCode < 0)
         return CallNextHookEx(m_hGetMsgHook, nCode, hookWParam, hookLParam);
-    
+
     if (nCode == HC_ACTION)
     {
         BOOL callNext = TRUE;
diff --git a/dll/win32/shell32/shellmenu/CMenuSite.h b/dll/win32/shell32/shellmenu/CMenuSite.h
index 99f40c3e528..f2336729729 100644
--- a/dll/win32/shell32/shellmenu/CMenuSite.h
+++ b/dll/win32/shell32/shellmenu/CMenuSite.h
@@ -92,7 +92,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
 
 
-    // Using custom message map instead 
+    // Using custom message map instead
     virtual BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId = 0);
 
     // UNIMPLEMENTED
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index aa3d4513433..1673f2d4b31 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -165,7 +165,6 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
         return S_OK;
 
     case CDDS_ITEMPREPAINT:
-        
         HWND tlw;
         m_menuBand->_GetTopLevelWindow(&tlw);
 
@@ -427,7 +426,7 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
         m_pager.SubclassWindow(hwndPager);
 
         ::SetParent(m_hWnd, hwndPager);
-        
+
         m_pager.SendMessageW(PGM_SETCHILD, 0, reinterpret_cast<LPARAM>(m_hWnd));
     }
 
@@ -715,7 +714,7 @@ HRESULT CMenuToolbarBase::PopupSubMenu(UINT iItem, UINT index, IShellMenu* child
 
     if (!GetItemRect(index, &rc))
         return E_FAIL;
-    
+
     POINT a = { rc.left, rc.top };
     POINT b = { rc.right, rc.bottom };
 
@@ -847,7 +846,7 @@ HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex, BOOL isLButton)
 
     GetButton(iIndex, &btn);
 
-    if ((m_initFlags & SMINIT_VERTICAL) 
+    if ((m_initFlags & SMINIT_VERTICAL)
         || m_popupBar
         || m_cancelingPopup)
     {
@@ -1042,7 +1041,7 @@ HRESULT CMenuToolbarBase::AddPlaceholder()
 {
     TBBUTTON tbb = { 0 };
     WCHAR MenuString[128];
-    
+
     LoadStringW(GetModuleHandle(L"shell32.dll"), IDS_MENU_EMPTY, MenuString, _countof(MenuString));
 
     tbb.fsState = 0;
@@ -1251,7 +1250,7 @@ HRESULT CMenuStaticToolbar::OnDeletingButton(const NMTOOLBAR * tb)
 HRESULT CMenuStaticToolbar::InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt)
 {
     CComPtr<IContextMenu> contextMenu;
-    HRESULT hr = m_menuBand->_CallCBWithItemId(iItem, SMC_GETOBJECT, 
+    HRESULT hr = m_menuBand->_CallCBWithItemId(iItem, SMC_GETOBJECT,
         reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu));
     if (hr != S_OK)
         return hr;
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h
index 6463166d258..a04c56935f1 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.h
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h
@@ -88,7 +88,7 @@ public:
     HRESULT DisableMouseTrack(BOOL bDisable);
 
     virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0;
-    
+
     HRESULT CancelCurrentPopup();
     HRESULT PopupItem(INT iItem, BOOL keyInitiated);
     HRESULT GetDataFromId(INT iItem, INT* pIndex, DWORD_PTR* pData);
diff --git a/dll/win32/shell32/shellmenu/CMergedFolder.cpp b/dll/win32/shell32/shellmenu/CMergedFolder.cpp
index 892c5011a7a..e9abc0ab744 100644
--- a/dll/win32/shell32/shellmenu/CMergedFolder.cpp
+++ b/dll/win32/shell32/shellmenu/CMergedFolder.cpp
@@ -90,7 +90,7 @@ CEnumMergedFolder::CEnumMergedFolder() :
     m_hDsaCount(0)
 {
 }
-    
+
 CEnumMergedFolder::~CEnumMergedFolder()
 {
     DSA_DestroyCallback(m_hDsa, s_DsaDeleteCallback, this);
@@ -104,7 +104,7 @@ int  CEnumMergedFolder::DsaDeleteCallback(LocalPidlInfo * info)
     CoTaskMemFree((LPVOID)info->parseName);
     return 0;
 }
-    
+
 int CALLBACK CEnumMergedFolder::s_DsaDeleteCallback(void *pItem, void *pData)
 {
     CEnumMergedFolder * mf = (CEnumMergedFolder*) pData;
@@ -270,7 +270,7 @@ HRESULT CEnumMergedFolder::FindPidlInList(HWND hwndOwner, LPCITEMIDLIST pcidl, L
         LocalPidlInfo * pInfo = (LocalPidlInfo *) DSA_GetItemPtr(m_hDsa, i);
         if (!pInfo)
             return E_FAIL;
-        
+
         TRACE("Comparing with item at %d with parent %p and pidl { cb=%d }\n", i, pInfo->parent, pInfo->pidl->mkid.cb);
 
         hr = pInfo->parent->CompareIDs(0, pInfo->pidl, pcidl);
@@ -393,7 +393,7 @@ CMergedFolder::CMergedFolder() :
 {
 }
 
-CMergedFolder::~CMergedFolder() 
+CMergedFolder::~CMergedFolder()
 {
     if (m_UserLocalPidl) ILFree(m_UserLocalPidl);
     if (m_AllUsersPidl)  ILFree(m_AllUsersPidl);
@@ -409,7 +409,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::AddNameSpace(LPGUID lpGuid, IShellFolde
     }
 
     TRACE("AddNameSpace %p %p\n", m_UserLocal.p, m_AllUsers.p);
-    
+
     // FIXME: Use a DSA to store the list of merged namespaces, together with their related info (psf, pidl, ...)
     // For now, assume only 2 will ever be used, and ignore all the other data.
     if (!m_UserLocal)
@@ -513,7 +513,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::BindToObject(
 {
     LocalPidlInfo info;
     HRESULT hr;
-    
+
     hr = m_EnumSource->FindPidlInList(NULL, pidl, &info);
     if (FAILED_UNEXPECTEDLY(hr))
         return hr;
diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp
index c853cb4af14..07d4415c352 100644
--- a/dll/win32/shell32/shellmenu/CStartMenu.cpp
+++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp
@@ -61,7 +61,6 @@ class CShellMenuCallback :
     public IShellMenuCallback
 {
 private:
-
     HWND m_hwndTray;
     CComPtr<IShellMenu> m_pShellMenu;
     CComPtr<IBandSite> m_pBandSite;
@@ -198,7 +197,6 @@ private:
             hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0);
             if (FAILED_UNEXPECTEDLY(hr))
                 return hr;
-
         }
         else
         {
@@ -461,7 +459,7 @@ RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv)
         hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute);
         if (FAILED_UNEXPECTEDLY(hr))
         {
-            WARN("USER Programs folder not found.");
+            WARN("USER Programs folder not found\n");
             hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_PROGRAMS, &pidlProgramsAbsolute);
             if (FAILED_UNEXPECTEDLY(hr))
                 return hr;
diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.h b/dll/win32/shell32/shellrecyclebin/recyclebin.h
index 63e149e265c..ddb4a862902 100644
--- a/dll/win32/shell32/shellrecyclebin/recyclebin.h
+++ b/dll/win32/shell32/shellrecyclebin/recyclebin.h
@@ -181,7 +181,6 @@ RestoreFile(
 
 #undef INTERFACE
 #define INTERFACE IRecycleBinFile
-
 DECLARE_INTERFACE_(IRecycleBinFile, IUnknown)
 {
     BEGIN_INTERFACE
@@ -203,10 +202,9 @@ DECLARE_INTERFACE_(IRecycleBinFile, IUnknown)
 
     END_INTERFACE
 };
-
 #undef INTERFACE
-#define INTERFACE IRecycleBinEnumList
 
+#define INTERFACE IRecycleBinEnumList
 DECLARE_INTERFACE_(IRecycleBinEnumList, IUnknown)
 {
     BEGIN_INTERFACE
@@ -223,10 +221,9 @@ DECLARE_INTERFACE_(IRecycleBinEnumList, IUnknown)
 
     END_INTERFACE
 };
-
 #undef INTERFACE
-#define INTERFACE IRecycleBin
 
+#define INTERFACE IRecycleBin
 DECLARE_INTERFACE_(IRecycleBin, IUnknown)
 {
     BEGIN_INTERFACE
diff --git a/dll/win32/shell32/shfldr.h b/dll/win32/shell32/shfldr.h
index 448fccc37ac..8b60f6e32a8 100644
--- a/dll/win32/shell32/shfldr.h
+++ b/dll/win32/shell32/shfldr.h
@@ -60,7 +60,7 @@ HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, const GUID* clsid,
 
 HRESULT SHELL32_BindToSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti,
                 LPCITEMIDLIST pidl, const GUID* clsid, REFIID riid, LPVOID *ppvOut);
-                
+
 extern "C"
 BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey);
 
diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index 0a4a0bc845a..bc4b1d53a90 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -267,7 +267,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR*
                     if (!done || (*fmt == '1'))
                     {
                         /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */
-                        if (SearchPathW(lpDir, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL))
+                        if (SearchPathW(lpDir, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL))
                             cmd = xlpFile;
                         else
                             cmd = lpFile;
@@ -314,7 +314,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR*
                         pv = SHLockShared(hmem, 0);
                         chars = swprintf(buf, L":%p", pv);
 
-                        if (chars >= sizeof(buf) / sizeof(WCHAR))
+                        if (chars >= ARRAY_SIZE(buf))
                             ERR("pidl format buffer too small!\n");
 
                         used += chars;
@@ -630,7 +630,7 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn
 
     if (RegOpenKeyExW(HKEY_CLASSES_ROOT, classname, 0, 0x02000000, &hkeyClass))
         return SE_ERR_NOASSOC;
-    if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, sizeof(verb) / sizeof(verb[0])))
+    if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, ARRAY_SIZE(verb)))
         return SE_ERR_NOASSOC;
     RegCloseKey(hkeyClass);
 
@@ -728,13 +728,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb,
         return 33;
     }
 
-    if (SearchPathW(lpPath, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL))
+    if (SearchPathW(lpPath, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL))
     {
         TRACE("SearchPathW returned non-zero\n");
         lpFile = xlpFile;
         /* The file was found in the application-supplied default directory (or the system search path) */
     }
-    else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL))
+    else if (lpPath && SearchPathW(NULL, lpFile, wszExe, ARRAY_SIZE(xlpFile), xlpFile, NULL))
     {
         TRACE("SearchPathW returned non-zero\n");
         lpFile = xlpFile;
@@ -777,7 +777,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb,
         /* See if it's a program - if GetProfileString fails, we skip this
          * section. Actually, if GetProfileString fails, we've probably
          * got a lot more to worry about than running a program... */
-        if (GetProfileStringW(L"windows", L"programs", L"exe pif bat cmd com", wBuffer, sizeof(wBuffer) / sizeof(WCHAR)) > 0)
+        if (GetProfileStringW(L"windows", L"programs", L"exe pif bat cmd com", wBuffer, ARRAY_SIZE(wBuffer)) > 0)
         {
             CharLowerW(wBuffer);
             tok = wBuffer;
@@ -809,7 +809,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb,
                            &classnamelen) == ERROR_SUCCESS)
         {
             classnamelen /= sizeof(WCHAR);
-            if (classnamelen == sizeof(classname) / sizeof(WCHAR))
+            if (classnamelen == ARRAY_SIZE(classname))
                 classnamelen--;
 
             classname[classnamelen] = '\0';
@@ -857,7 +857,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb,
     {
         /* Toss the leading dot */
         extension++;
-        if (GetProfileStringW(L"extensions", extension, L"", command, sizeof(command) / sizeof(WCHAR)) > 0)
+        if (GetProfileStringW(L"extensions", extension, L"", command, ARRAY_SIZE(command)) > 0)
         {
             if (wcslen(command) != 0)
             {
@@ -926,14 +926,14 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
     unsigned    ret = SE_ERR_NOASSOC;
     BOOL unicode = !(GetVersion() & 0x80000000);
 
-    if (strlenW(key) + 1 > sizeof(regkey) / sizeof(regkey[0]))
+    if (strlenW(key) + 1 > ARRAY_SIZE(regkey))
     {
         FIXME("input parameter %s larger than buffer\n", debugstr_w(key));
         return 2;
     }
     wcscpy(regkey, key);
     static const WCHAR wApplication[] = L"\\application";
-    endkeyLen = sizeof(regkey) / sizeof(regkey[0]) - (endkey - regkey);
+    endkeyLen = ARRAY_SIZE(regkey) - (endkey - regkey);
     if (strlenW(wApplication) + 1 > endkeyLen)
     {
         FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication));
@@ -945,14 +945,14 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
     {
         WCHAR command[1024], fullpath[MAX_PATH];
         static const WCHAR wSo[] = L".so";
-        DWORD sizeSo = sizeof(wSo) / sizeof(WCHAR);
+        DWORD sizeSo = ARRAY_SIZE(wSo);
         LPWSTR ptr = NULL;
         DWORD ret = 0;
 
         /* Get application command from start string and find filename of application */
         if (*start == '"')
         {
-            if (strlenW(start + 1) + 1 > sizeof(command) / sizeof(command[0]))
+            if (strlenW(start + 1) + 1 > ARRAY_SIZE(command))
             {
                 FIXME("size of input parameter %s larger than buffer\n",
                       debugstr_w(start + 1));
@@ -961,7 +961,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
             wcscpy(command, start + 1);
             if ((ptr = wcschr(command, '"')))
                 * ptr = 0;
-            ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr);
+            ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr);
         }
         else
         {
@@ -972,11 +972,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
                 int idx = space - start;
                 memcpy(command, start, idx * sizeof(WCHAR));
                 command[idx] = '\0';
-                if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr)))
+                if ((ret = SearchPathW(NULL, command, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr)))
                     break;
             }
             if (!ret)
-                ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr);
+                ret = SearchPathW(NULL, start, wszExe, ARRAY_SIZE(fullpath), fullpath, &ptr);
         }
 
         if (!ret)
@@ -984,7 +984,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
             ERR("Unable to find application path for command %s\n", debugstr_w(start));
             return ERROR_ACCESS_DENIED;
         }
-        if (strlenW(ptr) + 1 > sizeof(app) / sizeof(app[0]))
+        if (strlenW(ptr) + 1 > ARRAY_SIZE(app))
         {
             FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr));
             return 2;
@@ -1078,8 +1078,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
         }
     }
 
-    SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen, NULL);
-    if (resultLen > sizeof(static_res)/sizeof(WCHAR))
+    SHELL_ArgifyW(static_res, ARRAY_SIZE(static_res), exec, lpFile, pidl, szCommandline, &resultLen, NULL);
+    if (resultLen > ARRAY_SIZE(static_res))
     {
         res = dynamic_res = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, resultLen * sizeof(WCHAR)));
         SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL, NULL);
@@ -1145,12 +1145,12 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env,
 
         /* Is there a replace() function anywhere? */
         cmdlen /= sizeof(WCHAR);
-        if (cmdlen >= sizeof(cmd) / sizeof(WCHAR))
-            cmdlen = sizeof(cmd) / sizeof(WCHAR) - 1;
+        if (cmdlen >= ARRAY_SIZE(cmd))
+            cmdlen = ARRAY_SIZE(cmd) - 1;
         cmd[cmdlen] = '\0';
-        SHELL_ArgifyW(param, sizeof(param) / sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen,
+        SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen,
                       (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL);
-        if (resultLen > sizeof(param) / sizeof(WCHAR))
+        if (resultLen > ARRAY_SIZE(param))
             ERR("Argify buffer not large enough, truncating\n");
     }
 
@@ -1237,7 +1237,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR
 
     if (lpDirectory)
     {
-        GetCurrentDirectoryW(sizeof(old_dir) / sizeof(WCHAR), old_dir);
+        GetCurrentDirectoryW(ARRAY_SIZE(old_dir), old_dir);
         SetCurrentDirectoryW(lpDirectory);
     }
 
@@ -1482,7 +1482,7 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei )
         i = 0;
         while (1)
         {
-            r = RegEnumKeyW(hkeycm, i++, szguid, sizeof(szguid) / sizeof(szguid[0]));
+            r = RegEnumKeyW(hkeycm, i++, szguid, ARRAY_SIZE(szguid));
             if (r != ERROR_SUCCESS)
                 break;
 
@@ -1529,7 +1529,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN
         TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName));
 
         wcmd[0] = '\0';
-        done = SHELL_ArgifyW(wcmd, sizeof(wcmd) / sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen,
+        done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen,
                              (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL);
         if (!done && wszApplicationName[0])
         {
@@ -1543,7 +1543,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN
             else
                 strcatW(wcmd, wszApplicationName);
         }
-        if (resultLen > sizeof(wcmd) / sizeof(WCHAR))
+        if (resultLen > ARRAY_SIZE(wcmd))
             ERR("Argify buffer not large enough... truncating\n");
         return execfunc(wcmd, NULL, FALSE, psei, psei_out);
     }
@@ -1568,7 +1568,7 @@ static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters
     BOOL appKnownSingular = FALSE;
 
     /* last chance to translate IDList: now also allow CLSID paths */
-    if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW((LPCITEMIDLIST)sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) {
+    if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW((LPCITEMIDLIST)sei->lpIDList, buffer, ARRAY_SIZE(buffer)))) {
         if (buffer[0] == ':' && buffer[1] == ':') {
             /* open shell folder for the specified class GUID */
             if (strlenW(buffer) + 1 > parametersLen)
@@ -1688,14 +1688,14 @@ static void do_error_dialog(UINT_PTR retval, HWND hwnd, WCHAR* filename)
 
     error_code = GetLastError();
     if (retval == SE_ERR_NOASSOC)
-        LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg) / sizeof(WCHAR));
+        LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, ARRAY_SIZE(msg));
     else
         FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
                        NULL,
                        error_code,
                        LANG_USER_DEFAULT,
                        msg,
-                       sizeof(msg) / sizeof(WCHAR),
+                       ARRAY_SIZE(msg),
                        (va_list*)msgArguments);
 
     MessageBoxW(hwnd, msg, NULL, MB_ICONERROR);
@@ -1734,9 +1734,9 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
     WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024];
     WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;
     DWORD dwApplicationNameLen = MAX_PATH + 2;
-    DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR);
-    DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR);
-    DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR);
+    DWORD parametersLen = ARRAY_SIZE(parametersBuffer);
+    DWORD dirLen = ARRAY_SIZE(dirBuffer);
+    DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer);
     DWORD len;
     SHELLEXECUTEINFOW sei_tmp;    /* modifiable copy of SHELLEXECUTEINFO struct */
     WCHAR wfileName[MAX_PATH];
diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp
index f652378616e..78eea71d6fe 100644
--- a/dll/win32/shell32/shlfolder.cpp
+++ b/dll/win32/shell32/shlfolder.cpp
@@ -164,10 +164,10 @@ HRESULT SHELL32_BindToSF (LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* pp
         return E_FAIL;
 
     CComPtr<IShellFolder> psf;
-    HRESULT hr = SHELL32_CoCreateInitSF(pidlRoot, 
-                                        ppfti, 
-                                        pidlChild, 
-                                        clsid, 
+    HRESULT hr = SHELL32_CoCreateInitSF(pidlRoot,
+                                        ppfti,
+                                        pidlChild,
+                                        clsid,
                                         IID_PPV_ARG(IShellFolder, &psf));
     ILFree(pidlChild);
 
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 8958d99a809..5c1d2354fe3 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -372,7 +372,7 @@
 #define IDD_FORMAT_DRIVE 25
 #define IDD_CHECK_DISK   26
 #define IDD_NOOPEN       27
-#define IDD_NEWEXTENSION      28
+#define IDD_NEWEXTENSION 28
 
 /* Not used dialogs */
 #define IDD_SHUTDOWN             29
@@ -702,8 +702,6 @@
 #define IDM_MOVEHERE 0x8
 #define IDM_LINKHERE 0xB
 
-
-
 /* Registrar scripts (RGS) */
 #define IDR_ADMINFOLDERSHORTCUT 128
 #define IDR_CONTROLPANEL        130
diff --git a/dll/win32/shell32/vista.c b/dll/win32/shell32/vista.c
index 93ec06c07b4..9f1a8335a34 100644
--- a/dll/win32/shell32/vista.c
+++ b/dll/win32/shell32/vista.c
@@ -11,8 +11,6 @@
  *                  20050502 Fireball imported some stuff from WINE
  */
 
-/* FIXME: This file should go away once we properly handle Vista+ APIs */
-
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
diff --git a/dll/win32/shell32/wine/changenotify.c b/dll/win32/shell32/wine/changenotify.c
index 05c7284a87f..37fb2b228e2 100644
--- a/dll/win32/shell32/wine/changenotify.c
+++ b/dll/win32/shell32/wine/changenotify.c
@@ -373,11 +373,11 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
         return;
     }
 
-    if( ( ( wEventId & SHCNE_NOITEMEVENTS ) && 
+    if( ( ( wEventId & SHCNE_NOITEMEVENTS ) &&
           ( wEventId & ~(SHCNE_NOITEMEVENTS | SHCNE_INTERRUPT) ) ) ||
-        ( ( wEventId & SHCNE_ONEITEMEVENTS ) && 
+        ( ( wEventId & SHCNE_ONEITEMEVENTS ) &&
           ( wEventId & ~(SHCNE_ONEITEMEVENTS | SHCNE_INTERRUPT) ) ) ||
-        ( ( wEventId & SHCNE_TWOITEMEVENTS ) && 
+        ( ( wEventId & SHCNE_TWOITEMEVENTS ) &&
           ( wEventId & ~(SHCNE_TWOITEMEVENTS | SHCNE_INTERRUPT) ) ) )
     {
         WARN("mutually incompatible events listed\n");
diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c
index c2c014c09d0..3985bf7cce1 100644
--- a/dll/win32/shell32/wine/classes.c
+++ b/dll/win32/shell32/wine/classes.c
@@ -293,7 +293,7 @@ static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPCSTR szName, DWORD len, i
 
 BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx)
 {
-        static const WCHAR swDefaultIcon[] = {'\\','D','e','f','a','u','l','t','I','c','o','n',0};
+    static const WCHAR swDefaultIcon[] = {'\\','D','e','f','a','u','l','t','I','c','o','n',0};
 	HKEY	hkey;
 	WCHAR	sTemp[MAX_PATH];
 	BOOL	ret = FALSE;
@@ -371,7 +371,7 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len)
 	if (HCR_RegOpenClassIDKey(riid, &hkey))
 #endif
 	{
-          static const WCHAR wszLocalizedString[] = 
+          static const WCHAR wszLocalizedString[] =
             { 'L','o','c','a','l','i','z','e','d','S','t','r','i','n','g', 0 };
           if (!RegLoadMUIStringW(hkey, wszLocalizedString, szDest, len, NULL, 0, NULL) ||
               !RegQueryValueExW(hkey, swEmpty, 0, NULL, (LPBYTE)szDest, &len))
@@ -520,7 +520,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes)
     LONG lResult;
     DWORD dwTemp, dwLen;
     static const WCHAR wszAttributes[] = { 'A','t','t','r','i','b','u','t','e','s',0 };
-    static const WCHAR wszCallForAttributes[] = { 
+    static const WCHAR wszCallForAttributes[] = {
         'C','a','l','l','F','o','r','A','t','t','r','i','b','u','t','e','s',0 };
     WCHAR wszShellFolderKey[] = { 'C','L','S','I','D','\\','{','0','0','0','2','1','4','0','0','-',
         '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-','0','0','0','0','0','0','0',
diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c
index 4f917e16296..c7de142320e 100644
--- a/dll/win32/shell32/wine/pidl.c
+++ b/dll/win32/shell32/wine/pidl.c
@@ -1306,7 +1306,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath)
         IShellFolder_Release(psfFolder);
         return FALSE;
     }
-                
+
     hr = IShellFolder_GetDisplayNameOf(psfFolder, pidlLast, SHGDN_FORPARSING, &strret);
     IShellFolder_Release(psfFolder);
     if (FAILED(hr)) return FALSE;
diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c
index 4b1d3c6561c..e2b70a04ecd 100644
--- a/dll/win32/shell32/wine/shell32_main.c
+++ b/dll/win32/shell32/wine/shell32_main.c
@@ -1098,7 +1098,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
                 {
                     BITMAP bmpLogo;
 
-                    GetObject( hLogoBmp, sizeof(BITMAP), &bmpLogo );
+                    GetObject(hLogoBmp, sizeof(BITMAP), &bmpLogo);
 
                     cxLogoBmp = bmpLogo.bmWidth;
                     cyLogoBmp = bmpLogo.bmHeight;
@@ -1107,28 +1107,28 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
                 // Set App-specific stuff (icon, app name, szOtherStuff string)
                 SendDlgItemMessageW(hWnd, IDC_ABOUT_ICON, STM_SETICON, (WPARAM)info->hIcon, 0);
 
-                GetWindowTextW( hWnd, szAppTitleTemplate, sizeof(szAppTitleTemplate) / sizeof(WCHAR) );
-                swprintf( szAppTitle, szAppTitleTemplate, info->szApp );
-                SetWindowTextW( hWnd, szAppTitle );
+                GetWindowTextW(hWnd, szAppTitleTemplate, ARRAY_SIZE(szAppTitleTemplate));
+                swprintf(szAppTitle, szAppTitleTemplate, info->szApp);
+                SetWindowTextW(hWnd, szAppTitle);
 
-                SetDlgItemTextW( hWnd, IDC_ABOUT_APPNAME, info->szApp );
+                SetDlgItemTextW(hWnd, IDC_ABOUT_APPNAME, info->szApp);
 #ifdef __REACTOS__
-                SetDlgItemTextW( hWnd, IDC_ABOUT_VERSION, info->szOSVersion );
+                SetDlgItemTextW(hWnd, IDC_ABOUT_VERSION, info->szOSVersion);
 #endif
-                SetDlgItemTextW( hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff );
+                SetDlgItemTextW(hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff);
 
                 // Set the registered user and organization name
-                if(RegOpenKeyExW( HKEY_LOCAL_MACHINE, szRegKey, 0, KEY_QUERY_VALUE, &hRegKey ) == ERROR_SUCCESS)
+                if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, szRegKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS)
                 {
-                    SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME );
-                    SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME );
+                    SetRegTextData(hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME);
+                    SetRegTextData(hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME);
 
-                    RegCloseKey( hRegKey );
+                    RegCloseKey(hRegKey);
                 }
 
                 // Set the value for the installed physical memory
                 MemStat.dwLength = sizeof(MemStat);
-                if( GlobalMemoryStatusEx(&MemStat) )
+                if(GlobalMemoryStatusEx(&MemStat))
                 {
                     WCHAR szBuf[12];
 
@@ -1152,24 +1152,24 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
                                 MemStat.ullTotalPhys /= 1024;
 
                                 dTotalPhys = (double)MemStat.ullTotalPhys / 1024;
-                                wcscpy( szUnits, L"PB" );
+                                wcscpy(szUnits, L"PB");
                             }
                             else
                             {
                                 dTotalPhys = (double)MemStat.ullTotalPhys / 1024;
-                                wcscpy( szUnits, L"TB" );
+                                wcscpy(szUnits, L"TB");
                             }
                         }
                         else
                         {
                             dTotalPhys = (double)MemStat.ullTotalPhys / 1024;
-                            wcscpy( szUnits, L"GB" );
+                            wcscpy(szUnits, L"GB");
                         }
 
                         // We need the decimal point of the current locale to display the RAM size correctly
                         if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL,
                             szDecimalSeparator,
-                            sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0)
+                            ARRAY_SIZE(szDecimalSeparator)) > 0)
                         {
                             UCHAR uDecimals;
                             UINT uIntegral;
@@ -1184,16 +1184,16 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
                     else
                     {
                         // We're dealing with MBs, don't show any decimals
-                        swprintf( szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys / 1024 / 1024 );
+                        swprintf(szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys / 1024 / 1024);
                     }
 
-                    SetDlgItemTextW( hWnd, IDC_ABOUT_PHYSMEM, szBuf);
+                    SetDlgItemTextW(hWnd, IDC_ABOUT_PHYSMEM, szBuf);
                 }
 
                 // Add the Authors dialog
-                hWndAuthors = CreateDialogW( shell32_hInstance, MAKEINTRESOURCEW(IDD_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc );
-                LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText );
+                hWndAuthors = CreateDialogW(shell32_hInstance, MAKEINTRESOURCEW(IDD_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc);
+                LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, ARRAY_SIZE(szAuthorsText));
+                SetDlgItemTextW(hWnd, IDC_ABOUT_AUTHORS, szAuthorsText);
             }
 
             return TRUE;
@@ -1238,16 +1238,16 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 
                     if(bShowingAuthors)
                     {
-                        LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                        ShowWindow( hWndAuthors, SW_HIDE );
+                        LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, ARRAY_SIZE(szAuthorsText));
+                        ShowWindow(hWndAuthors, SW_HIDE);
                     }
                     else
                     {
-                        LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_BACK, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) );
-                        ShowWindow( hWndAuthors, SW_SHOW );
+                        LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_BACK, szAuthorsText, ARRAY_SIZE(szAuthorsText));
+                        ShowWindow(hWndAuthors, SW_SHOW);
                     }
 
-                    SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText );
+                    SetDlgItemTextW(hWnd, IDC_ABOUT_AUTHORS, szAuthorsText);
                     bShowingAuthors = !bShowingAuthors;
                     return TRUE;
                 }
diff --git a/dll/win32/shell32/wine/shell32_main.h b/dll/win32/shell32/wine/shell32_main.h
index 170d844b4b1..16536975384 100644
--- a/dll/win32/shell32/wine/shell32_main.h
+++ b/dll/win32/shell32/wine/shell32_main.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
+
 /*******************************************
 *  global SHELL32.DLL variables
 */
diff --git a/dll/win32/shell32/wine/shellole.c b/dll/win32/shell32/wine/shellole.c
index ae9a39bb8fa..0e1e2e81ec8 100644
--- a/dll/win32/shell32/wine/shellole.c
+++ b/dll/win32/shell32/wine/shellole.c
@@ -144,7 +144,7 @@ HRESULT WINAPI SHCoCreateInstance(
         }
 
 	/* we look up the dll path in the registry */
-        SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR));
+	SHStringFromGUIDW(myclsid, sClassID, ARRAY_SIZE(sClassID));
 	lstrcpyW(sKeyName, sCLSID);
 	lstrcatW(sKeyName, sClassID);
 	lstrcatW(sKeyName, sInProcServer32);
diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c
index c6175efc87f..105a2475725 100644
--- a/dll/win32/shell32/wine/shellord.c
+++ b/dll/win32/shell32/wine/shellord.c
@@ -355,12 +355,12 @@ int ShellMessageBoxW(
 	    hInstance,hWnd,lpText,lpCaption,uType);
 
 	if (IS_INTRESOURCE(lpCaption))
-	  LoadStringW(hInstance, LOWORD(lpCaption), szTitle, sizeof(szTitle)/sizeof(szTitle[0]));
+	  LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle));
 	else
 	  pszTitle = lpCaption;
 
 	if (IS_INTRESOURCE(lpText))
-	  LoadStringW(hInstance, LOWORD(lpText), szText, sizeof(szText)/sizeof(szText[0]));
+	  LoadStringW(hInstance, LOWORD(lpText), szText, ARRAY_SIZE(szText));
 	else
 	  pszText = lpText;
 
@@ -1322,11 +1322,8 @@ BOOL WINAPI IsUserAnAdmin(VOID)
     DWORD i;
     BOOL bResult = FALSE;
 
-    TRACE("\n");
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
-    {
         return FALSE;
-    }
 
     if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize))
     {
@@ -1900,7 +1897,7 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc(
  */
 BOOL WINAPI SHFindFiles( LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlSaveFile )
 {
-    FIXME("%p %p\n", pidlFolder, pidlSaveFile );
+    FIXME("%p %p\n", pidlFolder, pidlSaveFile);
     return FALSE;
 }
 
diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c
index 229dff98ddc..8ba2daba9ce 100644
--- a/dll/win32/shell32/wine/shellpath.c
+++ b/dll/win32/shell32/wine/shellpath.c
@@ -574,7 +574,6 @@ static const WCHAR MusicW[] = {'M','u','s','i','c','\0'};
 static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'};
 static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'};
 static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'};
-static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'};
 #endif
 static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'};
 static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'};
@@ -1484,7 +1483,7 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
 
     TRACE("0x%02x,%p\n", folder, pszPath);
 
-    if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
+    if (folder >= ARRAY_SIZE(CSIDL_Data))
         return E_INVALIDARG;
     if (!pszPath)
         return E_INVALIDARG;
@@ -1566,7 +1565,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder,
 
     TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath);
 
-    if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
+    if (folder >= ARRAY_SIZE(CSIDL_Data))
         return E_INVALIDARG;
     if (CSIDL_Data[folder].type != CSIDL_Type_CurrVer)
         return E_INVALIDARG;
@@ -1670,7 +1669,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder,
 
     TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath);
 
-    if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
+    if (folder >= ARRAY_SIZE(CSIDL_Data))
         return E_INVALIDARG;
     if (CSIDL_Data[folder].type != CSIDL_Type_User)
         return E_INVALIDARG;
@@ -1737,7 +1736,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder,
 
     TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath);
 
-    if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
+    if (folder >= ARRAY_SIZE(CSIDL_Data))
         return E_INVALIDARG;
     if (CSIDL_Data[folder].type != CSIDL_Type_AllUsers)
         return E_INVALIDARG;
@@ -1961,7 +1960,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA(
     HRESULT hr = S_OK;
     LPWSTR pszSubPathW = NULL;
     LPWSTR pszPathW = NULL;
-    TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW));
 
     if(pszPath) {
         pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
@@ -2013,8 +2011,6 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
     DWORD      folder = nFolder & CSIDL_FOLDER_MASK;
     CSIDL_Type type;
     int        ret;
-    
-    TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath));
 
     /* Windows always NULL-terminates the resulting path regardless of success
      * or failure, so do so first
@@ -2022,7 +2018,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW(
     if (pszPath)
         *pszPath = '\0';
 
-    if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
+    if (folder >= ARRAY_SIZE(CSIDL_Data))
         return E_INVALIDARG;
     if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags))
         return E_INVALIDARG;
@@ -2150,8 +2146,6 @@ HRESULT WINAPI SHGetFolderPathA(
     WCHAR szTemp[MAX_PATH];
     HRESULT hr;
 
-    TRACE("%p,%p,nFolder=0x%04x\n",hwndOwner,pszPath,nFolder);
-
     if (pszPath)
         *pszPath = '\0';
     hr = SHGetFolderPathW(hwndOwner, nFolder, hToken, dwFlags, szTemp);
@@ -2319,7 +2313,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
     }
 
     hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath,
-     pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0]));
+     pShellFolderPath, folders, ARRAY_SIZE(folders));
     TRACE("returning 0x%08x\n", hr);
     return hr;
 }
@@ -2344,7 +2338,7 @@ static HRESULT _SHRegisterCommonShellFolders(void)
 
     TRACE("\n");
     hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders,
-     szSHFolders, folders, sizeof(folders) / sizeof(folders[0]));
+     szSHFolders, folders, ARRAY_SIZE(folders));
     TRACE("returning 0x%08x\n", hr);
     return hr;
 }
diff --git a/dll/win32/shell32/wine/shellreg.c b/dll/win32/shell32/wine/shellreg.c
index 92e5b9c18b6..4bb0654cb56 100644
--- a/dll/win32/shell32/wine/shellreg.c
+++ b/dll/win32/shell32/wine/shellreg.c
@@ -82,7 +82,7 @@ HRESULT WINAPI SHRegQueryValueExA(
 	LPDWORD lpcbData)
 {
 	TRACE("%p %s %p %p %p %p\n", hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
-	return RegQueryValueExA (hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
+	return RegQueryValueExA(hkey, lpValueName, lpReserved, lpType, lpData, lpcbData);
 }
 
 /*************************************************************************
@@ -107,7 +107,7 @@ HRESULT WINAPI SHRegQueryValueW(
  *  if the datatype REG_EXPAND_SZ then expand the string and change
  *  *pdwType to REG_SZ.
  */
-HRESULT WINAPI SHRegQueryValueExW (
+HRESULT WINAPI SHRegQueryValueExW(
 	HKEY hkey,
 	LPWSTR pszValue,
 	LPDWORD pdwReserved,
@@ -116,9 +116,9 @@ HRESULT WINAPI SHRegQueryValueExW (
 	LPDWORD pcbData)
 {
 	DWORD ret;
-	WARN("%p %s %p %p %p %p semi-stub\n",
+	TRACE("%p %s %p %p %p %p\n",
 		hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData);
-	ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
+	ret = RegQueryValueExW(hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
 	return ret;
 }