Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[gadamopoulos] 69330: [SHELL32] - Fix a bug in my latest commit.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Sep 23 15:20:56 2015 New Revision: 69330 URL: http://svn.reactos.org/svn/reactos?rev=69330&view=rev Log: [SHELL32] - Fix a bug in my latest commit. Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Wed Sep 23 15:20:56 2015 @@ -485,7 +485,7 @@ } else if (!_ILIsDesktop(pidl) && _ILIsSpecialFolder(pidl)) { - return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); + return SHELL32_GetDisplayNameOfGUIDItem(this, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", pidl, dwFlags, strRet); } else if (pidl->mkid.cb && !_ILIsDrive(pidl)) {

9 years, 3 months

[tfaber] 69329: [NTDLL_APITEST] - Add simple tests for NtOpenThreadToken[Ex] and NtOpenProcessToken[Ex]

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Sep 23 15:14:25 2015 New Revision: 69329 URL: http://svn.reactos.org/svn/reactos?rev=69329&view=rev Log: [NTDLL_APITEST] - Add simple tests for NtOpenThreadToken[Ex] and NtOpenProcessToken[Ex] Added: trunk/rostests/apitests/ntdll/NtOpenProcessToken.c (with props) trunk/rostests/apitests/ntdll/NtOpenThreadToken.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed Sep 23 15:14:25 2015 @@ -10,6 +10,8 @@ NtFreeVirtualMemory.c NtMapViewOfSection.c NtMutant.c + NtOpenProcessToken.c + NtOpenThreadToken.c NtProtectVirtualMemory.c NtQueryKey.c NtQuerySystemEnvironmentValue.c Added: trunk/rostests/apitests/ntdll/NtOpenProcessToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtOpenProc… ============================================================================== --- trunk/rostests/apitests/ntdll/NtOpenProcessToken.c (added) +++ trunk/rostests/apitests/ntdll/NtOpenProcessToken.c [iso-8859-1] Wed Sep 23 15:14:25 2015 @@ -0,0 +1,53 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtOpenProcessToken[Ex] + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/sefuncs.h> + +START_TEST(NtOpenProcessToken) +{ + NTSTATUS Status; + HANDLE TokenHandle; + + Status = NtOpenProcessToken(NtCurrentProcess(), + TOKEN_READ, + &TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ok((LONG_PTR)TokenHandle > 0, "TokenHandle = %p\n", TokenHandle); + Status = NtClose(TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } + + Status = NtOpenProcessTokenEx(NtCurrentProcess(), + TOKEN_READ, + 0, + &TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ok((LONG_PTR)TokenHandle > 0, "TokenHandle = %p\n", TokenHandle); + Status = NtClose(TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } + + Status = NtOpenProcessTokenEx(NtCurrentProcess(), + TOKEN_READ, + OBJ_KERNEL_HANDLE, + &TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ok((LONG_PTR)TokenHandle > 0, "TokenHandle = %p\n", TokenHandle); + Status = NtClose(TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } +} Propchange: trunk/rostests/apitests/ntdll/NtOpenProcessToken.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/NtOpenThreadToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtOpenThre… ============================================================================== --- trunk/rostests/apitests/ntdll/NtOpenThreadToken.c (added) +++ trunk/rostests/apitests/ntdll/NtOpenThreadToken.c [iso-8859-1] Wed Sep 23 15:14:25 2015 @@ -0,0 +1,69 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtOpenThreadToken[Ex] + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> + +START_TEST(NtOpenThreadToken) +{ + NTSTATUS Status; + HANDLE TokenHandle; + BOOLEAN OpenAsSelf; + ULONG HandleAttributes[] = { 0, OBJ_KERNEL_HANDLE }; + ULONG i; + + TokenHandle = (HANDLE)0x55555555; + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_READ, + TRUE, + &TokenHandle); + ok(Status == STATUS_NO_TOKEN, "Status = %lx\n", Status); + ok(TokenHandle == NULL, "TokenHandle = %p\n", TokenHandle); + + Status = RtlImpersonateSelf(SecurityImpersonation); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + for (OpenAsSelf = FALSE; OpenAsSelf <= TRUE; OpenAsSelf++) + { + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_READ, + OpenAsSelf, + &TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ok((LONG_PTR)TokenHandle > 0, "TokenHandle = %p\n", TokenHandle); + Status = NtClose(TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } + + for (i = 0; i < RTL_NUMBER_OF(HandleAttributes); i++) + { + Status = NtOpenThreadTokenEx(NtCurrentThread(), + TOKEN_READ, + OpenAsSelf, + HandleAttributes[i], + &TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + if (NT_SUCCESS(Status)) + { + ok((LONG_PTR)TokenHandle > 0, "TokenHandle = %p\n", TokenHandle); + Status = NtClose(TokenHandle); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + } + } + } + + TokenHandle = NULL; + Status = NtSetInformationThread(NtCurrentThread(), + ThreadImpersonationToken, + &TokenHandle, + sizeof(TokenHandle)); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} Propchange: trunk/rostests/apitests/ntdll/NtOpenThreadToken.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed Sep 23 15:14:25 2015 @@ -13,6 +13,8 @@ extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); extern void func_NtMutant(void); +extern void func_NtOpenProcessToken(void); +extern void func_NtOpenThreadToken(void); extern void func_NtProtectVirtualMemory(void); extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); @@ -50,6 +52,8 @@ { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtMutant", func_NtMutant }, + { "NtOpenProcessToken", func_NtOpenProcessToken }, + { "NtOpenThreadToken", func_NtOpenThreadToken }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue },

9 years, 3 months

[gadamopoulos] 69328: [SHELL32] - Add a few helper functions: SH_ParseGuidDisplayName, SHELL32_SetNameOfGuidItem, SHELL32_GetDetailsOfGuidItem. - SHELL32_SetNameOfGuidItem is based on a patch for C...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Sep 23 15:02:05 2015 New Revision: 69328 URL: http://svn.reactos.org/svn/reactos?rev=69328&view=rev Log: [SHELL32] - Add a few helper functions: SH_ParseGuidDisplayName, SHELL32_SetNameOfGuidItem, SHELL32_GetDetailsOfGuidItem. - SHELL32_SetNameOfGuidItem is based on a patch for CORE-5995 - Use the helpers in CControlPanelFolder, CDesktopFolder and CDrivesFolder. Implements getting the comment and renaming registry items in these folders and share some more code. Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Wed Sep 23 15:02:05 2015 @@ -294,63 +294,8 @@ PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { - WCHAR szElement[MAX_PATH]; - LPCWSTR szNext = NULL; - LPITEMIDLIST pidlTemp = NULL; - HRESULT hr = S_OK; - CLSID clsid; - - TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", - this, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), - pchEaten, ppidl, pdwAttributes); - - if (!lpszDisplayName || !ppidl) - return E_INVALIDARG; - - *ppidl = 0; - - if (pchEaten) - *pchEaten = 0; /* strange but like the original */ - - if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') - { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - TRACE ("-- element: %s\n", debugstr_w (szElement)); - CLSIDFromString (szElement + 2, &clsid); - pidlTemp = _ILCreateGuid (PT_GUID, clsid); - } - else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) - { - *ppidl = pidlTemp; - return S_OK; - } - - if (SUCCEEDED(hr) && pidlTemp) - { - if (szNext && *szNext) - { - hr = SHELL32_ParseNextElement(this, hwndOwner, pbc, - &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); - } - else - { - if (pdwAttributes && *pdwAttributes) - { - if (_ILIsCPanelStruct(pidlTemp)) - *pdwAttributes &= SFGAO_CANLINK; - else if (_ILIsSpecialFolder(pidlTemp)) - SHELL32_GetGuidItemAttributes(this, pidlTemp, pdwAttributes); - else - ERR("Got an unkown pidl here!\n"); - } - } - } - - *ppidl = pidlTemp; - - TRACE ("(%p)->(-- ret=0x%08x)\n", this, hr); - - return hr; + /* We only support parsing guid names */ + return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } /************************************************************************** @@ -626,46 +571,36 @@ HRESULT WINAPI CControlPanelFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) { - HRESULT hr; - - TRACE("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd); - if (!psd || iColumn >= CONROLPANELSHELLVIEWCOLUMNS) return E_INVALIDARG; - if (!pidl) { + if (!pidl) + { psd->fmt = ControlPanelSFHeader[iColumn].fmt; psd->cxChar = ControlPanelSFHeader[iColumn].cxChar; return SHSetStrRet(&psd->str, shell32_hInstance, ControlPanelSFHeader[iColumn].colnameid); - } else { - switch(iColumn) { + } + else if (_ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); + } + else + { + PIDLCPanelStruct *pCPanel = _ILGetCPanelPointer(pidl); + + if (!pCPanel) + return E_FAIL; + + switch(iColumn) + { case 0: /* name */ - hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); - break; + return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsDispName); case 1: /* comment */ - { - PIDLCPanelStruct* pCPanel = _ILGetCPanelPointer(pidl); - if (pCPanel) - return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsComment); - if (_ILIsSpecialFolder(pidl)) - { - HKEY hKey; - GUID *pGuid = _ILGetGUIDPointer(pidl); - if (HCR_RegOpenClassIDKey(*pGuid, &hKey)) - { - psd->str.cStr[0] = 0x00; - psd->str.uType = STRRET_CSTR; - RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); - RegCloseKey(hKey); - } - } - break; - } + return SHSetStrRet(&psd->str, pCPanel->szName + pCPanel->offsComment); } - hr = S_OK; - } - - return hr; + } + + return S_OK; } HRESULT WINAPI CControlPanelFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Wed Sep 23 15:02:05 2015 @@ -315,12 +315,10 @@ PIDLIST_RELATIVE *ppidl, DWORD *pdwAttributes) { - WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; PARSEDURLW urldata; HRESULT hr = S_OK; - CLSID clsid; TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), @@ -329,13 +327,10 @@ if (!ppidl) return E_INVALIDARG; + *ppidl = NULL; + if (!lpszDisplayName) - { - *ppidl = NULL; return E_INVALIDARG; - } - - *ppidl = NULL; if (pchEaten) *pchEaten = 0; /* strange but like the original */ @@ -344,10 +339,7 @@ if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - TRACE ("-- element: %s\n", debugstr_w (szElement)); - CLSIDFromString (szElement + 2, &clsid); - pidlTemp = _ILCreateGuid (PT_GUID, clsid); + return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } else if (PathGetDriveNumberW (lpszDisplayName) >= 0) { @@ -370,8 +362,7 @@ if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ { TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix)); - SHCLSIDFromStringW (urldata.pszSuffix + 2, &clsid); - pidlTemp = _ILCreateGuid (PT_GUID, clsid); + pidlTemp = _ILCreateGuidFromStrW(urldata.pszSuffix + 2); } else return IEParseDisplayNameWithBCW(CP_ACP, lpszDisplayName, pbc, ppidl); @@ -449,7 +440,7 @@ if (_ILIsSpecialFolder(pidl)) return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); - return SHELL32_BindToFS( pidlRoot, sPathTarget, pidl, riid, ppvOut ); + return m_DesktopFSFolder->BindToObject(pidl, pbcReserved, riid, ppvOut ); } /************************************************************************** @@ -773,13 +764,7 @@ debugstr_w (lpName), dwFlags, pPidlOut); if (_ILGetGUIDPointer(pidl)) - { - if (SUCCEEDED(BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder2, &psf)))) - { - hr = psf->SetNameOf(hwndOwner, pidl, lpName, dwFlags, pPidlOut); - return hr; - } - } + return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); /* build source path */ lstrcpynW(szSrc, sPathTarget, MAX_PATH); @@ -896,6 +881,10 @@ LoadStringA (shell32_hInstance, DesktopSFHeader[iColumn].colnameid, psd->str.cStr, MAX_PATH); return S_OK; + } + else if (_ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); } /* the data from the pidl */ Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Wed Sep 23 15:02:05 2015 @@ -208,7 +208,6 @@ LPCWSTR szNext = NULL; WCHAR szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; - CLSID clsid; TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, hwndOwner, pbc, lpszDisplayName, debugstr_w (lpszDisplayName), @@ -221,10 +220,7 @@ /* handle CLSID paths */ if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - TRACE ("-- element: %s\n", debugstr_w (szElement)); - CLSIDFromString (szElement + 2, &clsid); - pidlTemp = _ILCreateGuid (PT_GUID, clsid); + return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } /* do we have an absolute path name ? */ else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && @@ -487,6 +483,15 @@ { return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet); } + else if (!_ILIsDesktop(pidl) && _ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); + } + else if (pidl->mkid.cb && !_ILIsDrive(pidl)) + { + ERR("Wrong pidl type\n"); + return E_INVALIDARG; + } pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); if (!pszPath) @@ -503,63 +508,51 @@ } else { - if (_ILIsSpecialFolder(pidl)) - return SHELL32_GetDisplayNameOfGUIDItem(this, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", pidl, dwFlags, strRet); - else if (_ILIsDrive(pidl)) + _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ + /* long view "lw_name (C:)" */ + if (!(dwFlags & SHGDN_FORPARSING)) { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ - /* long view "lw_name (C:)" */ - if (!(dwFlags & SHGDN_FORPARSING)) + WCHAR wszDrive[18] = {0}; + DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; + static const WCHAR wszOpenBracket[] = {' ', '(', 0}; + static const WCHAR wszCloseBracket[] = {')', 0}; + + lstrcpynW(wszDrive, pszPath, 4); + pszPath[0] = L'\0'; + GetVolumeInformationW(wszDrive, pszPath, + MAX_PATH - 7, + &dwVolumeSerialNumber, + &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); + pszPath[MAX_PATH-1] = L'\0'; + if (!wcslen(pszPath)) { - WCHAR wszDrive[18] = {0}; - DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; - static const WCHAR wszOpenBracket[] = {' ', '(', 0}; - static const WCHAR wszCloseBracket[] = {')', 0}; - - lstrcpynW(wszDrive, pszPath, 4); - pszPath[0] = L'\0'; - GetVolumeInformationW(wszDrive, pszPath, - MAX_PATH - 7, - &dwVolumeSerialNumber, - &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); - pszPath[MAX_PATH-1] = L'\0'; - if (!wcslen(pszPath)) + UINT DriveType, ResourceId; + DriveType = GetDriveTypeW(wszDrive); + switch(DriveType) { - UINT DriveType, ResourceId; - DriveType = GetDriveTypeW(wszDrive); - switch(DriveType) - { - case DRIVE_FIXED: - ResourceId = IDS_DRIVE_FIXED; - break; - case DRIVE_REMOTE: - ResourceId = IDS_DRIVE_NETWORK; - break; - case DRIVE_CDROM: - ResourceId = IDS_DRIVE_CDROM; - break; - default: - ResourceId = 0; - } - if (ResourceId) - { - dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); - if (dwFileSystemFlags > MAX_PATH - 7) - pszPath[MAX_PATH-7] = L'\0'; - } + case DRIVE_FIXED: + ResourceId = IDS_DRIVE_FIXED; + break; + case DRIVE_REMOTE: + ResourceId = IDS_DRIVE_NETWORK; + break; + case DRIVE_CDROM: + ResourceId = IDS_DRIVE_CDROM; + break; + default: + ResourceId = 0; } - wcscat (pszPath, wszOpenBracket); - wszDrive[2] = L'\0'; - wcscat (pszPath, wszDrive); - wcscat (pszPath, wszCloseBracket); + if (ResourceId) + { + dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); + if (dwFileSystemFlags > MAX_PATH - 7) + pszPath[MAX_PATH-7] = L'\0'; + } } - } - else - { - /* Neither a shell namespace extension nor a drive letter. */ - ERR("Wrong pidl type\n"); - CoTaskMemFree(pszPath); - return E_INVALIDARG; + wcscat (pszPath, wszOpenBracket); + wszDrive[2] = L'\0'; + wcscat (pszPath, wszDrive); + wcscat (pszPath, wszCloseBracket); } } @@ -590,13 +583,7 @@ HRESULT WINAPI CDrivesFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { - LPWSTR sName; - HKEY hKey; - UINT length; WCHAR szName[30]; - - TRACE("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, - hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); if (_ILIsDrive(pidl)) { @@ -607,35 +594,7 @@ return S_OK; } - - if (pPidlOut != NULL) - *pPidlOut = _ILCreateMyComputer(); - - length = (wcslen(lpName) + 1) * sizeof(WCHAR); - sName = (LPWSTR)SHAlloc(length); - - if (!sName) - return E_OUTOFMEMORY; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\{20D04FE0-3AEA-1069-A2D8-08002B30309D}", - 0, - KEY_WRITE, - &hKey) != ERROR_SUCCESS) - { - WARN("Error: failed to open registry key\n"); - } - else - { - RegSetValueExW(hKey, NULL, 0, REG_SZ, (const LPBYTE)lpName, length); - RegCloseKey(hKey); - } - - wcscpy(sName, lpName); - SHFree(this->sName); - this->sName = sName; - TRACE("result %s\n", debugstr_w(sName)); - return S_OK; + return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); } HRESULT WINAPI CDrivesFolder::GetDefaultSearchGUID(GUID * pguid) @@ -695,6 +654,10 @@ LoadStringA(shell32_hInstance, MyComputerSFHeader[iColumn].colnameid, psd->str.cStr, MAX_PATH); return S_OK; + } + else if (_ILIsSpecialFolder(pidl)) + { + return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); } else { @@ -713,20 +676,14 @@ _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); break; case 2: /* total size */ - if (_ILIsDrive(pidl)) - { - _ILSimpleGetText (pidl, szPath, MAX_PATH); - GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL); - StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); - } + _ILSimpleGetText (pidl, szPath, MAX_PATH); + GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL); + StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); break; case 3: /* free size */ - if (_ILIsDrive(pidl)) - { - _ILSimpleGetText (pidl, szPath, MAX_PATH); - GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL); - StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); - } + _ILSimpleGetText (pidl, szPath, MAX_PATH); + GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL); + StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); break; } hr = S_OK; Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Wed Sep 23 15:02:05 2015 @@ -62,6 +62,18 @@ HRESULT SHELL32_GetDisplayNameOfGUIDItem(IShellFolder2* psf, LPCWSTR pszFolderPath, PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); +HRESULT SHELL32_SetNameOfGuidItem(PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); + +HRESULT SHELL32_GetDetailsOfGuidItem(IShellFolder2* psf, PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); + +HRESULT SH_ParseGuidDisplayName(IShellFolder * pFolder, + HWND hwndOwner, + LPBC pbc, + LPOLESTR lpszDisplayName, + DWORD *pchEaten, + PIDLIST_RELATIVE *ppidl, + DWORD *pdwAttributes); + extern "C" BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Wed Sep 23 15:02:05 2015 @@ -682,6 +682,120 @@ return nReturn; } +HRESULT SH_ParseGuidDisplayName(IShellFolder * pFolder, + HWND hwndOwner, + LPBC pbc, + LPOLESTR lpszDisplayName, + DWORD *pchEaten, + PIDLIST_RELATIVE *ppidl, + DWORD *pdwAttributes) +{ + LPITEMIDLIST pidl; + + if (!lpszDisplayName || !ppidl) + return E_INVALIDARG; + + *ppidl = 0; + + if (pchEaten) + *pchEaten = 0; + + UINT cch = wcslen(lpszDisplayName); + if (cch < 40) + return E_FAIL; + + if (lpszDisplayName[0] != L':' || lpszDisplayName[1] != L':' || lpszDisplayName[2] != L'{' || lpszDisplayName[40] != L'}') + return E_FAIL; + + pidl = _ILCreateGuidFromStrW(lpszDisplayName + 2); + if (pidl == NULL) + return E_FAIL; + + if (cch < 42) + { + *ppidl = pidl; + if (pdwAttributes && *pdwAttributes) + { + SHELL32_GetGuidItemAttributes(pFolder, *ppidl, pdwAttributes); + } + } + else + { + IShellFolder* psf; + LPITEMIDLIST pidlChild; + HRESULT hres; + + hres = SHELL32_BindToGuidItem(NULL, pidl, NULL, IID_PPV_ARG(IShellFolder, &psf)); + if (SUCCEEDED(hres)) + { + return psf->ParseDisplayName(hwndOwner, pbc, lpszDisplayName + 42, pchEaten, &pidlChild, pdwAttributes); + } + } + + return S_OK; +} + +HRESULT SHELL32_SetNameOfGuidItem(PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) +{ + GUID const *clsid = _ILGetGUIDPointer (pidl); + LPOLESTR pStr; + HRESULT hr; + WCHAR szName[100]; + + if (!clsid) + { + ERR("Pidl is not reg item!\n"); + return E_FAIL; + } + + hr = StringFromCLSID(*clsid, &pStr); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + swprintf(szName, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CLSID\\%s", pStr); + + DWORD cbData = (wcslen(lpName) + 1) * sizeof(WCHAR); + LONG res = SHSetValueW(HKEY_CURRENT_USER, szName, NULL, RRF_RT_REG_SZ, lpName, cbData); + + CoTaskMemFree(pStr); + + if (res == ERROR_SUCCESS) + { + *pPidlOut = ILClone(pidl); + return S_OK; + } + + return E_FAIL; +} + +HRESULT SHELL32_GetDetailsOfGuidItem(IShellFolder2* psf, PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) +{ + GUID const *clsid = _ILGetGUIDPointer (pidl); + + if (!clsid) + { + ERR("Pidl is not reg item!\n"); + return E_FAIL; + } + + switch(iColumn) + { + case 0: /* name */ + return psf->GetDetailsOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, psd); + case 1: /* comment */ + HKEY hKey; + if (HCR_RegOpenClassIDKey(*clsid, &hKey)) + { + psd->str.cStr[0] = 0x00; + psd->str.uType = STRRET_CSTR; + RegLoadMUIStringA(hKey, "InfoTip", psd->str.cStr, MAX_PATH, NULL, 0, NULL); + RegCloseKey(hKey); + return S_OK; + } + } + return E_FAIL; +} + /*********************************************************************** * SHCreateLinks *

9 years, 3 months

[gedmurphy] 69327: [SETUPAPI] - Buffer lengths are calculated in chars not bytes. - Fixes use of CM_Get_Device_ID_Size / CM_Get_Device_ID

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Sep 23 09:27:32 2015 New Revision: 69327 URL: http://svn.reactos.org/svn/reactos?rev=69327&view=rev Log: [SETUPAPI] - Buffer lengths are calculated in chars not bytes. - Fixes use of CM_Get_Device_ID_Size / CM_Get_Device_ID Modified: trunk/reactos/dll/win32/setupapi/stringtable.c Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Wed Sep 23 09:27:32 2015 @@ -784,7 +784,7 @@ return FALSE; } - dwLength = (lstrlenW(pStringTable->pSlots[dwId - 1].pString) + 1) * sizeof(WCHAR); + dwLength = (lstrlenW(pStringTable->pSlots[dwId - 1].pString) + 1); if (dwLength <= *lpBufferLength) { lstrcpyW(lpBuffer, pStringTable->pSlots[dwId - 1].pString);

9 years, 3 months

[gedmurphy] 69326: [INCLUDES] - Fix linking with c++ modules

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Sep 23 09:04:39 2015 New Revision: 69326 URL: http://svn.reactos.org/svn/reactos?rev=69326&view=rev Log: [INCLUDES] - Fix linking with c++ modules Modified: trunk/reactos/include/reactos/dll/newdevp.h Modified: trunk/reactos/include/reactos/dll/newdevp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/newdev… ============================================================================== --- trunk/reactos/include/reactos/dll/newdevp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/dll/newdevp.h [iso-8859-1] Wed Sep 23 09:04:39 2015 @@ -7,6 +7,10 @@ #ifndef __NEWDEVP__H #define __NEWDEVP__H + +#ifdef __cplusplus +extern "C" { +#endif BOOL WINAPI @@ -24,4 +28,8 @@ IN BOOL bUpdate, OUT LPDWORD lpReboot); +#ifdef __cplusplus +} +#endif + #endif /* __NEWDEVP__H */

9 years, 3 months

[gedmurphy] 69325: [DEVMGR] Fix building with cmake (msvc) It needs my local ATL changes to build, I'll add these soon

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Sep 23 08:49:48 2015 New Revision: 69325 URL: http://svn.reactos.org/svn/reactos?rev=69325&view=rev Log: [DEVMGR] Fix building with cmake (msvc) It needs my local ATL changes to build, I'll add these soon Added: trunk/reactos/dll/win32/devmgr_new/api.cpp - copied, changed from r68739, trunk/reactos/dll/win32/devmgr_new/api.c Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Wed Sep 23 08:49:48 2015 @@ -21,8 +21,7 @@ devmgmt/DeviceView.cpp devmgmt/MainWindow.cpp devmgmt/Node.cpp - devmgmt/RootNode.cpp - ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c) + devmgmt/RootNode.cpp) add_library(devmgr SHARED ${SOURCE} Copied: trunk/reactos/dll/win32/devmgr_new/api.cpp (from r68739, trunk/reactos/dll/win32/devmgr_new/api.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/api.cpp [iso-8859-1] Wed Sep 23 08:49:48 2015 @@ -0,0 +1,309 @@ +/* +* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS devmgr.dll +* FILE: lib/devmgr/stubs.c +* PURPOSE: devmgr.dll stubs +* PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) +* Ged Murphy (gedmurphy(a)reactos.org) +* NOTES: +* Some helpful resources: +* http://support.microsoft.com/default.aspx?scid=kb;%5BLN%5D;815320 +* http://www.jsiinc.com/SUBO/tip7400/rh7482.htm +* http://www.jsiinc.com/SUBM/tip6400/rh6490.htm +* +* UPDATE HISTORY: +* 04-04-2004 Created +*/ + +#include "stdafx.h" +#include "devmgmt\MainWindow.h" + +HINSTANCE hDllInstance = NULL; + +WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + + +/*************************************************************************** +* NAME EXPORTED +* DeviceManager_ExecuteA +* +* DESCRIPTION +* Starts the Device Manager +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpMachineName: Machine Name, NULL is the local machine +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* TRUE: if no errors occured +* FALSE: if the device manager could not be executed +* +* REVISIONS +* +* NOTE +* - Win runs the device manager in a separate process, so hWndParent is somehow +* obsolete. +* +* @unimplemented +*/ +BOOL +WINAPI +DeviceManager_ExecuteA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpMachineName, + int nCmdShow) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceManager_ExecuteW +* +* DESCRIPTION +* Starts the Device Manager +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpMachineName: Machine Name, NULL is the local machine +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* TRUE: if no errors occured +* FALSE: if the device manager could not be executed +* +* REVISIONS +* +* NOTE +* - Win runs the device manager in a separate process, so hWndParent is somehow +* obsolete. +* +* @unimplemented +*/ +BOOL +WINAPI +DeviceManager_ExecuteW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpMachineName, + int nCmdShow) +{ + // FIXME: Call mmc with devmgmt.msc + + CDeviceManager DevMgr; + return DevMgr.Create(hWndParent, hInst, lpMachineName, nCmdShow); +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceProblemWizard_RunDLLA +* +* DESCRIPTION +* Calls the device problem wizard +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, +* also see NOTEs +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* +* REVISIONS +* +* NOTE +* - Win XP exports this function as DeviceProblenWizard_RunDLLA, apparently it's +* a typo so we additionally export an alias function +* - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" +* (/MachineName is optional). This function only parses this string and eventually +* calls DeviceProperties(). +* +* @unimplemented +*/ +VOID +WINAPI +DeviceProblemWizard_RunDLLA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpDeviceCmd, + int nCmdShow) +{ + UNIMPLEMENTED; +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceProblemWizard_RunDLLW +* +* DESCRIPTION +* Calls the device problem wizard +* +* ARGUMENTS +* hWndParent: Handle to the parent window +* hInst: Handle to the application instance +* lpDeviceCmd: A command that includes the DeviceID of the properties to be shown, +* also see NOTEs +* nCmdShow: Specifies how the window should be shown +* +* RETURN VALUE +* +* REVISIONS +* +* NOTE +* - Win XP exports this function as DeviceProblenWizard_RunDLLA, apparently it's +* a typo so we additionally export an alias function +* - lpDeviceCmd is a string in the form of "/MachineName MACHINE /DeviceID DEVICEPATH" +* (/MachineName is optional). This function only parses this string and eventually +* calls DeviceProperties(). +* +* @unimplemented +*/ +VOID +WINAPI +DeviceProblemWizard_RunDLLW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpDeviceCmd, + int nCmdShow) +{ + UNIMPLEMENTED; +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceManagerPrintA +* +* DESCRIPTION +* Calls the device problem wizard +* +* ARGUMENTS +* lpMachineName: Machine Name, NULL is the local machine +* lpPrinter: Filename of the printer where it should be printed on +* nPrintMode: Specifies what kind of information is to be printed +* DEV_PRINT_ABSTRACT: Prints an abstract of system information, the parameters +* uNumberOfGuids, Guids are ignored +* DEV_PRINT_SELECTED: Prints information about the devices listed in Guids +* DEV_PRINT_ALL: Prints an abstract of system information and all +* system devices +* uNumberOfGuids: Numbers of guids in the Guids array, this parameter is ignored unless +* nPrintMode is DEV_PRINT_SELECTED +* lpGuids: Array of device guids, this parameter is ignored unless +* nPrintMode is DEV_PRINT_SELECTED +* +* RETURN VALUE +* TRUE: if no errors occured +* FALSE: if errors occured +* +* REVISIONS +* +* NOTE +* +* @unimplemented +*/ +BOOL +WINAPI +DeviceManagerPrintA(LPCSTR lpMachineName, + LPCSTR lpPrinter, + int nPrintMode, + UINT uNumberOfGuids, + LPGUID lpGuids) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/*************************************************************************** +* NAME EXPORTED +* DeviceManagerPrintW +* +* DESCRIPTION +* Calls the device problem wizard +* +* ARGUMENTS +* lpMachineName: Machine Name, NULL is the local machine +* lpPrinter: Filename of the printer where it should be printed on +* nPrintMode: Specifies what kind of information is to be printed +* DEV_PRINT_ABSTRACT: Prints an abstract of system information, the parameters +* uNumberOfGuids, Guids are ignored +* DEV_PRINT_SELECTED: Prints information about the devices listed in Guids +* DEV_PRINT_ALL: Prints an abstract of system information and all +* system devices +* uNumberOfGuids: Numbers of guids in the Guids array, this parameter is ignored unless +* nPrintMode is DEV_PRINT_SELECTED +* lpGuids: Array of device guids, this parameter is ignored unless +* nPrintMode is DEV_PRINT_SELECTED +* +* RETURN VALUE +* TRUE: if no errors occured +* FALSE: if errors occured +* +* REVISIONS +* +* NOTE +* +* @unimplemented +*/ +BOOL +WINAPI +DeviceManagerPrintW(LPCWSTR lpMachineName, + LPCWSTR lpPrinter, + int nPrintMode, + UINT uNumberOfGuids, + LPGUID lpGuids) +{ + UNIMPLEMENTED; + return FALSE; +} + + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, +IN DWORD dwReason, +IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hDllInstance = hinstDLL; + break; + } + + return TRUE; +} + +class CDevMgrUIModule : public CComModule +{ +public: +}; + +CDevMgrUIModule gModule; + +STDAPI DllCanUnloadNow() +{ + return gModule.DllCanUnloadNow(); +} + +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return gModule.DllGetClassObject(rclsid, riid, ppv); +} + +STDAPI DllRegisterServer() +{ + return gModule.DllRegisterServer(FALSE); +} + +STDAPI DllUnregisterServer() +{ + return gModule.DllUnregisterServer(FALSE); +} Modified: trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] Wed Sep 23 08:49:48 2015 @@ -30,7 +30,7 @@ #include "properties.h" #include "resource.h" -HINSTANCE hDllInstance = NULL; + INT LengthOfStrResource(IN HINSTANCE hInst, @@ -1129,21 +1129,3 @@ return hComCtl32; } - - -BOOL -WINAPI -DllMain(IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - hDllInstance = hinstDLL; - break; - } - - return TRUE; -}

9 years, 3 months

[ion] 69324: [NTOSKRNL]: Properly respect the registry's Win32PrioritySeparation value instead of ignoring it. [NTOSKRNL]: Actually apply the foreground priority boost to threads in a foreground pr...

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 23 05:10:58 2015 New Revision: 69324 URL: http://svn.reactos.org/svn/reactos?rev=69324&view=rev Log: [NTOSKRNL]: Properly respect the registry's Win32PrioritySeparation value instead of ignoring it. [NTOSKRNL]: Actually apply the foreground priority boost to threads in a foreground process. [NTOSKRNL]: Correctly handle the case where the quantum length and fixed/variable flag are set to "default", instead of falling back into the server case. Thanks to WINSRV doing the right thing, ReactOS console apps now receive the priority separation boost. However, my tests show that it doesn't last as long as it should on Windows (quantums too short? bug in priority decrement?). Also, since Win32k.sys doesn't tell the kernel about foreground GUI apps, they don't get the boost. Someone needs to add a NtSetInformationProcess call in whatever win32k function determines active focus. Dedicated to ThFabba who needs to write some tests ;-) Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Wed Sep 23 05:10:58 2015 @@ -129,8 +129,11 @@ // // Process Priority Separation Values (OR) // -#define PSP_VARIABLE_QUANTUMS 4 -#define PSP_LONG_QUANTUMS 16 +#define PSP_DEFAULT_QUANTUMS 0x00 +#define PSP_VARIABLE_QUANTUMS 0x04 +#define PSP_FIXED_QUANTUMS 0x08 +#define PSP_LONG_QUANTUMS 0x10 +#define PSP_SHORT_QUANTUMS 0x20 #ifndef NTOS_MODE_USER // Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Wed Sep 23 05:10:58 2015 @@ -765,7 +765,7 @@ { L"PriorityControl", L"Win32PrioritySeparation", - &DummyData, + &PsRawPrioritySeparation, NULL, NULL }, Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Wed Sep 23 05:10:58 2015 @@ -452,6 +452,7 @@ extern BOOLEAN PspUseJobSchedulingClasses; extern CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES]; extern ULONG PsRawPrioritySeparation; +extern ULONG PsPrioritySeparation; extern POBJECT_TYPE _PsThreadType, _PsProcessType; extern PTOKEN PspBootAccessToken; extern GENERIC_MAPPING PspJobMapping; Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Sep 23 05:10:58 2015 @@ -1495,7 +1495,7 @@ /* Create a random name and set up the string*/ NameLength = (USHORT)swprintf(NameBuffer, DRIVER_ROOT_NAME L"%08u", - KeTickCount); + KeTickCount.LowPart); LocalDriverName.Length = NameLength * sizeof(WCHAR); LocalDriverName.MaximumLength = LocalDriverName.Length + sizeof(UNICODE_NULL); LocalDriverName.Buffer = NameBuffer; Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Wed Sep 23 05:10:58 2015 @@ -171,6 +171,14 @@ /* Calculate the new priority after the increment */ OldPriority = Thread->BasePriority + Thread->AdjustIncrement; + + /* Check if this is a foreground process */ + if (CONTAINING_RECORD(Thread->ApcState.Process, EPROCESS, Pcb)-> + Vm.Flags.MemoryPriority == MEMORY_PRIORITY_FOREGROUND) + { + /* Apply the foreground boost */ + OldPriority += PsPrioritySeparation; + } /* Check if this new priority is higher */ if (OldPriority > Thread->Priority) 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] Wed Sep 23 05:10:58 2015 @@ -24,7 +24,7 @@ LARGE_INTEGER ShortPsLockDelay; -ULONG PsRawPrioritySeparation = 0; +ULONG PsRawPrioritySeparation; ULONG PsPrioritySeparation; CHAR PspForegroundQuantum[3]; @@ -255,17 +255,32 @@ /* Use a variable table */ QuantumTable = PspVariableQuantums; } - else + else if (PspQuantumTypeFromMask(PrioritySeparation) == PSP_FIXED_QUANTUMS) { /* Use fixed table */ QuantumTable = PspFixedQuantums; } + else + { + /* Use default for the type of system we're on */ + QuantumTable = MmIsThisAnNtAsSystem() ? PspFixedQuantums : PspVariableQuantums; + } /* Now check if we should use long or short */ if (PspQuantumLengthFromMask(PrioritySeparation) == PSP_LONG_QUANTUMS) { /* Use long quantums */ QuantumTable += 3; + } + else if (PspQuantumLengthFromMask(PrioritySeparation) == PSP_SHORT_QUANTUMS) + { + /* Keep existing table */ + NOTHING; + } + else + { + /* Use default for the type of system we're on */ + QuantumTable += MmIsThisAnNtAsSystem() ? 3 : 0; } /* Check if we're using long fixed quantums */ @@ -292,12 +307,10 @@ Process = PsGetNextProcess(Process); while (Process) { - /* - * Use the priority separation, unless the process has - * low memory priority - */ - i = (Process->Vm.Flags.MemoryPriority == 1) ? - 0: PsPrioritySeparation; + /* Use the priority separation if this is a foreground process */ + i = (Process->Vm.Flags.MemoryPriority == + MEMORY_PRIORITY_BACKGROUND) ? + 0: PsPrioritySeparation; /* Make sure that the process isn't idle */ if (Process->PriorityClass != PROCESS_PRIORITY_CLASS_IDLE) @@ -306,8 +319,7 @@ if ((Process->Job) && (PspUseJobSchedulingClasses)) { /* Use job quantum */ - Quantum = PspJobSchedulingClasses[Process->Job-> - SchedulingClass]; + Quantum = PspJobSchedulingClasses[Process->Job->SchedulingClass]; } else {

9 years, 3 months

[hbelusca] 69323: [NTVDM] - Do not hardcode the number of XMS memory blocks that can map the HMA. It should be function of the MAX_ADDRESS value of our emulator. - Require that MAX_ADDRESS should b...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Sep 23 01:45:18 2015 New Revision: 69323 URL: http://svn.reactos.org/svn/reactos?rev=69323&view=rev Log: [NTVDM] - Do not hardcode the number of XMS memory blocks that can map the HMA. It should be function of the MAX_ADDRESS value of our emulator. - Require that MAX_ADDRESS should be greater or equal than 1 MB. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h trunk/reactos/subsystems/mvdm/ntvdm/emulator.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] Wed Sep 23 01:45:18 2015 @@ -13,8 +13,8 @@ /* DEFINITIONS ****************************************************************/ #define XMS_ADDRESS 0x110000 // Just above HMA -#define XMS_BLOCKS 0x3BC0 // XMS_ADDRESS + (XMS_BLOCKS * XMS_BLOCK_SIZE) == 16 MB #define XMS_BLOCK_SIZE 1024 +#define XMS_BLOCKS ((MAX_ADDRESS - XMS_ADDRESS) / XMS_BLOCK_SIZE) #define XMS_MAX_HANDLES 16 // Specification: min 1, max 128, default 32 #define XMS_STATUS_SUCCESS 0x00 Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Wed Sep 23 01:45:18 2015 @@ -23,6 +23,7 @@ #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF #define MAX_ADDRESS 0x1000000 // 16 MB of RAM; see also: kernel32/client/vdm.c!BaseGetVdmConfigInfo +C_ASSERT(0x100000 <= MAX_ADDRESS); // A minimum of 1 MB is required for PC emulation. #define SEG_OFF_TO_PTR(seg, off) \ (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off)))

9 years, 3 months

[pschweitzer] 69322: [KMTESTS:IO] Extend the IoCreateFile tests with two parts tests. First part properly checks for opening/reparse handling on mount points (and ideally on symlinks, see below). T...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 22 22:31:08 2015 New Revision: 69322 URL: http://svn.reactos.org/svn/reactos?rev=69322&view=rev Log: [KMTESTS:IO] Extend the IoCreateFile tests with two parts tests. First part properly checks for opening/reparse handling on mount points (and ideally on symlinks, see below). The other part checks for proper handling of the IO_STOP_ON_SYMLINK parameter. Regarding symlink, I'm clearly not convinced that what I did is correct (hence the failure on both W2K3 & ROS). It seems to me that symlink resolution is up to the FSD and not to IO which only handles mount point traversal. If someone (Alex?) can confirm/infirm and give more insight, that's more than welcome. Added: trunk/rostests/kmtests/ntos_io/IoCreateFile.h (with props) trunk/rostests/kmtests/ntos_io/IoCreateFile_drv.c (with props) trunk/rostests/kmtests/ntos_io/IoCreateFile_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/ntos_io/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -111,6 +111,7 @@ example/Example_user.c kernel32/FindFile_user.c + ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c tcpip/TcpIp_user.c @@ -134,6 +135,7 @@ add_dependencies(kmtest_drivers kmtest_drv example_drv + iocreatefile_drv iodeviceobject_drv iohelper_drv ioreadwrite_drv Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -9,6 +9,7 @@ KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FindFile; +KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; KMT_TESTFUNC Test_RtlAvlTree; @@ -27,6 +28,7 @@ { { "-Example", Test_Example }, { "FindFile", Test_FindFile }, + { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "IoReadWrite", Test_IoReadWrite }, { "RtlAvlTree", Test_RtlAvlTree }, Modified: trunk/rostests/kmtests/ntos_io/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -1,5 +1,20 @@ include_directories(../include) + +# +# IoCreateFile +# +list(APPEND IOCREATEFILE_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + IoCreateFile_drv.c) + +add_library(iocreatefile_drv SHARED ${IOCREATEFILE_DRV_SOURCE}) +set_module_type(iocreatefile_drv kernelmodedriver) +target_link_libraries(iocreatefile_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(iocreatefile_drv ntoskrnl hal) +add_target_compile_definitions(iocreatefile_drv KMT_STANDALONE_DRIVER) +#add_pch(iocreatefile_drv ../include/kmt_test.h) +add_cd_file(TARGET iocreatefile_drv DESTINATION reactos/bin FOR all) # # IoDeviceObject Added: trunk/rostests/kmtests/ntos_io/IoCreateFile.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.h (added) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.h [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: IoCreateFile test declarations + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#ifndef _KMTEST_IOCREATEFILE_H_ +#define _KMTEST_IOCREATEFILE_H_ + +#define IOCTL_CREATE_SYMLINK 1 +#define IOCTL_CREATE_NO_SYMLINK 2 + +#endif /* !defined _KMTEST_IOCREATEFILE_H_ */ Propchange: trunk/rostests/kmtests/ntos_io/IoCreateFile.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_io/IoCreateFile_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile_drv.c (added) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile_drv.c [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -0,0 +1,270 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for reparse point operations + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#include "IoCreateFile.h" + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +static KMT_IRP_HANDLER TestIrpHandler; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"IoCreateFile"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CLEANUP, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + PTEST_FCB Fcb; + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || + IoStack->MajorFunction == IRP_MJ_CLEANUP); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + ok((IoStack->Parameters.Create.Options & FILE_OPEN_REPARSE_POINT) == 0, "FILE_OPEN_REPARSE_POINT set\n"); + ok((IoStack->Flags == 0) || (IoStack->Flags == SL_STOP_ON_SYMLINK), "IoStack->Flags = %lx\n", IoStack->Flags); + + if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR)) + { + TestDeviceObject = DeviceObject; + TestFileObject = IoStack->FileObject; + } + if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && + IoStack->FileObject->FileName.Buffer[1] == 'M') + { + PREPARSE_DATA_BUFFER Reparse; + + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; + + RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + Reparse->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); + Reparse->MountPointReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); + Reparse->MountPointReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); + RtlCopyMemory(Reparse->MountPointReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); + Irp->IoStatus.Information = IO_REPARSE_TAG_MOUNT_POINT; + Status = STATUS_REPARSE; + } + else if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && + IoStack->FileObject->FileName.Buffer[1] == 'S') + { + if (IoStack->Flags & SL_STOP_ON_SYMLINK) + { + Status = STATUS_STOPPED_ON_SYMLINK; + } + else + { + PREPARSE_DATA_BUFFER Reparse; + + Irp->Tail.Overlay.AuxiliaryBuffer = ExAllocatePoolWithTag(NonPagedPool, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, 'FwrI'); + Reparse = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; + + RtlZeroMemory(Reparse, MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + Reparse->ReparseTag = IO_REPARSE_TAG_SYMLINK; + Reparse->ReparseDataLength = 12 + sizeof(L"\\??\\C:\\Documents and Settings"); + Reparse->SymbolicLinkReparseBuffer.SubstituteNameLength = sizeof(L"\\??\\C:\\Documents and Settings") - sizeof(UNICODE_NULL); + Reparse->SymbolicLinkReparseBuffer.PrintNameOffset = sizeof(L"\\??\\C:\\Documents and Settings"); + RtlCopyMemory(Reparse->SymbolicLinkReparseBuffer.PathBuffer, L"\\??\\C:\\Documents and Settings", sizeof(L"\\??\\C:\\Documents and Settings")); + Irp->IoStatus.Information = IO_REPARSE_TAG_SYMLINK; + Status = STATUS_REPARSE; + } + } + else + { + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Fcb), 'FwrI'); + RtlZeroMemory(Fcb, sizeof(*Fcb)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + Fcb->Header.AllocationSize.QuadPart = 0; + Fcb->Header.FileSize.QuadPart = 0; + Fcb->Header.ValidDataLength.QuadPart = 0; + IoStack->FileObject->FsContext = Fcb; + IoStack->FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + Irp->IoStatus.Information = FILE_OPENED; + Status = STATUS_SUCCESS; + } + } + else if (IoStack->MajorFunction == IRP_MJ_CLEANUP) + { + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(IoStack->FileObject, NULL, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + Fcb = IoStack->FileObject->FsContext; + ExFreePoolWithTag(Fcb, 'FwrI'); + IoStack->FileObject->FsContext = NULL; + Status = STATUS_SUCCESS; + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} + +static UNICODE_STRING FileObjectFileName = RTL_CONSTANT_STRING(L"\\NonSymlinked"); +static UNICODE_STRING DocumentsAndSettings = RTL_CONSTANT_STRING(L"\\Documents and Settings"); + +static +NTSTATUS +TestIoCreateFile( + IN PUNICODE_STRING Path, + IN BOOLEAN NoLinks) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE Handle; + NTSTATUS Status; + PFILE_OBJECT FileObject; + + InitializeObjectAttributes(&ObjectAttributes, + Path, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = IoCreateFile(&Handle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_ALERT, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_NO_PARAMETER_CHECKING | (NoLinks ? IO_STOP_ON_SYMLINK : 0)); + if (NT_SUCCESS(Status)) + { + NTSTATUS IntStatus; + + IntStatus = ObReferenceObjectByHandle(Handle, + FILE_READ_DATA, + *IoFileObjectType, + KernelMode, + (PVOID *)&FileObject, + NULL); + ok_eq_hex(IntStatus, STATUS_SUCCESS); + if (NT_SUCCESS(IntStatus)) + { + ok(RtlCompareUnicodeString(&FileObjectFileName, &FileObject->FileName, TRUE) == 0 || + RtlCompareUnicodeString(&DocumentsAndSettings, &FileObject->FileName, TRUE) == 0, + "Expected: %wZ or %wZ. Opened: %wZ\n", &FileObjectFileName, &DocumentsAndSettings, &FileObject->FileName); + ObDereferenceObject(FileObject); + } + NtClose(Handle); + } + + return Status; +} + +static +NTSTATUS +TestMessageHandler( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + switch (ControlCode) + { + case IOCTL_CREATE_SYMLINK: + case IOCTL_CREATE_NO_SYMLINK: + { + ANSI_STRING Path; + UNICODE_STRING PathW; + + ok(Buffer != NULL, "Buffer is NULL\n"); + Path.Length = Path.MaximumLength = (USHORT)InLength; + Path.Buffer = Buffer; + + Status = RtlAnsiStringToUnicodeString(&PathW, &Path, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + + Status = TestIoCreateFile(&PathW, (ControlCode == IOCTL_CREATE_NO_SYMLINK)); + + RtlFreeUnicodeString(&PathW); + + break; + } + default: + return STATUS_NOT_SUPPORTED; + } + + return Status; +} Propchange: trunk/rostests/kmtests/ntos_io/IoCreateFile_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_io/IoCreateFile_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile_user.c (added) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile_user.c [iso-8859-1] Tue Sep 22 22:31:08 2015 @@ -0,0 +1,40 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Reparse points test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> +#include "IoCreateFile.h" + +static CHAR MountedPointFileName[] = "\\Device\\Kmtest-IoCreateFile\\MountedPoint"; +static CHAR SymlinkedFileName[] = "\\Device\\Kmtest-IoCreateFile\\Symlinked"; +static CHAR NonSymlinkedFileName[] = "\\Device\\Kmtest-IoCreateFile\\NonSymlinked"; + +START_TEST(IoCreateFile) +{ + DWORD Error; + + KmtRunKernelTest("IoCreateFile"); + + KmtLoadDriver(L"IoCreateFile", FALSE); + KmtOpenDriver(); + + Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, NonSymlinkedFileName); + ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error); + Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, SymlinkedFileName); + ok(Error == ERROR_CANT_ACCESS_FILE, "Expected ERROR_CANT_ACCESS_FILE, got %lx\n", Error); /* FIXME */ + Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, MountedPointFileName); + ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error); + + Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, NonSymlinkedFileName); + ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error); + Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, SymlinkedFileName); + ok(Error == ERROR_MR_MID_NOT_FOUND, "Expected ERROR_MR_MID_NOT_FOUND, got %lx\n", Error); + Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, MountedPointFileName); + ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error); + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/ntos_io/IoCreateFile_user.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[gedmurphy] 69321: [DEVMGR] - A few cmake fixes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Sep 22 21:44:19 2015 New Revision: 69321 URL: http://svn.reactos.org/svn/reactos?rev=69321&view=rev Log: [DEVMGR] - A few cmake fixes Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp trunk/reactos/dll/win32/devmgr_new/properties/properties.h trunk/reactos/dll/win32/devmgr_new/stdafx.h Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -3,7 +3,10 @@ set_cpp(WITH_RTTI WITH_RUNTIME) -include_directories(${REACTOS_SOURCE_DIR}/lib/atl includes devmgmt) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/dll + ${REACTOS_SOURCE_DIR}/lib/atl + includes) list(APPEND SOURCE stdafx.h @@ -13,7 +16,6 @@ properties/hwpage.cpp properties/hwresource.cpp properties/misc.cpp - properties/stubs.cpp devmgmt/ClassNode.cpp devmgmt/DeviceNode.cpp devmgmt/DeviceView.cpp @@ -30,4 +32,5 @@ set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid atlnew wine) add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll) +add_pch(devmgr stdafx.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/advprop.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -28,7 +28,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/devprblm.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/hwpage.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/hwresource.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -8,7 +8,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/misc.cpp [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -26,7 +26,7 @@ */ #include "stdafx.h" -#include <devmgr\devmgr.h>" +#include <devmgr\devmgr.h> #include "properties.h" #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr_new/properties/properties.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/prope… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/properties/properties.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/properties/properties.h [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -1,7 +1,7 @@ #ifndef __DEVMGR_H #define __DEVMGR_H -//WINE_DEFAULT_DEBUG_CHANNEL(devmgr); +WINE_DEFAULT_DEBUG_CHANNEL(devmgr); extern HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/devmgr_new/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/stdaf… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/stdafx.h [iso-8859-1] Tue Sep 22 21:44:19 2015 @@ -53,6 +53,8 @@ #include <process.h> #include <WindowsX.h> #include <strsafe.h> +#include <regstr.h> +#include <newdevp.h> #include <setupapi.h> #include <commctrl.h> @@ -64,4 +66,8 @@ #include <atlstr.h> #include <atlcoll.h> +#include <wine/debug.h> + +//WINE_DEFAULT_DEBUG_CHANNEL(devmgr); + #endif

9 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
54
Older →

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 September 2015