From 128c57f209012da1a74c2291e3a56df35582cc96 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Fri, 23 Sep 2005 19:24:20 +0000
Subject: [PATCH] imported shfolder.dll from WINE-20050830

svn path=/trunk/; revision=18019
---
 reactos/baseaddress.xml               |  1 +
 reactos/bootdata/packages/reactos.dff |  1 +
 reactos/lib/directory.xml             |  3 +++
 reactos/lib/shfolder/Makefile.in      | 13 +++++++++++++
 reactos/lib/shfolder/shfolder.spec    |  2 ++
 reactos/lib/shfolder/shfolder.xml     | 10 ++++++++++
 reactos/lib/shfolder/shfolder_main.c  |  1 +
 reactos/media/doc/README.WINE         |  1 +
 8 files changed, 32 insertions(+)
 create mode 100644 reactos/lib/shfolder/Makefile.in
 create mode 100644 reactos/lib/shfolder/shfolder.spec
 create mode 100644 reactos/lib/shfolder/shfolder.xml
 create mode 100644 reactos/lib/shfolder/shfolder_main.c

diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml
index bf078d99865..615736519ae 100644
--- a/reactos/baseaddress.xml
+++ b/reactos/baseaddress.xml
@@ -57,6 +57,7 @@
 <property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
 <property name="BASEADDRESS_MPR" value="0x76620000" />
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
+<property name="BASEADDRESS_SHFOLDER" value="0x76780000" />
 <property name="BASEADDRESS_NTMARTA" value="0x768A0000" />
 <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
 <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index e747cc00263..8488fa19f5b 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -136,6 +136,7 @@ lib\serialui\serialui.dll               1
 lib\setupapi\setupapi.dll               1
 lib\shdocvw\shdocvw.dll                 1
 lib\shell32\shell32.dll                 1
+lib\shfolder\shfolder.dll               1
 lib\shlwapi\shlwapi.dll                 1
 lib\smdll\smdll.dll                     1
 lib\syssetup\syssetup.dll               1
diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml
index 6286b801e2d..df9f683fafd 100644
--- a/reactos/lib/directory.xml
+++ b/reactos/lib/directory.xml
@@ -224,6 +224,9 @@
 <directory name="shell32">
 	<xi:include href="shell32/shell32.xml" />
 </directory>
+<directory name="shfolder">
+	<xi:include href="shfolder/shfolder.xml" />
+</directory>
 <directory name="shlwapi">
 	<xi:include href="shlwapi/shlwapi.xml" />
 </directory>
diff --git a/reactos/lib/shfolder/Makefile.in b/reactos/lib/shfolder/Makefile.in
new file mode 100644
index 00000000000..b497a221b56
--- /dev/null
+++ b/reactos/lib/shfolder/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = shfolder.dll
+IMPORTLIB = libshfolder.$(IMPLIBEXT)
+IMPORTS   = shell32 kernel32
+
+C_SRCS = shfolder_main.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:
diff --git a/reactos/lib/shfolder/shfolder.spec b/reactos/lib/shfolder/shfolder.spec
new file mode 100644
index 00000000000..06250240f96
--- /dev/null
+++ b/reactos/lib/shfolder/shfolder.spec
@@ -0,0 +1,2 @@
+@ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA
+@ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW
diff --git a/reactos/lib/shfolder/shfolder.xml b/reactos/lib/shfolder/shfolder.xml
new file mode 100644
index 00000000000..845549a9d90
--- /dev/null
+++ b/reactos/lib/shfolder/shfolder.xml
@@ -0,0 +1,10 @@
+<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll">
+	<importlibrary definition="shfolder.spec.def" />
+	<include base="shfolder">.</include>
+	<include base="shfolder">include</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<library>shell32</library>
+	<file>shfolder_main.c</file>
+	<file>shfolder.spec</file>
+</module>
diff --git a/reactos/lib/shfolder/shfolder_main.c b/reactos/lib/shfolder/shfolder_main.c
new file mode 100644
index 00000000000..67a01ed518c
--- /dev/null
+++ b/reactos/lib/shfolder/shfolder_main.c
@@ -0,0 +1 @@
+/* nothing here yet */
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 4bd2d9b4f5b..332c4118f66 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -64,6 +64,7 @@ reactos/lib/rpcrt4		# Synced to Wine-20050830
 reactos/lib/setupapi		# Forked at Wine-20050524
 reactos/lib/shell32             # Synced to Wine-20050830
 reactos/lib/shdocvw             # Synced to Wine-20050830
+reactos/lib/shfolder            # Synced to Wine-20050830
 reactos/lib/shlwapi             # Synced to Wine-20050830
 reactos/lib/twain		# Out of sync
 reactos/lib/urlmon		# Synced to Wine-20050830