Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66611: [WIN32K] - Pass bitmap buffer size to SURFACE_AllocSurface and validate it - Fix arithmetic overflow checks by using RtlULongMult - GreExtTextOutW: do not allocate / blit zero siz...
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 17:25:44 2015 New Revision: 66611 URL: http://svn.reactos.org/svn/reactos?rev=66611&view=rev Log: [WIN32K] - Pass bitmap buffer size to SURFACE_AllocSurface and validate it - Fix arithmetic overflow checks by using RtlULongMult - GreExtTextOutW: do not allocate / blit zero sized bitmaps - NtGdiStretchDIBitsInternal: do not pass negative y size to GreCreateBitmapEx - DIB_CreateDIBSection: use calculated bitmap size, instead of biSizeImage when calculating the section view size and as size parameter to GreCreateBitmapEx CORE-9245 #resolve Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/surface.h trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/pch.h Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -1078,6 +1078,7 @@ psoDest->iBitmapFormat, 0, 0, + 0, NULL); if (psurfTemp == NULL) { Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -120,6 +120,7 @@ _In_ ULONG iFormat, _In_ ULONG fjBitmap, _In_opt_ ULONG cjWidth, + _In_opt_ ULONG cjBufSize, _In_opt_ PVOID pvBits) { ULONG cBitsPixel, cjBits, cjObject; @@ -127,7 +128,9 @@ SURFOBJ *pso; PVOID pvSection; - ASSERT(!pvBits || (iType == STYPE_BITMAP)); + NT_ASSERT(!pvBits || (iType == STYPE_BITMAP)); + NT_ASSERT((iFormat <= BMF_32BPP) || (cjBufSize != 0)); + NT_ASSERT((LONG)cy > 0); /* Verify format */ if ((iFormat < BMF_1BPP) || (iFormat > BMF_PNG)) @@ -151,8 +154,35 @@ cjWidth = WIDTH_BYTES_ALIGN32(cx, cBitsPixel); } - /* Calculate the bitmap size in bytes */ - cjBits = cjWidth * cy; + /* Is this an uncompressed format? */ + if (iFormat <= BMF_32BPP) + { + /* Calculate the correct bitmap size in bytes */ + if (!NT_SUCCESS(RtlULongMult(cjWidth, cy, &cjBits))) + { + DPRINT1("Overflow calculating size: cjWidth %lu, cy %lu\n", + cjWidth, cy); + return NULL; + } + + /* Did we get a buffer and size? */ + if ((pvBits != NULL) && (cjBufSize != 0)) + { + /* Make sure the buffer is large enough */ + if (cjBufSize < cjBits) + { + DPRINT1("Buffer is too small, required: %lu, got %lu\n", + cjBits, cjBufSize); + return NULL; + } + } + } + else + { + /* Compressed format, use the provided size */ + NT_ASSERT(cjBufSize != 0); + cjBits = cjBufSize; + } /* Check if we need an extra large object */ if ((iType == STYPE_BITMAP) && (pvBits == NULL) && @@ -168,9 +198,10 @@ } /* Check for arithmetic overflow */ - if ((cjBits < cjWidth) || (cjObject < sizeof(SURFACE))) + if (cjObject < sizeof(SURFACE)) { /* Fail! */ + DPRINT1("Overflow calculating cjObject: cjBits %lu\n", cjBits); return NULL; } @@ -289,6 +320,7 @@ iFormat, fl, lWidth, + 0, pvBits); if (!psurf) { @@ -327,6 +359,7 @@ iFormat, 0, 0, + 0, NULL); if (!psurf) { @@ -363,6 +396,7 @@ sizl.cx, sizl.cy, iFormat, + 0, 0, 0, NULL); Modified: trunk/reactos/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -123,6 +123,7 @@ _In_ ULONG iFormat, _In_ ULONG fjBitmap, _In_opt_ ULONG cjWidth, + _In_opt_ ULONG cjBits, _In_opt_ PVOID pvBits); FORCEINLINE Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -1453,6 +1453,7 @@ BMF_32BPP, 0, 0, + 0, &ulRGBColor); if (psurfDest) { Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -103,6 +103,7 @@ pvCompressedBits = pvBits; pvBits = NULL; iFormat = (iFormat == BMF_4RLE) ? BMF_4BPP : BMF_8BPP; + cjSizeImage = 0; } /* Allocate a surface */ @@ -112,6 +113,7 @@ iFormat, fjBitmap, cjWidthBytes, + cjSizeImage, pvBits); if (!psurf) { @@ -205,6 +207,7 @@ nWidth, nHeight, iFormat, + 0, 0, 0, NULL); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -1090,7 +1090,7 @@ _SEH2_TRY { /* Copy the data back */ - cjMaxInfo = min(cjMaxInfo, DIB_BitmapInfoSize(pbmi, (WORD)iUsage)); + cjMaxInfo = min(cjMaxInfo, (UINT)DIB_BitmapInfoSize(pbmi, (WORD)iUsage)); ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); } @@ -1228,7 +1228,7 @@ RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); hbmTmp = GreCreateBitmapEx(pbmi->bmiHeader.biWidth, - pbmi->bmiHeader.biHeight, + abs(pbmi->bmiHeader.biHeight), 0, BitmapFormat(pbmi->bmiHeader.biBitCount, pbmi->bmiHeader.biCompression), @@ -1652,7 +1652,7 @@ // Get storage location for DIB bits. Only use biSizeImage if it's valid and // we're dealing with a compressed bitmap. Otherwise, use width * height. - totalSize = bi->biSizeImage && bi->biCompression != BI_RGB && bi->biCompression != BI_BITFIELDS + totalSize = (bi->biSizeImage && (bi->biCompression != BI_RGB) && (bi->biCompression != BI_BITFIELDS)) ? bi->biSizeImage : (ULONG)(bm.bmWidthBytes * effHeight); if (section) @@ -1674,7 +1674,7 @@ } mapOffset = offset - (offset % Sbi.AllocationGranularity); - mapSize = bi->biSizeImage + (offset - mapOffset); + mapSize = totalSize + (offset - mapOffset); SectionOffset.LowPart = mapOffset; SectionOffset.HighPart = 0; @@ -1724,7 +1724,7 @@ BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | ((bi->biHeight < 0) ? BMF_TOPDOWN : 0), - bi->biSizeImage, + totalSize, bm.bmBits, 0); if (!res) Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -3662,7 +3662,6 @@ ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); MouseSafetyOnDrawEnd(dc->ppdev); BackgroundLeft = DestRect.right; - } DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; @@ -3675,71 +3674,75 @@ MaskRect.right = realglyph->bitmap.width; MaskRect.bottom = realglyph->bitmap.rows; - /* - * We should create the bitmap out of the loop at the biggest possible - * glyph size. Then use memset with 0 to clear it and sourcerect to - * limit the work of the transbitblt. - */ - - HSourceGlyph = EngCreateBitmap(bitSize, realglyph->bitmap.pitch, - BMF_8BPP, BMF_TOPDOWN, - realglyph->bitmap.buffer); - if ( !HSourceGlyph ) - { - DPRINT1("WARNING: EngLockSurface() failed!\n"); - // FT_Done_Glyph(realglyph); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; - } - SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); - if ( !SourceGlyphSurf ) - { + /* Check if the bitmap has any pixels */ + if ((bitSize.cx != 0) && (bitSize.cy != 0)) + { + /* + * We should create the bitmap out of the loop at the biggest possible + * glyph size. Then use memset with 0 to clear it and sourcerect to + * limit the work of the transbitblt. + */ + + HSourceGlyph = EngCreateBitmap(bitSize, realglyph->bitmap.pitch, + BMF_8BPP, BMF_TOPDOWN, + realglyph->bitmap.buffer); + if ( !HSourceGlyph ) + { + DPRINT1("WARNING: EngCreateBitmap() failed!\n"); + // FT_Done_Glyph(realglyph); + IntUnLockFreeType; + DC_vFinishBlit(dc, NULL); + goto fail2; + } + SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); + if ( !SourceGlyphSurf ) + { + EngDeleteSurface((HSURF)HSourceGlyph); + DPRINT1("WARNING: EngLockSurface() failed!\n"); + IntUnLockFreeType; + DC_vFinishBlit(dc, NULL); + goto fail2; + } + + /* + * Use the font data as a mask to paint onto the DCs surface using a + * brush. + */ + + if (lprc && (fuOptions & ETO_CLIPPED) && + DestRect.right >= lprc->right + dc->ptlDCOrig.x) + { + // We do the check '>=' instead of '>' to possibly save an iteration + // through this loop, since it's breaking after the drawing is done, + // and x is always incremented. + DestRect.right = lprc->right + dc->ptlDCOrig.x; + DoBreak = TRUE; + } + if (lprc && (fuOptions & ETO_CLIPPED) && + DestRect.bottom >= lprc->bottom + dc->ptlDCOrig.y) + { + DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; + } + MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + if (!IntEngMaskBlt( + SurfObj, + SourceGlyphSurf, + &dc->co.ClipObj, + &exloRGB2Dst.xlo, + &exloDst2RGB.xlo, + &DestRect, + (PPOINTL)&MaskRect, + &dc->eboText.BrushObject, + &BrushOrigin)) + { + DPRINT1("Failed to MaskBlt a glyph!\n"); + } + + MouseSafetyOnDrawEnd(dc->ppdev) ; + + EngUnlockSurface(SourceGlyphSurf); EngDeleteSurface((HSURF)HSourceGlyph); - DPRINT1("WARNING: EngLockSurface() failed!\n"); - IntUnLockFreeType; - DC_vFinishBlit(dc, NULL); - goto fail2; - } - - /* - * Use the font data as a mask to paint onto the DCs surface using a - * brush. - */ - - if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.right >= lprc->right + dc->ptlDCOrig.x) - { - // We do the check '>=' instead of '>' to possibly save an iteration - // through this loop, since it's breaking after the drawing is done, - // and x is always incremented. - DestRect.right = lprc->right + dc->ptlDCOrig.x; - DoBreak = TRUE; - } - if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.bottom >= lprc->bottom + dc->ptlDCOrig.y) - { - DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; - } - MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); - if (!IntEngMaskBlt( - SurfObj, - SourceGlyphSurf, - &dc->co.ClipObj, - &exloRGB2Dst.xlo, - &exloDst2RGB.xlo, - &DestRect, - (PPOINTL)&MaskRect, - &dc->eboText.BrushObject, - &BrushOrigin)) - { - DPRINT1("Failed to MaskBlt a glyph!\n"); - } - - MouseSafetyOnDrawEnd(dc->ppdev) ; - - EngUnlockSurface(SourceGlyphSurf); - EngDeleteSurface((HSURF)HSourceGlyph); + } if (DoBreak) { Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=66611&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sun Mar 8 17:25:44 2015 @@ -26,6 +26,7 @@ #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ntstrsafe.h> +#include <ntintsafe.h> #include <ntddkbd.h> /* Win32 headers */

1 0

[hbelusca] 66610: [CONSRV]: Hackfix the icons retrieval in the same way as what was done in r65683, because we have a bug in PrivateExtractIconExW.
by hbelusca＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: hbelusca Date: Sun Mar 8 14:28:19 2015 New Revision: 66610 URL: http://svn.reactos.org/svn/reactos?rev=66610&view=rev Log: [CONSRV]: Hackfix the icons retrieval in the same way as what was done in r65683, because we have a bug in PrivateExtractIconExW. Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Sun Mar 8 14:28:19 2015 @@ -476,11 +476,27 @@ if (IconPath && *IconPath) { HICON hIcon = NULL, hIconSm = NULL; + /* + * FIXME!! Because of a strange bug we have in PrivateExtractIconExW + * (see r65683 for more details), we cannot use this API to extract + * at the same time the large and small icons from the app. + * Instead we just use PrivateExtractIconsW. + * PrivateExtractIconExW(IconPath, ConsoleInitInfo->ConsoleStartInfo->IconIndex, &hIcon, &hIconSm, 1); + */ + PrivateExtractIconsW(IconPath, + ConsoleInitInfo->ConsoleStartInfo->IconIndex, + 32, 32, + &hIcon, NULL, 1, LR_COPYFROMRESOURCE); + PrivateExtractIconsW(IconPath, + ConsoleInitInfo->ConsoleStartInfo->IconIndex, + 16, 16, + &hIconSm, NULL, 1, LR_COPYFROMRESOURCE); + DPRINT("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm); if (hIcon != NULL) ConsoleInitInfo->ConsoleStartInfo->hIcon = hIcon; if (hIconSm != NULL) ConsoleInitInfo->ConsoleStartInfo->hIconSm = hIconSm;

1 0

[hbelusca] 66609: [CONSRV]: Fix the console TUI frontend compilation.
by hbelusca＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: hbelusca Date: Sun Mar 8 13:52:06 2015 New Revision: 66609 URL: http://svn.reactos.org/svn/reactos?rev=66609&view=rev Log: [CONSRV]: Fix the console TUI frontend compilation. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Mar 8 13:52:06 2015 @@ -11,11 +11,15 @@ #ifdef TUITERM_COMPILE -#include "consrv.h" +#include <consrv.h> + // #include "include/conio.h" #include "include/console.h" #include "include/settings.h" #include "tuiterm.h" + +#include <ndk/iofuncs.h> +#include <ndk/setypes.h> #include <drivers/blue/ntddblue.h> #define NDEBUG @@ -23,6 +27,10 @@ /* GLOBALS ********************************************************************/ + +#define ConsoleOutputUnicodeToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ + WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass" @@ -32,10 +40,12 @@ CRITICAL_SECTION Lock; LIST_ENTRY Entry; /* Entry in the list of virtual consoles */ // HANDLE hTuiInitEvent; - - HWND hWindow; /* Handle to the console's window (used for the window's procedure */ + // HANDLE hTuiTermEvent; + + HWND hWindow; /* Handle to the console's window (used for the window's procedure) */ PCONSRV_CONSOLE Console; /* Pointer to the owned console */ + PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to the active screen buffer (then maybe the previous Console member is redundant?? Or not...) */ // TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */ } TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; @@ -164,6 +174,7 @@ /**\ \******************************************************************************/ +#if 0 static BOOL TuiSwapConsole(INT Next) { @@ -230,6 +241,7 @@ return FALSE; } } +#endif static VOID TuiCopyRect(PCHAR Dest, PTEXTMODE_SCREEN_BUFFER Buff, SMALL_RECT* Region) @@ -244,7 +256,7 @@ DestDelta = ConioRectWidth(Region) * 2 /* 2 == sizeof(CHAR) + sizeof(BYTE) */; for (i = Region->Top; i <= Region->Bottom; i++) { - ConsoleUnicodeCharToAnsiChar(Buff->Header.Console, (PCHAR)Dest, &Src->Char.UnicodeChar); + ConsoleOutputUnicodeToAnsiChar(Buff->Header.Console, (PCHAR)Dest, &Src->Char.UnicodeChar); *(PBYTE)(Dest + 1) = (BYTE)Src->Attributes; Src += SrcDelta; @@ -386,7 +398,7 @@ 0, NULL, OPEN_EXISTING, 0, NULL); - if (INVALID_HANDLE_VALUE == ConsoleDeviceHandle) + if (ConsoleDeviceHandle == INVALID_HANDLE_VALUE) { DPRINT1("Failed to open BlueScreen.\n"); return FALSE; @@ -470,11 +482,8 @@ if (This == NULL || Console == NULL) return STATUS_INVALID_PARAMETER; - // if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) - // return STATUS_INVALID_PARAMETER; - - // /* Initialize the console */ - // Console->FrontEndIFace.Vtbl = &TuiVtbl; + if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) + return STATUS_INVALID_PARAMETER; TuiData = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(TUI_CONSOLE_DATA)); if (!TuiData) @@ -483,7 +492,8 @@ return STATUS_UNSUCCESSFUL; } // Console->FrontEndIFace.Context = (PVOID)TuiData; - TuiData->Console = Console; + TuiData->Console = Console; + TuiData->ActiveBuffer = Console->ActiveBuffer; TuiData->hWindow = NULL; InitializeCriticalSection(&TuiData->Lock); @@ -540,7 +550,7 @@ TuiDeinitFrontEnd(IN OUT PFRONTEND This) { // PCONSRV_CONSOLE Console = This->Console; - PTUI_CONSOLE_DATA TuiData = This->Context; // Console->FrontEndIFace.Context; + PTUI_CONSOLE_DATA TuiData = This->Context; /* Close the notification window */ DestroyWindow(TuiData->hWindow); @@ -571,7 +581,6 @@ /* Switch to the next console */ if (NULL != ActiveConsole) ConioDrawConsole(ActiveConsole->Console); - // Console->FrontEndIFace.Context = NULL; This->Context = NULL; DeleteCriticalSection(&TuiData->Lock); ConsoleFreeHeap(TuiData); @@ -581,12 +590,14 @@ TuiDrawRegion(IN OUT PFRONTEND This, SMALL_RECT* Region) { + PTUI_CONSOLE_DATA TuiData = This->Context; + PCONSOLE_SCREEN_BUFFER Buff = TuiData->Console->ActiveBuffer; + PCONSOLE_DRAW ConsoleDraw; DWORD BytesReturned; - PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; - PCONSOLE_DRAW ConsoleDraw; UINT ConsoleDrawSize; - if (ActiveConsole->Console != Console || GetType(Buff) != TEXTMODE_BUFFER) return; + if (TuiData != ActiveConsole) return; + if (GetType(Buff) != TEXTMODE_BUFFER) return; ConsoleDrawSize = sizeof(CONSOLE_DRAW) + (ConioRectWidth(Region) * ConioRectHeight(Region)) * 2; @@ -625,20 +636,22 @@ PWCHAR Buffer, UINT Length) { - PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; + PTUI_CONSOLE_DATA TuiData = This->Context; + PCONSOLE_SCREEN_BUFFER Buff = TuiData->Console->ActiveBuffer; PCHAR NewBuffer; ULONG NewLength; DWORD BytesWritten; - if (ActiveConsole->Console->ActiveBuffer != Buff) return; - - NewLength = WideCharToMultiByte(Console->OutputCodePage, 0, + if (TuiData != ActiveConsole) return; + if (GetType(Buff) != TEXTMODE_BUFFER) return; + + NewLength = WideCharToMultiByte(TuiData->Console->OutputCodePage, 0, Buffer, Length, NULL, 0, NULL, NULL); NewBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, NewLength * sizeof(CHAR)); if (!NewBuffer) return; - WideCharToMultiByte(Console->OutputCodePage, 0, + WideCharToMultiByte(TuiData->Console->OutputCodePage, 0, Buffer, Length, NewBuffer, NewLength, NULL, NULL); @@ -648,18 +661,27 @@ } RtlFreeHeap(RtlGetProcessHeap(), 0, NewBuffer); +} + +static VOID NTAPI +TuiRingBell(IN OUT PFRONTEND This) +{ + Beep(800, 200); } static BOOL NTAPI TuiSetCursorInfo(IN OUT PFRONTEND This, PCONSOLE_SCREEN_BUFFER Buff) { + PTUI_CONSOLE_DATA TuiData = This->Context; CONSOLE_CURSOR_INFO Info; DWORD BytesReturned; - if (ActiveConsole->Console->ActiveBuffer != Buff) return TRUE; - - Info.dwSize = ConioEffectiveCursorSize(Console, 100); + if (TuiData != ActiveConsole) return TRUE; + if (TuiData->Console->ActiveBuffer != Buff) return TRUE; + if (GetType(Buff) != TEXTMODE_BUFFER) return FALSE; + + Info.dwSize = ConioEffectiveCursorSize(TuiData->Console, 100); Info.bVisible = Buff->CursorInfo.bVisible; if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_CURSOR_INFO, @@ -678,10 +700,12 @@ SHORT OldCursorX, SHORT OldCursorY) { + PTUI_CONSOLE_DATA TuiData = This->Context; CONSOLE_SCREEN_BUFFER_INFO Info; DWORD BytesReturned; - if (ActiveConsole->Console->ActiveBuffer != Buff) return TRUE; + if (TuiData != ActiveConsole) return TRUE; + if (TuiData->Console->ActiveBuffer != Buff) return TRUE; if (GetType(Buff) != TEXTMODE_BUFFER) return FALSE; Info.dwCursorPosition = Buff->CursorPosition; @@ -701,6 +725,93 @@ static VOID NTAPI TuiResizeTerminal(IN OUT PFRONTEND This) { +} + +static VOID NTAPI +TuiSetActiveScreenBuffer(IN OUT PFRONTEND This) +{ + // PGUI_CONSOLE_DATA GuiData = This->Context; + // PCONSOLE_SCREEN_BUFFER ActiveBuffer; + // HPALETTE hPalette; + + // EnterCriticalSection(&GuiData->Lock); + // GuiData->WindowSizeLock = TRUE; + + // InterlockedExchangePointer(&GuiData->ActiveBuffer, + // ConDrvGetActiveScreenBuffer(GuiData->Console)); + + // GuiData->WindowSizeLock = FALSE; + // LeaveCriticalSection(&GuiData->Lock); + + // ActiveBuffer = GuiData->ActiveBuffer; + + // /* Change the current palette */ + // if (ActiveBuffer->PaletteHandle == NULL) + // { + // hPalette = GuiData->hSysPalette; + // } + // else + // { + // hPalette = ActiveBuffer->PaletteHandle; + // } + + // DPRINT("GuiSetActiveScreenBuffer using palette 0x%p\n", hPalette); + + // /* Set the new palette for the framebuffer */ + // SelectPalette(GuiData->hMemDC, hPalette, FALSE); + + // /* Specify the use of the system palette for the framebuffer */ + // SetSystemPaletteUse(GuiData->hMemDC, ActiveBuffer->PaletteUsage); + + // /* Realize the (logical) palette */ + // RealizePalette(GuiData->hMemDC); + + // GuiResizeTerminal(This); + // // ConioDrawConsole(Console); +} + +static VOID NTAPI +TuiReleaseScreenBuffer(IN OUT PFRONTEND This, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer) +{ + // PGUI_CONSOLE_DATA GuiData = This->Context; + + // /* + // * If we were notified to release a screen buffer that is not actually + // * ours, then just ignore the notification... + // */ + // if (ScreenBuffer != GuiData->ActiveBuffer) return; + + // /* + // * ... else, we must release our active buffer. Two cases are present: + // * - If ScreenBuffer (== GuiData->ActiveBuffer) IS NOT the console + // * active screen buffer, then we can safely switch to it. + // * - If ScreenBuffer IS the console active screen buffer, we must release + // * it ONLY. + // */ + + // /* Release the old active palette and set the default one */ + // if (GetCurrentObject(GuiData->hMemDC, OBJ_PAL) == ScreenBuffer->PaletteHandle) + // { + // /* Set the new palette */ + // SelectPalette(GuiData->hMemDC, GuiData->hSysPalette, FALSE); + // } + + // /* Set the adequate active screen buffer */ + // if (ScreenBuffer != GuiData->Console->ActiveBuffer) + // { + // GuiSetActiveScreenBuffer(This); + // } + // else + // { + // EnterCriticalSection(&GuiData->Lock); + // GuiData->WindowSizeLock = TRUE; + + // InterlockedExchangePointer(&GuiData->ActiveBuffer, NULL); + + // GuiData->WindowSizeLock = FALSE; + // LeaveCriticalSection(&GuiData->Lock); + // } } static VOID NTAPI @@ -800,9 +911,12 @@ TuiDeinitFrontEnd, TuiDrawRegion, TuiWriteStream, + TuiRingBell, TuiSetCursorInfo, TuiSetScreenInfo, TuiResizeTerminal, + TuiSetActiveScreenBuffer, + TuiReleaseScreenBuffer, TuiRefreshInternalInfo, TuiChangeTitle, TuiChangeIcon,

1 0

[tkreuzer] 66608: [WIN32K] - revert an "improvement" in NtUserFindExistingCursorIcon - Remove boken asserts - Implement GreSetBitmapOwner and use it to set bitmap owner in IntSetCursorData - Fix cl...
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 13:44:24 2015 New Revision: 66608 URL: http://svn.reactos.org/svn/reactos?rev=66608&view=rev Log: [WIN32K] - revert an "improvement" in NtUserFindExistingCursorIcon - Remove boken asserts - Implement GreSetBitmapOwner and use it to set bitmap owner in IntSetCursorData - Fix cleanup after failure in setting bitmap owner - Fix string cleanup (don't free INTRESOURCE) - Validate frame indices to be within range - Make sure frame indices and JIR reates are copied - A few other fixes/improvements Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Mar 8 13:44:24 2015 @@ -10,6 +10,37 @@ #define NDEBUG #include <debug.h> + +BOOL +NTAPI +GreSetBitmapOwner( + _In_ HBITMAP hbmp, + _In_ ULONG ulOwner) +{ + /* Check if we have the correct object type */ + if (GDI_HANDLE_GET_TYPE(hbmp) != GDILoObjType_LO_BITMAP_TYPE) + { + DPRINT1("Incorrect type for hbmp: %p\n", hbmp); + return FALSE; + } + + /// FIXME: this is a hack and doesn't handle a race condition properly. + /// It needs to be done in GDIOBJ_vSetObjectOwner atomically. + + /* Check if we set public or none */ + if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || + (ulOwner == GDI_OBJ_HMGR_NONE)) + { + /* Only allow this for owned objects */ + if (GreGetObjectOwner(hbmp) != GDI_OBJ_HMGR_POWNED) + { + DPRINT1("Cannot change owner for non-powned hbmp\n"); + return FALSE; + } + } + + return GreSetObjectOwner(hbmp, ulOwner); +} static int Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] Sun Mar 8 13:44:24 2015 @@ -2,6 +2,12 @@ INT APIENTRY BITMAP_GetObject(SURFACE * bmp, INT count, LPVOID buffer); HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); + +BOOL +NTAPI +GreSetBitmapOwner( + _In_ HBITMAP hbmp, + _In_ ULONG ulOwner); HBITMAP NTAPI Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Mar 8 13:44:24 2015 @@ -107,8 +107,6 @@ NT_ASSERT((pcur->CURSORF_flags & (CURSORF_GLOBAL|CURSORF_LRSHARED)) != 0); NT_ASSERT((pcur->CURSORF_flags & CURSORF_LINKED) != 0); - NT_ASSERT((pcur->CURSORF_flags & CURSORF_GLOBAL) == 0); - /* Get the right list head */ ppcurHead = (pcur->CURSORF_flags & CURSORF_GLOBAL) ? &gcurFirst : &ppi->pCursorCache; @@ -360,7 +358,7 @@ for (i = 0; i < AniCurIcon->cpcur; i++) { - NT_VERIFY(UserDereferenceObject(AniCurIcon->aspcur[i]) == TRUE); + UserDereferenceObject(AniCurIcon->aspcur[i]); NT_VERIFY(IntDestroyCurIconObject(AniCurIcon->aspcur[i]) == TRUE); } ExFreePoolWithTag(AniCurIcon->aspcur, USERTAG_CURSOR); @@ -904,11 +902,16 @@ /* See if module names match */ if (atomModName == CurIcon->atomModName) { - /* Check if this is an INTRESOURCE */ + /* They do. Now see if this is the same resource */ + if (IS_INTRESOURCE(CurIcon->strName.Buffer) != IS_INTRESOURCE(ustrRsrcSafe.Buffer)) + { + /* One is an INT resource and the other is not -> no match */ + CurIcon = CurIcon->pcurNext; + continue; + } + if (IS_INTRESOURCE(CurIcon->strName.Buffer)) { - /* Compare if it matches the one we are looking for. This also - handles the case, where ustrRsrcSafe is not an INTRESOURCE */ if (CurIcon->strName.Buffer == ustrRsrcSafe.Buffer) { /* INT resources match */ @@ -1111,8 +1114,6 @@ _In_ ATOM atomModName, _In_ const CURSORDATA* pcursordata) { - NT_ASSERT((pcur->CURSORF_flags & CURSORF_ACON) == 0); - /* Check if the CURSORF_ACON is also set in the cursor data */ if (pcursordata->CURSORF_flags & CURSORF_ACON) { @@ -1133,22 +1134,25 @@ { ERR("NtUserSetCursorIconData was got no hbmMask.\n"); EngSetLastError(ERROR_INVALID_PARAMETER); - goto Cleanup; + return FALSE; } /* Take ownership of the mask bitmap */ - if (!GreSetObjectOwner(pcursordata->hbmMask, GDI_OBJ_HMGR_PUBLIC)) - { - goto Cleanup; + if (!GreSetBitmapOwner(pcursordata->hbmMask, GDI_OBJ_HMGR_PUBLIC)) + { + ERR("Failed to set ownership of hbmMask %p.\n", pcursordata->hbmMask); + return FALSE; } /* Check if we have a color bitmap */ if (pcursordata->hbmColor) { /* Take ownership of the color bitmap */ - if (!GreSetObjectOwner(pcursordata->hbmColor, GDI_OBJ_HMGR_PUBLIC)) - { - goto Cleanup; + if (!GreSetBitmapOwner(pcursordata->hbmColor, GDI_OBJ_HMGR_PUBLIC)) + { + ERR("Failed to set ownership of hbmColor %p.\n", pcursordata->hbmColor); + GreSetBitmapOwner(pcursordata->hbmMask, GDI_OBJ_HMGR_POWNED); + return FALSE; } } @@ -1156,19 +1160,27 @@ if (pcursordata->hbmAlpha) { /* Take ownership of the alpha bitmap */ - if (!GreSetObjectOwner(pcursordata->hbmAlpha, GDI_OBJ_HMGR_PUBLIC)) - { - goto Cleanup; - } - } - - /* Free the old name */ + if (!GreSetBitmapOwner(pcursordata->hbmAlpha, GDI_OBJ_HMGR_PUBLIC)) + { + ERR("Failed to set ownership of hbmAlpha %p.\n", pcursordata->hbmAlpha); + GreSetBitmapOwner(pcursordata->hbmMask, GDI_OBJ_HMGR_POWNED); + if (pcursordata->hbmColor) + { + GreSetBitmapOwner(pcursordata->hbmColor, GDI_OBJ_HMGR_POWNED); + } + return FALSE; + } + } + + /* Free the old name (Must be NULL atm, but later we might allow this) */ + NT_ASSERT(pcur->strName.Buffer == NULL); if (pcur->strName.Buffer != NULL) { - ExFreePoolWithTag(pcur->strName.Buffer, TAG_STRING); - pcur->strName.Buffer = NULL; - pcur->strName.Length = 0; - pcur->strName.MaximumLength = 0; + if (!IS_INTRESOURCE(pcur->strName.Buffer)) + { + ExFreePoolWithTag(pcur->strName.Buffer, TAG_STRING); + } + RtlInitEmptyUnicodeString(&pcur->strName, NULL, 0); } /* Free the module atom */ @@ -1200,28 +1212,6 @@ } return TRUE; - -Cleanup: - - if (pcursordata->hbmMask != NULL) - { - GreSetObjectOwner(pcursordata->hbmMask, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(pcursordata->hbmMask); - } - - if (pcursordata->hbmColor != NULL) - { - GreSetObjectOwner(pcursordata->hbmColor, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(pcursordata->hbmColor); - } - - if (pcursordata->hbmAlpha != NULL) - { - GreSetObjectOwner(pcursordata->hbmAlpha, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(pcursordata->hbmAlpha); - } - - return FALSE; } static @@ -1230,7 +1220,7 @@ _Inout_ PACON pacon, _In_opt_ PUNICODE_STRING pustrName, _In_ ATOM atomModName, - _In_ PCURSORDATA pcursordata) + _In_ const CURSORDATA *pcursordata) { PCURICON_OBJECT *aspcur; DWORD *aicur; @@ -1240,9 +1230,11 @@ UINT cjSize, i; NT_ASSERT((pacon->CURSORF_flags & CURSORF_ACON) != 0); + NT_ASSERT((pacon->CURSORF_flags & CURSORF_ACONFRAME) == 0); NT_ASSERT((ULONG_PTR)pcursordata->aspcur > MmUserProbeAddress); NT_ASSERT((ULONG_PTR)pcursordata->aicur > MmUserProbeAddress); NT_ASSERT((ULONG_PTR)pcursordata->ajifRate > MmUserProbeAddress); + NT_ASSERT((pcursordata->CURSORF_flags & ~CURSORF_USER_MASK) == 0); NT_ASSERT(pcursordata->cpcur > 0); NT_ASSERT(pcursordata->cicur > 0); @@ -1259,6 +1251,20 @@ { ERR("Acon data already set!\n"); return FALSE; + } + + /* Loop all frames indexes */ + for (i = 0; i < pcursordata->cicur; i++) + { + /* Check if the index is within the range of the frames */ + if (pcursordata->aicur[i] >= pcursordata->cpcur) + { + ERR("aicur[%lu] is out or range. Got %lu, cpcur = %u\n", + i, pcursordata->aicur[i], pcursordata->cpcur); + return FALSE; + } + + /* FIXME: check the JIF rates? */ } /* Calculate size: one cursor object for each frame, and a frame @@ -1280,6 +1286,13 @@ aicur = (DWORD*)&aspcur[pcursordata->cpcur]; ajifRate = (INT*)&aicur[pcursordata->cicur]; + /* Copy the values */ + RtlCopyMemory(aicur, pcursordata->aicur, pcursordata->cicur * sizeof(DWORD)); + RtlCopyMemory(ajifRate, pcursordata->ajifRate, pcursordata->cicur * sizeof(INT)); + + /* Zero out the array, so we can handle cleanup */ + RtlZeroMemory(aspcur, pcursordata->cpcur * sizeof(PCURICON_OBJECT)); + /* Get a pointer to the cursor data for each frame */ pcdFrame = pcursordata->aspcur; @@ -1291,7 +1304,6 @@ if (hcurFrame == NULL) { ERR("Failed to create a cursor for frame %u\n", i); - aspcur[i] = NULL; goto Cleanup; } @@ -1299,8 +1311,13 @@ aspcur[i] = UserGetCurIconObject(hcurFrame); NT_ASSERT(aspcur[i] != NULL); - /* Mark this cursor as an acon frame */ - pcdFrame->CURSORF_flags |= CURSORF_ACONFRAME; + /* Check if the flags are valid */ + if (pcdFrame->CURSORF_flags & ~(CURSORF_USER_MASK|CURSORF_ACONFRAME)) + { + ERR("Invalid flags for acon frame %u: 0x%lx\n", + i, pcdFrame->CURSORF_flags); + goto Cleanup; + } /* Set the cursor data for this frame */ if (!IntSetCursorData(aspcur[i], NULL, 0, &pcdFrame[i])) @@ -1308,15 +1325,20 @@ ERR("Failed to set cursor data for frame %u\n", i); goto Cleanup; } - } - - /* Free the old name */ + + /* Mark this cursor as an acon frame */ + aspcur[i]->CURSORF_flags |= CURSORF_ACONFRAME; + } + + /* Free the old name (Must be NULL atm.) */ + NT_ASSERT(pacon->strName.Buffer == NULL); if (pacon->strName.Buffer != NULL) { - ExFreePoolWithTag(pacon->strName.Buffer, TAG_STRING); - pacon->strName.Buffer = NULL; - pacon->strName.Length = 0; - pacon->strName.MaximumLength = 0; + if (!IS_INTRESOURCE(pacon->strName.Buffer)) + { + ExFreePoolWithTag(pacon->strName.Buffer, TAG_STRING); + } + RtlInitEmptyUnicodeString(&pacon->strName, NULL, 0); } /* Free the module atom */ @@ -1330,7 +1352,7 @@ { for (i = 0; i < pacon->cpcur; i++) { - NT_VERIFY(UserDereferenceObject(pacon->aspcur[i]) == TRUE); + UserDereferenceObject(pacon->aspcur[i]); NT_VERIFY(IntDestroyCurIconObject(pacon->aspcur[i]) == TRUE); } ExFreePoolWithTag(pacon->aspcur, USERTAG_CURSOR); @@ -1362,7 +1384,7 @@ break; /* Destroy this cursor */ - NT_VERIFY(UserDereferenceObject(aspcur[i]) == TRUE); + UserDereferenceObject(aspcur[i]); NT_VERIFY(IntDestroyCurIconObject(aspcur[i]) == TRUE); } @@ -1472,6 +1494,9 @@ CURSORDATA cursordata; UNICODE_STRING ustrModule, ustrRsrc; _SEH2_VOLATILE PVOID pvBuffer; + CURSORDATA* aspcur; + DWORD* aicur; + PINT ajifRate; UINT cjSize; NTSTATUS status; BOOL bResult; @@ -1518,28 +1543,33 @@ goto Exit; } - /* Set the pointers */ - cursordata.aspcur = (CURSORDATA*)pvBuffer; - cursordata.aicur = (DWORD*)&cursordata.aspcur[cursordata.cpcur]; - cursordata.ajifRate = (INT*)&cursordata.aicur[cursordata.cicur]; + /* Calculate the kernel mode pointers */ + aspcur = (CURSORDATA*)pvBuffer; + aicur = (DWORD*)&aspcur[cursordata.cpcur]; + ajifRate = (INT*)&aicur[cursordata.cicur]; /* Probe and copy aspcur */ - ProbeForRead(pCursorData->aspcur, cursordata.cpcur * sizeof(CURSORDATA), 1); - RtlCopyMemory(cursordata.aspcur, - pCursorData->aspcur, + ProbeForRead(cursordata.aspcur, cursordata.cpcur * sizeof(CURSORDATA), 1); + RtlCopyMemory(aspcur, + cursordata.aspcur, cursordata.cpcur * sizeof(CURSORDATA)); /* Probe and copy aicur */ - ProbeForRead(pCursorData->aicur, cursordata.cicur * sizeof(DWORD), 1); - RtlCopyMemory(cursordata.aicur, - pCursorData->aicur, + ProbeForRead(cursordata.aicur, cursordata.cicur * sizeof(DWORD), 1); + RtlCopyMemory(aicur, + cursordata.aicur, cursordata.cicur * sizeof(DWORD)); /* Probe and copy ajifRate */ - ProbeForRead(pCursorData->ajifRate, cursordata.cicur * sizeof(INT), 1); - RtlCopyMemory(cursordata.ajifRate, - pCursorData->ajifRate, + ProbeForRead(cursordata.ajifRate, cursordata.cicur * sizeof(INT), 1); + RtlCopyMemory(ajifRate, + cursordata.ajifRate, cursordata.cicur * sizeof(INT)); + + /* Set the new pointers */ + cursordata.aspcur = aspcur; + cursordata.aicur = aicur; + cursordata.ajifRate = ajifRate; } else { @@ -1579,6 +1609,13 @@ ERR("Failed to copy pustrRsrc: status 0x%08lx\n", status); goto Exit; } + } + + /* Make sure the caller doesn't give us invalid flags */ + if (cursordata.CURSORF_flags & ~CURSORF_USER_MASK) + { + ERR("Invalid cursor flags: 0x%08lx\n", cursordata.CURSORF_flags); + goto Exit; } /* Acquire the global user lock */

1 0

[akhaldi] 66607: [NOTEPAD] Prevent some NULL pointer dereferences. CID 502217. By Ricardo Hanke. CORE-9337
by akhaldi＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: akhaldi Date: Sun Mar 8 13:16:46 2015 New Revision: 66607 URL: http://svn.reactos.org/svn/reactos?rev=66607&view=rev Log: [NOTEPAD] Prevent some NULL pointer dereferences. CID 502217. By Ricardo Hanke. CORE-9337 Modified: trunk/reactos/base/applications/notepad/main.c Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sun Mar 8 13:16:46 2015 @@ -115,6 +115,11 @@ { BOOL bMatches; size_t iTargetLength; + + if ((!pFindReplace) || (!pszText)) + { + return FALSE; + } iTargetLength = _tcslen(pFindReplace->lpstrFindWhat);

1 0

[janderwald] 66606: [MMSYS] - fix build
by janderwald＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: janderwald Date: Sun Mar 8 09:37:06 2015 New Revision: 66606 URL: http://svn.reactos.org/svn/reactos?rev=66606&view=rev Log: [MMSYS] - fix build Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sun Mar 8 09:37:06 2015 @@ -345,7 +345,6 @@ SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; - HANDLE hDevice; hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); if (!hDevInfo)

1 0

[janderwald] 66605: [MMSYS] - install software bus pnp enumerator only once
by janderwald＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: janderwald Date: Sun Mar 8 08:28:12 2015 New Revision: 66605 URL: http://svn.reactos.org/svn/reactos?rev=66605&view=rev Log: [MMSYS] - install software bus pnp enumerator only once Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sun Mar 8 08:28:12 2015 @@ -15,6 +15,7 @@ #include <shlwapi.h> #include <debug.h> +#include <swenum.h> #include <newdev.h> #include <initguid.h> #include <devguid.h> @@ -335,6 +336,51 @@ } RegCloseKey(hKey); +} + +BOOL +IsSoftwareBusPnpEnumeratorInstalled() +{ + HDEVINFO hDevInfo; + SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; + GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator}; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData; + HANDLE hDevice; + + hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT); + if (!hDevInfo) + { + // failed + return FALSE; + } + + DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData)) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return FALSE; + } + + DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)); + if (!DeviceInterfaceDetailData) + { + // failed + SetupDiDestroyDeviceInfoList(hDevInfo); + return FALSE; + } + + DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL)) + { + // failed + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData); + SetupDiDestroyDeviceInfoList(hDevInfo); + return TRUE; } DWORD @@ -484,20 +530,23 @@ SetupTermDefaultQueueCallback(Context); SetupCloseInfFile(hInf); - Length = GetWindowsDirectoryW(szBuffer, MAX_PATH); - if (!Length || Length >= MAX_PATH - 14) - { - return ERROR_GEN_FAILURE; - } - - pBuffer = PathAddBackslashW(szBuffer); - if (!pBuffer) - { - return ERROR_GEN_FAILURE; - } - - wcscpy(pBuffer, L"inf\\machine.inf"); - InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM"); + if (!IsSoftwareBusPnpEnumeratorInstalled()) + { + Length = GetWindowsDirectoryW(szBuffer, MAX_PATH); + if (!Length || Length >= MAX_PATH - 14) + { + return ERROR_GEN_FAILURE; + } + + pBuffer = PathAddBackslashW(szBuffer); + if (!pBuffer) + { + return ERROR_GEN_FAILURE; + } + + wcscpy(pBuffer, L"inf\\machine.inf"); + InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM"); + } hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); if (!hSCManager)

1 0

[hbelusca] 66604: [USETUP]: Fix some problems with extra-backslashes in paths, and fix the support for the setup directory "\" which means "the install directory" (i.e. C:\ReactOS usually). [BOOTDA...
by hbelusca＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: hbelusca Date: Sun Mar 8 04:09:23 2015 New Revision: 66604 URL: http://svn.reactos.org/svn/reactos?rev=66604&view=rev Log: [USETUP]: Fix some problems with extra-backslashes in paths, and fix the support for the setup directory "\" which means "the install directory" (i.e. C:\ReactOS usually). [BOOTDATA/VGAFONTS]: Install the vga fonts needed for the Blue driver. Better fix for r57755 and r59547. Modified: trunk/reactos/base/setup/usetup/filequeue.c trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] Sun Mar 8 04:09:23 2015 @@ -38,7 +38,7 @@ struct _QUEUEENTRY *Prev; struct _QUEUEENTRY *Next; - PWSTR SourceCabinet; /* May be NULL if file is not in a cabinet */ + PWSTR SourceCabinet; /* May be NULL if the file is not in a cabinet */ PWSTR SourceRootPath; PWSTR SourcePath; PWSTR SourceFilename; @@ -215,6 +215,8 @@ if (SourcePath != NULL) { Length = wcslen(SourcePath); + if ((Length > 0) && (SourcePath[Length - 1] == L'\\')) + Length--; Entry->SourcePath = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0, (Length + 1) * sizeof(WCHAR)); @@ -257,7 +259,7 @@ /* Copy target directory */ Length = wcslen(TargetDirectory); - if (TargetDirectory[Length] == '\\') + if ((Length > 0) && (TargetDirectory[Length - 1] == L'\\')) Length--; Entry->TargetDirectory = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0, @@ -366,6 +368,7 @@ Entry = QueueHeader->CopyHead; while (Entry != NULL) { + /* Build the full source path */ wcscpy(FileSrcPath, Entry->SourceRootPath); if (Entry->SourcePath != NULL) wcscat(FileSrcPath, Entry->SourcePath); @@ -374,24 +377,44 @@ /* Build the full target path */ wcscpy(FileDstPath, TargetRootPath); - if (Entry->TargetDirectory[0] == L'\\') - { - wcscat(FileDstPath, Entry->TargetDirectory); - } - else - { + if (Entry->TargetDirectory[0] == 0) + { + /* Installation path */ + + /* Add the installation path */ if (TargetPath != NULL) { if (TargetPath[0] != L'\\') wcscat(FileDstPath, L"\\"); wcscat(FileDstPath, TargetPath); } + } + else if (Entry->TargetDirectory[0] == L'\\') + { + /* Absolute path */ + if (Entry->TargetDirectory[1] != 0) + wcscat(FileDstPath, Entry->TargetDirectory); + } + else // if (Entry->TargetDirectory[0] != L'\\') + { + /* Path relative to the installation path */ + + /* Add the installation path */ + if (TargetPath != NULL) + { + if (TargetPath[0] != L'\\') + wcscat(FileDstPath, L"\\"); + wcscat(FileDstPath, TargetPath); + } wcscat(FileDstPath, L"\\"); wcscat(FileDstPath, Entry->TargetDirectory); } - /* Use only the destination path if the file is in a cabinet */ + /* + * If the file is in a cabinet, use only the destination path. + * Otherwise possibly use a different target name. + */ if (Entry->SourceCabinet == NULL) { wcscat(FileDstPath, L"\\"); @@ -402,7 +425,7 @@ } /* FIXME: Do it! */ - DPRINT("'%S' ==> '%S'\n", FileSrcPath, FileDstPath); + DPRINT("Copy: '%S' ==> '%S'\n", FileSrcPath, FileDstPath); MsgHandler(Context, SPFILENOTIFY_STARTCOPY, Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Sun Mar 8 04:09:23 2015 @@ -327,7 +327,7 @@ 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateFile failed: %x\n", Status); + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); goto unmapsrcsec; } Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Mar 8 04:09:23 2015 @@ -3121,7 +3121,8 @@ PWCHAR FileKeyValue; PWCHAR DirKeyValue; PWCHAR TargetFileName; - WCHAR CompleteOrigFileName[512]; + ULONG Length; + WCHAR CompleteOrigDirName[512]; if (SourceCabinet) return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir); @@ -3180,14 +3181,35 @@ break; } - wcscpy(CompleteOrigFileName, SourceRootDir.Buffer); - wcscat(CompleteOrigFileName, L"\\"); - wcscat(CompleteOrigFileName, DirKeyValue); + if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + { + /* Installation path */ + wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + wcscpy(CompleteOrigDirName, DirKeyValue); + } + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); + wcscat(CompleteOrigDirName, L"\\"); + wcscat(CompleteOrigDirName, DirKeyValue); + } + + /* Remove trailing backslash */ + Length = wcslen(CompleteOrigDirName); + if ((Length > 0) && (CompleteOrigDirName[Length - 1] == L'\\')) + { + CompleteOrigDirName[Length - 1] = 0; + } if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, SourceRootPath.Buffer, - CompleteOrigFileName, + CompleteOrigDirName, FileKeyName, DirKeyValue, TargetFileName)) @@ -3209,7 +3231,7 @@ WCHAR PathBuffer[MAX_PATH]; INFCONTEXT DirContext; PWCHAR AdditionalSectionName = NULL; - PWCHAR KeyValue; + PWCHAR DirKeyValue; ULONG Length; NTSTATUS Status; @@ -3233,16 +3255,20 @@ /* Create directories */ /* - * FIXME: - * Install directories like '\reactos\test' are not handled yet. - */ + * FIXME: + * - Install directories like '\reactos\test' are not handled yet. + * - Copying files to DestinationRootPath should be done from within + * the SystemPartitionFiles section. + * At the moment we check whether we specify paths like '\foo' or '\\' for that. + * For installing to DestinationPath specify just '\' . + */ /* Get destination path */ wcscpy(PathBuffer, DestinationPath.Buffer); /* Remove trailing backslash */ Length = wcslen(PathBuffer); - if ((Length > 0) && (PathBuffer[Length - 1] == '\\')) + if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { PathBuffer[Length - 1] = 0; } @@ -3274,27 +3300,35 @@ /* Enumerate the directory values and create the subdirectories */ do { - if (!INF_GetData(&DirContext, NULL, &KeyValue)) + if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) { DPRINT1("break\n"); break; } - if (KeyValue[0] == L'\\' && KeyValue[1] != 0) - { - DPRINT("Absolute Path: '%S'\n", KeyValue); + if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + { + /* Installation path */ + DPRINT("InstallationPath: '%S'\n", DirKeyValue); + + wcscpy(PathBuffer, DestinationPath.Buffer); + + DPRINT("FullPath: '%S'\n", PathBuffer); + } + else if (DirKeyValue[0] == L'\\') + { + /* Absolute path */ + DPRINT("Absolute Path: '%S'\n", DirKeyValue); wcscpy(PathBuffer, DestinationRootPath.Buffer); - wcscat(PathBuffer, KeyValue); - - DPRINT("FullPath: '%S'\n", PathBuffer); - } - else if (KeyValue[0] != L'\\') - { - DPRINT("RelativePath: '%S'\n", KeyValue); - wcscpy(PathBuffer, DestinationPath.Buffer); - wcscat(PathBuffer, L"\\"); - wcscat(PathBuffer, KeyValue); + wcscat(PathBuffer, DirKeyValue); + + /* Remove trailing backslash */ + Length = wcslen(PathBuffer); + if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) + { + PathBuffer[Length - 1] = 0; + } DPRINT("FullPath: '%S'\n", PathBuffer); @@ -3306,7 +3340,33 @@ return FALSE; } } - } while (SetupFindNextLine (&DirContext, &DirContext)); + else // if (DirKeyValue[0] != L'\\') + { + /* Path relative to the installation path */ + DPRINT("RelativePath: '%S'\n", DirKeyValue); + + wcscpy(PathBuffer, DestinationPath.Buffer); + wcscat(PathBuffer, L"\\"); + wcscat(PathBuffer, DirKeyValue); + + /* Remove trailing backslash */ + Length = wcslen(PathBuffer); + if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) + { + PathBuffer[Length - 1] = 0; + } + + DPRINT("FullPath: '%S'\n", PathBuffer); + + Status = SetupCreateDirectory(PathBuffer); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) + { + DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); + return FALSE; + } + } + } while (SetupFindNextLine(&DirContext, &DirContext)); return TRUE; } Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sun Mar 8 04:09:23 2015 @@ -13,11 +13,14 @@ [Version] Signature = "$ReactOS$" +; Directories relative to the installation directory. +; For specifying absolute directories, use the SystemPartitionFiles section, +; or use names starting with \. [Directories] 1 = system32 2 = system32\drivers 3 = Fonts -4 = +4 = "\" 5 = system32\drivers\etc 6 = inf 7 = bin Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Mar 8 04:09:23 2015 @@ -1,6 +1,9 @@ [Version] Signature = "$ReactOS$" +; Directories relative to the installation directory. +; For specifying absolute directories, use the SystemPartitionFiles section, +; or use names starting with \. [Directories] ; <directory_id> = <path> 1 = "\" @@ -22,6 +25,7 @@ uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 +vgafonts.cab=,,,,,,,,,,,,1 bootvid.dll=,,,,,,,,,,,,2 c_437.nls=,,,,,,,,,,,,2 c_1252.nls=,,,,,,,,,,,,2 @@ -63,6 +67,8 @@ wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 + +[SystemPartitionFiles] [HardwareIdsDatabase] ;*PNP0A00 = isapnp

1 0

[dquintana] 66603: [NTOBJSHEX] * Make the shell view default to details mode. * Some cleanups.
by dquintana＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: dquintana Date: Sun Mar 8 02:05:24 2015 New Revision: 66603 URL: http://svn.reactos.org/svn/reactos?rev=66603&view=rev Log: [NTOBJSHEX] * Make the shell view default to details mode. * Some cleanups. Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjns.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… ============================================================================== --- trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMergedFolder.h [iso-8859-1] Sun Mar 8 02:05:24 2015 @@ -50,13 +50,13 @@ public IShellFolder2, public IPersistFolder2, public IAugmentedShellFolder3 // -- undocumented - //public IShellService, // -- undocumented + //public IShellService, // DEPRECATED IE4 interface: https://msdn.microsoft.com/en-us/library/windows/desktop/bb774870%28v=vs.85… //public ITranslateShellChangeNotify,// -- undocumented //public IStorage, //public IPersistPropertyBag, //public IShellIconOverlay, // -- undocumented //public ICompositeFolder, // -- undocumented - //public IItemNameLimits, // -- undocumented + //public IItemNameLimits, // https://msdn.microsoft.com/en-us/library/windows/desktop/bb761776%28v=vs.85… { private: CComPtr<IShellFolder> m_UserLocal; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sun Mar 8 02:05:24 2015 @@ -41,6 +41,12 @@ PCITEMID_CHILD m_pcidlChild; UINT m_idFirst; + enum ItemOffsets + { + ITEM_Open = 0, + ITEM_OpenNewWindow + }; + public: CNtObjectFolderContextMenu() : m_pcidlFolder(NULL), @@ -70,24 +76,24 @@ // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { + MENUITEMINFOW mii; + m_idFirst = idCmdFirst; const NtPidlEntry * entry = (NtPidlEntry *) m_pcidlChild; + + static WCHAR open [] = L"Open"; + static WCHAR opennewwindow [] = L"Open in new window"; if ((entry->objectType == DIRECTORY_OBJECT) || (entry->objectType == SYMBOLICLINK_OBJECT) || (entry->objectType == KEY_OBJECT)) { - MENUITEMINFOW mii; - - WCHAR open [] = L"Open"; - WCHAR opennewwindow [] = L"Open in new window"; - ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; mii.fType = MFT_STRING; - mii.wID = idCmdFirst++; + mii.wID = (idCmdFirst = m_idFirst + ITEM_Open); mii.dwTypeData = open; mii.cch = _countof(open); mii.fState = MFS_ENABLED | MFS_DEFAULT; @@ -100,7 +106,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; mii.fType = MFT_STRING; - mii.wID = idCmdFirst++; + mii.wID = (idCmdFirst = m_idFirst + ITEM_OpenNewWindow); mii.dwTypeData = opennewwindow; mii.cch = _countof(opennewwindow); mii.fState = MFS_ENABLED; @@ -114,10 +120,10 @@ virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - if (LOWORD(lpici->lpVerb) == m_idFirst || !lpici->lpVerb) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - + LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); + + if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_Open) || !lpici->lpVerb) + { SHELLEXECUTEINFO sei = { 0 }; sei.cbSize = sizeof(sei); sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; @@ -132,10 +138,8 @@ return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } - else if (LOWORD(lpici->lpVerb) == (m_idFirst + 1)) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - + else if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_OpenNewWindow)) + { SHELLEXECUTEINFO sei = { 0 }; sei.cbSize = sizeof(sei); sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; @@ -467,7 +471,7 @@ if (ord < 0) return MAKE_HRESULT(0, 0, (USHORT) -1); - ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength/sizeof(WCHAR)); + ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength / sizeof(WCHAR)); if (ord != 0) return MAKE_HRESULT(0, 0, (USHORT) ord); @@ -722,7 +726,7 @@ if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { @@ -806,7 +810,7 @@ sfv.cbSize = sizeof(sfv); sfv.pshf = this; sfv.psvOuter = NULL; - sfv.psfvcb = NULL; + sfv.psfvcb = this; return SHCreateShellFolderView(&sfv, (IShellView**) ppvOut); } @@ -954,26 +958,6 @@ PCWSTR ntPath = L"\\"; -#if 0 - WCHAR debugTemp[MAX_PATH]; - GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); - DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); - - if (ntPath[wcslen(ntPath)-1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') - wcscat(debugTemp, L"\\"); - - PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; - - PCWSTR findTemp = StrStrW(debugTemp, guidTemp); - PCWSTR nextTemp = findTemp + wcslen(guidTemp); - - if (wcscmp(nextTemp, ntPath)) - { - DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); - return E_FAIL; - } -#endif - if (!m_PidlManager) { m_PidlManager = new CNtObjectPidlManager(); @@ -989,27 +973,6 @@ { TRACE("INITIALIZE %p CNtObjectFolder with ntPath %S\n", this, ntPath); -#if 0 - m_shellPidl = ILClone(pidl); - WCHAR debugTemp[MAX_PATH]; - GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); - DbgPrint("INITIALIZE CNtObjectFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); - - if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') - wcscat(debugTemp, L"\\"); - - PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; - - PCWSTR findTemp = StrStrW(debugTemp, guidTemp); - PCWSTR nextTemp = findTemp + wcslen(guidTemp); - - if (wcscmp(nextTemp, ntPath)) - { - DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); - return E_FAIL; - } -#endif - if (!m_PidlManager) m_PidlManager = new CNtObjectPidlManager(); @@ -1104,7 +1067,7 @@ { if (info->objectType < 0) { - NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (td->typeNameLength > 0) { @@ -1138,7 +1101,7 @@ { if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { @@ -1183,7 +1146,7 @@ if (info->objectType < 0) { - NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + NtPidlTypeData * td = (NtPidlTypeData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (td->typeNameLength > 0) MakeStrRetFromString(td->typeName, td->typeNameLength, &(psd->str)); @@ -1219,7 +1182,7 @@ if (info->objectType == SYMBOLICLINK_OBJECT) { - NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + NtPidlSymlinkData * symlink = (NtPidlSymlinkData*) (((PBYTE) info) + FIELD_OFFSET(NtPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (symlink->targetNameLength > 0) { @@ -1296,3 +1259,17 @@ } return E_INVALIDARG; } + +HRESULT STDMETHODCALLTYPE CNtObjectFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case SFVM_DEFVIEWMODE: + { + FOLDERVIEWMODE* pViewMode = (FOLDERVIEWMODE*) lParam; + *pViewMode = FVM_DETAILS; + return S_OK; + } + } + return E_NOTIMPL; +} Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] Sun Mar 8 02:05:24 2015 @@ -15,7 +15,8 @@ public CComCoClass<CNtObjectFolder, &CLSID_NtObjectFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2 + public IPersistFolder2, + public IShellFolderViewCB { CNtObjectPidlManager * m_PidlManager; @@ -130,6 +131,9 @@ // IPersistFolder2 virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); + // IShellFolderViewCB + virtual HRESULT STDMETHODCALLTYPE MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); + // Internal HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); @@ -143,6 +147,7 @@ COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) END_COM_MAP() }; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sun Mar 8 02:05:24 2015 @@ -40,6 +40,12 @@ PCITEMID_CHILD m_pcidlChild; UINT m_idFirst; + enum ItemOffsets + { + ITEM_Open = 0, + ITEM_OpenNewWindow + }; + public: CRegistryFolderContextMenu() : m_pcidlFolder(NULL), @@ -69,22 +75,22 @@ // IContextMenu virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { + MENUITEMINFOW mii; + m_idFirst = idCmdFirst; const RegPidlEntry * entry = (RegPidlEntry *) m_pcidlChild; + static WCHAR open [] = L"Open"; + static WCHAR opennewwindow [] = L"Open in new window"; + if (entry->entryType == REG_ENTRY_KEY) { - MENUITEMINFOW mii; - - WCHAR open [] = L"Open"; - WCHAR opennewwindow [] = L"Open in new window"; - ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; mii.fType = MFT_STRING; - mii.wID = idCmdFirst++; + mii.wID = (idCmdFirst = m_idFirst + ITEM_Open); mii.dwTypeData = open; mii.cch = _countof(open); mii.fState = MFS_ENABLED | MFS_DEFAULT; @@ -97,7 +103,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; mii.fType = MFT_STRING; - mii.wID = idCmdFirst++; + mii.wID = (idCmdFirst = m_idFirst + ITEM_OpenNewWindow); mii.dwTypeData = opennewwindow; mii.cch = _countof(opennewwindow); mii.fState = MFS_ENABLED; @@ -111,10 +117,10 @@ virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) { - if (LOWORD(lpici->lpVerb) == m_idFirst || !lpici->lpVerb) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - + LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); + + if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_Open) || !lpici->lpVerb) + { SHELLEXECUTEINFO sei = { 0 }; sei.cbSize = sizeof(sei); sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; @@ -129,10 +135,8 @@ return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } - else if (LOWORD(lpici->lpVerb) == (m_idFirst + 1)) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - + else if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_OpenNewWindow)) + { SHELLEXECUTEINFO sei = { 0 }; sei.cbSize = sizeof(sei); sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; @@ -223,7 +227,7 @@ return E_INVALIDARG; UINT flags = 0; - + switch (entry->entryType) { case REG_ENTRY_KEY: @@ -453,7 +457,7 @@ if (ord < 0) return MAKE_HRESULT(0, 0, (USHORT) -1); - ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength/sizeof(WCHAR)); + ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength / sizeof(WCHAR)); if (ord != 0) return MAKE_HRESULT(0, 0, (USHORT) ord); @@ -495,7 +499,7 @@ HRESULT FormatContentsForDisplay(RegPidlEntry * info, PCWSTR * strContents) { - PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry,entryName) + info->entryNameLength + sizeof(WCHAR)); + PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); if (info->contentsLength > 0) { @@ -553,7 +557,7 @@ else { PCWSTR strEmpty = L"(Empty)"; - DWORD bufferLength = (wcslen(strEmpty)+1) * sizeof(WCHAR); + DWORD bufferLength = (wcslen(strEmpty) + 1) * sizeof(WCHAR); PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); StringCbCopyW(strValue, bufferLength, strEmpty); *strContents = strValue; @@ -755,11 +759,6 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 0 - if (!(info->objectInformation.GrantedAccess & (STANDARD_RIGHTS_READ | FILE_LIST_DIRECTORY))) - return E_ACCESSDENIED; -#endif - WCHAR path[MAX_PATH]; StringCbCopyW(path, _countof(path), m_NtPath); @@ -819,7 +818,7 @@ sfv.cbSize = sizeof(sfv); sfv.pshf = this; sfv.psvOuter = NULL; - sfv.psfvcb = NULL; + sfv.psfvcb = this; return SHCreateShellFolderView(&sfv, (IShellView**) ppvOut); } @@ -967,26 +966,6 @@ PCWSTR ntPath = L"\\REGISTRY"; -#if 0 - WCHAR debugTemp[MAX_PATH]; - GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); - DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); - - if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') - wcscat(debugTemp, L"\\"); - - PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; - - PCWSTR findTemp = StrStrW(debugTemp, guidTemp); - PCWSTR nextTemp = findTemp + wcslen(guidTemp); - - if (wcscmp(nextTemp, ntPath)) - { - DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); - return E_FAIL; - } -#endif - if (!m_PidlManager) { m_PidlManager = new CRegistryPidlManager(); @@ -1001,26 +980,6 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) { m_shellPidl = ILClone(pidl); - -#if 0 - WCHAR debugTemp[MAX_PATH]; - GetFullName(m_shellPidl, SHGDN_FORPARSING, debugTemp, _countof(debugTemp)); - DbgPrint("INITIALIZE CRegistryFolder PIDL PATH: %S (ntPath: %S)\n", debugTemp, ntPath); - - if (ntPath[wcslen(ntPath) - 1] == L'\\' && debugTemp[wcslen(debugTemp) - 1] != L'\\') - wcscat(debugTemp, L"\\"); - - PCWSTR guidTemp = L"::{845B0FB2-66E0-416B-8F91-314E23F7C12D}"; - - PCWSTR findTemp = StrStrW(debugTemp, guidTemp); - PCWSTR nextTemp = findTemp + wcslen(guidTemp); - - if (wcscmp(nextTemp, ntPath)) - { - DbgPrint("WHAT THE F, the NT PATH DOES NOT MATCH\n"); - return E_FAIL; - } -#endif if (!m_PidlManager) m_PidlManager = new CRegistryPidlManager(); @@ -1129,7 +1088,7 @@ hr = MakeVariantString(pv, strValueContents); - CoTaskMemFree((PVOID)strValueContents); + CoTaskMemFree((PVOID) strValueContents); return hr; @@ -1246,3 +1205,17 @@ } return E_INVALIDARG; } + +HRESULT STDMETHODCALLTYPE CRegistryFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case SFVM_DEFVIEWMODE: + { + FOLDERVIEWMODE* pViewMode = (FOLDERVIEWMODE*) lParam; + *pViewMode = FVM_DETAILS; + return S_OK; + } + } + return E_NOTIMPL; +} Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Sun Mar 8 02:05:24 2015 @@ -16,7 +16,8 @@ public CComCoClass<CRegistryFolder, &CLSID_RegistryFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2 + public IPersistFolder2, + public IShellFolderViewCB { CRegistryPidlManager * m_PidlManager; @@ -131,6 +132,9 @@ // IPersistFolder2 virtual HRESULT STDMETHODCALLTYPE GetCurFolder(LPITEMIDLIST * pidl); + // IShellFolderViewCB + virtual HRESULT STDMETHODCALLTYPE MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); + // Internal HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); @@ -144,6 +148,7 @@ COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolderViewCB, IShellFolderViewCB) END_COM_MAP() };

1 0

[aandrejevic] 66602: [NTVDM] Implement EMS function AH = 57h.
by aandrejevic＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: aandrejevic Date: Sun Mar 8 00:36:46 2015 New Revision: 66602 URL: http://svn.reactos.org/svn/reactos?rev=66602&view=rev Log: [NTVDM] Implement EMS function AH = 57h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/ems.c trunk/reactos/subsystems/mvdm/ntvdm/ems.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/ems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.c [iso-8859-1] Sun Mar 8 00:36:46 2015 @@ -10,6 +10,7 @@ #define NDEBUG +#include "emulator.h" #include "bios/bios32/bios32p.h" #include <ndk/rtltypes.h> #include <ndk/rtlfuncs.h> @@ -104,12 +105,24 @@ return EMS_STATUS_OK; } +static PEMS_PAGE GetLogicalPage(PEMS_HANDLE Handle, USHORT LogicalPage) +{ + PLIST_ENTRY Entry = Handle->PageList.Flink; + + while (LogicalPage) + { + if (Entry == &Handle->PageList) return NULL; + LogicalPage--; + Entry = Entry->Flink; + } + + return (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); +} + static USHORT EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) { - PLIST_ENTRY Entry; PEMS_PAGE PageEntry; PEMS_HANDLE HandleEntry = &HandleTable[Handle]; - ULONG PageNumber; if (PhysicalPage >= EMS_PHYSICAL_PAGES) return EMS_STATUS_INV_PHYSICAL_PAGE; if (LogicalPage == 0xFFFF) @@ -121,21 +134,10 @@ if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) return EMS_STATUS_INVALID_HANDLE; - Entry = HandleEntry->PageList.Flink; - while (LogicalPage) - { - if (Entry == &HandleEntry->PageList) break; - - LogicalPage--; - Entry = Entry->Flink; - } - - if (Entry == &HandleEntry->PageList) return EMS_STATUS_INV_LOGICAL_PAGE; - - PageEntry = (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); - PageNumber = (ULONG)(((ULONG_PTR)PageEntry - (ULONG_PTR)PageTable) / sizeof(EMS_PAGE)); - Mapping[PhysicalPage] = (PVOID)(EMS_ADDRESS + PageNumber * EMS_PAGE_SIZE); - + PageEntry = GetLogicalPage(HandleEntry, LogicalPage); + if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; + + Mapping[PhysicalPage] = (PVOID)(EMS_ADDRESS + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); return EMS_STATUS_OK; } @@ -192,6 +194,97 @@ break; } + /* Move/Exchange Memory */ + case 0x57: + { + PUCHAR SourcePtr, DestPtr; + PEMS_HANDLE HandleEntry; + PEMS_PAGE PageEntry; + BOOLEAN Exchange = getAL(); + PEMS_COPY_DATA Data = (PEMS_COPY_DATA)SEG_OFF_TO_PTR(getDS(), getSI()); + + if (Data->SourceType) + { + /* Expanded memory */ + HandleEntry = &HandleTable[Data->SourceHandle]; + + if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + { + setAL(EMS_STATUS_INVALID_HANDLE); + break; + } + + PageEntry = GetLogicalPage(HandleEntry, Data->SourceSegment); + + if (!PageEntry) + { + setAL(EMS_STATUS_INV_LOGICAL_PAGE); + break; + } + + SourcePtr = (PUCHAR)(EMS_ADDRESS + + ARRAY_INDEX(PageEntry, PageTable) + * EMS_PAGE_SIZE + + Data->SourceOffset); + } + else + { + /* Conventional memory */ + SourcePtr = (PUCHAR)SEG_OFF_TO_PTR(Data->SourceSegment, Data->SourceOffset); + } + + if (Data->DestType) + { + /* Expanded memory */ + HandleEntry = &HandleTable[Data->DestHandle]; + + if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) + { + setAL(EMS_STATUS_INVALID_HANDLE); + break; + } + + PageEntry = GetLogicalPage(HandleEntry, Data->DestSegment); + + if (!PageEntry) + { + setAL(EMS_STATUS_INV_LOGICAL_PAGE); + break; + } + + DestPtr = (PUCHAR)(EMS_ADDRESS + + ARRAY_INDEX(PageEntry, PageTable) + * EMS_PAGE_SIZE + + Data->DestOffset); + } + else + { + /* Conventional memory */ + DestPtr = (PUCHAR)SEG_OFF_TO_PTR(Data->DestSegment, Data->DestOffset); + } + + if (Exchange) + { + ULONG i; + + /* Exchange */ + for (i = 0; i < Data->RegionLength; i++) + { + UCHAR Temp = DestPtr[i]; + DestPtr[i] = SourcePtr[i]; + SourcePtr[i] = Temp; + } + } + else + { + /* Move */ + RtlMoveMemory(DestPtr, SourcePtr, Data->RegionLength); + } + + setAL(EMS_STATUS_OK); + break; + } + default: { DPRINT1("EMS function AH = %02X NOT IMPLEMENTED\n", getAH()); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.h [iso-8859-1] Sun Mar 8 00:36:46 2015 @@ -32,6 +32,8 @@ #define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B #define EMS_STATUS_UNKNOWN_FUNCTION 0x8F +#define ARRAY_INDEX(ptr, array) ((ULONG)(((ULONG_PTR)(ptr) - (ULONG_PTR)(array)) / sizeof(*array))) + typedef struct _EMS_HANDLE { BOOLEAN Allocated; @@ -45,6 +47,23 @@ USHORT Handle; } EMS_PAGE, *PEMS_PAGE; +#pragma pack(push, 1) + +typedef struct _EMS_COPY_DATA +{ + ULONG RegionLength; + UCHAR SourceType; + USHORT SourceHandle; + USHORT SourceOffset; + USHORT SourceSegment; + UCHAR DestType; + USHORT DestHandle; + USHORT DestOffset; + USHORT DestSegment; +} EMS_COPY_DATA, *PEMS_COPY_DATA; + +#pragma pack(pop) + /* FUNCTIONS ******************************************************************/ VOID EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size);

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