Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[mjansen] 71230: [APPHELP][APPHELP_APITEST] Add some apphelp GUID helper functions + tests to be used later on. CORE-10367 - SdbGetStandardDatabaseGUID - SdbGUIDFromString - SdbGUIDToString - SdbIs...
by mjansen＠svn.reactos.org 01 May '16

01 May '16

Author: mjansen Date: Sun May 1 21:43:30 2016 New Revision: 71230 URL: http://svn.reactos.org/svn/reactos?rev=71230&view=rev Log: [APPHELP][APPHELP_APITEST] Add some apphelp GUID helper functions + tests to be used later on. CORE-10367 - SdbGetStandardDatabaseGUID - SdbGUIDFromString - SdbGUIDToString - SdbIsNullGUID Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/apphelp.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun May 1 21:43:30 2016 @@ -31,6 +31,11 @@ #define TAGREF_NULL (0) #define TAGREF_ROOT (0) + +#define HID_DATABASE_TYPE_MASK 0xF00F0000 +#define SDB_DATABASE_MAIN_MSI 0x80020000 +#define SDB_DATABASE_MAIN_SHIM 0x80030000 +#define SDB_DATABASE_MAIN_DRIVERS 0x80040000 typedef struct tagATTRINFO { TAG type; Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun May 1 21:43:30 2016 @@ -79,17 +79,17 @@ @ stdcall SdbGetPermLayerKeys(wstr wstr ptr long) @ stub SdbGetShowDebugInfoOption @ stub SdbGetShowDebugInfoOptionValue -@ stub SdbGetStandardDatabaseGUID +@ stdcall SdbGetStandardDatabaseGUID(long ptr) @ stub SdbGetStringTagPtr @ stub SdbGetTagDataSize @ stub SdbGetTagFromTagID @ stub SdbGrabMatchingInfo @ stub SdbGrabMatchingInfoEx -@ stub SdbGUIDFromString -@ stub SdbGUIDToString +@ stdcall SdbGUIDFromString(wstr ptr) +@ stdcall SdbGUIDToString(ptr wstr long) @ stub SdbInitDatabase @ stub SdbInitDatabaseEx -@ stub SdbIsNullGUID +@ stdcall SdbIsNullGUID(ptr) @ stub SdbIsStandardDatabase @ stub SdbIsTagrefFromLocalDB @ stub SdbIsTagrefFromMainDB Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun May 1 21:43:30 2016 @@ -26,6 +26,10 @@ #include "wine/unicode.h" + +static const GUID GUID_DATABASE_MSI = {0xd8ff6d16,0x6a3a,0x468a, {0x8b,0x44,0x01,0x71,0x4d,0xdc,0x49,0xea}}; +static const GUID GUID_DATABASE_SHIM = {0x11111111,0x1111,0x1111, {0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11}}; +static const GUID GUID_DATABASE_DRIVERS = {0xf9ab2228,0x3312,0x4a73, {0xb6,0xf9,0x93,0x6d,0x70,0xe1,0x12,0xef}}; static HANDLE SdbpHeap(void); @@ -284,6 +288,88 @@ NtClose(mapping->section); NtClose(mapping->file); RtlZeroMemory(mapping, sizeof(*mapping)); +} + +/** + * Parses a string to retrieve a GUID. + * + * @param [in] GuidString The string to parse. + * @param [out] Guid The resulting GUID. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbGUIDFromString(PCWSTR GuidString, GUID *Guid) +{ + UNICODE_STRING GuidString_u; + RtlInitUnicodeString(&GuidString_u, GuidString); + return NT_SUCCESS(RtlGUIDFromString(&GuidString_u, Guid)); +} + +/** + * Converts a GUID to a string. + * + * @param [in] Guid The GUID to convert. + * @param [out] GuidString The resulting string representation of Guid. + * @param [in] Length The length of GuidString. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbGUIDToString(CONST GUID *Guid, PWSTR GuidString, SIZE_T Length) +{ + UNICODE_STRING GuidString_u; + if(NT_SUCCESS(RtlStringFromGUID(Guid, &GuidString_u))) + { + HRESULT hr = StringCchCopyNW(GuidString, Length, GuidString_u.Buffer, GuidString_u.Length / 2); + RtlFreeUnicodeString(&GuidString_u); + return SUCCEEDED(hr); + } + return FALSE; +} + +/** + * Checks if the specified GUID is a NULL GUID + * + * @param [in] Guid The GUID to check. + * + * @return TRUE if it is a NULL GUID. + */ +BOOL WINAPI SdbIsNullGUID(CONST GUID *Guid) +{ + static GUID NullGuid = { 0 }; + return !Guid || IsEqualGUID(&NullGuid, Guid); +} + +/** + * Get the GUID from one of the standard databases. + * + * @param [in] Flags The ID to retrieve the guid from. (See SDB_DATABASE_MAIN_[xxx]) + * @param [out] Guid The resulting GUID. + * + * @return TRUE if a known database ID. + */ +BOOL WINAPI SdbGetStandardDatabaseGUID(DWORD Flags, GUID* Guid) +{ + const GUID* copy_from = NULL; + switch(Flags & HID_DATABASE_TYPE_MASK) + { + case SDB_DATABASE_MAIN_MSI: + copy_from = &GUID_DATABASE_MSI; + break; + case SDB_DATABASE_MAIN_SHIM: + copy_from = &GUID_DATABASE_SHIM; + break; + case SDB_DATABASE_MAIN_DRIVERS: + copy_from = &GUID_DATABASE_DRIVERS; + break; + default: + SHIM_ERR("Cannot obtain database guid for databases other than main\n"); + return FALSE; + } + if(Guid) + { + memcpy(Guid, copy_from, sizeof(GUID)); + } + return TRUE; } /** Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sun May 1 21:43:30 2016 @@ -32,6 +32,7 @@ #include <winerror.h> #include <stdio.h> +#include <initguid.h> #include "wine/test.h" @@ -119,8 +120,20 @@ static HMODULE hdll; static LPCWSTR (WINAPI *pSdbTagToString)(TAG); +static BOOL (WINAPI *pSdbGUIDToString)(CONST GUID *, PCWSTR, SIZE_T); +static BOOL (WINAPI *pSdbIsNullGUID)(CONST GUID *); +static BOOL (WINAPI *pSdbGetStandardDatabaseGUID)(DWORD, GUID*); static BOOL (WINAPI *pSdbGetFileAttributes)(LPCWSTR, PATTRINFO *, LPDWORD); static BOOL (WINAPI *pSdbFreeFileAttributes)(PATTRINFO); + +/* 'Known' database guids */ +DEFINE_GUID(GUID_DATABASE_MSI,0xd8ff6d16,0x6a3a,0x468a,0x8b,0x44,0x01,0x71,0x4d,0xdc,0x49,0xea); +DEFINE_GUID(GUID_DATABASE_SHIM,0x11111111,0x1111,0x1111,0x11,0x11,0x11,0x11,0x11,0x11,0x11,0x11); +DEFINE_GUID(GUID_DATABASE_DRIVERS,0xf9ab2228,0x3312,0x4a73,0xb6,0xf9,0x93,0x6d,0x70,0xe1,0x12,0xef); +DEFINE_GUID(GUID_DATABASE_TEST,0x6E989AB7,0x864D,0x4575,0x87,0x34,0x90,0x36,0x4A,0xC6,0x4F,0xBD); + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(test_UserAssist, 0xdd313e04, 0xfeff, 0x11d1, 0x8e, 0xcd, 0x00, 0x00, 0xf8, 0x7a, 0x47, 0x0c); static void test_SdbTagToString(void) { @@ -423,6 +436,32 @@ test_tag(data[n].base, data[n].tags, data[n].upper_limit, data[n].line); } } +} + +static void test_GuidFunctions(void) +{ + GUID guid; + ok(pSdbIsNullGUID(&GUID_NULL), "expected GUID_NULL to be recognized as NULL GUID\n"); + ok(pSdbIsNullGUID(NULL), "expected NULL to be recognized as NULL GUID\n"); + ok(pSdbIsNullGUID(&test_UserAssist) == 0, "expected a set GUID not to be recognized as NULL GUID\n"); + + memset(&guid, 0, sizeof(guid)); + ok(pSdbGetStandardDatabaseGUID(0, &guid) == 0,"Expected SdbGetStandardDatabaseGUID to fail\n"); + ok(IsEqualGUID(&GUID_NULL, &guid), "Expected guid not to be changed\n"); + + ok(pSdbGetStandardDatabaseGUID(0x80020000, NULL),"Expected SdbGetStandardDatabaseGUID to succeed\n"); + + memset(&guid, 0, sizeof(guid)); + ok(pSdbGetStandardDatabaseGUID(0x80020000, &guid),"Expected SdbGetStandardDatabaseGUID to succeed\n"); + ok(IsEqualGUID(&GUID_DATABASE_MSI, &guid), "Expected guid to equal GUID_DATABASE_MSI, was: %s\n", wine_dbgstr_guid(&guid)); + + memset(&guid, 0, sizeof(guid)); + ok(pSdbGetStandardDatabaseGUID(0x80030000, &guid),"Expected SdbGetStandardDatabaseGUID to succeed\n"); + ok(IsEqualGUID(&GUID_DATABASE_SHIM, &guid), "Expected guid to equal GUID_DATABASE_SHIM, was: %s\n", wine_dbgstr_guid(&guid)); + + memset(&guid, 0, sizeof(guid)); + ok(pSdbGetStandardDatabaseGUID(0x80040000, &guid),"Expected SdbGetStandardDatabaseGUID to succeed\n"); + ok(IsEqualGUID(&GUID_DATABASE_DRIVERS, &guid), "Expected guid to equal GUID_DATABASE_DRIVERS, was: %s\n", wine_dbgstr_guid(&guid)); } static void expect_tag_skip_imp(PATTRINFO pattr, DWORD num) @@ -820,9 +859,13 @@ //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); + pSdbGUIDToString = (void *) GetProcAddress(hdll, "SdbGUIDToString"); + pSdbIsNullGUID = (void *) GetProcAddress(hdll, "SdbIsNullGUID"); + pSdbGetStandardDatabaseGUID = (void *) GetProcAddress(hdll, "SdbGetStandardDatabaseGUID"); pSdbGetFileAttributes = (void *) GetProcAddress(hdll, "SdbGetFileAttributes"); pSdbFreeFileAttributes = (void *) GetProcAddress(hdll, "SdbFreeFileAttributes"); + test_GuidFunctions(); test_ApplicationAttributes(); test_SdbTagToString(); #ifdef __REACTOS__

1 0

[pschweitzer] 71229: [NTFS] Cherry pick a change from r71224 by Trevor: - Don't fail too early in NtfsCreateFile() when requesting write/supersede operation. This allows already setting appropriate...
by pschweitzer＠svn.reactos.org 01 May '16

01 May '16

Author: pschweitzer Date: Sun May 1 20:16:08 2016 New Revision: 71229 URL: http://svn.reactos.org/svn/reactos?rev=71229&view=rev Log: [NTFS] Cherry pick a change from r71224 by Trevor: - Don't fail too early in NtfsCreateFile() when requesting write/supersede operation. This allows already setting appropriate error in certain cases and making the driver more consistent Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun May 1 20:16:08 2016 @@ -359,13 +359,6 @@ FileObject = Stack->FileObject; - if (RequestedDisposition == FILE_CREATE || - RequestedDisposition == FILE_OVERWRITE_IF || - RequestedDisposition == FILE_SUPERSEDE) - { - return STATUS_ACCESS_DENIED; - } - if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID) { ULONGLONG MFTId;

1 0

[pschweitzer] 71228: [NTFS] This has nothing to do in a NTFS driver
by pschweitzer＠svn.reactos.org 01 May '16

01 May '16

Author: pschweitzer Date: Sun May 1 20:13:26 2016 New Revision: 71228 URL: http://svn.reactos.org/svn/reactos?rev=71228&view=rev Log: [NTFS] This has nothing to do in a NTFS driver Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 1 20:13:26 2016 @@ -817,16 +817,6 @@ NtfsGetUserBuffer(PIRP Irp, BOOLEAN Paging); -#if 0 -BOOLEAN -wstrcmpjoki(PWSTR s1, PWSTR s2); - -VOID -CdfsSwapString(PWCHAR Out, - PUCHAR In, - ULONG Count); -#endif - VOID NtfsFileFlagsToAttributes(ULONG NtfsAttributes, PULONG FileAttributes);

1 0

[gadamopoulos] 71227: [SHELL32] - Remove IExtractIconA_Constructor and rename IExtractIconW_Constructor to GenericExtractIcon_CreateInstance which will handle both A and W. - Make GenericExtractIco...
by gadamopoulos＠svn.reactos.org 01 May '16

01 May '16

Author: gadamopoulos Date: Sun May 1 19:54:23 2016 New Revision: 71227 URL: http://svn.reactos.org/svn/reactos?rev=71227&view=rev Log: [SHELL32] - Remove IExtractIconA_Constructor and rename IExtractIconW_Constructor to GenericExtractIcon_CreateInstance which will handle both A and W. - Make GenericExtractIcon_CreateInstance accept a pointer to a IShellFolder and a simple pidl. - Avoid using SHGetPathFromIDListW. Use ILGetDisplayNameExW instead. May make loading icons for folders and exe files slightly faster as it does fewer I/O and less allocations. Modified: trunk/reactos/dll/win32/shell32/folders.cpp 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/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sun May 1 19:54:23 2016 @@ -24,7 +24,7 @@ DWORD NumIconOverlayHandlers = 0; IShellIconOverlayIdentifier ** Handlers = NULL; -static HRESULT getIconLocationForFolder(LPCITEMIDLIST pidl, UINT uFlags, +static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; @@ -39,7 +39,7 @@ { WCHAR wszFolderPath[MAX_PATH]; - if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + if (!ILGetDisplayNameExW(psf, pidl, wszFolderPath, 0)) return FALSE; PathAppendW(wszFolderPath, wszDesktopIni); @@ -192,28 +192,20 @@ return FALSE; } -/************************************************************************** -* IExtractIconW_Constructor -*/ -IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) +HRESULT GenericExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; - CComPtr<IExtractIconW> extractIcon; GUID const * riid; int icon_idx; UINT flags; CHAR sTemp[MAX_PATH]; WCHAR wTemp[MAX_PATH]; - LPITEMIDLIST pSimplePidl = ILFindLastID(pidl); + LPCITEMIDLIST pSimplePidl = pidl; HRESULT hr; hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); if (FAILED(hr)) - return NULL; - - hr = initIcon->QueryInterface(IID_PPV_ARG(IExtractIconW,&extractIcon)); - if (FAILED(hr)) - return NULL; + return hr; if (_ILIsDesktop(pSimplePidl)) { @@ -321,7 +313,7 @@ else if (_ILIsFolder (pSimplePidl)) { - if (SUCCEEDED(getIconLocationForFolder( + if (SUCCEEDED(getIconLocationForFolder(psf, pidl, 0, wTemp, MAX_PATH, &icon_idx, &flags))) @@ -332,21 +324,21 @@ // the following line removed. initIcon->SetShortcutIcon(wTemp, icon_idx); } - if (SUCCEEDED(getIconLocationForFolder( + if (SUCCEEDED(getIconLocationForFolder(psf, pidl, GIL_DEFAULTICON, wTemp, MAX_PATH, &icon_idx, &flags))) { initIcon->SetDefaultIcon(wTemp, icon_idx); } - // if (SUCCEEDED(getIconLocationForFolder( + // if (SUCCEEDED(getIconLocationForFolder(psf, // pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, // &icon_idx, // &flags))) // { // initIcon->SetShortcutIcon(wTemp, icon_idx); // } - if (SUCCEEDED(getIconLocationForFolder( + if (SUCCEEDED(getIconLocationForFolder(psf, pidl, GIL_OPENICON, wTemp, MAX_PATH, &icon_idx, &flags))) @@ -365,7 +357,7 @@ { if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ { - SHGetPathFromIDListW(pidl, wTemp); + ILGetDisplayNameExW(psf, pidl, wTemp, 0); icon_idx = 0; } else @@ -383,7 +375,7 @@ if (SUCCEEDED(SHGetDesktopFolder(&dsf))) { - HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*) &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); + HRESULT hr = dsf->GetUIObjectOf(NULL, 1, &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); if (SUCCEEDED(hr)) { @@ -404,24 +396,5 @@ initIcon->SetNormalIcon(wTemp, icon_idx); } - return extractIcon.Detach(); + return initIcon->QueryInterface(iid, ppvOut); } - -/************************************************************************** -* IExtractIconA_Constructor -*/ -IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) -{ - CComPtr<IExtractIconW> extractIconW; - CComPtr<IExtractIconA> extractIconA; - HRESULT hr; - - extractIconW = IExtractIconW_Constructor(pidl); - if (!extractIconW) - return NULL; - - hr = extractIconW->QueryInterface(IID_PPV_ARG(IExtractIconA, &extractIconA)); - if (FAILED(hr)) - return NULL; - return extractIconA.Detach(); -} 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] Sun May 1 19:54:23 2016 @@ -125,19 +125,12 @@ return NULL; } -HRESULT CCPLExtractIcon_CreateInstance(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) +HRESULT CCPLExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { PIDLCPanelStruct *pData = _ILGetCPanelPointer(pidl); if (!pData) { - LPITEMIDLIST pidlComplete = ILCombine(pidlRoot, pidl); - if (!pidlComplete) - return E_OUTOFMEMORY; - - *ppvOut = IExtractIconW_Constructor(pidlComplete); - - SHFree(pidlComplete); - return *ppvOut ? S_OK : E_FAIL; + return GenericExtractIcon_CreateInstance(psf, pidl, riid, ppvOut); } CComPtr<IDefaultExtractIconInit> initIcon; @@ -508,7 +501,7 @@ } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else if ((IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CCPLExtractIcon_CreateInstance(pidlRoot, apidl[0], riid, &pObj); + hr = CCPLExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) { 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] Sun May 1 19:54:23 2016 @@ -590,7 +590,7 @@ LPVOID *ppvOut) { LPITEMIDLIST pidl; - IUnknown *pObj = NULL; + LPVOID pObj = NULL; HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", @@ -609,19 +609,9 @@ { hr = IDataObject_Constructor( hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } - else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconA_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } - else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconW_Constructor (pidl); - SHFree (pidl); - hr = S_OK; + else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) + { + hr = GenericExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } else if (IsEqualIID (riid, IID_IDropTarget)) { 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] Sun May 1 19:54:23 2016 @@ -436,7 +436,7 @@ REFIID riid, UINT *prgfInOut, LPVOID *ppvOut) { LPITEMIDLIST pidl; - IUnknown *pObj = NULL; + LPVOID pObj = NULL; HRESULT hr = E_INVALIDARG; TRACE("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", this, @@ -456,19 +456,9 @@ hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } - else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconA_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } - else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconW_Constructor (pidl); - SHFree (pidl); - hr = S_OK; + else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) + { + hr = GenericExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Sun May 1 19:54:23 2016 @@ -488,7 +488,7 @@ LPVOID * ppvOut) { LPITEMIDLIST pidl; - IUnknown *pObj = NULL; + LPVOID pObj = NULL; HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", @@ -515,19 +515,9 @@ hr = IDataObject_Constructor (hwndOwner, pidlRoot, (LPCITEMIDLIST*)&pidlRoot, 1, (IDataObject **)&pObj); } } - else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconA_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } - else if (IsEqualIID (riid, IID_IExtractIconW) && (cidl == 1)) - { - pidl = ILCombine (pidlRoot, apidl[0]); - pObj = IExtractIconW_Constructor (pidl); - SHFree (pidl); - hr = S_OK; + else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) + { + hr = GenericExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } else if (IsEqualIID (riid, IID_IDropTarget)) { Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Sun May 1 19:54:23 2016 @@ -79,8 +79,7 @@ HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; -LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; -LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; +HRESULT GenericExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut); /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \

1 0

[mjansen] 71226: [APPHELP][APPHELP_APITEST] Add SdbGetFileAttributes + tests, based on the work of Mislav Blažević CORE-10367 - Implement SdbGetFileAttributes (based on the work of Mislav Blažević)...
by mjansen＠svn.reactos.org 01 May '16

01 May '16

Author: mjansen Date: Sun May 1 19:12:06 2016 New Revision: 71226 URL: http://svn.reactos.org/svn/reactos?rev=71226&view=rev Log: [APPHELP][APPHELP_APITEST] Add SdbGetFileAttributes + tests, based on the work of Mislav Blažević CORE-10367 - Implement SdbGetFileAttributes (based on the work of Mislav Blažević) - Add tests for SdbGetFileAttributes Added: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c (with props) trunk/rostests/apitests/apphelp/data.c (with props) Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/rostests/apitests/apphelp/CMakeLists.txt trunk/rostests/apitests/apphelp/apphelp.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sun May 1 19:12:06 2016 @@ -3,8 +3,9 @@ list(APPEND SOURCE apphelp.c + layer.c sdbapi.c - layer.c + sdbfileattr.c apphelp.spec apphelp.h ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) @@ -15,6 +16,7 @@ set_module_type(apphelp win32dll) target_link_libraries(apphelp wine) -#add_delay_importlibs(apphelp version imagehlp user32) -add_importlibs(apphelp msvcrt kernel32 ntdll) +# When binutils is fixed, we should move imagehlp to delay! CORE-6504 +add_delay_importlibs(apphelp version) +add_importlibs(apphelp msvcrt imagehlp kernel32 ntdll) add_cd_file(TARGET apphelp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sun May 1 19:12:06 2016 @@ -32,6 +32,16 @@ #define TAGREF_NULL (0) #define TAGREF_ROOT (0) +typedef struct tagATTRINFO { + TAG type; + DWORD flags; + union { + QWORD qwattr; + DWORD dwattr; + WCHAR *lpattr; + }; +} ATTRINFO, *PATTRINFO; + typedef enum _SHIM_LOG_LEVEL { SHIM_ERR = 1, SHIM_WARN = 2, @@ -72,12 +82,28 @@ #endif +typedef struct tagMEMMAPPED { + HANDLE file; + HANDLE section; + PBYTE view; + SIZE_T size; + SIZE_T mapped_size; +} MEMMAPPED, *PMEMMAPPED; + +BOOL WINAPI SdbpOpenMemMappedFile(LPCWSTR path, PMEMMAPPED mapping); +void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping); +DWORD SdbpStrlen(LPCWSTR string); +PWSTR SdbpStrDup(LPCWSTR string); + /* layer.c */ BOOL WINAPI AllowPermLayer(PCWSTR path); BOOL WINAPI SdbGetPermLayerKeys(PCWSTR wszPath, PWSTR pwszLayers, PDWORD pdwBytes, DWORD dwFlags); BOOL WINAPI SetPermLayerState(PCWSTR wszPath, PCWSTR wszLayer, DWORD dwFlags, BOOL bMachine, BOOL bEnable); + +#define ATTRIBUTE_AVAILABLE 0x1 +#define ATTRIBUTE_FAILED 0x2 #define TAGID_NULL 0x0 #define TAGID_ROOT 0x0 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sun May 1 19:12:06 2016 @@ -48,7 +48,7 @@ @ stub SdbFindNextTag @ stub SdbFindNextTagRef @ stub SdbFreeDatabaseInformation -@ stub SdbFreeFileAttributes +@ stdcall SdbFreeFileAttributes(ptr) @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize @@ -61,7 +61,7 @@ @ stub SdbGetDatabaseVersion @ stub SdbGetDllPath @ stub SdbGetEntryFlags -@ stub SdbGetFileAttributes +@ stdcall SdbGetFileAttributes(wstr ptr ptr) @ stub SdbGetFileImageType @ stub SdbGetFileImageTypeEx @ stub SdbGetFileInfo Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun May 1 19:12:06 2016 @@ -155,52 +155,135 @@ HeapDestroy(g_Heap); } +static HANDLE SdbpHeap(void) +{ + return g_Heap; +} + +LPVOID SdbpAlloc(SIZE_T size +#if SDBAPI_DEBUG_ALLOC + , int line, const char* file +#endif + ) +{ + LPVOID mem = HeapAlloc(SdbpHeap(), HEAP_ZERO_MEMORY, size); +#if SDBAPI_DEBUG_ALLOC + SdbpInsertAllocation(mem, size, line, file); +#endif + return mem; +} + +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size +#if SDBAPI_DEBUG_ALLOC + , int line, const char* file +#endif + ) +{ + LPVOID newmem = HeapReAlloc(SdbpHeap(), HEAP_ZERO_MEMORY, mem, size); +#if SDBAPI_DEBUG_ALLOC + SdbpUpdateAllocation(mem, newmem, size, line, file); +#endif + return newmem; +} + +void SdbpFree(LPVOID mem +#if SDBAPI_DEBUG_ALLOC + , int line, const char* file +#endif + ) +{ +#if SDBAPI_DEBUG_ALLOC + SdbpRemoveAllocation(mem, line, file); +#endif + HeapFree(SdbpHeap(), 0, mem); +} + DWORD SdbpStrlen(PCWSTR string) { return (lstrlenW(string) + 1) * sizeof(WCHAR); } -static HANDLE SdbpHeap(void) -{ - return g_Heap; -} - -LPVOID SdbpAlloc(SIZE_T size -#if SDBAPI_DEBUG_ALLOC - , int line, const char* file -#endif - ) -{ - LPVOID mem = HeapAlloc(SdbpHeap(), HEAP_ZERO_MEMORY, size); -#if SDBAPI_DEBUG_ALLOC - SdbpInsertAllocation(mem, size, line, file); -#endif - return mem; -} - -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size -#if SDBAPI_DEBUG_ALLOC - , int line, const char* file -#endif - ) -{ - LPVOID newmem = HeapReAlloc(SdbpHeap(), HEAP_ZERO_MEMORY, mem, size); -#if SDBAPI_DEBUG_ALLOC - SdbpUpdateAllocation(mem, newmem, size, line, file); -#endif - return newmem; -} - -void SdbpFree(LPVOID mem -#if SDBAPI_DEBUG_ALLOC - , int line, const char* file -#endif - ) -{ -#if SDBAPI_DEBUG_ALLOC - SdbpRemoveAllocation(mem, line, file); -#endif - HeapFree(SdbpHeap(), 0, mem); +PWSTR SdbpStrDup(LPCWSTR string) +{ + PWSTR ret = SdbpAlloc(SdbpStrlen(string)); + lstrcpyW(ret, string); + return ret; +} + + +BOOL WINAPI SdbpOpenMemMappedFile(LPCWSTR path, PMEMMAPPED mapping) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + FILE_STANDARD_INFORMATION FileStandard; + UNICODE_STRING FileName; + + RtlZeroMemory(mapping, sizeof(*mapping)); + + if(!RtlDosPathNameToNtPathName_U(path, &FileName, NULL, NULL)) + { + RtlFreeUnicodeString(&FileName); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&mapping->file, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&FileName); + + if (!NT_SUCCESS(Status)) + { + SHIM_ERR("Failed to open file %S: 0x%lx\n", path, Status); + return FALSE; + } + + Status = NtCreateSection(&mapping->section, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, 0, 0, PAGE_READONLY, SEC_COMMIT, mapping->file); + if (!NT_SUCCESS(Status)) + { + /* Special case */ + if (Status == STATUS_MAPPED_FILE_SIZE_ZERO) + { + NtClose(mapping->file); + mapping->file = mapping->section = NULL; + return TRUE; + } + SHIM_ERR("Failed to create mapping for file: 0x%lx\n", Status); + goto err_out; + } + + Status = NtQueryInformationFile(mapping->file, &IoStatusBlock, &FileStandard, sizeof(FileStandard), FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + SHIM_ERR("Failed to read file info for file: 0x%lx\n", Status); + goto err_out; + } + + mapping->mapped_size = mapping->size = FileStandard.EndOfFile.LowPart; + Status = NtMapViewOfSection(mapping->section, NtCurrentProcess(), (PVOID*)&mapping->view, 0, 0, 0, &mapping->mapped_size, ViewUnmap, 0, PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + SHIM_ERR("Failed to map view of file: 0x%lx\n", Status); + goto err_out; + } + + return TRUE; + +err_out: + if (!mapping->view) + { + if (mapping->section) + NtClose(mapping->section); + NtClose(mapping->file); + } + return FALSE; +} + +void WINAPI SdbpCloseMemMappedFile(PMEMMAPPED mapping) +{ + NtUnmapViewOfSection(NtCurrentProcess(), mapping->view); + NtClose(mapping->section); + NtClose(mapping->file); + RtlZeroMemory(mapping, sizeof(*mapping)); } /** Added: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] Sun May 1 19:12:06 2016 @@ -0,0 +1,371 @@ +/* + * Copyright 2011 André Hentschel + * Copyright 2013 Mislav Blaevic + * Copyright 2015 Mark Jansen + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "apphelp.h" +#include "imagehlp.h" +#include "winver.h" + +#include "wine/unicode.h" + +#define NUM_ATTRIBUTES 28 + +static void WINAPI SdbpSetDWORDAttr(PATTRINFO attr, TAG tag, DWORD value) +{ + attr->type = tag; + attr->flags = ATTRIBUTE_AVAILABLE; + attr->dwattr = value; +} + +static void WINAPI SdbpSetQWORDAttr(PATTRINFO attr, TAG tag, QWORD value) +{ + attr->type = tag; + attr->flags = ATTRIBUTE_AVAILABLE; + attr->qwattr = value; +} + +static void WINAPI SdbpSetStringAttr(PATTRINFO attr, TAG tag, WCHAR *string) +{ + if (!string) + { + attr->flags = ATTRIBUTE_FAILED; + return; + } + + attr->type = tag; + attr->flags = ATTRIBUTE_AVAILABLE; + attr->lpattr = SdbpStrDup(string); +} + +static void WINAPI SdbpSetAttrFail(PATTRINFO attr) +{ + attr->flags = ATTRIBUTE_FAILED; +} + +static WCHAR* WINAPI SdbpGetStringAttr(LPWSTR translation, LPCWSTR attr, PVOID file_info) +{ + UINT size = 0; + PVOID buffer; + WCHAR value[128] = {0}; + + if (!file_info) + return NULL; + + snprintfW(value, 128, translation, attr); + if (VerQueryValueW(file_info, value, &buffer, &size) && size != 0) + return (WCHAR*)buffer; + + return NULL; +} + +static void WINAPI SdbpSetStringAttrFromAnsiString(PATTRINFO attr, TAG tag, PBYTE string, BYTE len) +{ + WCHAR* dest; + if (!string) + { + attr->flags = ATTRIBUTE_FAILED; + return; + } + + attr->type = tag; + attr->flags = ATTRIBUTE_AVAILABLE; + dest = attr->lpattr = SdbpAlloc((len+1) * sizeof(WCHAR)); + while (len--) + *(dest++) = *(string++); + *dest = 0; +} + +static void WINAPI SdbpSetStringAttrFromPascalString(PATTRINFO attr, TAG tag, PBYTE string) +{ + if (!string) + { + attr->flags = ATTRIBUTE_FAILED; + return; + } + + SdbpSetStringAttrFromAnsiString(attr, tag, string + 1, *string); +} + +static void SdbpReadFileVersion(PATTRINFO attr_info, PVOID file_info) +{ + static const WCHAR str_root[] = {'\\',0}; + + VS_FIXEDFILEINFO* fixed_info; + UINT size; + if (file_info && VerQueryValueW(file_info, str_root, (LPVOID*)&fixed_info, &size) && size) + { + if (fixed_info->dwSignature == VS_FFI_SIGNATURE) + { + LARGE_INTEGER version; + version.HighPart = fixed_info->dwFileVersionMS; + version.LowPart = fixed_info->dwFileVersionLS; + SdbpSetQWORDAttr(&attr_info[2], TAG_BIN_FILE_VERSION, version.QuadPart); + SdbpSetQWORDAttr(&attr_info[21], TAG_UPTO_BIN_FILE_VERSION, version.QuadPart); + version.HighPart = fixed_info->dwProductVersionMS; + version.LowPart = fixed_info->dwProductVersionLS; + SdbpSetQWORDAttr(&attr_info[3], TAG_BIN_PRODUCT_VERSION, version.QuadPart); + SdbpSetQWORDAttr(&attr_info[22], TAG_UPTO_BIN_PRODUCT_VERSION, version.QuadPart); + + SdbpSetDWORDAttr(&attr_info[12], TAG_VERDATEHI, fixed_info->dwFileDateMS); + SdbpSetDWORDAttr(&attr_info[13], TAG_VERDATELO, fixed_info->dwFileDateLS); + SdbpSetDWORDAttr(&attr_info[14], TAG_VERFILEOS, fixed_info->dwFileOS); /* 0x000, 0x4, 0x40004, 0x40000, 0x10004, 0x10001*/ + SdbpSetDWORDAttr(&attr_info[15], TAG_VERFILETYPE, fixed_info->dwFileType); /* VFT_APP, VFT_DLL, .... */ + return; + } + } + + SdbpSetAttrFail(&attr_info[2]); + SdbpSetAttrFail(&attr_info[3]); + SdbpSetAttrFail(&attr_info[12]); + SdbpSetAttrFail(&attr_info[13]); + SdbpSetAttrFail(&attr_info[14]); + SdbpSetAttrFail(&attr_info[15]); + SdbpSetAttrFail(&attr_info[21]); + SdbpSetAttrFail(&attr_info[22]); +} + +static DWORD WINAPI SdbpCalculateFileChecksum(PMEMMAPPED mapping) +{ + size_t n, size; + PDWORD data; + DWORD checks = 0, carry = 0; + + if (mapping->size < 4) + return 0; + + if (mapping->size >= 0x1000) + { + size = 0x1000; + if (mapping->size < 0x1200) + data = (PDWORD)(mapping->view + mapping->size - size); + else + data = (PDWORD)mapping->view + (0x200 / 4); + } + else + { + data = (PDWORD)mapping->view; + size = mapping->size; + } + + for (n = 0; n < size / 4; ++n) + { + checks += *data; + carry = (checks & 1) ? 0x80000000 : 0; + checks >>= 1; + checks |= carry; + ++data; + } + return checks; +} + +static DWORD WINAPI SdbpGetModuleType(PMEMMAPPED mapping) +{ + PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)mapping->view; + PIMAGE_OS2_HEADER os2; + + if (mapping->size < 2 || dos->e_magic != IMAGE_DOS_SIGNATURE) + return 0; + + if (mapping->size < sizeof(IMAGE_DOS_HEADER) || mapping->size < (dos->e_lfanew+2)) + return 1; + + os2 = (PIMAGE_OS2_HEADER)((PBYTE)dos + dos->e_lfanew); + if (os2->ne_magic == IMAGE_OS2_SIGNATURE || os2->ne_magic == IMAGE_OS2_SIGNATURE_LE) + return 2; + + if (mapping->size >= (dos->e_lfanew + 4) && ((PIMAGE_NT_HEADERS)os2)->Signature == IMAGE_NT_SIGNATURE) + return 3; + + return 1; +} + +/** + * Frees attribute data allocated by SdbGetFileAttributes. + * + * @note Unlike Windows, this implementation will not crash if attr_info is NULL. + * + * @param [in] attr_info Pointer to array of ATTRINFO which will be freed. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbFreeFileAttributes(PATTRINFO attr_info) +{ + WORD i; + + if (!attr_info) + return FALSE; + + for (i = 0; i < NUM_ATTRIBUTES; i++) + if ((attr_info[i].type & TAG_TYPE_MASK) == TAG_TYPE_STRINGREF) + SdbFree(attr_info[i].lpattr); + SdbFree(attr_info); + return TRUE; +} + +/** + * Retrieves attribute data shim database requires to match a file with database entry + * + * @note You must free the attr_info allocated by this function by calling SdbFreeFileAttributes. + * + * @param [in] path Path to the file. + * @param [out] attr_info_ret Pointer to array of ATTRINFO. Contains attribute data. + * @param [out] attr_count Number of attributes in attr_info. + * + * @return TRUE if it succeeds, FALSE if it fails. + */ +BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO *attr_info_ret, LPDWORD attr_count) +{ + static const WCHAR str_tinfo[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; + static const WCHAR str_trans[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','%','0','4','x','%','0','4','x','\\','%','%','s',0}; + static const WCHAR str_CompanyName[] = {'C','o','m','p','a','n','y','N','a','m','e',0}; + static const WCHAR str_FileDescription[] = {'F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR str_FileVersion[] = {'F','i','l','e','V','e','r','s','i','o','n',0}; + static const WCHAR str_InternalName[] = {'I','n','t','e','r','n','a','l','N','a','m','e',0}; + static const WCHAR str_LegalCopyright[] = {'L','e','g','a','l','C','o','p','y','r','i','g','h','t',0}; + static const WCHAR str_OriginalFilename[] = {'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e',0}; + static const WCHAR str_ProductName[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; + static const WCHAR str_ProductVersion[] = {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; + + PIMAGE_NT_HEADERS headers; + MEMMAPPED mapped; + PVOID file_info = 0; + DWORD headersum, checksum, module_type; + WCHAR translation[128] = {0}; + PATTRINFO attr_info; + + struct LANGANDCODEPAGE { + WORD language; + WORD code_page; + } *lang_page; + + if (!SdbpOpenMemMappedFile(path, &mapped)) + { + SHIM_ERR("Error retrieving FILEINFO structure\n"); + return FALSE; + } + + attr_info = (PATTRINFO)SdbAlloc(NUM_ATTRIBUTES * sizeof(ATTRINFO)); + + SdbpSetDWORDAttr(&attr_info[0], TAG_SIZE, mapped.size); + if (mapped.size) + SdbpSetDWORDAttr(&attr_info[1], TAG_CHECKSUM, SdbpCalculateFileChecksum(&mapped)); + else + SdbpSetAttrFail(&attr_info[1]); + module_type = SdbpGetModuleType(&mapped); + + if (module_type) + SdbpSetDWORDAttr(&attr_info[16], TAG_MODULE_TYPE, module_type); + else + SdbpSetAttrFail(&attr_info[16]); /* TAG_MODULE_TYPE */ + + headers = CheckSumMappedFile(mapped.view, mapped.size, &headersum, &checksum); + if (headers) + { + DWORD info_size; + SIZE_T export_dir_size; + PIMAGE_EXPORT_DIRECTORY export_dir; + + info_size = GetFileVersionInfoSizeW(path, NULL); + if (info_size != 0) + { + UINT page_size = 0; + file_info = SdbAlloc(info_size); + GetFileVersionInfoW(path, 0, info_size, file_info); + VerQueryValueW(file_info, str_tinfo, (LPVOID)&lang_page, &page_size); + snprintfW(translation, 128, str_trans, lang_page->language, lang_page->code_page); + } + + /* Handles 2, 3, 12, 13, 14, 15, 21, 22 */ + SdbpReadFileVersion(attr_info, file_info); + + SdbpSetStringAttr(&attr_info[4], TAG_PRODUCT_VERSION, SdbpGetStringAttr(translation, str_ProductVersion, file_info)); + SdbpSetStringAttr(&attr_info[5], TAG_FILE_DESCRIPTION, SdbpGetStringAttr(translation, str_FileDescription, file_info)); + SdbpSetStringAttr(&attr_info[6], TAG_COMPANY_NAME, SdbpGetStringAttr(translation, str_CompanyName, file_info)); + SdbpSetStringAttr(&attr_info[7], TAG_PRODUCT_NAME, SdbpGetStringAttr(translation, str_ProductName, file_info)); + SdbpSetStringAttr(&attr_info[8], TAG_FILE_VERSION, SdbpGetStringAttr(translation, str_FileVersion, file_info)); + SdbpSetStringAttr(&attr_info[9], TAG_ORIGINAL_FILENAME, SdbpGetStringAttr(translation, str_OriginalFilename, file_info)); + SdbpSetStringAttr(&attr_info[10], TAG_INTERNAL_NAME, SdbpGetStringAttr(translation, str_InternalName, file_info)); + SdbpSetStringAttr(&attr_info[11], TAG_LEGAL_COPYRIGHT, SdbpGetStringAttr(translation, str_LegalCopyright, file_info)); + + /* http://msdn.microsoft.com/en-us/library/windows/desktop/ms680339(v=vs.85).a… */ + + SdbpSetDWORDAttr(&attr_info[17], TAG_PE_CHECKSUM, headers->OptionalHeader.CheckSum); + + SdbpSetDWORDAttr(&attr_info[18], TAG_LINKER_VERSION, /* mislabeled! */ + ((DWORD)headers->OptionalHeader.MajorImageVersion) << 16 | headers->OptionalHeader.MinorImageVersion); + SdbpSetAttrFail(&attr_info[19]); /* TAG_16BIT_DESCRIPTION */ + SdbpSetAttrFail(&attr_info[20]); /* TAG_16BIT_MODULE_NAME */ + + SdbpSetDWORDAttr(&attr_info[23], TAG_LINK_DATE, headers->FileHeader.TimeDateStamp); + SdbpSetDWORDAttr(&attr_info[24], TAG_UPTO_LINK_DATE, headers->FileHeader.TimeDateStamp); + + export_dir = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); + if (export_dir) + { + PIMAGE_SECTION_HEADER section = NULL; + PBYTE export_name = ImageRvaToVa(headers, mapped.view, export_dir->Name, &section); + if (export_name) + SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME, export_name, strlen((char*)export_name)); + else + SdbpSetAttrFail(&attr_info[25]); /* TAG_EXPORT_NAME */ + } + else + { + SdbpSetAttrFail(&attr_info[25]); /* TAG_EXPORT_NAME */ + } + + if (info_size) + SdbpSetDWORDAttr(&attr_info[26], TAG_VER_LANGUAGE, lang_page->language); + + SdbpSetDWORDAttr(&attr_info[27], TAG_EXE_WRAPPER, 0); /* boolean */ + } + else + { + int n; + for (n = 2; n < NUM_ATTRIBUTES; ++n) + { + if (n != 16 && n != 26) + SdbpSetAttrFail(&attr_info[n]); + } + if (module_type == 2) + { + PIMAGE_DOS_HEADER dos = (PIMAGE_DOS_HEADER)mapped.view; + PBYTE end = mapped.view + mapped.size, ptr; + PIMAGE_OS2_HEADER os2 = (PIMAGE_OS2_HEADER)((PBYTE)dos + dos->e_lfanew); + if ((PBYTE)(os2 + 1) <= end) + { + ptr = (PBYTE)dos + os2->ne_nrestab; + if (ptr <= end && (ptr + 1 + *ptr) <= end) + SdbpSetStringAttrFromPascalString(&attr_info[19], TAG_16BIT_DESCRIPTION, ptr); + ptr = (PBYTE)os2 + os2->ne_restab; + if (ptr <= end && (ptr + 1 + *ptr) <= end) + SdbpSetStringAttrFromPascalString(&attr_info[20], TAG_16BIT_MODULE_NAME, ptr); + } + } + } + + *attr_info_ret = attr_info; + *attr_count = NUM_ATTRIBUTES; /* As far as I know, this one is always 28 */ + + SdbFree(file_info); + SdbpCloseMemMappedFile(&mapped); + return TRUE; +} Propchange: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/CMakeLists.txt [iso-8859-1] Sun May 1 19:12:06 2016 @@ -2,8 +2,9 @@ add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE + apphelp.c + data.c layerapi.c - apphelp.c testlist.c) add_executable(apphelp_apitest ${SOURCE}) Modified: trunk/rostests/apitests/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/apphelp.… ============================================================================== --- trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apphelp/apphelp.c [iso-8859-1] Sun May 1 19:12:06 2016 @@ -35,6 +35,15 @@ #include "wine/test.h" +/* data.c */ +void test_create_exe_imp(const char* name, int skip_rsrc_exports); +void test_create_file_imp(const char* name, const char* contents, size_t len); +void test_create_ne_imp(const char* name, int skip_names); + +#define test_create_exe (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_exe_imp +#define test_create_file (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_file_imp +#define test_create_ne (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_create_ne_imp + static DWORD g_Version; @@ -48,6 +57,9 @@ typedef WORD TAG; +typedef DWORD TAGID; +typedef DWORD TAGREF; +typedef UINT64 QWORD; #define TAG_TYPE_MASK 0xF000 @@ -60,10 +72,55 @@ #define TAG_TYPE_LIST 0x7000 #define TAG_TYPE_STRING 0x8000 #define TAG_TYPE_BINARY 0x9000 - +#define TAG_NULL 0x0 +#define TAG_SIZE (0x1 | TAG_TYPE_DWORD) +#define TAG_CHECKSUM (0x3 | TAG_TYPE_DWORD) +#define TAG_MODULE_TYPE (0x6 | TAG_TYPE_DWORD) +#define TAG_VERDATEHI (0x7 | TAG_TYPE_DWORD) +#define TAG_VERDATELO (0x8 | TAG_TYPE_DWORD) +#define TAG_VERFILEOS (0x9 | TAG_TYPE_DWORD) +#define TAG_VERFILETYPE (0xA | TAG_TYPE_DWORD) +#define TAG_PE_CHECKSUM (0xB | TAG_TYPE_DWORD) +#define TAG_VER_LANGUAGE (0x12 | TAG_TYPE_DWORD) +#define TAG_LINKER_VERSION (0x1C | TAG_TYPE_DWORD) +#define TAG_LINK_DATE (0x1D | TAG_TYPE_DWORD) +#define TAG_UPTO_LINK_DATE (0x1E | TAG_TYPE_DWORD) +#define TAG_EXE_WRAPPER (0x31 | TAG_TYPE_DWORD) +#define TAG_BIN_FILE_VERSION (0x2 | TAG_TYPE_QWORD) +#define TAG_BIN_PRODUCT_VERSION (0x3 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_PRODUCT_VERSION (0x6 | TAG_TYPE_QWORD) +#define TAG_UPTO_BIN_FILE_VERSION (0xD | TAG_TYPE_QWORD) +#define TAG_NAME (0x1 | TAG_TYPE_STRINGREF) +#define TAG_COMPANY_NAME (0x9 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_NAME (0x10 | TAG_TYPE_STRINGREF) +#define TAG_PRODUCT_VERSION (0x11 | TAG_TYPE_STRINGREF) +#define TAG_FILE_DESCRIPTION (0x12 | TAG_TYPE_STRINGREF) +#define TAG_FILE_VERSION (0x13 | TAG_TYPE_STRINGREF) +#define TAG_ORIGINAL_FILENAME (0x14 | TAG_TYPE_STRINGREF) +#define TAG_INTERNAL_NAME (0x15 | TAG_TYPE_STRINGREF) +#define TAG_LEGAL_COPYRIGHT (0x16 | TAG_TYPE_STRINGREF) +#define TAG_16BIT_DESCRIPTION (0x17 | TAG_TYPE_STRINGREF) +#define TAG_16BIT_MODULE_NAME (0x20 | TAG_TYPE_STRINGREF) +#define TAG_EXPORT_NAME (0x24 | TAG_TYPE_STRINGREF) + + +#define ATTRIBUTE_AVAILABLE 0x1 +#define ATTRIBUTE_FAILED 0x2 + +typedef struct tagATTRINFO { + TAG type; + DWORD flags; /* ATTRIBUTE_AVAILABLE, ATTRIBUTE_FAILED */ + union { + QWORD qwattr; + DWORD dwattr; + WCHAR *lpattr; + }; +} ATTRINFO, *PATTRINFO; static HMODULE hdll; static LPCWSTR (WINAPI *pSdbTagToString)(TAG); +static BOOL (WINAPI *pSdbGetFileAttributes)(LPCWSTR, PATTRINFO *, LPDWORD); +static BOOL (WINAPI *pSdbFreeFileAttributes)(PATTRINFO); static void test_SdbTagToString(void) { @@ -366,6 +423,386 @@ test_tag(data[n].base, data[n].tags, data[n].upper_limit, data[n].line); } } +} + +static void expect_tag_skip_imp(PATTRINFO pattr, DWORD num) +{ + PATTRINFO p = &pattr[num]; + winetest_ok(p->type == TAG_NULL, "expected entry #%d to be TAG_NULL, was %x\n", num, p->type); + winetest_ok(p->flags == ATTRIBUTE_FAILED, "expected entry #%d to be failed, was %d\n", num, p->flags); + winetest_ok(p->qwattr == 0, "expected entry #%d to be 0, was 0x%I64x\n", num, p->qwattr); +} +static void expect_tag_empty_imp(PATTRINFO pattr, DWORD num) +{ + PATTRINFO p = &pattr[num]; + winetest_ok(p->type == TAG_NULL, "expected entry #%d to be TAG_NULL, was %x\n", num, p->type); + winetest_ok(p->flags == 0, "expected entry #%d to be 0, was %d\n", num, p->flags); + winetest_ok(p->qwattr == 0, "expected entry #%d to be 0, was 0x%I64x\n", num, p->qwattr); +} + +static void expect_tag_dword_imp(PATTRINFO pattr, DWORD num, TAG tag, DWORD value) +{ + PATTRINFO p = &pattr[num]; + winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); + winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); + winetest_ok(p->dwattr == value, "expected entry #%d to be 0x%x, was 0x%x\n", num, value, p->dwattr); +} + +static void expect_tag_qword_imp(PATTRINFO pattr, DWORD num, TAG tag, QWORD value) +{ + PATTRINFO p = &pattr[num]; + winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); + winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); + winetest_ok(p->qwattr == value, "expected entry #%d to be 0x%I64x, was 0x%I64x\n", num, value, p->qwattr); +} + +static void expect_tag_str_imp(PATTRINFO pattr, DWORD num, TAG tag, const WCHAR* value) +{ + PATTRINFO p = &pattr[num]; + winetest_ok(p->type == tag, "expected entry #%d to be %x, was %x\n", num, tag, p->type); + winetest_ok(p->flags == ATTRIBUTE_AVAILABLE, "expected entry #%d to be available, was %d\n", num, p->flags); + winetest_ok(p->lpattr && wcscmp(p->lpattr, value) == 0, "expected entry #%d to be %s, was %s\n", num, wine_dbgstr_w(value), wine_dbgstr_w(p->lpattr)); +} + +#define expect_tag_skip (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_tag_skip_imp +#define expect_tag_empty (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_tag_empty_imp +#define expect_tag_dword (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_tag_dword_imp +#define expect_tag_qword (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_tag_qword_imp +#define expect_tag_str (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : expect_tag_str_imp +#define expect_tag_skip_range(ptr, from, to) \ + do { \ + int n = (from), n_end = (to); \ + winetest_set_location(__FILE__, __LINE__); \ + for ( ; n < n_end; ++n) \ + expect_tag_skip_imp((ptr), n); \ + } while (0) +#define test_crc (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_crc_imp +#define test_crc2 (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_crc2_imp + +void test_onefile(WCHAR* filename) +{ + PATTRINFO pattrinfo; + DWORD num; + + if (!pSdbFreeFileAttributes) + { + hdll = LoadLibraryA("apphelp.dll"); + pSdbTagToString = (void *)GetProcAddress(hdll, "SdbTagToString"); + pSdbGetFileAttributes = (void *)GetProcAddress(hdll, "SdbGetFileAttributes"); + pSdbFreeFileAttributes = (void *)GetProcAddress(hdll, "SdbFreeFileAttributes"); + } + + if (pSdbGetFileAttributes(filename, &pattrinfo, &num)) + { + if (pattrinfo[16].flags == ATTRIBUTE_AVAILABLE) + { + if (pattrinfo[16].type != TAG_MODULE_TYPE)//SdbpSetAttrFail(&attr_info[16]); /* TAG_MODULE_TYPE (1: WIN16?) (3: WIN32?) (WIN64?), Win32VersionValue? */) + printf("FAIL TAG_MODULE_TYPE (%S)\n", filename); + if (pattrinfo[16].dwattr != 3 && pattrinfo[16].dwattr != 2) + printf("TAG_MODULE_TYPE(%S): %d\n", filename, pattrinfo[16].dwattr); // C:\Program Files (x86)\Windows Kits\8.1\Lib\win7\stub512.com + if (pattrinfo[16].dwattr == 2) + { + printf("TAG_MODULE_TYPE(%S): %d, %d\n", filename, pattrinfo[16].dwattr, pattrinfo[0].dwattr); + } + } + + if (pattrinfo[27].flags == ATTRIBUTE_AVAILABLE) + { + if (pattrinfo[27].type != TAG_EXE_WRAPPER) + printf("FAIL TAG_EXE_WRAPPER (%S)\n", filename); + if (pattrinfo[27].dwattr != 0) + printf("TAG_EXE_WRAPPER(%S): %d\n", filename, pattrinfo[27].dwattr); + } + + pSdbFreeFileAttributes(pattrinfo); + } +} + +static void test_crc_imp(size_t len, DWORD expected) +{ + static const WCHAR path[] = {'t','e','s','t','x','x','.','e','x','e',0}; + static char crc_test[] = {4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 2, 2, 2, 2}; + + PATTRINFO pattrinfo = (PATTRINFO)0xdead; + DWORD num = 333; + BOOL ret; + + test_create_file_imp("testxx.exe", crc_test, len); + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + winetest_ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + winetest_ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + winetest_ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword_imp(pattrinfo, 1, TAG_CHECKSUM, expected); + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); +} + +static void test_crc2_imp(size_t len, int fill, DWORD expected) +{ + static const WCHAR path[] = {'t','e','s','t','x','x','.','e','x','e',0}; + + PATTRINFO pattrinfo = (PATTRINFO)0xdead; + DWORD num = 333; + BOOL ret; + size_t n; + char* crc_test = malloc(len); + for (n = 0; n < len; ++n) + crc_test[n] = (char)(fill ? fill : n); + + test_create_file_imp("testxx.exe", crc_test, len); + free(crc_test); + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + winetest_ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + winetest_ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + winetest_ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword_imp(pattrinfo, 0, TAG_SIZE, len); + expect_tag_dword_imp(pattrinfo, 1, TAG_CHECKSUM, expected); + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); +} + + + +static void test_ApplicationAttributes(void) +{ + static const WCHAR path[] = {'t','e','s','t','x','x','.','e','x','e',0}; + static const WCHAR PRODUCT_VERSION[] = {'1','.','0','.','0','.','1',0}; + static const WCHAR FILE_DESCRIPTION[] = {'F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR COMPANY_NAME[] = {'C','o','m','p','a','n','y','N','a','m','e',0}; + static const WCHAR PRODUCT_NAME[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; + static const WCHAR FILE_VERSION[] = {'1','.','0','.','0','.','0',0}; + static const WCHAR ORIGINAL_FILENAME[] = {'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e',0}; + static const WCHAR INTERNAL_NAME[] = {'I','n','t','e','r','n','a','l','N','a','m','e',0}; + static const WCHAR LEGAL_COPYRIGHT[] = {'L','e','g','a','l','C','o','p','y','r','i','g','h','t',0}; + static const WCHAR EXPORT_NAME[] = {'T','e','S','t','2','.','e','x','e',0}; + static const WCHAR OS2_DESCRIPTION[] = {'M','O','D',' ','D','E','S','C','R','I','P','T','I','O','N',' ','H','E','R','E',0}; + static const WCHAR OS2_EXPORT_NAME[] = {'T','E','S','T','M','O','D','.','h','X','x',0}; + static const WCHAR OS2_DESCRIPTION_broken[] = {'Z',0}; + static const WCHAR OS2_EXPORT_NAME_broken[] = {'E',0}; + + PATTRINFO pattrinfo = (PATTRINFO)0xdead; + DWORD num = 333; + BOOL ret; + + /* ensure the file is not there. */ + DeleteFileA("testxx.exe"); + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret == FALSE, "expected SdbGetFileAttributes to fail.\n"); + ok(pattrinfo == (PATTRINFO)0xdead, "expected the pointer not to change.\n"); + ok(num == 333, "expected the number of items not to change.\n"); + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + /* Test a file with as much features as possible */ + test_create_exe("testxx.exe", 0); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x800); + expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0x178bd629); + expect_tag_qword(pattrinfo, 2, TAG_BIN_FILE_VERSION, 0x1000000000000ull); + expect_tag_qword(pattrinfo, 3, TAG_BIN_PRODUCT_VERSION, 0x1000000000001ull); + expect_tag_str(pattrinfo, 4, TAG_PRODUCT_VERSION, PRODUCT_VERSION); + expect_tag_str(pattrinfo, 5, TAG_FILE_DESCRIPTION, FILE_DESCRIPTION); + expect_tag_str(pattrinfo, 6, TAG_COMPANY_NAME, COMPANY_NAME); + expect_tag_str(pattrinfo, 7, TAG_PRODUCT_NAME, PRODUCT_NAME); + expect_tag_str(pattrinfo, 8, TAG_FILE_VERSION, FILE_VERSION); + expect_tag_str(pattrinfo, 9, TAG_ORIGINAL_FILENAME, ORIGINAL_FILENAME); + expect_tag_str(pattrinfo, 10, TAG_INTERNAL_NAME, INTERNAL_NAME); + expect_tag_str(pattrinfo, 11, TAG_LEGAL_COPYRIGHT, LEGAL_COPYRIGHT); + expect_tag_dword(pattrinfo, 12, TAG_VERDATEHI, 0x1d1a019); + expect_tag_dword(pattrinfo, 13, TAG_VERDATELO, 0xac754c50); + expect_tag_dword(pattrinfo, 14, TAG_VERFILEOS, VOS__WINDOWS32); + expect_tag_dword(pattrinfo, 15, TAG_VERFILETYPE, VFT_APP); + expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x3); /* Win32 */ + expect_tag_dword(pattrinfo, 17, TAG_PE_CHECKSUM, 0xBAAD); + expect_tag_dword(pattrinfo, 18, TAG_LINKER_VERSION, 0x40002); + expect_tag_skip(pattrinfo, 19); /* TAG_16BIT_DESCRIPTION */ + expect_tag_skip(pattrinfo, 20); /* TAG_16BIT_MODULE_NAME */ + expect_tag_qword(pattrinfo, 21, TAG_UPTO_BIN_FILE_VERSION, 0x1000000000000ull); + expect_tag_qword(pattrinfo, 22, TAG_UPTO_BIN_PRODUCT_VERSION, 0x1000000000001ull); + expect_tag_dword(pattrinfo, 23, TAG_LINK_DATE, 0x12345); + expect_tag_dword(pattrinfo, 24, TAG_UPTO_LINK_DATE, 0x12345); + expect_tag_str(pattrinfo, 25, TAG_EXPORT_NAME, EXPORT_NAME); + expect_tag_dword(pattrinfo, 26, TAG_VER_LANGUAGE, 0xffff); + expect_tag_dword(pattrinfo, 27, TAG_EXE_WRAPPER, 0x0); + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + + /* Disable resource and exports */ + test_create_exe("testxx.exe", 1); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x800); + expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xea7caffd); + expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x3); /* Win32 */ + expect_tag_dword(pattrinfo, 17, TAG_PE_CHECKSUM, 0xBAAD); + expect_tag_dword(pattrinfo, 18, TAG_LINKER_VERSION, 0x40002); + expect_tag_skip_range(pattrinfo, 19, 23); + expect_tag_dword(pattrinfo, 23, TAG_LINK_DATE, 0x12345); + expect_tag_dword(pattrinfo, 24, TAG_UPTO_LINK_DATE, 0x12345); + expect_tag_skip(pattrinfo, 25); /* TAG_EXPORT_NAME */ + expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ + expect_tag_dword(pattrinfo, 27, TAG_EXE_WRAPPER, 0x0); + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + /* A file with just 'MZ' */ + test_create_file("testxx.exe", "MZ", 2); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0x2); + expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0); + expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x1); + expect_tag_skip_range(pattrinfo, 17, 26); + expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ + expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + /* Empty file */ + test_create_file("testxx.exe", NULL, 0); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0); + expect_tag_skip_range(pattrinfo, 1, 26); + expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ + expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + /* minimal NE executable */ + test_create_ne("testxx.exe", 0); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0xa8); + expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xf2abe4e9); + expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x2); + expect_tag_skip(pattrinfo, 17); /* TAG_PE_CHECKSUM */ + expect_tag_skip(pattrinfo, 18); /* TAG_LINKER_VERSION */ + expect_tag_str(pattrinfo, 19, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION); + expect_tag_str(pattrinfo, 20, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME); + expect_tag_skip_range(pattrinfo, 21, 26); + expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ + expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + /* NE executable with description / module name pointers zero, to show they are always used */ + test_create_ne("testxx.exe", 1); + + ret = pSdbGetFileAttributes(path, &pattrinfo, &num); + ok(ret != FALSE, "expected SdbGetFileAttributes to succeed.\n"); + ok(pattrinfo != (PATTRINFO)0xdead, "expected a valid pointer.\n"); + ok(num == 28, "expected 28 items, got %d.\n", num); + + if (num == 28 && ret) + { + expect_tag_dword(pattrinfo, 0, TAG_SIZE, 0xa8); + expect_tag_dword(pattrinfo, 1, TAG_CHECKSUM, 0xddcbe4c9); + expect_tag_skip_range(pattrinfo, 2, 16); + expect_tag_dword(pattrinfo, 16, TAG_MODULE_TYPE, 0x2); + expect_tag_skip(pattrinfo, 17); /* TAG_PE_CHECKSUM */ + expect_tag_skip(pattrinfo, 18); /* TAG_LINKER_VERSION */ + expect_tag_str(pattrinfo, 19, TAG_16BIT_DESCRIPTION, OS2_DESCRIPTION_broken); /* the 'Z' from 'MZ' */ + expect_tag_str(pattrinfo, 20, TAG_16BIT_MODULE_NAME, OS2_EXPORT_NAME_broken); /* the 'E' from 'NE' */ + expect_tag_skip_range(pattrinfo, 21, 26); + expect_tag_empty(pattrinfo, 26); /* TAG_VER_LANGUAGE */ + expect_tag_skip(pattrinfo, 27); /* TAG_EXE_WRAPPER */ + } + if (ret) + pSdbFreeFileAttributes(pattrinfo); + + test_crc(1, 0); + test_crc(2, 0); + test_crc(3, 0); + test_crc(4, 0x2020202); + test_crc(5, 0x2020202); + test_crc(6, 0x2020202); + test_crc(7, 0x2020202); + test_crc(8, 0x81818181); + test_crc(9, 0x81818181); + test_crc(10, 0x81818181); + test_crc(11, 0x81818181); + test_crc(12, 0xc2c2c2c2); + test_crc(16, 0x62626262); + + /* This seems to be the cutoff point */ + test_crc2(0xffc, 4, 0xfbfbfcfc); + test_crc2(0xffc, 8, 0x7070717); + test_crc2(0xffc, 0xcc, 0xc8eba002); + test_crc2(0xffc, 0, 0x4622028d); + + test_crc2(0x1000, 4, 0x80); + test_crc2(0x1000, 8, 0x8787878f); + test_crc2(0x1000, 0xcc, 0x4adc3667); + test_crc2(0x1000, 0, 0xa3108044); + + /* Here is another cutoff point */ + test_crc2(0x11fc, 4, 0x80); + test_crc2(0x11fc, 8, 0x8787878f); + test_crc2(0x11fc, 0xcc, 0x4adc3667); + test_crc2(0x11fc, 0, 0xf03e0800); + + test_crc2(0x1200, 4, 0x80); + test_crc2(0x1200, 8, 0x8787878f); + test_crc2(0x1200, 0xcc, 0x4adc3667); + test_crc2(0x1200, 0, 0xa3108044); + + /* After that, it stays the same for all sizes */ + test_crc2(0xf000, 4, 0x80); + test_crc2(0xf000, 8, 0x8787878f); + test_crc2(0xf000, 0xcc, 0x4adc3667); + test_crc2(0xf000, 0, 0xa3108044); + + + DeleteFileA("testxx.exe"); } START_TEST(apphelp) @@ -383,6 +820,10 @@ //SetEnvironmentVariable("DEBUGCHANNEL", "+apphelp"); hdll = LoadLibraryA("apphelp.dll"); pSdbTagToString = (void *) GetProcAddress(hdll, "SdbTagToString"); + pSdbGetFileAttributes = (void *) GetProcAddress(hdll, "SdbGetFileAttributes"); + pSdbFreeFileAttributes = (void *) GetProcAddress(hdll, "SdbFreeFileAttributes"); + + test_ApplicationAttributes(); test_SdbTagToString(); #ifdef __REACTOS__ if (g_Version < VERSION_WIN7) Added: trunk/rostests/apitests/apphelp/data.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apphelp/data.c?r… ============================================================================== --- trunk/rostests/apitests/apphelp/data.c (added) +++ trunk/rostests/apitests/apphelp/data.c [iso-8859-1] Sun May 1 19:12:06 2016 @@ -0,0 +1,573 @@ +/* + * Copyright 2015 Mark Jansen + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <exdisp.h> +#include <winbase.h> +#include "wine/test.h" + + +static IMAGE_DOS_HEADER dos_header = +{ + IMAGE_DOS_SIGNATURE, /* e_magic */ + 144, /* e_cblp */ + 3, /* e_cp */ + 0, /* e_crlc */ + 4, /* e_cparhdr */ + 0, /* e_minalloc */ + 65535, /* e_maxalloc */ + 0, /* e_ss */ + 184, /* e_sp */ + 0, /* e_csum */ + 0, /* e_ip */ + 0, /* e_cs */ + 64, /* e_lfarlc */ + 0, /* e_ovno */ + { 0 }, /* e_res[4] */ + 0, /* e_oemid */ + 0, /* e_oeminfo */ + { 0 }, /* e_res2[10] */ + 0x80 /* e_lfanew */ +}; + +static IMAGE_NT_HEADERS32 nt_header = +{ + IMAGE_NT_SIGNATURE, /* Signature */ + { + IMAGE_FILE_MACHINE_I386, /* Machine */ + 2, /* NumberOfSections */ + 0x12345, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + sizeof(IMAGE_OPTIONAL_HEADER), /* SizeOfOptionalHeader */ + IMAGE_FILE_RELOCS_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_32BIT_MACHINE /* Characteristics */ + }, + { + IMAGE_NT_OPTIONAL_HDR_MAGIC, /* Magic */ + 6, /* MajorLinkerVersion */ + 3, /* MinorLinkerVersion */ + 0, /* SizeOfCode */ + 0, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0x1000, /* AddressOfEntryPoint */ + 0x1000, /* BaseOfCode */ +#ifndef _WIN64 + 0, /* BaseOfData */ +#endif + 0x400000, /* ImageBase */ + 0x1000, /* SectionAlignment */ + 0x200, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 1, /* MinorOperatingSystemVersion */ + 4, /* MajorImageVersion */ + 2, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 3, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x3000, /* SizeOfImage */ + 0x200, /* SizeOfHeaders */ + 0xBAAD, /* CheckSum: This checksum is not the correct checksum, intentionally! */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + 0, /* DllCharacteristics */ + 0x100000, /* SizeOfStackReserve */ + 0x1000, /* SizeOfStackCommit */ + 0x100000, /* SizeOfHeapReserve */ + 0x1000, /* SizeOfHeapCommit */ + 0, /* LoaderFlags */ + 0x10, /* NumberOfRvaAndSizes */ + { + /* IMAGE_DIRECTORY_ENTRY_EXPORT */ + { + 0x2370, /* VirtualAddress */ + 76, /* Size */ + }, + { 0 }, + /* IMAGE_DIRECTORY_ENTRY_RESOURCE */ + { + 0x2000, /* VirtualAddress */ + 868, /* Size */ + }, + } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ + } +}; + +static IMAGE_SECTION_HEADER section_headers[] = +{ + { + { '.','t','e','x','t',0 }, /* Name */ + { 24 }, /* VirtualSize */ + 0x1000, /* VirtualAddress */ + 0x200, /* SizeOfRawData */ + 0x200, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_MEM_READ /* Characteristics */ + }, + { + { '.','r','s','r','c',0 }, /* Name */ + { 880 }, /* VirtualSize */ + 0x2000, /* VirtualAddress */ + 0x400, /* SizeOfRawData */ + 0x400, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ /* Characteristics */ + } +}; + +static const unsigned char text_section[] = +{ + 0x33, 0xc0, /* xor eax, eax */ + 0xc3 /* ret */ +}; + + +/* taken from fusionpriv.h */ +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[17]; + VS_FIXEDFILEINFO Value; +} VS_VERSIONINFO; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[15]; +} STRINGFILEINFO; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[9]; +} STRINGTABLE; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; +} STRINGHDR; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[13]; +} VARFILEINFO; + +typedef struct +{ + WORD wLength; + WORD wValueLength; + WORD wType; + WCHAR szKey[13]; + DWORD Value; +} VAR; + +typedef struct rsrc_section_t +{ + IMAGE_RESOURCE_DIRECTORY header; + IMAGE_RESOURCE_DIRECTORY_ENTRY file_info_id; + IMAGE_RESOURCE_DIRECTORY file_info_header; + IMAGE_RESOURCE_DIRECTORY_ENTRY version_info_id; + IMAGE_RESOURCE_DIRECTORY version_info_header; + IMAGE_RESOURCE_DIRECTORY_ENTRY version_lang_id; + IMAGE_RESOURCE_DATA_ENTRY version_data_entry; + + VS_VERSIONINFO version_info; + STRINGFILEINFO string_file_info; + STRINGTABLE string_table; + + STRINGHDR FileVersion_hdr; + WCHAR FileVersion_key[13]; + WCHAR FileVersion_val[8]; + + STRINGHDR ProductVersion_hdr; + WCHAR ProductVersion_key[15]; + WCHAR ProductVersion_val[8]; + + STRINGHDR CompanyName_hdr; + WCHAR CompanyName_key[13]; + WCHAR CompanyName_val[12]; + + STRINGHDR FileDescription_hdr; + WCHAR FileDescription_key[17]; + WCHAR FileDescription_val[16]; + + STRINGHDR InternalName_hdr; + WCHAR InternalName_key[13]; + WCHAR InternalName_val[14]; + + STRINGHDR LegalCopyright_hdr; + WCHAR LegalCopyright_key[15]; + WCHAR LegalCopyright_val[16]; + + STRINGHDR LegalTrademarks_hdr; + WCHAR LegalTrademarks_key[17]; + WCHAR LegalTrademarks_val[16]; + + STRINGHDR OriginalFilename_hdr; + WCHAR OriginalFilename_key[17]; + WCHAR OriginalFilename_val[18]; + + STRINGHDR Productname_hdr; + WCHAR Productname_key[13]; + WCHAR Productname_val[12]; + + VARFILEINFO file_info; + VAR translation; +} rsrc_section_t; + +static const rsrc_section_t rsrc_section = +{ + /* header */ + { + 0, /* Characteristics */ + 0x55FE8E21, /* TimeDateStamp, 20/09/2015 10:44:49 */ + 0, /* MajorVersion */ + 0, /* MinorVersion */ + 0, /* NumberOfNamedEntries */ + 1, /* NumberOfIdEntries */ + }, + /* file_info_id */ + { + {{ + (DWORD)VS_FILE_INFO, /* NameOffset:31 */ + 0 /* NameIsString:1 */ + }}, + { + 0x80000018 /* OffsetToData */ + } + }, + /* file_info_header */ + { + 0, /* Characteristics */ + 0x55FE8E21, /* TimeDateStamp, 20/09/2015 10:44:49 */ + 0, /* MajorVersion */ + 0, /* MinorVersion */ + 0, /* NumberOfNamedEntries */ + 1, /* NumberOfIdEntries */ + }, + /* version_info_id */ + { + {{ + VS_VERSION_INFO, /* NameOffset:31 */ + 0 /* NameIsString:1 */ + }}, + { + 0x80000030 /* OffsetToData */ + }, + }, + /* version_info_header */ + { + 0, /* Characteristics */ + 0x55FE8E21, /* TimeDateStamp, 20/09/2015 10:44:49 */ + 0, /* MajorVersion */ + 0, /* MinorVersion */ + 0, /* NumberOfNamedEntries */ + 1, /* NumberOfIdEntries */ + }, + /* version_lang_id */ + { + {{ + 1033, /* NameOffset:31 */ + 0 /* NameIsString:1 */ + }}, + { + 0x48 /* OffsetToDirectory */ + } + }, + /* version_data_entry */ + { + 0x2058, /* OffsetToData */ + 0x30C, /* Size */ + 0, /* CodePage */ + 0, /* Reserved */ + }, + + /* version_info */ + { + 0x30C, /* wLength */ + 0x34, /* wValueLength */ + 0, /* wType: Binary */ + { 'V','S','_','V','E','R','S','I','O','N','_','I','N','F','O','\0','\0' }, /* szKey[17] */ + /* Value */ + { + 0xFEEF04BD, /* dwSignature */ + 0x10000, /* dwStrucVersion */ + 0x10000, /* dwFileVersionMS */ + 0, /* dwFileVersionLS */ + 0x10000, /* dwProductVersionMS */ + 1, /* dwProductVersionLS */ + 0, /* dwFileFlagsMask */ + 0, /* dwFileFlags */ + VOS__WINDOWS32, /* dwFileOS */ + VFT_APP, /* dwFileType */ + 0, /* dwFileSubtype */ + 0x01d1a019, /* dwFileDateMS */ + 0xac754c50 /* dwFileDateLS */ + }, + }, + + /* string_file_info */ + { + 0x26C, /* wLength */ + 0, /* wValueLength */ + 1, /* wType: Text */ + { 'S','t','r','i','n','g','F','i','l','e','I','n','f','o','\0' } /* szKey[15] */ + }, + /* string_table */ + { + 0x248, /* wLength */ + 0, /* wValueLength */ + 1, /* wType: Text */ + { 'F','F','F','F','0','0','0','0','\0' } /* szKey[9] */ + }, + + /* FileVersion */ + { + 48, /* wLength */ + 8, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'F','i','l','e','V','e','r','s','i','o','n','\0' }, + { '1','.','0','.','0','.','0','\0' }, + + /* ProductVersion */ + { + 52, /* wLength */ + 8, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'P','r','o','d','u','c','t','V','e','r','s','i','o','n','\0' }, + { '1','.','0','.','0','.','1','\0' }, + + /* CompanyName */ + { + 56, /* wLength */ + 12, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'C','o','m','p','a','n','y','N','a','m','e','\0' }, + { 'C','o','m','p','a','n','y','N','a','m','e','\0' }, + + /* FileDescription */ + { + 72, /* wLength */ + 16, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'F','i','l','e','D','e','s','c','r','i','p','t','i','o','n','\0' }, + { 'F','i','l','e','D','e','s','c','r','i','p','t','i','o','n','\0' }, + + /* InternalName */ + { + 58, /* wLength */ + 13, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'I','n','t','e','r','n','a','l','N','a','m','e','\0' }, + { 'I','n','t','e','r','n','a','l','N','a','m','e','\0' }, + + /* LegalCopyright */ + { + 66, /* wLength */ + 15, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'L','e','g','a','l','C','o','p','y','r','i','g','h','t','\0' }, + { 'L','e','g','a','l','C','o','p','y','r','i','g','h','t','\0' }, + + /* LegalTrademarks */ + { + 72, /* wLength */ + 16, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'L','e','g','a','l','T','r','a','d','e','m','a','r','k','s','\0' }, + { 'L','e','g','a','l','T','r','a','d','e','m','a','r','k','s','\0' }, + + /* OriginalFilename */ + { + 74, /* wLength */ + 17, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e','\0' }, + { 'O','r','i','g','i','n','a','l','F','i','l','e','n','a','m','e','\0' }, + + /* ProductName */ + { + 56, /* wLength */ + 12, /* wValueLength */ + 1, /* wType: Text */ + }, + { 'P','r','o','d','u','c','t','N','a','m','e','\0' }, + { 'P','r','o','d','u','c','t','N','a','m','e','\0' }, + + + /* file_info */ + { + 0x44, /* wLength */ + 0, /* wValueLength */ + 1, /* wType: Text */ + { 'V','a','r','F','i','l','e','I','n','f','o','\0' } /* szKey[13] */ + }, + + /* translation */ + { + 0x24, /* wLength */ + 4, /* wValueLength */ + 0, /* wType: Binary */ + { 'T','r','a','n','s','l','a','t','i','o','n','\0' }, /* szKey[13] */ + 0xffff /* Value */ + } +}; + +typedef struct export_section_t +{ + IMAGE_EXPORT_DIRECTORY desc; + char binary_name[10]; +} export_section_t; + +/* This export section is not complete, but the Name RVA is only taken into account */ +static export_section_t export_dir = +{ + { + 0, /* Characteristics */ + 0, /* TimeDateStamp */ + 0, /* MajorVersion */ + 0, /* MinorVersion */ + 0x2398, /* Name (RVA) */ + 1, /* Base */ + 0, /* NumberOfFunctions */ + 0, /* NumberOfNames */ + 0, /* AddressOfFunctions (RVA) */ + 0, /* AddressOfNames (RVA) */ + 0, /* AddressOfNameOrdinals (RVA) */ + }, + { 'T','e','S','t','2','.','e','x','e',0 }, /* binary_name */ +}; + + +void test_create_exe_imp(const char* name, int skip_rsrc_exports) +{ + HANDLE file; + char *buf, *cur; + DWORD size = 0x800; + buf = malloc(size); + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + winetest_ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + memset(buf, 0, size); + cur = buf; + cur = memcpy(buf, &dos_header, sizeof(dos_header)); + cur += dos_header.e_lfanew; + + memcpy(cur, &nt_header, sizeof(nt_header)); + if (skip_rsrc_exports) + { + ((IMAGE_NT_HEADERS32*)cur)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress = 0; + ((IMAGE_NT_HEADERS32*)cur)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = 0; + } + cur += sizeof(nt_header); + memcpy(cur, section_headers, sizeof(section_headers)); + + /* write code section: */ + cur = buf + section_headers[0].PointerToRawData; + memcpy(cur, text_section, sizeof(text_section)); + + if (!skip_rsrc_exports) + { + /* write resource section: */ + cur = buf + section_headers[1].PointerToRawData; + memcpy(cur, &rsrc_section, sizeof(rsrc_section)); + + /* write minimal export directory: */ + cur += 0x370; + memcpy(cur, &export_dir, sizeof(export_dir)); + } + + WriteFile(file, buf, size, &size, NULL); + free(buf); + CloseHandle(file); +} + + +/* Almost everything in this filetype is ignored, only e_lfanew, ne_restab and ne_nrestab are relevant */ +void test_create_ne_imp(const char* name, int skip_names) +{ + HANDLE file; + DWORD size; + IMAGE_DOS_HEADER MZ_hdr = { IMAGE_DOS_SIGNATURE, 0 }; + IMAGE_OS2_HEADER NE_hdr = { IMAGE_OS2_SIGNATURE, 0 }; + static const BYTE NE_names[] = + { + /* Show that the length is used, not the nullterm*/ + 11,'T','E','S','T','M','O','D','.','h','X','x','x',0,0,0, + 20,'M','O','D',' ','D','E','S','C','R','I','P','T','I','O','N',' ','H','E','R','E',0,0,0 + }; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + winetest_ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + MZ_hdr.e_lfanew = sizeof(MZ_hdr); + if (!skip_names) + { + NE_hdr.ne_restab = sizeof(NE_hdr); /* First entry (pascal string + ordinal) = module name */ + NE_hdr.ne_nrestab = sizeof(MZ_hdr) + sizeof(NE_hdr) + 16; /* First entry (pascal string + ordinal) = module description */ + } + + WriteFile(file, &MZ_hdr, sizeof(MZ_hdr), &size, NULL); + WriteFile(file, &NE_hdr, sizeof(NE_hdr), &size, NULL); + WriteFile(file, NE_names, sizeof(NE_names), &size, NULL); + + CloseHandle(file); +} + +void test_create_file_imp(const char* name, const char* contents, size_t len) +{ + HANDLE file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + winetest_ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); + if (file != INVALID_HANDLE_VALUE) + { + if (contents && len) + { + DWORD size; + WriteFile(file, contents, len, &size, NULL); + } + CloseHandle(file); + } +} + Propchange: trunk/rostests/apitests/apphelp/data.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 71225: [SHELL32] - Disentangle icon extraction for control panel. Add CCPLExtractIcon_CreateInstance and isolate control panel handling in CControlPanelFolder.cpp.
by gadamopoulos＠svn.reactos.org 01 May '16

01 May '16

Author: gadamopoulos Date: Sun May 1 19:05:32 2016 New Revision: 71225 URL: http://svn.reactos.org/svn/reactos?rev=71225&view=rev Log: [SHELL32] - Disentangle icon extraction for control panel. Add CCPLExtractIcon_CreateInstance and isolate control panel handling in CControlPanelFolder.cpp. Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sun May 1 19:05:32 2016 @@ -358,12 +358,7 @@ { BOOL found = FALSE; - if (_ILIsCPanelStruct(pSimplePidl)) - { - if (SUCCEEDED(CPanel_GetIconLocationW(pSimplePidl, wTemp, MAX_PATH, &icon_idx))) - found = TRUE; - } - else if (_ILGetExtension(pSimplePidl, sTemp, MAX_PATH)) + if (_ILGetExtension(pSimplePidl, sTemp, MAX_PATH)) { if (HCR_MapTypeToValueA(sTemp, sTemp, MAX_PATH, TRUE) && HCR_GetIconA(sTemp, sTemp, NULL, MAX_PATH, &icon_idx)) 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] Sun May 1 19:05:32 2016 @@ -125,6 +125,31 @@ return NULL; } +HRESULT CCPLExtractIcon_CreateInstance(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) +{ + PIDLCPanelStruct *pData = _ILGetCPanelPointer(pidl); + if (!pData) + { + LPITEMIDLIST pidlComplete = ILCombine(pidlRoot, pidl); + if (!pidlComplete) + return E_OUTOFMEMORY; + + *ppvOut = IExtractIconW_Constructor(pidlComplete); + + SHFree(pidlComplete); + return *ppvOut ? S_OK : E_FAIL; + } + + CComPtr<IDefaultExtractIconInit> initIcon; + HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); + if (FAILED(hr)) + return NULL; + + initIcon->SetNormalIcon(pData->szName, (int)pData->iconIdx != -1 ? pData->iconIdx : 0); + + return initIcon->QueryInterface(riid, ppvOut); +} + BOOL CControlPanelEnum::RegisterCPanelApp(LPCWSTR wpath) { CPlApplet* applet = Control_LoadApplet(0, wpath, NULL); @@ -455,7 +480,7 @@ UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) { LPITEMIDLIST pidl; - IUnknown *pObj = NULL; + LPVOID pObj = NULL; HRESULT hr = E_INVALIDARG; TRACE("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", @@ -482,16 +507,9 @@ hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); - } else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { - pidl = ILCombine(pidlRoot, apidl[0]); - pObj = IExtractIconA_Constructor(pidl); - SHFree(pidl); - hr = S_OK; - } else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) { - pidl = ILCombine(pidlRoot, apidl[0]); - pObj = IExtractIconW_Constructor(pidl); - SHFree(pidl); - hr = S_OK; + } else if ((IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) && (cidl == 1)) { + hr = CCPLExtractIcon_CreateInstance(pidlRoot, apidl[0], riid, &pObj); + } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine(pidlRoot, apidl[0]); @@ -669,20 +687,6 @@ return S_OK; } -HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST pidl, LPWSTR szIconFile, UINT cchMax, int* piIndex) -{ - PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl); - - if (!pcpanel) - return E_INVALIDARG; - - wcsncpy(szIconFile, pcpanel->szName, cchMax); - *piIndex = (int)pcpanel->iconIdx != -1 ? pcpanel->iconIdx : 0; - - return S_OK; -} - - CCPLItemMenu::CCPLItemMenu() { m_apidl = NULL; Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Sun May 1 19:05:32 2016 @@ -76,7 +76,6 @@ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); -extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN;

1 0

[tthompson] 71224: [NTFS] Added minimal write support from CORE-10998 along with updates as suggested by CR-90.
by tthompson＠svn.reactos.org 01 May '16

01 May '16

Author: tthompson Date: Sun May 1 16:21:53 2016 New Revision: 71224 URL: http://svn.reactos.org/svn/reactos?rev=71224&view=rev Log: [NTFS] Added minimal write support from CORE-10998 along with updates as suggested by CR-90. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/blockdev.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/misc.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] Sun May 1 16:21:53 2016 @@ -20,7 +20,8 @@ * PROJECT: ReactOS kernel * FILE: drivers/filesystem/ntfs/blockdev.c * PURPOSE: NTFS filesystem driver - * PROGRAMMER: Eric Kohl + * PROGRAMMERS: Eric Kohl + * Trevor Thompson */ /* INCLUDES *****************************************************************/ @@ -129,6 +130,180 @@ return Status; } +/** +* @name NtfsWriteDisk +* @implemented +* +* Writes data from the given buffer to the given DeviceObject. +* +* @param DeviceObject +* Device to write to +* +* @param StartingOffset +* Offset, in bytes, from the start of the device object where the data will be written +* +* @param Length +* How much data will be written, in bytes +* +* @param SectorSize +* Size of the sector on the disk that the write must be aligned to +* +* @param Buffer +* The data that's being written to the device +* +* @return +* STATUS_SUCCESS in case of success, STATUS_INSUFFICIENT_RESOURCES if a memory allocation failed, +* or whatever status IoCallDriver() sets. +* +* @remarks Called by NtfsWriteFile(). May perform a read-modify-write operation if the +* requested write is not sector-aligned. +* +*/ +NTSTATUS +NtfsWriteDisk(IN PDEVICE_OBJECT DeviceObject, + IN LONGLONG StartingOffset, + IN ULONG Length, + IN ULONG SectorSize, + IN const PUCHAR Buffer) +{ + IO_STATUS_BLOCK IoStatus; + LARGE_INTEGER Offset; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + ULONGLONG RealWriteOffset; + ULONG RealLength; + BOOLEAN AllocatedBuffer = FALSE; + PUCHAR TempBuffer = NULL; + + DPRINT("NtfsWriteDisk(%p, %I64x, %u, %u, %p)\n", DeviceObject, StartingOffset, Length, SectorSize, Buffer); + + if (Length == 0) + return STATUS_SUCCESS; + + RealWriteOffset = (ULONGLONG)StartingOffset; + RealLength = Length; + + // Does the write need to be adjusted to be sector-aligned? + if ((RealWriteOffset % SectorSize) != 0 || (RealLength % SectorSize) != 0) + { + ULONGLONG relativeOffset; + + // We need to do a read-modify-write. We'll start be copying the entire + // contents of every sector that will be overwritten. + // TODO: Optimize (read no more than necessary) + + RealWriteOffset = ROUND_DOWN(StartingOffset, SectorSize); + RealLength = ROUND_UP(Length, SectorSize); + + // Would the end of our sector-aligned write fall short of the requested write? + if (RealWriteOffset + RealLength < StartingOffset + Length) + { + RealLength += SectorSize; + } + + // Did we underestimate the memory required somehow? + if (RealLength + RealWriteOffset < StartingOffset + Length) + { + DPRINT1("\a\t\t\t\t\tFIXME: calculated less memory than needed!\n"); + DPRINT1("StartingOffset: %lu\tLength: %lu\tRealWriteOffset: %lu\tRealLength: %lu\n", + StartingOffset, Length, RealWriteOffset, RealLength); + + RealLength += SectorSize; + } + + // Allocate a buffer to copy the existing data to + TempBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength, TAG_NTFS); + + // Did we fail to allocate it? + if (TempBuffer == NULL) + { + DPRINT1("Not enough memory!\n"); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Read the sectors we'll be overwriting into TempBuffer + Status = NtfsReadDisk(DeviceObject, RealWriteOffset, RealLength, SectorSize, TempBuffer, FALSE); + + // Did we fail the read? + if (!NT_SUCCESS(Status)) + { + RtlSecureZeroMemory(TempBuffer, RealLength); + ExFreePoolWithTag(TempBuffer, TAG_NTFS); + return Status; + } + + // Calculate where the new data should be written to, relative to the start of TempBuffer + relativeOffset = StartingOffset - RealWriteOffset; + + // Modify the tempbuffer with the data being read + RtlCopyMemory(TempBuffer + relativeOffset, Buffer, Length); + + AllocatedBuffer = TRUE; + } + + // set the destination offset + Offset.QuadPart = RealWriteOffset; + + // setup the notification event for the write + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + DPRINT("Building synchronous FSD Request...\n"); + + // Build an IRP requesting the lower-level [disk] driver to perform the write + // TODO: Forward the existing IRP instead + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, + DeviceObject, + // if we allocated a temp buffer, use that instead of the Buffer parameter + ((AllocatedBuffer) ? TempBuffer : Buffer), + RealLength, + &Offset, + &Event, + &IoStatus); + // Did we fail to build the IRP? + if (Irp == NULL) + { + DPRINT1("IoBuildSynchronousFsdRequest failed\n"); + + if (AllocatedBuffer) + { + RtlSecureZeroMemory(TempBuffer, RealLength); + ExFreePoolWithTag(TempBuffer, TAG_NTFS); + } + + return STATUS_INSUFFICIENT_RESOURCES; + } + + // Call the next-lower driver to perform the write + DPRINT("Calling IO Driver with irp %p\n", Irp); + Status = IoCallDriver(DeviceObject, Irp); + + // Wait until the next-lower driver has completed the IRP + DPRINT("Waiting for IO Operation for %p\n", Irp); + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + DPRINT("Getting IO Status... for %p\n", Irp); + Status = IoStatus.Status; + } + + if (AllocatedBuffer) + { + // zero the buffer before freeing it, so private user data can't be snooped + RtlSecureZeroMemory(TempBuffer, RealLength); + + ExFreePoolWithTag(TempBuffer, TAG_NTFS); + } + + DPRINT("NtfsWriteDisk() done (Status %x)\n", Status); + + return Status; +} + NTSTATUS NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, IN ULONG DiskSector, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun May 1 16:21:53 2016 @@ -359,13 +359,6 @@ FileObject = Stack->FileObject; - if (RequestedDisposition == FILE_CREATE || - RequestedDisposition == FILE_OVERWRITE_IF || - RequestedDisposition == FILE_SUPERSEDE) - { - return STATUS_ACCESS_DENIED; - } - if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID) { ULONGLONG MFTId; @@ -483,26 +476,26 @@ return Status; } - /* HUGLY HACK: remain RO so far... */ + /* HUGLY HACK: Can't overwrite or supersede a file yet... */ if (RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) { - DPRINT1("Denying write request on NTFS volume\n"); + DPRINT1("Cannot yet perform an overwrite or supersede request on NTFS volume\n"); NtfsCloseFile(DeviceExt, FileObject); return STATUS_ACCESS_DENIED; } } else { - /* HUGLY HACK: remain RO so far... */ + /* HUGLY HACK: Can't create new files yet... */ if (RequestedDisposition == FILE_CREATE || RequestedDisposition == FILE_OPEN_IF || RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) { - DPRINT1("Denying write request on NTFS volume\n"); - return STATUS_ACCESS_DENIED; + DPRINT1("Denying file creation request on NTFS volume\n"); + return STATUS_CANNOT_MAKE; } } Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun May 1 16:21:53 2016 @@ -24,6 +24,7 @@ * Valentin Verkhovsky * Pierre Schweitzer (pierre(a)reactos.org) * HervÃ© Poussineau (hpoussin(a)reactos.org) + * Trevor Thompson */ /* INCLUDES *****************************************************************/ @@ -31,6 +32,7 @@ #include "ntfs.h" #define NDEBUG +#undef NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -336,6 +338,273 @@ return AlreadyRead; } + +/** +* @name WriteAttribute +* @implemented +* +* Writes an NTFS attribute to the disk. It presently borrows a lot of code from ReadAttribute(), +* and it still needs more documentation / cleaning up. +* +* @param Vcb +* Volume Control Block indicating which volume to write the attribute to +* +* @param Context +* Pointer to an NTFS_ATTR_CONTEXT that has information about the attribute +* +* @param Offset +* Offset, in bytes, from the beginning of the attribute indicating where to start +* writing data +* +* @param Buffer +* The data that's being written to the device +* +* @param Length +* How much data will be written, in bytes +* +* @param RealLengthWritten +* Pointer to a ULONG which will receive how much data was written, in bytes +* +* @return +* STATUS_SUCCESS if successful, an error code otherwise. STATUS_NOT_IMPLEMENTED if +* writing to a sparse file. +* +* @remarks Note that in this context the word "attribute" isn't referring read-only, hidden, +* etc. - the file's data is actually stored in an attribute in NTFS parlance. +* +*/ + +NTSTATUS +WriteAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT Context, + ULONGLONG Offset, + const PUCHAR Buffer, + ULONG Length, + PULONG RealLengthWritten) +{ + ULONGLONG LastLCN; + PUCHAR DataRun; + LONGLONG DataRunOffset; + ULONGLONG DataRunLength; + LONGLONG DataRunStartLCN; + ULONGLONG CurrentOffset; + ULONG WriteLength; + NTSTATUS Status; + PUCHAR SourceBuffer = Buffer; + LONGLONG StartingOffset; + + DPRINT("WriteAttribute(%p, %p, %I64U, %p, %lu)\n", Vcb, Context, Offset, Buffer, Length); + + // is this a resident attribute? + if (!Context->Record.IsNonResident) + { + DPRINT1("FIXME: Writing to resident NTFS records (small files) is not supported at this time.\n"); + // (TODO: This should be really easy to implement) + + /* LeftOver code from ReadAttribute(), may be helpful: + if (Offset > Context->Record.Resident.ValueLength) + return 0; + if (Offset + Length > Context->Record.Resident.ValueLength) + Length = (ULONG)(Context->Record.Resident.ValueLength - Offset); + RtlCopyMemory(Buffer, (PCHAR)&Context->Record + Context->Record.Resident.ValueOffset + Offset, Length); + return Length;*/ + + return STATUS_NOT_IMPLEMENTED; // until we implement it + } + + // This is a non-resident attribute. + + // I. Find the corresponding start data run. + + *RealLengthWritten = 0; + + // FIXME: Cache seems to be non-working. Disable it for now + //if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) + /*if (0) + { + DataRun = Context->CacheRun; + LastLCN = Context->CacheRunLastLCN; + DataRunStartLCN = Context->CacheRunStartLCN; + DataRunLength = Context->CacheRunLength; + CurrentOffset = Context->CacheRunCurrentOffset; + } + else*/ + { + LastLCN = 0; + DataRun = (PUCHAR)&Context->Record + Context->Record.NonResident.MappingPairsOffset; + CurrentOffset = 0; + + while (1) + { + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + // Normal data run. + // DPRINT1("Writing to normal data run, LastLCN %I64u DataRunOffset %I64d\n", LastLCN, DataRunOffset); + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + // Sparse data run. We can't support writing to sparse files yet + // (it may require increasing the allocation size). + DataRunStartLCN = -1; + DPRINT1("FIXME: Writing to sparse files is not supported yet!\n"); + return STATUS_NOT_IMPLEMENTED; + } + + // Have we reached the data run we're trying to write to? + if (Offset >= CurrentOffset && + Offset < CurrentOffset + (DataRunLength * Vcb->NtfsInfo.BytesPerCluster)) + { + break; + } + + if (*DataRun == 0) + { + // We reached the last assigned cluster + // TODO: assign new clusters to the end of the file. + // (Presently, this code will never be reached, the write should have already failed by now) + return STATUS_END_OF_FILE; + } + + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + } + } + + // II. Go through the run list and write the data + + /* REVIEWME -- As adapted from NtfsReadAttribute(): + We seem to be making a special case for the first applicable data run, but I'm not sure why. + Does it have something to do with (not) caching? Is this strategy equally applicable to writing? */ + + WriteLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster - (Offset - CurrentOffset), Length); + + StartingOffset = DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster + Offset - CurrentOffset; + + // Write the data to the disk + Status = NtfsWriteDisk(Vcb->StorageDevice, + StartingOffset, + WriteLength, + Vcb->NtfsInfo.BytesPerSector, + (PVOID)SourceBuffer); + + // Did the write fail? + if (!NT_SUCCESS(Status)) + { + Context->CacheRun = DataRun; + Context->CacheRunOffset = Offset; + Context->CacheRunStartLCN = DataRunStartLCN; + Context->CacheRunLength = DataRunLength; + Context->CacheRunLastLCN = LastLCN; + Context->CacheRunCurrentOffset = CurrentOffset; + + return Status; + } + + Length -= WriteLength; + SourceBuffer += WriteLength; + *RealLengthWritten += WriteLength; + + // Did we write to the end of the data run? + if (WriteLength == DataRunLength * Vcb->NtfsInfo.BytesPerCluster - (Offset - CurrentOffset)) + { + // Advance to the next data run + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + + if (DataRunOffset != (ULONGLONG)-1) + { + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + DataRunStartLCN = -1; + + if (*DataRun == 0) + { + if (Length == 0) + return STATUS_SUCCESS; + + // This code shouldn't execute, because we should have extended the allocation size + // or failed the request by now. It's just a sanity check. + DPRINT1("Encountered EOF before expected!\n"); + return STATUS_END_OF_FILE; + } + } + + // Do we have more data to write? + while (Length > 0) + { + // Make sure we don't write past the end of the current data run + WriteLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster, Length); + + // Are we dealing with a sparse data run? + if (DataRunStartLCN == -1) + { + DPRINT1("FIXME: Don't know how to write to sparse files yet! (DataRunStartLCN == -1)\n"); + return STATUS_NOT_IMPLEMENTED; + } + else + { + // write the data to the disk + Status = NtfsWriteDisk(Vcb->StorageDevice, + DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster, + WriteLength, + Vcb->NtfsInfo.BytesPerSector, + (PVOID)SourceBuffer); + if (!NT_SUCCESS(Status)) + break; + } + + Length -= WriteLength; + SourceBuffer += WriteLength; + RealLengthWritten += WriteLength; + + // We finished this request, but there's still data in this data run. + if (Length == 0 && WriteLength != DataRunLength * Vcb->NtfsInfo.BytesPerCluster) + break; + + // Go to next run in the list. + + if (*DataRun == 0) + { + // that was the last run + if (Length > 0) + { + // Failed sanity check. + DPRINT1("Encountered EOF before expected!\n"); + return STATUS_END_OF_FILE; + } + + break; + } + + // Advance to the next data run + CurrentOffset += DataRunLength * Vcb->NtfsInfo.BytesPerCluster; + DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); + if (DataRunOffset != -1) + { + // Normal data run. + DataRunStartLCN = LastLCN + DataRunOffset; + LastLCN = DataRunStartLCN; + } + else + { + // Sparse data run. + DataRunStartLCN = -1; + } + } // end while (Length > 0) [more data to write] + + Context->CacheRun = DataRun; + Context->CacheRunOffset = Offset + *RealLengthWritten; + Context->CacheRunStartLCN = DataRunStartLCN; + Context->CacheRunLength = DataRunLength; + Context->CacheRunLastLCN = LastLCN; + Context->CacheRunCurrentOffset = CurrentOffset; + + return Status; +} NTSTATUS ReadFileRecord(PDEVICE_EXTENSION Vcb, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun May 1 16:21:53 2016 @@ -130,4 +130,62 @@ } } +/** +* @name NtfsLockUserBuffer +* @implemented +* +* Ensures the IRP has an MDL Address. +* +* @param Irp +* Irp with the UserBuffer that needs locking +* +* @param Length +* Size of the Irp->UserBuffer, in bytes +* +* @param Operation +* What kind of access does the driver need to the buffer. Set to +* IoReadAccess, IoWriteAccess, or IoModifyAccess. +* +* @return +* STATUS_SUCCESS in case of success, STATUS_INSUFFICIENT_RESOURCES +* or an exception code otherwise. +* +* @remarks Trevor Thompson shamelessly ripped this from +* VfatLockUserBuffer(). Only the name was changed. +* +*/ +NTSTATUS +NtfsLockUserBuffer(IN PIRP Irp, + IN ULONG Length, + IN LOCK_OPERATION Operation) +{ + ASSERT(Irp); + + if (Irp->MdlAddress) + { + return STATUS_SUCCESS; + } + + IoAllocateMdl(Irp->UserBuffer, Length, FALSE, FALSE, Irp); + + if (!Irp->MdlAddress) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Irp->MdlAddress, Irp->RequestorMode, Operation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoFreeMdl(Irp->MdlAddress); + Irp->MdlAddress = NULL; + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + /* EOF */ Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 1 16:21:53 2016 @@ -551,6 +551,13 @@ IN BOOLEAN Override); NTSTATUS +NtfsWriteDisk(IN PDEVICE_OBJECT DeviceObject, + IN LONGLONG StartingOffset, + IN ULONG Length, + IN ULONG SectorSize, + IN PUCHAR Buffer); + +NTSTATUS NtfsReadSectors(IN PDEVICE_OBJECT DeviceObject, IN ULONG DiskSector, IN ULONG SectorCount, @@ -741,6 +748,14 @@ PCHAR Buffer, ULONG Length); +NTSTATUS +WriteAttribute(PDEVICE_EXTENSION Vcb, + PNTFS_ATTR_CONTEXT Context, + ULONGLONG Offset, + const PUCHAR Buffer, + ULONG Length, + PULONG LengthWritten); + ULONGLONG AttributeDataLength(PNTFS_ATTR_RECORD AttrRecord); @@ -817,6 +832,11 @@ NtfsGetUserBuffer(PIRP Irp, BOOLEAN Paging); +NTSTATUS +NtfsLockUserBuffer(IN PIRP Irp, + IN ULONG Length, + IN LOCK_OPERATION Operation); + #if 0 BOOLEAN wstrcmpjoki(PWSTR s1, PWSTR s2); Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun May 1 16:21:53 2016 @@ -22,6 +22,7 @@ * PURPOSE: NTFS filesystem driver * PROGRAMMERS: Art Yerkes * Pierre Schweitzer (pierre(a)reactos.org) + * Trevor Thompson */ /* INCLUDES *****************************************************************/ @@ -252,14 +253,403 @@ return Status; } - +/** +* @name NtfsWriteFile +* @implemented +* +* Writes a file to the disk. It presently borrows a lot of code from NtfsReadFile() and +* VFatWriteFileData(). It needs some more work before it will be complete; it won't handle +* page files, asnyc io, cached writes, etc. +* +* @param DeviceExt +* Points to the target disk's DEVICE_EXTENSION +* +* @param FileObject +* Pointer to a FILE_OBJECT describing the target file +* +* @param Buffer +* The data that's being written to the file +* +* @Param Length +* The size of the data buffer being written, in bytes +* +* @param WriteOffset +* Offset, in bytes, from the beginning of the file. Indicates where to start +* writing data. +* +* @param IrpFlags +* TODO: flags are presently ignored in code. +* +* @param LengthWritten +* Pointer to a ULONG. This ULONG will be set to the number of bytes successfully written. +* +* @return +* STATUS_SUCCESS if successful, STATUS_NOT_IMPLEMENTED if a required feature isn't implemented, +* STATUS_INSUFFICIENT_RESOURCES if an allocation failed, STATUS_ACCESS_DENIED if the write itself fails, +* STATUS_PARTIAL_COPY or STATUS_UNSUCCESSFUL if ReadFileRecord() fails, or +* STATUS_OBJECT_NAME_NOT_FOUND if the file's data stream could not be found. +* +* @remarks Called by NtfsWrite(). It may perform a read-modify-write operation if the requested write is +* not sector-aligned. LengthWritten only refers to how much of the requested data has been written; +* extra data that needs to be written to make the write sector-aligned will not affect it. +* +*/ +NTSTATUS NtfsWriteFile(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject, + const PUCHAR Buffer, + ULONG Length, + ULONG WriteOffset, + ULONG IrpFlags, + PULONG LengthWritten) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PNTFS_FCB Fcb; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG StreamSize; + + DPRINT("NtfsWriteFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, WriteOffset, IrpFlags, LengthWritten); + + *LengthWritten = 0; + + ASSERT(DeviceExt); + + if (Length == 0) + { + if (Buffer == NULL) + return STATUS_SUCCESS; + else + return STATUS_INVALID_PARAMETER; + } + + // get the File control block + Fcb = (PNTFS_FCB)FileObject->FsContext; + ASSERT(Fcb); + + DPRINT("Fcb->PathName: %wS\n", Fcb->PathName); + DPRINT("Fcb->ObjectName: %wS\n", Fcb->ObjectName); + + // we don't yet handle compression + if (NtfsFCBIsCompressed(Fcb)) + { + DPRINT("Compressed file!\n"); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + + // allocate non-paged memory for the FILE_RECORD_HEADER + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (FileRecord == NULL) + { + DPRINT1("Not enough memory! Can't write %wS!\n", Fcb->PathName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // read the FILE_RECORD_HEADER from the drive (or cache) + DPRINT("Reading file record...\n"); + Status = ReadFileRecord(DeviceExt, Fcb->MFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + // We couldn't get the file's record. Free the memory and return the error + DPRINT1("Can't find record for %wS!\n", Fcb->ObjectName); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + DPRINT("Found record for %wS\n", Fcb->ObjectName); + + // Find the attribute (in the NTFS sense of the word) with the data stream for our file + DPRINT("Finding Data Attribute...\n"); + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext); + + // Did we fail to find the attribute? + if (!NT_SUCCESS(Status)) + { + NTSTATUS BrowseStatus; + FIND_ATTR_CONTXT Context; + PNTFS_ATTR_RECORD Attribute; + + DPRINT1("No '%S' data stream associated with file!\n", Fcb->Stream); + + // Couldn't find the requested data stream; print a list of streams available + BrowseStatus = FindFirstAttribute(&Context, DeviceExt, FileRecord, FALSE, &Attribute); + while (NT_SUCCESS(BrowseStatus)) + { + if (Attribute->Type == AttributeData) + { + UNICODE_STRING Name; + + Name.Length = Attribute->NameLength * sizeof(WCHAR); + Name.MaximumLength = Name.Length; + Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset); + DPRINT1("Data stream: '%wZ' available\n", &Name); + } + + BrowseStatus = FindNextAttribute(&Context, &Attribute); + } + FindCloseAttribute(&Context); + + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + // Get the size of the stream on disk + StreamSize = AttributeDataLength(&DataContext->Record); + + DPRINT("WriteOffset: %lu\tStreamSize: %I64u\n", WriteOffset, StreamSize); + + // Are we trying to write beyond the end of the stream? + if (WriteOffset + Length > StreamSize) + { + // TODO: allocate additional clusters as needed and expand stream + DPRINT1("WriteOffset: %lu\tLength: %lu\tStreamSize: %I64u\n", WriteOffset, Length, StreamSize); + DPRINT1("TODO: Stream embiggening (appending files) is not yet supported!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + *LengthWritten = 0; // We didn't write anything + return STATUS_ACCESS_DENIED; // temporarily; we don't change file sizes yet + } + + DPRINT("Length: %lu\tWriteOffset: %lu\tStreamSize: %I64u\n", Length, WriteOffset, StreamSize); + + // Write the data to the attribute + Status = WriteAttribute(DeviceExt, DataContext, WriteOffset, Buffer, Length, LengthWritten); + + // Did the write fail? + if (!NT_SUCCESS(Status)) + { + DPRINT1("Write failure!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; + } + + // This should never happen: + if (*LengthWritten != Length) + { + DPRINT1("\a\tNTFS DRIVER ERROR: length written (%lu) differs from requested (%lu), but no error was indicated!\n", + *LengthWritten, Length); + Status = STATUS_UNEXPECTED_IO_ERROR; + } + + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; +} + +/** +* @name NtfsWrite +* @implemented +* +* Handles IRP_MJ_WRITE I/O Request Packets for NTFS. This code borrows a lot from +* VfatWrite, and needs a lot of cleaning up. It also needs a lot more of the code +* from VfatWrite integrated. +* +* @param IrpContext +* Points to an NTFS_IRP_CONTEXT which describes the write +* +* @return +* STATUS_SUCCESS if successful, +* STATUS_INSUFFICIENT_RESOURCES if an allocation failed, +* STATUS_INVALID_DEVICE_REQUEST if called on the main device object, +* STATUS_NOT_IMPLEMENTED or STATUS_ACCESS_DENIED if a required feature isn't implemented. +* STATUS_PARTIAL_COPY, STATUS_UNSUCCESSFUL, or STATUS_OBJECT_NAME_NOT_FOUND if NtfsWriteFile() fails. +* +* @remarks Called by NtfsDispatch() in response to an IRP_MJ_WRITE request. Page files are not implemented. +* Support for large files (>4gb) is not implemented. Cached writes, file locks, transactions, etc - not implemented. +* +*/ NTSTATUS NtfsWrite(PNTFS_IRP_CONTEXT IrpContext) { - DPRINT("NtfsWrite(IrpContext %p)\n",IrpContext); - - IrpContext->Irp->IoStatus.Information = 0; - return STATUS_NOT_SUPPORTED; + PNTFS_FCB Fcb; + PERESOURCE Resource = NULL; + LARGE_INTEGER ByteOffset; + PUCHAR Buffer; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Length = 0; + ULONG ReturnedWriteLength = 0; + PDEVICE_OBJECT DeviceObject = NULL; + PDEVICE_EXTENSION DeviceExt = NULL; + PFILE_OBJECT FileObject = NULL; + PIRP Irp = NULL; + ULONG BytesPerSector; + + DPRINT("NtfsWrite(IrpContext %p)\n", IrpContext); + ASSERT(IrpContext); + + // This request is not allowed on the main device object + if (IrpContext->DeviceObject == NtfsGlobalData->DeviceObject) + { + DPRINT1("\t\t\t\tNtfsWrite is called with the main device object.\n"); + + Irp->IoStatus.Information = 0; + return STATUS_INVALID_DEVICE_REQUEST; + } + + // get the I/O request packet + Irp = IrpContext->Irp; + + // get the File control block + Fcb = (PNTFS_FCB)IrpContext->FileObject->FsContext; + ASSERT(Fcb); + + DPRINT("About to write %wS\n", Fcb->ObjectName); + DPRINT("NTFS Version: %d.%d\n", Fcb->Vcb->NtfsInfo.MajorVersion, Fcb->Vcb->NtfsInfo.MinorVersion); + + // setup some more locals + FileObject = IrpContext->FileObject; + DeviceObject = IrpContext->DeviceObject; + DeviceExt = DeviceObject->DeviceExtension; + BytesPerSector = DeviceExt->StorageDevice->SectorSize; + Length = IrpContext->Stack->Parameters.Write.Length; + + // get the file offset we'll be writing to + ByteOffset = IrpContext->Stack->Parameters.Write.ByteOffset; + if (ByteOffset.u.LowPart == FILE_WRITE_TO_END_OF_FILE && + ByteOffset.u.HighPart == -1) + { + ByteOffset.QuadPart = Fcb->RFCB.FileSize.QuadPart; + } + + DPRINT("ByteOffset: %I64u\tLength: %lu\tBytes per sector: %lu\n", ByteOffset.QuadPart, + Length, BytesPerSector); + + if (ByteOffset.u.HighPart && !(Fcb->Flags & FCB_IS_VOLUME)) + { + // TODO: Support large files + DPRINT1("FIXME: Writing to large files is not yet supported at this time.\n"); + return STATUS_INVALID_PARAMETER; + } + + // Is this a non-cached write? A non-buffered write? + if (IrpContext->Irp->Flags & (IRP_PAGING_IO | IRP_NOCACHE) || (Fcb->Flags & FCB_IS_VOLUME) || + IrpContext->FileObject->Flags & FILE_NO_INTERMEDIATE_BUFFERING) + { + // non-cached and non-buffered writes must be sector aligned + if (ByteOffset.u.LowPart % BytesPerSector != 0 || Length % BytesPerSector != 0) + { + DPRINT1("Non-cached writes and non-buffered writes must be sector aligned!\n"); + return STATUS_INVALID_PARAMETER; + } + } + + if (Length == 0) + { + DPRINT1("Null write!\n"); + + IrpContext->Irp->IoStatus.Information = 0; + + // FIXME: Doesn't accurately detect when a user passes NULL to WriteFile() for the buffer + if (Irp->UserBuffer == NULL && Irp->MdlAddress == NULL) + { + // FIXME: Update last write time + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; + } + + // get the Resource + if (Fcb->Flags & FCB_IS_VOLUME) + { + Resource = &DeviceExt->DirResource; + } + else if (IrpContext->Irp->Flags & IRP_PAGING_IO) + { + Resource = &Fcb->PagingIoResource; + } + else + { + Resource = &Fcb->MainResource; + } + + // acquire exclusive access to the Resource + if (!ExAcquireResourceExclusiveLite(Resource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return STATUS_CANT_WAIT; + } + + /* From VfatWrite(). Todo: Handle file locks + if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && + FsRtlAreThereCurrentFileLocks(&Fcb->FileLock)) + { + if (!FsRtlCheckLockForWriteAccess(&Fcb->FileLock, IrpContext->Irp)) + { + Status = STATUS_FILE_LOCK_CONFLICT; + goto ByeBye; + } + }*/ + + // Is this an async request to a file? + if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT) && !(Fcb->Flags & FCB_IS_VOLUME)) + { + DPRINT1("FIXME: Async writes not supported in NTFS!\n"); + + ExReleaseResourceLite(Resource); + return STATUS_NOT_IMPLEMENTED; + } + + // get the buffer of data the user is trying to write + Buffer = NtfsGetUserBuffer(Irp, BooleanFlagOn(Irp->Flags, IRP_PAGING_IO)); + ASSERT(Buffer); + + // lock the buffer + Status = NtfsLockUserBuffer(Irp, Length, IoReadAccess); + + // were we unable to lock the buffer? + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to lock user buffer!\n"); + + ExReleaseResourceLite(Resource); + return Status; + } + + DPRINT("Existing File Size(Fcb->RFCB.FileSize.QuadPart): %I64u\n", Fcb->RFCB.FileSize.QuadPart); + DPRINT("About to write the data. Length: %lu\n", Length); + + // TODO: handle HighPart of ByteOffset (large files) + + // write the file + Status = NtfsWriteFile(DeviceExt, + FileObject, + Buffer, + Length, + ByteOffset.LowPart, + Irp->Flags, + &ReturnedWriteLength); + + IrpContext->Irp->IoStatus.Status = Status; + + // was the write successful? + if (NT_SUCCESS(Status)) + { + // TODO: Update timestamps + + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + // advance the file pointer + FileObject->CurrentByteOffset.QuadPart = ByteOffset.QuadPart + ReturnedWriteLength; + } + + IrpContext->PriorityBoost = IO_DISK_INCREMENT; + } + else + { + DPRINT1("Write not Succesful!\tReturned length: %lu\n", ReturnedWriteLength); + } + + Irp->IoStatus.Information = ReturnedWriteLength; + + // Note: We leave the user buffer that we locked alone, it's up to the I/O manager to unlock and free it + + ExReleaseResourceLite(Resource); + + return Status; } /* EOF */

1 0

[pschweitzer] 71223: [DHCPCSVC] Properly end variadic args enumeration
by pschweitzer＠svn.reactos.org 01 May '16

01 May '16

Author: pschweitzer Date: Sun May 1 13:36:15 2016 New Revision: 71223 URL: http://svn.reactos.org/svn/reactos?rev=71223&view=rev Log: [DHCPCSVC] Properly end variadic args enumeration Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ut… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] Sun May 1 13:36:15 2016 @@ -17,7 +17,7 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); - va_end( format ); + va_end( arg_begin ); DPRINT("NOTE: %s\n", buf); @@ -32,7 +32,7 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); - va_end( format ); + va_end( arg_begin ); DPRINT("DEBUG: %s\n", buf); @@ -47,7 +47,7 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); - va_end( format ); + va_end( arg_begin ); DPRINT("WARN: %s\n", buf); @@ -62,7 +62,7 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); - va_end( format ); + va_end( arg_begin ); DPRINT("WARNING: %s\n", buf); @@ -76,7 +76,7 @@ _vsnprintf( buf, sizeof(buf), format, arg_begin ); - va_end( format ); + va_end( arg_begin ); DPRINT1("ERROR: %s\n", buf); }

1 0

[pschweitzer] 71222: [SHELL32] Don't use uninit var
by pschweitzer＠svn.reactos.org 01 May '16

01 May '16

Author: pschweitzer Date: Sun May 1 13:27:11 2016 New Revision: 71222 URL: http://svn.reactos.org/svn/reactos?rev=71222&view=rev Log: [SHELL32] Don't use uninit var Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp 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] Sun May 1 13:27:11 2016 @@ -399,7 +399,7 @@ if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING && GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) { - int bWantsForParsing; + int bWantsForParsing = FALSE; /* * We can only get a filesystem path from a shellfolder if the

1 0

[pschweitzer] 71221: [KS] - Don't leak memory in KspValidateConnectRequest(), patch by Victor Martinez - Also compute connect medium ID string only twice (could be even computed once) instead of do...
by pschweitzer＠svn.reactos.org 01 May '16

01 May '16

Author: pschweitzer Date: Sun May 1 08:25:22 2016 New Revision: 71221 URL: http://svn.reactos.org/svn/reactos?rev=71221&view=rev Log: [KS] - Don't leak memory in KspValidateConnectRequest(), patch by Victor Martinez - Also compute connect medium ID string only twice (could be even computed once) instead of doing so in each loop iteration CORE-11099 #resolve #comment Committed in r71221 Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sun May 1 08:25:22 2016 @@ -73,6 +73,7 @@ ULONG Count; BOOLEAN Found; PKSPIN_DESCRIPTOR Descriptor; + UNICODE_STRING GuidString2; /* did the caller miss the connect parameter */ if (!Connect) @@ -93,7 +94,10 @@ /* is pin id out of bounds */ if (ConnectDetails->PinId >= DescriptorsCount) + { + FreeItem(ConnectDetails); return STATUS_INVALID_PARAMETER; + } if (DescriptorSize == sizeof(KSPIN_DESCRIPTOR)) { @@ -124,14 +128,16 @@ /* now check the interface */ Found = FALSE; Index = 0; + RtlStringFromGUID(&ConnectDetails->Interface.Set, &GuidString2); do { - UNICODE_STRING GuidString, GuidString2; + UNICODE_STRING GuidString; RtlStringFromGUID(&Interface[Index].Set, &GuidString); - RtlStringFromGUID(&ConnectDetails->Interface.Set, &GuidString2); DPRINT("Driver Interface %S Id %u\n", GuidString.Buffer, Interface[Index].Id); DPRINT("Connect Interface %S Id %u\n", GuidString2.Buffer, ConnectDetails->Interface.Id); + + RtlFreeUnicodeString(&GuidString); if (IsEqualGUIDAligned(&Interface[Index].Set, &ConnectDetails->Interface.Set) && Interface[Index].Id == ConnectDetails->Interface.Id) @@ -143,10 +149,12 @@ /* iterate to next interface */ Index++; }while(Index < Count); + RtlFreeUnicodeString(&GuidString2); if (!Found) { /* pin doesnt support this interface */ + FreeItem(ConnectDetails); return STATUS_NO_MATCH; } @@ -167,15 +175,16 @@ /* now check the interface */ Found = FALSE; Index = 0; + RtlStringFromGUID(&ConnectDetails->Medium.Set, &GuidString2); do { - UNICODE_STRING GuidString, GuidString2; + UNICODE_STRING GuidString; RtlStringFromGUID(&Medium[Index].Set, &GuidString); - RtlStringFromGUID(&ConnectDetails->Medium.Set, &GuidString2); DPRINT("Driver Medium %S Id %u\n", GuidString.Buffer, Medium[Index].Id); DPRINT("Connect Medium %S Id %u\n", GuidString2.Buffer, ConnectDetails->Medium.Id); + RtlFreeUnicodeString(&GuidString); if (IsEqualGUIDAligned(&Medium[Index].Set, &ConnectDetails->Medium.Set) && Medium[Index].Id == ConnectDetails->Medium.Id) @@ -185,15 +194,15 @@ break; } - - /* iterate to next medium */ Index++; }while(Index < Count); + RtlFreeUnicodeString(&GuidString2); if (!Found) { /* pin doesnt support this medium */ + FreeItem(ConnectDetails); return STATUS_NO_MATCH; }

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 May 2016