Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[ion] 59584: - Server 2003 and later return the remote PEB in the TIB->ArbitraryUserPointer. Do so as well.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 25 18:32:52 2013 New Revision: 59584 URL: http://svn.reactos.org/svn/reactos?rev=59584&view=rev Log: - Server 2003 and later return the remote PEB in the TIB->ArbitraryUserPointer. Do so as well. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Jul 25 18:32:52 2013 @@ -838,6 +838,12 @@ /* Protect against bad user-mode pointer */ _SEH2_TRY { + /* Hacky way of returning the PEB to the user-mode creator */ + if ((Process->Peb) && (CurrentThread->Tcb.Teb)) + { + CurrentThread->Tcb.Teb->NtTib.ArbitraryUserPointer = Process->Peb; + } + /* Save the process handle */ *ProcessHandle = hProcess; }

11 years, 5 months

[ion] 59583: [NTDLL]: Export LdrOpenImageFileOptionsKey and LdrQueryIamgeFileKeyOption. These were implemented, we just never exported them.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 25 18:30:06 2013 New Revision: 59583 URL: http://svn.reactos.org/svn/reactos?rev=59583&view=rev Log: [NTDLL]: Export LdrOpenImageFileOptionsKey and LdrQueryIamgeFileKeyOption. These were implemented, we just never exported them. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu Jul 25 18:30:06 2013 @@ -91,9 +91,10 @@ @ stdcall LdrLoadAlternateResourceModule(ptr ptr) @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) -;@ stdcall LdrOpenImageFileOptionsKey ; 5.2 SP1 and higher +@ stdcall LdrOpenImageFileOptionsKey(ptr long ptr) ; 5.2 SP1 and higher @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr str long ptr long ptr) +@ stdcall LdrQueryImageFileKeyOption(ptr ptr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) ;@ stdcall LdrSetAppCompatDllRedirectionCallback ;@ stdcall LdrSetDllManifestProber

11 years, 5 months

[akhaldi] 59582: [CDMAKE] * Remove an unused variable.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jul 25 15:14:32 2013 New Revision: 59582 URL: http://svn.reactos.org/svn/reactos?rev=59582&view=rev Log: [CDMAKE] * Remove an unused variable. Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jul 25 15:14:32 2013 @@ -129,7 +129,6 @@ void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) { - unsigned int hashcode; struct target_file *tf; struct target_dir_entry *de; const char *filename = chop_filename(target);

11 years, 5 months

[pschweitzer] 59581: [CDMAKE] Fix memory leak in dir_hash_add_file(). The duplicated targetnorm used for calling dir_hash_create_dir is never affected anywhere. It is duplicated again before affect...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Jul 25 15:04:56 2013 New Revision: 59581 URL: http://svn.reactos.org/svn/reactos?rev=59581&view=rev Log: [CDMAKE] Fix memory leak in dir_hash_add_file(). The duplicated targetnorm used for calling dir_hash_create_dir is never affected anywhere. It is duplicated again before affectation. And thus, leaks. Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Thu Jul 25 15:04:56 2013 @@ -139,6 +139,7 @@ targetnorm = strdup(targetdir); normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); + free(targetnorm); tf = calloc(1, sizeof(*tf)); tf->next = de->head; de->head = tf;

11 years, 5 months

[gadamopoulos] 59580: [shell32] - Do not call OnDefaultCommand when there is no selected item in the shell view

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jul 25 12:57:56 2013 New Revision: 59580 URL: http://svn.reactos.org/svn/reactos?rev=59580&view=rev Log: [shell32] - Do not call OnDefaultCommand when there is no selected item in the shell view Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu Jul 25 12:57:56 2013 @@ -1102,6 +1102,10 @@ UINT uCommand; HRESULT hResult; + cidl = ListView_GetSelectedCount(hWndList); + if (cidl == 0) + return S_OK; + hResult = OnDefaultCommand(); if (hResult == S_OK) return hResult; @@ -1175,7 +1179,7 @@ if (!hMenu) return E_FAIL; - GetSelections(); + cidl = ListView_GetSelectedCount(hWndList); hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); if (FAILED( hResult))

11 years, 5 months

[gadamopoulos] 59579: [shell32] - Improve the execution of a shell verb in the default context menu. - Retrieve the browse flags from the verb in order to figure out if we should actually try to br...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jul 25 12:54:30 2013 New Revision: 59579 URL: http://svn.reactos.org/svn/reactos?rev=59579&view=rev Log: [shell32] - Improve the execution of a shell verb in the default context menu. - Retrieve the browse flags from the verb in order to figure out if we should actually try to browse - Execute all the items that were selected and not only the first one Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Thu Jul 25 12:54:30 2013 @@ -8,10 +8,7 @@ /* TODO: -1. In DoStaticShellExtensions, check for "Explore" and "Open" verbs, and for BrowserFlags or - ExplorerFlags under those entries. These flags indicate if we should browse to the new item - instead of attempting to open it. -2. The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent + The code in NotifyShellViewWindow to deliver commands to the view is broken. It is an excellent example of the wrong way to do it. */ @@ -71,6 +68,9 @@ HRESULT DoFormat(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoDynamicShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoStaticShellExtensions(LPCMINVOKECOMMANDINFO lpcmi); + DWORD BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry); + HRESULT TryToBrowse(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags); + HRESULT InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry); public: CDefaultContextMenu(); @@ -1484,23 +1484,64 @@ return E_FAIL; } - -HRESULT -CDefaultContextMenu::DoStaticShellExtensions( - LPCMINVOKECOMMANDINFO lpcmi) -{ - PStaticShellEntry pEntry = m_pStaticEntries; - INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; +DWORD +CDefaultContextMenu::BrowserFlagsFromVerb(LPCMINVOKECOMMANDINFO lpcmi, PStaticShellEntry pEntry) +{ + LPSHELLBROWSER lpSB; + HWND hwndTree; + LPWSTR FlagsName; + WCHAR wszKey[256]; HRESULT hr; - - while (pEntry && (iCmd--) > 0) - pEntry = pEntry->pNext; - - if (iCmd > 0) - return E_FAIL; - + DWORD wFlags; + DWORD cbVerb; + + /* Get a pointer to the shell browser */ + lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (lpSB == NULL) + return 0; + + /* See if we are in Explore or Browse mode. If the browser's tree is present, we are in Explore mode.*/ + if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) + FlagsName = L"ExplorerFlags"; + else + FlagsName = L"BrowserFlags"; + + /* Try to get the flag from the verb */ + hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"%s\\shell\\%s", pEntry->szClass, pEntry->szVerb); + if (!SUCCEEDED(hr)) + return 0; + + cbVerb = sizeof(wFlags); + if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, FlagsName, RRF_RT_REG_DWORD, NULL, &wFlags, &cbVerb) == ERROR_SUCCESS) + { + return wFlags; + } + + return 0; +} + +HRESULT +CDefaultContextMenu::TryToBrowse( + LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, DWORD wFlags) +{ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + HRESULT hr; + + if (lpSB == NULL) + return E_FAIL; + + hr = lpSB->BrowseObject(ILCombine(m_Dcm.pidlFolder, pidl), wFlags); + + return hr; +} + +HRESULT +CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) +{ + HRESULT hr; STRRET strFile; - hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile); + + hr = m_Dcm.psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); if (hr != S_OK) { ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); @@ -1508,7 +1549,7 @@ } WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, MAX_PATH); + hr = StrRetToBufW(&strFile, pidl, wszPath, MAX_PATH); if (hr != S_OK) return hr; @@ -1519,14 +1560,57 @@ SHELLEXECUTEINFOW sei; ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_CLASSNAME; - sei.lpClass = pEntry->szClass; sei.hwnd = lpcmi->hwnd; sei.nShow = SW_SHOWNORMAL; sei.lpVerb = pEntry->szVerb; sei.lpFile = wszPath; sei.lpDirectory = wszDir; ShellExecuteExW(&sei); + + return S_OK; +} + +HRESULT +CDefaultContextMenu::DoStaticShellExtensions( + LPCMINVOKECOMMANDINFO lpcmi) +{ + PStaticShellEntry pEntry = m_pStaticEntries; + INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; + HRESULT hr; + UINT i; + + while (pEntry && (iCmd--) > 0) + pEntry = pEntry->pNext; + + if (iCmd > 0) + return E_FAIL; + + /* Get the browse flags to see if we need to browse */ + DWORD wFlags = BrowserFlagsFromVerb(lpcmi, pEntry); + BOOL bBrowsed = FALSE; + + for (i=0; i < m_Dcm.cidl; i++) + { + /* Check if we need to browse */ + if (wFlags > 0) + { + /* In xp if we have browsed, we don't open any more folders . + * In win7 we browse to the first folder we find and + * open new windows fo for each of the rest of the folders */ + if (bBrowsed) + continue; + + hr = TryToBrowse(lpcmi, m_Dcm.apidl[i], wFlags); + if (SUCCEEDED(hr)) + { + bBrowsed = TRUE; + continue; + } + } + + InvokePidl(lpcmi, m_Dcm.apidl[i], pEntry); + } + return S_OK; }

11 years, 5 months

[gadamopoulos] 59578: [hivecls.inf] - Add browse flags for the folder class

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Jul 25 12:48:34 2013 New Revision: 59578 URL: http://svn.reactos.org/svn/reactos?rev=59578&view=rev Log: [hivecls.inf] - Add browse flags for the folder class Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Thu Jul 25 12:48:34 2013 @@ -11,7 +11,11 @@ ; Folders HKCR,"Folder","",0x00000000,"Folder" ;HKCR,"Folder\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" +HKCR,"Folder\shell\open","BrowserFlags",0x00010001,"0x00000010" +HKCR,"Folder\shell\open","ExplorerFlags",0x00010001,"0x00000012" HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1""" +HKCR,"Folder\shell\explore","BrowserFlags",0x00010001,"0x00000022" +HKCR,"Folder\shell\explore","ExplorerFlags",0x00010001,"0x00000021" HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" ; Drive property page

11 years, 5 months

[akhaldi] 59577: [CABMAN] * A new approach to splitting the reactos.cab generation time now by more than a half, which consists of using the default compression level. * The catch is 50kb bigger ca...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 24 22:02:20 2013 New Revision: 59577 URL: http://svn.reactos.org/svn/reactos?rev=59577&view=rev Log: [CABMAN] * A new approach to splitting the reactos.cab generation time now by more than a half, which consists of using the default compression level. * The catch is 50kb bigger cab :p Modified: trunk/reactos/tools/cabman/mszip.cxx Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/mszip.cxx [iso-8859-1] Wed Jul 24 22:02:20 2013 @@ -79,7 +79,7 @@ /* WindowBits is passed < 0 to tell that there is no zlib header */ Status = deflateInit2(&ZStream, - Z_BEST_COMPRESSION, + Z_DEFAULT_COMPRESSION, Z_DEFLATED, -MAX_WBITS, 8, /* memLevel */

11 years, 5 months

[akhaldi] 59576: [CDMAKE] * Sanitize the header inclusions in dirhash.c.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 24 20:33:33 2013 New Revision: 59576 URL: http://svn.reactos.org/svn/reactos?rev=59576&view=rev Log: [CDMAKE] * Sanitize the header inclusions in dirhash.c. Modified: trunk/reactos/tools/cdmake/dirhash.c Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Wed Jul 24 20:33:33 2013 @@ -1,5 +1,6 @@ #include <string.h> -#include <malloc.h> +#include <stdlib.h> +#include <ctype.h> #include "dirsep.h" #include "dirhash.h"

11 years, 5 months

[akhaldi] 59575: * Revert r59570 as it caused some integrity issues.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 24 20:28:59 2013 New Revision: 59575 URL: http://svn.reactos.org/svn/reactos?rev=59575&view=rev Log: * Revert r59570 as it caused some integrity issues. Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Wed Jul 24 20:28:59 2013 @@ -95,7 +95,7 @@ #define CAB_SIGNATURE 0x4643534D // "MSCF" #define CAB_VERSION 0x0103 -#define CAB_BLOCKSIZE 2048 +#define CAB_BLOCKSIZE 32768 #define CAB_COMP_MASK 0x00FF #define CAB_COMP_NONE 0x0000

11 years, 5 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 July 2013