Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
* Move TRASH_CanTrashFile and TRASH_TrashFile declarations to recyclebin.h.
* Do not include xdg.h in shlfileop.cpp anymore.
* Remove the now unneeded xdg.h.

svn path=/trunk/; revision=65146
This commit is contained in:
Amine Khaldi 2014-10-31 14:29:26 +00:00
parent c9d1d86d84
commit 8a1d7dd1c0
3 changed files with 3 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/shell32/folders/recyclebin.h
View file

@ -25,6 +25,9 @@
DWORD WINAPI DoDeleteThreadProc(LPVOID lpParameter);
HRESULT WINAPI DoDeleteDataObject(IDataObject *pda);
BOOL TRASH_CanTrashFile(LPCWSTR wszPath);
BOOL TRASH_TrashFile(LPCWSTR wszPath);
class CRecycleBin :
public CComCoClass<CRecycleBin, &CLSID_RecycleBin>,
public CComObjectRootEx<CComMultiThreadModelNoCS>,

2
reactos/dll/win32/shell32/shlfileop.cpp
View file

@ -23,8 +23,6 @@
#include "precomp.h"
#include "xdg.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define IsAttrib(x, y) ((INVALID_FILE_ATTRIBUTES != (x)) && ((x) & (y)))

52
reactos/dll/win32/shell32/xdg.h
View file

@ -1,52 +0,0 @@
/*
* 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
*/
#ifndef __XDG_H__
#define __XDG_H__
/*
* XDG directories access
*/
#define XDG_DATA_HOME 0
#define XDG_CONFIG_HOME 1
#define XDG_DATA_DIRS 2
#define XDG_CONFIG_DIRS 3
#define XDG_CACHE_HOME 4
const char *XDG_GetPath(int path_id);
char *XDG_BuildPath(int root_id, const char *subpath);
int XDG_MakeDirs(const char *path);
#define XDG_URLENCODE 0x1
BOOL XDG_WriteDesktopStringEntry(int fd, const char *keyName, DWORD dwFlags, const char *value);
typedef struct tagXDG_PARSED_FILE XDG_PARSED_FILE;
XDG_PARSED_FILE *XDG_ParseDesktopFile(int fd);
char *XDG_GetStringValue(XDG_PARSED_FILE *file, const char *group_name, const char *value_name, DWORD dwFlags);
void XDG_FreeParsedFile(XDG_PARSED_FILE *file);
/* implemented in trash.c */
typedef struct tagTRASH_ELEMENT TRASH_ELEMENT;
BOOL TRASH_CanTrashFile(LPCWSTR wszPath);
BOOL TRASH_TrashFile(LPCWSTR wszPath);
HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data);
HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count);
void TRASH_DisposeElement(TRASH_ELEMENT *element);
#endif /* __XDG_H__ */