Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 49410: [PORTCLS] - Dear lawyers / worried developers, this is the XP DDK Version.
by janderwald＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: janderwald Date: Mon Nov 1 17:33:06 2010 New Revision: 49410 URL: http://svn.reactos.org/svn/reactos?rev=49410&view=rev Log: [PORTCLS] - Dear lawyers / worried developers, this is the XP DDK Version. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Mon Nov 1 17:33:06 2010 @@ -46,7 +46,6 @@ const BOOLEAN COMMAND = TRUE; const BOOLEAN DATA = FALSE; - const ULONG kMPUInputBufferSize = 128;

1 0

[jgardou] 49409: [CMAKE] - build msvc importlibs explicitly from def file - circumvent lack of pseh lib in MSVC. - fix advapi32.def
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 17:24:32 2010 New Revision: 49409 URL: http://svn.reactos.org/svn/reactos?rev=49409&view=rev Log: [CMAKE] - build msvc importlibs explicitly from def file - circumvent lack of pseh lib in MSVC. - fix advapi32.def Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/advapi32.def branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/drivers/base/null/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -12,7 +12,7 @@ add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE}) -target_link_libraries(eventlog eventlogrpc_server pseh) +target_link_libraries(eventlog eventlogrpc_server ${PSEH_LIB}) add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -14,7 +14,7 @@ add_executable(rpcss ${SOURCE}) -target_link_libraries(rpcss epm_server irot_server pseh wine) +target_link_libraries(rpcss epm_server irot_server ${PSEH_LIB} wine) set_module_type(rpcss win32cui) Modified: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -6,7 +6,7 @@ add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) -target_link_libraries(umpnpmgr pnp_server wdmguid pseh) +target_link_libraries(umpnpmgr pnp_server wdmguid ${PSEH_LIB}) set_module_type(umpnpmgr win32cui) add_importlibs(umpnpmgr Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -4,7 +4,7 @@ add_executable(wlansvc wlansvc.c rpcserver.c) -target_link_libraries(wlansvc wlansvc_server pseh) +target_link_libraries(wlansvc wlansvc_server ${PSEH_LIB}) set_module_type(wlansvc win32cui) add_importlibs(wlansvc Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -3,7 +3,7 @@ add_executable(vmwinst vmwinst.c vmwinst.rc) -target_link_libraries(vmwinst pseh) +target_link_libraries(vmwinst ${PSEH_LIB}) set_module_type(vmwinst win32gui) add_importlibs(vmwinst Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -16,7 +16,7 @@ target_link_libraries(services svcctl_server - pseh) + ${PSEH_LIB}) add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE}) Modified: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -50,7 +50,7 @@ strmiids uuid wine - pseh) + ${PSEH_LIB}) add_importlibs(quartz msvcrt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -48,11 +48,11 @@ target_link_libraries(ntdll ntdllsys libcntpr - pseh) + ${PSEH_LIB}) add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus) add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) -add_importlib_target(ntdll) +add_importlib_def(${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -13,7 +13,7 @@ actxprxy_proxy uuid wine - pseh) + ${PSEH_LIB}) add_importlibs(actxprxy rpcrt4 Modified: branches/cmake-bringup/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/advapi32.def [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -241,7 +241,7 @@ GetEffectiveRightsFromAclA GetEffectiveRightsFromAclW GetEventLogInformation - GetExplicitEntriesFromAclAadvapi32.GetExplicitEntriesFromAclW + GetExplicitEntriesFromAclA=GetExplicitEntriesFromAclW GetExplicitEntriesFromAclW GetFileSecurityA GetFileSecurityW @@ -271,7 +271,7 @@ GetSecurityDescriptorControl GetSecurityDescriptorDacl GetSecurityDescriptorGroup - GetSecurityDescriptorLengthtdll.RtlLengthSecurityDescriptor + GetSecurityDescriptorLengtht=ntdll.RtlLengthSecurityDescriptor GetSecurityDescriptorOwner GetSecurityDescriptorRMControl GetSecurityDescriptorSacl @@ -321,7 +321,7 @@ InitiateSystemShutdownW InstallApplication=__wine_stub_advapi32_dll_318 IsProcessRestricted=__wine_stub_advapi32_dll_319 - IsTextUnicodentdll.RtlIsTextUnicode + IsTextUnicode=ntdll.RtlIsTextUnicode IsTokenRestricted IsTokenUntrusted=__wine_stub_advapi32_dll_322 IsValidAcl @@ -418,7 +418,7 @@ MakeAbsoluteSD MakeAbsoluteSD2 MakeSelfRelativeSD - MapGenericMasktdll.RtlMapGenericMask + MapGenericMask=ntdll.RtlMapGenericMask NotifyBootConfigStatus NotifyChangeEventLog ObjectCloseAuditAlarmA Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -45,7 +45,7 @@ target_link_libraries(crypt32 wine - pseh + ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -46,7 +46,7 @@ target_link_libraries(dbghelp wine - pseh + ${PSEH_LIB} oldnames) add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -50,7 +50,7 @@ target_link_libraries(gdi32 win32ksys dxguid - pseh) + ${PSEH_LIB}) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -115,10 +115,10 @@ set_module_type(kernel32 win32dll) -target_link_libraries(kernel32 pseh) +target_link_libraries(kernel32 ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes) add_cab_target(kernel32 1) -add_importlib_target(kernel32) +add_importlib_def(${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -20,7 +20,7 @@ target_link_libraries(lsasrv lsa_server wine - pseh) + ${PSEH_LIB}) add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -24,7 +24,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.def crt wine - pseh) + ${PSEH_LIB}) add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_importlibs(msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -68,7 +68,7 @@ irot_client ole32_proxy uuid - pseh) + ${PSEH_LIB}) add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -53,7 +53,7 @@ wine wineldr uuid - pseh) + ${PSEH_LIB}) add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -15,7 +15,7 @@ target_link_libraries(psapi epsapi - pseh) + ${PSEH_LIB}) add_importlibs(psapi kernel32 ntdll) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ wine uuid epm_client - pseh) + ${PSEH_LIB}) add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) add_dependencies(rpcrt4 winesdk) Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ pnp_client uuid wine - pseh) + ${PSEH_LIB}) add_importlibs(setupapi msvcrt Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -25,7 +25,7 @@ sti_proxy wine uuid - pseh) + ${PSEH_LIB}) add_importlibs(sti ole32 Modified: branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -18,7 +18,7 @@ target_link_libraries(syssetup uuid - pseh) + ${PSEH_LIB}) add_importlibs(syssetup msvcrt Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -40,7 +40,7 @@ urlmon_proxy uuid wine - pseh) + ${PSEH_LIB}) add_importlibs(urlmon rpcrt4 Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -77,7 +77,7 @@ target_link_libraries(user32 wine win32ksys - pseh) + ${PSEH_LIB}) add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -30,7 +30,7 @@ target_link_libraries(wininet wine zlib - pseh) + ${PSEH_LIB}) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -23,7 +23,7 @@ target_link_libraries(winmm wine - pseh) + ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -17,7 +17,7 @@ target_link_libraries(wintrust wine - pseh) + ${PSEH_LIB}) add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -11,7 +11,7 @@ target_link_libraries(wlanapi wlansvc_client wine - pseh) + ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi psdk buildno_header) Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null… ============================================================================== --- branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -6,7 +6,7 @@ set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") target_link_libraries(null - pseh + ${PSEH_LIB} -lntoskrnl -lhal) Modified: branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -28,7 +28,7 @@ set_target_properties(fastfat_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(fastfat_new - pseh + ${PSEH_LIB} fullfat) add_importlibs(fastfat_new ntoskrnl hal) Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd… ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -9,7 +9,7 @@ set_module_type(kbdclass kernelmodedriver) -target_link_libraries(kbdclass pseh) +target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mou… ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -8,7 +8,7 @@ set_module_type(mouclass kernelmodedriver) -target_link_libraries(mouclass pseh) +target_link_libraries(mouclass ${PSEH_LIB}) add_importlibs(mouclass ntoskrnl hal) Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -33,7 +33,7 @@ target_link_libraries(ks ${CMAKE_CURRENT_SOURCE_DIR}/ks.def - pseh) + ${PSEH_LIB}) add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes) Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/a… ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -22,7 +22,7 @@ set_module_type(afd kernelmodedriver) target_link_libraries(afd - pseh + ${PSEH_LIB} -lntoskrnl -lhal) Modified: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -31,7 +31,7 @@ target_link_libraries(tcpip ip oskittcp - pseh + ${PSEH_LIB} chew -lndis -lntoskrnl Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -36,7 +36,7 @@ spec2def(classpnp.sys class.spec) add_library(classpnp SHARED ${SOURCE}) -target_link_libraries(classpnp pseh libcntpr) +target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -51,7 +51,7 @@ target_link_libraries(portcls libcntpr - pseh) + ${PSEH_LIB}) if(MSVC) set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-") Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -17,7 +17,7 @@ target_link_libraries(wdmaud mmixer libcntpr - pseh) + ${PSEH_LIB}) add_importlibs(wdmaud ntoskrnl ks hal) add_dependencies(wdmaud psdk bugcodes) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -157,8 +157,11 @@ set(IDL_SERVER_ARG -s -S) #.c for server library set(IDL_CLIENT_ARG -c -C) #.c for stub client library -macro(add_importlib_target _name) +macro(add_importlib_def _def_file) # empty for now, while import libs are shipped endmacro() +#pseh lib, needed with mingw +set(PSEH_LIB "pseh") + endif() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -82,25 +82,26 @@ set(IDL_CLIENT_ARG /cstub) #.c for stub client library -macro(add_importlib_target _name) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_name}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def - ) - add_custom_target(lib${_name} - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib +macro(add_importlib_def _def_file) + get_filename_component(_name ${_def_file} NAME_WE) + add_custom_target( + lib${_name} + COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + DEPENDS ${_def_file} ) endmacro() macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) - add_dependencies(${MODULE} lib${LIB}) + #add_dependencies(${MODULE} lib${LIB}) endforeach() endmacro() file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) +#pseh workaround +set(PSEH_LIB "") + endif() Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -409,7 +409,7 @@ target_link_libraries(ntoskrnl cportlib csq - pseh + ${PSEH_LIB} cmlib rtl rossym Modified: branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -15,7 +15,7 @@ add_library(csrsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/csrsrv_srv.h.gch ${SOURCE}) -target_link_libraries(csrsrv pseh) +target_link_libraries(csrsrv ${PSEH_LIB}) set_module_type(csrsrv nativedll) Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -31,7 +31,7 @@ target_link_libraries(win32csr win32ksys - pseh) + ${PSEH_LIB}) set_module_type(win32csr win32dll) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Mon Nov 1 17:24:32 2010 @@ -181,7 +181,7 @@ target_link_libraries(win32k ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def - pseh + ${PSEH_LIB} dxguid libcntpr)

1 0

[tkreuzer] 49408: [HAL] Make systimer.S ML compatible. Replace most hardcoded numerical values with proper symbolic constants.
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 16:42:53 2010 New Revision: 49408 URL: http://svn.reactos.org/svn/reactos?rev=49408&view=rev Log: [HAL] Make systimer.S ML compatible. Replace most hardcoded numerical values with proper symbolic constants. Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S Modified: branches/cmake-bringup/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/halx86/generi… ============================================================================== --- branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ branches/cmake-bringup/hal/halx86/generic/i386/systimer.S [iso-8859-1] Mon Nov 1 16:42:53 2010 @@ -7,12 +7,41 @@ /* INCLUDES ******************************************************************/ -#include <asm.h> -.intel_syntax noprefix +#include <reactos/asm.h> +#include <ndk/asm.h> + +EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC +EXTERN _HalpReleaseCmosSpinLock@0:PROC +EXTERN _DbgBreakPoint@0:PROC +EXTERN _HalpCurrentRollOver:DWORD +EXTERN _HalpPerfCounterCutoff:DWORD + +#define PIC1_BASE HEX(20) /* IO base address for master PIC */ +#define PIC2_BASE HEX(A0) /* IO base address for slave PIC */ +#define PIC1_COMMAND PIC1_BASE +#define PIC1_DATA (PIC1_BASE+1) +#define PIC2_COMMAND PIC2_BASE +#define PIC2_DATA (PIC2_BASE+1) +#define PIC_EOI HEX(20) +#define PIC_SPECIFIC_EOI2 HEX(62) + +#define CMOS_ADDR HEX(70) +#define CMOS_DATA HEX(71) +#define CMOS_REGISTER_A HEX(0A) +#define CMOS_REGISTER_B HEX(0B) +#define CMOS_REGISTER_C HEX(0C) +#define CMOS_REGISTER_D HEX(0D) + +#define PIT_CH0 HEX(40) +#define PIT_MODE HEX(43) +#define SYSTEM_CTRL_PORT_A HEX(92) /* GLOBALS *******************************************************************/ -.globl _HalpPerfCounter +.data +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING + +PUBLIC _HalpPerfCounter _HalpLastPerfCounterLow: .long 0 _HalpLastPerfCounterHigh: .long 0 _HalpPerfCounter: @@ -22,8 +51,8 @@ /* FUNCTIONS *****************************************************************/ -.global _HalpCalibrateStallExecution@0 -.func HalpCalibrateStallExecution@0 +.code +PUBLIC _HalpCalibrateStallExecution@0 _HalpCalibrateStallExecution@0: /* Setup the stack frame */ @@ -37,27 +66,27 @@ /* Get the current interrupt mask on the PICs */ xor eax, eax - in al, 0xA1 + in al, PIC2_DATA shl eax, 8 - in al, 0x21 + in al, PIC1_DATA /* Save it */ push eax /* Now mask everything except the RTC and PIC 2 chain-interrupt */ - mov eax, ~((1 << 2) | (1 << 8)) + mov eax, NOT (HEX(04) OR HEX(100)) /* Program the PICs */ - out 0x21, al + out PIC1_DATA, al shr eax, 8 - out 0xA1, al + out PIC2_DATA, al /* Now get the IDT */ sidt [ebp-8] mov ecx, [ebp-6] /* Get the IDT entry for the RTC */ - mov eax, 0x38 + mov eax, HEX(38) shl eax, 3 add ecx, eax @@ -70,7 +99,7 @@ mov eax, offset OnlyOnePersonCanWriteHalCode mov [ecx], ax mov word ptr [ecx+2], KGDT_R0_CODE - mov word ptr [ecx+4], 0x8E00 + mov word ptr [ecx+4], HEX(08E00) shr eax, 16 mov [ecx+6], ax @@ -81,18 +110,18 @@ call _HalpAcquireSystemHardwareSpinLock@0 /* Now initialize register A on the CMOS */ - mov ax, (0x2D << 8) | 0xA - out 0x70, al + mov ax, HEX(2D00) OR CMOS_REGISTER_A + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 + mov ax, CMOS_REGISTER_B + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Don't touch the LastKnownGoodConfig hack */ @@ -100,28 +129,28 @@ mov ah, al /* Enable the interrupt */ - or ah, 0x42 + or ah, HEX(42) /* Now write the register B */ - mov al, 0xB - out 0x70, al + mov al, CMOS_REGISTER_B + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 + mov al, CMOS_REGISTER_C + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Read register D */ - mov al, 0xD - out 0x70, al - jmp $+2 - in al, 0x71 + mov al, CMOS_REGISTER_D + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Release CMOS lock */ @@ -169,18 +198,18 @@ call _HalpAcquireSystemHardwareSpinLock@0 /* Now initialize register A on the CMOS */ - mov ax, (0x2D << 8) | 0xA - out 0x70, al + mov ax, HEX(2D00) OR CMOS_REGISTER_A + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 + mov ax, CMOS_REGISTER_B + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Don't touch the LastKnownGoodConfig hack */ @@ -188,38 +217,38 @@ mov ah, al /* Enable the interrupt */ - or ah, 0x42 + or ah, HEX(42) /* Now write the register B */ - mov al, 0xB - out 0x70, al + mov al, CMOS_REGISTER_B + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 + mov al, CMOS_REGISTER_C + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Read register D */ - mov al, 0xD - out 0x70, al - jmp $+2 - in al, 0x71 + mov al, CMOS_REGISTER_D + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Release CMOS lock */ call _HalpReleaseCmosSpinLock@0 /* Dismiss the interrupt */ - mov al, 0x20 - out 0xA0, al - mov al, 0x62 - out 0x20, al + mov al, PIC_EOI + out PIC2_COMMAND, al + mov al, PIC_SPECIFIC_EOI2 + out PIC1_COMMAND, al /* Reset the counter and return back to the looper */ xor eax, eax @@ -248,24 +277,24 @@ /* Prepare for interrupt return */ pop eax push offset AndItsNotYou - mov eax, 0x13 + mov eax, HEX(13) /* Acquire CMOS lock */ call _HalpAcquireSystemHardwareSpinLock@0 /* Now initialize register A on the CMOS */ - mov ax, (0x2D << 8) | 0xA - out 0x70, al + mov ax, HEX(2D00) OR CMOS_REGISTER_A + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register B */ - mov ax, 0xB - out 0x70, al - jmp $+2 - in al, 0x71 + mov ax, CMOS_REGISTER_B + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Don't touch the LastKnownGoodConfig hack */ @@ -273,34 +302,34 @@ mov ah, al /* Disable the interrupt */ - or ah, 0x2 + or ah, 2 /* Now write the register B */ - mov al, 0xB - out 0x70, al + mov al, CMOS_REGISTER_B + out CMOS_ADDR, al jmp $+2 mov al, ah - out 0x71, al + out CMOS_DATA, al jmp $+2 /* Read register C */ - mov al, 0xC - out 0x70, al - jmp $+2 - in al, 0x71 + mov al, CMOS_REGISTER_C + out CMOS_ADDR, al + jmp $+2 + in al, CMOS_DATA jmp $+2 /* Release CMOS lock */ call _HalpReleaseCmosSpinLock@0 /* Dismiss the interrupt */ - mov al, 0x20 - out 0xA0, al - mov al, 0x62 - out 0x20, al + mov al, PIC_EOI + out PIC2_COMMAND, al + mov al, PIC_SPECIFIC_EOI2 + out PIC1_COMMAND, al /* Disable interrupts on return */ - and word ptr [esp+8], ~EFLAGS_INTERRUPT_MASK + and word ptr [esp+8], NOT EFLAGS_INTERRUPT_MASK iretd /************************* WE ARE BACK FROM RTC ***************************/ @@ -313,9 +342,9 @@ /* Restore the mask */ pop eax - out 0x21, al + out PIC1_DATA, al shr eax, 8 - out 0xA1, al + out PIC2_DATA, al /* Restore EFLAGS */ popf @@ -324,11 +353,10 @@ mov esp, ebp pop ebp ret -.endfunc + #ifndef _MINIHAL_ -.globl _KeStallExecutionProcessor@4 -.func KeStallExecutionProcessor@4 +PUBLIC _KeStallExecutionProcessor@4 _KeStallExecutionProcessor@4: /* Get the number of microseconds required */ @@ -356,11 +384,9 @@ Done: /* Return */ ret 4 -.endfunc #endif -.global _KeQueryPerformanceCounter@4 -.func KeQueryPerformanceCounter@4 +PUBLIC _KeQueryPerformanceCounter@4 _KeQueryPerformanceCounter@4: /* Check if we were called too early */ @@ -380,20 +406,20 @@ LoopPostInt: /* Get the current value */ - mov ebx, _HalpPerfCounterLow - mov esi, _HalpPerfCounterHigh + mov ebx, dword ptr _HalpPerfCounterLow + mov esi, dword ptr _HalpPerfCounterHigh /* Read 8254 timer */ - mov al, 0 - out 0x43, al - in al, 0x92 - or al, _HalpPerfCounterCutoff - out 0x92, al - jmp $+2 - in al, 0x40 + mov al, 0 /* Interrupt on terminal count */ + out PIT_MODE, al + in al, SYSTEM_CTRL_PORT_A + or al, byte ptr _HalpPerfCounterCutoff + out SYSTEM_CTRL_PORT_A, al + jmp $+2 + in al, PIT_CH0 jmp $+2 movzx ecx, al - in al, 0x40 + in al, PIT_CH0 mov ch, al /* Enable interrupts and do a short wait */ @@ -406,8 +432,8 @@ cli /* Get the counter value again */ - mov eax, _HalpPerfCounterLow - mov edx, _HalpPerfCounterHigh + mov eax, dword ptr _HalpPerfCounterLow + mov edx, dword ptr _HalpPerfCounterHigh /* Check if someone updated the counter */ cmp eax, ebx @@ -417,7 +443,7 @@ /* Check if the current 8254 value causes rollover */ neg ecx - add ecx, _HalpCurrentRollOver + add ecx, dword ptr _HalpCurrentRollOver jnb DoRollOver SetSum: @@ -427,19 +453,19 @@ adc edx, 0 /* Check if we're above or below the last high value */ - cmp edx, _HalpLastPerfCounterHigh + cmp edx, dword ptr _HalpLastPerfCounterHigh jb short BelowHigh jnz short BelowLow /* Check if we're above or below the last low value */ - cmp eax, _HalpLastPerfCounterLow + cmp eax, dword ptr _HalpLastPerfCounterLow jb BelowHigh BelowLow: /* Update the last value and bring back interrupts */ - mov _HalpLastPerfCounterLow, eax - mov _HalpLastPerfCounterHigh, edx + mov dword ptr _HalpLastPerfCounterLow, eax + mov dword ptr _HalpLastPerfCounterHigh, edx popf /* Check if caller wants frequency */ @@ -469,7 +495,7 @@ /* We might have an incoming interrupt, save EFLAGS and reset rollover */ mov esi, [esp] - mov ecx, _HalpCurrentRollOver + mov ecx, dword ptr _HalpCurrentRollOver popf /* Check if interrupts were enabled and try again */ @@ -483,8 +509,8 @@ BelowHigh: /* Get the last counter values */ - mov ebx, _HalpLastPerfCounterLow - mov esi, _HalpLastPerfCounterHigh + mov ebx, dword ptr _HalpLastPerfCounterLow + mov esi, dword ptr _HalpLastPerfCounterHigh /* Check if the previous value was 0 and go back if yes */ mov ecx, ebx @@ -495,7 +521,7 @@ sub ebx, eax sbb esi, edx jnz InvalidCount - cmp ebx, _HalpCurrentRollOver + cmp ebx, dword ptr _HalpCurrentRollOver jg InvalidCount /* Fixup the count with the last known value */ @@ -517,7 +543,8 @@ InvalidCount: popf xor eax, eax - mov _HalpLastPerfCounterLow, eax - mov _HalpLastPerfCounterHigh, eax + mov dword ptr _HalpLastPerfCounterLow, eax + mov dword ptr _HalpLastPerfCounterHigh, eax jmp LoopPreInt -.endfunc + +END

1 0

[tkreuzer] 49407: [CMAKE] set custom command to compile asm files for MSVC toolchain. They are being preprocessed first.
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 16:40:30 2010 New Revision: 49407 URL: http://svn.reactos.org/svn/reactos?rev=49407&view=rev Log: [CMAKE] set custom command to compile asm files for MSVC toolchain. They are being preprocessed first. Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Nov 1 16:40:30 2010 @@ -34,6 +34,10 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /h <OBJECT> <SOURCE>") +SET(CMAKE_ASM_COMPILE_OBJECT + "<CMAKE_C_COMPILER> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <OBJECT>.tmp") + set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")

1 0

[jgardou] 49406: [CMAKE] - put advapi32.def into source files.
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 16:32:32 2010 New Revision: 49406 URL: http://svn.reactos.org/svn/reactos?rev=49406&view=rev Log: [CMAKE] - put advapi32.def into source files. Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Mon Nov 1 16:32:32 2010 @@ -40,7 +40,12 @@ token/privilege.c token/token.c advapi32_stubs.c - advapi32.rc) + advapi32.rc + advapi32.def) + +if(NOT MSVC) + set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(advapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch @@ -49,12 +54,11 @@ set_module_type(advapi32 win32dll) target_link_libraries(advapi32 - ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def svcctl_client lsa_client eventlogrpc_client wine - pseh) + ${PSEH_LIB}) add_importlibs(advapi32 rpcrt4 kernel32 ntdll)

1 0

[tkreuzer] 49405: [CMAKE] When PreLoad.cmake is run, the CMAKE_CURRENT_SOURCE_DIR points to the directory, where the cmake command was executed (bug?). To get the root folder of reactos, use CMAKE_...
by tkreuzer＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: tkreuzer Date: Mon Nov 1 15:15:02 2010 New Revision: 49405 URL: http://svn.reactos.org/svn/reactos?rev=49405&view=rev Log: [CMAKE] When PreLoad.cmake is run, the CMAKE_CURRENT_SOURCE_DIR points to the directory, where the cmake command was executed (bug?). To get the root folder of reactos, use CMAKE_CURRENT_LIST_FILE, which points to PreLoad.cmake in the root folder. Modified: branches/cmake-bringup/PreLoad.cmake Modified: branches/cmake-bringup/PreLoad.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/PreLoad.cmake?rev… ============================================================================== --- branches/cmake-bringup/PreLoad.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/PreLoad.cmake [iso-8859-1] Mon Nov 1 15:15:02 2010 @@ -1,7 +1,10 @@ -#message("PreLoad.cmake ...") +# small trick to get the real source directory at this stage +STRING(REPLACE "/PreLoad.cmake" "" REACTOS_HOME_DIR ${CMAKE_CURRENT_LIST_FILE}) -SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules" CACHE INTERNAL "") +#message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}") + +SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake/Modules" CACHE INTERNAL "") #message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")

1 0

[fireball] 49404: - Stop abusing non paged pool in arwinss. - Fix different time units usage in message queue code. - My timeout implementation still s..ks b..ls. See issue #5222 for more details.
by fireball＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: fireball Date: Mon Nov 1 14:36:45 2010 New Revision: 49404 URL: http://svn.reactos.org/svn/reactos?rev=49404&view=rev Log: - Stop abusing non paged pool in arwinss. - Fix different time units usage in message queue code. - My timeout implementation still s..ks b..ls. See issue #5222 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -129,11 +129,20 @@ KDPC Dpc; }; -enum timeout_t; typedef PKDEFERRED_ROUTINE timeout_callback; #define TICKS_PER_SEC 10000000 void remove_timeout_user( struct timeout_user *user ); struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); + +VOID FORCEINLINE +get_current_time(timeout_t *value) +{ + LARGE_INTEGER time; + KeQuerySystemTime(&time); + + *value = time.QuadPart / 10; +} + thread_id_t get_thread_id (PTHREADINFO Thread); process_id_t get_process_id(PPROCESSINFO Process); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -278,7 +278,7 @@ queue->timeout = NULL; queue->input = (struct thread_input *)grab_object( input ); queue->hooks = NULL; - KeQuerySystemTime((PLARGE_INTEGER)&queue->last_get_msg); + get_current_time(&queue->last_get_msg); list_init( &queue->send_result ); list_init( &queue->callback_result ); list_init( &queue->pending_timers ); @@ -585,7 +585,7 @@ struct msg_queue *recv_queue, struct message *msg, timeout_t timeout ) { - struct message_result *result = ExAllocatePool( NonPagedPool, sizeof(*result) ); + struct message_result *result = ExAllocatePool( PagedPool, sizeof(*result) ); if (result) { result->msg = msg; @@ -804,11 +804,11 @@ static int is_queue_hung( struct msg_queue *queue ) { //struct wait_queue_entry *entry; - LARGE_INTEGER current_time; - - KeQuerySystemTime(&current_time); - - if (current_time.QuadPart - queue->last_get_msg <= 5 * TICKS_PER_SEC) + timeout_t current_time; + + get_current_time(&current_time); + + if (current_time - queue->last_get_msg <= 5 * TICKS_PER_SEC) return 0; /* less than 5 seconds since last get message -> not hung */ #if 0 @@ -1097,8 +1097,6 @@ struct msg_queue *queue = Context; PQUEUE_WORKER_CONTEXT work_context; - ASSERT(queue); - /* Allocate memory for the work iteam */ work_context = ExAllocatePool(NonPagedPool, sizeof(QUEUE_WORKER_CONTEXT)); @@ -1133,11 +1131,11 @@ /* restart an expired timer */ static void restart_timer( struct msg_queue *queue, struct timer *timer ) { - LARGE_INTEGER current_time; - KeQuerySystemTime(&current_time); + timeout_t current_time; + get_current_time(&current_time); list_remove( &timer->entry ); - while (timer->when <= current_time.QuadPart) timer->when += (timeout_t)timer->rate * 10000; + while (timer->when <= current_time) timer->when += (timeout_t)timer->rate * 10000; link_timer( queue, timer ); set_next_timer( queue ); } @@ -1165,15 +1163,15 @@ /* add a timer */ static struct timer *set_timer( struct msg_queue *queue, unsigned int rate ) { - LARGE_INTEGER current_time; + timeout_t current_time; struct timer *timer; - KeQuerySystemTime(&current_time); + get_current_time(&current_time); timer = mem_alloc( sizeof(*timer) ); if (timer) { timer->rate = max( rate, 1 ); - timer->when = current_time.QuadPart + (timeout_t)timer->rate * 10000; + timer->when = current_time + (timeout_t)timer->rate * 10000; link_timer( queue, timer ); /* check if we replaced the next timer */ if (list_head( &queue->pending_timers ) == &timer->entry) set_next_timer( queue ); @@ -1564,7 +1562,7 @@ if (!thread) return; - if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = MSG_POSTED; msg->win = get_user_full_handle( win ); @@ -1591,7 +1589,7 @@ { struct message *msg; - if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { struct winevent_msg_data *data; @@ -1753,7 +1751,7 @@ return; } - if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if ((msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = req->type; msg->win = get_user_full_handle( req->win ); @@ -1844,7 +1842,7 @@ data->y = req->y; data->info = req->info; - if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) + if ((msg = ExAllocatePool( PagedPool, sizeof(*msg) ))) { msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( req->win ); @@ -1878,7 +1876,7 @@ /* get a message from the current queue */ DECL_HANDLER(get_message) { - LARGE_INTEGER current_time; + timeout_t current_time; struct timer *timer; struct list *ptr; PPROCESSINFO process = PsGetCurrentProcessWin32Process(); @@ -1889,8 +1887,8 @@ reply->active_hooks = get_active_hooks(); if (!queue) return; - KeQuerySystemTime(&current_time); - queue->last_get_msg = current_time.QuadPart; + get_current_time(&current_time); + queue->last_get_msg = current_time; if (!filter) filter = QS_ALLINPUT; /* first check for sent messages */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Mon Nov 1 14:36:45 2010 @@ -54,12 +54,12 @@ LARGE_INTEGER DueTime; struct timeout_user *TimeoutUser; - DueTime.QuadPart = (LONGLONG)when; - - DPRINT("add_timeout_user(when %I64d, func %p)\n", when, func); + DueTime.QuadPart = (LONGLONG)when * 10; /* Allocate memory for timeout structure */ TimeoutUser = ExAllocatePool(NonPagedPool, sizeof(struct timeout_user)); + + //DPRINT1("add_timeout_user(%p when %I64d, diff %I64d msecs, func %p)\n", TimeoutUser, when, secs, func); /* Initialize timer and DPC objects */ KeInitializeTimer(&TimeoutUser->Timer); @@ -74,7 +74,7 @@ /* remove a timeout user */ void remove_timeout_user( struct timeout_user *user ) { - DPRINT("remove_timeout_user %p\n", user); + //DPRINT1("remove_timeout_user %p, current time %I64d\n", user, current_time); /* Cancel the timer */ KeCancelTimer(&user->Timer);

1 0

[ekohl] 49403: [ADVAPI32] Implement LsaAddAccountRights(), LsaQueryTrustedDomainInfoByName() and LsaRemoveAccountRights().
by ekohl＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: ekohl Date: Mon Nov 1 14:09:33 2010 New Revision: 49403 URL: http://svn.reactos.org/svn/reactos?rev=49403&view=rev Log: [ADVAPI32] Implement LsaAddAccountRights(), LsaQueryTrustedDomainInfoByName() and LsaRemoveAccountRights(). Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Mon Nov 1 14:09:33 2010 @@ -143,18 +143,37 @@ /* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaAddAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights) -{ - FIXME("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); - return STATUS_OBJECT_NAME_NOT_FOUND; + * @implemented + */ +NTSTATUS +WINAPI +LsaAddAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN PLSA_UNICODE_STRING UserRights, + IN ULONG CountOfRights) +{ + LSAPR_USER_RIGHT_SET UserRightSet; + NTSTATUS Status; + + TRACE("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); + + UserRightSet.Entries = CountOfRights; + UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; + + RpcTryExcept + { + Status = LsarAddAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + &UserRightSet); + + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -265,6 +284,7 @@ return STATUS_SUCCESS; } + /* * @implemented */ @@ -291,16 +311,16 @@ return Status; } -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaEnumerateAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - PLSA_UNICODE_STRING *UserRights, - PULONG CountOfRights) + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaEnumerateAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + OUT PLSA_UNICODE_STRING *UserRights, + OUT PULONG CountOfRights) { LSAPR_USER_RIGHT_SET UserRightsSet; NTSTATUS Status; @@ -332,6 +352,7 @@ return Status; } + /* * @unimplemented @@ -385,16 +406,18 @@ return STATUS_SUCCESS; } -/* - * @implemented - */ -NTSTATUS -WINAPI -LsaFreeMemory(PVOID Buffer) + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaFreeMemory(IN PVOID Buffer) { TRACE("(%p)\n", Buffer); return RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } + /* * @implemented @@ -446,6 +469,7 @@ return Status; } + /* * @unimplemented */ @@ -470,8 +494,9 @@ return STATUS_NONE_MAPPED; } -/* - * @unmplemented + +/* + * @implemented */ NTSTATUS WINAPI @@ -503,6 +528,7 @@ return Status; } + /* * @implemented @@ -534,6 +560,7 @@ return Status; } + /* * @implemented @@ -591,6 +618,7 @@ return Status; } + /****************************************************************************** * LsaNtStatusToWinError * @@ -599,7 +627,8 @@ * * @implemented */ -ULONG WINAPI +ULONG +WINAPI LsaNtStatusToWinError(IN NTSTATUS Status) { TRACE("(%lx)\n", Status); @@ -747,6 +776,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* * @implemented */ @@ -782,20 +812,6 @@ return Status; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaQueryTrustedDomainInfoByName( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - TRUSTED_INFORMATION_CLASS InformationClass, - PVOID *Buffer) -{ - FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); - return STATUS_OBJECT_NAME_NOT_FOUND; -} /* * @unimplemented @@ -812,21 +828,77 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaRemoveAccountRights( - LSA_HANDLE PolicyHandle, - PSID AccountSid, - BOOLEAN AllRights, - PLSA_UNICODE_STRING UserRights, - ULONG CountOfRights) -{ - FIXME("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaQueryTrustedDomainInfoByName(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN TRUSTED_INFORMATION_CLASS InformationClass, + OUT PVOID *Buffer) +{ + NTSTATUS Status; + + TRACE("(%p,%p,%d,%p)\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); + + if (InformationClass == TrustedDomainAuthInformationInternal || + InformationClass == TrustedDomainFullInformationInternal) + return STATUS_INVALID_INFO_CLASS; + + RpcTryExcept + { + Status = LsarQueryTrustedDomainInfoByName((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)TrustedDomainName, + InformationClass, + (unsigned long *)Buffer); // Shuld be: (PLSAPR_POLICY_INFORMATION *)Buffer + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaRemoveAccountRights(IN LSA_HANDLE PolicyHandle, + IN PSID AccountSid, + IN BOOLEAN AllRights, + IN PLSA_UNICODE_STRING UserRights, + IN ULONG CountOfRights) +{ + LSAPR_USER_RIGHT_SET UserRightSet; + NTSTATUS Status; + + TRACE("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); + + UserRightSet.Entries = CountOfRights; + UserRightSet.UserRights = (PRPC_UNICODE_STRING)UserRights; + + RpcTryExcept + { + Status = LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + AllRights, + &UserRightSet); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + return STATUS_SUCCESS; } + /* * @unimplemented

1 0

[jgardou] 49402: [CMAKE] - fix build, sorry
by jgardou＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: jgardou Date: Mon Nov 1 14:05:48 2010 New Revision: 49402 URL: http://svn.reactos.org/svn/reactos?rev=49402&view=rev Log: [CMAKE] - fix build, sorry Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Nov 1 14:05:48 2010 @@ -21,7 +21,7 @@ rtl/libsupp.c rtl/version.c def/ntdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/def/ntdll.def) + ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) if(ARCH MATCHES i386) list(APPEND SOURCE dispatch/i386/dispatch.S) @@ -55,4 +55,4 @@ add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) -add_importlib_target(ntdll) +add_importlib_target(ntdll)

1 0

[janderwald] 49401: [PORTCLS] - Add license header
by janderwald＠svn.reactos.org 01 Nov '10

01 Nov '10

Author: janderwald Date: Mon Nov 1 13:23:15 2010 New Revision: 49401 URL: http://svn.reactos.org/svn/reactos?rev=49401&view=rev Log: [PORTCLS] - Add license header Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Mon Nov 1 13:23:15 2010 @@ -1,6 +1,17 @@ +/***************************************************************************** + * miniport_dmus.cpp - UART miniport implementation + ***************************************************************************** + * Copyright (c) 1997-2000 Microsoft Corporation. All Rights Reserved. + * + * Feb 98 MartinP -- based on UART, began deltas for DirectMusic. + * + */ + + #include "private.hpp" // + for absolute / - for relative + #define kOneMillisec (10 * 1000) // @@ -272,13 +283,7 @@ friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream); }; -/***************************************************************************** - * miniport.cpp - UART miniport implementation - ***************************************************************************** - * Copyright (c) 1997-2000 Microsoft Corporation. All Rights Reserved. - * - * Feb 98 MartinP -- based on UART, began deltas for DirectMusic. - */ + #define STR_MODULENAME "DMusUART:Miniport: "

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