Module: wine Branch: master Commit: 0a51e54fce5c7d7b0b1384d0e89ad0bbcbaf97a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a51e54fce5c7d7b0b1384d0e8...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jan 20 11:21:34 2009 +0100
oleview: Remove superfluous pointer casts.
---
programs/oleview/details.c | 12 ++++++------ programs/oleview/oleview.c | 2 +- programs/oleview/tree.c | 14 +++++++------- programs/oleview/typelib.c | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/programs/oleview/details.c b/programs/oleview/details.c index da43de9..ae8e1ba 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -46,7 +46,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszTree; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = parent;
while(TRUE) @@ -61,7 +61,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad { if(!i && lstrlenW(wszKeyName) > 1) { - U(tvis).item.pszText = (LPWSTR)wszKeyName; + U(tvis).item.pszText = wszKeyName; addPlace = TreeView_InsertItem(details.hReg, &tvis); U(tvis).item.pszText = wszTree; } @@ -213,7 +213,7 @@ static void CreateReg(WCHAR *buffer) U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszTree; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = TVI_ROOT;
path = buffer; @@ -225,7 +225,7 @@ static void CreateReg(WCHAR *buffer) { *path = '\0';
- if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) + if(RegOpenKey(HKEY_CLASSES_ROOT, buffer, &hKey) != ERROR_SUCCESS) return;
lastLenBuffer = lenBuffer+1; @@ -259,9 +259,9 @@ static void CreateReg(WCHAR *buffer) else break; }
- if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) return; + if(RegOpenKey(HKEY_CLASSES_ROOT, buffer, &hKey) != ERROR_SUCCESS) return;
- CreateRegRec(hKey, addPlace, (LPWSTR)&buffer[lenBuffer+1], TRUE); + CreateRegRec(hKey, addPlace, &buffer[lenBuffer+1], TRUE);
RegCloseKey(hKey);
diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 592fa0b..096a625 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -515,7 +515,7 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) if(!hWnd) return FALSE;
globals.hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD, - (LPWSTR)wszTitle, hWnd, 0); + wszTitle, hWnd, 0);
globals.hToolBar = CreateToolbarEx(hWnd, WS_CHILD|WS_VISIBLE, 0, 1, hInst, IDB_TOOLBAR, tB, 10, 16, 16, 16, 16, sizeof(TBBUTTON)); diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 3c9ee5a..394c99b 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -77,7 +77,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) memset(&tvis, 0, sizeof(TVINSERTSTRUCT)); U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; U(tvis).item.pszText = tvi.pszText; tvis.hParent = item; tvis.hInsertAfter = TVI_LAST; @@ -263,7 +263,7 @@ static void AddCOMandAll(void) 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; + tvis.hInsertAfter = TVI_FIRST;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszCLSID, &hKey) != ERROR_SUCCESS) return;
@@ -346,7 +346,7 @@ static void AddApplicationID(void)
U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hAID;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszAppID, &hKey) != ERROR_SUCCESS) return; @@ -391,7 +391,7 @@ static void AddTypeLib(void)
U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hTL;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszTypeLib, &hKey) != ERROR_SUCCESS) return; @@ -457,7 +457,7 @@ static void AddInterfaces(void)
U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hI;
if(RegOpenKey(HKEY_CLASSES_ROOT, wszInterface, &hKey) != ERROR_SUCCESS) return; @@ -499,7 +499,7 @@ static void AddComponentCategories(void)
U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; if(tree.hGBCC) tvis.hParent = tree.hGBCC; else tvis.hParent = TVI_ROOT; U(tvis).item.cChildren = 1; @@ -546,7 +546,7 @@ static void AddBaseEntries(void) U(tvis).item.pszText = name; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.cChildren = 1; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = TVI_ROOT;
LoadString(globals.hMainInst, IDS_TREE_I, U(tvis).item.pszText, diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 4861c50..236a670 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -209,7 +209,7 @@ static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) { int lineLen = lstrlenW(wszSource); int newLinesNo = 0; - WCHAR *pSourcePos = (WCHAR *)wszSource; + WCHAR *pSourcePos = wszSource; WCHAR *pSourceBeg;
if(!lineLen) return; @@ -223,8 +223,8 @@ static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, sizeof(WCHAR)*(pTLData->idlLen+lineLen+4*newLinesNo+1));
- pSourcePos = (WCHAR *)wszSource; - pSourceBeg = (WCHAR *)wszSource; + pSourcePos = wszSource; + pSourceBeg = wszSource; while(newLinesNo) { if(*pSourcePos != *wszNewLine && *pSourcePos) @@ -379,7 +379,7 @@ static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent;
for(i=0; i<cVars; i++) @@ -443,7 +443,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent;
for(i=0; i<cVars; i++) @@ -507,7 +507,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen BOOL bFirst;
U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent;
cFuncs = pTypeAttr->cFuncs; @@ -736,7 +736,7 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszInheritedInterfaces; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent;
tvis.hParent = TreeView_InsertItem(typelib.hTree, &tvis); @@ -1182,7 +1182,7 @@ static int PopulateTree(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = TVI_ROOT;
if(FAILED((hRes = LoadTypeLib(typelib.wszFileName, &pTypeLib)))) @@ -1635,7 +1635,7 @@ BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName) if(!globals.hTypeLibWnd) return FALSE;
typelib.hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD, - (LPWSTR)wszTitle, globals.hTypeLibWnd, 0); + wszTitle, globals.hTypeLibWnd, 0);
TypeLibResizeChild(); return TRUE;