Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 20397: checking for null and correct memmroy leak part of bug 252 patch by j_anderw
by greatlrd＠svn.reactos.com 28 Dec '05

28 Dec '05

checking for null and correct memmroy leak part of bug 252 patch by j_anderw Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-12-28 16:14:10 UTC (rev 20396) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-12-28 16:27:20 UTC (rev 20397) @@ -652,6 +652,7 @@ ModuleName.MaximumLength); if (! NT_SUCCESS(Status)) { + ExFreePool(Hook->ModuleName.Buffer); ObmDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); if (NULL != Thread) _____ Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c --- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-12-28 16:14:10 UTC (rev 20396) +++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-12-28 16:27:20 UTC (rev 20397) @@ -630,6 +630,12 @@ RETURN(FALSE); } + if(pMonitorInfo == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + RETURN(FALSE); + } + /* get size of pMonitorInfo */ Status = MmCopyFromCaller(&MonitorInfo.cbSize, &pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize)); if (!NT_SUCCESS(Status))

1 0

[mf] 20396: - refactor icon cache
by mf＠svn.reactos.com 28 Dec '05

28 Dec '05

- refactor icon cache - display icon overlays in Explorer tree view Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.h Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h Modified: trunk/reactos/subsys/system/explorer/utility/utility.h _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -344,7 +344,7 @@ Entry* entry = cache_entry._entry; if (entry->_icon_id == ICID_UNKNOWN) - entry->extract_icon(false); + entry->_icon_id = entry->extract_icon(ICF_SYSCACHE); pDispInfo->item.iImage = g_Globals._icon_cache.get_icon(entry->_icon_id).get_sysiml_idx(); pDispInfo->item.mask |= LVIF_DI_SETITEM; _____ Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt --- trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-12-28 16:14:10 UTC (rev 20396) @@ -166,3 +166,4 @@ m. fuchs replace "search computer" start menu entry by a "not yet implemented" message 01.11.2005 m. fuchs String::str(), String::toLower() to allow conventient and WINE compatible string conversions 29.11.2005 m. fuchs Adjustments for Visual Studio 2005: use new secure CT functions, COUNTOF for buffer sizes +28.12.2005 m. fuchs display icon overlays in Explorer tree view _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -322,7 +322,7 @@ return ret; } -HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool big_icons*/) +HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool large_icons*/) { int cx = GetSystemMetrics(SM_CXSMICON); //ICON_SIZE_X; int cy = GetSystemMetrics(SM_CYSMICON); //ICON_SIZE_Y; @@ -396,27 +396,65 @@ } -const Icon& IconCache::extract(LPCTSTR path, bool big_icons) +const Icon& IconCache::extract(LPCTSTR path, ICONCACHE_FLAGS flags) { - PathMap::iterator found = _pathMap.find(path); + // search for matching icon with unchanged flags in the cache + CacheKey mapkey(path, flags); + PathCacheMap::iterator found = _pathCache.find(mapkey); - if (found != _pathMap.end()) + if (found != _pathCache.end()) return _icons[found->second]; + // search for matching icon with handle + CacheKey mapkey_hicon(path, flags|ICF_HICON); + if (flags != mapkey_hicon.second) { + found = _pathCache.find(mapkey_hicon); + + if (found != _pathCache.end()) + return _icons[found->second]; + } + + // search for matching icon in the system image list cache + CacheKey mapkey_syscache(path, flags|ICF_SYSCACHE); + if (flags != mapkey_syscache.second) { + found = _pathCache.find(mapkey_syscache); + + if (found != _pathCache.end()) + return _icons[found->second]; + } + SHFILEINFO sfi; - if (big_icons) { - if (SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_ICON)) { + int shgfi_flags = 0; + + if (flags & ICF_OPEN) + shgfi_flags |= SHGFI_OPENICON; + + if ((flags&(ICF_LARGE|ICF_OVERLAYS|ICF_HICON)) && !(flags&ICF_SYSCACHE)) { + shgfi_flags |= SHGFI_ICON; + + if (!(flags & ICF_LARGE)) + shgfi_flags |= SHGFI_SMALLICON; + + if (flags & ICF_OVERLAYS) + shgfi_flags |= SHGFI_ADDOVERLAYS; + + // get small/big icons with/without overlays + if (SHGetFileInfo(path, 0, &sfi, sizeof(sfi), shgfi_flags)) { const Icon& icon = add(sfi.hIcon, IT_CACHED); ///@todo limit cache size - _pathMap[path] = icon; + _pathCache[mapkey_hicon] = icon; return icon; } } else { + assert(!(flags&ICF_OVERLAYS)); + + shgfi_flags |= SHGFI_SYSICONINDEX|SHGFI_SMALLICON; + // use system image list - the "search program dialog" needs it - HIMAGELIST himlSys_small = (HIMAGELIST) SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); + HIMAGELIST himlSys_small = (HIMAGELIST) SHGetFileInfo(path, 0, &sfi, sizeof(sfi), shgfi_flags); if (himlSys_small) { _himlSys_small = himlSys_small; @@ -424,7 +462,7 @@ const Icon& icon = add(sfi.iIcon/*, IT_SYSCACHE*/); ///@todo limit cache size - _pathMap[path] = icon; + _pathCache[mapkey_syscache] = icon; return icon; } @@ -433,15 +471,15 @@ return _icons[ICID_NONE]; } -const Icon& IconCache::extract(LPCTSTR path, int idx) +const Icon& IconCache::extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags) { - CachePair key(path, idx); + IdxCacheKey key(path, make_pair(idx, (flags|ICF_HICON)&~ICF_SYSCACHE)); key.first.toLower(); - PathIdxMap::iterator found = _pathIdxMap.find(key); + IdxCacheMap::iterator found = _idxCache.find(key); - if (found != _pathIdxMap.end()) + if (found != _idxCache.end()) return _icons[found->second]; HICON hIcon; @@ -449,7 +487,7 @@ if ((int)ExtractIconEx(path, idx, NULL, &hIcon, 1) > 0) { const Icon& icon = add(hIcon, IT_CACHED); - _pathIdxMap[key] = icon; + _idxCache[key] = icon; return icon; } else { @@ -460,15 +498,16 @@ } } -const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int idx, bool big_icons) +const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags) { HICON hIconLarge = 0; HICON hIcon; + bool large_icons = flags & ICF_LARGE; HRESULT hr = pExtract->Extract(path, idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X)); if (hr == NOERROR) { //@@ oder SUCCEEDED(hr) ? - if (big_icons) { //@@ OK? + if (large_icons) { //@@ OK? if (hIcon) DestroyIcon(hIcon); @@ -479,7 +518,7 @@ } if (hIcon) - return add(hIcon); + return add(hIcon); //@@ When do we want not to free this icons? } return _icons[ICID_NONE]; _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/globals.h 2005-12-28 16:14:10 UTC (rev 20396) @@ -98,6 +98,7 @@ int add_to_imagelist(HIMAGELIST himl, HDC hdc_wnd, COLORREF bk_color=GetSysColor(COLOR_WINDOW), HBRUSH bk_brush=GetSysColorBrush(COLOR_WINDOW)) const; int get_sysiml_idx() const {return _itype==IT_SYSCACHE? _sys_idx: -1;} + HICON get_hicon() const {return _itype!=IT_SYSCACHE? _hicon: 0;} bool destroy() {if (_itype == IT_DYNAMIC) {DestroyIcon(_hicon); return true;} else return false;} @@ -118,9 +119,9 @@ void init(); - const Icon& extract(LPCTSTR path, bool big_icons); - const Icon& extract(LPCTSTR path, int idx); - const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int idx, bool big_icons); + const Icon& extract(LPCTSTR path, ICONCACHE_FLAGS flags=ICF_NORMAL); + const Icon& extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON); + const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON); const Icon& add(HICON hIcon, ICON_TYPE type=IT_DYNAMIC); const Icon& add(int sys_idx/*, ICON_TYPE type=IT_SYSCACHE*/); @@ -137,23 +138,24 @@ typedef map<int, Icon> IconMap; IconMap _icons; - typedef map<String, ICON_ID> PathMap; - PathMap _pathMap; + typedef pair<String,int/*ICONCACHE_FLAGS*/> CacheKey; + typedef map<CacheKey, ICON_ID> PathCacheMap; + PathCacheMap _pathCache; - typedef pair<String, int> CachePair; - typedef map<CachePair, ICON_ID> PathIdxMap; - PathIdxMap _pathIdxMap; + typedef pair<String,pair<int,int/*ICONCACHE_FLAGS*/> > IdxCacheKey; + typedef map<IdxCacheKey, ICON_ID> IdxCacheMap; + IdxCacheMap _idxCache; HIMAGELIST _himlSys_small; }; -#define ICON_SIZE_X GetSystemMetrics(big_icons? SM_CXICON: SM_CXSMICON) -#define ICON_SIZE_Y GetSystemMetrics(big_icons? SM_CYICON: SM_CYSMICON) +#define ICON_SIZE_X GetSystemMetrics(large_icons? SM_CXICON: SM_CXSMICON) +#define ICON_SIZE_Y GetSystemMetrics(large_icons? SM_CYICON: SM_CYSMICON) /// create a bitmap from an icon -extern HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool big_icons*/); +extern HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool large_icons*/); /// add icon with alpha channel to imagelist using the specified background color extern int ImageList_AddAlphaIcon(HIMAGELIST himl, HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd); _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -319,52 +319,55 @@ } -void Entry::extract_icon(bool big_icons) + +int Entry::extract_icon(ICONCACHE_FLAGS flags) { TCHAR path[MAX_PATH]; ICON_ID icon_id = ICID_NONE; if (get_path(path, COUNTOF(path)) && _tcsncmp(path,TEXT("::{"),3)) - icon_id = g_Globals._icon_cache.extract(path, big_icons); + icon_id = g_Globals._icon_cache.extract(path, flags); if (icon_id == ICID_NONE) { - IExtractIcon* pExtract; - if (SUCCEEDED(GetUIObjectOf(0, IID_IExtractIcon, (LPVOID*)&pExtract))) { - unsigned flags; - int idx; + if (!(flags & (ICF_OPEN|ICF_OVERLAYS))) { + IExtractIcon* pExtract; + if (SUCCEEDED(GetUIObjectOf(0, IID_IExtractIcon, (LPVOID*)&pExtract))) { + unsigned gil_flags; + int idx; - if (SUCCEEDED(pExtract->GetIconLocation(GIL_FORSHELL, path, COUNTOF(path), &idx, &flags))) { - if (flags & GIL_NOTFILENAME) - icon_id = g_Globals._icon_cache.extract(pExtract, path, idx, big_icons); - else { - if (idx == -1) - idx = 0; // special case for some control panel applications ("System") + if (SUCCEEDED(pExtract->GetIconLocation(GIL_FORSHELL, path, COUNTOF(path), &idx, &gil_flags))) { + if (gil_flags & GIL_NOTFILENAME) + icon_id = g_Globals._icon_cache.extract(pExtract, path, idx, flags); + else { + if (idx == -1) + idx = 0; // special case for some control panel applications ("System") - icon_id = g_Globals._icon_cache.extract(path, idx); - } + icon_id = g_Globals._icon_cache.extract(path, idx, flags); + } - /* using create_absolute_pidl() [see below] results in more correct icons for some control panel applets ("NVidia"). - if (icon_id == ICID_NONE) { - SHFILEINFO sfi; + /* using create_absolute_pidl() [see below] results in more correct icons for some control panel applets (NVidia display driver). + if (icon_id == ICID_NONE) { + SHFILEINFO sfi; - if (SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_SMALLICON)) - icon_id = g_Globals._icon_cache.add(sfi.hIcon)._id; - } */ - /* - if (icon_id == ICID_NONE) { - LPBYTE b = (LPBYTE) alloca(0x10000); - SHFILEINFO sfi; + if (SHGetFileInfo(path, 0, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_SMALLICON)) + icon_id = g_Globals._icon_cache.add(sfi.hIcon)._id; + } */ + /* + if (icon_id == ICID_NONE) { + LPBYTE b = (LPBYTE) alloca(0x10000); + SHFILEINFO sfi; - FILE* file = fopen(path, "rb"); - if (file) { - int l = fread(b, 1, 0x10000, file); - fclose(file); + FILE* file = fopen(path, "rb"); + if (file) { + int l = fread(b, 1, 0x10000, file); + fclose(file); - if (l) - icon_id = g_Globals._icon_cache.add(CreateIconFromResourceEx(b, l, TRUE, 0x00030000, 16, 16, LR_DEFAULTCOLOR)); - } - } */ + if (l) + icon_id = g_Globals._icon_cache.add(CreateIconFromResourceEx(b, l, TRUE, 0x00030000, 16, 16, LR_DEFAULTCOLOR)); + } + } */ + } } } @@ -374,20 +377,41 @@ const ShellPath& pidl_abs = create_absolute_pidl(); LPCITEMIDLIST pidl = pidl_abs; - HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|SHGFI_PIDL|(big_icons? SHGFI_SMALLICON: 0)); + int shgfi_flags = SHGFI_SYSICONINDEX|SHGFI_PIDL; + + if (!(flags & ICF_LARGE)) + shgfi_flags |= SHGFI_SMALLICON; + + if (flags & ICF_OPEN) + shgfi_flags |= SHGFI_OPENICON; + + // ICF_OVERLAYS is not supported in this case. + + HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), shgfi_flags); if (himlSys) icon_id = g_Globals._icon_cache.add(sfi.iIcon); /* - if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_ICON|(g_Globals._big_icons? SHGFI_SMALLICON: 0))) + if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_ICON|(g_Globals._large_icons? SHGFI_SMALLICON: 0))) icon_id = g_Globals._icon_cache.add(sfi.hIcon)._id; */ } } - _icon_id = icon_id; + return icon_id; } +int Entry::safe_extract_icon(ICONCACHE_FLAGS flags) +{ + try { + return extract_icon(flags); + } catch(COMException&) { + // ignore unexpected exceptions while extracting icons + } + return ICID_NONE; +} + + BOOL Entry::launch_entry(HWND hwnd, UINT nCmdShow) { TCHAR cmd[MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.h --- trunk/reactos/subsys/system/explorer/shell/entries.h 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/entries.h 2005-12-28 16:14:10 UTC (rev 20396) @@ -64,7 +64,20 @@ #define ATTRIBUTE_EXECUTABLE 0x80000000 #endif +enum ICONCACHE_FLAGS { + ICF_NORMAL = 0, + ICF_LARGE = 1, + ICF_OPEN = 2, + ICF_OVERLAYS = 4, + ICF_HICON = 8, + ICF_SYSCACHE = 16 +}; +#ifndef SHGFI_ADDOVERLAYS // missing in MinGW (as of 28.12.2005) +#define SHGFI_ADDOVERLAYS 0x000000020 +#endif + + /// base of all file and directory entries struct Entry { @@ -103,7 +116,8 @@ Entry* read_tree(const void* path, SORT_ORDER sortOrder=SORT_NAME, int scan_flags=SCAN_ALL); void sort_directory(SORT_ORDER sortOrder); void smart_scan(SORT_ORDER sortOrder=SORT_NAME, int scan_flags=SCAN_ALL); - void extract_icon(bool big_icons); + int extract_icon(ICONCACHE_FLAGS flags=ICF_NORMAL); + int safe_extract_icon(ICONCACHE_FLAGS flags=ICF_NORMAL); virtual void read_directory(int scan_flags=SCAN_ALL) {} virtual const void* get_next_path_component(const void*) const {return NULL;} _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -1335,9 +1335,6 @@ _split_pos = DEFAULT_SPLIT_POS; _last_split = DEFAULT_SPLIT_POS; - // create image list for explorer tree view - init_himl(); - /* wait for PM_OPEN_WINDOW message before creating a shell view update_shell_browser();*/ } @@ -1647,12 +1644,12 @@ } _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd, - _shellpath_info, _himlSmall, this, _cm_ifs)); + _shellpath_info, this, _cm_ifs)); _shellBrowser->Init(_hwnd); if (_left_hwnd) - _shellBrowser->Init(_himlSmall); + _shellBrowser->Init(); // update _clnt_rect and set size of new created shell view windows update_clnt_rect(); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -38,7 +38,7 @@ ShellBrowser::ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, - HIMAGELIST himl, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs) + BrowserCallback* cb, CtxMenuInterfaces& cm_ifs) #ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) : super(IID_IShellFolderViewCB), #else @@ -48,7 +48,6 @@ _left_hwnd(left_hwnd), _right_hwnd(right_hwnd), _create_info(create_info), - _himl(himl), _callback(cb), _cm_ifs(cm_ifs) { @@ -57,11 +56,15 @@ _last_sel = 0; _cur_dir = NULL; + + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); + ImageList_SetBkColor(_himl, GetSysColor(COLOR_WINDOW)); } ShellBrowser::~ShellBrowser() { (void)TreeView_SetImageList(_left_hwnd, _himl_old, TVSIL_NORMAL); + ImageList_Destroy(_himl); if (_pShellView) _pShellView->Release(); @@ -148,22 +151,22 @@ } -void ShellBrowser::InitializeTree(HIMAGELIST himl) +void ShellBrowser::InitializeTree() { CONTEXT("ShellBrowserChild::InitializeTree()"); - _himl_old = TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); + _himl_old = TreeView_SetImageList(_left_hwnd, _himl, TVSIL_NORMAL); TreeView_SetScrollTime(_left_hwnd, 100); TV_INSERTSTRUCT tvInsert; + TV_ITEM& tvItem = tvInsert.item; tvInsert.hParent = 0; tvInsert.hInsertAfter = TVI_LAST; - TV_ITEM& tvItem = tvInsert.item; tvItem.mask = TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN; tvItem.lParam = (LPARAM)_root._entry; - tvItem.pszText = LPSTR_TEXTCALLBACK; + tvItem.pszText = _root._volname; //LPSTR_TEXTCALLBACK; tvItem.iImage = tvItem.iSelectedImage = I_IMAGECALLBACK; tvItem.cChildren = 1; @@ -239,33 +242,43 @@ if (lpdi->item.mask & TVIF_TEXT) lpdi->item.pszText = entry->_display_name; - if (lpdi->item.mask & (/*TVIF_TEXT|*/TVIF_IMAGE|TVIF_SELECTEDIMAGE)) { - ShellPath pidl_abs = entry->create_absolute_pidl(); // Caching of absolute PIDLs could enhance performance. - LPCITEMIDLIST pidl = pidl_abs; - - SHFILEINFO sfi; -/* - if (lpdi->item.mask & TVIF_TEXT) - if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_DISPLAYNAME)) - lstrcpy(lpdi->item.pszText, sfi.szDisplayName); ///@todo look at cchTextMax if there is enough space available - else - lpdi->item.pszText = entry->_data.cFileName; -*/ + if (lpdi->item.mask & (TVIF_IMAGE|TVIF_SELECTEDIMAGE)) { if (lpdi->item.mask & TVIF_IMAGE) - if ((HIMAGELIST)SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_SYSICONINDEX|SHGFI_LINKOVERLAY|SHGFI_SMALLICON) == _himl) - lpdi->item.iImage = sfi.iIcon; - else - lpdi->item.iImage = -1; + lpdi->item.iImage = get_image_idx( + entry->safe_extract_icon((ICONCACHE_FLAGS)(ICF_HICON|ICF_OVERLAYS))); if (lpdi->item.mask & TVIF_SELECTEDIMAGE) - if ((HIMAGELIST)SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_SYSICONINDEX|SHGFI_OPENICON|SHGFI_SMALLICON) == _himl) - lpdi->item.iSelectedImage = sfi.iIcon; - else - lpdi->item.iSelectedImage = -1; + lpdi->item.iSelectedImage = get_image_idx( + entry->safe_extract_icon((ICONCACHE_FLAGS)(ICF_HICON|ICF_OVERLAYS|ICF_OP EN))); } } } +int ShellBrowser::get_image_idx(int icon_id) +{ + if (icon_id != ICID_NONE) { + map<int,int>::const_iterator found = _image_map.find(icon_id); + + if (found != _image_map.end()) + return found->second; + + int idx = ImageList_AddIcon(_himl, g_Globals._icon_cache.get_icon(icon_id).get_hicon()); + + _image_map[icon_id] = idx; + + return idx; + } else + return -1; +} + +void ShellBrowser::invalidate_cache() +{ + for(map<int,int>::const_iterator it=_image_map.begin(); it!=_image_map.end(); ++it) + g_Globals._icon_cache.free_icon(it->first); + + _image_map.clear(); +} + void ShellBrowser::OnTreeItemExpanding(int idCtrl, LPNMTREEVIEW pnmtv) { CONTEXT("ShellBrowser::OnTreeItemExpanding()"); @@ -554,13 +567,11 @@ if (super::Init(pcs)) return 1; - init_himl(); - update_shell_browser(); if (_shellBrowser.get()) if (_left_hwnd) - _shellBrowser->Init(_himlSmall); + _shellBrowser->Init(); else _shellBrowser->UpdateFolderView(_create_info._shell_path.get_folder()); @@ -579,6 +590,7 @@ case ID_REFRESH: //@todo refresh shell child + _shellBrowser->invalidate_cache(); break; case ID_VIEW_SDI: @@ -626,7 +638,7 @@ } _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd, - _shellpath_info, _himlSmall, this, _cm_ifs)); + _shellpath_info, this, _cm_ifs)); _shellBrowser->Init(_hwndFrame); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.h --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.h 2005-12-28 16:14:10 UTC (rev 20396) @@ -62,7 +62,7 @@ #endif { ShellBrowser(HWND hwnd, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, - HIMAGELIST himl, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs); + BrowserCallback* cb, CtxMenuInterfaces& cm_ifs); virtual ~ShellBrowser(); //IOleWindow @@ -124,9 +124,9 @@ LRESULT Init(HWND hWndFrame); - void Init(HIMAGELIST himl) + void Init() { - InitializeTree(himl); + InitializeTree(); InitDragDrop(); } @@ -142,6 +142,8 @@ // for SDIMainFrame void jump_to(LPCITEMIDLIST pidl); + void invalidate_cache(); + protected: HWND _hwnd; HWND _left_hwnd; @@ -164,7 +166,7 @@ CtxMenuInterfaces& _cm_ifs; - void InitializeTree(HIMAGELIST himl); + void InitializeTree(); bool InitDragDrop(); #ifndef __MINGW32__ // IShellFolderViewCB missing in MinGW (as of 25.09.2005) @@ -173,6 +175,10 @@ // IShellFolderViewCB virtual HRESULT STDMETHODCALLTYPE MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); #endif + + map<int, int> _image_map; + + int get_image_idx(int icon_id); }; @@ -194,29 +200,15 @@ ShellBrowserChildT(HWND hwnd) : super(hwnd) { - _himlSmall = 0; } // constructor for MDIShellBrowserChild ShellBrowserChildT(HWND hwnd, const ShellChildWndInfo& info) : super(hwnd, info) { - _himlSmall = 0; } - void init_himl() - { - SHFILEINFO sfi; - - _himlSmall = (HIMAGELIST)SHGetFileInfo(C_DRIVE, 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); -// _himlLarge = (HIMAGELIST)SHGetFileInfo(C_DRIVE, 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_LARGEICON); - } - protected: - HIMAGELIST _himlSmall; // list -// HIMAGELIST _himlLarge; // shell image - -protected: auto_ptr<ShellBrowser> _shellBrowser; LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -325,11 +325,7 @@ if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; /* else if (scan_flags & SCAN_EXTRACT_ICONS) - try { - entry->extract_icon(big_icons); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->safe_extract_icon(large_icons); */ last = entry; } while(FindNextFile(hFind, &w32fd)); @@ -431,11 +427,7 @@ if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || !(attribs & SFGAO_FILESYSTEM)) { /* if (scan_flags & SCAN_EXTRACT_ICONS) - try { - entry->extract_icon(big_icons); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->extract_icon(large_icons); */ } else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; else @@ -488,13 +480,13 @@ return NULL; } -int ShellDirectory::extract_icons(bool big_icons) +int ShellDirectory::extract_icons(ICONCACHE_FLAGS flags) { int cnt = 0; for(Entry*entry=_down; entry; entry=entry->_next) if (entry->_icon_id == ICID_UNKNOWN) { - entry->extract_icon(big_icons); + entry->_icon_id = entry->extract_icon(flags); if (entry->_icon_id != ICID_NONE) ++cnt; _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.h --- trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.h 2005-12-28 16:14:10 UTC (rev 20396) @@ -105,7 +105,7 @@ virtual bool get_path(PTSTR path, size_t path_count) const; - int extract_icons(bool big_icons); + int extract_icons(ICONCACHE_FLAGS flags); ShellFolder _folder; HWND _hwnd; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -161,7 +161,7 @@ RegisterHotkeys(); // prepare Startmenu, but hide it for now - _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd, true)); //@@ _big_icons + _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd, true)); //@@ _large_icons return 0; } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -109,11 +109,7 @@ // immediatelly extract the shortcut icons for(Entry*entry=_dir->_down; entry; entry=entry->_next) - try { - entry->extract_icon(false); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->_icon_id = entry->safe_extract_icon(ICF_NORMAL); } catch(COMException&) { return; } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-28 14:55:22 UTC (rev 20395) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-12-28 16:14:10 UTC (rev 20396) @@ -46,9 +46,9 @@ #define SHELLPATH_NET_CONNECTIONS TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2 DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}") -StartMenu::StartMenu(HWND hwnd, bool big_icons) +StartMenu::StartMenu(HWND hwnd, bool large_icons) : super(hwnd), - _big_icons(big_icons) + _large_icons(large_icons) { _next_id = IDC_FIRST_MENU; _submenu_id = 0; @@ -70,10 +70,10 @@ #endif } -StartMenu::StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, bool big_icons) +StartMenu::StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, bool large_icons) : super(hwnd), _create_info(create_info), - _big_icons(big_icons) + _large_icons(large_icons) { for(StartMenuFolders::const_iterator it=create_info._folders.begin(); it!=create_info._folders.end(); ++it) if (*it) @@ -117,7 +117,7 @@ Window::CREATORFUNC_INFO StartMenu::s_def_creator = STARTMENU_CREATOR(StartMenu); -HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndParent, LPCTSTR title, bool parent_big_icons, +HWND StartMenu::Create(int x, int y, const StartMenuFolders& folders, HWND hwndParent, LPCTSTR title, CREATORFUNC_INFO creator, void* info, const String& filter) { UINT style, ex_style; @@ -133,7 +133,7 @@ top_height = 0; } - bool big_icons = false; + bool large_icons = false; RECT rect = {x, y-STARTMENU_LINE_HEIGHT-top_height, x+STARTMENU_WIDTH_MIN, y}; #ifndef _LIGHT_STARTMENU @@ -348,7 +348,7 @@ WindowRect pos(_hwnd); ///@todo do something similar to StartMenuRoot::TrackStartmenu() in order to automatically close submenus when clicking on the desktop background - StartMenu::Create(pos.left+3, pos.bottom-3, _create_info._folders, 0, _create_info._title, _big_icons, _create_info._creator, _create_info._info); + StartMenu::Create(pos.left+3, pos.bottom-3, _create_info._folders, 0, _create_info._title, _create_info._creator, _create_info._info); CloseStartMenu(); } @@ -391,7 +391,7 @@ if (_arrow_btns) { RECT rect_up, rect_down; - GetArrowButtonRects(&rect_up, &rect_down, _big_icons); + GetArrowButtonRects(&rect_up, &rect_down, _large_icons); SCROLL_MODE scroll_mode = SCROLL_NOT; @@ -515,7 +515,7 @@ int StartMenu::ButtonHitTest(POINT pt) { ClientRect clnt(_hwnd); - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; if (pt.x<rect.left || pt.x>rect.right) @@ -547,7 +547,7 @@ return; ClientRect clnt(_hwnd); - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; for(SMBtnVector::const_iterator it=_buttons.begin()+_scroll_pos; it!=_buttons.end(); ++it) { @@ -773,7 +773,7 @@ { #ifdef _LIGHT_STARTMENU ClientRect clnt(_hwnd); - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; for(SMBtnVector::const_iterator it=_buttons.begin()+_scroll_pos; it!=_buttons.end(); ++it) { @@ -823,10 +823,10 @@ } -void StartMenu::DrawArrows(HDC hdc, bool big_icons) +void StartMenu::DrawArrows(HDC hdc, bool large_icons) { - int cx = big_icons? 16: 8; - int cy = big_icons? 8: 4; + int cx = large_icons? 16: 8; + int cy = large_icons? 8: 4; ResIconEx arrowUpIcon(IDI_ARROW_UP, cx, cy); ResIconEx arrowDownIcon(IDI_ARROW_DOWN, cx, cy); @@ -837,10 +837,10 @@ DrawIconEx(hdc, clnt.right/2-cx/2, clnt.bottom-cy-1, arrowDownIcon, cx, cy, 0, 0, DI_NORMAL); } -void StartMenu::GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, bool big_icons) +void StartMenu::GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, bool large_icons) { - int cx = big_icons? 16: 8; - int cy = big_icons? 8: 4; + int cx = large_icons? 16: 8; + int cy = large_icons? 8: 4; GetClientRect(_hwnd, prect_up); *prect_down = *prect_up; @@ -865,10 +865,10 @@ #ifdef _LIGHT_STARTMENU if (_arrow_btns) - DrawArrows(canvas, _big_icons); + DrawArrows(canvas, _large_icons); ClientRect clnt(_hwnd); - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; int sep_width = rect.right-rect.left - 4; @@ -900,7 +900,7 @@ break; if (rect.top >= canvas.rcPaint.top) - DrawStartMenuButton(canvas, rect, btn._title, btn, btn._id==_selected_id, false, _big_icons); + DrawStartMenuButton(canvas, rect, btn._title, btn, btn._id==_selected_id, false, _large_icons); } rect.top = rect.bottom; @@ -930,11 +930,7 @@ Entry* entry = *it; if (entry->_icon_id == ICID_UNKNOWN) - try { - entry->extract_icon(_big_icons); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->_icon_id = entry->safe_extract_icon(_large_icons? ICF_LARGE: ICF_NORMAL); if (entry->_icon_id > ICID_NONE) { btn._icon_id = (ICON_ID)/*@@*/ entry->_icon_id; @@ -947,7 +943,7 @@ break; WindowCanvas canvas(_hwnd); - DrawStartMenuButton(canvas, rect, NULL, btn, btn._id==_selected_id, false, _big_icons); + DrawStartMenuButton(canvas, rect, NULL, btn, btn._id==_selected_id, false, _large_icons); //InvalidateRect(_hwnd, &rect, FALSE); //UpdateWindow(_hwnd); @@ -1266,7 +1262,7 @@ ClientToScreen(_hwnd, &rect); x = rect.right; // Submenus should overlap their parent a bit. - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; y = rect.top+STARTMENU_LINE_HEIGHT +_border_top/*own border*/ -STARTMENU_TOP_BTN_SPACE/*border of new submenu*/; } else { WindowRect pos(_hwnd); @@ -1276,7 +1272,7 @@ } _submenu_id = id; - _submenu = StartMenu::Create(x, y, new_folders, _hwnd, title, _big_icons, creator, info, _create_info._filter); + _submenu = StartMenu::Create(x, y, new_folders, _hwnd, title, creator, info, _create_info._filter); } @@ -1368,10 +1364,10 @@ } #ifdef _LIGHT_STARTMENU -void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, bool big_icons) +void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, bool large_icons) #else void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, HICON hIcon, - bool hasSubmenu, bool enabled, bool has_focus, bool pushed, bool big_icons); + bool hasSubmenu, bool enabled, bool has_focus, bool pushed, bool large_icons); #endif { UINT style = DFCS_BUTTONPUSH; @@ -1404,7 +1400,7 @@ FillRect(hdc, &rect, bk_brush); if (btn._icon_id > ICID_NONE) - g_Globals._icon_cache.get_icon(btn._icon_id).draw(hdc, iconPos.x, iconPos.y, ICON_SIZE_X, ICON_SIZE_Y, bk_color, bk_brush/*, big_icons*/); + g_Globals._icon_cache.get_icon(btn._icon_id).draw(hdc, iconPos.x, iconPos.y, ICON_SIZE_X, ICON_SIZE_Y, bk_color, bk_brush/*, large_icons*/); // draw submenu arrow at the right if (btn._hasSubmenu) { @@ -1438,7 +1434,7 @@ WindowCanvas canvas(_hwnd); FontSelection font(canvas, GetStockFont(DEFAULT_GUI_FONT)); - const bool big_icons = _big_icons; + const bool large_icons = _large_icons; int max_width = STARTMENU_WIDTH_MIN; int height = 0; @@ -1583,7 +1579,7 @@ } -static void CalculateStartPos(HWND hwndOwner, RECT& rect, bool big_icons) +static void CalculateStartPos(HWND hwndOwner, RECT& rect, bool large_icons) { WindowRect pos(hwndOwner); @@ -1599,11 +1595,11 @@ AdjustWindowRectEx(&rect, WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, FALSE, 0); } -HWND StartMenuRoot::Create(HWND hwndOwner, bool big_icons) +HWND StartMenuRoot::Create(HWND hwndOwner, bool large_icons) { RECT rect; - CalculateStartPos(hwndOwner, rect, big_icons); + CalculateStartPos(hwndOwner, rect, large_icons); [truncated at 1000 lines; 106 more skipped]

1 0

[weiden] 20395: fixed uninitialized variable warning
by weiden＠svn.reactos.com 28 Dec '05

28 Dec '05

fixed uninitialized variable warning Modified: trunk/reactos/lib/setupapi/install.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-28 14:21:05 UTC (rev 20394) +++ trunk/reactos/lib/setupapi/install.c 2005-12-28 14:55:22 UTC (rev 20395) @@ -866,7 +866,7 @@ { SP_DEVINSTALL_PARAMS_W install_params; struct files_callback_info info; - HSPFILEQ queue; + HSPFILEQ queue = NULL; BOOL use_custom_queue; BOOL ret;

1 0

[hpoussin] 20394: - Add a minimal implementation of SetupScanFileQueueW
by hpoussin＠svn.reactos.com 28 Dec '05

28 Dec '05

- Add a minimal implementation of SetupScanFileQueueW - In SetupDiBuildDriverInfoList, add found drivers in the right driver list - In SetupDiEnumDriverInfoW, enumerate the right driver list if DeviceInfoData is not NULL Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/queue.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-28 13:27:40 UTC (rev 20393) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-28 14:21:05 UTC (rev 20394) @@ -5389,6 +5389,7 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else { + PLIST_ENTRY pDriverListHead = &list->DriverListHead; BOOL Result; InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); @@ -5396,6 +5397,13 @@ if (!Result) goto done; + if (DeviceInfoData) + { + struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + if (!(devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) + pDriverListHead = &devInfo->DriverListHead; + } + if (DriverType == SPDIT_COMPATDRIVER) { /* Get hardware IDs list */ @@ -5633,7 +5641,7 @@ { /* FIXME: read [ControlFlags] / ExcludeFromSelect */ if (!AddDriverToList( - &list->DriverListHead, + pDriverListHead, DriverType, &ClassGuid, ContextDevice, @@ -5689,7 +5697,7 @@ if (wcsicmp(DeviceId, currentId) == 0) { AddDriverToList( - &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, + pDriverListHead, DriverType, &ClassGuid, ContextDevice, @@ -5710,7 +5718,7 @@ if (wcsicmp(DeviceId, currentId) == 0) { AddDriverToList( - &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, + pDriverListHead, DriverType, &ClassGuid, ContextDevice, @@ -6106,8 +6114,6 @@ SetLastError(ERROR_INVALID_HANDLE); else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) SetLastError(ERROR_INVALID_PARAMETER); - else if (DriverType == SPDIT_CLASSDRIVER && DeviceInfoData) - SetLastError(ERROR_INVALID_PARAMETER); else if (DriverType == SPDIT_COMPATDRIVER && !DeviceInfoData) SetLastError(ERROR_INVALID_PARAMETER); else if (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_W) && DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_W)) @@ -6118,8 +6124,7 @@ PLIST_ENTRY ItemList; if (DeviceInfoData) devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; - if (DriverType == SPDIT_CLASSDRIVER || - (devInfo && devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) + if (!devInfo || (devInfo->CreationFlags & DICD_INHERIT_CLASSDRVS)) { ListHead = &((struct DeviceInfoSet *)DeviceInfoSet)->DriverListHead; } _____ Modified: trunk/reactos/lib/setupapi/queue.c --- trunk/reactos/lib/setupapi/queue.c 2005-12-28 13:27:40 UTC (rev 20393) +++ trunk/reactos/lib/setupapi/queue.c 2005-12-28 14:21:05 UTC (rev 20394) @@ -1200,11 +1200,43 @@ /*********************************************************************** * SetupScanFileQueueW (SETUPAPI.@) */ -BOOL WINAPI SetupScanFileQueueW( HSPFILEQ queue, DWORD flags, HWND window, +BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window, PSP_FILE_CALLBACK_W callback, PVOID context, PDWORD result ) { - FIXME("stub\n"); - return FALSE; + struct file_queue *queue = handle; + struct file_op *op; + BOOL allnodesprocessed = FALSE; + FILEPATHS_W paths; + + paths.Source = paths.Target = NULL; + *result = FALSE; + + if ( flags & (SPQ_SCAN_FILE_PRESENCE | SPQ_SCAN_FILE_VALIDITY | SPQ_SCAN_USE_CALLBACKEX | SPQ_SCAN_INFORM_USER | SPQ_SCAN_PRUNE_COPY_QUEUE /*| SPQ_SCAN_USE_CALLBACK_SIGNERINFO | SPQ_SCAN_PRUNE_DELREN*/) ) + { + FIXME( "flags ignored 0x%lx\n", flags & (SPQ_SCAN_FILE_PRESENCE | SPQ_SCAN_FILE_VALIDITY | SPQ_SCAN_USE_CALLBACKEX | SPQ_SCAN_INFORM_USER | SPQ_SCAN_PRUNE_COPY_QUEUE /*| SPQ_SCAN_USE_CALLBACK_SIGNERINFO | SPQ_SCAN_PRUNE_DELREN*/) ); + } + + if (queue->copy_queue.count) + { + for (op = queue->copy_queue.head; op; op = op->next) + { + build_filepathsW( op, &paths ); + if (flags & SPQ_SCAN_USE_CALLBACK) + { + /* FIXME: sometimes set param 2 to SPQ_DELAYED_COPY */ + if (NO_ERROR != callback( context, SPFILENOTIFY_QUEUESCAN, (UINT)paths.Target, 0 )) + goto done; + } + } + } + + *result = TRUE; + allnodesprocessed = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, (void *)paths.Source ); + HeapFree( GetProcessHeap(), 0, (void *)paths.Target ); + return allnodesprocessed; }

1 0

[navaraf] 20393: Add failure check.
by navaraf＠svn.reactos.com 28 Dec '05

28 Dec '05

Add failure check. Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-12-28 12:40:17 UTC (rev 20392) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-12-28 13:27:40 UTC (rev 20393) @@ -134,6 +134,8 @@ h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id), Icon ? MAKEINTRESOURCEW(RT_ICON) : MAKEINTRESOURCEW(RT_CURSOR)); + if (h2Resource == NULL) + return NULL; hResource = LoadResource(hinst, h2Resource); if (hResource == NULL)

1 0

[mbosma] 20392: Revert r20367 and r20368 since they crash the GUI in second boot by hitting a assert at line 271 in win32k/ntuser/msgqueue.c
by mbosma＠svn.reactos.com 28 Dec '05

28 Dec '05

Revert r20367 and r20368 since they crash the GUI in second boot by hitting a assert at line 271 in win32k/ntuser/msgqueue.c Added: trunk/reactos/include/win32k/bitmaps.h Added: trunk/reactos/include/win32k/brush.h Added: trunk/reactos/include/win32k/caret.h Added: trunk/reactos/include/win32k/cliprgn.h Added: trunk/reactos/include/win32k/color.h Added: trunk/reactos/include/win32k/coord.h Added: trunk/reactos/include/win32k/cursoricon.h Added: trunk/reactos/include/win32k/dc.h Added: trunk/reactos/include/win32k/driver.h Added: trunk/reactos/include/win32k/fillshap.h Added: trunk/reactos/include/win32k/float.h Added: trunk/reactos/include/win32k/font.h Added: trunk/reactos/include/win32k/gdiobj.h Added: trunk/reactos/include/win32k/icm.h Added: trunk/reactos/include/win32k/kapi.h Added: trunk/reactos/include/win32k/line.h Added: trunk/reactos/include/win32k/math.h Added: trunk/reactos/include/win32k/menu.h Added: trunk/reactos/include/win32k/metafile.h Added: trunk/reactos/include/win32k/misc.h Added: trunk/reactos/include/win32k/ntddraw.h Deleted: trunk/reactos/include/win32k/ntgdibad.h Deleted: trunk/reactos/include/win32k/ntgdihdl.h Deleted: trunk/reactos/include/win32k/ntgdityp.h Modified: trunk/reactos/include/win32k/ntuser.h Deleted: trunk/reactos/include/win32k/ntusrtyp.h Added: trunk/reactos/include/win32k/paint.h Added: trunk/reactos/include/win32k/path.h Added: trunk/reactos/include/win32k/pen.h Added: trunk/reactos/include/win32k/print.h Added: trunk/reactos/include/win32k/region.h Added: trunk/reactos/include/win32k/text.h Added: trunk/reactos/include/win32k/win32k.h Added: trunk/reactos/include/win32k/wingl.h Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/gdi32/gdi32.def Deleted: trunk/reactos/lib/gdi32/include/gdi32p.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c Modified: trunk/reactos/lib/gdi32/misc/stubsa.c Modified: trunk/reactos/lib/gdi32/misc/stubsw.c Modified: trunk/reactos/lib/gdi32/misc/wingl.c Modified: trunk/reactos/lib/gdi32/objects/bitmap.c Modified: trunk/reactos/lib/gdi32/objects/brush.c Modified: trunk/reactos/lib/gdi32/objects/dc.c Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/gdi32/objects/path.c Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/subsys/win32k/eng/objects.h Deleted: trunk/reactos/subsys/win32k/include/bitmaps.h Deleted: trunk/reactos/subsys/win32k/include/brush.h Modified: trunk/reactos/subsys/win32k/include/color.h Deleted: trunk/reactos/subsys/win32k/include/coord.h Deleted: trunk/reactos/subsys/win32k/include/dc.h Modified: trunk/reactos/subsys/win32k/include/dib.h Deleted: trunk/reactos/subsys/win32k/include/driver.h Deleted: trunk/reactos/subsys/win32k/include/gdifloat.h Deleted: trunk/reactos/subsys/win32k/include/gdiobj.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/include/menu.h Deleted: trunk/reactos/subsys/win32k/include/misc.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/include/path.h Deleted: trunk/reactos/subsys/win32k/include/pen.h Deleted: trunk/reactos/subsys/win32k/include/region.h Modified: trunk/reactos/subsys/win32k/include/text.h Modified: trunk/reactos/subsys/win32k/include/win32k.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/paint.c Modified: trunk/reactos/subsys/win32k/objects/path.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/print.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/text.c Modified: trunk/reactos/subsys/win32k/objects/wingl.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/tools/nci/w32ksvc.db Deleted: trunk/reactos/w32api/include/ntgdi.h Modified: trunk/reactos/w32api/include/wingdi.h _____ Copied: trunk/reactos/include/win32k/bitmaps.h (from rev 20366, trunk/reactos/include/win32k/bitmaps.h) _____ Copied: trunk/reactos/include/win32k/brush.h (from rev 20366, trunk/reactos/include/win32k/brush.h) _____ Copied: trunk/reactos/include/win32k/caret.h (from rev 20366, trunk/reactos/include/win32k/caret.h) _____ Copied: trunk/reactos/include/win32k/cliprgn.h (from rev 20366, trunk/reactos/include/win32k/cliprgn.h) _____ Copied: trunk/reactos/include/win32k/color.h (from rev 20366, trunk/reactos/include/win32k/color.h) _____ Copied: trunk/reactos/include/win32k/coord.h (from rev 20366, trunk/reactos/include/win32k/coord.h) _____ Copied: trunk/reactos/include/win32k/cursoricon.h (from rev 20366, trunk/reactos/include/win32k/cursoricon.h) _____ Copied: trunk/reactos/include/win32k/dc.h (from rev 20366, trunk/reactos/include/win32k/dc.h) _____ Copied: trunk/reactos/include/win32k/driver.h (from rev 20366, trunk/reactos/include/win32k/driver.h) _____ Copied: trunk/reactos/include/win32k/fillshap.h (from rev 20366, trunk/reactos/include/win32k/fillshap.h) _____ Copied: trunk/reactos/include/win32k/float.h (from rev 20366, trunk/reactos/include/win32k/float.h) _____ Copied: trunk/reactos/include/win32k/font.h (from rev 20366, trunk/reactos/include/win32k/font.h) _____ Copied: trunk/reactos/include/win32k/gdiobj.h (from rev 20366, trunk/reactos/include/win32k/gdiobj.h) _____ Copied: trunk/reactos/include/win32k/icm.h (from rev 20366, trunk/reactos/include/win32k/icm.h) _____ Copied: trunk/reactos/include/win32k/kapi.h (from rev 20366, trunk/reactos/include/win32k/kapi.h) _____ Copied: trunk/reactos/include/win32k/line.h (from rev 20366, trunk/reactos/include/win32k/line.h) _____ Copied: trunk/reactos/include/win32k/math.h (from rev 20366, trunk/reactos/include/win32k/math.h) _____ Copied: trunk/reactos/include/win32k/menu.h (from rev 20366, trunk/reactos/include/win32k/menu.h) _____ Copied: trunk/reactos/include/win32k/metafile.h (from rev 20366, trunk/reactos/include/win32k/metafile.h) _____ Copied: trunk/reactos/include/win32k/misc.h (from rev 20366, trunk/reactos/include/win32k/misc.h) _____ Copied: trunk/reactos/include/win32k/ntddraw.h (from rev 20366, trunk/reactos/include/win32k/ntddraw.h) _____ Deleted: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2005-12-28 12:27:25 UTC (rev 20391) +++ trunk/reactos/include/win32k/ntgdibad.h 2005-12-28 12:40:17 UTC (rev 20392) @@ -1,1256 +0,0 @@ -#ifndef WIN32K_NTGDI_BAD_INCLUDED -#define WIN32K_NTGDI_BAD_INCLUDED - -/* - * - * If you want to help, please read this: - * - * This file contains NtGdi APIs which are specific to ROS, including - * a short comment describing the solution on how to use the actual NtGdi - * call documented in ntgdi.h. Here are the main cases and information on - * how to remove them from this header. - * - * - Simple rename. This deals with an API simply having a different name, - * with absolutely no other changes needed. - * - Rename and new parameters. This deals with a case similar to the one - * above, except that new parameters have now - * been added. This is also usually extremly - * simple to fix. Either pass the right params - * or pass null/0 values that you ignore. - * - Rename and new structure. This is similar to the above, except that the - * information is now passed in a differently - * named and organized structure. Ask Alex for - * the structure you need and he will add it to - * ntgdityp.h - * - Rename and different semantics. Similar to the previous examples, except - * that parameters have usually been removed - * or need to be converted in user-mode in - * one form of another. - * - Does not exist: user-mode. This means that the API can be fully done in - * user mode. In 80% of cases, our API was already - * returning NOT_IMPLEMENTED in kernel-mode, so - * the work to be done is minimal. A good example - * are the ICM and Metafile APIs, which can simply - * be removed and added into gdi32. - * - Does not exist: GDI Shared Objects. This is by far the hardest case. This - * class cannot be fixed until ReactOS - * has a working Shared GDI Object table - * and a DC_ATTR structure in which the - * attributes, selection and deletion of - * objects can be quickly done from user- - * mode without requiring a kernel mode - * call. - */ -/* Should be using ENUMFONTDATAW */ -typedef struct tagFONTFAMILYINFO -{ - ENUMLOGFONTEXW EnumLogFontEx; - NEWTEXTMETRICEXW NewTextMetricEx; - DWORD FontType; -} FONTFAMILYINFO, *PFONTFAMILYINFO; - -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFontIndirect(CONST LPLOGFONTW lf); - -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFont( - int Height, - int Width, - int Escapement, - int Orientation, - int Weight, - DWORD Italic, - DWORD Underline, - DWORD StrikeOut, - DWORD CharSet, - DWORD OutputPrecision, - DWORD ClipPrecision, - DWORD Quality, - DWORD PitchAndFamily, - LPCWSTR Face -); - -/* Should be using NtGdiEnumFontChunk */ -INT -NTAPI -NtGdiGetFontFamilyInfo( - HDC Dc, - LPLOGFONTW LogFont, - PFONTFAMILYINFO Info, - DWORD Size -); - -/* Should be using NtGdiEnumFontChunk */ -BOOL -NTAPI -NtGdiTranslateCharsetInfo( - PDWORD Src, - LPCHARSETINFO CSI, - DWORD Flags -); - -/* The gdi32 call does all the work in user-mode, save for NtGdiMakeFontDir */ -BOOL -NTAPI -NtGdiCreateScalableFontResource( - DWORD Hidden, - LPCWSTR FontRes, - LPCWSTR FontFile, - LPCWSTR CurrentPath -); - -/* The gdi32 call Should Use NtGdiGetRandomRgn and nothing else */ -HRGN -NTAPI -NtGdiGetClipRgn(HDC hDC); - -/* The gdi32 call Should Use NtGdiGetTextExtent */ -BOOL -NTAPI -NtGdiGetTextExtentPoint32( - HDC hDC, - LPCWSTR String, - int Count, - LPSIZE -); - -BOOL -STDCALL -NtGdiGetCharWidth32( - HDC hDC, - UINT FirstChar, - UINT LastChar, - LPINT Buffer -); - -/* Use NtGdiOpenDCW */ -HDC -NTAPI -NtGdiCreateDC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData -); - -HDC -NTAPI -NtGdiCreateIC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW DevMode -); - -/* Use NtGdiAddFontResourceW */ -int -STDCALL -NtGdiAddFontResource(PUNICODE_STRING Filename, - DWORD fl); - -/* Use NtGdiDoPalette with GdiPalAnimate */ -BOOL -STDCALL -NtGdiAnimatePalette ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - CONST PPALETTEENTRY ppe - ); - -/* Use NtGdiArcInternal with GdiTypeArc */ -BOOL -STDCALL -NtGdiArc(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc); - -/* Use NtGdiArcInternal with GdiTypeArcTo */ -BOOL -STDCALL -NtGdiArcTo(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2); - -/* Does not exist */ -BOOL -STDCALL -NtGdiCheckColorsInGamut(HDC hDC, - LPVOID RGBTriples, - LPVOID Buffer, - UINT Count); - -/* Use NtGdiArcInternal with GdiTypeChord */ -BOOL -STDCALL -NtGdiChord(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2); - -/* Metafiles are user mode */ -HENHMETAFILE -STDCALL -NtGdiCloseEnhMetaFile ( - HDC hDC - ); - -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCloseMetaFile ( - HDC hDC - ); - -/* Does not exist */ -BOOL -STDCALL -NtGdiColorMatchToTarget(HDC hDC, - HDC hDCTarget, - DWORD Action); - -/* Metafiles are user mode */ -HENHMETAFILE -STDCALL -NtGdiCopyEnhMetaFile ( - HENHMETAFILE Src, - LPCWSTR File - ); - -/* Metafiles are user mode */ -HMETAFILE -STDCALL -NtGdiCopyMetaFile ( - HMETAFILE Src, - LPCWSTR File - ); - -/* Use NtGdiCreateBitmap and expand the pbm-> */ -HBITMAP -STDCALL -NtGdiCreateBitmapIndirect ( - CONST BITMAP * BM - ); - -/* Use NtGdiCreateDIBitmapInternal */ -HBITMAP -STDCALL -NtGdiCreateDIBitmap ( - HDC hDC, - CONST BITMAPINFOHEADER * bmih, - DWORD Init, - CONST VOID * bInit, - CONST BITMAPINFO * bmi, - UINT Usage - ); - -/* Use NtGdiCreateCompatibleBitmap */ -HBITMAP -STDCALL -NtGdiCreateDiscardableBitmap ( - HDC hDC, - INT Width, - INT Height - ); - -/* Use NtGdiCreateEllipticRgn and expand the lprect-> */ -HRGN -STDCALL -NtGdiCreateEllipticRgnIndirect(CONST PRECT rc); - -/* Metafiles are user mode */ -HDC -STDCALL -NtGdiCreateEnhMetaFile ( - HDC hDCRef, - LPCWSTR File, - CONST LPRECT Rect, - LPCWSTR Description - ); - -/* Use NtGdiCreateHatchBrushInternal with FALSE at the end. */ -HBRUSH STDCALL -NtGdiCreateHatchBrush( - INT Style, - COLORREF Color); - -/* Metafiles are user mode */ -HDC -STDCALL -NtGdiCreateMetaFile ( - LPCWSTR File - ); - -/* Use NtGdiCreatePaletteInternal with palNumEntries at the end. */ -HPALETTE -STDCALL -NtGdiCreatePalette ( - CONST PLOGPALETTE lgpl - ); - -/* Use NtGdiCreatePatternBrushInternal with false, false at the end. */ -HBRUSH STDCALL -NtGdiCreatePatternBrush( - HBITMAP hBitmap); - -/* Use NtGdiCreatePen with -> as parameters. */ -HPEN STDCALL -NtGdiCreatePenIndirect( - CONST PLOGPEN LogBrush); - -/* Use NtGdiPolyPolyDraw with PolyPolyRgn. */ -HRGN -STDCALL -NtGdiCreatePolygonRgn(CONST PPOINT pt, - INT Count, - INT PolyFillMode); - -/* Use NtGdiPolyPolyDraw with PolyPolyRgn. */ -HRGN -STDCALL -NtGdiCreatePolyPolygonRgn(CONST PPOINT pt, - CONST PINT PolyCounts, - INT Count, - INT PolyFillMode); - -/* Use NtGdiCreateRectRgn with expanded paraemters. */ -HRGN -STDCALL -NtGdiCreateRectRgnIndirect(CONST PRECT rc); - -/* Use NtGdiTransformPoints with GdiDpToLp. */ -BOOL -STDCALL -NtGdiDPtoLP ( - HDC hDC, - LPPOINT Points, - int Count - ); - -/* Use NtGdiDeleteObjectApp. */ -BOOL STDCALL NtGdiDeleteDC(HDC hDC); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiDeleteEnhMetaFile ( - HENHMETAFILE emf - ); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiDeleteMetaFile ( - HMETAFILE mf - ); - -/* Should be done in user-mode. */ -BOOL STDCALL NtGdiDeleteObject(HGDIOBJ hObject); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiEnumEnhMetaFile ( - HDC hDC, - HENHMETAFILE emf, - ENHMFENUMPROC EnhMetaFunc, - LPVOID Data, - CONST LPRECT Rect - ); - -/* Should be done in user-mode. */ -int -STDCALL -NtGdiEnumFonts(HDC hDC, - LPCWSTR FaceName, - FONTENUMPROCW FontFunc, - LPARAM lParam); - -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiEnumICMProfiles(HDC hDC, - LPWSTR lpstrBuffer, - UINT cch ); - -/* Meta are user-mode. */ -BOOL -STDCALL -NtGdiEnumMetaFile ( - HDC hDC, - HMETAFILE mf, - MFENUMPROC MetaFunc, - LPARAM lParam - ); - -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiEscape(HDC hDC, - INT Escape, - INT InSize, - LPCSTR InData, - LPVOID OutData); - -/* Use NtGdiExtTextOutW with 0, 0 at the end. */ -BOOL -STDCALL -NtGdiExtTextOut(HDC hdc, - int X, - int Y, - UINT fuOptions, - CONST RECT *lprc, - LPCWSTR lpString, - UINT cbCount, - CONST INT *lpDx); - -/* Use NtGdiExtFloodFill with FLOODFILLBORDER. */ -BOOL -STDCALL -NtGdiFloodFill ( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill - ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGdiComment ( - HDC hDC, - UINT Size, - CONST LPBYTE Data - ); - -/* Should be done in user-mode. */ -BOOL STDCALL NtGdiGdiFlush (VOID); - -/* Should be done in user-mode. */ -DWORD STDCALL NtGdiGdiGetBatchLimit (VOID); - -/* Should be done in user-mode. */ -DWORD STDCALL NtGdiGdiSetBatchLimit (DWORD Limit); - -/* Use NtGdiGetDCDword with GdiGetArcDirection. */ -INT -STDCALL -NtGdiGetArcDirection ( HDC hDC ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetAspectRatioFilterEx(HDC hDC, - LPSIZE AspectRatio); - -/* Should be done in user-mode using shared GDI Objects. */ -BOOL -STDCALL -NtGdiGetBitmapDimensionEx ( - HBITMAP hBitmap, - LPSIZE Dimension - ); - -/* Should be done in user-mode using shared GDI Objects. */ -COLORREF STDCALL NtGdiGetBkColor(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetBkMode(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -BOOL STDCALL NtGdiGetBrushOrgEx(HDC hDC, LPPOINT brushOrg); - -/* Use NtGdiGetCharABCWidthsW */ -BOOL -STDCALL -NtGdiGetCharABCWidths(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABC abc); - -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharABCWidthsFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABCFLOAT abcF); - -/* Should be done in user mode. */ -DWORD -STDCALL -NtGdiGetCharacterPlacement(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPGCP_RESULTSW Results, - DWORD Flags); - -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharWidthFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - PFLOAT Buffer); - -/* Use NtGdiGetAppClipBox. */ -int -STDCALL -NtGdiGetClipBox ( - HDC hDC, - LPRECT rc - ); - -/* Use NtGdiGetColorSpaceforBitmap. */ -HCOLORSPACE -STDCALL -NtGdiGetColorSpace(HDC hDC); - -/* Should be done in user-mode and/or NtGdiGetDCObject. */ -HGDIOBJ STDCALL NtGdiGetCurrentObject(HDC hDC, UINT ObjectType); - -/* Should be done in user mode. */ -BOOL STDCALL NtGdiGetCurrentPositionEx(HDC hDC, LPPOINT currentPosition); - -/* Use NtGdiGetDCPoint with GdiGetDCOrg. */ -BOOL STDCALL NtGdiGetDCOrgEx(HDC hDC, LPPOINT Point); - -/* Use NtGdiDoPalette with GdiPalGetColorTable. */ -UINT -STDCALL -NtGdiGetDIBColorTable ( - HDC hDC, - UINT StartIndex, - UINT Entries, - RGBQUAD * Colors - ); - -/* Use NtGdiGetDIBitsInternal. */ -INT -STDCALL -NtGdiGetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO bi, - UINT Usage - ); - - -/* Meta are user-mode. */ -HENHMETAFILE -STDCALL -NtGdiGetEnhMetaFile ( - LPCWSTR MetaFile - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileBits ( - HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileDescription ( - HENHMETAFILE hemf, - UINT BufSize, - LPWSTR Description - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFileHeader ( - HENHMETAFILE hemf, - UINT BufSize, - LPENHMETAHEADER emh - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFilePaletteEntries ( - HENHMETAFILE hemf, - UINT Entries, - LPPALETTEENTRY pe - ); - -/* Meta are user-mode. */ -UINT -STDCALL -NtGdiGetEnhMetaFilePixelFormat(HENHMETAFILE hEMF, - DWORD BufSize, - CONST PPIXELFORMATDESCRIPTOR pfd); - -/* Should be done in user-mode. */ -DWORD -STDCALL -NtGdiGetFontLanguageInfo(HDC hDC); - -/* Should be done in user-mode. */ -int -STDCALL -NtGdiGetGraphicsMode ( HDC hDC ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetICMProfile(HDC hDC, - LPDWORD NameSize, - LPWSTR Filename); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiGetLogColorSpace(HCOLORSPACE hColorSpace, - LPLOGCOLORSPACEW Buffer, - DWORD Size); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetMapMode(HDC hDC); - -/* Meta files are user-mode. */ -HMETAFILE -STDCALL -NtGdiGetMetaFile ( - LPCWSTR MetaFile - ); - -/* Meta files are user-mode. */ -UINT -STDCALL -NtGdiGetMetaFileBitsEx ( - HMETAFILE hmf, - UINT Size, - LPVOID Data - ); - -/* Meta files are user-mode. */ -int -STDCALL -NtGdiGetMetaRgn ( - HDC hDC, - HRGN hrgn - ); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetObject(HGDIOBJ hGDIObj, - INT BufSize, - LPVOID Object); - -/* Should be done in user-mode using shared GDI Objects. */ -DWORD STDCALL NtGdiGetObjectType(HGDIOBJ hGDIObj); - -/* Use NtGdiGetOutlineTextMetricsInternalW. */ -UINT -STDCALL -NtGdiGetOutlineTextMetrics(HDC hDC, - UINT Data, - LPOUTLINETEXTMETRICW otm); - -/* Use NtGdiDoPalette with GdiPalGetEntries. */ -UINT -STDCALL -NtGdiGetPaletteEntries ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); - -/* Should be done in user-mode using shared GDI Objects. */ -INT -STDCALL -NtGdiGetPixelFormat(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetPolyFillMode(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetROP2(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetRelAbs(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT STDCALL NtGdiGetStretchBltMode(HDC hDC); - -/* Use NtGdiDoPalette with GdiPalSetSystemEntries. */ -UINT -STDCALL -NtGdiGetSystemPaletteEntries ( - HDC hDC, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); - -/* Should be done in user-mode using shared GDI Objects. */ -UINT STDCALL NtGdiGetTextAlign(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -UINT -STDCALL -NtGdiGetTextCharset(HDC hDC); - -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ -COLORREF STDCALL NtGdiGetTextColor(HDC hDC); - -/* Rename to NtGdiGetTextExtentExW. Add 0 at the end. */ -BOOL -STDCALL -NtGdiGetTextExtentExPoint(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size); - -/* Rename to NtGdiGetTextExtent. Add 0 at the end. */ -BOOL -STDCALL -NtGdiGetTextExtentPoint(HDC hDC, - LPCWSTR String, - int Count, - LPSIZE Size); - -/* Rename to NtGdiGetTextFaceW, add FALSE at the end. */ -int -STDCALL -NtGdiGetTextFace(HDC hDC, - int Count, - LPWSTR FaceName); - -/* Use NtGdiGetTextMetricsW with 0 at the end */ -BOOL -STDCALL -NtGdiGetTextMetrics(HDC hDC, - LPTEXTMETRICW tm); - -/* Use NtGdiGetDCPoint with GdiGetViewPortExt */ -BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetViewportOrgEx(HDC hDC, LPPOINT viewportOrg); - -/* Metafiles are user-mode. */ -UINT -STDCALL -NtGdiGetWinMetaFileBits ( - HENHMETAFILE hemf, - UINT BufSize, - LPBYTE Buffer, - INT MapMode, - HDC Ref - ); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetWindowExtEx(HDC hDC, LPSIZE windowExt); - -/* Needs to be done in user-mode. */ -BOOL STDCALL NtGdiGetWindowOrgEx(HDC hDC, LPPOINT windowOrg); - -/* Use NtGdiGetTransform with GdiWorldSpaceToPageSpace */ -BOOL -STDCALL -NtGdiGetWorldTransform ( - HDC hDC, - LPXFORM Xform - ); - -/* Use NtGdiTransformPoints with GdiDpToLp */ -BOOL -STDCALL -NtGdiLPtoDP ( - HDC hDC, - LPPOINT Points, - int Count - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiMoveToEx(HDC hDC, - int X, - int Y, - LPPOINT Point); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiOffsetViewportOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); - -/* Needs to be done in user-mode. */ -BOOL -STDCALL -NtGdiOffsetWindowOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); - -/* Use NtGdiFillRgn. Add 0 at the end. */ -BOOL -STDCALL -NtGdiPaintRgn(HDC hDC, - HRGN hRgn); - -/* Use NtGdiArcInternal with GdiTypePie. */ -BOOL -STDCALL -NtGdiPie(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayEnhMetaFile ( - HDC hDC, - HENHMETAFILE hemf, - CONST PRECT Rect - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayEnhMetaFileRecord ( - HDC hDC, - LPHANDLETABLE Handletable, - CONST ENHMETARECORD * EnhMetaRecord, - UINT Handles - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayMetaFile ( - HDC hDC, - HMETAFILE hmf - ); - -/* Metafiles are user-mode. */ -BOOL -STDCALL -NtGdiPlayMetaFileRecord ( - HDC hDC, - LPHANDLETABLE Handletable, - LPMETARECORD MetaRecord, - UINT Handles - ); - -/* Use NtGdiPolyPolyDraw with GdiPolyBezier. */ -BOOL -STDCALL -NtGdiPolyBezier(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyBezierTo. */ -BOOL -STDCALL -NtGdiPolyBezierTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */ -BOOL -STDCALL -NtGdiPolyline(HDC hDC, - CONST LPPOINT pt, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyLineTo. */ -BOOL -STDCALL -NtGdiPolylineTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */ -BOOL -STDCALL -NtGdiPolyPolyline(HDC hDC, - CONST LPPOINT pt, - CONST LPDWORD PolyPoints, - DWORD Count); - -/* Use NtGdiPolyTextOutW with 0 at the end. */ -BOOL -STDCALL -NtGdiPolyTextOut(HDC hDC, - CONST LPPOLYTEXTW txt, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolygon. */ -BOOL -STDCALL -NtGdiPolygon(HDC hDC, - CONST PPOINT Points, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolygon. */ -BOOL -STDCALL -NtGdiPolyPolygon(HDC hDC, - CONST LPPOINT Points, - CONST LPINT PolyCounts, - int Count); - -/* Call UserRealizePalette. */ -UINT -STDCALL -NtGdiRealizePalette ( - HDC hDC - ); - -/* Should be done in user-mode. */ -BOOL -STDCALL -NtGdiRemoveFontResource(LPCWSTR FileName); - -/* Use NtGdiExtSelectClipRgn with RGN_COPY. */ -int -STDCALL -NtGdiSelectClipRgn ( - HDC hDC, - HRGN hrgn - ); - -/* Should be done in user-mode. */ -HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); - -/* Use NtUserSelectPalette. */ -HPALETTE -STDCALL -NtGdiSelectPalette ( - HDC hDC, - HPALETTE hpal, - BOOL ForceBackground - ); - -/* Should be done in user-mode. */ [truncated at 1000 lines; 9187 more skipped]

1 0

[mf] 20391: correct command line handling in lean explorer
by mf＠svn.reactos.com 28 Dec '05

28 Dec '05

correct command line handling in lean explorer Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 02:20:27 UTC (rev 20390) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 12:27:25 UTC (rev 20391) @@ -452,10 +452,14 @@ cmd.ParseCmdLine(lpCmdLine); // Open the first child window after initializing the application - if (cmd.IsValidPath()) - PostMessage(hMainFrame, PM_OPEN_WINDOW, cmd._flags, (LPARAM)lpCmdLine); - else - PostMessage(hMainFrame, PM_OPEN_WINDOW, 0/*OWM_EXPLORE|OWM_DETAILS*/, 0); + if (cmd.IsValidPath()) { + // We use the static s_path variable to store the path string in order + // to avoid accessing prematurely freed memory in the PostMessage handlers. + static String s_path = cmd._path; + + PostMessage(hMainFrame, PM_OPEN_WINDOW, cmd._flags, (LPARAM)(LPCTSTR)s_path); + } else + PostMessage(hMainFrame, PM_OPEN_WINDOW, cmd._flags, 0); } }

1 0

[gedmurphy] 20390: Fix some MSVC warnings
by gedmurphy＠svn.reactos.com 28 Dec '05

28 Dec '05

Fix some MSVC warnings I'm feeling very lazy today, today's commits prove that point nicely :) Modified: trunk/reactos/apps/utils/net/arp/arp.c _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-12-28 01:29:42 UTC (rev 20389) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-12-28 02:20:27 UTC (rev 20390) @@ -66,26 +66,30 @@ { LPVOID lpMsgBuf; DWORD RetVal; - /* double brackets to silence the assignment warning message */ - if ((RetVal = FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, - 0, - NULL ))) { - _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); - LocalFree(lpMsgBuf); - /* return number of TCHAR's stored in output buffer - * excluding '\0' - as FormatMessage does*/ - return RetVal; + if (ErrorCode != ERROR_SUCCESS) + { + RetVal = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ); + + if (RetVal != 0) + { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } } - else - return 0; + return 0; } @@ -256,8 +260,7 @@ DWORD dwIpAddr = 0; DWORD dwSize = 0; ULONG ulSize = 0; - INT iRet, i, val; - TCHAR c; + INT iRet, i, val, c; /* error checking */ @@ -318,7 +321,14 @@ /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ if (pszIfAddr) - sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); + { + if (sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex) == EOF) + { + free(pIpNetTable); + free(pAddHost); + return EXIT_FAILURE; + } + } else { /* map the IP to the index */ @@ -355,7 +365,7 @@ c = toupper(pszEthAddr[i*3 + 1]); c = c - (isdigit(c) ? '0' : ('A' - 10)); val += c; - pAddHost->bPhysAddr[i] = val; + pAddHost->bPhysAddr[i] = (BYTE)val; } @@ -444,7 +454,15 @@ /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ if (pszIfAddr) - sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); + { + if (sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex) == EOF) + { + free(pIpNetTable); + free(pIpAddrTable); + free(pDelHost); + return EXIT_FAILURE; + } + } else { /* map the IP to the index */

1 0

[gedmurphy] 20389: put the asterix and colon the right way round
by gedmurphy＠svn.reactos.com 28 Dec '05

28 Dec '05

put the asterix and colon the right way round Modified: trunk/reactos/apps/utils/net/netstat/netstat.c _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-28 01:23:14 UTC (rev 20388) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-12-28 01:29:42 UTC (rev 20389) @@ -502,7 +502,7 @@ sprintf(Host, "%s:%s", HostIp, HostPort); - _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), Host, _T(":*:")); + _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), Host, _T("*:*")); } HeapFree(GetProcessHeap(), 0, udpTable); @@ -531,18 +531,16 @@ } -// -// GetIpHostName -// -// Translate IP addresses into their name-resolved form if possible. -// +/* + * convert addresses into dotted decimal or hostname + */ PCHAR GetIpHostName(BOOL Local, UINT IpAddr, CHAR Name[], int NameLen) { // struct hostent *phostent; UINT nIpAddr; - // Does the user want raw numbers? + /* display dotted decimal */ nIpAddr = htonl(IpAddr); if (bDoShowNumbers) { sprintf(Name, "%d.%d.%d.%d", @@ -555,7 +553,7 @@ Name[0] = _T('\0'); - // Try to translate to a name + /* try to resolve the name */ if (!IpAddr) { if (!Local) { sprintf(Name, "%d.%d.%d.%d", @@ -588,7 +586,7 @@ VOID Usage() { - _tprintf(_T("Displays current TCP/IP protocol statistics and network connections.\n\n" + _tprintf(_T("\nDisplays current TCP/IP protocol statistics and network connections.\n\n" "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n" " -a Displays all connections and listening ports.\n" " -e Displays Ethernet statistics. May be combined with -s\n"

1 0

[gedmurphy] 20388: Use bigger buffer to avoid stack corruption, as seen when running app built with msvc
by gedmurphy＠svn.reactos.com 28 Dec '05

28 Dec '05

Use bigger buffer to avoid stack corruption, as seen when running app built with msvc Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-12-28 01:08:04 UTC (rev 20387) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-12-28 01:23:14 UTC (rev 20388) @@ -408,7 +408,7 @@ CHAR Time[100]; LARGE_INTEGER RelativeTime; LARGE_INTEGER LargeTime; - CHAR Sign[1]; + CHAR Sign[2]; IpHeader = (PIPv4_HEADER)buffer;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs