Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RAPPS] Simplified string creation in CAvailableApps
by Alexander Shaposhnikov 02 Jan '18

02 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d436d9bb5018f30bd92a… commit 8d436d9bb5018f30bd92a0e2d954dee7ff263dbe Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Tue Jan 2 02:07:12 2018 +0200 [RAPPS] Simplified string creation in CAvailableApps Created a struct that fills itself upon creation. This makes it easy to include in CAvailableApps without additional weirdness. --- base/applications/rapps/available.cpp | 84 ++++++++--------------------- base/applications/rapps/include/available.h | 19 +++---- 2 files changed, 33 insertions(+), 70 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index a62cc146c2..b396e1dbb7 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -209,37 +209,24 @@ inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CString } // CAvailableApplicationInfo -// CAvailableApps -ATL::CStringW CAvailableApps::m_szPath; -ATL::CStringW CAvailableApps::m_szCabPath; -ATL::CStringW CAvailableApps::m_szAppsPath; -ATL::CStringW CAvailableApps::m_szSearchPath; - -BOOL CAvailableApps::InitializeStaticStrings() +// AvailableStrings +AvailableStrings::AvailableStrings() { - - if (!m_szPath.IsEmpty()) - { - // strings are filled - return TRUE; - } - //FIXME: maybe provide a fallback? - if (GetStorageDirectory(m_szPath)) + if (GetStorageDirectory(szPath)) { - m_szAppsPath = m_szPath + L"\\rapps\\"; - m_szCabPath = m_szPath + L"\\rappmgr.cab"; - m_szSearchPath = m_szAppsPath + L"*.txt"; - return TRUE; + szAppsPath = szPath + L"\\rapps\\"; + szCabPath = szPath + L"\\rappmgr.cab"; + szSearchPath = szAppsPath + L"*.txt"; } - - return FALSE; } +// AvailableStrings + +// CAvailableApps +AvailableStrings CAvailableApps::m_Strings; CAvailableApps::CAvailableApps() { - //set all paths - InitializeStaticStrings(); } VOID CAvailableApps::FreeCachedEntries() @@ -261,26 +248,21 @@ VOID CAvailableApps::DeleteCurrentAppsDB() HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - if (!InitializeStaticStrings()) - { - return; - } - - hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); + hFind = FindFirstFileW(m_Strings.szSearchPath.GetString(), &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { ATL::CStringW szTmp; do { - szTmp = m_szAppsPath + FindFileData.cFileName; + szTmp = m_Strings.szAppsPath + FindFileData.cFileName; DeleteFileW(szTmp.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); } - RemoveDirectoryW(m_szAppsPath); - RemoveDirectoryW(m_szPath); + RemoveDirectoryW(m_Strings.szAppsPath); + RemoveDirectoryW(m_Strings.szPath); } BOOL CAvailableApps::UpdateAppsDB() @@ -288,18 +270,13 @@ BOOL CAvailableApps::UpdateAppsDB() HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - if (!InitializeStaticStrings()) - { - return FALSE; - } - - if (!CreateDirectoryW(m_szPath.GetString(), NULL) && GetLastError() != ERROR_ALREADY_EXISTS) + if (!CreateDirectoryW(m_Strings.szPath, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { return FALSE; } //if there are some files in the db folder - we're good - hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); + hFind = FindFirstFileW(m_Strings.szSearchPath, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { FindClose(hFind); @@ -308,12 +285,12 @@ BOOL CAvailableApps::UpdateAppsDB() CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); - if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath)) + if (!ExtractFilesFromCab(m_Strings.szCabPath, m_Strings.szAppsPath)) { return FALSE; } - DeleteFileW(m_szCabPath.GetString()); + DeleteFileW(m_Strings.szCabPath); return TRUE; } @@ -330,7 +307,7 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATAW FindFileData; - hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); + hFind = FindFirstFileW(m_Strings.szSearchPath.GetString(), &FindFileData); if (hFind == INVALID_HANDLE_VALUE) { @@ -387,7 +364,7 @@ skip_if_cached: Info->RefreshAppInfo(); if (lpEnumProc) - lpEnumProc(Info, m_szAppsPath.GetString()); + lpEnumProc(Info, m_Strings.szAppsPath.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0); @@ -432,31 +409,16 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const const ATL::CStringW& CAvailableApps::GetFolderPath() const { - return m_szPath; + return m_Strings.szPath; } const ATL::CStringW& CAvailableApps::GetAppPath() const { - return m_szAppsPath; + return m_Strings.szAppsPath; } const ATL::CStringW& CAvailableApps::GetCabPath() const { - return m_szCabPath; -} - -LPCWSTR CAvailableApps::GetFolderPathString() const -{ - return m_szPath.GetString(); -} - -LPCWSTR CAvailableApps::GetAppPathString() const -{ - return m_szPath.GetString(); -} - -LPCWSTR CAvailableApps::GetCabPathString() const -{ - return m_szPath.GetString(); + return m_Strings.szCabPath; } // CAvailableApps diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index ab95afc3b3..1e9a1df63b 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -79,15 +79,19 @@ private: typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR szFolderPath); -class CAvailableApps +struct AvailableStrings { - static ATL::CStringW m_szPath; - static ATL::CStringW m_szCabPath; - static ATL::CStringW m_szAppsPath; - static ATL::CStringW m_szSearchPath; + ATL::CStringW szPath; + ATL::CStringW szCabPath; + ATL::CStringW szAppsPath; + ATL::CStringW szSearchPath; - static BOOL InitializeStaticStrings(); + AvailableStrings(); +}; +class CAvailableApps +{ + static AvailableStrings m_Strings; ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; public: @@ -106,7 +110,4 @@ public: const ATL::CStringW& GetFolderPath() const; const ATL::CStringW& GetAppPath() const; const ATL::CStringW& GetCabPath() const; - LPCWSTR GetFolderPathString() const; - LPCWSTR GetAppPathString() const; - LPCWSTR GetCabPathString() const; };

1 0

[reactos] 01/01: [CMAKE] Allow overriding the .dll extension for delay imports in MSVC builds.
by Thomas Faber 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b20280a0f9d64c91fb268… commit b20280a0f9d64c91fb2680e2220f3984f82ad343 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 31 13:08:39 2017 +0100 [CMAKE] Allow overriding the .dll extension for delay imports in MSVC builds. Fixes delay-importing winspool.drv. --- dll/win32/setupapi/CMakeLists.txt | 2 +- dll/win32/shell32/CMakeLists.txt | 2 +- sdk/cmake/gcc.cmake | 3 ++- sdk/cmake/msvc.cmake | 9 +++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index 409d9edf86..933d66111a 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -41,7 +41,7 @@ add_library(setupapi SHARED set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) -add_delay_importlibs(setupapi comdlg32 shell32 winspool wintrust) +add_delay_importlibs(setupapi comdlg32 shell32 winspool.drv wintrust) add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) add_pch(setupapi setupapi_private.h SOURCE) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 46af5e6e32..8bdf3ee56f 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -107,7 +107,7 @@ set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) -add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) +add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool.drv winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb add_pch(shell32 precomp.h SOURCE) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 41d6a721cb..d54fc3a93e 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -326,7 +326,8 @@ function(add_delay_importlibs _module) message(FATAL_ERROR "Cannot add delay imports to a static library") endif() foreach(_lib ${ARGN}) - target_link_libraries(${_module} lib${_lib}_delayed) + get_filename_component(_basename "${_lib}" NAME_WE) + target_link_libraries(${_module} lib${_basename}_delayed) endforeach() target_link_libraries(${_module} delayimp) endfunction() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index dd7392756e..1559677fb4 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -336,8 +336,13 @@ function(add_delay_importlibs _module) message(FATAL_ERROR "Cannot add delay imports to a static library") endif() foreach(_lib ${ARGN}) - add_target_link_flags(${_module} "/DELAYLOAD:${_lib}.dll") - target_link_libraries(${_module} lib${_lib}) + get_filename_component(_basename "${_lib}" NAME_WE) + get_filename_component(_ext "${_lib}" EXT) + if(NOT _ext) + set(_ext ".dll") + endif() + add_target_link_flags(${_module} "/DELAYLOAD:${_basename}${_ext}") + target_link_libraries(${_module} "lib${_basename}") endforeach() target_link_libraries(${_module} delayimp) endfunction()

1 0

[reactos] 01/01: [FASTFAT] When overwriting a file with FILE_OVERWRITE*, don't erase previous file attributes, only update them. Keep erasing them in case the file gets overwritten with FILE_SUPERSEDE.
by Pierre Schweitzer 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b4d5c5cffe649845f552… commit 2b4d5c5cffe649845f552440a076b269a0aec339 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 1 14:29:15 2018 +0100 [FASTFAT] When overwriting a file with FILE_OVERWRITE*, don't erase previous file attributes, only update them. Keep erasing them in case the file gets overwritten with FILE_SUPERSEDE. CORE-14158 --- drivers/filesystems/fastfat/create.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 89ac5e07c4..49c54207cd 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -919,7 +919,14 @@ VfatCreateFile( if (!vfatFCBIsDirectory(pFcb)) { - *pFcb->Attributes = Attributes & ~FILE_ATTRIBUTE_NORMAL; + if (RequestedDisposition == FILE_SUPERSEDE) + { + *pFcb->Attributes = Attributes & ~FILE_ATTRIBUTE_NORMAL; + } + else + { + *pFcb->Attributes |= Attributes & ~FILE_ATTRIBUTE_NORMAL; + } *pFcb->Attributes |= FILE_ATTRIBUTE_ARCHIVE; VfatUpdateEntry(pFcb, vfatVolumeIsFatX(DeviceExt)); }

1 0

[reactos] 01/01: [FASTFAT] On file overwrite, deny it if file as HIDDEN/SYSTEM flag and caller doesn't set them.
by Pierre Schweitzer 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3fecf92c1033a747b048… commit f3fecf92c1033a747b04828de974444c1013dc8f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Jan 1 12:12:08 2018 +0100 [FASTFAT] On file overwrite, deny it if file as HIDDEN/SYSTEM flag and caller doesn't set them. CORE-14158 --- drivers/filesystems/fastfat/create.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 20a4bc0d04..89ac5e07c4 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -728,6 +728,8 @@ VfatCreateFile( return Status; } + Attributes = Stack->Parameters.Create.FileAttributes & ~FILE_ATTRIBUTE_NORMAL; + /* If the file open failed then create the required file */ if (!NT_SUCCESS (Status)) { @@ -736,7 +738,6 @@ VfatCreateFile( RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) { - Attributes = Stack->Parameters.Create.FileAttributes & ~FILE_ATTRIBUTE_NORMAL; if (!BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE)) { if (TrailingBackslash) @@ -908,9 +909,17 @@ VfatCreateFile( RequestedDisposition == FILE_OVERWRITE_IF || RequestedDisposition == FILE_SUPERSEDE) { + if ((BooleanFlagOn(*pFcb->Attributes, FILE_ATTRIBUTE_HIDDEN) && !BooleanFlagOn(Attributes, FILE_ATTRIBUTE_HIDDEN)) || + (BooleanFlagOn(*pFcb->Attributes, FILE_ATTRIBUTE_SYSTEM) && !BooleanFlagOn(Attributes, FILE_ATTRIBUTE_SYSTEM))) + { + VfatCloseFile(DeviceExt, FileObject); + vfatAddToStat(DeviceExt, Fat.FailedCreates, 1); + return STATUS_ACCESS_DENIED; + } + if (!vfatFCBIsDirectory(pFcb)) { - *pFcb->Attributes = Stack->Parameters.Create.FileAttributes & ~FILE_ATTRIBUTE_NORMAL; + *pFcb->Attributes = Attributes & ~FILE_ATTRIBUTE_NORMAL; *pFcb->Attributes |= FILE_ATTRIBUTE_ARCHIVE; VfatUpdateEntry(pFcb, vfatVolumeIsFatX(DeviceExt)); }

1 0

[reactos] 02/02: [NTOS:KE] Fix pushing of fake error code in KiDoubleFaultAbort (amd64)
by Timo Kreuzer 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4d6c2c3f10c13e11ed10… commit c4d6c2c3f10c13e11ed10a621800742c73f81c77 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 31 17:41:01 2017 +0100 [NTOS:KE] Fix pushing of fake error code in KiDoubleFaultAbort (amd64) --- ntoskrnl/ke/amd64/trap.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3988ab99e0..750e21c048 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -305,7 +305,7 @@ ENDFUNC PUBLIC KiBoundFault FUNC KiBoundFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Check if the frame was from kernelmode */ @@ -329,7 +329,7 @@ ENDFUNC PUBLIC KiInvalidOpcodeFault FUNC KiInvalidOpcodeFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL TRAPINFO KiInvalidOpcodeFault @@ -360,7 +360,7 @@ ENDFUNC PUBLIC KiNpxNotAvailableFault FUNC KiNpxNotAvailableFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Call the C handler */ @@ -382,8 +382,8 @@ ENDFUNC PUBLIC KiDoubleFaultAbort FUNC KiDoubleFaultAbort - /* No error code */ - EnterTrap TF_SAVE_ALL + /* A zero error code is pushed */ + EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) lea rcx, MsgDoubleFault[rip] mov rdx, [rbp + KTRAP_FRAME_FaultAddress] @@ -398,7 +398,7 @@ ENDFUNC PUBLIC KiNpxSegmentOverrunAbort FUNC KiNpxSegmentOverrunAbort - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Bugcheck */ @@ -567,7 +567,7 @@ ENDFUNC PUBLIC KiFloatingErrorFault FUNC KiFloatingErrorFault - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL UNIMPLEMENTED KiFloatingErrorFault @@ -591,7 +591,7 @@ ENDFUNC PUBLIC KiMcheckAbort FUNC KiMcheckAbort - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Bugcheck */ @@ -602,7 +602,7 @@ ENDFUNC PUBLIC KiXmmException FUNC KiXmmException - /* No error code */ + /* Push pseudo error code */ EnterTrap TF_SAVE_ALL /* Call the C handler */

1 0

[reactos] 01/02: [RTL] Fix amd64 version of DebugService2
by Timo Kreuzer 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f60a9eb7a3d4a674969b5… commit f60a9eb7a3d4a674969b52347293bb30673efa49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 31 17:42:40 2017 +0100 [RTL] Fix amd64 version of DebugService2 --- sdk/lib/rtl/amd64/debug_asm.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/lib/rtl/amd64/debug_asm.S b/sdk/lib/rtl/amd64/debug_asm.S index 22a9f107f4..a659bc16f4 100644 --- a/sdk/lib/rtl/amd64/debug_asm.S +++ b/sdk/lib/rtl/amd64/debug_asm.S @@ -47,11 +47,12 @@ DbgUserBreakPoint: .ENDP DebugService2: + + /* Pass the service number in eax */ + mov rax, r8 + int HEX(2D) + int 3 ret - /* Call the interrupt */ -// mov eax, [rbp+8] -// int 0x2D -// int 3 /******************************************************************************

1 0

[reactos] 01/01: Amd64/misc 64bit fixes (#236)
by Timo Kreuzer 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2f7de7ee85024dd4f15e… commit a2f7de7ee85024dd4f15ea62f5a6f6340e2890f8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 1 12:07:50 2018 +0100 Amd64/misc 64bit fixes (#236) [REACTOS] Misc 64 bit fixes * [NTOS:MM] Allow MEM_DOS_LIM in NtMapViewOfSection on x64 as well * [NTOS:MM] Implement x64 version of MmIsDisabledPage * [HAL] Remove obsolete code * [NTOS:KE] Fix amd64 version of KeContextToTrapFrame and KeTrapFrameToContext * [XDK] Fix CONTEXT_XSTATE definition * [PCNET] Convert physical address types from pointers to PHYSICAL_ADDRESS --- dll/ntdll/dbg/dbgui.c | 7 ++- dll/win32/kernel32/client/handle.c | 2 +- dll/win32/kernel32/winnls/string/format_msg.c | 7 +-- dll/win32/shell32/dialogs/dialogs.cpp | 2 +- drivers/network/afd/afd/main.c | 2 +- drivers/network/dd/pcnet/pcnet.c | 50 +++++++++++----------- drivers/network/dd/pcnet/pcnet.h | 10 ++--- .../applications/explorer-old/shell/mainframe.cpp | 2 +- .../applications/explorer-old/utility/utility.cpp | 6 +-- .../applications/explorer-old/utility/window.h | 6 +-- ntoskrnl/ke/amd64/context.c | 30 +++++++------ ntoskrnl/ke/amd64/cpu.c | 10 ----- ntoskrnl/ke/bug.c | 2 +- ntoskrnl/mm/ARM3/section.c | 2 +- ntoskrnl/mm/amd64/page.c | 6 ++- sdk/include/ndk/ketypes.h | 2 +- sdk/include/xdk/amd64/ke.h | 2 +- 17 files changed, 72 insertions(+), 76 deletions(-) diff --git a/dll/ntdll/dbg/dbgui.c b/dll/ntdll/dbg/dbgui.c index 80b0a1dcb5..ccc89fb89b 100644 --- a/dll/ntdll/dbg/dbgui.c +++ b/dll/ntdll/dbg/dbgui.c @@ -64,11 +64,10 @@ DbgUiConvertStateChangeStructure(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange, NTSTATUS Status; THREAD_BASIC_INFORMATION ThreadBasicInfo; LPDEBUG_EVENT DebugEvent = Win32DebugEvent; - + /* Write common data */ - DebugEvent->dwProcessId = (DWORD)WaitStateChange-> - AppClientId.UniqueProcess; - DebugEvent->dwThreadId = (DWORD)WaitStateChange->AppClientId.UniqueThread; + DebugEvent->dwProcessId = PtrToUlong(WaitStateChange->AppClientId.UniqueProcess); + DebugEvent->dwThreadId = PtrToUlong(WaitStateChange->AppClientId.UniqueThread); /* Check what kind of even this is */ switch (WaitStateChange->NewState) diff --git a/dll/win32/kernel32/client/handle.c b/dll/win32/kernel32/client/handle.c index 3e5cbcf455..3e116f5cbe 100644 --- a/dll/win32/kernel32/client/handle.c +++ b/dll/win32/kernel32/client/handle.c @@ -20,7 +20,7 @@ TranslateStdHandle(IN HANDLE hHandle) { PRTL_USER_PROCESS_PARAMETERS Ppb = NtCurrentPeb()->ProcessParameters; - switch ((ULONG)hHandle) + switch ((ULONG_PTR)hHandle) { case STD_INPUT_HANDLE: return Ppb->StandardInput; case STD_OUTPUT_HANDLE: return Ppb->StandardOutput; diff --git a/dll/win32/kernel32/winnls/string/format_msg.c b/dll/win32/kernel32/winnls/string/format_msg.c index 2f01c204aa..389cf1fad8 100644 --- a/dll/win32/kernel32/winnls/string/format_msg.c +++ b/dll/win32/kernel32/winnls/string/format_msg.c @@ -63,14 +63,15 @@ static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) { MESSAGE_RESOURCE_ENTRY *mre; WCHAR *buffer; - NTSTATUS status; + NTSTATUS Status; TRACE("module = %p, id = %08x\n", module, id ); if (!module) module = GetModuleHandleW( NULL ); - if ((status = RtlFindMessage( module, (ULONG)RT_MESSAGETABLE, lang, id, &mre )) != STATUS_SUCCESS) + Status = RtlFindMessage(module, (ULONG_PTR)RT_MESSAGETABLE, lang, id, &mre); + if (!NT_SUCCESS(Status)) { - SetLastError( RtlNtStatusToDosError(status) ); + SetLastError(RtlNtStatusToDosError(Status)); return NULL; } diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 3d66374ce3..f266e79787 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -113,7 +113,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, { case WM_INITDIALOG: pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl); diff --git a/drivers/network/afd/afd/main.c b/drivers/network/afd/afd/main.c index df2eccc835..8cdfb1a269 100644 --- a/drivers/network/afd/afd/main.c +++ b/drivers/network/afd/afd/main.c @@ -27,7 +27,7 @@ void OskitDumpBuffer( PCHAR Data, UINT Len ) { for( i = 0; i < Len; i++ ) { if( i && !(i & 0xf) ) DbgPrint( "\n" ); - if( !(i & 0xf) ) DbgPrint( "%08x: ", (UINT)(Data + i) ); + if( !(i & 0xf) ) DbgPrint( "%p: ", (Data + i) ); DbgPrint( " %02x", Data[i] & 0xff ); } DbgPrint("\n"); diff --git a/drivers/network/dd/pcnet/pcnet.c b/drivers/network/dd/pcnet/pcnet.c index 26a6527036..0a78530765 100644 --- a/drivers/network/dd/pcnet/pcnet.c +++ b/drivers/network/dd/pcnet/pcnet.c @@ -139,8 +139,8 @@ MiniportHandleInterrupt( IndicatedData = TRUE; RtlZeroMemory(Descriptor, sizeof(RECEIVE_DESCRIPTOR)); - Descriptor->RBADR = - (ULONG)(Adapter->ReceiveBufferPtrPhys + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); + Descriptor->RBADR = Adapter->ReceiveBufferPtrPhys.QuadPart + + (Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); Descriptor->BCNT = (-BUFFER_SIZE) | 0xf000; Descriptor->FLAGS |= RD_OWN; @@ -308,11 +308,9 @@ MiFreeSharedMemory( { NDIS_PHYSICAL_ADDRESS PhysicalAddress; - PhysicalAddress.u.HighPart = 0; - if(Adapter->InitializationBlockVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->InitializationBlockPhys; + PhysicalAddress = Adapter->InitializationBlockPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, FALSE, Adapter->InitializationBlockVirt, PhysicalAddress); Adapter->InitializationBlockVirt = NULL; @@ -320,7 +318,7 @@ MiFreeSharedMemory( if(Adapter->TransmitDescriptorRingVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitDescriptorRingPhys; + PhysicalAddress = Adapter->TransmitDescriptorRingPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, FALSE, Adapter->TransmitDescriptorRingVirt, PhysicalAddress); Adapter->TransmitDescriptorRingVirt = NULL; @@ -328,7 +326,7 @@ MiFreeSharedMemory( if(Adapter->ReceiveDescriptorRingVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveDescriptorRingPhys; + PhysicalAddress = Adapter->ReceiveDescriptorRingPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, FALSE, Adapter->ReceiveDescriptorRingVirt, PhysicalAddress); Adapter->ReceiveDescriptorRingVirt = NULL; @@ -336,7 +334,7 @@ MiFreeSharedMemory( if(Adapter->TransmitBufferPtrVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitBufferPtrPhys; + PhysicalAddress = Adapter->TransmitBufferPtrPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, TRUE, Adapter->TransmitBufferPtrVirt, PhysicalAddress); Adapter->TransmitBufferPtrVirt = NULL; @@ -344,7 +342,7 @@ MiFreeSharedMemory( if(Adapter->ReceiveBufferPtrVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveBufferPtrPhys; + PhysicalAddress = Adapter->ReceiveBufferPtrPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, TRUE, Adapter->ReceiveBufferPtrVirt, PhysicalAddress); Adapter->ReceiveBufferPtrVirt = NULL; @@ -383,13 +381,13 @@ MiAllocateSharedMemory( return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) + if (((ULONG_PTR)Adapter->InitializationBlockVirt & 0x00000003) != 0) { DPRINT1("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); return NDIS_STATUS_RESOURCES; } - Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->InitializationBlockPhys = PhysicalAddress; /* allocate the transport descriptor ring */ Adapter->TransmitDescriptorRingLength = sizeof(TRANSMIT_DESCRIPTOR) * BufferCount; @@ -404,13 +402,13 @@ MiAllocateSharedMemory( continue; } - if (((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) + if (((ULONG_PTR)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) { DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); return NDIS_STATUS_RESOURCES; } - Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->TransmitDescriptorRingPhys = PhysicalAddress; RtlZeroMemory(Adapter->TransmitDescriptorRingVirt, sizeof(TRANSMIT_DESCRIPTOR) * BufferCount); /* allocate the receive descriptor ring */ @@ -426,13 +424,13 @@ MiAllocateSharedMemory( continue; } - if (((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) + if (((ULONG_PTR)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) { DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); return NDIS_STATUS_RESOURCES; } - Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->ReceiveDescriptorRingPhys = PhysicalAddress; RtlZeroMemory(Adapter->ReceiveDescriptorRingVirt, sizeof(RECEIVE_DESCRIPTOR) * BufferCount); /* allocate transmit buffers */ @@ -448,13 +446,13 @@ MiAllocateSharedMemory( continue; } - if (((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) { DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); return NDIS_STATUS_RESOURCES; } - Adapter->TransmitBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->TransmitBufferPtrPhys = PhysicalAddress; RtlZeroMemory(Adapter->TransmitBufferPtrVirt, BUFFER_SIZE * BufferCount); /* allocate receive buffers */ @@ -470,13 +468,13 @@ MiAllocateSharedMemory( continue; } - if (((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) + if (((ULONG_PTR)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) { DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); return NDIS_STATUS_RESOURCES; } - Adapter->ReceiveBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->ReceiveBufferPtrPhys = PhysicalAddress; RtlZeroMemory(Adapter->ReceiveBufferPtrVirt, BUFFER_SIZE * BufferCount); break; @@ -495,7 +493,7 @@ MiAllocateSharedMemory( TransmitDescriptor = Adapter->TransmitDescriptorRingVirt; for(i = 0; i < BufferCount; i++) { - (TransmitDescriptor+i)->TBADR = (ULONG)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; + (TransmitDescriptor+i)->TBADR = Adapter->TransmitBufferPtrPhys.QuadPart + i * BUFFER_SIZE; (TransmitDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ (TransmitDescriptor+i)->FLAGS = TD1_STP | TD1_ENP; } @@ -506,7 +504,7 @@ MiAllocateSharedMemory( ReceiveDescriptor = Adapter->ReceiveDescriptorRingVirt; for(i = 0; i < BufferCount; i++) { - (ReceiveDescriptor+i)->RBADR = (ULONG)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; + (ReceiveDescriptor+i)->RBADR = Adapter->ReceiveBufferPtrPhys.QuadPart + i * BUFFER_SIZE; (ReceiveDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ (ReceiveDescriptor+i)->FLAGS = RD_OWN; } @@ -542,12 +540,12 @@ MiPrepareInitializationBlock( /* set up receive ring */ DPRINT("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys); - Adapter->InitializationBlockVirt->RDRA = (ULONG)Adapter->ReceiveDescriptorRingPhys; + Adapter->InitializationBlockVirt->RDRA = Adapter->ReceiveDescriptorRingPhys.QuadPart; Adapter->InitializationBlockVirt->RLEN = (Adapter->LogBufferCount << 4) & 0xf0; /* set up transmit ring */ DPRINT("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys); - Adapter->InitializationBlockVirt->TDRA = (ULONG)Adapter->TransmitDescriptorRingPhys; + Adapter->InitializationBlockVirt->TDRA = Adapter->TransmitDescriptorRingPhys.QuadPart; Adapter->InitializationBlockVirt->TLEN = (Adapter->LogBufferCount << 4) & 0xf0; } @@ -730,9 +728,9 @@ MiInitChip( /* set up csr1 and csr2 with init block */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR1); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys & 0xffff)); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)(Adapter->InitializationBlockPhys.LowPart & 0xffff)); NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR2); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys >> 16) & 0xffff); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)(Adapter->InitializationBlockPhys.LowPart >> 16) & 0xffff); DPRINT("programmed with init block\n"); @@ -1223,7 +1221,7 @@ MiniportSend( Adapter->CurrentTransmitEndIndex %= Adapter->BufferCount; Desc->FLAGS = TD1_OWN | TD1_STP | TD1_ENP; - Desc->BCNT = 0xf000 | -TotalPacketLength; + Desc->BCNT = 0xf000 | -(INT)TotalPacketLength; NdisMSynchronizeWithInterrupt(&Adapter->InterruptObject, MiSyncStartTransmit, Adapter); diff --git a/drivers/network/dd/pcnet/pcnet.h b/drivers/network/dd/pcnet/pcnet.h index 5389c3ee96..578d1da7ad 100644 --- a/drivers/network/dd/pcnet/pcnet.h +++ b/drivers/network/dd/pcnet/pcnet.h @@ -79,27 +79,27 @@ typedef struct _ADAPTER /* initialization block */ ULONG InitializationBlockLength; PINITIALIZATION_BLOCK InitializationBlockVirt; - PINITIALIZATION_BLOCK InitializationBlockPhys; + PHYSICAL_ADDRESS InitializationBlockPhys; /* transmit descriptor ring */ ULONG TransmitDescriptorRingLength; PTRANSMIT_DESCRIPTOR TransmitDescriptorRingVirt; - PTRANSMIT_DESCRIPTOR TransmitDescriptorRingPhys; + PHYSICAL_ADDRESS TransmitDescriptorRingPhys; /* transmit buffers */ ULONG TransmitBufferLength; PCHAR TransmitBufferPtrVirt; - PCHAR TransmitBufferPtrPhys; + PHYSICAL_ADDRESS TransmitBufferPtrPhys; /* receive descriptor ring */ ULONG ReceiveDescriptorRingLength; PRECEIVE_DESCRIPTOR ReceiveDescriptorRingVirt; - PRECEIVE_DESCRIPTOR ReceiveDescriptorRingPhys; + PHYSICAL_ADDRESS ReceiveDescriptorRingPhys; /* receive buffers */ ULONG ReceiveBufferLength; PCHAR ReceiveBufferPtrVirt; - PCHAR ReceiveBufferPtrPhys; + PHYSICAL_ADDRESS ReceiveBufferPtrPhys; /* buffer count */ ULONG BufferCount; diff --git a/modules/rosapps/applications/explorer-old/shell/mainframe.cpp b/modules/rosapps/applications/explorer-old/shell/mainframe.cpp index dd8618a756..6cda867b92 100644 --- a/modules/rosapps/applications/explorer-old/shell/mainframe.cpp +++ b/modules/rosapps/applications/explorer-old/shell/mainframe.cpp @@ -418,7 +418,7 @@ int MainFrameBase::Command(int id, int code) HINSTANCE hinst = ShellExecute(_hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); - if ((int)hinst <= 32) + if ((INT_PTR)hinst <= 32) display_error(_hwnd, GetLastError()); } break;} diff --git a/modules/rosapps/applications/explorer-old/utility/utility.cpp b/modules/rosapps/applications/explorer-old/utility/utility.cpp index d20c73b633..9fe745e4c1 100644 --- a/modules/rosapps/applications/explorer-old/utility/utility.cpp +++ b/modules/rosapps/applications/explorer-old/utility/utility.cpp @@ -192,7 +192,7 @@ BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow, LPCTSTR parameters) HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow); - if ((int)hinst <= 32) { + if ((INT_PTR)hinst <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -205,7 +205,7 @@ BOOL launch_fileA(HWND hwnd, LPSTR cmd, UINT nCmdShow, LPCSTR parameters) { HINSTANCE hinst = ShellExecuteA(hwnd, NULL/*operation*/, cmd, parameters, NULL/*dir*/, nCmdShow); - if ((int)hinst <= 32) { + if ((INT_PTR)hinst <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -387,7 +387,7 @@ BOOL launch_cpanel(HWND hwnd, LPCTSTR applet) _tcscpy(parameters, TEXT("shell32.dll,Control_RunDLL ")); _tcscat(parameters, applet); - return ((int)ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), parameters, NULL, SW_SHOWDEFAULT) > 32); + return ((INT_PTR)ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), parameters, NULL, SW_SHOWDEFAULT) > 32); } diff --git a/modules/rosapps/applications/explorer-old/utility/window.h b/modules/rosapps/applications/explorer-old/utility/window.h index 3bf913adfb..391f42a76d 100644 --- a/modules/rosapps/applications/explorer-old/utility/window.h +++ b/modules/rosapps/applications/explorer-old/utility/window.h @@ -838,7 +838,7 @@ protected: { if (!_cmd.empty()) { HINSTANCE hinst = ShellExecute(GetParent(_hwnd), _T("open"), _cmd, 0, 0, SW_SHOWNORMAL); - return (int)hinst > HINSTANCE_ERROR; + return (INT_PTR)hinst > HINSTANCE_ERROR; } return true; @@ -861,7 +861,7 @@ struct ToolTip : public WindowHandle void add(HWND hparent, HWND htool, LPCTSTR txt=LPSTR_TEXTCALLBACK, LPARAM lparam=0) { TOOLINFO ti = { - sizeof(TOOLINFO), TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT, hparent, (UINT)htool, + sizeof(TOOLINFO), TTF_SUBCLASS|TTF_IDISHWND|TTF_TRANSPARENT, hparent, (UINT_PTR)htool, {0,0,0,0}, 0, (LPTSTR)txt, lparam }; @@ -893,7 +893,7 @@ struct ToolTip : public WindowHandle void remove(HWND hparent, HWND htool) { TOOLINFO ti = { - sizeof(TOOLINFO), TTF_IDISHWND, hparent, (UINT)htool, + sizeof(TOOLINFO), TTF_IDISHWND, hparent, (UINT_PTR)htool, {0,0,0,0}, 0, 0, 0 }; diff --git a/ntoskrnl/ke/amd64/context.c b/ntoskrnl/ke/amd64/context.c index ec20efa4d4..3e21cae319 100644 --- a/ntoskrnl/ke/amd64/context.c +++ b/ntoskrnl/ke/amd64/context.c @@ -57,8 +57,9 @@ KeContextToTrapFrame(IN PCONTEXT Context, /* Handle floating point registers */ if ((ContextFlags & CONTEXT_FLOATING_POINT) && - (Context->SegCs & MODE_MASK)) + ((Context->SegCs & MODE_MASK) != KernelMode)) { + TrapFrame->MxCsr = Context->MxCsr; TrapFrame->Xmm0 = Context->Xmm0; TrapFrame->Xmm1 = Context->Xmm1; TrapFrame->Xmm2 = Context->Xmm2; @@ -84,7 +85,7 @@ KeContextToTrapFrame(IN PCONTEXT Context, if (ContextFlags & CONTEXT_CONTROL) { /* Check if this was a Kernel Trap */ - if (Context->SegCs == KGDT64_R0_CODE) + if ((Context->SegCs & MODE_MASK) == KernelMode) { /* Set valid selectors */ TrapFrame->SegCs = KGDT64_R0_CODE; @@ -107,7 +108,7 @@ KeContextToTrapFrame(IN PCONTEXT Context, if (ContextFlags & CONTEXT_SEGMENTS) { /* Check if this was a Kernel Trap */ - if (Context->SegCs == KGDT64_R0_CODE) + if ((Context->SegCs & MODE_MASK) == KernelMode) { /* Set valid selectors */ TrapFrame->SegDs = KGDT64_R3_DATA | RPL_MASK; @@ -147,14 +148,20 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame, IN OUT PCONTEXT Context) { + ULONG ContextFlags; KIRQL OldIrql; /* Do this at APC_LEVEL */ OldIrql = KeGetCurrentIrql(); if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + /* Make sure we have an amd64 context, then remove the flag */ + ContextFlags = Context->ContextFlags; + ASSERT(ContextFlags & CONTEXT_AMD64); + ContextFlags &= ~CONTEXT_AMD64; + /* Handle integer registers */ - if ((Context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) + if (ContextFlags & CONTEXT_INTEGER) { Context->Rax = TrapFrame->Rax; Context->Rbx = TrapFrame->Rbx; @@ -178,8 +185,8 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, } /* Handle floating point registers */ - if (((Context->ContextFlags & CONTEXT_FLOATING_POINT) == - CONTEXT_FLOATING_POINT) && (TrapFrame->SegCs & MODE_MASK)) + if ((ContextFlags & CONTEXT_FLOATING_POINT) && + ((TrapFrame->SegCs & MODE_MASK) != KernelMode)) { Context->Xmm0 = TrapFrame->Xmm0; Context->Xmm1 = TrapFrame->Xmm1; @@ -203,10 +210,10 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, } /* Handle control registers */ - if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) + if (ContextFlags & CONTEXT_CONTROL) { /* Check if this was a Kernel Trap */ - if (TrapFrame->SegCs == KGDT64_R0_CODE) + if ((TrapFrame->SegCs & MODE_MASK) == KernelMode) { /* Set valid selectors */ Context->SegCs = KGDT64_R0_CODE; @@ -226,10 +233,10 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, } /* Handle segment selectors */ - if ((Context->ContextFlags & CONTEXT_SEGMENTS) == CONTEXT_SEGMENTS) + if (ContextFlags & CONTEXT_SEGMENTS) { /* Check if this was a Kernel Trap */ - if (TrapFrame->SegCs == KGDT64_R0_CODE) + if ((TrapFrame->SegCs & MODE_MASK) == KernelMode) { /* Set valid selectors */ Context->SegDs = KGDT64_R3_DATA | RPL_MASK; @@ -248,8 +255,7 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, } /* Handle debug registers */ - if ((Context->ContextFlags & CONTEXT_DEBUG_REGISTERS) == - CONTEXT_DEBUG_REGISTERS) + if (ContextFlags & CONTEXT_DEBUG_REGISTERS) { /* Copy the debug registers */ Context->Dr0 = TrapFrame->Dr0; diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 730bda1d9a..3c2b706a90 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -54,16 +54,9 @@ VOID NTAPI KiSetProcessorType(VOID) { - ULONG64 EFlags; CPU_INFO CpuInfo; ULONG Stepping, Type; - /* Start by assuming no CPUID data */ - KeGetCurrentPrcb()->CpuID = 0; - - /* Save EFlags */ - EFlags = __readeflags(); - /* Do CPUID 1 now */ KiCpuId(&CpuInfo, 1); @@ -85,9 +78,6 @@ KiSetProcessorType(VOID) KeGetCurrentPrcb()->CpuID = TRUE; KeGetCurrentPrcb()->CpuType = (UCHAR)Type; KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; - - /* Restore EFLAGS */ - __writeeflags(EFlags); } ULONG diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 899debd191..a92acb1bab 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -716,7 +716,7 @@ KiDisplayBlueScreen(IN ULONG MessageId, /* Show the technical Data */ sprintf(AnsiName, "\r\n\r\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\r\n\r\n", - KiBugCheckData[0], + (ULONG)KiBugCheckData[0], (PVOID)KiBugCheckData[1], (PVOID)KiBugCheckData[2], (PVOID)KiBugCheckData[3], diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index c9b5daf13d..6a2710e0be 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -3567,7 +3567,7 @@ NtMapViewOfSection(IN HANDLE SectionHandle, ACCESS_MASK DesiredAccess; ULONG ProtectionMask; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) static const ULONG ValidAllocationType = (MEM_TOP_DOWN | MEM_LARGE_PAGES | MEM_DOS_LIM | SEC_NO_CHANGE | MEM_RESERVE); #else diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 864302bd42..c5f6158d81 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -312,8 +312,10 @@ MmIsDisabledPage(PEPROCESS Process, PVOID Address) { MMPTE Pte; Pte.u.Long = MiGetPteValueForProcess(Process, Address); - __debugbreak(); // FIXME - return !Pte.u.Hard.Valid && !(Pte.u.Long & 0x800) && Pte.u.Hard.PageFrameNumber; + + return (Pte.u.Hard.Valid == 0) && + (Pte.u.Trans.Transition == 0) && + (Pte.u.Hard.PageFrameNumber != 0); } BOOLEAN diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 7963217d8b..839a0d77d7 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -1975,7 +1975,7 @@ typedef struct _KPROCESS LIST_ENTRY ProfileListHead; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG_PTR DirectoryTableBase; - ULONG Unused0; + ULONG_PTR Unused0; #else ULONG_PTR DirectoryTableBase[2]; #endif diff --git a/sdk/include/xdk/amd64/ke.h b/sdk/include/xdk/amd64/ke.h index f16b721455..90abb70311 100644 --- a/sdk/include/xdk/amd64/ke.h +++ b/sdk/include/xdk/amd64/ke.h @@ -191,7 +191,7 @@ $if (_NTDDK_) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) -#define CONTEXT_XSTATE (CONTEXT_AMD64 | 0x20L) +#define CONTEXT_XSTATE (CONTEXT_AMD64 | 0x40L) #define CONTEXT_EXCEPTION_ACTIVE 0x8000000 #define CONTEXT_SERVICE_ACTIVE 0x10000000

1 0

[reactos] 01/01: [CHARMAP:NEW] Fix newlines and whitespace.
by Hermès Bélusca-Maïto 01 Jan '18

01 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a4693ff6fb2ad413e35e… commit 5a4693ff6fb2ad413e35eb66116b2898728af82b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 1 02:10:22 2018 +0100 [CHARMAP:NEW] Fix newlines and whitespace. --- base/applications/charmap_new/lang/en-US.rc | 2 +- base/applications/charmap_new/lang/it-IT.rc | 58 ++++++++++++++--------------- base/applications/charmap_new/lang/pl-PL.rc | 4 +- base/applications/charmap_new/lang/ro-RO.rc | 58 ++++++++++++++--------------- base/applications/charmap_new/lang/tr-TR.rc | 2 +- base/applications/charmap_new/lang/zh-CN.rc | 2 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/base/applications/charmap_new/lang/en-US.rc b/base/applications/charmap_new/lang/en-US.rc index ecc294b45d..c8a1566cc3 100644 --- a/base/applications/charmap_new/lang/en-US.rc +++ b/base/applications/charmap_new/lang/en-US.rc @@ -7,7 +7,7 @@ CAPTION "ReactOS Character Map" BEGIN LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "Characters to copy:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 diff --git a/base/applications/charmap_new/lang/it-IT.rc b/base/applications/charmap_new/lang/it-IT.rc index 4379f46102..5a81e8f752 100644 --- a/base/applications/charmap_new/lang/it-IT.rc +++ b/base/applications/charmap_new/lang/it-IT.rc @@ -1,29 +1,29 @@ -/* - * PROJECT: ReactOS Character Map - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Italian Translation for ReactOS Character Map - * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) - */ - - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -IDD_CHARMAP DIALOGEX 6, 6, 290, 224 -FONT 8, "MS Shell Dlg", 0, 0 -STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX -CAPTION "Mappa Caratteri di ReactOS" -BEGIN - LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - LTEXT "Caratteri da copiare:", IDC_STATIC, 6, 188, 66, 9 - CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 - DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13 - PUSHBUTTON "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED -END - -STRINGTABLE -BEGIN - IDS_ABOUT "&Informazioni su…" - IDS_TITLE "Mappa caratteri" -END +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian Translation for ReactOS Character Map + * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX +CAPTION "Mappa Caratteri di ReactOS" +BEGIN + LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "Caratteri da copiare:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED +END + +STRINGTABLE +BEGIN + IDS_ABOUT "&Informazioni su…" + IDS_TITLE "Mappa caratteri" +END diff --git a/base/applications/charmap_new/lang/pl-PL.rc b/base/applications/charmap_new/lang/pl-PL.rc index 4332bdc29d..1268ebf07b 100644 --- a/base/applications/charmap_new/lang/pl-PL.rc +++ b/base/applications/charmap_new/lang/pl-PL.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 290, 224 FONT 8, "MS Shell Dlg", 0, 0 @@ -7,7 +7,7 @@ CAPTION "Tablica znaków ReactOS" BEGIN LTEXT "Czcionka:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "Znaki do skopiowania:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 diff --git a/base/applications/charmap_new/lang/ro-RO.rc b/base/applications/charmap_new/lang/ro-RO.rc index 60dc0a9cad..a043a35ca6 100644 --- a/base/applications/charmap_new/lang/ro-RO.rc +++ b/base/applications/charmap_new/lang/ro-RO.rc @@ -1,29 +1,29 @@ -/* - * PROJECT: ReactOS Character Map - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Romanian Translation for ReactOS Character Map - * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) - */ - - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -IDD_CHARMAP DIALOGEX 6, 6, 290, 224 -FONT 8, "MS Shell Dlg", 0, 0 -STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX -CAPTION "Hartă de caractere de ReactOS" -BEGIN - LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - LTEXT "Caractere de copiat:", IDC_STATIC, 6, 188, 66, 9 - CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 - DEFPUSHBUTTON "Selectează", IDC_SELECT, 194, 186, 44, 13 - PUSHBUTTON "Copiază", IDC_COPY, 242, 186, 44, 13, WS_DISABLED -END - -STRINGTABLE -BEGIN - IDS_ABOUT "&Despre…" - IDS_TITLE "Hartă de caractere" -END +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Romanian Translation for ReactOS Character Map + * COPYRIGHT: Bișoc George (fraizeraust99(a)gmail.com) + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 +FONT 8, "MS Shell Dlg", 0, 0 +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX +CAPTION "Hartă de caractere de ReactOS" +BEGIN + LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + LTEXT "Caractere de copiat:", IDC_STATIC, 6, 188, 66, 9 + CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | + WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 + DEFPUSHBUTTON "Selectează", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "Copiază", IDC_COPY, 242, 186, 44, 13, WS_DISABLED +END + +STRINGTABLE +BEGIN + IDS_ABOUT "&Despre…" + IDS_TITLE "Hartă de caractere" +END diff --git a/base/applications/charmap_new/lang/tr-TR.rc b/base/applications/charmap_new/lang/tr-TR.rc index cdbe5e4caf..8f7403b14d 100644 --- a/base/applications/charmap_new/lang/tr-TR.rc +++ b/base/applications/charmap_new/lang/tr-TR.rc @@ -9,7 +9,7 @@ CAPTION "ReactOS Damga Eşlemi" BEGIN LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "Çoğaltılacak Damgalar:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 diff --git a/base/applications/charmap_new/lang/zh-CN.rc b/base/applications/charmap_new/lang/zh-CN.rc index 022a828d28..d85f1a1932 100644 --- a/base/applications/charmap_new/lang/zh-CN.rc +++ b/base/applications/charmap_new/lang/zh-CN.rc @@ -7,7 +7,7 @@ CAPTION "ReactOS 字符映射表" BEGIN LTEXT "字体：", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | - WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "待复制的字符：", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13

1 0

[reactos] 01/01: [REACTOS] Switch to year 2018...
by Hermès Bélusca-Maïto 31 Dec '17

31 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fa693e59b5afbd35e4dc… commit 9fa693e59b5afbd35e4dc10a4a9013997f71b793 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 1 00:00:00 2018 +0100 [REACTOS] Switch to year 2018... ... and Happy New Year 2018 to everyone!! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░░ ░░░░░░█▀█ █▀█ █▀▀ █▀▀ ▀█▀░░░░░░ ░░░░░░▀░▀ ▀░▀ ▀░░ ▀░░ ░▀░░░░░░░ █▄░█ █▀▀ █░█░█░░█░█ █▀▀ █▀█ █▀█ █░██ █▀▀ █░█░█░░▀█▀ █▀▀ █▀█ ██▀ ▀░░▀ ▀▀▀ ░▀▀▀░░░░▀░ ▀▀▀ ▀░▀ ▀░▀ ⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰ ░░░▄████▄░▄███▄░░▄██░▄████▄░░░ ░░░▀▀░▄██░██░██░████░██▄▄██░░░ ░░░░▄██▀░░██░██░░░██░██▀▀██░░░ ░░░██████░▀███▀░░░██░▀████▀░░░ ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/logo/1.bmp | Bin 21640 -> 21654 bytes sdk/include/reactos/version.cmake | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 56d14e687d..4c8ecfe8c9 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/reactos.svg index a8c1f2c9a0..2af08cf093 100644 --- a/dll/win32/msgina/resources/reactos.svg +++ b/dll/win32/msgina/resources/reactos.svg @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2017 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2018 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 56d14e687d..4c8ecfe8c9 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp index f48c35c6d2..1c2c7bdd58 100644 Binary files a/ntoskrnl/inbv/logo/1.bmp and b/ntoskrnl/inbv/logo/1.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 2eabee77ba..ca0ceb4c9a 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -3,7 +3,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "8") -set(COPYRIGHT_YEAR "2017") +set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [NTFS] Start using different tags for allocations. They all be Ntf? as for the Windows NTFS driver
by Pierre Schweitzer 31 Dec '17

31 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2a5322576b87a1233fad… commit d2a5322576b87a1233fad125b1e0ed70c1800399 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 31 23:11:12 2017 +0100 [NTFS] Start using different tags for allocations. They all be Ntf? as for the Windows NTFS driver --- drivers/filesystems/ntfs/fsctl.c | 2 +- drivers/filesystems/ntfs/ntfs.c | 4 ++-- drivers/filesystems/ntfs/ntfs.h | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index 87858e07c0..c85f1bfb9f 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -275,7 +275,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, ExFreePool(BootSector); ExInitializeNPagedLookasideList(&DeviceExt->FileRecLookasideList, - NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_NTFS, 0); + NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_FILE_REC, 0); DeviceExt->MasterFileTable = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (DeviceExt->MasterFileTable == NULL) diff --git a/drivers/filesystems/ntfs/ntfs.c b/drivers/filesystems/ntfs/ntfs.c index 53733e1dec..c29badab08 100644 --- a/drivers/filesystems/ntfs/ntfs.c +++ b/drivers/filesystems/ntfs/ntfs.c @@ -142,13 +142,13 @@ DriverEntry(PDRIVER_OBJECT DriverObject, /* Initialize lookaside list for IRP contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList, - NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), 'PRIN', 0); + NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), TAG_IRP_CTXT, 0); /* Initialize lookaside list for FCBs */ ExInitializeNPagedLookasideList(&NtfsGlobalData->FcbLookasideList, NULL, NULL, 0, sizeof(NTFS_FCB), TAG_FCB, 0); /* Initialize lookaside list for attributes contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->AttrCtxtLookasideList, - NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_NTFS, 0); + NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_ATT_CTXT, 0); /* Driver can't be unloaded */ DriverObject->DriverUnload = NULL; diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 7b88f7b7c4..a0cb6ab7cd 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -14,7 +14,12 @@ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) -#define TAG_NTFS 'SFTN' +#define TAG_NTFS '0ftN' +#define TAG_CCB 'CftN' +#define TAG_FCB 'FftN' +#define TAG_IRP_CTXT 'iftN' +#define TAG_ATT_CTXT 'aftN' +#define TAG_FILE_REC 'rftN' #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) @@ -140,9 +145,6 @@ typedef struct ULONG LastOffset; } NTFS_CCB, *PNTFS_CCB; -#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' - typedef struct { NTFSIDENTIFIER Identifier;

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