Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [MSHTML_WINETEST] Fix crash of mshtml_winetest:activex
by Timo Kreuzer 22 Jan '25

22 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17d32a373abc158e67d3… commit a17d32a373abc158e67d330c8235ab18634a6f5f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 20 10:52:37 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 13:38:18 2025 +0200 [MSHTML_WINETEST] Fix crash of mshtml_winetest:activex --- modules/rostests/winetests/mshtml/activex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/winetests/mshtml/activex.c b/modules/rostests/winetests/mshtml/activex.c index 117becd79af..4d768378fc9 100644 --- a/modules/rostests/winetests/mshtml/activex.c +++ b/modules/rostests/winetests/mshtml/activex.c @@ -2434,6 +2434,7 @@ static void test_flash_ax(void) skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + return; } IOleClientSite_AddRef(client_site);

1 0

[reactos] 01/02: [URLMON] Define PROXY_CLSID_IS on the command line
by Timo Kreuzer 22 Jan '25

22 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b3406e6304638e192e7a… commit 6b3406e6304638e192e7a1cf85c98a6243d6314a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 20 12:29:24 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 13:38:18 2025 +0200 [URLMON] Define PROXY_CLSID_IS on the command line Fixes crash of mshtml_winetest:htmldoc (introduced by 716613c). Please do not ask me why. The test started crashing with commit 716613cddc8039eff5f095051dc9a79727a25e73 "[CMAKE] Use new policies for CMP0005 and CMP0018 (#1481)", which moved this definition from the command line to urlmon_main.h. This got later removed by commit 6c3c2e33f63b9e621497807591555304ecdd37ec "[URLMON] Sync with Wine Staging 4.18. CORE-16441" --- dll/win32/urlmon/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index 6b5bef1759f..6475c18dc30 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -4,7 +4,8 @@ add_definitions( -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION - -DWINE_REGISTER_DLL) + -DWINE_REGISTER_DLL + -DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB)

1 0

[reactos] 01/01: [FREETYPE][NTGDI] Simplify IntGdiLoadFontsFromMemory (#7651)
by Katayama Hirofumi MZ 22 Jan '25

22 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1868985dde6217225f83b… commit 1868985dde6217225f83b0e20c69639387e60fb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 11:56:41 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 11:56:41 2025 +0900 [FREETYPE][NTGDI] Simplify IntGdiLoadFontsFromMemory (#7651) Simplify code logic and reduce management cost. JIRA issue: CORE-19973 - Add IntGdiLoadFontByIndexFromMemory helper function. - Simplify IntGdiLoadFontsFromMemory function. --- win32ss/gdi/ntgdi/freetype.c | 115 +++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 54 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 13932681b29..b6ba46316c7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1737,44 +1737,13 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, FT_ULong os2_ulCodePageRange1; FT_UShort os2_usWeightClass; - if (SharedFace == NULL && CharSetIndex == -1) - { - /* load a face from memory */ - IntLockFreeType(); - Error = FT_New_Memory_Face( - g_FreeTypeLibrary, - pLoadFont->Memory->Buffer, - pLoadFont->Memory->BufferSize, - ((FontIndex != -1) ? FontIndex : 0), - &Face); - - if (!Error) - SharedFace = SharedFace_Create(Face, pLoadFont->Memory); + ASSERT(SharedFace != NULL); + ASSERT(FontIndex != -1); - IntUnLockFreeType(); - - if (!Error && FT_IS_SFNT(Face)) - pLoadFont->IsTrueType = TRUE; - - if (Error || SharedFace == NULL) - { - if (SharedFace) - SharedFace_Release(SharedFace); - - if (Error == FT_Err_Unknown_File_Format) - DPRINT1("Unknown font file format\n"); - else - DPRINT1("Error reading font (error code: %d)\n", Error); - return 0; /* failure */ - } - } - else - { - Face = SharedFace->Face; - IntLockFreeType(); - SharedFace_AddRef(SharedFace); - IntUnLockFreeType(); - } + IntLockFreeType(); + Face = SharedFace->Face; + SharedFace_AddRef(SharedFace); + IntUnLockFreeType(); /* allocate a FONT_ENTRY */ Entry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_ENTRY), TAG_FONT); @@ -1984,16 +1953,6 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, } IntUnLockFreeType(); - if (FontIndex == -1) - { - FT_Long iFace, num_faces = Face->num_faces; - for (iFace = 1; iFace < num_faces; ++iFace) - { - FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, NULL, iFace, -1); - } - FontIndex = 0; - } - if (CharSetIndex == -1) { INT i; @@ -2046,6 +2005,57 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, return FaceCount; /* number of loaded faces */ } +static INT FASTCALL +IntGdiLoadFontByIndexFromMemory(PGDI_LOAD_FONT pLoadFont, FT_Long FontIndex) +{ + FT_Error Error; + FT_Face Face; + FT_Long iFace, num_faces; + PSHARED_FACE SharedFace; + INT FaceCount = 0; + + IntLockFreeType(); + + /* Load a face from memory */ + Error = FT_New_Memory_Face(g_FreeTypeLibrary, + pLoadFont->Memory->Buffer, pLoadFont->Memory->BufferSize, + ((FontIndex == -1) ? 0 : FontIndex), &Face); + if (Error) + { + if (Error == FT_Err_Unknown_File_Format) + DPRINT1("Unknown font file format\n"); + else + DPRINT1("Error reading font (error code: %d)\n", Error); + IntUnLockFreeType(); + return 0; /* Failure */ + } + + pLoadFont->IsTrueType = FT_IS_SFNT(Face); + num_faces = Face->num_faces; + SharedFace = SharedFace_Create(Face, pLoadFont->Memory); + + IntUnLockFreeType(); + + if (!SharedFace) + { + DPRINT1("SharedFace_Create failed\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; /* Failure */ + } + + if (FontIndex == -1) + { + for (iFace = 1; iFace < num_faces; ++iFace) + { + FaceCount += IntGdiLoadFontByIndexFromMemory(pLoadFont, iFace); + } + FontIndex = 0; + } + + FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, SharedFace, FontIndex, -1); + return FaceCount; +} + static LPCWSTR FASTCALL NameFromCharSet(BYTE CharSet) { @@ -2172,14 +2182,13 @@ IntGdiAddFontResourceEx(PUNICODE_STRING FileName, DWORD Characteristics, return 0; } + RtlZeroMemory(&LoadFont, sizeof(LoadFont)); LoadFont.pFileName = &PathName; LoadFont.Memory = SharedMem_Create(Buffer, ViewSize, TRUE); LoadFont.Characteristics = Characteristics; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); - LoadFont.IsTrueType = FALSE; LoadFont.CharSet = DEFAULT_CHARSET; - LoadFont.PrivateEntry = NULL; - FontCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); + FontCount = IntGdiLoadFontByIndexFromMemory(&LoadFont, -1); /* Release our copy */ IntLockFreeType(); @@ -2463,13 +2472,11 @@ IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) } RtlCopyMemory(BufferCopy, Buffer, dwSize); - LoadFont.pFileName = NULL; + RtlZeroMemory(&LoadFont, sizeof(LoadFont)); LoadFont.Memory = SharedMem_Create(BufferCopy, dwSize, FALSE); LoadFont.Characteristics = FR_PRIVATE | FR_NOT_ENUM; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); - LoadFont.IsTrueType = FALSE; - LoadFont.PrivateEntry = NULL; - FaceCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); + FaceCount = IntGdiLoadFontByIndexFromMemory(&LoadFont, -1); RtlFreeUnicodeString(&LoadFont.RegValueName);

1 0

[reactos] 01/01: [FREETYPE][FTFD][NTGDI] Split FT_Bitmap_Convert hack (#7628)
by Katayama Hirofumi MZ 22 Jan '25

22 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb7cf5a5b7d25308e570e… commit bb7cf5a5b7d25308e570e6bf22a14957c4384e9c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 10:57:40 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 10:57:40 2025 +0900 [FREETYPE][FTFD][NTGDI] Split FT_Bitmap_Convert hack (#7628) Our FT_Bitmap_Convert function had a hack to make the bitmap image compatible to ReactOS. I think the hack on FT_Bitmap_Convert should be separated from our font engine. JIRA issue: CORE-16047 - Add FT_Bitmap_Convert_ReactOS_Hack function, that is based on FT_Bitmap_Convert, and split the hack of FT_Bitmap_Convert. - Use FT_Bitmap_Convert_ReactOS_Hack in IntGetBitmapGlyphWithCache function instead of FT_Bitmap_Convert. - Modify ftfd.spec to add FT_Bitmap_Convert_ReactOS_Hack. --- .../3rdparty/freetype/include/freetype/ftbitmap.h | 35 ++++++++++++++ sdk/lib/3rdparty/freetype/src/base/ftbitmap.c | 53 +++++++++++++++++----- win32ss/drivers/font/ftfd/ftfd.spec | 1 + win32ss/gdi/ntgdi/freetype.c | 3 +- 4 files changed, 79 insertions(+), 13 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h b/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h index a43187cad47..0b9f52a619c 100644 --- a/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h +++ b/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h @@ -181,6 +181,41 @@ FT_BEGIN_HEADER FT_Bitmap *target, FT_Int alignment ); +#ifdef __REACTOS__ + /*************************************************************************/ + /* */ + /* <Function> */ + /* FT_Bitmap_Convert_ReactOS_Hack */ + /* */ + /* <Description> */ + /* Mainly same as @FT_Bitmap_Convert, but the bitmap will be */ + /* ReactOS compatible when hack parameter is true. */ + /* */ + /* <Input> */ + /* library :: A handle to a library object. */ + /* */ + /* source :: The source bitmap. */ + /* */ + /* alignment :: The pitch of the bitmap is a multiple of this */ + /* parameter. Common values are 1, 2, or 4. */ + /* */ + /* hack :: If TRUE, the bitmap will be ReactOS compatible. */ + /* If FALSE, the bitmap will be same as */ + /* FT_Bitmap_Convert returns. */ + /* */ + /* <Output> */ + /* target :: The target bitmap. */ + /* */ + /* <Return> */ + /* FreeType error code. 0~means success. */ + /* */ + FT_EXPORT( FT_Error ) + FT_Bitmap_Convert_ReactOS_Hack( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment, + FT_Bool hack); +#endif /*************************************************************************/ /* */ diff --git a/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c b/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c index 5bfc13e2445..696db7368b1 100644 --- a/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c +++ b/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c @@ -500,11 +500,20 @@ /* documentation is in ftbitmap.h */ +#ifdef __REACTOS__ + FT_EXPORT_DEF( FT_Error ) + FT_Bitmap_Convert_ReactOS_Hack( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment, + FT_Bool hack ) +#else FT_EXPORT_DEF( FT_Error ) FT_Bitmap_Convert( FT_Library library, const FT_Bitmap *source, FT_Bitmap *target, FT_Int alignment ) +#endif { FT_Error error = FT_Err_Ok; FT_Memory memory; @@ -602,15 +611,20 @@ FT_Int val = ss[0]; /* avoid a byte->int cast on each line */ #ifdef __REACTOS__ - tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); - tt[1] = (FT_Byte)( ( val & 0x40 ) ? 0xff : 0); - tt[2] = (FT_Byte)( ( val & 0x20 ) ? 0xff : 0); - tt[3] = (FT_Byte)( ( val & 0x10 ) ? 0xff : 0); - tt[4] = (FT_Byte)( ( val & 0x08 ) ? 0xff : 0); - tt[5] = (FT_Byte)( ( val & 0x04 ) ? 0xff : 0); - tt[6] = (FT_Byte)( ( val & 0x02 ) ? 0xff : 0); - tt[7] = (FT_Byte)( ( val & 0x01 ) ? 0xff : 0); -#else + if (hack) + { + tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); + tt[1] = (FT_Byte)( ( val & 0x40 ) ? 0xff : 0); + tt[2] = (FT_Byte)( ( val & 0x20 ) ? 0xff : 0); + tt[3] = (FT_Byte)( ( val & 0x10 ) ? 0xff : 0); + tt[4] = (FT_Byte)( ( val & 0x08 ) ? 0xff : 0); + tt[5] = (FT_Byte)( ( val & 0x04 ) ? 0xff : 0); + tt[6] = (FT_Byte)( ( val & 0x02 ) ? 0xff : 0); + tt[7] = (FT_Byte)( ( val & 0x01 ) ? 0xff : 0); + } + else + { +#endif tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7 ); tt[1] = (FT_Byte)( ( val & 0x40 ) >> 6 ); tt[2] = (FT_Byte)( ( val & 0x20 ) >> 5 ); @@ -619,6 +633,8 @@ tt[5] = (FT_Byte)( ( val & 0x04 ) >> 2 ); tt[6] = (FT_Byte)( ( val & 0x02 ) >> 1 ); tt[7] = (FT_Byte)( val & 0x01 ); +#ifdef __REACTOS__ + } #endif tt += 8; @@ -635,10 +651,11 @@ for ( ; j > 0; j-- ) { #ifdef __REACTOS__ - tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); -#else - tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7); + if (hack) + tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); + else #endif + tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7); val <<= 1; tt += 1; } @@ -794,6 +811,18 @@ return error; } +#ifdef __REACTOS__ + /* documentation is in ftbitmap.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Bitmap_Convert( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment ) + { + return FT_Bitmap_Convert_ReactOS_Hack(library, source, target, alignment, FALSE); + } +#endif /* documentation is in ftbitmap.h */ diff --git a/win32ss/drivers/font/ftfd/ftfd.spec b/win32ss/drivers/font/ftfd/ftfd.spec index f4178ef7d11..f1b06a86989 100644 --- a/win32ss/drivers/font/ftfd/ftfd.spec +++ b/win32ss/drivers/font/ftfd/ftfd.spec @@ -6,6 +6,7 @@ @ cdecl FT_Attach_File () @ cdecl FT_Attach_Stream () @ cdecl FT_Bitmap_Convert () + @ cdecl FT_Bitmap_Convert_ReactOS_Hack () @ cdecl FT_Bitmap_Copy () @ cdecl FT_Bitmap_Done () @ cdecl FT_Bitmap_Embolden () diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 86efc2e2c30..13932681b29 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3852,7 +3852,8 @@ IntGetBitmapGlyphWithCache( BitmapGlyph = (FT_BitmapGlyph)GlyphCopy; FT_Bitmap_New(&AlignedBitmap); - if(FT_Bitmap_Convert(GlyphSlot->library, &BitmapGlyph->bitmap, &AlignedBitmap, 4)) + if (FT_Bitmap_Convert_ReactOS_Hack(GlyphSlot->library, &BitmapGlyph->bitmap, + &AlignedBitmap, 4, TRUE)) { DPRINT1("Conversion failed\n"); ExFreePoolWithTag(NewEntry, TAG_FONT);

1 0

[reactos] 11/11: [NTOS:IO] IoVolumeDeviceToDosName(): Fix returned DosName buffer initialization (#6990)
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e01cbc6cdedc187b89bf… commit 0e01cbc6cdedc187b89bfed5331d64b2af46f503 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 4 17:21:03 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:03 2025 +0100 [NTOS:IO] IoVolumeDeviceToDosName(): Fix returned DosName buffer initialization (#6990) The VolumePath buffer returned by IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH contains one string stored as a multi-NUL-terminated string, whose total length is given by its `MultiSzLength` member. The DosName UNICODE_STRING just returns the (single) string as a normal NUL-terminated string. So, we need to remove the two NUL-terminators from the `MultiSzLength` count to retrieve the correct length. --- ntoskrnl/io/iomgr/volume.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/io/iomgr/volume.c b/ntoskrnl/io/iomgr/volume.c index 5d5614b4454..9a5915d2802 100644 --- a/ntoskrnl/io/iomgr/volume.c +++ b/ntoskrnl/io/iomgr/volume.c @@ -1367,7 +1367,7 @@ IoVolumeDeviceToDosName( * Even if MOUNTMGR_VOLUME_PATHS allows bigger name lengths * than MAXUSHORT, we can't use them, because we have to return * this in an UNICODE_STRING that stores length in a USHORT. */ - Length = sizeof(VolumePath) + VolumePath.MultiSzLength; + Length = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + VolumePath.MultiSzLength; if (Length > MAXUSHORT) { Status = STATUS_INVALID_BUFFER_SIZE; @@ -1407,13 +1407,14 @@ IoVolumeDeviceToDosName( goto ReleaseMemory; } - /* Set output string */ - DosName->Length = (USHORT)VolumePathPtr->MultiSzLength; - DosName->MaximumLength = (USHORT)VolumePathPtr->MultiSzLength + sizeof(UNICODE_NULL); - /* Our MOUNTMGR_VOLUME_PATHS will be used as output buffer */ + /* Set the output string. Discount the last two + * NUL-terminators from the multi-string length. */ + DosName->Length = (USHORT)VolumePathPtr->MultiSzLength - 2 * sizeof(UNICODE_NULL); + DosName->MaximumLength = DosName->Length + sizeof(UNICODE_NULL); + /* Recycle our MOUNTMGR_VOLUME_PATHS as the output buffer + * and move the NUL-terminated string to the beginning */ DosName->Buffer = (PWSTR)VolumePathPtr; - /* Move name at the begin, RtlMoveMemory is OK with overlapping */ - RtlMoveMemory(DosName->Buffer, VolumePathPtr->MultiSz, VolumePathPtr->MultiSzLength); + RtlMoveMemory(DosName->Buffer, VolumePathPtr->MultiSz, DosName->Length); DosName->Buffer[DosName->Length / sizeof(WCHAR)] = UNICODE_NULL; /* Don't release the buffer, just dereference the FO and return success */

1 0

[reactos] 10/11: [NTOS:IO] Improve some comments in IoVolumeDeviceToDosName()
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f315111bb583b1911d1d9… commit f315111bb583b1911d1d9069c964ca5d4735ac18 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 9 19:34:56 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:02 2025 +0100 [NTOS:IO] Improve some comments in IoVolumeDeviceToDosName() Addendum to commit 5afb7ab003. --- ntoskrnl/io/iomgr/volume.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/io/iomgr/volume.c b/ntoskrnl/io/iomgr/volume.c index 3f614e27c98..5d5614b4454 100644 --- a/ntoskrnl/io/iomgr/volume.c +++ b/ntoskrnl/io/iomgr/volume.c @@ -1328,7 +1328,7 @@ IoVolumeDeviceToDosName( return Status; } - /* Now, query the MountMgr for the DOS path */ + /* Retrieve the MountMgr controlling device */ RtlInitUnicodeString(&MountMgrDevice, MOUNTMGR_DEVICE_NAME); Status = IoGetDeviceObjectPointer(&MountMgrDevice, FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); @@ -1337,6 +1337,7 @@ IoVolumeDeviceToDosName( return Status; } + /* Now, query the MountMgr for the DOS path */ KeInitializeEvent(&Event, NotificationEvent, FALSE); Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH, DeviceObject, @@ -1362,7 +1363,7 @@ IoVolumeDeviceToDosName( goto Quit; } - /* Compute the needed size to store the DOS name. + /* Compute the needed size to store the DOS path. * Even if MOUNTMGR_VOLUME_PATHS allows bigger name lengths * than MAXUSHORT, we can't use them, because we have to return * this in an UNICODE_STRING that stores length in a USHORT. */ @@ -1373,8 +1374,8 @@ IoVolumeDeviceToDosName( goto Quit; } - /* Reallocate the memory, even in case of success, because - * that's the buffer that will be returned to the caller */ + /* Allocate the buffer, even in case of success, + * because it is returned to the caller */ VolumePathPtr = ExAllocatePoolWithTag(PagedPool, Length, TAG_DEV2DOS); if (!VolumePathPtr) {

1 0

[reactos] 09/11: [MOUNTMGR] Fix the buffer returned by IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH (#6990)
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c306a27941ab74941247a… commit c306a27941ab74941247a13155be5c6980f6cda3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 19 23:11:04 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:01 2025 +0100 [MOUNTMGR] Fix the buffer returned by IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH (#6990) The buffer returned by MountMgrQueryDosVolumePath() should be a multi-string containing one single string. --- drivers/storage/mountmgr/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c index 22710b7b4d7..7000d4a4218 100644 --- a/drivers/storage/mountmgr/device.c +++ b/drivers/storage/mountmgr/device.c @@ -1004,8 +1004,8 @@ TryWithVolumeName: Output = (PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer; /* At least, we will return our length */ - Output->MultiSzLength = DeviceLength; - Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + DeviceLength; + Output->MultiSzLength = DeviceLength + 2 * sizeof(UNICODE_NULL); + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + Output->MultiSzLength; /* If we have enough room for copying the string */ if (Irp->IoStatus.Information <= Stack->Parameters.DeviceIoControl.OutputBufferLength)

1 0

[reactos] 08/11: [MOUNTMGR] Fix three more bugs in MountMgrQueryDosVolumePath() (#6990)
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bb7cd286bc106dd67a86… commit 8bb7cd286bc106dd67a869e045d589960873bd1b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 19 23:00:04 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:01 2025 +0100 [MOUNTMGR] Fix three more bugs in MountMgrQueryDosVolumePath() (#6990) - When trying to find a device, don't fail with STATUS_NOT_FOUND if no associated symbolic links are present. Instead, that test was wrong, and should go out of the search loop to do the drive-letter processing. Addendum to commit f9f5a78715. - In addition, when using the associated-device method, fix the list used to retrieve the corresponding device. - In the TryWithVolumeName: block, reset DeviceString to NULL after freeing, so that we can correctly fail with STATUS_NOT_FOUND if no suitable device was found, before initializing the output data. --- drivers/storage/mountmgr/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c index fdf6af9435b..22710b7b4d7 100644 --- a/drivers/storage/mountmgr/device.c +++ b/drivers/storage/mountmgr/device.c @@ -887,20 +887,16 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, } } - /* We didn't find, break */ - if (SymlinksEntry == &(DeviceInformation->SymbolicLinksListHead)) - { - return STATUS_NOT_FOUND; - } + /* If we've found a device via drive letter, do default processing */ + if (SymlinksEntry != &(DeviceInformation->SymbolicLinksListHead)) + break; - /* It doesn't have associated device, go to fallback method */ + /* If it doesn't have an associated device, go to fallback method */ if (IsListEmpty(&DeviceInformation->AssociatedDevicesHead)) - { goto TryWithVolumeName; - } /* Create a string with the information about the device */ - AssociatedDevice = CONTAINING_RECORD(&(DeviceInformation->SymbolicLinksListHead), ASSOCIATED_DEVICE_ENTRY, AssociatedDevicesEntry); + AssociatedDevice = CONTAINING_RECORD(&(DeviceInformation->AssociatedDevicesHead), ASSOCIATED_DEVICE_ENTRY, AssociatedDevicesEntry); OldLength = DeviceLength; OldBuffer = DeviceString; DeviceLength += AssociatedDevice->String.Length; @@ -967,6 +963,7 @@ TryWithVolumeName: if (DeviceString) { FreePool(DeviceString); + DeviceString = NULL; DeviceLength = 0; }

1 0

[reactos] 07/11: [MOUNTMGR] Simplify a bit the code in MountMgrQueryDosVolumePath(s) (#6990)
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28c3533d1113f5b7ea849… commit 28c3533d1113f5b7ea849d0f8d8f3c0480639837 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 19 22:54:02 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:00 2025 +0100 [MOUNTMGR] Simplify a bit the code in MountMgrQueryDosVolumePath(s) (#6990) --- drivers/storage/mountmgr/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c index 58a478115e9..fdf6af9435b 100644 --- a/drivers/storage/mountmgr/device.c +++ b/drivers/storage/mountmgr/device.c @@ -856,7 +856,7 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, } /* Construct string for query */ - SymbolicName.Length = Target->DeviceNameLength; + SymbolicName.Length = SymbolicName.MaximumLength = Target->DeviceNameLength; SymbolicName.Buffer = Target->DeviceName; @@ -1482,8 +1482,8 @@ MountMgrQueryDosVolumePaths(IN PDEVICE_EXTENSION DeviceExtension, } /* Construct string for query */ - SymbolicName.Length = Target->DeviceNameLength; - SymbolicName.MaximumLength = Target->DeviceNameLength + sizeof(UNICODE_NULL); + SymbolicName.Length = + SymbolicName.MaximumLength = Target->DeviceNameLength; SymbolicName.Buffer = Target->DeviceName; /* Find device with our info */

1 0

[reactos] 06/11: [MOUNTMGR] Fix some other bugs (#6990)
by Hermès Bélusca-Maïto 21 Jan '25

21 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e72a9a78b0148254c35f8… commit e72a9a78b0148254c35f80f368516d7368a9799b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 19 22:32:25 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:15:59 2025 +0100 [MOUNTMGR] Fix some other bugs (#6990) - Use FIELD_OFFSET to correct structure and member instead of hardcoding sizeof-s of fields until the member of interest. - Fix a bug in MountMgrQueryDosVolumePath() where the FIELD_OFFSET used in the entry structure size validation was incorrect. FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceNameLength) is == 0 since DeviceNameLength is the first member of the MOUNTMGR_TARGET_NAME structure. The intended member was DeviceName. Addendum to commit f9f5a78715. --- drivers/storage/mountmgr/device.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/storage/mountmgr/device.c b/drivers/storage/mountmgr/device.c index 62d28cf7192..58a478115e9 100644 --- a/drivers/storage/mountmgr/device.c +++ b/drivers/storage/mountmgr/device.c @@ -637,7 +637,8 @@ MountMgrNextDriveLetter(IN PDEVICE_EXTENSION DeviceExtension, } DriveLetterTarget = (PMOUNTMGR_DRIVE_LETTER_TARGET)Irp->AssociatedIrp.SystemBuffer; - if (DriveLetterTarget->DeviceNameLength + sizeof(USHORT) > Stack->Parameters.DeviceIoControl.InputBufferLength) + if (FIELD_OFFSET(MOUNTMGR_DRIVE_LETTER_TARGET, DeviceName) + DriveLetterTarget->DeviceNameLength > + Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } @@ -842,14 +843,14 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, } /* Validate the entry structure size */ - if ((FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceNameLength) + Target->DeviceNameLength) > + if (FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Target->DeviceNameLength > Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } /* Ensure we can at least return needed size */ - if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz)) { return STATUS_INVALID_PARAMETER; } @@ -1007,11 +1008,10 @@ TryWithVolumeName: /* At least, we will return our length */ Output->MultiSzLength = DeviceLength; - /* MOUNTMGR_VOLUME_PATHS is a string + a ULONG */ - Irp->IoStatus.Information = DeviceLength + sizeof(ULONG); + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + DeviceLength; /* If we have enough room for copying the string */ - if (sizeof(ULONG) + DeviceLength <= Stack->Parameters.DeviceIoControl.OutputBufferLength) + if (Irp->IoStatus.Information <= Stack->Parameters.DeviceIoControl.OutputBufferLength) { /* Copy it */ if (DeviceLength) @@ -1031,7 +1031,7 @@ TryWithVolumeName: { /* Just return the size needed and leave */ FreePool(DeviceString); - Irp->IoStatus.Information = sizeof(ULONG); + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz); return STATUS_BUFFER_OVERFLOW; } } @@ -1469,13 +1469,14 @@ MountMgrQueryDosVolumePaths(IN PDEVICE_EXTENSION DeviceExtension, } /* Validate the entry structure size */ - if (Target->DeviceNameLength + FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) > Stack->Parameters.DeviceIoControl.InputBufferLength) + if (FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Target->DeviceNameLength > + Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } /* Ensure we can at least return needed size */ - if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz)) { return STATUS_INVALID_PARAMETER; } @@ -1566,12 +1567,12 @@ MountMgrQueryDosVolumePaths(IN PDEVICE_EXTENSION DeviceExtension, Output->MultiSzLength = Paths->MultiSzLength; /* Compute total length */ - OutputLength = Output->MultiSzLength + sizeof(ULONG); + OutputLength = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + Output->MultiSzLength; /* If it cannot fit, just return the size needed and leave */ if (OutputLength > Stack->Parameters.DeviceIoControl.OutputBufferLength) { - Irp->IoStatus.Information = sizeof(ULONG); + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz); FreePool(Paths); return STATUS_BUFFER_OVERFLOW; } @@ -1605,7 +1606,8 @@ MountMgrKeepLinksWhenOffline(IN PDEVICE_EXTENSION DeviceExtension, } Target = (PMOUNTMGR_TARGET_NAME)Irp->AssociatedIrp.SystemBuffer; - if (Target->DeviceNameLength + sizeof(USHORT) > Stack->Parameters.DeviceIoControl.InputBufferLength) + if (FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Target->DeviceNameLength > + Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } @@ -1649,7 +1651,8 @@ MountMgrVolumeArrivalNotification(IN PDEVICE_EXTENSION DeviceExtension, } Target = (PMOUNTMGR_TARGET_NAME)Irp->AssociatedIrp.SystemBuffer; - if (Target->DeviceNameLength + sizeof(USHORT) > Stack->Parameters.DeviceIoControl.InputBufferLength) + if (FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Target->DeviceNameLength > + Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs