[ros-diffs] [akhaldi] 65146: [SHELL32] * 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.

Author: akhaldi
Date: Fri Oct 31 14:29:26 2014
New Revision: 65146

URL: http://svn.reactos.org/svn/reactos?rev=65146&view=rev
Log:
[SHELL32]
* 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.

Removed:
    trunk/reactos/dll/win32/shell32/xdg.h
Modified:
    trunk/reactos/dll/win32/shell32/folders/recyclebin.h
    trunk/reactos/dll/win32/shell32/shlfileop.cpp

Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/recyclebin.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/recyclebin.h	[iso-8859-1] Fri Oct 31 14:29:26
2014
@@ -24,6 +24,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>,

Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfileop.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfileop.cpp	[iso-8859-1] Fri Oct 31 14:29:26 2014
@@ -22,8 +22,6 @@
  */
 
 #include "precomp.h"
-
-#include "xdg.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

Removed: trunk/reactos/dll/win32/shell32/xdg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/xdg.h?re…
==============================================================================
--- trunk/reactos/dll/win32/shell32/xdg.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/xdg.h	(removed)
@@ -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__ */