[sserapion] 37696: Fix 64bit warnings and errors. Silence result computed not used warnings. (Update your mingw-w64 to the latest snapshot to be able to build explorer). Some linker issues still remain.
Author: sserapion Date: Thu Nov 27 15:22:59 2008 New Revision: 37696
URL: http://svn.reactos.org/svn/reactos?rev=37696&view=rev Log: Fix 64bit warnings and errors. Silence result computed not used warnings. (Update your mingw-w64 to the latest snapshot to be able to build explorer). Some linker issues still remain.
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/dialogs/searchprogram.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/filechild.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/mainframe.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/pane.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/shellbrowser.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/taskbar.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/traynotify.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/treedroptarget.h branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.h
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/dialogs/searchprogram.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -111,19 +111,19 @@
LoadString(g_Globals._hInstance, IDS_NAMECOLUMN, szTemp, nChars); column.pszText = szTemp; - ListView_InsertColumn(_list_ctrl, 0, &column); + (void)ListView_InsertColumn(_list_ctrl, 0, &column);
column.cx = 300; LoadString(g_Globals._hInstance, IDS_PATHCOLUMN, szTemp, nChars); column.pszText = szTemp; - ListView_InsertColumn(_list_ctrl, 1, &column); + (void)ListView_InsertColumn(_list_ctrl, 1, &column);
column.cx = 400; LoadString(g_Globals._hInstance, IDS_MENUCOLUMN, szTemp, nChars); column.pszText = szTemp; - ListView_InsertColumn(_list_ctrl, 2, &column); - - ListView_SetExtendedListViewStyleEx(_list_ctrl, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + (void)ListView_InsertColumn(_list_ctrl, 2, &column); + + (void)ListView_SetExtendedListViewStyleEx(_list_ctrl, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
_common_programs = SpecialFolderFSPath(CSIDL_COMMON_PROGRAMS, hwnd); if (!_common_programs.empty()) @@ -161,7 +161,7 @@
HiddenWindow hide_listctrl(_list_ctrl);
- ListView_DeleteAllItems(_list_ctrl); + (void)ListView_DeleteAllItems(_list_ctrl);
if (delete_cache || !_thread._cache_valid) { _thread.free_dirs(); @@ -254,11 +254,11 @@
item.iSubItem = 1; item.pszText = (LPTSTR)(LPCTSTR)cache_entry._path; - ListView_SetItem(_list_ctrl, &item); + (void)ListView_SetItem(_list_ctrl, &item);
item.iSubItem = 2; item.pszText = (LPTSTR)(LPCTSTR)cache_entry._menu_path; - ListView_SetItem(_list_ctrl, &item); + (void)ListView_SetItem(_list_ctrl, &item); }
LRESULT FindProgramDlg::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -1130,9 +1130,9 @@ if (_tcsstr(ext_options,TEXT("-console"))) { AllocConsole();
- _dup2(_open_osfhandle((long)GetStdHandle(STD_INPUT_HANDLE), _O_RDONLY), 0); - _dup2(_open_osfhandle((long)GetStdHandle(STD_OUTPUT_HANDLE), 0), 1); - _dup2(_open_osfhandle((long)GetStdHandle(STD_ERROR_HANDLE), 0), 2); + _dup2(_open_osfhandle((intptr_t)GetStdHandle(STD_INPUT_HANDLE), _O_RDONLY), 0); + _dup2(_open_osfhandle((intptr_t)GetStdHandle(STD_OUTPUT_HANDLE), 0), 1); + _dup2(_open_osfhandle((intptr_t)GetStdHandle(STD_ERROR_HANDLE), 0), 2);
g_Globals._log = _fdopen(1, "w"); setvbuf(g_Globals._log, 0, _IONBF, 0); @@ -1179,7 +1179,9 @@ if (use_gdb_stub) { LOG(TEXT("waiting for debugger connection...\n"));
+#ifdef __i386__ initialize_gdb_stub(); +#endif }
g_Globals.init(hInstance);
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -62,7 +62,9 @@ <file>xs-native.cpp</file> </directory> <file>explorer.cpp</file> - <file>i386-stub-win32.c</file> + <if property="ARCH" value="i386"> + <file>i386-stub-win32.c</file> + </if> <file>explorer.rc</file> </module> <installfile installbase=".">explorer-cfg-template.xml</installfile>
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/filechild.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -424,7 +424,7 @@ hdl.prc = &rt; hdl.pwpos = ℘
- Header_Layout(_left->_hwndHeader, &hdl); + (void)Header_Layout(_left->_hwndHeader, &hdl);
hdwp = DeferWindowPos(hdwp, _left->_hwndHeader, wp.hwndInsertAfter, wp.x-1, wp.y, _split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags);
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -394,7 +394,7 @@
HINSTANCE hinst = ShellExecute(_hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow);
- if ((int)hinst <= 32) + if ((INT_PTR)hinst <= 32) display_error(_hwnd, GetLastError()); } break;} @@ -629,7 +629,7 @@ HiddenWindow hide(_hsidebar); WindowCanvas canvas(_hwnd);
- TreeView_DeleteAllItems(_hsidebar); + (void)TreeView_DeleteAllItems(_hsidebar);
g_Globals._icon_cache.get_icon(ICID_FAVORITES).add_to_imagelist(_himl, canvas); g_Globals._icon_cache.get_icon(ICID_BOOKMARK).add_to_imagelist(_himl, canvas); @@ -650,7 +650,7 @@
g_Globals._favorites.fill_tree(_hsidebar, hitem_bookmarks, _himl, canvas);
- TreeView_Expand(_hsidebar, hitem_bookmarks, TVE_EXPAND); + (void)TreeView_Expand(_hsidebar, hitem_bookmarks, TVE_EXPAND); }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/pane.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -144,7 +144,7 @@ hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = _widths[idx]; - Header_InsertItem(hwnd, idx, &hdi); + (void)Header_InsertItem(hwnd, idx, &hdi); }
_hwndHeader = hwnd; @@ -704,18 +704,18 @@
for(; x+_widths[i]<scroll_pos && i<COLUMNS; i++) { x += _widths[i]; - Header_SetItem(_hwndHeader, i, &item); + (void)Header_SetItem(_hwndHeader, i, &item); }
if (i < COLUMNS) { x += _widths[i]; item.cxy = x - scroll_pos; - Header_SetItem(_hwndHeader, i++, &item); + (void)Header_SetItem(_hwndHeader, i++, &item);
for(; i<COLUMNS; i++) { item.cxy = _widths[i]; x += _widths[i]; - Header_SetItem(_hwndHeader, i, &item); + (void)Header_SetItem(_hwndHeader, i, &item); } } } @@ -779,7 +779,7 @@ x += _widths[col]; }
- ListBox_SetHorizontalExtent(_hwnd, x); + (void)ListBox_SetHorizontalExtent(_hwnd, x); }
@@ -796,7 +796,7 @@ ClientRect clnt(_hwnd);
// move immediate to simulate HDS_FULLDRAG (for now [04/2000] not realy needed with WINELIB) - Header_SetItem(_hwndHeader, idx, phdn->pitem); + (void)Header_SetItem(_hwndHeader, idx, phdn->pitem);
_widths[idx] += dx;
@@ -845,7 +845,7 @@ item.mask = HDI_WIDTH; item.cxy = _widths[phdn->iItem];
- Header_SetItem(_hwndHeader, phdn->iItem, &item); + (void)Header_SetItem(_hwndHeader, phdn->iItem, &item); InvalidateRect(_hwnd, 0, TRUE); break;}
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -161,7 +161,7 @@ CONTEXT("ShellBrowserChild::InitializeTree()");
_himl_old = TreeView_SetImageList(_left_hwnd, _himl, TVSIL_NORMAL); - TreeView_SetScrollTime(_left_hwnd, 100); + (void)TreeView_SetScrollTime(_left_hwnd, 100);
TV_INSERTSTRUCT tvInsert; TV_ITEM& tvItem = tvInsert.item; @@ -176,8 +176,8 @@ tvItem.cChildren = 1;
HTREEITEM hItem = TreeView_InsertItem(_left_hwnd, &tvInsert); - TreeView_SelectItem(_left_hwnd, hItem); - TreeView_Expand(_left_hwnd, hItem, TVE_EXPAND); + (void)TreeView_SelectItem(_left_hwnd, hItem); + (void)TreeView_Expand(_left_hwnd, hItem, TVE_EXPAND); }
bool ShellBrowser::InitDragDrop() @@ -273,7 +273,7 @@ CONTEXT("ShellBrowser::OnTreeItemExpanding()");
if (pnmtv->action == TVE_COLLAPSE) - TreeView_Expand(_left_hwnd, pnmtv->itemNew.hItem, TVE_COLLAPSE|TVE_COLLAPSERESET); + (void)TreeView_Expand(_left_hwnd, pnmtv->itemNew.hItem, TVE_COLLAPSE|TVE_COLLAPSERESET); else if (pnmtv->action == TVE_EXPAND) { ShellDirectory* entry = (ShellDirectory*)TreeView_GetItemData(_left_hwnd, pnmtv->itemNew.hItem);
@@ -288,7 +288,7 @@ tvItem.hItem = pnmtv->itemNew.hItem; tvItem.cChildren = 0;
- TreeView_SetItem(_left_hwnd, &tvItem); + (void)TreeView_SetItem(_left_hwnd, &tvItem); } } } @@ -316,7 +316,7 @@
while((hchild=hnext) != 0) { hnext = TreeView_GetNextSibling(_left_hwnd, hchild); - TreeView_DeleteItem(_left_hwnd, hchild); + (void)TreeView_DeleteItem(_left_hwnd, hchild); }
TV_ITEM tvItem; @@ -531,7 +531,7 @@ if ((Entry*)TreeView_GetItemData(_left_hwnd,hitem) == entry) { if (TreeView_SelectItem(_left_hwnd, hitem)) { if (expand) - TreeView_Expand(_left_hwnd, hitem, TVE_EXPAND); + (void)TreeView_Expand(_left_hwnd, hitem, TVE_EXPAND);
return hitem; }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -324,13 +324,13 @@ { HICON hIcon = 0;
- SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
if (!hIcon) hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); @@ -339,7 +339,7 @@ hIcon = (HICON)GetClassLong(hwnd, GCL_HICON);
if (!hIcon) - SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
return hIcon; } @@ -348,13 +348,13 @@ { HICON hIcon = 0;
- SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
if (allow_from_class) { if (!hIcon) @@ -365,7 +365,7 @@ }
if (!hIcon) - SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
return hIcon; }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -966,7 +966,7 @@
HiddenWindow hide(_tree_ctrl);
- TreeView_DeleteAllItems(_tree_ctrl); + (void)TreeView_DeleteAllItems(_tree_ctrl);
TV_INSERTSTRUCT tvi;
@@ -1040,12 +1040,12 @@ CheckDlgButton(_hwnd, ID_SHOW_HIDDEN_ICONS, _pNotifyArea->_show_hidden? BST_CHECKED: BST_UNCHECKED); }
- TreeView_Expand(_tree_ctrl, _hitemCurrent_visible, TVE_EXPAND); - TreeView_Expand(_tree_ctrl, _hitemCurrent_hidden, TVE_EXPAND); - TreeView_Expand(_tree_ctrl, _hitemCurrent, TVE_EXPAND); - TreeView_Expand(_tree_ctrl, _hitemConfig, TVE_EXPAND); - - TreeView_EnsureVisible(_tree_ctrl, _hitemCurrent_visible); + (void)TreeView_Expand(_tree_ctrl, _hitemCurrent_visible, TVE_EXPAND); + (void)TreeView_Expand(_tree_ctrl, _hitemCurrent_hidden, TVE_EXPAND); + (void)TreeView_Expand(_tree_ctrl, _hitemCurrent, TVE_EXPAND); + (void)TreeView_Expand(_tree_ctrl, _hitemConfig, TVE_EXPAND); + + (void)TreeView_EnsureVisible(_tree_ctrl, _hitemCurrent_visible); }
void TrayNotifyDlg::InsertItem(HTREEITEM hparent, HTREEITEM after, const NotifyInfo& entry, HDC hdc)
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/treedroptarget.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/treedroptarget.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/treedroptarget.h [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -50,7 +50,7 @@ GlobalUnlock(medium.hGlobal); }
- TreeView_SelectDropTarget(m_hTargetWnd, NULL); + (void)TreeView_SelectDropTarget(m_hTargetWnd, NULL);
return true; //let base free the medium } @@ -67,14 +67,14 @@ HTREEITEM hItem = TreeView_HitTest(m_hTargetWnd,&hit);
if (hItem != NULL) - TreeView_SelectDropTarget(m_hTargetWnd, hItem); + (void)TreeView_SelectDropTarget(m_hTargetWnd, hItem);
return IDropTargetImpl::DragOver(grfKeyState, pt, pdwEffect); }
virtual HRESULT STDMETHODCALLTYPE DragLeave(void) { - TreeView_SelectDropTarget(m_hTargetWnd, NULL); + (void)TreeView_SelectDropTarget(m_hTargetWnd, NULL);
return IDropTargetImpl::DragLeave(); }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -192,7 +192,7 @@
HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow);
- if ((int)hinst <= 32) { + if ((INT_PTR)hinst <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -205,7 +205,7 @@ { HINSTANCE hinst = ShellExecuteA(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow);
- if ((int)hinst <= 32) { + if ((INT_PTR)hinst <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -387,7 +387,7 @@ _tcscpy(parameters, TEXT("shell32.dll,Control_RunDLL ")); _tcscat(parameters, applet);
- return ((int)ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), parameters, NULL, SW_SHOWDEFAULT) > 32); + return ((INT_PTR)ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), parameters, NULL, SW_SHOWDEFAULT) > 32); }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -1289,11 +1289,11 @@ int idx = ListView_GetSelectionMark(_hwnd); LPARAM param = ListView_GetItemData(_hwnd, idx);
- ListView_SortItems(_hwnd, _compare_fct, (LPARAM)this); + (void)ListView_SortItems(_hwnd, _compare_fct, (LPARAM)this);
if (idx >= 0) { idx = ListView_FindItemPara(_hwnd, param); - ListView_EnsureVisible(_hwnd, idx, FALSE); + (void)ListView_EnsureVisible(_hwnd, idx, FALSE); } }
Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/window.h [iso-8859-1] Thu Nov 27 15:22:59 2008 @@ -837,7 +837,7 @@ { if (!_cmd.empty()) { HINSTANCE hinst = ShellExecute(GetParent(_hwnd), _T("open"), _cmd, 0, 0, SW_SHOWNORMAL); - return (int)hinst > HINSTANCE_ERROR; + return (ULONG_PTR)hinst > HINSTANCE_ERROR; }
return true; @@ -860,7 +860,7 @@ void add(HWND hparent, HWND htool, LPCTSTR txt=LPSTR_TEXTCALLBACK, LPARAM lparam=0) { TOOLINFO ti = { - sizeof(TOOLINFO), TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT, hparent, (UINT)htool, + sizeof(TOOLINFO), TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT, hparent, (UINT_PTR)htool, {0,0,0,0}, 0, (LPTSTR)txt, lparam };
@@ -892,7 +892,7 @@ void remove(HWND hparent, HWND htool) { TOOLINFO ti = { - sizeof(TOOLINFO), TTF_IDISHWND, hparent, (UINT)htool, + sizeof(TOOLINFO), TTF_IDISHWND, hparent, (UINT_PTR)htool, {0,0,0,0}, 0, 0, 0 };
-
sserapion＠svn.reactos.org