Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 72432: [CMAKE] - Update kernel32 address
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 14:34:53 2016 New Revision: 72432 URL: http://svn.reactos.org/svn/reactos?rev=72432&view=rev Log: [CMAKE] - Update kernel32 address Modified: trunk/reactos/sdk/cmake/baseaddress.cmake Modified: trunk/reactos/sdk/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Mon Aug 22 14:34:53 2016 @@ -1,5 +1,5 @@ set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c760000) +set(baseaddress_kernel32 0x7cc70000) set(baseaddress_msvcrt 0x7c6b0000) set(baseaddress_advapi32 0x7c600000) set(baseaddress_gdi32 0x7c560000)

1 0

[dchapyshev] 72431: [CMAKE] - Convert all *.mc files to UTF16 LE (without BOM) at build - Use unicode flag in windmc/mc for source files - Switch UNICODE_SOURCE files to UNICODE (must check for the...
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 14:02:42 2016 New Revision: 72431 URL: http://svn.reactos.org/svn/reactos?rev=72431&view=rev Log: [CMAKE] - Convert all *.mc files to UTF16 LE (without BOM) at build - Use unicode flag in windmc/mc for source files - Switch UNICODE_SOURCE files to UNICODE (must check for the presence of regression tests) Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake trunk/reactos/sdk/cmake/gcc.cmake trunk/reactos/sdk/include/reactos/mc/CMakeLists.txt Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Mon Aug 22 14:02:42 2016 @@ -115,11 +115,17 @@ endif() foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) + set(_converted_item ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc) + set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + add_custom_command( + OUTPUT "${_converted_item}" + COMMAND native-utf16le "${_source_item}" "${_converted_item}" "nobom" + DEPENDS native-utf16le "${_source_item}") macro_mc(${_flag} ${FILE}) add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h COMMAND ${COMMAND_MC} ${MC_FLAGS} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + DEPENDS "${_converted_item}") set_source_files_properties( ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc PROPERTIES GENERATED TRUE) Modified: trunk/reactos/sdk/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/gcc.cmake?rev=72… ============================================================================== --- trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] Mon Aug 22 14:02:42 2016 @@ -379,7 +379,7 @@ endfunction() macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) + set(COMMAND_MC ${CMAKE_MC_COMPILER} -u ${FLAG} -b ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos) endmacro() # PSEH lib, needed with mingw Modified: trunk/reactos/sdk/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/CMa… ============================================================================== --- trunk/reactos/sdk/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/mc/CMakeLists.txt [iso-8859-1] Mon Aug 22 14:02:42 2016 @@ -15,5 +15,5 @@ add_message_headers(ANSI ${ANSI_SOURCE}) # FIXME: this needs testing before switching to unicode -add_message_headers(ANSI ${UNICODE_SOURCE}) +add_message_headers(UNICODE ${UNICODE_SOURCE}) add_message_headers(UNICODE ${UNICODE_SOURCE_REALLY})

1 0

[dchapyshev] 72430: [UTF16LE] - Fix MSVC build
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:49:12 2016 New Revision: 72430 URL: http://svn.reactos.org/svn/reactos?rev=72430&view=rev Log: [UTF16LE] - Fix MSVC build Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:49:12 2016 @@ -18,6 +18,10 @@ //#define DISPLAY_DETECTED_UNICODE using namespace std; + +#ifdef _MSC_VER +#define strcasecmp _stricmp +#endif class utf_converter {

1 0

[jimtabor] 72429: [NtUser] - Defer the changing of the window region while setting the window position. - Patch based on Stefano Toncich work. See CORE-6897 and possibly CORE-7229.
by jimtabor＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: jimtabor Date: Mon Aug 22 13:28:02 2016 New Revision: 72429 URL: http://svn.reactos.org/svn/reactos?rev=72429&view=rev Log: [NtUser] - Defer the changing of the window region while setting the window position. - Patch based on Stefano Toncich work. See CORE-6897 and possibly CORE-7229. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Aug 22 13:28:02 2016 @@ -31,6 +31,40 @@ VOID FASTCALL IntLinkWindow(PWND Wnd,PWND WndInsertAfter); /* FUNCTIONS *****************************************************************/ + +#if DBG +/*********************************************************************** + * dump_winpos_flags + */ +static void dump_winpos_flags(UINT flags) +{ + static const DWORD dumped_flags = (SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | + SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_SHOWWINDOW | + SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOOWNERZORDER | + SWP_NOSENDCHANGING | SWP_DEFERERASE | SWP_ASYNCWINDOWPOS | + SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_STATECHANGED); + TRACE("flags:"); + if(flags & SWP_NOSIZE) TRACE(" SWP_NOSIZE"); + if(flags & SWP_NOMOVE) TRACE(" SWP_NOMOVE"); + if(flags & SWP_NOZORDER) TRACE(" SWP_NOZORDER"); + if(flags & SWP_NOREDRAW) TRACE(" SWP_NOREDRAW"); + if(flags & SWP_NOACTIVATE) TRACE(" SWP_NOACTIVATE"); + if(flags & SWP_FRAMECHANGED) TRACE(" SWP_FRAMECHANGED"); + if(flags & SWP_SHOWWINDOW) TRACE(" SWP_SHOWWINDOW"); + if(flags & SWP_HIDEWINDOW) TRACE(" SWP_HIDEWINDOW"); + if(flags & SWP_NOCOPYBITS) TRACE(" SWP_NOCOPYBITS"); + if(flags & SWP_NOOWNERZORDER) TRACE(" SWP_NOOWNERZORDER"); + if(flags & SWP_NOSENDCHANGING) TRACE(" SWP_NOSENDCHANGING"); + if(flags & SWP_DEFERERASE) TRACE(" SWP_DEFERERASE"); + if(flags & SWP_ASYNCWINDOWPOS) TRACE(" SWP_ASYNCWINDOWPOS"); + if(flags & SWP_NOCLIENTSIZE) TRACE(" SWP_NOCLIENTSIZE"); + if(flags & SWP_NOCLIENTMOVE) TRACE(" SWP_NOCLIENTMOVE"); + if(flags & SWP_STATECHANGED) TRACE(" SWP_STATECHANGED"); + + if(flags & ~dumped_flags) TRACE(" %08x", flags & ~dumped_flags); + TRACE("\n"); +} +#endif BOOL FASTCALL IntGetClientOrigin(PWND Window OPTIONAL, LPPOINT Point) @@ -218,6 +252,30 @@ return pWnd; } return NULL; +} + +VOID +SelectWindowRgn( PWND Window, HRGN hRgnClip) +{ + if (Window->hrgnClip) + { + /* Delete no longer needed region handle */ + IntGdiSetRegionOwner(Window->hrgnClip, GDI_OBJ_HMGR_POWNED); + GreDeleteObject(Window->hrgnClip); + Window->hrgnClip = NULL; + } + + if (hRgnClip > HRGN_WINDOW) + { + /*if (Window != UserGetDesktopWindow()) // Window->fnid != FNID_DESKTOP) + { + NtGdiOffsetRgn(hRgnClip, Window->rcWindow.left, Window->rcWindow.top); + }*/ + /* Set public ownership */ + IntGdiSetRegionOwner(hRgnClip, GDI_OBJ_HMGR_PUBLIC); + + Window->hrgnClip = hRgnClip; + } } // @@ -1758,10 +1816,16 @@ HDC Dc; RECTL CopyRect; PWND Ancestor; - BOOL bPointerInWindow; + BOOL bPointerInWindow, PosChanged = FALSE; //PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); ASSERT_REFS_CO(Window); + + TRACE("pwnd %p, after %p, %d,%d (%dx%d), flags %s", + Window, WndInsertAfter, x, y, cx, cy, flags); +#if DBG + dump_winpos_flags(flags); +#endif /* FIXME: Get current active window from active queue. Why? since r2915. */ @@ -1862,6 +1926,13 @@ } } + //// HACK 3 + if (Window->hrgnNewFrame) + { + SelectWindowRgn( Window, Window->hrgnNewFrame ); // Should be PSMWP->acvr->hrgnClip + Window->hrgnNewFrame = NULL; + } + WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect, valid_rects); // ERR("co_WinPosDoNCCALCSize returned 0x%x\n valid dest: %d %d %d %d\n valid src : %d %d %d %d\n", WvrFlags, @@ -1884,6 +1955,7 @@ WinPosInternalMoveWindow(Window, NewClientRect.left - OldClientRect.left, NewClientRect.top - OldClientRect.top); + PosChanged = TRUE; } Window->rcWindow = NewWindowRect; @@ -1951,11 +2023,12 @@ * class need to be completely repainted on (horizontal/vertical) size * change. */ - if ( VisBefore != NULL && - VisAfter != NULL && - !(WinPos.flags & SWP_NOCOPYBITS) && - ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && - !(Window->ExStyle & WS_EX_TRANSPARENT) ) + if ( ( VisBefore != NULL && + VisAfter != NULL && + !(WinPos.flags & SWP_NOCOPYBITS) && + ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && + !(Window->ExStyle & WS_EX_TRANSPARENT) ) || + ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore) ) { /* @@ -2000,8 +2073,9 @@ REGION_Delete(CopyRgn); CopyRgn = NULL; } - else if (OldWindowRect.left != NewWindowRect.left || - OldWindowRect.top != NewWindowRect.top) + else if ( OldWindowRect.left != NewWindowRect.left || + OldWindowRect.top != NewWindowRect.top || + (WinPos.flags & SWP_FRAMECHANGED) ) { HRGN DcRgn = NtGdiCreateRectRgn(0, 0, 0, 0); PREGION DcRgnObj = REGION_LockRgn(DcRgn); @@ -2041,7 +2115,19 @@ { CopyRgn = NULL; } - +#if 0 + /////// Fixes NoPopup tests but breaks msg_paint tests. + if ( !PosChanged && (WinPos.flags & SWP_FRAMECHANGED) && VisBefore) + { + PWND Parent = Window->spwndParent; + ERR("SWP_FRAMECHANGED no chg\n"); + if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) + { + ERR("SWP_FRAMECHANGED Parent WS_CLIPCHILDREN\n"); + //IntInvalidateWindows( Window, VisBefore, /*RDW_ERASE |*/ RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + } +#endif /* We need to redraw what wasn't visible before */ if (VisAfter != NULL) { @@ -3303,20 +3389,16 @@ RETURN( 0); } - if (Window->hrgnClip) - { - /* Delete no longer needed region handle */ - IntGdiSetRegionOwner(Window->hrgnClip, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(Window->hrgnClip); - } - + //// HACK 1 : Work around the lack of supporting DeferWindowPos. if (hrgnCopy) { - /* Set public ownership */ - IntGdiSetRegionOwner(hrgnCopy, GDI_OBJ_HMGR_PUBLIC); - } - Window->hrgnClip = hrgnCopy; - + Window->hrgnNewFrame = hrgnCopy; // Should be PSMWP->acvr->hrgnClip + } + else + { + Window->hrgnNewFrame = (HRGN) 1; + } + //// HACK 2 Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) ); RETURN( (INT)Ret);

1 0

[dchapyshev] 72428: Maybe strcasecmp?
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:22:32 2016 New Revision: 72428 URL: http://svn.reactos.org/svn/reactos?rev=72428&view=rev Log: Maybe strcasecmp? Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:22:32 2016 @@ -279,7 +279,7 @@ utf_converter::bom_types bom_type = utf_converter::bom; - if (argc == 4 && stricmp(argv[3], "nobom") == 0) + if (argc == 4 && strcasecmp(argv[3], "nobom") == 0) { bom_type = utf_converter::nobom; }

1 0

[dchapyshev] 72427: [UTF16LE] Try to fix build
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:18:26 2016 New Revision: 72427 URL: http://svn.reactos.org/svn/reactos?rev=72427&view=rev Log: [UTF16LE] Try to fix build Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:18:26 2016 @@ -279,12 +279,12 @@ utf_converter::bom_types bom_type = utf_converter::bom; - if (argc == 4 && _stricmp(argv[3], "nobom") == 0) + if (argc == 4 && stricmp(argv[3], "nobom") == 0) { bom_type = utf_converter::nobom; } - utf_converter conv(argv[1],argv[2], bom_type); + utf_converter conv(argv[1], argv[2], bom_type); if ((err = conv.getError())!=utf_converter::none) {

1 0

[dchapyshev] 72426: [UTF16LE] - Implement ability to disable BOM writing
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 13:14:41 2016 New Revision: 72426 URL: http://svn.reactos.org/svn/reactos?rev=72426&view=rev Log: [UTF16LE] - Implement ability to disable BOM writing Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp Modified: trunk/reactos/sdk/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/utf16le/utf16le.… ============================================================================== --- trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/utf16le/utf16le.cpp [iso-8859-1] Mon Aug 22 13:14:41 2016 @@ -13,6 +13,7 @@ #include <fstream> #include <iostream> +#include <string.h> //#define DISPLAY_DETECTED_UNICODE @@ -25,14 +26,16 @@ // due to ambiguous BOM enum enc_types { detect, utf8, utf16le, utf16be, utf32le, utf32be }; enum err_types { none, iopen, oopen, eof, read, write, decode }; + enum bom_types { bom, nobom }; protected: err_types error; enc_types encoding; + bom_types bom_type; unsigned char buffer[4], fill, index; // need 4 char buffer for optional BOM handling fstream inputfile,outputfile; static const unsigned char utf8table[64]; public: - utf_converter(string ifname, string ofname, enc_types enc = detect) : error(none), encoding(enc), fill(0), index(0) + utf_converter(string ifname, string ofname, bom_types ofbom = bom, enc_types enc = detect) : error(none), bom_type(ofbom), encoding(enc), fill(0), index(0) { enc_types tmp_enc; inputfile.open(ifname.c_str(), ios::in | ios::binary); @@ -230,10 +233,15 @@ } void convert2utf16le() { - wchar_t c; - unsigned char buffer[2] = {0xff, 0xfe}; - outputfile.write(reinterpret_cast<char*>(&buffer),2); // write BOM - c = get_wchar_t(); + unsigned char buffer[2] = { 0xff, 0xfe }; + + if (bom_type == bom) + { + outputfile.write(reinterpret_cast<char*>(&buffer), 2); // write BOM + } + + wchar_t c = get_wchar_t(); + while (!inputfile.eof()) { buffer[0] = c & 0xff; @@ -262,12 +270,22 @@ int main(int argc, char* argv[]) { utf_converter::err_types err; + if (argc < 3) { cout << "usage: " << argv[0] << " inputfile outputfile" << endl; return -1; } - utf_converter conv(argv[1],argv[2]); + + utf_converter::bom_types bom_type = utf_converter::bom; + + if (argc == 4 && _stricmp(argv[3], "nobom") == 0) + { + bom_type = utf_converter::nobom; + } + + utf_converter conv(argv[1],argv[2], bom_type); + if ((err = conv.getError())!=utf_converter::none) { switch (err) @@ -282,7 +300,11 @@ cerr << "Unknown error." << endl; } return -1; - } else - conv.convert2utf16le(); + } + else + { + conv.convert2utf16le(); + } + return 0; }

1 0

[dchapyshev] 72425: [KERNEL32] - Update Russian translation
by dchapyshev＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: dchapyshev Date: Mon Aug 22 12:15:00 2016 New Revision: 72425 URL: http://svn.reactos.org/svn/reactos?rev=72425&view=rev Log: [KERNEL32] - Update Russian translation Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc [iso-8859-1] Mon Aug 22 12:15:00 2016 @@ -226,7 +226,7 @@ 84+NLSRC_OFFSET "Ð¤ÑÐ°Ð½ÑÐ¸Ñ" 86+NLSRC_OFFSET "ÐÐ°Ð¼Ð±Ð¸Ñ" 87+NLSRC_OFFSET "ÐÐ°Ð±Ð¾Ð½" - 88+NLSRC_OFFSET "ÐÐ¶Ð¾ÑÐ´Ð¶Ð¸Ñ" + 88+NLSRC_OFFSET "ÐÑÑÐ·Ð¸Ñ" 89+NLSRC_OFFSET "ÐÐ°Ð½Ð°" 90+NLSRC_OFFSET "ÐÐ¸Ð±ÑÐ°Ð»ÑÐ°Ñ" 91+NLSRC_OFFSET "ÐÑÐµÐ½Ð°Ð´Ð°"

1 0

[tthompson] 72424: [NTFS] +NtfsDumpFileRecord() - Provides diagnostic information about a file record.
by tthompson＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: tthompson Date: Mon Aug 22 11:08:22 2016 New Revision: 72424 URL: http://svn.reactos.org/svn/reactos?rev=72424&view=rev Log: [NTFS] +NtfsDumpFileRecord() - Provides diagnostic information about a file record. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Aug 22 11:08:22 2016 @@ -1460,6 +1460,46 @@ return NtfsLookupFileAt(Vcb, PathName, FileRecord, MFTIndex, NTFS_FILE_ROOT); } +/** +* @name NtfsDumpFileRecord +* @implemented +* +* Provides diagnostic information about a file record. Prints a hex dump +* of the entire record (based on the size reported by FileRecord->ByesInUse), +* then prints a dump of each attribute. +* +* @param Vcb +* Pointer to a DEVICE_EXTENSION describing the volume. +* +* @param FileRecord +* Pointer to the file record to be analyzed. +* +* @remarks +* FileRecord must be a complete file record at least FileRecord->BytesAllocated +* in size, and not just the header. +* +*/ +VOID +NtfsDumpFileRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord) +{ + ULONG i, j; + + // dump binary data, 8 bytes at a time + for (i = 0; i < FileRecord->BytesInUse; i += 8) + { + // display current offset, in hex + DbgPrint("\t%03x\t", i); + + // display hex value of each of the next 8 bytes + for (j = 0; j < 8; j++) + DbgPrint("%02x ", *(PUCHAR)((ULONG_PTR)FileRecord + i + j)); + DbgPrint("\n"); + } + + NtfsDumpFileAttributes(Vcb, FileRecord); +} + NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern, Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Aug 22 11:08:22 2016 @@ -907,6 +907,10 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +VOID +NtfsDumpFileRecord(PDEVICE_EXTENSION Vcb, + PFILE_RECORD_HEADER FileRecord); + NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern,

1 0

[tthompson] 72423: [NTFS] *UpdateFileRecord() - Fix a DPRINT
by tthompson＠svn.reactos.org 22 Aug '16

22 Aug '16

Author: tthompson Date: Mon Aug 22 08:27:35 2016 New Revision: 72423 URL: http://svn.reactos.org/svn/reactos?rev=72423&view=rev Log: [NTFS] *UpdateFileRecord() - Fix a DPRINT Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Aug 22 08:27:35 2016 @@ -1092,7 +1092,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("UpdateFileRecord failed: %I64u written, %lu expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); + DPRINT1("UpdateFileRecord failed: %lu written, %lu expected\n", BytesWritten, Vcb->NtfsInfo.BytesPerFileRecord); } // remove the fixup array (so the file record pointer can still be used)

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