* lib/uuid.c (CGID_Explorer, CGID_ShellDocView,

	CGID_ShellServiceObject): Remove definitions.
	* lib/shell32.c (CGID_ShellServiceObject): Add definition.

	Correct last ChangeLog entry for lib/shell32.def.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 644bd62..82fb485 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,9 +1,15 @@
 2003-08-10  Danny Smith <dannysmith@users.sourceforge.net>
 
+       * lib/uuid.c (CGID_Explorer, CGID_ShellDocView,
+       CGID_ShellServiceObject): Remove definitions.
+       * lib/shell32.c (CGID_ShellServiceObject): Add definition.
+
+2003-08-10  Danny Smith <dannysmith@users.sourceforge.net>
+
        * include/shlobj.h (SHELLSTATE): Add structure.
        (SHGetSetSettings): Add prototype.
        (SHGetSettings): Add prototype.
-       * lib/user32.def (SHGetSetSettings): Add stub.
+       * lib/shell32.def (SHGetSetSettings): Add stub.
 
 2003-08-10  Phil Krylov  <likewolf@users.sourceforge.net>
 

diff --git a/winsup/w32api/lib/shell32.c b/winsup/w32api/lib/shell32.c
index 3525ed9..5196c37 100644 (file)
--- a/winsup/w32api/lib/shell32.c
+++ b/winsup/w32api/lib/shell32.c
@@ -8,6 +8,7 @@ DEFINE_SHLGUID(FMTID_Intshcut,0x000214A0L,0,0);
 DEFINE_SHLGUID(FMTID_InternetSite,0x000214A1L,0,0);
 DEFINE_SHLGUID(CGID_Explorer,0x000214D0L,0,0);
 DEFINE_SHLGUID(CGID_ShellDocView,0x000214D1L,0,0);
+DEFINE_SHLGUID(CGID_ShellServiceObject,0x000214D2L,0,0);
 DEFINE_SHLGUID(IID_INewShortcutHookA,0x000214E1L,0,0);
 DEFINE_SHLGUID(IID_IShellBrowser,0x000214E2L,0,0);
 DEFINE_SHLGUID(IID_IShellView,0x000214E3L,0,0);

diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index d5917ad..ee2bf1d 100644 (file)
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -334,6 +334,3 @@ DEFINE_GUID(OLE_DATAPATH_WMF,0x2de03,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(OLE_DATAPATH_XBM,0x2de08,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
 DEFINE_GUID(SID_SDataPathBrowser,0xfc4801a5,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CGID_Explorer,0x000214d0,0,0,0xc0,0,0,0,0,0,0,0x46); /* shlguid */
-DEFINE_GUID(CGID_ShellDocView,0x000214d1,0,0,0xc0,0,0,0,0,0,0,0x46); /* shlguid */
-DEFINE_GUID(CGID_ShellServiceObject,0x000214d2,0,0,0xc0,0,0,0,0,0,0,0x46); /* shlguid */