Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 59488: [CMAKE] - Add configure support for VS 2013 - Add a missing /nologo to assembler invocations - Properly complain about old MSVC versions during configure instead of failing the build
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 21:00:42 2013 New Revision: 59488 URL: http://svn.reactos.org/svn/reactos?rev=59488&view=rev Log: [CMAKE] - Add configure support for VS 2013 - Add a missing /nologo to assembler invocations - Properly complain about old MSVC versions during configure instead of failing the build Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/configure.cmd Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=59488&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -92,7 +92,7 @@ endif() # Default to Debug for the build type - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup @@ -182,36 +182,19 @@ # We're using widl now for both MSVC and GCC builds include(cmake/widl-support.cmake) - if(MSVC AND USE_WDK_HEADERS) - include_directories( - include - $ENV{SDK_INC_PATH} - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/reactos - $ENV{CRT_INC_PATH} - $ENV{DDK_INC_PATH} - include/ndk - include/reactos - include/reactos/libs) - else() - include_directories( - include - include/psdk - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/reactos - include/crt - include/ddk - include/ndk - include/reactos - include/reactos/libs) - endif() - + include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) if(ARCH STREQUAL "arm") include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) @@ -232,7 +215,7 @@ add_subdirectory(include/asm) include(cmake/baseaddress.cmake) - + # For MSVC builds, this puts all debug symbols file in the same directory. set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59488&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -216,8 +216,8 @@ if(_module_type STREQUAL "STATIC_LIBRARY") message(FATAL_ERROR "Cannot add delay imports to a static library") endif() - foreach(LIB ${ARGN}) - target_link_libraries(${_module} lib${LIB}_delayed) + foreach(_lib ${ARGN}) + target_link_libraries(${_module} lib${_lib}_delayed) endforeach() target_link_libraries(${_module} delayimp) endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59488… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -127,15 +127,15 @@ #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") -set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Cp /Fo<OBJECT> /c /Ta <SOURCE>") +set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") function(add_delay_importlibs _module) get_target_property(_module_type ${_module} TYPE) if(_module_type STREQUAL "STATIC_LIBRARY") message(FATAL_ERROR "Cannot add delay imports to a static library") endif() - foreach(LIB ${ARGN}) - add_target_link_flags(${_module} "/DELAYLOAD:${LIB}.dll") - target_link_libraries(${_module} lib${LIB}) + foreach(_lib ${ARGN}) + add_target_link_flags(${_module} "/DELAYLOAD:${_lib}.dll") + target_link_libraries(${_module} lib${_lib}) endforeach() target_link_libraries(${_module} delayimp) endfunction() Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59488&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -41,27 +41,14 @@ set CMAKE_GENERATOR="Ninja" ) -) else if defined DDK_TARGET_OS ( - echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%% - set BUILD_ENVIRONMENT=WDK - if "%_BUILDARCH%" == "x86" ( - set ARCH=i386 - ) else if "%_BUILDARCH%" == "AMD64" ( - set ARCH=amd64 - ) - set USE_VSCMD=1 - set USE_WDK_HEADERS=0 - ) else if defined VCINSTALLDIR ( :: VS command prompt does not put this in environment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 - ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 + cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b @@ -69,19 +56,7 @@ echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH! if /I "%1" == "VSSolution" ( - if "!BUILD_ENVIRONMENT!" == "VS8" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 8 2005 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 8 2005" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS9" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 9 2008" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS10" ( + if "!BUILD_ENVIRONMENT!" == "VS10" ( if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 10 Win64" ) else ( @@ -95,22 +70,19 @@ ) else ( set CMAKE_GENERATOR="Visual Studio 11" ) + ) else if "!BUILD_ENVIRONMENT!" == "VS12" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 12 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 12 ARM" + ) else ( + set CMAKE_GENERATOR="Visual Studio 12" + ) ) ) else ( set USE_VSCMD=1 echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter. ) - -) else if defined sdkdir ( - echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU% - if "%TARGET_CPU%" == "x86" ( - set ARCH=i386 - ) else if "%TARGET_CPU%" == "x64" ( - set ARCH=amd64 - ) - - set BUILD_ENVIRONMENT=SDK - set USE_VSCMD=1 ) else ( echo Error: Unable to detect build environment. Configure script failure. @@ -179,8 +151,6 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" -) else if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" )

1 0

[ekohl] 59487: [SAMSRV] Add security descriptors for the account and builtin domains.
by ekohl＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: ekohl Date: Sun Jul 14 18:41:29 2013 New Revision: 59487 URL: http://svn.reactos.org/svn/reactos?rev=59487&view=rev Log: [SAMSRV] Add security descriptors for the account and builtin domains. Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/security.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -306,6 +306,14 @@ SampCreateServerSD(OUT PSECURITY_DESCRIPTOR *ServerSd, OUT PULONG Size); +NTSTATUS +SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size); + +NTSTATUS +SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size); + /* setup.c */ Modified: trunk/reactos/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/security.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -283,4 +283,580 @@ return Status; } + +NTSTATUS +SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + SAM_SERVER_ALL_ACCESS, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_INITIALIZE | + SAM_SERVER_SHUTDOWN, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *ServerSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + + +NTSTATUS +SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PSID UsersSid = NULL; + PSID GuestsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Users SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, + 0, + 0, + 0, + 0, + 0, + 0, + &UsersSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Guests SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_GUESTS, + 0, + 0, + 0, + 0, + 0, + 0, + &GuestsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 4 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid) + + RtlLengthSid(UsersSid) + + RtlLengthSid(GuestsSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + UsersSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_ALL_ACCESS & ~DOMAIN_CREATE_GROUP, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE | DOMAIN_CREATE_USER | DOMAIN_CREATE_ALIAS, + GuestsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_INITIALIZE | + SAM_SERVER_SHUTDOWN, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *ServerSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -552,6 +552,7 @@ IN LPCWSTR lpKeyName, IN LPCWSTR lpDomainName, IN PSID lpDomainSid, + IN BOOLEAN bBuiltinDomain, OUT HANDLE *lpDomainKey) { SAM_DOMAIN_FIXED_DATA FixedData; @@ -562,6 +563,8 @@ HANDLE hGroupsKey = NULL; HANDLE hUsersKey = NULL; HANDLE hNamesKey = NULL; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; NTSTATUS Status; if (lpDomainKey != NULL) @@ -690,12 +693,35 @@ if (!NT_SUCCESS(Status)) goto done; + /* Create the server SD */ + if (bBuiltinDomain == TRUE) + Status = SampCreateBuiltinDomainSD(&Sd, + &SdSize); + else + Status = SampCreateAccountDomainSD(&Sd, + &SdSize); + + if (!NT_SUCCESS(Status)) + goto done; + + /* Set SecDesc attribute*/ + Status = SampRegSetValue(hServerKey, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + goto done; + SampRegCloseKey(hNamesKey); if (lpDomainKey != NULL) *lpDomainKey = hDomainKey; done: + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + if (hAliasesKey != NULL) SampRegCloseKey(hAliasesKey); @@ -867,6 +893,7 @@ L"Builtin", szName, pBuiltinSid, + TRUE, &hBuiltinDomainKey); if (!NT_SUCCESS(Status)) { @@ -936,6 +963,7 @@ L"Account", L"", AccountDomainInfo->DomainSid, + FALSE, &hAccountDomainKey); if (!NT_SUCCESS(Status)) {

1 0

[hbelusca] 59486: [KERNEL32] Fix some broken logic: we can duplicate console handles only if both the source and the target processes are in fact the current process.
by hbelusca＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: hbelusca Date: Sun Jul 14 16:57:26 2013 New Revision: 59486 URL: http://svn.reactos.org/svn/reactos?rev=59486&view=rev Log: [KERNEL32] Fix some broken logic: we can duplicate console handles only if both the source and the target processes are in fact the current process. Modified: trunk/reactos/dll/win32/kernel32/client/handle.c Modified: trunk/reactos/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] Sun Jul 14 16:57:26 2013 @@ -170,7 +170,11 @@ ((hSourceHandle != NtCurrentProcess()) && (hSourceHandle != NtCurrentThread()))) { - if ((hSourceProcessHandle != NtCurrentProcess()) && + /* + * We can duplicate console handles only if both the source + * and the target processes are in fact the current process. + */ + if ((hSourceProcessHandle != NtCurrentProcess()) || (hTargetProcessHandle != NtCurrentProcess())) { BaseSetLastNTError(STATUS_INVALID_PARAMETER);

1 0

[hbelusca] 59485: [KERNEL32] Fix parameters usage when calling NtDuplicateObject.
by hbelusca＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: hbelusca Date: Sun Jul 14 14:52:39 2013 New Revision: 59485 URL: http://svn.reactos.org/svn/reactos?rev=59485&view=rev Log: [KERNEL32] Fix parameters usage when calling NtDuplicateObject. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jul 14 14:52:39 2013 @@ -52,6 +52,7 @@ /* FUNCTIONS ****************************************************************/ +// NOTE: Code duplicated from BasepDuplicateAndWriteHandle VOID WINAPI StuffStdHandle(IN HANDLE ProcessHandle, @@ -67,9 +68,8 @@ StandardHandle, ProcessHandle, &DuplicatedHandle, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES, - 0, - 0); + 0, 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (NT_SUCCESS(Status)) { /* Write it */ @@ -715,6 +715,7 @@ /* * Duplicates a standard handle and writes it where requested. */ +// NOTE: Code duplicated from StuffStdHandle VOID WINAPI BasepDuplicateAndWriteHandle(IN HANDLE ProcessHandle, @@ -736,9 +737,8 @@ StandardHandle, ProcessHandle, &DuplicatedHandle, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES, - 0, - 0); + 0, 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (NT_SUCCESS(Status)) { /* Write it */

1 0

[ekohl] 59484: [SAMSRV] Implement SamIFree_SAMPR_GET_MEMBERS_BUFFER.
by ekohl＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: ekohl Date: Sun Jul 14 14:22:30 2013 New Revision: 59484 URL: http://svn.reactos.org/svn/reactos?rev=59484&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_GET_MEMBERS_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Jul 14 14:22:30 2013 @@ -181,6 +181,23 @@ VOID NTAPI +SamIFree_SAMPR_GET_MEMBERS_BUFFER(PSAMPR_GET_MEMBERS_BUFFER Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->Members != NULL) + MIDL_user_free(Ptr->Members); + + if (Ptr->Attributes != NULL) + MIDL_user_free(Ptr->Attributes); + + MIDL_user_free(Ptr); + } +} + + +VOID +NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun Jul 14 14:22:30 2013 @@ -22,7 +22,7 @@ @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr) -@ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER +@ stdcall SamIFree_SAMPR_GET_MEMBERS_BUFFER(ptr) @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr)

1 0

[tfaber] 59483: [BROWSEUI] - This is not Wine source. Remove hacks accordingly
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 13:18:32 2013 New Revision: 59483 URL: http://svn.reactos.org/svn/reactos?rev=59483&view=rev Log: [BROWSEUI] - This is not Wine source. Remove hacks accordingly Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/browseui/bandsitemenu.cpp trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -1,8 +1,5 @@ set_cpp(WITH_RUNTIME) - -add_definitions( - -D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -38,12 +35,6 @@ ${SOURCE} browseui.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(browseui) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -40,7 +40,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu( HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - FIXME("(%p, %p, %p, %p, %p, %p)\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + FIXME("(%p, %p, %u, %u, %u, 0x%x)\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); return E_NOTIMPL; } @@ -53,7 +53,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) { - FIXME("(%p, %p, %p, %p, %p, %p)\n", this, idCmd, uType, pwReserved, pszName, cchMax); + FIXME("(%p, %p, %u, %p, %p, %u)\n", this, idCmd, uType, pwReserved, pszName, cchMax); return E_NOTIMPL; } @@ -65,6 +65,6 @@ HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam); + FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam, plResult); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -110,7 +110,7 @@ /*********************************************************************** * DllGetVersion (BROWSEUI.@) */ -HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +STDAPI DllGetVersion(DLLVERSIONINFO *info) { if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jul 14 13:18:32 2013 @@ -532,13 +532,6 @@ virtual HRESULT STDMETHODCALLTYPE get_Document(IDispatch **ppDisp); virtual HRESULT STDMETHODCALLTYPE get_TopLevelContainer(VARIANT_BOOL *pBool); virtual HRESULT STDMETHODCALLTYPE get_Type(BSTR *Type); - -// WIDL temp hack : when the interface contains 'long' WIDL writes it out as a 'LONG' -// Setting the prototype to LONG in this class breaks building with MSVC so we use -// the correct 'long' type here and temp hack it for WIDL generated prototypes. -#ifdef __exdisp_h__ -#define long LONG -#endif virtual HRESULT STDMETHODCALLTYPE get_Left(long *pl); virtual HRESULT STDMETHODCALLTYPE put_Left(long Left); virtual HRESULT STDMETHODCALLTYPE get_Top(long *pl); @@ -547,9 +540,6 @@ virtual HRESULT STDMETHODCALLTYPE put_Width(long Width); virtual HRESULT STDMETHODCALLTYPE get_Height(long *pl); virtual HRESULT STDMETHODCALLTYPE put_Height(long Height); -#ifdef __exdisp_h__ -#undef long -#endif virtual HRESULT STDMETHODCALLTYPE get_LocationName(BSTR *LocationName); virtual HRESULT STDMETHODCALLTYPE get_LocationURL(BSTR *LocationURL); virtual HRESULT STDMETHODCALLTYPE get_Busy(VARIANT_BOOL *pBool); @@ -612,9 +602,6 @@ virtual HRESULT STDMETHODCALLTYPE SaveHistory(IStream *pStream); virtual HRESULT STDMETHODCALLTYPE SetPositionCookie(DWORD dwPositioncookie); virtual HRESULT STDMETHODCALLTYPE GetPositionCookie(DWORD *pdwPositioncookie); - - // *** IBrowserService2 methods *** - // message handlers LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);

1 0

[tfaber] 59482: [IEFRAME][MSHTML_WINETEST] - Use SHANDLE_PTR in IWebBrowserApp::get_HWND. Already sent to Wine.
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 13:01:55 2013 New Revision: 59482 URL: http://svn.reactos.org/svn/reactos?rev=59482&view=rev Log: [IEFRAME][MSHTML_WINETEST] - Use SHANDLE_PTR in IWebBrowserApp::get_HWND. Already sent to Wine. Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt trunk/reactos/dll/win32/ieframe/ie.c trunk/reactos/dll/win32/ieframe/webbrowser.c trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -28,12 +28,6 @@ add_library(ieframe SHARED ${SOURCE} ieframe.rc) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(aclui) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_typelib(ieframe_v1.idl) list(APPEND ieframe_rc_deps Modified: trunk/reactos/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ie.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -358,7 +358,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { InternetExplorer *This = impl_from_IWebBrowser2(iface); FIXME("(%p)->(%p)\n", This, pHWND); Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows… ============================================================================== --- trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -565,7 +565,7 @@ return S_OK; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { WebBrowser *This = impl_from_IWebBrowser2(iface); Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -28,12 +28,6 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_winetest_rc_deps}") -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(mshtml_winetest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - target_link_libraries(mshtml_winetest wine uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32 ntdll) Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sun Jul 14 13:01:55 2013 @@ -4176,7 +4176,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND) +static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND) { ok(0, "unexpected call\n"); return E_NOTIMPL;

1 0

[tfaber] 59481: [CMAKE] - Do not allow add_delay_importlibs to be called on static libraries
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 11:44:21 2013 New Revision: 59481 URL: http://svn.reactos.org/svn/reactos?rev=59481&view=rev Log: [CMAKE] - Do not allow add_delay_importlibs to be called on static libraries Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59481&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 14 11:44:21 2013 @@ -211,11 +211,15 @@ endif() endfunction() -function(add_delay_importlibs MODULE) +function(add_delay_importlibs _module) + get_target_property(_module_type ${_module} TYPE) + if(_module_type STREQUAL "STATIC_LIBRARY") + message(FATAL_ERROR "Cannot add delay imports to a static library") + endif() foreach(LIB ${ARGN}) - target_link_libraries(${MODULE} lib${LIB}_delayed) + target_link_libraries(${_module} lib${LIB}_delayed) endforeach() - target_link_libraries(${MODULE} delayimp) + target_link_libraries(${_module} delayimp) endfunction() if(NOT ARCH STREQUAL "i386") Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59481… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jul 14 11:44:21 2013 @@ -128,13 +128,17 @@ #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Cp /Fo<OBJECT> /c /Ta <SOURCE>") -macro(add_delay_importlibs MODULE) +function(add_delay_importlibs _module) + get_target_property(_module_type ${_module} TYPE) + if(_module_type STREQUAL "STATIC_LIBRARY") + message(FATAL_ERROR "Cannot add delay imports to a static library") + endif() foreach(LIB ${ARGN}) - add_target_link_flags(${MODULE} "/DELAYLOAD:${LIB}.dll") - target_link_libraries(${MODULE} lib${LIB}) + add_target_link_flags(${_module} "/DELAYLOAD:${LIB}.dll") + target_link_libraries(${_module} lib${LIB}) endforeach() - target_link_libraries(${MODULE} delayimp) -endmacro() + target_link_libraries(${_module} delayimp) +endfunction() function(generate_import_lib _libname _dllname _spec_file)

1 0

[hbelusca] 59480: [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking ...
by hbelusca＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: hbelusca Date: Sun Jul 14 11:33:26 2013 New Revision: 59480 URL: http://svn.reactos.org/svn/reactos?rev=59480&view=rev Log: [WINSRV] Fix a delayed-imports problem, catched by Timo and Thomas with a MSVC build. Caused by the fact that the static library consrv specified delayed imports for it, thinking that they will be added to the list of delayed imports of winsrv. In fact it doesn't work and those imports become real imports. Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv.cmake Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sun Jul 14 11:33:26 2013 @@ -18,12 +18,13 @@ # Add the components target_link_libraries(winsrv consrv usersrv) -target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() +# Add win32ksys because of NtUser...() +target_link_libraries(winsrv win32ksys ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) set_module_type(winsrv win32dll UNICODE) -add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv) -add_delay_importlibs(winsrv user32 gdi32 advapi32) +add_importlibs(winsrv msvcrt kernel32 ntdll csrsrv ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv user32 gdi32 advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Jul 14 11:33:26 2013 @@ -45,8 +45,8 @@ add_library(consrv ${CONSRV_SOURCE}) #add_object_library(consrv ${CONSRV_SOURCE}) -add_importlibs(consrv psapi) # And the default ones from winsrv -add_delay_importlibs(consrv ole32) # And the default ones from winsrv -target_link_libraries(consrv uuid) # And the default ones from winsrv +list(APPEND CONSRV_IMPORT_LIBS psapi) +list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32) +list(APPEND CONSRV_TARGET_LINK_LIBS uuid) set_module_type(consrv module UNICODE)

1 0

[tfaber] 59479: [MSHTML_WINETEST] - Use winetest_interactive to disable tests
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 10:11:45 2013 New Revision: 59479 URL: http://svn.reactos.org/svn/reactos?rev=59479&view=rev Log: [MSHTML_WINETEST] - Use winetest_interactive to disable tests Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Sun Jul 14 10:11:45 2013 @@ -2435,14 +2435,18 @@ /* Set in DoVerb */ CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); -#if ROSTESTS_114_IS_FIXED - test_ui_activate(); - test_container(notif_doc); - test_object_elem(notif_doc); -#endif - win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); - win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); - win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + if (winetest_interactive) + { + test_ui_activate(); + test_container(notif_doc); + test_object_elem(notif_doc); + } + else + { + skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); + skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); + skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + } SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); @@ -2557,10 +2561,10 @@ CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(Advise); -#if ROSTESTS_114_IS_FIXED - test_event_call(); -#endif - win_skip("Skipping test_event_call(). ROSTESTS-114.\n"); + if (winetest_interactive) + test_event_call(); + else + skip("Skipping test_event_call(). ROSTESTS-114.\n"); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sun Jul 14 10:11:45 2013 @@ -7574,17 +7574,21 @@ test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); -#if ROSTESTS_113_IS_FIXED - test_editing_mode(FALSE); -#endif - win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); + if (winetest_interactive) + test_editing_mode(FALSE); + else + skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); test_editing_mode(TRUE); -#if ROSTESTS_113_IS_FIXED - test_HTMLDocument_http(FALSE); - test_HTMLDocument_http(TRUE); -#endif - win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); - win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + if (winetest_interactive) + { + test_HTMLDocument_http(FALSE); + test_HTMLDocument_http(TRUE); + } + else + { + skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); + skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + } test_UIActivate(FALSE, FALSE, FALSE); test_UIActivate(FALSE, TRUE, FALSE);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs