Rename PT_MYCOMP to PT_GUID, and the corresponding union member from

dlls/shell32/debughlp.c

@@ -69,7 +69,7 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
 	{
 	  switch (pdata->type)
 	  {
-	    case PT_MYCOMP:
+	    case PT_GUID:
 	    case PT_SPECIAL:
 	      return NULL;
 
@@ -129,8 +129,8 @@ REFIID _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl)
 	  switch (pdata->type)
 	  {
 	    case PT_SPECIAL:
-	    case PT_MYCOMP:
-	      return (REFIID) &(pdata->u.mycomp.guid);
+	    case PT_GUID:
+	      return (REFIID) &(pdata->u.guid.guid);
 	  }
 	}
 	return NULL;
@@ -230,7 +230,7 @@ BOOL pcheck (LPCITEMIDLIST pidl)
           { type   = _dbg_ILGetDataPointer(pidltemp)->type;
             switch (type)
 	    { case PT_DESKTOP:
-	      case PT_MYCOMP:
+	      case PT_GUID:
 	      case PT_SPECIAL:
 	      case PT_DRIVE:
 	      case PT_DRIVE1:

dlls/shell32/pidl.c

@@ -1531,12 +1531,12 @@ LPITEMIDLIST _ILCreateDesktop()
 
 LPITEMIDLIST _ILCreateMyComputer()
 {	TRACE("()\n");
-	return _ILCreate(PT_MYCOMP, &CLSID_MyComputer, sizeof(GUID));
+	return _ILCreate(PT_GUID, &CLSID_MyComputer, sizeof(GUID));
 }
 
 LPITEMIDLIST _ILCreateIExplore()
 {	TRACE("()\n");
-	return _ILCreate(PT_MYCOMP, &CLSID_Internet, sizeof(GUID));
+	return _ILCreate(PT_GUID, &CLSID_Internet, sizeof(GUID));
 }
 
 LPITEMIDLIST _ILCreateControl()
@@ -1551,12 +1551,12 @@ LPITEMIDLIST _ILCreatePrinter()
 
 LPITEMIDLIST _ILCreateNetwork()
 {	TRACE("()\n");
-	return _ILCreate(PT_MYCOMP, &CLSID_NetworkPlaces, sizeof(GUID));
+	return _ILCreate(PT_GUID, &CLSID_NetworkPlaces, sizeof(GUID));
 }
 
 LPITEMIDLIST _ILCreateBitBucket()
 {	TRACE("()\n");
-	return _ILCreate(PT_MYCOMP, &CLSID_RecycleBin, sizeof(GUID));
+	return _ILCreate(PT_GUID, &CLSID_RecycleBin, sizeof(GUID));
 }
 
 LPITEMIDLIST _ILCreateDrive( LPCSTR lpszNew)
@@ -1659,7 +1659,7 @@ LPITEMIDLIST _ILCreateSpecial(LPCSTR szGUID)
 	  ERR("%s is not a GUID\n", szGUID);
 	  return NULL;
 	}
-	return _ILCreate(PT_MYCOMP, &iid, sizeof(IID));
+	return _ILCreate(PT_GUID, &iid, sizeof(IID));
 }
 
 LPITEMIDLIST _ILCreateCPanel(LPCSTR name, LPCSTR displayName, LPCSTR comment, int iconIdx)
@@ -1728,7 +1728,7 @@ LPITEMIDLIST _ILCreate(PIDLTYPE type, LPCVOID pIn, UINT uInSize)
 	    uSize = 0;
 	    break;
 	  case PT_SPECIAL:
-	  case PT_MYCOMP:
+	  case PT_GUID:
 	    uSize = 2 + 2 + sizeof(GUID);
 	    break;
 	  case PT_DRIVE:
@@ -1754,11 +1754,11 @@ LPITEMIDLIST _ILCreate(PIDLTYPE type, LPCVOID pIn, UINT uInSize)
 	    break;
 
 	  case PT_SPECIAL:
-	  case PT_MYCOMP:
+	  case PT_GUID:
 	    pData = _ILGetDataPointer(pidlOut);
 	    pData->type = type;
-	    memcpy(&(pData->u.mycomp.guid), pIn, uInSize);
-	    TRACE("-- create GUID-pidl %s\n", debugstr_guid(&(pData->u.mycomp.guid)));
+	    memcpy(&(pData->u.guid.guid), pIn, uInSize);
+	    TRACE("-- create GUID-pidl %s\n", debugstr_guid(&(pData->u.guid.guid)));
 	    break;
 
 	  case PT_DRIVE:
@@ -1840,7 +1840,7 @@ BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl)
 {
 	LPPIDLDATA lpPData = _ILGetDataPointer(pidl);
 	TRACE("(%p)\n",pidl);
-	return (pidl && ( (lpPData && (PT_MYCOMP== lpPData->type || PT_SPECIAL== lpPData->type)) ||
+	return (pidl && ( (lpPData && (PT_GUID== lpPData->type || PT_SPECIAL== lpPData->type)) ||
 			  (pidl && pidl->mkid.cb == 0x00)
 			));
 }
@@ -2006,7 +2006,7 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl)
 	{
 	  switch (pdata->type)
 	  {
-	    case PT_MYCOMP:
+	    case PT_GUID:
 	    case PT_SPECIAL:
 	      return NULL;
 
@@ -2079,8 +2079,8 @@ REFIID _ILGetGUIDPointer(LPCITEMIDLIST pidl)
 	  switch (pdata->type)
 	  {
 	    case PT_SPECIAL:
-	    case PT_MYCOMP:
-	      return (REFIID) &(pdata->u.mycomp.guid);
+	    case PT_GUID:
+	      return (REFIID) &(pdata->u.guid.guid);
 
 	    default:
 		TRACE("Unknown pidl type 0x%04x\n", pdata->type);

dlls/shell32/pidl.h

@@ -53,13 +53,13 @@
 *	object        ! first byte /  ! format       ! living space
 *	              ! size
 *	----------------------------------------------------------------
-*	my computer	0x1F/20		mycomp (2)	(usual)
-*	network		0x1F		mycomp
-*	bitbucket	0x1F		mycomp
+*	my computer	0x1F/20		guid (2)	(usual)
+*	network		0x1F		guid
+*	bitbucket	0x1F		guid
 *	drive		0x23/25		drive		(usual)
 *	drive		0x25/25		drive		(lnk/persistent)
 *	drive		0x29/25		drive
-*	shell extension	0x2E		mycomp
+*	shell extension	0x2E		guid
 *	drive		0x2F		drive		(lnk/persistent)
 *	folder/file	0x30		folder/file (1)	(lnk/persistent)
 *	folder		0x31		folder		(usual)
@@ -86,7 +86,7 @@
 */
 
 #define PT_DESKTOP	0x00 /* internal */
-#define PT_MYCOMP	0x1F
+#define PT_GUID		0x1F
 #define PT_DRIVE	0x23
 #define PT_DRIVE2	0x25
 #define PT_DRIVE3	0x29
@@ -123,7 +123,7 @@ typedef struct tagPIDLDATA
 	  { BYTE dummy;			/*01*/
 	    GUID guid;			/*02*/
 	    BYTE dummy1;		/*18*/
-	  } mycomp;
+	  } guid;
 	  struct
 	  { CHAR szDriveName[20];	/*01*/
 	    DWORD dwUnknown;		/*21*/

dlls/shell32/shfldr_desktop.c

@@ -216,7 +216,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
 	szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH);
 	TRACE ("-- element: %s\n", debugstr_w (szElement));
 	SHCLSIDFromStringW (szElement + 2, &clsid);
-	pidlTemp = _ILCreate (PT_MYCOMP, &clsid, sizeof (clsid));
+	pidlTemp = _ILCreate (PT_GUID, &clsid, sizeof (clsid));
     } else if (PathGetDriveNumberW (lpszDisplayName) >= 0) {
 	/* it's a filesystem path with a drive. Let MyComputer parse it */
 	pidlTemp = _ILCreateMyComputer ();

dlls/shell32/shfldr_mycomp.c

@@ -212,7 +212,7 @@ ISF_MyComputer_fnParseDisplayName (IShellFolder2 * iface,
 	szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH);
 	TRACE ("-- element: %s\n", debugstr_w (szElement));
 	SHCLSIDFromStringW (szElement + 2, &clsid);
-	pidlTemp = _ILCreate (PT_MYCOMP, &clsid, sizeof (clsid));
+	pidlTemp = _ILCreate (PT_GUID, &clsid, sizeof (clsid));
     }
     /* do we have an absolute path name ? */
     else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && lpszDisplayName[2] == (WCHAR) '\\') {