Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[mf] 20407: reinitialize image list in ShellBrowser::invalidate_cache()
by mf＠svn.reactos.com 28 Dec '05

28 Dec '05

reinitialize image list in ShellBrowser::invalidate_cache() Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-12-28 22:45:04 UTC (rev 20406) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-12-28 22:46:09 UTC (rev 20407) @@ -190,8 +190,7 @@ _pDropTarget->Release(); // free TreeDropTarget _pDropTarget = NULL; return false; - } - else + } else _pDropTarget->Release(); FORMATETC ftetc; @@ -273,6 +272,12 @@ void ShellBrowser::invalidate_cache() { + (void)TreeView_SetImageList(_left_hwnd, _himl_old, TVSIL_NORMAL); + ImageList_Destroy(_himl); + + _himl_old = TreeView_SetImageList(_left_hwnd, _himl, TVSIL_NORMAL); + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); + for(map<int,int>::const_iterator it=_image_map.begin(); it!=_image_map.end(); ++it) g_Globals._icon_cache.free_icon(it->first);

1 0

[mf] 20406: lean explorer: get and use the parent folder to display correct context menu in all cases
by mf＠svn.reactos.com 28 Dec '05

28 Dec '05

lean explorer: get and use the parent folder to display correct context menu in all cases Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h Modified: branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.h _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-12-28 21:46:31 UTC (rev 20405) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-12-28 22:45:04 UTC (rev 20406) @@ -197,6 +197,66 @@ } } + // local replacement implementation for SHBindToParent() + // (derived from http://www.geocities.com/SiliconValley/2060/articles/shell-helpers.html) +static HRESULT my_SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, VOID** ppv, LPCITEMIDLIST* ppidlLast) +{ + HRESULT hr; + + if (!ppv) + return E_POINTER; + + // There must be at least one item ID. + if (!pidl || !pidl->mkid.cb) + return E_INVALIDARG; + + // Get the desktop folder as root. + ShellFolder desktop; +/* IShellFolderPtr desktop; + hr = SHGetDesktopFolder(&desktop); + if (FAILED(hr)) + return hr; */ + + // Walk to the penultimate item ID. + LPCITEMIDLIST marker = pidl; + for (;;) + { + LPCITEMIDLIST next = reinterpret_cast<LPCITEMIDLIST>( + marker->mkid.abID - sizeof(marker->mkid.cb) + marker->mkid.cb); + if (!next->mkid.cb) + break; + marker = next; + } + + if (marker == pidl) + { + // There was only a single item ID, so bind to the root folder. + hr = desktop->QueryInterface(riid, ppv); + } + else + { + // Copy the ID list, truncating the last item. + int length = marker->mkid.abID - pidl->mkid.abID; + if (LPITEMIDLIST parent_id = reinterpret_cast<LPITEMIDLIST>( + malloc(length + sizeof(pidl->mkid.cb)))) + { + LPBYTE raw_data = reinterpret_cast<LPBYTE>(parent_id); + memcpy(raw_data, pidl, length); + memset(raw_data + length, 0, sizeof(pidl->mkid.cb)); + hr = desktop->BindToObject(parent_id, 0, riid, ppv); + free(parent_id); + } + else + return E_OUTOFMEMORY; + } + + // Return a pointer to the last item ID. + if (ppidlLast) + *ppidlLast = marker; + + return hr; +} + void ShellBrowserChild::Tree_DoItemMenu(HWND hwndTreeView, HTREEITEM hItem, LPPOINT pptScreen) { CONTEXT("ShellBrowserChild::Tree_DoItemMenu()"); @@ -214,10 +274,21 @@ CHECKERROR(ShellFolderContextMenu(folder, ::GetParent(hwndTreeView), 1, &pidl, pptScreen->x, pptScreen->y, _cm_ifs)); } else { ShellPath shell_path = entry->create_absolute_pidl(); - LPCITEMIDLIST pidl = shell_path; + LPCITEMIDLIST pidl_abs = shell_path; - ///@todo use parent folder instead of desktop - CHECKERROR(ShellFolderContextMenu(GetDesktopFolder(), _hwnd, 1, &pidl, pptScreen->x, pptScreen->y, _cm_ifs)); + IShellFolder* parentFolder; + LPCITEMIDLIST pidlLast; + + // get and use the parent folder to display correct context menu in all cases -> correct "Properties" dialog for directories, ... + HRESULT hr = my_SHBindToParent(pidl_abs, IID_IShellFolder, (LPVOID*)&parentFolder, &pidlLast); + + if (SUCCEEDED(hr)) { + hr = ShellFolderContextMenu(parentFolder, _hwnd, 1, &pidlLast, pptScreen->x, pptScreen->y, _cm_ifs); + + parentFolder->Release(); + } + + CHECKERROR(hr); } } } @@ -289,7 +360,7 @@ ShellDirectory* entry = (ShellDirectory*)TreeView_GetItemData(_left_hwnd, pnmtv->itemNew.hItem); if (entry) - if (!InsertSubitems(pnmtv->itemNew.hItem, entry, entry->_folder)) { + if (!InsertSubitems(pnmtv->itemNew.hItem, entry)) { entry->_shell_attribs &= ~SFGAO_HASSUBFOLDER; // remove subitem "+" @@ -304,7 +375,7 @@ } } -int ShellBrowserChild::InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder) +int ShellBrowserChild::InsertSubitems(HTREEITEM hParentItem, Entry* entry) { CONTEXT("ShellBrowserChild::InsertSubitems()"); @@ -347,9 +418,9 @@ tvInsert.hParent = hParentItem; TreeView_InsertItem(_left_hwnd, &tvInsert); + + ++cnt; } - - ++cnt; } SendMessage(_left_hwnd, WM_SETREDRAW, TRUE, 0); _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2005-12-28 21:46:31 UTC (rev 20405) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2005-12-28 22:45:04 UTC (rev 20406) @@ -128,7 +128,7 @@ LRESULT Init(HWND hWndFrame); void InitializeTree(); - int InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder); + int InsertSubitems(HTREEITEM hParentItem, Entry* entry); bool InitDragDrop(); HRESULT OnDefaultCommand(LPIDA pida); @@ -148,9 +148,9 @@ int _last_split; RECT _clnt_rect; - /*virtual*/ void resize_children(); - /*virtual*/ void jump_to(LPCTSTR path); - /*virtual*/ void jump_to(LPCITEMIDLIST pidl); + void resize_children(); + void jump_to(LPCTSTR path); + void jump_to(LPCITEMIDLIST pidl); void jump_to(Entry* entry); _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.h --- branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.h 2005-12-28 21:46:31 UTC (rev 20405) +++ branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.h 2005-12-28 22:45:04 UTC (rev 20406) @@ -1079,5 +1079,6 @@ CtxMenuInterfaces _cm_ifs; }; + extern HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl, LPCITEMIDLIST* ppidl, int x, int y, CtxMenuInterfaces& cm_ifs);

1 0

[weiden] 20405: Patch by David Hinz <fRy2oo5@gmail.com>:
by weiden＠svn.reactos.com 28 Dec '05

28 Dec '05

Patch by David Hinz <fRy2oo5(a)gmail.com>: - Update German translation of devmgr.dll Modified: trunk/reactos/lib/devmgr/De.rc _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2005-12-28 20:34:10 UTC (rev 20404) +++ trunk/reactos/lib/devmgr/De.rc 2005-12-28 21:46:31 UTC (rev 20405) @@ -1,4 +1,5 @@ // German language resource file (David Hinz (fRy2oo5), 2005-12-04) +// This is incomplete, IDS_DEV_UNKNOWN_RESOURCE still needs to be translated LANGUAGE LANG_GERMAN, SUBLANG_GERMAN @@ -77,7 +78,7 @@ "Bitte benutzen sie das System-Setup Programm dieses Computers, um den Interrupt f³r dieses Gerõt neu zu konfigurieren." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht initialisieren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht laden, weil eine noch fr³here Instanz des Gerõtetreibers im Speicher ist." - IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." + IDS_DEV_DRIVER_FAILED_LOAD "Der Gerõtetreiber f³r diese Hardware kann nicht geladen werden. Der Treiber ist m÷glicherweise beschõdigt oder nicht vorhanden." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS kann dieses Gerõt nicht ansprechen, weil seine Serviceschl³ssel Information nicht in der Registry ist oder weil sie falsch ist." IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS hat den Gerõtetreiber f³r dieses Gerõt erfolgreich geladen, kann aber das Gerõt nicht finden." IDS_DEV_DUPLICATE_DEVICE "ReactOS kann den Gerõtetreiber f³r dieses Gerõt nicht laden, weil bereits ein identisches Gerõt installiert ist." @@ -87,7 +88,7 @@ IDS_DEV_SYSTEM_SHUTDOWN "ReactOS kann auf dieses Gerõt nicht zugreifen, weil das Betriebssystem heruntergefahren wird." IDS_DEV_HELD_FOR_EJECT "ReactOS kann dieses Gerõt nicht benutzen, weil es f³r \"Sicheres Entfernen\" vorbereitet wurde, aber es wurde bisher nicht vom Computer entfernt." IDS_DEV_DRIVER_BLOCKED "Die Ausf³hrung der Software f³r dieses Gerõt wurde blockiert, weil bekannt ist, dass sie Probleme mit ReactOS hat. Kontaktieren sie den Hersteller f³r einen neuen Treiber." - IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." + IDS_DEV_REGISTRY_TOO_LARGE "Die neuen Hardwaregerõte k÷nnen nicht gestartet werden, da die Systemstruktur zu gro? ist (die Struktur ³berschreitet die Registrierungsgr÷?enbeschrõnkung)." IDS_DEV_SETPROPERTIES_FAILED "ReactOS konnte die Einstellungen f³r dieses Gerõt nicht verõndern." END @@ -130,15 +131,15 @@ IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Driver" +CAPTION "Treiber" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Driver provider:", -1, 37, 39, 60, 8, SS_NOPREFIX + LTEXT "Treiberanbieter:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver date:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Treiberdatum:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver version:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Treiberversion:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY END

1 0

[hbirr] 20404: Fixed the structure allignment of some cursor/icon related structures.
by hbirr＠svn.reactos.com 28 Dec '05

28 Dec '05

Fixed the structure allignment of some cursor/icon related structures. Modified: trunk/reactos/include/win32k/ntusrtyp.h _____ Modified: trunk/reactos/include/win32k/ntusrtyp.h --- trunk/reactos/include/win32k/ntusrtyp.h 2005-12-28 20:31:44 UTC (rev 20403) +++ trunk/reactos/include/win32k/ntusrtyp.h 2005-12-28 20:34:10 UTC (rev 20404) @@ -22,6 +22,7 @@ } PATRECT, * PPATRECT; /* Structures for reading icon/cursor files and resources */ +#pragma pack(push,1) typedef struct _ICONIMAGE { BITMAPINFOHEADER icHeader; // DIB header @@ -107,6 +108,7 @@ WORD idCount; // How many images? GRPCURSORICONDIRENTRY idEntries[1]; // The entries for each image } GRPCURSORICONDIR; +#pragma pack(pop) typedef struct _THRDCARETINFO {

1 0

[hbirr] 20403: Commit r20366:20368 again.
by hbirr＠svn.reactos.com 28 Dec '05

28 Dec '05

Commit r20366:20368 again. Deleted: trunk/reactos/include/win32k/bitmaps.h Deleted: trunk/reactos/include/win32k/brush.h Deleted: trunk/reactos/include/win32k/caret.h Deleted: trunk/reactos/include/win32k/cliprgn.h Deleted: trunk/reactos/include/win32k/color.h Deleted: trunk/reactos/include/win32k/coord.h Deleted: trunk/reactos/include/win32k/cursoricon.h Deleted: trunk/reactos/include/win32k/dc.h Deleted: trunk/reactos/include/win32k/driver.h Deleted: trunk/reactos/include/win32k/fillshap.h Deleted: trunk/reactos/include/win32k/float.h Deleted: trunk/reactos/include/win32k/font.h Deleted: trunk/reactos/include/win32k/gdiobj.h Deleted: trunk/reactos/include/win32k/icm.h Deleted: trunk/reactos/include/win32k/kapi.h Deleted: trunk/reactos/include/win32k/line.h Deleted: trunk/reactos/include/win32k/math.h Deleted: trunk/reactos/include/win32k/menu.h Deleted: trunk/reactos/include/win32k/metafile.h Deleted: trunk/reactos/include/win32k/misc.h Deleted: trunk/reactos/include/win32k/ntddraw.h Added: trunk/reactos/include/win32k/ntgdibad.h Added: trunk/reactos/include/win32k/ntgdihdl.h Added: trunk/reactos/include/win32k/ntgdityp.h Modified: trunk/reactos/include/win32k/ntuser.h Added: trunk/reactos/include/win32k/ntusrtyp.h Deleted: trunk/reactos/include/win32k/paint.h Deleted: trunk/reactos/include/win32k/path.h Deleted: trunk/reactos/include/win32k/pen.h Deleted: trunk/reactos/include/win32k/print.h Deleted: trunk/reactos/include/win32k/region.h Deleted: trunk/reactos/include/win32k/text.h Deleted: trunk/reactos/include/win32k/win32k.h Deleted: trunk/reactos/include/win32k/wingl.h Modified: trunk/reactos/lib/gdi32/gdi32.def Added: 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 Added: trunk/reactos/subsys/win32k/include/bitmaps.h Added: trunk/reactos/subsys/win32k/include/brush.h Modified: trunk/reactos/subsys/win32k/include/color.h Added: trunk/reactos/subsys/win32k/include/coord.h Added: trunk/reactos/subsys/win32k/include/dc.h Modified: trunk/reactos/subsys/win32k/include/dib.h Added: trunk/reactos/subsys/win32k/include/driver.h Added: trunk/reactos/subsys/win32k/include/gdifloat.h Added: trunk/reactos/subsys/win32k/include/gdiobj.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/include/menu.h Added: trunk/reactos/subsys/win32k/include/misc.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/include/path.h Added: trunk/reactos/subsys/win32k/include/pen.h Added: 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 Added: trunk/reactos/w32api/include/ntgdi.h Modified: trunk/reactos/w32api/include/wingdi.h _____ Deleted: trunk/reactos/include/win32k/bitmaps.h --- trunk/reactos/include/win32k/bitmaps.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/bitmaps.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,343 +0,0 @@ -#ifndef __WIN32K_BITMAPS_H -#define __WIN32K_BITMAPS_H - -/* GDI logical bitmap object */ -typedef struct _BITMAPOBJ -{ - SURFOBJ SurfObj; - FLONG flHooks; - FLONG flFlags; - SIZE dimension; /* For SetBitmapDimension(), do NOT use - to get width/height of bitmap, use - bitmap.bmWidth/bitmap.bmHeight for - that */ -#ifdef NTOS_MODE_USER - PVOID BitsLock; -#else - PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch - the actual bits in the bitmap */ -#endif - - /* For device-independent bitmaps: */ - DIBSECTION *dib; - HPALETTE hDIBPalette; -} BITMAPOBJ, *PBITMAPOBJ; - -#define BITMAPOBJ_IS_APIBITMAP 0x1 - -/* Internal interface */ - -#define BITMAPOBJ_AllocBitmap() \ - ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) -#define BITMAPOBJ_FreeBitmap(hBMObj) \ - GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) -/* NOTE: Use shared locks! */ -#define BITMAPOBJ_LockBitmap(hBMObj) (PBITMAPOBJ)EngLockSurface((HSURF)hBMObj) -#define BITMAPOBJ_UnlockBitmap(pBMObj) EngUnlockSurface(&pBMObj->SurfObj) -BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); - -BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); -#define BITMAPOBJ_LockBitmapBits(pBMObj) ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->BitsLock) -#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->BitsLock) -void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); - -INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); -HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); -INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); -int STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth); -INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); -INT STDCALL BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer); -HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice); - -HBITMAP FASTCALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT Height); - -/* User Entry Points */ -BOOL -STDCALL -NtGdiAlphaBlend( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - BLENDFUNCTION BlendFunc); - -BOOL -STDCALL -NtGdiBitBlt ( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - DWORD ROP - ); -HBITMAP -STDCALL -NtGdiCreateBitmap ( - INT Width, - INT Height, - UINT Planes, - UINT BitsPerPel, - CONST VOID * Bits - ); -HBITMAP -STDCALL -NtGdiCreateCompatibleBitmap ( - HDC hDC, - INT Width, - INT Height - ); -HBITMAP -STDCALL -NtGdiCreateBitmapIndirect ( - CONST BITMAP * BM - ); -HBITMAP -STDCALL -NtGdiCreateDIBitmap ( - HDC hDC, - CONST BITMAPINFOHEADER * bmih, - DWORD Init, - CONST VOID * bInit, - CONST BITMAPINFO * bmi, - UINT Usage - ); -HBITMAP -STDCALL -NtGdiCreateDIBSection ( - HDC hDC, - CONST BITMAPINFO * bmi, - UINT Usage, - VOID * Bits, - HANDLE hSection, - DWORD dwOffset - ); -HBITMAP -STDCALL -NtGdiCreateDiscardableBitmap ( - HDC hDC, - INT Width, - INT Height - ); -BOOL -STDCALL -NtGdiExtFloodFill ( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Color, - UINT FillType - ); -BOOL -STDCALL -NtGdiFloodFill ( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill - ); -LONG -STDCALL -NtGdiGetBitmapBits ( - HBITMAP hBitmap, - LONG Buffer, - LPVOID Bits - ); -BOOL -STDCALL -NtGdiGetBitmapDimensionEx ( - HBITMAP hBitmap, - LPSIZE Dimension - ); -UINT -STDCALL -NtGdiGetDIBColorTable ( - HDC hDC, - UINT StartIndex, - UINT Entries, - RGBQUAD * Colors - ); -INT -STDCALL -NtGdiGetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO bi, - UINT Usage - ); -COLORREF -STDCALL -NtGdiGetPixel ( - HDC hDC, - INT XPos, - INT YPos - ); -BOOL -STDCALL -NtGdiGradientFill ( - HDC hdc, - PTRIVERTEX pVertex, - ULONG uVertex, - PVOID pMesh, - ULONG uMesh, - ULONG ulMode - ); -BOOL -STDCALL -NtGdiMaskBlt ( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - HBITMAP hMaskBitmap, - INT xMask, - INT yMask, - DWORD ROP - ); -BOOL -STDCALL -NtGdiPlgBlt ( - HDC hDCDest, - CONST POINT * Point, - HDC hDCSrc, - INT XSrc, - INT YSrc, - INT Width, - INT Height, - HBITMAP hMaskBitmap, - INT xMask, - INT yMask - ); -LONG -STDCALL -NtGdiSetBitmapBits ( - HBITMAP hBitmap, - DWORD Bytes, - CONST VOID * Bits - ); -BOOL -STDCALL -NtGdiSetBitmapDimensionEx ( - HBITMAP hBitmap, - INT Width, - INT Height, - LPSIZE Size - ); -UINT -STDCALL -NtGdiSetDIBColorTable ( - HDC hDC, - UINT StartIndex, - UINT Entries, - CONST RGBQUAD * Colors - ); -INT -STDCALL -NtGdiSetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID * Bits, - CONST BITMAPINFO * bmi, - UINT ColorUse - ); -INT -STDCALL -NtGdiSetDIBitsToDevice ( - HDC hDC, - INT XDest, - INT YDest, - DWORD Width, - DWORD Height, - INT XSrc, - INT YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID * Bits, - CONST BITMAPINFO * bmi, - UINT ColorUse - ); -COLORREF -STDCALL -NtGdiSetPixel ( - HDC hDC, - INT X, - INT Y, - COLORREF Color - ); -BOOL -STDCALL -NtGdiSetPixelV ( - HDC hDC, - INT X, - INT Y, - COLORREF Color - ); -BOOL -STDCALL -NtGdiStretchBlt ( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP - ); -INT -STDCALL -NtGdiStretchDIBits ( - HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID * Bits, - CONST BITMAPINFO * BitsInfo, - UINT Usage, - DWORD ROP - ); - -BOOL -STDCALL -NtGdiTransparentBlt( - HDC hdcDst, - INT xDst, - INT yDst, - INT cxDst, - INT cyDst, - HDC hdcSrc, - INT xSrc, - INT ySrc, - INT cxSrc, - INT cySrc, - COLORREF TransColor - ); - -#endif - _____ Deleted: trunk/reactos/include/win32k/brush.h --- trunk/reactos/include/win32k/brush.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/brush.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,112 +0,0 @@ -#ifndef __WIN32K_BRUSH_H -#define __WIN32K_BRUSH_H - -#include <win32k/gdiobj.h> - -/* Internal interface */ - -#define NB_HATCH_STYLES 6 - -/* - * The layout of this structure is taken from "Windows Graphics Programming" - * book written by Feng Yuan. - * - * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK ON - * A MAILING LIST FIRST. - */ - -typedef struct -{ - ULONG AttrFlags; - COLORREF lbColor; -} BRUSHATTR, *PBRUSHATTR; - -typedef struct -{ - ULONG ulStyle; - HBITMAP hbmPattern; - HANDLE hbmClient; - ULONG flAttrs; - - ULONG ulBrushUnique; - BRUSHATTR *pBrushAttr; - BRUSHATTR BrushAttr; - POINT ptOrigin; - ULONG bCacheGrabbed; - COLORREF crBack; - COLORREF crFore; - ULONG ulPalTime; - ULONG ulSurfTime; - PVOID ulRealization; - ULONG Unknown4C[3]; - POINT ptPenWidth; - ULONG ulPenStyle; - DWORD *pStyle; - ULONG dwStyleCount; - ULONG Unknown6C; -} GDIBRUSHOBJ, *PGDIBRUSHOBJ; - -typedef struct -{ - BRUSHOBJ BrushObject; - PGDIBRUSHOBJ GdiBrushObject; - XLATEOBJ *XlateObject; -} GDIBRUSHINST, *PGDIBRUSHINST; - -/* GDI Brush Attributes */ - -#define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ -#define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ -#define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ -#define GDIBRUSH_IS_HATCH 0x0020 /* Hatch brush */ -#define GDIBRUSH_IS_BITMAP 0x0040 /* DDB pattern brush */ -#define GDIBRUSH_IS_DIB 0x0080 /* DIB pattern brush */ -#define GDIBRUSH_IS_NULL 0x0100 /* Null/hollow brush */ -#define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ -#define GDIBRUSH_IS_PEN 0x0400 /* Pen */ -#define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ -#define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ -#define GDIBRUSH_CACHED_IS_SOLID 0x80000000 - -#define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BRUSH)) -#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) -#define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) -#define BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr(pBrush) -BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); - -HBRUSH STDCALL -NtGdiCreateBrushIndirect( - CONST LOGBRUSH *LogBrush); - -HBRUSH STDCALL -NtGdiCreateDIBBrush( - CONST BITMAPINFO *BitmapInfoAndData, - UINT ColorSpec, - UINT BitmapInfoSize, - CONST VOID *PackedDIB); - -HBRUSH STDCALL -NtGdiCreateHatchBrush( - INT Style, - COLORREF Color); - -HBRUSH STDCALL -NtGdiCreatePatternBrush( - HBITMAP hBitmap); - -HBRUSH STDCALL -NtGdiCreateSolidBrush( - COLORREF Color); - -BOOL STDCALL -NtGdiFixBrushOrgEx( - VOID); - -BOOL STDCALL -NtGdiSetBrushOrgEx( - HDC hDC, - INT XOrg, - INT YOrg, - LPPOINT Point); - -#endif _____ Deleted: trunk/reactos/include/win32k/caret.h --- trunk/reactos/include/win32k/caret.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/caret.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,23 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: include/win32k/caret.h - * PURPOSE: GDI32/Win32k Caret interface - * PROGRAMMER: - * - */ - -#ifndef WIN32K_CARET_H_INCLUDED -#define WIN32K_CARET_H_INCLUDED - -typedef struct _THRDCARETINFO -{ - HWND hWnd; - HBITMAP Bitmap; - POINT Pos; - SIZE Size; - BYTE Visible; - BYTE Showing; -} THRDCARETINFO, *PTHRDCARETINFO; - -#endif /* WIN32K_FONT_H_INCLUDED */ _____ Deleted: trunk/reactos/include/win32k/cliprgn.h --- trunk/reactos/include/win32k/cliprgn.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/cliprgn.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,81 +0,0 @@ -#ifndef _WIN32K_CLIPRGN_H -#define _WIN32K_CLIPRGN_H - -HRGN WINAPI SaveVisRgn(HDC hdc); -INT WINAPI SelectVisRgn(HDC hdc, HRGN hrgn); - -int -STDCALL -NtGdiExcludeClipRect ( - HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect - ); -int -STDCALL -NtGdiExtSelectClipRgn ( - HDC hDC, - HRGN hrgn, - int fnMode - ); -int -STDCALL -NtGdiGetClipBox ( - HDC hDC, - LPRECT rc - ); -int -STDCALL -NtGdiGetMetaRgn ( - HDC hDC, - HRGN hrgn - ); -int -STDCALL -NtGdiIntersectClipRect ( - HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect - ); -int -STDCALL -NtGdiOffsetClipRgn ( - HDC hDC, - int XOffset, - int YOffset - ); -BOOL -STDCALL -NtGdiPtVisible ( - HDC hDC, - int X, - int Y - ); -BOOL -STDCALL -NtGdiRectVisible ( - HDC hDC, - CONST PRECT rc - ); -BOOL -STDCALL -NtGdiSelectClipPath ( - HDC hDC, - int Mode - ); -int -STDCALL -NtGdiSelectClipRgn ( - HDC hDC, - HRGN hrgn - ); -int -STDCALL -NtGdiSetMetaRgn ( - HDC hDC - ); -#endif _____ Deleted: trunk/reactos/include/win32k/color.h --- trunk/reactos/include/win32k/color.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/color.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,116 +0,0 @@ -#ifndef __WIN32K_COLOR_H -#define __WIN32K_COLOR_H - -#ifndef CLR_INVALID -#define CLR_INVALID 0xffffffff -#endif -#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ -#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ -#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ - -BOOL -STDCALL -NtGdiAnimatePalette ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - CONST PPALETTEENTRY ppe - ); -HPALETTE -STDCALL -NtGdiCreateHalftonePalette ( - HDC hDC - ); -HPALETTE -STDCALL -NtGdiCreatePalette ( - CONST PLOGPALETTE lgpl - ); -BOOL -STDCALL -NtGdiGetColorAdjustment ( - HDC hDC, - LPCOLORADJUSTMENT ca - ); -COLORREF -STDCALL -NtGdiGetNearestColor ( - HDC hDC, - COLORREF Color - ); -UINT -STDCALL -NtGdiGetNearestPaletteIndex ( - HPALETTE hpal, - COLORREF Color - ); -UINT -STDCALL -NtGdiGetPaletteEntries ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); -UINT -STDCALL -NtGdiGetSystemPaletteEntries ( - HDC hDC, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); -UINT -STDCALL -NtGdiGetSystemPaletteUse ( - HDC hDC - ); -UINT -STDCALL -NtGdiRealizePalette ( - HDC hDC - ); -BOOL -STDCALL -NtGdiResizePalette ( - HPALETTE hpal, - UINT Entries - ); -HPALETTE -STDCALL -NtGdiSelectPalette ( - HDC hDC, - HPALETTE hpal, - BOOL ForceBackground - ); -BOOL -STDCALL -NtGdiSetColorAdjustment ( - HDC hDC, - CONST LPCOLORADJUSTMENT ca - ); -UINT -STDCALL -NtGdiSetPaletteEntries ( - HPALETTE hpal, - UINT Start, - UINT Entries, - CONST LPPALETTEENTRY pe - ); -UINT -STDCALL -NtGdiSetSystemPaletteUse ( - HDC hDC, - UINT Usage - ); -BOOL -STDCALL -NtGdiUnrealizeObject ( - HGDIOBJ hgdiobj - ); -BOOL -STDCALL -NtGdiUpdateColors ( - HDC hDC - ); -#endif _____ Deleted: trunk/reactos/include/win32k/coord.h --- trunk/reactos/include/win32k/coord.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/coord.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,151 +0,0 @@ -#ifndef __WIN32K_COORD_H -#define __WIN32K_COORD_H - -BOOL -STDCALL -NtGdiCombineTransform ( - LPXFORM XformResult, - CONST LPXFORM xform1, - CONST LPXFORM xform2 - ); - -VOID -FASTCALL -IntDPtoLP ( PDC dc, LPPOINT Points, INT Count ); - -VOID -FASTCALL -CoordDPtoLP ( PDC Dc, LPPOINT Point ); - -BOOL -STDCALL -NtGdiDPtoLP ( - HDC hDC, - LPPOINT Points, - int Count - ); - -int -FASTCALL -IntGetGraphicsMode ( PDC dc ); - -int -STDCALL -NtGdiGetGraphicsMode ( HDC hDC ); - -BOOL -STDCALL -NtGdiGetWorldTransform ( - HDC hDC, - LPXFORM Xform - ); - -VOID -FASTCALL -CoordLPtoDP ( PDC Dc, LPPOINT Point ); - -VOID -FASTCALL -IntLPtoDP ( PDC dc, LPPOINT Points, INT Count ); - -BOOL -STDCALL -NtGdiLPtoDP ( - HDC hDC, - LPPOINT Points, - int Count - ); -BOOL -STDCALL -NtGdiModifyWorldTransform ( - HDC hDC, - CONST LPXFORM Xform, - DWORD Mode - ); -BOOL -STDCALL -NtGdiOffsetViewportOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); -BOOL -STDCALL -NtGdiOffsetWindowOrgEx ( - HDC hDC, - int XOffset, - int YOffset, - LPPOINT Point - ); -BOOL -STDCALL -NtGdiScaleViewportExtEx ( - HDC hDC, - int Xnum, - int Xdenom, - int Ynum, - int Ydenom, - LPSIZE Size - ); -BOOL -STDCALL -NtGdiScaleWindowExtEx ( - HDC hDC, - int Xnum, - int Xdenom, - int Ynum, - int Ydenom, - LPSIZE Size - ); -int -STDCALL -NtGdiSetGraphicsMode ( - HDC hDC, - int Mode - ); -int -STDCALL -NtGdiSetMapMode ( - HDC hDC, - int MapMode - ); -BOOL -STDCALL -NtGdiSetViewportExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size - ); -BOOL -STDCALL -NtGdiSetViewportOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); -BOOL -STDCALL -NtGdiSetWindowExtEx ( - HDC hDC, - int XExtent, - int YExtent, - LPSIZE Size - ); -BOOL -STDCALL -NtGdiSetWindowOrgEx ( - HDC hDC, - int X, - int Y, - LPPOINT Point - ); -BOOL -STDCALL -NtGdiSetWorldTransform ( - HDC hDC, - CONST LPXFORM Xform - ); -#endif _____ Deleted: trunk/reactos/include/win32k/cursoricon.h --- trunk/reactos/include/win32k/cursoricon.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/cursoricon.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,95 +0,0 @@ - -#ifndef __WIN32K_CURSORICON_H -#define __WIN32K_CURSORICON_H - -#include <pshpack1.h> - -/* Structures for reading icon/cursor files and resources */ -// Structures for reading icon files and resources -typedef struct _ICONIMAGE -{ - BITMAPINFOHEADER icHeader; // DIB header - RGBQUAD icColors[1]; // Color table - BYTE icXOR[1]; // DIB bits for XOR mask - BYTE icAND[1]; // DIB bits for AND mask -} ICONIMAGE, *LPICONIMAGE; - -typedef struct _CURSORIMAGE -{ - BITMAPINFOHEADER icHeader; // DIB header - RGBQUAD icColors[1]; // Color table - BYTE icXOR[1]; // DIB bits for XOR mask - BYTE icAND[1]; // DIB bits for AND mask -} CURSORIMAGE, *LPCURSORIMAGE; - -typedef struct -{ - BYTE bWidth; - BYTE bHeight; - BYTE bColorCount; - BYTE bReserved; -} ICONRESDIR; - -typedef struct -{ - WORD wWidth; - WORD wHeight; -} CURSORRESDIR; - -typedef struct -{ - WORD wPlanes; // Number of Color Planes in the XOR image - WORD wBitCount; // Bits per pixel in the XOR image -} ICONDIR; - -typedef struct -{ - WORD wXHotspot; // Number of Color Planes in the XOR image - WORD wYHotspot; // Bits per pixel in the XOR image -} CURSORDIR; - -typedef struct -{ - BYTE bWidth; // Width, in pixels, of the icon image - BYTE bHeight; // Height, in pixels, of the icon image - BYTE bColorCount; // Number of colors in image (0 if >=8bpp) - BYTE bReserved; // Reserved ( must be 0) - union - { ICONDIR icon; - CURSORDIR cursor; - } Info; - DWORD dwBytesInRes; // How many bytes in this resource? - DWORD dwImageOffset; // Where in the file is this image? -} CURSORICONDIRENTRY; - -typedef struct -{ - WORD idReserved; // Reserved (must be 0) - WORD idType; // Resource Type (1 for icons, 0 for cursors) - WORD idCount; // How many images? - CURSORICONDIRENTRY idEntries[1]; // An entry for idCount number of images -} CURSORICONDIR; - -typedef struct -{ - union - { ICONRESDIR icon; - CURSORRESDIR cursor; - } ResInfo; - WORD wPlanes; // Color Planes - WORD wBitCount; // Bits per pixel - DWORD dwBytesInRes; // how many bytes in this resource? - WORD nID; // the ID -} GRPCURSORICONDIRENTRY; - -typedef struct -{ - WORD idReserved; // Reserved (must be 0) - WORD idType; // Resource type (1 for icons) - WORD idCount; // How many images? - GRPCURSORICONDIRENTRY idEntries[1]; // The entries for each image -} GRPCURSORICONDIR; - -#include <poppack.h> - -#endif _____ Deleted: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-12-28 20:06:35 UTC (rev 20402) +++ trunk/reactos/include/win32k/dc.h 2005-12-28 20:31:44 UTC (rev 20403) @@ -1,238 +0,0 @@ - -#ifndef __WIN32K_DC_H -#define __WIN32K_DC_H - -typedef struct _WIN_DC_INFO -{ - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HPEN hPen; - HBRUSH hBrush; - HFONT hFont; - HBITMAP hBitmap; - HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ - -/* #if 0 */ - HANDLE hDevice; - HPALETTE hPalette; - - GdiPath path; -/* #endif */ - - WORD ROPmode; - WORD polyFillMode; - WORD stretchBltMode; - WORD relAbsMode; - WORD backgroundMode; - COLORREF backgroundColor; - COLORREF textColor; - - short brushOrgX; - short brushOrgY; - - WORD textAlign; /* Text alignment from SetTextAlign() */ - short charExtra; /* Spacing from SetTextCharacterExtra() */ - short breakTotalExtra; /* Total extra space for justification */ - short breakCount; /* Break char. count */ - short breakExtra; /* breakTotalExtra / breakCount */ [truncated at 1000 lines; 6574 more skipped]

1 0

[weiden] 20402: ReAlloc should be able to move memory blocks if necessary. This fixes
by weiden＠svn.reactos.com 28 Dec '05

28 Dec '05

ReAlloc should be able to move memory blocks if necessary. This fixes some problems I ran into: syslink control, and dynamically adding property sheets with PropSheet_AddPage/PSM_ADDPAGE. This patch was submitted to wine-patches. Modified: trunk/reactos/lib/comctl32/comctl32undoc.c _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-12-28 19:54:07 UTC (rev 20401) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-12-28 20:06:35 UTC (rev 20402) @@ -96,7 +96,7 @@ LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) { if (lpSrc) - return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT ); + return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT | LMEM_MOVEABLE ); else return LocalAlloc( LMEM_ZEROINIT, dwSize); }

1 0

[greatlrd] 20401: update NtUserGetMouseMovePointsEx prototype to msdn
by greatlrd＠svn.reactos.com 28 Dec '05

28 Dec '05

update NtUserGetMouseMovePointsEx prototype to msdn Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-12-28 19:32:06 UTC (rev 20400) +++ trunk/reactos/include/win32k/ntuser.h 2005-12-28 19:54:07 UTC (rev 20401) @@ -804,11 +804,11 @@ DWORD STDCALL NtUserGetMouseMovePointsEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4); + UINT cbSize, + LPMOUSEMOVEPOINT lppt, + LPMOUSEMOVEPOINT lpptBuf, + int nBufPoints, + DWORD resolution); BOOL STDCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-12-28 19:32:06 UTC (rev 20400) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-12-28 19:54:07 UTC (rev 20401) @@ -359,11 +359,11 @@ DWORD STDCALL NtUserGetMouseMovePointsEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) + UINT cbSize, + LPMOUSEMOVEPOINT lppt, + LPMOUSEMOVEPOINT lpptBuf, + int nBufPoints, + DWORD resolution) { UNIMPLEMENTED

1 0

[gedmurphy] 20400: Clean up code and fix memory leaks
by gedmurphy＠svn.reactos.com 28 Dec '05

28 Dec '05

Clean up code and fix memory leaks 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 17:37:37 UTC (rev 20399) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-12-28 19:32:06 UTC (rev 20400) @@ -51,7 +51,7 @@ /* * function declerations */ -DWORD DoFormatMessage(DWORD ErrorCode); +DWORD DoFormatMessage(VOID); INT PrintEntries(PMIB_IPNETROW pIpAddRow); INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); @@ -62,11 +62,13 @@ /* * convert error code into meaningful message */ -DWORD DoFormatMessage(DWORD ErrorCode) +DWORD DoFormatMessage(VOID) { LPVOID lpMsgBuf; DWORD RetVal; + DWORD ErrorCode = GetLastError(); + if (ErrorCode != ERROR_SUCCESS) { RetVal = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -149,55 +151,63 @@ { INT iRet; UINT i, k; - PMIB_IPNETTABLE pIpNetTable; - PMIB_IPADDRTABLE pIpAddrTable; - ULONG ulSize = 0; + PMIB_IPNETTABLE pIpNetTable = NULL; + PMIB_IPADDRTABLE pIpAddrTable = NULL; + DWORD Size = 0; struct in_addr inaddr, inaddr2; - DWORD dwSize = 0; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; - /* Return required buffer size */ - GetIpNetTable(NULL, &ulSize, 0); + /* retrieve the IP-to-physical address mapping table */ + /* get table size */ + GetIpNetTable(pIpNetTable, &Size, 0); + /* allocate memory for ARP address table */ - pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - /* get Arp address table */ - if (pIpNetTable != NULL) - GetIpNetTable(pIpNetTable, &ulSize, TRUE); - else + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); - free(pIpNetTable); - exit(EXIT_FAILURE); + DoFormatMessage(); + goto cleanup; } /* check there are entries in the table */ if (pIpNetTable->dwNumEntries == 0) { _tprintf(_T("No ARP entires found\n")); - free(pIpNetTable); - exit(EXIT_FAILURE); + goto cleanup; } - /* try doing this in the way it's done above, it's clearer */ /* Retrieve the interface-to-ip address mapping * table to get the IP address for adapter */ - pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? + /* get table size */ + Size = 0; + GetIpAddrTable(pIpAddrTable, &Size, 0); - pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); + pIpAddrTable = (MIB_IPADDRTABLE *) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpAddrTable == NULL) + goto cleanup; - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) + ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); + + iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE); + + if (iRet != NO_ERROR) { _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); - _tprintf(_T("error: %d\n"), WSAGetLastError()); + DoFormatMessage(); + goto cleanup; } @@ -237,10 +247,14 @@ PrintEntries(&pIpNetTable->table[i]); } - free(pIpNetTable); - free(pIpAddrTable); - return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pIpAddrTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpAddrTable); + return EXIT_FAILURE; } @@ -254,12 +268,10 @@ */ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) { - PMIB_IPNETROW pAddHost; - PMIB_IPADDRTABLE pIpAddrTable; - PMIB_IPNETTABLE pIpNetTable; + PMIB_IPNETROW pAddHost = NULL; + PMIB_IPNETTABLE pIpNetTable = NULL; DWORD dwIpAddr = 0; - DWORD dwSize = 0; - ULONG ulSize = 0; + ULONG Size = 0; INT iRet, i, val, c; /* error checking */ @@ -270,20 +282,20 @@ if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } else { Usage(); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } /* check MAC address */ if (strlen(pszEthAddr) != 17) { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } for (i=0; i<17; i++) { @@ -293,29 +305,36 @@ if (!isxdigit(pszEthAddr[i])) { _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } /* We need the IpNetTable to get the adapter index */ /* Return required buffer size */ - GetIpNetTable(NULL, &ulSize, 0); + GetIpNetTable(pIpNetTable, &Size, 0); + /* allocate memory for ARP address table */ - pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - /* get Arp address table */ - if (pIpNetTable != NULL) - GetIpNetTable(pIpNetTable, &ulSize, TRUE); - else + + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); - free(pIpNetTable); - return -1; + DoFormatMessage(); + goto cleanup; } /* reserve memory on heap and zero */ - pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); + pAddHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + if (pAddHost == NULL) + goto cleanup; + ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); /* set dwIndex field to the index of a local IP address to @@ -324,30 +343,15 @@ { if (sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex) == EOF) { - free(pIpNetTable); - free(pAddHost); - return EXIT_FAILURE; + goto cleanup; } } else { - /* map the IP to the index */ - pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - GetIpAddrTable(pIpAddrTable, &dwSize, 0); - - pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) - { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); - _tprintf(_T("error: %d\n"), WSAGetLastError()); - } //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex); /* needs testing. I get the correct index on my machine, but need others * to test their card index. Any problems and we can use GetAdaptersInfo instead */ pAddHost->dwIndex = pIpNetTable->table[0].dwIndex; - - free(pIpAddrTable); } /* Set MAC address to 6 bytes (typical) */ @@ -380,14 +384,20 @@ /* Add the ARP entry */ if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { - DoFormatMessage(iRet); - free(pAddHost); - exit(EXIT_FAILURE); + DoFormatMessage(); + goto cleanup; } - free(pAddHost); + HeapFree(GetProcessHeap(), 0, pAddHost); return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pAddHost != NULL) + HeapFree(GetProcessHeap(), 0, pAddHost); + return EXIT_FAILURE; } @@ -401,12 +411,10 @@ */ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { - PMIB_IPNETROW pDelHost; - PMIB_IPADDRTABLE pIpAddrTable; - PMIB_IPNETTABLE pIpNetTable; - ULONG ulSize = 0; + PMIB_IPNETROW pDelHost = NULL; + PMIB_IPNETTABLE pIpNetTable = NULL; + DWORD Size = 0; DWORD dwIpAddr = 0; - DWORD dwSize = 0; INT iRet; BOOL bFlushTable = FALSE; @@ -432,48 +440,43 @@ /* We need the IpNetTable to get the adapter index */ /* Return required buffer size */ - GetIpNetTable(NULL, &ulSize, 0); + GetIpNetTable(NULL, &Size, 0); + /* allocate memory for ARP address table */ - pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); - /* get Arp address table */ - if (pIpNetTable != NULL) - GetIpNetTable(pIpNetTable, &ulSize, TRUE); - else + + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) { _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); - free(pIpNetTable); - return -1; + DoFormatMessage(); + goto cleanup; } + /* reserve memory on heap and zero */ + pDelHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + if (pDelHost == NULL) + goto cleanup; - pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); - pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); - ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); - ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); + ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); + + /* set dwIndex field to the index of a local IP address to * indicate the network on which the ARP entry applies */ if (pszIfAddr) { if (sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex) == EOF) { - free(pIpNetTable); - free(pIpAddrTable); - free(pDelHost); - return EXIT_FAILURE; + goto cleanup; } } else { - /* map the IP to the index */ - if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) - pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); - - if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) - { - _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); - _tprintf(_T("error: %d\n"), WSAGetLastError()); - } /* needs testing. I get the correct index on my machine, but need others * to test their card index. Any problems and we can use GetAdaptersInfo instead */ pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; @@ -484,15 +487,12 @@ /* delete arp cache */ if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) { - DoFormatMessage(iRet); - free(pIpAddrTable); - free(pDelHost); - return EXIT_FAILURE; + DoFormatMessage(); + goto cleanup; } else { - free(pIpAddrTable); - free(pDelHost); + HeapFree(GetProcessHeap(), 0, pDelHost); return EXIT_SUCCESS; } } @@ -503,17 +503,20 @@ /* Add the ARP entry */ if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { - - DoFormatMessage(iRet); - free(pIpAddrTable); - free(pDelHost); - exit(EXIT_FAILURE); + DoFormatMessage(); + goto cleanup; } - free(pIpAddrTable); - free(pDelHost); + HeapFree(GetProcessHeap(), 0, pDelHost); return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pDelHost != NULL) + HeapFree(GetProcessHeap(), 0, pDelHost); + return EXIT_FAILURE; } @@ -615,6 +618,4 @@ Usage(); return EXIT_SUCCESS; -} /* -warning: suggest parentheses around assignment used as truth value -warning: char format, void arg (arg 2)*/ +}

1 0

[mf] 20399: lean explorer:
by mf＠svn.reactos.com 28 Dec '05

28 Dec '05

lean explorer: - merge a few bug fixes from trunk - display icon overlays in Explorer tree view Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.h Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellfs.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-12-28 17:37:37 UTC (rev 20399) @@ -443,8 +443,6 @@ ShowWindow(hMainFrame, cmdShow); UpdateWindow(hMainFrame); - bool valid_dir = false; - cmd._cmdShow = cmdShow; // parse command line options _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.cpp 2005-12-28 17:37:37 UTC (rev 20399) @@ -319,7 +319,7 @@ } -void Entry::extract_icon() +int Entry::extract_icon() { TCHAR path[MAX_PATH]; @@ -384,10 +384,21 @@ } } - _icon_id = icon_id; + return icon_id; } +int Entry::safe_extract_icon() +{ + try { + return extract_icon(); + } catch(COMException&) { + // ignore unexpected exceptions while extracting icons + } + return ICID_NONE; +} + + BOOL Entry::launch_entry(HWND hwnd, UINT nCmdShow) { TCHAR cmd[MAX_PATH]; _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.h 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/entries.h 2005-12-28 17:37:37 UTC (rev 20399) @@ -96,7 +96,8 @@ Entry* read_tree(const void* path, SORT_ORDER sortOrder); void sort_directory(SORT_ORDER sortOrder); void smart_scan(int scan_flags=SCAN_ALL); - void extract_icon(); + int extract_icon(); + int safe_extract_icon(); virtual void read_directory(int scan_flags=SCAN_ALL) {} virtual const void* get_next_path_component(const void*) const {return NULL;} _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .cpp 2005-12-28 17:37:37 UTC (rev 20399) @@ -51,11 +51,10 @@ _left_hwnd(left_hwnd), _right_hwnd(right_hwnd), _create_info(create_info), - _cm_ifs(_cm_ifs) + _cm_ifs(cm_ifs) { _pShellView = NULL; _pDropTarget = NULL; - _himlSmall = 0; _last_sel = 0; // SDI integration @@ -64,12 +63,16 @@ _cur_dir = NULL; + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); + ImageList_SetBkColor(_himl, GetSysColor(COLOR_WINDOW)); + Init(hwnd); } ShellBrowserChild::~ShellBrowserChild() { TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); + ImageList_Destroy(_himl); if (_pShellView) _pShellView->Release(); @@ -94,16 +97,6 @@ ClientRect rect(_hwnd); - SHFILEINFO sfi; - - _himlSmall = (HIMAGELIST)SHGetFileInfo(TEXT("C:\\"), 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_SMALLICON); -// _himlLarge = (HIMAGELIST)SHGetFileInfo(TEXT("C:\\"), 0, &sfi, sizeof(SHFILEINFO), SHGFI_SYSICONINDEX|SHGFI_LARGEICON); - - if (_left_hwnd) { - InitializeTree(); - InitDragDrop(); - } - const String& root_name = GetDesktopFolder().get_name(_create_info._root_shell_path, SHGDN_FORADDRESSBAR); _root._drive_type = DRIVE_UNKNOWN; @@ -118,6 +111,11 @@ // -> set_curdir() _root._entry->read_directory(); + if (_left_hwnd) { + InitializeTree(); + InitDragDrop(); + } + /* already filled by ShellDirectory constructor lstrcpy(_root._entry->_data.cFileName, TEXT("Desktop")); */ @@ -129,23 +127,21 @@ { CONTEXT("ShellBrowserChild::InitializeTree()"); - TreeView_SetImageList(_left_hwnd, _himlSmall, TVSIL_NORMAL); + TreeView_SetImageList(_left_hwnd, _himl, TVSIL_NORMAL); TreeView_SetScrollTime(_left_hwnd, 100); - TV_ITEM tvItem; + TV_INSERTSTRUCT tvInsert; + TV_ITEM& tvItem = tvInsert.item; + tvInsert.hParent = 0; + tvInsert.hInsertAfter = TVI_LAST; + 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; - TV_INSERTSTRUCT tvInsert; - - tvInsert.hParent = 0; - tvInsert.hInsertAfter = TVI_LAST; - tvInsert.item = tvItem; - HTREEITEM hItem = TreeView_InsertItem(_left_hwnd, &tvInsert); TreeView_SelectItem(_left_hwnd, hItem); TreeView_Expand(_left_hwnd, hItem, TVE_EXPAND); @@ -167,8 +163,7 @@ _pDropTarget->Release(); // free TreeDropTarget _pDropTarget = NULL; return false; - } - else + } else _pDropTarget->Release(); FORMATETC ftetc; @@ -233,38 +228,57 @@ LPNMTVDISPINFO lpdi = (LPNMTVDISPINFO)pnmh; ShellEntry* entry = (ShellEntry*)lpdi->item.lParam; - if (!entry) - return; - if (lpdi->item.mask & TVIF_TEXT) - lpdi->item.pszText = entry->_display_name; + if (entry) { + 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; + if (lpdi->item.mask & (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) - if ((HIMAGELIST)SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_LINKOVERLAY) == _himlSmall) - lpdi->item.iImage = sfi.iIcon; - else - lpdi->item.iImage = -1; + if (lpdi->item.mask & TVIF_IMAGE) + lpdi->item.iImage = get_entry_image(entry, pidl, SHGFI_SMALLICON, _image_map); - if (lpdi->item.mask & TVIF_SELECTEDIMAGE) - if ((HIMAGELIST)SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_OPENICON) == _himlSmall) - lpdi->item.iSelectedImage = sfi.iIcon; - else - lpdi->item.iSelectedImage = -1; + if (lpdi->item.mask & TVIF_SELECTEDIMAGE) + lpdi->item.iSelectedImage = get_entry_image(entry, pidl, SHGFI_SMALLICON|SHGFI_OPENICON, _image_map_open); + } } } +int ShellBrowserChild::get_entry_image(Entry* entry, LPCITEMIDLIST pidl, int shgfi_flags, ImageMap& cache) +{ + SHFILEINFO sfi; + int idx = -1; + + ImageMap::const_iterator found = cache.find(entry); + + if (found != cache.end()) + return found->second; + + if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), shgfi_flags|SHGFI_PIDL|SHGFI_ICON|SHGFI_ADDOVERLAYS)) { + idx = ImageList_AddIcon(_himl, sfi.hIcon); + + DestroyIcon(sfi.hIcon); + } + + cache[entry] = idx; + + return idx; +} + +void ShellBrowserChild::invalidate_cache() +{ + TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); + ImageList_Destroy(_himl); + + TreeView_SetImageList(_left_hwnd, _himl, TVSIL_NORMAL); + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); + + _image_map.clear(); + _image_map_open.clear(); +} + void ShellBrowserChild::OnTreeItemExpanding(int idCtrl, LPNMTREEVIEW pnmtv) { CONTEXT("ShellBrowserChild::OnTreeItemExpanding()"); _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2005-12-28 17:37:37 UTC (rev 20399) @@ -41,6 +41,10 @@ }; +#ifndef SHGFI_ADDOVERLAYS // missing in MinGW (as of 28.12.2005) +#define SHGFI_ADDOVERLAYS 0x000000020 +#endif + /// Implementation of IShellBrowserImpl interface in explorer child windows struct ShellBrowserChild : public IShellBrowserImpl { @@ -112,11 +116,10 @@ ShellFolder _folder; IShellView* _pShellView; // current hosted shellview - HIMAGELIST _himlSmall; // list -// HIMAGELIST _himlLarge; // shell image TreeDropTarget* _pDropTarget; - HTREEITEM _last_sel; + HIMAGELIST _himl; + HTREEITEM _last_sel; public: LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); @@ -154,4 +157,11 @@ protected: ShellDirectory* _cur_dir; CtxMenuInterfaces& _cm_ifs; + + typedef map<Entry*, int> ImageMap; + ImageMap _image_map; + ImageMap _image_map_open; + + int get_entry_image(Entry* entry, LPCITEMIDLIST pidl, int shgfi_flags, ImageMap& cache); + void invalidate_cache(); }; _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellfs.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-12-28 17:10:36 UTC (rev 20398) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-12-28 17:37:37 UTC (rev 20399) @@ -298,11 +298,7 @@ if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; else if (scan_flags & SCAN_EXTRACT_ICONS) - try { - entry->extract_icon(); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->_icon_id = entry->safe_extract_icon(); last = entry; } while(FindNextFile(hFind, &w32fd)); @@ -404,11 +400,7 @@ if (!(entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || !(attribs & SFGAO_FILESYSTEM)) { if (scan_flags & SCAN_EXTRACT_ICONS) - try { - entry->extract_icon(); - } catch(COMException&) { - // ignore unexpected exceptions while extracting icons - } + entry->_icon_id = entry->safe_extract_icon(); } else if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) entry->_icon_id = ICID_FOLDER; else @@ -463,7 +455,7 @@ for(Entry*entry=_down; entry; entry=entry->_next) if (entry->_icon_id == ICID_UNKNOWN) { - entry->extract_icon(); + entry->_icon_id = entry->extract_icon(); if (entry->_icon_id != ICID_NONE) ++cnt;

1 0

[hpoussin] 20398: Validate parameters in SetupDiSetDeviceInstallParamsW
by hpoussin＠svn.reactos.com 28 Dec '05

28 Dec '05

Validate parameters in SetupDiSetDeviceInstallParamsW Be ready to honor DI_FLAGSEX_ALLOWEXCLUDEDDRVS flag Fix an infinite loop in SetupDiSetSelectedDriverW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-28 16:27:20 UTC (rev 20397) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-28 17:10:36 UTC (rev 20398) @@ -4139,6 +4139,59 @@ return ret; } +static BOOL +CheckDeviceInstallParameters( + IN PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + DWORD SupportedFlags = + DI_NOVCP | /* 0x00000008 */ + DI_DIDCOMPAT | /* 0x00000010 */ + DI_DIDCLASS | /* 0x00000020 */ + DI_NEEDRESTART | /* 0x00000080 */ + DI_NEEDREBOOT | /* 0x00000100 */ + DI_RESOURCEPAGE_ADDED | /* 0x00002000 */ + DI_PROPERTIES_CHANGE | /* 0x00004000 */ + DI_ENUMSINGLEINF | /* 0x00010000 */ + DI_CLASSINSTALLPARAMS | /* 0x00100000 */ + DI_NODI_DEFAULTACTION | /* 0x00200000 */ + DI_NOFILECOPY | /* 0x01000000 */ + DI_DRIVERPAGE_ADDED; /* 0x04000000 */ + DWORD SupportedFlagsEx = + DI_FLAGSEX_CI_FAILED | /* 0x00000004 */ + DI_FLAGSEX_DIDINFOLIST | /* 0x00000010 */ + DI_FLAGSEX_DIDCOMPATINFO | /* 0x00000020 */ + DI_FLAGSEX_ALLOWEXCLUDEDDRVS | /* 0x00000800 */ + DI_FLAGSEX_NO_DRVREG_MODIFY; /* 0x00008000 */ + BOOL ret = FALSE; + + /* FIXME: add support for more flags */ + + /* FIXME: DI_CLASSINSTALLPARAMS flag is not correctly used. + * It should be checked before accessing to other values + * of the SP_DEVINSTALL_PARAMS structure */ + + if (DeviceInstallParams->Flags & ~SupportedFlags) + { + FIXME("Unknown Flags: 0x%08lx\n", DeviceInstallParams->Flags & ~SupportedFlags); + SetLastError(ERROR_INVALID_FLAGS); + } + else if (DeviceInstallParams->FlagsEx & ~SupportedFlagsEx) + { + FIXME("Unknown FlagsEx: 0x%08lx\n", DeviceInstallParams->FlagsEx & ~SupportedFlagsEx); + SetLastError(ERROR_INVALID_FLAGS); + } + else if ((DeviceInstallParams->Flags & DI_NOVCP) + && (DeviceInstallParams->FileQueue == NULL || DeviceInstallParams->FileQueue == (HSPFILEQ)INVALID_HANDLE_VALUE)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + /* FIXME: check Reserved field */ + ret = TRUE; + } + + return ret; +} + /*********************************************************************** * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) */ @@ -4162,12 +4215,10 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInstallParams->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) SetLastError(ERROR_INVALID_USER_BUFFER); - else + else if (CheckDeviceInstallParameters(DeviceInstallParams)) { PSP_DEVINSTALL_PARAMS_W Destination; - /* FIXME: Validate parameters */ - if (DeviceInfoData) Destination = &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->InstallParams; else @@ -5368,6 +5419,7 @@ LPWSTR HardwareIDs = NULL; LPWSTR CompatibleIDs = NULL; LPWSTR FullInfFileName = NULL; + LPWSTR ExcludeFromSelect = NULL; FILETIME DriverDate; DWORDLONG DriverVersion = 0; DWORD RequiredSize; @@ -5593,6 +5645,14 @@ } } + if (InstallParams.FlagsEx & DI_FLAGSEX_ALLOWEXCLUDEDDRVS) + { + /* Read ExcludeFromSelect control flags */ + /* FIXME */ + } + else + FIXME("ExcludeFromSelect list ignored\n"); + /* Get the manufacturers list */ Result = SetupFindFirstLineW(currentInfFileDetails->hInf, L"Manufacturer", NULL, &ContextManufacturer); while (Result) @@ -5639,7 +5699,7 @@ { if (DriverType == SPDIT_CLASSDRIVER) { - /* FIXME: read [ControlFlags] / ExcludeFromSelect */ + /* FIXME: Check ExcludeFromSelect list */ if (!AddDriverToList( pDriverListHead, DriverType, @@ -5691,6 +5751,7 @@ HeapFree(GetProcessHeap(), 0, DeviceId); goto done; } + /* FIXME: Check ExcludeFromSelect list */ DriverAlreadyAdded = FALSE; for (DriverRank = 0, currentId = (LPCWSTR)HardwareIDs; !DriverAlreadyAdded && *currentId; currentId += wcslen(currentId) + 1, DriverRank++) { @@ -5747,7 +5808,8 @@ ret = TRUE; next: HeapFree(GetProcessHeap(), 0, ProviderName); - ProviderName = NULL; + HeapFree(GetProcessHeap(), 0, ExcludeFromSelect); + ProviderName = ExcludeFromSelect = NULL; DereferenceInfFile(currentInfFileDetails); currentInfFileDetails = NULL; @@ -5777,6 +5839,7 @@ HeapFree(GetProcessHeap(), 0, HardwareIDs); HeapFree(GetProcessHeap(), 0, CompatibleIDs); HeapFree(GetProcessHeap(), 0, FullInfFileName); + HeapFree(GetProcessHeap(), 0, ExcludeFromSelect); if (currentInfFileDetails) DereferenceInfFile(currentInfFileDetails); HeapFree(GetProcessHeap(), 0, Buffer); @@ -6458,7 +6521,7 @@ else { /* The caller wants to compare only DriverType, Description and ProviderName fields */ - struct DriverInfoElement *driverInfo = (struct DriverInfoElement *)ItemList; + struct DriverInfoElement *driverInfo = CONTAINING_RECORD(ItemList, struct DriverInfoElement, ListEntry); if (driverInfo->Info.DriverType == DriverInfoData->DriverType && wcscmp(driverInfo->Info.Description, DriverInfoData->Description) == 0 && wcscmp(driverInfo->Info.ProviderName, DriverInfoData->ProviderName) == 0) @@ -6466,6 +6529,7 @@ break; } } + ItemList= ItemList->Flink; } if (ItemList == ListHead) SetLastError(ERROR_INVALID_PARAMETER);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
71
Older →

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 December 2005