Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 64083: [PSDK] * Make shlwapi_undoc.h compatible with C code. [EXPLORER-NEW] * Link with browseui. * Use SHOpenNewFrame linked from browseui instead of explicitly loaded. * Make use of S...
by dquintana＠svn.reactos.org 08 Sep '14

08 Sep '14

Author: dquintana Date: Mon Sep 8 13:09:19 2014 New Revision: 64083 URL: http://svn.reactos.org/svn/reactos?rev=64083&view=rev Log: [PSDK] * Make shlwapi_undoc.h compatible with C code. [EXPLORER-NEW] * Link with browseui. * Use SHOpenNewFrame linked from browseui instead of explicitly loaded. * Make use of SHExplorerParseCmdLine. Does not yet open windows in an existing process when used through commandline. Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/include/psdk/shlwapi_undoc.h Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Mon Sep 8 13:09:19 2014 @@ -31,6 +31,7 @@ ole32 oleaut32 shell32 + browseui shlwapi shdocvw version Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Mon Sep 8 13:09:19 2014 @@ -19,7 +19,7 @@ */ #include "precomp.h" - +#include <shlwapi_undoc.h> #include <winver.h> HINSTANCE hExplorerInstance; @@ -450,108 +450,28 @@ } else { - WCHAR root[MAX_PATH]; - HMODULE hBrowseui; HRESULT hr; - LPSHELLFOLDER pDesktopFolder = NULL; - LPITEMIDLIST pidlRoot = NULL; - typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); - SH_OPEN_NEW_FRAME SHOpenNewFrame; - - /* A shell is already loaded. Parse the command line arguments - and unless we need to do something specific simply display - the desktop in a separate explorer window */ - /* FIXME */ - - /* Commandline switches: - * - * /n Open a new window, even if an existing one still exists. - * /e Start with the explorer sidebar shown. - * /root,<object> Open a window for the given object path. - * /select,<object> Open a window with the given object selected. - */ - - /* FIXME: Do it right */ - WCHAR* tmp = wcsstr(lpCmdLine,L"/root,"); - if (tmp) - { - WCHAR* tmp2; - - tmp += 6; // skip to beginning of path - tmp2 = wcschr(tmp, L','); - - if (tmp2) - { - wcsncpy(root, tmp, tmp2 - tmp); - } - else - { - wcscpy(root, tmp); - } - } - else - { - wcscpy(root, lpCmdLine); - } - - if (root[0] == L'"') - { - int len = wcslen(root) - 2; - wcsncpy(root, root + 1, len); - root[len] = 0; - } - - if (wcslen(root) > 0) - { - LPITEMIDLIST pidl; - ULONG chEaten; - ULONG dwAttributes; - - if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder))) - { - hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder, - NULL, - NULL, - root, - &chEaten, - &pidl, - &dwAttributes); - if (SUCCEEDED(hr)) - { - pidlRoot = pidl; - DbgPrint("Got PIDL for folder '%S'\n", root); - } - } - } - - if (!pidlRoot) - { - DbgPrint("No folder, getting PIDL for My Computer.\n", root); - hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot); + EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 }; + + if (!SHExplorerParseCmdLine(&parseResults)) + return 0; + + // TODO: Handle the case where .strPath was assigned instead of .pidlPath + + if (parseResults.dwFlags & SH_EXPLORER_CMDLINE_FLAG_IDLIST) + { + TRACE("Trying to open browser window... \n"); + + hr = SHOpenNewFrame(parseResults.pidlPath, NULL, 0, 0); if (FAILED(hr)) return 0; - } - - DbgPrint("Trying to open browser window... \n"); - - hBrowseui = LoadLibraryW(L"browseui.dll"); - if (!hBrowseui) - { - DbgPrint("Browseui not found.. \n"); + + /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ + Sleep(1000); + ExitThread(0); + return 0; } - - SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); - - hr = SHOpenNewFrame(pidlRoot, (IUnknown*)pDesktopFolder, 0, 0); - if (FAILED(hr)) - return 0; - - /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ - Sleep(1000); - ExitThread(0); - - return 0; } if (Tray != NULL) Modified: branches/shell-experiments/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] Mon Sep 8 13:09:19 2014 @@ -25,7 +25,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -struct IEThreadParamBlock +typedef struct IEThreadParamBlock { long offset0; long offset4; @@ -43,9 +43,9 @@ char filler3[116]; // unknown contents IUnknown *offsetF8; // instance explorer long filler4; // unknown contents -}; +} IE_THREAD_PARAM_BLOCK, *PIE_THREAD_PARAM_BLOCK; -struct ExplorerCommandLineParseResults +typedef struct ExplorerCommandLineParseResults { LPWSTR strPath; LPITEMIDLIST pidlPath; @@ -61,7 +61,7 @@ DWORD unk_44; DWORD unk_48; GUID guidInproc; -}; +} EXPLORER_CMDLINE_PARSE_RESULTS, *PEXPLORER_CMDLINE_PARSE_RESULTS; #define SH_EXPLORER_CMDLINE_FLAG_ONE 0x00000001 #define SH_EXPLORER_CMDLINE_FLAG_S 0x00000002 @@ -122,18 +122,18 @@ BOOL WINAPI SHIsChildOrSelf(HWND hParent, HWND hChild); void WINAPI InitOCHostClass(long param8); -long WINAPI SHOpenFolderWindow(IEThreadParamBlock *param8); +long WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK param8); void WINAPI SHCreateSavedWindows(void); long WINAPI SHCreateFromDesktop(long param8); -UINT WINAPI SHExplorerParseCmdLine(ExplorerCommandLineParseResults * pParseResults); +UINT WINAPI SHExplorerParseCmdLine(PEXPLORER_CMDLINE_PARSE_RESULTS pParseResults); void WINAPI UEMRegisterNotify(long param8, long paramC); HRESULT WINAPI SHCreateBandForPidl(LPCITEMIDLIST param8, IUnknown *paramC, BOOL param10); HRESULT WINAPI SHPidlFromDataObject(IDataObject *param8, long *paramC, long param10, FILEDESCRIPTORW *param14); long WINAPI IDataObject_GetDeskBandState(long param8); -IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM(long param8, long paramC, IUnknown *param10, IUnknown *param14); -IEThreadParamBlock *WINAPI SHCloneIETHREADPARAM(IEThreadParamBlock *param); +PIE_THREAD_PARAM_BLOCK WINAPI SHCreateIETHREADPARAM(long param8, long paramC, IUnknown *param10, IUnknown *param14); +PIE_THREAD_PARAM_BLOCK WINAPI SHCloneIETHREADPARAM(PIE_THREAD_PARAM_BLOCK param); long WINAPI SHParseIECommandLine(long param8, long paramC); -void WINAPI SHDestroyIETHREADPARAM(IEThreadParamBlock *param); +void WINAPI SHDestroyIETHREADPARAM(PIE_THREAD_PARAM_BLOCK param); HRESULT WINAPI SHOnCWMCommandLine(long param8); LPITEMIDLIST WINAPI Channel_GetFolderPidl(void); IUnknown *WINAPI ChannelBand_Create(LPITEMIDLIST pidl);

1 0

[cwittich] 64082: [apitest/crt] apply the same buffer size fix to _vsnwprintf test
by cwittich＠svn.reactos.org 08 Sep '14

08 Sep '14

Author: cwittich Date: Mon Sep 8 07:00:00 2014 New Revision: 64082 URL: http://svn.reactos.org/svn/reactos?rev=64082&view=rev Log: [apitest/crt] apply the same buffer size fix to _vsnwprintf test Modified: trunk/rostests/apitests/crt/_vsnwprintf.c Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Mon Sep 8 07:00:00 2014 @@ -19,7 +19,7 @@ int ret; /* Test the basic functionality */ va_start(args, formatString); - ret = _vsnwprintf(buf, 255, formatString, args); + ret = _vsnwprintf(buf, buf_size, formatString, args); ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); }

1 0

[dquintana] 64081: [BROWSEUI] * Initial implementation of the explorer command line parser. Not used by explorer-new, yet.
by dquintana＠svn.reactos.org 08 Sep '14

08 Sep '14

Author: dquintana Date: Mon Sep 8 01:59:18 2014 New Revision: 64081 URL: http://svn.reactos.org/svn/reactos?rev=64081&view=rev Log: [BROWSEUI] * Initial implementation of the explorer command line parser. Not used by explorer-new, yet. Added: branches/shell-experiments/dll/win32/browseui/parsecmdline.cpp (with props) Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/browseuiord.cpp branches/shell-experiments/include/psdk/shlwapi.h branches/shell-experiments/include/psdk/shlwapi_undoc.h Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Sep 8 01:59:18 2014 @@ -24,6 +24,7 @@ commonbrowser.cpp globalfoldersettings.cpp internettoolbar.cpp + parsecmdline.cpp regtreeoptions.cpp shellbrowser.cpp toolsband.cpp Modified: branches/shell-experiments/dll/win32/browseui/browseuiord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/browseuiord.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/browseuiord.cpp [iso-8859-1] Mon Sep 8 01:59:18 2014 @@ -58,10 +58,7 @@ /************************************************************************* * SHExplorerParseCmdLine [BROWSEUI.107] */ -extern "C" long WINAPI SHExplorerParseCmdLine(LPCTSTR commandLine) -{ - return -1; -} +/****** MOVED TO parsecmdline.cpp ******/ /************************************************************************* * UEMRegisterNotify [BROWSEUI.118] Added: branches/shell-experiments/dll/win32/browseui/parsecmdline.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/parsecmdline.cpp (added) +++ branches/shell-experiments/dll/win32/browseui/parsecmdline.cpp [iso-8859-1] Mon Sep 8 01:59:18 2014 @@ -0,0 +1,417 @@ +/* +* ReactOS browseui +* +* Copyright 2014 David Quintana <gigaherz(a)gmail.com> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "precomp.h" +#include <strsafe.h> + +extern "C" +BOOL WINAPI GUIDFromStringW( + _In_ PCWSTR psz, + _Out_ LPGUID pguid + ); + +static BOOL _CopyAndUnquoteText(LPCWSTR strFieldSource, LPWSTR strField, size_t cchField) +{ + WCHAR cChar; + PWSTR tmpField = strField; + size_t lenField = 1; + BOOL inQuote = FALSE; + + // Remove leading whitespace + cChar = *strFieldSource; + while (cChar == L' ' || cChar == L'\t' || cChar == L'\n' || cChar == L'\r') + { + strFieldSource = CharNextW(strFieldSource); + cChar = *strFieldSource; + } + + while (cChar && cChar != L'=' && cChar != L',') + { + if (cChar == L'"') + { + // [1] is always valid read because of null-termination + if (inQuote && strFieldSource[1] == L'"') + { + if (lenField < cchField) + { + // Append + *(tmpField++) = L'"'; + ++lenField; + } + + // Skip second quote + strFieldSource++; + } + else + { + inQuote = !inQuote; + } + } + else + { + if (inQuote || (cChar != L'=' && cChar != L',')) + { + if (lenField < cchField) + { + // Append + *(tmpField++) = cChar; + ++lenField; + } + } + } + + strFieldSource = CharNextW(strFieldSource); + cChar = *strFieldSource; + } + + // Remove trailing whitespace + while (tmpField > strField) + { + tmpField = CharPrevW(strField, tmpField); + cChar = *tmpField; + if (cChar != L' ' && cChar != L'\t' && cChar != L'\n' && cChar != L'\r') + { + tmpField = CharNextW(tmpField); + break; + } + } + + // Terminate output string + *tmpField = 0; + + return TRUE; +} + +static BOOL _FindNextArg(PCWSTR * pstrFieldSource) +{ + PCWSTR strFieldSource = *pstrFieldSource; + WCHAR cChar = *strFieldSource; + BOOL inQuote = FALSE; + + while (cChar) + { + if (!inQuote && (cChar == L'=' || cChar == L',')) + break; + + if (cChar == L'"') + inQuote = !inQuote; + + strFieldSource = CharNextW(strFieldSource); + cChar = *strFieldSource; + } + + if (cChar == 0) + { + *pstrFieldSource = strFieldSource; + return FALSE; + } + + *pstrFieldSource = CharNextW(strFieldSource); + return TRUE; +} + +static PCWSTR _FindFirstField(PCWSTR strFieldSource) +{ + //Find end of first arg, because + // behaviour is different if the first separator is an '=' + BOOL inQuote = FALSE; + PCWSTR tmpArgs = strFieldSource; + WCHAR cChar = *tmpArgs; + while (cChar) + { + if (cChar == L'=') + break; + + if (cChar == L',') + break; + + if (cChar == L'\"') + inQuote = !inQuote; + + tmpArgs = CharNextW(tmpArgs); + cChar = *tmpArgs; + } + + // Skip the text before the first equal sign, if not quoted, unless the arg 0 was requested. + if (*tmpArgs == L'=' && !inQuote) + { + strFieldSource = ++tmpArgs; + TRACE("Skipped content before the first '=', remainder=%S\n", strFieldSource); + } + + return strFieldSource; +} + +static BOOL _ReadNextArg(PCWSTR * pstrFieldSource, PWSTR strField, size_t cchField) +{ + // Copy and unquote text + _CopyAndUnquoteText(*pstrFieldSource, strField, cchField); + + return _FindNextArg(pstrFieldSource); +} + +static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) +{ + LPITEMIDLIST ret = NULL; + + // Ensure it really is an IDLIST-formatted parameter + // Format for IDLIST params: ":pid:shared" + if (*strField != L':') + return NULL; + + HANDLE hData = (HANDLE) StrToIntW(strField + 1); + PWSTR strSecond = StrChrW(strField + 1, L':'); + + if (strSecond) + { + int pid = StrToIntW(strSecond + 1); + void* pvShared = SHLockShared(hData, pid); + if (pvShared) + { + ret = ILClone((LPCITEMIDLIST) pvShared); + SHUnlockShared(pvShared); + SHFreeShared(hData, pid); + } + } + return ret; +} + +static HRESULT _ParsePathToPidl(PWSTR strPath, LPITEMIDLIST * pidl) +{ + CComPtr<IShellFolder> psfDesktop; + + HRESULT hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + return psfDesktop->ParseDisplayName(NULL, NULL, strPath, NULL, pidl, NULL); +} + +static LPITEMIDLIST _GetDocumentsPidl() +{ + CComPtr<IShellFolder> ppshf; + LPITEMIDLIST pidl; + WCHAR guid [] = L"::{450d8fba-ad25-11d0-98a8-0800361b1103}"; + + if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_MYDOCUMENTS, &pidl))) + return pidl; + + if (FAILED(SHGetDesktopFolder(&ppshf))) + return NULL; + + if (FAILED(ppshf->ParseDisplayName(NULL, NULL, guid, NULL, &pidl, NULL))) + return NULL; + + return pidl; +} + +/************************************************************************* +* SHExplorerParseCmdLine [BROWSEUI.107] +*/ +extern "C" +UINT +WINAPI +SHExplorerParseCmdLine(ExplorerCommandLineParseResults * pInfo) +{ + WCHAR strField[MAX_PATH]; + WCHAR strDir[MAX_PATH]; + + PCWSTR strCmdLine = GetCommandLineW(); + PCWSTR strFieldArray = PathGetArgsW(strCmdLine); + + if (!*strFieldArray) + { + pInfo->dwFlags = 9; + pInfo->pidlPath = _GetDocumentsPidl(); + if (!pInfo->pidlPath) + { + GetWindowsDirectoryW(strDir, MAX_PATH); + PathStripToRootW(strDir); + pInfo->pidlPath = ILCreateFromPathW(strDir); + } + return (LONG) (pInfo->pidlPath); + } + + PCWSTR strNextArg = _FindFirstField(strFieldArray); + + BOOL hasNext = TRUE; + + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + while (TRUE) + { + // Basic flags-only params first + if (!StrCmpIW(strField, L"/N")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_N | SH_EXPLORER_CMDLINE_FLAG_ONE; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/S")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_S; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/E")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_E; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/SELECT")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_SELECT; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/NOUI")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_NOUI; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"-embedding")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_EMBED; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/SEPARATE")) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_SEPARATE; + TRACE("CmdLine Parser: Parsed %S flag. dwFlags=%08lx\n", strField, pInfo->dwFlags); + } + else if (!StrCmpIW(strField, L"/INPROC")) + { + // No idea what Inproc is supposed to do, but it gets a GUID, and parses it. + + TRACE("CmdLine Parser: Found %S flag\n", strField); + + if (!hasNext) + return FALSE; + + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + + if (!GUIDFromStringW(strField, &(pInfo->guidInproc))) + return FALSE; + + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_INPROC; + + TRACE("CmdLine Parser: Parsed /INPROC flag. dwFlags=%08lx, guidInproc=%S\n", pInfo->dwFlags, strField); + } + else if (!StrCmpIW(strField, L"/ROOT")) + { + LPITEMIDLIST pidlRoot = NULL; + + // The window should be rooted + + TRACE("CmdLine Parser: Found %S flag\n", strField); + + if (!pInfo->pidlPath) + return FALSE; + + if (!hasNext) + return FALSE; + + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + + // Root may be a pidl + if (!StrCmpIW(strField, L"/IDLIST")) + { + if (hasNext) + { + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + } + pidlRoot = _ILReadFromSharedMemory(strField); + } + else + { + // Or just a path string + _ParsePathToPidl(strField, &pidlRoot); + } + + pInfo->pidlRoot = pidlRoot; + + // The root defaults to the desktop + if (!pidlRoot) + { + if (FAILED(SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &(pInfo->pidlRoot)))) + pInfo->pidlRoot = NULL; + } + + // TODO: Create rooted PIDL from pInfo->pidlPath and pInfo->pidlRoot + + TRACE("CmdLine Parser: Parsed /ROOT flag. dwFlags=%08lx, pidlRoot=%p\n", pInfo->dwFlags, pInfo->pidlRoot); + } + else + { + // Anything else is part of the target path to browse to + TRACE("CmdLine Parser: Found target path %S\n", strField); + + // Which can be a shared-memory itemidlist + if (!StrCmpIW(strField, L"/IDLIST")) + { + LPITEMIDLIST pidlArg; + + if (!hasNext) + return FALSE; + + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + pidlArg = _ILReadFromSharedMemory(strField); + if (!pidlArg) + return FALSE; + + if (pInfo->pidlPath) + ILFree(pInfo->pidlPath); + pInfo->pidlPath = pidlArg; + + TRACE("CmdLine Parser: Parsed target path. dwFlags=%08lx, pidlPath=%p\n", pInfo->dwFlags, pInfo->pidlPath); + } + else + { + // Or just a plain old string. + + LPITEMIDLIST pidlPath = ILCreateFromPathW(strField); + + pInfo->pidlPath = pidlPath; + + if (pidlPath) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_IDLIST; + TRACE("CmdLine Parser: Parsed target path. dwFlags=%08lx, pidlPath=%p\n", pInfo->dwFlags, pInfo->pidlPath); + } + else + { + // The path could not be parsed into an ID List, + // so pass it on as a plain string. + + PWSTR field = StrDupW(strField); + pInfo->strPath = field; + if (field) + { + pInfo->dwFlags |= SH_EXPLORER_CMDLINE_FLAG_STRING; + TRACE("CmdLine Parser: Parsed target path. dwFlags=%08lx, strPath=%S\n", pInfo->dwFlags, field); + } + } + + } + } + + if (!hasNext) + break; + hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); + } + + return TRUE; +} Propchange: branches/shell-experiments/dll/win32/browseui/parsecmdline.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi.h [iso-8859-1] Mon Sep 8 01:59:18 2014 @@ -1861,6 +1861,30 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); #endif /* NO_SHLWAPI_STREAM */ + +#ifndef NO_SHLWAPI_SHARED + +PVOID +WINAPI +SHLockShared( + _In_ HANDLE hData, + _In_ DWORD dwProcessId + ); + +BOOL +WINAPI +SHUnlockShared( + _In_ void *pvData + ); + +BOOL +WINAPI +SHFreeShared( + _In_ HANDLE hData, + _In_ DWORD dwProcessId + ); + +#endif /* NO_SHLWAPI_SHARED */ /* SHAutoComplete flags */ #define SHACF_DEFAULT 0x00000000 Modified: branches/shell-experiments/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] Mon Sep 8 01:59:18 2014 @@ -45,6 +45,45 @@ long filler4; // unknown contents }; +struct ExplorerCommandLineParseResults +{ + LPWSTR strPath; + LPITEMIDLIST pidlPath; + DWORD dwFlags; + DWORD unk_12; + DWORD unk_16; + DWORD unk_20; + DWORD unk_24; + DWORD unk_28; + LPITEMIDLIST pidlRoot; + DWORD unk_36; + DWORD unk_40; + DWORD unk_44; + DWORD unk_48; + GUID guidInproc; +}; + +#define SH_EXPLORER_CMDLINE_FLAG_ONE 0x00000001 +#define SH_EXPLORER_CMDLINE_FLAG_S 0x00000002 +// unknown/unused 0x00000004 +#define SH_EXPLORER_CMDLINE_FLAG_E 0x00000008 +// unknown/unused 0x00000010 +// unknown/unused 0x00000020 +#define SH_EXPLORER_CMDLINE_FLAG_SELECT 0x00000040 +#define SH_EXPLORER_CMDLINE_FLAG_EMBED 0x00000080 +// unknown/unused 0x00000100 +#define SH_EXPLORER_CMDLINE_FLAG_IDLIST 0x00000200 +#define SH_EXPLORER_CMDLINE_FLAG_INPROC 0x00000400 +// unknown/unused 0x00000800 +#define SH_EXPLORER_CMDLINE_FLAG_NOUI 0x00001000 +// unknown/unused 0x00002000 +#define SH_EXPLORER_CMDLINE_FLAG_N 0x00004000 +// unknown/unused 0x00008000 +// unknown/unused 0x00010000 +#define SH_EXPLORER_CMDLINE_FLAG_SEPARATE 0x00020000 +#define SH_EXPLORER_CMDLINE_FLAG_STRING 0x02000000 + + BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); HRESULT WINAPI IUnknown_QueryStatus(IUnknown *lpUnknown, REFGUID pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText); @@ -86,7 +125,7 @@ long WINAPI SHOpenFolderWindow(IEThreadParamBlock *param8); void WINAPI SHCreateSavedWindows(void); long WINAPI SHCreateFromDesktop(long param8); -long WINAPI SHExplorerParseCmdLine(LPCTSTR commandLine); +UINT WINAPI SHExplorerParseCmdLine(ExplorerCommandLineParseResults * pParseResults); void WINAPI UEMRegisterNotify(long param8, long paramC); HRESULT WINAPI SHCreateBandForPidl(LPCITEMIDLIST param8, IUnknown *paramC, BOOL param10); HRESULT WINAPI SHPidlFromDataObject(IDataObject *param8, long *paramC, long param10, FILEDESCRIPTORW *param14);

1 0

[dquintana] 64080: [BROWSEUI_APITEST] * Do not depend on a file to exist, which in fact does not exist in ros. Fix the test expectations accordingly.
by dquintana＠svn.reactos.org 08 Sep '14

08 Sep '14

Author: dquintana Date: Mon Sep 8 01:54:29 2014 New Revision: 64080 URL: http://svn.reactos.org/svn/reactos?rev=64080&view=rev Log: [BROWSEUI_APITEST] * Do not depend on a file to exist, which in fact does not exist in ros. Fix the test expectations accordingly. Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Mon Sep 8 01:54:29 2014 @@ -10,6 +10,16 @@ //#define UNICODE #include <strsafe.h> #include <shlobj.h> + +// Macro parameters are only expanded in the second nesting... +#define _WIDEN(x) L##x +#define WIDEN(x) _WIDEN(x) + +#define TEST_FILENAMEA "SHExplorerParseCmdLine.test" +#define TEST_FILENAMEW WIDEN(TEST_FILENAMEA) + +#define TEST_PATHA "C:\\SHExplorerParseCmdLine.test" +#define TEST_PATHW WIDEN(TEST_PATHA) #define PADDING_SIZE 0x100 @@ -74,6 +84,8 @@ LocalFree(Info.FileName); } } + + ok(Info.dwFlags == ExpectedFlags, "dwFlags = %08lx, expected %08lx\n", Info.dwFlags, ExpectedFlags); if (ExpectedCsidl == PIDL_IS_UNTOUCHED) ok(Info.pidl == InvalidPointer, "pidl = %p\n", Info.pidl); @@ -128,11 +140,12 @@ } } } - ILFree(Info.pidl); + + if (Info.pidl != NULL && Info.pidl != (LPITEMIDLIST) 0x55555555) + ILFree(Info.pidl); } } - ok(Info.dwFlags == ExpectedFlags, "dwFlags = %08lx, expected %08lx\n", Info.dwFlags, ExpectedFlags); for (i = 0; i < sizeof(Info) / sizeof(DWORD); i++) { switch (i*4) @@ -206,7 +219,7 @@ { __LINE__, L"c:\\Program Files\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, { __LINE__, L"c:\\Program Files/", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\Program Files/"}, { __LINE__, L"c:/Program Files/", TRUE, PIDL_IS_NULL, 0x02000000, L"c:/Program Files/"}, - { __LINE__, L"c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\ntldr" }, + { __LINE__, TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000200, NULL, TEST_PATHW }, { __LINE__, L"\"c:\\\"\"program files\"", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\\"program files"}, { __LINE__, L"\"c:\\\"program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, { __LINE__, L"\"c:\\ \"program files", TRUE, PIDL_IS_NULL, 0x02000000, L"c:\\ program files"}, @@ -238,12 +251,12 @@ { __LINE__, L"/select,0", TRUE, PIDL_IS_NULL, 0x02000040, L"0"}, { __LINE__, L"/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, { __LINE__, L"c:\\,/select", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, - { __LINE__, L"/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, + { __LINE__, L"/select," TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000240, NULL, TEST_PATHW }, { __LINE__, L"/select,c:\\Program Files,c:\\Documents and settings", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\Documents and Settings" }, - { __LINE__, L"c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000240, L"ntldr"}, - { __LINE__, L"c:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, - { __LINE__, L"a:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, - { __LINE__, L"z:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x02000240, L"z:\\", L"C:\\ntldr" }, + { __LINE__, L"c:\\,/select," TEST_FILENAMEW, TRUE, PIDL_IS_NULL, 0x02000240, TEST_FILENAMEW }, + { __LINE__, L"c:\\,/select," TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000240, NULL, TEST_PATHW }, + { __LINE__, L"a:\\,/select," TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000240, NULL, TEST_PATHW }, + { __LINE__, L"z:\\,/select," TEST_PATHW, TRUE, PIDL_IS_PATH, 0x02000240, L"z:\\", TEST_PATHW }, { __LINE__, L"select,c:\\ ", TRUE, PIDL_IS_PATH, 0x02000200, L"select", L"C:\\" }, { __LINE__, L"/select c:\\ ", TRUE, PIDL_IS_NULL, 0x02000000, L"/select c:\\"}, { __LINE__, L"a:\\,/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, @@ -256,16 +269,16 @@ { __LINE__, L"/e,c:\\", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, { __LINE__, L"c:\\,/e", TRUE, PIDL_IS_PATH, 0x00000208, NULL, L"C:\\" }, { __LINE__, L"/e,c", TRUE, PIDL_IS_NULL, 0x02000008, L"c"}, - { __LINE__, L"/root,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000040, L"ntldr"}, - { __LINE__, L"/select,ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000040, L"ntldr", L"c:\\" }, - { __LINE__, L"/root,c:\\,/select,c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\ntldr" }, - { __LINE__, L"/select,c:\\ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000240, NULL, L"c:\\" }, - { __LINE__, L"/e,/select,ntldr,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000048, L"ntldr", L"c:\\" }, - { __LINE__, L"/e,/root,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000048, L"ntldr"}, + { __LINE__, L"/root,c:\\,/select," TEST_FILENAMEW, TRUE, PIDL_IS_NULL, 0x02000040, TEST_FILENAMEW }, + { __LINE__, L"/select," TEST_FILENAMEW L",/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000040, TEST_FILENAMEW, L"c:\\" }, + { __LINE__, L"/root,c:\\,/select," TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000240, NULL, TEST_PATHW }, + { __LINE__, L"/select," TEST_PATHW L",/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000240, NULL, L"c:\\" }, + { __LINE__, L"/e,/select," TEST_FILENAMEW L",/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x02000048, TEST_FILENAMEW, L"c:\\" }, + { __LINE__, L"/e,/root,c:\\,/select," TEST_FILENAMEW, TRUE, PIDL_IS_NULL, 0x02000048, TEST_FILENAMEW }, { __LINE__, L"/e,/root,c:\\", TRUE, PIDL_PATH_EQUALS_PATH, 0x00000008, NULL, L"c:\\" }, - { __LINE__, L"/e,c:\\,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, - { __LINE__, L"c:\\,/e,/select,ntldr", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, - { __LINE__, L"c:\\,/select,ntldr,/e", TRUE, PIDL_IS_NULL, 0x02000248, L"ntldr"}, + { __LINE__, L"/e,c:\\,/select," TEST_FILENAMEW, TRUE, PIDL_IS_NULL, 0x02000248, TEST_FILENAMEW }, + { __LINE__, L"c:\\,/e,/select," TEST_FILENAMEW, TRUE, PIDL_IS_NULL, 0x02000248, TEST_FILENAMEW }, + { __LINE__, L"c:\\,/select," TEST_FILENAMEW L",/e", TRUE, PIDL_IS_NULL, 0x02000248, TEST_FILENAMEW }, { __LINE__, L"http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000000, L"http:\\\\www.reactos.org"}, { __LINE__, L"/e,http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000008, L"http:\\\\www.reactos.org"}, { __LINE__, L"/root,c:\\,http:\\\\www.reactos.org", TRUE, PIDL_IS_NULL, 0x02000000, L"http:\\\\www.reactos.org"}, @@ -279,7 +292,7 @@ { __LINE__, L"c:\\Documents and settings,/inproc,/noui,/s,/separate,/n,/e,/root,{450D8FBA-AD25-11D0-98A8-0800361B1103, 0},test,/select,c:\\Program files,", FALSE, PIDL_PATH_EQUALS_PATH, 0x00000200, NULL, L"C:\\Documents and Settings" }, { __LINE__, L"=", TRUE, CSIDL_DRIVES, 0x00000200 }, { __LINE__, L"=c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, - { __LINE__, L"=c:\\ntldr", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\ntldr" }, + { __LINE__, L"=" TEST_PATHW, TRUE, PIDL_IS_PATH, 0x00000200, NULL, TEST_PATHW }, { __LINE__, L"/root,=", TRUE, CSIDL_DRIVES, 0x00000200 }, { __LINE__, L"/root=c:\\", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\" }, { __LINE__, L"/root=c:\\Program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, @@ -331,9 +344,13 @@ WCHAR OriginalCommandLine[1024]; int i; UINT maxWrite = 0; + FILE * ff; CommandLine = GetCommandLineW(); StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); + + ff = fopen(TEST_PATHA, "wb"); + fclose(ff); for (i = 0; i < TestCount; i++) { @@ -356,4 +373,6 @@ trace("Writes reached the byte right before 0x%08x\n", maxWrite); wcscpy(CommandLine, OriginalCommandLine); + + remove(TEST_PATHA); }

1 0

[hbelusca] 64079: [KERNEL32][CONSRV] - Make CONSRV_API_CONNECTINFO, CONSOLE_ALLOCCONSOLE and CONSOLE_ATTACHCONSOLE Windows 2k3-compatible, so that using either their kernel32 in ROS or our kernel32...
by hbelusca＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: hbelusca Date: Sun Sep 7 22:53:49 2014 New Revision: 64079 URL: http://svn.reactos.org/svn/reactos?rev=64079&view=rev Log: [KERNEL32][CONSRV] - Make CONSRV_API_CONNECTINFO, CONSOLE_ALLOCCONSOLE and CONSOLE_ATTACHCONSOLE Windows 2k3-compatible, so that using either their kernel32 in ROS or our kernel32 in windows, works. For that, complete and fix also the CONSOLE_START_INFO and CONSOLE_PROPERTIES structures. - Rewrite Alloc/AttachConsole and the console initialization functions to match what Windows expects when connecting to the console server, and make them compatible with the fixed structures. - Fix SrvAllocConsole and SrvAttachConsole accordingly, and few other console initialization functions in consrv. - Fix input EXE name support and store also the current directory from which we were started. - Use a temporarily define USE_CONSOLE_INIT_HANDLES that is not enabled yet because we do not use console initialization events (used by Windows for Alloc/AttachConsole and console initialization functions). Until this gets implemented in ReactOS, putting windows' kernel32 in ReactOS will fail when it will try to wait on those events. - For SrvAlloc/SrvAttach/SrvFreeConsole, ConSrvConnect and ConSrvDisconnect: correctly mark the process as console app. - Fix process initialization in ConSrvNewProcess. - Get rid of CONSOLE_PROCESS_DATA::ParentConsoleHandle member. - Temporarily move the link settings retrieval in console.c and hack a bit icon setting. [CONSRV] - Move console title setting from condrv back to consrv where it should belong in fact. CORE-7931 #resolve #comment ConsolepAlloc and ConsolepAttach finally fixed in revision 64079. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c branches/condrv_restructure/dll/win32/kernel32/client/console/init.c branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/dll/win32/kernel32/client/dllmain.c branches/condrv_restructure/dll/win32/kernel32/client/proc.c branches/condrv_restructure/dll/win32/kernel32/include/console.h branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…

1 0

[tkreuzer] 64078: [PSEH] - On clang builds we need to do the return twice trick, since we don't have asm goto, which would allow us to specify labels in the code where we can branch to on an except...
by tkreuzer＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: tkreuzer Date: Sun Sep 7 21:40:07 2014 New Revision: 64078 URL: http://svn.reactos.org/svn/reactos?rev=64078&view=rev Log: [PSEH] - On clang builds we need to do the return twice trick, since we don't have asm goto, which would allow us to specify labels in the code where we can branch to on an exception. So we return back to from where we called the registration function and decide how to proceed from there nasedon the return value. For this we need to save the return address in the registration record and use it in __SEH3$_InvokeEmbeddedFilterFromRegistration Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3_asmdef.h trunk/reactos/lib/pseh/i386/pseh3_i386.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Sep 7 21:40:07 2014 @@ -76,6 +76,9 @@ unsigned long Ebx; unsigned long Esi; unsigned long Edi; +#endif +#ifdef __clang__ + void *ReturnAddress; #endif } SEH3$_REGISTRATION_FRAME ,*PSEH3$_REGISTRATION_FRAME; Modified: trunk/reactos/lib/pseh/i386/pseh3_asmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_asmdef… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] Sun Sep 7 21:40:07 2014 @@ -12,6 +12,7 @@ #define SEH3_REGISTRATION_FRAME_Ebx 36 #define SEH3_REGISTRATION_FRAME_Esi 40 #define SEH3_REGISTRATION_FRAME_Edi 44 +#define SEH3_REGISTRATION_FRAME_ReturnAddress 48 #define SEH3_SCOPE_TABLE_Target 0 #define SEH3_SCOPE_TABLE_Filter 4 Modified: trunk/reactos/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_i386.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] Sun Sep 7 21:40:07 2014 @@ -30,6 +30,10 @@ mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi + /* Safe the return address */ + mov ebx, [esp] + mov [eax + SEH3_REGISTRATION_FRAME_ReturnAddress], ebx + .global __SEH3$_RegisterFrameWithStackLayout __SEH3$_RegisterFrameWithStackLayout: @@ -79,6 +83,10 @@ mov [eax + SEH3_REGISTRATION_FRAME_Esi], esi mov [eax + SEH3_REGISTRATION_FRAME_Edi], edi + /* Safe the return address */ + mov ebx, [esp] + mov [eax + SEH3_REGISTRATION_FRAME_ReturnAddress], ebx + .global __SEH3$_RegisterTryLevelWithStackLayout __SEH3$_RegisterTryLevelWithStackLayout: @@ -128,14 +136,61 @@ mov edi, [eax + SEH3_REGISTRATION_FRAME_Edi] mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] - jmp __SEH3$_InvokeEmbeddedFilter2 - - /* Get the saved stack pointer */ - mov edx, [eax + SEH3_REGISTRATION_FRAME_Esp] - + /* Calculate the size of the temp stack frame region */ + mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame] + sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp] + + /* Put the return address on the stack */ + push offset __SEH3$_InvokeEmbeddedFilterReturn + + /* Save the current stack pointer in the AllocaFrame member */ + mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], esp + + /* Allocate enough temp stack space on the stack */ + sub esp, ecx + + /* Get the return address that was saved when registering the frame */ + mov edx, [eax + SEH3_REGISTRATION_FRAME_ReturnAddress] + + /* Jump into the filter or finally function */ xor eax, eax inc eax - call [edx] + jmp edx + + +.global __SEH3$_InvokeEmbeddedFilter +__SEH3$_InvokeEmbeddedFilter: + + /* Safe the current non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Load ebp from the registration invocation */ + mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] + + /* Calculate the size of the temp stack frame region */ + mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame] + sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp] + + /* Put the return address on the stack */ + push offset __SEH3$_InvokeEmbeddedFilterReturn + + /* Save the current stack pointer in the AllocaFrame member */ + mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], esp + + /* Allocate enough temp stack space on the stack */ + sub esp, ecx + + /* Get the scope table */ + mov edx, [eax + SEH3_REGISTRATION_FRAME_ScopeTable] + + /* Jump into the filter or finally function */ + jmp [edx + SEH3_SCOPE_TABLE_Filter] + + /* We return to this label with a cleaned up stack */ +__SEH3$_InvokeEmbeddedFilterReturn: /* Restore the current non-volatiles */ pop edi @@ -145,49 +200,6 @@ ret - -.global __SEH3$_InvokeEmbeddedFilter -__SEH3$_InvokeEmbeddedFilter: - - /* Safe the current non-volatiles */ - push ebp - push ebx - push esi - push edi - - /* Load ebp from the registration invocation */ - mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] -__SEH3$_InvokeEmbeddedFilter2: - /* Calculate the size of the temp stack frame region */ - mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame] - sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp] - - /* Put the return address on the stack */ - push offset __SEH3$_InvokeEmbeddedFilterReturn - - /* Save the current stack pointer in the AllocaFrame member */ - mov [eax + SEH3_REGISTRATION_FRAME_AllocaFrame], esp - - /* Allocate enough temp stack space on the stack */ - sub esp, ecx - - /* Get the scope table */ - mov edx, [eax + SEH3_REGISTRATION_FRAME_ScopeTable] - - /* Jump into the filter or finally function */ - jmp [edx + SEH3_SCOPE_TABLE_Filter] - - /* We return to this label with a cleaned up stack */ -__SEH3$_InvokeEmbeddedFilterReturn: - - /* Restore the current non-volatiles */ - pop edi - pop esi - pop ebx - pop ebp - - ret - /* * void * __fastcall

1 0

[tkreuzer] 64077: [PSEH] - Fix compilation of PSEH with Clang - Fix _SEH3$_InvokeEmbeddedFilterFromRegistration
by tkreuzer＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: tkreuzer Date: Sun Sep 7 20:52:20 2014 New Revision: 64077 URL: http://svn.reactos.org/svn/reactos?rev=64077&view=rev Log: [PSEH] - Fix compilation of PSEH with Clang - Fix _SEH3$_InvokeEmbeddedFilterFromRegistration Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c trunk/reactos/lib/pseh/i386/pseh3_i386.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sun Sep 7 20:52:20 2014 @@ -64,7 +64,7 @@ /* Except handler stores pointer to exception pointers here */ PSEH3$_EXCEPTION_POINTERS volatile ExceptionPointers; - /* Except handle stores the exception code here */ + /* Except handler stores the exception code here */ unsigned long ExceptionCode; /* Registers that we need to save */ Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sun Sep 7 20:52:20 2014 @@ -64,7 +64,7 @@ static inline LONG _SEH3$_InvokeNestedFunctionFilter( - PSEH3$_REGISTRATION_FRAME RegistrationFrame, + volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame, PVOID Filter) { LONG FilterResult; @@ -93,17 +93,17 @@ long __attribute__((regparm(1))) _SEH3$_InvokeEmbeddedFilter( - PSEH3$_REGISTRATION_FRAME RegistrationFrame); + volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame); long __attribute__((regparm(1))) _SEH3$_InvokeEmbeddedFilterFromRegistration( - PSEH3$_REGISTRATION_FRAME RegistrationFrame); + volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame); static inline LONG _SEH3$_InvokeFilter( - PSEH3$_REGISTRATION_FRAME RegistrationFrame, + volatile SEH3$_REGISTRATION_FRAME *RegistrationFrame, PVOID Filter) { LONG FilterResult; @@ -133,7 +133,7 @@ void __attribute__((regparm(1))) _SEH3$_AutoCleanup( - SEH3$_REGISTRATION_FRAME *Frame) + volatile SEH3$_REGISTRATION_FRAME *Frame) { /* Check for __finally frames */ if (Frame->ScopeTable->Target == NULL) @@ -241,7 +241,9 @@ EXCEPTION_DISPOSITION __cdecl +#ifndef __clang__ __attribute__ ((__target__ ("cld"))) +#endif _SEH3$_except_handler( struct _EXCEPTION_RECORD * ExceptionRecord, PSEH3$_REGISTRATION_FRAME EstablisherFrame, Modified: trunk/reactos/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_i386.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] Sun Sep 7 20:52:20 2014 @@ -128,6 +128,8 @@ mov edi, [eax + SEH3_REGISTRATION_FRAME_Edi] mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] + jmp __SEH3$_InvokeEmbeddedFilter2 + /* Get the saved stack pointer */ mov edx, [eax + SEH3_REGISTRATION_FRAME_Esp] @@ -155,7 +157,7 @@ /* Load ebp from the registration invocation */ mov ebp, [eax + SEH3_REGISTRATION_FRAME_Ebp] - +__SEH3$_InvokeEmbeddedFilter2: /* Calculate the size of the temp stack frame region */ mov ecx, [eax + SEH3_REGISTRATION_FRAME_AllocaFrame] sub ecx, [eax + SEH3_REGISTRATION_FRAME_Esp]

1 0

[akhaldi] 64076: [DPLAY] * Add the (empty) stub file to build. * We don't need to link ntdll. * dplay now compiles with Clang. CORE-8516
by akhaldi＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: akhaldi Date: Sun Sep 7 20:19:05 2014 New Revision: 64076 URL: http://svn.reactos.org/svn/reactos?rev=64076&view=rev Log: [DPLAY] * Add the (empty) stub file to build. * We don't need to link ntdll. * dplay now compiles with Clang. CORE-8516 Modified: trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplay/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt [iso-8859-1] Sun Sep 7 20:19:05 2014 @@ -4,8 +4,9 @@ add_library(dplay SHARED version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dplay_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) set_module_type(dplay win32dll) -add_importlibs(dplay dplayx msvcrt kernel32 ntdll) +add_importlibs(dplay dplayx msvcrt kernel32) add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all)

1 0

[hbelusca] 64075: [CONSRV] - Start to implement a popup list of entered commands (history), WIP. - Fix Get/SetConsoleHistoryInfo. - Implement SetConsoleCommandHistoryMode.
by hbelusca＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: hbelusca Date: Sun Sep 7 20:05:39 2014 New Revision: 64075 URL: http://svn.reactos.org/svn/reactos?rev=64075&view=rev Log: [CONSRV] - Start to implement a popup list of entered commands (history), WIP. - Fix Get/SetConsoleHistoryInfo. - Implement SetConsoleCommandHistoryMode. Modified: branches/condrv_restructure/include/psdk/wincon.h branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h Modified: branches/condrv_restructure/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… ============================================================================== --- branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] Sun Sep 7 20:05:39 2014 @@ -27,9 +27,6 @@ // These codes are answered by GetConsoleDisplayMode #define CONSOLE_WINDOWED 0 #define CONSOLE_FULLSCREEN 1 -#if (_WIN32_WINNT >= 0x0600) -#define CONSOLE_OVERSTRIKE 1 -#endif #define CONSOLE_FULLSCREEN_HARDWARE 2 // These codes should be given to SetConsoleDisplayMode @@ -103,11 +100,15 @@ #define CONSOLE_MOUSE_DOWN 0x0008 /* - * History duplicate flags + * History information and mode flags */ #if (_WIN32_WINNT >= 0x0600) +// For Get/SetConsoleHistoryInfo #define HISTORY_NO_DUP_FLAG 0x0001 -#endif +// For SetConsoleCommandHistoryMode +#define CONSOLE_OVERSTRIKE 0x0001 +#endif + /* * Read input flags Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c [iso-8859-1] Sun Sep 7 20:05:39 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" +#include "popup.h" #define NDEBUG #include <debug.h> @@ -25,14 +26,14 @@ BOOLEAN -ConvertInputAnsiToUnicode(PCONSOLE Console, +ConvertInputAnsiToUnicode(PCONSRV_CONSOLE Console, PVOID Source, USHORT SourceLength, // BOOLEAN IsUnicode, PWCHAR* Target, PUSHORT TargetLength); BOOLEAN -ConvertInputUnicodeToAnsi(PCONSOLE Console, +ConvertInputUnicodeToAnsi(PCONSRV_CONSOLE Console, PVOID Source, USHORT SourceLength, // BOOLEAN IsAnsi, @@ -266,9 +267,44 @@ return FALSE; } +PPOPUP_WINDOW +HistoryDisplayCurrentHistory(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName) +{ + PTEXTMODE_SCREEN_BUFFER ActiveBuffer; + PPOPUP_WINDOW Popup; + + SHORT xLeft, yTop; + SHORT Width, Height; + + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName); + + if (!Hist) return NULL; + if (Hist->NumEntries == 0) return NULL; + + if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) return NULL; + ActiveBuffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer; + + Width = 40; + Height = 10; + + /* Center the popup window on the screen */ + xLeft = ActiveBuffer->ViewOrigin.X + (ActiveBuffer->ViewSize.X - Width ) / 2; + yTop = ActiveBuffer->ViewOrigin.Y + (ActiveBuffer->ViewSize.Y - Height) / 2; + + /* Create the popup */ + Popup = CreatePopupWindow(Console, ActiveBuffer, + xLeft, yTop, Width, Height); + if (Popup == NULL) return NULL; + + Popup->PopupInputRoutine = NULL; + + return Popup; +} + VOID HistoryDeleteCurrentBuffer(PCONSRV_CONSOLE Console, - PVOID ExeName) + PUNICODE_STRING ExeName) { HistoryDeleteBuffer(HistoryCurrentBuffer(Console, ExeName)); } @@ -312,7 +348,8 @@ return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Hist = HistoryFindBuffer(Console, @@ -394,7 +431,8 @@ return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Hist = HistoryFindBuffer(Console, @@ -435,7 +473,8 @@ return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Hist = HistoryFindBuffer(Console, @@ -463,7 +502,8 @@ return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; Hist = HistoryFindBuffer(Console, @@ -504,12 +544,13 @@ #if 0 // Vista+ PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSRV_CONSOLE Console; - NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (NT_SUCCESS(Status)) { HistoryInfoRequest->HistoryBufferSize = Console->HistoryBufferSize; HistoryInfoRequest->NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; - HistoryInfoRequest->dwFlags = Console->HistoryNoDup; + HistoryInfoRequest->dwFlags = (Console->HistoryNoDup ? HISTORY_NO_DUP_FLAG : 0); ConSrvReleaseConsole(Console, TRUE); } return Status; @@ -524,12 +565,13 @@ #if 0 // Vista+ PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSRV_CONSOLE Console; - NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (NT_SUCCESS(Status)) { Console->HistoryBufferSize = HistoryInfoRequest->HistoryBufferSize; Console->NumberOfHistoryBuffers = HistoryInfoRequest->NumberOfHistoryBuffers; - Console->HistoryNoDup = HistoryInfoRequest->dwFlags & HISTORY_NO_DUP_FLAG; + Console->HistoryNoDup = !!(HistoryInfoRequest->dwFlags & HISTORY_NO_DUP_FLAG); ConSrvReleaseConsole(Console, TRUE); } return Status; @@ -548,14 +590,14 @@ DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", SetHistoryModeRequest->Mode); - Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - /* This API is not yet implemented */ - Status = STATUS_NOT_IMPLEMENTED; + Console->InsertMode = !!(SetHistoryModeRequest->Mode & CONSOLE_OVERSTRIKE); ConSrvReleaseConsole(Console, TRUE); - return Status; + return STATUS_SUCCESS; } /* EOF */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Sun Sep 7 20:05:39 2014 @@ -9,20 +9,21 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" +#include "popup.h" #define NDEBUG #include <debug.h> BOOLEAN -ConvertInputAnsiToUnicode(PCONSOLE Console, +ConvertInputAnsiToUnicode(PCONSRV_CONSOLE Console, PVOID Source, USHORT SourceLength, // BOOLEAN IsUnicode, PWCHAR* Target, PUSHORT TargetLength); BOOLEAN -ConvertInputUnicodeToAnsi(PCONSOLE Console, +ConvertInputUnicodeToAnsi(PCONSRV_CONSOLE Console, PVOID Source, USHORT SourceLength, // BOOLEAN IsAnsi, @@ -45,7 +46,7 @@ PUNICODE_STRING Entry); VOID HistoryDeleteCurrentBuffer(PCONSRV_CONSOLE Console, - PVOID ExeName); + PUNICODE_STRING ExeName); BOOL HistoryFindEntryByPrefix(PCONSRV_CONSOLE Console, PUNICODE_STRING ExeName, @@ -53,14 +54,13 @@ PUNICODE_STRING Entry); - /* PRIVATE FUNCTIONS **********************************************************/ static VOID LineInputSetPos(PCONSRV_CONSOLE Console, UINT Pos) { - if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + if (Pos != Console->LinePos && GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) { PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; SHORT OldCursorX = Buffer->CursorPosition.X; @@ -104,7 +104,7 @@ (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) { for (i = Pos; i < NewSize; i++) { @@ -158,6 +158,14 @@ } #endif + +// TESTS!! +PPOPUP_WINDOW Popup = NULL; + +PPOPUP_WINDOW +HistoryDisplayCurrentHistory(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName); + VOID LineInputKeyDown(PCONSRV_CONSOLE Console, PUNICODE_STRING ExeName, @@ -177,6 +185,13 @@ /* Clear entire line */ LineInputSetPos(Console, 0); LineInputEdit(Console, Console->LineSize, 0, NULL); + + // TESTS!! + if (Popup) + { + DestroyPopupWindow(Popup); + Popup = NULL; + } return; } @@ -310,6 +325,11 @@ { if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) HistoryDeleteCurrentBuffer(Console, ExeName); + else + { + if (Popup) DestroyPopupWindow(Popup); + Popup = HistoryDisplayCurrentHistory(Console, ExeName); + } return; } @@ -383,7 +403,7 @@ * OK, we deal with normal keys, we can continue... */ - if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT) + if (KeyEvent->uChar.UnicodeChar == L'\b' && GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) { /* backspace handling - if processed input enabled then we handle it here * otherwise we treat it like a normal char. */ @@ -404,7 +424,7 @@ LineInputSetPos(Console, Console->LineSize); Console->LineBuffer[Console->LineSize++] = L'\r'; - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) { if (GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) { @@ -417,11 +437,11 @@ * but an exception to the rule exists: the buffer could have been * pre-filled with LineMaxSize - 1 characters. */ - if (Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && + if (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT && Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n'; - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + if (GetConsoleInputBufferMode(Console) & ENABLE_ECHO_INPUT) { if (GetType(Console->ActiveBuffer) == TEXTMODE_BUFFER) { @@ -447,6 +467,7 @@ { /* Normal character */ BOOL Overstrike = !Console->LineInsertToggle && (Console->LinePos != Console->LineSize); + DPRINT("Overstrike = %s\n", Overstrike ? "true" : "false"); LineInputEdit(Console, (Overstrike ? 1 : 0), 1, &KeyEvent->uChar.UnicodeChar); } } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c [iso-8859-1] Sun Sep 7 20:05:39 2014 @@ -170,7 +170,8 @@ /* PUBLIC FUNCTIONS ***********************************************************/ PPOPUP_WINDOW -CreatePopupWindow(PTEXTMODE_SCREEN_BUFFER Buffer, +CreatePopupWindow(PCONSRV_CONSOLE Console, + PTEXTMODE_SCREEN_BUFFER Buffer, SHORT xLeft, SHORT yTop, SHORT Width, @@ -178,6 +179,8 @@ { PPOPUP_WINDOW Popup; SMALL_RECT Region; + + ASSERT((PCONSOLE)Console == Buffer->Header.Console); /* Create the popup window */ Popup = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*Popup)); @@ -214,7 +217,7 @@ Width, Height); /* Add it into the list of popups */ - InsertTailList(&Buffer->Header.Console->PopupWindows, &Popup->ListEntry); + InsertTailList(&Console->PopupWindows, &Popup->ListEntry); return Popup; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.h [iso-8859-1] Sun Sep 7 20:05:39 2014 @@ -27,7 +27,8 @@ PPOPUP_WINDOW -CreatePopupWindow(PTEXTMODE_SCREEN_BUFFER Buffer, +CreatePopupWindow(PCONSRV_CONSOLE Console, + PTEXTMODE_SCREEN_BUFFER Buffer, SHORT xLeft, SHORT yTop, SHORT Width,

1 0

[akhaldi] 64074: [NTOS:CC] * Remove unused ExSectionInfoClass.
by akhaldi＠svn.reactos.org 07 Sep '14

07 Sep '14

Author: akhaldi Date: Sun Sep 7 19:16:30 2014 New Revision: 64074 URL: http://svn.reactos.org/svn/reactos?rev=64074&view=rev Log: [NTOS:CC] * Remove unused ExSectionInfoClass. Modified: trunk/reactos/ntoskrnl/cache/section/data.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Sep 7 19:16:30 2014 @@ -89,14 +89,6 @@ extern KSPIN_LOCK MiSectionPageTableLock; extern PMMWSL MmWorkingSetList; -/* GLOBALS *******************************************************************/ - -static const INFORMATION_CLASS_INFO ExSectionInfoClass[] = -{ - ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */ - ICI_SQ_SAME( sizeof(SECTION_IMAGE_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionImageInformation */ -}; - /* FUNCTIONS *****************************************************************/ /* Note: Mmsp prefix denotes "Memory Manager Section Private". */

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