Ros-dev September 2011

ros-dev@reactos.org

26 participants
36 discussions

by Dmitry Gorbachev

Hi, Are there any bugs: /reactos/dll/directx/ksproxy/allocator.cpp: In member function 'void CKsAllocator::FreeMediaSamples()': /reactos/dll/directx/ksproxy/allocator.cpp:586:16: warning: deleting object of abstract class type 'IMediaSample' which has non-virtual destructor will cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/dll/directx/ksproxy/proxy.cpp: In function 'HRESULT CKsProxy_Constructor(IUnknown*, const IID&, void**)': /reactos/dll/directx/ksproxy/proxy.cpp:3188:16: warning: deleting object of polymorphic class type 'CKsProxy' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] In file included from /reactos/dll/win32/browseui/precomp.h:8:0, from /reactos/dll/win32/browseui/browseui.cpp:21: /reactos/lib/atl/atlcom.h: In instantiation of 'static HRESULT ATL::CComCreator<T1>::CreateInstance(void*, const IID&, void**) [with T1 = ATL::CComObjectCached<ATL::CComClassFactory>, HRESULT = int, IID = _GUID, LPVOID = void*]': /reactos/dll/win32/browseui/browseui.cpp:32:1: required from here /reactos/lib/atl/atlcom.h:253:5: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/lib/atl/atlcom.h: In instantiation of 'ULONG ATL::CComObjectCached<Base>::Release() [with Base = ATL::CComClassFactory, ULONG = unsigned int]': /reactos/dll/win32/browseui/browseui.cpp:121:1: required from here /reactos/lib/atl/atlcom.h:304:4: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] In file included from /reactos/dll/win32/shell32/precomp.h:50:0, from /reactos/dll/win32/shell32/shell32_main.cpp:22: /reactos/lib/atl/atlcom.h: In instantiation of 'static HRESULT ATL::CComCreator<T1>::CreateInstance(void*, const IID&, void**) [with T1 = ATL::CComObjectCached<ATL::CComClassFactory>, HRESULT = long int, IID = _GUID, LPVOID = void*]': /reactos/dll/win32/shell32/shell32_main.cpp:1273:1: required from here /reactos/lib/atl/atlcom.h:253:5: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/lib/atl/atlcom.h: In instantiation of 'ULONG ATL::CComObjectCached<Base>::Release() [with Base = ATL::CComClassFactory, ULONG = long unsigned int]': /reactos/dll/win32/shell32/shell32_main.cpp:1478:1: required from here /reactos/lib/atl/atlcom.h:304:4: warning: deleting object of polymorphic class type 'ATL::CComObjectCached<ATL::CComClassFactory>' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In member function 'virtual ULONG CMiniportDMusUART::Release()': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:114:20: warning: deleting object of polymorphic class type 'CMiniportDMusUART' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In member function 'virtual ULONG CMiniportDMusUARTStream::Release()': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:239:20: warning: deleting object of polymorphic class type 'CMiniportDMusUARTStream' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor] /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp: In function 'NTSTATUS NewMiniportDMusUART(IMiniport**, const CLSID&)': /reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp:1274:16: warning: deleting object of polymorphic class type 'CMiniportDMusUART' which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor]

12 years, 11 months

Re: [ros-dev] [ros-diffs] [pschweitzer] 53823: [KERNEL32] Simplify overcomplicated function CreateHardlinkW(), and SEHify it.

by Alex Ionescu

Why are you putting SEH everywhere??? Just to avoid goto? This is infinitely retarded. Exceptions should not be used as a mechanism for flow control. Best regards, Alex Ionescu On Sat, Sep 24, 2011 at 3:51 AM, <pschweitzer(a)svn.reactos.org> wrote: > Author: pschweitzer > Date: Sat Sep 24 07:51:21 2011 > New Revision: 53823 > > URL: http://svn.reactos.org/svn/reactos?rev=53823&view=rev > Log: > [KERNEL32] > Simplify overcomplicated function CreateHardlinkW(), and SEHify it. > > Modified: > trunk/reactos/dll/win32/kernel32/client/file/hardlink.c > > Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… > > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] > (original) > +++ trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] > Sat Sep 24 07:51:21 2011 > @@ -2,11 +2,10 @@ > * > * COPYRIGHT: See COPYING in the top level directory > * PROJECT: ReactOS system libraries > - * FILE: lib/kernel32/file/hardlink.c > + * FILE: dll/win32/kernel32/client/file/hardlink.c > * PURPOSE: Hardlink functions > * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) > - * UPDATE HISTORY: > - * Created 13/03/2004 > + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) > */ > > /* INCLUDES > *****************************************************************/ > @@ -27,169 +26,110 @@ > LPCWSTR lpExistingFileName, > LPSECURITY_ATTRIBUTES lpSecurityAttributes) > { > - UNICODE_STRING LinkTarget, LinkName; > - LPVOID lpSecurityDescriptor; > - PFILE_LINK_INFORMATION LinkInformation; > - IO_STATUS_BLOCK IoStatus; > - NTSTATUS Status; > - BOOL Ret = FALSE; > + NTSTATUS Status; > + BOOL Ret = FALSE; > + ULONG NeededSize; > + IO_STATUS_BLOCK IoStatusBlock; > + OBJECT_ATTRIBUTES ObjectAttributes; > + HANDLE hTarget = INVALID_HANDLE_VALUE; > + PFILE_LINK_INFORMATION LinkInformation = NULL; > + UNICODE_STRING LinkTarget = {0, 0, NULL}, LinkName = {0, 0, NULL}; > > - if(!lpFileName || !lpExistingFileName) > - { > - SetLastError(ERROR_INVALID_PARAMETER); > - return FALSE; > - } > + TRACE("CreateHardLinkW: %S, %S, %p\n", lpFileName, lpExistingFileName, > lpSecurityAttributes); > > - lpSecurityDescriptor = (lpSecurityAttributes ? > lpSecurityAttributes->lpSecurityDescriptor : NULL); > + /* Validate parameters */ > + if(!lpFileName || !lpExistingFileName) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > > - if(RtlDetermineDosPathNameType_U((LPWSTR)lpFileName) == 1 || > - RtlDetermineDosPathNameType_U((LPWSTR)lpExistingFileName) == 1) > - { > - WARN("CreateHardLinkW() cannot handle UNC Paths!\n"); > - SetLastError(ERROR_INVALID_NAME); > - return FALSE; > - } > + _SEH2_TRY > + { > + /* Get target UNC path */ > + if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, > NULL, NULL)) > + { > + SetLastError(ERROR_PATH_NOT_FOUND); > + _SEH2_LEAVE; > + } > > - if(RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, > NULL)) > - { > - ULONG NeededSize = RtlGetFullPathName_U((LPWSTR)lpExistingFileName, 0, > NULL, NULL); > - if(NeededSize > 0) > + /* Open target */ > + InitializeObjectAttributes(&ObjectAttributes, > + &LinkTarget, > + OBJ_CASE_INSENSITIVE, > + NULL, > + (lpSecurityAttributes ? > lpSecurityAttributes->lpSecurityDescriptor : NULL)); > + > + Status = NtOpenFile(&hTarget, > + SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, > + &ObjectAttributes, > + &IoStatusBlock, > + FILE_SHARE_READ | FILE_SHARE_WRITE | > FILE_SHARE_DELETE, > + FILE_SYNCHRONOUS_IO_NONALERT | > FILE_OPEN_REPARSE_POINT); > + if (!NT_SUCCESS(Status)) > + { > + BaseSetLastNTError(Status); > + _SEH2_LEAVE; > + } > + > + /* Get UNC path name for link */ > + if (!RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, > NULL)) > + { > + SetLastError(ERROR_PATH_NOT_FOUND); > + _SEH2_LEAVE; > + } > + > + /* Prepare data for link */ > + NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length; > + LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, > NeededSize); > + if (!LinkInformation) > + { > + SetLastError(ERROR_NOT_ENOUGH_MEMORY); > + _SEH2_LEAVE; > + } > + > + RtlMoveMemory(LinkInformation->FileName, LinkName.Buffer, > LinkName.Length); > + LinkInformation->ReplaceIfExists = FALSE; > + LinkInformation->RootDirectory = 0; > + LinkInformation->FileNameLength = LinkName.Length; > + > + /* Create hard link */ > + Status = NtSetInformationFile(hTarget, > + &IoStatusBlock, > + LinkInformation, > + NeededSize, > + FileLinkInformation); > + if (NT_SUCCESS(Status)) > + { > + Ret = TRUE; > + } > + } > + _SEH2_FINALLY > { > - LPWSTR lpNtLinkTarget = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, NeededSize * sizeof(WCHAR)); > - if(lpNtLinkTarget != NULL) > - { > - LPWSTR lpFilePart; > + if (LinkTarget.Buffer) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); > + } > > - if(RtlGetFullPathName_U((LPWSTR)lpExistingFileName, NeededSize, > lpNtLinkTarget, &lpFilePart) && > - (*lpNtLinkTarget) != L'\0') > + if (hTarget != INVALID_HANDLE_VALUE) > { > - UNICODE_STRING CheckDrive, LinkDrive; > - WCHAR wCheckDrive[10]; > + NtClose(hTarget); > + } > > - swprintf(wCheckDrive, L"\\??\\%c:", (WCHAR)(*lpNtLinkTarget)); > - RtlInitUnicodeString(&CheckDrive, wCheckDrive); > + if (LinkName.Buffer) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkName.Buffer); > + } > > - RtlZeroMemory(&LinkDrive, sizeof(UNICODE_STRING)); > + if (LinkInformation) > + { > + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); > + } > + } > + _SEH2_END; > > - LinkDrive.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, (MAX_PATH + 1) * sizeof(WCHAR)); > - if(LinkDrive.Buffer != NULL) > - { > - HANDLE hFile, hTarget; > - OBJECT_ATTRIBUTES ObjectAttributes; > - > - InitializeObjectAttributes(&ObjectAttributes, > - &CheckDrive, > - OBJ_CASE_INSENSITIVE, > - NULL, > - NULL); > - > - Status = NtOpenSymbolicLinkObject(&hFile, 1, > &ObjectAttributes); > - if(NT_SUCCESS(Status)) > - { > - UNICODE_STRING LanManager; > - > - RtlInitUnicodeString(&LanManager, > L"\\Device\\LanmanRedirector\\"); > - > - NtQuerySymbolicLinkObject(hFile, &LinkDrive, NULL); > - > - if(!RtlPrefixUnicodeString(&LanManager, &LinkDrive, TRUE)) > - { > - InitializeObjectAttributes(&ObjectAttributes, > - &LinkTarget, > - OBJ_CASE_INSENSITIVE, > - NULL, > - lpSecurityDescriptor); > - Status = NtOpenFile(&hTarget, > - SYNCHRONIZE | DELETE, > - &ObjectAttributes, > - &IoStatus, > - FILE_SHARE_READ | FILE_SHARE_WRITE | > FILE_SHARE_DELETE, > - FILE_SYNCHRONOUS_IO_NONALERT | > FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); > - if(NT_SUCCESS(Status)) > - { > - if(RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, > NULL, NULL)) > - { > - NeededSize = sizeof(FILE_LINK_INFORMATION) + > LinkName.Length + sizeof(WCHAR); > - LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), > HEAP_ZERO_MEMORY, NeededSize); > - if(LinkInformation != NULL) > - { > - LinkInformation->ReplaceIfExists = FALSE; > - LinkInformation->RootDirectory = 0; > - LinkInformation->FileNameLength = LinkName.Length; > - RtlCopyMemory(LinkInformation->FileName, > LinkName.Buffer, LinkName.Length); > - > - Status = NtSetInformationFile(hTarget, &IoStatus, > LinkInformation, NeededSize, FileLinkInformation); > - if(NT_SUCCESS(Status)) > - { > - Ret = TRUE; > - } > - else > - { > - BaseSetLastNTError(Status); > - } > - > - RtlFreeHeap(RtlGetProcessHeap(), 0, > LinkInformation); > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_PATH_NOT_FOUND); > - } > - NtClose(hTarget); > - } > - else > - { > - WARN("Unable to open link destination \"%wZ\"!\n", > &LinkTarget); > - BaseSetLastNTError(Status); > - } > - } > - else > - { > - WARN("Path \"%wZ\" must not be a mapped drive!\n", > &LinkDrive); > - SetLastError(ERROR_INVALID_NAME); > - } > - > - NtClose(hFile); > - } > - else > - { > - BaseSetLastNTError(Status); > - } > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_INVALID_NAME); > - } > - RtlFreeHeap(RtlGetProcessHeap(), 0, lpNtLinkTarget); > - } > - else > - { > - SetLastError(ERROR_NOT_ENOUGH_MEMORY); > - } > - } > - else > - { > - SetLastError(ERROR_INVALID_NAME); > - } > - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); > - } > - else > - { > - SetLastError(ERROR_PATH_NOT_FOUND); > - } > - > - return Ret; > + return Ret; > } > - > > /* > * @implemented > @@ -199,26 +139,32 @@ > LPCSTR lpExistingFileName, > LPSECURITY_ATTRIBUTES lpSecurityAttributes) > { > - PWCHAR FileNameW, ExistingFileNameW; > - BOOL Ret; > + BOOL Ret; > + PUNICODE_STRING lpFileNameW; > + UNICODE_STRING ExistingFileNameW; > > - if(!lpFileName || !lpExistingFileName) > - { > - SetLastError(ERROR_INVALID_PARAMETER); > - return FALSE; > - } > + lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); > + if (!lpFileNameW) > + { > + return FALSE; > + } > > - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) > - return FALSE; > + if (!lpExistingFileName) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return FALSE; > + } > > - if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, TRUE))) > - return FALSE; > + if (!Basep8BitStringToDynamicUnicodeString(&ExistingFileNameW, > lpExistingFileName)) > + { > + return FALSE; > + } > > - Ret = CreateHardLinkW(FileNameW , ExistingFileNameW , > lpSecurityAttributes); > + Ret = CreateHardLinkW(lpFileNameW->Buffer, ExistingFileNameW.Buffer, > lpSecurityAttributes); > > - RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW); > + RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW.Buffer); > > - return Ret; > + return Ret; > } > > /* EOF */ > > >

12 years, 11 months

Problem with new BE release candidate

by caemyr＠myopera.com

Windows cmake builder is running new BE since yesterday. First thing that i noticed, is the increase of buildtime. Previous version was consistent around 5 minutes, the new candidate - more than 7. I doublechecked it by swapping BE's back and forth. This might look not serious, but if this problem scales up, we are talking about 35 minutes of buildtime for someone who needed 25 minutes previously. -- With best regards Caemyr

12 years, 11 months

[ros-diffs] [gadamopoulos] 52716: [win32k] - Fix TrackMouseEvent. Now hot tracking really works

by James Tabor

If it passes all the wine tests w/o the intermittent hits and misses! SYNC it to HEAD!

12 years, 12 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 53730: [CMAKE] Allow to specify prefix/suffix for GCC and Binutils.

by Jérôme Gardou

Hello. May I ask why you removed the -nodefaultlibs flag? Regards. Jérôme. Le 18/09/2011 02:57, dgorbachev(a)svn.reactos.org a écrit : > Author: dgorbachev > Date: Sun Sep 18 00:57:17 2011 > New Revision: 53730 > > URL: http://svn.reactos.org/svn/reactos?rev=53730&view=rev > Log: > [CMAKE] > Allow to specify prefix/suffix for GCC and Binutils. > > Modified: > trunk/reactos/cmake/gcc.cmake > trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt > trunk/reactos/lib/sdk/crt/oldnames.cmake > trunk/reactos/toolchain-gcc.cmake > > Modified: trunk/reactos/cmake/gcc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53730&… > ============================================================================== > --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -86,7 +86,7 @@ > > set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o<TARGET> <LINK_LIBRARIES>") > > -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import -Wl,--disable-stdcall-fixup") > +set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import,--disable-stdcall-fixup") > > set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") > > @@ -134,7 +134,7 @@ > endif() > > if(${TYPE} STREQUAL kernelmodedriver) > - add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000") > + add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000") > endif() > endfunction() > > @@ -190,25 +190,25 @@ > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) > > # Delayed importlib creation > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) > > elseif(${_extension} STREQUAL ".def") > message("Use of def files for import libs is deprecated: ${_exports_file}") > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) > add_custom_command( > OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a > DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) > else() > message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") > @@ -243,7 +243,7 @@ > endfunction() > > macro(macro_mc FILE) > - set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) > + set(COMMAND_MC ${CMAKE_MC_COMPILER} -A -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) > endmacro() > > #pseh lib, needed with mingw > > Modified: trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -65,8 +65,7 @@ > if(NOT MSVC) > add_custom_command( > OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > > set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) > > > Modified: trunk/reactos/lib/sdk/crt/oldnames.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake… > ============================================================================== > --- trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] (original) > +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -1,8 +1,7 @@ > if(NOT MSVC) > add_custom_command( > OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a > - COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > + COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) > > set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE) > > > Modified: trunk/reactos/toolchain-gcc.cmake > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53… > ============================================================================== > --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) > +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Sun Sep 18 00:57:17 2011 > @@ -3,19 +3,25 @@ > set(ARCH i386) > endif() > > -# Choose the right MinGW prefix > -if(ARCH MATCHES i386) > +# Choose the right MinGW toolchain prefix > +if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX) > + if(ARCH MATCHES i386) > > - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > - set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") > - else() > - set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") > - endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > + set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") > + else() > + set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") > + endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > > -elseif(ARCH MATCHES amd64) > - set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") > -elseif(ARCH MATCHES arm) > - set(MINGW_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Prefix") > + elseif(ARCH MATCHES amd64) > + set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix") > + elseif(ARCH MATCHES arm) > + set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix") > + endif() > +endif() > + > +if (NOT DEFINED MINGW_TOOLCHAIN_SUFFIX) > + set(MINGW_TOOLCHAIN_SUFFIX "" CACHE STRING "MinGW Toolchain Suffix") > endif() > > if(ENABLE_CCACHE) > @@ -28,11 +34,13 @@ > set(CMAKE_SYSTEM_NAME Windows) > set(CMAKE_SYSTEM_PROCESSOR i686) > > -# Which compilers to use for C and C++ > -set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) > -set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) > -set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) > -set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) > +# Which tools to use > +set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) > +set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) > +set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) > +set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) > > if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) > set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs<TARGET> <LINK_FLAGS> <OBJECTS>") > @@ -46,4 +54,4 @@ > #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) > set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") > > -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") > +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") > >

12 years, 12 months

Re: [ros-dev] [ros-diffs] [rmessiant] 53729: [NTOSKRNL] Disable normal APC delivery while acquiring/releasing a heap lock. Also, BOOLEAN != NTSTATUS.

by Timo Kreuzer

Am 17.09.2011 22:26, schrieb rmessiant(a)svn.reactos.org: > Author: rmessiant > Date: Sat Sep 17 20:26:31 2011 > New Revision: 53729 > > URL: http://svn.reactos.org/svn/reactos?rev=53729&view=rev > Log: > [NTOSKRNL] > Disable normal APC delivery while acquiring/releasing a heap lock. Also, BOOLEAN != NTSTATUS. > > > Modified: > trunk/reactos/ntoskrnl/rtl/libsupp.c > > Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sat Sep 17 20:26:31 2011 > @@ -168,7 +168,10 @@ > RtlEnterHeapLock( > PHEAP_LOCK Lock) > { > - return ExAcquireResourceExclusive(&Lock->Resource, TRUE); > + KeEnterCriticalRegion(); > + ExAcquireResourceExclusive(&Lock->Resource, TRUE); > + KeLeaveCriticalRegion(); > + return STATUS_SUCCESS; > } > > NTSTATUS > @@ -185,7 +188,9 @@ > RtlLeaveHeapLock( > PHEAP_LOCK Lock) > { > + KeEnterCriticalRegion(); > ExReleaseResource(&Lock->Resource); > + KeLeaveCriticalRegion(); > return STATUS_SUCCESS; > } > Why enable APC delivery after the resource is acquired? It should stay disabled to prevent deadlocks.

12 years, 12 months

IServ secured access

by Pierre Schweitzer

Hi, small note to inform people who were having issues connecting to secured IServ services due to wrong SSL certificate (issued for the wrong address) that the certificate has been renewed today and the issues are gone. Regards, Pierre

12 years, 12 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 53695: [HAL] Implement lazy irql for APIC. This is useful for VMs, since APIC usually has high overhead due to the need of invoking the hypervisor on every irql raise and lower. With laz...

by Alex Ionescu

http://blogs.technet.com/b/askperf/archive/2010/07/23/windows-xp-guests-exh… Windows does have APIC Lazy IRQL, Microsoft are not idiots. Best regards, Alex Ionescu On Mon, Sep 12, 2011 at 2:46 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon Sep 12 09:46:20 2011 > New Revision: 53695 > > URL: http://svn.reactos.org/svn/reactos?rev=53695&view=rev > Log: > [HAL] > Implement lazy irql for APIC. This is useful for VMs, since APIC usually > has high overhead due to the need of invoking the hypervisor on every irql > raise and lower. With lazy irql we avoid that until absolutely neccessary. > Note that we misuse the PCR's IRR field to save the current hardware irql. > Its a huge performance boost (some parts take half the time), making APIC > performance close to PIC performance on VBox. This is something that Windows > doesn't have :) > > Modified: > trunk/reactos/hal/halx86/apic/apic.c > trunk/reactos/hal/halx86/apic/rtctimer.c > > Modified: trunk/reactos/hal/halx86/apic/apic.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… > > ============================================================================== > --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Mon Sep 12 09:46:20 > 2011 > @@ -17,6 +17,8 @@ > > #include "apic.h" > void HackEoi(void); > + > +#define APIC_LAZY_IRQL > > /* GLOBALS > ********************************************************************/ > > @@ -105,6 +107,46 @@ > > VOID > FORCEINLINE > +ApicWriteIORedirectionEntry( > + UCHAR Index, > + IOAPIC_REDIRECTION_REGISTER ReDirReg) > +{ > + IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); > + IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); > +} > + > +IOAPIC_REDIRECTION_REGISTER > +FORCEINLINE > +ApicReadIORedirectionEntry( > + UCHAR Index) > +{ > + IOAPIC_REDIRECTION_REGISTER ReDirReg; > + > + ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); > + ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); > + > + return ReDirReg; > +} > + > +VOID > +FORCEINLINE > +ApicRequestInterrupt(IN UCHAR Vector) > +{ > + APIC_COMMAND_REGISTER CommandRegister; > + > + /* Setup the command register */ > + CommandRegister.Long0 = 0; > + CommandRegister.Vector = Vector; > + CommandRegister.MessageType = APIC_MT_Fixed; > + CommandRegister.TriggerMode = APIC_TGM_Edge; > + CommandRegister.DestinationShortHand = APIC_DSH_Self; > + > + /* Write the low dword to send the interrupt */ > + ApicWrite(APIC_ICR0, CommandRegister.Long0); > +} > + > +VOID > +FORCEINLINE > ApicSendEOI(void) > { > //ApicWrite(APIC_EOI, 0); > @@ -125,6 +167,12 @@ > { > #ifdef _M_AMD64 > return (KIRQL)__readcr8(); > +#elif defined(APIC_LAZY_IRQL) > + // HACK: some magic to Sync VBox's APIC registers > + ApicRead(APIC_VER); > + > + /* Return the field in the PCR */ > + return (KIRQL)__readfsbyte(FIELD_OFFSET(KPCR, Irql)); > #else > // HACK: some magic to Sync VBox's APIC registers > ApicRead(APIC_VER); > @@ -136,16 +184,42 @@ > > VOID > FORCEINLINE > -ApicSetCurrentIrql(KIRQL Irql) > +ApicRaiseIrql(KIRQL Irql) > { > #ifdef _M_AMD64 > __writecr8(Irql); > +#elif defined(APIC_LAZY_IRQL) > + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); > #else > /* Convert IRQL and write the TPR */ > ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > #endif > } > > +VOID > +FORCEINLINE > +ApicLowerIrql(KIRQL Irql) > +{ > +#ifdef _M_AMD64 > + __writecr8(Irql); > +#elif defined(APIC_LAZY_IRQL) > + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); > + > + /* Is the new Irql lower than set in the TPR? */ > + if (Irql < KeGetPcr()->IRR) > + { > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = Irql; > + > + /* Need to lower it back */ > + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > + } > +#else > + /* Convert IRQL and write the TPR */ > + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > +#endif > +} > + > UCHAR > FASTCALL > HalpIrqToVector(UCHAR Irq) > @@ -171,6 +245,13 @@ > HalpVectorToIrq(UCHAR Vector) > { > return HalpVectorToIndex[Vector]; > +} > + > +VOID > +NTAPI > +HalpSendEOI(VOID) > +{ > + ApicSendEOI(); > } > > VOID > @@ -311,31 +392,10 @@ > ApicWrite(APIC_ERRLVTR, LvtEntry.Long); > > /* Set the IRQL from the PCR */ > - ApicSetCurrentIrql(KeGetPcr()->Irql); > -} > - > - > -VOID > -FORCEINLINE > -ApicWriteIORedirectionEntry( > - UCHAR Index, > - IOAPIC_REDIRECTION_REGISTER ReDirReg) > -{ > - IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); > - IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); > -} > - > -IOAPIC_REDIRECTION_REGISTER > -FORCEINLINE > -ApicReadIORedirectionEntry( > - UCHAR Index) > -{ > - IOAPIC_REDIRECTION_REGISTER ReDirReg; > - > - ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); > - ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); > - > - return ReDirReg; > + ApicWrite(APIC_TPR, IrqlToTpr(KeGetPcr()->Irql)); > + > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = KeGetPcr()->Irql; > } > > UCHAR > @@ -486,6 +546,9 @@ > __writeeflags(EFlags); > } > > + > +/* SOFTWARE INTERRUPT TRAPS > ***************************************************/ > + > VOID > DECLSPEC_NORETURN > FASTCALL > @@ -493,17 +556,25 @@ > { > KPROCESSOR_MODE ProcessorMode; > KIRQL OldIrql; > - ASSERT(ApicGetCurrentIrql() < APC_LEVEL); > ASSERT(ApicGetProcessorIrql() == APC_LEVEL); > > /* Enter trap */ > KiEnterInterruptTrap(TrapFrame); > > +#ifdef APIC_LAZY_IRQL > + if (!HalBeginSystemInterrupt(APC_LEVEL, APC_VECTOR, &OldIrql)) > + { > + /* "Spurious" interrupt, exit the interrupt */ > + KiEoiHelper(TrapFrame); > + } > +#else > /* Save the old IRQL */ > OldIrql = ApicGetCurrentIrql(); > + ASSERT(OldIrql < APC_LEVEL); > +#endif > > /* Raise to APC_LEVEL */ > - ApicSetCurrentIrql(APC_LEVEL); > + ApicRaiseIrql(APC_LEVEL); > > /* End the interrupt */ > ApicSendEOI(); > @@ -521,7 +592,7 @@ > _disable(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > + ApicLowerIrql(OldIrql); > > /* Exit the interrupt */ > KiEoiHelper(TrapFrame); > @@ -534,17 +605,25 @@ > HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) > { > KIRQL OldIrql; > - ASSERT(ApicGetCurrentIrql() < DISPATCH_LEVEL); > ASSERT(ApicGetProcessorIrql() == DISPATCH_LEVEL); > > /* Enter trap */ > KiEnterInterruptTrap(TrapFrame); > > - /* Save the old IRQL */ > +#ifdef APIC_LAZY_IRQL > + if (!HalBeginSystemInterrupt(DISPATCH_LEVEL, DISPATCH_VECTOR, > &OldIrql)) > + { > + /* "Spurious" interrupt, exit the interrupt */ > + KiEoiHelper(TrapFrame); > + } > +#else > + /* Get the current IRQL */ > OldIrql = ApicGetCurrentIrql(); > + ASSERT(OldIrql < DISPATCH_LEVEL); > +#endif > > /* Raise to DISPATCH_LEVEL */ > - ApicSetCurrentIrql(DISPATCH_LEVEL); > + ApicRaiseIrql(DISPATCH_LEVEL); > > /* End the interrupt */ > ApicSendEOI(); > @@ -555,37 +634,23 @@ > _disable(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > + ApicLowerIrql(OldIrql); > > /* Exit the interrupt */ > KiEoiHelper(TrapFrame); > } > #endif > > -VOID > -NTAPI > -HalpSendEOI(VOID) > -{ > - ApicSendEOI(); > -} > - > -/* PUBLIC FUNCTIONS > ***********************************************************/ > + > +/* SOFTWARE INTERRUPTS > ********************************************************/ > + > > VOID > FASTCALL > HalRequestSoftwareInterrupt(IN KIRQL Irql) > { > - APIC_COMMAND_REGISTER CommandRegister; > - > - /* Setup the command register */ > - CommandRegister.Long0 = 0; > - CommandRegister.Vector = IrqlToTpr(Irql); > - CommandRegister.MessageType = APIC_MT_Fixed; > - CommandRegister.TriggerMode = APIC_TGM_Edge; > - CommandRegister.DestinationShortHand = APIC_DSH_Self; > - > - /* Write the low dword to send the interrupt */ > - ApicWrite(APIC_ICR0, CommandRegister.Long0); > + /* Convert irql to vector and request an interrupt */ > + ApicRequestInterrupt(IrqlToTpr(Irql)); > } > > VOID > @@ -595,6 +660,9 @@ > { > /* Nothing to do */ > } > + > + > +/* SYSTEM INTERRUPTS > **********************************************************/ > > BOOLEAN > NTAPI > @@ -678,11 +746,37 @@ > IN UCHAR Vector, > OUT PKIRQL OldIrql) > { > + KIRQL CurrentIrql; > + > /* Get the current IRQL */ > - *OldIrql = ApicGetCurrentIrql(); > + CurrentIrql = ApicGetCurrentIrql(); > + > +#ifdef APIC_LAZY_IRQL > + /* Check if this interrupt is allowed */ > + if (CurrentIrql >= Irql) > + { > + /* It is not, set the real Irql in the TPR! */ > + ApicWrite(APIC_TPR, IrqlToTpr(CurrentIrql)); > + > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = CurrentIrql; > + > + /* End this interrupt */ > + ApicSendEOI(); > + > + // FIXME: level interrupts > + /* Re-request the interrupt to be handled later */ > + ApicRequestInterrupt(Vector); > + > + /* Pretend it was a spurious interrupt */ > + return FALSE; > + } > +#endif > + /* Save the current IRQL */ > + *OldIrql = CurrentIrql; > > /* Set the new IRQL */ > - ApicSetCurrentIrql(Irql); > + ApicRaiseIrql(Irql); > > /* Turn on interrupts */ > _enable(); > @@ -701,9 +795,11 @@ > ApicSendEOI(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > -} > - > + ApicLowerIrql(OldIrql); > +} > + > + > +/* IRQL MANAGEMENT > ************************************************************/ > > KIRQL > NTAPI > @@ -726,8 +822,8 @@ > KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); > } > #endif > - /* Convert the new IRQL to a TPR value and write the register */ > - ApicSetCurrentIrql(OldIrql); > + /* Set the new IRQL */ > + ApicLowerIrql(OldIrql); > } > > KIRQL > @@ -748,7 +844,7 @@ > } > #endif > /* Convert the new IRQL to a TPR value and write the register */ > - ApicSetCurrentIrql(NewIrql); > + ApicRaiseIrql(NewIrql); > > /* Return old IRQL */ > return OldIrql; > > Modified: trunk/reactos/hal/halx86/apic/rtctimer.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… > > ============================================================================== > --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Mon Sep 12 > 09:46:20 2011 > @@ -111,7 +111,7 @@ > KiEnterInterruptTrap(TrapFrame); > > /* Start the interrupt */ > - if (HalBeginSystemInterrupt(CLOCK_LEVEL, PRIMARY_VECTOR_BASE, &Irql)) > + if (HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) > { > /* Read register C, so that the next interrupt can happen */ > HalpReadCmos(RTC_REGISTER_C);; > > >

13 years

Re: [ros-dev] [ros-diffs] [fireball] 53635: - Downgrade some DPRINT1s to DPRINTs.

by Alex Ionescu

For the stuff that was obviously designed to warn at least once, have you filled out bug reports for all these missing features, or do you think that someone will now remember all this missing code? Best regards, Alex Ionescu On Thu, Sep 8, 2011 at 9:28 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Thu Sep 8 08:28:41 2011 > New Revision: 53635 > > URL: http://svn.reactos.org/svn/reactos?rev=53635&view=rev > Log: > - Downgrade some DPRINT1s to DPRINTs. > > Modified: > trunk/reactos/dll/ntdll/ldr/ldrapi.c > trunk/reactos/dll/ntdll/ldr/ldrinit.c > trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c > trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c > > Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… > > ============================================================================== > --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Sep 8 08:28:41 > 2011 > @@ -1542,8 +1542,8 @@ > NTAPI > LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) > { > - static BOOLEAN WarnedOnce = FALSE; > - if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } > + //static BOOLEAN WarnedOnce = FALSE; > + //if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } > return FALSE; > } > > > Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… > > ============================================================================== > --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Sep 8 08:28:41 > 2011 > @@ -728,7 +728,7 @@ > > /* Clear it */ > //Kernel32ProcessInitPostImportfunction = NULL; > - UNIMPLEMENTED; > + //UNIMPLEMENTED; > } > > /* No root entry? return */ > @@ -1988,7 +1988,7 @@ > if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) > { > /* Load kernel32 and call BasePostImportInit... */ > - DPRINT1("Unimplemented codepath!\n"); > + DPRINT("Unimplemented codepath!\n"); > } > > /* Walk the IAT and load all the DLLs */ > @@ -2095,7 +2095,7 @@ > { > /* Check for Application Compatibility Goo */ > //LdrQueryApplicationCompatibilityGoo(hKey); > - DPRINT1("Querying app compat hacks is missing!\n"); > + DPRINT("Querying app compat hacks is missing!\n"); > } > > /* > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Sep 8 > 08:28:41 2011 > @@ -590,7 +590,7 @@ > ViewShare, > MEM_TOP_DOWN, > PAGE_READONLY); > - DPRINT1("NLS Tables at: %p\n", TableBase); > + DPRINT("NLS Tables at: %p\n", TableBase); > if (!NT_SUCCESS(Status)) > { > /* Cleanup and exit */ > @@ -602,7 +602,7 @@ > // Allocate the PEB > // > Status = MiCreatePebOrTeb(Process, sizeof(PEB), (PULONG_PTR)&Peb); > - DPRINT1("PEB at: %p\n", Peb); > + DPRINT("PEB at: %p\n", Peb); > if (!NT_SUCCESS(Status)) > { > /* Cleanup and exit */ > > Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… > > ============================================================================== > --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] > Thu Sep 8 08:28:41 2011 > @@ -105,7 +105,7 @@ > PROCESS_ALL_ACCESS, > &ObjectAttributes, > &ClientId); > - DPRINT1("CSR Process: %p Handle: %p\n", pProcessData, > pProcessData->Process); > + DPRINT("CSR Process: %p Handle: %p\n", pProcessData, > pProcessData->Process); > if (!NT_SUCCESS(Status)) > { > ProcessData[hash] = pProcessData->next; > > Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… > > ============================================================================== > --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu > Sep 8 08:28:41 2011 > @@ -278,8 +278,8 @@ > /* Check if we have a process */ > if (CsrProcess) > { > - /* Map the sectio into this process */ > - DPRINT1("CSR Process Handle: %p. CSR Process: %p\n", > CsrProcess->Process, CsrProcess); > + /* Map the section into this process */ > + DPRINT("CSR Process Handle: %p. CSR Process: %p\n", > CsrProcess->Process, CsrProcess); > Status = NtMapViewOfSection(CsrSrvSharedSection, > CsrProcess->Process, > &CsrSrvSharedSectionBase, > @@ -520,7 +520,7 @@ > Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); > if (NT_SUCCESS(Status)) > { > - DPRINT1("Connection ok\n"); > + DPRINT("Connection ok\n"); > AllowConnection = TRUE; > } > else > > >

13 years

Re: [ros-dev] [ros-diffs] [tfaber] 53688: [NTOSKRNL][RTL][DOC] - Fix incorrect loop boundaries in the ARM version of MmCreateProcessAddressSpace. Spotted by Vincenzo Cotugno and cppcheck - Correct outdated wineimport.cmd UR...

by Alex Ionescu

Sorry but these kinds of fixes are not "readability fixes", in fact they make things more obtuse. (*MdlPages << PAGE_SHIFT)) could be interpreted as *(MdlPages << PAGE_SHIFT). while ((*MdlPages) << PAGE_SHIFT) Makes it clear what is happening. In general, all operations affecting the contents of a *dereference should be in parens. Best regards, Alex Ionescu On Sun, Sep 11, 2011 at 7:47 AM, <tfaber(a)svn.reactos.org> wrote: > - ((*MdlPages) << PAGE_SHIFT)); > + (*MdlPages << PAGE_SHIFT)); >

13 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev September 2011