Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[tkreuzer] 61755: [KSECDD] Implement IRP_MJ_QUERY_INFORMATION and IRP_MJ_QUERY_VOLUME_INFORMATION
by tkreuzer＠svn.reactos.org 22 Jan '14

22 Jan '14

Author: tkreuzer Date: Wed Jan 22 20:52:01 2014 New Revision: 61755 URL: http://svn.reactos.org/svn/reactos?rev=61755&view=rev Log: [KSECDD] Implement IRP_MJ_QUERY_INFORMATION and IRP_MJ_QUERY_VOLUME_INFORMATION Modified: trunk/reactos/drivers/crypto/ksecdd/dispatch.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.c Modified: trunk/reactos/drivers/crypto/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/disp… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] Wed Jan 22 20:52:01 2014 @@ -16,6 +16,71 @@ /* FUNCTIONS ******************************************************************/ +static +NTSTATUS +KsecQueryFileInformation( + PVOID InfoBuffer, + FILE_INFORMATION_CLASS FileInformationClass, + PSIZE_T BufferLength) +{ + PFILE_STANDARD_INFORMATION StandardInformation; + + /* Only FileStandardInformation is supported */ + if (FileInformationClass != FileStandardInformation) + { + return STATUS_INVALID_INFO_CLASS; + } + + /* Validate buffer size */ + if (*BufferLength >= sizeof(FILE_STANDARD_INFORMATION)) + { + *BufferLength = sizeof(FILE_STANDARD_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Fill the structure */ + StandardInformation = (PFILE_STANDARD_INFORMATION)InfoBuffer; + StandardInformation->AllocationSize.QuadPart = 0; + StandardInformation->EndOfFile.QuadPart = 0; + StandardInformation->NumberOfLinks = 1; + StandardInformation->DeletePending = FALSE; + StandardInformation->Directory = FALSE; + *BufferLength = sizeof(FILE_STANDARD_INFORMATION); + + return STATUS_SUCCESS; +} + +static +NTSTATUS +KsecQueryVolumeInformation( + PVOID InfoBuffer, + FS_INFORMATION_CLASS FsInformationClass, + PSIZE_T BufferLength) +{ + PFILE_FS_DEVICE_INFORMATION DeviceInformation; + + /* Only FileFsDeviceInformation is supported */ + if (FsInformationClass == FileFsDeviceInformation) + { + return STATUS_INVALID_INFO_CLASS; + } + + /* Validate buffer size */ + if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) + { + *BufferLength = sizeof(FILE_FS_DEVICE_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Fill the structure */ + DeviceInformation = (PFILE_FS_DEVICE_INFORMATION)InfoBuffer; + DeviceInformation->DeviceType = FILE_DEVICE_NULL; + DeviceInformation->Characteristics = 0; + *BufferLength = sizeof(FILE_FS_DEVICE_INFORMATION); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI KsecDdDispatch( @@ -25,6 +90,10 @@ PIO_STACK_LOCATION IoStackLocation; ULONG_PTR Information; NTSTATUS Status; + PVOID Buffer; + SIZE_T OutputLength; + FILE_INFORMATION_CLASS FileInfoClass; + FS_INFORMATION_CLASS FsInfoClass; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); @@ -52,6 +121,34 @@ Information = IoStackLocation->Parameters.Write.Length; break; + case IRP_MJ_QUERY_INFORMATION: + + /* Extract the parameters */ + Buffer = Irp->AssociatedIrp.SystemBuffer; + OutputLength = IoStackLocation->Parameters.QueryFile.Length; + FileInfoClass = IoStackLocation->Parameters.QueryFile.FileInformationClass; + + /* Call the internal function */ + Status = KsecQueryFileInformation(Buffer, + FileInfoClass, + &OutputLength); + Information = OutputLength; + break; + + case IRP_MJ_QUERY_VOLUME_INFORMATION: + + /* Extract the parameters */ + Buffer = Irp->AssociatedIrp.SystemBuffer; + OutputLength = IoStackLocation->Parameters.QueryVolume.Length; + FsInfoClass = IoStackLocation->Parameters.QueryVolume.FsInformationClass; + + /* Call the internal function */ + Status = KsecQueryVolumeInformation(Buffer, + FsInfoClass, + &OutputLength); + Information = OutputLength; + break; + default: DPRINT1("Unhandled major function %lu!\n", IoStackLocation->MajorFunction); Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.c [iso-8859-1] Wed Jan 22 20:52:01 2014 @@ -48,6 +48,8 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = KsecDdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = KsecDdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = KsecDdDispatch; return STATUS_SUCCESS; }

1 0

[tkreuzer] 61754: [KSECDD] Start implementing ksecdd
by tkreuzer＠svn.reactos.org 22 Jan '14

22 Jan '14

Author: tkreuzer Date: Wed Jan 22 16:58:36 2014 New Revision: 61754 URL: http://svn.reactos.org/svn/reactos?rev=61754&view=rev Log: [KSECDD] Start implementing ksecdd Added: trunk/reactos/drivers/crypto/ (with props) trunk/reactos/drivers/crypto/CMakeLists.txt (with props) trunk/reactos/drivers/crypto/ksecdd/ (with props) trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt (with props) trunk/reactos/drivers/crypto/ksecdd/dispatch.c (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd.c (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd.h (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd.rc (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd.spec (with props) trunk/reactos/drivers/crypto/ksecdd/stubs.c (with props) Modified: trunk/reactos/drivers/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -5,6 +5,7 @@ add_subdirectory(battery) add_subdirectory(bluetooth) add_subdirectory(bus) +add_subdirectory(crypto) add_subdirectory(filesystems) add_subdirectory(filters) add_subdirectory(hid) Propchange: trunk/reactos/drivers/crypto/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jan 22 16:58:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/crypto/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/crypto/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/crypto/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/crypto/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/CMakeLists.… ============================================================================== --- trunk/reactos/drivers/crypto/CMakeLists.txt (added) +++ trunk/reactos/drivers/crypto/CMakeLists.txt [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,2 @@ + +add_subdirectory(ksecdd) Propchange: trunk/reactos/drivers/crypto/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/crypto/ksecdd/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jan 22 16:58:36 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/crypto/ksecdd/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/crypto/ksecdd/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/crypto/ksecdd/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMak… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt (added) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,13 @@ + +spec2def(ksecdd.sys ksecdd.spec) + +list(APPEND SOURCE + ksecdd.c + dispatch.c + stubs.c + ksecdd.rc) + +add_library(ksecdd SHARED ${SOURCE}) +set_module_type(ksecdd kernelmodedriver) +add_importlibs(ksecdd ntoskrnl hal) +add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/disp… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/dispatch.c (added) +++ trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,69 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +KsecDdDispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStackLocation; + ULONG_PTR Information; + NTSTATUS Status; + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + switch (IoStackLocation->MajorFunction) + { + case IRP_MJ_CREATE: + case IRP_MJ_CLOSE: + + /* Just return success */ + Status = STATUS_SUCCESS; + Information = 0; + break; + + case IRP_MJ_READ: + + /* There is nothing to read */ + Status = STATUS_END_OF_FILE; + Information = 0; + break; + + case IRP_MJ_WRITE: + + /* Pretend to have written everything */ + Status = STATUS_SUCCESS; + Information = IoStackLocation->Parameters.Write.Length; + break; + + default: + DPRINT1("Unhandled major function %lu!\n", + IoStackLocation->MajorFunction); + ASSERT(FALSE); + } + + /* Return the information */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + + /* Complete the request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: trunk/reactos/drivers/crypto/ksecdd/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.c (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.c [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,53 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PDEVICE_OBJECT KsecDeviceObject; + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +DriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KsecDD"); + NTSTATUS Status; + + /* Create the KsecDD device */ + Status = IoCreateDevice(DriverObject, + 0, + &DeviceName, + FILE_DEVICE_KSEC, + 0x100u, + FALSE, + &KsecDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create KsecDD device: 0x%lx\n", Status); + return Status; + } + + /* Set up dispatch table */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_READ] = KsecDdDispatch; + DriverObject->MajorFunction[IRP_MJ_WRITE] = KsecDdDispatch; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#define _NO_KSECDD_IMPORT_ +#include <ntifs.h> + +NTSTATUS +NTAPI +KsecDdDispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + + Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.rc (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.rc [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Resource File for KsecDD + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <winver.h> +#include <ntverp.h> + +/* Version Data */ +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "Kernel Security Support Provider Interface" +#define VER_INTERNALNAME_STR "ksecdd.sys" +#define VER_ORIGINALFILENAME_STR "ksecdd.sys" +#define VER_LANGNEUTRAL +#include <common.ver> Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.spec (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.spec [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,39 @@ +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) +@ stdcall AcquireCredentialsHandleW(ptr ptr long ptr ptr long ptr ptr ptr) +@ stdcall AddCredentialsW(ptr ptr ptr long ptr long ptr ptr) +@ stdcall ApplyControlToken(ptr ptr) +@ stdcall CredMarshalTargetInfo() +@ stdcall DeleteSecurityContext(ptr) +@ stdcall EfsDecryptFek() +@ stdcall EfsGenerateKey() +@ stdcall EnumerateSecurityPackagesW(ptr ptr) +@ stdcall ExportSecurityContext(ptr long ptr ptr) +@ stdcall FreeContextBuffer(ptr) +@ stdcall FreeCredentialsHandle(ptr) +@ stdcall GenerateDirEfs() +@ stdcall GenerateSessionKey() +@ stdcall GetSecurityUserInfo() +@ stdcall ImpersonateSecurityContext(ptr) +@ stdcall ImportSecurityContextW(ptr ptr ptr ptr) +@ stdcall InitSecurityInterfaceW() +@ stdcall InitializeSecurityContextW(ptr ptr ptr long long long ptr long ptr ptr ptr ptr) +@ stdcall KSecRegisterSecurityProvider() +@ stdcall KSecValidateBuffer() +@ stdcall LsaEnumerateLogonSessions() +@ stdcall LsaGetLogonSessionData() +@ stdcall MakeSignature(ptr long ptr long) +@ stdcall MapSecurityError() +@ stdcall QueryContextAttributesW(ptr long ptr) +@ stdcall QueryCredentialsAttributesW(ptr long ptr) +@ stdcall QuerySecurityContextToken(ptr ptr) +@ stdcall QuerySecurityPackageInfoW(ptr ptr) +@ stdcall RevertSecurityContext(ptr) +@ stdcall SealMessage() +@ stdcall SecLookupAccountName(ptr ptr ptr ptr ptr ptr) +@ stdcall SecLookupAccountSid(ptr ptr ptr ptr ptr ptr) +@ stdcall SecLookupWellKnownSid(long ptr long ptr) +@ stdcall SecMakeSPN(ptr ptr ptr long ptr ptr ptr long) +@ stdcall SecMakeSPNEx(ptr ptr ptr long ptr ptr ptr ptr long) +@ stdcall SecSetPagingMode() +@ stdcall UnsealMessage() +@ stdcall VerifySignature(ptr ptr long ptr) Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/crypto/ksecdd/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/stub… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/stubs.c (added) +++ trunk/reactos/drivers/crypto/ksecdd/stubs.c [iso-8859-1] Wed Jan 22 16:58:36 2014 @@ -0,0 +1,412 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ksecdd.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +SECURITY_STATUS +SEC_ENTRY +AcceptSecurityContext( + _In_opt_ PCredHandle phCredential, + _In_opt_ PCtxtHandle phContext, + _In_opt_ PSecBufferDesc pInput, + _In_ ULONG fContextReq, + _In_ ULONG TargetDataRep, + _In_opt_ PCtxtHandle phNewContext, + _In_opt_ PSecBufferDesc pOutput, + _Out_ PULONG pfContextAttr, + _Out_opt_ PTimeStamp ptsExpiry) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +AcquireCredentialsHandleW( + _In_opt_ PSSPI_SEC_STRING pPrincipal, + _In_ PSSPI_SEC_STRING pPackage, + _In_ ULONG fCredentialUse, + _In_opt_ PVOID pvLogonId, + _In_opt_ PVOID pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ PVOID pvGetKeyArgument, + _Out_ PCredHandle phCredential, + _Out_opt_ PTimeStamp ptsExpiry) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +AddCredentialsW( + _In_ PCredHandle hCredentials, + _In_opt_ PSSPI_SEC_STRING pPrincipal, + _In_ PSSPI_SEC_STRING pPackage, + _In_ ULONG fCredentialUse, + _In_opt_ PVOID pAuthData, + _In_opt_ SEC_GET_KEY_FN pGetKeyFn, + _In_opt_ PVOID pvGetKeyArgument, + _Out_opt_ PTimeStamp ptsExpiry) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +ApplyControlToken( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pInput) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +CredMarshalTargetInfo(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityContext( + _In_ PCtxtHandle phContext) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +EfsDecryptFek(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +EfsGenerateKey(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +EnumerateSecurityPackagesW( + _Out_ PULONG pcPackages, + _Deref_out_ PSecPkgInfoW* ppPackageInfo) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +ExportSecurityContext( + _In_ PCtxtHandle phContext, + _In_ ULONG fFlags, + _Out_ PSecBuffer pPackedContext, + _Out_ PVOID* pToken) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +FreeContextBuffer( + _Inout_ PVOID pvContextBuffer) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +FreeCredentialsHandle( + _In_ PCredHandle phCredential) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +GenerateDirEfs(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +GenerateSessionKey(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +GetSecurityUserInfo(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +ImpersonateSecurityContext( + _In_ PCtxtHandle phContext) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +ImportSecurityContextW( + _In_ PSSPI_SEC_STRING pszPackage, + _In_ PSecBuffer pPackedContext, + _In_ PVOID Token, + _Out_ PCtxtHandle phContext) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +InitializeSecurityContextW( + _In_opt_ PCredHandle phCredential, + _In_opt_ PCtxtHandle phContext, + _In_opt_ PSSPI_SEC_STRING pTargetName, + _In_ ULONG fContextReq, + _In_ ULONG Reserved1, + _In_ ULONG TargetDataRep, + _In_opt_ PSecBufferDesc pInput, + _In_ ULONG Reserved2, + _Inout_opt_ PCtxtHandle phNewContext, + _Inout_opt_ PSecBufferDesc pOutput, + _Out_ PULONG pfContextAttr, + _Out_opt_ PTimeStamp ptsExpiry) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +KSecRegisterSecurityProvider(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +KSecValidateBuffer(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +LsaEnumerateLogonSessions(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +VOID +SEC_ENTRY +LsaGetLogonSessionData(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +MakeSignature( + _In_ PCtxtHandle phContext, + _In_ ULONG fQOP, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +MapSecurityError(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +QueryContextAttributesW( + _In_ PCtxtHandle phContext, + _In_ ULONG ulAttribute, + _Out_ PVOID pBuffer) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +QueryCredentialsAttributesW( + _In_ PCredHandle phCredential, + _In_ ULONG ulAttribute, + _Inout_ PVOID pBuffer) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityContextToken( + _In_ PCtxtHandle phContext, + _Out_ PVOID* Token) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +QuerySecurityPackageInfoW( + _In_ PSSPI_SEC_STRING pPackageName, + _Deref_out_ PSecPkgInfoW *ppPackageInfo) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +SECURITY_STATUS +SEC_ENTRY +RevertSecurityContext( + _In_ PCtxtHandle phContext) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +SealMessage(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +NTSTATUS +SEC_ENTRY +SecLookupAccountName( + _In_ PUNICODE_STRING Name, + _Inout_ PULONG SidSize, + _Out_ PSID Sid, + _Out_ PSID_NAME_USE NameUse, + _Out_opt_ PULONG DomainSize, + _Inout_opt_ PUNICODE_STRING ReferencedDomain) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +NTSTATUS +SEC_ENTRY +SecLookupAccountSid( + _In_ PSID Sid, + _Out_ PULONG NameSize, + _Inout_ PUNICODE_STRING NameBuffer, + _Out_ PULONG DomainSize OPTIONAL, + _Out_opt_ PUNICODE_STRING DomainBuffer, + _Out_ PSID_NAME_USE NameUse) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +NTSTATUS +SEC_ENTRY +SecLookupWellKnownSid( + _In_ WELL_KNOWN_SID_TYPE SidType, + _Out_ PSID Sid, + _In_ ULONG SidBufferSize, + _Inout_opt_ PULONG SidSize) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +NTSTATUS +NTAPI +SecMakeSPN( + _In_ PUNICODE_STRING ServiceClass, + _In_ PUNICODE_STRING ServiceName, + _In_opt_ PUNICODE_STRING InstanceName, + _In_opt_ USHORT InstancePort, + _In_opt_ PUNICODE_STRING Referrer, + _Inout_ PUNICODE_STRING Spn, + _Out_opt_ PULONG Length, + _In_ BOOLEAN Allocate) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +NTSTATUS +NTAPI +SecMakeSPNEx( + _In_ PUNICODE_STRING ServiceClass, + _In_ PUNICODE_STRING ServiceName, + _In_opt_ PUNICODE_STRING InstanceName, + _In_opt_ USHORT InstancePort, + _In_opt_ PUNICODE_STRING Referrer, + _In_opt_ PUNICODE_STRING TargetInfo, + _Inout_ PUNICODE_STRING Spn, + _Out_opt_ PULONG Length, + _In_ BOOLEAN Allocate) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} + +VOID +SEC_ENTRY +SecSetPagingMode(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} +VOID +SEC_ENTRY +UnsealMessage(VOID) +{ + UNIMPLEMENTED_DBGBREAK(); +} + +SECURITY_STATUS +SEC_ENTRY +VerifySignature( + _In_ PCtxtHandle phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _Out_ PULONG pfQOP) +{ + UNIMPLEMENTED_DBGBREAK(); + return 0; +} Propchange: trunk/reactos/drivers/crypto/ksecdd/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 61753: [NTOSKRNL] - Implement NtPrivilegedServiceAuditAlarm, the internal function SepAdtPrivilegedServiceAuditAlarm is not implemented yet. - Stubplement SepAccessCheckAndAuditAlarm and...
by tkreuzer＠svn.reactos.org 22 Jan '14

22 Jan '14

Author: tkreuzer Date: Wed Jan 22 16:29:26 2014 New Revision: 61753 URL: http://svn.reactos.org/svn/reactos?rev=61753&view=rev Log: [NTOSKRNL] - Implement NtPrivilegedServiceAuditAlarm, the internal function SepAdtPrivilegedServiceAuditAlarm is not implemented yet. - Stubplement SepAccessCheckAndAuditAlarm and make NtAccessCheckAndAuditAlarm, NtAccessCheckByTypeAndAuditAlarm, NtAccessCheckByTypeResultListAndAuditAlarm and NtAccessCheckByTypeResultListAndAuditAlarmByHandle (love that name) wrappers around it. Modified: trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Wed Jan 22 16:29:26 2014 @@ -5,6 +5,7 @@ * PURPOSE: Audit functions * * PROGRAMMERS: Eric Kohl + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -12,6 +13,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define SEP_PRIVILEGE_SET_MAX_COUNT 60 /* PRIVATE FUNCTIONS***********************************************************/ @@ -180,6 +183,145 @@ return Status; } +VOID +NTAPI +SepAdtCloseObjectAuditAlarm( + PUNICODE_STRING SubsystemName, + PVOID HandleId, + PSID Sid) +{ + UNIMPLEMENTED; +} + +VOID +NTAPI +SepAdtPrivilegedServiceAuditAlarm( + PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_opt_ PUNICODE_STRING SubsystemName, + _In_opt_ PUNICODE_STRING ServiceName, + _In_ PTOKEN Token, + _In_ PTOKEN PrimaryToken, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ) +{ + UNIMPLEMENTED; +} + +_Must_inspect_result_ +NTSTATUS +NTAPI +SepAccessCheckAndAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PHANDLE ClientToken, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ ACCESS_MASK DesiredAccess, + _In_ AUDIT_EVENT_TYPE AuditType, + _In_ ULONG Flags, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList, + _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatusList, + _Out_ PBOOLEAN GenerateOnClose, + _In_ BOOLEAN UseResultList) +{ + SECURITY_SUBJECT_CONTEXT SubjectContext; + ULONG ResultListLength; + GENERIC_MAPPING LocalGenericMapping; + NTSTATUS Status; + PAGED_CODE(); + + DBG_UNREFERENCED_LOCAL_VARIABLE(LocalGenericMapping); + + /* Only user mode is supported! */ + ASSERT(ExGetPreviousMode() != KernelMode); + + /* Validate AuditType */ + if ((AuditType != AuditEventObjectAccess) && + (AuditType != AuditEventDirectoryServiceAccess)) + { + DPRINT1("Invalid audit type: %u\n", AuditType); + return STATUS_INVALID_PARAMETER; + } + + /* Capture the security subject context */ + SeCaptureSubjectContext(&SubjectContext); + + /* Did the caller pass a token handle? */ + if (ClientToken == NULL) + { + /* Check if we have a token in the subject context */ + if (SubjectContext.ClientToken == NULL) + { + Status = STATUS_NO_IMPERSONATION_TOKEN; + goto Cleanup; + } + + /* Check if we have a valid impersonation level */ + if (SubjectContext.ImpersonationLevel < SecurityIdentification) + { + Status = STATUS_BAD_IMPERSONATION_LEVEL; + goto Cleanup; + } + } + + /* Are we using a result list? */ + if (UseResultList) + { + /* The list length equals the object type list length */ + ResultListLength = ObjectTypeListLength; + if ((ResultListLength == 0) || (ResultListLength > 0x1000)) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + } + else + { + /* List length is 1 */ + ResultListLength = 1; + } + + _SEH2_TRY + { + /* Probe output buffers */ + ProbeForWrite(AccessStatusList, + ResultListLength * sizeof(*AccessStatusList), + sizeof(*AccessStatusList)); + ProbeForWrite(GrantedAccessList, + ResultListLength * sizeof(*GrantedAccessList), + sizeof(*GrantedAccessList)); + + /* Probe generic mapping and make a local copy */ + ProbeForRead(GenericMapping, sizeof(*GenericMapping), sizeof(ULONG)); + LocalGenericMapping = * GenericMapping; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + + UNIMPLEMENTED; + + /* For now pretend everything else is ok */ + Status = STATUS_SUCCESS; + +Cleanup: + + /* Release the security subject context */ + SeReleaseSubjectContext(&SubjectContext); + + return Status; +} + + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -336,36 +478,7 @@ UNIMPLEMENTED; } -VOID -NTAPI -SepAdtCloseObjectAuditAlarm( - PUNICODE_STRING SubsystemName, - PVOID HandleId, - PSID Sid) -{ - UNIMPLEMENTED; -} - /* SYSTEM CALLS ***************************************************************/ - -NTSTATUS -NTAPI -NtAccessCheckAndAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN HANDLE HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus, - OUT PBOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - NTSTATUS NTAPI @@ -483,15 +596,157 @@ } -NTSTATUS NTAPI -NtPrivilegedServiceAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PUNICODE_STRING ServiceName, - IN HANDLE ClientToken, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +__kernel_entry +NTSTATUS +NTAPI +NtPrivilegedServiceAuditAlarm( + _In_opt_ PUNICODE_STRING SubsystemName, + _In_opt_ PUNICODE_STRING ServiceName, + _In_ HANDLE ClientToken, + _In_ PPRIVILEGE_SET Privileges, + _In_ BOOLEAN AccessGranted ) +{ + KPROCESSOR_MODE PreviousMode; + PTOKEN Token; + volatile PPRIVILEGE_SET CapturedPrivileges = NULL; + UNICODE_STRING CapturedSubsystemName; + UNICODE_STRING CapturedServiceName; + ULONG PrivilegeCount, PrivilegesSize; + SECURITY_SUBJECT_CONTEXT SubjectContext; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the previous mode (only user mode is supported!) */ + PreviousMode = ExGetPreviousMode(); + ASSERT(PreviousMode != KernelMode); + + /* Reference the client token */ + Status = ObReferenceObjectByHandle(ClientToken, + TOKEN_QUERY, + SeTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference client token: 0x%lx\n", Status); + return Status; + } + + /* Validate the token's impersonation level */ + if ((Token->TokenType == TokenImpersonation) && + (Token->ImpersonationLevel < SecurityIdentification)) + { + DPRINT1("Invalid impersonation level (%u)\n", Token->ImpersonationLevel); + ObfDereferenceObject(Token); + return STATUS_BAD_IMPERSONATION_LEVEL; + } + + /* Validate privilege */ + if (!SeSinglePrivilegeCheck(SeAuditPrivilege, PreviousMode)) + { + DPRINT1("Caller does not have SeAuditPrivilege\n"); + ObfDereferenceObject(Token); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Do we have a subsystem name? */ + if (SubsystemName != NULL) + { + /* Probe and capture the subsystem name */ + Status = ProbeAndCaptureUnicodeString(&CapturedSubsystemName, + PreviousMode, + SubsystemName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture subsystem name!\n"); + goto Cleanup; + } + } + + /* Do we have a service name? */ + if (ServiceName != NULL) + { + /* Probe and capture the service name */ + Status = ProbeAndCaptureUnicodeString(&CapturedServiceName, + PreviousMode, + ServiceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture service name!\n"); + goto Cleanup; + } + } + + _SEH2_TRY + { + /* Probe the basic privilege set structure */ + ProbeForRead(Privileges, sizeof(PRIVILEGE_SET), sizeof(ULONG)); + + /* Validate privilege count */ + PrivilegeCount = Privileges->PrivilegeCount; + if (PrivilegeCount > SEP_PRIVILEGE_SET_MAX_COUNT) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + + /* Calculate the size of the Privileges structure */ + PrivilegesSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]); + + /* Probe the whole structure */ + ProbeForRead(Privileges, PrivilegesSize, sizeof(ULONG)); + + /* Allocate a temp buffer */ + CapturedPrivileges = ExAllocatePoolWithTag(PagedPool, + PrivilegesSize, + 'rPeS'); + if (CapturedPrivileges == NULL) + { + DPRINT1("Failed to allocate %u bytes\n", PrivilegesSize); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Copy the privileges */ + RtlCopyMemory(CapturedPrivileges, Privileges, PrivilegesSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("Got exception 0x%lx\n", Status); + goto Cleanup; + } + _SEH2_END; + + /* Capture the security subject context */ + SeCaptureSubjectContext(&SubjectContext); + + /* Call the internal function */ + SepAdtPrivilegedServiceAuditAlarm(&SubjectContext, + &CapturedSubsystemName, + &CapturedServiceName, + Token, + SubjectContext.PrimaryToken, + CapturedPrivileges, + AccessGranted); + + /* Release the security subject context */ + SeReleaseSubjectContext(&SubjectContext); + + Status = STATUS_SUCCESS; + +Cleanup: + /* Cleanup resources */ + if (SubsystemName != NULL) + ReleaseCapturedUnicodeString(&CapturedSubsystemName, PreviousMode); + if (ServiceName != NULL) + ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); + if (CapturedPrivileges != NULL) + ExFreePoolWithTag(CapturedPrivileges, 0); + ObDereferenceObject(Token); + + return Status; } @@ -507,4 +762,171 @@ return STATUS_NOT_IMPLEMENTED; } + +_Must_inspect_result_ +__kernel_entry +NTSTATUS +NTAPI +NtAccessCheckAndAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ ACCESS_MASK DesiredAccess, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus, + _Out_ PBOOLEAN GenerateOnClose) +{ + /* Call the internal function */ + return SepAccessCheckAndAuditAlarm(SubsystemName, + HandleId, + NULL, + ObjectTypeName, + ObjectName, + SecurityDescriptor, + NULL, + DesiredAccess, + AuditEventObjectAccess, + 0, + NULL, + 0, + GenericMapping, + GrantedAccess, + AccessStatus, + GenerateOnClose, + FALSE); +} + +_Must_inspect_result_ +__kernel_entry +NTSTATUS +NTAPI +NtAccessCheckByTypeAndAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ ACCESS_MASK DesiredAccess, + _In_ AUDIT_EVENT_TYPE AuditType, + _In_ ULONG Flags, + _In_reads_opt_(ObjectTypeLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeLength, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_ PACCESS_MASK GrantedAccess, + _Out_ PNTSTATUS AccessStatus, + _Out_ PBOOLEAN GenerateOnClose) +{ + /* Call the internal function */ + return SepAccessCheckAndAuditAlarm(SubsystemName, + HandleId, + NULL, + ObjectTypeName, + ObjectName, + SecurityDescriptor, + PrincipalSelfSid, + DesiredAccess, + AuditType, + Flags, + ObjectTypeList, + ObjectTypeLength, + GenericMapping, + GrantedAccess, + AccessStatus, + GenerateOnClose, + FALSE); +} + +_Must_inspect_result_ +__kernel_entry +NTSTATUS +NTAPI +NtAccessCheckByTypeResultListAndAuditAlarm( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ ACCESS_MASK DesiredAccess, + _In_ AUDIT_EVENT_TYPE AuditType, + _In_ ULONG Flags, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList, + _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatusList, + _Out_ PBOOLEAN GenerateOnClose) +{ + /* Call the internal function */ + return SepAccessCheckAndAuditAlarm(SubsystemName, + HandleId, + NULL, + ObjectTypeName, + ObjectName, + SecurityDescriptor, + PrincipalSelfSid, + DesiredAccess, + AuditType, + Flags, + ObjectTypeList, + ObjectTypeListLength, + GenericMapping, + GrantedAccessList, + AccessStatusList, + GenerateOnClose, + TRUE); +} + +_Must_inspect_result_ +__kernel_entry +NTSTATUS +NTAPI +NtAccessCheckByTypeResultListAndAuditAlarmByHandle( + _In_ PUNICODE_STRING SubsystemName, + _In_opt_ PVOID HandleId, + _In_ HANDLE ClientToken, + _In_ PUNICODE_STRING ObjectTypeName, + _In_ PUNICODE_STRING ObjectName, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_opt_ PSID PrincipalSelfSid, + _In_ ACCESS_MASK DesiredAccess, + _In_ AUDIT_EVENT_TYPE AuditType, + _In_ ULONG Flags, + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ PGENERIC_MAPPING GenericMapping, + _In_ BOOLEAN ObjectCreation, + _Out_writes_(ObjectTypeListLength) PACCESS_MASK GrantedAccessList, + _Out_writes_(ObjectTypeListLength) PNTSTATUS AccessStatusList, + _Out_ PBOOLEAN GenerateOnClose) +{ + UNREFERENCED_PARAMETER(ObjectCreation); + + /* Call the internal function */ + return SepAccessCheckAndAuditAlarm(SubsystemName, + HandleId, + &ClientToken, + ObjectTypeName, + ObjectName, + SecurityDescriptor, + PrincipalSelfSid, + DesiredAccess, + AuditType, + Flags, + ObjectTypeList, + ObjectTypeListLength, + GenericMapping, + GrantedAccessList, + AccessStatusList, + GenerateOnClose, + TRUE); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Wed Jan 22 16:29:26 2014 @@ -617,7 +617,7 @@ *GrantedAccess = CurrentAccess & DesiredAccess; - if ((*GrantedAccess & ~VALID_INHERIT_FLAGS) == + if ((*GrantedAccess & ~VALID_INHERIT_FLAGS) == (DesiredAccess & ~VALID_INHERIT_FLAGS)) { *AccessStatus = STATUS_SUCCESS; @@ -1074,29 +1074,6 @@ NTSTATUS NTAPI -NtAccessCheckByTypeAndAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN HANDLE HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID PrincipalSelfSid, - IN ACCESS_MASK DesiredAccess, - IN AUDIT_EVENT_TYPE AuditType, - IN ULONG Flags, - IN POBJECT_TYPE_LIST ObjectTypeList, - IN ULONG ObjectTypeLength, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus, - OUT PBOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI NtAccessCheckByTypeResultList(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN PSID PrincipalSelfSid, IN HANDLE ClientToken, @@ -1113,51 +1090,4 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS -NTAPI -NtAccessCheckByTypeResultListAndAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN HANDLE HandleId, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID PrincipalSelfSid, - IN ACCESS_MASK DesiredAccess, - IN AUDIT_EVENT_TYPE AuditType, - IN ULONG Flags, - IN POBJECT_TYPE_LIST ObjectTypeList, - IN ULONG ObjectTypeLength, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus, - OUT PBOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtAccessCheckByTypeResultListAndAuditAlarmByHandle(IN PUNICODE_STRING SubsystemName, - IN HANDLE HandleId, - IN HANDLE ClientToken, - IN PUNICODE_STRING ObjectTypeName, - IN PUNICODE_STRING ObjectName, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSID PrincipalSelfSid, - IN ACCESS_MASK DesiredAccess, - IN AUDIT_EVENT_TYPE AuditType, - IN ULONG Flags, - IN POBJECT_TYPE_LIST ObjectTypeList, - IN ULONG ObjectTypeLength, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus, - OUT PBOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */

1 0

[tkreuzer] 61752: [NTOSKRNL] Implement TokenSessionReference case in NtSetInformationToken, also make sure not to leak a reference on the token in case of an exception.
by tkreuzer＠svn.reactos.org 22 Jan '14

22 Jan '14

Author: tkreuzer Date: Wed Jan 22 15:05:16 2014 New Revision: 61752 URL: http://svn.reactos.org/svn/reactos?rev=61752&view=rev Log: [NTOSKRNL] Implement TokenSessionReference case in NtSetInformationToken, also make sure not to leak a reference on the token in case of an exception. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Jan 22 15:05:16 2014 @@ -64,7 +64,7 @@ /* TokenGroupsAndPrivileges */ ICI_SQ_SAME( sizeof(TOKEN_GROUPS_AND_PRIVILEGES), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenSessionReference */ - ICI_SQ_SAME( /* FIXME */0, sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ), /* TokenSandBoxInert */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenAuditPolicy */ @@ -1759,7 +1759,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; @@ -1798,7 +1799,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; @@ -1837,7 +1839,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; @@ -1891,7 +1894,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; @@ -1906,13 +1910,49 @@ break; } + case TokenSessionReference: + { + ULONG SessionReference; + + _SEH2_TRY + { + /* Buffer size was already verified, no need to check here again */ + SessionReference = *(PULONG)TokenInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + goto Cleanup; + } + + /* Check if it is 0 */ + if (SessionReference == 0) + { + /* Atomically set the flag in the token */ + RtlInterlockedSetBits(&Token->TokenFlags, + TOKEN_SESSION_NOT_REFERENCED); + } + + break; + + } + default: { + DPRINT1("Unhandled TokenInformationClass: 0x%lx\n", + TokenInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; } } - +Cleanup: ObDereferenceObject(Token); }

1 0

[tkreuzer] 61751: [NTOSKRNL] Fix return type of PsSetProcessSecurityPort
by tkreuzer＠svn.reactos.org 22 Jan '14

22 Jan '14

Author: tkreuzer Date: Wed Jan 22 14:48:45 2014 New Revision: 61751 URL: http://svn.reactos.org/svn/reactos?rev=61751&view=rev Log: [NTOSKRNL] Fix return type of PsSetProcessSecurityPort Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Wed Jan 22 14:48:45 2014 @@ -1229,22 +1229,23 @@ /* * @implemented */ -VOID +NTSTATUS NTAPI PsSetProcessSecurityPort(PEPROCESS Process, PVOID SecurityPort) { Process->SecurityPort = SecurityPort; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI PsSetProcessWin32Process( - _Inout_ PEPROCESS Process, - _In_opt_ PVOID Win32Process, + _Inout_ PEPROCESS Process, + _In_opt_ PVOID Win32Process, _In_opt_ PVOID OldWin32Process) { NTSTATUS Status;

1 0

[ekohl] 61750: [MSGINA] Move the unlock code to a separate function and display error messages if user name or password do not match.
by ekohl＠svn.reactos.org 21 Jan '14

21 Jan '14

Author: ekohl Date: Tue Jan 21 23:31:13 2014 New Revision: 61750 URL: http://svn.reactos.org/svn/reactos?rev=61750&view=rev Log: [MSGINA] Move the unlock code to a separate function and display error messages if user name or password do not match. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -604,6 +604,59 @@ static +BOOL +DoUnlock( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext, + OUT LPINT Action) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + LPWSTR UserName = NULL; + LPWSTR Password = NULL; + BOOL res = FALSE; + + if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') + return FALSE; + + if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password)) + { + if (UserName != NULL && Password != NULL && + wcscmp(UserName, pgContext->UserName) == 0 && + wcscmp(Password, pgContext->Password) == 0) + { + *Action = WLX_SAS_ACTION_UNLOCK_WKSTA; + res = TRUE; + } + else if (wcscmp(UserName, pgContext->UserName) == 0 && + wcscmp(Password, pgContext->Password) != 0) + { + /* Wrong Password */ + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGPASSWORD, Buffer2, 256); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + } + else + { + /* Wrong user name */ + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); + wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); + } + } + + if (UserName != NULL) + HeapFree(GetProcessHeap(), 0, UserName); + + if (Password != NULL) + HeapFree(GetProcessHeap(), 0, Password); + + return res; +} + + +static INT_PTR CALLBACK UnlockWindowProc( @@ -613,6 +666,7 @@ IN LPARAM lParam) { PGINA_CONTEXT pgContext; + INT result = WLX_SAS_ACTION_NONE; pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); @@ -653,26 +707,9 @@ switch (LOWORD(wParam)) { case IDOK: - { - LPWSTR UserName = NULL, Password = NULL; - INT result = WLX_SAS_ACTION_NONE; - - if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') - break; - if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password)) - { - if (UserName != NULL && Password != NULL && - wcscmp(UserName, pgContext->UserName) == 0 && - wcscmp(Password, pgContext->Password) == 0) - { - result = WLX_SAS_ACTION_UNLOCK_WKSTA; - } - } - HeapFree(GetProcessHeap(), 0, UserName); - HeapFree(GetProcessHeap(), 0, Password); - EndDialog(hwndDlg, result); - return TRUE; - } + if (DoUnlock(hwndDlg, pgContext, &result)) + EndDialog(hwndDlg, result); + return TRUE; case IDCANCEL: EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -127,4 +127,7 @@ IDS_LOCKMSG "Pouze %s nebo AdministrÃ¡tor mÅ¯Å¾e odemknout tento poÄÃtaÄ." IDS_LOGONMSG "Jste pÅihlÃ¡Å¡eni jako %s." IDS_LOGONDATE "Datum pÅihlÃ¡Å¡enÃ: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren." IDS_LOGONMSG "Sie sind angemeldet als %s." IDS_LOGONDATE "Anmeldedatum: %s %s" + IDS_COMPUTERLOCKED "Computer ist gesperrt" + IDS_LOCKEDWRONGPASSWORD "Das Kennwort ist falsch. Bitte geben Sie das Kennwort erneut ein. Bei Buchstaben des Kennworts wird GroÃ- und Kleinschreibung unterschieden." + IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren." END Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED + PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Cancel", IDCANCEL, 189, 154, 76, 14 END @@ -122,4 +122,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -124,4 +124,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut dÃ©verrouiller cet ordinateur." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "×¨×§ %s ×× ×× ×× ×××××× ××©××¨×¨ ××ª ××××©× ×××." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "×ª××¨×× ×× ××¡×: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -121,4 +121,7 @@ IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan. Lanjutkan?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -130,4 +130,7 @@ IDS_LOCKMSG "Solo %s o un Amministratore possono sbloccare questo computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Dati di accesso: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -122,4 +122,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -131,4 +131,7 @@ IDS_LOCKMSG "Tylko %s lub Administrator moÅ¼e odblokowaÄ ten komputer." IDS_LOGONMSG "JesteÅ zalogowany jako %s." IDS_LOGONDATE "Data logowania: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -124,4 +124,7 @@ IDS_LOCKMSG "Doar %s sau un Administrator poate debloca acest calculator." IDS_LOGONMSG "SunteÈi autentificat ca %s." IDS_LOGONDATE "Data autentificÄrii: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -124,4 +124,7 @@ IDS_LOCKMSG "Ð¢Ð¾Ð»ÑÐºÐ¾ %s Ð¸Ð»Ð¸ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ Ð¼Ð¾Ð³ÑÑ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "ÐÐ°ÑÐ° Ð²ÑÐ¾Ð´Ð°: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -127,4 +127,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -124,4 +124,7 @@ IDS_LOCKMSG "YalnÄ±zca %s ve bir yÃ¶netici bu bilgisayarÄ± kilitleyebilir." IDS_LOGONMSG "%s olarak oturum aÃ§tÄ±nÄ±z." IDS_LOGONDATE "Oturum AÃ§ma ZamÃ¢nÄ±: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -130,4 +130,7 @@ IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." IDS_LOGONMSG "You are logged on as %s." IDS_LOGONDATE "Logon date: %s %s" + IDS_COMPUTERLOCKED "Computer locked" + IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." END Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Tue Jan 21 23:31:13 2014 @@ -34,12 +34,15 @@ #define IDI_LOCKICON 21 -#define IDS_LOGGEDOUTSAS 40000 -#define IDS_LOCKEDSAS 40001 -#define IDS_PRESSCTRLALTDELETE 40002 -#define IDS_ASKFORUSER 40003 -#define IDS_ASKFORPASSWORD 40004 -#define IDS_FORCELOGOFF 40005 -#define IDS_LOCKMSG 40006 -#define IDS_LOGONMSG 40007 -#define IDS_LOGONDATE 40008 +#define IDS_LOGGEDOUTSAS 40000 +#define IDS_LOCKEDSAS 40001 +#define IDS_PRESSCTRLALTDELETE 40002 +#define IDS_ASKFORUSER 40003 +#define IDS_ASKFORPASSWORD 40004 +#define IDS_FORCELOGOFF 40005 +#define IDS_LOCKMSG 40006 +#define IDS_LOGONMSG 40007 +#define IDS_LOGONDATE 40008 +#define IDS_COMPUTERLOCKED 40009 +#define IDS_LOCKEDWRONGPASSWORD 40010 +#define IDS_LOCKEDWRONGUSER 40011

1 0

[akhaldi] 61749: [DBGHELP] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 21 Jan '14

21 Jan '14

Author: akhaldi Date: Tue Jan 21 18:04:09 2014 New Revision: 61749 URL: http://svn.reactos.org/svn/reactos?rev=61749&view=rev Log: [DBGHELP] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/compat.c trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/cpu_arm64.c trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/crc32.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/dwarf.h trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/rosstubs.c trunk/reactos/dll/win32/dbghelp/source.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/stack.c trunk/reactos/dll/win32/dbghelp/storage.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/dll/win32/dbghelp/wdbgexts.h Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/coff.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/coff.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -32,26 +32,7 @@ * Add symbol size to internal symbol table. */ -#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <stdlib.h> - -#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -//#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winternl.h" - -//#include "wine/exception.h" -#include <wine/debug.h> #include "dbghelp_private.h" -#include <wine/mscvpdb.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_coff); Modified: trunk/reactos/dll/win32/dbghelp/compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/compat.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/compat.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -1,5 +1,3 @@ -#include <stdio.h> -#include <stdarg.h> #include "dbghelp_private.h" void* __HeapAlloc(int heap, int flags, size_t size) Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,13 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <assert.h> - -//#include "ntstatus.h" -#define WIN32_NO_STATUS #include "dbghelp_private.h" -//#include "winternl.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm6… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm64.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,13 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,18 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> +#include "dbghelp_private.h" #ifndef DBGHELP_STATIC_LIB -#include "ntstatus.h" -#endif - -#include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include "wine/winbase16.h" -#include "winternl.h" -#include "wine/debug.h" +#include <wine/winbase16.h> #endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_ppc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_ppc.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,15 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/crc32.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/crc32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/crc32.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,11 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - -#include <stdio.h> #include "dbghelp_private.h" Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include "dbghelp_private.h" + #include "wdbgexts.h" - -#ifndef DBGHELP_STATIC_LIB -#include "winerror.h" -#include "psapi.h" -#include "wine/debug.h" -#include "winnls.h" -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,30 +21,55 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS +#include <config.h> + +#include <assert.h> +#include <stdio.h> + +#ifdef HAVE_SYS_MMAN_H +# include <sys/mman.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #ifndef DBGHELP_STATIC_LIB + +#include <wine/port.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winver.h> +#include <winternl.h> #include <dbghelp.h> #include <objbase.h> #include <cvconst.h> +#include <psapi.h> + +#include <wine/debug.h> +#include <wine/mscvpdb.h> #include <wine/unicode.h> -#else + +#else /* DBGHELP_STATIC_LIB */ + #include <string.h> #include "compat.h" -#endif - -//#include "oaidl.h" -//#include "winnls.h" + +#endif /* DBGHELP_STATIC_LIB */ + #include <wine/list.h> #include <wine/rbtree.h> - /* #define USE_STATS */ @@ -815,3 +840,5 @@ extern struct symt_typedef* symt_new_typedef(struct module* module, struct symt* ref, const char* name) DECLSPEC_HIDDEN; + +#include "image_private.h" Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -20,45 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - -#include <config.h> - -//#include <sys/types.h> -//#include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -//#include <limits.h> -//#include <stdlib.h> -//#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -//#include <stdio.h> -#include <assert.h> -#include <stdarg.h> +#include "dbghelp_private.h" #ifdef HAVE_ZLIB #include <zlib.h> #endif - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "ole2.h" -//#include "oleauto.h" - -#ifndef DBGHELP_STATIC_LIB -#include <winternl.h> -#include <wine/debug.h> -#endif - -#include "dbghelp_private.h" -#include "image_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf); Modified: trunk/reactos/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.h?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once typedef enum dwarf_tag_e { Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/elf_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" +#include "dbghelp_private.h" #if defined(__svr4__) || defined(__sun) #define __ELF__ 1 @@ -29,26 +28,10 @@ #define _FILE_OFFSET_BITS 32 #endif -#include <assert.h> -#include <stdio.h> #include <stdlib.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#include "dbghelp_private.h" - -#include "image_private.h" - -#include "wine/library.h" -#include "wine/debug.h" + +#include <wine/library.h> #ifdef __ELF__ Modified: trunk/reactos/dll/win32/dbghelp/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/image.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <string.h> - #include "dbghelp_private.h" -#include <winternl.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pr… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once #ifdef HAVE_ELF_H # include <elf.h> Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,21 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "dbghelp_private.h" #ifdef HAVE_MACH_O_LOADER_H - -#include <assert.h> -#include <stdarg.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif #include <mach-o/fat.h> #include <mach-o/loader.h> Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dbghelp_private.h" + #include <time.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "dbghelp_private.h" -#include "winternl.h" -#include "psapi.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,19 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <string.h> -#include <assert.h> - #include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include <psapi.h> -#include <wine/debug.h> -#endif -//#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -32,29 +32,9 @@ * Add symbol size to internal symbol table. */ -#define NONAMELESSUNION - -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> - -#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winternl.h" - -#include "wine/exception.h" -#include "wine/debug.h" #include "dbghelp_private.h" -#include "wine/mscvpdb.h" + +#include <wine/exception.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <string.h> - #include "dbghelp_private.h" -//#include "winnls.h" -#include <winternl.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,20 +21,7 @@ * */ -#include "config.h" -#include "wine/port.h" - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <assert.h> - #include "dbghelp_private.h" -#include "image_private.h" -#ifndef DBGHELP_STATIC_LIB -#include "winternl.h" -#include "wine/debug.h" -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/rosstubs… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -20,8 +20,7 @@ #include "dbghelp_private.h" -ULONG __cdecl DbgPrint(IN PCCH Format, IN ...); -#define UNIMPLEMENTED DbgPrint("DBGHELP: %s is unimplemented, please try again later.\n", __FUNCTION__); +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); #define PDBGHELP_CREATE_USER_DUMP_CALLBACK PVOID #define PSYM_ENUMPROCESSES_CALLBACK PVOID Modified: trunk/reactos/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/source.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/source.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,17 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <config.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <string.h> -#include <assert.h> #include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include <wine/debug.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -29,39 +29,10 @@ * available (hopefully) from http://sources.redhat.com/gdb/onlinedocs */ -#include <config.h> -//#include "wine/port.h" - -//#include <sys/types.h> -//#include <fcntl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -//#include <limits.h> -//#include <stdlib.h> -//#include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -//#include <stdio.h> -#include <assert.h> -//#include <stdarg.h> +#include "dbghelp_private.h" #ifdef HAVE_MACH_O_NLIST_H # include <mach-o/nlist.h> -#endif - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include <wine/debug.h> #endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,14 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <string.h> -//#include <assert.h> - #include "dbghelp_private.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); Modified: trunk/reactos/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/storage.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,16 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include <assert.h> -#include <stdlib.h> - -#ifndef DBGHELP_STATIC_LIB -#include "wine/debug.h" -#endif - #include "dbghelp_private.h" + #ifdef USE_STATS #include <math.h> #endif Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "config.h" - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <limits.h> -#include <sys/types.h> -#include <assert.h> - #include "dbghelp_private.h" - -#ifndef DBGHELP_STATIC_LIB -#include "wine/debug.h" -#include "winnls.h" -#endif WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/type.c [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -21,20 +21,6 @@ * Note: This really doesn't do much at the moment, but it forms the framework * upon which full support for datatype handling will eventually be built. */ - -#define NONAMELESSUNION - -#include "config.h" -#include <stdlib.h> -#include <stdarg.h> -#include <assert.h> - -#ifndef DBGHELP_STATIC_LIB -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wine/debug.h" -#endif #include "dbghelp_private.h" Modified: trunk/reactos/dll/win32/dbghelp/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/wdbgexts… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/wdbgexts.h [iso-8859-1] Tue Jan 21 18:04:09 2014 @@ -18,6 +18,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once typedef struct EXT_API_VERSION {

1 0

[akhaldi] 61748: [CRYPT32] * Move cryptres.h inclusion to the main header. CORE-7716
by akhaldi＠svn.reactos.org 21 Jan '14

21 Jan '14

Author: akhaldi Date: Tue Jan 21 18:01:34 2014 New Revision: 61748 URL: http://svn.reactos.org/svn/reactos?rev=61748&view=rev Log: [CRYPT32] * Move cryptres.h inclusion to the main header. CORE-7716 Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h trunk/reactos/dll/win32/crypt32/cryptres.h trunk/reactos/dll/win32/crypt32/object.c trunk/reactos/dll/win32/crypt32/oid.c Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -19,7 +19,7 @@ #ifndef __CRYPT32_PRIVATE_H__ #define __CRYPT32_PRIVATE_H__ -#include <config.h> +#include <wine/config.h> #include <wine/port.h> #include <assert.h> @@ -47,6 +47,8 @@ #include <wine/list.h> #include <wine/exception.h> #include <wine/debug.h> + +#include "cryptres.h" /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) @@ -460,4 +462,4 @@ */ #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -#endif +#endif /* __CRYPT32_PRIVATE_H__ */ Modified: trunk/reactos/dll/win32/crypt32/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cryptres… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/cryptres.h [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -15,6 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ Modified: trunk/reactos/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -21,8 +21,6 @@ #include "crypt32_private.h" #include <wintrust.h> - -#include "cryptres.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Tue Jan 21 18:01:34 2014 @@ -18,8 +18,6 @@ */ #include "crypt32_private.h" - -#include "cryptres.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

[akhaldi] 61747: [CRTDLL] * We don't need PCH for one source file modules. CORE-7716
by akhaldi＠svn.reactos.org 21 Jan '14

21 Jan '14

Author: akhaldi Date: Tue Jan 21 18:00:17 2014 New Revision: 61747 URL: http://svn.reactos.org/svn/reactos?rev=61747&view=rev Log: [CRTDLL] * We don't need PCH for one source file modules. CORE-7716 Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Tue Jan 21 18:00:17 2014 @@ -29,6 +29,5 @@ endif() add_importlibs(crtdll kernel32 ntdll) -add_pch(crtdll precomp.h) add_cd_file(TARGET crtdll DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 61746: [COMDLG32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 21 Jan '14

21 Jan '14

Author: akhaldi Date: Tue Jan 21 17:59:36 2014 New Revision: 61746 URL: http://svn.reactos.org/svn/reactos?rev=61746&view=rev Log: [COMDLG32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] Tue Jan 21 17:59:36 2014 @@ -21,9 +21,8 @@ #ifndef _WINE_DLL_CDLG_H #define _WINE_DLL_CDLG_H -#include <config.h> +#include <wine/config.h> -#include <stdarg.h> #include <stdio.h> #define WIN32_NO_STATUS @@ -38,18 +37,15 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> -#include <winnls.h> #include <wincon.h> #include <winternl.h> -#include <commctrl.h> #include <objbase.h> #include <commdlg.h> #include <shlobj.h> -#include <shellapi.h> #include <dlgs.h> #include <cderr.h> -// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista +/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 #include <winreg.h> Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Tue Jan 21 17:59:36 2014 @@ -46,6 +46,8 @@ */ #include "cdlg.h" + +#include <shellapi.h> #define UNIMPLEMENTED_FLAGS \ (OFN_DONTADDTORECENT |\ Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Tue Jan 21 17:59:36 2014 @@ -23,6 +23,7 @@ */ #include "cdlg.h" + #include <assert.h> #include <winspool.h>

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014