Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[gadamopoulos] 73706: [BROWSEUI] -CExplorerBand: Commit the last part of the work submitted by Sylvain Deverre. Sorry for not committing all this time. Unfortunately some parts were changed and som...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 5 13:41:45 2017 New Revision: 73706 URL: http://svn.reactos.org/svn/reactos?rev=73706&view=rev Log: [BROWSEUI] -CExplorerBand: Commit the last part of the work submitted by Sylvain Deverre. Sorry for not committing all this time. Unfortunately some parts were changed and some parts don't work well and we need to debug it a bit. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Sun Feb 5 13:41:45 2017 @@ -28,13 +28,148 @@ #define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) #endif +/* + * TODO: + * - Monitor correctly "external" shell interrupts (seems like we need to register/deregister them for each folder) + * - find and fix what cause explorer crashes sometimes (seems to be explorer that does more releases than addref) + * - TESTING + */ + +typedef struct _PIDLDATA +{ + BYTE type; + BYTE data[1]; +} PIDLDATA, *LPPIDLDATA; + +#define PT_GUID 0x1F +#define PT_SHELLEXT 0x2E +#define PT_YAGUID 0x70 + +static BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl) +{ + LPPIDLDATA lpPData = (LPPIDLDATA)&pidl->mkid.abID; + + return (pidl && + ((lpPData && (PT_GUID == lpPData->type || PT_SHELLEXT== lpPData->type || + PT_YAGUID == lpPData->type)) || (pidl && pidl->mkid.cb == 0x00))); +} + +static BOOL _ILIsDesktop (LPCITEMIDLIST pidl) +{ + return (pidl && pidl->mkid.cb == 0x00); +} + + +HRESULT GetDisplayName(LPCITEMIDLIST pidlDirectory,TCHAR *szDisplayName,UINT cchMax,DWORD uFlags) +{ + IShellFolder *pShellFolder = NULL; + LPCITEMIDLIST pidlRelative = NULL; + STRRET str; + HRESULT hr; + + if (pidlDirectory == NULL || szDisplayName == NULL) + { + return E_FAIL; + } + + hr = SHBindToParent(pidlDirectory, IID_PPV_ARG(IShellFolder, &pShellFolder), &pidlRelative); + + if (SUCCEEDED(hr)) + { + hr = pShellFolder->GetDisplayNameOf(pidlRelative,uFlags,&str); + if (SUCCEEDED(hr)) + { + hr = StrRetToBuf(&str,pidlDirectory,szDisplayName,cchMax); + } + pShellFolder->Release(); + } + return hr; +} + +extern "C" +HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv) +{ +#ifdef __REACTOS__ + return ShellObjectCreator<CExplorerBand>(riid, ppv); +#else + return S_OK; +#endif +} + +/* + This is a Windows hack, because shell event messages in Windows gives an + ill-formed PIDL stripped from useful data that parses incorrectly with SHGetFileInfo. + So we need to re-enumerate subfolders until we find one with the same name. + */ +HRESULT _ReparsePIDL(LPITEMIDLIST buggyPidl, LPITEMIDLIST *cleanPidl) +{ + HRESULT hr; + CComPtr<IShellFolder> folder; + CComPtr<IPersistFolder2> persist; + CComPtr<IEnumIDList> pEnumIDList; + LPITEMIDLIST childPidl; + LPITEMIDLIST correctChild; + LPITEMIDLIST correctParent; + ULONG fetched; + DWORD EnumFlags; + + + EnumFlags = SHCONTF_FOLDERS | SHCONTF_INCLUDEHIDDEN; + hr = SHBindToParent(buggyPidl, IID_PPV_ARG(IShellFolder, &folder), (LPCITEMIDLIST*)&childPidl); + *cleanPidl = NULL; + if (!SUCCEEDED(hr)) + { + ERR("Can't bind to parent folder\n"); + return hr; + } + hr = folder->QueryInterface(IID_PPV_ARG(IPersistFolder2, &persist)); + if (!SUCCEEDED(hr)) + { + ERR("PIDL doesn't belong to the shell namespace, aborting\n"); + return hr; + } + + hr = persist->GetCurFolder(&correctParent); + if (!SUCCEEDED(hr)) + { + ERR("Unable to get current folder\n"); + return hr; + } + + hr = folder->EnumObjects(NULL,EnumFlags,&pEnumIDList); + // avoid broken IShellFolder implementations that return null pointer with success + if (!SUCCEEDED(hr) || !pEnumIDList) + { + ERR("Can't enum the folder !\n"); + return hr; + } + + while(SUCCEEDED(pEnumIDList->Next(1, &correctChild, &fetched)) && correctChild && fetched) + { + if (!folder->CompareIDs(0, childPidl, correctChild)) + { + *cleanPidl = ILCombine(correctParent, correctChild); + ILFree(correctChild); + goto Cleanup; + } + ILFree(correctChild); + } +Cleanup: + ILFree(correctParent); + return hr; +} + CExplorerBand::CExplorerBand() : - pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0) + pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0), pidlCurrent(NULL) { } CExplorerBand::~CExplorerBand() { + if(pidlCurrent) + { + ILFree(pidlCurrent); + } } void CExplorerBand::InitializeExplorerBand() @@ -176,6 +311,11 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + if(pidlCurrent) + { + ILFree(pidlCurrent); + pidlCurrent = ILClone(pidlGoto); + } return hr; } @@ -214,6 +354,17 @@ return FALSE; } +BOOL CExplorerBand::OnTreeItemDeleted(LPNMTREEVIEW pnmtv) +{ + /* Destroy memory associated to our node */ + NodeInfo* ptr = GetNodeInfo(pnmtv->itemNew.hItem); + + ILFree(ptr->relativePidl); + ILFree(ptr->absolutePidl); + delete ptr; + return TRUE; +} + void CExplorerBand::OnSelectionChanged(LPNMTREEVIEW pnmtv) { NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); @@ -227,6 +378,29 @@ SetFocus(); // Expand the node //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND); +} + +void CExplorerBand::OnTreeItemDragging(LPNMTREEVIEW pnmtv, BOOL isRightClick) +{ + CComPtr<IShellFolder> pSrcFolder; + CComPtr<IDataObject> pObj; + LPCITEMIDLIST pLast; + HRESULT hr; + DWORD dwEffect; + DWORD dwEffect2; + + dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; + if (!pnmtv->itemNew.lParam) + return; + NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); + hr = SHBindToParent(pNodeInfo->absolutePidl, IID_PPV_ARG(IShellFolder, &pSrcFolder), &pLast); + if (!SUCCEEDED(hr)) + return; + hr = pSrcFolder->GetUIObjectOf(m_hWnd, 1, &pLast, IID_IDataObject, 0, reinterpret_cast<void**>(&pObj)); + if (!SUCCEEDED(hr)) + return; + DoDragDrop(pObj, this, dwEffect, &dwEffect2); + return; } @@ -323,6 +497,64 @@ } return FALSE; /* let the wndproc process the message */ } + +LRESULT CExplorerBand::OnShellEvent(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + LPITEMIDLIST *dest; + LPITEMIDLIST clean; + HTREEITEM pItem; + + dest = (LPITEMIDLIST*)wParam; + /* TODO: handle shell notifications */ + switch(lParam & ~SHCNE_INTERRUPT) + { + case SHCNE_MKDIR: + if (!SUCCEEDED(_ReparsePIDL(dest[0], &clean))) + { + ERR("Can't reparse PIDL to a valid one\n"); + return FALSE; + } + NavigateToPIDL(clean, &pItem, FALSE, TRUE, FALSE); + ILFree(clean); + break; + case SHCNE_RMDIR: + DeleteItem(dest[0]); + break; + case SHCNE_RENAMEFOLDER: + if (!SUCCEEDED(_ReparsePIDL(dest[1], &clean))) + { + ERR("Can't reparse PIDL to a valid one\n"); + return FALSE; + } + if (NavigateToPIDL(dest[0], &pItem, FALSE, FALSE, FALSE)) + RenameItem(pItem, clean); + ILFree(clean); + break; + case SHCNE_UPDATEDIR: + // We don't take care of this message + TRACE("Directory updated\n"); + break; + default: + TRACE("Unhandled message\n"); + } + return TRUE; +} + +LRESULT CExplorerBand::OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + bFocused = TRUE; + IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), TRUE); + bHandled = FALSE; + return TRUE; +} + +LRESULT CExplorerBand::OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + IUnknown_OnFocusChangeIS(pSite, reinterpret_cast<IUnknown*>(this), FALSE); + bHandled = FALSE; + return TRUE; +} + // *** Helper functions *** HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort) { @@ -377,6 +609,15 @@ htiCreated = TreeView_InsertItem(m_hWnd, &tvInsert); + if (bSort) + { + TVSORTCB sortCallback; + sortCallback.hParent = hParent; + sortCallback.lpfnCompare = CompareTreeItems; + sortCallback.lParam = (LPARAM)this; + SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); + } + return htiCreated; } @@ -401,6 +642,7 @@ ULONG fetched; ULONG uItemCount; CComPtr<IShellFolder> pFolder; + TVSORTCB sortCallback; entry = pNodeInfo->absolutePidl; fetched = 1; @@ -458,6 +700,11 @@ ILFree(pidlSub); } pNodeInfo->expanded = TRUE; + /* Let's do sorting */ + sortCallback.hParent = hItem; + sortCallback.lpfnCompare = CompareTreeItems; + sortCallback.lParam = (LPARAM)this; + SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); /* Now we can redraw */ SendMessage(WM_SETREDRAW, TRUE, 0); @@ -596,6 +843,184 @@ return result; } +BOOL CExplorerBand::DeleteItem(LPITEMIDLIST idl) +{ + HTREEITEM toDelete; + TVITEM tvItem; + HTREEITEM parentNode; + + if (!NavigateToPIDL(idl, &toDelete, FALSE, FALSE, FALSE)) + return FALSE; + + // TODO: check that the treeview item is really deleted + + parentNode = TreeView_GetParent(m_hWnd, toDelete); + // Navigate to parent when deleting child item + if (!pDesktop->CompareIDs(0, idl, pidlCurrent)) + { + TreeView_SelectItem(m_hWnd, parentNode); + } + + // Remove the child item + TreeView_DeleteItem(m_hWnd, toDelete); + // Probe parent to see if it has children + if (!TreeView_GetChild(m_hWnd, parentNode)) + { + // Decrement parent's child count + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = parentNode; + tvItem.cChildren = 0; + TreeView_SetItem(m_hWnd, &tvItem); + } + return TRUE; +} + +BOOL CExplorerBand::RenameItem(HTREEITEM toRename, LPITEMIDLIST newPidl) +{ + WCHAR wszDisplayName[MAX_PATH]; + TVITEM itemInfo; + LPCITEMIDLIST relPidl; + NodeInfo *treeInfo; + TVSORTCB sortCallback; + HTREEITEM child; + + ZeroMemory(&itemInfo, sizeof(itemInfo)); + itemInfo.mask = TVIF_PARAM; + itemInfo.hItem = toRename; + + // Change PIDL associated to the item + relPidl = ILFindLastID(newPidl); + TreeView_GetItem(m_hWnd, &itemInfo); + if (!itemInfo.lParam) + { + ERR("Unable to fetch lParam\n"); + return FALSE; + } + SendMessage(WM_SETREDRAW, FALSE, 0); + treeInfo = (NodeInfo*)itemInfo.lParam; + ILFree(treeInfo->absolutePidl); + ILFree(treeInfo->relativePidl); + treeInfo->absolutePidl = ILClone(newPidl); + treeInfo->relativePidl = ILClone(relPidl); + + // Change the display name + GetDisplayName(newPidl, wszDisplayName, MAX_PATH, SHGDN_INFOLDER); + ZeroMemory(&itemInfo, sizeof(itemInfo)); + itemInfo.hItem = toRename; + itemInfo.mask = TVIF_TEXT; + itemInfo.pszText = wszDisplayName; + TreeView_SetItem(m_hWnd, &itemInfo); + + if((child = TreeView_GetChild(m_hWnd, toRename)) != NULL) + { + RefreshTreePidl(child, newPidl); + } + + // Sorting + sortCallback.hParent = TreeView_GetParent(m_hWnd, toRename); + sortCallback.lpfnCompare = CompareTreeItems; + sortCallback.lParam = (LPARAM)this; + SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); + SendMessage(WM_SETREDRAW, TRUE, 0); + return TRUE; +} + +BOOL CExplorerBand::RefreshTreePidl(HTREEITEM tree, LPITEMIDLIST pidlParent) +{ + HTREEITEM tmp; + NodeInfo *pInfo; + + // Update our node data + pInfo = GetNodeInfo(tree); + if (!pInfo) + { + WARN("No tree info !\n"); + return FALSE; + } + ILFree(pInfo->absolutePidl); + pInfo->absolutePidl = ILCombine(pidlParent, pInfo->relativePidl); + if (!pInfo->absolutePidl) + { + WARN("PIDL allocation failed\n"); + return FALSE; + } + // Recursively update children + if ((tmp = TreeView_GetChild(m_hWnd, tree)) != NULL) + { + RefreshTreePidl(tmp, pInfo->absolutePidl); + } + + tmp = TreeView_GetNextSibling(m_hWnd, tree); + while(tmp != NULL) + { + pInfo = GetNodeInfo(tmp); + if(!pInfo) + { + WARN("No tree info !\n"); + continue; + } + ILFree(pInfo->absolutePidl); + pInfo->absolutePidl = ILCombine(pidlParent, pInfo->relativePidl); + tmp = TreeView_GetNextSibling(m_hWnd, tmp); + } + return TRUE; +} + +// *** Tree item sorting callback *** +int CALLBACK CExplorerBand::CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) +{ + /* + * We first sort drive letters (Path root), then PIDLs and then regular folder + * display name. + * This is not how Windows sorts item, but it gives decent results. + */ + NodeInfo *info1; + NodeInfo *info2; + CExplorerBand *pThis; + WCHAR wszFolder1[MAX_PATH]; + WCHAR wszFolder2[MAX_PATH]; + + info1 = (NodeInfo*)p1; + info2 = (NodeInfo*)p2; + pThis = (CExplorerBand*)p3; + + GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_FORPARSING); + GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_FORPARSING); + if (PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) + { + return lstrcmpiW(wszFolder1,wszFolder2); + } + if (PathIsRoot(wszFolder1) && !PathIsRoot(wszFolder2)) + { + return -1; + } + if (!PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) + { + return 1; + } + // Now, we compare non-root folders, grab display name + GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_INFOLDER); + GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_INFOLDER); + + if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) + { + return -1; + } + if (!_ILIsSpecialFolder(info1->relativePidl) && _ILIsSpecialFolder(info2->relativePidl)) + { + return 1; + } + if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) + { + HRESULT hr; + hr = pThis->pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); + if (!hr) return 0; + return (hr > 0) ? -1 : 1; + } + return StrCmpLogicalW(wszFolder1, wszFolder2); +} + // *** IOleWindow methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::GetWindow(HWND *lphwnd) { @@ -835,6 +1260,7 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::GetSizeMax(ULARGE_INTEGER *pcbSize) { + // TODO: calculate max size UNIMPLEMENTED; return E_NOTIMPL; } @@ -855,10 +1281,16 @@ case TVN_SELCHANGED: OnSelectionChanged((LPNMTREEVIEW)lParam); break; + case TVN_DELETEITEM: + OnTreeItemDeleted((LPNMTREEVIEW)lParam); + break; case NM_RCLICK: OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled); *theResult = 1; break; + case TVN_BEGINDRAG: + case TVN_BEGINRDRAG: + OnTreeItemDragging((LPNMTREEVIEW)lParam, pNotifyHeader->code == TVN_BEGINRDRAG); case TVN_BEGINLABELEDITW: { // TODO: put this in a function ? (mostly copypasta from CDefView) @@ -1009,37 +1441,120 @@ // *** IDropTarget methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) { - UNIMPLEMENTED; - return E_NOTIMPL; + ERR("Entering drag\n"); + pCurObject = pObj; + oldSelected = TreeView_GetSelection(m_hWnd); + return DragOver(glfKeyState, pt, pdwEffect); } HRESULT STDMETHODCALLTYPE CExplorerBand::DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) { - UNIMPLEMENTED; - return E_NOTIMPL; + TVHITTESTINFO info; + CComPtr<IShellFolder> pShellFldr; + NodeInfo *nodeInfo; + //LPCITEMIDLIST pChild; + HRESULT hr; + + info.pt.x = pt.x; + info.pt.y = pt.y; + info.flags = TVHT_ONITEM; + info.hItem = NULL; + ScreenToClient(&info.pt); + + // Move to the item selected by the treeview (don't change right pane) + TreeView_HitTest(m_hWnd, &info); + + if (info.hItem) + { + bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, info.hItem); + bNavigating = FALSE; + // Delegate to shell folder + if (pDropTarget && info.hItem != childTargetNode) + { + pDropTarget = NULL; + } + if (info.hItem != childTargetNode) + { + nodeInfo = GetNodeInfo(info.hItem); + if (!nodeInfo) + return E_FAIL; +#if 0 + hr = SHBindToParent(nodeInfo->absolutePidl, IID_PPV_ARG(IShellFolder, &pShellFldr), &pChild); + if (!SUCCEEDED(hr)) + return E_FAIL; + hr = pShellFldr->GetUIObjectOf(m_hWnd, 1, &pChild, IID_IDropTarget, NULL, reinterpret_cast<void**>(&pDropTarget)); + if (!SUCCEEDED(hr)) + return E_FAIL; +#endif + if(_ILIsDesktop(nodeInfo->absolutePidl)) + pShellFldr = pDesktop; + else + { + hr = pDesktop->BindToObject(nodeInfo->absolutePidl, 0, IID_PPV_ARG(IShellFolder, &pShellFldr)); + if (!SUCCEEDED(hr)) + { + /* Don't allow dnd since we couldn't get our folder object */ + ERR("Can't bind to folder object\n"); + *pdwEffect = DROPEFFECT_NONE; + return E_FAIL; + } + } + hr = pShellFldr->CreateViewObject(m_hWnd, IID_PPV_ARG(IDropTarget, &pDropTarget)); + if (!SUCCEEDED(hr)) + { + /* Don't allow dnd since we couldn't get our drop target */ + ERR("Can't get drop target for folder object\n"); + *pdwEffect = DROPEFFECT_NONE; + return E_FAIL; + } + hr = pDropTarget->DragEnter(pCurObject, glfKeyState, pt, pdwEffect); + childTargetNode = info.hItem; + } + hr = pDropTarget->DragOver(glfKeyState, pt, pdwEffect); + } + else + { + childTargetNode = NULL; + pDropTarget = NULL; + *pdwEffect = DROPEFFECT_NONE; + } + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::DragLeave() { - UNIMPLEMENTED; - return E_NOTIMPL; + bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, oldSelected); + bNavigating = FALSE; + childTargetNode = NULL; + if (pCurObject) + { + pCurObject = NULL; + } + return S_OK; } HRESULT STDMETHODCALLTYPE CExplorerBand::Drop(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (!pDropTarget) + return E_FAIL; + pDropTarget->Drop(pObj, glfKeyState, pt, pdwEffect); + DragLeave(); + return S_OK; } // *** IDropSource methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) { - UNIMPLEMENTED; - return E_NOTIMPL; + if (fEscapePressed) + return DRAGDROP_S_CANCEL; + if ((grfKeyState & MK_LBUTTON) || (grfKeyState & MK_RBUTTON)) + return S_OK; + return DRAGDROP_S_DROP; } HRESULT STDMETHODCALLTYPE CExplorerBand::GiveFeedback(DWORD dwEffect) { - UNIMPLEMENTED; - return E_NOTIMPL; -} + return DRAGDROP_S_USEDEFAULTCURSORS; +} Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Sun Feb 5 13:41:45 2017 @@ -53,7 +53,7 @@ // *** BaseBarSite information *** CComPtr<IUnknown> pSite; CComPtr<IShellFolder> pDesktop; - + // *** tree explorer band stuff *** BOOL fVisible; BOOL bNavigating; @@ -62,21 +62,33 @@ HIMAGELIST hImageList; HTREEITEM hRoot; HTREEITEM oldSelected; - + LPITEMIDLIST pidlCurrent; + // *** notification cookies *** DWORD adviseCookie; ULONG shellRegID; - + + // *** Drop target information *** + CComPtr<IDropTarget> pDropTarget; + HTREEITEM childTargetNode; + CComPtr<IDataObject> pCurObject; + void InitializeExplorerBand(); void DestroyExplorerBand(); HRESULT ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd); + // *** notifications handling *** BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv); void OnSelectionChanged(LPNMTREEVIEW pnmtv); + BOOL OnTreeItemDeleted(LPNMTREEVIEW pnmtv); + void OnTreeItemDragging(LPNMTREEVIEW pnmtv, BOOL isRightClick); // *** ATL event handlers *** LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnShellEvent(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); // *** Helper functions *** NodeInfo* GetNodeInfo(HTREEITEM hItem); @@ -85,7 +97,13 @@ HTREEITEM InsertItem(HTREEITEM hParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort); BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo); BOOL NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExpand, BOOL bInsert, BOOL bSelect); + BOOL DeleteItem(LPITEMIDLIST toDelete); + BOOL RenameItem(HTREEITEM toRename, LPITEMIDLIST newPidl); + BOOL RefreshTreePidl(HTREEITEM tree, LPITEMIDLIST pidlParent); BOOL NavigateToCurrentFolder(); + + // *** Tree item sorting callback *** + static int CALLBACK CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3); public: CExplorerBand(); @@ -181,6 +199,12 @@ BEGIN_MSG_MAP(CExplorerBand) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) + MESSAGE_HANDLER(WM_USER_SHELLEVENT, OnShellEvent) MESSAGE_HANDLER(WM_RBUTTONDOWN, ContextMenuHack) + MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) + // MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) END_MSG_MAP() }; + +extern "C" +HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv);

7 years, 10 months

[gadamopoulos] 73705: [SHELL32] -CDesktopBrowser: Implement handling FCIDM_DESKBROWSER_REFRESH.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 5 12:35:47 2017 New Revision: 73705 URL: http://svn.reactos.org/svn/reactos?rev=73705&view=rev Log: [SHELL32] -CDesktopBrowser: Implement handling FCIDM_DESKBROWSER_REFRESH. Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sun Feb 5 12:35:47 2017 @@ -361,6 +361,8 @@ SHFindFiles(NULL, NULL); break; case FCIDM_DESKBROWSER_REFRESH: + if (m_ShellView) + m_ShellView->Refresh(); break; }

7 years, 10 months

[gadamopoulos] 73704: [SHELL32] -The only change I did in the previous patch was buggy.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 5 12:27:53 2017 New Revision: 73704 URL: http://svn.reactos.org/svn/reactos?rev=73704&view=rev Log: [SHELL32] -The only change I did in the previous patch was buggy. Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] Sun Feb 5 12:27:53 2017 @@ -1132,9 +1132,9 @@ WCHAR ClassName[100]; if (GetClassName(hWnd, ClassName, 100)) { - if (wcscmp(ClassName, L"Progman") || - wcscmp(ClassName, L"CabinetWClass") || - wcscmp(ClassName, L"ExploreWClass")) + if (!wcscmp(ClassName, L"Progman") || + !wcscmp(ClassName, L"CabinetWClass") || + !wcscmp(ClassName, L"ExploreWClass")) { PostMessage(hWnd, WM_COMMAND, FCIDM_DESKBROWSER_REFRESH, 0); }

7 years, 10 months

[gadamopoulos] 73703: [SHELL32] - Implement View tab in Folder options dialog. CORE-12540 Patch by Katayama Hirofumi MZ with a tiny improvement by me to refresh explorer in a better way.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 5 12:15:59 2017 New Revision: 73703 URL: http://svn.reactos.org/svn/reactos?rev=73703&view=rev Log: [SHELL32] - Implement View tab in Folder options dialog. CORE-12540 Patch by Katayama Hirofumi MZ with a tiny improvement by me to refresh explorer in a better way. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

7 years, 10 months

[gadamopoulos] 73702: [BROWSEUI] - CShellBrowser: Implement Refresh menu item in the View menu.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 5 11:01:24 2017 New Revision: 73702 URL: http://svn.reactos.org/svn/reactos?rev=73702&view=rev Log: [BROWSEUI] - CShellBrowser: Implement Refresh menu item in the View menu. Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Feb 5 11:01:24 2017 @@ -612,6 +612,7 @@ LRESULT OnToggleTextLabels(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToolbarCustomize(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnGoTravel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnRefresh(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnExplorerBar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); HRESULT OnSearch(); @@ -648,6 +649,7 @@ COMMAND_ID_HANDLER(IDM_GOTO_HOMEPAGE, OnGoHome) COMMAND_ID_HANDLER(IDM_FAVORITES_ORGANIZEFAVORITES, OnOrganizeFavorites) COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible) + COMMAND_ID_HANDLER(IDM_VIEW_REFRESH, OnRefresh) COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock) COMMAND_ID_HANDLER(IDM_TOOLBARS_STANDARDBUTTONS, OnToggleToolbarBandVisible) COMMAND_ID_HANDLER(IDM_TOOLBARS_ADDRESSBAR, OnToggleAddressBandVisible) @@ -3665,6 +3667,13 @@ return 0; } +LRESULT CShellBrowser::OnRefresh(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) +{ + if (fCurrentShellView) + fCurrentShellView->Refresh(); + return 0; +} + LRESULT CShellBrowser::OnGoTravel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { return 0;

7 years, 10 months

[tfaber] 73701: [FATTEN][KBDTOOL][RSYM] - Fix clang warnings

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 5 10:46:29 2017 New Revision: 73701 URL: http://svn.reactos.org/svn/reactos?rev=73701&view=rev Log: [FATTEN][KBDTOOL][RSYM] - Fix clang warnings Modified: trunk/reactos/sdk/tools/fatten/fatten.c trunk/reactos/sdk/tools/kbdtool/parser.c trunk/reactos/sdk/tools/rsym/rsym.c Modified: trunk/reactos/sdk/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/fatten/fatten.c?… ============================================================================== --- trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] Sun Feb 5 10:46:29 2017 @@ -14,7 +14,7 @@ static FATFS g_Filesystem; static int isMounted = 0; -static char buff[32768]; +static unsigned char buff[32768]; // tool needed by fatfs DWORD get_fattime(void) Modified: trunk/reactos/sdk/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/kbdtool/parser.c… ============================================================================== --- trunk/reactos/sdk/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/kbdtool/parser.c [iso-8859-1] Sun Feb 5 10:46:29 2017 @@ -189,8 +189,8 @@ { /* Scan for extended character code entry */ if ((sscanf(State, "%6x", &CharCode) == 1) && - ((Length == 5) && (State[0] == '0') || - (Length == 6) && ((State[0] == '0') && (State[1] == '0')))) + (((Length == 5) && (State[0] == '0')) || + ((Length == 6) && ((State[0] == '0') && (State[1] == '0'))))) { /* Handle a ligature key */ CharInfo = CHAR_LIGATURE_KEY; @@ -726,7 +726,8 @@ CHAR State[8][8]; ULONG ScanCodeCount = -1; PLAYOUTENTRY Entry; - UCHAR CharacterType, LigatureChar; + UCHAR CharacterType; + CHAR LigatureChar; /* Zero out the layout */ memset(LayoutData, 0, sizeof(LAYOUT)); Modified: trunk/reactos/sdk/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/rsym/rsym.c?rev=… ============================================================================== --- trunk/reactos/sdk/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/rsym/rsym.c [iso-8859-1] Sun Feb 5 10:46:29 2017 @@ -935,7 +935,8 @@ InSectionHeaders[Section].Name); if (InSectionHeaders[Section].Name[0] == '/') { - StringTableLength = atoi(InSectionHeaders[Section].Name+1) + strlen(SectionName) + 1; + StringTableLength = atoi((const char *)InSectionHeaders[Section].Name + 1) + + strlen((const char *)SectionName) + 1; } if ((StartOfRawData == 0 || InSectionHeaders[Section].PointerToRawData < StartOfRawData) && InSectionHeaders[Section].PointerToRawData != 0

7 years, 10 months

[tfaber] 73700: [BOOTLIB] - Add missing asm dependency

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 5 10:45:50 2017 New Revision: 73700 URL: http://svn.reactos.org/svn/reactos?rev=73700&view=rev Log: [BOOTLIB] - Add missing asm dependency Modified: trunk/reactos/boot/environ/CMakeLists.txt Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Sun Feb 5 10:45:50 2017 @@ -70,7 +70,7 @@ add_asm_files(bootlib_asm ${BOOTLIB_ASM_SOURCE}) add_library(bootlib ${BOOTLIB_SOURCE} ${bootlib_asm}) add_pch(bootlib app/bootmgr/bootmgr.h BOOTLIB_SOURCE) -add_dependencies(bootlib bugcodes bootmsg xdk) +add_dependencies(bootlib bugcodes asm bootmsg xdk) list(APPEND BOOTMGR_BASE_SOURCE app/bootmgr/efiemu.c

7 years, 10 months

[khornicek] 73699: [CONTROL] - Use strsafe functions. CID 515200

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Feb 5 10:28:42 2017 New Revision: 73699 URL: http://svn.reactos.org/svn/reactos?rev=73699&view=rev Log: [CONTROL] - Use strsafe functions. CID 515200 Modified: trunk/reactos/base/applications/control/control.c Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/control.c [iso-8859-1] Sun Feb 5 10:28:42 2017 @@ -15,6 +15,7 @@ #include <winuser.h> #include <winreg.h> #include <shellapi.h> +#include <strsafe.h> #include "resource.h" @@ -41,8 +42,8 @@ * Open a shell folder using "explorer.exe". The passed CLSIDs * are all subfolders of the "Control Panel" shell folder. */ - wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"); - wcscat(szParameters, lpFolderCLSID); + StringCbCopy(szParameters, sizeof(szParameters), L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"); + StringCbCat(szParameters,sizeof(szParameters), lpFolderCLSID); return (INT_PTR)ShellExecuteW(NULL, L"open",

7 years, 10 months

[tfaber] 73698: [ZLIB] - Update to 1.2.11 CORE-12753 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 5 10:28:40 2017 New Revision: 73698 URL: http://svn.reactos.org/svn/reactos?rev=73698&view=rev Log: [ZLIB] - Update to 1.2.11 CORE-12753 #resolve Removed: trunk/reactos/sdk/lib/3rdparty/zlib/algorithm.txt Modified: trunk/reactos/sdk/include/reactos/libs/zlib/zconf.h trunk/reactos/sdk/include/reactos/libs/zlib/zlib.h trunk/reactos/sdk/lib/3rdparty/zlib/ChangeLog trunk/reactos/sdk/lib/3rdparty/zlib/Makefile.in trunk/reactos/sdk/lib/3rdparty/zlib/README trunk/reactos/sdk/lib/3rdparty/zlib/adler32.c trunk/reactos/sdk/lib/3rdparty/zlib/compress.c trunk/reactos/sdk/lib/3rdparty/zlib/configure trunk/reactos/sdk/lib/3rdparty/zlib/crc32.c trunk/reactos/sdk/lib/3rdparty/zlib/deflate.c trunk/reactos/sdk/lib/3rdparty/zlib/deflate.h trunk/reactos/sdk/lib/3rdparty/zlib/gzguts.h trunk/reactos/sdk/lib/3rdparty/zlib/gzlib.c trunk/reactos/sdk/lib/3rdparty/zlib/gzread.c trunk/reactos/sdk/lib/3rdparty/zlib/gzwrite.c trunk/reactos/sdk/lib/3rdparty/zlib/infback.c trunk/reactos/sdk/lib/3rdparty/zlib/inffast.c trunk/reactos/sdk/lib/3rdparty/zlib/inflate.c trunk/reactos/sdk/lib/3rdparty/zlib/inflate.h trunk/reactos/sdk/lib/3rdparty/zlib/inftrees.c trunk/reactos/sdk/lib/3rdparty/zlib/trees.c trunk/reactos/sdk/lib/3rdparty/zlib/uncompr.c trunk/reactos/sdk/lib/3rdparty/zlib/zutil.c trunk/reactos/sdk/lib/3rdparty/zlib/zutil.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/sdk/include/reactos/libs/zlib/zconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/z… Modified: trunk/reactos/sdk/include/reactos/libs/zlib/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/z… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/Chan… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/Make… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/READ… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/adler32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/adle… Removed: trunk/reactos/sdk/lib/3rdparty/zlib/algorithm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/algo… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/comp… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/conf… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/crc3… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/deflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/defl… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/deflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/defl… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/gzguts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/gzgu… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/gzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/gzli… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/gzread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/gzre… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/gzwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/gzwr… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/infback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/infb… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/inffast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/inff… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/inflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/infl… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/inflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/infl… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/inftrees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/inft… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/trees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/tree… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/uncompr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/unco… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/zutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/zuti… Modified: trunk/reactos/sdk/lib/3rdparty/zlib/zutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/zuti…

7 years, 10 months

[tfaber] 73697: [HHPCOMP] - Avoid implicit function declarations

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 5 09:58:22 2017 New Revision: 73697 URL: http://svn.reactos.org/svn/reactos?rev=73697&view=rev Log: [HHPCOMP] - Avoid implicit function declarations Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/chmc.c Modified: trunk/reactos/sdk/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/hhpcomp/chmc/chm… ============================================================================== --- trunk/reactos/sdk/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Sun Feb 5 09:58:22 2017 @@ -31,6 +31,10 @@ #include <sys/types.h> #include <sys/stat.h> #else +#ifdef __REACTOS__ +#include <sys/types.h> +#include <sys/stat.h> +#endif /* __REACTOS__ */ #include <unistd.h> #endif @@ -100,6 +104,15 @@ void chmc_pmgi_add(struct chmcFile *chm, struct chmcPmgiChunkNode *pmgi); void chmc_string_init(struct chmcStringChunk *node); +#ifdef __REACTOS__ +int chmc_uncompressed_done(struct chmcFile *chm); +int chmc_pmgi_done(struct chmcFile *chm); +int chmc_write(struct chmcFile *chm); +int chmc_appendfile(struct chmcFile *chm, const char *filename, void *buf, + size_t size ); +int chmc_pmgl_add_entry(struct chmcFile *chm, struct chmcTreeNode *entry); +#endif /* __REACTOS__ */ + struct chmcLzxInfo { struct chmcFile *chm;

7 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017