Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[akhaldi] 73240: [NOTEPAD] Fix a typo. Spotted by Laur Florin. CORE-12405

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 17 11:56:16 2016 New Revision: 73240 URL: http://svn.reactos.org/svn/reactos?rev=73240&view=rev Log: [NOTEPAD] Fix a typo. Spotted by Laur Florin. CORE-12405 Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/en-US.rc Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/da-DK.rc [iso-8859-1] Thu Nov 17 11:56:16 2016 @@ -51,7 +51,7 @@ END POPUP "&SÃ¸g" BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Word Wrap", CMD_WRAP MENUITEM "&Font...", CMD_FONT END POPUP "&View" Modified: trunk/reactos/base/applications/notepad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/en-US.rc [iso-8859-1] Thu Nov 17 11:56:16 2016 @@ -51,7 +51,7 @@ END POPUP "F&ormat" BEGIN - MENUITEM "&Wrap Wrap", CMD_WRAP + MENUITEM "&Word Wrap", CMD_WRAP MENUITEM "&Font...", CMD_FONT END POPUP "&View"

8 years, 1 month

[cfinck] 73239: [LOCALSPL_APITEST] Fix some NULL vs. INVALID_HANDLE_VALUE checks. Now localspl_apitest.exe should properly quit when it cannot find its DLL.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Nov 16 14:59:01 2016 New Revision: 73239 URL: http://svn.reactos.org/svn/reactos?rev=73239&view=rev Log: [LOCALSPL_APITEST] Fix some NULL vs. INVALID_HANDLE_VALUE checks. Now localspl_apitest.exe should properly quit when it cannot find its DLL. Modified: trunk/rostests/apitests/localspl/tests.c Modified: trunk/rostests/apitests/localspl/tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/tests.c… ============================================================================== --- trunk/rostests/apitests/localspl/tests.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/tests.c [iso-8859-1] Wed Nov 16 14:59:01 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Local Spooler API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ /* @@ -45,7 +45,7 @@ DWORD cbRead; DWORD cbWritten; HANDLE hCommandPipe = INVALID_HANDLE_VALUE; - HANDLE hFind = NULL; + HANDLE hFind = INVALID_HANDLE_VALUE; HANDLE hOutputPipe = INVALID_HANDLE_VALUE; PWSTR p; SC_HANDLE hSC = NULL; @@ -77,7 +77,7 @@ // Check if the corresponding DLL file exists. hFind = FindFirstFileW(wszFilePath, &fd); - if (!hFind) + if (hFind == INVALID_HANDLE_VALUE) { skip("My DLL file \"%S\" does not exist!\n", wszFilePath); goto Cleanup; @@ -187,13 +187,13 @@ bSuccessful = TRUE; Cleanup: - if (hCommandPipe) + if (hCommandPipe != INVALID_HANDLE_VALUE) CloseHandle(hCommandPipe); - if (hOutputPipe) + if (hOutputPipe != INVALID_HANDLE_VALUE) CloseHandle(hOutputPipe); - if (hFind) + if (hFind != INVALID_HANDLE_VALUE) FindClose(hFind); if (hService)

8 years, 1 month

[cfinck] 73238: [WINSPOOL_APITEST] Add tests for GetPrintProcessorDirectoryA and another one for GetPrintProcessorDirectoryW. Tested against Windows Server 2003 SP2. Step 1 for CORE-12399

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Nov 16 08:54:54 2016 New Revision: 73238 URL: http://svn.reactos.org/svn/reactos?rev=73238&view=rev Log: [WINSPOOL_APITEST] Add tests for GetPrintProcessorDirectoryA and another one for GetPrintProcessorDirectoryW. Tested against Windows Server 2003 SP2. Step 1 for CORE-12399 Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c trunk/rostests/apitests/winspool/testlist.c Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… ============================================================================== --- trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] Wed Nov 16 08:54:54 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler DLL API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for GetPrintProcessorDirectoryA/GetPrintProcessorDirectoryW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -13,7 +13,59 @@ #include <wingdi.h> #include <winspool.h> -START_TEST(GetPrintProcessorDirectory) +START_TEST(GetPrintProcessorDirectoryA) +{ + DWORD cbNeeded; + DWORD cbTemp; + PSTR pszBuffer; + + // Try with an invalid level, this needs to be caught first. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 0, NULL, 0, NULL), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_LEVEL, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Now try with valid level, but no pcbNeeded. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, NULL), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == RPC_X_NULL_REF_POINTER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Try with an invalid environment as well. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, "invalid", 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_ENVIRONMENT, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbNeeded == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Now get the required buffer size by supplying pcbNeeded. This needs to fail with ERROR_INSUFFICIENT_BUFFER. + // Note for GetPrintProcessorDirectoryA: cbNeeded will be the same as for GetPrintProcessorDirectoryW, even though the ANSI string only needs half of it! + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbNeeded), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + + // Now provide the demanded size, but no buffer. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Same error has to occur with a size too small. + SetLastError(0xDEADBEEF); + ok(!GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 1, &cbTemp), "GetPrintProcessorDirectoryA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); + + // Finally use the function as intended and aim for success! + pszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded); + SetLastError(0xDEADBEEF); + ok(GetPrintProcessorDirectoryA(NULL, NULL, 1, (PBYTE)pszBuffer, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryA returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "GetPrintProcessorDirectoryA returns error %lu!\n", GetLastError()); + + // Note for GetPrintProcessorDirectoryA: cbNeeded is the same as for GetPrintProcessorDirectoryW! + ok(strlen(pszBuffer) == cbNeeded / sizeof(WCHAR) - 1, "GetPrintProcessorDirectoryA string is %Iu characters long, but %lu characters expected!\n", strlen(pszBuffer), cbNeeded / sizeof(WCHAR) - 1); + HeapFree(GetProcessHeap(), 0, pszBuffer); +} + +START_TEST(GetPrintProcessorDirectoryW) { DWORD cbNeeded; DWORD cbTemp; @@ -54,9 +106,10 @@ ok(cbTemp == 0, "cbNeeded is %lu!\n", cbNeeded); // Finally use the function as intended and aim for success! - pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbNeeded); + pwszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNeeded); SetLastError(0xDEADBEEF); - ok(GetPrintProcessorDirectoryW(NULL, NULL, 1, (PBYTE)pwszBuffer, cbNeeded, &cbNeeded), "GetPrintProcessorDirectoryW returns FALSE!\n"); + ok(GetPrintProcessorDirectoryW(NULL, NULL, 1, (PBYTE)pwszBuffer, cbNeeded, &cbTemp), "GetPrintProcessorDirectoryW returns FALSE!\n"); ok(GetLastError() == ERROR_SUCCESS, "GetPrintProcessorDirectoryW returns error %lu!\n", GetLastError()); + ok(wcslen(pwszBuffer) == cbNeeded / sizeof(WCHAR) - 1, "GetPrintProcessorDirectoryW string is %Iu characters long, but %lu characters expected!\n", wcslen(pwszBuffer), cbNeeded / sizeof(WCHAR) - 1); HeapFree(GetProcessHeap(), 0, pwszBuffer); } Modified: trunk/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/testlis… ============================================================================== --- trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] Wed Nov 16 08:54:54 2016 @@ -13,7 +13,8 @@ extern void func_ClosePrinter(void); extern void func_EnumPrinters(void); extern void func_EnumPrintProcessorDatatypes(void); -extern void func_GetPrintProcessorDirectory(void); +extern void func_GetPrintProcessorDirectoryA(void); +extern void func_GetPrintProcessorDirectoryW(void); extern void func_IsValidDevmodeA(void); extern void func_IsValidDevmodeW(void); extern void func_OpenPrinter(void); @@ -24,7 +25,8 @@ { "ClosePrinter", func_ClosePrinter }, { "EnumPrinters", func_EnumPrinters }, { "EnumPrintProcessorDatatypes", func_EnumPrintProcessorDatatypes }, - { "GetPrintProcessorDirectory", func_GetPrintProcessorDirectory }, + { "GetPrintProcessorDirectoryA", func_GetPrintProcessorDirectoryA }, + { "GetPrintProcessorDirectoryW", func_GetPrintProcessorDirectoryW }, { "IsValidDevmodeA", func_IsValidDevmodeA }, { "IsValidDevmodeW", func_IsValidDevmodeW }, { "OpenPrinter", func_OpenPrinter },

8 years, 1 month

[gadamopoulos] 73237: [SHELL32] - Implement filling in needed keys passed to CDefFolderMenu_Create2. - CDefaultContextMenu: Remove the code that filled the array of keys as this is now moved to the...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Nov 15 20:14:56 2016 New Revision: 73237 URL: http://svn.reactos.org/svn/reactos?rev=73237&view=rev Log: [SHELL32] - Implement filling in needed keys passed to CDefFolderMenu_Create2. - CDefaultContextMenu: Remove the code that filled the array of keys as this is now moved to the implementation of the shell folder. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.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/folders/CRegFolder.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -1571,96 +1571,10 @@ * */ -static void AddClassKey(const WCHAR * szClass, HKEY* buffer, UINT* cKeys) -{ - LSTATUS result; - HKEY hkey; - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szClass, 0, KEY_READ | KEY_QUERY_VALUE, &hkey); - if (result != ERROR_SUCCESS) - return; - - buffer[*cKeys] = hkey; - *cKeys +=1; -} - -void HackFillKeys(DEFCONTEXTMENU *pdcm, HKEY* buffer) -{ - PCUITEMID_CHILD pidl = pdcm->apidl[0]; - pdcm->cKeys = 0; - pdcm->aKeys = buffer; - - if (_ILIsValue(pidl)) - { - FileStructW* pFileData = _ILGetFileStructW(pidl); - LPWSTR extension = PathFindExtension(pFileData->wszName); - - if (extension) - { - AddClassKey(extension, buffer, &pdcm->cKeys); - - WCHAR wszClass[40], wszClass2[40]; - DWORD dwSize = sizeof(wszClass); - if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) - { - swprintf(wszClass2, L"%s//%s", extension, wszClass); - - AddClassKey(wszClass, buffer, &pdcm->cKeys); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - } - - swprintf(wszClass2, L"SystemFileAssociations//%s", extension); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - - if (RegGetValueW(HKEY_CLASSES_ROOT, extension, L"PerceivedType ", RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) - { - swprintf(wszClass2, L"SystemFileAssociations//%s", wszClass); - AddClassKey(wszClass2, buffer, &pdcm->cKeys); - } - } - - AddClassKey(L"AllFilesystemObjects", buffer, &pdcm->cKeys); - AddClassKey(L"*", buffer, &pdcm->cKeys); - } - else if (_ILIsSpecialFolder(pidl)) - { - GUID *pGuid = _ILGetGUIDPointer(pidl); - if (pGuid) - { - LPOLESTR pwszCLSID; - WCHAR key[60]; - - wcscpy(key, L"CLSID\\"); - HRESULT hr = StringFromCLSID(*pGuid, &pwszCLSID); - if (hr == S_OK) - { - wcscpy(&key[6], pwszCLSID); - AddClassKey(key, buffer, &pdcm->cKeys); - } - } - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } - else if (_ILIsFolder(pidl)) - { - AddClassKey(L"AllFilesystemObjects", buffer, &pdcm->cKeys); - AddClassKey(L"Directory", buffer, &pdcm->cKeys); - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } - else if (_ILIsDrive(pidl)) - { - AddClassKey(L"Drive", buffer, &pdcm->cKeys); - AddClassKey(L"Folder", buffer, &pdcm->cKeys); - } -} - HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - /* HACK: move to the shell folders implementation */ - HKEY hkeyHack[16]; - if (!pdcm->aKeys && pdcm->cidl) - HackFillKeys((DEFCONTEXTMENU *)pdcm, hkeyHack); - HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) return hr; 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] Tue Nov 15 20:14:56 2016 @@ -486,7 +486,7 @@ if (bHasCpl) hr = ShellObjectCreatorInit<CCPLItemMenu>(cidl, apidl, riid, &pObj); else - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } 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)) { 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] Tue Nov 15 20:14:56 2016 @@ -639,7 +639,21 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu **)&pObj); + if (_ILIsSpecialFolder(apidl[0])) + { + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); + } + else + { + /* Do not use the context menu of the CFSFolder here. */ + /* We need to pass a pointer of the CDesktopFolder so as the data object that the context menu gets is rooted to the desktop */ + /* Otherwise operations like that involve items from both user and shared desktop will not work */ + IContextMenu * pCm = NULL; + HKEY hKeys[16]; + UINT cKeys = 0; + AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); + } } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { @@ -817,14 +831,15 @@ { TRACE ("(%p)->(%p)\n", this, pidl); - return E_NOTIMPL; + return E_INVALIDARG; } HRESULT WINAPI CDesktopFolder::GetCurFolder(LPITEMIDLIST * pidl) { TRACE ("(%p)->(%p)\n", this, pidl); - if (!pidl) return E_POINTER; + if (!pidl) + return E_INVALIDARG; /* xp doesn't have this check and crashes on NULL */ *pidl = ILClone (pidlRoot); return S_OK; } 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] Tue Nov 15 20:14:56 2016 @@ -39,6 +39,22 @@ * IShellFolder implementation */ +HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, + HWND hwnd, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + IShellFolder *psf, + IContextMenu **ppcm) +{ + HKEY hKeys[2]; + UINT cKeys = 0; + AddClassKeyToArray(L"Drive", hKeys, &cKeys); + AddClassKeyToArray(L"Folder", hKeys, &cKeys); + + /* TODO: also pass a callback here */ + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); +} + HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -536,7 +552,10 @@ if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + if (_ILIsDrive(apidl[0])) + hr = CDrivesContextMenu_CreateInstance(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + else + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { @@ -812,12 +831,6 @@ */ HRESULT WINAPI CDrivesFolder::Initialize(LPCITEMIDLIST pidl) { - TRACE ("(%p)->(%p)\n", this, pidl); - - if (pidlRoot) - SHFree((LPVOID)pidlRoot); - - pidlRoot = ILClone(pidl); return S_OK; } @@ -829,7 +842,7 @@ TRACE("(%p)->(%p)\n", this, pidl); if (!pidl) - return E_POINTER; + return E_INVALIDARG; /* xp doesn't have this check and crashes on NULL */ *pidl = ILClone(pidlRoot); return S_OK; 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] Tue Nov 15 20:14:56 2016 @@ -490,7 +490,10 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { IContextMenu * pCm = NULL; - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + HKEY hKeys[16]; + UINT cKeys = 0; + AddFSClassKeysToArray(apidl[0], hKeys, &cKeys); + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, cKeys, hKeys, &pCm); pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject)) Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -22,6 +22,35 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +HRESULT CGuidItemContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder, + HWND hwnd, + UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, + IShellFolder *psf, + IContextMenu **ppcm) +{ + HKEY hKeys[10]; + UINT cKeys = 0; + + GUID *pGuid = _ILGetGUIDPointer(apidl[0]); + if (pGuid) + { + LPOLESTR pwszCLSID; + WCHAR key[60]; + + wcscpy(key, L"CLSID\\"); + HRESULT hr = StringFromCLSID(*pGuid, &pwszCLSID); + if (hr == S_OK) + { + wcscpy(&key[6], pwszCLSID); + AddClassKeyToArray(key, hKeys, &cKeys); + } + } + AddClassKeyToArray(L"Folder", hKeys, &cKeys); + + return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, NULL, cKeys, hKeys, ppcm); +} + HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut) { CComPtr<IDefaultExtractIconInit> initIcon; @@ -175,13 +204,26 @@ HRESULT CRegFolder::GetGuidItemAttributes (LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { + DWORD dwAttributes = *pdwAttributes; + /* First try to get them from the registry */ - if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) - { - return S_OK; - } - - *pdwAttributes &= SFGAO_CANLINK; + if (!HCR_GetFolderAttributes(pidl, pdwAttributes)) + { + /* We couldn't get anything */ + *pdwAttributes = 0; + } + + /* Items have more attributes when on desktop */ + if (_ILIsDesktop(m_pidlRoot)) + { + *pdwAttributes |= (dwAttributes & (SFGAO_CANLINK|SFGAO_CANDELETE|SFGAO_CANRENAME|SFGAO_HASPROPSHEET)); + } + + /* In any case, links can be created */ + if (*pdwAttributes == NULL) + { + *pdwAttributes |= (dwAttributes & SFGAO_CANLINK); + } return S_OK; } @@ -346,8 +388,20 @@ { hr = CGuidItemExtractIcon_CreateInstance(apidl[0], riid, &pObj); } + else if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) + { + if (!_ILGetGUIDPointer (apidl[0])) + { + ERR("Got non guid item!\n"); + return E_FAIL; + } + + hr = CGuidItemContextMenu_CreateInstance(m_pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), (IContextMenu**)&pObj); + } else + { hr = E_NOINTERFACE; + } *ppvOut = pObj; return hr; Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Tue Nov 15 20:14:56 2016 @@ -61,6 +61,8 @@ extern "C" BOOL HCR_RegOpenClassIDKey(REFIID riid, HKEY *hkey); +void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys); + static __inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", 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] Tue Nov 15 20:14:56 2016 @@ -501,6 +501,52 @@ *cKeys += 1; } +void AddFSClassKeysToArray(PCUITEMID_CHILD pidl, HKEY* array, UINT* cKeys) +{ + if (_ILIsValue(pidl)) + { + FileStructW* pFileData = _ILGetFileStructW(pidl); + LPWSTR extension = PathFindExtension(pFileData->wszName); + + if (extension) + { + AddClassKeyToArray(extension, array, cKeys); + + WCHAR wszClass[40], wszClass2[40]; + DWORD dwSize = sizeof(wszClass); + if (RegGetValueW(HKEY_CLASSES_ROOT, extension, NULL, RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) + { + swprintf(wszClass2, L"%s//%s", extension, wszClass); + + AddClassKeyToArray(wszClass, array, cKeys); + AddClassKeyToArray(wszClass2, array, cKeys); + } + + swprintf(wszClass2, L"SystemFileAssociations//%s", extension); + AddClassKeyToArray(wszClass2, array, cKeys); + + if (RegGetValueW(HKEY_CLASSES_ROOT, extension, L"PerceivedType ", RRF_RT_REG_SZ, NULL, wszClass, &dwSize) == ERROR_SUCCESS) + { + swprintf(wszClass2, L"SystemFileAssociations//%s", wszClass); + AddClassKeyToArray(wszClass2, array, cKeys); + } + } + + AddClassKeyToArray(L"AllFilesystemObjects", array, cKeys); + AddClassKeyToArray(L"*", array, cKeys); + } + else if (_ILIsFolder(pidl)) + { + AddClassKeyToArray(L"AllFilesystemObjects", array, cKeys); + AddClassKeyToArray(L"Directory", array, cKeys); + AddClassKeyToArray(L"Folder", array, cKeys); + } + else + { + ERR("Got non FS pidl\n"); + } +} + /*********************************************************************** * SHCreateLinks *

8 years, 1 month

[gadamopoulos] 73236: [SHELL32] - Accept NULL pidl in CRegFolder::GetDisplayNameOf. CORE-12317

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Nov 15 14:25:05 2016 New Revision: 73236 URL: http://svn.reactos.org/svn/reactos?rev=73236&view=rev Log: [SHELL32] - Accept NULL pidl in CRegFolder::GetDisplayNameOf. CORE-12317 Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Tue Nov 15 14:25:05 2016 @@ -356,10 +356,10 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - if (!strRet || !_ILIsSpecialFolder(pidl)) - return E_INVALIDARG; - - if (!pidl->mkid.cb) + if (!strRet || (!_ILIsSpecialFolder(pidl) && pidl != NULL)) + return E_INVALIDARG; + + if (!pidl || !pidl->mkid.cb) { if ((GET_SHGDN_RELATION(dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING)) {

8 years, 1 month

[gadamopoulos] 73235: [SHELL32_APITEST] - Add a test for CShellDesktop to show what breaks the select folder dialog.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Nov 15 14:08:57 2016 New Revision: 73235 URL: http://svn.reactos.org/svn/reactos?rev=73235&view=rev Log: [SHELL32_APITEST] - Add a test for CShellDesktop to show what breaks the select folder dialog. Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Tue Nov 15 14:08:57 2016 @@ -182,6 +182,10 @@ hr = psf2->CreateViewObject(NULL, IID_PPV_ARG(IShellView, &psv_2)); ok(hr == S_OK, "hr = %lx\n", hr); ok(psv != psv_2, "Expected %p != %p\n", static_cast<PVOID>(psv), static_cast<PVOID>(psv_2)); + + STRRET strret; + hr = psf2->GetDisplayNameOf(NULL, 0, &strret); + ok(hr == S_OK, "hr = %lx\n", hr); } VOID TestInitialize(_In_ IShellFolder *psf)

8 years, 1 month

[hbelusca] 73234: [LSASRV]: Revert part of r73233: GetModuleHandle(NULL) retrieves the exe module in which the dll is loaded, not the dll instance itself. (an alternative might be to use the hinsta...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 14 18:57:18 2016 New Revision: 73234 URL: http://svn.reactos.org/svn/reactos?rev=73234&view=rev Log: [LSASRV]: Revert part of r73233: GetModuleHandle(NULL) retrieves the exe module in which the dll is loaded, not the dll instance itself. (an alternative might be to use the hinstance from DllMain...). Thanks Thomas for having pointed this to me. Modified: trunk/reactos/dll/win32/lsasrv/lookup.c Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Mon Nov 14 18:57:18 2016 @@ -186,7 +186,7 @@ InitializeListHead(&WellKnownSidListHead); - hInstance = GetModuleHandleW(NULL); + hInstance = GetModuleHandleW(L"lsasrv.dll"); /* NT Authority */

8 years, 1 month

[hbelusca] 73233: [LSASRV] - No need to hardcode the name of the dll in the GetModuleHandleW call; - Use ARRAYSIZE instead of hardcoding string buffer sizes; - When initializing the "Network Sid", ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 14 16:19:22 2016 New Revision: 73233 URL: http://svn.reactos.org/svn/reactos?rev=73233&view=rev Log: [LSASRV] - No need to hardcode the name of the dll in the GetModuleHandleW call; - Use ARRAYSIZE instead of hardcoding string buffer sizes; - When initializing the "Network Sid", use the correct localized string. Modified: trunk/reactos/dll/win32/lsasrv/lookup.c Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Mon Nov 14 16:19:22 2016 @@ -186,12 +186,12 @@ InitializeListHead(&WellKnownSidListHead); - hInstance = GetModuleHandleW(L"lsasrv.dll"); + hInstance = GetModuleHandleW(NULL); /* NT Authority */ - LsapLoadString(hInstance, IDS_NT_AUTHORITY, szAccountName, 80); - LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szAccountName, ARRAYSIZE(szAccountName)); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, ARRAYSIZE(szDomainName)); LsapCreateSid(&NtAuthority, 0, NULL, @@ -201,7 +201,7 @@ NULL); /* Null Sid */ - LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_NULL_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_NULL_RID; LsapCreateSid(&NullSidAuthority, @@ -213,7 +213,7 @@ NULL); /* World Sid */ - LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_WORLD_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_WORLD_RID; LsapCreateSid(&WorldSidAuthority, @@ -225,7 +225,7 @@ &LsapWorldSid); /* Local Sid */ - LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_LOCAL_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_LOCAL_RID; LsapCreateSid(&LocalSidAuthority, @@ -237,7 +237,7 @@ NULL); /* Creator Owner Sid */ - LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_CREATOR_OWNER_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_CREATOR_OWNER_RID; LsapCreateSid(&CreatorSidAuthority, @@ -249,7 +249,7 @@ NULL); /* Creator Group Sid */ - LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_CREATOR_GROUP_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_CREATOR_GROUP_RID; LsapCreateSid(&CreatorSidAuthority, @@ -261,7 +261,7 @@ NULL); /* Creator Owner Server Sid */ - LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_CREATOR_OWNER_SERVER_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_CREATOR_OWNER_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, @@ -273,7 +273,7 @@ NULL); /* Creator Group Server Sid */ - LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_CREATOR_GROUP_SERVER_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_CREATOR_GROUP_SERVER_RID; LsapCreateSid(&CreatorSidAuthority, @@ -285,8 +285,8 @@ NULL); /* Dialup Sid */ - LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); - LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, 80); + LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, ARRAYSIZE(szAccountName)); + LsapLoadString(hInstance, IDS_NT_AUTHORITY, szDomainName, ARRAYSIZE(szDomainName)); SubAuthorities[0] = SECURITY_DIALUP_RID; LsapCreateSid(&NtAuthority, @@ -298,7 +298,7 @@ NULL); /* Network Sid */ - LsapLoadString(hInstance, IDS_DIALUP_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_NETWORK_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_NETWORK_RID; LsapCreateSid(&NtAuthority, @@ -310,7 +310,7 @@ &LsapNetworkSid); /* Batch Sid*/ - LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_BATCH_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BATCH_RID; LsapCreateSid(&NtAuthority, @@ -322,7 +322,7 @@ &LsapBatchSid); /* Interactive Sid */ - LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_INTERACTIVE_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_INTERACTIVE_RID; LsapCreateSid(&NtAuthority, @@ -334,7 +334,7 @@ &LsapInteractiveSid); /* Service Sid */ - LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_SERVICE_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_SERVICE_RID; LsapCreateSid(&NtAuthority, @@ -346,7 +346,7 @@ &LsapServiceSid); /* Anonymous Logon Sid */ - LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_ANONYMOUS_LOGON_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_ANONYMOUS_LOGON_RID; LsapCreateSid(&NtAuthority, @@ -358,7 +358,7 @@ NULL); /* Proxy Sid */ - LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_PROXY_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_PROXY_RID; LsapCreateSid(&NtAuthority, @@ -370,7 +370,7 @@ NULL); /* Enterprise Controllers Sid */ - LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_ENTERPRISE_CONTROLLERS_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_ENTERPRISE_CONTROLLERS_RID; LsapCreateSid(&NtAuthority, @@ -382,7 +382,7 @@ NULL); /* Principal Self Sid */ - LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_PRINCIPAL_SELF_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_PRINCIPAL_SELF_RID; LsapCreateSid(&NtAuthority, @@ -394,7 +394,7 @@ NULL); /* Authenticated Users Sid */ - LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_AUTHENTICATED_USER_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_AUTHENTICATED_USER_RID; LsapCreateSid(&NtAuthority, @@ -406,7 +406,7 @@ NULL); /* Restricted Code Sid */ - LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_RESTRICTED_CODE_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_RESTRICTED_CODE_RID; LsapCreateSid(&NtAuthority, @@ -418,7 +418,7 @@ NULL); /* Terminal Server Sid */ - LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_TERMINAL_SERVER_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_TERMINAL_SERVER_RID; LsapCreateSid(&NtAuthority, @@ -430,7 +430,7 @@ NULL); /* Remote Logon Sid */ - LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_REMOTE_LOGON_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_REMOTE_LOGON_RID; LsapCreateSid(&NtAuthority, @@ -442,7 +442,7 @@ NULL); /* This Organization Sid */ - LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_THIS_ORGANIZATION_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_THIS_ORGANIZATION_RID; LsapCreateSid(&NtAuthority, @@ -454,7 +454,7 @@ NULL); /* Local System Sid */ - LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_LOCAL_SYSTEM_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_LOCAL_SYSTEM_RID; LsapCreateSid(&NtAuthority, @@ -466,7 +466,7 @@ &LsapLocalSystemSid); /* Local Service Sid */ - LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_LOCAL_SERVICE_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_LOCAL_SERVICE_RID; LsapCreateSid(&NtAuthority, @@ -486,7 +486,7 @@ NULL); /* Network Service Sid */ - LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, 80); + LsapLoadString(hInstance, IDS_NETWORK_SERVICE_RID, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; LsapCreateSid(&NtAuthority, @@ -506,8 +506,8 @@ NULL); /* Builtin Domain Sid */ - LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, 80); - LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szDomainName, 80); + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szAccountName, ARRAYSIZE(szAccountName)); + LsapLoadString(hInstance, IDS_BUILTIN_DOMAIN_RID, szDomainName, ARRAYSIZE(szDomainName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; LsapCreateSid(&NtAuthority, @@ -519,7 +519,7 @@ NULL); /* Administrators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_ADMINS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ADMINS; @@ -532,7 +532,7 @@ &LsapAdministratorsSid); /* Users Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_USERS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_USERS; @@ -545,7 +545,7 @@ NULL); /* Guests Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_GUESTS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_GUESTS; @@ -558,7 +558,7 @@ NULL); /* Power User Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_POWER_USERS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_POWER_USERS; @@ -571,7 +571,7 @@ NULL); /* Account Operators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_ACCOUNT_OPS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_ACCOUNT_OPS; @@ -584,7 +584,7 @@ NULL); /* System Operators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_SYSTEM_OPS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_SYSTEM_OPS; @@ -597,7 +597,7 @@ NULL); /* Print Operators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_PRINT_OPS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PRINT_OPS; @@ -610,7 +610,7 @@ NULL); /* Backup Operators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_BACKUP_OPS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_BACKUP_OPS; @@ -623,7 +623,7 @@ NULL); /* Replicators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_REPLICATOR, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REPLICATOR; @@ -636,7 +636,7 @@ NULL); /* RAS Servers Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_RAS_SERVERS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_RAS_SERVERS; @@ -649,7 +649,7 @@ NULL); /* Pre-Windows 2000 Compatible Access Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_PREW2KCOMPACCESS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_PREW2KCOMPACCESS; @@ -662,7 +662,7 @@ NULL); /* Remote Desktop Users Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_REMOTE_DESKTOP_USERS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS; @@ -675,7 +675,7 @@ NULL); /* Network Configuration Operators Alias Sid */ - LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, 80); + LsapLoadString(hInstance, IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS, szAccountName, ARRAYSIZE(szAccountName)); SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; SubAuthorities[1] = DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS;

8 years, 1 month

[hbelusca] 73232: [LSASRV] - Remove trailing whitespace; - Tabs --> Spaces; - Don't always hardcode parameters sizeofs; - Use ARRAYSIZE where applicable; - Use UNICODE_NULL

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 14 16:17:42 2016 New Revision: 73232 URL: http://svn.reactos.org/svn/reactos?rev=73232&view=rev Log: [LSASRV] - Remove trailing whitespace; - Tabs --> Spaces; - Don't always hardcode parameters sizeofs; - Use ARRAYSIZE where applicable; - Use UNICODE_NULL Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/dssetup.c trunk/reactos/dll/win32/lsasrv/privileges.c trunk/reactos/dll/win32/lsasrv/registry.c trunk/reactos/dll/win32/lsasrv/security.c trunk/reactos/dll/win32/lsasrv/service.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -950,7 +950,7 @@ Groups->GroupCount = 1; Groups->Groups[0].Sid = Sid; - Groups->Groups[0].Attributes = + Groups->Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; *TokenGroups = Groups; @@ -985,7 +985,7 @@ } Groups->Groups[Groups->GroupCount].Sid = Sid; - Groups->Groups[Groups->GroupCount].Attributes = + Groups->Groups[Groups->GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; Groups->GroupCount++; Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -254,11 +254,11 @@ /* Initialize the audit log attribute */ AuditLogInfo.AuditLogPercentFull = 0; - AuditLogInfo.MaximumLogSize = 0; // DWORD - AuditLogInfo.AuditRetentionPeriod.QuadPart = 0; // LARGE_INTEGER - AuditLogInfo.AuditLogFullShutdownInProgress = 0; // BYTE - AuditLogInfo.TimeToShutdown.QuadPart = 0; // LARGE_INTEGER - AuditLogInfo.NextAuditRecordId = 0; // DWORD + AuditLogInfo.MaximumLogSize = 0; // DWORD + AuditLogInfo.AuditRetentionPeriod.QuadPart = 0; // LARGE_INTEGER + AuditLogInfo.AuditLogFullShutdownInProgress = 0; // BYTE + AuditLogInfo.TimeToShutdown.QuadPart = 0; // LARGE_INTEGER + AuditLogInfo.NextAuditRecordId = 0; // DWORD /* Initialize the Audit Events attribute */ AuditEventsInfo = RtlAllocateHeap(RtlGetProcessHeap(), @@ -273,7 +273,7 @@ AuditEventsInfo->AuditEvents[i] = 0; /* Initialize the DNS Domain GUID attribute */ - memset(&DnsDomainGuid, 0, sizeof(GUID)); + RtlZeroMemory(&DnsDomainGuid, sizeof(DnsDomainGuid)); /* Initialize the modification attribute */ ModificationInfo.ModifiedId.QuadPart = 0; @@ -323,31 +323,31 @@ LsapSetObjectAttribute(PolicyObject, L"DefQuota", &QuotaInfo, - sizeof(POLICY_DEFAULT_QUOTA_INFO)); + sizeof(QuotaInfo)); /* Set the modification attribute */ LsapSetObjectAttribute(PolicyObject, L"PolMod", &ModificationInfo, - sizeof(POLICY_MODIFICATION_INFO)); + sizeof(ModificationInfo)); /* Set the audit full attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAdtFl", &AuditFullInfo, - sizeof(POLICY_AUDIT_FULL_QUERY_INFO)); + sizeof(AuditFullInfo)); /* Set the audit log attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAdtLg", &AuditLogInfo, - sizeof(POLICY_AUDIT_LOG_INFO)); + sizeof(AuditLogInfo)); /* Set the audit events attribute */ LsapSetObjectAttribute(PolicyObject, L"PolAdtEv", AuditEventsInfo, - sizeof(LSAP_POLICY_AUDIT_EVENTS_DATA)); + sizeof(*AuditEventsInfo)); /* Set the DNS Domain Name attribute */ LsapSetObjectAttribute(PolicyObject, @@ -365,7 +365,7 @@ LsapSetObjectAttribute(PolicyObject, L"PolDnDmG", &DnsDomainGuid, - sizeof(GUID)); + sizeof(DnsDomainGuid)); /* Set the Security Descriptor */ LsapSetObjectAttribute(PolicyObject, @@ -912,7 +912,7 @@ { Status = LsapRegEnumerateSubKey(DbObject->KeyHandle, Index, - 64 * sizeof(WCHAR), + sizeof(KeyName), KeyName); if (!NT_SUCCESS(Status)) break; @@ -1081,4 +1081,3 @@ } /* EOF */ - Modified: trunk/reactos/dll/win32/lsasrv/dssetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/dssetup.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/dssetup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/dssetup.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -46,7 +46,7 @@ ULONG Size; NTSTATUS Status; - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); + RtlZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); Status = LsarOpenPolicy(NULL, &ObjectAttributes, POLICY_VIEW_LOCAL_INFORMATION, @@ -142,7 +142,7 @@ { NET_API_STATUS ret; - TRACE("DsRolerGetPrimaryDomainInformation(%p, %d, %p)\n", + TRACE("DsRolerGetPrimaryDomainInformation(%p, %d, %p)\n", hBinding, InfoLevel, DomainInfo); switch (InfoLevel) Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -88,7 +88,7 @@ return STATUS_NO_SUCH_PRIVILEGE; } - for (Priv = 0; Priv < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); Priv++) + for (Priv = 0; Priv < ARRAYSIZE(WellKnownPrivileges); Priv++) { if (Value->LowPart == WellKnownPrivileges[Priv].Luid.LowPart && Value->HighPart == WellKnownPrivileges[Priv].Luid.HighPart) @@ -162,7 +162,7 @@ if (Name->Length == 0 || Name->Buffer == NULL) return NULL; - for (Priv = 0; Priv < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); Priv++) + for (Priv = 0; Priv < ARRAYSIZE(WellKnownPrivileges); Priv++) { if (_wcsicmp(Name->Buffer, WellKnownPrivileges[Priv].Name) == 0) return (PLUID)&(WellKnownPrivileges[Priv].Luid); @@ -187,7 +187,7 @@ EnumIndex = *EnumerationContext; - for (; EnumIndex < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); EnumIndex++) + for (; EnumIndex < ARRAYSIZE(WellKnownPrivileges); EnumIndex++) { TRACE("EnumIndex: %lu\n", EnumIndex); TRACE("Privilege Name: %S\n", WellKnownPrivileges[EnumIndex].Name); @@ -276,7 +276,7 @@ PRPC_UNICODE_STRING NameBuffer; ULONG i; - for (i = 0; i < sizeof(WellKnownRights) / sizeof(WellKnownRights[0]); i++) + for (i = 0; i < ARRAYSIZE(WellKnownRights); i++) { if (WellKnownRights[i].Flag == RightValue) { @@ -315,7 +315,7 @@ if (Name->Length == 0 || Name->Buffer == NULL) return 0; - for (i = 0; i < sizeof(WellKnownRights) / sizeof(WellKnownRights[0]); i++) + for (i = 0; i < ARRAYSIZE(WellKnownRights); i++) { if (_wcsicmp(Name->Buffer, WellKnownRights[i].Name) == 0) return WellKnownRights[i].Flag; Modified: trunk/reactos/dll/win32/lsasrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -132,7 +132,7 @@ KeyInfo->NameLength); /* Terminate the string */ - Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; } else { @@ -268,7 +268,7 @@ ValueInfo->NameLength); /* Terminate the string */ - Name[ValueInfo->NameLength / sizeof(WCHAR)] = 0; + Name[ValueInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; } else { @@ -295,7 +295,7 @@ { WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); if ((ptr > (WCHAR *)Data) && ptr[-1]) - *ptr = 0; + *ptr = UNICODE_NULL; } } else @@ -383,7 +383,7 @@ { WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); if ((ptr > (WCHAR *)Data) && ptr[-1]) - *ptr = 0; + *ptr = UNICODE_NULL; } } Modified: trunk/reactos/dll/win32/lsasrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/security.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/security.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -125,7 +125,7 @@ /* Allocate and initialize the DACL */ DaclSize = sizeof(ACL) + - sizeof(ACCESS_DENIED_ACE) - sizeof(ULONG) + RtlLengthSid(AnonymousSid) + + sizeof(ACCESS_DENIED_ACE) - sizeof(ULONG) + RtlLengthSid(AnonymousSid) + sizeof(ACCESS_ALLOWED_ACE) - sizeof(ULONG) + RtlLengthSid(AdministratorsSid) + sizeof(ACCESS_ALLOWED_ACE) - sizeof(ULONG) + RtlLengthSid(EveryoneSid) + sizeof(ACCESS_ALLOWED_ACE) - sizeof(ULONG) + RtlLengthSid(AnonymousSid) + Modified: trunk/reactos/dll/win32/lsasrv/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/service.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/service.c [iso-8859-1] Mon Nov 14 16:17:42 2016 @@ -21,4 +21,4 @@ return STATUS_SUCCESS; } -/* EOF */ +/* EOF */

8 years, 1 month

[phater] 73231: [MSAFD] When out of band data is inlined, calling WSPRecv/WSPRecvFrom with flag MSG_OOB is invalid, return WSAEINVAL. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Nov 14 14:10:48 2016 New Revision: 73231 URL: http://svn.reactos.org/svn/reactos?rev=73231&view=rev Log: [MSAFD] When out of band data is inlined, calling WSPRecv/WSPRecvFrom with flag MSG_OOB is invalid, return WSAEINVAL. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Nov 14 14:10:48 2016 @@ -191,6 +191,12 @@ { if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + if (Socket->SharedData->OobInline && ReceiveFlags && (*ReceiveFlags & MSG_OOB) != 0) + { + if (lpErrno) + *lpErrno = WSAEINVAL; return SOCKET_ERROR; } @@ -379,6 +385,12 @@ { if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + if (Socket->SharedData->OobInline && ReceiveFlags && (*ReceiveFlags & MSG_OOB) != 0) + { + if (lpErrno) + *lpErrno = WSAEINVAL; return SOCKET_ERROR; }

8 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016