Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [MODULES] Add a convenient option to transfer files into a new installation (#877)
by Bernhard Feichtinger 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76daaf9fafadec0fbf98c… commit 76daaf9fafadec0fbf98c068080cdd15320f4ffb Author: Bernhard Feichtinger <43303168+BieHDC(a)users.noreply.github.com> AuthorDate: Fri Nov 16 23:26:58 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 16 23:26:58 2018 +0100 [MODULES] Add a convenient option to transfer files into a new installation (#877) Purpose: When doing a PXE BootCD installation, you may be left without networking, usb and a cd drive. This adds an easy way to include a few or more files to the installation which are then present on the disk after the installation and which does not require any change to ReactOS source code/build script files (and no manual editing of boot/bootdata/packages/reactos.dff.in). Proposed changes: Adds a new modules/3rdparty folder which lets the files end up in C:\ReactOS\3rdParty ready for use. --- .gitignore | 1 + boot/bootdata/packages/reactos.dff.in | 1 + modules/CMakeLists.txt | 10 ++++++++++ sdk/cmake/CMakeMacros.cmake | 2 ++ 4 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index 9bed1e86be..717e06c033 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ modules/optional modules/bootcd_extras modules/livecd_extras modules/hybridcd_extras +modules/3rdparty .cproject .project .settings diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 9424840238..0b550795d5 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -81,6 +81,7 @@ Signature = "$Windows NT$" 60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef 61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef 62 = Resources\Themes\Modern +63 = 3rdParty .InfEnd diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 78123b6aed..4c68bfb1e5 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -17,6 +17,8 @@ endif() ## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## in the same layout as you want them to be in the CD. +## If you change the content of any of the following folders later on, +## run "cmake ." before compiling. if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*) foreach(item ${EXTRA_FILES}) @@ -35,3 +37,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd) endforeach(item) endif() + +## Extra files which you need existing on the hard drive after the installation. +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/${item} DESTINATION reactos/3rdParty NAME_ON_CD ${item} FOR bootcd) + endforeach(item) +endif() diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index f7eba51794..f5d2a0befa 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -294,6 +294,8 @@ macro(dir_to_num dir var) set(${var} 61) elseif(${dir} STREQUAL reactos/Resources/Themes/Modern) set(${var} 62) + elseif(${dir} STREQUAL reactos/3rdParty) + set(${var} 63) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

01/01: [SHELL32] Print out the error code (#973)
by Bișoc George 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c00bafaad97edc72e15c3… commit c00bafaad97edc72e15c38b30b722649b81896eb Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Nov 16 23:09:15 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 16 23:09:15 2018 +0100 [SHELL32] Print out the error code (#973) When SearchPathW, GetFullPathNameW and PathFileExistsW fail, output the error code. --- dll/win32/shell32/CShellLink.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index fa1adab35f..7b402eb186 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2213,7 +2213,7 @@ static BOOL HACKISH_PathResolve( _countof(szPath), szPath, NULL) != 0); if (!Success) { - ERR("SearchPathW(pszPath = '%S') failed\n", pszPath); + ERR("SearchPathW(pszPath = '%S') failed. Error code: %lu\n", pszPath, GetLastError()); } else { @@ -2224,7 +2224,7 @@ static BOOL HACKISH_PathResolve( if (!Success) { - ERR("SearchPathW(pszPath = '%S') failed\n", pszPath); + ERR("SearchPathW(pszPath = '%S') failed. Error code: %lu\n", pszPath, GetLastError()); /* We failed, try with PathFindOnPath, as explained by MSDN */ // Success = PathFindOnPathW(pszPath, dirs); @@ -2237,13 +2237,13 @@ static BOOL HACKISH_PathResolve( /* We failed again, fall back to building a possible non-existing path */ if (!GetFullPathNameW(pszPath, _countof(szPath), szPath, &fname)) { - ERR("GetFullPathNameW(pszPath = '%S') failed\n", pszPath); + ERR("GetFullPathNameW(pszPath = '%S') failed. Error code: %lu\n", pszPath, GetLastError()); return FALSE; } Success = PathFileExistsW(szPath); if (!Success) - ERR("PathFileExistsW(szPath = '%S') failed\n", szPath); + ERR("PathFileExistsW(szPath = '%S') failed. Error code: %lu\n", szPath, GetLastError()); /******************************************************/ /* Question: Why this line is needed only for files?? */

1 0

01/01: [MSPAINT] Fix scrollbar presence on canvas/view fitting (#878)
by Ștefan Fulea 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d48aa2992d8c9c20d6cf… commit 3d48aa2992d8c9c20d6cf72065dc02fc07d3553b Author: Ștefan Fulea <reactos-contributor(a)programmer.net> AuthorDate: Sat Nov 17 00:05:51 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 16 23:05:51 2018 +0100 [MSPAINT] Fix scrollbar presence on canvas/view fitting (#878) * [MSPAINT] Fix scrollbar presence on canvas/view fitting This is a small fix for a scrollbar related edge case functionality exhibited in mspaint (and in a lesser degree also elsewhere in instances of) scrollbar controlled content. As known, the scrollbars presence is given by the size ratio between the accommodating outer frame and the scroll-controlled contents inside it, and it works for the most part. There is, however, a case where the presence of both toolbars is kept even when the contents would fit the frame (if not for the scrollba [...] * [MSPAINT] Fix a small mistake and improve readability in UpdateScrollbox() Although with no visible impact on testing, I've used a wrong constant related to vertical scrollbox width in one instance (SM_CXHSCROLL instead of SM_CXVSCROLL), and this fixes it. Also, prefer using constants, to improve a bit readability and performance (by avoiding repeated function calls). --- base/applications/mspaint/scrollbox.cpp | 84 ++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/scrollbox.cpp b/base/applications/mspaint/scrollbox.cpp index b0ef7373c7..351c59c717 100644 --- a/base/applications/mspaint/scrollbox.cpp +++ b/base/applications/mspaint/scrollbox.cpp @@ -9,31 +9,89 @@ /* INCLUDES *********************************************************/ #include "precomp.h" +#include <atltypes.h> + +/* + * Scrollbar functional modes: + * 0 view < canvas + * 1 view < canvas + scroll width + * 2 view >= canvas + scroll width + * + * Matrix of scrollbar presence (VERTICAL,HORIZONTAL) given by + * vertical & horizontal scrollbar modes (view:canvas ratio): + * + * horizontal mode + * | 0 | 1 | 2 + * vertical ---+-------------+-------------+------------ + * mode 0 | TRUE,TRUE | TRUE,TRUE | TRUE,FALSE + * ---+-------------+-------------+------------ + * 1 | TRUE,TRUE | FALSE,FALSE | FALSE,FALSE + * ---+-------------+-------------+------------ + * 2 | FALSE,TRUE | FALSE,FALSE | FALSE,FALSE + */ + +struct ScrollbarPresence +{ + BOOL bVert; + BOOL bHoriz; +}; + +CONST ScrollbarPresence sp_mx[3][3] = +{ + { { TRUE,TRUE }, { TRUE,TRUE }, { TRUE,FALSE } }, + { { TRUE,TRUE }, { FALSE,FALSE }, { FALSE,FALSE } }, + { { FALSE,TRUE }, { FALSE,FALSE }, { FALSE,FALSE } } +}; + +CONST INT HSCROLL_WIDTH = ::GetSystemMetrics(SM_CYHSCROLL); +CONST INT VSCROLL_WIDTH = ::GetSystemMetrics(SM_CXVSCROLL); + /* FUNCTIONS ********************************************************/ void UpdateScrollbox() { - RECT clientRectScrollbox; - RECT clientRectImageArea; + CONST INT EXTRASIZE = 5; /* 3 px of selection markers + 2 px of border */ + + CRect tempRect; + CSize sizeImageArea; + CSize sizeScrollBox; + INT vmode, hmode; SCROLLINFO si; - scrollboxWindow.GetClientRect(&clientRectScrollbox); - imageArea.GetClientRect(&clientRectImageArea); + + scrollboxWindow.GetWindowRect(&tempRect); + sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); + + imageArea.GetClientRect(&tempRect); + sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); + sizeImageArea += CSize(EXTRASIZE * 2, EXTRASIZE * 2); + + /* show/hide the scrollbars */ + vmode = (sizeScrollBox.cy < sizeImageArea.cy ? 0 : + (sizeScrollBox.cy < sizeImageArea.cy + HSCROLL_WIDTH ? 1 : 2)); + hmode = (sizeScrollBox.cx < sizeImageArea.cx ? 0 : + (sizeScrollBox.cx < sizeImageArea.cx + VSCROLL_WIDTH ? 1 : 2)); + scrollboxWindow.ShowScrollBar(SB_VERT, sp_mx[vmode][hmode].bVert); + scrollboxWindow.ShowScrollBar(SB_HORZ, sp_mx[vmode][hmode].bHoriz); + si.cbSize = sizeof(SCROLLINFO); si.fMask = SIF_PAGE | SIF_RANGE; - si.nMax = clientRectImageArea.right + 6 - 1; si.nMin = 0; - si.nPage = clientRectScrollbox.right; + + si.nMax = sizeImageArea.cx + + (sp_mx[vmode][hmode].bVert == TRUE ? HSCROLL_WIDTH : 0); + si.nPage = sizeScrollBox.cx; scrollboxWindow.SetScrollInfo(SB_HORZ, &si); - scrollboxWindow.GetClientRect(&clientRectScrollbox); - si.nMax = clientRectImageArea.bottom + 6 - 1; - si.nPage = clientRectScrollbox.bottom; + + si.nMax = sizeImageArea.cy + + (sp_mx[vmode][hmode].bHoriz == TRUE ? VSCROLL_WIDTH : 0); + si.nPage = sizeScrollBox.cy; scrollboxWindow.SetScrollInfo(SB_VERT, &si); - scrlClientWindow.MoveWindow( - -scrollboxWindow.GetScrollPos(SB_HORZ), -scrollboxWindow.GetScrollPos(SB_VERT), - max(clientRectImageArea.right + 6, clientRectScrollbox.right), - max(clientRectImageArea.bottom + 6, clientRectScrollbox.bottom), TRUE); + + scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), + -scrollboxWindow.GetScrollPos(SB_VERT), + sizeImageArea.cx, sizeImageArea.cy, TRUE); } LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

02/02: [MC] Add messages 3190-3299. The first NELOG range is done.
by Eric Kohl 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c83c683bc3050074cc868… commit c83c683bc3050074cc86851a94568e987425e49b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Nov 16 22:21:55 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Nov 16 22:26:50 2018 +0100 [MC] Add messages 3190-3299. The first NELOG range is done. --- sdk/include/reactos/mc/netmsgmsg.mc | 603 ++++++++++++++++++++++++++++++++++++ 1 file changed, 603 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index ff5c299d6c..2c370a96ab 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -4070,6 +4070,609 @@ Language=Russian Local security could not be started because an error\noccurred during initialization. The error code returned is %1.\n\nTHE SYSTEM IS NOT SECURE.\n . +MessageId=3190 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_Internal_Error +Language=English +A NetWksta internal error has occurred:\n%1 +. +Language=Russian +A NetWksta internal error has occurred:\n%1 +. + +MessageId=3191 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_No_Resource +Language=English +The redirector is out of a resource: %1. +. +Language=Russian +The redirector is out of a resource: %1. +. + +MessageId=3192 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_SMB_Err +Language=English +A server message block (SMB) error occurred on the connection to %1.\nThe SMB header is the data. +. +Language=Russian +A server message block (SMB) error occurred on the connection to %1.\nThe SMB header is the data. +. + +MessageId=3193 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_VC_Err +Language=English +A virtual circuit error occurred on the session to %1.\nThe network control block (NCB) command and return code is the data. +. +Language=Russian +A virtual circuit error occurred on the session to %1.\nThe network control block (NCB) command and return code is the data. +. + +MessageId=3194 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_Stuck_VC_Err +Language=English +Hanging up a stuck session to %1. +. +Language=Russian +Hanging up a stuck session to %1. +. + +MessageId=3195 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_NCB_Err +Language=English +A network control block (NCB) error occurred (%1).\nThe NCB is the data. +. +Language=Russian +A network control block (NCB) error occurred (%1).\nThe NCB is the data. +. + +MessageId=3196 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_Write_Behind_Err +Language=English +A write operation to %1 failed.\nData may have been lost. +. +Language=Russian +A write operation to %1 failed.\nData may have been lost. +. + +MessageId=3197 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_Reset_Err +Language=English +Reset of driver %1 failed to complete the network control block (NCB).\nThe NCB is the data. +. +Language=Russian +Reset of driver %1 failed to complete the network control block (NCB).\nThe NCB is the data. +. + +MessageId=3198 +Severity=Success +Facility=System +SymbolicName=NELOG_NetWkSta_Too_Many +Language=English +The amount of resource %1 requested was more\nthan the maximum. The maximum amount was allocated. +. +Language=Russian +The amount of resource %1 requested was more\nthan the maximum. The maximum amount was allocated. +. + +MessageId=3204 +Severity=Success +Facility=System +SymbolicName=NELOG_Srv_Thread_Failure +Language=English +The server could not create a thread.\nThe THREADS parameter in the CONFIG.SYS file should be increased. +. +Language=Russian +The server could not create a thread.\nThe THREADS parameter in the CONFIG.SYS file should be increased. +. + +MessageId=3205 +Severity=Success +Facility=System +SymbolicName=NELOG_Srv_Close_Failure +Language=English +The server could not close %1.\nThe file is probably corrupted. +. +Language=Russian +The server could not close %1.\nThe file is probably corrupted. +. + +MessageId=3206 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplUserCurDir +Language=English +The replicator cannot update directory %1. It has tree integrity\nand is the current directory for some process. +. +Language=Russian +The replicator cannot update directory %1. It has tree integrity\nand is the current directory for some process. +. + +MessageId=3207 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplCannotMasterDir +Language=English +The server cannot export directory %1 to client %2.\nIt is exported from another server. +. +Language=Russian +The server cannot export directory %1 to client %2.\nIt is exported from another server. +. + +MessageId=3208 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplUpdateError +Language=English +The replication server could not update directory %2 from the source\non %3 due to error %1. +. +Language=Russian +The replication server could not update directory %2 from the source\non %3 due to error %1. +. + +MessageId=3209 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplLostMaster +Language=English +Master %1 did not send an update notice for directory %2 at the expected\ntime. +. +Language=Russian +Master %1 did not send an update notice for directory %2 at the expected\ntime. +. + +MessageId=3210 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonAuthDCFail +Language=English +This computer could not authenticate with %2, a domain controller\n +for domain %1, and therefore this computer might deny logon requests.\n +This inability to authenticate might be caused by another computer on the\n +same network using the same name or the password for this computer account\n +is not recognized. If this message appears again, contact your system\n +administrator. +. +Language=Russian +This computer could not authenticate with %2, a domain controller\n +for domain %1, and therefore this computer might deny logon requests.\n +This inability to authenticate might be caused by another computer on the\n +same network using the same name or the password for this computer account\n +is not recognized. If this message appears again, contact your system\n +administrator. +. + +MessageId=3211 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplLogonFailed +Language=English +The replicator attempted to log on at %2 as %1 and failed. +. +Language=Russian +The replicator attempted to log on at %2 as %1 and failed. +. + +MessageId=3212 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplNetErr +Language=English +Network error %1 occurred. +. +Language=Russian +Network error %1 occurred. +. + +MessageId=3213 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplMaxFiles +Language=English +Replicator limit for files in a directory has been exceeded. +. +Language=Russian +Replicator limit for files in a directory has been exceeded. +. + +MessageId=3214 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplMaxTreeDepth +Language=English +Replicator limit for tree depth has been exceeded. +. +Language=Russian +Replicator limit for tree depth has been exceeded. +. + +MessageId=3215 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplBadMsg +Language=English +Unrecognized message received in mailslot. +. +Language=Russian +Unrecognized message received in mailslot. +. + +MessageId=3216 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplSysErr +Language=English +System error %1 occurred. +. +Language=Russian +System error %1 occurred. +. + +MessageId=3217 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplUserLoged +Language=English +Cannot log on. User is currently logged on and argument TRYUSER\nis set to NO. +. +Language=Russian +Cannot log on. User is currently logged on and argument TRYUSER\nis set to NO. +. + +MessageId=3218 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplBadImport +Language=English +IMPORT path %1 cannot be found. +. +Language=Russian +IMPORT path %1 cannot be found. +. + +MessageId=3219 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplBadExport +Language=English +EXPORT path %1 cannot be found. +. +Language=Russian +EXPORT path %1 cannot be found. +. + +MessageId=3220 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplSignalFileErr +Language=English +Replicator failed to update signal file in directory %2 due to\n%1 system error. +. +Language=Russian +Replicator failed to update signal file in directory %2 due to\n%1 system error. +. + +MessageId=3221 +Severity=Success +Facility=System +SymbolicName=NELOG_DiskFT +Language=English +Disk Fault Tolerance Error\n\n%1 +. +Language=Russian +Disk Fault Tolerance Error\n\n%1 +. + +MessageId=3222 +Severity=Success +Facility=System +SymbolicName=NELOG_ReplAccessDenied +Language=English +Replicator could not access %2\non %3 due to system error %1. +. +Language=Russian +Replicator could not access %2\non %3 due to system error %1. +. + +MessageId=3223 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedPrimary +Language=English +The primary domain controller for domain %1 has apparently failed. +. +Language=Russian +The primary domain controller for domain %1 has apparently failed. +. + +MessageId=3224 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonPasswdSetFailed +Language=English +Changing machine account password for account %1 failed with\nthe following error: %n%2 +. +Language=Russian +Changing machine account password for account %1 failed with\nthe following error: %n%2 +. + +MessageId=3225 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonTrackingError +Language=English +An error occurred while updating the logon or logoff information for %1. +. +Language=Russian +An error occurred while updating the logon or logoff information for %1. +. + +MessageId=3226 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonSyncError +Language=English +An error occurred while synchronizing with primary domain controller %1 +. +Language=Russian +An error occurred while synchronizing with primary domain controller %1 +. + +MessageId=3227 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonRequireSignOrSealError +Language=English +The session setup to the Domain Controller %1 for the domain %2 failed\n +because %1 does not support signing or sealing the Netlogon session.\n\n +Either upgrade the Domain Controller or set the RequireSignOrSeal\n +registry entry on this machine to 0. +. +Language=Russian +The session setup to the Domain Controller %1 for the domain %2 failed\n +because %1 does not support signing or sealing the Netlogon session.\n\n +Either upgrade the Domain Controller or set the RequireSignOrSeal\n +registry entry on this machine to 0. +. + +MessageId=3230 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_PowerOut +Language=English +A power failure was detected at the server. +. +Language=Russian +A power failure was detected at the server. +. + +MessageId=3231 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_Shutdown +Language=English +The UPS service performed server shut down. +. +Language=Russian +The UPS service performed server shut down. +. + +MessageId=3232 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_CmdFileError +Language=English +The UPS service did not complete execution of the\nuser specified shut down command file. +. +Language=Russian +The UPS service did not complete execution of the\nuser specified shut down command file. +. + +MessageId=3233 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_CannotOpenDriver +Language=English +The UPS driver could not be opened. The error code is\nthe data. +. +Language=Russian +The UPS driver could not be opened. The error code is\nthe data. +. + +MessageId=3234 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_PowerBack +Language=English +Power has been restored. +. +Language=Russian +Power has been restored. +. + +MessageId=3235 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_CmdFileConfig +Language=English +There is a problem with a configuration of user specified\nshut down command file. +. +Language=Russian +There is a problem with a configuration of user specified\nshut down command file. +. + +MessageId=3236 +Severity=Success +Facility=System +SymbolicName=NELOG_UPS_CmdFileExec +Language=English +The UPS service failed to execute a user specified shutdown\ncommand file %1. The error code is the data. +. +Language=Russian +The UPS service failed to execute a user specified shutdown\ncommand file %1. The error code is the data. +. + +MessageId=3250 +Severity=Success +Facility=System +SymbolicName=NELOG_Missing_Parameter +Language=English +Initialization failed because of an invalid or missing\nparameter in the configuration file %1. +. +Language=Russian +Initialization failed because of an invalid or missing\nparameter in the configuration file %1. +. + +MessageId=3251 +Severity=Success +Facility=System +SymbolicName=NELOG_Invalid_Config_Line +Language=English +Initialization failed because of an invalid line in the\nconfiguration file %1. The invalid line is the data. +. +Language=Russian +Initialization failed because of an invalid line in the\nconfiguration file %1. The invalid line is the data. +. + +MessageId=3252 +Severity=Success +Facility=System +SymbolicName=NELOG_Invalid_Config_File +Language=English +Initialization failed because of an error in the configuration\nfile %1. +. +Language=Russian +Initialization failed because of an error in the configuration\nfile %1. +. + +MessageId=3253 +Severity=Success +Facility=System +SymbolicName=NELOG_File_Changed +Language=English +The file %1 has been changed after initialization.\nThe boot-block loading was temporarily terminated. +. +Language=Russian +The file %1 has been changed after initialization.\nThe boot-block loading was temporarily terminated. +. + +MessageId=3254 +Severity=Success +Facility=System +SymbolicName=NELOG_Files_Dont_Fit +Language=English +The files do not fit to the boot-block configuration\nfile %1. Change the BASE and ORG definitions or the order\nof the files. +. +Language=Russian +The files do not fit to the boot-block configuration\nfile %1. Change the BASE and ORG definitions or the order\nof the files. +. + +MessageId=3255 +Severity=Success +Facility=System +SymbolicName=NELOG_Wrong_DLL_Version +Language=English +Initialization failed because the dynamic-link\nlibrary %1 returned an incorrect version number. +. +Language=Russian +Initialization failed because the dynamic-link\nlibrary %1 returned an incorrect version number. +. + +MessageId=3256 +Severity=Success +Facility=System +SymbolicName=NELOG_Error_in_DLL +Language=English +There was an unrecoverable error in the dynamic-\nlink library of the service. +. +Language=Russian +There was an unrecoverable error in the dynamic-\nlink library of the service. +. + +MessageId=3257 +Severity=Success +Facility=System +SymbolicName=NELOG_System_Error +Language=English +The system returned an unexpected error code.\nThe error code is the data. +. +Language=Russian +The system returned an unexpected error code.\nThe error code is the data. +. + +MessageId=3258 +Severity=Success +Facility=System +SymbolicName=NELOG_FT_ErrLog_Too_Large +Language=English +The fault-tolerance error log file, LANROOT\\LOGS\\FT.LOG,\nis more than 64K. +. +Language=Russian +The fault-tolerance error log file, LANROOT\\LOGS\\FT.LOG,\nis more than 64K. +. + +MessageId=3259 +Severity=Success +Facility=System +SymbolicName=NELOG_FT_Update_In_Progress +Language=English +The fault-tolerance error-log file, LANROOT\\LOGS\\FT.LOG, had the\n +update in progress bit set upon opening, which means that the\n +system crashed while working on the error log. +. +Language=Russian +The fault-tolerance error-log file, LANROOT\\LOGS\\FT.LOG, had the\n +update in progress bit set upon opening, which means that the\n +system crashed while working on the error log. +. + +MessageId=3260 +Severity=Success +Facility=System +SymbolicName=NELOG_Joined_Domain +Language=English +This computer has been successfully joined to domain '%1'. +. +Language=Russian +This computer has been successfully joined to domain '%1'. +. + +MessageId=3261 +Severity=Success +Facility=System +SymbolicName=NELOG_Joined_Workgroup +Language=English +This computer has been successfully joined to workgroup '%1'. +. +Language=Russian +This computer has been successfully joined to workgroup '%1'. +. + +MessageId=3299 +Severity=Success +Facility=System +SymbolicName=NELOG_OEM_Code +Language=English +%1 %2 %3 %4 %5 %6 %7 %8 %9. +. +Language=Russian +%1 %2 %3 %4 %5 %6 %7 %8 %9. +. + ; ; other message definitions

1 0

01/02: [PSDK] Add missing NELOG-codes to lmerrlog.h
by Eric Kohl 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a889acc63fbecf230a3b… commit 4a889acc63fbecf230a3ba68ad07748a59c2209b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Nov 16 22:00:15 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Nov 16 22:26:49 2018 +0100 [PSDK] Add missing NELOG-codes to lmerrlog.h --- sdk/include/psdk/lmerrlog.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/psdk/lmerrlog.h b/sdk/include/psdk/lmerrlog.h index b4f5b3db26..cd63f9bbee 100644 --- a/sdk/include/psdk/lmerrlog.h +++ b/sdk/include/psdk/lmerrlog.h @@ -98,6 +98,7 @@ extern "C" { #define NELOG_NetlogonPasswdSetFailed (ERRLOG_BASE+124) #define NELOG_NetlogonTrackingError (ERRLOG_BASE+125) #define NELOG_NetlogonSyncError (ERRLOG_BASE+126) +#define NELOG_NetlogonRequireSignOrSealError (ERRLOG_BASE + 127) #define NELOG_UPS_PowerOut (ERRLOG_BASE+130) #define NELOG_UPS_Shutdown (ERRLOG_BASE+131) #define NELOG_UPS_CmdFileError (ERRLOG_BASE+132) @@ -115,6 +116,8 @@ extern "C" { #define NELOG_System_Error (ERRLOG_BASE+157) #define NELOG_FT_ErrLog_Too_Large (ERRLOG_BASE+158) #define NELOG_FT_Update_In_Progress (ERRLOG_BASE+159) +#define NELOG_Joined_Domain (ERRLOG_BASE + 160) +#define NELOG_Joined_Workgroup (ERRLOG_BASE + 161) #define NELOG_OEM_Code (ERRLOG_BASE+199) #define NELOG_NetlogonSSIInitError ERRLOG2_BASE #define NELOG_NetlogonFailedToUpdateTrustList (ERRLOG2_BASE+1)

1 0

09/09: [ACGENRAL] Don't leak memory on failure in InitIgnoreFreeLibrary()
by Pierre Schweitzer 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=007cc5cd8a4ede70516bf… commit 007cc5cd8a4ede70516bf2bf15dd62af01dfc8f0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 16 22:02:46 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 16 22:07:09 2018 +0100 [ACGENRAL] Don't leak memory on failure in InitIgnoreFreeLibrary() CID 1441306 --- dll/appcompat/shims/genral/ignorefreelib.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dll/appcompat/shims/genral/ignorefreelib.c b/dll/appcompat/shims/genral/ignorefreelib.c index b0c7ebb991..01b472fc06 100644 --- a/dll/appcompat/shims/genral/ignorefreelib.c +++ b/dll/appcompat/shims/genral/ignorefreelib.c @@ -97,7 +97,7 @@ static VOID InitIgnoreFreeLibrary(PCSTR CommandLine) if (!names[n]) { SHIM_WARN("Unable to allocate %u bytes\n", cur - prev + 2); - return; + goto fail; } n++; prev = cur + 1; @@ -106,11 +106,23 @@ static VOID InitIgnoreFreeLibrary(PCSTR CommandLine) if (!names[n]) { SHIM_WARN("Unable to allocate last string\n"); - return; + goto fail; } g_Names = names; g_NameCount = count; + return; + +fail: + --n; + while (n >= 0) + { + if (names[n]) + ShimLib_ShimFree((PVOID)names[n]); + + --n; + } + ShimLib_ShimFree(names); } BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr)

1 0

08/09: [COMCTL32] Don't leak memory in CB_ThemedPaint()
by Pierre Schweitzer 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52da8448259ebe77a7e0f… commit 52da8448259ebe77a7e0fa8c971871072f7c6145 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 16 21:52:38 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 16 22:07:09 2018 +0100 [COMCTL32] Don't leak memory in CB_ThemedPaint() CID 1441313 --- dll/win32/comctl32/button.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index 6a0a226ea1..59067471f1 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1995,12 +1995,16 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu } heap_free(text); +#ifdef __REACTOS__ + text = NULL; +#endif } #ifdef __REACTOS__ if (cdrf == CDRF_NOTIFYPOSTPAINT) BUTTON_SendCustomDraw(infoPtr, hDC, CDDS_POSTPAINT, &bgRect); cleanup: + if (text) heap_free(text); #endif if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont);

1 0

07/09: [WIN32SS] Don't leak memory on failure in IntGdiWidenPath().
by Pierre Schweitzer 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6416ee982fae087664787… commit 6416ee982fae08766478784adedae54cca7c0869 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 16 21:42:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 16 22:07:08 2018 +0100 [WIN32SS] Don't leak memory on failure in IntGdiWidenPath(). CID 1441350 --- win32ss/gdi/ntgdi/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/gdi/ntgdi/path.c b/win32ss/gdi/ntgdi/path.c index a3e2ea0cdd..4a5277a9fe 100644 --- a/win32ss/gdi/ntgdi/path.c +++ b/win32ss/gdi/ntgdi/path.c @@ -1777,6 +1777,7 @@ IntGdiWidenPath(PPATH pPath, UINT penWidth, UINT penStyle, FLOAT eMiterLimit) pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(*pStrokes), TAG_PATH); if (!pStrokes) { + ExFreePoolWithTag(pOldStrokes, TAG_PATH); PATH_UnlockPath(flat_path); PATH_Delete(flat_path->BaseObject.hHmgr); return NULL;

1 0

06/09: [SETUPAPI] Allocate big enough buffer in CM_Query_Resource_Conflict_List().
by Pierre Schweitzer 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=699af9f62ad578e5086ae… commit 699af9f62ad578e5086ae36e87e5d9bd5b5b30a5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 16 21:36:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 16 22:07:08 2018 +0100 [SETUPAPI] Allocate big enough buffer in CM_Query_Resource_Conflict_List(). CID 1441357 --- dll/win32/setupapi/cfgmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index c7087e6d0f..2c56fd1caa 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -6691,7 +6691,7 @@ CM_Query_Resource_Conflict_List( if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - pConflictData = MyMalloc(sizeof(PCONFLICT_DATA)); + pConflictData = MyMalloc(sizeof(CONFLICT_DATA)); if (pConflictData == NULL) { ret = CR_OUT_OF_MEMORY;

1 0

05/09: [WIN32SS] Avoid an user-after-free in FontFamilyFillInfo().
by Pierre Schweitzer 16 Nov '18

16 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2255d5f5b648069fa889e… commit 2255d5f5b648069fa889ed153794d0e6e7ab9444 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Nov 16 21:28:42 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Nov 16 22:07:08 2018 +0100 [WIN32SS] Avoid an user-after-free in FontFamilyFillInfo(). CID 1441367 --- win32ss/gdi/ntgdi/freetype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ce655c5d3e..dd5e0064a5 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2605,14 +2605,13 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, sizeof(Info->EnumLogFontEx.elfFullName), FullName); - ExFreePoolWithTag(Otm, GDITAG_TEXT); - RtlInitAnsiString(&StyleA, Face->style_name); StyleW.Buffer = Info->EnumLogFontEx.elfStyle; StyleW.MaximumLength = sizeof(Info->EnumLogFontEx.elfStyle); status = RtlAnsiStringToUnicodeString(&StyleW, &StyleA, FALSE); if (!NT_SUCCESS(status)) { + ExFreePoolWithTag(Otm, GDITAG_TEXT); return; } Info->EnumLogFontEx.elfScript[0] = UNICODE_NULL; @@ -2623,6 +2622,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, if (!pOS2) { IntUnLockFreeType(); + ExFreePoolWithTag(Otm, GDITAG_TEXT); return; } @@ -2630,6 +2630,8 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent; Ntm->ntmAvgWidth = 0; + ExFreePoolWithTag(Otm, GDITAG_TEXT); + fs.fsCsb[0] = pOS2->ulCodePageRange1; fs.fsCsb[1] = pOS2->ulCodePageRange2; fs.fsUsb[0] = pOS2->ulUnicodeRange1;

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