Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 02/05: [NTOSKRNL] Define TAG_FSTUB in the dedicated internal header
by Pierre Schweitzer 21 Oct '19

21 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11db7c9e5ddf399cba54e… commit 11db7c9e5ddf399cba54e6bfbbc1d259d266185c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 14:26:00 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 14:26:00 2019 +0200 [NTOSKRNL] Define TAG_FSTUB in the dedicated internal header --- ntoskrnl/fstub/fstubex.c | 2 -- ntoskrnl/include/internal/tag.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/fstub/fstubex.c b/ntoskrnl/fstub/fstubex.c index b9be7fa4e16..922aee7d8de 100644 --- a/ntoskrnl/fstub/fstubex.c +++ b/ntoskrnl/fstub/fstubex.c @@ -76,8 +76,6 @@ typedef struct _MASTER_BOOT_RECORD USHORT MasterBootRecordMagic; // 510 } MASTER_BOOT_RECORD, *PMASTER_BOOT_RECORD; -/* Tag for Fstub allocations */ -#define TAG_FSTUB 'BtsF' /* Partition entry size (bytes) - FIXME: It's hardcoded as Microsoft does, but according to specs, it shouldn't be */ #define PARTITION_ENTRY_SIZE 128 /* Defines "EFI PART" */ diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index dc47c9cd4f4..4b36524ea5d 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -190,3 +190,6 @@ #define TAG_WAIT 'tiaW' #define TAG_SEC_QUERY 'qSbO' + +/* FSTUB */ +#define TAG_FSTUB 'BtsF'

1 0

[reactos] 01/05: [NTOSKRNL] Declare IoRemoteBootClient in internal headers
by Pierre Schweitzer 21 Oct '19

21 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80cc287cf6f824642bf0e… commit 80cc287cf6f824642bf0ebe19d832fb73aacf236 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 14:16:58 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 14:16:58 2019 +0200 [NTOSKRNL] Declare IoRemoteBootClient in internal headers --- ntoskrnl/include/internal/io.h | 1 + ntoskrnl/io/iomgr/arcname.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 14a427973b7..471f6e067f4 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1418,6 +1418,7 @@ extern PDRIVER_OBJECT IopRootDriverObject; extern KSPIN_LOCK IopDeviceActionLock; extern LIST_ENTRY IopDeviceActionRequestList; extern RESERVE_IRP_ALLOCATOR IopReserveIrpAllocator; +extern BOOLEAN IoRemoteBootClient; // // Inlined Functions diff --git a/ntoskrnl/io/iomgr/arcname.c b/ntoskrnl/io/iomgr/arcname.c index 9d011043571..852f7e02632 100644 --- a/ntoskrnl/io/iomgr/arcname.c +++ b/ntoskrnl/io/iomgr/arcname.c @@ -18,7 +18,6 @@ UNICODE_STRING IoArcHalDeviceName, IoArcBootDeviceName; PCHAR IoLoaderArcBootDeviceName; -extern BOOLEAN IoRemoteBootClient; /* FUNCTIONS *****************************************************************/

1 0

[reactos] 01/01: [MOUNTMGR] Fix setting up reparse index file name
by Pierre Schweitzer 21 Oct '19

21 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16fcf694efc4115d5d354… commit 16fcf694efc4115d5d354919cf861a81848139f2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 12:58:30 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 12:58:30 2019 +0200 [MOUNTMGR] Fix setting up reparse index file name This fixes memory smashing while attempting to volume reparse index (we were previously trying to copy the name on itself, in the middle of itself...). This code won't go farther on FAT, it requires NTFS. Now, with this, ReactOS can properly boot with MountMgr handling DOS devices without any crash or code disabled. Cf: what was written in 7608ac9. Modifications in class2, disk, and ntoskrnl are still to be committed to enable all this. --- drivers/filters/mountmgr/database.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/filters/mountmgr/database.c b/drivers/filters/mountmgr/database.c index 5e94f5c9a50..a025f7db3ec 100644 --- a/drivers/filters/mountmgr/database.c +++ b/drivers/filters/mountmgr/database.c @@ -678,11 +678,10 @@ ReconcileThisDatabaseWithMasterWorker(IN PVOID Parameter) goto ReleaseRDS; } - RtlCopyMemory(ReparseFile.Buffer, DeviceInformation->DeviceName.Buffer, DeviceInformation->DeviceName.Length); RtlCopyMemory((PVOID)((ULONG_PTR)ReparseFile.Buffer + DeviceInformation->DeviceName.Length), - ReparseFile.Buffer, ReparseFile.Length); + ReparseIndex.Buffer, ReparseIndex.Length); ReparseFile.Buffer[ReparseFile.Length / sizeof(WCHAR)] = UNICODE_NULL; InitializeObjectAttributes(&ObjectAttributes,

1 0

[reactos] 01/01: [MOUNTMGR] That was not meant to be committed
by Pierre Schweitzer 21 Oct '19

21 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bced3eaa25451d2aa093a… commit bced3eaa25451d2aa093a4d338a63fdf0ca43b74 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 11:03:43 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 11:03:43 2019 +0200 [MOUNTMGR] That was not meant to be committed Even though it shows there might be a bug in the code handling remote databases in the MountMgr ;-) Addendum to 7608ac9 --- drivers/filters/mountmgr/database.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/filters/mountmgr/database.c b/drivers/filters/mountmgr/database.c index 694c98a25fa..5e94f5c9a50 100644 --- a/drivers/filters/mountmgr/database.c +++ b/drivers/filters/mountmgr/database.c @@ -1622,9 +1622,6 @@ ReconcileThisDatabaseWithMaster(IN PDEVICE_EXTENSION DeviceExtension, return; } - UNIMPLEMENTED; - return; - /* Allocate a work item */ WorkItem = AllocatePool(sizeof(RECONCILE_WORK_ITEM)); if (!WorkItem)

1 0

[reactos] 01/01: [MOUNTMGR] Misc. fixes for WorkerThread()
by Pierre Schweitzer 21 Oct '19

21 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7608ac9f71956c2ef60a1… commit 7608ac9f71956c2ef60a18b1e52f4b4f12749d05 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Oct 21 10:54:51 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Oct 21 10:58:14 2019 +0200 [MOUNTMGR] Misc. fixes for WorkerThread() - Properly quit the active loop when we're out of work items; - Fix timeout duration (setting it to 1s); - Fix handling the "Unloading" variable in case of a shutdown so that waiting loop is properly stopped; - Documented why we're waiting on VolumesSafeForWriteAccess. This fixes shutting down ReactOS with work items queued. This is needed here because no one ever sets that event (properly) created by SMSS though. A. Ionescu was explaining in 2018 that it's autochk responsibility, but it doesn't seem to be the case in W2K3. To be investigated. This fix with all the previous ones and more uncommitted stuff (yet ;-)) allows reaching the first steps towards a NT5 storage stack: https://twitter.com/HeisSpiter/status/1186199631740506112 --- drivers/filters/mountmgr/database.c | 40 ++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/drivers/filters/mountmgr/database.c b/drivers/filters/mountmgr/database.c index aa0c6a42ef5..694c98a25fa 100644 --- a/drivers/filters/mountmgr/database.c +++ b/drivers/filters/mountmgr/database.c @@ -1168,21 +1168,40 @@ WorkerThread(IN PDEVICE_OBJECT DeviceObject, NULL, NULL); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Timeout.LowPart = 0xFFFFFFFF; - Timeout.HighPart = 0xFF676980; + Timeout.QuadPart = -10000000LL; /* Wait for 1 second */ - /* Try to wait as long as possible */ - for (i = (Unloading ? 999 : 0); i < 1000; i++) + /* Wait as long as possible for clearance from autochk + * We will write remote databases only if it is safe + * to access volumes. + * First, given we start before SMSS, wait for the + * event creation. + */ + i = 0; + do { - Status = ZwOpenEvent(&SafeEvent, EVENT_ALL_ACCESS, &ObjectAttributes); - if (NT_SUCCESS(Status)) + /* If we started to shutdown, stop waiting forever and jump to last attempt */ + if (Unloading) { - break; + i = 999; + } + else + { + /* Attempt to open the event */ + Status = ZwOpenEvent(&SafeEvent, EVENT_ALL_ACCESS, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + break; + } + + /* Wait a bit to give SMSS a chance to create the event */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &Timeout); } - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &Timeout); + ++i; } + while (i < 1000); + /* We managed to open the event, wait until autochk signals it */ if (i < 1000) { do @@ -1220,7 +1239,7 @@ WorkerThread(IN PDEVICE_OBJECT DeviceObject, IoFreeWorkItem(WorkItem->WorkItem); FreePool(WorkItem); - if (InterlockedDecrement(&(DeviceExtension->WorkerReferences)) == 0) + if (InterlockedDecrement(&(DeviceExtension->WorkerReferences)) < 0) { return; } @@ -1603,6 +1622,9 @@ ReconcileThisDatabaseWithMaster(IN PDEVICE_EXTENSION DeviceExtension, return; } + UNIMPLEMENTED; + return; + /* Allocate a work item */ WorkItem = AllocatePool(sizeof(RECONCILE_WORK_ITEM)); if (!WorkItem)

1 0

[reactos] 01/01: [IPCONFIG] Implement the /flushdns option and most of the /displaydns option
by Eric Kohl 20 Oct '19

20 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0d4763f2bd41df058389… commit b0d4763f2bd41df0583898d5a80c567204d57e5d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 20 23:24:28 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 20 23:24:28 2019 +0200 [IPCONFIG] Implement the /flushdns option and most of the /displaydns option --- base/applications/network/ipconfig/CMakeLists.txt | 2 +- base/applications/network/ipconfig/ipconfig.c | 136 +++++++++++++++++++++- 2 files changed, 134 insertions(+), 4 deletions(-) diff --git a/base/applications/network/ipconfig/CMakeLists.txt b/base/applications/network/ipconfig/CMakeLists.txt index d772922feed..f91e1969a28 100644 --- a/base/applications/network/ipconfig/CMakeLists.txt +++ b/base/applications/network/ipconfig/CMakeLists.txt @@ -1,5 +1,5 @@ add_executable(ipconfig ipconfig.c ipconfig.rc) set_module_type(ipconfig win32cui) -add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) +add_importlibs(ipconfig user32 iphlpapi dnsapi advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ipconfig DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index af8b1467a9a..ced1de7072d 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -8,10 +8,11 @@ /* * TODO: * fix renew / release - * implement flushdns, registerdns, displaydns, showclassid, setclassid + * implement registerdns, showclassid, setclassid * allow globbing on adapter names */ +#define WIN32_NO_STATUS #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -21,6 +22,10 @@ #include <tchar.h> #include <time.h> #include <iphlpapi.h> +#include <ndk/rtlfuncs.h> +#include <inaddr.h> +#include <windns.h> +#include <windns_undoc.h> #include "resource.h" @@ -725,7 +730,132 @@ VOID Renew(LPTSTR Index) } } +VOID +FlushDns(VOID) +{ + _tprintf(_T("\nReactOS IP Configuration\n\n")); + + if (DnsFlushResolverCache()) + _tprintf(_T("The DNS Resolver Cache has been deleted.\n")); + else + DoFormatMessage(GetLastError()); +} +VOID +DisplayDns(VOID) +{ + PDNSCACHEENTRY DnsEntry = NULL, pThisEntry, pNextEntry; + PDNS_RECORDW pQueryResults, pThisRecord, pNextRecord; + IN_ADDR Addr4; + IN6_ADDR Addr6; + WCHAR szBuffer[48]; + DNS_STATUS Status; + + _tprintf(_T("\nReactOS IP Configuration\n\n")); + + if (!DnsGetCacheDataTable(&DnsEntry)) + { + DoFormatMessage(GetLastError()); + return; + } + + if (DnsEntry == NULL) + return; + + pThisEntry = DnsEntry; + while (pThisEntry != NULL) + { + pNextEntry = pThisEntry->pNext; + + pQueryResults = NULL; + Status = DnsQuery_W(pThisEntry->pszName, + pThisEntry->wType, + DNS_QUERY_NO_WIRE_QUERY, + NULL, + (PDNS_RECORD *)&pQueryResults, + NULL); + if (Status == 0) + { + _tprintf(_T("\t%S\n"), pThisEntry->pszName); + _tprintf(_T("\t----------------------------------------\n")); + + pThisRecord = pQueryResults; + while (pThisRecord != NULL) + { + pNextRecord = pThisRecord->pNext; + + _tprintf(_T("\tRecord Name . . . . . : %S\n"), pThisRecord->pName); + _tprintf(_T("\tRecord Type . . . . . : %hu\n"), pThisRecord->wType); + _tprintf(_T("\tTime To Live. . . . . : %lu\n"), pThisRecord->dwTtl); + _tprintf(_T("\tData Length . . . . . : %hu\n"), pThisRecord->wDataLength); + + switch (pThisRecord->Flags.S.Section) + { + case DnsSectionQuestion: + _tprintf(_T("\tSection . . . . . . . : Question\n")); + break; + + case DnsSectionAnswer: + _tprintf(_T("\tSection . . . . . . . : Answer\n")); + break; + + case DnsSectionAuthority: + _tprintf(_T("\tSection . . . . . . . : Authority\n")); + break; + + case DnsSectionAdditional: + _tprintf(_T("\tSection . . . . . . . : Additional\n")); + break; + } + + switch (pThisRecord->wType) + { + case DNS_TYPE_A: + Addr4.S_un.S_addr = pThisRecord->Data.A.IpAddress; + RtlIpv4AddressToStringW(&Addr4, szBuffer); + _tprintf(_T("\tA (Host) Record . . . : %S\n"), szBuffer); + break; + + case DNS_TYPE_PTR: + _tprintf(_T("\tPTR Record. . . . . . : %S\n"), pThisRecord->Data.PTR.pNameHost); + break; + + case DNS_TYPE_NS: + _tprintf(_T("\tNS Record . . . . . . : %S\n"), pThisRecord->Data.NS.pNameHost); + break; + + case DNS_TYPE_CNAME: + _tprintf(_T("\tCNAME Record. . . . . : %S\n"), pThisRecord->Data.CNAME.pNameHost); + break; + + case DNS_TYPE_AAAA: + RtlCopyMemory(&Addr6, &pThisRecord->Data.AAAA.Ip6Address, sizeof(IN6_ADDR)); + RtlIpv6AddressToStringW(&Addr6, szBuffer); + _tprintf(_T("\tAAAA Record . . . . . : %S\n"), szBuffer); + break; + } + _tprintf(_T("\n\n")); + + pThisRecord = pNextRecord; + } + + DnsRecordListFree((PDNS_RECORD)pQueryResults, DnsFreeRecordList); + pQueryResults = NULL; + } + else if (Status != ERROR_SUCCESS && pThisEntry->wType != 0) + { + _tprintf(_T("\t%S\n"), pThisEntry->pszName); + _tprintf(_T("\t----------------------------------------\n")); + _tprintf(_T("\tNo records of type %hu\n\n"), pThisEntry->wType); + } + + if (pThisEntry->pszName) + LocalFree(pThisEntry->pszName); + LocalFree(pThisEntry); + + pThisEntry = pNextEntry; + } +} VOID Usage(VOID) { @@ -835,11 +965,11 @@ int main(int argc, char *argv[]) else if (DoRenew) Renew(NULL); else if (DoFlushdns) - _tprintf(_T("\nSorry /flushdns is not implemented yet\n")); + FlushDns(); else if (DoRegisterdns) _tprintf(_T("\nSorry /registerdns is not implemented yet\n")); else if (DoDisplaydns) - _tprintf(_T("\nSorry /displaydns is not implemented yet\n")); + DisplayDns(); else Usage(); break;

1 0

[reactos] 01/01: [DNSAPI][REACTOS] Add a header for undocumented dnsapi functions and use it in dnsapi.dll
by Eric Kohl 20 Oct '19

20 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4455dcb26e193f477d714… commit 4455dcb26e193f477d714b28e93756ef9bd783a6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Oct 20 23:13:46 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Oct 20 23:13:46 2019 +0200 [DNSAPI][REACTOS] Add a header for undocumented dnsapi functions and use it in dnsapi.dll --- dll/win32/dnsapi/dnsapi.spec | 2 +- dll/win32/dnsapi/dnsapi/precomp.h | 1 + dll/win32/dnsapi/dnsapi/stubs.c | 14 ++++++++------ sdk/include/reactos/windns_undoc.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dll/win32/dnsapi/dnsapi.spec b/dll/win32/dnsapi/dnsapi.spec index 7262aaa5cd4..64ce27a4b3e 100644 --- a/dll/win32/dnsapi/dnsapi.spec +++ b/dll/win32/dnsapi/dnsapi.spec @@ -41,7 +41,7 @@ @ stdcall DnsFreeNetworkInformation() @ stdcall DnsFreeSearchInformation() @ stdcall DnsGetBufferLengthForStringCopy() -@ stdcall DnsGetCacheDataTable() +@ stdcall DnsGetCacheDataTable(ptr) @ stdcall DnsGetDnsServerList() @ stdcall DnsGetDomainName() @ stdcall DnsGetHostName_A() diff --git a/dll/win32/dnsapi/dnsapi/precomp.h b/dll/win32/dnsapi/dnsapi/precomp.h index 44aa0c395c1..687e67f5947 100644 --- a/dll/win32/dnsapi/dnsapi/precomp.h +++ b/dll/win32/dnsapi/dnsapi/precomp.h @@ -21,6 +21,7 @@ #include <winbase.h> #include <winnls.h> #include <windns.h> +#include <reactos/windns_undoc.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> diff --git a/dll/win32/dnsapi/dnsapi/stubs.c b/dll/win32/dnsapi/dnsapi/stubs.c index 137f1641a5b..76bb1ef63c5 100644 --- a/dll/win32/dnsapi/dnsapi/stubs.c +++ b/dll/win32/dnsapi/dnsapi/stubs.c @@ -216,11 +216,11 @@ DnsFindAuthoritativeZone() return ERROR_OUTOFMEMORY; } -DNS_STATUS WINAPI -DnsFlushResolverCache() +BOOL WINAPI +DnsFlushResolverCache(VOID) { UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; + return TRUE; } BOOL WINAPI @@ -273,11 +273,13 @@ DnsGetBufferLengthForStringCopy() return ERROR_OUTOFMEMORY; } -DNS_STATUS WINAPI -DnsGetCacheDataTable() +BOOL +WINAPI +DnsGetCacheDataTable( + _Out_ PDNSCACHEENTRY *DnsCache) { UNIMPLEMENTED; - return ERROR_OUTOFMEMORY; + return TRUE; } DNS_STATUS WINAPI diff --git a/sdk/include/reactos/windns_undoc.h b/sdk/include/reactos/windns_undoc.h new file mode 100644 index 00000000000..af04fabb2c3 --- /dev/null +++ b/sdk/include/reactos/windns_undoc.h @@ -0,0 +1,30 @@ +#ifndef _WINDNS_UNDOC_H_ +#define _WINDNS_UNDOC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _DNS_CACHE_ENTRY +{ + struct _DNS_CACHE_ENTRY *pNext; /* Pointer to next entry */ + PWSTR pszName; /* DNS Record Name */ + unsigned short wType; /* DNS Record Type */ + unsigned short wUnknown; /* Unknown */ + unsigned short wFlags; /* DNS Record Flags */ +} DNSCACHEENTRY, *PDNSCACHEENTRY; + +BOOL +WINAPI +DnsFlushResolverCache(VOID); + +BOOL +WINAPI +DnsGetCacheDataTable( + _Out_ PDNSCACHEENTRY *DnsCache); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINDNS_UNDOC_H_ */

1 0

[reactos] 01/01: [HNETCFG_WINETEST] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 20 Oct '19

20 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4601b11fc94c522b119a2… commit 4601b11fc94c522b119a27861e448b463e454609 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 20 20:04:04 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Oct 20 20:04:04 2019 +0100 [HNETCFG_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/hnetcfg/CMakeLists.txt | 2 +- modules/rostests/winetests/hnetcfg/policy.c | 105 ++++++++++++++++------ 2 files changed, 78 insertions(+), 29 deletions(-) diff --git a/modules/rostests/winetests/hnetcfg/CMakeLists.txt b/modules/rostests/winetests/hnetcfg/CMakeLists.txt index 195bcbf9814..63f9841d798 100644 --- a/modules/rostests/winetests/hnetcfg/CMakeLists.txt +++ b/modules/rostests/winetests/hnetcfg/CMakeLists.txt @@ -3,5 +3,5 @@ add_definitions(-DUSE_WINE_TODOS) add_executable(hnetcfg_winetest policy.c testlist.c) target_link_libraries(hnetcfg_winetest uuid) set_module_type(hnetcfg_winetest win32cui) -add_importlibs(hnetcfg_winetest ole32 oleaut32 msvcrt kernel32) +add_importlibs(hnetcfg_winetest ole32 oleaut32 mpr msvcrt kernel32) add_rostests_file(TARGET hnetcfg_winetest) diff --git a/modules/rostests/winetests/hnetcfg/policy.c b/modules/rostests/winetests/hnetcfg/policy.c index 4ee19d8db46..8701455841b 100644 --- a/modules/rostests/winetests/hnetcfg/policy.c +++ b/modules/rostests/winetests/hnetcfg/policy.c @@ -27,6 +27,7 @@ #include "wine/test.h" #include "netfw.h" +#include "natupnp.h" static void test_policy2_rules(INetFwPolicy2 *policy2) { @@ -59,6 +60,9 @@ static void test_policy2_rules(INetFwPolicy2 *policy2) INetFwServiceRestriction_Release(restriction); } + hr = INetFwRules_get__NewEnum(rules, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + INetFwRules_Release(rules); INetFwRules_Release(rules2); } @@ -105,48 +109,92 @@ static void test_interfaces(void) static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; + static WCHAR empty[] = {0}; + UNIVERSAL_NAME_INFOW *info; + WCHAR fullpath[MAX_PATH]; + WCHAR netpath[MAX_PATH]; + WCHAR image[MAX_PATH]; HRESULT hr; + BSTR bstr; + DWORD sz; hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_INetFwAuthorizedApplication, (void**)&app); ok(hr == S_OK, "got: %08x\n", hr); - if(hr == S_OK) - { - BSTR image = SysAllocStringLen( NULL, MAX_PATH ); - static WCHAR empty[] = {0}; - BSTR bstr; - if (!GetModuleFileNameW( NULL, image, MAX_PATH )) - { - ok(0, "Failed to get filename\n"); - SysFreeString( image ); - return; - } + hr = GetModuleFileNameW(NULL, image, ARRAY_SIZE(image)); + ok(hr, "GetModuleFileName failed: %u\n", GetLastError()); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); - ok(hr == E_POINTER, "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); + ok(hr == E_POINTER, "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); - ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); - ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); + ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); - ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); - ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); - hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, image); - ok(hr == S_OK, "got: %08x\n", hr); + bstr = SysAllocString(image); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, bstr); + ok(hr == S_OK, "got: %08x\n", hr); + SysFreeString(bstr); - hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); - ok(hr == S_OK, "got: %08x\n", hr); - ok(!lstrcmpiW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); - SysFreeString( bstr ); + GetFullPathNameW(image, ARRAY_SIZE(fullpath), fullpath, NULL); + GetLongPathNameW(fullpath, fullpath, ARRAY_SIZE(fullpath)); - SysFreeString( image ); - INetFwAuthorizedApplication_Release(app); + info = (UNIVERSAL_NAME_INFOW *)&netpath; + sz = sizeof(netpath); + hr = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, info, &sz); + if (hr != NO_ERROR) + { + info->lpUniversalName = netpath + sizeof(*info)/sizeof(WCHAR); + lstrcpyW(info->lpUniversalName, fullpath); } + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK, "got: %08x\n", hr); + ok(!lstrcmpW(bstr,info->lpUniversalName), "expected %s, got %s\n", + wine_dbgstr_w(info->lpUniversalName), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + INetFwAuthorizedApplication_Release(app); +} + +static void test_IUPnPNAT(void) +{ + IUPnPNAT *nat; + IStaticPortMappingCollection *static_ports; + IDynamicPortMappingCollection *dync_ports; + INATEventManager *manager; + IProvideClassInfo *provider; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); + ok(hr == S_OK, "got: %08x\n", hr); + + hr = IUPnPNAT_QueryInterface(nat, &IID_IProvideClassInfo, (void**)&provider); + ok(hr == E_NOINTERFACE, "got: %08x\n", hr); + + hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && static_ports) + IStaticPortMappingCollection_Release(static_ports); + + hr = IUPnPNAT_get_DynamicPortMappingCollection(nat, &dync_ports); + ok(hr == S_OK || hr == E_NOTIMPL /* Windows 8.1 */, "got: %08x\n", hr); + if(hr == S_OK && dync_ports) + IDynamicPortMappingCollection_Release(dync_ports); + + hr = IUPnPNAT_get_NATEventManager(nat, &manager); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && manager) + INATEventManager_Release(manager); + + IUPnPNAT_Release(nat); } START_TEST(policy) @@ -169,6 +217,7 @@ START_TEST(policy) test_interfaces(); test_NetFwAuthorizedApplication(); + test_IUPnPNAT(); CoUninitialize(); }

1 0

[reactos] 01/01: [HNETCFG] Sync with Wine Staging 4.18. CORE-16441
by Amine Khaldi 20 Oct '19

20 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c98f2203d6ede6c1d1cc… commit 7c98f2203d6ede6c1d1cc81c5e01cae7cbc525e9 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 20 20:03:33 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Oct 20 20:03:33 2019 +0100 [HNETCFG] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/hnetcfg/CMakeLists.txt | 2 +- dll/win32/hnetcfg/apps.c | 60 +++++++++++-- dll/win32/hnetcfg/hnetcfg.c | 7 ++ dll/win32/hnetcfg/hnetcfg.idl | 24 +++++ dll/win32/hnetcfg/hnetcfg.rgs | 27 ++++++ dll/win32/hnetcfg/hnetcfg_private.h | 2 + dll/win32/hnetcfg/hnetcfg_tlb.idl | 1 + dll/win32/hnetcfg/hnetcfg_tlb.rgs | 25 +++++- dll/win32/hnetcfg/manager.c | 3 - dll/win32/hnetcfg/policy.c | 13 ++- dll/win32/hnetcfg/port.c | 174 +++++++++++++++++++++++++++++++++++- dll/win32/hnetcfg/profile.c | 2 - dll/win32/hnetcfg/service.c | 2 - media/doc/README.WINE | 2 +- 14 files changed, 313 insertions(+), 31 deletions(-) diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt index 4e75ba685e0..14353e9f4ad 100644 --- a/dll/win32/hnetcfg/CMakeLists.txt +++ b/dll/win32/hnetcfg/CMakeLists.txt @@ -29,6 +29,6 @@ set_source_files_properties(hnetcfg.rc PROPERTIES OBJECT_DEPENDS "${hnetcfg_rc_d set_module_type(hnetcfg win32dll) add_dependencies(hnetcfg stdole2) target_link_libraries(hnetcfg wine uuid) -add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(hnetcfg ole32 oleaut32 advapi32 mpr msvcrt kernel32 ntdll) add_pch(hnetcfg precomp.h SOURCE) add_cd_file(TARGET hnetcfg DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/hnetcfg/apps.c b/dll/win32/hnetcfg/apps.c index fda714e3bb8..e0f2cc3b629 100644 --- a/dll/win32/hnetcfg/apps.c +++ b/dll/win32/hnetcfg/apps.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -27,9 +26,13 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" +#ifdef __REACTOS__ +#include "winnetwk.h" +#endif #include "wine/debug.h" -#include "wine/unicode.h" +#include "wine/heap.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); @@ -114,7 +117,8 @@ static REFIID tid_id[] = &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwPolicy2, - &IID_INetFwProfile + &IID_INetFwProfile, + &IID_IUPnPNAT }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -156,7 +160,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + for (i = 0; i < ARRAY_SIZE(typeinfo); i++) if (typeinfo[i]) ITypeInfo_Release(typeinfo[i]); @@ -263,18 +267,56 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName( } static HRESULT WINAPI fw_app_put_ProcessImageFileName( - INetFwAuthorizedApplication *iface, - BSTR imageFileName ) + INetFwAuthorizedApplication *iface, BSTR image ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + UNIVERSAL_NAME_INFOW *info; + DWORD sz, longsz; + WCHAR *path; + DWORD res; - FIXME("%p, %s\n", This, debugstr_w(imageFileName)); + FIXME("%p, %s\n", This, debugstr_w(image)); - if (!imageFileName || !imageFileName[0]) + if (!image || !image[0]) return E_INVALIDARG; + sz = 0; + res = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, NULL, &sz); + if (res == WN_MORE_DATA) + { + if (!(path = heap_alloc(sz))) + return E_OUTOFMEMORY; + + info = (UNIVERSAL_NAME_INFOW *)&path; + res = WNetGetUniversalNameW(image, UNIVERSAL_NAME_INFO_LEVEL, &info, &sz); + if (res == NO_ERROR) + { + SysFreeString(This->filename); + This->filename = SysAllocString(info->lpUniversalName); + } + heap_free(path); + return HRESULT_FROM_WIN32(res); + } + + sz = GetFullPathNameW(image, 0, NULL, NULL); + if (!(path = heap_alloc(++sz * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + GetFullPathNameW(image, sz, path, NULL); + + longsz = GetLongPathNameW(path, path, sz); + if (longsz > sz) + { + if (!(path = heap_realloc(path, longsz * sizeof(WCHAR)))) + { + heap_free(path); + return E_OUTOFMEMORY; + } + GetLongPathNameW(path, path, longsz); + } + SysFreeString( This->filename ); - This->filename = SysAllocString( imageFileName ); + This->filename = SysAllocString(path); + heap_free(path); return This->filename ? S_OK : E_OUTOFMEMORY; } diff --git a/dll/win32/hnetcfg/hnetcfg.c b/dll/win32/hnetcfg/hnetcfg.c index e56dbab9e74..5cc24a1447b 100644 --- a/dll/win32/hnetcfg/hnetcfg.c +++ b/dll/win32/hnetcfg/hnetcfg.c @@ -25,6 +25,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "hnetcfg_private.h" @@ -114,6 +115,8 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; +static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { @@ -156,6 +159,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_policy2_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UPnPNAT )) + { + cf = &upnpnat_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dll/win32/hnetcfg/hnetcfg.idl b/dll/win32/hnetcfg/hnetcfg.idl index 763529a83b9..40a3b9853f7 100644 --- a/dll/win32/hnetcfg/hnetcfg.idl +++ b/dll/win32/hnetcfg/hnetcfg.idl @@ -51,3 +51,27 @@ coclass NetFwOpenPort { interface INetFwOpenPort; } uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) ] coclass NetFwPolicy2 { interface INetFwPolicy2; } + +[ + helpstring("HNetCfg.FwRule"), + progid("HNetCfg.FwRule"), + threading(both), + uuid(2c5bc43e-3369-4c33-ab0c-be9469677af4) +] +coclass NetFwRule { interface INetFwRule; } + +[ + helpstring("HNetCfg.FwProduct"), + progid("HNetCfg.FwProduct"), + threading(both), + uuid(9d745ed8-c514-4d1d-bf42-751fed2d5ac7) +] +coclass NetFwProduct { interface INetFwProduct; } + +[ + helpstring("HNetCfg.FwProducts"), + progid("HNetCfg.FwProducts"), + threading(both), + uuid(cc19079b-8272-4d73-bb70-cdb533527b61) +] +coclass NetFwProducts { interface INetFwProducts; } diff --git a/dll/win32/hnetcfg/hnetcfg.rgs b/dll/win32/hnetcfg/hnetcfg.rgs index eb7f5266fca..4974ebef711 100644 --- a/dll/win32/hnetcfg/hnetcfg.rgs +++ b/dll/win32/hnetcfg/hnetcfg.rgs @@ -25,6 +25,21 @@ HKCR InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } ProgId = s 'HNetCfg.FwPolicy2' } + '{2C5BC43E-3369-4C33-AB0C-BE9469677AF4}' = s 'HNetCfg.FwRule' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwRule' + } + '{9D745ED8-C514-4D1D-BF42-751FED2D5AC7}' = s 'HNetCfg.FwProduct' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwProduct' + } + '{CC19079B-8272-4D73-BB70-CDB533527B61}' = s 'HNetCfg.FwProducts' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'HNetCfg.FwProducts' + } } 'HNetCfg.FwMgr' = s 'HNetCfg.FwMgr' { @@ -42,4 +57,16 @@ HKCR { CLSID = s '{E2B3C97F-6AE1-41AC-817A-F6F92166D7DD}' } + 'HNetCfg.FwRule' = s 'HNetCfg.FwRule' + { + CLSID = s '{2C5BC43E-3369-4C33-AB0C-BE9469677AF4}' + } + 'HNetCfg.FwProduct' = s 'HNetCfg.FwProduct' + { + CLSID = s '{9D745ED8-C514-4D1D-BF42-751FED2D5AC7}' + } + 'HNetCfg.FwProducts' = s 'HNetCfg.FwProducts' + { + CLSID = s '{CC19079B-8272-4D73-BB70-CDB533527B61}' + } } diff --git a/dll/win32/hnetcfg/hnetcfg_private.h b/dll/win32/hnetcfg/hnetcfg_private.h index 26b52d9231b..0e67d81cd60 100644 --- a/dll/win32/hnetcfg/hnetcfg_private.h +++ b/dll/win32/hnetcfg/hnetcfg_private.h @@ -29,6 +29,7 @@ enum type_id INetFwPolicy2_tid, INetFwProfile_tid, INetFwRules_tid, + IUPnPNAT_tid, last_tid }; @@ -44,3 +45,4 @@ HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT IUPnPNAT_create(IUnknown *, void **) DECLSPEC_HIDDEN; diff --git a/dll/win32/hnetcfg/hnetcfg_tlb.idl b/dll/win32/hnetcfg/hnetcfg_tlb.idl index 33e8cc87ae0..e368fe60c38 100644 --- a/dll/win32/hnetcfg/hnetcfg_tlb.idl +++ b/dll/win32/hnetcfg/hnetcfg_tlb.idl @@ -21,3 +21,4 @@ #pragma makedep regtypelib #include "netfw.idl" +#include "natupnp.idl" diff --git a/dll/win32/hnetcfg/hnetcfg_tlb.rgs b/dll/win32/hnetcfg/hnetcfg_tlb.rgs index 50ff31f0777..1628f02b90b 100644 --- a/dll/win32/hnetcfg/hnetcfg_tlb.rgs +++ b/dll/win32/hnetcfg/hnetcfg_tlb.rgs @@ -2,11 +2,11 @@ HKCR { NoRemove Typelib { - NoRemove '{DB4F3345-3EF8-45ED-B976-25A6D3B81B71}' + NoRemove '{1C565858-F302-471E-B409-F180AA4ABEC6}' { - '1.0' = s 'NetFwPublicTypeLib' + '1.0' = s 'NATUPNPLib' { - '0' { win32 = s '%MODULE%' } + '0' { win32 = s '%MODULE%\2' } FLAGS = s '0' } } @@ -16,5 +16,22 @@ HKCR } NoRemove CLSID { + '{AE1E00AA-3FD5-403C-8A27-2BBDC30CD0E1}' = s 'UPnPNAT' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'HNetCfg.NATUPnP.1' + TypeLib = s '{1C565858-F302-471E-B409-F180AA4ABEC6}' + Version = s '1.0' + VersionIndependentProgId = s 'HNetCfg.NATUPnP' + } + } + 'HNetCfg.NATUPnP.1' = s 'UPnPNAT' + { + CLSID = s '{AE1E00AA-3FD5-403C-8A27-2BBDC30CD0E1}' + } + 'HNetCfg.NATUPnP' = s 'UPnPNAT' + { + CLSID = s '{AE1E00AA-3FD5-403C-8A27-2BBDC30CD0E1}' + CurVer = s 'HNetCfg.NATUPnP.1' } -} +} \ No newline at end of file diff --git a/dll/win32/hnetcfg/manager.c b/dll/win32/hnetcfg/manager.c index 1d548b41a94..2c0790a73b5 100644 --- a/dll/win32/hnetcfg/manager.c +++ b/dll/win32/hnetcfg/manager.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -25,12 +24,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "initguid.h" #include "ole2.h" #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dll/win32/hnetcfg/policy.c b/dll/win32/hnetcfg/policy.c index c2f32520bd4..1f5b0daa568 100644 --- a/dll/win32/hnetcfg/policy.c +++ b/dll/win32/hnetcfg/policy.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); @@ -238,6 +236,10 @@ static HRESULT WINAPI netfw_rules_get__NewEnum( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %p\n", This, newEnum); + + if (!newEnum) return E_POINTER; + *newEnum = NULL; + return E_NOTIMPL; } @@ -641,11 +643,8 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru if(!rules) return E_POINTER; - if(rules) - { - *rules = This->fw_policy2_rules; - INetFwRules_AddRef(This->fw_policy2_rules); - } + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); return S_OK; } diff --git a/dll/win32/hnetcfg/port.c b/dll/win32/hnetcfg/port.c index 7d749650763..bb33d6a2bf4 100644 --- a/dll/win32/hnetcfg/port.c +++ b/dll/win32/hnetcfg/port.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -27,9 +26,10 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" +#include "wine/heap.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); @@ -603,3 +603,173 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +typedef struct _upnpnat +{ + IUPnPNAT IUPnPNAT_iface; + LONG ref; +} upnpnat; + +static inline upnpnat *impl_from_IUPnPNAT( IUPnPNAT *iface ) +{ + return CONTAINING_RECORD(iface, upnpnat, IUPnPNAT_iface); +} + +static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void **object) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_IUPnPNAT ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else if(IsEqualGUID( riid, &IID_IProvideClassInfo)) + { + TRACE("IProvideClassInfo not supported.\n"); + return E_NOINTERFACE; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUPnPNAT_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI upnpnat_AddRef(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI upnpnat_Release(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + LONG refs = InterlockedDecrement( &This->ref ); + if (!refs) + { + heap_free( This ); + } + return refs; +} + +static HRESULT WINAPI upnpnat_GetTypeInfoCount(IUPnPNAT *iface, UINT *pctinfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( IUPnPNAT_tid, ppTInfo ); +} + +static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->IUPnPNAT_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, IStaticPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_NATEventManager(IUPnPNAT *iface, INATEventManager **manager) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, manager); + if(manager) + *manager = NULL; + return E_NOTIMPL; +} + +static const IUPnPNATVtbl upnpnat_vtbl = +{ + upnpnat_QueryInterface, + upnpnat_AddRef, + upnpnat_Release, + upnpnat_GetTypeInfoCount, + upnpnat_GetTypeInfo, + upnpnat_GetIDsOfNames, + upnpnat_Invoke, + upnpnat_get_StaticPortMappingCollection, + upnpnat_get_DynamicPortMappingCollection, + upnpnat_get_NATEventManager +}; + + +HRESULT IUPnPNAT_create(IUnknown *outer, void **object) +{ + upnpnat *nat; + + TRACE("(%p,%p)\n", outer, object); + + nat = heap_alloc( sizeof(*nat) ); + if (!nat) return E_OUTOFMEMORY; + + nat->IUPnPNAT_iface.lpVtbl = &upnpnat_vtbl; + nat->ref = 1; + + *object = &nat->IUPnPNAT_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +} diff --git a/dll/win32/hnetcfg/profile.c b/dll/win32/hnetcfg/profile.c index 835e82ed14b..d0e9f48dab4 100644 --- a/dll/win32/hnetcfg/profile.c +++ b/dll/win32/hnetcfg/profile.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dll/win32/hnetcfg/service.c b/dll/win32/hnetcfg/service.c index fa214b67601..5bfeedaaedf 100644 --- a/dll/win32/hnetcfg/service.c +++ b/dll/win32/hnetcfg/service.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a94f3ca32fa..3d051727089 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -72,7 +72,7 @@ dll/win32/fusion # Synced to WineStaging-3.17 dll/win32/gdiplus # Synced to WineStaging-4.0 dll/win32/hhctrl.ocx # Synced to WineStaging-4.0 dll/win32/hlink # Synced to WineStaging-4.0 -dll/win32/hnetcfg # Synced to WineStaging-3.9 +dll/win32/hnetcfg # Synced to WineStaging-4.18 dll/win32/httpapi # Synced to WineStaging-3.3 dll/win32/iccvid # Synced to WineStaging-4.0 dll/win32/ieframe # Synced to WineStaging-4.0

1 0

[reactos] 01/01: [PSDK][UUID] Import natupnp.idl from Wine Staging 4.18. CORE-16441
by Amine Khaldi 20 Oct '19

20 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c73a46af9c23215240170… commit c73a46af9c23215240170ac6e127e7c0a776798f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Oct 20 20:01:58 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Oct 20 20:01:58 2019 +0100 [PSDK][UUID] Import natupnp.idl from Wine Staging 4.18. CORE-16441 --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/natupnp.idl | 224 ++++++++++++++++++++++++++++++++++++++++ sdk/lib/uuid/CMakeLists.txt | 2 +- 3 files changed, 226 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 7667ff07ae5..4d6b5e6e049 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -79,6 +79,7 @@ list(APPEND SOURCE msxml.idl msxml2.idl msxml6.idl + natupnp.idl netcon.idl netfw.idl oaidl.idl diff --git a/sdk/include/psdk/natupnp.idl b/sdk/include/psdk/natupnp.idl new file mode 100644 index 00000000000..83b48a3dc60 --- /dev/null +++ b/sdk/include/psdk/natupnp.idl @@ -0,0 +1,224 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * 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 + */ +import "oaidl.idl"; +import "ocidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + object, + uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1), + dual, + pointer_default(unique) +] +interface IStaticPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(3)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(6)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(7)] + HRESULT Description([out, retval] BSTR *value); + + [id(8)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(9)] + HRESULT Enable ([in] VARIANT_BOOL enable); + + [id(10)] + HRESULT EditDescription ([in] BSTR description); + + [id(11)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(cd1f3e77-66d6-4664-82c7-36dbb641d0f1), + dual, + pointer_default(unique) +] +interface IStaticPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] long port, [in] BSTR protocol, [out, retval] IStaticPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] long external, [in] BSTR protocol, [in] long internal, [in] BSTR client, + [in] VARIANT_BOOL enabled, [in] BSTR description, [out, retval] IStaticPortMapping **mapping); +}; + +[ + object, + uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C), + dual, + pointer_default(unique) +] +interface IDynamicPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT RemoteHost ([out, retval] BSTR *value); + + [propget, id(3)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(6)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(7)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(8)] + HRESULT Description([out, retval] BSTR *value); + + [propget, id(9)] + HRESULT LeaseDuration([out, retval] long *value); + + [id(10)] + HRESULT RenewLease([in] long desired, [out, retval] long *duration); + + [id(11)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(12)] + HRESULT Enable ([in] VARIANT_BOOL enabled); + + [id(13)] + HRESULT EditDescription ([in] BSTR description); + + [id(14)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(b60de00f-156e-4e8d-9ec1-3a2342c10899), + dual, + pointer_default(unique) +] +interface IDynamicPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] BSTR host, [in] long port, [in] BSTR orotocol, + [out, retval] IDynamicPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] BSTR host, [in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] BSTR host, [in] long port, [in] BSTR protocol, [in] long internal, + [in] BSTR client, [in] VARIANT_BOOL enabled, [in] BSTR Description, + [in] long duration, [out, retval] IDynamicPortMapping **mapping); +}; + +[ + object, + uuid(624bd588-9060-4109-b0b0-1adbbcac32df), + dual, + pointer_default(unique) +] +interface INATEventManager : IDispatch +{ + [id(1), propput] + HRESULT ExternalIPAddressCallback ([in] IUnknown *unk); + + [id(2), propput] + HRESULT NumberOfEntriesCallback ([in] IUnknown *unk); +}; + +[ + object, + uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), + dual, + pointer_default(unique) +] +interface IUPnPNAT : IDispatch +{ + [propget, id(1)] + HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); + + [propget, id(2)] + HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); + + [propget, id(3)] + HRESULT NATEventManager ([out, retval] INATEventManager **manager); +}; + +[ + id(2), + uuid(1c565858-f302-471e-b409-f180aa4abec6), + version(1.0) +] +library NATUPNPLib +{ + importlib("stdole2.tlb"); + + [ + vi_progid("HNetCfg.NATUPnP"), + progid("HNetCfg.NATUPnP.1"), + threading(apartment), + uuid(ae1e00aa-3fd5-403c-8a27-2bbdc30cd0e1) + ] + coclass UPnPNAT + { + [default] interface IUPnPNAT; + }; +}; diff --git a/sdk/lib/uuid/CMakeLists.txt b/sdk/lib/uuid/CMakeLists.txt index 09efcd927f6..d1f1392b256 100644 --- a/sdk/lib/uuid/CMakeLists.txt +++ b/sdk/lib/uuid/CMakeLists.txt @@ -75,7 +75,7 @@ list(APPEND IDL_SOURCES # mstime.idl msxml.idl # my_msdatsrc.idl -# natupnp.idl + natupnp.idl # netcfgn.idl # netcfgp.idl # netcfgx.idl

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019