Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 68931: [OSK] fix resource leak in error case CID 1322148
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 09:33:58 2015 New Revision: 68931 URL: http://svn.reactos.org/svn/reactos?rev=68931&view=rev Log: [OSK] fix resource leak in error case CID 1322148 Modified: trunk/reactos/base/applications/osk/main.c Modified: trunk/reactos/base/applications/osk/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/main… ============================================================================== --- trunk/reactos/base/applications/osk/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/main.c [iso-8859-1] Thu Sep 3 09:33:58 2015 @@ -40,10 +40,15 @@ hIcon = (HICON)LoadImage(Globals.hInstance, MAKEINTRESOURCE(IdResource), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - if (hIcon == NULL) return FALSE; + if (hIcon == NULL) + return FALSE; hWndItem = GetDlgItem(Globals.hMainWnd, IdDlgItem); - if (hWndItem == NULL) return FALSE; + if (hWndItem == NULL) + { + DestroyIcon(hIcon); + return FALSE; + } SendMessage(hWndItem, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);

1 0

[sginsberg] 68930: - Explicitly make the kernel .rsrc/Resource Directory non-discardable and non-pageable on MSVC builds, as it is accessed from bugcheck code. Previously this data was marked as di...
by sginsberg＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: sginsberg Date: Thu Sep 3 09:29:26 2015 New Revision: 68930 URL: http://svn.reactos.org/svn/reactos?rev=68930&view=rev Log: - Explicitly make the kernel .rsrc/Resource Directory non-discardable and non-pageable on MSVC builds, as it is accessed from bugcheck code. Previously this data was marked as discardable and the bugcheck routine would bugcheck (after a certain stage in boot) when trying to access the bugcheck code data because the data was discarded and the memory invalidated. Thanks to Thomas for the help and the fix. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Sep 3 09:29:26 2015 @@ -28,6 +28,7 @@ if(MSVC) set_image_base(ntoskrnl 0x00400000) + add_target_link_flags(ntoskrnl "/SECTION:.rsrc,!DP") #Accessed from bugcheck code else() if(GDB) set_image_base(ntoskrnl 0x00800000) Modified: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Thu Sep 3 09:29:26 2015 @@ -28,6 +28,7 @@ if(MSVC) set_image_base(ntkrnlmp 0x00400000) + add_target_link_flags(ntoskrnl "/SECTION:.rsrc,!DP") #Accessed from bugcheck code else() set_image_base(ntkrnlmp 0x80800000) endif()

1 0

[cwittich] 68929: [WINLOGON] fix resource leak in error case CID 1322159
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 08:48:31 2015 New Revision: 68929 URL: http://svn.reactos.org/svn/reactos?rev=68929&view=rev Log: [WINLOGON] fix resource leak in error case CID 1322159 Modified: trunk/reactos/base/system/winlogon/notify.c Modified: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Thu Sep 3 08:48:31 2015 @@ -121,7 +121,10 @@ HEAP_ZERO_MEMORY, sizeof(NOTIFICATION_ITEM)); if (NotificationDll == NULL) + { + FreeLibrary(hInstance); return; + } NotificationDll->bEnabled = TRUE; NotificationDll->dwMaxWait = 30; /* FIXME: ??? */

1 0

[cwittich] 68928: [CRT] Addendum to r68927
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 07:42:05 2015 New Revision: 68928 URL: http://svn.reactos.org/svn/reactos?rev=68928&view=rev Log: [CRT] Addendum to r68927 Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Thu Sep 3 07:42:05 2015 @@ -61,7 +61,7 @@ */ double CDECL _CIatan2(void) { - FPU_DOUBLES(x, y); + FPU_DOUBLES(y, x); return atan2(y, x); } /*

1 0

[cwittich] 68927: [CRT] atan2 pass arguments in the correct order CID 1322203
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 07:35:54 2015 New Revision: 68927 URL: http://svn.reactos.org/svn/reactos?rev=68927&view=rev Log: [CRT] atan2 pass arguments in the correct order CID 1322203 Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Thu Sep 3 07:35:54 2015 @@ -62,7 +62,7 @@ double CDECL _CIatan2(void) { FPU_DOUBLES(x, y); - return atan2(x, y); + return atan2(y, x); } /* * @implemented

1 0

[tfaber] 68926: [KERNEL32_WINETEST] - Enable test_thread_fpu_cw on MSVC builds
by tfaber＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: tfaber Date: Thu Sep 3 07:18:00 2015 New Revision: 68926 URL: http://svn.reactos.org/svn/reactos?rev=68926&view=rev Log: [KERNEL32_WINETEST] - Enable test_thread_fpu_cw on MSVC builds Modified: trunk/rostests/winetests/kernel32/thread.c Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… ============================================================================== --- trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] Thu Sep 3 07:18:00 2015 @@ -1397,16 +1397,25 @@ pSetThreadErrorMode(oldmode, NULL); } -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) static inline void set_fpu_cw(WORD cw) { +#ifdef _MSC_VER + __asm { fnclex } + __asm { fldcw [cw] } +#else __asm__ volatile ("fnclex; fldcw %0" : : "m" (cw)); +#endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; +#ifdef _MSC_VER + __asm { fnstcw [cw] } +#else __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif return cw; } @@ -1769,7 +1778,7 @@ test_RegisterWaitForSingleObject(); test_TLS(); test_ThreadErrorMode(); -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || (defined(_MSC_VER) && defined(__i386__)) test_thread_fpu_cw(); #endif test_thread_actctx();

1 0

[cwittich] 68925: [NTOS:SE] fix uninitialized variable usage CID 1322236
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 07:15:52 2015 New Revision: 68925 URL: http://svn.reactos.org/svn/reactos?rev=68925&view=rev Log: [NTOS:SE] fix uninitialized variable usage CID 1322236 Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Thu Sep 3 07:15:52 2015 @@ -1080,6 +1080,12 @@ PSECURITY_IMPERSONATION_LEVEL SeImpersonationLvl; PAGED_CODE(); + if (TokenInformationClass >= MaxTokenInfoClass) + { + DPRINT1("SeQueryInformationToken(%d) invalid information class\n", TokenInformationClass); + return STATUS_INVALID_INFO_CLASS; + } + switch (TokenInformationClass) { case TokenImpersonationLevel: @@ -1106,6 +1112,7 @@ default: UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; break; }

1 0

[cwittich] 68924: [EXPLORER] proper fix for CID 1321923, 1321924
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 07:01:29 2015 New Revision: 68924 URL: http://svn.reactos.org/svn/reactos?rev=68924&view=rev Log: [EXPLORER] proper fix for CID 1321923, 1321924 Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Sep 3 07:01:29 2015 @@ -190,7 +190,7 @@ HDC hDC = NULL; HDC hDCScreen = NULL; SIZE Size, SmallIcon; - HBITMAP hbmpOld; + HBITMAP hbmpOld, hbmp = NULL; HBITMAP hBitmap = NULL; HICON hIconStart; BOOL Ret; @@ -243,10 +243,10 @@ Size.cy = max(Size.cy, SmallIcon.cy); /* Create the bitmap */ - hBitmap = CreateCompatibleBitmap(hDCScreen, + hbmp = CreateCompatibleBitmap(hDCScreen, Size.cx, Size.cy); - if (hBitmap == NULL) + if (hbmp == NULL) goto Cleanup; /* Caluclate the button rect */ @@ -256,13 +256,13 @@ rcButton.bottom = Size.cy; /* Draw the button */ - hbmpOld = (HBITMAP) SelectObject(hDC, hBitmap); + hbmpOld = (HBITMAP) SelectObject(hDC, hbmp); Flags = DC_TEXT | DC_INBUTTON; if (hIconStart != NULL) Flags |= DC_ICON; - DrawCaptionTemp(NULL, + Ret = DrawCaptionTemp(NULL, hDC, &rcButton, m_Font, @@ -275,11 +275,18 @@ if (!Ret) goto Cleanup; + /* We successfully created the bitmap! */ + hBitmap = hbmp; + hbmp = NULL; + Cleanup: if (hDCScreen != NULL) { ::ReleaseDC(NULL, hDCScreen); } + + if (hbmp != NULL) + DeleteObject(hbmp); if (hDC != NULL) DeleteDC(hDC);

1 0

[cwittich] 68923: [EXPLORER] remove dead code CID 1321923, 1321924
by cwittich＠svn.reactos.org 03 Sep '15

03 Sep '15

Author: cwittich Date: Thu Sep 3 06:24:13 2015 New Revision: 68923 URL: http://svn.reactos.org/svn/reactos?rev=68923&view=rev Log: [EXPLORER] remove dead code CID 1321923, 1321924 Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Sep 3 06:24:13 2015 @@ -190,7 +190,7 @@ HDC hDC = NULL; HDC hDCScreen = NULL; SIZE Size, SmallIcon; - HBITMAP hbmpOld, hbmp = NULL; + HBITMAP hbmpOld; HBITMAP hBitmap = NULL; HICON hIconStart; BOOL Ret; @@ -243,10 +243,10 @@ Size.cy = max(Size.cy, SmallIcon.cy); /* Create the bitmap */ - hbmp = CreateCompatibleBitmap(hDCScreen, + hBitmap = CreateCompatibleBitmap(hDCScreen, Size.cx, Size.cy); - if (hbmp == NULL) + if (hBitmap == NULL) goto Cleanup; /* Caluclate the button rect */ @@ -256,7 +256,7 @@ rcButton.bottom = Size.cy; /* Draw the button */ - hbmpOld = (HBITMAP) SelectObject(hDC, hbmp); + hbmpOld = (HBITMAP) SelectObject(hDC, hBitmap); Flags = DC_TEXT | DC_INBUTTON; if (hIconStart != NULL) @@ -275,18 +275,11 @@ if (!Ret) goto Cleanup; - /* We successfully created the bitmap! */ - hBitmap = hbmp; - hbmp = NULL; - Cleanup: if (hDCScreen != NULL) { ::ReleaseDC(NULL, hDCScreen); } - - if (hbmp != NULL) - DeleteObject(hbmp); if (hDC != NULL) DeleteDC(hDC);

1 0

[jimtabor] 68922: [Win32k] - Yes we must specify everything in ReactOS. Fix CORE-10085.
by jimtabor＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: jimtabor Date: Wed Sep 2 23:25:48 2015 New Revision: 68922 URL: http://svn.reactos.org/svn/reactos?rev=68922&view=rev Log: [Win32k] - Yes we must specify everything in ReactOS. Fix CORE-10085. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Wed Sep 2 23:25:48 2015 @@ -463,7 +463,7 @@ IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) - UserPaintCaption(pWnd, DC_ICON); + UserPaintCaption(pWnd, DC_CAPTION); return (LRESULT)hIconOld; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs