Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/01: [SDK] Define some constants for use with _mm_prefetch (#1147)

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5aa5bcdc1973b68dda39… commit b5aa5bcdc1973b68dda396dc194705858d63c68d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Dec 16 23:25:52 2018 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 16 23:25:52 2018 +0100 [SDK] Define some constants for use with _mm_prefetch (#1147) * [SDK] Define some constants for use with _mm_prefetch This should fix the build for x64 Add __INTRIN_INLINE for gcc and clang --- sdk/include/crt/intrin.h | 1 + sdk/include/crt/xmmintrin.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/sdk/include/crt/intrin.h b/sdk/include/crt/intrin.h index 8dc1944fe7..3a03d02fe3 100644 --- a/sdk/include/crt/intrin.h +++ b/sdk/include/crt/intrin.h @@ -11,6 +11,7 @@ #if defined(_M_IX86) || defined(_M_X64) //#include <immintrin.h> //#include <ammintrin.h> +#include <xmmintrin.h> // native headers: immintrin.h -> wmmintrin.h -> nmmintrin.h -> smmintrin.h -> tmmintrin.h -> pmmintrin.h -> emmintrin.h #endif /* _M_IX86 || _M_X64 */ #if defined(_M_IX86) diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/crt/xmmintrin.h index 19eff23702..8bb7c7b06b 100644 --- a/sdk/include/crt/xmmintrin.h +++ b/sdk/include/crt/xmmintrin.h @@ -34,6 +34,16 @@ unsigned int _mm_getcsr(void); void _mm_setcsr(unsigned int); #pragma intrinsic(_mm_setcsr) #else + +#ifndef __INTRIN_INLINE +#ifdef __clang__ +#define __INTRIN_INLINE __forceinline +#else +#define __ATTRIBUTE_ARTIFICIAL __attribute__((artificial)) +#define __INTRIN_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) __ATTRIBUTE_ARTIFICIAL +#endif +#endif + /* * We can't use __builtin_ia32_* functions, * are they are only available with the -msse2 compiler switch @@ -55,4 +65,12 @@ __INTRIN_INLINE void _mm_setcsr(unsigned int val) #define _mm_cvtss_si32 _mm_cvt_ss2si +/* _mm_prefetch constants */ +#define _MM_HINT_T0 1 +#define _MM_HINT_T1 2 +#define _MM_HINT_T2 3 +#define _MM_HINT_NTA 0 +#define _MM_HINT_ET1 6 + + #endif /* _INCLUDED_MM2 */

6 years

[reactos] 01/01: [CMAKE] MSVC: Make C4028 warning into error, on "i386" only

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d840d7cb1b216876a0669… commit d840d7cb1b216876a06695dae29904257346c7d2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jul 18 17:08:57 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Dec 16 23:12:22 2018 +0100 [CMAKE] MSVC: Make C4028 warning into error, on "i386" only "C4028: formal parameter N different from declaration" CORE-7538 --- sdk/cmake/msvc.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 95a0c252b9..eda0972729 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -71,7 +71,7 @@ add_compile_flags("/wd4018") # - C4013: implicit function declaration # - C4020: too many actual parameters # - C4022: pointer type mismatch for parameter -# - TODO: C4028: formal parameter different from declaration +# - C4028: formal parameter different from declaration # - C4047: different level of indirection # - TODO: C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) @@ -85,6 +85,10 @@ add_compile_flags("/wd4018") # - C4603: macro is not defined or definition is different after precompiled header use # - C4716: function must return a value add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") +# TODO: Check and fix other architectures. +if(ARCH STREQUAL "i386") + add_compile_flags("/we4028") +endif() # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

6 years

[reactos] 01/01: [SAMSRV] Implement SamConnect5() and add/improve TRACE messages.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74d50a4da32e91cb9b1fc… commit 74d50a4da32e91cb9b1fc2b3cbe94789b14c307a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 16 20:41:36 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 16 20:43:02 2018 +0100 [SAMSRV] Implement SamConnect5() and add/improve TRACE messages. - Implement SamConnect5() and let the other connect functions call SamrConnect5(). - Add missing and improve incomplete TRACE messages for all Samr functions. --- dll/win32/samsrv/samrpc.c | 171 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 120 insertions(+), 51 deletions(-) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 5d3595c14a..0bea2e0d5f 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -135,35 +135,22 @@ SamrConnect(IN PSAMPR_SERVER_NAME ServerName, OUT SAMPR_HANDLE *ServerHandle, IN ACCESS_MASK DesiredAccess) { - PSAM_DB_OBJECT ServerObject; - NTSTATUS Status; + SAMPR_REVISION_INFO InRevisionInfo, OutRevisionInfo; + ULONG OutVersion; TRACE("SamrConnect(%p %p %lx)\n", ServerName, ServerHandle, DesiredAccess); - RtlAcquireResourceShared(&SampResource, - TRUE); - - /* Map generic access rights */ - RtlMapGenericMask(&DesiredAccess, - &ServerMapping); - - /* Open the Server Object */ - Status = SampOpenDbObject(NULL, - NULL, - L"SAM", - 0, - SamDbServerObject, - DesiredAccess, - &ServerObject); - if (NT_SUCCESS(Status)) - *ServerHandle = (SAMPR_HANDLE)ServerObject; - - RtlReleaseResource(&SampResource); - - TRACE("SamrConnect done (Status 0x%08lx)\n", Status); + InRevisionInfo.V1.Revision = 0; + InRevisionInfo.V1.SupportedFeatures = 0; - return Status; + return SamrConnect5(ServerName, + DesiredAccess, + 1, + &InRevisionInfo, + &OutVersion, + &OutRevisionInfo, + ServerHandle); } @@ -351,7 +338,7 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, ULONG ResultSdSize = 0; NTSTATUS Status; - TRACE("(%p %lx %p)\n", + TRACE("SamrQuerySecurityObject(%p %lx %p)\n", ObjectHandle, SecurityInformation, SecurityDescriptor); *SecurityDescriptor = NULL; @@ -480,7 +467,8 @@ SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle) PSAM_DB_OBJECT ServerObject; NTSTATUS Status; - TRACE("(%p)\n", ServerHandle); + TRACE("SamrShutdownSamServer(%p)\n", + ServerHandle); RtlAcquireResourceShared(&SampResource, TRUE); @@ -4581,7 +4569,7 @@ SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; - TRACE("(%p %lu %lx)\n", + TRACE("SamrAddMemberToGroup(%p %lu %lx)\n", GroupHandle, MemberId, Attributes); RtlAcquireResourceExclusive(&SampResource, @@ -4643,7 +4631,7 @@ SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) ULONG Length = 0; NTSTATUS Status; - TRACE("(%p)\n", GroupHandle); + TRACE("SamrDeleteGroup(%p)\n", GroupHandle); RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -4712,7 +4700,7 @@ SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, PSAM_DB_OBJECT UserObject = NULL; NTSTATUS Status; - TRACE("(%p %lu)\n", + TRACE("SamrRemoveMemberFromGroup(%p %lu)\n", GroupHandle, MemberId); RtlAcquireResourceExclusive(&SampResource, @@ -4776,6 +4764,9 @@ SamrGetMembersInGroup(IN SAMPR_HANDLE GroupHandle, ULONG i; NTSTATUS Status; + TRACE("SamrGetMembersInGroup(%p %p)\n", + GroupHandle, Members); + RtlAcquireResourceShared(&SampResource, TRUE); @@ -4885,6 +4876,9 @@ SamrSetMemberAttributesOfGroup(IN SAMPR_HANDLE GroupHandle, PSAM_DB_OBJECT GroupObject; NTSTATUS Status; + TRACE("SamrSetMemberAttributesOfGroup(%p %lu %lx)\n", + GroupHandle, MemberId, Attributes); + RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -5324,6 +5318,8 @@ SamrDeleteAlias(IN OUT SAMPR_HANDLE *AliasHandle) PSAM_DB_OBJECT AliasObject; NTSTATUS Status; + TRACE("SamrDeleteAlias(%p)\n", AliasHandle); + RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -5381,7 +5377,8 @@ SamrAddMemberToAlias(IN SAMPR_HANDLE AliasHandle, PSAM_DB_OBJECT AliasObject; NTSTATUS Status; - TRACE("(%p %p)\n", AliasHandle, MemberId); + TRACE("SamrAddMemberToAlias(%p %p)\n", + AliasHandle, MemberId); RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -5420,7 +5417,8 @@ SamrRemoveMemberFromAlias(IN SAMPR_HANDLE AliasHandle, PSAM_DB_OBJECT AliasObject; NTSTATUS Status; - TRACE("(%p %p)\n", AliasHandle, MemberId); + TRACE("SamrRemoveMemberFromAlias(%p %p)\n", + AliasHandle, MemberId); RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -5580,7 +5578,7 @@ SamrDeleteUser(IN OUT SAMPR_HANDLE *UserHandle) PSAM_DB_OBJECT UserObject; NTSTATUS Status; - TRACE("(%p)\n", UserHandle); + TRACE("SamrDeleteUser(%p)\n", UserHandle); RtlAcquireResourceExclusive(&SampResource, TRUE); @@ -8356,7 +8354,7 @@ SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle, DBG_UNREFERENCED_LOCAL_VARIABLE(StoredNtPresent); DBG_UNREFERENCED_LOCAL_VARIABLE(StoredLmEmpty); - TRACE("(%p %u %p %p %u %p %p %u %p %u %p)\n", + TRACE("SamrChangePasswordUser(%p %u %p %p %u %p %p %u %p %u %p)\n", UserHandle, LmPresent, OldLmEncryptedWithNewLm, NewLmEncryptedWithOldLm, NtPresent, OldNtEncryptedWithNewNt, NewNtEncryptedWithOldNt, NtCrossEncryptionPresent, NewNtEncryptedWithNewLm, LmCrossEncryptionPresent, NewLmEncryptedWithNewNt); @@ -8764,7 +8762,7 @@ SamrGetUserDomainPasswordInformation(IN SAMPR_HANDLE UserHandle, ULONG Length = 0; NTSTATUS Status; - TRACE("(%p %p)\n", + TRACE("SamrGetUserDomainPasswordInformation(%p %p)\n", UserHandle, PasswordInformation); RtlAcquireResourceShared(&SampResource, @@ -8849,7 +8847,7 @@ SamrRemoveMemberFromForeignDomain(IN SAMPR_HANDLE DomainHandle, ULONG Rid = 0; NTSTATUS Status; - TRACE("(%p %p)\n", + TRACE("SamrRemoveMemberFromForeignDomain(%p %p)\n", DomainHandle, MemberSid); RtlAcquireResourceExclusive(&SampResource, @@ -8905,7 +8903,8 @@ SamrQueryInformationDomain2(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - TRACE("(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); + TRACE("SamrQueryInformationDomain2(%p %lu %p)\n", + DomainHandle, DomainInformationClass, Buffer); return SamrQueryInformationDomain(DomainHandle, DomainInformationClass, @@ -8920,7 +8919,8 @@ SamrQueryInformationUser2(IN SAMPR_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PSAMPR_USER_INFO_BUFFER *Buffer) { - TRACE("(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + TRACE("SamrQueryInformationUser2(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); return SamrQueryInformationUser(UserHandle, UserInformationClass, @@ -8940,7 +8940,7 @@ SamrQueryDisplayInformation2(IN SAMPR_HANDLE DomainHandle, OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - TRACE("%p %lu %lu %lu %lu %p %p %p\n", + TRACE("SamrQueryDisplayInformation2(%p %lu %lu %lu %lu %p %p %p)\n", DomainHandle, DisplayInformationClass, Index, EntryCount, PreferredMaximumLength, TotalAvailable, TotalReturned, Buffer); @@ -8964,8 +8964,8 @@ SamrGetDisplayEnumerationIndex2(IN SAMPR_HANDLE DomainHandle, IN PRPC_UNICODE_STRING Prefix, OUT unsigned long *Index) { - TRACE("(%p %lu %p %p)\n", - DomainHandle, DisplayInformationClass, Prefix, Index); + TRACE("SamrGetDisplayEnumerationIndex2(%p %lu %p %p)\n", + DomainHandle, DisplayInformationClass, Prefix, Index); return SamrGetDisplayEnumerationIndex(DomainHandle, DisplayInformationClass, @@ -9401,7 +9401,7 @@ SamrQueryDisplayInformation3(IN SAMPR_HANDLE DomainHandle, OUT unsigned long *TotalReturned, OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) { - TRACE("%p %lu %lu %lu %lu %p %p %p\n", + TRACE("SamrQueryDisplayInformation3(%p %lu %lu %lu %lu %p %p %p)\n", DomainHandle, DisplayInformationClass, Index, EntryCount, PreferredMaximumLength, TotalAvailable, TotalReturned, Buffer); @@ -9516,7 +9516,8 @@ SamrGetDomainPasswordInformation(IN handle_t BindingHandle, ULONG Length; NTSTATUS Status; - TRACE("(%p %p %p)\n", BindingHandle, Unused, PasswordInformation); + TRACE("SamrGetDomainPasswordInformation(%p %p %p)\n", + BindingHandle, Unused, PasswordInformation); Status = SamrConnect(NULL, &ServerHandle, @@ -9573,11 +9574,22 @@ SamrConnect2(IN PSAMPR_SERVER_NAME ServerName, OUT SAMPR_HANDLE *ServerHandle, IN ACCESS_MASK DesiredAccess) { - TRACE("(%p %p %lx)\n", ServerName, ServerHandle, DesiredAccess); + SAMPR_REVISION_INFO InRevisionInfo, OutRevisionInfo; + ULONG OutVersion; - return SamrConnect(ServerName, - ServerHandle, - DesiredAccess); + TRACE("SamrConnect2(%p %p %lx)\n", + ServerName, ServerHandle, DesiredAccess); + + InRevisionInfo.V1.Revision = 1; + InRevisionInfo.V1.SupportedFeatures = 0; + + return SamrConnect5(ServerName, + DesiredAccess, + 1, + &InRevisionInfo, + &OutVersion, + &OutRevisionInfo, + ServerHandle); } @@ -9588,7 +9600,8 @@ SamrSetInformationUser2(IN SAMPR_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, IN PSAMPR_USER_INFO_BUFFER Buffer) { - TRACE("(%p %lu %p)\n", UserHandle, UserInformationClass, Buffer); + TRACE("SamrSetInformationUser2(%p %lu %p)\n", + UserHandle, UserInformationClass, Buffer); return SamrSetInformationUser(UserHandle, UserInformationClass, @@ -9623,6 +9636,7 @@ SamrConnect3(IN handle_t BindingHandle) /* FIXME */ return STATUS_NOT_IMPLEMENTED; } + /* Function 62 */ NTSTATUS NTAPI @@ -9631,10 +9645,25 @@ SamrConnect4(IN PSAMPR_SERVER_NAME ServerName, IN unsigned long ClientRevision, IN ACCESS_MASK DesiredAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SAMPR_REVISION_INFO InRevisionInfo, OutRevisionInfo; + ULONG OutVersion; + + TRACE("SamrConnect4(%p %p %lu 0x%lx)\n", + ServerName, ServerHandle, ClientRevision, DesiredAccess); + + InRevisionInfo.V1.Revision = 2; + InRevisionInfo.V1.SupportedFeatures = 0; + + return SamrConnect5(ServerName, + DesiredAccess, + 1, + &InRevisionInfo, + &OutVersion, + &OutRevisionInfo, + ServerHandle); } + /* Function 63 */ NTSTATUS NTAPI @@ -9644,6 +9673,7 @@ SamrUnicodeChangePasswordUser3(IN handle_t BindingHandle) /* FIXME */ return STATUS_NOT_IMPLEMENTED; } + /* Function 64 */ NTSTATUS NTAPI @@ -9655,10 +9685,49 @@ SamrConnect5(IN PSAMPR_SERVER_NAME ServerName, OUT SAMPR_REVISION_INFO *OutRevisionInfo, OUT SAMPR_HANDLE *ServerHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("SamrConnect5(%p 0x%lx %lu %p %p %p %p)\n", + ServerName, DesiredAccess, InVersion, InRevisionInfo, + OutVersion, OutRevisionInfo, ServerHandle); + + if (InVersion != 1) + return STATUS_NOT_SUPPORTED; + + RtlAcquireResourceShared(&SampResource, + TRUE); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + &ServerMapping); + + /* Open the Server Object */ + Status = SampOpenDbObject(NULL, + NULL, + L"SAM", + 0, + SamDbServerObject, + DesiredAccess, + &ServerObject); + if (NT_SUCCESS(Status)) + { + *OutVersion = 1; + + OutRevisionInfo->V1.Revision = 3; + OutRevisionInfo->V1.SupportedFeatures = 0; + + *ServerHandle = (SAMPR_HANDLE)ServerObject; + } + + RtlReleaseResource(&SampResource); + + TRACE("SamrConnect5 done (Status 0x%08lx)\n", Status); + + return Status; } + /* Function 65 */ NTSTATUS NTAPI

6 years

[reactos] 01/01: [BTRFS] Fix MSVC build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd52bbdf0359671f8757e… commit cd52bbdf0359671f8757eb71c9a1d5043b4e74be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 16 17:38:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 16 17:38:09 2018 +0100 [BTRFS] Fix MSVC build. --- drivers/filesystems/btrfs/compress.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/btrfs/compress.c b/drivers/filesystems/btrfs/compress.c index 598171b678..3c9a4d6386 100644 --- a/drivers/filesystems/btrfs/compress.c +++ b/drivers/filesystems/btrfs/compress.c @@ -94,7 +94,11 @@ typedef struct { static void* zstd_malloc(void* opaque, size_t size); static void zstd_free(void* opaque, void* address); +#ifndef __REACTOS__ ZSTD_customMem zstd_mem = { .customAlloc = zstd_malloc, .customFree = zstd_free, .opaque = NULL }; +#else +ZSTD_customMem zstd_mem = { zstd_malloc, zstd_free, NULL }; +#endif static UINT8 lzo_nextbyte(lzo_stream* stream) { UINT8 c;

6 years

[reactos] 01/01: [SHELLBTRFS] Fix MSVC build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc00ea2464e9b682672f7… commit bc00ea2464e9b682672f740aaa49535303b264ca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 16 17:20:37 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 16 17:20:37 2018 +0100 [SHELLBTRFS] Fix MSVC build. --- dll/shellext/shellbtrfs/shellext.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dll/shellext/shellbtrfs/shellext.h b/dll/shellext/shellbtrfs/shellext.h index 6b16911c62..cb9e605ac5 100644 --- a/dll/shellext/shellbtrfs/shellext.h +++ b/dll/shellext/shellbtrfs/shellext.h @@ -17,6 +17,13 @@ #pragma once +/* C++ backwards-compatibility */ +#ifdef __REACTOS__ +#if defined(_MSC_VER) && (_MSC_VER < 1900) +#define noexcept +#endif +#endif + #define ISOLATION_AWARE_ENABLED 1 #define STRSAFE_NO_DEPRECATE @@ -195,6 +202,9 @@ typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER { class win_handle { public: win_handle() { +#ifdef __REACTOS__ + h = INVALID_HANDLE_VALUE; +#endif } win_handle(HANDLE nh) { @@ -224,12 +234,19 @@ public: } private: +#ifndef __REACTOS__ HANDLE h = INVALID_HANDLE_VALUE; +#else + HANDLE h; +#endif }; class fff_handle { public: fff_handle() { +#ifdef __REACTOS__ + h = INVALID_HANDLE_VALUE; +#endif } fff_handle(HANDLE nh) { @@ -259,12 +276,19 @@ public: } private: +#ifndef __REACTOS__ HANDLE h = INVALID_HANDLE_VALUE; +#else + HANDLE h; +#endif }; class nt_handle { public: nt_handle() { +#ifdef __REACTOS__ + h = INVALID_HANDLE_VALUE; +#endif } nt_handle(HANDLE nh) { @@ -294,7 +318,11 @@ public: } private: +#ifndef __REACTOS__ HANDLE h = INVALID_HANDLE_VALUE; +#else + HANDLE h; +#endif }; class string_error : public exception {

6 years

[reactos] 01/01: [BTRFS] Fix link with modern MSVC compilers

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65ff430c2b520ed4c2b16… commit 65ff430c2b520ed4c2b165ffb3becd782b97c44c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 16 14:37:52 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 16 14:38:49 2018 +0100 [BTRFS] Fix link with modern MSVC compilers CORE-15452 --- drivers/filesystems/btrfs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt index 59fe9565e6..7a8806c23a 100644 --- a/drivers/filesystems/btrfs/CMakeLists.txt +++ b/drivers/filesystems/btrfs/CMakeLists.txt @@ -55,6 +55,6 @@ add_library(btrfs SHARED ${SOURCE} btrfs.rc) add_definitions(-D__KERNEL__) set_module_type(btrfs kernelmodedriver) -target_link_libraries(btrfs rtlver ntoskrnl_vista zlib_solo wdmguid ${PSEH_LIB}) +target_link_libraries(btrfs rtlver ntoskrnl_vista zlib_solo chkstk wdmguid ${PSEH_LIB}) add_importlibs(btrfs ntoskrnl hal) add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all)

6 years

[reactos] 01/01: [NTOSKRNL] Add and call the CmpSaveBootControlSet() stub.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=167bffd80fb8189de3400… commit 167bffd80fb8189de34007d78e697af4444cf533 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 16 12:48:56 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 16 12:49:59 2018 +0100 [NTOSKRNL] Add and call the CmpSaveBootControlSet() stub. --- ntoskrnl/config/cmcontrl.c | 8 ++++++++ ntoskrnl/config/ntapi.c | 4 ++-- ntoskrnl/include/internal/cm.h | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/config/cmcontrl.c b/ntoskrnl/config/cmcontrl.c index 81d8086cb1..54d4949979 100644 --- a/ntoskrnl/config/cmcontrl.c +++ b/ntoskrnl/config/cmcontrl.c @@ -262,3 +262,11 @@ CmGetSystemControlValues(IN PVOID SystemHiveData, PsDefaultThreadLocaleId = PsDefaultSystemLocaleId; PsDefaultUILanguageId = PsInstallUILanguageId; } + +NTSTATUS +NTAPI +CmpSaveBootControlSet(IN USHORT ControlSet) +{ + DPRINT1("CmpSaveBootControlSet(%lu)\n", ControlSet); + return STATUS_SUCCESS; +} diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index f3137ce861..824992fe75 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -1322,8 +1322,8 @@ NtInitializeRegistry(IN USHORT Flag) Flag -= CM_BOOT_FLAG_ACCEPTED; if (Flag) { - /* FIXME: Save the last known good boot */ - //Status = CmpSaveBootControlSet(Flag); + /* Save the last known good boot */ + Status = CmpSaveBootControlSet(Flag); /* Notify HAL */ HalEndOfBoot(); diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index c2900b2314..76fc5b9d1a 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -1177,6 +1177,12 @@ CmGetSystemControlValues( IN PCM_SYSTEM_CONTROL_VECTOR ControlVector ); +NTSTATUS +NTAPI +CmpSaveBootControlSet( + IN USHORT ControlSet +); + // // Hardware Configuration Routines //

6 years

[reactos] 01/01: [SHELLBTRFS] Oops, that local change got dropped...

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4e25b86736b6c777ee64… commit a4e25b86736b6c777ee644c89ec6699c2b545fee Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 16 12:27:08 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 16 12:27:08 2018 +0100 [SHELLBTRFS] Oops, that local change got dropped... CORE-15452 --- dll/shellext/shellbtrfs/send.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/shellext/shellbtrfs/send.h b/dll/shellext/shellbtrfs/send.h index 7940c4f19f..7735c61b13 100644 --- a/dll/shellext/shellbtrfs/send.h +++ b/dll/shellext/shellbtrfs/send.h @@ -19,6 +19,7 @@ #ifdef __REACTOS__ #include "btrfs.h" +#include <stdlib.h> #else #include "../btrfs.h" #endif

6 years

[reactos] 01/01: [SHELLBTRFS] Fix build

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ff5e8dc9e459d1b49e5… commit 00ff5e8dc9e459d1b49e50603919998963f5992b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 16 12:19:32 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 16 12:19:32 2018 +0100 [SHELLBTRFS] Fix build CORE-15452 --- dll/shellext/shellbtrfs/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/shellext/shellbtrfs/main.cpp b/dll/shellext/shellbtrfs/main.cpp index 92f4c5b710..ba9c419ff8 100644 --- a/dll/shellext/shellbtrfs/main.cpp +++ b/dll/shellext/shellbtrfs/main.cpp @@ -836,7 +836,6 @@ NTSTATUS NTAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, } /* encode ch as UTF-8 */ - ASSERT(ch <= 0x10ffff); if (ch < 0x80) { utf8_ch[0] = ch & 0x7f;

6 years

[reactos] 03/03: [UBTRFS] Upgrade to 1.1

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=215c0778da38335a0669d… commit 215c0778da38335a0669d1799b273fa80c125c7a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 16 12:05:58 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 16 12:06:46 2018 +0100 [UBTRFS] Upgrade to 1.1 CORE-15452 --- dll/win32/ubtrfs/ubtrfs.rc | 22 +++++++++++----------- media/doc/README.FSD | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/ubtrfs/ubtrfs.rc b/dll/win32/ubtrfs/ubtrfs.rc index e67bd27079..c4c486f92a 100644 --- a/dll/win32/ubtrfs/ubtrfs.rc +++ b/dll/win32/ubtrfs/ubtrfs.rc @@ -25,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,2,0 - PRODUCTVERSION 1,0,2,0 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -60,20 +60,20 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "080904b0" BEGIN - VALUE "FileDescription", "Btrfs utility DLL" - VALUE "FileVersion", "1.0.2" - VALUE "InternalName", "ubtrfs" + VALUE "FileDescription", "Btrfs formatting utility" + VALUE "FileVersion", "1.1" + VALUE "InternalName", "mkbtrfs" VALUE "LegalCopyright", "Copyright (c) Mark Harmstone 2016-18" - VALUE "OriginalFilename", "ubtrfs.dll" + VALUE "OriginalFilename", "mkbtrfs.exe" VALUE "ProductName", "WinBtrfs" - VALUE "ProductVersion", "1.0.2" + VALUE "ProductVersion", "1.1" END END BLOCK "VarFileInfo" diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 07c2702f10..a8d03e4510 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -5,7 +5,7 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. reactos/drivers/filesystems/btrfs # Synced to 1.1 reactos/dll/shellext/shellbtrfs # Synced to 1.1 -reactos/sdk/lib/fslib/btrfslib # Synced to 1.0.2 +reactos/sdk/lib/fslib/btrfslib # Synced to 1.1 The following FSD are shared with: http://www.ext2fsd.com/

6 years

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018