Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[jimtabor] 73886: [NtGDI] - Add function for NtUser.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Feb 22 17:20:43 2017 New Revision: 73886 URL: http://svn.reactos.org/svn/reactos?rev=73886&view=rev Log: [NtGDI] - Add function for NtUser. Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Wed Feb 22 17:20:43 2017 @@ -180,6 +180,7 @@ COLORREF FASTCALL IntSetDCBrushColor(HDC,COLORREF); COLORREF FASTCALL IntSetDCPenColor(HDC,COLORREF); int FASTCALL GreGetGraphicsMode(HDC); +BOOL FASTCALL GreSetBrushOrg(HDC,INT,INT,LPPOINT); INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(VOID); PPDEVOBJ FASTCALL IntEnumHDev(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Wed Feb 22 17:20:43 2017 @@ -220,6 +220,31 @@ } DC_UnlockDc(dc); return OldColor; +} + +BOOL FASTCALL +GreSetBrushOrg( + HDC hdc, + INT x, + INT y, + LPPOINT pptOut) +{ + PDC pdc = DC_LockDc(hdc); + if (pdc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (pptOut != NULL) + { + *pptOut = pdc->pdcattr->ptlBrushOrigin; + } + + DC_vSetBrushOrigin(pdc, x, y); + + DC_UnlockDc(pdc); + return TRUE; } COLORREF FASTCALL

7 years, 8 months

[gadamopoulos] 73885: [COMCTL32] -Fix several tests for the v6 button when themes are enabled.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 22 13:58:49 2017 New Revision: 73885 URL: http://svn.reactos.org/svn/reactos?rev=73885&view=rev Log: [COMCTL32] -Fix several tests for the v6 button when themes are enabled. Modified: trunk/reactos/dll/win32/comctl32/button.c trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Wed Feb 22 13:58:49 2017 @@ -205,7 +205,7 @@ return hrgn; } -BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC); +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag); #endif @@ -234,7 +234,7 @@ /* GetDC appears to give a dc with a clip rect that includes the whoe parent, not sure if it is correct or not. */ GetClientRect(hwnd, &rc); IntersectClipRect (hdc, rc.left, rc. top, rc.right, rc.bottom); - if (theme && BUTTON_PaintWithTheme(theme, hwnd, hdc)) + if (theme && BUTTON_PaintWithTheme(theme, hwnd, hdc, 0)) { ReleaseDC( hwnd, hdc ); return; @@ -426,7 +426,7 @@ HDC hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); #ifndef _USER32_ HTHEME theme = GetWindowTheme(hWnd); - if (theme && BUTTON_PaintWithTheme(theme, hWnd, hdc)) + if (theme && BUTTON_PaintWithTheme(theme, hWnd, hdc, uMsg == WM_PRINTCLIENT ? lParam : 0)) { if ( !wParam ) EndPaint( hWnd, &ps ); return 0; Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Wed Feb 22 13:58:49 2017 @@ -34,7 +34,20 @@ STATE_DEFAULTED } ButtonState; -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag); + +#define STATE_GWL_OFFSET 0 +#define HFONT_GWL_OFFSET (sizeof(LONG)) + +static inline LONG get_button_state( HWND hwnd ) +{ + return GetWindowLongPtrW( hwnd, STATE_GWL_OFFSET ); +} + +static inline HFONT get_button_font( HWND hwnd ) +{ + return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); +} static UINT get_drawtext_flags(DWORD style, DWORD ex_style) { @@ -87,12 +100,12 @@ return text; } -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; RECT bgRect, textRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT font = get_button_font(hwnd); HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; int state = states[ drawState ]; WCHAR *text = get_button_text(hwnd); @@ -100,8 +113,12 @@ GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + } + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); if (text) { @@ -127,7 +144,7 @@ if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int cb_states[3][5] = { @@ -145,7 +162,7 @@ SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; - LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); + LRESULT checkState = get_button_state(hwnd) & 3; DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON @@ -168,7 +185,7 @@ created_font = TRUE; } } else { - font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + font = get_button_font(hwnd); hPrevFont = SelectObject(hDC, font); } @@ -186,7 +203,10 @@ bgRect.right = bgRect.left + sz.cx; textRect.left = bgRect.right + 6; - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + DrawThemeParentBackground(hwnd, hDC, NULL); + } DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (text) @@ -214,7 +234,7 @@ if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; @@ -235,7 +255,7 @@ created_font = TRUE; } } else { - font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + font = get_button_font(hwnd); hPrevFont = SelectObject(hDC, font); } @@ -257,8 +277,12 @@ GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); - if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + if (prfFlag == 0 || (prfFlag & PRF_ERASEBKGND)) + { + if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + } + DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); SelectClipRgn(hDC, NULL); @@ -294,12 +318,12 @@ NULL, /* Not defined */ }; -BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC) +BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) { DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + int state = get_button_state(hwnd); ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; if (!paint) @@ -314,6 +338,6 @@ } else drawState = STATE_DISABLED; - paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS); + paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); return TRUE; }

7 years, 8 months

[gadamopoulos] 73884: [COMCTL32] -Fix a couple more button tests.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 22 13:24:17 2017 New Revision: 73884 URL: http://svn.reactos.org/svn/reactos?rev=73884&view=rev Log: [COMCTL32] -Fix a couple more button tests. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Wed Feb 22 13:24:17 2017 @@ -626,7 +626,10 @@ case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); set_button_state( hWnd, get_button_state(hWnd) | BST_FOCUS ); - InvalidateRect(hWnd, NULL, FALSE); + if (btn_type == BS_OWNERDRAW) + paint_button( hWnd, btn_type, ODA_FOCUS ); + else + InvalidateRect(hWnd, NULL, FALSE); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; @@ -635,7 +638,6 @@ TRACE("WM_KILLFOCUS %p\n",hWnd); state = get_button_state( hWnd ); set_button_state( hWnd, state & ~BST_FOCUS ); - paint_button( hWnd, btn_type, ODA_FOCUS ); if ((state & BUTTON_BTNPRESSED) && GetCapture() == hWnd) ReleaseCapture();

7 years, 8 months

[gadamopoulos] 73883: [COMCTL32_WINETEST] -Do not take into account the wine todos for the button tests.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 22 12:31:40 2017 New Revision: 73883 URL: http://svn.reactos.org/svn/reactos?rev=73883&view=rev Log: [COMCTL32_WINETEST] -Do not take into account the wine todos for the button tests. Modified: trunk/rostests/winetests/comctl32/button.c Modified: trunk/rostests/winetests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/button… ============================================================================== --- trunk/rostests/winetests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/button.c [iso-8859-1] Wed Feb 22 12:31:40 2017 @@ -19,6 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#undef USE_WINE_TODOS //#include <windows.h> #include <stdarg.h>

7 years, 8 months

[gadamopoulos] 73882: [WIN32k] -Remove overzealous assertion that prevents boot.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 22 11:59:42 2017 New Revision: 73882 URL: http://svn.reactos.org/svn/reactos?rev=73882&view=rev Log: [WIN32k] -Remove overzealous assertion that prevents boot. Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Feb 22 11:59:42 2017 @@ -2333,7 +2333,7 @@ if (SYSTEMCUR(ARROW) == NULL) { ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); - ASSERT(FALSE); + //ASSERT(FALSE); } else {

7 years, 8 months

[khornicek] 73881: [NTGDI] - Check for zero rectangles in REGION_bXformRgn. CORE-12204

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Feb 22 10:48:41 2017 New Revision: 73881 URL: http://svn.reactos.org/svn/reactos?rev=73881&view=rev Log: [NTGDI] - Check for zero rectangles in REGION_bXformRgn. CORE-12204 Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Feb 22 10:48:41 2017 @@ -2051,6 +2051,10 @@ RECT rect; BOOL bResult; + /* Check for zero rectangles and return TRUE for translation only matrices */ + if (prgn->rdh.nCount < 1) + return pmx->flAccel & XFORM_UNITY; + /* Check if this is a scaling only matrix (off-diagonal elements are 0 */ if (pmx->flAccel & XFORM_SCALE) {

7 years, 8 months

[gadamopoulos] 73880: [COMCTL32]: Fix a few button tests.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 22 10:46:26 2017 New Revision: 73880 URL: http://svn.reactos.org/svn/reactos?rev=73880&view=rev Log: [COMCTL32]: Fix a few button tests. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Wed Feb 22 10:46:26 2017 @@ -626,7 +626,7 @@ case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); set_button_state( hWnd, get_button_state(hWnd) | BST_FOCUS ); - paint_button( hWnd, btn_type, ODA_FOCUS ); + InvalidateRect(hWnd, NULL, FALSE); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; @@ -721,7 +721,7 @@ if ((state & 3) != wParam) { set_button_state( hWnd, (state & ~3) | wParam ); - paint_button( hWnd, btn_type, ODA_SELECT ); + InvalidateRect(hWnd, NULL, FALSE); } if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); @@ -737,7 +737,7 @@ else set_button_state( hWnd, state & ~BST_PUSHED ); - paint_button( hWnd, btn_type, ODA_SELECT ); + InvalidateRect(hWnd, NULL, FALSE); break; #ifdef __REACTOS__

7 years, 8 months

[khornicek] 73879: [NTUSER] - Prevent a null to be passed to UserDereferenceObject in UserSetCursorIconData. CID 1321971 - Make the status check in co_IntCallSentMessageCallback less useless. CID 1...

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Feb 22 10:29:03 2017 New Revision: 73879 URL: http://svn.reactos.org/svn/reactos?rev=73879&view=rev Log: [NTUSER] - Prevent a null to be passed to UserDereferenceObject in UserSetCursorIconData. CID 1321971 - Make the status check in co_IntCallSentMessageCallback less useless. CID 1322014 - Prevent a null pointer dereference in a trace in IntCreateClass. CID 514617 Modified: trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callproc.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Wed Feb 22 10:29:03 2017 @@ -279,6 +279,7 @@ if (!NT_SUCCESS(Status)) { + ERR("KeUserModeCallback failed with %lx\n", Status); return; } return; Modified: trunk/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callpr… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Wed Feb 22 10:29:03 2017 @@ -47,10 +47,10 @@ NewCallProc->pfnClientPrevious = WndProc; NewCallProc->wType |= Unicode ? UserGetCPDA2U : UserGetCPDU2A ; NewCallProc->spcpdNext = NULL; + + /* Release the extra reference (UserCreateObject added 2 references) */ + UserDereferenceObject(NewCallProc); } - - /* Release the extra reference (UserCreateObject added 2 references) */ - if (NewCallProc != NULL) UserDereferenceObject(NewCallProc); return NewCallProc; } Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed Feb 22 10:29:03 2017 @@ -1228,7 +1228,8 @@ } TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and version atom 0x%x and hInstance 0x%p, global %u\n", - Class, ClassName, Class->lpfnWndProc, Atom, verAtom, Class->hModule, Class->Global); + Class, ClassName, Class ? Class->lpfnWndProc : NULL, Atom, verAtom, + Class ? Class->hModule : NULL , Class ? Class->Global : 0); return Class; } @@ -2332,6 +2333,7 @@ if (SYSTEMCUR(ARROW) == NULL) { ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); + ASSERT(FALSE); } else { Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed Feb 22 10:29:03 2017 @@ -1494,7 +1494,9 @@ } /* Dereference the cursor and return the result */ - UserDereferenceObject(pcur); + if (pcur) + UserDereferenceObject(pcur); + return bResult; }

7 years, 8 months

[khornicek] 73878: [NTGDI] - Consider the return value from IntFillArc in IntArc. CID 1237076 - Remove an useless check in ENTRY_ReferenceEntryByHandle CID 731587 - Prevent an unlikely memory leak ...

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Feb 22 10:26:40 2017 New Revision: 73878 URL: http://svn.reactos.org/svn/reactos?rev=73878&view=rev Log: [NTGDI] - Consider the return value from IntFillArc in IntArc. CID 1237076 - Remove an useless check in ENTRY_ReferenceEntryByHandle CID 731587 - Prevent an unlikely memory leak in PATH_WidenPath. CID 716634 - Minor cleanup. Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Wed Feb 22 10:26:40 2017 @@ -143,15 +143,18 @@ arctype); } - ret = IntDrawArc( dc, - RectBounds.left, - RectBounds.top, - abs(RectBounds.right-RectBounds.left), // Width - abs(RectBounds.bottom-RectBounds.top), // Height - AngleStart, - AngleEnd, - arctype, - pbrPen); + if(ret) + { + ret = IntDrawArc( dc, + RectBounds.left, + RectBounds.top, + abs(RectBounds.right-RectBounds.left), // Width + abs(RectBounds.bottom-RectBounds.top), // Height + AngleStart, + AngleEnd, + arctype, + pbrPen); + } psurf = dc->dclevel.pSurface; if (NULL == psurf) Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Wed Feb 22 10:26:40 2017 @@ -161,8 +161,6 @@ int innerX = 0, prevx, prevy, W; Rect r1, r2; int result = 1; - -// START_DEBUG(); if ((r.width <= 2) || (r.height <= 2)) return app_fill_rect(g, r, pbrush, TRUE); @@ -636,8 +634,6 @@ Rect r1, r2; int result = 1; -// START_DEBUG(); - if ((r.width <= 2) || (r.height <= 2)) return app_fill_rect(g, r, pbrush, FALSE); @@ -810,8 +806,6 @@ /* Line descriptions */ POINT p0, p1, p2; -// START_DEBUG(); - /* If angles differ by 360 degrees or more, close the shape */ if ((start_angle + 360 <= end_angle) || (start_angle - 360 >= end_angle)) @@ -1009,8 +1003,6 @@ /* Line descriptions */ POINT p0, p1, p2; - -// START_DEBUG(); /* If angles differ by 360 degrees or more, close the shape */ if ((start_angle + 360 <= end_angle) || Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed Feb 22 10:26:40 2017 @@ -480,7 +480,6 @@ /* Get the handle index and check if its too big */ ulIndex = GDI_HANDLE_GET_INDEX(hobj); - if (ulIndex >= GDI_HANDLE_COUNT) return NULL; /* Get pointer to the entry */ pentry = &gpentHmgr[ulIndex]; Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Wed Feb 22 10:26:40 2017 @@ -1813,6 +1813,8 @@ DPRINT1("Expected PT_MOVETO %s, got path flag %c\n", i == 0 ? "as first point" : "after PT_CLOSEFIGURE", flat_path->pFlags[i]); + if (pStrokes) + ExFreePoolWithTag(pStrokes, TAG_PATH); PATH_UnlockPath(flat_path); PATH_Delete(flat_path->BaseObject.hHmgr); return FALSE; @@ -1867,6 +1869,8 @@ break; default: DPRINT1("Got path flag %c\n", flat_path->pFlags[i]); + if (pStrokes) + ExFreePoolWithTag(pStrokes, TAG_PATH); PATH_UnlockPath(flat_path); PATH_Delete(flat_path->BaseObject.hHmgr); return FALSE;

7 years, 8 months

[khornicek] 73877: [GDI32] - Fix a possible null pointer dereference in GetGlyphOutlineA. CID 513747 - SetDIBits should not accept null bitmap info at all. CID 513425 - Don't set the pdwResult poin...

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Feb 22 10:22:28 2017 New Revision: 73877 URL: http://svn.reactos.org/svn/reactos?rev=73877&view=rev Log: [GDI32] - Fix a possible null pointer dereference in GetGlyphOutlineA. CID 513747 - SetDIBits should not accept null bitmap info at all. CID 513425 - Don't set the pdwResult pointer itself to null in TADC_GetAndSetDCDWord. CID 1321970 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/font.c trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Wed Feb 22 10:22:28 2017 @@ -578,16 +578,13 @@ if (!lpvBits || (GDI_HANDLE_GET_TYPE(hBitmap) != GDI_OBJECT_TYPE_BITMAP)) return 0; - if (lpbmi) - { - if (lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) - { - if (lpbmi->bmiHeader.biCompression == BI_JPEG - || lpbmi->bmiHeader.biCompression == BI_PNG) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } + if (lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + if (lpbmi->bmiHeader.biCompression == BI_JPEG + || lpbmi->bmiHeader.biCompression == BI_PNG) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; } } Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Feb 22 10:22:28 2017 @@ -132,7 +132,11 @@ strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); if (!strW) return NULL; - MultiByteToWideChar(cp, 0, str, count, strW, lenW); + if(!MultiByteToWideChar(cp, 0, str, count, strW, lenW)) + { + HeapFree(GetProcessHeap(), 0, strW); + return NULL; + } DPRINT("mapped %s -> %S\n", str, strW); if(plenW) *plenW = lenW; if(pCP) *pCP = cp; @@ -1009,6 +1013,8 @@ mbchs[0] = (uChar & 0xff); } p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); + if(!p) + return GDI_ERROR; c = p[0]; } else Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Wed Feb 22 10:22:28 2017 @@ -1096,7 +1096,7 @@ case GdiGetSetArcDirection: if (GDI_HANDLE_GET_TYPE(physdev->hdc) == GDILoObjType_LO_METADC16_TYPE) - pdwResult = 0; + *pdwResult = 0; else *pdwResult = physdev->funcs->pSetArcDirection(physdev, dwIn); break;

7 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
36
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 February 2017