Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

[reactos] 01/01: [MC] Add messages 4450-4580 to netmsg.dll.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e486d8aaa6d8307d63004… commit e486d8aaa6d8307d63004a7722b2e5b77ca3ce2f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Nov 27 22:55:22 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Nov 27 22:56:10 2018 +0100 [MC] Add messages 4450-4580 to netmsg.dll. --- sdk/include/reactos/mc/netmsgmsg.mc | 583 ++++++++++++++++++++++++++++++++++++ 1 file changed, 583 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 40ae685c07..bd913cc7a6 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -9367,6 +9367,589 @@ Language=Russian Locked%0 . +MessageId=4450 +Severity=Success +Facility=System +SymbolicName=APPERR2_4450 +Language=English +Computer name%0 +. +Language=Russian +Computer name%0 +. + +MessageId=4451 +Severity=Success +Facility=System +SymbolicName=APPERR2_4451 +Language=English +User name%0 +. +Language=Russian +User name%0 +. + +MessageId=4452 +Severity=Success +Facility=System +SymbolicName=APPERR2_4452 +Language=English +Software version%0 +. +Language=Russian +Software version%0 +. + +MessageId=4453 +Severity=Success +Facility=System +SymbolicName=APPERR2_4453 +Language=English +Workstation active on%0 +. +Language=Russian +Workstation active on%0 +. + +MessageId=4454 +Severity=Success +Facility=System +SymbolicName=APPERR2_4454 +Language=English +ReactOS root directory%0 +. +Language=Russian +ReactOS root directory%0 +. + +MessageId=4455 +Severity=Success +Facility=System +SymbolicName=APPERR2_4455 +Language=English +Workstation domain%0 +. +Language=Russian +Workstation domain%0 +. + +MessageId=4456 +Severity=Success +Facility=System +SymbolicName=APPERR2_4456 +Language=English +Logon domain%0 +. +Language=Russian +Logon domain%0 +. + +MessageId=4457 +Severity=Success +Facility=System +SymbolicName=APPERR2_4457 +Language=English +Other domain(s)%0 +. +Language=Russian +Other domain(s)%0 +. + +MessageId=4458 +Severity=Success +Facility=System +SymbolicName=APPERR2_4458 +Language=English +COM Open Timeout (sec)%0 +. +Language=Russian +COM Open Timeout (sec)%0 +. + +MessageId=4459 +Severity=Success +Facility=System +SymbolicName=APPERR2_4459 +Language=English +COM Send Count (byte)%0 +. +Language=Russian +COM Send Count (byte)%0 +. + +MessageId=4460 +Severity=Success +Facility=System +SymbolicName=APPERR2_4460 +Language=English +COM Send Timeout (msec)%0 +. +Language=Russian +COM Send Timeout (msec)%0 +. + +MessageId=4461 +Severity=Success +Facility=System +SymbolicName=APPERR2_4461 +Language=English +DOS session print time-out (sec)%0 +. +Language=Russian +DOS session print time-out (sec)%0 +. + +MessageId=4462 +Severity=Success +Facility=System +SymbolicName=APPERR2_4462 +Language=English +Maximum error log size (K)%0 +. +Language=Russian +Maximum error log size (K)%0 +. + +MessageId=4463 +Severity=Success +Facility=System +SymbolicName=APPERR2_4463 +Language=English +Maximum cache memory (K)%0 +. +Language=Russian +Maximum cache memory (K)%0 +. + +MessageId=4464 +Severity=Success +Facility=System +SymbolicName=APPERR2_4464 +Language=English +Number of network buffers%0 +. +Language=Russian +Number of network buffers%0 +. + +MessageId=4465 +Severity=Success +Facility=System +SymbolicName=APPERR2_4465 +Language=English +Number of character buffers%0 +. +Language=Russian +Number of character buffers%0 +. + +MessageId=4466 +Severity=Success +Facility=System +SymbolicName=APPERR2_4466 +Language=English +Size of network buffers%0 +. +Language=Russian +Size of network buffers%0 +. + +MessageId=4467 +Severity=Success +Facility=System +SymbolicName=APPERR2_4467 +Language=English +Size of character buffers%0 +. +Language=Russian +Size of character buffers%0 +. + +MessageId=4468 +Severity=Success +Facility=System +SymbolicName=APPERR2_4468 +Language=English +Full Computer name%0 +. +Language=Russian +Full Computer name%0 +. + +MessageId=4469 +Severity=Success +Facility=System +SymbolicName=APPERR2_4469 +Language=English +Workstation Domain DNS Name%0 +. +Language=Russian +Workstation Domain DNS Name%0 +. + +MessageId=4470 +Severity=Success +Facility=System +SymbolicName=APPERR2_4470 +Language=English +ReactOS%0 +. +Language=Russian +ReactOS%0 +. + +MessageId=4481 +Severity=Success +Facility=System +SymbolicName=APPERR2_4481 +Language=English +Server Name%0 +. +Language=Russian +Server Name%0 +. + +MessageId=4482 +Severity=Success +Facility=System +SymbolicName=APPERR2_4482 +Language=English +Server Comment%0 +. +Language=Russian +Server Comment%0 +. + +MessageId=4483 +Severity=Success +Facility=System +SymbolicName=APPERR2_4483 +Language=English +Send administrative alerts to%0 +. +Language=Russian +Send administrative alerts to%0 +. + +MessageId=4484 +Severity=Success +Facility=System +SymbolicName=APPERR2_4484 +Language=English +Software version%0 +. +Language=Russian +Software version%0 +. + +MessageId=4485 +Severity=Success +Facility=System +SymbolicName=APPERR2_4485 +Language=English +Peer Server%0 +. +Language=Russian +Peer Server%0 +. + +MessageId=4486 +Severity=Success +Facility=System +SymbolicName=APPERR2_4486 +Language=English +ReactOS%0" +. +Language=Russian +ReactOS%0" +. + +MessageId=4487 +Severity=Success +Facility=System +SymbolicName=APPERR2_4487 +Language=English +Server Level%0 +. +Language=Russian +Server Level%0 +. + +MessageId=4488 +Severity=Success +Facility=System +SymbolicName=APPERR2_4488 +Language=English +ReactOS Server%0 +. +Language=Russian +ReactOS Server%0 +. + +MessageId=4489 +Severity=Success +Facility=System +SymbolicName=APPERR2_4489 +Language=English +Server is active on%0 +. +Language=Russian +Server is active on%0 +. + +MessageId=4492 +Severity=Success +Facility=System +SymbolicName=APPERR2_4492 +Language=English +Server hidden%0 +. +Language=Russian +Server hidden%0 +. + +MessageId=4506 +Severity=Success +Facility=System +SymbolicName=APPERR2_4506 +Language=English +Maximum Logged On Users%0 +. +Language=Russian +Maximum Logged On Users%0 +. + +MessageId=4507 +Severity=Success +Facility=System +SymbolicName=APPERR2_4507 +Language=English +Maximum concurrent administrators%0 +. +Language=Russian +Maximum concurrent administrators%0 +. + +MessageId=4508 +Severity=Success +Facility=System +SymbolicName=APPERR2_4508 +Language=English +Maximum resources shared%0 +. +Language=Russian +Maximum resources shared%0 +. + +MessageId=4509 +Severity=Success +Facility=System +SymbolicName=APPERR2_4509 +Language=English +Maximum connections to resources%0 +. +Language=Russian +Maximum connections to resources%0 +. + +MessageId=4510 +Severity=Success +Facility=System +SymbolicName=APPERR2_4510 +Language=English +Maximum open files on server%0 +. +Language=Russian +Maximum open files on server%0 +. + +MessageId=4511 +Severity=Success +Facility=System +SymbolicName=APPERR2_4511 +Language=English +Maximum open files per session%0 +. +Language=Russian +Maximum open files per session%0 +. + +MessageId=4512 +Severity=Success +Facility=System +SymbolicName=APPERR2_4512 +Language=English +Maximum file locks%0 +. +Language=Russian +Maximum file locks%0 +. + +MessageId=4520 +Severity=Success +Facility=System +SymbolicName=APPERR2_4520 +Language=English +Idle session time (min)%0 +. +Language=Russian +Idle session time (min)%0 +. + +MessageId=4526 +Severity=Success +Facility=System +SymbolicName=APPERR2_4526 +Language=English +Share-level%0 +. +Language=Russian +Share-level%0 +. + +MessageId=4527 +Severity=Success +Facility=System +SymbolicName=APPERR2_4527 +Language=English +User-level%0 +. +Language=Russian +User-level%0 +. + +MessageId=4530 +Severity=Success +Facility=System +SymbolicName=APPERR2_4530 +Language=English +Unlimited Server%0 +. +Language=Russian +Unlimited Server%0 +. + +MessageId=4570 +Severity=Success +Facility=System +SymbolicName=APPERR2_4570 +Language=English +Force user logoff how long after time expires?:%0\n +. +Language=Russian +Force user logoff how long after time expires?:%0\n +. + +MessageId=4571 +Severity=Success +Facility=System +SymbolicName=APPERR2_4571 +Language=English +Lock out account after how many bad passwords?:%0\n +. +Language=Russian +Lock out account after how many bad passwords?:%0\n +. + +MessageId=4572 +Severity=Success +Facility=System +SymbolicName=APPERR2_4572 +Language=English +Minimum password age (days):%0 +. +Language=Russian +Minimum password age (days):%0 +. + +MessageId=4573 +Severity=Success +Facility=System +SymbolicName=APPERR2_4573 +Language=English +Maximum password age (days):%0 +. +Language=Russian +Maximum password age (days):%0 +. + +MessageId=4574 +Severity=Success +Facility=System +SymbolicName=APPERR2_4574 +Language=English +Minimum password length:%0 +. +Language=Russian +Minimum password length:%0 +. + +MessageId=4575 +Severity=Success +Facility=System +SymbolicName=APPERR2_4575 +Language=English +Length of password history maintained:%0 +. +Language=Russian +Length of password history maintained:%0 +. + +MessageId=4576 +Severity=Success +Facility=System +SymbolicName=APPERR2_4576 +Language=English +Computer role:%0 +. +Language=Russian +Computer role:%0 +. + +MessageId=4577 +Severity=Success +Facility=System +SymbolicName=APPERR2_4577 +Language=English +Primary Domain controller for workstation domain:%0. +. +Language=Russian +Primary Domain controller for workstation domain:%0. +. + +MessageId=4578 +Severity=Success +Facility=System +SymbolicName=APPERR2_4578 +Language=English +Lockout threshold:%0 +. +Language=Russian +Lockout threshold:%0 +. + +MessageId=4579 +Severity=Success +Facility=System +SymbolicName=APPERR2_4579 +Language=English +Lockout duration (minutes):%0 +. +Language=Russian +Lockout duration (minutes):%0 +. + +MessageId=4580 +Severity=Success +Facility=System +SymbolicName=APPERR2_4580 +Language=English +Lockout observation window (minutes):%0 +. +Language=Russian +Lockout observation window (minutes):%0 +. + ;

5 years, 9 months

[reactos] 05/05: [IPHLPAPI_APITEST] Add tests for AllocateAndGetTcpExTable2FromStack()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec605e913847bfc228712… commit ec605e913847bfc228712c637bac3997d96923e3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 21:25:23 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 21:36:48 2018 +0100 [IPHLPAPI_APITEST] Add tests for AllocateAndGetTcpExTable2FromStack() --- .../iphlpapi/AllocateAndGetTcpExTable2FromStack.c | 351 +++++++++++++++++++++ modules/rostests/apitests/iphlpapi/CMakeLists.txt | 3 +- modules/rostests/apitests/iphlpapi/testlist.c | 10 +- 3 files changed, 359 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c b/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c new file mode 100644 index 0000000000..002d7d1909 --- /dev/null +++ b/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c @@ -0,0 +1,351 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for TCP connections enumeration functions + * COPYRIGHT: Copyright 2018 Pierre Schweitzer + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <iphlpapi.h> +#include <winsock2.h> + +static DWORD (WINAPI * pAllocateAndGetTcpExTable2FromStack)(PVOID*,BOOL,HANDLE,DWORD,DWORD,TCP_TABLE_CLASS); + +START_TEST(AllocateAndGetTcpExTable2FromStack) +{ + WSADATA wsaData; + SOCKET sock; + SOCKADDR_IN server; + PMIB_TCPTABLE TcpTable; + PMIB_TCPTABLE_OWNER_PID TcpTableOwner; + PMIB_TCPTABLE_OWNER_MODULE TcpTableOwnerMod; + DWORD i; + BOOLEAN Found; + HINSTANCE hIpHlpApi; + SYSTEMTIME Creation; + DWORD Pid = GetCurrentProcessId(); + + hIpHlpApi = GetModuleHandleW(L"iphlpapi.dll"); + if (!hIpHlpApi) + { + skip("Failed to load iphlpapi.dll\n"); + return; + } + + pAllocateAndGetTcpExTable2FromStack = (void *)GetProcAddress(hIpHlpApi, "AllocateAndGetTcpExTable2FromStack"); + if (pAllocateAndGetTcpExTable2FromStack == NULL) + { + skip("AllocateAndGetTcpExTable2FromStack not found\n"); + return; + } + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + skip("Failed to init WS2\n"); + return; + } + + GetSystemTime(&Creation); + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock == INVALID_SOCKET) + { + skip("Cannot create socket\n"); + goto quit; + } + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + if (bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)) == SOCKET_ERROR) + { + skip("Cannot bind socket\n"); + goto quit2; + } + + if (listen(sock, SOMAXCONN) == SOCKET_ERROR) + { + skip("Cannot listen on socket\n"); + goto quit2; + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_ALL) == ERROR_SUCCESS) + { + ok(TcpTable->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTable->dwNumEntries; ++i) + { + if (TcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTable->table[i].dwLocalAddr == 0 && + TcpTable->table[i].dwLocalPort == htons(9876) && + TcpTable->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + ok(Found, "Our socket wasn't found!\n"); + + HeapFree(GetProcessHeap(), 0, TcpTable); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_CONNECTIONS) == ERROR_SUCCESS) + { + Found = FALSE; + for (i = 0; i < TcpTable->dwNumEntries; ++i) + { + if (TcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTable->table[i].dwLocalAddr == 0 && + TcpTable->table[i].dwLocalPort == htons(9876) && + TcpTable->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + ok(Found == FALSE, "Our socket was found!\n"); + + HeapFree(GetProcessHeap(), 0, TcpTable); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_LISTENER) == ERROR_SUCCESS) + { + ok(TcpTable->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTable->dwNumEntries; ++i) + { + if (TcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTable->table[i].dwLocalAddr == 0 && + TcpTable->table[i].dwLocalPort == htons(9876) && + TcpTable->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + ok(Found, "Our socket wasn't found!\n"); + + HeapFree(GetProcessHeap(), 0, TcpTable); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_ALL) == ERROR_SUCCESS) + { + ok(TcpTableOwner->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwner->dwNumEntries; ++i) + { + if (TcpTableOwner->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwner->table[i].dwLocalAddr == 0 && + TcpTableOwner->table[i].dwLocalPort == htons(9876) && + TcpTableOwner->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + ok(TcpTableOwner->table[i].dwOwningPid == Pid, "Invalid owner\n"); + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwner); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_CONNECTIONS) == ERROR_SUCCESS) + { + Found = FALSE; + for (i = 0; i < TcpTableOwner->dwNumEntries; ++i) + { + if (TcpTableOwner->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwner->table[i].dwLocalAddr == 0 && + TcpTableOwner->table[i].dwLocalPort == htons(9876) && + TcpTableOwner->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + ok(Found == FALSE, "Our socket was found!\n"); + + HeapFree(GetProcessHeap(), 0, TcpTableOwner); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_LISTENER) == ERROR_SUCCESS) + { + ok(TcpTableOwner->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwner->dwNumEntries; ++i) + { + if (TcpTableOwner->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwner->table[i].dwLocalAddr == 0 && + TcpTableOwner->table[i].dwLocalPort == htons(9876) && + TcpTableOwner->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + ok(TcpTableOwner->table[i].dwOwningPid == Pid, "Invalid owner\n"); + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwner); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_ALL) == ERROR_SUCCESS) + { + ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) + { + if (TcpTableOwnerMod->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwnerMod->table[i].dwLocalAddr == 0 && + TcpTableOwnerMod->table[i].dwLocalPort == htons(9876) && + TcpTableOwnerMod->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + SYSTEMTIME SockTime; + + ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + + CopyMemory(&SockTime, &TcpTableOwnerMod->table[i].liCreateTimestamp, sizeof(SYSTEMTIME)); + ok(Creation.wYear == SockTime.wYear, "Invalid year\n"); + ok(Creation.wMonth == SockTime.wMonth, "Invalid month\n"); + ok(Creation.wDayOfWeek == SockTime.wDayOfWeek, "Invalid day of week\n"); + ok(Creation.wDay == SockTime.wDay, "Invalid day\n"); + ok(Creation.wHour == SockTime.wHour, "Invalid hour\n"); + ok(Creation.wMinute == SockTime.wMinute, "Invalid minute\n"); + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_CONNECTIONS) == ERROR_SUCCESS) + { + Found = FALSE; + for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) + { + if (TcpTableOwnerMod->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwnerMod->table[i].dwLocalAddr == 0 && + TcpTableOwnerMod->table[i].dwLocalPort == htons(9876) && + TcpTableOwnerMod->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + ok(Found == FALSE, "Our socket was found!\n"); + + HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + + if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER) == ERROR_SUCCESS) + { + ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) + { + if (TcpTableOwnerMod->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwnerMod->table[i].dwLocalAddr == 0 && + TcpTableOwnerMod->table[i].dwLocalPort == htons(9876) && + TcpTableOwnerMod->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + SYSTEMTIME SockTime; + + ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + + CopyMemory(&SockTime, &TcpTableOwnerMod->table[i].liCreateTimestamp, sizeof(SYSTEMTIME)); + ok(Creation.wYear == SockTime.wYear, "Invalid year\n"); + ok(Creation.wMonth == SockTime.wMonth, "Invalid month\n"); + ok(Creation.wDayOfWeek == SockTime.wDayOfWeek, "Invalid day of week\n"); + ok(Creation.wDay == SockTime.wDay, "Invalid day\n"); + ok(Creation.wHour == SockTime.wHour, "Invalid hour\n"); + ok(Creation.wMinute == SockTime.wMinute, "Invalid minute\n"); + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); + } + else + { + skip("AllocateAndGetTcpExTable2FromStack failure\n"); + } + +quit2: + closesocket(sock); +quit: + WSACleanup(); +} diff --git a/modules/rostests/apitests/iphlpapi/CMakeLists.txt b/modules/rostests/apitests/iphlpapi/CMakeLists.txt index 2a5a3ad754..8e59d25643 100644 --- a/modules/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/modules/rostests/apitests/iphlpapi/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND SOURCE + AllocateAndGetTcpExTable2FromStack.c GetInterfaceName.c GetNetworkParams.c icmp.c @@ -9,5 +10,5 @@ list(APPEND SOURCE add_executable(iphlpapi_apitest ${SOURCE}) target_link_libraries(iphlpapi_apitest wine ${PSEH_LIB}) set_module_type(iphlpapi_apitest win32cui) -add_importlibs(iphlpapi_apitest iphlpapi advapi32 msvcrt kernel32 ntdll) +add_importlibs(iphlpapi_apitest iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET iphlpapi_apitest) diff --git a/modules/rostests/apitests/iphlpapi/testlist.c b/modules/rostests/apitests/iphlpapi/testlist.c index 942004df68..78843f5b5e 100644 --- a/modules/rostests/apitests/iphlpapi/testlist.c +++ b/modules/rostests/apitests/iphlpapi/testlist.c @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_AllocateAndGetTcpExTable2FromStack(void); extern void func_GetInterfaceName(void); extern void func_GetNetworkParams(void); extern void func_icmp(void); @@ -10,10 +11,11 @@ extern void func_SendARP(void); const struct test winetest_testlist[] = { - { "GetInterfaceName", func_GetInterfaceName }, - { "GetNetworkParams", func_GetNetworkParams }, - { "icmp", func_icmp }, - { "SendARP", func_SendARP }, + { "AllocateAndGetTcpExTable2FromStack", func_AllocateAndGetTcpExTable2FromStack }, + { "GetInterfaceName", func_GetInterfaceName }, + { "GetNetworkParams", func_GetNetworkParams }, + { "icmp", func_icmp }, + { "SendARP", func_SendARP }, { 0, 0 } };

5 years, 9 months

[reactos] 04/05: [SDK] Add AllocateAndGetTcp/UdpEx/2TableFromStack() functions family

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ce2f09a708658873f30b… commit 7ce2f09a708658873f30be2dbef7c96d9bcec2c1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 20:31:38 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 21:36:47 2018 +0100 [SDK] Add AllocateAndGetTcp/UdpEx/2TableFromStack() functions family --- dll/win32/iphlpapi/iphlpapi_main.c | 4 ++-- sdk/include/psdk/iphlpapi.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index cf89261517..ad979c19e5 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -321,7 +321,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, * DWORD * */ -DWORD WINAPI AllocateAndGetTcpExTableFromStack(PMIB_TCPTABLE_OWNER_PID *ppTcpTable, +DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) { DWORD ret; @@ -456,7 +456,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, * DWORD * */ -DWORD WINAPI AllocateAndGetUdpExTableFromStack(PMIB_UDPTABLE_OWNER_PID *ppUdpTable, +DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) { DWORD ret; diff --git a/sdk/include/psdk/iphlpapi.h b/sdk/include/psdk/iphlpapi.h index a31ecf228f..ff3d279b0b 100644 --- a/sdk/include/psdk/iphlpapi.h +++ b/sdk/include/psdk/iphlpapi.h @@ -61,6 +61,13 @@ DWORD WINAPI SetIpTTL(UINT); DWORD WINAPI SetTcpEntry(PMIB_TCPROW); DWORD WINAPI UnenableRouter(OVERLAPPED*, LPDWORD); +#if (NTDDI_VERSION < NTDDI_VISTA) +DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID*,BOOL,HANDLE,DWORD,DWORD); +DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID*,BOOL,HANDLE,DWORD,DWORD,TCP_TABLE_CLASS); +DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID*,BOOL,HANDLE,DWORD,DWORD); +DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID*,BOOL,HANDLE,DWORD,DWORD,UDP_TABLE_CLASS); +#endif + #if (NTDDI_VERSION >= NTDDI_VISTA) #include <netioapi.h> #endif

5 years, 9 months

[reactos] 03/05: [SDK] Add a non documenter TOIID used to query modules information

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05657bfcfd6c8b490ab40… commit 05657bfcfd6c8b490ab404a25222edeb9fc4712c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 20:15:34 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 21:36:47 2018 +0100 [SDK] Add a non documenter TOIID used to query modules information --- sdk/include/psdk/tcpioctl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/psdk/tcpioctl.h b/sdk/include/psdk/tcpioctl.h index 7e4bfeb990..af7389155c 100644 --- a/sdk/include/psdk/tcpioctl.h +++ b/sdk/include/psdk/tcpioctl.h @@ -51,6 +51,10 @@ #define IP_MIB_ARPTABLE_ENTRY_ID 0x101 #define IP_MIB_ADDRTABLE_ENTRY_ID 0x102 #define IP_INTFC_INFO_ID 0x103 +/* Non public TOIID used to query modules info */ +#ifdef __REACTOS__ +#define IP_SPECIFIC_MODULE_ENTRY_ID 0x110 +#endif #define MAX_PHYSADDR_SIZE 8 /* Address Object Options */

5 years, 9 months

[reactos] 02/05: [TCPIP] Save the date when an ADDRESS_FILE is created

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=302883186785938651184… commit 302883186785938651184c53912535c3e690cb33 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 08:35:49 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 21:36:47 2018 +0100 [TCPIP] Save the date when an ADDRESS_FILE is created --- drivers/network/tcpip/include/titypes.h | 1 + drivers/network/tcpip/tcpip/fileobjs.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/network/tcpip/include/titypes.h b/drivers/network/tcpip/include/titypes.h index 5ca137bf89..e63fad2821 100644 --- a/drivers/network/tcpip/include/titypes.h +++ b/drivers/network/tcpip/include/titypes.h @@ -155,6 +155,7 @@ typedef struct _ADDRESS_FILE { IP_ADDRESS AddrCache; /* One entry address cache (destination address of last packet transmitted) */ HANDLE ProcessId; /* Creator process ID */ + LARGE_INTEGER CreationTime; /* Time of creation */ /* The following members are used to control event notification */ diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index c637150158..30a3939e2b 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -425,6 +425,7 @@ NTSTATUS FileOpenAddress( AddrFile->BCast = 1; AddrFile->HeaderIncl = 1; AddrFile->ProcessId = PsGetCurrentProcessId(); + KeQuerySystemTime(&AddrFile->CreationTime); /* Make sure address is a local unicast address or 0 */ /* FIXME: IPv4 only */

5 years, 9 months

[reactos] 01/05: [TCPIP] Define a enum to select which information to return

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=655e66bdbd139742a7c74… commit 655e66bdbd139742a7c747caab3a30c06faa5f4c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 08:27:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 21:36:41 2018 +0100 [TCPIP] Define a enum to select which information to return --- drivers/network/tcpip/include/info.h | 10 ++++++++-- drivers/network/tcpip/tcpip/info.c | 8 ++++---- drivers/network/tcpip/tcpip/ninfo.c | 21 ++++++++++++++++----- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/network/tcpip/include/info.h b/drivers/network/tcpip/include/info.h index 358a8b0a5a..8866a01c5c 100644 --- a/drivers/network/tcpip/include/info.h +++ b/drivers/network/tcpip/include/info.h @@ -80,6 +80,12 @@ typedef union TDI_INFO { TDI_PROVIDER_STATISTICS ProviderStats; } TDI_INFO, *PTDI_INFO; +typedef enum TDI_TCPUDP_CLASS_INFO { + TcpUdpClassBasic, + TcpUdpClassOwnerPid, + TcpUdpClassOwner +} TDI_TCPUDP_CLASS_INFO, *PTDI_TCPUDP_CLASS_INFO; + TDI_STATUS InfoCopyOut( PCHAR DataOut, UINT SizeOut, PNDIS_BUFFER ClientBuf, PUINT ClientBufSize ); @@ -117,12 +123,12 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, TDI_STATUS InfoTdiQueryGetConnectionTcpTable( PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, PUINT BufferSize, - BOOLEAN Extended); + TDI_TCPUDP_CLASS_INFO Class); TDI_STATUS InfoTdiQueryGetConnectionUdpTable( PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, PUINT BufferSize, - BOOLEAN Extended); + TDI_TCPUDP_CLASS_INFO Class); TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, PVOID Buffer, diff --git a/drivers/network/tcpip/tcpip/info.c b/drivers/network/tcpip/tcpip/info.c index b64e8619ed..674fb96049 100644 --- a/drivers/network/tcpip/tcpip/info.c +++ b/drivers/network/tcpip/tcpip/info.c @@ -268,12 +268,12 @@ TDI_STATUS InfoTdiQueryInformationEx( return InfoTdiQueryGetAddrTable(ID->toi_entity, Buffer, BufferSize); else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TRUE); + return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassOwnerPid); else return TDI_INVALID_PARAMETER; else if (ID->toi_entity.tei_entity == CL_TL_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TRUE); + return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassOwnerPid); else return TDI_INVALID_PARAMETER; else @@ -297,12 +297,12 @@ TDI_STATUS InfoTdiQueryInformationEx( return TDI_INVALID_PARAMETER; else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, FALSE); + return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassBasic); else return TDI_INVALID_PARAMETER; else if (ID->toi_entity.tei_entity == CL_TL_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, FALSE); + return InfoTdiQueryGetConnectionUdpTable(EntityListContext, Buffer, BufferSize, TcpUdpClassBasic); else return TDI_INVALID_PARAMETER; else diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 5b7c706b8f..267c43f1d9 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -182,7 +182,7 @@ TDI_STATUS InfoTdiQueryGetIPSnmpInfo( TDIEntityID ID, TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, PUINT BufferSize, - BOOLEAN Extended) + TDI_TCPUDP_CLASS_INFO Class) { SIZE_T Size; MIB_TCPROW_OWNER_PID TcpRow; @@ -191,12 +191,13 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TI_DbgPrint(DEBUG_INFO, ("Called.\n")); TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; - if (Extended) + if (Class == TcpUdpClassOwnerPid) { Size = sizeof(MIB_TCPROW_OWNER_PID); } else { + ASSERT(Class != TcpUdpClassOwner); Size = sizeof(MIB_TCPROW); } @@ -255,20 +256,30 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, PUINT BufferSize, - BOOLEAN Extended) + TDI_TCPUDP_CLASS_INFO Class) { + SIZE_T Size; MIB_UDPROW_OWNER_PID UdpRow; TDI_STATUS Status = TDI_INVALID_REQUEST; TI_DbgPrint(DEBUG_INFO, ("Called.\n")); + if (Class == TcpUdpClassOwnerPid) + { + Size = sizeof(MIB_UDPROW_OWNER_PID); + } + else + { + ASSERT(Class != TcpUdpClassOwner); + Size = sizeof(MIB_UDPROW); + } + UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; UdpRow.dwLocalPort = AddrFile->Port; UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; Status = InfoCopyOut( (PCHAR)&UdpRow, - (Extended ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDPROW)), - Buffer, BufferSize ); + Size, Buffer, BufferSize ); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status));

5 years, 9 months

[reactos] 01/01: [SHELL32] CFSDropTarget: Fix right click menu when shown over the tree view. CORE-11240

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d55f459d6402eb5f97e5… commit 1d55f459d6402eb5f97e5ebf65a32e24cdd7a13b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 27 11:53:56 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Nov 27 12:58:08 2018 +0200 [SHELL32] CFSDropTarget: Fix right click menu when shown over the tree view. CORE-11240 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 41d4bab1c1..641770b37a 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -206,9 +206,26 @@ HRESULT CFSDropTarget::_GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, D /* FIXME: We need to support shell extensions here */ + /* We shouldn't use the site window here because the menu should work even when we don't have a site */ + HWND hwndDummy = CreateWindowEx(0, + WC_STATIC, + NULL, + WS_OVERLAPPED | WS_DISABLED | WS_CLIPSIBLINGS | WS_BORDER | SS_LEFT, + pt.x, + pt.y, + 1, + 1, + NULL, + NULL, + NULL, + NULL); + UINT uCommand = TrackPopupMenu(hpopupmenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON | TPM_NONOTIFY, - pt.x, pt.y, 0, m_hwndSite, NULL); + pt.x, pt.y, 0, hwndDummy, NULL); + + DestroyWindow(hwndDummy); + if (uCommand == 0) return S_FALSE; else if (uCommand == IDM_COPYHERE)

5 years, 9 months

[reactos] 03/03: [BROWSEUI] CShellBrowser: Don't pass any parameters to Initialize. Let users use the BrowseObject method instead.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62c33fbf69e6bc48d454d… commit 62c33fbf69e6bc48d454df8ed5361fbfa1a6539b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Nov 24 19:41:42 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Nov 27 10:33:57 2018 +0200 [BROWSEUI] CShellBrowser: Don't pass any parameters to Initialize. Let users use the BrowseObject method instead. --- dll/win32/browseui/browseui.h | 2 +- dll/win32/browseui/desktopipc.cpp | 30 ++++++++++++++++++------------ dll/win32/browseui/shellbrowser.cpp | 27 ++++++++++++++------------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dll/win32/browseui/browseui.h b/dll/win32/browseui/browseui.h index e1d62de647..5635b8f5cf 100644 --- a/dll/win32/browseui/browseui.h +++ b/dll/win32/browseui/browseui.h @@ -17,7 +17,7 @@ HRESULT CExplorerBand_CreateInstance(REFIID riid, LPVOID *ppv); HRESULT CInternetToolbar_CreateInstance(REFIID riid, void **ppv); HRESULT CMergedFolder_CreateInstance(REFIID riid, void **ppv); HRESULT CMenuBand_CreateInstance(REFIID iid, LPVOID *ppv); -HRESULT CShellBrowser_CreateInstance(LPITEMIDLIST pidl, DWORD dwFlags, REFIID riid, void **ppv); +HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv); HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index c82f4cd30d..7c794b6133 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -343,8 +343,7 @@ cleanup0: static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr<IBrowserService2> browser; - HRESULT hResult; + HRESULT hResult; MSG Msg; BOOL Ret; @@ -366,26 +365,33 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) ILRemoveLastID(parameters->directoryPIDL); } - hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, wFlags, IID_PPV_ARG(IBrowserService2, &browser)); + CComPtr<IShellBrowser> psb; + hResult = CShellBrowser_CreateInstance(IID_PPV_ARG(IShellBrowser, &psb)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = psb->BrowseObject(parameters->directoryPIDL, wFlags); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (pidlSelect != NULL) { - CComPtr<IShellBrowser> pisb; - hResult = browser->QueryInterface(IID_PPV_ARG(IShellBrowser, &pisb)); + CComPtr<IShellView> shellView; + hResult = psb->QueryActiveShellView(&shellView); if (SUCCEEDED(hResult)) { - CComPtr<IShellView> shellView; - hResult = pisb->QueryActiveShellView(&shellView); - if (SUCCEEDED(hResult)) - { - shellView->SelectItem(pidlSelect, SVSI_SELECT|SVSI_ENSUREVISIBLE); - } + shellView->SelectItem(pidlSelect, SVSI_SELECT|SVSI_ENSUREVISIBLE); } ILFree(pidlSelect); } + CComPtr<IBrowserService2> browser; + hResult = psb->QueryInterface(IID_PPV_ARG(IBrowserService2, &browser)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + psb.Release(); + while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) { if (Ret == -1) @@ -617,7 +623,7 @@ BOOL WINAPI SHCreateFromDesktop(ExplorerCommandLineParseResults * parseResults) } parameters->dwFlags = parseResults->dwFlags; - parameters->offset8 = parseResults->offsetC; + parameters->offset8 = parseResults->nCmdShow; LPITEMIDLIST pidl = parseResults->pidlPath ? ILClone(parseResults->pidlPath) : NULL; if (!pidl && parseResults->dwFlags & SH_EXPLORER_CMDLINE_FLAG_STRING) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 72421a456e..dbafbbe860 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -323,7 +323,7 @@ public: CShellBrowser(); ~CShellBrowser(); - HRESULT Initialize(LPITEMIDLIST pidl, DWORD dwFlags); + HRESULT Initialize(); public: HRESULT BrowseToPIDL(LPCITEMIDLIST pidl, long flags); HRESULT BrowseToPath(IShellFolder *newShellFolder, LPCITEMIDLIST absolutePIDL, @@ -723,7 +723,7 @@ CShellBrowser::~CShellBrowser() DSA_Destroy(menuDsa); } -HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, DWORD dwFlags) +HRESULT CShellBrowser::Initialize() { CComPtr<IPersistStreamInit> persistStreamInit; HRESULT hResult; @@ -792,15 +792,8 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, DWORD dwFlags) fStatusBarVisible = true; - // browse - hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - - if ((dwFlags & SBSP_EXPLOREMODE) != NULL) - ShowBand(CLSID_ExplorerBand, true); - ShowWindow(SW_SHOWNORMAL); + UpdateWindow(); return S_OK; } @@ -1009,6 +1002,11 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, saveCurrentShellView->DestroyViewWindow(); fCurrentShellViewWindow = newShellViewWindow; + if (previousView == NULL) + { + RepositionBars(); + } + // no use saveCurrentShellView.Release(); saveCurrentShellFolder.Release(); @@ -2252,7 +2250,10 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT w if ((wFlags & SBSP_EXPLOREMODE) != NULL) ShowBand(CLSID_ExplorerBand, true); - return BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + long flags = BTP_UPDATE_NEXT_HISTORY; + if (fTravelLog) + flags |= BTP_UPDATE_CUR_HISTORY; + return BrowseToPIDL(pidl, flags); } HRESULT STDMETHODCALLTYPE CShellBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) @@ -3782,7 +3783,7 @@ LRESULT CShellBrowser::RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BO return 0; } -HRESULT CShellBrowser_CreateInstance(LPITEMIDLIST pidl, DWORD dwFlags, REFIID riid, void **ppv) +HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { - return ShellObjectCreatorInit<CShellBrowser>(pidl, dwFlags, riid, ppv); + return ShellObjectCreatorInit<CShellBrowser>(riid, ppv); }

5 years, 9 months

[reactos] 02/03: [FILEBROWSER] In the struct passed to SHCreateFromDesktop the fourth field is the parameter that later on will be passed to ShowWindow. Initialize it properly so that when we run filrbrowser.exe in win2k3 the main window won't be hidden.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f05d01ec2fe9706f1b7e6… commit f05d01ec2fe9706f1b7e6ec71efec62cb315372f Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Nov 24 19:26:14 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Nov 27 10:33:45 2018 +0200 [FILEBROWSER] In the struct passed to SHCreateFromDesktop the fourth field is the parameter that later on will be passed to ShowWindow. Initialize it properly so that when we run filrbrowser.exe in win2k3 the main window won't be hidden. --- base/shell/filebrowser/filebrowser.c | 1 + sdk/include/reactos/browseui_undoc.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/shell/filebrowser/filebrowser.c b/base/shell/filebrowser/filebrowser.c index f6cace8be4..bf0481a3b7 100644 --- a/base/shell/filebrowser/filebrowser.c +++ b/base/shell/filebrowser/filebrowser.c @@ -34,6 +34,7 @@ int _tmain(int argc, _TCHAR* argv[]) if (SHExplorerParseCmdLine(&parseResults)) { parseResults.dwFlags |= SH_EXPLORER_CMDLINE_FLAG_SEPARATE; + parseResults.nCmdShow = SW_SHOWNORMAL; return SHCreateFromDesktop(&parseResults); } diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index 0bc1d12db6..4cd00096c5 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -60,7 +60,7 @@ typedef struct ExplorerCommandLineParseResults LPWSTR strPath; LPITEMIDLIST pidlPath; DWORD dwFlags; - DWORD offsetC; + int nCmdShow; DWORD offset10; DWORD offset14; DWORD offset18;

5 years, 9 months

[reactos] 01/03: [EXPLORER] -Rename StartMenuBtnCtxMenuCreator to CStartMenuBtnCtxMenu_CreateInstance. -Rename CreateStartMenuSite to CStartMenuSite_CreateInstance. -Remove a couple of definitions that were not used.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84fa20ec8b918fee361a8… commit 84fa20ec8b918fee361a84dd389832cda7781d17 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Nov 23 19:50:42 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Nov 27 10:33:42 2018 +0200 [EXPLORER] -Rename StartMenuBtnCtxMenuCreator to CStartMenuBtnCtxMenu_CreateInstance. -Rename CreateStartMenuSite to CStartMenuSite_CreateInstance. -Remove a couple of definitions that were not used. --- base/shell/explorer/precomp.h | 10 ++-------- base/shell/explorer/startctxmnu.cpp | 2 +- base/shell/explorer/startmnu.cpp | 2 +- base/shell/explorer/startmnusite.cpp | 2 +- base/shell/explorer/traywnd.cpp | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index ea56448db0..0f49ee6b5e 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -170,12 +170,6 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown) #define ITrayWindow_Lock(p,a) (p)->lpVtbl->Lock(p,a) #endif -BOOL -RegisterTrayWindowClass(VOID); - -VOID -UnregisterTrayWindowClass(VOID); - HRESULT CreateTrayWindow(ITrayWindow ** ppTray); VOID @@ -309,7 +303,7 @@ HRESULT CTrayBandSite_CreateInstance(IN ITrayWindow *tray, IN IDeskBand* pTaskBa * startmnu.cpp */ -HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); +HRESULT CStartMenuBtnCtxMenu_CreateInstance(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); IMenuPopup* CreateStartMenu(IN ITrayWindow *Tray, @@ -328,7 +322,7 @@ ShowCustomizeClassic(HINSTANCE, HWND); */ HRESULT -CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); +CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); /* * trayntfy.c diff --git a/base/shell/explorer/startctxmnu.cpp b/base/shell/explorer/startctxmnu.cpp index ba5b766266..4c3d7caf17 100644 --- a/base/shell/explorer/startctxmnu.cpp +++ b/base/shell/explorer/startctxmnu.cpp @@ -237,7 +237,7 @@ public: END_COM_MAP() }; -HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu) +HRESULT CStartMenuBtnCtxMenu_CreateInstance(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu) { CStartMenuBtnCtxMenu * mnu = new CComObject<CStartMenuBtnCtxMenu>(); mnu->Initialize(m_TrayWnd, m_Owner); diff --git a/base/shell/explorer/startmnu.cpp b/base/shell/explorer/startmnu.cpp index a3355f2dfa..d306010bba 100644 --- a/base/shell/explorer/startmnu.cpp +++ b/base/shell/explorer/startmnu.cpp @@ -55,7 +55,7 @@ CreateStartMenu(IN ITrayWindow *Tray, CComPtr<IBandSite> pBs; DWORD dwBandId = 0; - hr = CreateStartMenuSite(Tray, IID_PPV_ARG(IUnknown, &pSms)); + hr = CStartMenuSite_CreateInstance(Tray, IID_PPV_ARG(IUnknown, &pSms)); if (FAILED_UNEXPECTEDLY(hr)) return NULL; diff --git a/base/shell/explorer/startmnusite.cpp b/base/shell/explorer/startmnusite.cpp index 1e36125517..215ed8c829 100644 --- a/base/shell/explorer/startmnusite.cpp +++ b/base/shell/explorer/startmnusite.cpp @@ -383,7 +383,7 @@ public: END_COM_MAP() }; -HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv) +HRESULT CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv) { return ShellObjectCreatorInit<CStartMenuSite>(Tray, riid, ppv); } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 63ece92395..ebea58e150 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2668,7 +2668,7 @@ ChangePos: if (!(m_StartButton.SendMessage(BM_GETSTATE, 0, 0) & BST_PUSHED)) { CComPtr<IContextMenu> ctxMenu; - StartMenuBtnCtxMenuCreator(this, m_hWnd, &ctxMenu); + CStartMenuBtnCtxMenu_CreateInstance(this, m_hWnd, &ctxMenu); TrackCtxMenu(ctxMenu, ppt, hWndExclude, m_Position == ABE_BOTTOM, this); } }

5 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018