Remove LPFILESYSTEMBINDDATA

Francois Gouget fgouget at free.fr
Wed Aug 11 11:27:33 CDT 2004


While I can find IFilesystemBindData in the standard Windows headers
without trouble, LPFILESYSTEMBINDDATA is not defined in the Visual C++
6.0 headers or in the Platform SDK.

But because we define it in shlobj.h, we try to test it in the generated
conformance tests which fails when compiling with the Windows ehaders.
So I think the best course of action is to just remove it.

Changelog:

 * dlls/shell32/tests/generated.c
   include/shlobj.h
   tools/winapi/tests.dat

   Remove LPFILESYSTEMBINDDATA as it's not defined in the standard
Windows headers.


Index: dlls/shell32/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/tests/generated.c,v
retrieving revision 1.4
diff -u -r1.4 generated.c
--- dlls/shell32/tests/generated.c	4 May 2004 00:41:11 -0000	1.4
+++ dlls/shell32/tests/generated.c	10 Aug 2004 16:12:30 -0000
@@ -924,12 +909,6 @@
     TEST_TYPE_POINTER(LPFILEGROUPDESCRIPTORW, 596, 1);
 }

-static void test_pack_LPFILESYSTEMBINDDATA(void)
-{
-    /* LPFILESYSTEMBINDDATA */
-    TEST_TYPE(LPFILESYSTEMBINDDATA, 4, 4);
-}
-
 static void test_pack_LPIDA(void)
 {
     /* LPIDA */
@@ -1086,7 +1059,6 @@
     test_pack_LPFILEDESCRIPTORW();
     test_pack_LPFILEGROUPDESCRIPTORA();
     test_pack_LPFILEGROUPDESCRIPTORW();
-    test_pack_LPFILESYSTEMBINDDATA();
     test_pack_LPGUID();
     test_pack_LPIDA();
     test_pack_LPOLESTR();
Index: include/shlobj.h
===================================================================
RCS file: /var/cvs/wine/include/shlobj.h,v
retrieving revision 1.87
diff -u -r1.87 shlobj.h
--- include/shlobj.h	9 Jul 2004 22:51:19 -0000	1.87
+++ include/shlobj.h	10 Aug 2004 16:15:00 -0000
@@ -934,8 +936,6 @@
 typedef struct IFileSystemBindData IFileSystemBindData;
 #endif

-typedef IFileSystemBindData *LPFILESYSTEMBINDDATA;
-
 #ifndef __IFileSystemBindData_INTERFACE_DEFINED__
 #define __IFileSystemBindData_INTERFACE_DEFINED__

Index: tools/winapi/tests.dat
===================================================================
RCS file: /var/cvs/wine/tools/winapi/tests.dat,v
retrieving revision 1.12
diff -u -r1.12 tests.dat
--- tools/winapi/tests.dat	4 May 2004 00:38:27 -0000	1.12
+++ tools/winapi/tests.dat	11 Aug 2004 09:17:33 -0000
@@ -999,7 +996,6 @@
 LPFILEDESCRIPTORW
 LPFILEGROUPDESCRIPTORA
 LPFILEGROUPDESCRIPTORW
-LPFILESYSTEMBINDDATA
 LPGUID
 LPIDA
 LPITEMIDLIST


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
               RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt
                IP over Avian Carriers with Quality of Service



More information about the wine-patches mailing list