Fixed the TEXT redefined warnings.

dlls/shell32/contmenu.c

@@ -12,10 +12,6 @@
 #include "shresdef.h"
 #include "if_macros.h"
 
-#define __T(x)      x
-#define _T(x)       __T(x)
-#define TEXT        _T
-
 static HRESULT WINAPI IContextMenu_QueryInterface(LPCONTEXTMENU ,REFIID , LPVOID *);
 static ULONG WINAPI IContextMenu_AddRef(LPCONTEXTMENU);
 static ULONG WINAPI IContextMenu_Release(LPCONTEXTMENU);
@@ -164,24 +160,24 @@ static HRESULT WINAPI IContextMenu_QueryContextMenu( LPCONTEXTMENU this, HMENU32
 	  { /* folder menu */
 	    fExplore = uFlags & CMF_EXPLORE;
 	    if(fExplore) 
-	    { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_EXPLORE, MFT_STRING, TEXT("&Explore"), MFS_ENABLED|MFS_DEFAULT);
-	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, TEXT("&Open"), MFS_ENABLED);
+	    { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED|MFS_DEFAULT);
+	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, "&Open", MFS_ENABLED);
 	    }
 	    else
-            { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, TEXT("&Open"), MFS_ENABLED|MFS_DEFAULT);
-	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_EXPLORE, MFT_STRING, TEXT("&Explore"), MFS_ENABLED);
+            { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, "&Open", MFS_ENABLED|MFS_DEFAULT);
+	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED);
             }
 
             if(uFlags & CMF_CANRENAME)
             { _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0);
-	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_RENAME, MFT_STRING, TEXT("&Rename"), (IContextMenu_CanRenameItems(this) ? MFS_ENABLED : MFS_DISABLED));
+	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_RENAME, MFT_STRING, "&Rename", (IContextMenu_CanRenameItems(this) ? MFS_ENABLED : MFS_DISABLED));
 	    }
 	  }
 	  else	/* file menu */
-	  { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, TEXT("&Open"), MFS_ENABLED|MFS_DEFAULT);
+	  { _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_OPEN, MFT_STRING, "&Open", MFS_ENABLED|MFS_DEFAULT);
             if(uFlags & CMF_CANRENAME)
             { _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0);
-	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_RENAME, MFT_STRING, TEXT("&Rename"), (IContextMenu_CanRenameItems(this) ? MFS_ENABLED : MFS_DISABLED));
+	      _InsertMenuItem(hmenu, indexMenu++, TRUE, idCmdFirst+IDM_RENAME, MFT_STRING, "&Rename", (IContextMenu_CanRenameItems(this) ? MFS_ENABLED : MFS_DISABLED));
 	    }
 	  }
 	  return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (IDM_LAST + 1));
@@ -248,15 +244,15 @@ static HRESULT WINAPI IContextMenu_InvokeCommand(LPCONTEXTMENU this, LPCMINVOKEC
 	    sei.cbSize = sizeof(sei);
 	    sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME;
 	    sei.lpIDList = pidlFQ;
-	    sei.lpClass = TEXT("folder");
+	    sei.lpClass = "folder";
 	    sei.hwnd = lpcmi->hwnd;
 	    sei.nShow = SW_SHOWNORMAL;
       
 	    if(LOWORD(lpcmi->lpVerb) == IDM_EXPLORE)
-	    { sei.lpVerb = TEXT("explore");
+	    { sei.lpVerb = "explore";
 	    }
 	    else
-	    { sei.lpVerb = TEXT("open");
+	    { sei.lpVerb = "open";
 	    }
 	    ShellExecuteEx32A(&sei);
 	    SHFree(pidlFQ);

dlls/shell32/shlview.c

@@ -489,7 +489,7 @@ void ShellView_MergeFileMenu(LPSHELLVIEW this, HMENU32 hSubMenu)
 	if(hSubMenu)
 	{ /*insert this item at the beginning of the menu */
 	  _InsertMenuItem(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED);
-	  _InsertMenuItem(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, TEXT("dummy45"), MFS_ENABLED);
+	  _InsertMenuItem(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, "dummy45", MFS_ENABLED);
 
 	}
 	TRACE(shell,"--\n");	
@@ -752,7 +752,7 @@ void ShellView_UpdateShellSettings(LPSHELLVIEW this)
 /*
 	sfs.fWin95Classic = TRUE;
 
-	hinstShell32 = LoadLibrary(TEXT("shell32.dll"));
+	hinstShell32 = LoadLibrary("shell32.dll");
 	if(hinstShell32)
 	{ PFNSHGETSETTINGSPROC pfnSHGetSettings;
 
@@ -777,7 +777,7 @@ void ShellView_UpdateShellSettings(LPSHELLVIEW this)
 */   
 LRESULT ShellView_OnSettingChange(LPSHELLVIEW this, LPCSTR lpszSection)
 {	TRACE(shell,"(%p) stub\n",this);
-	//if(0 == lstrcmpi(lpszSection, TEXT("ShellState")))
+	//if(0 == lstrcmpi(lpszSection, "ShellState"))
 	{ ShellView_UpdateShellSettings(this);
 	  return 0;
 	}

include/oleobj.h

@@ -12,11 +12,6 @@
 #define FAR
 #define THIS_ THIS,
 
-#define __T(x)      x
-#define _T(x)       __T(x)
-#define TEXT        _T
-
-
 /* forward declaration of the objects*/
 typedef struct tagOLEADVISEHOLDER	*LPOLEADVISEHOLDER,	IOleAdviseHolder;
 typedef struct tagADVISESINK		*LPADVISESINK,		IAdviseSink;

include/shlobj.h

@@ -330,7 +330,7 @@ typedef struct
 /* shell specific clipboard formats */
 
 /* DATAOBJECT_InitShellIDList*/
-#define CFSTR_SHELLIDLIST       TEXT("Shell IDList Array")      /* CF_IDLIST */
+#define CFSTR_SHELLIDLIST       "Shell IDList Array"      /* CF_IDLIST */
 
 extern UINT32 cfShellIDList;
 
@@ -339,29 +339,29 @@ typedef struct
 	UINT32 aoffset[1];
 } CIDA, *LPCIDA;
 
-#define CFSTR_SHELLIDLISTOFFSET TEXT("Shell Object Offsets")    /* CF_OBJECTPOSITIONS */
-#define CFSTR_NETRESOURCES      TEXT("Net Resource")            /* CF_NETRESOURCE */
+#define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets"    /* CF_OBJECTPOSITIONS */
+#define CFSTR_NETRESOURCES      "Net Resource"            /* CF_NETRESOURCE */
 
 /* DATAOBJECT_InitFileGroupDesc */
-#define CFSTR_FILEDESCRIPTORA   TEXT("FileGroupDescriptor")     /* CF_FILEGROUPDESCRIPTORA */
+#define CFSTR_FILEDESCRIPTORA   "FileGroupDescriptor"     /* CF_FILEGROUPDESCRIPTORA */
 extern UINT32 cfFileGroupDesc;
 
-#define CFSTR_FILEDESCRIPTORW   TEXT("FileGroupDescriptorW")    /* CF_FILEGROUPDESCRIPTORW */
+#define CFSTR_FILEDESCRIPTORW   "FileGroupDescriptorW"    /* CF_FILEGROUPDESCRIPTORW */
 
 /* DATAOBJECT_InitFileContents*/
-#define CFSTR_FILECONTENTS      TEXT("FileContents")            /* CF_FILECONTENTS */
+#define CFSTR_FILECONTENTS      "FileContents"            /* CF_FILECONTENTS */
 extern UINT32 cfFileContents;
 
-#define CFSTR_FILENAMEA         TEXT("FileName")                /* CF_FILENAMEA */
-#define CFSTR_FILENAMEW         TEXT("FileNameW")               /* CF_FILENAMEW */
-#define CFSTR_PRINTERGROUP      TEXT("PrinterFriendlyName")     /* CF_PRINTERS */
-#define CFSTR_FILENAMEMAPA      TEXT("FileNameMap")             /* CF_FILENAMEMAPA */
-#define CFSTR_FILENAMEMAPW      TEXT("FileNameMapW")            /* CF_FILENAMEMAPW */
-#define CFSTR_SHELLURL          TEXT("UniformResourceLocator")
-#define CFSTR_PREFERREDDROPEFFECT TEXT("Preferred DropEffect")
-#define CFSTR_PERFORMEDDROPEFFECT TEXT("Performed DropEffect")
-#define CFSTR_PASTESUCCEEDED    TEXT("Paste Succeeded")
-#define CFSTR_INDRAGLOOP        TEXT("InShellDragLoop")
+#define CFSTR_FILENAMEA         "FileName"                /* CF_FILENAMEA */
+#define CFSTR_FILENAMEW         "FileNameW"               /* CF_FILENAMEW */
+#define CFSTR_PRINTERGROUP      "PrinterFriendlyName"     /* CF_PRINTERS */
+#define CFSTR_FILENAMEMAPA      "FileNameMap"             /* CF_FILENAMEMAPA */
+#define CFSTR_FILENAMEMAPW      "FileNameMapW"            /* CF_FILENAMEMAPW */
+#define CFSTR_SHELLURL          "UniformResourceLocator"
+#define CFSTR_PREFERREDDROPEFFECT "Preferred DropEffect"
+#define CFSTR_PERFORMEDDROPEFFECT "Performed DropEffect"
+#define CFSTR_PASTESUCCEEDED    "Paste Succeeded"
+#define CFSTR_INDRAGLOOP        "InShellDragLoop"
 
 /**************************************************************************
  *  IDLList "Item ID List List"