Greg Geldorp : shell32/tests: Remove shlwapi dependency.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e5cc92f35be75a848c1197c3565d58c0e8e944c9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e5cc92f35be75a848c1197c3565d58c0e8e944c9

Author: Greg Geldorp <ggeldorp at vmware.com>
Date:   Wed Jan 26 11:52:42 2011 +0100

shell32/tests: Remove shlwapi dependency.

---

 dlls/shell32/tests/Makefile.in     |    2 +-
 dlls/shell32/tests/shelldispatch.c |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 53f33b1..3399532 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = shell32.dll
-IMPORTS   = shell32 ole32 oleaut32 shlwapi user32 advapi32
+IMPORTS   = shell32 ole32 oleaut32 user32 advapi32
 
 C_SRCS = \
 	appbar.c \
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 9375d40..34dbdb5 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -118,7 +118,9 @@ static void test_namespace(void)
                 r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL,
                  SHGFP_TYPE_CURRENT, path);
                 ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r);
-                p = PathFindFileNameW(path);
+                p = path + lstrlenW(path);
+                while (path < p && *(p - 1) != '\\')
+                    p--;
                 ok(!lstrcmpW(title, p), "expected %s, got %s\n",
                  wine_dbgstr_w(p), wine_dbgstr_w(title));
             }