Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[gadamopoulos] 65072: [SHELL32] - Return a readable folder name when SHGDN_FORADDRESSBAR was specified - We no longer show GUIDs in the address bar

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Oct 28 15:07:31 2014 New Revision: 65072 URL: http://svn.reactos.org/svn/reactos?rev=65072&view=rev Log: [SHELL32] - Return a readable folder name when SHGDN_FORADDRESSBAR was specified - We no longer show GUIDs in the address bar Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Tue Oct 28 15:07:31 2014 @@ -679,7 +679,7 @@ if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) { int bWantsForParsing; Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Tue Oct 28 15:07:31 2014 @@ -491,7 +491,7 @@ clsid = _ILGetGUIDPointer (pidl); if (clsid) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) { static const WCHAR clsidW[] = L"CLSID\\"; static const WCHAR shellfolderW[] = L"\\shellfolder";

10 years, 1 month

[gadamopoulos] 65071: [RSHELL] - Actually give focus to the start menu when CMenuDeskBar::Popup is called - Fixes opening and navigating the start menu with the keyboard

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Oct 28 14:31:19 2014 New Revision: 65071 URL: http://svn.reactos.org/svn/reactos?rev=65071&view=rev Log: [RSHELL] - Actually give focus to the start menu when CMenuDeskBar::Popup is called - Fixes opening and navigating the start menu with the keyboard Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Oct 28 14:31:19 2014 @@ -381,7 +381,7 @@ y = rcWorkArea.bottom - cy; } - this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW | SWP_NOACTIVATE); + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); m_ShowFlags = dwFlags; m_Shown = true;

10 years, 1 month

[gadamopoulos] 65070: [EXPLORER_NEW] - Use IMenuPopup_OnSelect to close the start menu when the win key is pressed. - Fixes closing the start menu (on windows and on reactos)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Oct 28 14:18:16 2014 New Revision: 65070 URL: http://svn.reactos.org/svn/reactos?rev=65070&view=rev Log: [EXPLORER_NEW] - Use IMenuPopup_OnSelect to close the start menu when the win key is pressed. - Fixes closing the start menu (on windows and on reactos) Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Tue Oct 28 14:18:16 2014 @@ -2889,9 +2889,13 @@ break; if (IsWindowVisible(hwndStartMenu)) - SetWindowPos(hwndStartMenu, 0,0,0,0,0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + { + IMenuPopup_OnSelect(This->StartMenuPopup, MPOS_CANCELLEVEL); + } else + { SendMessage(This->hWnd, WM_COMMAND, MAKEWPARAM(BN_CLICKED, IDC_STARTBTN), (LPARAM)This->hwndStart); + } break; }

10 years, 1 month

[gadamopoulos] 65069: [WIN32K] - Send the HSHELL_TASKMAN notification to the shell when the windows key is pressed - Needed to open and close the start menu with the keyboard

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Oct 28 13:45:43 2014 New Revision: 65069 URL: http://svn.reactos.org/svn/reactos?rev=65069&view=rev Log: [WIN32K] - Send the HSHELL_TASKMAN notification to the shell when the windows key is pressed - Needed to open and close the start menu with the keyboard Modified: branches/shell-experiments/win32ss/user/ntuser/hotkey.c Modified: branches/shell-experiments/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/hotkey.c [iso-8859-1] Tue Oct 28 13:45:43 2014 @@ -219,7 +219,7 @@ { TRACE("System Hot key Id %d Key %d\n",pHotKey->id, wVk ); UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); - //ptiLastInput = pWnd->head.pti; + co_IntShellHookNotify(HSHELL_TASKMAN, 0, 0); bWinHotkeyActive = FALSE; return FALSE; }

10 years, 1 month

[pschweitzer] 65068: [NTFS] ReleaseAttributeContext() is to be used out of mft.c I believe that at some point, we're leaking memory...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 28 10:26:47 2014 New Revision: 65068 URL: http://svn.reactos.org/svn/reactos?rev=65068&view=rev Log: [NTFS] ReleaseAttributeContext() is to be used out of mft.c I believe that at some point, we're leaking memory... Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Oct 28 10:26:47 2014 @@ -600,6 +600,9 @@ /* mft.c */ +VOID +ReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context); + ULONG ReadAttribute(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_CONTEXT Context,

10 years, 1 month

[tkreuzer] 65067: [GDI32] Implement separate functions for all SelectObject cases.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 28 09:06:33 2014 New Revision: 65067 URL: http://svn.reactos.org/svn/reactos?rev=65067&view=rev Log: [GDI32] Implement separate functions for all SelectObject cases. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Tue Oct 28 09:06:33 2014 @@ -1695,26 +1695,23 @@ } -/* - * @implemented - * - */ -HGDIOBJ -WINAPI -SelectObject( - _In_ HDC hdc, - _In_ HGDIOBJ hGdiObj) -{ - PDC_ATTR pdcattr; - HGDIOBJ hOldObj = NULL; - UINT uType; - - /* Fix up 16 bit handles */ - hGdiObj = GdiFixUpHandle(hGdiObj); - if (!GdiIsHandleValid(hGdiObj)) - { - return NULL; - } +HBITMAP +WINAPI +GdiSelectBitmap( + _In_ HDC hdc, + _In_ HBITMAP hbmp) +{ + return NtGdiSelectBitmap(hdc, hbmp); +} + +HBRUSH +WINAPI +GdiSelectBrush( + _In_ HDC hdc, + _In_ HBRUSH hbr) +{ + PDC_ATTR pdcattr; + HBRUSH hbrOld; /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); @@ -1724,68 +1721,133 @@ return NULL; } - uType = GDI_HANDLE_GET_TYPE(hGdiObj); - - switch (uType) - { - case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hdc, hGdiObj, RGN_COPY); - - case GDI_OBJECT_TYPE_BITMAP: - return NtGdiSelectBitmap(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_BRUSH: - hOldObj = pdcattr->hbrush; - pdcattr->ulDirty_ |= DC_BRUSH_DIRTY; - pdcattr->hbrush = hGdiObj; - return hOldObj; -// return NtGdiSelectBrush(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_EXTPEN: - hOldObj = pdcattr->hpen; - pdcattr->ulDirty_ |= DC_PEN_DIRTY; - pdcattr->hpen = hGdiObj; - return hOldObj; -// return NtGdiSelectPen(hdc, hGdiObj); - - case GDI_OBJECT_TYPE_FONT: - hOldObj = pdcattr->hlfntNew; - if (hOldObj == hGdiObj) return hOldObj; - - pdcattr->ulDirty_ &= ~SLOW_WIDTHS; - pdcattr->ulDirty_ |= DIRTY_CHARSET; - pdcattr->hlfntNew = hGdiObj; - - if (!(pdcattr->ulDirty_ & DC_DIBSECTION)) - { - PGDIBSOBJECT pgO; - - pgO = GdiAllocBatchCommand(hdc, GdiBCSelObj); - if (pgO) - { - pgO->hgdiobj = hGdiObj; - return hOldObj; - } - } - - // default for select object font - return NtGdiSelectFont(hdc, hGdiObj); - -#if 0 - case GDI_OBJECT_TYPE_METADC: - return MFDRV_SelectObject(hdc, hGdiObj); - case GDI_OBJECT_TYPE_EMF: - PLDC pLDC = GdiGetLDC(hdc); - if (!pLDC) return NULL; - return EMFDRV_SelectObject(hdc, hGdiObj); -#endif - case GDI_OBJECT_TYPE_COLORSPACE: - SetColorSpace(hdc, (HCOLORSPACE) hGdiObj); - return NULL; - - case GDI_OBJECT_TYPE_PALETTE: + /* Get the current brush. If it matches the new brush, we're done */ + hbrOld = pdcattr->hbrush; + if (hbrOld == hbr) + return hbrOld; + + /* Set the new brush and update dirty flags */ + pdcattr->hbrush = hbr; + pdcattr->ulDirty_ |= DC_BRUSH_DIRTY; + return hbrOld; +} + +HPEN +WINAPI +GdiSelectPen( + _In_ HDC hdc, + _In_ HPEN hpen) +{ + PDC_ATTR pdcattr; + HPEN hpenOld; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Get the current pen. If it matches the new pen, we're done */ + hpenOld = pdcattr->hpen; + if (hpenOld == hpen) + return hpenOld; + + /* Set the new pen and update dirty flags */ + pdcattr->ulDirty_ |= DC_PEN_DIRTY; + pdcattr->hpen = hpen; + return hpenOld; +} + +HFONT +WINAPI +GdiSelectFont( + _In_ HDC hdc, + _In_ HFONT hfont) +{ + PDC_ATTR pdcattr; + HFONT hfontOld; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Get the current font. If it matches the new font, we're done */ + hfontOld = pdcattr->hlfntNew; + if (hfontOld == hfont) + return hfontOld; + + /* Set the new font and update dirty flags */ + pdcattr->hlfntNew = hfont; + pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + pdcattr->ulDirty_ |= DIRTY_CHARSET; + + /* If the DC does not have a DIB section selected, try a batch command */ + if (!(pdcattr->ulDirty_ & DC_DIBSECTION)) + { + PGDIBSOBJECT pgO; + + pgO = GdiAllocBatchCommand(hdc, GdiBCSelObj); + if (pgO) + { + pgO->hgdiobj = hfont; + return hfontOld; + } + } + + /* We could not use the batch command, call win32k */ + return NtGdiSelectFont(hdc, hfont); +} + + +/* + * @implemented + * + */ +HGDIOBJ +WINAPI +SelectObject( + _In_ HDC hdc, + _In_ HGDIOBJ hobj) +{ + /* Fix up 16 bit handles */ + hobj = GdiFixUpHandle(hobj); + if (!GdiIsHandleValid(hobj)) + { + return NULL; + } + + /* Call the appropriate select function */ + switch (GDI_HANDLE_GET_TYPE(hobj)) + { + case GDILoObjType_LO_REGION_TYPE: + return (HGDIOBJ)ExtSelectClipRgn(hdc, hobj, RGN_COPY); + + case GDILoObjType_LO_BITMAP_TYPE: + case GDILoObjType_LO_DIBSECTION_TYPE: + return GdiSelectBitmap(hdc, hobj); + + case GDILoObjType_LO_BRUSH_TYPE: + return GdiSelectBrush(hdc, hobj); + + case GDILoObjType_LO_PEN_TYPE: + case GDILoObjType_LO_EXTPEN_TYPE: + return GdiSelectPen(hdc, hobj); + + case GDILoObjType_LO_FONT_TYPE: + return GdiSelectFont(hdc, hobj); + + case GDILoObjType_LO_ICMLCS_TYPE: + return SetColorSpace(hdc, hobj); + + case GDILoObjType_LO_PALETTE_TYPE: SetLastError(ERROR_INVALID_FUNCTION); + default: return NULL; }

10 years, 1 month

[cwittich] 65066: [DRIVERS] don't use uninitialized variables

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Oct 28 08:15:49 2014 New Revision: 65066 URL: http://svn.reactos.org/svn/reactos?rev=65066&view=rev Log: [DRIVERS] don't use uninitialized variables Modified: trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/pcix/fdo.c Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Tue Oct 28 08:15:49 2014 @@ -450,7 +450,7 @@ LPWSTR ProcessorVendorIdentifier = NULL; LPWSTR HardwareIdsBuffer = NULL; HANDLE ProcessorHandle = NULL; - ULONG Length, Level1Length = 0, Level2Length = 0, Level3Length = 0; + ULONG Length = 0, Level1Length = 0, Level2Length = 0, Level3Length = 0; SIZE_T HardwareIdsLength = 0; SIZE_T VendorIdentifierLength; ULONG i; Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Tue Oct 28 08:15:49 2014 @@ -478,6 +478,8 @@ AttachedTo = NULL; FdoExtension = NULL; PdoExtension = NULL; + DeviceObject = NULL; + do { /* Check if there's already a device extension for this bus */

10 years, 1 month

[dquintana] 65065: [RSHELL] * Fix some small things that were getting in the way of fixing the start menu (which was broken and no one noticed). The actual fix will come tomorrow since my brain is ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Oct 28 01:27:02 2014 New Revision: 65065 URL: http://svn.reactos.org/svn/reactos?rev=65065&view=rev Log: [RSHELL] * Fix some small things that were getting in the way of fixing the start menu (which was broken and no one noticed). The actual fix will come tomorrow since my brain is about to implode at this time. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/include/reactos/undocshell.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -909,6 +909,7 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) { + CComPtr<CMenuBand> safeThis = this; HRESULT hr; if (m_dwFlags & SMINIT_VERTICAL) @@ -951,6 +952,7 @@ { m_subMenuParent->OnSelect(changeType); } + TRACE("Menu closed, executing item...\n"); m_hotBar->ExecuteItem(m_hotItem); break; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -131,11 +131,15 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { + HRESULT hr; + if (IsEqualGUID(guidService, SID_SMenuPopup) || IsEqualGUID(guidService, SID_SMenuBandParent) || IsEqualGUID(guidService, SID_STopLevelBrowser)) { - return this->QueryInterface(riid, ppvObject); + hr = this->QueryInterface(riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; } if (IsEqualGUID(guidService, SID_SMenuBandBottom) || @@ -145,7 +149,9 @@ if (m_Client == NULL) return E_NOINTERFACE; - return IUnknown_QueryService(m_Client, guidService, riid, ppvObject); + hr = IUnknown_QueryService(m_Client, guidService, riid, ppvObject); + if (SUCCEEDED(hr)) + return hr; } @@ -484,6 +490,8 @@ * */ + CComPtr<IMenuPopup> oldParent = m_SubMenuParent; + switch (dwSelectType) { case MPOS_EXECUTE: @@ -498,8 +506,8 @@ case MPOS_SELECTLEFT: case MPOS_SELECTRIGHT: case MPOS_CHILDTRACKING: - if (m_SubMenuParent) - return m_SubMenuParent->OnSelect(dwSelectType); + if (oldParent) + return oldParent->OnSelect(dwSelectType); break; } Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -832,6 +832,11 @@ DbgPrint("PopMenuBar %p\n", mb); + if (m_current == m_entryUnderMouse) + { + m_entryUnderMouse = NULL; + } + hr = PopFromArray(&type, &mbc, NULL); if (FAILED_UNEXPECTEDLY(hr)) { @@ -871,6 +876,11 @@ DbgPrint("PopMenuPopup %p\n", mb); + if (m_current == m_entryUnderMouse) + { + m_entryUnderMouse = NULL; + } + hr = PopFromArray(&type, &mbc, NULL); if (FAILED_UNEXPECTEDLY(hr)) { Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -37,6 +37,11 @@ #define COBJMACROS +//#define DEBUG_CCOMOBJECT +//#define DEBUG_CCOMOBJECT_CREATION 1 +//#define DEBUG_CCOMOBJECT_DESTRUCTION 1 +//#define DEBUG_CCOMOBJECT_REFCOUNTING 0 + #include <windef.h> #include <winbase.h> #include <winreg.h> Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Tue Oct 28 01:27:02 2014 @@ -626,6 +626,9 @@ public: CComDebugObject(void * = NULL) { +#if DEBUG_CCOMOBJECT_CREATION + DbgPrint("%S, this=%08p\n", __FUNCTION__, static_cast<Base*>(this)); +#endif _pAtlModule->Lock(); } @@ -638,25 +641,28 @@ STDMETHOD_(ULONG, AddRef)() { int rc = this->InternalAddRef(); - DbgPrint("RefCount is now %d(++)! %s\n", rc, __FUNCTION__); +#if DEBUG_CCOMOBJECT_REFCOUNTING + DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); +#endif return rc; } STDMETHOD_(ULONG, Release)() { - ULONG newRefCount; - - newRefCount = this->InternalRelease(); - if (newRefCount == 0) + int rc = this->InternalRelease(); + +#if DEBUG_CCOMOBJECT_REFCOUNTING + DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); +#endif + + if (rc == 0) { - DbgPrint("RefCount is now 0! Deleting! %s\n", newRefCount, __FUNCTION__); +#if DEBUG_CCOMOBJECT_DESTRUCTION + DbgPrint("%s, RefCount reached 0 Deleting!\n", __FUNCTION__); +#endif delete this; } - else - { - DbgPrint("RefCount is now %d(--)! %s\n", newRefCount, __FUNCTION__); - } - return newRefCount; + return rc; } STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) @@ -675,9 +681,9 @@ hResult = E_OUTOFMEMORY; newInstance = NULL; - ATLTRY(newInstance = new CComDebugObject<Base>()) - if (newInstance != NULL) - { + ATLTRY(newInstance = new CComDebugObject<Base>()); + if (newInstance != NULL) + { newInstance->SetVoid(NULL); newInstance->InternalFinalConstructAddRef(); hResult = newInstance->_AtlInitialConstruct(); @@ -691,7 +697,7 @@ delete newInstance; newInstance = NULL; } - } + } *pp = newInstance; return hResult; }

10 years, 1 month

[gadamopoulos] 65064: [SHELL32] - Properly check for error in CDefaultContextMenu::DoCreateLink

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Oct 28 00:58:19 2014 New Revision: 65064 URL: http://svn.reactos.org/svn/reactos?rev=65064&view=rev Log: [SHELL32] - Properly check for error in CDefaultContextMenu::DoCreateLink Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Tue Oct 28 00:58:19 2014 @@ -1115,7 +1115,7 @@ return hr; } - psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pDT)); + hr = psfTarget->QueryInterface(IID_PPV_ARG(IDropTarget, &pDT)); if (FAILED(hr)) { ERR("no IDropTarget Interface\n");

10 years, 1 month

[tkreuzer] 65063: [GDI32] - Use GdiGetDcAttr instead of GdiGetHandleUserData where appropriate - Add a few missing SetLastError() - Fix return failure return value of GetBkColor() - Improve order o...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Oct 28 00:55:22 2014 New Revision: 65063 URL: http://svn.reactos.org/svn/reactos?rev=65063&view=rev Log: [GDI32] - Use GdiGetDcAttr instead of GdiGetHandleUserData where appropriate - Add a few missing SetLastError() - Fix return failure return value of GetBkColor() - Improve order of operations in SelectObject (needs more fixing) Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Tue Oct 28 00:55:22 2014 @@ -438,9 +438,12 @@ (uObjectType == OBJ_BRUSH) || (uObjectType == OBJ_COLORSPACE)) { - /* Get the dc attribute */ + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) return NULL; + if (pdcattr == NULL) + { + return NULL; + } } /* Check what object was requested */ @@ -519,8 +522,14 @@ } else { - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } + if (!(pdcattr->ulDirty_ & DC_PRIMARY_DISPLAY) ) return NtGdiGetDeviceCaps(hdc, nIndex); } @@ -966,8 +975,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } return pdcattr->ulBrushClr; } @@ -982,8 +995,13 @@ { PDC_ATTR pdcattr; - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } return pdcattr->ulPenClr; } @@ -1001,8 +1019,12 @@ COLORREF crOldColor; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } /* Get old color and store the new */ crOldColor = pdcattr->ulBrushClr; @@ -1062,8 +1084,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - return 0; + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ + return CLR_INVALID; + } return pdcattr->ulBackgroundClr; } @@ -1081,8 +1107,12 @@ COLORREF crOldColor; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return CLR_INVALID; + } #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -1129,8 +1159,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; + } return pdcattr->lBkMode; } @@ -1149,8 +1183,13 @@ INT iOldMode; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } + #if 0 if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { @@ -1193,6 +1232,7 @@ pdcattr = GdiGetDcAttr(hdc); if (pdcattr == NULL) { + /* Don't set LastError here! */ return 0; } @@ -1233,9 +1273,11 @@ } #endif - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1264,9 +1306,11 @@ { PDC_ATTR pdcattr; - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; } @@ -1293,9 +1337,11 @@ return 0; } - /* Get DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -1505,8 +1551,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } return pdcattr->iMapMode; } @@ -1563,8 +1613,12 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return 0; + } return pdcattr->lStretchBltMode; } @@ -1600,8 +1654,13 @@ } } #endif - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return 0; + } iOldMode = pdcattr->lStretchBltMode; pdcattr->lStretchBltMode = iStretchMode; @@ -1624,8 +1683,10 @@ PDC_ATTR pdcattr; /* Get the DC attribute */ - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Don't set LastError here! */ return NULL; } @@ -1648,15 +1709,18 @@ HGDIOBJ hOldObj = NULL; UINT uType; - if(!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID*)&pdcattr)) - { - SetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - + /* Fix up 16 bit handles */ hGdiObj = GdiFixUpHandle(hGdiObj); if (!GdiIsHandleValid(hGdiObj)) { + return NULL; + } + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); return NULL; }

10 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014