Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ROSAUTOTEST] A timeout of 120 seconds kills the msi:action test prematurely, so increase it to 170 seconds.
by Colin Finck 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86ae6b029fd4d18db885e… commit 86ae6b029fd4d18db885edd12275dc8b120814e4 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Fri Apr 26 10:30:24 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Fri Apr 26 10:31:02 2019 +0200 [ROSAUTOTEST] A timeout of 120 seconds kills the msi:action test prematurely, so increase it to 170 seconds. This is still below the 180 seconds before sysreg2 kills the entire VM. I've added a comment to clarify that. --- modules/rostests/rosautotest/CWineTest.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/rosautotest/CWineTest.cpp b/modules/rostests/rosautotest/CWineTest.cpp index 6e163979e0..9967d2d21c 100644 --- a/modules/rostests/rosautotest/CWineTest.cpp +++ b/modules/rostests/rosautotest/CWineTest.cpp @@ -8,7 +8,11 @@ #include "precomp.h" static const DWORD ListTimeout = 10000; -static const DWORD ProcessActivityTimeout = 120000; + +// This value needs to be lower than the <timeout> configured in sysreg.xml! (usually 180000) +// Otherwise, sysreg2 kills the VM before we can kill the process. +static const DWORD ProcessActivityTimeout = 170000; + /** * Constructs a CWineTest object.

1 0

[reactos] 01/01: [PSDK] Improve lmrepl.h
by Timo Kreuzer 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7ab90d93287ffc02d4c2… commit b7ab90d93287ffc02d4c2f2603630d9660fc367a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Apr 21 12:59:23 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 26 10:30:01 2019 +0200 [PSDK] Improve lmrepl.h Added public domain header. This file was originally imported in r8283 from w32api where is has no copyright. --- sdk/include/psdk/lmrepl.h | 300 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 229 insertions(+), 71 deletions(-) diff --git a/sdk/include/psdk/lmrepl.h b/sdk/include/psdk/lmrepl.h index 706ebba596..e950f5a273 100644 --- a/sdk/include/psdk/lmrepl.h +++ b/sdk/include/psdk/lmrepl.h @@ -1,91 +1,249 @@ -#ifndef _LMREPL_H -#define _LMREPL_H +/* + * lmrepl.h + * + * This file is part of the ReactOS PSDK package. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#pragma once +#define _LMREPL_ #ifdef __cplusplus extern "C" { #endif + #define REPL_ROLE_EXPORT 1 #define REPL_ROLE_IMPORT 2 -#define REPL_ROLE_BOTH 3 -#define REPL_INTERVAL_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+0) -#define REPL_PULSE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1) +#define REPL_ROLE_BOTH 3 + +#define REPL_INTERVAL_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+0) +#define REPL_PULSE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1) #define REPL_GUARDTIME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+2) -#define REPL_RANDOM_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+3) +#define REPL_RANDOM_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+3) + #define REPL_UNLOCK_NOFORCE 0 -#define REPL_UNLOCK_FORCE 1 +#define REPL_UNLOCK_FORCE 1 + #define REPL_STATE_OK 0 #define REPL_STATE_NO_MASTER 1 #define REPL_STATE_NO_SYNC 2 #define REPL_STATE_NEVER_REPLICATED 3 + #define REPL_INTEGRITY_FILE 1 #define REPL_INTEGRITY_TREE 2 + #define REPL_EXTENT_FILE 1 #define REPL_EXTENT_TREE 2 + #define REPL_EXPORT_INTEGRITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+0) -#define REPL_EXPORT_EXTENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1) -typedef struct _REPL_INFO_0 { - DWORD rp0_role; - LPWSTR rp0_exportpath; - LPWSTR rp0_exportlist; - LPWSTR rp0_importpath; - LPWSTR rp0_importlist; - LPWSTR rp0_logonusername; - DWORD rp0_interval; - DWORD rp0_pulse; - DWORD rp0_guardtime; - DWORD rp0_random; -} REPL_INFO_0,*PREPL_INFO_0,*LPREPL_INFO_0; -typedef struct _REPL_INFO_1000 { DWORD rp1000_interval; } REPL_INFO_1000,*PREPL_INFO_1000,*LPREPL_INFO_1000; -typedef struct _REPL_INFO_1001 { DWORD rp1001_pulse; } REPL_INFO_1001,*PREPL_INFO_1001,*LPREPL_INFO_1001; -typedef struct _REPL_INFO_1002 { DWORD rp1002_guardtime; } REPL_INFO_1002,*PREPL_INFO_1002,*LPREPL_INFO_1002; -typedef struct _REPL_INFO_1003 { DWORD rp1003_random; } REPL_INFO_1003,*PREPL_INFO_1003,*LPREPL_INFO_1003; - -NET_API_STATUS WINAPI NetReplGetInfo(LPCWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetReplSetInfo(LPCWSTR,DWORD,const LPBYTE,PDWORD); -typedef struct _REPL_EDIR_INFO_0 { - LPWSTR rped0_dirname; -} REPL_EDIR_INFO_0,*PREPL_EDIR_INFO_0,*LPREPL_EDIR_INFO_0; -typedef struct _REPL_EDIR_INFO_1 { - LPWSTR rped1_dirname; - DWORD rped1_integrity; - DWORD rped1_extent; -} REPL_EDIR_INFO_1,*PREPL_EDIR_INFO_1,*LPREPL_EDIR_INFO_1; -typedef struct _REPL_EDIR_INFO_2 { - LPWSTR rped2_dirname; - DWORD rped2_integrity; - DWORD rped2_extent; - DWORD rped2_lockcount; - DWORD rped2_locktime; -} REPL_EDIR_INFO_2,*PREPL_EDIR_INFO_2,*LPREPL_EDIR_INFO_2; -typedef struct _REPL_EDIR_INFO_1000 { - DWORD rped1000_integrity; -} REPL_EDIR_INFO_1000,*PREPL_EDIR_INFO_1000,*LPREPL_EDIR_INFO_1000; -typedef struct _REPL_EDIR_INFO_1001 { - DWORD rped1001_extent; -} REPL_EDIR_INFO_1001,*PREPL_EDIR_INFO_1001,*LPREPL_EDIR_INFO_1001; -typedef struct _REPL_IDIR_INFO_0 { LPWSTR rpid0_dirname; } REPL_IDIR_INFO_0,*PREPL_IDIR_INFO_0,*LPREPL_IDIR_INFO_0; -typedef struct _REPL_IDIR_INFO_1 { - LPWSTR rpid1_dirname; - DWORD rpid1_state; - LPWSTR rpid1_mastername; - DWORD rpid1_last_update_time; - DWORD rpid1_lockcount; - DWORD rpid1_locktime; -} REPL_IDIR_INFO_1,*PREPL_IDIR_INFO_1,*LPREPL_IDIR_INFO_1; -NET_API_STATUS WINAPI NetReplExportDirAdd(LPCWSTR,DWORD,const LPBYTE,PDWORD); -NET_API_STATUS WINAPI NetReplExportDirDel(LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetReplExportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); -NET_API_STATUS WINAPI NetReplExportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPCWSTR,LPCWSTR,DWORD,const LPBYTE,PDWORD); -NET_API_STATUS WINAPI NetReplExportDirLock(LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetReplExportDirUnlock(LPCWSTR,LPCWSTR,DWORD); -NET_API_STATUS WINAPI NetReplImportDirAdd(LPCWSTR,DWORD,const LPBYTE,PDWORD); -NET_API_STATUS WINAPI NetReplImportDirDel(LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetReplImportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD); -NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*); -NET_API_STATUS WINAPI NetReplImportDirLock(LPCWSTR,LPCWSTR); -NET_API_STATUS WINAPI NetReplImportDirUnlock(LPCWSTR,LPCWSTR,DWORD); +#define REPL_EXPORT_EXTENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1) + +typedef struct _REPL_INFO_0 +{ + DWORD rp0_role; + LPWSTR rp0_exportpath; + LPWSTR rp0_exportlist; + LPWSTR rp0_importpath; + LPWSTR rp0_importlist; + LPWSTR rp0_logonusername; + DWORD rp0_interval; + DWORD rp0_pulse; + DWORD rp0_guardtime; + DWORD rp0_random; +} REPL_INFO_0, * PREPL_INFO_0, * LPREPL_INFO_0; + +typedef struct _REPL_INFO_1000 +{ + DWORD rp1000_interval; +} REPL_INFO_1000,*PREPL_INFO_1000,*LPREPL_INFO_1000; + +typedef struct _REPL_INFO_1001 +{ + DWORD rp1001_pulse; +} REPL_INFO_1001,*PREPL_INFO_1001,*LPREPL_INFO_1001; + +typedef struct _REPL_INFO_1002 +{ + DWORD rp1002_guardtime; +} REPL_INFO_1002,*PREPL_INFO_1002,*LPREPL_INFO_1002; + +typedef struct _REPL_INFO_1003 +{ + DWORD rp1003_random; +} REPL_INFO_1003,*PREPL_INFO_1003,*LPREPL_INFO_1003; + +NET_API_STATUS +NET_API_FUNCTION +NetReplGetInfo( + _In_ LPCWSTR servername OPTIONAL, + _In_ DWORD level, + _Out_ LPBYTE* bufptr); + +NET_API_STATUS +WINAPI +NetReplSetInfo( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _In_ const LPBYTE buf, + _Out_opt_ LPDWORD parm_err); + +typedef struct _REPL_EDIR_INFO_0 +{ + LPWSTR rped0_dirname; +} REPL_EDIR_INFO_0, * PREPL_EDIR_INFO_0, * LPREPL_EDIR_INFO_0; + +typedef struct _REPL_EDIR_INFO_1 +{ + LPWSTR rped1_dirname; + DWORD rped1_integrity; + DWORD rped1_extent; +} REPL_EDIR_INFO_1, * PREPL_EDIR_INFO_1, * LPREPL_EDIR_INFO_1; + +typedef struct _REPL_EDIR_INFO_2 +{ + LPWSTR rped2_dirname; + DWORD rped2_integrity; + DWORD rped2_extent; + DWORD rped2_lockcount; + DWORD rped2_locktime; +} REPL_EDIR_INFO_2, * PREPL_EDIR_INFO_2, * LPREPL_EDIR_INFO_2; + +typedef struct _REPL_EDIR_INFO_1000 +{ + DWORD rped1000_integrity; +} REPL_EDIR_INFO_1000, * PREPL_EDIR_INFO_1000, * LPREPL_EDIR_INFO_1000; + +typedef struct _REPL_EDIR_INFO_1001 +{ + DWORD rped1001_extent; +} REPL_EDIR_INFO_1001, * PREPL_EDIR_INFO_1001, * LPREPL_EDIR_INFO_1001; + +typedef struct _REPL_IDIR_INFO_0 +{ + LPWSTR rpid0_dirname; +} REPL_IDIR_INFO_0, * PREPL_IDIR_INFO_0, * LPREPL_IDIR_INFO_0; + +typedef struct _REPL_IDIR_INFO_1 +{ + LPWSTR rpid1_dirname; + DWORD rpid1_state; + LPWSTR rpid1_mastername; + DWORD rpid1_last_update_time; + DWORD rpid1_lockcount; + DWORD rpid1_locktime; +} REPL_IDIR_INFO_1, * PREPL_IDIR_INFO_1, * LPREPL_IDIR_INFO_1; + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirAdd( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _In_ const LPBYTE buf, + _Out_opt_ LPDWORD parm_err); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirDel( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirEnum( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _Out_ LPBYTE* bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_opt_ LPDWORD resumehandle); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirGetInfo( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname, + _In_ DWORD level, + _Out_ LPBYTE* bufptr); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirSetInfo( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname, + _In_ DWORD level, + _In_ const LPBYTE buf, + _Out_opt_ LPDWORD parm_err); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirLock( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname); + +NET_API_STATUS +NET_API_FUNCTION +NetReplExportDirUnlock( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname, + _In_ DWORD unlockforce); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirAdd( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _In_ const LPBYTE buf, + _Out_opt_ LPDWORD parm_err); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirDel( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirEnum( + _In_opt_ LPCWSTR servername, + _In_ DWORD level, + _Out_ LPBYTE* bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_opt_ LPDWORD resumehandle); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirGetInfo( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname, + _In_ DWORD level, + _Out_ LPBYTE* bufptr); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirLock( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname); + +NET_API_STATUS +NET_API_FUNCTION +NetReplImportDirUnlock( + _In_opt_ LPCWSTR servername, + _In_ LPCWSTR dirname, + _In_ DWORD unlockforce); + #ifdef __cplusplus } #endif -#endif

1 0

[reactos] 01/01: [REGTEST] Add regtest.cmd to the Run key inside regtest.cmd, so we're also started on the next reboot in case ReactOS crashed *and* the registry has been saved.
by Colin Finck 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e34d3cf3792b9ae44d1e8… commit e34d3cf3792b9ae44d1e814a1ca160e1714aa71f Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Apr 24 10:48:15 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Fri Apr 26 10:02:47 2019 +0200 [REGTEST] Add regtest.cmd to the Run key inside regtest.cmd, so we're also started on the next reboot in case ReactOS crashed *and* the registry has been saved. unattend.inf only allows to add RunOnce entries, which are in theory only executed on the first boot after installation. For almost a decade, this worked anyway to start regtest.cmd again after a ReactOS crash, because the registry and thus the deletion of the RunOnce entry wasn't stored on disk in case of a crash. Thanks to Sylvain for the hint! As Explorer processes the Run key right after RunOnce and therefore picks up regtest.cmd a second time during the first boot, exit the script just after adding the Run key. Otherwise, rosautotest.exe would be started twice, with catastrophic results. --- boot/bootdata/bootcdregtest/regtest.cmd | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/boot/bootdata/bootcdregtest/regtest.cmd b/boot/bootdata/bootcdregtest/regtest.cmd index 29ea7becb2..ec263e1324 100644 --- a/boot/bootdata/bootcdregtest/regtest.cmd +++ b/boot/bootdata/bootcdregtest/regtest.cmd @@ -2,6 +2,15 @@ set WINETEST_DEBUG=0 set WINETEST_PLATFORM=reactos +:: On the first boot, we're started through RunOnce. +:: Add us to the Run key, so we're also started on the next reboot in case ReactOS crashed *and* the registry has been saved. +:: Exit right after that, because Explorer processes the Run key right after RunOnce and therefore picks up regtest.cmd a second time during the first boot. +reg query HKLM\Software\Microsoft\Windows\CurrentVersion\Run /v regtest +if "%errorlevel%"=="1" ( + reg add HKLM\Software\Microsoft\Windows\CurrentVersion\Run /v regtest /t REG_SZ /d "%SystemRoot%\system32\cmd.exe /c regtest.cmd" + exit 0 +) + move C:\ReactOS\bin\redirtest1.dll C:\ReactOS\bin\kernel32test_versioned.dll move C:\ReactOS\bin\testdata\redirtest2.dll C:\ReactOS\bin\testdata\kernel32test_versioned.dll if exist "C:\ReactOS\bin\AHKAppTests.cmd" (

1 0

[reactos] 02/02: [ROSAUTOTEST] Cache the result of GetLastError().
by Colin Finck 26 Apr '19

26 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=064dffe6c3c22336c1ab3… commit 064dffe6c3c22336c1ab3acb3127af8e91115f25 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Tue Apr 23 11:37:58 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 26 08:47:15 2019 +0200 [ROSAUTOTEST] Cache the result of GetLastError(). --- modules/rostests/rosautotest/CPipe.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/rostests/rosautotest/CPipe.cpp b/modules/rostests/rosautotest/CPipe.cpp index 5af7163971..73e9eda295 100644 --- a/modules/rostests/rosautotest/CPipe.cpp +++ b/modules/rostests/rosautotest/CPipe.cpp @@ -169,7 +169,9 @@ CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, D // The asynchronous read request could be satisfied immediately. return ERROR_SUCCESS; } - else if (GetLastError() == ERROR_IO_PENDING) + + DWORD dwLastError = GetLastError(); + if (dwLastError == 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); @@ -181,7 +183,9 @@ CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, D // We successfully read NumberOfBytesRead bytes. return ERROR_SUCCESS; } - else if (GetLastError() == ERROR_BROKEN_PIPE) + + dwLastError = GetLastError(); + if (dwLastError == ERROR_BROKEN_PIPE) { // The other end of the pipe has been closed. return ERROR_BROKEN_PIPE; @@ -201,7 +205,7 @@ CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, D else { // This may be ERROR_BROKEN_PIPE or an unexpected error. - return GetLastError(); + return dwLastError; } }

1 0

[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 26 Apr '19

26 Apr '19

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) {

1 0

[reactos] 01/01: [POWERCFG] Fix the initialization of the power schemes page
by Eric Kohl 25 Apr '19

25 Apr '19

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; }

1 0

[reactos] 01/01: [DPNHPAST] Import dpnhpast.dll from Wine (Staging) 4.5
by Oleg Dubinskiy 24 Apr '19

24 Apr '19

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

1 0

[reactos] 03/03: [BROWSEUI] Enable the Disconnect Network Drive menu item. (#1522)
by Jared Smudde 24 Apr '19

24 Apr '19

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; }

1 0

[reactos] 02/03: [MPR] Implement the function WNetDisconnectDialog(). (#1522)
by Jared Smudde 24 Apr '19

24 Apr '19

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 } /*********************************************************************

1 0

[reactos] 01/03: [NETPLWIZ] Implement the Disconnect Network Drive dialog. (#1522)
by Jared Smudde 24 Apr '19

24 Apr '19

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs