Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[khornicek] 65162: [EVENTLOG] - fix a possible null dereference

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Oct 31 22:39:19 2014 New Revision: 65162 URL: http://svn.reactos.org/svn/reactos?rev=65162&view=rev Log: [EVENTLOG] - fix a possible null dereference Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Oct 31 22:39:19 2014 @@ -118,6 +118,14 @@ if (lpLogHandle->LogFile == NULL) { lpLogHandle->LogFile = LogfListItemByName(L"Application"); + + if (lpLogHandle->LogFile == NULL) + { + DPRINT1("Application log is missing!\n"); + Status = STATUS_UNSUCCESSFUL; + goto Done; + } + lpLogHandle->CurrentRecord = LogfGetOldestRecord(lpLogHandle->LogFile); } }

9 years, 10 months

[gadamopoulos] 65161: [RSHELL] - A HACK notice was more obvious than needed (I got what I asked after all). - Reenable opening the printers folder since it works now

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Oct 31 22:32:01 2014 New Revision: 65161 URL: http://svn.reactos.org/svn/reactos?rev=65161&view=rev Log: [RSHELL] - A HACK notice was more obvious than needed (I got what I asked after all). - Reenable opening the printers folder since it works now Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Fri Oct 31 22:32:01 2014 @@ -230,12 +230,6 @@ HRESULT OnExec(LPSMDATA psmd) { - // H H A CCC K K ! ! ! - // H H A A C C K K ! ! ! - // HHHHH AAAAA C KKK ! ! ! - // H H A A C C K K ! ! ! - // H H A A CCC K K . . . - // // HACK: Instead of running explorer.exe with the path, we should be using ShellExecute to "open" the path directly! // Remove once ShellExecute can handle CLSID path components. @@ -244,7 +238,7 @@ else if (psmd->uId == IDM_NETWORKCONNECTIONS) ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, SW_SHOWNORMAL); else if (psmd->uId == IDM_PRINTERSANDFAXES) - {}/* FIXME: crashes: ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, SW_SHOWNORMAL);*/ + ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, SW_SHOWNORMAL); else PostMessageW(m_hwndTray, WM_COMMAND, psmd->uId, 0);

9 years, 10 months

[gadamopoulos] 65160: [SHELL32] - Do not release the pointer to the ShellView that was just created - Fixes a crash when showing the Printers shell folder

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Oct 31 22:30:21 2014 New Revision: 65160 URL: http://svn.reactos.org/svn/reactos?rev=65160&view=rev Log: [SHELL32] - Do not release the pointer to the ShellView that was just created - Fixes a crash when showing the Printers shell folder Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp Modified: branches/shell-experiments/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/printers.cpp [iso-8859-1] Fri Oct 31 22:30:21 2014 @@ -430,7 +430,6 @@ if (pShellView) { hr = pShellView->QueryInterface(riid, ppvOut); - pShellView->Release(); } } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut);

9 years, 10 months

[akhaldi] 65159: [SHELL32] * Apply Wine commit a2c90524 by Aric Stewart: Improve the FO_MOVE operation. * More shell32:shlfileop tests run, less fail. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 31 18:46:27 2014 New Revision: 65159 URL: http://svn.reactos.org/svn/reactos?rev=65159&view=rev Log: [SHELL32] * Apply Wine commit a2c90524 by Aric Stewart: Improve the FO_MOVE operation. * More shell32:shlfileop tests run, less fail. CORE-8540 Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Fri Oct 31 18:46:27 2014 @@ -1559,14 +1559,18 @@ } /* the FO_MOVE operation */ -static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; + INT mismatched = 0; const FILE_ENTRY *entryToMove; const FILE_ENTRY *fileDest; - if (!flFrom->dwNumFiles || !flTo->dwNumFiles) - return ERROR_CANCELLED; + if (!flFrom->dwNumFiles) + return ERROR_SUCCESS; + + if (!flTo->dwNumFiles) + return ERROR_FILE_NOT_FOUND; if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1) @@ -1584,27 +1588,42 @@ if (!PathFileExistsW(flTo->feFiles[0].szDirectory)) return ERROR_CANCELLED; - if ((lpFileOp->fFlags & FOF_MULTIDESTFILES) && - flFrom->dwNumFiles != flTo->dwNumFiles) - { - return ERROR_CANCELLED; - } + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; fileDest = &flTo->feFiles[0]; for (i = 0; i < flFrom->dwNumFiles; i++) { entryToMove = &flFrom->feFiles[i]; - if (lpFileOp->fFlags & FOF_MULTIDESTFILES) - fileDest = &flTo->feFiles[i]; - if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; + + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + { + if (i >= flTo->dwNumFiles) + break; + fileDest = &flTo->feFiles[i]; + if (mismatched && !fileDest->bExists) + { + create_dest_dirs(flTo->feFiles[i].szFullPath); + flTo->feFiles[i].bExists = TRUE; + flTo->feFiles[i].attributes = FILE_ATTRIBUTE_DIRECTORY; + } + } if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(lpFileOp, entryToMove, fileDest); else SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); + } + + if (mismatched > 0) + { + if (flFrom->bAnyDirectories) + return DE_DESTSAMETREE; + else + return DE_SAMEFILE; } return ERROR_SUCCESS; Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Fri Oct 31 18:46:27 2014 @@ -83,7 +83,8 @@ #define RFF_NOLABEL 0x08 #define RFF_NOSEPARATEMEM 0x20 /* NT only */ -#define DE_SAMEFILE 0x71 +#define DE_SAMEFILE 0x71 +#define DE_DESTSAMETREE 0x7D /* RunFileFlg notification structure */ typedef struct

9 years, 10 months

[dquintana] 65158: [BROWSEUI] * Implement hiding the statusbar from the view menu. Based on patch by Christoph von Wittich.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Oct 31 18:37:40 2014 New Revision: 65158 URL: http://svn.reactos.org/svn/reactos?rev=65158&view=rev Log: [BROWSEUI] * Implement hiding the statusbar from the view menu. Based on patch by Christoph von Wittich. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Fri Oct 31 18:37:40 2014 @@ -3309,7 +3309,11 @@ LRESULT CShellBrowser::OnToggleStatusBarVisible(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { fStatusBarVisible = !fStatusBarVisible; - // TODO: trigger a relayout of contained items + if (fStatusBar) + { + ::ShowWindow(fStatusBar, fStatusBarVisible ? SW_SHOW : SW_HIDE); + RepositionBars(); + } return 0; }

9 years, 10 months

[khornicek] 65157: [KERNEL32] - rewrite the GEO_FRIENDLYNAME case of GetGeoInfoW which was completely wrong, intl.cpl now shows a valid list of locations - note: The geo location resource strings h...

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Oct 31 18:13:36 2014 New Revision: 65157 URL: http://svn.reactos.org/svn/reactos?rev=65157&view=rev Log: [KERNEL32] - rewrite the GEO_FRIENDLYNAME case of GetGeoInfoW which was completely wrong, intl.cpl now shows a valid list of locations - note: The geo location resource strings have an arbitrary offset so that they don't collide with the nls resources (which shouldn't be there). Once these are moved out of kernel32 into locale.nls this offset alongside with the hack already present in GetLocalisedText can be removed. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…

9 years, 10 months

[tfaber] 65156: [SHELL32] - Fix a use after free in COpenWithMenu::Initialize. Powered by DPH.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 31 18:02:52 2014 New Revision: 65156 URL: http://svn.reactos.org/svn/reactos?rev=65156&view=rev Log: [SHELL32] - Fix a use after free in COpenWithMenu::Initialize. Powered by DPH. Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Fri Oct 31 18:02:52 2014 @@ -1334,6 +1334,14 @@ pidlFolder2 = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[0]); pidlChild = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[1]); + if (!_ILIsValue(pidlChild)) + { + TRACE("pidl is not a file\n"); + GlobalUnlock(medium.hGlobal); + GlobalFree(medium.hGlobal); + return E_FAIL; + } + pidl = ILCombine(pidlFolder2, pidlChild); GlobalUnlock(medium.hGlobal); @@ -1343,12 +1351,6 @@ { ERR("no mem\n"); return E_OUTOFMEMORY; - } - if (!_ILIsValue(pidlChild)) - { - TRACE("pidl is not a file\n"); - SHFree((void*)pidl); - return E_FAIL; } if (!SHGetPathFromIDListW(pidl, m_wszPath))

9 years, 10 months

[zguo] 65155: [KERNEL32] Merge English fallback for unlocalized text. CORE-8720

by zguo＠svn.reactos.org

Author: zguo Date: Fri Oct 31 17:47:32 2014 New Revision: 65155 URL: http://svn.reactos.org/svn/reactos?rev=65155&view=rev Log: [KERNEL32] Merge English fallback for unlocalized text. CORE-8720 Modified: branches/0.3.17/reactos/ (props changed) branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c Propchange: branches/0.3.17/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 31 17:47:32 2014 @@ -18,4 +18,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:64752-64754,64765,64769,64771,64776-64777,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041,65100 +/trunk/reactos:64752-64754,64765,64769,64771,64776-64777,64793,64800,64825,64829,64832-64833,64855-64856,64859,64908-64909,64976,65025-65028,65041,65100,65152 Modified: branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/branches/0.3.17/reactos/dll/win32/kernel… ============================================================================== --- branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ branches/0.3.17/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Fri Oct 31 17:47:32 2014 @@ -1704,6 +1704,16 @@ (LPWSTR)RT_STRING, MAKEINTRESOURCEW((dwId >> 4) + 1), langId); + + /* english fallback */ + if(!hrsrc) + { + hrsrc = FindResourceExW(hCurrentModule, + (LPWSTR)RT_STRING, + MAKEINTRESOURCEW((dwId >> 4) + 1), + MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)); + } + if (hrsrc) { HGLOBAL hmem = LoadResource(hCurrentModule, hrsrc);

9 years, 10 months

[tfaber] 65154: [NEWDEV] - Fix buffer overflow in PopulateCustomPathCombo. Powered by DPH. - Fix a signed vs unsigned comparison

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 31 17:35:38 2014 New Revision: 65154 URL: http://svn.reactos.org/svn/reactos?rev=65154&view=rev Log: [NEWDEV] - Fix buffer overflow in PopulateCustomPathCombo. Powered by DPH. - Fix a signed vs unsigned comparison Modified: trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Fri Oct 31 17:35:38 2014 @@ -280,7 +280,9 @@ TRACE("RegQueryValueEx() failed with error 0x%lx\n", rc); goto cleanup; } - Buffer[dwPathLength] = Buffer[dwPathLength + 1] = '\0'; + + Buffer[dwPathLength / sizeof(WCHAR)] = UNICODE_NULL; + Buffer[dwPathLength / sizeof(WCHAR) + 1] = UNICODE_NULL; /* Populate combo box */ for (Path = Buffer; *Path; Path += wcslen(Path) + 1) @@ -305,7 +307,7 @@ LPWSTR Buffer = NULL; LPWSTR pBuffer; /* Pointer into Buffer */ int ItemsCount, Length; - DWORD i; + int i; DWORD TotalLength = 0; BOOL UseCustomPath = TRUE; HKEY hKey = NULL;

9 years, 10 months

[tfaber] 65153: [MSGINA] - pszEnvironment is a multi-sz string so make sure to double-null terminate it. Fixes a buffer overrun in winlogon; powered by DPH.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Oct 31 17:05:30 2014 New Revision: 65153 URL: http://svn.reactos.org/svn/reactos?rev=65153&view=rev Log: [MSGINA] - pszEnvironment is a multi-sz string so make sure to double-null terminate it. Fixes a buffer overrun in winlogon; powered by DPH. Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Oct 31 17:05:30 2014 @@ -30,6 +30,7 @@ #include <winsvc.h> #include <userenv.h> #include <ndk/sefuncs.h> +#include <strsafe.h> HINSTANCE hDllInstance; @@ -778,15 +779,19 @@ pProfile->dwType = WLX_PROFILE_TYPE_V2_0; pProfile->pszProfile = ProfilePath; - lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(pgContext->Domain)+ 14 + 1) * sizeof(WCHAR)); + cbSize = sizeof(L"LOGONSERVER=\\\\") + + wcslen(pgContext->Domain) * sizeof(WCHAR) + + sizeof(UNICODE_NULL); + lpEnvironment = HeapAlloc(GetProcessHeap(), 0, cbSize); if (!lpEnvironment) { WARN("HeapAlloc() failed\n"); goto cleanup; } - wsprintfW(lpEnvironment, L"LOGONSERVER=\\\\%s", pgContext->Domain); + StringCbPrintfW(lpEnvironment, cbSize, L"LOGONSERVER=\\\\%ls", pgContext->Domain); + ASSERT(wcslen(lpEnvironment) == cbSize / sizeof(WCHAR) - 2); + lpEnvironment[cbSize / sizeof(WCHAR) - 1] = UNICODE_NULL; pProfile->pszEnvironment = lpEnvironment;

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014