shlobj.h: move declaration for SHBindToParent from undocshell.h to shlobj.h
Rolf Kalbermatter
rolf.kalbermatter at citeng.com
Sun Mar 30 16:25:01 CST 2003
Newest MSDN documents this function and declares it in shlobj.h
Changelog
* dlls/shell32/undocshell.h
Remove prototype for SHBindToParent() and add it to shlobj.h
* include/shlobj.h
Move prototype for SHBindToParent()
License: X11/LGPL
Rolf Kalbermatter
Index: dlls/shell32/undocshell.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/undocshell.h,v
retrieving revision 1.9
diff -u -r1.9 undocshell.h
--- dlls/shell32/undocshell.h 26 Mar 2003 23:59:51 -0000 1.9
+++ dlls/shell32/undocshell.h 30 Mar 2003 22:11:52 -0000@@ -100,12 +100,6 @@
LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR path);
LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR path);
LPITEMIDLIST WINAPI ILCreateFromPathAW(LPCVOID path);
-
-HRESULT WINAPI SHBindToParent(
- LPCITEMIDLIST pidl,
- REFIID riid,
- LPVOID *ppv,
- LPCITEMIDLIST *ppidlLast);
/*
string functions
Index: include/shlobj.h
===================================================================
RCS file: /home/wine/wine/include/shlobj.h,v
retrieving revision 1.60
diff -u -r1.60 shlobj.h
--- include/shlobj.h 17 Mar 2003 04:42:45 -0000 1.60
+++ include/shlobj.h 30 Mar 2003 22:16:39 -0000
@@ -274,6 +274,7 @@
#define BIF_RETURNFSANCESTORS 0x0008
#define BIF_EDITBOX 0x0010
#define BIF_VALIDATE 0x0020
+#define BIF_NEWDIALOGSTYLE 0x0040
#define BIF_BROWSEFORCOMPUTER 0x1000
#define BIF_BROWSEFORPRINTER 0x2000
@@ -323,6 +324,9 @@
#define SHDID_NET_SHARE 15
#define SHDID_NET_RESTOFNET 16
#define SHDID_NET_OTHER 17
+#define SHDID_COMPUTER_IMAGING 18
+#define SHDID_COMPUTER_AUDIO 19
+#define SHDID_COMPUTER_SHAREDDOCS 20
typedef struct _SHDESCRIPTIONID
{ DWORD dwDescriptionId;
@@ -576,6 +580,10 @@
#define CSIDL_FLAG_MASK 0xff00
/****************************************************************************
+ * SHBindToParent API
+ */
+HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast);
+
+/****************************************************************************
* SHDefExtractIcon API
*/
HRESULT WINAPI SHDefExtractIconA(LPCSTR pszIconFile, int iIndex, UINT uFlags,
More information about the wine-patches
mailing list