Ros-diffs

ros-diffs@reactos.org

81390 discussions

[phater] 73193: [WS2_32_APITEST] Use test.winehq.org insteadof reactos.org. These days main reactos page is too big.
by phater＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: phater Date: Thu Nov 10 14:23:49 2016 New Revision: 73193 URL: http://svn.reactos.org/svn/reactos?rev=73193&view=rev Log: [WS2_32_APITEST] Use test.winehq.org insteadof reactos.org. These days main reactos page is too big. Modified: trunk/rostests/apitests/ws2_32/helpers.c Modified: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Thu Nov 10 14:23:49 2016 @@ -34,7 +34,7 @@ struct sockaddr_in sa; /* Connect to "www.reactos.org" */ - host = gethostbyname("www.reactos.org"); + host = gethostbyname("test.winehq.org"); sa.sin_family = AF_INET; sa.sin_addr.s_addr = *(u_long*)host->h_addr_list[0];

1 0

[phater] 73192: [MSAFD] Fix for WSPStringToAddressA/W wine tests. CORE-12104
by phater＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: phater Date: Thu Nov 10 11:15:14 2016 New Revision: 73192 URL: http://svn.reactos.org/svn/reactos?rev=73192&view=rev Log: [MSAFD] Fix for WSPStringToAddressA/W wine tests. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Nov 10 11:15:14 2016 @@ -2898,8 +2898,9 @@ IN OUT LPINT lpAddressLength, OUT LPINT lpErrno) { - int pos = 0; - LONG inetaddr = 0; + int numdots = 0; + USHORT port; + LONG inetaddr = 0, ip_part; LPWSTR *bp = NULL; SOCKADDR_IN *sockaddr; @@ -2926,47 +2927,74 @@ { if (*lpAddressLength < (INT)sizeof(SOCKADDR_IN)) { - *lpAddressLength = sizeof(SOCKADDR_IN); if (lpErrno) *lpErrno = WSAEFAULT; } else { // translate ip string to ip + /* Get ip number */ + bp = &AddressString; + inetaddr = 0; + + while (*bp < &AddressString[wcslen(AddressString)]) + { + ip_part = wcstol(*bp, bp, 10); + /* ip part number should be in range 0-255 */ + if (ip_part < 0 || ip_part > 255) + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + inetaddr = (inetaddr << 8) + ip_part; + /* we end on string end or port separator */ + if ((*bp)[0] == 0 || (*bp)[0] == L':') + break; + /* ip parts are dot separated. verify it */ + if ((*bp)[0] != L'.') + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + /* count the dots */ + numdots++; + /* move over the dot to next ip part */ + (*bp)++; + } + + /* check dots count */ + if (numdots != 3) + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + + /* Get port number */ + if ((*bp)[0] == L':') + { + /* move over the column to port part */ + (*bp)++; + /* next char should be numeric */ + if ((*bp)[0] < L'0' || (*bp)[0] > L'9') + { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + port = wcstol(*bp, bp, 10); + } + else + { + port = 0; + } + + if (lpErrno) *lpErrno = NO_ERROR; /* rest sockaddr.sin_addr.s_addr for we need to be sure it is zero when we come to while */ - memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - - /* Set right adress family */ + *lpAddressLength = sizeof(*sockaddr); + memset(lpAddress, 0, sizeof(*sockaddr)); sockaddr->sin_family = AF_INET; - - /* Get port number */ - pos = wcscspn(AddressString, L":") + 1; - - if (pos < (int)wcslen(AddressString)) - { - sockaddr->sin_port = wcstol(&AddressString[pos], bp, 10); - } - else - { - sockaddr->sin_port = 0; - } - - /* Get ip number */ - pos = 0; - inetaddr = 0; - - while (pos < (int)wcslen(AddressString)) - { - inetaddr = (inetaddr << 8) + - ((UCHAR)wcstol(&AddressString[pos], bp, 10)); - - pos += wcscspn(&AddressString[pos], L".") + 1; - } - - if (lpErrno) *lpErrno = NO_ERROR; sockaddr->sin_addr.s_addr = inetaddr; - + sockaddr->sin_port = port; } }

1 0

[tfaber] 73191: [FASTFAT] - Generate LFNs for files containing non-ASCII characters in their names. CORE-8617 #resolve
by tfaber＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: tfaber Date: Thu Nov 10 11:04:29 2016 New Revision: 73191 URL: http://svn.reactos.org/svn/reactos?rev=73191&view=rev Log: [FASTFAT] - Generate LFNs for files containing non-ASCII characters in their names. CORE-8617 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Thu Nov 10 11:04:29 2016 @@ -298,10 +298,13 @@ PVOID Context = NULL; PFAT_DIR_ENTRY pFatEntry; slot *pSlots; - USHORT nbSlots = 0, j, posCar; + USHORT nbSlots = 0, j; PUCHAR Buffer; BOOLEAN needTilde = FALSE, needLong = FALSE; - BOOLEAN lCaseBase = FALSE, uCaseBase, lCaseExt = FALSE, uCaseExt; + BOOLEAN BaseAllLower, BaseAllUpper; + BOOLEAN ExtensionAllLower, ExtensionAllUpper; + BOOLEAN InExtension; + WCHAR c; ULONG CurrentCluster; LARGE_INTEGER SystemTime, FileOffset; NTSTATUS Status = STATUS_SUCCESS; @@ -386,53 +389,51 @@ return STATUS_UNSUCCESSFUL; } IsNameLegal = RtlIsNameLegalDOS8Dot3(&DirContext.ShortNameU, &NameA, &SpacesFound); - aName[NameA.Length]=0; - } - else - { - aName[NameA.Length] = 0; - for (posCar = 0; posCar < DirContext.LongNameU.Length / sizeof(WCHAR); posCar++) - { - if (DirContext.LongNameU.Buffer[posCar] == L'.') - { + } + else + { + BaseAllLower = BaseAllUpper = TRUE; + ExtensionAllLower = ExtensionAllUpper = TRUE; + InExtension = FALSE; + for (i = 0; i < DirContext.LongNameU.Length / sizeof(WCHAR); i++) + { + c = DirContext.LongNameU.Buffer[i]; + if (c >= L'A' && c <= L'Z') + { + if (InExtension) + ExtensionAllLower = FALSE; + else + BaseAllLower = FALSE; + } + else if (c >= L'a' && c <= L'z') + { + if (InExtension) + ExtensionAllUpper = FALSE; + else + BaseAllUpper = FALSE; + } + else if (c > 0x7f) + { + needLong = TRUE; break; } - } - /* check if the name and the extension contains upper case characters */ - RtlDowncaseUnicodeString(&DirContext.ShortNameU, &DirContext.LongNameU, FALSE); - DirContext.ShortNameU.Buffer[DirContext.ShortNameU.Length / sizeof(WCHAR)] = 0; - uCaseBase = wcsncmp(DirContext.LongNameU.Buffer, - DirContext.ShortNameU.Buffer, posCar) ? TRUE : FALSE; - if (posCar < DirContext.LongNameU.Length/sizeof(WCHAR)) - { - i = DirContext.LongNameU.Length / sizeof(WCHAR) - posCar; - uCaseExt = wcsncmp(DirContext.LongNameU.Buffer + posCar, - DirContext.ShortNameU.Buffer + posCar, i) ? TRUE : FALSE; - } - else - { - uCaseExt = FALSE; - } - /* check if the name and the extension contains lower case characters */ + + if (c == L'.') + { + InExtension = TRUE; + } + } + + if ((!BaseAllLower && !BaseAllUpper) || + (!ExtensionAllLower && !ExtensionAllUpper)) + { + needLong = TRUE; + } + RtlUpcaseUnicodeString(&DirContext.ShortNameU, &DirContext.LongNameU, FALSE); DirContext.ShortNameU.Buffer[DirContext.ShortNameU.Length / sizeof(WCHAR)] = 0; - lCaseBase = wcsncmp(DirContext.LongNameU.Buffer, - DirContext.ShortNameU.Buffer, posCar) ? TRUE : FALSE; - if (posCar < DirContext.LongNameU.Length / sizeof(WCHAR)) - { - i = DirContext.LongNameU.Length / sizeof(WCHAR) - posCar; - lCaseExt = wcsncmp(DirContext.LongNameU.Buffer + posCar, - DirContext.ShortNameU.Buffer + posCar, i) ? TRUE : FALSE; - } - else - { - lCaseExt = FALSE; - } - if ((lCaseBase && uCaseBase) || (lCaseExt && uCaseExt)) - { - needLong = TRUE; - } - } + } + aName[NameA.Length] = 0; DPRINT("'%s', '%wZ', needTilde=%u, needLong=%u\n", aName, &DirContext.LongNameU, needTilde, needLong); memset(DirContext.DirEntry.Fat.ShortName, ' ', 11); @@ -465,11 +466,11 @@ else { nbSlots = 1; - if (lCaseBase) + if (BaseAllLower && !BaseAllUpper) { DirContext.DirEntry.Fat.lCase |= VFAT_CASE_LOWER_BASE; } - if (lCaseExt) + if (ExtensionAllLower && !ExtensionAllUpper) { DirContext.DirEntry.Fat.lCase |= VFAT_CASE_LOWER_EXT; }

1 0

[tfaber] 73190: [NTDLL_APITEST] - Add tests for RtlIsNameLegalDOS8Dot3 and RtlUpcaseUnicodeStringToCountedOemString with the ® sign. CORE-8617
by tfaber＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: tfaber Date: Thu Nov 10 10:18:25 2016 New Revision: 73190 URL: http://svn.reactos.org/svn/reactos?rev=73190&view=rev Log: [NTDLL_APITEST] - Add tests for RtlIsNameLegalDOS8Dot3 and RtlUpcaseUnicodeStringToCountedOemString with the ® sign. CORE-8617 Added: trunk/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c (with props) trunk/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Thu Nov 10 10:18:25 2016 @@ -40,8 +40,10 @@ RtlGetLongestNtPathLength.c RtlImageRvaToVa.c RtlInitializeBitMap.c + RtlIsNameLegalDOS8Dot3.c RtlMemoryStream.c RtlReAllocateHeap.c + RtlUpcaseUnicodeStringToCountedOemString.c StackOverflow.c SystemInfo.c Timer.c Added: trunk/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlIsNameL… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c (added) +++ trunk/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c [iso-8859-1] Thu Nov 10 10:18:25 2016 @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlIsNameLegalDOS8Dot3 + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> + +START_TEST(RtlIsNameLegalDOS8Dot3) +{ + UNICODE_STRING Name; + CHAR OemNameBuffer[13]; + OEM_STRING OemName; + BOOLEAN NameContainsSpaces; + BOOLEAN IsLegal; + + RtlInitUnicodeString(&Name, L"\x00ae"); + RtlFillMemory(OemNameBuffer, sizeof(OemNameBuffer), 0x55); + OemName.Buffer = OemNameBuffer; + OemName.Length = 0; + OemName.MaximumLength = sizeof(OemNameBuffer); + NameContainsSpaces = 0x55; + IsLegal = RtlIsNameLegalDOS8Dot3(&Name, &OemName, &NameContainsSpaces); + ok(IsLegal == TRUE, "IsLegal = %u\n", IsLegal); + ok(NameContainsSpaces == FALSE, "NameContainsSpaces = %u\n", NameContainsSpaces); + ok(OemName.Length == 1, "OemName.Length = %u\n", OemName.Length); + ok(OemNameBuffer[0] == 'R', "OemNameBuffer[0] = 0x%x\n", OemNameBuffer[0]); + ok(OemNameBuffer[1] == 0x55, "OemNameBuffer[1] = 0x%x\n", OemNameBuffer[1]); + ok(OemNameBuffer[2] == 0x55, "OemNameBuffer[2] = 0x%x\n", OemNameBuffer[2]); + +} Propchange: trunk/rostests/apitests/ntdll/RtlIsNameLegalDOS8Dot3.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlUpcaseU… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c (added) +++ trunk/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c [iso-8859-1] Thu Nov 10 10:18:25 2016 @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlUpcaseUnicodeStringToCountedOemString + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> + +START_TEST(RtlUpcaseUnicodeStringToCountedOemString) +{ + NTSTATUS Status; + UNICODE_STRING Name; + CHAR OemNameBuffer[13]; + OEM_STRING OemName; + + RtlInitUnicodeString(&Name, L"\x00ae"); + RtlFillMemory(OemNameBuffer, sizeof(OemNameBuffer), 0x55); + OemName.Buffer = OemNameBuffer; + OemName.Length = 0; + OemName.MaximumLength = sizeof(OemNameBuffer); + Status = RtlUpcaseUnicodeStringToCountedOemString(&OemName, &Name, FALSE); + ok(Status == STATUS_SUCCESS, "Status = 0x%lx\n", Status); + ok(OemName.Length == 1, "OemName.Length = %u\n", OemName.Length); + ok(OemNameBuffer[0] == 'R', "OemNameBuffer[0] = 0x%x\n", OemNameBuffer[0]); + ok(OemNameBuffer[1] == 0x55, "OemNameBuffer[1] = 0x%x\n", OemNameBuffer[1]); + ok(OemNameBuffer[2] == 0x55, "OemNameBuffer[2] = 0x%x\n", OemNameBuffer[2]); +} Propchange: trunk/rostests/apitests/ntdll/RtlUpcaseUnicodeStringToCountedOemString.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Thu Nov 10 10:18:25 2016 @@ -44,8 +44,10 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlImageRvaToVa(void); extern void func_RtlInitializeBitMap(void); +extern void func_RtlIsNameLegalDOS8Dot3(void); extern void func_RtlMemoryStream(void); extern void func_RtlReAllocateHeap(void); +extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); extern void func_StackOverflow(void); extern void func_TimerResolution(void); @@ -92,8 +94,10 @@ { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlImageRvaToVa", func_RtlImageRvaToVa }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, + { "RtlIsNameLegalDOS8Dot3", func_RtlIsNameLegalDOS8Dot3 }, { "RtlMemoryStream", func_RtlMemoryStream }, { "RtlReAllocateHeap", func_RtlReAllocateHeap }, + { "RtlUpcaseUnicodeStringToCountedOemString", func_RtlUpcaseUnicodeStringToCountedOemString }, { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution },

1 0

[gadamopoulos] 73189: [SHELL32] - CStartMenu: Add missing checks for failure and make some checks noisy. CORE-12300
by gadamopoulos＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: gadamopoulos Date: Thu Nov 10 09:34:14 2016 New Revision: 73189 URL: http://svn.reactos.org/svn/reactos?rev=73189&view=rev Log: [SHELL32] - CStartMenu: Add missing checks for failure and make some checks noisy. CORE-12300 Modified: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] Thu Nov 10 09:34:14 2016 @@ -167,6 +167,8 @@ return hr; hr = pShellMenu->Initialize(this, 0, ANCESTORDEFAULT, SMINIT_VERTICAL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; switch (psmd->uId) { @@ -188,11 +190,22 @@ LPITEMIDLIST pidlStartMenu; IShellFolder *psfDestop; hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = SHGetDesktopFolder(&psfDestop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; } hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } else { @@ -202,6 +215,8 @@ if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii)) { hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; } } return pShellMenu->QueryInterface(iid, pv); @@ -475,7 +490,7 @@ /* psf is a merged folder, so now we want to get the pidl of the programs item from the merged folder */ { hr = SHGetSpecialFolderLocation(NULL, CSIDL_PROGRAMS, &pidlProgramsAbsolute); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { WARN("USER Programs folder not found."); hr = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_PROGRAMS, &pidlProgramsAbsolute); @@ -489,11 +504,11 @@ TCHAR szDisplayName[MAX_PATH]; hr = SHBindToParent(pidlProgramsAbsolute, IID_PPV_ARG(IShellFolder, &psfParent), &pcidlPrograms); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; hr = psfParent->GetDisplayNameOf(pcidlPrograms, SHGDN_FORPARSING | SHGDN_INFOLDER, &str); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; StrRetToBuf(&str, pcidlPrograms, szDisplayName, _countof(szDisplayName)); @@ -501,7 +516,7 @@ /* We got the display name from the fs folder and we parse it with the merged folder here */ hr = psf->ParseDisplayName(NULL, NULL, szDisplayName, NULL, &pidlPrograms, NULL); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; }

1 0

[gadamopoulos] 73188: [SHELL32] - CMenuBand: Don't accept a NULL shell folder in SetShellFolder. Should fix a test and possibly CORE-12300.
by gadamopoulos＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: gadamopoulos Date: Thu Nov 10 08:10:28 2016 New Revision: 73188 URL: http://svn.reactos.org/svn/reactos?rev=73188&view=rev Log: [SHELL32] - CMenuBand: Don't accept a NULL shell folder in SetShellFolder. Should fix a test and possibly CORE-12300. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Thu Nov 10 08:10:28 2016 @@ -672,6 +672,9 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) { + if (!psf) + return E_INVALIDARG; + if (m_SFToolbar == NULL) { m_SFToolbar = new CMenuSFToolbar(this);

1 0

[gadamopoulos] 73187: [SHELL32] - Make some checks for failure in CDefView and CDefaultContextMenu noisy.
by gadamopoulos＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: gadamopoulos Date: Thu Nov 10 08:05:13 2016 New Revision: 73187 URL: http://svn.reactos.org/svn/reactos?rev=73187&view=rev Log: [SHELL32] - Make some checks for failure in CDefView and CDefaultContextMenu noisy. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Nov 10 08:05:13 2016 @@ -1212,7 +1212,11 @@ if (GetKeyState(VK_CONTROL) & 0x8000) cmi.fMask |= CMIC_MASK_CONTROL_DOWN; - return m_pCM->InvokeCommand(&cmi); + HRESULT hr = m_pCM->InvokeCommand(&cmi); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } /********************************************************** @@ -1237,13 +1241,13 @@ return E_FAIL; hResult = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pCM)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; IUnknown_SetSite(m_pCM, (IShellView *)this); hResult = m_pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; uCommand = GetMenuDefaultItem(hMenu, FALSE, 0); @@ -1290,13 +1294,13 @@ m_cidl = m_ListView.GetSelectedCount(); hResult = GetItemObject( m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); - if (FAILED( hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; IUnknown_SetSite(m_pCM, (IShellView *)this); hResult = m_pCM->QueryContextMenu(m_hContextMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); - if (FAILED( hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) goto cleanup; uCommand = TrackPopupMenu(m_hContextMenu, @@ -1336,13 +1340,13 @@ return 0; hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_PPV_ARG(IContextMenu, &m_pCM)); - if (FAILED( hResult)) + if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; IUnknown_SetSite(m_pCM, (IShellView *)this); hResult = m_pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); - if (FAILED( hResult)) + if (FAILED_UNEXPECTEDLY( hResult)) goto cleanup; InvokeContextMenuCommand(uCommand); @@ -1688,11 +1692,8 @@ if (m_pSF2Parent) { SHELLDETAILS sd; - if (FAILED(m_pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd))) - { - FIXME("failed to get details\n"); + if (FAILED_UNEXPECTEDLY(m_pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd))) break; - } if (lpnmh->code == LVN_GETDISPINFOA) { @@ -2228,7 +2229,7 @@ IContextMenu* pcm; hr = CDefFolderMenu_Create2(NULL, NULL, 0, NULL, m_pSFParent, NULL, 0, NULL, &pcm); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; *ppvOut = pcm; } @@ -2238,9 +2239,7 @@ { hr = CDefViewDual_Constructor(riid, (LPVOID*)&m_pShellFolderViewDual); if (FAILED_UNEXPECTEDLY(hr)) - { return hr; - } } hr = m_pShellFolderViewDual->QueryInterface(riid, ppvOut); } @@ -2249,6 +2248,8 @@ case SVGIO_SELECTION: GetSelections(); hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, riid, 0, ppvOut); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; break; } 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] Thu Nov 10 08:05:13 2016 @@ -360,9 +360,7 @@ PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); if (!pEntry) - { return E_OUTOFMEMORY; - } pEntry->iIdCmdFirst = 0; pEntry->pNext = NULL; @@ -829,7 +827,11 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - return psv->Refresh(); + hr = psv->Refresh(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink) @@ -932,7 +934,11 @@ m_pDataObj->SetData(&formatetc, &medium, TRUE); } - return OleSetClipboard(m_pDataObj); + HRESULT hr = OleSetClipboard(m_pDataObj); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } HRESULT CDefaultContextMenu::DoRename(LPCMINVOKECOMMANDINFO lpcmi) @@ -954,7 +960,10 @@ return hr; SVSIF selFlags = SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; - lpSV->SelectItem(m_apidl[0], selFlags); + hr = lpSV->SelectItem(m_apidl[0], selFlags); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; } @@ -1115,10 +1124,12 @@ hr = psv->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; SHFree(pidl); - return hr; + return S_OK; } PDynamicShellEntry CDefaultContextMenu::GetDynamicEntry(UINT idCmd) @@ -1216,7 +1227,7 @@ /* Try to get the flag from the verb */ hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"shell\\%s", pEntry->szVerb); - if (!SUCCEEDED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return 0; cbVerb = sizeof(wFlags); @@ -1650,7 +1661,11 @@ if (!pdcm->aKeys && pdcm->cidl) HackFillKeys((DEFCONTEXTMENU *)pdcm, hkeyHack); - return CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); + HRESULT hr = CDefaultContextMenu_CreateInstance(pdcm, riid, ppv); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } /************************************************************************* @@ -1683,6 +1698,8 @@ pdcm.aKeys = ahkeyClsKeys; HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_PPV_ARG(IContextMenu, ppcm)); - return hr; -} - + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Thu Nov 10 08:05:13 2016 @@ -54,8 +54,8 @@ { CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit,&initIcon)); - if (FAILED(hr)) - return NULL; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* FIXME: other icons for default, network, print to file */ initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_PRINTER);

1 0

[mjansen] 73186: and of course also rename the test itself...
by mjansen＠svn.reactos.org 09 Nov '16

09 Nov '16

Author: mjansen Date: Wed Nov 9 23:23:50 2016 New Revision: 73186 URL: http://svn.reactos.org/svn/reactos?rev=73186&view=rev Log: and of course also rename the test itself... Modified: trunk/rostests/apitests/shell32/ShellExecuteEx.cpp trunk/rostests/apitests/shell32/testlist.c Modified: trunk/rostests/apitests/shell32/ShellExecuteEx.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/ShellExe… ============================================================================== --- trunk/rostests/apitests/shell32/ShellExecuteEx.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/ShellExecuteEx.cpp [iso-8859-1] Wed Nov 9 23:23:50 2016 @@ -84,7 +84,7 @@ } } -START_TEST(shlexec) +START_TEST(ShellExecuteEx) { ok_ShellExecuteEx(L"iexplore", TRUE); ok_ShellExecuteEx(L"iexplore.exe", TRUE); Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Wed Nov 9 23:23:50 2016 @@ -7,8 +7,8 @@ extern void func_CShellDesktop(void); extern void func_CShellLink(void); extern void func_menu(void); +extern void func_ShellExecuteEx(void); extern void func_SHParseDisplayName(void); -extern void func_shlexec(void); const struct test winetest_testlist[] = { @@ -16,7 +16,7 @@ { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, { "menu", func_menu }, + { "ShellExecuteEx", func_ShellExecuteEx }, { "SHParseDisplayName", func_SHParseDisplayName }, - { "shlexec", func_shlexec }, { 0, 0 } };

1 0

[mjansen] 73185: Rename shlexec.cpp to ShellExecuteEx.cpp as suggested by Thomas.
by mjansen＠svn.reactos.org 09 Nov '16

09 Nov '16

Author: mjansen Date: Wed Nov 9 23:18:23 2016 New Revision: 73185 URL: http://svn.reactos.org/svn/reactos?rev=73185&view=rev Log: Rename shlexec.cpp to ShellExecuteEx.cpp as suggested by Thomas. Added: trunk/rostests/apitests/shell32/ShellExecuteEx.cpp - copied unchanged from r73184, trunk/rostests/apitests/shell32/shlexec.cpp Removed: trunk/rostests/apitests/shell32/shlexec.cpp Modified: trunk/rostests/apitests/shell32/CMakeLists.txt Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 9 23:18:23 2016 @@ -8,9 +8,9 @@ CShellDesktop.cpp CShellLink.cpp menu.cpp + ShellExecuteEx.cpp shelltest.cpp SHParseDisplayName.cpp - shlexec.cpp testlist.c) target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) Removed: trunk/rostests/apitests/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shlexec.… ============================================================================== --- trunk/rostests/apitests/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/shlexec.cpp (removed) @@ -1,105 +0,0 @@ -/* - * PROJECT: ReactOS api tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Testing ShellExecuteEx - * PROGRAMMER: Yaroslav Veremenko <yaroslav(a)veremenko.info> - */ - - -#include "shelltest.h" - - - -#define ok_ShellExecuteEx (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : TestShellExecuteEx - -static -BOOL -CreateAppPathRegKey(const WCHAR* Name) -{ - HKEY RegistryKey; - LONG Result; - WCHAR Buffer[1024]; - WCHAR KeyValue[1024]; - DWORD Length = sizeof(KeyValue); - DWORD Disposition; - - wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); - wcscat(Buffer, L"IEXPLORE.EXE"); - Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_READ, &RegistryKey); - if (Result != ERROR_SUCCESS) trace("Could not open iexplore.exe key. Status: %lu\n", Result); - if (Result) goto end; - Result = RegQueryValueExW(RegistryKey, NULL, NULL, NULL, (LPBYTE)KeyValue, &Length); - if (Result != ERROR_SUCCESS) trace("Could not read iexplore.exe key. Status: %lu\n", Result); - if (Result) goto end; - RegCloseKey(RegistryKey); - - wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); - wcscat(Buffer, Name); - Result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, NULL, - 0, KEY_WRITE, NULL, &RegistryKey, &Disposition); - if (Result != ERROR_SUCCESS) trace("Could not create test key. Status: %lu\n", Result); - if (Result) goto end; - Result = RegSetValueW(RegistryKey, NULL, REG_SZ, KeyValue, 0); - if (Result != ERROR_SUCCESS) trace("Could not set value of the test key. Status: %lu\n", Result); - if (Result) goto end; - RegCloseKey(RegistryKey); -end: - if (RegistryKey) RegCloseKey(RegistryKey); - return Result == ERROR_SUCCESS; -} - -static -VOID -DeleteAppPathRegKey(const WCHAR* Name) -{ - LONG Result; - WCHAR Buffer[1024]; - wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); - wcscat(Buffer, Name); - Result = RegDeleteKeyW(HKEY_LOCAL_MACHINE, Buffer); - if (Result != ERROR_SUCCESS) trace("Could not remove the test key. Status: %lu\n", Result); -} - -static -VOID -TestShellExecuteEx(const WCHAR* Name, BOOL ExpectedResult) -{ - SHELLEXECUTEINFOW ShellExecInfo; - BOOL Result; - ZeroMemory(&ShellExecInfo, sizeof(ShellExecInfo)); - ShellExecInfo.cbSize = sizeof(ShellExecInfo); - ShellExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI; - ShellExecInfo.hwnd = NULL; - ShellExecInfo.nShow = SW_SHOWNORMAL; - ShellExecInfo.lpFile = Name; - ShellExecInfo.lpDirectory = NULL; - Result = ShellExecuteExW(&ShellExecInfo); - ok(Result == ExpectedResult, "ShellExecuteEx lpFile %s failed. Error: %lu\n", wine_dbgstr_w(Name), GetLastError()); - if (ShellExecInfo.hProcess) - { - Result = TerminateProcess(ShellExecInfo.hProcess, 0); - if (!Result) trace("Terminate process failed. Error: %lu\n", GetLastError()); - WaitForSingleObject(ShellExecInfo.hProcess, INFINITE); - CloseHandle(ShellExecInfo.hProcess); - } -} - -START_TEST(shlexec) -{ - ok_ShellExecuteEx(L"iexplore", TRUE); - ok_ShellExecuteEx(L"iexplore.exe", TRUE); - - if (CreateAppPathRegKey(L"iexplore.bat")) - { - ok_ShellExecuteEx(L"iexplore.bat", TRUE); - ok_ShellExecuteEx(L"iexplore.bat.exe", FALSE); - DeleteAppPathRegKey(L"iexplore.bat"); - } - - if (CreateAppPathRegKey(L"iexplore.bat.exe")) - { - ok_ShellExecuteEx(L"iexplore.bat", FALSE); - ok_ShellExecuteEx(L"iexplore.bat.exe", TRUE); - DeleteAppPathRegKey(L"iexplore.bat.exe"); - } -}

1 0

[tfaber] 73184: [PROPSYS_WINETEST] - Fix VS2010 build
by tfaber＠svn.reactos.org 09 Nov '16

09 Nov '16

Author: tfaber Date: Wed Nov 9 22:55:16 2016 New Revision: 73184 URL: http://svn.reactos.org/svn/reactos?rev=73184&view=rev Log: [PROPSYS_WINETEST] - Fix VS2010 build Modified: trunk/rostests/winetests/propsys/propsys.c Modified: trunk/rostests/winetests/propsys/propsys.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys… ============================================================================== --- trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] Wed Nov 9 22:55:16 2016 @@ -353,7 +353,7 @@ } testcases[] = { {NULL, NULL, E_POINTER}, - {NULL, &out, E_POINTER, out_init}, + {NULL, &out, E_POINTER, {GUID_MEMBERS(out_init.fmtid), out_init.pid}}, {emptyW, NULL, E_POINTER}, {emptyW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}}, {fmtid_clsidW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},

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