Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 01/01: [SDK][NDK][PSTYPES] Align the PROCESS_PRIORITY_CLASS structure during compile time (#2478)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7481bda679eccdf1eba36… commit 7481bda679eccdf1eba3666e500074dcb966e748 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Mar 28 19:17:10 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 28 19:17:10 2020 +0100 [SDK][NDK][PSTYPES] Align the PROCESS_PRIORITY_CLASS structure during compile time (#2478) CORE-16757 After doing investigations on the priority class structure alignment, it's been revealed that in Windows XP and Server 2003 this PROCESS_PRIORITY_CLASS structure is aligned as a 4-bytes of size hence NtQueryInformationProcess() probes the alignment of user mode arguments buffer output and buffer length with requirement of a ULONG. As PROCESS_PRIORITY_CLASS was initially aligned as a 1-byte size because both BOOLEAN and UCHAR are just unsigned characters, the compiler may not align such structure and gracefully let the default alignment of such structure as is, 1-byte because an unsigned char has a size of 1 byte. Setting an align attribute to this structure fixes the problem of a potential datatype misalignment which caused GetPriorityClass() to not retrieve the process' priority class properly. --- sdk/include/ndk/pstypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 543afcb618d..219b880368f 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -902,7 +902,7 @@ typedef struct _PROCESS_SESSION_INFORMATION #endif -typedef struct _PROCESS_PRIORITY_CLASS +typedef struct DECLSPEC_ALIGN(4) _PROCESS_PRIORITY_CLASS { BOOLEAN Foreground; UCHAR PriorityClass;

4 years, 9 months

[reactos] 01/01: [MSV1_0] use precompiled headers (#2475)

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d36be496309bf8551f12… commit 2d36be496309bf8551f120c674f73f987f88e5c3 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Mar 28 17:13:57 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 28 17:13:57 2020 +0100 [MSV1_0] use precompiled headers (#2475) --- dll/win32/msv1_0/CMakeLists.txt | 5 +++-- dll/win32/msv1_0/msv1_0.c | 2 +- dll/win32/msv1_0/msv1_0.h | 31 ------------------------------- dll/win32/msv1_0/precomp.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt index 6e2e41bb9d3..b4e56cd2475 100644 --- a/dll/win32/msv1_0/CMakeLists.txt +++ b/dll/win32/msv1_0/CMakeLists.txt @@ -3,14 +3,15 @@ spec2def(msv1_0.dll msv1_0.spec) list(APPEND SOURCE msv1_0.c - msv1_0.rc + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def) -add_library(msv1_0 MODULE ${SOURCE}) +add_library(msv1_0 MODULE ${SOURCE} msv1_0.rc) set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0) target_link_libraries(msv1_0 wine ${PSEH_LIB}) add_delay_importlibs(msv1_0 samsrv lsasrv) add_importlibs(msv1_0 advapi32 kernel32 ntdll) add_dependencies(msv1_0 psdk) +add_pch(msv1_0 precomp.h SOURCE) add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index a7e5c2b5a6c..6994940290c 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -8,7 +8,7 @@ /* INCLUDES ****************************************************************/ -#include "msv1_0.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); diff --git a/dll/win32/msv1_0/msv1_0.h b/dll/win32/msv1_0/msv1_0.h index 773702fdec1..1b656bca4f1 100644 --- a/dll/win32/msv1_0/msv1_0.h +++ b/dll/win32/msv1_0/msv1_0.h @@ -6,37 +6,6 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#define NTOS_MODE_USER -#include <ndk/cmfuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/lpctypes.h> -#include <ndk/lpcfuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/rtlfuncs.h> -#include <ndk/setypes.h> -#include <ndk/sefuncs.h> - -#include <sspi.h> -#include <ntsecapi.h> -#include <ntsecpkg.h> -#include <ntsam.h> -#include <ntlsa.h> - -#include <samsrv/samsrv.h> -//#include <lsass/lsasrv.h> - -#include <wine/debug.h> - - #define FIXUP_POINTER(Pointer, Offset) ((Pointer != NULL) ? ((PWSTR)((ULONG_PTR)Pointer + Offset)) : NULL) diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h new file mode 100644 index 00000000000..c4140240ab3 --- /dev/null +++ b/dll/win32/msv1_0/precomp.h @@ -0,0 +1,36 @@ +#ifndef _MSV1_0_PRECOMP_H_ +#define _MSV1_0_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> + +#include <sspi.h> +#include <ntsecapi.h> +#include <ntsecpkg.h> +#include <ntsam.h> +#include <ntlsa.h> + +#include <samsrv/samsrv.h> +//#include <lsass/lsasrv.h> + +#include "msv1_0.h" + +#include <wine/debug.h> + +#endif

4 years, 9 months

[reactos] 01/01: [NTOS:MM] Make _X86PAE_ the only define for PAE-enabled kernel

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99f9c1666de320517ddd2… commit 99f9c1666de320517ddd2564c8ec3dbb1f892087 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Mar 28 18:11:42 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Mar 28 18:11:42 2020 +0300 [NTOS:MM] Make _X86PAE_ the only define for PAE-enabled kernel --- ntoskrnl/include/internal/i386/mm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/include/internal/i386/mm.h b/ntoskrnl/include/internal/i386/mm.h index 1db55cba96a..0784f6709ba 100644 --- a/ntoskrnl/include/internal/i386/mm.h +++ b/ntoskrnl/include/internal/i386/mm.h @@ -3,7 +3,7 @@ */ #pragma once -#ifdef _PAE_ +#ifdef _X86PAE_ #define _MI_PAGING_LEVELS 3 #define _MI_HAS_NO_EXECUTE 1 #else @@ -14,7 +14,7 @@ /* Memory layout base addresses */ #define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 -#ifndef PAE +#ifndef _X86PAE_ #define HYPER_SPACE 0xC0400000 #define HYPER_SPACE_END 0xC07FFFFF #else @@ -106,7 +106,7 @@ #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Writable == 1) #endif #define MI_IS_PAGE_COPY_ON_WRITE(x)((x)->u.Hard.CopyOnWrite == 1) -#ifdef _PAE_ +#ifdef _X86PAE_ #define MI_IS_PAGE_EXECUTABLE(x) ((x)->u.Hard.NoExecute == 0) #else #define MI_IS_PAGE_EXECUTABLE(x) TRUE

4 years, 9 months

[reactos] 01/01: [SDK][NDK] MMPTE for PAE (#2453)

by Vadim Galyant

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae0e0569d5015f31b79a5… commit ae0e0569d5015f31b79a599a903bb9fb43b74e95 Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Sat Mar 28 15:45:51 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 28 13:45:51 2020 +0100 [SDK][NDK] MMPTE for PAE (#2453) This not only makes PAE possible, but also allows to make the definitions and macros in the memory manager header files more human-readable. CORE-16702 * [SDK][NDK] Make the _MMPTE_HARDWARE structure more compact and more human-readable. * [SDK][NDK] Add definitions a struct _MMPTE for PAE mode. --- sdk/include/ndk/i386/mmtypes.h | 150 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 16 deletions(-) diff --git a/sdk/include/ndk/i386/mmtypes.h b/sdk/include/ndk/i386/mmtypes.h index 238a1cdf9bc..1b52d06de4b 100644 --- a/sdk/include/ndk/i386/mmtypes.h +++ b/sdk/include/ndk/i386/mmtypes.h @@ -65,6 +65,8 @@ C_ASSERT(MM_ALLOCATION_GRANULARITY >= PAGE_SIZE); // // Page Table Entry Definitions // +#if !defined(_X86PAE_) + typedef struct _HARDWARE_PTE_X86 { ULONG Valid:1; @@ -135,12 +137,14 @@ typedef struct _MMPTE_LIST ULONG NextEntry:20; } MMPTE_LIST; -#ifndef CONFIG_SMP - typedef struct _MMPTE_HARDWARE { ULONG Valid:1; +#ifndef CONFIG_SMP ULONG Write:1; +#else + ULONG Writable:1; +#endif ULONG Owner:1; ULONG WriteThrough:1; ULONG CacheDisable:1; @@ -150,27 +154,126 @@ typedef struct _MMPTE_HARDWARE ULONG Global:1; ULONG CopyOnWrite:1; ULONG Prototype:1; +#ifndef CONFIG_SMP ULONG reserved:1; +#else + ULONG Write:1; +#endif ULONG PageFrameNumber:20; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; #else +typedef struct _HARDWARE_PTE_X86 +{ + union + { + struct + { + ULONGLONG Valid:1; + ULONGLONG Write:1; + ULONGLONG Owner:1; + ULONGLONG WriteThrough:1; + ULONGLONG CacheDisable:1; + ULONGLONG Accessed:1; + ULONGLONG Dirty:1; + ULONGLONG LargePage:1; + ULONGLONG Global:1; + ULONGLONG CopyOnWrite:1; + ULONGLONG Prototype:1; + ULONGLONG reserved0:1; + ULONGLONG PageFrameNumber:26; + ULONGLONG reserved1:26; + }; + struct + { + ULONG LowPart; + ULONG HighPart; + }; + }; +} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + +typedef struct _MMPTE_SOFTWARE +{ + ULONGLONG Valid:1; + ULONGLONG PageFileLow:4; + ULONGLONG Protection:5; + ULONGLONG Prototype:1; + ULONGLONG Transition:1; + ULONGLONG Unused:20; + ULONGLONG PageFileHigh:32; +} MMPTE_SOFTWARE; + +typedef struct _MMPTE_TRANSITION +{ + ULONGLONG Valid:1; + ULONGLONG Write:1; + ULONGLONG Owner:1; + ULONGLONG WriteThrough:1; + ULONGLONG CacheDisable:1; + ULONGLONG Protection:5; + ULONGLONG Prototype:1; + ULONGLONG Transition:1; + ULONGLONG PageFrameNumber:26; + ULONGLONG Unused:26; +} MMPTE_TRANSITION; + +typedef struct _MMPTE_PROTOTYPE +{ + ULONGLONG Valid:1; + ULONGLONG Unused0:7; + ULONGLONG ReadOnly:1; + ULONGLONG Unused1:1; + ULONGLONG Prototype:1; + ULONGLONG Protection:5; + ULONGLONG Unused:16; + ULONGLONG ProtoAddress:32; +} MMPTE_PROTOTYPE; + +typedef struct _MMPTE_SUBSECTION +{ + ULONGLONG Valid:1; + ULONGLONG Unused0:4; + ULONGLONG Protection:5; + ULONGLONG Prototype:1; + ULONGLONG Unused1:21; + ULONGLONG SubsectionAddress:32; +} MMPTE_SUBSECTION; + +typedef struct _MMPTE_LIST +{ + ULONGLONG Valid:1; + ULONGLONG OneEntry:1; + ULONGLONG filler0:8; + ULONGLONG Prototype:1; + ULONGLONG filler1:21; + ULONGLONG NextEntry:32; +} MMPTE_LIST; + typedef struct _MMPTE_HARDWARE { - ULONG Valid:1; - ULONG Writable:1; - ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Accessed:1; - ULONG Dirty:1; - ULONG LargePage:1; - ULONG Global:1; - ULONG CopyOnWrite:1; - ULONG Prototype:1; - ULONG Write:1; - ULONG PageFrameNumber:20; + ULONGLONG Valid:1; +#ifndef CONFIG_SMP + ULONGLONG Write:1; +#else + ULONGLONG Writable:1; +#endif + ULONGLONG Owner:1; + ULONGLONG WriteThrough:1; + ULONGLONG CacheDisable:1; + ULONGLONG Accessed:1; + ULONGLONG Dirty:1; + ULONGLONG LargePage:1; + ULONGLONG Global:1; + ULONGLONG CopyOnWrite:1; + ULONGLONG Prototype:1; +#ifndef CONFIG_SMP + ULONGLONG reserved0:1; +#else + ULONGLONG Write:1; +#endif + ULONGLONG PageFrameNumber:26; + ULONGLONG reserved1:26; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; #endif @@ -185,7 +288,16 @@ typedef struct _MMPTE { union { - ULONG_PTR Long; +#if !defined(_X86PAE_) + ULONG Long; +#else + ULONGLONG Long; + struct + { + ULONG LowPart; + ULONG HighPart; + } HighLow; +#endif HARDWARE_PTE Flush; MMPTE_HARDWARE Hard; MMPTE_PROTOTYPE Proto; @@ -197,6 +309,12 @@ typedef struct _MMPTE } MMPTE, *PMMPTE, MMPDE, *PMMPDE; +#if !defined(_X86PAE_) +C_ASSERT(sizeof(MMPTE) == sizeof(ULONG)); +#else +C_ASSERT(sizeof(MMPTE) == sizeof(ULONGLONG)); +#endif + #ifdef __cplusplus }; // extern "C" #endif

4 years, 9 months

[reactos] 01/01: [WINEFILE] Fix 'LANGUAGE_SI_SI' typo (#2474)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=660383b8559815870054d… commit 660383b8559815870054db034769bea055239e0f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Mar 28 13:23:35 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 28 13:23:35 2020 +0100 [WINEFILE] Fix 'LANGUAGE_SI_SI' typo (#2474) --- modules/rosapps/applications/winfile/rsrc.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/winfile/rsrc.rc b/modules/rosapps/applications/winfile/rsrc.rc index babd5d95e72..c0f667b9a6b 100644 --- a/modules/rosapps/applications/winfile/rsrc.rc +++ b/modules/rosapps/applications/winfile/rsrc.rc @@ -112,8 +112,8 @@ IDB_IMAGES BITMAP DISCARDABLE "resources/images.bmp" #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif -#ifdef LANGUAGE_SI_SI - #include "lang/sl-SI.rc" +#ifdef LANGUAGE_SL_SI + #include "lang/sl-SI.rc" #endif #ifdef LANGUAGE_SV_SE #include "lang/sv-SE.rc"

4 years, 9 months

[reactos] 01/01: [NTDLL_APITEST] Add testcase for process priority class. CORE-16757

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcb156388d88eb6c09498… commit fcb156388d88eb6c0949890fde6d0efe19f00deb Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Mar 26 12:11:29 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 28 13:10:44 2020 +0100 [NTDLL_APITEST] Add testcase for process priority class. CORE-16757 Currently the testcase function only addresses the behaviour of getting an unaligned buffer (either of correct length size or not) for now. --- .../apitests/ntdll/NtQueryInformationProcess.c | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c index bdbfc3f726a..e392ead8760 100644 --- a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c @@ -185,6 +185,74 @@ Test_ProcessTimes(void) #undef SPIN_TIME } +static +void +Test_ProcessPriorityClassAlignment(void) +{ + NTSTATUS Status; + PPROCESS_PRIORITY_CLASS ProcPriority; + + /* Allocate some memory for the priority class structure */ + ProcPriority = malloc(sizeof(PROCESS_PRIORITY_CLASS)); + if (ProcPriority == NULL) + { + skip("Failed to allocate memory for PROCESS_PRIORITY_CLASS!\n"); + return; + } + + /* + * Initialize the PriorityClass member to ensure the test won't randomly succeed (if such data is uninitialized). + * Filling 85 to the data member makes sure that if the test fails continously then NtQueryInformationProcess() + * didn't initialize the structure with data. + */ + RtlFillMemory(&ProcPriority->PriorityClass, sizeof(ProcPriority->PriorityClass), 0x55); + + /* Unaligned buffer -- wrong size */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessPriorityClass, + (PVOID)1, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Unaligned buffer -- correct size */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessPriorityClass, + (PVOID)1, + sizeof(PROCESS_PRIORITY_CLASS), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Unaligned buffer -- wrong size (but this time do with an alignment of 2) */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessPriorityClass, + (PVOID)2, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Unaligned buffer -- correct size (but this time do with an alignment of 2) */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessPriorityClass, + (PVOID)2, + sizeof(PROCESS_PRIORITY_CLASS), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Do not care for the length but expect to return the priority class */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessPriorityClass, + ProcPriority, + sizeof(PROCESS_PRIORITY_CLASS), + NULL); + ok_hex(Status, STATUS_SUCCESS); + + /* Make sure the returned priority class is a valid number (non negative) but also it should be within the PROCESS_PRIORITY_CLASS range */ + ok(ProcPriority->PriorityClass > PROCESS_PRIORITY_CLASS_INVALID && ProcPriority->PriorityClass <= PROCESS_PRIORITY_CLASS_ABOVE_NORMAL, + "Expected a valid number from priority class range but got %d\n", ProcPriority->PriorityClass); + free(ProcPriority); +} + START_TEST(NtQueryInformationProcess) { NTSTATUS Status; @@ -193,4 +261,5 @@ START_TEST(NtQueryInformationProcess) ok_hex(Status, STATUS_SUCCESS); Test_ProcessTimes(); + Test_ProcessPriorityClassAlignment(); }

4 years, 9 months

[reactos] 09/09: [STORAHCI] Replace some __inline by FORCEINLINE

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5658fd3b41f168578a49… commit f5658fd3b41f168578a497846b556c914884f635 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 11:53:27 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [STORAHCI] Replace some __inline by FORCEINLINE Functions were declared as __inline, then used, and then defined. This leads to some linking errors with some compilers. --- drivers/storage/port/storahci/storahci.c | 10 +++++----- drivers/storage/port/storahci/storahci.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/storage/port/storahci/storahci.c b/drivers/storage/port/storahci/storahci.c index c674b2b7af4..ed94f1d3e87 100644 --- a/drivers/storage/port/storahci/storahci.c +++ b/drivers/storage/port/storahci/storahci.c @@ -2438,7 +2438,7 @@ AhciAdapterReset ( * @param Buffer * @param BufferSize */ -__inline +FORCEINLINE VOID AhciZeroMemory ( __out PCHAR Buffer, @@ -2466,7 +2466,7 @@ AhciZeroMemory ( * @return * return TRUE if provided port is valid (implemented) or not */ -__inline +FORCEINLINE BOOLEAN IsPortValid ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, @@ -2496,7 +2496,7 @@ IsPortValid ( * return TRUE if Srb is successfully added to Queue * */ -__inline +FORCEINLINE BOOLEAN AddQueue ( __inout PAHCI_QUEUE Queue, @@ -2527,7 +2527,7 @@ AddQueue ( * return Srb * */ -__inline +FORCEINLINE PVOID RemoveQueue ( __inout PAHCI_QUEUE Queue @@ -2590,7 +2590,7 @@ GetSrbExtension ( * return Logical Address of the block * */ -__inline +FORCEINLINE ULONG64 AhciGetLba ( __in PCDB Cdb, diff --git a/drivers/storage/port/storahci/storahci.h b/drivers/storage/port/storahci/storahci.h index 8c5277d04ca..fba3f2d4be5 100644 --- a/drivers/storage/port/storahci/storahci.h +++ b/drivers/storage/port/storahci/storahci.h @@ -581,14 +581,14 @@ AhciAdapterReset ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension ); -__inline +FORCEINLINE VOID AhciZeroMemory ( __out PCHAR Buffer, __in ULONG BufferSize ); -__inline +FORCEINLINE BOOLEAN IsPortValid ( __in PAHCI_ADAPTER_EXTENSION AdapterExtension, @@ -632,14 +632,14 @@ UCHAR DeviceReportLuns ( __in PCDB Cdb ); -__inline +FORCEINLINE BOOLEAN AddQueue ( __inout PAHCI_QUEUE Queue, __in PVOID Srb ); -__inline +FORCEINLINE PVOID RemoveQueue ( __inout PAHCI_QUEUE Queue @@ -651,7 +651,7 @@ GetSrbExtension( __in PSCSI_REQUEST_BLOCK Srb ); -__inline +FORCEINLINE ULONG64 AhciGetLba ( __in PCDB Cdb,

4 years, 9 months

[reactos] 08/09: [TCPIP] Add some static specifiers, to prevent exporting FORCEINLINE function outside compilation unit

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=796c1ac993640494c0637… commit 796c1ac993640494c06373a779c80140a4d2ef3a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 16:26:16 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [TCPIP] Add some static specifiers, to prevent exporting FORCEINLINE function outside compilation unit --- drivers/network/tcpip/tcpip/buffer.c | 3 ++- sdk/lib/drivers/ip/network/receive.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/network/tcpip/tcpip/buffer.c b/drivers/network/tcpip/tcpip/buffer.c index 4fed0557362..1100390c29f 100644 --- a/drivers/network/tcpip/tcpip/buffer.c +++ b/drivers/network/tcpip/tcpip/buffer.c @@ -10,7 +10,8 @@ #include "precomp.h" -__inline INT SkipToOffset( +static inline +INT SkipToOffset( PNDIS_BUFFER Buffer, UINT Offset, PCHAR *Data, diff --git a/sdk/lib/drivers/ip/network/receive.c b/sdk/lib/drivers/ip/network/receive.c index 15876e494b1..52c929bb88a 100644 --- a/sdk/lib/drivers/ip/network/receive.c +++ b/sdk/lib/drivers/ip/network/receive.c @@ -247,7 +247,7 @@ ReassembleDatagram( } -__inline VOID Cleanup( +static inline VOID Cleanup( PKSPIN_LOCK Lock, KIRQL OldIrql, PIPDATAGRAM_REASSEMBLY IPDR)

4 years, 9 months

[reactos] 07/09: [WIN32K] Add some static specifiers, to prevent exporting FORCEINLINE function outside compilation unit

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae5d2dbb9e7f63420d334… commit ae5d2dbb9e7f63420d33497ace71119a4ba50e7f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 26 14:48:35 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [WIN32K] Add some static specifiers, to prevent exporting FORCEINLINE function outside compilation unit --- win32ss/gdi/ntgdi/freetype.c | 2 +- win32ss/gdi/ntgdi/gdiobj.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 65bda368626..7d646807e7b 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5830,7 +5830,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, return GotCount; } -FORCEINLINE +static inline LONG ScaleLong(LONG lValue, PFLOATOBJ pef) { diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index 3a323dc2fb4..95633e980da 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -343,7 +343,7 @@ DecrementCurrentProcessGdiHandleCount(void) if (ppi) InterlockedDecrement((LONG*)&ppi->GDIHandleCount); } -FORCEINLINE +static inline VOID IncrementGdiHandleCount(ULONG ulProcessId) { @@ -360,7 +360,7 @@ IncrementGdiHandleCount(ULONG ulProcessId) if (NT_SUCCESS(Status)) ObDereferenceObject(pep); } -FORCEINLINE +static inline VOID DecrementGdiHandleCount(ULONG ulProcessId) {

4 years, 9 months

[reactos] 06/09: [FSUTIL] Mark some functions as static (only used in this file)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8649ed90a8eb731069258… commit 8649ed90a8eb731069258f5a5342648525f2e593 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Feb 4 23:29:17 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 26 16:39:16 2020 +0100 [FSUTIL] Mark some functions as static (only used in this file) --- base/applications/cmdutils/fsutil/fsinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/fsutil/fsinfo.c b/base/applications/cmdutils/fsutil/fsinfo.c index 65bae0fde32..88b51ea7ebc 100644 --- a/base/applications/cmdutils/fsutil/fsinfo.c +++ b/base/applications/cmdutils/fsutil/fsinfo.c @@ -339,7 +339,7 @@ DumpNtfs(PVOID Statistics, PVOID Specific) #define GET_NEXT(stats, length, iter, type) (type)((ULONG_PTR)stats + (length * iter)) #define SUM_VALUE(stats, new, value) stats->value += new->value -inline int +static inline int ValidateSizes(ULONG Length, DWORD ProcCount, DWORD BytesRead, DWORD SpecificSize) { /* Check whether we could read our base length for every processor */ @@ -359,7 +359,7 @@ ValidateSizes(ULONG Length, DWORD ProcCount, DWORD BytesRead, DWORD SpecificSize return 0; } -inline void +static inline void SumBase(PFILESYSTEM_STATISTICS Base, PFILESYSTEM_STATISTICS NextBase) { /* Sum any entry in the generic structures */

4 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
16
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 March 2020