- some fixes, cleaned up includes, fixed leaks
- clean DllReferenceCount, better DllMain()
- dynamically linking LookupIconIdFromDirectoryEx32 and
CreateIconFromResourceEx32 to USER32
- moved guid's instances to new file shellguid.c
- implemented ShellExecuteEx32W
diff --git a/include/shlobj.h b/include/shlobj.h
index c741985..a87620d 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -33,63 +33,6 @@
typedef struct tagDOCKINGWINDOWFRAME *LPDOCKINGWINDOWFRAME, IDockingWindowFrame;
typedef struct tagCOMMDLGBROWSER *LPCOMMDLGBROWSER, ICommDlgBrowser;
-
-
-/****************************************************************************
-* SHELL ID
-*/
-/* desktop elements */
-DEFINE_GUID (IID_MyComputer, 0x20D04FE0L, 0x3AEA, 0x1069, 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
-
-/* strange Objects */
-DEFINE_SHLGUID(IID_IEnumOLEVERB, 0x00000104L, 0, 0);
-
-DEFINE_SHLGUID(IID_IViewObject, 0x0000010DL, 0, 0);
-
-DEFINE_SHLGUID(IID_IDropSource, 0x00000121L, 0, 0);
-DEFINE_SHLGUID(IID_IDropTarget, 0x00000122L, 0, 0);
-
-DEFINE_GUID (IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
-DEFINE_GUID (IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
-DEFINE_GUID (IID_IDockingWindowFrame, 0x47D2657AL, 0x7B27, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
-
-DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0);
-DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0);
-
-/* shell32 formatids */
-DEFINE_SHLGUID(FMTID_Intshcut, 0x000214A0L, 0, 0);
-DEFINE_SHLGUID(FMTID_InternetSite, 0x000214A1L, 0, 0);
-/* command group ids */
-DEFINE_SHLGUID(CGID_Explorer, 0x000214D0L, 0, 0);
-DEFINE_SHLGUID(CGID_ShellDocView, 0x000214D1L, 0, 0);
-
- /* shell32interface ids */
-DEFINE_SHLGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0);
-DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0);
-#define SID_SShellBrowser IID_IShellBrowser
-DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0);
-DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0);
-DEFINE_SHLGUID(IID_IShellIcon, 0x000214E5L, 0, 0);
-DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0);
-DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0);
-DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0);
-DEFINE_SHLGUID(IID_IExtractIcon, 0x000214EBL, 0, 0);
-DEFINE_SHLGUID(IID_IShellLink, 0x000214EEL, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHook, 0x000214EFL, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewer, 0x000214F0L, 0, 0);
-DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0);
-DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0);
-DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0);
-DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0);
-DEFINE_SHLGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0);
-DEFINE_SHLGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerW, 0x000214F8L, 0, 0);
-DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0);
-DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0);
-DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0);
-
/****************************************************************************
* STRRET
*/
@@ -503,7 +446,6 @@
LPSTR sMyPath;
LPITEMIDLIST pMyPidl;
LPITEMIDLIST mpidl;
- LPSHELLFOLDER mpSFParent;
};
extern LPSHELLFOLDER pdesktopfolder;
@@ -1221,6 +1163,8 @@
} SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
+DWORD WINAPI SHGetMalloc(LPMALLOC32 *lpmal) ;
+
#undef PURE
#undef FAR
#undef THIS
