Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[tfaber] 74426: [0.4.5] - Mask WndProc exceptions CORE-11915

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 28 07:26:15 2017 New Revision: 74426 URL: http://svn.reactos.org/svn/reactos?rev=74426&view=rev Log: [0.4.5] - Mask WndProc exceptions CORE-11915 Modified: branches/ros-branch-0_4_5/reactos/win32ss/user/user32/windows/message.c Modified: branches/ros-branch-0_4_5/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_5/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Fri Apr 28 07:26:15 2017 @@ -1463,20 +1463,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1517,20 +1512,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1609,20 +1599,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) { @@ -1670,20 +1655,15 @@ if (PreResult) goto Exit; - if (!Dialog) - Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); - else - { _SEH2_TRY { Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; - } if (Hook && (MsgOverride || DlgOverride)) {

7 years, 8 months

[tfaber] 74425: [0.4.5] - Update start menu banner, thanks to David

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 28 07:22:33 2017 New Revision: 74425 URL: http://svn.reactos.org/svn/reactos?rev=74425&view=rev Log: [0.4.5] - Update start menu banner, thanks to David Modified: branches/ros-branch-0_4_5/reactos/base/shell/explorer/res/bmp/158.bmp Modified: branches/ros-branch-0_4_5/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/base/s… ============================================================================== Binary files - no diff available.

7 years, 8 months

[akhaldi] 74424: [0.4.5] Update the version number.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 27 20:21:11 2017 New Revision: 74424 URL: http://svn.reactos.org/svn/reactos?rev=74424&view=rev Log: [0.4.5] Update the version number. Modified: branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_5/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_5/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Thu Apr 27 20:21:11 2017 @@ -17,15 +17,15 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "5") set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC1") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

7 years, 8 months

[akhaldi] 74423: [0.4.5] Branch for the release.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 27 20:19:23 2017 New Revision: 74423 URL: http://svn.reactos.org/svn/reactos?rev=74423&view=rev Log: [0.4.5] Branch for the release. Added: branches/ros-branch-0_4_5/ (props changed) - copied from r74422, trunk/ Propchange: branches/ros-branch-0_4_5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Apr 27 20:19:23 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

7 years, 8 months

[jimtabor] 74422: [NtGDI] - Use internal function for setting brush origin. Related to CORE-13110.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 27 19:20:09 2017 New Revision: 74422 URL: http://svn.reactos.org/svn/reactos?rev=74422&view=rev Log: [NtGDI] - Use internal function for setting brush origin. Related to CORE-13110. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Thu Apr 27 19:20:09 2017 @@ -168,40 +168,30 @@ _In_ INT y, _Out_opt_ LPPOINT pptOut) { - PDC pdc; - - /* Lock the DC */ - pdc = DC_LockDc(hdc); - if (pdc == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - /* Check if the old origin was requested */ - if (pptOut != NULL) - { - /* Enter SEH for buffer transfer */ - _SEH2_TRY - { - /* Probe and copy the old origin */ - ProbeForWrite(pptOut, sizeof(POINT), 1); - *pptOut = pdc->pdcattr->ptlBrushOrigin; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DC_UnlockDc(pdc); - _SEH2_YIELD(return FALSE); - } - _SEH2_END; - } - - /* Call the internal function */ - DC_vSetBrushOrigin(pdc, x, y); - - /* Unlock the DC and return success */ - DC_UnlockDc(pdc); - return TRUE; + + POINT ptOut; + /* Call the internal function */ + BOOL Ret = GreSetBrushOrg( hdc, x, y, &ptOut); + if (Ret) + { + /* Check if the old origin was requested */ + if (pptOut != NULL) + { + /* Enter SEH for buffer transfer */ + _SEH2_TRY + { + /* Probe and copy the old origin */ + ProbeForWrite(pptOut, sizeof(POINT), 1); + *pptOut = ptOut; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + } + } + return Ret; } HPALETTE

7 years, 8 months

[jimtabor] 74421: [NtGDI] - Update DC attributes while internally setting brush origin. Related to CORE-13110.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Apr 27 17:53:03 2017 New Revision: 74421 URL: http://svn.reactos.org/svn/reactos?rev=74421&view=rev Log: [NtGDI] - Update DC attributes while internally setting brush origin. Related to CORE-13110. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c 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] Thu Apr 27 17:53:03 2017 @@ -240,6 +240,9 @@ { *pptOut = pdc->pdcattr->ptlBrushOrigin; } + + pdc->pdcattr->ptlBrushOrigin.x = x; + pdc->pdcattr->ptlBrushOrigin.y = y; DC_vSetBrushOrigin(pdc, x, y);

7 years, 8 months

[mjansen] 74420: [WIN32SS] Fix returning an uninitialized variable. Patch by Victor Martinez Calvo. CID 1341417, CORE-11027 #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Apr 27 15:37:08 2017 New Revision: 74420 URL: http://svn.reactos.org/svn/reactos?rev=74420&view=rev Log: [WIN32SS] Fix returning an uninitialized variable. Patch by Victor Martinez Calvo. CID 1341417, CORE-11027 #comment Thanks! Modified: trunk/reactos/win32ss/user/ntuser/hook.c Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Thu Apr 27 15:37:08 2017 @@ -324,7 +324,7 @@ WPARAM wParam, LPARAM lParam) { - LRESULT Result; + LRESULT Result = 0; PHOOK phk; PHOOKPACK pHP = (PHOOKPACK)lParam;

7 years, 8 months

[tfaber] 74419: [GDI32] - Fix last error value returned from GdiSelectPen for invalid DCs. Fixes the last test failure in gdi32:gdiobj. Patch by Katayama Hirofumi MZ. CORE-13132 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 27 08:59:29 2017 New Revision: 74419 URL: http://svn.reactos.org/svn/reactos?rev=74419&view=rev Log: [GDI32] - Fix last error value returned from GdiSelectPen for invalid DCs. Fixes the last test failure in gdi32:gdiobj. Patch by Katayama Hirofumi MZ. CORE-13132 #resolve 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] Thu Apr 27 08:59:29 2017 @@ -1426,7 +1426,7 @@ pdcattr = GdiGetDcAttr(hdc); if (pdcattr == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_HANDLE); return NULL; }

7 years, 8 months

[tfaber] 74418: [EVENTVWR] - Avoid two cases of uninitialized variable use in GetEventUserName. Based on a patch by Víctor Martínez Calvo. CID 1401250 CORE-12798 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 27 00:23:04 2017 New Revision: 74418 URL: http://svn.reactos.org/svn/reactos?rev=74418&view=rev Log: [EVENTVWR] - Avoid two cases of uninitialized variable use in GetEventUserName. Based on a patch by Víctor Martínez Calvo. CID 1401250 CORE-12798 #resolve Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Thu Apr 27 00:23:04 2017 @@ -1271,7 +1271,7 @@ SID_NAME_USE peUse; DWORD cchName = ARRAYSIZE(szName); DWORD cchDomain = ARRAYSIZE(szDomain); - BOOL Success; + BOOL Success = FALSE; /* Point to the SID */ pCurrentSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset);

7 years, 8 months

[tfaber] 74417: [EVENTVWR] - Make user name caching actually work CORE-12798

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 27 00:17:08 2017 New Revision: 74417 URL: http://svn.reactos.org/svn/reactos?rev=74417&view=rev Log: [EVENTVWR] - Make user name caching actually work CORE-12798 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Thu Apr 27 00:17:08 2017 @@ -1261,7 +1261,7 @@ BOOL GetEventUserName(IN PEVENTLOGRECORD pelr, - IN OUT PSID pLastSid, + IN OUT PSID *pLastSid, OUT PWCHAR pszUser) // TODO: Add IN DWORD BufLen { PSID pCurrentSid; @@ -1278,10 +1278,10 @@ if (!IsValidSid(pCurrentSid)) { - pLastSid = NULL; + *pLastSid = NULL; return FALSE; } - else if (pLastSid && EqualSid(pLastSid, pCurrentSid)) + else if (*pLastSid && EqualSid(*pLastSid, pCurrentSid)) { return TRUE; } @@ -1325,7 +1325,7 @@ } } - pLastSid = Success ? pCurrentSid : NULL; + *pLastSid = Success ? pCurrentSid : NULL; return Success; } @@ -1604,7 +1604,7 @@ GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, ARRAYSIZE(szLocalTime)); /* Get the username that generated the event, and filter it */ - lpszUsername = GetEventUserName(pEvlrTmp, pLastSid, szUsername) ? szUsername : szNoUsername; + lpszUsername = GetEventUserName(pEvlrTmp, &pLastSid, szUsername) ? szUsername : szNoUsername; if (!FilterByString(EventLogFilter->Users, lpszUsername)) goto SkipEvent;

7 years, 8 months

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 April 2017