Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NETAPI32] Add DFS RPC interface and some DFS stubs
by Eric Kohl 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=956086d369727a2c15604… commit 956086d369727a2c15604a997277a1838736ba8a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 12 14:13:26 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 12 14:31:07 2018 +0200 [NETAPI32] Add DFS RPC interface and some DFS stubs --- dll/win32/netapi32/CMakeLists.txt | 3 + dll/win32/netapi32/dfs.c | 128 ++++++++ dll/win32/netapi32/netapi32.spec | 14 +- sdk/include/reactos/idl/netdfs.idl | 581 +++++++++++++++++++++++++++++++++++++ 4 files changed, 719 insertions(+), 7 deletions(-) diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 0339f76604..c5066c09e4 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -9,6 +9,7 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/atsvc.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/browser.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/dssetup.idl + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/netdfs.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/netlogon.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/srvsvc.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl) @@ -16,6 +17,7 @@ add_rpc_files(client list(APPEND SOURCE apibuf.c browser.c + dfs.c display.c dssetup.c group.c @@ -38,6 +40,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/atsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/browser_c.c ${CMAKE_CURRENT_BINARY_DIR}/dssetup_c.c + ${CMAKE_CURRENT_BINARY_DIR}/netdfs_c.c ${CMAKE_CURRENT_BINARY_DIR}/netlogon_c.c ${CMAKE_CURRENT_BINARY_DIR}/srvsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) diff --git a/dll/win32/netapi32/dfs.c b/dll/win32/netapi32/dfs.c new file mode 100644 index 0000000000..af4bcddaf5 --- /dev/null +++ b/dll/win32/netapi32/dfs.c @@ -0,0 +1,128 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/dfs.c + * PURPOSE: Distributed File System Service interface code + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" + +#include <rpc.h> +#include "netdfs_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +NET_API_STATUS +WINAPI +NetDfsAdd( + _In_ LPWSTR DfsEntryPath, + _In_ LPWSTR ServerName, + _In_ LPWSTR PathName, + _In_opt_ LPWSTR Comment, + _In_ DWORD Flags) +{ +#if 0 + NET_API_STATUS + __stdcall + status = NetrDfsAdd(DfsEntryPath, + ServerName, + PathName, + Comment, + Flags); +#endif + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsAddFtRoot( + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_ LPWSTR FtDfsName, + _In_opt_ LPWSTR Comment, + _In_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsAddStdRoot( + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_opt_ LPWSTR Comment, + _In_ DWORD Flags) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsAddStdRootForced( + _In_ LPWSTR ServerName, + _In_ LPWSTR RootShare, + _In_opt_ LPWSTR Comment, + _In_ LPWSTR Store) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsEnum( + _In_ LPWSTR DfsName, + _In_ DWORD Level, + _In_ DWORD PrefMaxLen, + _Out_ LPBYTE *Buffer, + _Out_ LPDWORD EntriesRead, + _Out_ LPDWORD ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +NET_API_STATUS +WINAPI +NetDfsGetClientInfo( + _In_ LPWSTR DfsEntryPath, + _In_ LPWSTR ServerName, + _In_ LPWSTR ShareName, + _In_ DWORD Level, + _Out_ LPBYTE *Buffer) +{ + UNIMPLEMENTED; + return 0; +} + + +/* NetDfsGetDcAddress */ + + +NET_API_STATUS +WINAPI +NetDfsGetFtContainerSecurity( + _In_ LPWSTR DomainName, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PSECURITY_DESCRIPTOR *ppSecurityDescriptor, + _Out_ LPDWORD lpcbSecurityDescriptor) +{ + UNIMPLEMENTED; + return 0; +} + + +/* EOF */ diff --git a/dll/win32/netapi32/netapi32.spec b/dll/win32/netapi32/netapi32.spec index 333d1405b2..d00d2f4162 100644 --- a/dll/win32/netapi32/netapi32.spec +++ b/dll/win32/netapi32/netapi32.spec @@ -114,14 +114,14 @@ @ stdcall NetConfigGetAll(wstr wstr ptr) @ stdcall NetConfigSet(wstr wstr wstr long long ptr long) @ stdcall NetConnectionEnum(wstr wstr long ptr long ptr ptr ptr) -@ stub NetDfsAdd -@ stub NetDfsAddFtRoot -@ stub NetDfsAddStdRoot -@ stub NetDfsAddStdRootForced -@ stub NetDfsEnum -@ stub NetDfsGetClientInfo +@ stdcall NetDfsAdd(wstr wstr wstr wstr long) +@ stdcall NetDfsAddFtRoot(wstr wstr wstr wstr long) +@ stdcall NetDfsAddStdRoot(wstr wstr wstr long) +@ stdcall NetDfsAddStdRootForced(wstr wstr wstr wstr) +@ stdcall NetDfsEnum(wstr long long ptr ptr ptr) +@ stdcall NetDfsGetClientInfo(wstr wstr wstr long ptr) @ stub NetDfsGetDcAddress -@ stub NetDfsGetFtContainerSecurity +@ stdcall NetDfsGetFtContainerSecurity(wstr long ptr ptr); @ stub NetDfsGetInfo @ stub NetDfsGetSecurity @ stub NetDfsGetStdContainerSecurity diff --git a/sdk/include/reactos/idl/netdfs.idl b/sdk/include/reactos/idl/netdfs.idl new file mode 100644 index 0000000000..bd4ca88ce0 --- /dev/null +++ b/sdk/include/reactos/idl/netdfs.idl @@ -0,0 +1,581 @@ +/* + * Distributed File System service interface definition + */ + +#include <ms-dtyp.idl> + +typedef DWORD NET_API_STATUS; + +typedef WCHAR *NETDFS_SERVER_OR_DOMAIN_HANDLE; + +typedef [v1_enum] enum _DFS_TARGET_PRIORITY_CLASS +{ + DfsInvalidPriorityClass = -1, + DfsSiteCostNormalPriorityClass = 0, + DfsGlobalHighPriorityClass = 1, + DfsSiteCostHighPriorityClass = 2, + DfsSiteCostLowPriorityClass = 3, + DfsGlobalLowPriorityClass = 4 +} DFS_TARGET_PRIORITY_CLASS; + +typedef struct _DFS_TARGET_PRIORITY +{ + DFS_TARGET_PRIORITY_CLASS TargetPriorityClass; + unsigned short TargetPriorityRank; + unsigned short Reserved; +} DFS_TARGET_PRIORITY; + +typedef struct _DFS_STORAGE_INFO +{ + unsigned long State; + [string] WCHAR *ServerName; + [string] WCHAR *ShareName; +} DFS_STORAGE_INFO; + +typedef struct _DFS_STORAGE_INFO_1 +{ + unsigned long State; + [string] WCHAR *ServerName; + [string] WCHAR * ShareName; + DFS_TARGET_PRIORITY TargetPriority; +} DFS_STORAGE_INFO_1, *PDFS_STORAGE_INFO_1, *LPDFS_STORAGE_INFO_1; + +typedef struct _DFSM_ROOT_LIST_ENTRY +{ + [string, unique] WCHAR *ServerShare; +} DFSM_ROOT_LIST_ENTRY; + +typedef struct _DFSM_ROOT_LIST +{ + DWORD cEntries; + [size_is(cEntries)] DFSM_ROOT_LIST_ENTRY Entry[]; +} DFSM_ROOT_LIST; + +typedef enum +{ + DFS_NAMESPACE_VERSION_ORIGIN_COMBINED = 0, + DFS_NAMESPACE_VERSION_ORIGIN_SERVER, + DFS_NAMESPACE_VERSION_ORIGIN_DOMAIN +} DFS_NAMESPACE_VERSION_ORIGIN; + +typedef struct _DFS_SUPPORTED_NAMESPACE_VERSION_INFO +{ + unsigned long DomainDfsMajorVersion; + unsigned long DomainDfsMinorVersion; + ULONGLONG DomainDfsCapabilities; + unsigned long StandaloneDfsMajorVersion; + unsigned long StandaloneDfsMinorVersion; + ULONGLONG StandaloneDfsCapabilities; +} DFS_SUPPORTED_NAMESPACE_VERSION_INFO, *PDFS_SUPPORTED_NAMESPACE_VERSION_INFO; + +typedef struct _DFS_INFO_1 +{ + [string] WCHAR *EntryPath; +} DFS_INFO_1; + +typedef struct _DFS_INFO_2 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + DWORD NumberOfStorages; +} DFS_INFO_2; + +typedef struct _DFS_INFO_3 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + DWORD NumberOfStorages; + [size_is(NumberOfStorages)] DFS_STORAGE_INFO *Storage; +} DFS_INFO_3; + +typedef struct _DFS_INFO_4 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + GUID Guid; + DWORD NumberOfStorages; + [size_is(NumberOfStorages)] DFS_STORAGE_INFO *Storage; +} DFS_INFO_4; + +typedef struct _DFS_INFO_5 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + GUID Guid; + unsigned long PropertyFlags; + unsigned long MetadataSize; + DWORD NumberOfStorages; +} DFS_INFO_5; + +typedef struct _DFS_INFO_6 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + GUID Guid; + unsigned long PropertyFlags; + unsigned long MetadataSize; + DWORD NumberOfStorages; + [size_is(NumberOfStorages)] DFS_STORAGE_INFO_1 *Storage; +} DFS_INFO_6; + +typedef struct _DFS_INFO_7 +{ + GUID GenerationGuid; +} DFS_INFO_7; + +typedef struct _DFS_INFO_8 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; GUID Guid; + unsigned long PropertyFlags; + unsigned long MetadataSize; + ULONG SecurityDescriptorLength; + [size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor; + DWORD NumberOfStorages; +} DFS_INFO_8, *LPDFS_INFO_8; + +typedef struct _DFS_INFO_9 +{ + [string] WCHAR *EntryPath; + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + GUID Guid; + unsigned long PropertyFlags; + unsigned long MetadataSize; + ULONG SecurityDescriptorLength; + [size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor; + DWORD NumberOfStorages; + [size_is(NumberOfStorages)] LPDFS_STORAGE_INFO_1 Storage; +} DFS_INFO_9, *LPDFS_INFO_9; + +typedef struct _DFS_INFO_50 +{ + unsigned long NamespaceMajorVersion; + unsigned long NamespaceMinorVersion; + unsigned __int64 NamespaceCapabilities; +} DFS_INFO_50; + +typedef struct _DFS_INFO_100 +{ + [string] WCHAR *Comment; +} DFS_INFO_100; + +typedef struct _DFS_INFO_101 +{ + unsigned long State; +} DFS_INFO_101; + +typedef struct _DFS_INFO_102 +{ + unsigned long Timeout; +} DFS_INFO_102; + +typedef struct _DFS_INFO_103 +{ + unsigned long PropertyFlagMask; + unsigned long PropertyFlags; +} DFS_INFO_103; + +typedef struct _DFS_INFO_104 +{ + DFS_TARGET_PRIORITY TargetPriority; +} DFS_INFO_104; + +typedef struct _DFS_INFO_105 +{ + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + unsigned long PropertyFlagMask; + unsigned long PropertyFlags; +} DFS_INFO_105; + +typedef struct _DFS_INFO_106 +{ + DWORD State; + DFS_TARGET_PRIORITY TargetPriority; +} DFS_INFO_106; + +typedef struct _DFS_INFO_107 +{ + [string] WCHAR *Comment; + DWORD State; + unsigned long Timeout; + unsigned long PropertyFlagMask; + unsigned long PropertyFlags; + ULONG SecurityDescriptorLength; + [size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor; +} DFS_INFO_107; + +typedef struct _DFS_INFO_150 +{ + ULONG SecurityDescriptorLength; + [size_is(SecurityDescriptorLength)] PUCHAR pSecurityDescriptor; +} DFS_INFO_150; + +typedef struct _DFS_INFO_200 +{ + [string] WCHAR *FtDfsName; +} DFS_INFO_200; + +typedef struct _DFS_INFO_300 +{ + DWORD Flags; + [string] WCHAR *DfsName; +} DFS_INFO_300; + +typedef [switch_type(unsigned long)] union _DFS_INFO_STRUCT +{ + [case(1)] DFS_INFO_1 *DfsInfo1; + [case(2)] DFS_INFO_2 *DfsInfo2; + [case(3)] DFS_INFO_3 *DfsInfo3; + [case(4)] DFS_INFO_4 *DfsInfo4; + [case(5)] DFS_INFO_5 *DfsInfo5; + [case(6)] DFS_INFO_6 *DfsInfo6; + [case(7)] DFS_INFO_7 *DfsInfo7; + [case(8)] DFS_INFO_8 *DfsInfo8; + [case(9)] DFS_INFO_9 *DfsInfo9; + [case(50)] DFS_INFO_50 *DfsInfo50; + [case(100)] DFS_INFO_100 *DfsInfo100; + [case(101)] DFS_INFO_101 *DfsInfo101; + [case(102)] DFS_INFO_102 *DfsInfo102; + [case(103)] DFS_INFO_103 *DfsInfo103; + [case(104)] DFS_INFO_104 *DfsInfo104; + [case(105)] DFS_INFO_105 *DfsInfo105; + [case(106)] DFS_INFO_106 *DfsInfo106; + [case(107)] DFS_INFO_107 *DfsInfo107; + [case(150)] DFS_INFO_150 *DfsInfo150; + [default]; +} DFS_INFO_STRUCT; + +typedef struct _DFS_INFO_1_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_1 *Buffer; +} DFS_INFO_1_CONTAINER; + +typedef struct _DFS_INFO_2_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_2 *Buffer; +} DFS_INFO_2_CONTAINER; + +typedef struct _DFS_INFO_3_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_3 *Buffer; +} DFS_INFO_3_CONTAINER; + +typedef struct _DFS_INFO_4_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_4 *Buffer; +} DFS_INFO_4_CONTAINER; + +typedef struct _DFS_INFO_5_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_5 *Buffer; +} DFS_INFO_5_CONTAINER; + +typedef struct _DFS_INFO_6_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_6 *Buffer; +} DFS_INFO_6_CONTAINER; + +typedef struct _DFS_INFO_8_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPDFS_INFO_8 Buffer; +} DFS_INFO_8_CONTAINER, *LPDFS_INFO_8_CONTAINER; + +typedef struct _DFS_INFO_9_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPDFS_INFO_9 Buffer; +} DFS_INFO_9_CONTAINER, *LPDFS_INFO_9_CONTAINER; + +typedef struct _DFS_INFO_200_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_200 *Buffer; +} DFS_INFO_200_CONTAINER; + +typedef struct _DFS_INFO_300_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] DFS_INFO_300 *Buffer; +} DFS_INFO_300_CONTAINER; + +typedef struct _DFS_INFO_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] union + { + [case(1)] DFS_INFO_1_CONTAINER *DfsInfo1Container; + [case(2)] DFS_INFO_2_CONTAINER *DfsInfo2Container; + [case(3)] DFS_INFO_3_CONTAINER *DfsInfo3Container; + [case(4)] DFS_INFO_4_CONTAINER *DfsInfo4Container; + [case(5)] DFS_INFO_5_CONTAINER *DfsInfo5Container; + [case(6)] DFS_INFO_6_CONTAINER *DfsInfo6Container; + [case(8)] DFS_INFO_8_CONTAINER *DfsInfo8Container; + [case(9)] DFS_INFO_9_CONTAINER *DfsInfo9Container; + [case(200)] DFS_INFO_200_CONTAINER *DfsInfo200Container; + [case(300)] DFS_INFO_300_CONTAINER *DfsInfo300Container; + } DfsInfoContainer; +} DFS_INFO_ENUM_STRUCT; + +[ + uuid(4fc742e0-4a10-11cf-8273-00aa004ae673), + version(3.0), + pointer_default(unique), +#ifdef __midl + ms_union, +#endif + endpoint("ncacn_np:[\\pipe\\netdfs]") +#ifndef __midl + ,implicit_handle(handle_t hBinding) +#endif +] +interface netdfs +{ + /* Function 0 */ + DWORD + __stdcall + NetrDfsManagerGetVersion(); + + /* Function 1 */ + NET_API_STATUS + __stdcall + NetrDfsAdd( + [in, string] WCHAR *DfsEntryPath, + [in, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in, unique, string] WCHAR *Comment, + [in] DWORD Flags); + + /* Function 2 */ + NET_API_STATUS + __stdcall + NetrDfsRemove( + [in, string] WCHAR *DfsEntryPath, + [in, unique, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName); + + /* Function 3 */ + NET_API_STATUS + __stdcall + NetrDfsSetInfo( + [in, string] WCHAR * DfsEntryPath, + [in, unique, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in] DWORD Level, + [in, switch_is(Level)] DFS_INFO_STRUCT *DfsInfo); + + /* Function 4 */ + NET_API_STATUS + __stdcall + NetrDfsGetInfo( + [in, string] WCHAR *DfsEntryPath, + [in, unique, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in] DWORD Level, + [out, switch_is(Level)] DFS_INFO_STRUCT *DfsInfo); + + /* Function 5 */ + NET_API_STATUS + __stdcall + NetrDfsEnum( + [in] DWORD Level, + [in] DWORD PrefMaxLen, + [in, out, unique] DFS_INFO_ENUM_STRUCT *DfsEnum, + [in, out, unique] DWORD *ResumeHandle); + + /* Function 6 */ + NET_API_STATUS + __stdcall + NetrDfsRename( + [in, string] WCHAR *DfsEntryPath, + [in, string] WCHAR *NewDfsEntryPath, + [in] unsigned long Flags); + + /* Function 7 - Not used on wire */ + void + __stdcall + NetrDfsMove(void); + + /* Function 8 - Not used on wire */ + void + __stdcall + NetrDfsManagerGetConfigInfo(void); + + /* Function 9 - Not used on wire */ + void + __stdcall + NetrDfsManagerSendSiteInfo(void); + + /* Function 10 */ + NET_API_STATUS + __stdcall + NetrDfsAddFtRoot( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *DcName, + [in, string] WCHAR *RootShare, + [in, string] WCHAR *FtDfsName, + [in, string] WCHAR *Comment, + [in, string] WCHAR *ConfigDN, + [in] BOOLEAN NewFtDfs, + [in] DWORD ApiFlags, + [in, out, unique] DFSM_ROOT_LIST **ppRootList); + + /* Function 11 */ + NET_API_STATUS + __stdcall + NetrDfsRemoveFtRoot( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *DcName, + [in, string] WCHAR *RootShare, + [in, string] WCHAR *FtDfsName, + [in] DWORD ApiFlags, + [in, out, unique] DFSM_ROOT_LIST **ppRootList); + + /* Function 12 */ + NET_API_STATUS + __stdcall + NetrDfsAddStdRoot( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *RootShare, + [in, string] WCHAR *Comment, + [in] DWORD ApiFlags); + + /* Function 13 */ + NET_API_STATUS + __stdcall + NetrDfsRemoveStdRoot( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *RootShare, + [in] DWORD ApiFlags); + + /* Function 14 */ + NET_API_STATUS + __stdcall + NetrDfsManagerInitialize( + [in, string] WCHAR *ServerName, + [in] DWORD Flags); + + /* Function 15 */ + NET_API_STATUS + __stdcall + NetrDfsAddStdRootForced( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *RootShare, + [in, string] WCHAR *Comment, + [in, string] WCHAR *Share); + + /* Function 16 */ + NET_API_STATUS + __stdcall + NetrDfsGetDcAddress( + [in, string] WCHAR *ServerName, + [in, out, string] WCHAR **DcName, + [in, out] BOOLEAN *IsRoot, + [in, out] unsigned long *Timeout); + + /* Function 17 */ + NET_API_STATUS + __stdcall + NetrDfsSetDcAddress( + [in, string] WCHAR *ServerName, + [in, string] WCHAR *DcName, + [in] DWORD Timeout, + [in] DWORD Flags); + + /* Function 18 */ + NET_API_STATUS + __stdcall + NetrDfsFlushFtTable( + [in, string] WCHAR *DcName, + [in, string] WCHAR *wszFtDfsName); + + /* Function 19 */ + NET_API_STATUS + __stdcall + NetrDfsAdd2( + [in, string] WCHAR *DfsEntryPath, + [in, string] WCHAR *DcName, + [in, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in, unique, string] WCHAR *Comment, + [in] DWORD Flags, + [in, out, unique] DFSM_ROOT_LIST **ppRootList); + + /* Function 20 */ + NET_API_STATUS + __stdcall + NetrDfsRemove2( + [in, string] WCHAR *DfsEntryPath, + [in, string] WCHAR *DcName, + [in, unique, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in, out, unique] DFSM_ROOT_LIST **ppRootList); + + /* Function 21 */ + NET_API_STATUS + __stdcall + NetrDfsEnumEx( + [in, string] WCHAR *DfsEntryPath, + [in] DWORD Level, + [in] DWORD PrefMaxLen, + [in, out, unique] DFS_INFO_ENUM_STRUCT *DfsEnum, + [in, out, unique] DWORD *ResumeHandle); + + /* Function 22 */ + NET_API_STATUS + __stdcall + NetrDfsSetInfo2( + [in, string] WCHAR *DfsEntryPath, + [in, string] WCHAR *DcName, + [in, unique, string] WCHAR *ServerName, + [in, unique, string] WCHAR *ShareName, + [in] DWORD Level, + [in, switch_is(Level)] DFS_INFO_STRUCT *pDfsInfo, + [in, out, unique] DFSM_ROOT_LIST **ppRootList); + + /* Function 23 */ + NET_API_STATUS + __stdcall + NetrDfsAddRootTarget( + [in, unique, string] LPWSTR pDfsPath, + [in, unique, string] LPWSTR pTargetPath, + [in] ULONG MajorVersion, + [in, unique, string] LPWSTR pComment, + [in] BOOLEAN NewNamespace, [in] ULONG Flags); + + /* Function 24 */ + NET_API_STATUS + __stdcall + NetrDfsRemoveRootTarget( + [in, unique, string] LPWSTR pDfsPath, + [in, unique, string] LPWSTR pTargetPath, + [in] ULONG Flags); + + /* Function 25 */ + NET_API_STATUS + __stdcall + NetrDfsGetSupportedNamespaceVersion( + [in] DFS_NAMESPACE_VERSION_ORIGIN Origin, + [in, unique, string] NETDFS_SERVER_OR_DOMAIN_HANDLE pName, + [out] PDFS_SUPPORTED_NAMESPACE_VERSION_INFO pVersionInfo); +}

1 0

04/04: [DXDIAG] Fix wrapped controls in russian translation
by Stanislav Motylkov 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ac04ad787a0b420ddb89… commit 6ac04ad787a0b420ddb89d6eb846b44e55387e29 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 12 12:11:39 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 14:21:56 2018 +0200 [DXDIAG] Fix wrapped controls in russian translation --- base/applications/dxdiag/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/dxdiag/lang/ru-RU.rc b/base/applications/dxdiag/lang/ru-RU.rc index bb858353ca..4b1bcf9a1e 100644 --- a/base/applications/dxdiag/lang/ru-RU.rc +++ b/base/applications/dxdiag/lang/ru-RU.rc @@ -22,9 +22,9 @@ BEGIN GROUPBOX "Сведения о системе", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT LTEXT "Текущие время и дата:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT LTEXT "Имя компьютера:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT - LTEXT "Операционная система:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT + LTEXT "Операционная система:", IDC_STATIC, 60, 70, 90, 10, SS_RIGHT LTEXT "Язык:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT - LTEXT "Изготовитель компьютера:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT + LTEXT "Изготовитель компьютера:", IDC_STATIC, 50, 90, 100, 10, SS_RIGHT LTEXT "Модель компьютера:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT LTEXT "Процессор:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT

1 0

03/04: [DXDIAG] Minor code style fixes
by Stanislav Motylkov 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a03d1860f219d388f3abb… commit a03d1860f219d388f3abb34c78bafad3767111d4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 4 00:22:49 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 14:21:56 2018 +0200 [DXDIAG] Minor code style fixes --- base/applications/dxdiag/system.c | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/base/applications/dxdiag/system.c b/base/applications/dxdiag/system.c index 849a7a5d4e..c10df851e4 100644 --- a/base/applications/dxdiag/system.c +++ b/base/applications/dxdiag/system.c @@ -199,26 +199,26 @@ InitializeSystemPage(HWND hwndDlg) /* set date/time */ szTime[0] = L'\0'; - Length = GetDateFormat(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, NULL, szTime, sizeof(szTime) / sizeof(WCHAR)); + Length = GetDateFormat(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, NULL, szTime, _countof(szTime)); if (Length) { szTime[Length-1] = L','; szTime[Length++] = L' '; } - Length = GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, TIME_FORCE24HOURFORMAT|LOCALE_NOUSEROVERRIDE, NULL, NULL, &szTime[Length], (sizeof(szTime) / sizeof(WCHAR))); - szTime[199] = L'\0'; + Length = GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, TIME_FORCE24HOURFORMAT|LOCALE_NOUSEROVERRIDE, NULL, NULL, szTime + Length, _countof(szTime)); + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STATIC_TIME, WM_SETTEXT, 0, (LPARAM)szTime); /* set computer name */ szTime[0] = L'\0'; - Length = sizeof(szTime) / sizeof(WCHAR); + Length = _countof(szTime); if (GetComputerNameW(szTime, &Length)) SendDlgItemMessageW(hwndDlg, IDC_STATIC_COMPUTER, WM_SETTEXT, 0, (LPARAM)szTime); /* set product name */ if (GetRegValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", L"ProductName", REG_SZ, szOSName, sizeof(szOSName))) { - if (LoadStringW(hInst, IDS_OS_VERSION, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_OS_VERSION, szFormat, _countof(szFormat))) { WCHAR szCpuName[50]; @@ -229,14 +229,14 @@ InitializeSystemPage(HWND hwndDlg) if (GetVersionEx(&VersionInfo)) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; wsprintfW(szTime, szFormat, szOSName, szCpuName, VersionInfo.dwMajorVersion, VersionInfo.dwMinorVersion, VersionInfo.dwBuildNumber); SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime); } else { /* If the version of the OS cannot be retrieved for some reason, then just give the OS Name and Architecture */ - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; wsprintfW(szTime, L"%s %s", szOSName, szCpuName); SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -244,15 +244,15 @@ InitializeSystemPage(HWND hwndDlg) } else { - if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, _countof(szTime))) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); } } /* FIXME set product language/local language */ - if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT,LOCALE_SLANGUAGE , szTime, sizeof(szTime) / sizeof(WCHAR))) + if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_SLANGUAGE, szTime, _countof(szTime))) SendDlgItemMessageW(hwndDlg, IDC_STATIC_LANG, WM_SETTEXT, 0, (LPARAM)szTime); /* prepare SMBIOS data */ @@ -266,7 +266,7 @@ InitializeSystemPage(HWND hwndDlg) szTime, _countof(szTime), FALSE); if (Length > 0) { - szTime[199] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STATIC_MANU, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -306,13 +306,13 @@ InitializeSystemPage(HWND hwndDlg) szTime + Index, StrLength, TRUE); if (Length > 0) { - if (Index + StrLength > (sizeof(szTime)/sizeof(WCHAR))- 15) + if (Index + StrLength > _countof(szTime) - 15) { //FIXME retrieve BiosMajorRelease, BiosMinorRelease - //StrLength = wcslen(&szTime[Index]); + //StrLength = wcslen(szTime + Index); //szTime[Index+StrLength] = L' '; - //wcscpy(&szTime[Index+StrLength], L"Ver: "); //FIXME NON-NLS - //szTime[(sizeof(szTime)/sizeof(WCHAR))-1] = L'\0'; + //wcscpy(szTime + Index + StrLength, L"Ver: "); //FIXME NON-NLS + //szTime[_countof(szTime)-1] = L'\0'; } SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -329,11 +329,11 @@ InitializeSystemPage(HWND hwndDlg) szFormat[0] = L'\0'; GetSystemInfo(&SysInfo); if (SysInfo.dwNumberOfProcessors > 1) - LoadStringW(hInst, IDS_FORMAT_MPPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_FORMAT_MPPROC, szFormat, _countof(szFormat)); else - LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, sizeof(szFormat) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_FORMAT_UNIPROC, szFormat, _countof(szFormat)); - szFormat[(sizeof(szFormat)/sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, szDesc, SysInfo.dwNumberOfProcessors); SendDlgItemMessageW(hwndDlg, IDC_STATIC_PROC, WM_SETTEXT, 0, (LPARAM)szTime); } @@ -343,36 +343,36 @@ InitializeSystemPage(HWND hwndDlg) mem.dwLength = sizeof(mem); if (GlobalMemoryStatusEx(&mem)) { - if (LoadStringW(hInst, IDS_FORMAT_MB, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_FORMAT_MB, szFormat, _countof(szFormat))) { /* set total mem string */ - szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, (mem.ullTotalPhys/1048576)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_MEM, WM_SETTEXT, 0, (LPARAM)szTime); } - if (LoadStringW(hInst, IDS_FORMAT_SWAP, szFormat, sizeof(szFormat) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_FORMAT_SWAP, szFormat, _countof(szFormat))) { /* set swap string */ AvailableBytes = (mem.ullTotalPageFile-mem.ullTotalPhys)/1048576; UsedBytes = (mem.ullTotalPageFile-mem.ullAvailPageFile)/1048576; - szFormat[(sizeof(szFormat) / sizeof(WCHAR))-1] = L'\0'; + szFormat[_countof(szFormat)-1] = L'\0'; wsprintfW(szTime, szFormat, (UsedBytes), (AvailableBytes)); SendDlgItemMessageW(hwndDlg, IDC_STATIC_SWAP, WM_SETTEXT, 0, (LPARAM)szTime); } } /* set directx version string */ wcscpy(szTime, L"ReactX "); - if (GetDirectXVersion(&szTime[7])) + if (GetDirectXVersion(szTime + 7)) { SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); } else { - if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, sizeof(szTime) / sizeof(WCHAR))) + if (LoadStringW(hInst, IDS_VERSION_UNKNOWN, szTime, _countof(szTime))) { - szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0'; + szTime[_countof(szTime)-1] = L'\0'; SendDlgItemMessage(hwndDlg, IDC_STATIC_VERSION, WM_SETTEXT, 0, (LPARAM)szTime); } }

1 0

02/04: [DXDIAG] Fix blank system and BIOS values
by Stanislav Motylkov 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50b0332438d11104e3f7c… commit 50b0332438d11104e3f7c0436734614f7ef4b675 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 31 18:52:09 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 14:21:56 2018 +0200 [DXDIAG] Fix blank system and BIOS values CORE-5961 #resolve --- base/applications/dxdiag/CMakeLists.txt | 6 ++- base/applications/dxdiag/precomp.h | 2 + base/applications/dxdiag/system.c | 71 ++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 7 deletions(-) diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt index fbcaff538e..a299f85160 100644 --- a/base/applications/dxdiag/CMakeLists.txt +++ b/base/applications/dxdiag/CMakeLists.txt @@ -1,4 +1,8 @@ +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/udmihelp + ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + list(APPEND SOURCE system.c display.c @@ -18,7 +22,7 @@ list(APPEND SOURCE add_rc_deps(dxdiag.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/dxdiag.ico) add_executable(dxdiag ${SOURCE} dxdiag.rc) set_module_type(dxdiag win32gui UNICODE) -target_link_libraries(dxdiag dxguid) +target_link_libraries(dxdiag dxguid udmihelp) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) add_pch(dxdiag precomp.h SOURCE) add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all) diff --git a/base/applications/dxdiag/precomp.h b/base/applications/dxdiag/precomp.h index 5ad492584f..4e16e04db4 100644 --- a/base/applications/dxdiag/precomp.h +++ b/base/applications/dxdiag/precomp.h @@ -22,6 +22,8 @@ #include <initguid.h> #include <devguid.h> #include <strsafe.h> +#include <udmihelp.h> +#include <dmilib.h> #include "resource.h" diff --git a/base/applications/dxdiag/system.c b/base/applications/dxdiag/system.c index b6686a515d..849a7a5d4e 100644 --- a/base/applications/dxdiag/system.c +++ b/base/applications/dxdiag/system.c @@ -153,6 +153,34 @@ VOID GetSystemCPU(WCHAR *szBuffer) } } +static +SIZE_T +GetBIOSValue( + BOOL UseSMBios, + PCHAR DmiString, + LPWSTR RegValue, + PVOID pBuf, + DWORD cchBuf, + BOOL bTrim) +{ + SIZE_T Length = 0; + BOOL Result; + + if (UseSMBios) + { + Length = GetSMBiosStringW(DmiString, pBuf, cchBuf, bTrim); + } + if (Length == 0) + { + Result = GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", RegValue, REG_SZ, pBuf, cchBuf * sizeof(WCHAR)); + if (Result) + { + Length = wcslen(pBuf); + } + } + return Length; +} + static VOID InitializeSystemPage(HWND hwndDlg) @@ -162,10 +190,12 @@ InitializeSystemPage(HWND hwndDlg) DWORD Length; DWORDLONG AvailableBytes, UsedBytes; MEMORYSTATUSEX mem; - WCHAR szFormat[40]; + WCHAR szFormat[50]; WCHAR szDesc[50]; SYSTEM_INFO SysInfo; OSVERSIONINFO VersionInfo; + PVOID SMBiosBuf; + PCHAR DmiStrings[ID_STRINGS_MAX] = { 0 }; /* set date/time */ szTime[0] = L'\0'; @@ -225,9 +255,16 @@ InitializeSystemPage(HWND hwndDlg) if (GetLocaleInfo(LOCALE_SYSTEM_DEFAULT,LOCALE_SLANGUAGE , szTime, sizeof(szTime) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, IDC_STATIC_LANG, WM_SETTEXT, 0, (LPARAM)szTime); + /* prepare SMBIOS data */ + SMBiosBuf = LoadSMBiosData(DmiStrings); + /* set system manufacturer */ szTime[0] = L'\0'; - if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemManufacturer", REG_SZ, szTime, sizeof(szTime))) + Length = GetBIOSValue(SMBiosBuf != NULL, + DmiStrings[SYS_VENDOR], + L"SystemManufacturer", + szTime, _countof(szTime), FALSE); + if (Length > 0) { szTime[199] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STATIC_MANU, WM_SETTEXT, 0, (LPARAM)szTime); @@ -235,22 +272,39 @@ InitializeSystemPage(HWND hwndDlg) /* set motherboard model */ szTime[0] = L'\0'; - if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"SystemProductName", REG_SZ, szTime, sizeof(szTime))) + Length = GetBIOSValue(SMBiosBuf != NULL, + DmiStrings[SYS_PRODUCT], + L"SystemProductName", + szTime, _countof(szTime), FALSE); + if (Length > 0) { SendDlgItemMessageW(hwndDlg, IDC_STATIC_MODEL, WM_SETTEXT, 0, (LPARAM)szTime); } /* set bios model */ szTime[0] = L'\0'; - if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSVendor", REG_SZ, szTime, sizeof(szTime))) + Length = GetBIOSValue(SMBiosBuf != NULL, + DmiStrings[BIOS_VENDOR], + L"BIOSVendor", + szTime, _countof(szTime), TRUE); + if (Length > 0) { DWORD Index; - DWORD StrLength = (sizeof(szTime) / sizeof(WCHAR)); + DWORD StrLength = _countof(szTime); Index = wcslen(szTime); + if (Index + 1 < _countof(szTime)) + { + szTime[Index++] = L' '; + szTime[Index] = L'\0'; + } StrLength -= Index; - if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\BIOS", L"BIOSReleaseDate", REG_SZ, &szTime[Index], StrLength)) + Length = GetBIOSValue(SMBiosBuf != NULL, + DmiStrings[BIOS_DATE], + L"BIOSReleaseDate", + szTime + Index, StrLength, TRUE); + if (Length > 0) { if (Index + StrLength > (sizeof(szTime)/sizeof(WCHAR))- 15) { @@ -263,9 +317,14 @@ InitializeSystemPage(HWND hwndDlg) SendDlgItemMessageW(hwndDlg, IDC_STATIC_BIOS, WM_SETTEXT, 0, (LPARAM)szTime); } } + + /* clean SMBIOS data */ + FreeSMBiosData(SMBiosBuf); + /* set processor string */ if (GetRegValue(HKEY_LOCAL_MACHINE, L"Hardware\\Description\\System\\CentralProcessor\\0", L"ProcessorNameString", REG_SZ, szDesc, sizeof(szDesc))) { + TrimDmiStringW(szDesc); /* FIXME retrieve current speed */ szFormat[0] = L'\0'; GetSystemInfo(&SysInfo);

1 0

01/04: [SDK] Add user-mode DMI/SMBIOS helper library
by Stanislav Motylkov 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4259aab7b0546ef0dc7a1… commit 4259aab7b0546ef0dc7a1c60cda87dc81978b3ef Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 31 18:48:32 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 12 14:21:56 2018 +0200 [SDK] Add user-mode DMI/SMBIOS helper library CORE-5961 --- sdk/lib/CMakeLists.txt | 1 + sdk/lib/udmihelp/CMakeLists.txt | 12 +++ sdk/lib/udmihelp/precomp.h | 8 ++ sdk/lib/udmihelp/udmihelp.c | 178 ++++++++++++++++++++++++++++++++++++++++ sdk/lib/udmihelp/udmihelp.h | 27 ++++++ 5 files changed, 226 insertions(+) diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index 99c68493aa..e5d2d92453 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -47,6 +47,7 @@ add_subdirectory(skiplist) add_subdirectory(strmiids) add_subdirectory(smlib) add_subdirectory(tdilib) +add_subdirectory(udmihelp) add_subdirectory(uuid) add_subdirectory(wdmguid) diff --git a/sdk/lib/udmihelp/CMakeLists.txt b/sdk/lib/udmihelp/CMakeLists.txt new file mode 100644 index 0000000000..270c234a44 --- /dev/null +++ b/sdk/lib/udmihelp/CMakeLists.txt @@ -0,0 +1,12 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/dmilib) + +list(APPEND SOURCE + udmihelp.c + precomp.h) + +add_library(udmihelp ${SOURCE}) +target_link_libraries(udmihelp dmilib) +add_pch(udmihelp precomp.h SOURCE) +add_dependencies(udmihelp psdk) diff --git a/sdk/lib/udmihelp/precomp.h b/sdk/lib/udmihelp/precomp.h new file mode 100644 index 0000000000..ee1c7a55c6 --- /dev/null +++ b/sdk/lib/udmihelp/precomp.h @@ -0,0 +1,8 @@ +#ifndef _UDMIHELP_PCH_ +#define _UDMIHELP_PCH_ + +#include <windows.h> +#include <dmilib.h> +#include "udmihelp.h" + +#endif /* _UDMIHELP_PCH_ */ diff --git a/sdk/lib/udmihelp/udmihelp.c b/sdk/lib/udmihelp/udmihelp.c new file mode 100644 index 0000000000..a7070eb33d --- /dev/null +++ b/sdk/lib/udmihelp/udmihelp.c @@ -0,0 +1,178 @@ +/* + * PROJECT: ReactOS User-mode DMI/SMBIOS Helper Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: SMBIOS table parsing functions + * COPYRIGHT: Copyright 2018 Stanislav Motylkov + */ + +#include "precomp.h" + +static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, PVOID, DWORD); +static BOOL bInitAPI = FALSE; + +static +VOID +InitializeAPI() +{ + HANDLE hKernel; + + pGetSystemFirmwareTable = NULL; + + hKernel = GetModuleHandleW(L"kernel32.dll"); + if (!hKernel) + return; + + pGetSystemFirmwareTable = (void *)GetProcAddress(hKernel, "GetSystemFirmwareTable"); +} + +/* Load SMBIOS Data */ +PVOID +LoadSMBiosData( + _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings) +{ + PVOID pBuffer = NULL; + HKEY hKey; + DWORD dwType, dwCheck, dwBytes = 0; + + if (!bInitAPI) + { + InitializeAPI(); + bInitAPI = TRUE; + } + + /* Try using GetSystemFirmwareTable (works on NT 5.2 and higher) */ + if (pGetSystemFirmwareTable) + { + dwBytes = pGetSystemFirmwareTable('RSMB', 0, NULL, 0); + if (dwBytes > 0) + { + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwBytes); + if (!pBuffer) + { + return NULL; + } + dwCheck = pGetSystemFirmwareTable('RSMB', 0, pBuffer, dwBytes); + if (dwCheck != dwBytes) + { + HeapFree(GetProcessHeap(), 0, pBuffer); + return NULL; + } + } + } + if (dwBytes == 0) + { + /* Try using registry (works on NT 5.1) */ + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\mssmbios\\Data", + &hKey) != ERROR_SUCCESS) + { + return NULL; + } + + if (RegQueryValueExW(hKey, + L"SMBiosData", + NULL, + &dwType, + NULL, + &dwBytes) != ERROR_SUCCESS || dwType != REG_BINARY) + { + RegCloseKey(hKey); + return NULL; + } + + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwBytes); + if (!pBuffer) + { + RegCloseKey(hKey); + return NULL; + } + + if (RegQueryValueExW(hKey, + L"SMBiosData", + NULL, + &dwType, + pBuffer, + &dwBytes) != ERROR_SUCCESS || dwType != REG_BINARY) + { + HeapFree(GetProcessHeap(), 0, pBuffer); + RegCloseKey(hKey); + return NULL; + } + + RegCloseKey(hKey); + } + ParseSMBiosTables(pBuffer, dwBytes, Strings); + return pBuffer; +} + +/* Trim converted DMI string */ +VOID +TrimDmiStringW( + _Inout_ PWSTR pStr) +{ + SIZE_T Length; + UINT i = 0; + + if (!pStr) + return; + + Length = wcslen(pStr); + if (Length == 0) + return; + + /* Trim leading spaces */ + while (i < Length && pStr[i] <= L' ') + { + i++; + } + + if (i > 0) + { + Length -= i; + memmove(pStr, pStr + i, (Length + 1) * sizeof(WCHAR)); + } + + /* Trim trailing spaces */ + while (Length && pStr[Length-1] <= L' ') + { + pStr[Length-1] = L'\0'; + --Length; + } +} + +/* Convert string from SMBIOS */ +SIZE_T +GetSMBiosStringW( + _In_ PCSTR DmiString, + _Out_ PWSTR pBuf, + _In_ DWORD cchBuf, + _In_ BOOL bTrim) +{ + SIZE_T cChars; + + if (!DmiString) + return 0; + + cChars = MultiByteToWideChar(CP_OEMCP, 0, DmiString, -1, pBuf, cchBuf); + + /* NULL-terminate string */ + pBuf[min(cchBuf-1, cChars)] = L'\0'; + + if (bTrim) + { + TrimDmiStringW(pBuf); + } + + return wcslen(pBuf); +} + +/* Free SMBIOS Data */ +VOID +FreeSMBiosData( + _In_ PVOID Buffer) +{ + if (!Buffer) + return; + + HeapFree(GetProcessHeap(), 0, Buffer); +} diff --git a/sdk/lib/udmihelp/udmihelp.h b/sdk/lib/udmihelp/udmihelp.h new file mode 100644 index 0000000000..8ed59d9f3c --- /dev/null +++ b/sdk/lib/udmihelp/udmihelp.h @@ -0,0 +1,27 @@ +/* + * PROJECT: ReactOS User-mode DMI/SMBIOS Helper Functions + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: SMBIOS table parsing functions + * COPYRIGHT: Copyright 2018 Stanislav Motylkov + */ + +#pragma once + +PVOID +LoadSMBiosData( + _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); + +VOID +TrimDmiStringW( + _Inout_ PWSTR pStr); + +SIZE_T +GetSMBiosStringW( + _In_ PCSTR DmiString, + _Out_ PWSTR pBuf, + _In_ DWORD cchBuf, + _In_ BOOL bTrim); + +VOID +FreeSMBiosData( + _In_ PVOID Buffer);

1 0

01/01: [MSPAINT] Fix interpretation of command line (#707)
by Katayama Hirofumi MZ 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22e86add33775c9a1a2a6… commit 22e86add33775c9a1a2a61b9e23b46acfb5a4580 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 12 18:23:16 2018 +0900 Commit: Benedikt Freisen <b.freisen(a)gmx.net> CommitDate: Sun Aug 12 11:23:16 2018 +0200 [MSPAINT] Fix interpretation of command line (#707) --- base/applications/mspaint/main.cpp | 70 ++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 8b0bfe7bf8..8abe4ffa41 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -261,24 +261,66 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument if (__argc >= 2) { - HBITMAP bmNew = NULL; - LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM); - if (bmNew != NULL) + WIN32_FIND_DATAW find; + HANDLE hFind = FindFirstFileW(__targv[1], &find); + if (hFind != INVALID_HANDLE_VALUE) { - TCHAR *temp; - imageModel.Insert(bmNew); - GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, &temp); - CPath pathFileName(filepathname); - pathFileName.StripPath(); - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - mainWindow.SetWindowText(strTitle); - imageModel.ClearHistory(); - isAFile = TRUE; + FindClose(hFind); + + // check the file size + if (find.nFileSizeHigh || find.nFileSizeLow) + { + // load it now + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, __targv[1], &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew) + { + // valid bitmap file + GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, NULL); + imageModel.Insert(bmNew); + CPath pathFileName(filepathname); + pathFileName.StripPath(); + + CString strTitle; + strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); + mainWindow.SetWindowText(strTitle); + + imageModel.ClearHistory(); + + isAFile = TRUE; + registrySettings.SetMostRecentFile(filepathname); + } + else + { + // cannot open and not empty + CStringW strText; + strText.Format(IDS_LOADERRORTEXT, __targv[1]); + MessageBoxW(NULL, strText, NULL, MB_ICONERROR); + } + } + else + { + // open the empty file + GetFullPathName(__targv[1], SIZEOF(filepathname), filepathname, NULL); + CPath pathFileName(filepathname); + pathFileName.StripPath(); + + CString strTitle; + strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); + mainWindow.SetWindowText(strTitle); + + imageModel.ClearHistory(); + + isAFile = TRUE; + registrySettings.SetMostRecentFile(filepathname); + } } else { - exit(0); + // does not exist + CStringW strText; + strText.Format(IDS_LOADERRORTEXT, __targv[1]); + MessageBoxW(NULL, strText, NULL, MB_ICONERROR); } }

1 0

01/01: [KMTESTS:MM] Properly clean up files
by Pierre Schweitzer 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c79e5dc476a7041b018eb… commit c79e5dc476a7041b018eba6eaf532f75d00be4f6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 12 10:05:25 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 12 10:05:25 2018 +0200 [KMTESTS:MM] Properly clean up files This fixes driver unloading on Windows. ROSTESTS-266 --- modules/rostests/kmtests/ntos_mm/NtCreateSection_drv.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/NtCreateSection_drv.c b/modules/rostests/kmtests/ntos_mm/NtCreateSection_drv.c index 45f20b5e85..a547207f21 100644 --- a/modules/rostests/kmtests/ntos_mm/NtCreateSection_drv.c +++ b/modules/rostests/kmtests/ntos_mm/NtCreateSection_drv.c @@ -413,13 +413,16 @@ TestIrpHandler( { Fcb = IoStack->FileObject->FsContext; ok(Fcb != NULL, "Null pointer!\n"); - if (IoStack->FileObject->SectionObjectPointer != NULL && - IoStack->FileObject->SectionObjectPointer->SharedCacheMap != NULL) + if (IoStack->FileObject->SectionObjectPointer != NULL) { LARGE_INTEGER Zero = RTL_CONSTANT_LARGE_INTEGER(0LL); - CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); - CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + if (CcIsFileCached(IoStack->FileObject)) + { + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + } + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); CcUninitializeCacheMap(IoStack->FileObject, &Zero, &CacheUninitEvent); KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL);

1 0

01/01: [NTOSKRNL] Misc fixes: - Rename page file struct to MMPAGING_FILE - Increment page files count after current page file was put in the list
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02b0ca08e40c40601a72a… commit 02b0ca08e40c40601a72aea0b10876d60810a942 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 23:34:08 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:34:08 2018 +0200 [NTOSKRNL] Misc fixes: - Rename page file struct to MMPAGING_FILE - Increment page files count after current page file was put in the list --- ntoskrnl/mm/pagefile.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index cbc7c9a854..347ffec4a5 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -21,6 +21,7 @@ * FILE: ntoskrnl/mm/pagefile.c * PURPOSE: Paging file functions * PROGRAMMER: David Welch (welch(a)mcmail.com) + * Pierre Schweitzer * UPDATE HISTORY: * Created 22/05/98 */ @@ -38,7 +39,7 @@ /* TYPES *********************************************************************/ -typedef struct _PAGINGFILE +typedef struct _MMPAGING_FILE { PFILE_OBJECT FileObject; HANDLE FileHandle; @@ -49,7 +50,7 @@ typedef struct _PAGINGFILE PRTL_BITMAP AllocMap; KSPIN_LOCK AllocMapLock; } -PAGINGFILE, *PPAGINGFILE; +MMPAGING_FILE, *PMMPAGING_FILE; /* GLOBALS *******************************************************************/ @@ -58,7 +59,7 @@ PAGINGFILE, *PPAGINGFILE; #define MAX_PAGING_FILES (16) /* List of paging files, both used and free */ -static PPAGINGFILE MmPagingFile[MAX_PAGING_FILES]; +static PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; /* Lock for examining the list of paging files */ static KSPIN_LOCK PagingFileListLock; @@ -224,7 +225,7 @@ MiReadPageFile( KEVENT Event; UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; PMDL Mdl = (PMDL)MdlBase; - PPAGINGFILE PagingFile; + PMMPAGING_FILE PagingFile; DPRINT("MiReadSwapFile\n"); @@ -289,7 +290,7 @@ MmInitPagingFile(VOID) } static ULONG -MiAllocPageFromPagingFile(PPAGINGFILE PagingFile) +MiAllocPageFromPagingFile(PMMPAGING_FILE PagingFile) { KIRQL oldIrql; ULONG off; @@ -308,7 +309,7 @@ MmFreeSwapPage(SWAPENTRY Entry) ULONG i; ULONG_PTR off; KIRQL oldIrql; - PPAGINGFILE PagingFile; + PMMPAGING_FILE PagingFile; i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry) - 1; @@ -388,7 +389,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, HANDLE FileHandle; IO_STATUS_BLOCK IoStatus; PFILE_OBJECT FileObject; - PPAGINGFILE PagingFile; + PMMPAGING_FILE PagingFile; KIRQL oldIrql; ULONG AllocMapSize; ULONG Count; @@ -662,8 +663,9 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, RtlClearAllBits(PagingFile->AllocMap); KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - MmNumberOfPagingFiles++; + ASSERT(MmPagingFile[MmNumberOfPagingFiles] == NULL); MmPagingFile[MmNumberOfPagingFiles] = PagingFile; + MmNumberOfPagingFiles++; MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; KeReleaseSpinLock(&PagingFileListLock, oldIrql);

1 0

01/01: [NTOSKRNL] Rename PagingFileList to MmPagingFile and make insertion simpler
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f106c297de749667b7818… commit f106c297de749667b7818c4ec9a38b51b9c7c801 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 23:19:58 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:19:58 2018 +0200 [NTOSKRNL] Rename PagingFileList to MmPagingFile and make insertion simpler --- ntoskrnl/mm/pagefile.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 4e6679bcbe..cbc7c9a854 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -58,7 +58,7 @@ PAGINGFILE, *PPAGINGFILE; #define MAX_PAGING_FILES (16) /* List of paging files, both used and free */ -static PPAGINGFILE PagingFileList[MAX_PAGING_FILES]; +static PPAGINGFILE MmPagingFile[MAX_PAGING_FILES]; /* Lock for examining the list of paging files */ static KSPIN_LOCK PagingFileListLock; @@ -129,7 +129,7 @@ MmIsFileObjectAPagingFile(PFILE_OBJECT FileObject) for (i = 0; i < MmNumberOfPagingFiles; i++) { /* Check if this is one of them */ - if (PagingFileList[i]->FileObject == FileObject) return TRUE; + if (MmPagingFile[i]->FileObject == FileObject) return TRUE; } /* Nothing found */ @@ -171,8 +171,8 @@ MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) i = FILE_FROM_ENTRY(SwapEntry); offset = OFFSET_FROM_ENTRY(SwapEntry) - 1; - if (PagingFileList[i]->FileObject == NULL || - PagingFileList[i]->FileObject->DeviceObject == NULL) + if (MmPagingFile[i]->FileObject == NULL || + MmPagingFile[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); KeBugCheck(MEMORY_MANAGEMENT); @@ -185,7 +185,7 @@ MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) file_offset.QuadPart = offset * PAGE_SIZE; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(PagingFileList[i]->FileObject, + Status = IoSynchronousPageWrite(MmPagingFile[i]->FileObject, Mdl, &file_offset, &Event, @@ -236,7 +236,7 @@ MiReadPageFile( ASSERT(PageFileIndex < MAX_PAGING_FILES); - PagingFile = PagingFileList[PageFileIndex]; + PagingFile = MmPagingFile[PageFileIndex]; if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) { @@ -283,7 +283,7 @@ MmInitPagingFile(VOID) for (i = 0; i < MAX_PAGING_FILES; i++) { - PagingFileList[i] = NULL; + MmPagingFile[i] = NULL; } MmNumberOfPagingFiles = 0; } @@ -308,26 +308,29 @@ MmFreeSwapPage(SWAPENTRY Entry) ULONG i; ULONG_PTR off; KIRQL oldIrql; + PPAGINGFILE PagingFile; i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry) - 1; KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - if (PagingFileList[i] == NULL) + + PagingFile = MmPagingFile[i]; + if (PagingFile == NULL) { KeBugCheck(MEMORY_MANAGEMENT); } - KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); + KeAcquireSpinLockAtDpcLevel(&PagingFile->AllocMapLock); - RtlClearBit(PagingFileList[i]->AllocMap, off >> 5); + RtlClearBit(PagingFile->AllocMap, off >> 5); - PagingFileList[i]->FreePages++; - PagingFileList[i]->UsedPages--; + PagingFile->FreePages++; + PagingFile->UsedPages--; MiFreeSwapPages++; MiUsedSwapPages--; - KeReleaseSpinLockFromDpcLevel(&PagingFileList[i]->AllocMapLock); + KeReleaseSpinLockFromDpcLevel(&PagingFile->AllocMapLock); KeReleaseSpinLock(&PagingFileListLock, oldIrql); } @@ -350,10 +353,10 @@ MmAllocSwapPage(VOID) for (i = 0; i < MAX_PAGING_FILES; i++) { - if (PagingFileList[i] != NULL && - PagingFileList[i]->FreePages >= 1) + if (MmPagingFile[i] != NULL && + MmPagingFile[i]->FreePages >= 1) { - off = MiAllocPageFromPagingFile(PagingFileList[i]); + off = MiAllocPageFromPagingFile(MmPagingFile[i]); if (off == 0xFFFFFFFF) { KeBugCheck(MEMORY_MANAGEMENT); @@ -388,7 +391,6 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PPAGINGFILE PagingFile; KIRQL oldIrql; ULONG AllocMapSize; - ULONG i; ULONG Count; KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedFileName; @@ -660,16 +662,9 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, RtlClearAllBits(PagingFile->AllocMap); KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - for (i = 0; i < MAX_PAGING_FILES; i++) - { - if (PagingFileList[i] == NULL) - { - PagingFileList[i] = PagingFile; - break; - } - } - MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; MmNumberOfPagingFiles++; + MmPagingFile[MmNumberOfPagingFiles] = PagingFile; + MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; KeReleaseSpinLock(&PagingFileListLock, oldIrql); MmSwapSpaceMessage = FALSE;

1 0

01/01: [NTOSKRNL] Remove useless define
by Pierre Schweitzer 11 Aug '18

11 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47cd447cfa64ef7a5c7a2… commit 47cd447cfa64ef7a5c7a29471329aec54790ff71 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 11 23:07:53 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 11 23:07:53 2018 +0200 [NTOSKRNL] Remove useless define --- ntoskrnl/mm/pagefile.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index d1c2e0c013..4e6679bcbe 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -35,10 +35,6 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif -PVOID -NTAPI -MiFindExportedRoutineByName(IN PVOID DllBase, - IN PANSI_STRING ExportName); /* TYPES *********************************************************************/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs