Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71932: [ACLAYER] Use the return of StringCbPrintfW instead of ignoring it. CID 1363460-63, 65-70, 76, 78, 85, 88, 90
by mjansen＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: mjansen Date: Wed Jul 13 18:10:37 2016 New Revision: 71932 URL: http://svn.reactos.org/svn/reactos?rev=71932&view=rev Log: [ACLAYER] Use the return of StringCbPrintfW instead of ignoring it. CID 1363460-63, 65-70, 76, 78, 85, 88, 90 Modified: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl Modified: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] Wed Jul 13 18:10:37 2016 @@ -52,7 +52,7 @@ "Service Pack %u", VERSION_INFO.wServicePackMajor); if (FAILED(hr)) return FALSE; - StringCbPrintfW(VERSION_INFO.szCSDVersionW, sizeof(VERSION_INFO.szCSDVersionW), + hr = StringCbPrintfW(VERSION_INFO.szCSDVersionW, sizeof(VERSION_INFO.szCSDVersionW), szServicePack, VERSION_INFO.wServicePackMajor); if (FAILED(hr)) return FALSE;

1 0

[mjansen] 71931: [APPHELP] Dereference after null check (default_dir). CID 1363509
by mjansen＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: mjansen Date: Wed Jul 13 18:02:16 2016 New Revision: 71931 URL: http://svn.reactos.org/svn/reactos?rev=71931&view=rev Log: [APPHELP] Dereference after null check (default_dir). CID 1363509 Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Wed Jul 13 18:02:16 2016 @@ -472,30 +472,35 @@ static WCHAR* default_dir = NULL; static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0}; - if(!default_dir) + /* In case function fails, path holds empty string */ + if (size > 0) + *path = 0; + + if (!default_dir) { WCHAR* tmp = NULL; UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch); tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); - if(tmp) + if (tmp) { UINT r = GetSystemWindowsDirectoryW(tmp, len+1); if (r && r < len) { if (SUCCEEDED(StringCchCatW(tmp, len+1, szAppPatch))) { - if(InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) + if (InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) tmp = NULL; } } if (tmp) SdbFree(tmp); } - } - - /* In case function fails, path holds empty string */ - if (size > 0) - *path = 0; + if (!default_dir) + { + SHIM_ERR("Unable to obtain default AppPatch directory\n"); + return FALSE; + } + } if (!db) {

1 0

[tfaber] 71930: [NTOSKRNL_VISTA] - Avoid ugly hacks CORE-11596 #resolve
by tfaber＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: tfaber Date: Wed Jul 13 17:48:21 2016 New Revision: 71930 URL: http://svn.reactos.org/svn/reactos?rev=71930&view=rev Log: [NTOSKRNL_VISTA] - Avoid ugly hacks CORE-11596 #resolve Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ntoskrnl_v… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c [iso-8859-1] Wed Jul 13 17:48:21 2016 @@ -70,12 +70,7 @@ } /* encode ch as UTF-8 */ -#ifndef __REACTOS__ - assert(ch <= 0x10ffff); -#endif -#ifdef __REACTOS__ - utf8_ch_len = 0; // FIXME: Check whether a non-zero value might be better for the case ch >= 0x200000 ? -#endif + ASSERT(ch <= 0x10ffff); if (ch < 0x80) { utf8_ch[0] = ch & 0x7f;

1 0

[hbelusca] 71929: [NET] No need to check for whether 'pBuffer' is NULL to call NetApiBufferFree, because: - 'pBuffer' was used above this call without any particular checks; - 'pBuffer' can be only...
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 17:35:16 2016 New Revision: 71929 URL: http://svn.reactos.org/svn/reactos?rev=71929&view=rev Log: [NET] No need to check for whether 'pBuffer' is NULL to call NetApiBufferFree, because: - 'pBuffer' was used above this call without any particular checks; - 'pBuffer' can be only null when NetUserEnum fails with an error different from NERR_Success or ERROR_MORE_DATA. But this case was actually checked for before using 'pBuffer'. By Victor Martinez aka. Mr.Coverity ^^ :) CID 1363629 CORE-11598 #resolve Modified: trunk/reactos/base/applications/network/net/cmdUser.c Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Wed Jul 13 17:35:16 2016 @@ -70,11 +70,8 @@ PrintToConsole(L"%s\n", pBuffer[i].usri0_name); } - if (pBuffer != NULL) - { - NetApiBufferFree(pBuffer); - pBuffer = NULL; - } + NetApiBufferFree(pBuffer); + pBuffer = NULL; } while (Status == ERROR_MORE_DATA);

1 0

[hbelusca] 71928: [NTOSKRNL_VISTA lib] Initialize utf8_ch_len to zero before using it (at each turn of the for-loop). As I couldn't find this code in Wine, I couldn't see whether they already fixed...
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 16:43:16 2016 New Revision: 71928 URL: http://svn.reactos.org/svn/reactos?rev=71928&view=rev Log: [NTOSKRNL_VISTA lib] Initialize utf8_ch_len to zero before using it (at each turn of the for-loop). As I couldn't find this code in Wine, I couldn't see whether they already fixed it or not. Caught by Victor. CORE-11596 Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c Modified: trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ntoskrnl_v… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ntoskrnl_vista/rtl.c [iso-8859-1] Wed Jul 13 16:43:16 2016 @@ -72,6 +72,9 @@ /* encode ch as UTF-8 */ #ifndef __REACTOS__ assert(ch <= 0x10ffff); +#endif +#ifdef __REACTOS__ + utf8_ch_len = 0; // FIXME: Check whether a non-zero value might be better for the case ch >= 0x200000 ? #endif if (ch < 0x80) {

1 0

[hbelusca] 71927: [SETUP] - Fix leaking 'pSetupData' in case of failure. CID 1363604 - Since we know that in the remaining of the code, 'pSetupData' is a valid pointer, we can free it at the very e...
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 16:33:37 2016 New Revision: 71927 URL: http://svn.reactos.org/svn/reactos?rev=71927&view=rev Log: [SETUP] - Fix leaking 'pSetupData' in case of failure. CID 1363604 - Since we know that in the remaining of the code, 'pSetupData' is a valid pointer, we can free it at the very end without rechecking whether it was NULL or not. CORE-11591 #resolve Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Jul 13 16:33:37 2016 @@ -788,7 +788,10 @@ if (!pSetupData->bUnattend) { if (!LoadSetupData(pSetupData)) + { + HeapFree(GetProcessHeap(), 0, pSetupData); return 0; + } /* Create the Start page, until setup is working */ psp.dwSize = sizeof(PROPSHEETPAGE); @@ -881,8 +884,7 @@ if (pSetupData->hTitleFont) DeleteObject(pSetupData->hTitleFont); - if (pSetupData != NULL) - HeapFree(GetProcessHeap(), 0, pSetupData); + HeapFree(GetProcessHeap(), 0, pSetupData); #if 0 EnableShutdownPrivilege();

1 0

[hbelusca] 71926: [MAGNIFY] Missing break. CID 1363532 CORE-11593 #resolve
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 16:27:39 2016 New Revision: 71926 URL: http://svn.reactos.org/svn/reactos?rev=71926&view=rev Log: [MAGNIFY] Missing break. CID 1363532 CORE-11593 #resolve Modified: trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Wed Jul 13 16:27:39 2016 @@ -726,6 +726,7 @@ SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); ReleaseCapture(); } + break; case WM_SIZE: if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_SETPOS); @@ -814,6 +815,7 @@ ShowWindow(hMainWnd, SW_HIDE); else ShowWindow(hMainWnd, SW_SHOW); + break; } return 0; }

1 0

[hbelusca] 71925: [MKHIVE] - Fix usage of the 'Status' variable. CID 1363689 - Fix some DPRINTs. CORE-11595 #resolve
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 16:23:12 2016 New Revision: 71925 URL: http://svn.reactos.org/svn/reactos?rev=71925&view=rev Log: [MKHIVE] - Fix usage of the 'Status' variable. CID 1363689 - Fix some DPRINTs. CORE-11595 #resolve Modified: trunk/reactos/sdk/tools/mkhive/registry.c Modified: trunk/reactos/sdk/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/registry.… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/registry.c [iso-8859-1] Wed Jul 13 16:23:12 2016 @@ -582,6 +582,7 @@ /* The value already exists, use it. Get the value cell. */ ValueCell = HvGetCell(&Key->RegistryHive->Hive, CellIndex); ASSERT(ValueCell != NULL); + Status = STATUS_SUCCESS; } // /**/HvReleaseCell(Hive, CellIndex);/**/ @@ -629,7 +630,7 @@ NewOffset = HvAllocateCell(Hive, cbData, Stable, HCELL_NIL); if (NewOffset == HCELL_NIL) { - DPRINT("HvAllocateCell() failed with status 0x%08x\n", Status); + DPRINT("HvAllocateCell() has failed!\n"); return ERROR_UNSUCCESSFUL; } @@ -660,8 +661,7 @@ /* Save the write time */ KeQuerySystemTime(&KeyNode->LastWriteTime); - DPRINT("Return status 0x%08x\n", Status); - return Status; + return ERROR_SUCCESS; }

1 0

[hbelusca] 71924: [CHARMAP] Don't overrun FillGrid() when accessing the last elements. Rewrite the code using 'for' loops, in the same style as what is done elsewhere in the code. CID 1363552 CORE-...
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 15:50:44 2016 New Revision: 71924 URL: http://svn.reactos.org/svn/reactos?rev=71924&view=rev Log: [CHARMAP] Don't overrun FillGrid() when accessing the last elements. Rewrite the code using 'for' loops, in the same style as what is done elsewhere in the code. CID 1363552 CORE-11597 #resolve Modified: trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Wed Jul 13 15:50:44 2016 @@ -107,8 +107,9 @@ i = XCELLS * infoPtr->iYStart; added = 0; - x = y = 0; - while ((y <= YCELLS) && (x <= XCELLS)) + + for (y = 0; y < YCELLS; y++) + for (x = 0; x < XCELLS; x++) { ch = (WCHAR)infoPtr->ValidGlyphs[i]; @@ -131,14 +132,6 @@ i++; ch = (WCHAR)i; - - // move to the next cell - x++; - if (x > XCELLS - 1) - { - x = 0; - y++; - } } SelectObject(ps->hdc, hOldFont);

1 0

[hbelusca] 71923: [BOOTLIB] - BiOpenKey is being feed with the wrong ElementHandle, it should be feed with ElementsHandle one. CID 1363670 . By Victor Martinez Calvo. CORE-11600 #resolve [BOOTMGR] ...
by hbelusca＠svn.reactos.org 13 Jul '16

13 Jul '16

Author: hbelusca Date: Wed Jul 13 15:43:08 2016 New Revision: 71923 URL: http://svn.reactos.org/svn/reactos?rev=71923&view=rev Log: [BOOTLIB] - BiOpenKey is being feed with the wrong ElementHandle, it should be feed with ElementsHandle one. CID 1363670 . By Victor Martinez Calvo. CORE-11600 #resolve [BOOTMGR] - Fix an Assign vs Compare issue. CID 1363558 . By Victor Martinez Calvo. CORE-11592 #resolve Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Jul 13 15:43:08 2016 @@ -1403,7 +1403,7 @@ /* Check if this is a real mode startup.com */ if ((ObjectType.Application.ObjectCode == BCD_OBJECT_TYPE_APPLICATION) && - (ObjectType.Application.ImageCode = BCD_IMAGE_TYPE_REAL_MODE) && + (ObjectType.Application.ImageCode == BCD_IMAGE_TYPE_REAL_MODE) && (ObjectType.Application.ApplicationCode == BCD_APPLICATION_TYPE_STARTUPCOM)) { /* Check if PXE soft reboot will occur */ Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Wed Jul 13 15:43:08 2016 @@ -579,7 +579,7 @@ else { /* Open the element specifically */ - Status = BiOpenKey(ElementHandle, TypeString, &ElementHandle); + Status = BiOpenKey(ElementsHandle, TypeString, &ElementHandle); if (NT_SUCCESS(Status)) { /* Delete it */ @@ -874,7 +874,7 @@ { EfiPrintf(L"Value invalid\r\n"); BiCloseKey(ElementHandle); - ElementHandle = 0; + ElementHandle = NULL; continue; }

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