Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[khornicek] 62677: [MSCONFIG] - fix possible leaks CID #716286 CID #716287
by khornicek＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: khornicek Date: Sun Apr 6 21:13:18 2014 New Revision: 62677 URL: http://svn.reactos.org/svn/reactos?rev=62677&view=rev Log: [MSCONFIG] - fix possible leaks CID #716286 CID #716287 Modified: trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c [iso-8859-1] Sun Apr 6 21:13:18 2014 @@ -109,17 +109,22 @@ /* reserve memory for service info array */ pServiceStatus = HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (!pServiceStatus) + { + CloseServiceHandle(ScHandle); return; + } /* fill array with service info */ if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, BytesNeeded, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) { HeapFree(GetProcessHeap(), 0, pServiceStatus); + CloseServiceHandle(ScHandle); return; } } else /* exit on failure */ { + CloseServiceHandle(ScHandle); return; } } @@ -127,7 +132,11 @@ if (NumServices) { if (!pServiceStatus) + { + CloseServiceHandle(ScHandle); return; + } + for (Index = 0; Index < NumServices; Index++) { memset(&item, 0, sizeof(LV_ITEM)); Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Sun Apr 6 21:13:18 2014 @@ -137,7 +137,7 @@ HeapFree(GetProcessHeap(), 0, Data); } } - RegCloseKey(hKey); + RegCloseKey(hKey); } } @@ -199,8 +199,8 @@ item.pszText = Path; item.iSubItem = 2; SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - HeapFree(GetProcessHeap(), 0, Data); } + HeapFree(GetProcessHeap(), 0, Data); } } RegCloseKey(hKey);

1 0

[pschweitzer] 62676: [CDFS] - Fix CdfsWSubString() prototype - Use it in CdfsCreateFCB() for string copy CID #511047
by pschweitzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: pschweitzer Date: Sun Apr 6 21:02:21 2014 New Revision: 62676 URL: http://svn.reactos.org/svn/reactos?rev=62676&view=rev Log: [CDFS] - Fix CdfsWSubString() prototype - Use it in CdfsCreateFCB() for string copy CID #511047 Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sun Apr 6 21:02:21 2014 @@ -57,7 +57,7 @@ static VOID -CdfsWSubString(PWCHAR pTarget, const PWCHAR pSource, size_t pLength) +CdfsWSubString(LPWSTR pTarget, LPCWSTR pSource, size_t pLength) { wcsncpy (pTarget, pSource, pLength); pTarget [pLength] = L'\0'; @@ -76,7 +76,7 @@ if (FileName) { - wcscpy(Fcb->PathName, FileName); + CdfsWSubString(Fcb->PathName, FileName, sizeof(Fcb->PathName) / sizeof(Fcb->PathName[0]) - 1); if (wcsrchr(Fcb->PathName, '\\') != 0) { Fcb->ObjectName = wcsrchr(Fcb->PathName, '\\');

1 0

[pschweitzer] 62675: [CHARMAP] Use rather wcsncpy(). A bit less safe, but at least, data are copied till possible
by pschweitzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: pschweitzer Date: Sun Apr 6 20:20:39 2014 New Revision: 62675 URL: http://svn.reactos.org/svn/reactos?rev=62675&view=rev Log: [CHARMAP] Use rather wcsncpy(). A bit less safe, but at least, data are copied till possible Modified: trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Sun Apr 6 20:20:39 2014 @@ -48,9 +48,9 @@ hdc); lf.lfCharSet = DEFAULT_CHARSET; - wcscpy_s(lf.lfFaceName, - sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0]), - lpFontName); + wcsncpy(lf.lfFaceName, + lpFontName, + sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0])); hFont = CreateFontIndirectW(&lf); 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] Sun Apr 6 20:20:39 2014 @@ -228,9 +228,9 @@ ReleaseDC(infoPtr->hMapWnd, hdc); infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; - wcscpy_s(infoPtr->CurrentFont.lfFaceName, - sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0]), - lpFontName); + wcsncpy(infoPtr->CurrentFont.lfFaceName, + lpFontName, + sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0])); infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont);

1 0

[pschweitzer] 62674: [CHARMAP] Fix buffer overruns. Dedicated to Thomas :-). CID #515199 CID #512920
by pschweitzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: pschweitzer Date: Sun Apr 6 20:14:16 2014 New Revision: 62674 URL: http://svn.reactos.org/svn/reactos?rev=62674&view=rev Log: [CHARMAP] Fix buffer overruns. Dedicated to Thomas :-). CID #515199 CID #512920 Modified: trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Sun Apr 6 20:14:16 2014 @@ -48,8 +48,9 @@ hdc); lf.lfCharSet = DEFAULT_CHARSET; - wcscpy(lf.lfFaceName, - lpFontName); + wcscpy_s(lf.lfFaceName, + sizeof(lf.lfFaceName) / sizeof(lf.lfFaceName[0]), + lpFontName); hFont = CreateFontIndirectW(&lf); 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] Sun Apr 6 20:14:16 2014 @@ -228,8 +228,9 @@ ReleaseDC(infoPtr->hMapWnd, hdc); infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; - wcscpy(infoPtr->CurrentFont.lfFaceName, - lpFontName); + wcscpy_s(infoPtr->CurrentFont.lfFaceName, + sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0]), + lpFontName); infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont);

1 0

[khornicek] 62673: [KBSWITCH] - fix possible buffer overrun CID #716051 CID #716052
by khornicek＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: khornicek Date: Sun Apr 6 20:10:24 2014 New Revision: 62673 URL: http://svn.reactos.org/svn/reactos?rev=62673&view=rev Log: [KBSWITCH] - fix possible buffer overrun CID #716051 CID #716052 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 6 20:10:24 2014 @@ -113,7 +113,7 @@ tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); - lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip) / sizeof(TCHAR)); Shell_NotifyIcon(NIM_ADD, &tnid); } @@ -142,7 +142,7 @@ tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); - lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip)); + lstrcpyn(tnid.szTip, szName, sizeof(tnid.szTip) / sizeof(TCHAR)); Shell_NotifyIcon(NIM_MODIFY, &tnid); }

1 0

[pschweitzer] 62672: [ATACTL] - Fix resource leak - Fix uninit field in struct CID #716281 CID #716748 CID #716749 CID #716751 CID #716752 CID #716753 CID #731454
by pschweitzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: pschweitzer Date: Sun Apr 6 19:48:22 2014 New Revision: 62672 URL: http://svn.reactos.org/svn/reactos?rev=62672&view=rev Log: [ATACTL] - Fix resource leak - Fix uninit field in struct CID #716281 CID #716748 CID #716749 CID #716751 CID #716752 CID #716753 CID #731454 Modified: trunk/reactos/base/applications/atactl/atactl.cpp Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Sun Apr 6 19:48:22 2014 @@ -727,6 +727,7 @@ } */ + addr.Length = sizeof(addr); addr.PortNumber = -1; addr.PathId = inquiryData->PathId; addr.TargetId = inquiryData->TargetId; @@ -986,12 +987,14 @@ h = ata_open_dev(dev_name); if(!h) return FALSE; + addr.Length = sizeof(addr); addr.PortNumber = bus_id; len = sizeof(ADAPTERINFO)+sizeof(CHANINFO)*AHCI_MAX_PORT; if(!g_AdapterInfo) { AdapterInfo = (PADAPTERINFO)GlobalAlloc(GMEM_FIXED, len); if(!AdapterInfo) { + ata_close_dev(h); return FALSE; } } else { @@ -1111,6 +1114,7 @@ h = ata_open_dev(dev_name); if(!h) return FALSE; + addr.Length = sizeof(addr); addr.PortNumber = bus_id; addr.PathId = (UCHAR)(dev_id >> 16); addr.TargetId = (UCHAR)(dev_id >> 8); @@ -1155,6 +1159,7 @@ h = ata_open_dev(dev_name); if(!h) return FALSE; + addr.Length = sizeof(addr); addr.PortNumber = bus_id; addr.PathId = (UCHAR)(dev_id >> 16); addr.TargetId = (UCHAR)(dev_id >> 8); @@ -1213,6 +1218,7 @@ h = ata_open_dev(dev_name); if(!h) return FALSE; + addr.Length = sizeof(addr); addr.PortNumber = bus_id; addr.PathId = (UCHAR)(dev_id >> 16); addr.TargetId = (UCHAR)(dev_id >> 8); @@ -1268,6 +1274,7 @@ if((UCHAR)(dev_id) != 0xff && (UCHAR)(dev_id >> 8) != 0xff) { + addr.Length = sizeof(addr); addr.PortNumber = bus_id; addr.PathId = (UCHAR)(dev_id >> 16); addr.TargetId = 0;

1 0

[khornicek] 62671: [FONTVIEW] - add czech translation - fix a leak CID #731443
by khornicek＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: khornicek Date: Sun Apr 6 18:57:16 2014 New Revision: 62671 URL: http://svn.reactos.org/svn/reactos?rev=62671&view=rev Log: [FONTVIEW] - add czech translation - fix a leak CID #731443 Added: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/fontview/fontview.rc Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sun Apr 6 18:57:16 2014 @@ -34,8 +34,8 @@ static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; -/* Tye definition for the GetFontResourceInfo function */ -typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPVOID, DWORD); +/* GetFontResourceInfoW is undocumented */ +BOOL WINAPI GetFontResourceInfoW(LPCWSTR lpFileName, DWORD *pdwBufSize, void* lpBuffer, DWORD dwType); DWORD FormatString( @@ -97,8 +97,6 @@ HWND hMainWnd; MSG msg; WNDCLASSEXW wincl; - HINSTANCE hDLL; - PGFRI GetFontResourceInfoW; LPCWSTR fileName; switch (GetUserDefaultUILanguage()) @@ -164,10 +162,6 @@ ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); return -1; } - - /* Load the GetFontResourceInfo function from gdi32.dll */ - hDLL = LoadLibraryW(L"GDI32.DLL"); - GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); /* Get the font name */ dwSize = sizeof(g_ExtLogFontW.elfFullName); Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Sun Apr 6 18:57:16 2014 @@ -23,6 +23,9 @@ #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" #endif #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" Added: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/fontview/lang/cs-CZ.rc [iso-8859-1] Sun Apr 6 18:57:16 2014 @@ -0,0 +1,13 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INSTALL "Nainstalovat" + IDS_PRINT "Tisk" + IDS_STRING "PÅÃliÅ¡ Å¾luÅ¥ouÄkÃ½ kÅ¯Å ÃºpÄl ÄÃ¡belskÃ© Ã³dy. 1234567890" + IDS_OPEN "OtevÅÃt soubor pÃsma..." + IDS_ERROR "Chyba" + IDS_ERROR_NOMEM "K dokonÄenÃ operace nenÃ dostatek pamÄti." + IDS_ERROR_NOFONT "Soubor %1 nenÃ platnÃ½m souborem pÃsma." + IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala." +END Propchange: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 62670: [CONSRV] - text.c: Few code formatting, and remove a warning. - guiterm.c: Implement basic word selection.
by hbelusca＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: hbelusca Date: Sun Apr 6 17:46:49 2014 New Revision: 62670 URL: http://svn.reactos.org/svn/reactos?rev=62670&view=rev Log: [CONSRV] - text.c: Few code formatting, and remove a warning. - guiterm.c: Implement basic word selection. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Apr 6 17:46:49 2014 @@ -1162,7 +1162,42 @@ case WM_LBUTTONDBLCLK: { - DPRINT1("Handle left-double-click for selecting a word\n"); + PCONSOLE_SCREEN_BUFFER Buffer = GuiData->ActiveBuffer; + + if (GetType(Buffer) == TEXTMODE_BUFFER) + { +#define IS_WHITESPACE(c) \ + ((c) == L'\0' || (c) == L' ' || (c) == L'\t' || (c) == L'\r' || (c) == L'\n') + + PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; + COORD cL, cR; + PCHAR_INFO ptrL, ptrR; + + /* Starting point */ + cL = cR = PointToCoord(GuiData, lParam); + ptrL = ptrR = ConioCoordToPointer(TextBuffer, cL.X, cL.Y); + + /* Enlarge the selection by checking for whitespace */ + while ((0 < cL.X) && !IS_WHITESPACE(ptrL->Char.UnicodeChar) + && !IS_WHITESPACE((ptrL-1)->Char.UnicodeChar)) + { + --cL.X; + --ptrL; + } + while ((cR.X < TextBuffer->ScreenBufferSize.X - 1) && + !IS_WHITESPACE(ptrR->Char.UnicodeChar) && + !IS_WHITESPACE((ptrR+1)->Char.UnicodeChar)) + { + ++cR.X; + ++ptrR; + } + + Console->Selection.dwSelectionAnchor = cL; + Console->dwSelectionCursor = cR; + + GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); + } + break; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Sun Apr 6 17:46:49 2014 @@ -89,9 +89,9 @@ for (yPos = 0; yPos < selHeight; yPos++) { - ptr = ConioCoordToPointer(Buffer, + ptr = ConioCoordToPointer(Buffer, Console->Selection.srSelection.Left, - yPos + Console->Selection.srSelection.Top); + Console->Selection.srSelection.Top + yPos); /* Copy only the characters, leave attributes alone */ for (xPos = 0; xPos < selWidth; xPos++) { @@ -139,7 +139,7 @@ LPWSTR str; WCHAR CurChar = 0; - SHORT VkKey; // MAKEWORD(low = vkey_code, high = shift_state); + USHORT VkKey; // MAKEWORD(low = vkey_code, high = shift_state); INPUT_RECORD er; hData = GetClipboardData(CF_UNICODETEXT);

1 0

[khornicek] 62669: [DXDIAG] - fix a buffer overrun CID #1102308
by khornicek＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: khornicek Date: Sun Apr 6 17:33:12 2014 New Revision: 62669 URL: http://svn.reactos.org/svn/reactos?rev=62669&view=rev Log: [DXDIAG] - fix a buffer overrun CID #1102308 Modified: trunk/reactos/base/applications/dxdiag/network.c Modified: trunk/reactos/base/applications/dxdiag/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/n… ============================================================================== --- trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] Sun Apr 6 17:33:12 2014 @@ -282,7 +282,7 @@ { RegProviders |= (1 << ProviderIndex); szResult[0] = L'\0'; - LoadStringW(hInst, IDS_REG_SUCCESS, szResult, sizeof(szResult)); + LoadStringW(hInst, IDS_REG_SUCCESS, szResult, sizeof(szResult) / sizeof(WCHAR)); Item.iSubItem = 1; Item.iItem = ProviderIndex + ItemCount;

1 0

[pschweitzer] 62668: [NTOSKRNL] Fix overflow CID #701303
by pschweitzer＠svn.reactos.org 06 Apr '14

06 Apr '14

Author: pschweitzer Date: Sun Apr 6 17:18:55 2014 New Revision: 62668 URL: http://svn.reactos.org/svn/reactos?rev=62668&view=rev Log: [NTOSKRNL] Fix overflow CID #701303 Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sun Apr 6 17:18:55 2014 @@ -2474,7 +2474,7 @@ NumberOfEntries = EfiHeader->NumberOfEntries; RtlCopyMemory(&DiskGuid, &EfiHeader->DiskGUID, sizeof(GUID)); /* Count number of sectors needed to store partitions */ - SectorsForPartitions = (NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = ((ULONGLONG)NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Set first usable LBA: Legacy MBR + GPT header + Partitions entries */ FirstUsableLBA = SectorsForPartitions + 2; /* Set last usable LBA: Last sector - GPT header - Partitions entries */

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
50
Older →

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