Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/02: [NTDLL] Check the process manifest at startup for a compatibility section.
by Mark Jansen 09 Apr '18

09 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d49004352fd3927e94db4… commit d49004352fd3927e94db440ea0a61185f45eab4e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 13 21:32:48 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 9 19:36:09 2018 +0200 [NTDLL] Check the process manifest at startup for a compatibility section. --- dll/appcompat/apphelp/hsdb.c | 12 +++-- dll/ntdll/ldr/ldrinit.c | 86 +++++++++++++++++++++++++++++++++- sdk/include/reactos/compat_undoc.h | 43 +++++++++++++++++ sdk/include/reactos/compatguid_undoc.h | 12 +++++ sdk/lib/uuid/undoc.c | 1 + 5 files changed, 149 insertions(+), 5 deletions(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index 903968d0d6..6c23ec6fa3 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -12,7 +12,7 @@ #include "ntndk.h" #include "strsafe.h" #include "apphelp.h" - +#include "compat_undoc.h" #define MAX_LAYER_LENGTH 256 #define GPLK_USER 1 @@ -25,12 +25,18 @@ typedef struct _ShimData DWORD dwMagic; SDBQUERYRESULT Query; WCHAR szLayer[MAX_LAYER_LENGTH]; - DWORD unknown; // 0x14c + DWORD dwRosProcessCompatVersion; // ReactOS specific } ShimData; #define SHIMDATA_MAGIC 0xAC0DEDAB +C_ASSERT(SHIMDATA_MAGIC == REACTOS_SHIMDATA_MAGIC); +C_ASSERT(sizeof(ShimData) == sizeof(ReactOS_ShimData)); +C_ASSERT(offsetof(ShimData, dwMagic) == offsetof(ReactOS_ShimData, dwMagic)); +C_ASSERT(offsetof(ShimData, dwRosProcessCompatVersion) == offsetof(ReactOS_ShimData, dwRosProcessCompatVersion)); + + static BOOL WINAPI SdbpFileExists(LPCWSTR path) { DWORD attr = GetFileAttributesW(path); @@ -706,7 +712,7 @@ BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* pData->dwSize = sizeof(*pData); pData->dwMagic = SHIMDATA_MAGIC; pData->Query = *pQueryResult; - pData->unknown = 0; + pData->dwRosProcessCompatVersion = 0; pData->szLayer[0] = UNICODE_NULL; /* TODO */ SHIM_INFO("\ndwFlags 0x%x\ndwMagic 0x%x\ntrExe 0x%x\ntrLayer 0x%x\n", diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index f62b93ef65..b35321e8c6 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include <ntdll.h> +#include <compat_undoc.h> +#include <compatguid_undoc.h> #define NDEBUG #include <debug.h> @@ -1455,6 +1457,83 @@ LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry) UNIMPLEMENTED; } +VOID +NTAPI +LdrpInitializeProcessCompat(PVOID* pOldShimData) +{ + static const GUID* GuidOrder[] = { &COMPAT_GUID_WIN10, &COMPAT_GUID_WIN81, &COMPAT_GUID_WIN8, + &COMPAT_GUID_WIN7, &COMPAT_GUID_VISTA }; + static const DWORD GuidVersions[] = { WINVER_WIN10, WINVER_WIN81, WINVER_WIN8, WINVER_WIN7, WINVER_VISTA }; + + ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)]; + ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; + SIZE_T SizeRequired; + NTSTATUS Status; + DWORD n, cur; + + C_ASSERT(RTL_NUMBER_OF(GuidOrder) == RTL_NUMBER_OF(GuidVersions)); + + SizeRequired = sizeof(Buffer); + Status = RtlQueryInformationActivationContext(RTL_QUERY_ACTIVATION_CONTEXT_FLAG_NO_ADDREF, + NULL, + NULL, + CompatibilityInformationInActivationContext, + Buffer, + sizeof(Buffer), + &SizeRequired); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("LdrpInitializeProcessCompat: Unable to query process actctx with status %x\n", Status); + return; + } + + ContextCompatInfo = (ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*)Buffer; + /* No Compatibility elements present, bail out */ + if (ContextCompatInfo->ElementCount == 0) + return; + + /* Search for known GUID's, starting from newest to oldest. */ + for (cur = 0; cur < RTL_NUMBER_OF(GuidOrder); ++cur) + { + for (n = 0; n < ContextCompatInfo->ElementCount; ++n) + { + if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, GuidOrder[cur], sizeof(GUID)) == sizeof(GUID)) + { + ReactOS_ShimData* pShimData = *pOldShimData; + + /* If this process did not need shim data before, allocate and store it */ + if (pShimData == NULL) + { + PPEB Peb = NtCurrentPeb(); + + ASSERT(Peb->pShimData == NULL); + pShimData = RtlAllocateHeap(Peb->ProcessHeap, HEAP_ZERO_MEMORY, sizeof(*pShimData)); + + if (!pShimData) + { + DPRINT1("LdrpInitializeProcessCompat: Unable to allocated %u bytes\n", sizeof(*pShimData)); + return; + } + + pShimData->dwSize = sizeof(*pShimData); + pShimData->dwMagic = REACTOS_SHIMDATA_MAGIC; + + Peb->pShimData = pShimData; + *pOldShimData = pShimData; + } + + /* Store the highest found version, and bail out. */ + pShimData->dwRosProcessCompatVersion = GuidVersions[cur]; + DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", GuidVersions[cur]); + return; + } + } + } +} + + NTSTATUS NTAPI LdrpInitializeProcess(IN PCONTEXT Context, @@ -1542,8 +1621,8 @@ LdrpInitializeProcess(IN PCONTEXT Context, /* Save the old Shim Data */ OldShimData = Peb->pShimData; - /* Clear it */ - Peb->pShimData = NULL; + /* ReactOS specific: do not clear it. (Windows starts doing the same in later versions) */ + //Peb->pShimData = NULL; /* Save the number of processors and CS Timeout */ LdrpNumberOfProcessors = Peb->NumberOfProcessors; @@ -1934,6 +2013,9 @@ LdrpInitializeProcess(IN PCONTEXT Context, /* Initialize Wine's active context implementation for the current process */ actctx_init(); + /* ReactOS specific */ + LdrpInitializeProcessCompat(&OldShimData); + /* Set the current directory */ Status = RtlSetCurrentDirectory_U(&CurrentDirectory); if (!NT_SUCCESS(Status)) diff --git a/sdk/include/reactos/compat_undoc.h b/sdk/include/reactos/compat_undoc.h new file mode 100644 index 0000000000..fc6a04794d --- /dev/null +++ b/sdk/include/reactos/compat_undoc.h @@ -0,0 +1,43 @@ +#ifndef COMPAT_UNDOC_H +#define COMPAT_UNDOC_H + + +typedef struct _ReactOS_ShimData +{ + DWORD dwReserved1[130]; + DWORD dwSize; + DWORD dwMagic; + DWORD dwReserved2[242]; + DWORD dwRosProcessCompatVersion; +} ReactOS_ShimData; + + +#define REACTOS_SHIMDATA_MAGIC 0xAC0DEDAB + +#ifndef WINVER_VISTA +#define WINVER_VISTA 0x0600 +#define WINVER_WIN7 0x0601 +#define WINVER_WIN8 0x0602 +#define WINVER_WIN81 0x0603 +#define WINVER_WIN10 0x0a00 +#endif + +static +inline +DWORD RosGetProcessCompatVersion(VOID) +{ + static DWORD g_CompatVersion = 0xffffffff; + if (g_CompatVersion == 0xffffffff) + { + ReactOS_ShimData* pShimData = (ReactOS_ShimData*)NtCurrentPeb()->pShimData; + if (pShimData && pShimData->dwMagic == REACTOS_SHIMDATA_MAGIC && + pShimData->dwSize == sizeof(ReactOS_ShimData)) + { + g_CompatVersion = pShimData->dwRosProcessCompatVersion; + } + } + return g_CompatVersion != 0xffffffff ? g_CompatVersion : 0; +} + + +#endif // COMPAT_UNDOC_H diff --git a/sdk/include/reactos/compatguid_undoc.h b/sdk/include/reactos/compatguid_undoc.h new file mode 100644 index 0000000000..be4206aa94 --- /dev/null +++ b/sdk/include/reactos/compatguid_undoc.h @@ -0,0 +1,12 @@ +#ifndef COMPATGUID_UNDOC_H +#define COMPATGUID_UNDOC_H + + +DEFINE_GUID(COMPAT_GUID_VISTA, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); +DEFINE_GUID(COMPAT_GUID_WIN7, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); +DEFINE_GUID(COMPAT_GUID_WIN8, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); +DEFINE_GUID(COMPAT_GUID_WIN81, 0x1f676c76, 0x80e1, 0x4239, 0x95, 0xbb, 0x83, 0xd0, 0xf6, 0xd0, 0xda, 0x78); +DEFINE_GUID(COMPAT_GUID_WIN10, 0x8e0f7a12, 0xbfb3, 0x4fe8, 0xb9, 0xa5, 0x48, 0xfd, 0x50, 0xa1, 0x5a, 0x9a); + + +#endif // COMPATGUID_UNDOC_H diff --git a/sdk/lib/uuid/undoc.c b/sdk/lib/uuid/undoc.c index 5e3fab4653..8768a3a2ff 100644 --- a/sdk/lib/uuid/undoc.c +++ b/sdk/lib/uuid/undoc.c @@ -5,4 +5,5 @@ #include <guiddef.h> #include <shlguid_undoc.h> +#include <compatguid_undoc.h>

1 0

01/01: Fix build
by Giannis Adamopoulos 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e195199a51c3f5f0ce812… commit e195199a51c3f5f0ce81276593000733cdd7c186 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Apr 9 01:42:17 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 9 01:42:17 2018 +0300 Fix build --- sdk/lib/rtl/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 2fe56c1d6a..f4a5f26124 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -4960,9 +4960,9 @@ void actctx_init(void) &SizeRequired); if (NT_SUCCESS(Status)) { - DPRINT("RtlQueryInformationActivationContext for CompatibilityInformationInActivationContext suceeded\n"); ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; ContextCompatInfo = (ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*)Buffer; + DPRINT("RtlQueryInformationActivationContext for CompatibilityInformationInActivationContext suceeded\n"); /* No Compatibility elements present, bail out */ if (ContextCompatInfo->ElementCount != 0) {

1 0

01/01: [RTL] actctx.c: Use an alternative implicit activation context when an application is built for latest windows versions. Instead of loading systemcompatible.manifest as the implicit activation context, load forwardcompatible.manifest Add a new assembly containing all apisets called ReactOS.Apisets and make it a dependency to forwardcompatible.manifest
by Giannis Adamopoulos 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3045622e59e178b732a… commit 8d3045622e59e178b732a8a4e4d414982aa77901 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Apr 8 22:28:29 2018 +0300 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Mon Apr 9 01:28:43 2018 +0300 [RTL] actctx.c: Use an alternative implicit activation context when an application is built for latest windows versions. Instead of loading systemcompatible.manifest as the implicit activation context, load forwardcompatible.manifest Add a new assembly containing all apisets called ReactOS.Apisets and make it a dependency to forwardcompatible.manifest --- boot/bootdata/packages/reactos.dff.in | 2 + dll/apisets/CMakeLists.txt | 4 +- dll/apisets/CMakeLists.txt.in | 4 +- ...6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest | 212 +++++++++++++++++++++ media/CMakeLists.txt | 3 +- media/forwardcompatible.manifest | 14 ++ sdk/cmake/CMakeMacros.cmake | 4 + sdk/lib/rtl/actctx.c | 29 ++- 8 files changed, 268 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 652aa91943..96ace64430 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -76,6 +76,8 @@ Signature = "$ReactOS$" 56 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef +59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef +60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef .InfEnd diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index aaf12c3880..facffcb579 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -32,9 +32,11 @@ function (add_apiset apiset_name baseaddress) add_importlibs(${apiset_name} ${ARGN} kernel32 ntdll) - add_cd_file(TARGET ${apiset_name} DESTINATION reactos/system32 FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction() +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + # Apisets will be appended add_apiset(api-ms-win-appmodel-identity-l1-1-0 0x60000000 ) diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in index 2399d21bf1..cbe9003f46 100644 --- a/dll/apisets/CMakeLists.txt.in +++ b/dll/apisets/CMakeLists.txt.in @@ -32,8 +32,10 @@ function (add_apiset apiset_name baseaddress) add_importlibs(${apiset_name} ${ARGN} kernel32 ntdll) - add_cd_file(TARGET ${apiset_name} DESTINATION reactos/system32 FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction() +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + # Apisets will be appended diff --git a/dll/apisets/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest b/dll/apisets/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest new file mode 100644 index 0000000000..c7a556e629 --- /dev/null +++ b/dll/apisets/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df"/> + <file name="api-ms-win-appmodel-identity-l1-1-0.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-1.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-2.dll"/> + <file name="api-ms-win-core-apiquery-l1-1-0.dll"/> + <file name="api-ms-win-core-appcompat-l1-1-1.dll"/> + <file name="api-ms-win-core-appinit-l1-1-0.dll"/> + <file name="api-ms-win-core-atoms-l1-1-0.dll"/> + <file name="api-ms-win-core-bem-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-1.dll"/> + <file name="api-ms-win-core-com-private-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l2-1-0.dll"/> + <file name="api-ms-win-core-crt-l1-1-0.dll"/> + <file name="api-ms-win-core-crt-l2-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-1.dll"/> + <file name="api-ms-win-core-debug-l1-1-0.dll"/> + <file name="api-ms-win-core-debug-l1-1-1.dll"/> + <file name="api-ms-win-core-delayload-l1-1-0.dll"/> + <file name="api-ms-win-core-delayload-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-0.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-2.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-3.dll"/> + <file name="api-ms-win-core-fibers-l1-1-0.dll"/> + <file name="api-ms-win-core-fibers-l1-1-1.dll"/> + <file name="api-ms-win-core-file-l1-1-0.dll"/> + <file name="api-ms-win-core-file-l1-2-0.dll"/> + <file name="api-ms-win-core-file-l1-2-1.dll"/> + <file name="api-ms-win-core-file-l1-2-2.dll"/> + <file name="api-ms-win-core-file-l2-1-0.dll"/> + <file name="api-ms-win-core-file-l2-1-1.dll"/> + <file name="api-ms-win-core-file-l2-1-2.dll"/> + <file name="api-ms-win-core-handle-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-2-0.dll"/> + <file name="api-ms-win-core-heap-l2-1-0.dll"/> + <file name="api-ms-win-core-heap-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-2-0.dll"/> + <file name="api-ms-win-core-io-l1-1-0.dll"/> + <file name="api-ms-win-core-io-l1-1-1.dll"/> + <file name="api-ms-win-core-job-l1-1-0.dll"/> + <file name="api-ms-win-core-job-l2-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-1.dll"/> + <file name="api-ms-win-core-kernel32-private-l1-1-1.dll"/> + <file name="api-ms-win-core-largeinteger-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-2.dll"/> + <file name="api-ms-win-core-localization-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-1.dll"/> + <file name="api-ms-win-core-localization-l2-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-3-0.dll"/> + <file name="api-ms-win-core-localization-private-l1-1-0.dll"/> + <file name="api-ms-win-core-localregistry-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-1.dll"/> + <file name="api-ms-win-core-memory-l1-1-2.dll"/> + <file name="api-ms-win-core-misc-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-2-0.dll"/> + <file name="api-ms-win-core-namespace-l1-1-0.dll"/> + <file name="api-ms-win-core-normalization-l1-1-0.dll"/> + <file name="api-ms-win-core-path-l1-1-0.dll"/> + <file name="api-ms-win-core-privateprofile-l1-1-1.dll"/> + <file name="api-ms-win-core-processenvironment-l1-1-0.dll"/> + <file name="api-ms-win-core-processenvironment-l1-2-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-1.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-2.dll"/> + <file name="api-ms-win-core-processtopology-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-profile-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-quirks-l1-1-0.dll"/> + <file name="api-ms-win-core-realtime-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l2-1-0.dll"/> + <file name="api-ms-win-core-registryuserspecific-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-2-0.dll"/> + <file name="api-ms-win-core-shlwapi-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-shutdown-l1-1-0.dll"/> + <file name="api-ms-win-core-sidebyside-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l2-1-0.dll"/> + <file name="api-ms-win-core-string-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-stringansi-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-1.dll"/> + <file name="api-ms-win-core-sysinfo-l1-1-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-1.dll"/> + <file name="api-ms-win-core-threadpool-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-l1-2-0.dll"/> + <file name="api-ms-win-core-threadpool-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-private-l1-1-0.dll"/> + <file name="api-ms-win-core-timezone-l1-1-0.dll"/> + <file name="api-ms-win-core-toolhelp-l1-1-0.dll"/> + <file name="api-ms-win-core-url-l1-1-0.dll"/> + <file name="api-ms-win-core-util-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-1.dll"/> + <file name="api-ms-win-core-version-private-l1-1-0.dll"/> + <file name="api-ms-win-core-versionansi-l1-1-0.dll"/> + <file name="api-ms-win-core-windowserrorreporting-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-errorprivate-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-registration-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-string-l1-1-0.dll"/> + <file name="api-ms-win-core-wow64-l1-1-0.dll"/> + <file name="api-ms-win-core-wow64-l1-1-1.dll"/> + <file name="api-ms-win-core-xstate-l1-1-0.dll"/> + <file name="api-ms-win-core-xstate-l2-1-0.dll"/> + <file name="api-ms-win-crt-conio-l1-1-0.dll"/> + <file name="api-ms-win-crt-convert-l1-1-0.dll"/> + <file name="api-ms-win-crt-environment-l1-1-0.dll"/> + <file name="api-ms-win-crt-filesystem-l1-1-0.dll"/> + <file name="api-ms-win-crt-heap-l1-1-0.dll"/> + <file name="api-ms-win-crt-locale-l1-1-0.dll"/> + <file name="api-ms-win-crt-math-l1-1-0.dll"/> + <file name="api-ms-win-crt-multibyte-l1-1-0.dll"/> + <file name="api-ms-win-crt-private-l1-1-0.dll"/> + <file name="api-ms-win-crt-process-l1-1-0.dll"/> + <file name="api-ms-win-crt-runtime-l1-1-0.dll"/> + <file name="api-ms-win-crt-stdio-l1-1-0.dll"/> + <file name="api-ms-win-crt-string-l1-1-0.dll"/> + <file name="api-ms-win-crt-time-l1-1-0.dll"/> + <file name="api-ms-win-crt-utility-l1-1-0.dll"/> + <file name="api-ms-win-devices-config-l1-1-1.dll"/> + <file name="api-ms-win-devices-query-l1-1-1.dll"/> + <file name="api-ms-win-downlevel-advapi32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-advapi32-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-normaliz-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-ole32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shell32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-user32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-version-l1-1-0.dll"/> + <file name="api-ms-win-dx-d3dkmt-l1-1-0.dll"/> + <file name="api-ms-win-eventing-classicprovider-l1-1-0.dll"/> + <file name="api-ms-win-eventing-consumer-l1-1-0.dll"/> + <file name="api-ms-win-eventing-controller-l1-1-0.dll"/> + <file name="api-ms-win-eventing-legacy-l1-1-0.dll"/> + <file name="api-ms-win-eventing-provider-l1-1-0.dll"/> + <file name="api-ms-win-eventlog-legacy-l1-1-0.dll"/> + <file name="api-ms-win-gdi-dpiinfo-l1-1-0.dll"/> + <file name="api-ms-win-mm-joystick-l1-1-0.dll"/> + <file name="api-ms-win-mm-misc-l1-1-1.dll"/> + <file name="api-ms-win-mm-mme-l1-1-0.dll"/> + <file name="api-ms-win-mm-time-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-dc-access-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-rectangle-l1-1-0.dll"/> + <file name="api-ms-win-perf-legacy-l1-1-0.dll"/> + <file name="api-ms-win-power-base-l1-1-0.dll"/> + <file name="api-ms-win-power-setting-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-draw-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-4.dll"/> + <file name="api-ms-win-rtcore-ntuser-window-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll"/> + <file name="api-ms-win-security-activedirectoryclient-l1-1-0.dll"/> + <file name="api-ms-win-security-audit-l1-1-1.dll"/> + <file name="api-ms-win-security-base-l1-1-0.dll"/> + <file name="api-ms-win-security-base-l1-2-0.dll"/> + <file name="api-ms-win-security-base-private-l1-1-1.dll"/> + <file name="api-ms-win-security-credentials-l1-1-0.dll"/> + <file name="api-ms-win-security-grouppolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-1.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-1.dll"/> + <file name="api-ms-win-security-lsapolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-provider-l1-1-0.dll"/> + <file name="api-ms-win-security-sddl-l1-1-0.dll"/> + <file name="api-ms-win-security-systemfunctions-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-1.dll"/> + <file name="api-ms-win-service-management-l1-1-0.dll"/> + <file name="api-ms-win-service-management-l2-1-0.dll"/> + <file name="api-ms-win-service-private-l1-1-1.dll"/> + <file name="api-ms-win-service-winsvc-l1-1-0.dll"/> + <file name="api-ms-win-service-winsvc-l1-2-0.dll"/> + <file name="api-ms-win-shcore-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-shcore-scaling-l1-1-1.dll"/> + <file name="api-ms-win-shcore-stream-l1-1-0.dll"/> + <file name="api-ms-win-shcore-thread-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellcom-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellfolders-l1-1-0.dll"/> +</assembly> diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index 508ab79214..dd2a78ea9f 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -13,4 +13,5 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/protocol DESTINATION re add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/systemcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) \ No newline at end of file +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/systemcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/forwardcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/media/forwardcompatible.manifest b/media/forwardcompatible.manifest new file mode 100644 index 0000000000..785d62f8db --- /dev/null +++ b/media/forwardcompatible.manifest @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 5f622e04e8..a103c74e29 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -281,6 +281,10 @@ macro(dir_to_num dir var) set(${var} 57) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) set(${var} 58) + elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 59) + elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 60) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif() diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index e70363c7d1..2fe56c1d6a 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -4935,6 +4935,9 @@ void actctx_init(void) HANDLE handle; WCHAR buffer[1024]; NTSTATUS Status; + BOOLEAN bForwardCompatible = FALSE; + ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)]; + SIZE_T SizeRequired; ctx.cbSize = sizeof(ctx); ctx.lpSource = NULL; @@ -4947,12 +4950,36 @@ void actctx_init(void) process_actctx = check_actctx(handle); } + /* FIXME: use RosGetProcessCompatVersion when PR419 gets merged */ + Status = RtlQueryInformationActivationContext(RTL_QUERY_ACTIVATION_CONTEXT_FLAG_NO_ADDREF, + NULL, + NULL, + CompatibilityInformationInActivationContext, + Buffer, + sizeof(Buffer), + &SizeRequired); + if (NT_SUCCESS(Status)) + { + DPRINT("RtlQueryInformationActivationContext for CompatibilityInformationInActivationContext suceeded\n"); + ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; + ContextCompatInfo = (ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION*)Buffer; + /* No Compatibility elements present, bail out */ + if (ContextCompatInfo->ElementCount != 0) + { + DPRINT1("Found compatibility information in exe manifest (%d). Attempting to activate forward compatibility!\n", ContextCompatInfo->ElementCount); + bForwardCompatible = TRUE; + } + } + ctx.dwFlags = 0; ctx.hModule = NULL; ctx.lpResourceName = NULL; ctx.lpSource = buffer; RtlStringCchCopyW(buffer, 1024, SharedUserData->NtSystemRoot); - RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\systemcompatible.manifest"); + if (!bForwardCompatible) + RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\systemcompatible.manifest"); + else + RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\forwardcompatible.manifest"); Status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle); if (NT_SUCCESS(Status)) {

1 0

01/01: [RTL] Fixes for supportedOS close elements. Imported from wine f8cca44: ntdll: Allow closing tags for 'supportedOS' elements. 697d4a7: ntdll: Allow explicitly specified asm.v2 namespace for "trustInfo".
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19912955f6547040eb99b… commit 19912955f6547040eb99bbc5c695d6d1577062b5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 9 00:01:30 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 9 00:07:31 2018 +0200 [RTL] Fixes for supportedOS close elements. Imported from wine f8cca44: ntdll: Allow closing tags for 'supportedOS' elements. 697d4a7: ntdll: Allow explicitly specified asm.v2 namespace for "trustInfo". --- sdk/lib/rtl/actctx.c | 88 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 545f5fe1a1..e70363c7d1 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -2353,11 +2353,52 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + COMPATIBILITY_CONTEXT_ELEMENT *compat; + UNICODE_STRING str; + GUID compat_id; + + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); + DPRINT1("Invalid guid %wZ\n", &attr_valueU); + } + } + else + { + UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); + UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + } + } + + if (error) return FALSE; + if (end) return TRUE; + + return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); +} + static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + BOOL ret = TRUE; + xmlstr_t elem; while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -2368,34 +2409,7 @@ static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assemb } else if (xmlstr_cmp(&elem, supportedOSW)) { - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - if (xmlstr_cmp(&attr_name, IdW)) - { - UNICODE_STRING str; - COMPATIBILITY_CONTEXT_ELEMENT* compat; - GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); - if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) - { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; - compat->Id = compat_id; - } - else - { - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("Invalid guid %wZ\n", &attr_valueU); - } - } - else - { - UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); - } - } + ret = parse_supportedos_elem(xmlbuf, assembly, acl); } else { @@ -2485,7 +2499,7 @@ static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assemb while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { - if (xmlstr_cmp_end(&elem, requestedExecutionLevelW)) + if (xml_elem_cmp_end(&elem, requestedExecutionLevelW, asmv2W)) { ret = parse_end_element(xmlbuf); break; @@ -2508,12 +2522,12 @@ static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* a while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { - if (xmlstr_cmp_end(&elem, requestedPrivilegesW)) + if (xml_elem_cmp_end(&elem, requestedPrivilegesW, asmv2W)) { ret = parse_end_element(xmlbuf); break; } - else if (xmlstr_cmp(&elem, requestedExecutionLevelW)) + else if (xml_elem_cmp(&elem, requestedExecutionLevelW, asmv2W)) ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); else { @@ -2533,12 +2547,12 @@ static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, str while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { - if (xmlstr_cmp_end(&elem, securityW)) + if (xml_elem_cmp_end(&elem, securityW, asmv2W)) { ret = parse_end_element(xmlbuf); break; } - else if (xmlstr_cmp(&elem, requestedPrivilegesW)) + else if (xml_elem_cmp(&elem, requestedPrivilegesW, asmv2W)) ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); else { @@ -2558,12 +2572,12 @@ static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, s while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { - if (xmlstr_cmp_end(&elem, trustInfoW)) + if (xml_elem_cmp_end(&elem, trustInfoW, asmv2W)) { ret = parse_end_element(xmlbuf); break; } - else if (xmlstr_cmp(&elem, securityW)) + else if (xml_elem_cmp(&elem, securityW, asmv2W)) ret = parse_security_elem(xmlbuf, assembly, acl); else {

1 0

01/01: [NET] Add the NET STATISTICS command
by Eric Kohl 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58b5cdc77c6bfdd1cae53… commit 58b5cdc77c6bfdd1cae53706f35e9b75162c045b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 8 20:04:11 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 8 21:27:05 2018 +0200 [NET] Add the NET STATISTICS command --- base/applications/network/net/CMakeLists.txt | 1 + base/applications/network/net/cmdStatistics.c | 195 ++++++++++++++++++++++++++ base/applications/network/net/help.c | 3 +- base/applications/network/net/lang/en-US.rc | 16 ++- base/applications/network/net/lang/es-ES.rc | 15 +- base/applications/network/net/lang/ro-RO.rc | 15 +- base/applications/network/net/lang/ru-RU.rc | 15 +- base/applications/network/net/lang/tr-TR.rc | 15 +- base/applications/network/net/lang/zh-CN.rc | 15 +- base/applications/network/net/lang/zh-TW.rc | 15 +- base/applications/network/net/main.c | 2 +- base/applications/network/net/net.h | 1 + base/applications/network/net/resource.h | 41 +++--- 13 files changed, 308 insertions(+), 41 deletions(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index d6ce980d1c..3555509fa9 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND SOURCE cmdLocalGroup.c cmdPause.c cmdStart.c + cmdStatistics.c cmdStop.c cmdUse.c cmdUser.c diff --git a/base/applications/network/net/cmdStatistics.c b/base/applications/network/net/cmdStatistics.c new file mode 100644 index 0000000000..7a048c06da --- /dev/null +++ b/base/applications/network/net/cmdStatistics.c @@ -0,0 +1,195 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: base/applications/network/net/cmdStatistics.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "net.h" + +static +INT +DisplayServerStatistics(VOID) +{ + PSERVER_INFO_100 ServerInfo = NULL; + PSTAT_SERVER_0 StatisticsInfo = NULL; + LARGE_INTEGER LargeValue; + NET_API_STATUS Status; + + Status = NetServerGetInfo(NULL, 100, (PBYTE*)&ServerInfo); + if (Status != NERR_Success) + goto done; + + Status = NetStatisticsGet(NULL, + SERVICE_SERVER, + 0, + 0, + (LPBYTE*)&StatisticsInfo); + if (Status != NERR_Success) + goto done; + + ConResPrintf(StdOut, IDS_STATISTICS_SERVER_NAME, ServerInfo->sv100_name); + + printf("Statistik since %lu\n\n\n", StatisticsInfo->sts0_start); + + printf("Sessions accepted %lu\n", StatisticsInfo->sts0_sopens); + printf("Sessions timed-out %lu\n", StatisticsInfo->sts0_stimedout); + printf("Sessions errored-out %lu\n\n", StatisticsInfo->sts0_serrorout); + + LargeValue.u.LowPart = StatisticsInfo->sts0_bytessent_low; + LargeValue.u.HighPart = StatisticsInfo->sts0_bytessent_high; + printf("Kilobytes sent %I64u\n", LargeValue.QuadPart / 1024); + + LargeValue.u.LowPart = StatisticsInfo->sts0_bytesrcvd_low; + LargeValue.u.HighPart = StatisticsInfo->sts0_bytesrcvd_high; + printf("Kilobytes received %I64u\n\n", LargeValue.QuadPart / 1024); + + printf("Mean response time (msec) %lu\n\n", StatisticsInfo->sts0_avresponse); + + printf("System errors %lu\n", StatisticsInfo->sts0_syserrors); + printf("Permission violations %lu\n", StatisticsInfo->sts0_permerrors); + printf("Password violations %lu\n\n", StatisticsInfo->sts0_pwerrors); + + printf("Files accessed %lu\n", StatisticsInfo->sts0_fopens); + printf("Communication devices accessed %lu\n", StatisticsInfo->sts0_devopens); + printf("Print jobs spooled %lu\n\n", StatisticsInfo->sts0_jobsqueued); + + printf("Times buffers exhausted\n\n"); + printf(" Big buffers %lu\n", StatisticsInfo->sts0_bigbufneed); + printf(" Request buffers %lu\n\n", StatisticsInfo->sts0_reqbufneed); + +done: + if (StatisticsInfo != NULL) + NetApiBufferFree(StatisticsInfo); + + if (ServerInfo != NULL) + NetApiBufferFree(ServerInfo); + + return 0; +} + + +static +INT +DisplayWorkstationStatistics(VOID) +{ + PWKSTA_INFO_100 WorkstationInfo = NULL; + PSTAT_WORKSTATION_0 StatisticsInfo = NULL; + NET_API_STATUS Status; + + Status = NetWkstaGetInfo(NULL, + 100, + (PBYTE*)&WorkstationInfo); + if (Status != NERR_Success) + goto done; + + Status = NetStatisticsGet(NULL, + SERVICE_SERVER, + 0, + 0, + (LPBYTE*)&StatisticsInfo); + if (Status != NERR_Success) + goto done; + + ConResPrintf(StdOut, IDS_STATISTICS_WORKSTATION_NAME, WorkstationInfo->wki100_computername); + + printf("Statistik since %I64u\n\n\n", StatisticsInfo->StatisticsStartTime.QuadPart); + + printf("Bytes received %I64u\n", StatisticsInfo->BytesReceived.QuadPart); + printf("Server Message Blocks (SMBs) received %I64u\n", StatisticsInfo->SmbsReceived.QuadPart); + printf("Bytes transmitted %I64u\n", StatisticsInfo->BytesTransmitted.QuadPart); + printf("Server Message Blocks (SMBs) transmitted %I64u\n", StatisticsInfo->SmbsTransmitted.QuadPart); + printf("Read operations %lu\n", StatisticsInfo->ReadOperations); + printf("Write operations %lu\n", StatisticsInfo->WriteOperations); + printf("Raw reads denied %lu\n", StatisticsInfo->RawReadsDenied); + printf("Raw writes denied %lu\n\n", StatisticsInfo->RawWritesDenied); + + printf("Network errors %lu\n", StatisticsInfo->NetworkErrors); + printf("Connections made %lu\n", StatisticsInfo->CoreConnects + + StatisticsInfo->Lanman20Connects + + StatisticsInfo->Lanman21Connects + + StatisticsInfo->LanmanNtConnects); + printf("Reconnections made %lu\n", StatisticsInfo->Reconnects); + printf("Server disconnects %lu\n\n", StatisticsInfo->ServerDisconnects); + + printf("Sessions started %lu\n", StatisticsInfo->Sessions); + printf("Hung sessions %lu\n", StatisticsInfo->HungSessions); + printf("Failed sessions %lu\n", StatisticsInfo->FailedSessions); + printf("Failed operations %lu\n", StatisticsInfo->InitiallyFailedOperations + + StatisticsInfo->FailedCompletionOperations); + printf("Use count %lu\n", StatisticsInfo->UseCount); + printf("Failed use count %lu\n\n", StatisticsInfo->FailedUseCount); + +done: + if (StatisticsInfo != NULL) + NetApiBufferFree(StatisticsInfo); + + if (WorkstationInfo != NULL) + NetApiBufferFree(WorkstationInfo); + + return 0; +} + + +INT +cmdStatistics( + INT argc, + WCHAR **argv) +{ + INT i, result = 0; + BOOL bServer = FALSE; + BOOL bWorkstation = FALSE; + + for (i = 2; i < argc; i++) + { + if (_wcsicmp(argv[i], L"server") == 0) + { + if (bWorkstation == FALSE) + bServer = TRUE; + continue; + } + + if (_wcsicmp(argv[i], L"workstation") == 0) + { + if (bServer == FALSE) + bWorkstation = TRUE; + continue; + } + + if (_wcsicmp(argv[i], L"help") == 0) + { + /* Print short syntax help */ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); + return 0; + } + + if (_wcsicmp(argv[i], L"/help") == 0) + { + /* Print full help text*/ + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); + ConResPuts(StdOut, IDS_STATISTICS_HELP_1); + ConResPuts(StdOut, IDS_STATISTICS_HELP_2); + return 0; + } + } + + if (bServer) + { + result = DisplayServerStatistics(); + } + else if (bWorkstation) + { + result = DisplayWorkstationStatistics(); + } + else + { + ConResPuts(StdOut, IDS_STATISTICS_TEXT); + } + + if (result == 0) + ConResPuts(StdOut, IDS_ERROR_NO_ERROR); + + return result; +} \ No newline at end of file diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index f354ee4f40..9398c45a1e 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -162,7 +162,8 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"STATISTICS") == 0) { ConResPuts(StdOut, IDS_STATISTICS_SYNTAX); - ConResPuts(StdOut, IDS_STATISTICS_HELP); + ConResPuts(StdOut, IDS_STATISTICS_HELP_1); + ConResPuts(StdOut, IDS_STATISTICS_HELP_2); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 3b89b498a7..f778c5a668 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -125,8 +125,13 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" + IDS_STOP_SYNTAX "NET STOP service\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -186,6 +191,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "Comment" IDS_LOCALGROUP_MEMBERS "Members" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "User accounts for \\\\%s" IDS_USER_NAME "User name" IDS_USER_FULL_NAME "Full name" @@ -227,5 +237,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 9db547f02e..54dbacf2c6 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -128,8 +128,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP <nombre del servicio>\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -188,6 +192,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "Comentario" IDS_LOCALGROUP_MEMBERS "Miembros" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "Cuentas de usuario en \\\\%s" IDS_USER_NAME "Nombre de usuario" IDS_USER_FULL_NAME "Nombre completo" @@ -229,5 +238,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "La opción %s todavía no está disponible.\n" IDS_ERROR_INVALID_OPTION_VALUE "El valor para la opción %s no es válido.\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 4f0e3e2456..a97a9b9dc8 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -131,8 +131,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP <nume serviciu>\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -191,6 +195,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "Comentariu" IDS_LOCALGROUP_MEMBERS "Membri" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "Conturi de utilizator pentru \\\\%s" IDS_USER_NAME "Nume utilizator" IDS_USER_FULL_NAME "Nume complet" @@ -232,5 +241,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Opțiunea %s încă nu este admisă.\n" IDS_ERROR_INVALID_OPTION_VALUE "Ați introdus o valoare nevalidă pentru opțiunea %s.\n" IDS_ERROR_SYSTEM_ERROR "A survenit eroarea de sistem %d.\n" - IDS_ERROR_NO_ERROR "Comanda a fost executată cu succes.\n\n\n" + IDS_ERROR_NO_ERROR "Comanda a fost executată cu succes.\n\n" END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index f60c5ad118..87bb958e99 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -127,8 +127,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP <имя_службы>\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -187,6 +191,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "Комментарий" IDS_LOCALGROUP_MEMBERS "Члены" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "Учетные записи пользователей для \\\\%s" IDS_USER_NAME "Имя пользователя" IDS_USER_FULL_NAME "Полное имя" @@ -228,5 +237,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "Опция %s в данный момент не поддерживается.\n" IDS_ERROR_INVALID_OPTION_VALUE "Вы ввели неверный данные для данной опции %s.\n" IDS_ERROR_SYSTEM_ERROR "Произошла системная ошибка: %d.\n" - IDS_ERROR_NO_ERROR "Команда успешно выполнена.\n\n\n" + IDS_ERROR_NO_ERROR "Команда успешно выполнена.\n\n" END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index a9a3863424..3930ce709d 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -127,8 +127,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP <Hizmet Adı>\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -187,6 +191,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "Açıklama" IDS_LOCALGROUP_MEMBERS "Üyeler" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "\\\\%s için kullanıcı hesapları" IDS_USER_NAME "Kullanıcı adı" IDS_USER_FULL_NAME "Tüm ad" @@ -228,5 +237,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "%s seçeneği daha desteklenmiyor.\n" IDS_ERROR_INVALID_OPTION_VALUE "%s seçeneği için geçersiz bir değer girdiniz.\n" IDS_ERROR_SYSTEM_ERROR "%d dizge hatâsı oldu.\n" - IDS_ERROR_NO_ERROR "Komut başarılı bir şekilde çalıştırıldı.\n\n\n" + IDS_ERROR_NO_ERROR "Komut başarılı bir şekilde çalıştırıldı.\n\n" END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index a8946a0005..6c6a4693a6 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -127,8 +127,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP service\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -187,6 +191,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "注释" IDS_LOCALGROUP_MEMBERS "成员" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "\\\\%s 的用户帐户" IDS_USER_NAME "用户名" IDS_USER_FULL_NAME "全名" @@ -228,5 +237,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支持 %s 选项。\n" IDS_ERROR_INVALID_OPTION_VALUE "您输入了 %s 选项的无效的值。\n" IDS_ERROR_SYSTEM_ERROR "发生了系统错误 %d。\n" - IDS_ERROR_NO_ERROR "命令执行成功。\n\n\n" + IDS_ERROR_NO_ERROR "命令执行成功。\n\n" END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 8f400f4be0..ff2c74c39e 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -127,8 +127,12 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_START_HELP_3 "When typed at the command prompt, service name of two words or more must\n\ be enclosed in quotation marks. For example, NET START ""NET LOGON""\n\ starts the net logon service.\n\n" - IDS_STATISTICS_SYNTAX "NET STATISTICS ...\n\n" - IDS_STATISTICS_HELP "STATISTICS\n...\n\n" + IDS_STATISTICS_SYNTAX "NET STATISTICS [SERVER | WORKSTATION]\n\n" + IDS_STATISTICS_HELP_1 "NET STATISTICS displays the statisticslog for the local Workstation or\n\ +Server service. Used without parameters, NET STATISTICS displays\n\ +the services for which statistics are available.\n\n" + IDS_STATISTICS_HELP_2 "SERVER Displays the Server service statistics.\n\ +WORKSTATION Displays the Workstation service statistics.\n\n" IDS_STOP_SYNTAX "NET STOP <服務名稱>\n\n" IDS_STOP_HELP_1 "NET STOP stops services.\n\n" IDS_STOP_HELP_2 "service The name of the service to be stopped.\n\n" @@ -187,6 +191,11 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_LOCALGROUP_COMMENT "評論" IDS_LOCALGROUP_MEMBERS "成員" + IDS_STATISTICS_TEXT "Statistics are available for the following services:\n\n\ + Server\n Workstation\n\n" + IDS_STATISTICS_SERVER_NAME "Server statistics for \\\\%s\n\n" + IDS_STATISTICS_WORKSTATION_NAME "Workstation statistics for \\\\%s\n\n" + IDS_USER_ACCOUNTS "使用者帳戶 \\\\%s" IDS_USER_NAME "使用者名稱" IDS_USER_FULL_NAME "全名" @@ -228,5 +237,5 @@ service can stop others. Some services cannot be stopped.\n\n" IDS_ERROR_OPTION_NOT_SUPPORTED "尚不支援 %s 選項。\n" IDS_ERROR_INVALID_OPTION_VALUE "您輸入了無效的值為 %s 選項。\n" IDS_ERROR_SYSTEM_ERROR "The system error %d happened.\n" - IDS_ERROR_NO_ERROR "The command completed successfully.\n\n\n" + IDS_ERROR_NO_ERROR "The command completed successfully.\n\n" END diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 2b572b48d4..5b2ad60b78 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -36,7 +36,7 @@ COMMAND cmds[] = {L"session", unimplemented}, {L"share", unimplemented}, {L"start", cmdStart}, - {L"statistics", unimplemented}, + {L"statistics", cmdStatistics}, {L"stop", cmdStop}, {L"time", unimplemented}, {L"use", cmdUse}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 711528fb1e..a595166af5 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -53,6 +53,7 @@ INT cmdHelpMsg(INT argc, WCHAR **argv); INT cmdLocalGroup(INT argc, WCHAR **argv); INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); +INT cmdStatistics(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv); INT cmdUse(INT argc, WCHAR **argv); INT cmdUser(INT argc, WCHAR **argv); diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index edcb94c7fe..0c53afc07a 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -56,20 +56,21 @@ #define IDS_START_HELP_2 153 #define IDS_START_HELP_3 154 #define IDS_STATISTICS_SYNTAX 155 -#define IDS_STATISTICS_HELP 156 -#define IDS_STOP_SYNTAX 157 -#define IDS_STOP_HELP_1 158 -#define IDS_STOP_HELP_2 159 -#define IDS_STOP_HELP_3 160 -#define IDS_TIME_SYNTAX 161 -#define IDS_TIME_HELP 162 -#define IDS_USE_SYNTAX 163 -#define IDS_USE_HELP 164 -#define IDS_USER_SYNTAX 165 -#define IDS_USER_HELP 166 -#define IDS_VIEW_SYNTAX 167 -#define IDS_VIEW_HELP 168 -#define IDS_NET_SYNTAX 169 +#define IDS_STATISTICS_HELP_1 156 +#define IDS_STATISTICS_HELP_2 157 +#define IDS_STOP_SYNTAX 158 +#define IDS_STOP_HELP_1 159 +#define IDS_STOP_HELP_2 160 +#define IDS_STOP_HELP_3 161 +#define IDS_TIME_SYNTAX 162 +#define IDS_TIME_HELP 163 +#define IDS_USE_SYNTAX 164 +#define IDS_USE_HELP 165 +#define IDS_USER_SYNTAX 166 +#define IDS_USER_HELP 167 +#define IDS_VIEW_SYNTAX 168 +#define IDS_VIEW_HELP 169 +#define IDS_NET_SYNTAX 170 #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201 @@ -104,10 +105,14 @@ #define IDS_CONFIG_WORKSTATION_LOGON 245 -#define IDS_LOCALGROUP_ALIASES 300 -#define IDS_LOCALGROUP_ALIAS_NAME 301 -#define IDS_LOCALGROUP_COMMENT 302 -#define IDS_LOCALGROUP_MEMBERS 303 +#define IDS_LOCALGROUP_ALIASES 300 +#define IDS_LOCALGROUP_ALIAS_NAME 301 +#define IDS_LOCALGROUP_COMMENT 302 +#define IDS_LOCALGROUP_MEMBERS 303 + +#define IDS_STATISTICS_TEXT 320 +#define IDS_STATISTICS_SERVER_NAME 321 +#define IDS_STATISTICS_WORKSTATION_NAME 322 #define IDS_USER_ACCOUNTS 449 #define IDS_USER_NAME 450

1 0

01/01: [CMAKE] Use configuration-specific names for files generated by CMake.
by Thomas Faber 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a0e6540278569bd7c594… commit 3a0e6540278569bd7c594d5687b565c9e32f6047 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 8 18:31:27 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 8 18:31:36 2018 +0200 [CMAKE] Use configuration-specific names for files generated by CMake. Fixes configuring with VSSolution. --- boot/CMakeLists.txt | 8 ++++---- boot/bootdata/packages/CMakeLists.txt | 6 +++--- sdk/cmake/CMakeMacros.cmake | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 1828e0ba5a..0bff234030 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -67,7 +67,7 @@ add_custom_target(bootcd -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst + -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) @@ -82,7 +82,7 @@ add_custom_target(bootcdregtest -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst + -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) @@ -126,7 +126,7 @@ add_custom_target(livecd -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst + -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) @@ -170,7 +170,7 @@ add_custom_target(hybridcd -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort - -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst + -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso DEPENDS bootcd livecd VERBATIM) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index 78db7ec536..a6199199f2 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -19,7 +19,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.cmake "") # This generates reactos.dff.dyn by processing the generator expressions file(GENERATE - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn INPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.cmake) # This finalizes reactos.dff by concat-ing the two files: one generated and one static containing the optional file. @@ -28,14 +28,14 @@ file(GENERATE add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in - -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn + -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn) add_custom_target( reactos_cab_inf diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 020ccc47ad..5f622e04e8 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -458,7 +458,7 @@ function(create_iso_lists) file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst "${_filelist}") unset(_filelist) file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.lst + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.$<CONFIG>.lst INPUT ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst) get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST) @@ -466,7 +466,7 @@ function(create_iso_lists) file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst "${_filelist}") unset(_filelist) file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.lst + OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.$<CONFIG>.lst INPUT ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst) get_property(_filelist GLOBAL PROPERTY HYBRIDCD_FILE_LIST) @@ -474,7 +474,7 @@ function(create_iso_lists) file(APPEND ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst "${_filelist}") unset(_filelist) file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.lst + OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.$<CONFIG>.lst INPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst) get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST) @@ -482,7 +482,7 @@ function(create_iso_lists) file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst "${_filelist}") unset(_filelist) file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.lst + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.$<CONFIG>.lst INPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst) endfunction()

1 0

01/01: [KERNEL32_VISTA] This function now comes from rtlfuncs.h
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dffd748daebea8e192961… commit dffd748daebea8e192961cd99836c8ea0cb39604 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 17:47:43 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:47:43 2018 +0200 [KERNEL32_VISTA] This function now comes from rtlfuncs.h --- dll/win32/kernel32_vista/sync.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c index 17d394955d..1f13206445 100644 --- a/dll/win32/kernel32_vista/sync.c +++ b/dll/win32/kernel32_vista/sync.c @@ -48,9 +48,6 @@ VOID NTAPI RtlReleaseSRWLockExclusive(IN OUT PRTL_SRWLOCK SRWLock); -ULONG -NTAPI -RtlNtStatusToDosError(IN NTSTATUS Status); VOID WINAPI

1 0

02/02: [APISETS] Update the script to take the current newline setting into account.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15affd19ee8ce8cb2c875… commit 15affd19ee8ce8cb2c875a43822788d465acd6cb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 11:10:11 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:30:44 2018 +0200 [APISETS] Update the script to take the current newline setting into account. --- dll/apisets/update.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dll/apisets/update.py b/dll/apisets/update.py index 2d7ce387a7..dc14a162aa 100644 --- a/dll/apisets/update.py +++ b/dll/apisets/update.py @@ -14,6 +14,8 @@ import subprocess SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) +NL_CHAR = '\n' + IGNORE_OPTIONS = ('-norelay', '-ret16', '-ret64', '-register', '-private', '-noname', '-ordinal', '-i386', '-arch=', '-stub') @@ -234,7 +236,7 @@ class SpecEntry(object): assert self._ord != '@' name = 'Ordinal' + self._ord if not self._forwarder: - spec_file.write('{} stub{} {}\n'.format(self._ord, opts, name)) + spec_file.write('{} stub{} {}{}'.format(self._ord, opts, name, NL_CHAR)) estimate_size += 0x1000 else: assert self.arch != Arch(), self.name @@ -256,12 +258,13 @@ class SpecEntry(object): fwd = '{}._imp__{}'.format(*self._forwarder) if arch != Arch(Arch.Any): opts = '{} -arch={}'.format(opts, arch.to_str()) - spec_file.write('{ord} {cc}{opts} {name}{args} {fwd}\n'.format(ord=self._ord, - cc=callconv, - opts=opts, - name=name, - args=args, - fwd=fwd)) + spec_file.write('{ord} {cc}{opts} {name}{args} {fwd}{nl}'.format(ord=self._ord, + cc=callconv, + opts=opts, + name=name, + args=args, + fwd=fwd, + nl=NL_CHAR)) estimate_size += 0x100 return estimate_size @@ -353,7 +356,7 @@ class SpecFile(object): fwd_strings = ' '.join(fwd_strings) name = self.name baseaddress = '0x{:8x}'.format(baseaddress) - cmakelists.write('add_apiset({} {} {})\n'.format(name, baseaddress, fwd_strings)) + cmakelists.write('add_apiset({} {} {}){}'.format(name, baseaddress, fwd_strings, NL_CHAR)) return self._estimate_size @@ -377,6 +380,7 @@ def generate_specnames(dll_dir): yield (os.path.join(dll_dir, '..', 'win32ss', 'gdi', 'gdi32', 'gdi32.spec'), 'gdi32') def run(wineroot): + global NL_CHAR wine_apisets = [] ros_modules = [] @@ -426,16 +430,21 @@ def run(wineroot): total = tuple(map(sum, zip(apiset.extra_forwarders(function_lookup, module_lookup), total))) print 'found', total[0], '/', total[1], 'forwarders' + with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt.in'), 'rb') as template: + data = template.read() + data = data.replace('%WINE_GIT_VERSION%', version) + # Detect the checkout newline settings + if '\r\n' in data: + NL_CHAR = '\r\n' + print 'Writing apisets' + spec_header = [line.replace('\n', NL_CHAR) for line in SPEC_HEADER] for apiset in wine_apisets: with open(os.path.join(SCRIPT_DIR, apiset.name + '.spec'), 'wb') as out_spec: - out_spec.writelines(SPEC_HEADER) + out_spec.writelines(spec_header) apiset.write(out_spec) print 'Writing CMakeLists.txt' - with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt.in'), 'rb') as template: - data = template.read() - data = data.replace('%WINE_GIT_VERSION%', version) baseaddress = 0x60000000 with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt'), 'wb') as cmakelists: cmakelists.write(data)

1 0

01/02: [KERNEL32_VISTA] Export InitializeCriticalSectionEx.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aefc6f49a048c2d8b6ab… commit 5aefc6f49a048c2d8b6ab91fbcda792dee63191b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 11:09:54 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:30:44 2018 +0200 [KERNEL32_VISTA] Export InitializeCriticalSectionEx. --- dll/apisets/api-ms-win-core-synch-l1-1-0.spec | 2 +- dll/apisets/api-ms-win-core-synch-l1-2-0.spec | 2 +- dll/apisets/api-ms-win-core-synch-l1-2-1.spec | 2 +- dll/win32/kernel32_vista/k32_vista.h | 1 + dll/win32/kernel32_vista/kernel32_vista.spec | 2 ++ dll/win32/kernel32_vista/sync.c | 28 +++++++++++++++++++++++++++ 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec index ab22da2ec4..de4c2f4f3e 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec @@ -18,7 +18,7 @@ @ stdcall EnterCriticalSection() kernel32.EnterCriticalSection @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection @ stdcall OpenEventA() kernel32.OpenEventA diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec index 78f9a6137c..778abd9aad 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec @@ -25,7 +25,7 @@ @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stub InitializeSynchronizationBarrier @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec index 37270fd434..d147b86c29 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec @@ -23,7 +23,7 @@ @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stub InitializeSynchronizationBarrier @ stub InitOnceBeginInitialize diff --git a/dll/win32/kernel32_vista/k32_vista.h b/dll/win32/kernel32_vista/k32_vista.h index 45c8bfe4c8..fff9ba8d0b 100644 --- a/dll/win32/kernel32_vista/k32_vista.h +++ b/dll/win32/kernel32_vista/k32_vista.h @@ -8,4 +8,5 @@ #include <ndk/kefuncs.h> #include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32_vista/kernel32_vista.spec index caa7adcf7f..f61e6e6dc3 100644 --- a/dll/win32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32_vista/kernel32_vista.spec @@ -14,3 +14,5 @@ @ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall WakeAllConditionVariable(ptr) @ stdcall WakeConditionVariable(ptr) + +@ stdcall InitializeCriticalSectionEx(ptr long long) diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c index a13f984f34..17d394955d 100644 --- a/dll/win32/kernel32_vista/sync.c +++ b/dll/win32/kernel32_vista/sync.c @@ -148,3 +148,31 @@ WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable) { RtlWakeConditionVariable((PRTL_CONDITION_VARIABLE)ConditionVariable); } + + +/* +* @implemented +*/ +BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection, + IN DWORD dwSpinCount, + IN DWORD flags) +{ + NTSTATUS Status; + + /* FIXME: Flags ignored */ + + /* Initialize the critical section */ + Status = RtlInitializeCriticalSectionAndSpinCount( + (PRTL_CRITICAL_SECTION)lpCriticalSection, + dwSpinCount); + if (!NT_SUCCESS(Status)) + { + /* Set failure code */ + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Success */ + return TRUE; +} +

1 0

01/01: [KERNEL32] Implement FlsAlloc/FlsFree based on Wine's implementation.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac620c2e8ea7a14e7175c… commit ac620c2e8ea7a14e7175ce32d1bfa74585f9ff36 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 7 23:41:53 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:27:24 2018 +0200 [KERNEL32] Implement FlsAlloc/FlsFree based on Wine's implementation. --- dll/apisets/api-ms-win-core-fibers-l1-1-0.spec | 8 +- dll/apisets/api-ms-win-core-fibers-l1-1-1.spec | 8 +- dll/win32/kernel32/client/fiber.c | 148 ++++++++++++++++--------- dll/win32/kernel32/kernel32.spec | 8 +- 4 files changed, 105 insertions(+), 67 deletions(-) diff --git a/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec b/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec index 32edaf83d2..4c4d859ad5 100644 --- a/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec @@ -1,7 +1,7 @@ # This file is autogenerated by update.py -@ stub FlsAlloc -@ stub FlsFree -@ stub FlsGetValue -@ stub FlsSetValue +@ stdcall FlsAlloc() kernel32.FlsAlloc +@ stdcall FlsFree() kernel32.FlsFree +@ stdcall FlsGetValue() kernel32.FlsGetValue +@ stdcall FlsSetValue() kernel32.FlsSetValue diff --git a/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec b/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec index f29bdf3060..504e62c345 100644 --- a/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec +++ b/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec @@ -1,8 +1,8 @@ # This file is autogenerated by update.py -@ stub FlsAlloc -@ stub FlsFree -@ stub FlsGetValue -@ stub FlsSetValue +@ stdcall FlsAlloc() kernel32.FlsAlloc +@ stdcall FlsFree() kernel32.FlsFree +@ stdcall FlsGetValue() kernel32.FlsGetValue +@ stdcall FlsSetValue() kernel32.FlsSetValue @ stub IsThreadAFiber diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index 8daa28e1de..ce6cd2d150 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -312,32 +312,97 @@ IsThreadAFiber(VOID) } /* - * @unimplemented + * @implemented */ DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) { - (void)lpCallback; + DWORD dwFlsIndex; + PPEB Peb = NtCurrentPeb(); + PVOID *ppFlsSlots; - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FLS_OUT_OF_INDEXES; + RtlAcquirePebLock(); + + ppFlsSlots = NtCurrentTeb()->FlsData; + + if (!Peb->FlsCallback && + !(Peb->FlsCallback = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + FLS_MAXIMUM_AVAILABLE * sizeof(PVOID)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwFlsIndex = FLS_OUT_OF_INDEXES; + } + else + { + dwFlsIndex = RtlFindClearBitsAndSet(Peb->FlsBitmap, 1, 1); + if (dwFlsIndex != FLS_OUT_OF_INDEXES) + { + if (!ppFlsSlots && + !(ppFlsSlots = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + { + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); + dwFlsIndex = FLS_OUT_OF_INDEXES; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + if (!NtCurrentTeb()->FlsData) + NtCurrentTeb()->FlsData = ppFlsSlots; + + if (lpCallback) + DPRINT1("FlsAlloc: Got lpCallback 0x%p, UNIMPLEMENTED!", lpCallback); + + ppFlsSlots[dwFlsIndex + 2] = NULL; /* clear the value */ + Peb->FlsCallback[dwFlsIndex] = lpCallback; + } + } + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + } + } + RtlReleasePebLock(); + return dwFlsIndex; } /* - * @unimplemented + * @implemented */ BOOL WINAPI FlsFree(DWORD dwFlsIndex) { - (void)dwFlsIndex; + BOOL ret; + PPEB Peb = NtCurrentPeb(); + PVOID *ppFlsSlots; + + if (dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + RtlAcquirePebLock(); + + ppFlsSlots = NtCurrentTeb()->FlsData; + ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1); + if (ret) + { + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); + /* FIXME: call Fls callback */ + /* FIXME: add equivalent of ThreadZeroTlsCell here */ + if (ppFlsSlots) + ppFlsSlots[dwFlsIndex + 2] = NULL; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + RtlReleasePebLock(); + return ret; } @@ -349,22 +414,16 @@ WINAPI FlsGetValue(DWORD dwFlsIndex) { PVOID *ppFlsSlots; - PVOID pRetVal; - - if(dwFlsIndex >= 128) goto l_InvalidParam; ppFlsSlots = NtCurrentTeb()->FlsData; + if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE || !ppFlsSlots) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } - if(ppFlsSlots == NULL) goto l_InvalidParam; - - SetLastError(0); - pRetVal = ppFlsSlots[dwFlsIndex + 2]; - - return pRetVal; - -l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; + SetLastError(ERROR_SUCCESS); + return ppFlsSlots[dwFlsIndex + 2]; } @@ -377,43 +436,22 @@ FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) { PVOID *ppFlsSlots; - TEB *pTeb = NtCurrentTeb(); - - if(dwFlsIndex >= 128) goto l_InvalidParam; - ppFlsSlots = pTeb->FlsData; - - if (ppFlsSlots == NULL) + if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) { - PEB *pPeb = pTeb->ProcessEnvironmentBlock; - - ppFlsSlots = RtlAllocateHeap(pPeb->ProcessHeap, - HEAP_ZERO_MEMORY, - (128 + 2) * sizeof(PVOID)); - if(ppFlsSlots == NULL) goto l_OutOfMemory; - - pTeb->FlsData = ppFlsSlots; - - RtlAcquirePebLock(); - - /* TODO: initialization */ - - RtlReleasePebLock(); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - + if (!NtCurrentTeb()->FlsData && + !(NtCurrentTeb()->FlsData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ppFlsSlots = NtCurrentTeb()->FlsData; ppFlsSlots[dwFlsIndex + 2] = lpFlsData; - return TRUE; - -l_OutOfMemory: - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto l_Fail; - -l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); - -l_Fail: - return FALSE; } /* EOF */ diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 923545416f..25b47afc8e 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -235,10 +235,10 @@ 231 stdcall FindResourceW(long wstr wstr) 232 stdcall FindVolumeClose(ptr) 233 stdcall FindVolumeMountPointClose(ptr) -;234 stdcall FlsAlloc(ptr) -;235 stdcall FlsFree(long) -;236 stdcall FlsGetValue(long) -;237 stdcall FlsSetValue(long ptr) +234 stdcall FlsAlloc(ptr) +235 stdcall FlsFree(long) +236 stdcall FlsGetValue(long) +237 stdcall FlsSetValue(long ptr) 238 stdcall FlushConsoleInputBuffer(long) 239 stdcall FlushFileBuffers(long) 240 stdcall FlushInstructionCache(long long long)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
25
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 April 2018