Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 63032: [NETCFGX] - Use correct parent key instead of an uninitialized handle in INetCfgComponentControl_fnApplyRegistryChanges CORE-8115 #resolve
by tfaber＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: tfaber Date: Mon Apr 28 08:27:57 2014 New Revision: 63032 URL: http://svn.reactos.org/svn/reactos?rev=63032&view=rev Log: [NETCFGX] - Use correct parent key instead of an uninitialized handle in INetCfgComponentControl_fnApplyRegistryChanges CORE-8115 #resolve Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Mon Apr 28 08:27:57 2014 @@ -3141,7 +3141,7 @@ //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges", NULL, MB_OK); - if (RegCreateKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { if (pCurrentConfig->pDNS) {

1 0

[tfaber] 63031: [EVENTVWR] - Remove dead code in GetEventCategory - Fix buffer overflows in DisplayEvent - Patch by Víctor Martínez CORE-8111 #resolve
by tfaber＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: tfaber Date: Mon Apr 28 08:15:28 2014 New Revision: 63031 URL: http://svn.reactos.org/svn/reactos?rev=63031&view=rev Log: [EVENTVWR] - Remove dead code in GetEventCategory - Fix buffer overflows in DisplayEvent - Patch by Víctor Martínez CORE-8111 #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] Mon Apr 28 08:15:28 2014 @@ -261,18 +261,11 @@ EVENT_MESSAGE_FILE_BUFFER, NULL) != 0) { - if (lpMsgBuf) - { - /* Trim the string */ - TrimNulls((LPWSTR)lpMsgBuf); - - /* Copy the category name */ - wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); - } - else - { - wcscpy(CategoryName, (LPCWSTR)lpMsgBuf); - } + /* Trim the string */ + TrimNulls(lpMsgBuf); + + /* Copy the category name */ + wcscpy(CategoryName, lpMsgBuf); } else { @@ -1118,14 +1111,14 @@ if (iIndex != -1) { - ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) * sizeof(WCHAR)); - ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) * sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 0, szEventType, sizeof(szEventType) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 1, szDate, sizeof(szDate) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 2, szTime, sizeof(szTime) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 3, szSource, sizeof(szSource) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 4, szCategory, sizeof(szCategory) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 5, szEventID, sizeof(szEventID) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 6, szUser, sizeof(szUser) / sizeof(WCHAR)); + ListView_GetItemText(hwndListView, iIndex, 7, szComputer, sizeof(szComputer) / sizeof(WCHAR)); bEventData = !(pevlr->DataLength == 0);

1 0

[tfaber] 63030: [FIND] - Avoid printf on a non-format string. Spotted by Víctor - Remove broken pseudo-TCHAR usage CORE-8112 #resolve
by tfaber＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: tfaber Date: Mon Apr 28 08:06:52 2014 New Revision: 63030 URL: http://svn.reactos.org/svn/reactos?rev=63030&view=rev Log: [FIND] - Avoid printf on a non-format string. Spotted by Víctor - Remove broken pseudo-TCHAR usage CORE-8112 #resolve Modified: trunk/reactos/base/applications/cmdutils/find/find.c Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] Mon Apr 28 08:06:52 2014 @@ -125,11 +125,11 @@ void usage (void) { - TCHAR lpUsage[4096]; - - LoadString( GetModuleHandle(NULL), IDS_USAGE, (LPTSTR)lpUsage, 4096); - CharToOem(lpUsage, lpUsage); - printf( lpUsage ); + char szUsage[4096]; + + LoadStringA (GetModuleHandle (NULL), IDS_USAGE, szUsage, sizeof(szUsage) / sizeof(szUsage[0])); + CharToOemA (szUsage, szUsage); + fputs (szUsage, stdout); } @@ -139,7 +139,7 @@ { char *opt, *needle = NULL; int ret = 0; - TCHAR lpMessage[4096]; + char szMessage[4096]; int invert_search = 0; /* flag to invert the search */ int count_lines = 0; /* flag to whether/not count lines */ @@ -216,9 +216,9 @@ { /* We were not able to find a file. Display a message and set the exit status. */ - LoadString( GetModuleHandle(NULL), IDS_NO_SUCH_FILE, (LPTSTR)lpMessage, 4096); - CharToOem(lpMessage, lpMessage); - fprintf (stderr, lpMessage, *argv);// + LoadStringA (GetModuleHandle (NULL), IDS_NO_SUCH_FILE, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); + CharToOemA (szMessage, szMessage); + fprintf (stderr, szMessage, *argv); } else { @@ -235,9 +235,9 @@ } else { - LoadString(GetModuleHandle(NULL), IDS_CANNOT_OPEN, (LPTSTR)lpMessage, 4096); - CharToOem(lpMessage, lpMessage); - fprintf (stderr, lpMessage, + LoadString (GetModuleHandle (NULL), IDS_CANNOT_OPEN, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); + CharToOemA (szMessage, szMessage); + fprintf (stderr, szMessage, finddata.name); } }

1 0

[tfaber] 63029: [DWNL] - Fix a format specifier. Patch by Víctor Martínez CORE-8113 #resolve
by tfaber＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: tfaber Date: Mon Apr 28 08:04:14 2014 New Revision: 63029 URL: http://svn.reactos.org/svn/reactos?rev=63029&view=rev Log: [DWNL] - Fix a format specifier. Patch by Víctor Martínez CORE-8113 #resolve Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] Mon Apr 28 08:04:14 2014 @@ -225,7 +225,7 @@ if (This->szMimeType[0] != _T('\0')) _tprintf(_T("Length: %I64u [%s]\n"), This->Size, This->szMimeType); else - _tprintf(_T("Length: %ull\n"), This->Size); + _tprintf(_T("Length: %I64u\n"), This->Size); } _tprintf(_T("\n"));

1 0

[jimtabor] 63028: [Win32k] - Goodbye to menu ntuser bad functions.
by jimtabor＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: jimtabor Date: Mon Apr 28 05:54:43 2014 New Revision: 63028 URL: http://svn.reactos.org/svn/reactos?rev=63028&view=rev Log: [Win32k] - Goodbye to menu ntuser bad functions. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -3390,21 +3390,6 @@ #define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 #define HWNDPARAM_ROUTINE_ROS_NOTIFYWINEVENT 0x1005 -DWORD -NTAPI -NtUserBuildMenuItemList( - HMENU hMenu, - PVOID Buffer, - ULONG nBufSize, - DWORD Reserved); - -UINT -NTAPI -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags); - BOOL NTAPI NtUserGetMonitorInfo( @@ -3443,14 +3428,6 @@ BOOL TimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ } ROSMENUINFO, *PROSMENUINFO; -BOOL -NTAPI -NtUserMenuInfo( - HMENU hmenu, - PROSMENUINFO lpmi, - BOOL fsog -); - typedef struct tagROSMENUITEMINFO { /* ----------- MENUITEMINFOW ----------- */ @@ -3473,16 +3450,6 @@ SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP state */ } ROSMENUITEMINFO, *PROSMENUITEMINFO; -BOOL -NTAPI -NtUserMenuItemInfo( - HMENU hMenu, - UINT uItem, - BOOL fByPosition, - PROSMENUITEMINFO lpmii, - BOOL fsog -); - HMONITOR NTAPI NtUserMonitorFromPoint( Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -2724,139 +2724,4 @@ END_CLEANUP; } -////// ReactOS NtUserBad is unpluged! - -DWORD -APIENTRY -NtUserBuildMenuItemList( - HMENU hMenu, - VOID* Buffer, - ULONG nBufSize, - DWORD Reserved) -{ -/* DWORD res = -1; - PMENU Menu; - DECLARE_RETURN(DWORD); - - TRACE("Enter NtUserBuildMenuItemList\n"); - UserEnterExclusive(); - - if(!(Menu = UserGetMenuObject(hMenu))) - { - RETURN( (DWORD)-1); - } - - if(Buffer) - { - res = IntBuildMenuItemList(Menu, Buffer, nBufSize); - } - else - { - res = Menu->cItems; - } - - RETURN( res); - -CLEANUP: - TRACE("Leave NtUserBuildMenuItemList, ret=%lu\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -UINT APIENTRY -NtUserGetMenuDefaultItem( - HMENU hMenu, - UINT fByPos, - UINT gmdiFlags) -{ -/* PMENU Menu; - DWORD gismc = 0; - DECLARE_RETURN(UINT); - - TRACE("Enter NtUserGetMenuDefaultItem\n"); - UserEnterExclusive(); - - if(!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(-1); - } - - RETURN( IntGetMenuDefaultItem(Menu, fByPos, gmdiFlags, &gismc)); - -CLEANUP: - TRACE("Leave NtUserGetMenuDefaultItem, ret=%u\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserMenuInfo( - HMENU hMenu, - PROSMENUINFO UnsafeMenuInfo, - BOOL SetOrGet) -{ -/* PMENU Menu; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserMenuInfo\n"); - UserEnterShared(); - - if (!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(FALSE); - } - - RETURN(UserMenuInfo(Menu, UnsafeMenuInfo, SetOrGet)); - -CLEANUP: - TRACE("Leave NtUserMenuInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserMenuItemInfo( - HMENU hMenu, - UINT Item, - BOOL ByPosition, - PROSMENUITEMINFO UnsafeItemInfo, - BOOL SetOrGet) -{ -/* PMENU Menu; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserMenuItemInfo\n"); - UserEnterExclusive(); - - if (!(Menu = UserGetMenuObject(hMenu))) - { - RETURN(FALSE); - } - - RETURN( UserMenuItemInfo(Menu, Item, ByPosition, UnsafeItemInfo, SetOrGet)); - -CLEANUP: - TRACE("Leave NtUserMenuItemInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -*/ - STUB - - return 0; -} - /* EOF */ Modified: trunk/reactos/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=630… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -681,11 +681,7 @@ NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 # -NtUserBuildMenuItemList 4 -NtUserGetMenuDefaultItem 3 NtUserGetMonitorInfo 2 -NtUserMenuInfo 3 -NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6302… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Mon Apr 28 05:54:43 2014 @@ -688,11 +688,7 @@ SVC_(GdiOffsetViewportOrgEx, 4) SVC_(GdiOffsetWindowOrgEx, 4) -SVC_(UserBuildMenuItemList, 4) -SVC_(UserGetMenuDefaultItem, 3) SVC_(UserGetMonitorInfo, 2) -SVC_(UserMenuInfo, 3) -SVC_(UserMenuItemInfo, 5) SVC_(UserMonitorFromPoint, 3) SVC_(UserMonitorFromRect, 2) SVC_(UserMonitorFromWindow, 2)

1 0

[jimtabor] 63027: [Win32k] - Moved to new menu structures, synced in wine code and started first phase to server side. Resulting that more tests are running and failing less. Unplugged ntuser bad f...
by jimtabor＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: jimtabor Date: Mon Apr 28 03:55:23 2014 New Revision: 63027 URL: http://svn.reactos.org/svn/reactos?rev=63027&view=rev Log: [Win32k] - Moved to new menu structures, synced in wine code and started first phase to server side. Resulting that more tests are running and failing less. Unplugged ntuser bad functions. - See CORE-5605, CORE-7447, CORE-7967, CORE-8098 and CORE-8107 Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/accelerator.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…

1 0

[jimtabor] 63026: - Disable insert menu test for now. Part II.
by jimtabor＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: jimtabor Date: Mon Apr 28 03:51:52 2014 New Revision: 63026 URL: http://svn.reactos.org/svn/reactos?rev=63026&view=rev Log: - Disable insert menu test for now. Part II. Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Mon Apr 28 03:51:52 2014 @@ -3632,7 +3632,10 @@ test_menu_search_bycommand(); test_CheckMenuRadioItem(); test_menu_resource_layout(); - //test_InsertMenu(); //// need more time... + if(!winetest_interactive) + skip("WIP turn off test for now.\n"); + else + test_InsertMenu(); //// need more time... test_menualign(); }

1 0

[jimtabor] 63025: - Disable insert menu test for now.
by jimtabor＠svn.reactos.org 28 Apr '14

28 Apr '14

Author: jimtabor Date: Mon Apr 28 03:46:21 2014 New Revision: 63025 URL: http://svn.reactos.org/svn/reactos?rev=63025&view=rev Log: - Disable insert menu test for now. Modified: trunk/rostests/winetests/user32/menu.c Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Mon Apr 28 03:46:21 2014 @@ -3632,7 +3632,7 @@ test_menu_search_bycommand(); test_CheckMenuRadioItem(); test_menu_resource_layout(); - test_InsertMenu(); + //test_InsertMenu(); //// need more time... test_menualign(); }

1 0

[aandrejevic] 63024: [NTVDM] Don't define STANDALONE by default. Don't quit ntvdm after it becomes the last process on the console if a DOS app is still running.
by aandrejevic＠svn.reactos.org 27 Apr '14

27 Apr '14

Author: aandrejevic Date: Sun Apr 27 22:38:54 2014 New Revision: 63024 URL: http://svn.reactos.org/svn/reactos?rev=63024&view=rev Log: [NTVDM] Don't define STANDALONE by default. Don't quit ntvdm after it becomes the last process on the console if a DOS app is still running. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Apr 27 22:38:54 2014 @@ -25,7 +25,7 @@ * Activate this line if you want to run NTVDM in standalone mode with: * ntvdm.exe <program> */ -#define STANDALONE +// #define STANDALONE /* VARIABLES ******************************************************************/ @@ -34,6 +34,7 @@ static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; static CONSOLE_CURSOR_INFO OrgConsoleCursorInfo; static CONSOLE_SCREEN_BUFFER_INFO OrgConsoleBufferInfo; +static BOOLEAN AcceptCommands = TRUE; static HANDLE CommandThread = NULL; static HMENU hConsoleMenu = NULL; @@ -199,7 +200,17 @@ } case CTRL_LAST_CLOSE_EVENT: { - if (CommandThread) TerminateThread(CommandThread, 0); + if (!VdmRunning) + { + /* Exit immediately */ + if (CommandThread) TerminateThread(CommandThread, 0); + } + else + { + /* Stop accepting new commands */ + AcceptCommands = FALSE; + } + break; } default: @@ -390,7 +401,7 @@ UNREFERENCED_PARAMETER(Parameter); - while (TRUE) + while (AcceptCommands) { /* Clear the structure */ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); @@ -435,9 +446,9 @@ INT wmain(INT argc, WCHAR *argv[]) { +#ifdef STANDALONE + DWORD Result; - -#ifdef STANDALONE CHAR ApplicationName[MAX_PATH]; CHAR CommandLine[DOS_CMDLINE_LENGTH];

1 0

[pschweitzer] 63023: [NTOSKRNL] Fix potential overflows CID #701302 CID #1206856
by pschweitzer＠svn.reactos.org 27 Apr '14

27 Apr '14

Author: pschweitzer Date: Sun Apr 27 18:46:26 2014 New Revision: 63023 URL: http://svn.reactos.org/svn/reactos?rev=63023&view=rev Log: [NTOSKRNL] Fix potential overflows CID #701302 CID #1206856 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 27 18:46:26 2014 @@ -1006,7 +1006,7 @@ if ((Disk->SectorCount - 1ULL) != EfiHeader->AlternateLBA) { /* We'll update it. First, count number of sectors needed to store partitions */ - SectorsForPartitions = (EfiHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; + SectorsForPartitions = ((ULONGLONG)EfiHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) / Disk->SectorSize; /* Then set first usable LBA: Legacy MBR + GPT header + Partitions entries */ EfiHeader->FirstUsableLBA = SectorsForPartitions + 2; /* Then set last usable LBA: Last sector - GPT header - Partitions entries */ @@ -1313,7 +1313,7 @@ } /* Compute sectors taken by partitions */ - SectorsForPartitions = ((EFIHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) + Disk->SectorSize - 1) / Disk->SectorSize; + SectorsForPartitions = (((ULONGLONG)EFIHeader->NumberOfEntries * PARTITION_ENTRY_SIZE) + Disk->SectorSize - 1) / Disk->SectorSize; if (PrimaryValid) { WriteBackup = TRUE;

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