Ros-diffs June 2018

ros-diffs@reactos.org

26 participants
174 discussions

01/01: [NETAPI32_APITEST] Fix a NULL dereference of pInfo
by Serge Gautherie 17 Jun '18

17 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15c29d0798a464f021230… commit 15c29d0798a464f0212301fa96a9bc6e34773998 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jun 8 16:24:05 2018 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Jun 17 12:16:08 2018 +0200 [NETAPI32_APITEST] Fix a NULL dereference of pInfo With DPH enabled, {{ Unhandled exception ExceptionCode: c0000005 Faulting Address: 0 ... modules/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c:23 (func_DsRoleGetPrimaryDomainInformation) ... }} --- .../apitests/netapi32/DsRoleGetPrimaryDomainInformation.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c b/modules/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c index 4882d35620..900ecd46aa 100644 --- a/modules/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c +++ b/modules/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for DsRoleGetPrimaryDomainInformation * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) + * Copyright 2018 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include <apitest.h> @@ -20,8 +21,12 @@ START_TEST(DsRoleGetPrimaryDomainInformation) // Get information about the domain membership of this computer. dwErrorCode = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (PBYTE*)&pInfo); ok(dwErrorCode == ERROR_SUCCESS, "DsRoleGetPrimaryDomainInformation returns %lu!\n", dwErrorCode); - ok(pInfo->MachineRole >= DsRole_RoleStandaloneWorkstation && pInfo->MachineRole <= DsRole_RolePrimaryDomainController, "pInfo->MachineRole is %u!\n", pInfo->MachineRole); + if (pInfo == NULL) + { + skip("pInfo is NULL\n"); + return; + } - if (pInfo) - DsRoleFreeMemory(pInfo); + ok(pInfo->MachineRole >= DsRole_RoleStandaloneWorkstation && pInfo->MachineRole <= DsRole_RolePrimaryDomainController, "pInfo->MachineRole is %u!\n", pInfo->MachineRole); + DsRoleFreeMemory(pInfo); }

1 0

02/02: [USETUP] Some changes to address the recent review
by Bișoc George 16 Jun '18

16 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8036ea17664c8227918a… commit b8036ea17664c8227918a43d2d3b501ece8e14ef Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Jun 14 10:05:36 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Jun 16 22:28:53 2018 +0200 [USETUP] Some changes to address the recent review --- base/setup/usetup/lang/it-IT.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index d81ad94773..8dfad853f7 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -140,54 +140,48 @@ static MUI_ENTRY itITIntroPageEntries[] = { 6, 8, - "Lo statuto della versione ReactOS", + "Status versione ReactOS", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS � nello stadio di sviluppo Alpha, cio� non � feature-complete", + "ReactOS � nello stadio di sviluppo Alpha, significa che non tutte le funzioni", TEXT_STYLE_NORMAL }, { 6, 12, - "ed � in continuo sviluppo. E' raccomandato solamente per", + "sono operative e cambia continuamente. � adatto solamente per", TEXT_STYLE_NORMAL }, { 6, 13, - "scopi di valutazione, testing ed � sconsigliato l'uso del sistema", + "scopi di valutazione, test ed � inadatto per le attivit� quotidiane.", TEXT_STYLE_NORMAL }, { 6, - 14, - "operativo per l'impiego delle attivit� di tutti i giorni.", + 15, + "Eseguire un backup dei dati oppure installate il sistema in un computer senza", TEXT_STYLE_NORMAL }, { 6, 16, - "Fai un backup dei tuoi dati oppure prova su un computer secondario", - TEXT_STYLE_NORMAL - }, - { - 6, - 17, - "se si tenta di eseguire ReactOS su un hardware reale.", + "sistema operativo e dati se volete eseguirlo su un hardware fisico.", TEXT_STYLE_NORMAL }, { 8, - 19, - "\x07 Premere INVIO per continuare l'installazione ReactOS.", + 18, + "\x07 Premere INVIO per continuare l'installazione di ReactOS.", TEXT_STYLE_NORMAL }, { 8, - 21, + 20, "\x07 Premere F3 per uscire senza installare ReactOS.", TEXT_STYLE_NORMAL },

1 0

01/02: [USETUP] Italian translation update
by Bișoc George 16 Jun '18

16 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=682ac75ecdde1d36326cb… commit 682ac75ecdde1d36326cbf8976a8609cd3d14565 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jun 13 15:56:05 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Jun 16 22:28:53 2018 +0200 [USETUP] Italian translation update --- base/setup/usetup/lang/it-IT.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 33dfe6d364..d81ad94773 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -134,61 +134,67 @@ static MUI_ENTRY itITIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Version Status", + "Lo statuto della versione ReactOS", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "ReactOS � nello stadio di sviluppo Alpha, cio� non � feature-complete", TEXT_STYLE_NORMAL }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "ed � in continuo sviluppo. E' raccomandato solamente per", TEXT_STYLE_NORMAL }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "scopi di valutazione, testing ed � sconsigliato l'uso del sistema", TEXT_STYLE_NORMAL }, { 6, - 15, - "Backup your data or test on a secondary computer if you attempt", + 14, + "operativo per l'impiego delle attivit� di tutti i giorni.", TEXT_STYLE_NORMAL }, { 6, 16, - "to run ReactOS on real hardware.", + "Fai un backup dei tuoi dati oppure prova su un computer secondario", + TEXT_STYLE_NORMAL + }, + { + 6, + 17, + "se si tenta di eseguire ReactOS su un hardware reale.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 Premere INVIO per continuare l'installazione ReactOS.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Premere F3 per uscire senza installare ReactOS.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = Continua F3 = Termina", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, {

1 0

01/01: Set minimum required version to 3.2.1 and set appropriate policies. #556
by Thomas Faber 14 Jun '18

14 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4f067068c818ea916b64… commit e4f067068c818ea916b648c15563d3891604df72 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 30 13:33:53 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jun 14 22:34:09 2018 +0200 Set minimum required version to 3.2.1 and set appropriate policies. #556 --- CMakeLists.txt | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd98d3ac47..489bdbb209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,15 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.2.1) +cmake_policy(VERSION 3.2.1) -if(POLICY CMP0017) - # Shadow cmake provided modules - cmake_policy(SET CMP0017 OLD) -endif() +# Don't escape preprocessor definition values added via add_definitions +cmake_policy(SET CMP0005 OLD) -if(POLICY CMP0026) - # Allow use of the LOCATION property - cmake_policy(SET CMP0026 NEW) -endif() +# Shadow cmake provided modules +cmake_policy(SET CMP0017 OLD) -if(POLICY CMP0051) - # List TARGET_OBJECTS in SOURCES target property - cmake_policy(SET CMP0051 NEW) -endif() +# Honor CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable. +cmake_policy(SET CMP0018 OLD) if(POLICY CMP0058) # Ninja requires custom command byproducts to be explicit @@ -26,13 +21,6 @@ project(REACTOS) # Versioning include(sdk/include/reactos/version.cmake) -# Don't escape preprocessor definition values added via add_definitions -cmake_policy(SET CMP0005 OLD) -cmake_policy(SET CMP0002 NEW) -if(POLICY CMP0018) - cmake_policy(SET CMP0018 OLD) -endif() - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_SHARED_LIBRARY_PREFIX "")

1 0

01/01: [APITESTS] Add ShellStateTest
by Katayama Hirofumi MZ 14 Jun '18

14 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12713b770972caf8a169e… commit 12713b770972caf8a169e76ad3f37e9bdd0f7388 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jun 2 11:05:52 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jun 14 20:07:52 2018 +0200 [APITESTS] Add ShellStateTest --- modules/rostests/apitests/shell32/CMakeLists.txt | 7 +- modules/rostests/apitests/shell32/ShellState.cpp | 219 +++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 225 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index ba7096b0c1..545d2cc26e 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -7,20 +7,21 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE AddCommas.cpp - Control_RunDLLW.cpp CFSFolder.cpp CMyComputer.cpp CShellDesktop.cpp CShellLink.cpp CUserNotification.cpp + Control_RunDLLW.cpp IShellFolderViewCB.cpp - menu.cpp OpenAs_RunDLL.cpp PathResolve.cpp SHCreateFileExtractIconW.cpp + SHParseDisplayName.cpp ShellExecuteEx.cpp + ShellState.cpp + menu.cpp shelltest.cpp - SHParseDisplayName.cpp shelltest.h) add_executable(shell32_apitest diff --git a/modules/rostests/apitests/shell32/ShellState.cpp b/modules/rostests/apitests/shell32/ShellState.cpp new file mode 100644 index 0000000000..94a4a38cff --- /dev/null +++ b/modules/rostests/apitests/shell32/ShellState.cpp @@ -0,0 +1,219 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SHELLSTATE + * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include "shelltest.h" + +#define NDEBUG +#include <debug.h> +#include <shellutils.h> +#include <strsafe.h> + +/* [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer] */ +/* The contents of RegValue ShellState. */ +typedef struct REGSHELLSTATE +{ + DWORD dwSize; + SHELLSTATE ss; +} REGSHELLSTATE, *PREGSHELLSTATE; + +static void dump(const char *name, const void *ptr, size_t siz) +{ + char buf[256], sz[16]; + + StringCbCopyA(buf, sizeof(buf), name); + StringCbCatA(buf, sizeof(buf), ": "); + + const BYTE *pb = reinterpret_cast<const BYTE *>(ptr); + while (siz--) + { + StringCbPrintfA(sz, sizeof(sz), "%02X ", *pb++); + StringCbCatA(buf, sizeof(buf), sz); + } + + trace("%s\n", buf); +} + +static int read_key(REGSHELLSTATE *prss) +{ + HKEY hKey; + LONG result; + DWORD cb; + static const LPCWSTR s_pszExplorer = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"; + + memset(prss, 0, sizeof(*prss)); + + result = RegOpenKeyExW(HKEY_CURRENT_USER, s_pszExplorer, 0, KEY_READ, &hKey); + ok(result == ERROR_SUCCESS, "result was %ld\n", result); + ok(hKey != NULL, "hKey was NULL\n"); + + if (result != ERROR_SUCCESS || !hKey) + { + skip("RegOpenKeyEx failed: %ld\n", result); + return 1; + } + + cb = sizeof(*prss); + result = RegQueryValueExW(hKey, L"ShellState", NULL, NULL, reinterpret_cast<LPBYTE>(prss), &cb); + RegCloseKey(hKey); + + ok(result == ERROR_SUCCESS, "result was %ld\n", result); + if (result != ERROR_SUCCESS) + { + skip("RegQueryValueEx failed: %ld\n", result); + return 2; + } + + return 0; +} + +static int dump_pss(SHELLSTATE *pss) +{ + dump("SHELLSTATE", pss, sizeof(*pss)); + return 0; +} + +START_TEST(ShellState) +{ + OSVERSIONINFO osinfo; + REGSHELLSTATE rss; + SHELLSTATE *pss; + SHELLFLAGSTATE FlagState; + LPBYTE pb; + int ret; + + trace("GetVersion(): 0x%08lX", GetVersion()); + + osinfo.dwOSVersionInfoSize = sizeof(osinfo); + GetVersionEx(&osinfo); + trace("osinfo.dwMajorVersion: 0x%08lX\n", osinfo.dwMajorVersion); + trace("osinfo.dwMinorVersion: 0x%08lX\n", osinfo.dwMinorVersion); + trace("osinfo.dwBuildNumber: 0x%08lX\n", osinfo.dwBuildNumber); + trace("osinfo.dwPlatformId: 0x%08lX\n", osinfo.dwPlatformId); + + trace("WINVER: 0x%04X\n", WINVER); + trace("_WIN32_WINNT: 0x%04X\n", _WIN32_WINNT); + trace("_WIN32_IE: 0x%04X\n", _WIN32_IE); + trace("NTDDI_VERSION: 0x%08X\n", NTDDI_VERSION); + +#ifdef _MSC_VER + trace("_MSC_VER: 0x%08X\n", int(_MSC_VER)); +#elif defined(__MINGW32__) + trace("__MINGW32__: 0x%08X\n", int(__MINGW32__)); +#elif defined(__clang__) + trace("__clang__: 0x%08X\n", int(__clang__)); +#else + #error Unknown compiler. +#endif + + ok(sizeof(REGSHELLSTATE) >= 0x24, "sizeof(REGSHELLSTATE) was %d\n", (int)sizeof(REGSHELLSTATE)); + trace("sizeof(SHELLSTATE): %d\n", (int)sizeof(SHELLSTATE)); + trace("__alignof(SHELLSTATE): %d\n", (int)__alignof(SHELLSTATE)); + trace("sizeof(SHELLFLAGSTATE): %d\n", (int)sizeof(SHELLFLAGSTATE)); + trace("sizeof(CABINETSTATE): %d\n", (int)sizeof(CABINETSTATE)); + + pss = &rss.ss; + pb = reinterpret_cast<LPBYTE>(pss); + + ret = read_key(&rss); + if (ret) + { + return; + } + + dump_pss(pss); + ok(rss.dwSize >= 0x24, "rss.dwSize was %ld (0x%lX).\n", rss.dwSize, rss.dwSize); + +#define DUMP_LONG(x) trace(#x ": 0x%08X\n", int(x)); +#define DUMP_BOOL(x) trace(#x ": %d\n", !!int(x)); + DUMP_BOOL(pss->fShowAllObjects); + DUMP_BOOL(pss->fShowExtensions); + DUMP_BOOL(pss->fNoConfirmRecycle); + DUMP_BOOL(pss->fShowSysFiles); + DUMP_BOOL(pss->fShowCompColor); + DUMP_BOOL(pss->fDoubleClickInWebView); + DUMP_BOOL(pss->fDesktopHTML); + DUMP_BOOL(pss->fWin95Classic); + DUMP_BOOL(pss->fDontPrettyPath); + DUMP_BOOL(pss->fShowAttribCol); + DUMP_BOOL(pss->fMapNetDrvBtn); + DUMP_BOOL(pss->fShowInfoTip); + DUMP_BOOL(pss->fHideIcons); + DUMP_BOOL(pss->fWebView); + DUMP_BOOL(pss->fFilter); + DUMP_BOOL(pss->fShowSuperHidden); + DUMP_BOOL(pss->fNoNetCrawling); + DUMP_LONG(pss->lParamSort); + DUMP_LONG(pss->iSortDirection); + DUMP_LONG(pss->version); + DUMP_LONG(pss->lParamSort); + DUMP_LONG(pss->iSortDirection); + DUMP_LONG(pss->version); + DUMP_BOOL(pss->fSepProcess); + DUMP_BOOL(pss->fStartPanelOn); + DUMP_BOOL(pss->fShowStartPage); +#if NTDDI_VERSION >= 0x06000000 // for future use + DUMP_BOOL(pss->fIconsOnly); + DUMP_BOOL(pss->fShowTypeOverlay); + DUMP_BOOL(pss->fShowStatusBar); +#endif + +#define SSF_MASK \ + (SSF_SHOWALLOBJECTS | SSF_SHOWEXTENSIONS | SSF_NOCONFIRMRECYCLE | \ + SSF_SHOWCOMPCOLOR | SSF_DOUBLECLICKINWEBVIEW | SSF_DESKTOPHTML | \ + SSF_WIN95CLASSIC | SSF_DONTPRETTYPATH | SSF_SHOWATTRIBCOL | \ + SSF_MAPNETDRVBUTTON | SSF_SHOWINFOTIP | SSF_HIDEICONS) + // For future: + // SSF_AUTOCHECKSELECT, SSF_ICONSONLY, SSF_SHOWTYPEOVERLAY, SSF_SHOWSTATUSBAR + + memset(&FlagState, 0, sizeof(FlagState)); + SHGetSettings(&FlagState, SSF_MASK); + +#define CHECK_FLAG(x) ok(pss->x == FlagState.x, "FlagState.%s expected %d, was %d\n", #x, (int)pss->x, (int)FlagState.x) + CHECK_FLAG(fShowAllObjects); + CHECK_FLAG(fShowExtensions); + CHECK_FLAG(fNoConfirmRecycle); + //CHECK_FLAG(fShowSysFiles); // No use + CHECK_FLAG(fShowCompColor); + CHECK_FLAG(fDoubleClickInWebView); + CHECK_FLAG(fDesktopHTML); + CHECK_FLAG(fWin95Classic); + CHECK_FLAG(fDontPrettyPath); + CHECK_FLAG(fShowAttribCol); + CHECK_FLAG(fMapNetDrvBtn); + CHECK_FLAG(fShowInfoTip); + CHECK_FLAG(fHideIcons); +#if NTDDI_VERSION >= 0x06000000 // for future use + CHECK_FLAG(fAutoCheckSelect); + CHECK_FLAG(fIconsOnly); +#endif + +#if 1 + #define DO_IT(x) x +#else + #define DO_IT(x) do { trace(#x ";\n"); x; } while (0) +#endif + + DO_IT(memset(pss, 0, sizeof(*pss))); + DO_IT(pss->dwWin95Unused = 1); + ok(pb[4] == 0x01 || dump_pss(pss), "Unexpected pss ^\n"); + + DO_IT(memset(pss, 0, sizeof(*pss))); + DO_IT(pss->lParamSort = 1); + ok(pb[12] == 0x01 || dump_pss(pss), "Unexpected pss ^\n"); + + DO_IT(memset(pss, 0, sizeof(*pss))); + DO_IT(pss->iSortDirection = 0xDEADBEEF); + ok(*(UNALIGNED DWORD *)(pb + 16) == 0xDEADBEEF || dump_pss(pss), "Unexpected pss ^\n"); + + DO_IT(memset(pss, 0, sizeof(*pss))); + DO_IT(pss->version = 0xDEADBEEF); + ok(*(UNALIGNED DWORD *)(pb + 20) == 0xDEADBEEF || dump_pss(pss), "Unexpected pss ^\n"); + + DO_IT(memset(pss, 0, sizeof(*pss))); + DO_IT(pss->fSepProcess = TRUE); + ok(pb[28] == 0x01 || dump_pss(pss), "Unexpected pss ^\n"); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 975b933f3f..b2e1b78876 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -16,6 +16,7 @@ extern void func_OpenAs_RunDLL(void); extern void func_PathResolve(void); extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecuteEx(void); +extern void func_ShellState(void); extern void func_SHParseDisplayName(void); const struct test winetest_testlist[] = @@ -33,6 +34,7 @@ const struct test winetest_testlist[] = { "PathResolve", func_PathResolve }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "ShellExecuteEx", func_ShellExecuteEx }, + { "ShellState", func_ShellState }, { "SHParseDisplayName", func_SHParseDisplayName }, { 0, 0 } };

1 0

01/01: [SHELL32][APITESTS] Add tests of OpenAs_RunDLL
by Katayama Hirofumi MZ 14 Jun '18

14 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5f5161804743b1d17da3… commit d5f5161804743b1d17da338e7f3274933b9a4a45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 7 15:48:42 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jun 14 19:59:11 2018 +0200 [SHELL32][APITESTS] Add tests of OpenAs_RunDLL --- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/OpenAs_RunDLL.cpp | 216 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + 3 files changed, 219 insertions(+) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 7526df1bad..ba7096b0c1 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE CUserNotification.cpp IShellFolderViewCB.cpp menu.cpp + OpenAs_RunDLL.cpp PathResolve.cpp SHCreateFileExtractIconW.cpp ShellExecuteEx.cpp diff --git a/modules/rostests/apitests/shell32/OpenAs_RunDLL.cpp b/modules/rostests/apitests/shell32/OpenAs_RunDLL.cpp new file mode 100644 index 0000000000..f66d4585f5 --- /dev/null +++ b/modules/rostests/apitests/shell32/OpenAs_RunDLL.cpp @@ -0,0 +1,216 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for OpenAs_RunDLL + * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <stdio.h> +#include <process.h> + +// OpenAs_RunDLLA +typedef void (WINAPI *OPENAS_RUNDLLA)(HWND, HINSTANCE, LPCSTR, int); +// OpenAs_RunDLLW +typedef void (WINAPI *OPENAS_RUNDLLW)(HWND, HINSTANCE, LPCWSTR, int); + +static OPENAS_RUNDLLA pOpenAs_RunDLLA = NULL; +static OPENAS_RUNDLLW pOpenAs_RunDLLW = NULL; + +struct TEST_ENTRY +{ + int nLine; + BOOL bWide; + HINSTANCE hInst; + int nRet; + BOOL bCreateFile; + LPCSTR pszFileA; + LPCWSTR pszFileW; + DWORD dwError; +}; + +#define COUNT 5 +#define INTERVAL 200 + +#define DEATH 999 +#define OPENED 1 +#define NOT_OPENED 0 + +#define BAD_INST ((HINSTANCE)0xDEAD) +#define BAD_SZ_A ((LPCSTR)0xDEAD) +#define BAD_SZ_W ((LPCWSTR)0xDEAD) + +static const TEST_ENTRY s_TestEntries[] = +{ + // ANSI + {__LINE__, FALSE, NULL, OPENED, FALSE, NULL, NULL, 0 }, + {__LINE__, FALSE, NULL, OPENED, FALSE, "", NULL, 0 }, + {__LINE__, FALSE, NULL, OPENED, FALSE, "invalid file name.txt", NULL, 0 }, + {__LINE__, FALSE, NULL, DEATH, FALSE, BAD_SZ_A, NULL, 0 }, + {__LINE__, FALSE, NULL, OPENED, TRUE, "created file.txt", NULL, 0 }, + {__LINE__, FALSE, BAD_INST, OPENED, FALSE, NULL, NULL, 0 }, + {__LINE__, FALSE, BAD_INST, OPENED, FALSE, "invalid file name.txt", NULL, 0 }, + {__LINE__, FALSE, BAD_INST, DEATH, FALSE, BAD_SZ_A, NULL, 0xDEADFACE }, + {__LINE__, FALSE, BAD_INST, OPENED, TRUE, "created file.txt", NULL, 0 }, + // WIDE + {__LINE__, TRUE, NULL, OPENED, FALSE, NULL, NULL, 0x80070490 }, + {__LINE__, TRUE, NULL, OPENED, FALSE, NULL, L"", ERROR_NO_SCROLLBARS }, + {__LINE__, TRUE, NULL, OPENED, FALSE, NULL, L"invalid file name.txt", ERROR_NO_SCROLLBARS }, + {__LINE__, TRUE, NULL, OPENED, FALSE, NULL, BAD_SZ_W, 0xDEADFACE }, + {__LINE__, TRUE, NULL, OPENED, TRUE, NULL, L"created file.txt", ERROR_NO_SCROLLBARS }, + {__LINE__, TRUE, BAD_INST, OPENED, FALSE, NULL, NULL, 0x80070490 }, + {__LINE__, TRUE, BAD_INST, OPENED, FALSE, NULL, L"invalid file name.txt", ERROR_NO_SCROLLBARS }, + {__LINE__, TRUE, BAD_INST, OPENED, FALSE, NULL, BAD_SZ_W, 0xDEADFACE }, + {__LINE__, TRUE, BAD_INST, OPENED, TRUE, NULL, L"created file.txt", ERROR_NO_SCROLLBARS }, +}; + +static HANDLE s_hThread = NULL; +static INT s_nRet = NOT_OPENED; + +static unsigned __stdcall +watch_thread_proc(void *arg) +{ + for (int i = 0; i < COUNT; ++i) + { + Sleep(INTERVAL); + + HWND hwnd = FindWindowA("#32770", "Open With"); + if (hwnd == NULL) + continue; + + if (!IsWindowVisible(hwnd)) + { + trace("not visible\n"); + continue; + } + + s_nRet = OPENED; + PostMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDCANCEL, BN_CLICKED), 0); + break; + } + return 0; +} + +static void StartWatchGUI(const TEST_ENTRY *pEntry) +{ + s_nRet = NOT_OPENED; + s_hThread = (HANDLE)_beginthreadex(NULL, 0, watch_thread_proc, NULL, 0, NULL); +} + +static void DoEntry(const TEST_ENTRY *pEntry) +{ + if (pEntry->bWide) + { + if (pEntry->bCreateFile) + { + FILE *fp = _wfopen(pEntry->pszFileW, L"wb"); + ok(fp != NULL, "Line %d: Unable to create file '%s'\n", pEntry->nLine, wine_dbgstr_w(pEntry->pszFileW)); + fclose(fp); + } + + StartWatchGUI(pEntry); + SetLastError(0xDEADFACE); + + _SEH2_TRY + { + (*pOpenAs_RunDLLW)(NULL, pEntry->hInst, pEntry->pszFileW, SW_SHOWDEFAULT); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + s_nRet = DEATH; + } + _SEH2_END; + + DWORD dwError = GetLastError(); + ok(pEntry->dwError == dwError, "Line %d: error expected %ld, was %ld\n", pEntry->nLine, pEntry->dwError, dwError); + + WaitForSingleObject(s_hThread, INFINITE); + CloseHandle(s_hThread); + + if (pEntry->bCreateFile) + { + ok(DeleteFileW(pEntry->pszFileW), "Line %d: DeleteFileA failed\n", pEntry->nLine); + } + } + else + { + if (pEntry->bCreateFile) + { + FILE *fp = fopen(pEntry->pszFileA, "wb"); + ok(fp != NULL, "Line %d: Unable to create file '%s'\n", pEntry->nLine, pEntry->pszFileA); + fclose(fp); + } + + StartWatchGUI(pEntry); + SetLastError(0xDEADFACE); + + _SEH2_TRY + { + (*pOpenAs_RunDLLA)(NULL, pEntry->hInst, pEntry->pszFileA, SW_SHOWDEFAULT); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + s_nRet = DEATH; + } + _SEH2_END; + + DWORD dwError = GetLastError(); + ok(pEntry->dwError == dwError, "Line %d: error expected %ld, was %ld\n", pEntry->nLine, pEntry->dwError, dwError); + + WaitForSingleObject(s_hThread, INFINITE); + CloseHandle(s_hThread); + + if (pEntry->bCreateFile) + { + ok(DeleteFileA(pEntry->pszFileA), "Line %d: DeleteFileA failed\n", pEntry->nLine); + } + } + + ok(pEntry->nRet == s_nRet, "Line %d: s_nRet expected %d, was %d\n", pEntry->nLine, pEntry->nRet, s_nRet); +} + +START_TEST(OpenAs_RunDLL) +{ + HINSTANCE hShell32 = LoadLibraryA("shell32.dll"); + if (hShell32 == NULL) + { + skip("Unable to load shell32.dll\n"); + return; + } + + pOpenAs_RunDLLA = (OPENAS_RUNDLLA)GetProcAddress(hShell32, "OpenAs_RunDLLA"); + if (pOpenAs_RunDLLA == NULL) + { + skip("Unable to get OpenAs_RunDLLA\n"); + return; + } + + pOpenAs_RunDLLW = (OPENAS_RUNDLLW)GetProcAddress(hShell32, "OpenAs_RunDLLW"); + if (pOpenAs_RunDLLW == NULL) + { + skip("Unable to get OpenAs_RunDLLW\n"); + return; + } + + TCHAR szCurDir[MAX_PATH], szTempDir[MAX_PATH]; + + ok(GetCurrentDirectory(_countof(szCurDir), szCurDir), "GetCurrentDirectory failed\n"); + ok(GetTempPath(_countof(szTempDir), szTempDir), "GetTempPath failed\n"); + + if (!SetCurrentDirectory(szTempDir)) + { + skip("SetCurrentDirectory failed\n"); + } + else + { + for (size_t i = 0; i < _countof(s_TestEntries); ++i) + { + const TEST_ENTRY *pEntry = &s_TestEntries[i]; + DoEntry(pEntry); + } + + ok(SetCurrentDirectory(szCurDir), "SetCurrentDirectory failed\n"); + } + + FreeLibrary(hShell32); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 7db323ad99..975b933f3f 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -12,6 +12,7 @@ extern void func_CShellLink(void); extern void func_CUserNotification(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); +extern void func_OpenAs_RunDLL(void); extern void func_PathResolve(void); extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecuteEx(void); @@ -28,6 +29,7 @@ const struct test winetest_testlist[] = { "CUserNotification", func_CUserNotification }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, + { "OpenAs_RunDLL", func_OpenAs_RunDLL }, { "PathResolve", func_PathResolve }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "ShellExecuteEx", func_ShellExecuteEx },

1 0

02/02: [DELAYIMP] Fix/Merge definitions of __pfnDliNotifyHook2 and __pfnDliFailureHook2
by Serge Gautherie 13 Jun '18

13 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5904542d6bd3bba962f8… commit e5904542d6bd3bba962f806096e4c1c757312bc1 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Feb 11 23:37:34 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 13 23:28:15 2018 +0200 [DELAYIMP] Fix/Merge definitions of __pfnDliNotifyHook2 and __pfnDliFailureHook2 --- sdk/lib/delayimp/delayimp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk/lib/delayimp/delayimp.c b/sdk/lib/delayimp/delayimp.c index e3f97b085b..0f86b67f2b 100644 --- a/sdk/lib/delayimp/delayimp.c +++ b/sdk/lib/delayimp/delayimp.c @@ -15,14 +15,11 @@ /**** Linker magic: provide a default (NULL) pointer, but allow the user to override it ****/ -#if defined(__GNUC__) +/* The actual items we use */ PfnDliHook __pfnDliNotifyHook2; PfnDliHook __pfnDliFailureHook2; -#else -/* The actual items we use */ -extern PfnDliHook __pfnDliNotifyHook2; -extern PfnDliHook __pfnDliFailureHook2; +#if !defined(__GNUC__) /* The fallback symbols */ PfnDliHook __pfnDliNotifyHook2Default = NULL; PfnDliHook __pfnDliFailureHook2Default = NULL;

1 0

01/02: [DELAYIMP] Fix 2 Clang-Cl warnings about __pfnDliNotifyHook2Default and __pfnDliFailureHook2Default
by Serge Gautherie 13 Jun '18

13 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9415f94c3a8d189dc2a18… commit 9415f94c3a8d189dc2a18effe5d10b7a445f9bc1 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Feb 11 23:33:16 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 13 23:28:15 2018 +0200 [DELAYIMP] Fix 2 Clang-Cl warnings about __pfnDliNotifyHook2Default and __pfnDliFailureHook2Default "warning: 'extern' variable has an initializer [-Wextern-initializer]" CORE-14306 --- sdk/lib/delayimp/delayimp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/delayimp/delayimp.c b/sdk/lib/delayimp/delayimp.c index 4ffcfd81d5..e3f97b085b 100644 --- a/sdk/lib/delayimp/delayimp.c +++ b/sdk/lib/delayimp/delayimp.c @@ -24,8 +24,8 @@ extern PfnDliHook __pfnDliNotifyHook2; extern PfnDliHook __pfnDliFailureHook2; /* The fallback symbols */ -extern PfnDliHook __pfnDliNotifyHook2Default = NULL; -extern PfnDliHook __pfnDliFailureHook2Default = NULL; +PfnDliHook __pfnDliNotifyHook2Default = NULL; +PfnDliHook __pfnDliFailureHook2Default = NULL; /* Tell the linker to use the fallback symbols */ #if defined (_M_IX86)

1 0

01/01: [SHELL32] Copy-paste files/folders into current place.
by Denis Malikov 13 Jun '18

13 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7916d0ae3e63f9fe4febf… commit 7916d0ae3e63f9fe4febf2597f4e66e63fcabc38 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Wed Jun 6 00:13:51 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 13 20:13:44 2018 +0200 [SHELL32] Copy-paste files/folders into current place. Files are copied with trying to find new path by adding (%d) suffix before asking for overwrite existing item CORE-13788 --- dll/win32/shell32/shlfileop.cpp | 54 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 4dfd44f781..e07d32d8d7 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define FO_MASK 0xF +#define NEW_FILENAME_ON_COPY_TRIES 100 + static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; @@ -1219,6 +1221,34 @@ static void destroy_file_list(FILE_LIST *flList) HeapFree(GetProcessHeap(), 0, flList->feFiles); } +static CStringW try_find_new_name(LPCWSTR szDestPath) +{ + CStringW mask(szDestPath); + CStringW ext(PathFindExtensionW(szDestPath)); + + // cut off extension before inserting a "new file" mask + if (!ext.IsEmpty()) + { + mask = mask.Left(mask.GetLength() - ext.GetLength()); + } + mask += L" (%d)" + ext; + + CStringW newName; + + // trying to find new file name + for (int i = 1; i < NEW_FILENAME_ON_COPY_TRIES; i++) + { + newName.Format(mask, i); + + if (!PathFileExistsW(newName)) + { + return newName; + } + } + + return CStringW(); +} + static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) { WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; @@ -1236,12 +1266,20 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { - if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) + CStringW newPath; + if (lstrcmp(feFrom->szDirectory, szDestPath) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty()) { - /* Vista returns an ERROR_CANCELLED even if user pressed "No" */ - if (!op->bManyItems) - op->bCancelled = TRUE; - return; + StringCchCopyW(szTo, _countof(szTo), newPath); + } + else + { + if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) + { + /* Vista returns an ERROR_CANCELLED even if user pressed "No" */ + if (!op->bManyItems) + op->bCancelled = TRUE; + return; + } } } @@ -1266,6 +1304,12 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH { if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { + CStringW newPath; + if (lstrcmp(szFrom, szTo) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty()) + { + return SHNotifyCopyFileW(op, szFrom, newPath, FALSE) == 0; + } + if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) return FALSE; }

1 0

01/01: [HALX86] Fix a Clang-Cl warning about KiUnexpectedInterrupt
by Serge Gautherie 13 Jun '18

13 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e01f935f0e48819c35423… commit e01f935f0e48819c354237ff8e40c286063cf8eb Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 18 06:51:00 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Jun 13 10:48:55 2018 +0200 [HALX86] Fix a Clang-Cl warning about KiUnexpectedInterrupt "warning: cast between incompatible calling conventions 'cdecl' and 'fastcall'; calls through this pointer may abort at runtime [-Wcast-calling-convention]" CORE-14306 --- hal/halx86/up/pic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/halx86/up/pic.c b/hal/halx86/up/pic.c index d3e5529d7e..e39f81a549 100644 --- a/hal/halx86/up/pic.c +++ b/hal/halx86/up/pic.c @@ -405,7 +405,7 @@ PHAL_SW_INTERRUPT_HANDLER SWInterruptHandlerTable[20] = /* Handlers for pending software interrupts when we already have a trap frame*/ PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3] = { - (PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)KiUnexpectedInterrupt, + (PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)(PVOID)KiUnexpectedInterrupt, HalpApcInterrupt2ndEntry, HalpDispatchInterrupt2ndEntry };

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2018