Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/02: [ROSAUTOTEST] Implement a process activity timeout of 2 minutes. If there is no log output within 2 minutes, the test process is killed, and we continue with the next test.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dd4d2256b97b1f8a3a39… commit 7dd4d2256b97b1f8a3a392060592a3d0f715fbd7 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Tue Apr 23 09:17:05 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 26 08:47:15 2019 +0200 [ROSAUTOTEST] Implement a process activity timeout of 2 minutes. If there is no log output within 2 minutes, the test process is killed, and we continue with the next test. This is a rather graceful approach compared to sysreg2's 3 minute timeout before killing and restarting the entire VM. Since we added autochk for FAT filesystems, the filesystem is often "fixed" after a reset with the consequence that ReactOS doesn't boot up anymore. The sysreg2 restart code still remains for handling tests causing BSODs. --- modules/rostests/rosautotest/CPipe.cpp | 101 +++++++++++++++++++++++++++-- modules/rostests/rosautotest/CPipe.h | 6 +- modules/rostests/rosautotest/CProcess.cpp | 5 +- modules/rostests/rosautotest/CWineTest.cpp | 38 ++++++++--- 4 files changed, 131 insertions(+), 19 deletions(-) diff --git a/modules/rostests/rosautotest/CPipe.cpp b/modules/rostests/rosautotest/CPipe.cpp index 8fd3cf03e1..5af7163971 100644 --- a/modules/rostests/rosautotest/CPipe.cpp +++ b/modules/rostests/rosautotest/CPipe.cpp @@ -3,10 +3,14 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class that manages an unidirectional anonymous byte stream pipe * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) + * Copyright 2019 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" +LONG CPipe::m_lPipeCount = 0; + + /** * Constructs a CPipe object and initializes read and write handles. */ @@ -18,8 +22,50 @@ CPipe::CPipe() SecurityAttributes.bInheritHandle = TRUE; SecurityAttributes.lpSecurityDescriptor = NULL; - if(!CreatePipe(&m_hReadPipe, &m_hWritePipe, &SecurityAttributes, 0)) - FATAL("CreatePipe failed\n"); + // Construct a unique pipe name. + WCHAR wszPipeName[MAX_PATH]; + InterlockedIncrement(&m_lPipeCount); + swprintf(wszPipeName, L"\\\\.\\pipe\\TestmanPipe%ld", m_lPipeCount); + + // Create a named pipe with the default settings, but overlapped (asynchronous) operations. + // Latter feature is why we can't simply use CreatePipe. + const DWORD dwDefaultBufferSize = 4096; + const DWORD dwDefaultTimeoutMilliseconds = 120000; + + m_hReadPipe = CreateNamedPipeW(wszPipeName, + PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, + 1, + dwDefaultBufferSize, + dwDefaultBufferSize, + dwDefaultTimeoutMilliseconds, + &SecurityAttributes); + if (m_hReadPipe == INVALID_HANDLE_VALUE) + { + FATAL("CreateNamedPipe failed\n"); + } + + // Use CreateFileW to get the write handle to the pipe. + // Writing is done synchronously, so no FILE_FLAG_OVERLAPPED here! + m_hWritePipe = CreateFileW(wszPipeName, + GENERIC_WRITE, + 0, + &SecurityAttributes, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (m_hWritePipe == INVALID_HANDLE_VALUE) + { + FATAL("CreateFileW failed\n"); + } + + // Prepare the OVERLAPPED structure for reading. + ZeroMemory(&m_ReadOverlapped, sizeof(m_ReadOverlapped)); + m_ReadOverlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL); + if (!m_ReadOverlapped.hEvent) + { + FATAL("CreateEvent failed\n"); + } } /** @@ -103,17 +149,60 @@ CPipe::Peek(PVOID Buffer, DWORD BufferSize, PDWORD BytesRead, PDWORD TotalBytesA * On return, the number of bytes actually read from the pipe into Buffer. * * @return - * True on success, false on failure; call GetLastError for error information. + * Returns a Win32 error code. Expected error codes include: + * - ERROR_SUCCESS: The read has completed successfully. + * - WAIT_TIMEOUT: The given timeout has elapsed before any data was read. + * - ERROR_BROKEN_PIPE: The other end of the pipe has been closed. * * @see ReadFile */ -bool -CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead) +DWORD +CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, DWORD TimeoutMilliseconds) { if (!m_hReadPipe) + { FATAL("Trying to read from a closed read pipe"); + } - return ReadFile(m_hReadPipe, Buffer, NumberOfBytesToRead, NumberOfBytesRead, NULL); + if (ReadFile(m_hReadPipe, Buffer, NumberOfBytesToRead, NumberOfBytesRead, &m_ReadOverlapped)) + { + // The asynchronous read request could be satisfied immediately. + return ERROR_SUCCESS; + } + else if (GetLastError() == ERROR_IO_PENDING) + { + // The asynchronous read request could not be satisfied immediately, so wait for it with the given timeout. + DWORD dwWaitResult = WaitForSingleObject(m_ReadOverlapped.hEvent, TimeoutMilliseconds); + if (dwWaitResult == WAIT_OBJECT_0) + { + // Fill NumberOfBytesRead. + if (GetOverlappedResult(m_hReadPipe, &m_ReadOverlapped, NumberOfBytesRead, FALSE)) + { + // We successfully read NumberOfBytesRead bytes. + return ERROR_SUCCESS; + } + else if (GetLastError() == ERROR_BROKEN_PIPE) + { + // The other end of the pipe has been closed. + return ERROR_BROKEN_PIPE; + } + else + { + // An unexpected error. + FATAL("GetOverlappedResult failed\n"); + } + } + else + { + // This may be WAIT_TIMEOUT or an unexpected error. + return dwWaitResult; + } + } + else + { + // This may be ERROR_BROKEN_PIPE or an unexpected error. + return GetLastError(); + } } /** diff --git a/modules/rostests/rosautotest/CPipe.h b/modules/rostests/rosautotest/CPipe.h index 6efe670373..84bb01897f 100644 --- a/modules/rostests/rosautotest/CPipe.h +++ b/modules/rostests/rosautotest/CPipe.h @@ -3,11 +3,15 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class that manages an unidirectional anonymous byte stream pipe * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) + * Copyright 2019 Colin Finck (colin(a)reactos.org) */ class CPipe { private: + static LONG m_lPipeCount; + + OVERLAPPED m_ReadOverlapped; HANDLE m_hReadPipe; HANDLE m_hWritePipe; @@ -19,7 +23,7 @@ public: void CloseWritePipe(); bool Peek(PVOID Buffer, DWORD BufferSize, PDWORD BytesRead, PDWORD TotalBytesAvailable); - bool Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead); + DWORD Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, DWORD TimeoutMilliseconds); bool Write(LPCVOID Buffer, DWORD NumberOfBytesToWrite, PDWORD NumberOfBytesWritten); friend class CPipedProcess; diff --git a/modules/rostests/rosautotest/CProcess.cpp b/modules/rostests/rosautotest/CProcess.cpp index 65445cb379..e462456564 100644 --- a/modules/rostests/rosautotest/CProcess.cpp +++ b/modules/rostests/rosautotest/CProcess.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class able to create a new process and closing its handles on destruction (exception-safe) - * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2009-2019 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" @@ -27,10 +27,11 @@ CProcess::CProcess(const wstring& CommandLine, LPSTARTUPINFOW StartupInfo) } /** - * Destructs a CProcess object and closes all handles belonging to the process. + * Destructs a CProcess object, terminates the process if running, and closes all handles belonging to the process. */ CProcess::~CProcess() { + TerminateProcess(m_ProcessInfo.hProcess, 255); CloseHandle(m_ProcessInfo.hThread); CloseHandle(m_ProcessInfo.hProcess); } diff --git a/modules/rostests/rosautotest/CWineTest.cpp b/modules/rostests/rosautotest/CWineTest.cpp index baf68a6b8a..6e163979e0 100644 --- a/modules/rostests/rosautotest/CWineTest.cpp +++ b/modules/rostests/rosautotest/CWineTest.cpp @@ -2,12 +2,13 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing functions for handling Wine tests - * COPYRIGHT: Copyright 2009-2015 Colin Finck (colin(a)reactos.org) + * COPYRIGHT: Copyright 2009-2019 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" static const DWORD ListTimeout = 10000; +static const DWORD ProcessActivityTimeout = 120000; /** * Constructs a CWineTest object. @@ -140,7 +141,7 @@ CWineTest::DoListCommand() /* Read the data */ m_ListBuffer = new char[BytesAvailable]; - if(!Pipe.Read(m_ListBuffer, BytesAvailable, &Temp)) + if(Pipe.Read(m_ListBuffer, BytesAvailable, &Temp, INFINITE) != ERROR_SUCCESS) TESTEXCEPTION("CPipe::Read failed\n"); return BytesAvailable; @@ -291,17 +292,34 @@ CWineTest::RunTest(CTestInfo* TestInfo) CPipedProcess Process(TestInfo->CommandLine, Pipe); /* Receive all the data from the pipe */ - while(Pipe.Read(Buffer, sizeof(Buffer) - 1, &BytesAvailable) && BytesAvailable) + for (;;) { - /* Output text through StringOut, even while the test is still running */ - Buffer[BytesAvailable] = 0; - tailString = StringOut(tailString.append(string(Buffer)), false); + DWORD dwReadResult = Pipe.Read(Buffer, sizeof(Buffer) - 1, &BytesAvailable, ProcessActivityTimeout); + if (dwReadResult == ERROR_SUCCESS) + { + /* Output text through StringOut, even while the test is still running */ + Buffer[BytesAvailable] = 0; + tailString = StringOut(tailString.append(string(Buffer)), false); - if(Configuration.DoSubmit()) - TestInfo->Log += Buffer; + if (Configuration.DoSubmit()) + TestInfo->Log += Buffer; + } + else if (dwReadResult == ERROR_BROKEN_PIPE) + { + // The process finished and has been terminated. + break; + } + else if (dwReadResult == WAIT_TIMEOUT) + { + // The process activity timeout above has elapsed without any new data. + TESTEXCEPTION("Timeout while waiting for the test process\n"); + } + else + { + // An unexpected error. + TESTEXCEPTION("CPipe::Read failed for the test run\n"); + } } - if(GetLastError() != ERROR_BROKEN_PIPE) - TESTEXCEPTION("CPipe::Read failed for the test run\n"); } catch(CTestException& e) {

5 years, 8 months

[reactos] 01/01: [POWERCFG] Fix the initialization of the power schemes page

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ca4b50791ffa2bed43fb… commit 0ca4b50791ffa2bed43fbd80e6520e9dd02e33e1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 26 00:03:27 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 26 00:03:27 2019 +0200 [POWERCFG] Fix the initialization of the power schemes page CORE-4995 --- dll/cpl/powercfg/powershemes.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index 64a90bb540..dd839bbe0f 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -233,34 +233,31 @@ Pos_InitData( if (!spc.SystemBatteriesPresent) { - ShowWindow(GetDlgItem(hwndDlg, IDC_SAT), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_IAC), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_SAC), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_IDC), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_SDC), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_DISKDCLIST), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), FALSE); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), spc.HiberFilePresent); - + ShowWindow(GetDlgItem(hwndDlg, IDC_SAT), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_IAC), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_SAC), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_IDC), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_SDC), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_DISKDCLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), SW_HIDE); } - else + + if (!(spc.SystemS1 || spc.SystemS2 || spc.SystemS3)) { - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), spc.HiberFilePresent); - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), FALSE); + ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBY), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), SW_HIDE); } - - if (!(spc.SystemS1 ||spc.SystemS2 || spc.SystemS3)) + if (!spc.HiberFilePresent) { - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), TRUE); - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), TRUE); - ShowWindow(GetDlgItem(hwndDlg, IDC_STANDBY), TRUE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATE), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), SW_HIDE); } - ShowWindow(GetDlgItem(hwndDlg, IDC_HYBERNATE), spc.HiberFilePresent); - return TRUE; }

5 years, 8 months

[reactos] 01/01: [DPNHPAST] Import dpnhpast.dll from Wine (Staging) 4.5

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8611aea13fc813354869… commit c8611aea13fc813354869f6a604f248af8cf1a47 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Apr 14 21:00:12 2019 +0300 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Wed Apr 24 19:59:15 2019 +0200 [DPNHPAST] Import dpnhpast.dll from Wine (Staging) 4.5 --- dll/directx/wine/CMakeLists.txt | 1 + dll/directx/wine/dpnhpast/CMakeLists.txt | 15 ++++++ dll/directx/wine/dpnhpast/dpnhpast.spec | 6 +++ dll/directx/wine/dpnhpast/main.c | 86 ++++++++++++++++++++++++++++++++ dll/directx/wine/dpnhpast/version.rc | 26 ++++++++++ media/doc/README.WINE | 1 + 6 files changed, 135 insertions(+) diff --git a/dll/directx/wine/CMakeLists.txt b/dll/directx/wine/CMakeLists.txt index 3de83cab1f..9cccbb1466 100644 --- a/dll/directx/wine/CMakeLists.txt +++ b/dll/directx/wine/CMakeLists.txt @@ -32,6 +32,7 @@ add_subdirectory(dinput8) add_subdirectory(dmusic) add_subdirectory(dplay) add_subdirectory(dplayx) +add_subdirectory(dpnhpast) add_subdirectory(dsound) add_subdirectory(dxdiagn) add_subdirectory(msdmo) diff --git a/dll/directx/wine/dpnhpast/CMakeLists.txt b/dll/directx/wine/dpnhpast/CMakeLists.txt new file mode 100644 index 0000000000..53d5cf5142 --- /dev/null +++ b/dll/directx/wine/dpnhpast/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(dpnhpast.dll dpnhpast.spec) + +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/dpnhpast_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/dpnhpast.def) + +add_library(dpnhpast MODULE ${SOURCE} version.rc) +set_module_type(dpnhpast win32dll) +target_link_libraries(dpnhpast dxguid uuid wine) +add_importlibs(dpnhpast msvcrt kernel32 ntdll) +add_cd_file(TARGET dpnhpast DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dpnhpast/dpnhpast.spec b/dll/directx/wine/dpnhpast/dpnhpast.spec new file mode 100644 index 0000000000..ea61468ac8 --- /dev/null +++ b/dll/directx/wine/dpnhpast/dpnhpast.spec @@ -0,0 +1,6 @@ +1 stdcall DirectPlayNATHelpCreate(ptr ptr) + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/directx/wine/dpnhpast/main.c b/dll/directx/wine/dpnhpast/main.c new file mode 100644 index 0000000000..4e46608abd --- /dev/null +++ b/dll/directx/wine/dpnhpast/main.c @@ -0,0 +1,86 @@ +/* DirectPlay NAT Helper Past Main + * + * Copyright (C) 2003 Rok Mandeljc + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnhpast); + +/****************************************************************** + * DirectPlayNATHelpCreate (DPNHPAST.1) + * + * + */ +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, PVOID *ppvInterface) +{ + TRACE("(%p, %p) stub\n", pIID, ppvInterface); + return E_NOTIMPL; +} + + +/****************************************************************** + * DllRegisterServer (DPNHPAST.@) + * + * + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME(":stub\n"); + return S_OK; +} + + +/****************************************************************** + * DllCanUnloadNow (DPNHPAST.@) + * + * + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + + +/****************************************************************** + * DllGetClassObject (DPNHPAST.@) + * + * + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME(":stub\n"); + return E_FAIL; +} + + +/****************************************************************** + * DllUnregisterServer (DPNHPAST.@) + * + * + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME(":stub\n"); + return S_OK; +} diff --git a/dll/directx/wine/dpnhpast/version.rc b/dll/directx/wine/dpnhpast/version.rc new file mode 100644 index 0000000000..7552f7de0a --- /dev/null +++ b/dll/directx/wine/dpnhpast/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2003 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DirectPlay NAT Helper PAST" +#define WINE_FILENAME_STR "dpnhpast.dll" +#define WINE_FILEVERSION 5,3,0,901 +#define WINE_FILEVERSION_STR "5.3.0.901" +#define WINE_PRODUCTVERSION 5,3,0,901 +#define WINE_PRODUCTVERSION_STR "5.3" + +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a073dcc37a..f0d7244ca1 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -35,6 +35,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/dmusic # Synced to WineStaging-4.0 reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17 +reactos/dll/directx/wine/dpnhpast # Synced to WineStaging-4.5 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.17

5 years, 8 months

[reactos] 03/03: [BROWSEUI] Enable the Disconnect Network Drive menu item. (#1522)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e18b6d0ebef7d34d1054… commit 7e18b6d0ebef7d34d1054130f35296d0163e8927 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Tue Apr 23 00:47:02 2019 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 04:28:05 2019 +0200 [BROWSEUI] Enable the Disconnect Network Drive menu item. (#1522) CORE-13516, CORE-13518 --- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/browseui/precomp.h | 1 + dll/win32/browseui/shellbrowser.cpp | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 3681a2f043..8b979501ab 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -47,7 +47,7 @@ add_library(browseui MODULE set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui shellbars uuid wine) -add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 mpr msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index e646759ef0..69d1cb92f5 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -11,6 +11,7 @@ #include <winbase.h> #include <wincon.h> #include <wingdi.h> +#include <winnetwk.h> #include <shlobj.h> #include <tlogstg.h> #include <shellapi.h> diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index ae981734e6..2f303123e1 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -3536,7 +3536,6 @@ LRESULT CShellBrowser::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, { // FIXME: Remove once implemented SHEnableMenuItem(theMenu, IDM_TOOLS_MAPNETWORKDRIVE, FALSE); - SHEnableMenuItem(theMenu, IDM_TOOLS_DISCONNECTNETWORKDRIVE, FALSE); SHEnableMenuItem(theMenu, IDM_TOOLS_SYNCHRONIZE, FALSE); menuIndex = 4; } @@ -3595,9 +3594,7 @@ LRESULT CShellBrowser::OnMapNetworkDrive(WORD wNotifyCode, WORD wID, HWND hWndCt LRESULT CShellBrowser::OnDisconnectNetworkDrive(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { -#ifndef __REACTOS__ WNetDisconnectDialog(m_hWnd, RESOURCETYPE_DISK); -#endif /* __REACTOS__ */ return 0; }

5 years, 8 months

[reactos] 02/03: [MPR] Implement the function WNetDisconnectDialog(). (#1522)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf431dd2783df30cddf0a… commit bf431dd2783df30cddf0a91c5e74e359a0bfcd4e Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Tue Apr 23 00:46:28 2019 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 04:28:01 2019 +0200 [MPR] Implement the function WNetDisconnectDialog(). (#1522) CORE-13516, CORE-13518 --- dll/win32/mpr/wnet.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index 09d144e595..e357654699 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -2812,10 +2812,22 @@ DWORD WINAPI WNetConnectionDialog1W( LPCONNECTDLGSTRUCTW lpConnDlgStruct ) */ DWORD WINAPI WNetDisconnectDialog( HWND hwnd, DWORD dwType ) { +#ifdef __REACTOS__ + DWORD dwRet; + HMODULE hDll = LoadLibraryW(L"netplwiz.dll"); + static BOOL (WINAPI *pSHDisconnectNetDrives)(PVOID); + pSHDisconnectNetDrives = (VOID *) GetProcAddress(hDll, "SHDisconnectNetDrives"); + + dwRet = pSHDisconnectNetDrives(NULL); + + FreeLibrary(hDll); + return dwRet; +#else FIXME( "(%p, %08X): stub\n", hwnd, dwType ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; +#endif } /*********************************************************************

5 years, 8 months

[reactos] 01/03: [NETPLWIZ] Implement the Disconnect Network Drive dialog. (#1522)

by Jared Smudde

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1404a7a2a8237da2321d… commit d1404a7a2a8237da2321d07c9edbcbf633d9696a Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Tue Apr 23 00:45:49 2019 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 04:26:12 2019 +0200 [NETPLWIZ] Implement the Disconnect Network Drive dialog. (#1522) CORE-13516, CORE-13518 --- dll/shellext/CMakeLists.txt | 1 + dll/shellext/netplwiz/CMakeLists.txt | 17 +++ dll/shellext/netplwiz/SHDisconnectNetDrives.c | 197 ++++++++++++++++++++++++++ dll/shellext/netplwiz/lang/en-US.rc | 21 +++ dll/shellext/netplwiz/netplwiz.c | 51 +++++++ dll/shellext/netplwiz/netplwiz.h | 19 +++ dll/shellext/netplwiz/netplwiz.rc | 26 ++++ dll/shellext/netplwiz/netplwiz.spec | 14 ++ dll/shellext/netplwiz/res/4400.ico | Bin 0 -> 22486 bytes dll/shellext/netplwiz/resource.h | 21 +++ 10 files changed, 367 insertions(+) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 0f57882163..89980c3f5f 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory(deskadp) add_subdirectory(deskmon) add_subdirectory(devcpux) add_subdirectory(fontext) +add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(shellbtrfs) diff --git a/dll/shellext/netplwiz/CMakeLists.txt b/dll/shellext/netplwiz/CMakeLists.txt new file mode 100644 index 0000000000..7d1fc15dc2 --- /dev/null +++ b/dll/shellext/netplwiz/CMakeLists.txt @@ -0,0 +1,17 @@ + +spec2def(netplwiz.dll netplwiz.spec) + +list(APPEND SOURCE + netplwiz.c + SHDisconnectNetDrives.c) + +add_library(netplwiz SHARED + ${SOURCE} + netplwiz.rc + ${CMAKE_CURRENT_BINARY_DIR}/netplwiz_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/netplwiz.def) + +set_module_type(netplwiz win32dll UNICODE) +target_link_libraries(netplwiz wine) +add_importlibs(netplwiz comctl32 mpr ole32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET netplwiz DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/netplwiz/SHDisconnectNetDrives.c b/dll/shellext/netplwiz/SHDisconnectNetDrives.c new file mode 100644 index 0000000000..c886052d5b --- /dev/null +++ b/dll/shellext/netplwiz/SHDisconnectNetDrives.c @@ -0,0 +1,197 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Implements the Disconnct Network Drive dialog + * COPYRIGHT: Copyright 2018 Jared Smudde (computerwhiz02(a)hotmail.com) + */ + +#include "netplwiz.h" +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(netplwiz); + +HINSTANCE hInstance; + +VOID InitializeListView(HWND hDlg) +{ + HWND hListView = GetDlgItem(hDlg, IDC_CONNECTEDDRIVELIST); + LV_COLUMN column; + WCHAR szLetter[100], szPath[100]; + + if (hListView == NULL) + return; + + LoadStringW(hInstance, IDS_DRIVE_LETTER, szLetter, _countof(szLetter)); + LoadStringW(hInstance, IDS_NETWORK_PATH, szPath, _countof(szPath)); + + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.pszText = szLetter; + column.cx = 75; + ListView_InsertColumn(hListView, 0, &column); + + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.pszText = szPath; + column.cx = 150; + ListView_InsertColumn(hListView, 1, &column); +} + +VOID EnumerateConnectedDrives(HWND hDlg) +{ + LV_ITEM item; + HIMAGELIST hImgList; + HICON hIconDrive = NULL; + HMODULE hShell32; + HWND hListView = GetDlgItem(hDlg, IDC_CONNECTEDDRIVELIST); + + DWORD dRet; + HANDLE hEnum; + LPNETRESOURCE lpRes; + DWORD dwSize = 0x1000; + DWORD dwCount = -1; + LPNETRESOURCE lpCur; + + /* List View Icons */ + hShell32 = GetModuleHandleW(L"shell32.dll"); + if (hShell32 == NULL) + return; + + hIconDrive = LoadImageW(hShell32, MAKEINTRESOURCEW(10), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + if (hIconDrive == NULL) + return; + + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 1, 1); + if (hImgList == NULL) + { + DestroyIcon(hIconDrive); + return; + } + + ImageList_AddIcon(hImgList, hIconDrive); + DestroyIcon(hIconDrive); + ListView_SetImageList(hListView, hImgList, LVSIL_SMALL); + + dRet = WNetOpenEnum(RESOURCE_CONNECTED, RESOURCETYPE_DISK, 0, NULL, &hEnum); + if (dRet != WN_SUCCESS) + { + return; + } + + lpRes = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!lpRes) + { + WNetCloseEnum(hEnum); + return; + } + + do + { + ZeroMemory(lpRes, dwSize); + dRet = WNetEnumResource(hEnum, &dwCount, lpRes, &dwSize); + if (dRet == WN_SUCCESS || dRet == WN_MORE_DATA) + { + lpCur = lpRes; + for (; dwCount; dwCount--) + { + ZeroMemory(&item, sizeof(item)); + item.mask = LVIF_TEXT | LVIF_IMAGE; + item.iImage = 0; + item.pszText = lpCur->lpLocalName; + item.lParam = 0; + item.iItem = ListView_InsertItem(hListView, &item); + ListView_SetItemText(hListView, item.iItem, 1, lpCur->lpRemoteName); + lpCur++; + } + } + } while (dRet != WN_NO_MORE_ENTRIES); + + HeapFree(GetProcessHeap(), 0, lpRes); + WNetCloseEnum(hEnum); +} + + +VOID UpdateButtonStatus(WPARAM wParam, LPARAM lParam, HWND hDlg) +{ + LPNMHDR pnmh = (LPNMHDR)lParam; + HWND hListView = GetDlgItem(hDlg, IDC_CONNECTEDDRIVELIST); + HWND hOkButton = GetDlgItem(hDlg, ID_OK); + + if (pnmh->hwndFrom == hListView) + { + switch (pnmh->code) + { + case LVN_ITEMCHANGED: + if (ListView_GetSelectedCount(hListView)) + { + EnableWindow(hOkButton, TRUE); + } + else + { + EnableWindow(hOkButton, FALSE); + } + break; + } + } +} + +DWORD DisconnectDriveExit(HWND hDlg) +{ + TCHAR driveLetter[10]; + HRESULT hr; + HWND hListView = GetDlgItem(hDlg, IDC_CONNECTEDDRIVELIST); + INT nItem = ListView_GetNextItem(hListView, -1, LVNI_SELECTED); + + if (nItem == -1) + return 0; + + ListView_GetItemText(hListView, nItem, 0, driveLetter, _countof(driveLetter)); + hr = WNetCancelConnection2(driveLetter, CONNECT_UPDATE_PROFILE, FALSE); + + EndDialog(hDlg, ID_OK); + return hr; +} + +static INT_PTR CALLBACK DisconnectDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HICON hIcon, hIconSm; + switch (uMsg) + { + case WM_INITDIALOG: + hIcon = (HICON)LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_DISCONNECT_NET_DRIVES), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); + SendMessageW(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + EnableWindow(GetDlgItem(hDlg, ID_OK), FALSE); + InitializeListView(hDlg); + EnumerateConnectedDrives(hDlg); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case ID_OK: + DisconnectDriveExit(hDlg); + break; + case IDCANCEL: + EndDialog(hDlg, IDCANCEL); + break; + } + break; + + case WM_NOTIFY: + UpdateButtonStatus(wParam, lParam, hDlg); + break; + + default: + return FALSE; + } + + return TRUE; +} + +HRESULT WINAPI SHDisconnectNetDrives(PVOID Unused) +{ + DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DISCONNECTDRIVES), NULL, DisconnectDlgProc); + return S_OK; +} diff --git a/dll/shellext/netplwiz/lang/en-US.rc b/dll/shellext/netplwiz/lang/en-US.rc new file mode 100644 index 0000000000..4fae14baf7 --- /dev/null +++ b/dll/shellext/netplwiz/lang/en-US.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Disconnect Network Drives" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the network drive(s) you want to disconnect, then click OK.", -1, 7, 7, 286, 8 + LTEXT "&Network Drives:", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "OK", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "Disconnect Network Drive" + IDS_DRIVE_LETTER "Drive Letter" + IDS_NETWORK_PATH "Network Path" + IDS_NO_DRIVES "You have no network drives to disconnect." +END diff --git a/dll/shellext/netplwiz/netplwiz.c b/dll/shellext/netplwiz/netplwiz.c new file mode 100644 index 0000000000..27fa3872ed --- /dev/null +++ b/dll/shellext/netplwiz/netplwiz.c @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS Shell + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Implements the Connect/Disconnect Network places dialogs + * COPYRIGHT: Copyright 2018 Jared Smudde (computerwhiz02(a)hotmail.com) + */ + +#include "netplwiz.h" + +HRESULT WINAPI +DllCanUnloadNow(VOID) +{ + return S_OK; +} + +HRESULT WINAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + return E_NOINTERFACE; +} + +HRESULT WINAPI +DllRegisterServer(VOID) +{ + return S_OK; +} + +HRESULT WINAPI +DllUnregisterServer(VOID) +{ + return S_OK; +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + INITCOMMONCONTROLSEX iccx; + hInstance = hinstDLL; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccx.dwICC = ICC_STANDARD_CLASSES | ICC_LISTVIEW_CLASSES; + InitCommonControlsEx(&iccx); + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} diff --git a/dll/shellext/netplwiz/netplwiz.h b/dll/shellext/netplwiz/netplwiz.h new file mode 100644 index 0000000000..13e8b71ffc --- /dev/null +++ b/dll/shellext/netplwiz/netplwiz.h @@ -0,0 +1,19 @@ +#pragma once + +#include "resource.h" + +#include <stdio.h> +#include <stdlib.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winnetwk.h> +#include <commctrl.h> + +#include <strsafe.h> + +extern HINSTANCE hInstance; diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc new file mode 100644 index 0000000000..aac48703fb --- /dev/null +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -0,0 +1,26 @@ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Map Network Drives" +#define REACTOS_STR_INTERNAL_NAME "netplwiz.dll" +#define REACTOS_STR_ORIGINAL_FILENAME "netplwiz.dll" + +#include <reactos/version.rc> + +#include <reactos/manifest_hosted.rc> + +/* Icons */ +IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/shellext/netplwiz/netplwiz.spec b/dll/shellext/netplwiz/netplwiz.spec new file mode 100644 index 0000000000..433874cb0b --- /dev/null +++ b/dll/shellext/netplwiz/netplwiz.spec @@ -0,0 +1,14 @@ +1 stub AddNetPlaceRunDll +2 stub PassportWizardRunDll +3 stub PublishRunDll +4 stub UsersRunDll +5 stub ClearAutoLogon +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +8 stub -private DllInstall +9 stdcall DllMain(ptr long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +12 stub NetAccessWizard +13 stub NetPlacesWizardDoModal +14 stdcall SHDisconnectNetDrives(ptr) diff --git a/dll/shellext/netplwiz/res/4400.ico b/dll/shellext/netplwiz/res/4400.ico new file mode 100644 index 0000000000..1498e69384 Binary files /dev/null and b/dll/shellext/netplwiz/res/4400.ico differ diff --git a/dll/shellext/netplwiz/resource.h b/dll/shellext/netplwiz/resource.h new file mode 100644 index 0000000000..71fe598490 --- /dev/null +++ b/dll/shellext/netplwiz/resource.h @@ -0,0 +1,21 @@ +#pragma once + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + +/* Controls */ +#define IDC_CONNECTEDDRIVELIST 1071 +#define ID_OK 100 + +/* Dialogs */ +#define IDD_DISCONNECTDRIVES 2100 + +/* Icons */ +#define IDI_DISCONNECT_NET_DRIVES 4400 + +/* Strings */ +#define IDS_DIALOG_CAPTION 13000 +#define IDS_DRIVE_LETTER 13001 +#define IDS_NETWORK_PATH 13002 +#define IDS_NO_DRIVES 13003

5 years, 8 months

[reactos] 01/01: [APPWIZ.CPL] Set a default shortcut-link description (#1520)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9de816c9710243678c933… commit 9de816c9710243678c933567abec34856d34aa42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Apr 24 10:44:44 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:44:44 2019 +0200 [APPWIZ.CPL] Set a default shortcut-link description (#1520) CORE-15511 --- dll/cpl/appwiz/createlink.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index a35e915f03..77213efefe 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -450,7 +450,14 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) StringCchCopyW(pContext->szOldFile, _countof(pContext->szOldFile), szPath); pch = PathFindFileNameW(pContext->szOrigin); if (pch && *pch) + { + /* build szDescription */ + StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), pch); + *pch = 0; + + pch = PathFindExtensionW(pContext->szDescription); *pch = 0; + } } PathAddBackslashW(pContext->szOrigin);

5 years, 8 months

[reactos] 02/02: [SHELL32] Make the new-item menu work (aka. make it dynamic) when the .lnk handler doesn't have any ShellNew entry.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62823a08cecf31f46a7b8… commit 62823a08cecf31f46a7b8f4de91ceabda96941ca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 24 03:41:41 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:41:41 2019 +0200 [SHELL32] Make the new-item menu work (aka. make it dynamic) when the .lnk handler doesn't have any ShellNew entry. --- dll/win32/shell32/CNewMenu.cpp | 50 +++++++++++++++++++++++++----------------- dll/win32/shell32/CNewMenu.h | 1 + 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index c4c3c28a97..3445ebdcfe 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -31,6 +31,9 @@ CNewMenu::CNewMenu() : m_pItems(NULL), m_pLinkItem(NULL), m_pSite(NULL), + m_idCmdFirst(0), + m_idCmdFolder(-1), + m_idCmdLink(-1), m_hIconFolder(NULL), m_hIconLink(NULL) { @@ -297,6 +300,9 @@ CNewMenu::LoadCachedItems() BOOL CNewMenu::LoadAllItems() { + // TODO: We need to find a way to refresh the cache from time to time, when + // e.g. new extensions with ShellNew handlers have been added or removed. + /* If there are any unload them */ UnloadAllItems(); @@ -324,6 +330,8 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); + m_idCmdFirst = idCmd; + /* Insert the new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; @@ -333,7 +341,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.wID = idCmd; mii.hbmpItem = HBMMENU_CALLBACK; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + m_idCmdFolder = idCmd++; /* Insert the new shortcut action */ if (m_pLinkItem) @@ -344,7 +352,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + m_idCmdLink = idCmd++; } /* Insert a seperator for the custom new action */ @@ -354,7 +362,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) InsertMenuItemW(hMenu, Pos++, TRUE, &mii); /* Insert the rest of the items */ - mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING | MIIM_DATA; mii.fType = 0; for (SHELLNEW_ITEM *pCurItem = m_pItems; pCurItem; pCurItem = pCurItem->pNext) @@ -364,6 +372,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) continue; TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); + mii.dwItemData = (ULONG_PTR)pCurItem; mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; @@ -376,23 +385,24 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) { - if (IdOffset == 0) - return NULL; /* Folder */ - - if (IdOffset == 1) - return m_pLinkItem; /* shortcut */ + /* Folder */ + if (m_idCmdFirst + IdOffset == m_idCmdFolder) + return NULL; - /* Find shell new item */ - SHELLNEW_ITEM *pItem = m_pItems; - for (UINT i = 2; pItem; ++i) - { - if (i == IdOffset) - break; + /* Shortcut */ + if (m_idCmdFirst + IdOffset == m_idCmdLink) + return m_pLinkItem; - pItem = pItem->pNext; - } + /* Find shell new item - Retrieve menu item info */ + MENUITEMINFOW mii; + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_DATA; - return pItem; + if (GetMenuItemInfoW(m_hSubMenu, m_idCmdFirst + IdOffset, FALSE, &mii) && mii.dwItemData) + return (SHELLNEW_ITEM *)mii.dwItemData; + else + return NULL; } HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename) @@ -657,7 +667,7 @@ CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { HRESULT hr = E_FAIL; - if (LOWORD(lpici->lpVerb) == 0) + if (m_idCmdFirst + LOWORD(lpici->lpVerb) == m_idCmdFolder) { hr = CreateNewFolder(lpici); } @@ -722,11 +732,11 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes DWORD id = LOWORD(lpdis->itemID); HICON hIcon = NULL; - if (id == 0) + if (m_idCmdFirst + id == m_idCmdFolder) { hIcon = m_hIconFolder; } - else if (id == 1) + else if (m_idCmdFirst + id == m_idCmdLink) { hIcon = m_hIconLink; } diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index e5c45e73d2..738fae0213 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -59,6 +59,7 @@ private: SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; + UINT m_idCmdFirst, m_idCmdFolder, m_idCmdLink; HICON m_hIconFolder, m_hIconLink; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt);

5 years, 8 months

[reactos] 01/02: [SHELL32] Code formatting/style/whitespace fix + fix two memory leaks in failure paths of CNewMenu::LoadItem().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0416c598f83b7dcfa808a… commit 0416c598f83b7dcfa808aebb6ee4672061f01153 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 24 03:36:27 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:36:27 2019 +0200 [SHELL32] Code formatting/style/whitespace fix + fix two memory leaks in failure paths of CNewMenu::LoadItem(). --- dll/win32/shell32/CNewMenu.cpp | 90 +++++++++++++++++++++++------------------- dll/win32/shell32/CNewMenu.h | 2 +- 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index d4b86863f3..c4c3c28a97 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -31,8 +31,8 @@ CNewMenu::CNewMenu() : m_pItems(NULL), m_pLinkItem(NULL), m_pSite(NULL), - m_hiconFolder(NULL), - m_hiconLink(NULL) + m_hIconFolder(NULL), + m_hIconLink(NULL) { } @@ -76,7 +76,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { HKEY hKey; WCHAR wszBuf[MAX_PATH]; - BYTE *pData = NULL; + PBYTE pData = NULL; DWORD cbData; StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s\\ShellNew", pwszExt); @@ -115,7 +115,7 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) { if (Types[i].bNeedData && cbData > 0) { - pData = (BYTE*)malloc(cbData); + pData = (PBYTE)malloc(cbData); RegGetValueW(hKey, NULL, Types[i].pszName, dwFlags, &dwType, pData, &cbData); if (!Types[i].bStr && (dwType == REG_SZ || dwType == REG_EXPAND_SZ)) { @@ -132,11 +132,17 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) /* Was any key found? */ if (!Types[i].pszName) + { + free(pData); return NULL; + } SHFILEINFOW fi; - if (!SHGetFileInfoW(pwszExt, FILE_ATTRIBUTE_NORMAL, &fi, sizeof(fi), SHGFI_USEFILEATTRIBUTES|SHGFI_TYPENAME|SHGFI_ICON|SHGFI_SMALLICON)) + if (!SHGetFileInfoW(pwszExt, FILE_ATTRIBUTE_NORMAL, &fi, sizeof(fi), SHGFI_USEFILEATTRIBUTES | SHGFI_TYPENAME | SHGFI_ICON | SHGFI_SMALLICON)) + { + free(pData); return NULL; + } /* Create new item */ SHELLNEW_ITEM *pNewItem = static_cast<SHELLNEW_ITEM *>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM))); @@ -198,9 +204,9 @@ CNewMenu::CacheItems() } } } - + dwSize++; - + lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize * sizeof(WCHAR)); if (!lpValues) return FALSE; @@ -216,17 +222,17 @@ CNewMenu::CacheItems() HeapFree(GetProcessHeap(), 0, lpValues); return FALSE; } - + if (RegSetValueExW(hKey, L"Classes", NULL, REG_MULTI_SZ, (LPBYTE)lpValues, dwSize * sizeof(WCHAR)) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); return FALSE; } - + HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); - + return TRUE; } @@ -239,17 +245,17 @@ CNewMenu::LoadCachedItems() HKEY hKey; SHELLNEW_ITEM *pNewItem; SHELLNEW_ITEM *pCurItem = NULL; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + + if (RegOpenKeyExW(HKEY_CURRENT_USER, ShellNewKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; - + if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, NULL, &dwSize) != ERROR_SUCCESS) return FALSE; - + lpValues = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, dwSize); if (!lpValues) return FALSE; - + if (RegQueryValueExW(hKey, L"Classes", NULL, NULL, (LPBYTE)lpValues, &dwSize) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lpValues); @@ -258,7 +264,7 @@ CNewMenu::LoadCachedItems() wszName = lpValues; - for (; '\0' != *wszName; wszName += wcslen(wszName) + 1) + for (; *wszName != '\0'; wszName += wcslen(wszName) + 1) { pNewItem = LoadItem(wszName); if (pNewItem) @@ -281,10 +287,10 @@ CNewMenu::LoadCachedItems() } } } - + HeapFree(GetProcessHeap(), 0, lpValues); RegCloseKey(hKey); - + return TRUE; } @@ -306,8 +312,8 @@ UINT CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) { MENUITEMINFOW mii; - WCHAR wszBuf[256]; UINT idCmd = idCmdFirst; + WCHAR wszBuf[256]; if (m_pItems == NULL) { @@ -318,7 +324,7 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); - /* Insert new folder action */ + /* Insert the new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; @@ -341,18 +347,17 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) ++idCmd; } - /* Insert seperator for custom new action */ + /* Insert a seperator for the custom new action */ mii.fMask = MIIM_TYPE | MIIM_ID; mii.fType = MFT_SEPARATOR; mii.wID = -1; InsertMenuItemW(hMenu, Pos++, TRUE, &mii); - /* Insert rest of items */ + /* Insert the rest of the items */ mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; mii.fType = 0; - SHELLNEW_ITEM *pCurItem = m_pItems; - while (pCurItem) + for (SHELLNEW_ITEM *pCurItem = m_pItems; pCurItem; pCurItem = pCurItem->pNext) { /* Skip shortcut item */ if (pCurItem == m_pLinkItem) @@ -364,7 +369,6 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) mii.wID = idCmd; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; - pCurItem = pCurItem->pNext; } return idCmd - idCmdFirst; @@ -436,7 +440,7 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) WCHAR wszName[MAX_PATH]; WCHAR wszNewFolder[25]; HRESULT hr; - + /* Get folder path */ hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); if (FAILED_UNEXPECTEDLY(hr)) @@ -553,7 +557,7 @@ HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, else { StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK | MB_ICONERROR); // FIXME load localized error msg } return S_OK; @@ -615,9 +619,9 @@ CNewMenu::QueryContextMenu(HMENU hMenu, UINT idCmdLast, UINT uFlags) { - WCHAR wszNew[200]; MENUITEMINFOW mii; UINT cItems = 0; + WCHAR wszNew[200]; TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -631,7 +635,7 @@ CNewMenu::QueryContextMenu(HMENU hMenu, cItems = InsertShellNewItems(m_hSubMenu, idCmdFirst, 0); - memset(&mii, 0, sizeof(mii)); + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; mii.fType = MFT_STRING; @@ -654,7 +658,9 @@ CNewMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpici) HRESULT hr = E_FAIL; if (LOWORD(lpici->lpVerb) == 0) + { hr = CreateNewFolder(lpici); + } else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(LOWORD(lpici->lpVerb)); @@ -715,11 +721,15 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes break; DWORD id = LOWORD(lpdis->itemID); - HICON hIcon = 0; + HICON hIcon = NULL; if (id == 0) - hIcon = m_hiconFolder; + { + hIcon = m_hIconFolder; + } else if (id == 1) - hIcon = m_hiconLink; + { + hIcon = m_hIconLink; + } else { SHELLNEW_ITEM *pItem = FindItemFromIdOffset(id); @@ -730,12 +740,12 @@ CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plRes if (!hIcon) break; - DrawIconEx(lpdis->hDC, - 2, - lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, - hIcon, - 16, - 16, + DrawIconEx(lpdis->hDC, + 2, + lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, + hIcon, + 16, + 16, 0, NULL, DI_NORMAL); if(plResult) @@ -753,7 +763,7 @@ CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, m_pidlFolder = ILClone(pidlFolder); /* Load folder and shortcut icons */ - m_hiconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); - m_hiconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED); + m_hIconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); + m_hIconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED); return S_OK; } diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index a0c62eb86e..e5c45e73d2 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -59,7 +59,7 @@ private: SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; - HICON m_hiconFolder, m_hiconLink; + HICON m_hIconFolder, m_hIconLink; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem);

5 years, 8 months

[reactos] 01/01: [SHELL32] Implement 'New Link' (Retrial of #1510), CORE-15511 (#1518)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e60c2efeefbb2a4d9389… commit 8e60c2efeefbb2a4d93894c8300c0244bf54fea6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Apr 23 10:48:34 2019 +0900 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 24 03:28:17 2019 +0200 [SHELL32] Implement 'New Link' (Retrial of #1510), CORE-15511 (#1518) Correctly create cache about ".lnk" and handling in the member functions. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- dll/win32/shell32/CNewMenu.cpp | 309 +++++++++++++++++++++-------------------- dll/win32/shell32/CNewMenu.h | 7 +- 2 files changed, 164 insertions(+), 152 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index 4a17e9b58b..d4b86863f3 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -4,6 +4,7 @@ * Copyright 2007 Johannes Anderwald (johannes.anderwald(a)reactos.org) * Copyright 2009 Andrew Hill * Copyright 2012 Rafal Harabien + * Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,18 +61,14 @@ void CNewMenu::UnloadAllItems() { SHELLNEW_ITEM *pCurItem; - /* Unload normal items */ + /* Unload the handler items, including the link item */ while (m_pItems) { pCurItem = m_pItems; m_pItems = m_pItems->pNext; - UnloadItem(pCurItem); } - - /* Unload link item */ - if (m_pLinkItem) - UnloadItem(m_pLinkItem); + m_pItems = NULL; m_pLinkItem = NULL; } @@ -183,21 +180,21 @@ CNewMenu::CacheItems() if (pNewItem) { dwSize += wcslen(wszName) + 1; - if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { - /* Link handler */ + /* The unique link handler */ m_pLinkItem = pNewItem; } + + /* Add at the end of the list */ + if (pCurItem) + { + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; + } else { - /* Add at the end of list */ - if (pCurItem) - { - pCurItem->pNext = pNewItem; - pCurItem = pNewItem; - } - else - pCurItem = m_pItems = pNewItem; + pCurItem = m_pItems = pNewItem; } } } @@ -208,13 +205,10 @@ CNewMenu::CacheItems() if (!lpValues) return FALSE; - lpValue = lpValues; - pCurItem = m_pItems; - while (pCurItem) + for (pCurItem = m_pItems, lpValue = lpValues; pCurItem; pCurItem = pCurItem->pNext) { memcpy(lpValue, pCurItem->pwszExt, (wcslen(pCurItem->pwszExt) + 1) * sizeof(WCHAR)); lpValue += wcslen(pCurItem->pwszExt) + 1; - pCurItem = pCurItem->pNext; } if (RegCreateKeyEx(HKEY_CURRENT_USER, ShellNewKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) @@ -269,21 +263,21 @@ CNewMenu::LoadCachedItems() pNewItem = LoadItem(wszName); if (pNewItem) { - if (wcsicmp(pNewItem->pwszExt, L".lnk") == 0) + if (!m_pLinkItem && wcsicmp(pNewItem->pwszExt, L".lnk") == 0) { - /* Link handler */ + /* The unique link handler */ m_pLinkItem = pNewItem; } + + /* Add at the end of the list */ + if (pCurItem) + { + pCurItem->pNext = pNewItem; + pCurItem = pNewItem; + } else { - /* Add at the end of list */ - if (pCurItem) - { - pCurItem->pNext = pNewItem; - pCurItem = pNewItem; - } - else - pCurItem = m_pItems = pNewItem; + pCurItem = m_pItems = pNewItem; } } } @@ -299,27 +293,13 @@ CNewMenu::LoadAllItems() { /* If there are any unload them */ UnloadAllItems(); - + if (!LoadCachedItems()) { CacheItems(); } - - if (!m_pLinkItem) - { - m_pLinkItem = static_cast<SHELLNEW_ITEM *>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SHELLNEW_ITEM))); - if (m_pLinkItem) - { - m_pLinkItem->Type = SHELLNEW_TYPE_NULLFILE; - m_pLinkItem->pwszDesc = _wcsdup(L"Link"); - m_pLinkItem->pwszExt = _wcsdup(L".lnk"); - } - } - if (m_pItems == NULL) - return FALSE; - else - return TRUE; + return (m_pItems != NULL); } UINT @@ -349,14 +329,17 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; - /* Insert new shortcut action */ - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, wszBuf, _countof(wszBuf))) - wszBuf[0] = 0; - mii.dwTypeData = wszBuf; - mii.cch = wcslen(mii.dwTypeData); - mii.wID = idCmd; - if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) - ++idCmd; + /* Insert the new shortcut action */ + if (m_pLinkItem) + { + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWLINK, wszBuf, _countof(wszBuf))) + wszBuf[0] = 0; + mii.dwTypeData = wszBuf; + mii.cch = wcslen(mii.dwTypeData); + mii.wID = idCmd; + if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) + ++idCmd; + } /* Insert seperator for custom new action */ mii.fMask = MIIM_TYPE | MIIM_ID; @@ -371,6 +354,10 @@ CNewMenu::InsertShellNewItems(HMENU hMenu, UINT idCmdFirst, UINT Pos) SHELLNEW_ITEM *pCurItem = m_pItems; while (pCurItem) { + /* Skip shortcut item */ + if (pCurItem == m_pLinkItem) + continue; + TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); @@ -404,13 +391,18 @@ CNewMenu::SHELLNEW_ITEM *CNewMenu::FindItemFromIdOffset(UINT IdOffset) return pItem; } -HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) +HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename) { CComPtr<IShellBrowser> lpSB; CComPtr<IShellView> lpSV; HRESULT hr = E_FAIL; LPITEMIDLIST pidl; PITEMID_CHILD pidlNewItem; + DWORD dwSelectFlags; + + dwSelectFlags = SVSI_DESELECTOTHERS | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT; + if (bRename) + dwSelectFlags |= SVSI_EDIT; /* Notify the view object about the new item */ SHChangeNotify(wEventId, uFlags, (LPCVOID) pszName, NULL); @@ -430,8 +422,7 @@ HRESULT CNewMenu::SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName) pidlNewItem = ILFindLastID(pidl); - hr = lpSV->SelectItem(pidlNewItem, SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | - SVSI_FOCUSED | SVSI_SELECT); + hr = lpSV->SelectItem(pidlNewItem, dwSelectFlags); SHFree(pidl); @@ -463,121 +454,139 @@ HRESULT CNewMenu::CreateNewFolder(LPCMINVOKECOMMANDINFO lpici) return E_FAIL; /* Show and select the new item in the def view */ - SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName); + SelectNewItem(SHCNE_MKDIR, SHCNF_PATHW, wszName, TRUE); return S_OK; } -HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +HRESULT CNewMenu::NewItemByCommand(SHELLNEW_ITEM *pItem, LPCWSTR wszPath) { WCHAR wszBuf[MAX_PATH]; - WCHAR wszPath[MAX_PATH]; - HRESULT hr; + LPWSTR Ptr, pwszCmd; + WCHAR wszTemp[MAX_PATH]; + STARTUPINFOW si; + PROCESS_INFORMATION pi; - /* Get folder path */ - hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, _countof(wszBuf))) + { + TRACE("ExpandEnvironmentStrings failed\n"); + return E_FAIL; + } - switch (pItem->Type) + /* Expand command parameter, FIXME: there can be more modifiers */ + Ptr = wcsstr(wszBuf, L"%1"); + if (Ptr) { - case SHELLNEW_TYPE_COMMAND: - { - LPWSTR Ptr, pwszCmd; - WCHAR wszTemp[MAX_PATH]; - STARTUPINFOW si; - PROCESS_INFORMATION pi; + Ptr[1] = L's'; + StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); + pwszCmd = wszTemp; + } + else + { + pwszCmd = wszBuf; + } - if (!ExpandEnvironmentStringsW((LPWSTR)pItem->pData, wszBuf, _countof(wszBuf))) - { - TRACE("ExpandEnvironmentStrings failed\n"); - break; - } + /* Create process */ + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (CreateProcessW(NULL, pwszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return S_OK; + } + else + { + ERR("Failed to create process\n"); + return E_FAIL; + } +} - /* Expand command parameter, FIXME: there can be more modifiers */ - Ptr = wcsstr(wszBuf, L"%1"); - if (Ptr) - { - Ptr[1] = L's'; - StringCbPrintfW(wszTemp, sizeof(wszTemp), wszBuf, wszPath); - pwszCmd = wszTemp; - } - else - { - pwszCmd = wszBuf; - } +HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, + DWORD cchNameMax, LPCWSTR wszPath) +{ + WCHAR wszBuf[MAX_PATH]; + WCHAR wszNewFile[MAX_PATH]; + BOOL bSuccess = TRUE; - /* Create process */ - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - if (CreateProcessW(NULL, pwszCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - else - { - ERR("Failed to create process\n"); - } - break; - } + if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) + return E_FAIL; - case SHELLNEW_TYPE_DATA: - case SHELLNEW_TYPE_FILENAME: - case SHELLNEW_TYPE_NULLFILE: + StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + + /* Create the name of the new file */ + if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) + return E_FAIL; + + /* Create new file */ + HANDLE hFile = CreateFileW(wszName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + if (pItem->Type == SHELLNEW_TYPE_DATA) { - BOOL bSuccess = TRUE; - WCHAR wszName[MAX_PATH]; - WCHAR wszNewFile[MAX_PATH]; + /* Write a content */ + DWORD cbWritten; + WriteFile(hFile, pItem->pData, pItem->cbData, &cbWritten, NULL); + } - if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEW, wszBuf, _countof(wszBuf))) - return E_FAIL; + /* Close file now */ + CloseHandle(hFile); + } + else + { + bSuccess = FALSE; + } - StringCchPrintfW(wszNewFile, _countof(wszNewFile), L"%s %s%s", wszBuf, pItem->pwszDesc, pItem->pwszExt); + if (pItem->Type == SHELLNEW_TYPE_FILENAME) + { + /* Copy file */ + if (!CopyFileW((LPWSTR)pItem->pData, wszName, FALSE)) + ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); + } - /* Create the name of the new file */ - if (!PathYetAnotherMakeUniqueName(wszName, wszPath, NULL, wszNewFile)) - return E_FAIL; + /* Show message if we failed */ + if (bSuccess) + { + TRACE("Notifying fs %s\n", debugstr_w(wszName)); + SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName, pItem != m_pLinkItem); + } + else + { + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); + MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg + } - /* Create new file */ - HANDLE hFile = CreateFileW(wszName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - if (pItem->Type == SHELLNEW_TYPE_DATA) - { - /* Write a content */ - DWORD cbWritten; - WriteFile(hFile, pItem->pData, pItem->cbData, &cbWritten, NULL); - } + return S_OK; +} - /* Close file now */ - CloseHandle(hFile); - } - else - { - bSuccess = FALSE; - } +HRESULT CNewMenu::CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi) +{ + HRESULT hr; + WCHAR wszPath[MAX_PATH], wszName[MAX_PATH]; - if (pItem->Type == SHELLNEW_TYPE_FILENAME) - { - /* Copy file */ - if (!CopyFileW((LPWSTR)pItem->pData, wszName, FALSE)) - ERR("Copy file failed: %ls\n", (LPWSTR)pItem->pData); - } + /* Get folder path */ + hr = SHGetPathFromIDListW(m_pidlFolder, wszPath); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - /* Show message if we failed */ - if (bSuccess) - { - TRACE("Notifying fs %s\n", debugstr_w(wszName)); - SelectNewItem(SHCNE_CREATE, SHCNF_PATHW, wszName); - } - else - { - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK|MB_ICONERROR); // FIXME load localized error msg - } + if (pItem == m_pLinkItem) + { + NewItemByNonCommand(pItem, wszName, _countof(wszName), wszPath); + NewItemByCommand(pItem, wszName); + return S_OK; + } + + switch (pItem->Type) + { + case SHELLNEW_TYPE_COMMAND: + NewItemByCommand(pItem, wszPath); + break; + + case SHELLNEW_TYPE_DATA: + case SHELLNEW_TYPE_FILENAME: + case SHELLNEW_TYPE_NULLFILE: + NewItemByNonCommand(pItem, wszName, _countof(wszName), wszPath); break; - } case SHELLNEW_TYPE_INVALID: ERR("Invalid type\n"); diff --git a/dll/win32/shell32/CNewMenu.h b/dll/win32/shell32/CNewMenu.h index 2475e725a9..a0c62eb86e 100644 --- a/dll/win32/shell32/CNewMenu.h +++ b/dll/win32/shell32/CNewMenu.h @@ -56,7 +56,7 @@ private: LPITEMIDLIST m_pidlFolder; LPWSTR m_wszPath; SHELLNEW_ITEM *m_pItems; - SHELLNEW_ITEM *m_pLinkItem; + SHELLNEW_ITEM *m_pLinkItem; // Points to the link handler item in the m_pItems list. CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; HICON m_hiconFolder, m_hiconLink; @@ -71,7 +71,10 @@ private: SHELLNEW_ITEM *FindItemFromIdOffset(UINT IdOffset); HRESULT CreateNewFolder(LPCMINVOKECOMMANDINFO lpici); HRESULT CreateNewItem(SHELLNEW_ITEM *pItem, LPCMINVOKECOMMANDINFO lpcmi); - HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName); + HRESULT SelectNewItem(LONG wEventId, UINT uFlags, LPWSTR pszName, BOOL bRename); + HRESULT NewItemByCommand(SHELLNEW_ITEM *pItem, LPCWSTR wszPath); + HRESULT NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, + DWORD cchNameMax, LPCWSTR wszPath); public: CNewMenu();

5 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
24
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 April 2019