oleview: Fix compilation with gcc 2.95
Francois Gouget
fgouget at codeweavers.com
Fri Jun 23 11:27:12 CDT 2006
Changelog:
* programs/oleview/details.c
programs/oleview/tree.c
Francois Gouget <fgouget at codeweavers.com>
Fix compilation with gcc 2.95
--
Francois Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: programs/oleview/details.c
===================================================================
RCS file: /home/wine/wine/programs/oleview/details.c,v
retrieving revision 1.3
diff -u -p -r1.3 details.c
--- programs/oleview/details.c 22 Jun 2006 11:19:39 -0000 1.3
+++ programs/oleview/details.c 23 Jun 2006 15:56:20 -0000
@@ -20,6 +20,12 @@
#include "main.h"
+#ifdef NONAMELESSUNION
+# define U(x) (x).u
+#else
+# define U(x) (x)
+#endif
+
DETAILS details;
static const WCHAR wszAppID[] = { 'A','p','p','I','D','\0' };
static const WCHAR wszCLSID[] = { 'C','L','S','I','D','\0' };
@@ -43,9 +49,9 @@ void CreateRegRec(HKEY hKey, HTREEITEM p
TVINSERTSTRUCT tvis;
HTREEITEM addPlace = parent;
- tvis.item.mask = TVIF_TEXT;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
- tvis.item.pszText = wszTree;
+ U(tvis).item.mask = TVIF_TEXT;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.pszText = wszTree;
tvis.hInsertAfter = (HTREEITEM)TVI_LAST;
tvis.hParent = parent;
@@ -61,9 +67,9 @@ void CreateRegRec(HKEY hKey, HTREEITEM p
{
if(!i && lstrlenW(wszKeyName) > 1)
{
- tvis.item.pszText = (LPWSTR)wszKeyName;
+ U(tvis).item.pszText = (LPWSTR)wszKeyName;
addPlace = TreeView_InsertItem(details.hReg, &tvis);
- tvis.item.pszText = wszTree;
+ U(tvis).item.pszText = wszTree;
}
break;
}
@@ -210,9 +216,9 @@ void CreateReg(WCHAR *buffer)
TVINSERTSTRUCT tvis;
HTREEITEM addPlace = TVI_ROOT;
- tvis.item.mask = TVIF_TEXT;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
- tvis.item.pszText = wszTree;
+ U(tvis).item.mask = TVIF_TEXT;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.pszText = wszTree;
tvis.hInsertAfter = (HTREEITEM)TVI_LAST;
tvis.hParent = TVI_ROOT;
Index: programs/oleview/tree.c
===================================================================
RCS file: /home/wine/wine/programs/oleview/tree.c,v
retrieving revision 1.7
diff -u -p -r1.7 tree.c
--- programs/oleview/tree.c 23 Jun 2006 11:46:29 -0000 1.7
+++ programs/oleview/tree.c 23 Jun 2006 15:56:20 -0000
@@ -20,6 +20,12 @@
#include "main.h"
+#ifdef NONAMELESSUNION
+# define U(x) (x).u
+#else
+# define U(x) (x)
+#endif
+
TREE tree;
static const WCHAR wszCLSID[] = { 'C','L','S','I','D','\\','\0' };
static const WCHAR wszInProcServer32[] =
@@ -74,10 +80,10 @@ void CreateInst(HTREEITEM item, WCHAR *w
tvi.pszText = wszTreeName;
memset(&tvis, 0, sizeof(TVINSERTSTRUCT));
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
- tvis.item.pszText = tvi.pszText;
+ U(tvis).item.pszText = tvi.pszText;
tvis.hParent = item;
tvis.hInsertAfter = TVI_LAST;
@@ -169,7 +175,7 @@ void CreateInst(HTREEITEM item, WCHAR *w
lstrcpyW(wszRegPath, wszInterface);
lstrcpyW(&wszRegPath[lstrlenW(wszRegPath)], ((ITEM_INFO *)tvi.lParam)->clsid);
- tvis.item.lParam = CreateITEM_INFO(REGTOP|INTERFACE|REGPATH,
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP|INTERFACE|REGPATH,
wszRegPath, ((ITEM_INFO *)tvi.lParam)->clsid);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
}
@@ -259,9 +265,9 @@ void AddCOMandAll(void)
int i=-1;
memset(&tvi, 0, sizeof(TVITEM));
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
- tvis.item.cChildren = 1;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.cChildren = 1;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszCLSID, &hKey) != ERROR_SUCCESS) return;
@@ -291,10 +297,10 @@ void AddCOMandAll(void)
lenBuffer = sizeof(WCHAR[MAX_LOAD_STRING]);
if(RegQueryValue(hCurKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer)
- tvis.item.pszText = buffer;
- else tvis.item.pszText = valName;
+ U(tvis).item.pszText = buffer;
+ else U(tvis).item.pszText = valName;
- tvis.item.lParam = CreateITEM_INFO(REGPATH|SHOWALL, valName, valName);
+ U(tvis).item.lParam = CreateITEM_INFO(REGPATH|SHOWALL, valName, valName);
if(tvis.hParent) SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
if(RegOpenKey(hCurKey, wszImplementedCategories, &hInfo) == ERROR_SUCCESS)
@@ -317,7 +323,7 @@ void AddCOMandAll(void)
memmove(&valName[6], valName, sizeof(WCHAR[MAX_LOAD_STRING-6]));
memmove(valName, wszCLSID, sizeof(WCHAR[6]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP|REGPATH|SHOWALL,
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP|REGPATH|SHOWALL,
valName, &valName[6]);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
@@ -343,8 +349,8 @@ void AddApplicationID(void)
LONG lenBuffer;
int i=-1;
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
tvis.hParent = tree.hAID;
@@ -361,12 +367,12 @@ void AddApplicationID(void)
lenBuffer = sizeof(WCHAR[MAX_LOAD_STRING]);
if(RegQueryValue(hCurKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer)
- tvis.item.pszText = buffer;
- else tvis.item.pszText = valName;
+ U(tvis).item.pszText = buffer;
+ else U(tvis).item.pszText = valName;
RegCloseKey(hCurKey);
- tvis.item.lParam = CreateITEM_INFO(REGPATH, valName, valName);
+ U(tvis).item.lParam = CreateITEM_INFO(REGPATH, valName, valName);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
}
RegCloseKey(hKey);
@@ -387,8 +393,8 @@ void AddTypeLib(void)
LONG lenBuffer;
int i=-1, j;
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
tvis.hParent = tree.hTL;
@@ -420,14 +426,14 @@ void AddTypeLib(void)
sizeof(WCHAR[MAX_LOAD_STRING]));
wsprintfW(&buffer[lstrlenW(buffer)], wszFormat, wszVer, valName);
- tvis.item.pszText = buffer;
+ U(tvis).item.pszText = buffer;
}
- else tvis.item.pszText = valName;
+ else U(tvis).item.pszText = valName;
RegCloseKey(hInfoKey);
wsprintfW(wszVer, wszFormat2, valParent, valName);
- tvis.item.lParam = CreateITEM_INFO(REGPATH, wszVer, valParent);
+ U(tvis).item.lParam = CreateITEM_INFO(REGPATH, wszVer, valParent);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
}
@@ -448,8 +454,8 @@ void AddInterfaces(void)
LONG lenBuffer;
int i=-1;
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
tvis.hParent = tree.hI;
@@ -466,12 +472,12 @@ void AddInterfaces(void)
lenBuffer = sizeof(WCHAR[MAX_LOAD_STRING]);
if(RegQueryValue(hCurKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer)
- tvis.item.pszText = buffer;
- else tvis.item.pszText = valName;
+ U(tvis).item.pszText = buffer;
+ else U(tvis).item.pszText = valName;
RegCloseKey(hCurKey);
- tvis.item.lParam = CreateITEM_INFO(REGPATH|INTERFACE, valName, valName);
+ U(tvis).item.lParam = CreateITEM_INFO(REGPATH|INTERFACE, valName, valName);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
}
@@ -490,12 +496,12 @@ void AddComponentCategories(void)
DWORD lenBufferHlp;
int i=-1;
- tvis.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
if(tree.hGBCC) tvis.hParent = tree.hGBCC;
else tvis.hParent = TVI_ROOT;
- tvis.item.cChildren = 1;
+ U(tvis).item.cChildren = 1;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszComponentCategories, &hKey) != ERROR_SUCCESS)
return;
@@ -512,15 +518,15 @@ void AddComponentCategories(void)
lenBufferHlp = sizeof(WCHAR[MAX_LOAD_STRING]);
if(RegQueryValue(hCurKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer)
- tvis.item.pszText = buffer;
+ U(tvis).item.pszText = buffer;
else if(RegEnumValue(hCurKey, 0, NULL, NULL, NULL, NULL,
(LPBYTE)buffer, &lenBufferHlp) == ERROR_SUCCESS && *buffer)
- tvis.item.pszText = buffer;
+ U(tvis).item.pszText = buffer;
else continue;
RegCloseKey(hCurKey);
- tvis.item.lParam = CreateITEM_INFO(REGTOP, valName, valName);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP, valName, valName);
SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis);
}
@@ -534,53 +540,53 @@ void AddBaseEntries(void)
TVINSERTSTRUCT tvis;
WCHAR name[MAX_LOAD_STRING];
- tvis.item.mask = TVIF_TEXT|TVIF_CHILDREN|TVIF_PARAM;
+ U(tvis).item.mask = TVIF_TEXT|TVIF_CHILDREN|TVIF_PARAM;
/* FIXME add TVIF_IMAGE */
- tvis.item.pszText = name;
- tvis.item.cchTextMax = MAX_LOAD_STRING;
- tvis.item.cChildren = 1;
+ U(tvis).item.pszText = name;
+ U(tvis).item.cchTextMax = MAX_LOAD_STRING;
+ U(tvis).item.cChildren = 1;
tvis.hInsertAfter = (HTREEITEM)TVI_FIRST;
tvis.hParent = TVI_ROOT;
- LoadString(globals.hMainInst, IDS_TREE_I, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_I, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP, wszInterface, NULL);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP, wszInterface, NULL);
tree.hI = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_TL, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_TL, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP, wszTypeLib, NULL);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP, wszTypeLib, NULL);
tree.hTL = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_AID, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_AID, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP|REGPATH, wszAppID, NULL);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP|REGPATH, wszAppID, NULL);
tree.hAID = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_OC, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_OC, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = (LPARAM)NULL;
+ U(tvis).item.lParam = (LPARAM)NULL;
tree.hOC = TreeView_InsertItem(globals.hTree, &tvis);
tvis.hParent = tree.hOC;
- LoadString(globals.hMainInst, IDS_TREE_AO, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_AO, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP, wszCLSID, NULL);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP, wszCLSID, NULL);
tree.hAO = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_CLO, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_CLO, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
tree.hCLO = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_O1O, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_O1O, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = (LPARAM)NULL;
+ U(tvis).item.lParam = (LPARAM)NULL;
tree.hO1O = TreeView_InsertItem(globals.hTree, &tvis);
- LoadString(globals.hMainInst, IDS_TREE_GBCC, tvis.item.pszText,
+ LoadString(globals.hMainInst, IDS_TREE_GBCC, U(tvis).item.pszText,
sizeof(WCHAR[MAX_LOAD_STRING]));
- tvis.item.lParam = CreateITEM_INFO(REGTOP|REGPATH, wszComponentCategories, NULL);
+ U(tvis).item.lParam = CreateITEM_INFO(REGTOP|REGPATH, wszComponentCategories, NULL);
tree.hGBCC = TreeView_InsertItem(globals.hTree, &tvis);
SendMessage(globals.hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)tree.hOC);
More information about the wine-patches
mailing list