Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[hbelusca] 73483: [XDK][RTL]: Fix parameter of RtlUnicodeStringToCountedOemString (see r51875); add RtlUpcaseUnicodeStringToAnsiString into XDK.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 25 15:06:31 2016 New Revision: 73483 URL: http://svn.reactos.org/svn/reactos?rev=73483&view=rev Log: [XDK][RTL]: Fix parameter of RtlUnicodeStringToCountedOemString (see r51875); add RtlUpcaseUnicodeStringToAnsiString into XDK. Modified: trunk/reactos/sdk/include/xdk/rtlfuncs.h trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/rtlfuncs.h [iso-8859-1] Sun Dec 25 15:06:31 2016 @@ -979,6 +979,18 @@ _In_ BOOLEAN AllocateDestinationString); _IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +NTSTATUS +NTAPI +RtlUpcaseUnicodeStringToAnsiString( + _When_(AllocateDestinationString, _Out_ _At_(DestinationString->Buffer, __drv_allocatesMem(Mem))) + _When_(!AllocateDestinationString, _Inout_) + PANSI_STRING DestinationString, + _In_ PCUNICODE_STRING SourceString, + _In_ BOOLEAN AllocateDestinationString); + +_IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI ULONG NTAPI Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Dec 25 15:06:31 2016 @@ -1779,7 +1779,7 @@ NTAPI RtlUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; @@ -1942,7 +1942,7 @@ NTAPI RtlUpcaseUnicodeStringToAnsiString( IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { NTSTATUS Status;

7 years, 8 months

[jimtabor] 73482: [NtGDI] - Turn off debug DC Bounds spam.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 23 18:42:47 2016 New Revision: 73482 URL: http://svn.reactos.org/svn/reactos?rev=73482&view=rev Log: [NtGDI] - Turn off debug DC Bounds spam. Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Dec 23 18:42:47 2016 @@ -194,8 +194,8 @@ if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { - DPRINT1("Bounds dc %p l %d t %d\n",dc,Bounds.left,Bounds.top); - DPRINT1(" r %d b %d\n",Bounds.right,Bounds.bottom); + DPRINT("Bounds dc %p l %d t %d\n",dc,Bounds.left,Bounds.top); + DPRINT(" r %d b %d\n",Bounds.right,Bounds.bottom); AddPenLinesBounds(dc, 2, Points); }

7 years, 8 months

[jimtabor] 73481: [NtGDI] - Turn off debug DC Bounds spam.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 23 17:40:09 2016 New Revision: 73481 URL: http://svn.reactos.org/svn/reactos?rev=73481&view=rev Log: [NtGDI] - Turn off debug DC Bounds spam. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Fri Dec 23 17:40:09 2016 @@ -701,14 +701,14 @@ rc.top = max( rc.top, 0 ); rc.right = min( rc.right, rcRgn.right - rcRgn.left ); rc.bottom = min( rc.bottom, rcRgn.bottom - rcRgn.top ); - DPRINT1("Rao dc %p r %d b %d\n",pdc,rcRgn.right - rcRgn.left, rcRgn.bottom - rcRgn.top); - DPRINT1("rc l %d t %d\n",rc.left,rc.top); - DPRINT1(" r %d b %d\n",rc.right,rc.bottom); + DPRINT("Rao dc %p r %d b %d\n",pdc,rcRgn.right - rcRgn.left, rcRgn.bottom - rcRgn.top); + DPRINT("rc l %d t %d\n",rc.left,rc.top); + DPRINT(" r %d b %d\n",rc.right,rc.bottom); ret = DCB_SET; } IntDPtoLP( pdc, &rc, 2 ); - DPRINT1("rc1 l %d t %d\n",rc.left,rc.top); - DPRINT1(" r %d b %d\n",rc.right,rc.bottom); + DPRINT("rc1 l %d t %d\n",rc.left,rc.top); + DPRINT(" r %d b %d\n",rc.right,rc.bottom); } else rc = pdc->erclBounds; Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri Dec 23 17:40:09 2016 @@ -59,8 +59,8 @@ points++; } - DPRINT1("APLB dc %p l %d t %d\n",dc,rect.left,rect.top); - DPRINT1(" r %d b %d\n",rect.right,rect.bottom); + DPRINT("APLB dc %p l %d t %d\n",dc,rect.left,rect.top); + DPRINT(" r %d b %d\n",rect.right,rect.bottom); { RECTL rcRgn;

7 years, 8 months

[hbelusca] 73480: [KERNEL32]: Addendum to r73479: display the file that failed to be opened before releasing SxsWin32RelativePath as PathName might be equal to SxsWin32RelativePath.RelativeName. Sp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 23 11:43:21 2016 New Revision: 73480 URL: http://svn.reactos.org/svn/reactos?rev=73480&view=rev Log: [KERNEL32]: Addendum to r73479: display the file that failed to be opened before releasing SxsWin32RelativePath as PathName might be equal to SxsWin32RelativePath.RelativeName. Spotted by Mark Jansen (actually he got it right at the beginning :) ) Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Fri Dec 23 11:43:21 2016 @@ -2923,13 +2923,16 @@ FILE_NON_DIRECTORY_FILE); } + /* Failure path, display which file failed to open */ + if (!NT_SUCCESS(Status)) + DPRINT1("Open file failed: %lx (%wZ)\n", Status, &PathName); + /* Cleanup in preparation for failure or success */ RtlReleaseRelativeName(&SxsWin32RelativePath); if (!NT_SUCCESS(Status)) { /* Failure path, try to understand why */ - DPRINT1("Open file failed: %lx (%wZ)\n", Status, &PathName); if (RtlIsDosDeviceName_U(lpApplicationName)) { /* If a device is being executed, return this special error code */

7 years, 8 months

[hbelusca] 73479: [KERNEL32]: Improve SxS DPRINT info, based on Mark Jansen's suggestion. CORE-10524

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 22 22:37:26 2016 New Revision: 73479 URL: http://svn.reactos.org/svn/reactos?rev=73479&view=rev Log: [KERNEL32]: Improve SxS DPRINT info, based on Mark Jansen's suggestion. CORE-10524 Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Thu Dec 22 22:37:26 2016 @@ -2925,10 +2925,11 @@ /* Cleanup in preparation for failure or success */ RtlReleaseRelativeName(&SxsWin32RelativePath); + if (!NT_SUCCESS(Status)) { /* Failure path, try to understand why */ - DPRINT1("Open file failed: %lx\n", Status); + DPRINT1("Open file failed: %lx (%wZ)\n", Status, &PathName); if (RtlIsDosDeviceName_U(lpApplicationName)) { /* If a device is being executed, return this special error code */

7 years, 8 months

[mjansen] 73478: [CMD] Show the executed command in the title, do not restore the old title when it is modified. CORE-12586

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Dec 22 21:25:37 2016 New Revision: 73478 URL: http://svn.reactos.org/svn/reactos?rev=73478&view=rev Log: [CMD] Show the executed command in the title, do not restore the old title when it is modified. CORE-12586 Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/title.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Thu Dec 22 21:25:37 2016 @@ -163,6 +163,7 @@ BOOL bUnicodeOutput = FALSE; BOOL bDisableBatchEcho = FALSE; BOOL bDelayedExpansion = FALSE; +BOOL bTitleSet = FALSE; DWORD dwChildProcessId = 0; HANDLE hIn; HANDLE hOut; @@ -314,7 +315,7 @@ { TCHAR szFullName[MAX_PATH]; TCHAR *first, *rest, *dot; - TCHAR szWindowTitle[MAX_PATH]; + TCHAR szWindowTitle[MAX_PATH], szNewTitle[MAX_PATH*2]; DWORD dwExitCode = 0; TCHAR *FirstEnd; TCHAR szFullCmdLine [CMDLINE_LENGTH]; @@ -377,7 +378,10 @@ return 1; } - GetConsoleTitle (szWindowTitle, MAX_PATH); + GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle)); + bTitleSet = FALSE; + _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest); + SetConsoleTitle(szNewTitle); /* check if this is a .BAT or .CMD file */ dot = _tcsrchr (szFullName, _T('.')); @@ -475,7 +479,8 @@ /* Get code page if it has been changed */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); - SetConsoleTitle(szWindowTitle); + if (!bTitleSet) + SetConsoleTitle(szWindowTitle); return dwExitCode; } Modified: trunk/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/title.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/title.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/title.c [iso-8859-1] Thu Dec 22 21:25:37 2016 @@ -13,6 +13,7 @@ #ifdef INCLUDE_CMD_TITLE +extern BOOL bTitleSet; INT cmd_title (LPTSTR param) { @@ -27,6 +28,7 @@ return 0; } + bTitleSet = TRUE; return SetConsoleTitle (param); }

7 years, 8 months

[mjansen] 73477: [BOOTDATA] Update AHKAppTests.cmd to check all drives for the AHK-Tests. CORE-12597 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Dec 22 20:51:38 2016 New Revision: 73477 URL: http://svn.reactos.org/svn/reactos?rev=73477&view=rev Log: [BOOTDATA] Update AHKAppTests.cmd to check all drives for the AHK-Tests. CORE-12597 #resolve Modified: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd Modified: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd [iso-8859-1] Thu Dec 22 20:51:38 2016 @@ -1,11 +1,14 @@ @ECHO OFF -if not exist "D:\AHK-Tests" ( +set DRIVE= +for %%X in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (if exist %%X:\AHK-Tests set DRIVE=%%X) + +if not defined DRIVE ( dbgprint "AHK Application testing suite not present, skipping." exit /b 0 ) -xcopy /Y /H /E D:\AHK-Tests\*.* C:\ReactOS\bin +xcopy /Y /H /E %DRIVE%:\AHK-Tests\*.* %SystemRoot%\bin REM Download Amine's rosautotest from svn -dwnl http://svn.reactos.org/amine/rosautotest.exe C:\ReactOS\system32\rosautotest.exe +dwnl http://svn.reactos.org/amine/rosautotest.exe %SystemRoot%\system32\rosautotest.exe dbgprint "....AHK Application testing suite added."

7 years, 8 months

[jimtabor] 73476: [Win32SS] - Implement DC Bounds support. It's close to what wine does and passes thousands of tests. Still WIP. See CORE-11582.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 22 17:34:58 2016 New Revision: 73476 URL: http://svn.reactos.org/svn/reactos?rev=73476&view=rev Log: [Win32SS] - Implement DC Bounds support. It's close to what wine does and passes thousands of tests. Still WIP. See CORE-11582. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/pen.h trunk/reactos/win32ss/include/ntgdityp.h Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -800,7 +800,7 @@ UINT flags ) { - return NtGdiGetBoundsRect(hdc,lprcBounds,flags & DCB_RESET); + return NtGdiGetBoundsRect(hdc,lprcBounds,flags & ~DCB_WINDOWMGR); } @@ -814,7 +814,7 @@ UINT flags) { /* FIXME add check for validate the flags */ - return NtGdiSetBoundsRect(hdc, (LPRECT)prc, flags); + return NtGdiSetBoundsRect(hdc, (LPRECT)prc, flags & ~DCB_WINDOWMGR); } 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] Thu Dec 22 17:34:58 2016 @@ -77,6 +77,11 @@ DestRect.top += DCDest->ptlDCOrig.y; DestRect.right += DCDest->ptlDCOrig.x; DestRect.bottom += DCDest->ptlDCOrig.y; + + if (DCDest->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(DCDest, &DestRect); + } SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; @@ -262,6 +267,11 @@ rcSrc.right += DCSrc->ptlDCOrig.x; rcSrc.bottom += DCSrc->ptlDCOrig.y; + if (DCDest->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(DCDest, &rcDest); + } + /* Prepare for blit */ DC_vPrepareDCsForBlit(DCDest, &rcDest, DCSrc, &rcSrc); @@ -419,6 +429,11 @@ DestRect.top += DCDest->ptlDCOrig.y; DestRect.right += DCDest->ptlDCOrig.x; DestRect.bottom += DCDest->ptlDCOrig.y; + + if (DCDest->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(DCDest, &DestRect); + } SourcePoint.x = nXSrc; SourcePoint.y = nYSrc; @@ -619,6 +634,11 @@ DestRect.right += DCDest->ptlDCOrig.x; DestRect.bottom += DCDest->ptlDCOrig.y; + if (DCDest->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(DCDest, &DestRect); + } + SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; SourceRect.right = XOriginSrc+WidthSrc; @@ -807,6 +827,12 @@ DestRect.top += pdc->ptlDCOrig.y; DestRect.right += pdc->ptlDCOrig.x; DestRect.bottom += pdc->ptlDCOrig.y; + + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(pdc, &DestRect); + } + #ifdef _USE_DIBLIB_ BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x + XLeft; BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y + YLeft; @@ -1058,6 +1084,13 @@ return FALSE; } + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + RECTL rcrgn; + REGION_GetRgnBox(prgnClip, &rcrgn); + IntUpdateBoundsRect(pdc, &rcrgn); + } + /* Prepare the DC */ DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); @@ -1137,6 +1170,13 @@ return FALSE; } + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + RECTL rcrgn; + REGION_GetRgnBox(prgnClip, &rcrgn); + IntUpdateBoundsRect(pdc, &rcrgn); + } + IntEngInitClipObj(&xcoClip); IntEngUpdateClipRegion(&xcoClip, prgnClip->rdh.nCount, @@ -1349,6 +1389,22 @@ /* Fail! */ DC_UnlockDc(pdc); return -1; + } + + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + RECTL rcDst; + + RECTL_vSetRect(&rcDst, x, y, x+1, y+1); + + IntLPtoDP(pdc, (LPPOINT)&rcDst, 2); + + rcDst.left += pdc->ptlDCOrig.x; + rcDst.top += pdc->ptlDCOrig.y; + rcDst.right += pdc->ptlDCOrig.x; + rcDst.bottom += pdc->ptlDCOrig.y; + + IntUpdateBoundsRect(pdc, &rcDst); } /* Translate the color to the target format */ Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -4,10 +4,16 @@ #define MIN_COORD (INT_MIN / 16) #define MAX_COORD (INT_MAX / 16) -#define IntLPtoDP(pdc, ppt, count) DC_vXformWorldToDevice(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); -#define CoordLPtoDP(pdc, ppt) DC_vXformWorldToDevice(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); -#define IntDPtoLP(pdc, ppt, count) DC_vXformDeviceToWorld(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); -#define CoordDPtoLP(pdc, ppt) DC_vXformDeviceToWorld(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define IntLPtoDP(pdc, ppt, count) \ + DC_vUpdateWorldToDevice(pdc); \ + DC_vXformWorldToDevice(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define CoordLPtoDP(pdc, ppt) \ + DC_vXformWorldToDevice(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define IntDPtoLP(pdc, ppt, count) \ + DC_vUpdateDeviceToWorld(pdc); \ + DC_vXformDeviceToWorld(pdc, count, (PPOINTL)(ppt), (PPOINTL)(ppt)); +#define CoordDPtoLP(pdc, ppt) \ + DC_vXformDeviceToWorld(pdc, 1, (PPOINTL)(ppt), (PPOINTL)(ppt)); #define XForm2MatrixS(m, x) XFormToMatrix(m, (XFORML*)x) #define MatrixS2XForm(x, m) MatrixToXForm((XFORML*)x, m) Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -2,9 +2,6 @@ #define __WIN32K_DC_H /* Constants ******************************************************************/ - -/* Get/SetBounds/Rect support. */ -#define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ /* flFontState */ enum _FONT_STATE @@ -207,6 +204,7 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); +VOID FASTCALL IntUpdateBoundsRect(PDC,PRECTL); BOOL NTAPI GreSetDCOwner(HDC hdc, ULONG ulOwner); HDC APIENTRY GreCreateCompatibleDC(HDC hdc, BOOL bAltDc); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -189,8 +189,8 @@ } DC_vUpdateTextBrush(pdc); -// DC_vUpdateLineBrush(pdc); -// DC_vUpdateFillBrush(pdc); + DC_vUpdateLineBrush(pdc); + DC_vUpdateFillBrush(pdc); DC_UnlockDc(pdc); @@ -652,6 +652,20 @@ return Ret; } +VOID +FASTCALL +IntUpdateBoundsRect(PDC pdc, PRECTL pRect) +{ + if (pdc->fs & DC_ACCUM_APP) + { + RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, pRect); + } + if (pdc->fs & DC_ACCUM_WMGR) + { + RECTL_bUnionRect(&pdc->erclBounds, &pdc->erclBounds, pRect); + } +} + DWORD APIENTRY NtGdiGetBoundsRect( @@ -661,19 +675,49 @@ { DWORD ret; PDC pdc; + RECT rc; /* Lock the DC */ if (!(pdc = DC_LockDc(hdc))) return 0; - /* Get the return value */ - ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; - ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + if (!(flags & DCB_WINDOWMGR)) + { + rc = pdc->erclBoundsApp; + + if (RECTL_bIsEmptyRect(&rc)) + { + rc.left = rc.top = rc.right = rc.bottom = 0; + ret = DCB_RESET; + } + else + { + RECTL rcRgn; + if (pdc->fs & DC_FLAG_DIRTY_RAO) CLIPPING_UpdateGCRegion(pdc); + if(!REGION_GetRgnBox(pdc->prgnRao, &rcRgn)) + { + REGION_GetRgnBox(pdc->prgnVis, &rcRgn); + } + rc.left = max( rc.left, 0 ); + rc.top = max( rc.top, 0 ); + rc.right = min( rc.right, rcRgn.right - rcRgn.left ); + rc.bottom = min( rc.bottom, rcRgn.bottom - rcRgn.top ); + DPRINT1("Rao dc %p r %d b %d\n",pdc,rcRgn.right - rcRgn.left, rcRgn.bottom - rcRgn.top); + DPRINT1("rc l %d t %d\n",rc.left,rc.top); + DPRINT1(" r %d b %d\n",rc.right,rc.bottom); + ret = DCB_SET; + } + IntDPtoLP( pdc, &rc, 2 ); + DPRINT1("rc1 l %d t %d\n",rc.left,rc.top); + DPRINT1(" r %d b %d\n",rc.right,rc.bottom); + } + else + rc = pdc->erclBounds; /* Copy the rect to the caller */ _SEH2_TRY { ProbeForWrite(prc, sizeof(RECT), 1); - *prc = pdc->erclBoundsApp; + *prc = rc; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -683,13 +727,21 @@ if (flags & DCB_RESET) { - RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + if (!(flags & DCB_WINDOWMGR)) + { + pdc->erclBoundsApp.left = pdc->erclBoundsApp.top = INT_MAX; + pdc->erclBoundsApp.right = pdc->erclBoundsApp.bottom = INT_MIN; + } + else + { + pdc->erclBounds.left = pdc->erclBounds.top = INT_MAX; + pdc->erclBounds.right = pdc->erclBounds.bottom = INT_MIN; + } } DC_UnlockDc(pdc); return ret; } - DWORD APIENTRY @@ -709,12 +761,23 @@ if (!(pdc = DC_LockDc(hdc))) return 0; /* Get the return value */ - ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; - ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + ret = DCB_RESET; /* we don't have device-specific bounds */ + ret = (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR) ? DCB_ENABLE : DCB_DISABLE) | + (RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? ret & DCB_SET : DCB_SET ); + ret |= (flags & DCB_WINDOWMGR); if (flags & DCB_RESET) { - RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + if (!(flags & DCB_WINDOWMGR)) + { + pdc->erclBoundsApp.left = pdc->erclBoundsApp.top = INT_MAX; + pdc->erclBoundsApp.right = pdc->erclBoundsApp.bottom = INT_MIN; + } + else + { + pdc->erclBounds.left = pdc->erclBounds.top = INT_MAX; + pdc->erclBounds.right = pdc->erclBounds.bottom = INT_MIN; + } } if (flags & DCB_ACCUMULATE && prc != NULL) @@ -733,11 +796,30 @@ _SEH2_END; RECTL_vMakeWellOrdered(&rcl); - RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, &rcl); - } - - if (flags & DCB_ENABLE) pdc->fs |= DC_ACCUM_APP; - if (flags & DCB_DISABLE) pdc->fs &= ~DC_ACCUM_APP; + + if (!(flags & DCB_WINDOWMGR)) + { + IntLPtoDP( pdc, (POINT *)&rcl, 2 ); + RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, &rcl); + } + else + RECTL_bUnionRect(&pdc->erclBounds, &pdc->erclBounds, &rcl); + } + + if (flags & DCB_ENABLE) + { + if (!(flags & DCB_WINDOWMGR)) + pdc->fs |= DC_ACCUM_APP; + else + pdc->fs |= DC_ACCUM_WMGR; + } + if (flags & DCB_DISABLE) + { + if (!(flags & DCB_WINDOWMGR)) + pdc->fs &= ~DC_ACCUM_APP; + else + pdc->fs &= ~DC_ACCUM_WMGR; + } DC_UnlockDc(pdc); return ret; } 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] Thu Dec 22 17:34:58 2016 @@ -558,6 +558,11 @@ rcDest.right = rcDest.left + Width; rcDest.bottom = rcDest.top + Height; rcDest.top += StartScan; + + if (pDC->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(pDC, &rcDest); + } ptSource.x = XSrc; ptSource.y = YSrc; @@ -1256,6 +1261,11 @@ IntLPtoDP(pdc, (POINTL*)&rcDst, 2); RECTL_vOffsetRect(&rcDst, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(pdc, &rcDst); + } + hbmTmp = GreCreateBitmapEx(pbmi->bmiHeader.biWidth, abs(pbmi->bmiHeader.biHeight), 0, Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -580,6 +580,11 @@ DestRect.top += dc->ptlDCOrig.y; DestRect.bottom += dc->ptlDCOrig.y; + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(dc, &DestRect); + } + /* In GM_COMPATIBLE, don't include bottom and right edges */ if (pdcattr->iGraphicsMode == GM_COMPATIBLE) { @@ -978,6 +983,11 @@ ptlDitherOrg.x += pdc->ptlDCOrig.x; ptlDitherOrg.y += pdc->ptlDCOrig.y; + + if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(pdc, &rclExtent); + } DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); @@ -1146,6 +1156,11 @@ RECTL_vSetRect(&DestRect, 0, 0, psurf->SurfObj.sizlBitmap.cx, psurf->SurfObj.sizlBitmap.cy); } + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(dc, &DestRect); + } + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0xffffff, 0); /* Only solid fills supported for now 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] Thu Dec 22 17:34:58 2016 @@ -3446,6 +3446,11 @@ DestRect.right += dc->ptlDCOrig.x; DestRect.bottom += dc->ptlDCOrig.y; + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(dc, &DestRect); + } + DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) @@ -3722,6 +3727,10 @@ DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + IntUpdateBoundsRect(dc, &DestRect); + } IntEngBitBlt( &psurf->SurfObj, NULL, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -12,6 +12,67 @@ #include <debug.h> // Some code from the WINE project source (www.winehq.com) + +VOID FASTCALL +AddPenLinesBounds(PDC dc, int count, POINT *points) +{ + DWORD join, endcap; + RECTL bounds, rect; + LONG lWidth; + PBRUSH pbrLine; + + /* Get BRUSH from current pen. */ + pbrLine = dc->dclevel.pbrLine; + ASSERT(pbrLine); + + lWidth = pbrLine->lWidth; + + // Setup bounds + bounds.left = bounds.top = INT_MAX; + bounds.right = bounds.bottom = INT_MIN; + + if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || lWidth > 1) + { + /* Windows uses some heuristics to estimate the distance from the point that will be painted */ + lWidth = lWidth + 2; + endcap = (PS_ENDCAP_MASK & pbrLine->ulPenStyle); + join = (PS_JOIN_MASK & pbrLine->ulPenStyle); + if (join == PS_JOIN_MITER) + { + lWidth *= 5; + if (endcap == PS_ENDCAP_SQUARE) lWidth = (lWidth * 3 + 1) / 2; + } + else + { + if (endcap == PS_ENDCAP_SQUARE) lWidth -= lWidth / 4; + else lWidth = (lWidth + 1) / 2; + } + } + + while (count-- > 0) + { + rect.left = points->x - lWidth; + rect.top = points->y - lWidth; + rect.right = points->x + lWidth + 1; + rect.bottom = points->y + lWidth + 1; + RECTL_bUnionRect(&bounds, &bounds, &rect); + points++; + } + + DPRINT1("APLB dc %p l %d t %d\n",dc,rect.left,rect.top); + DPRINT1(" r %d b %d\n",rect.right,rect.bottom); + + { + RECTL rcRgn; + if (dc->fs & DC_FLAG_DIRTY_RAO) CLIPPING_UpdateGCRegion(dc); + if (REGION_GetRgnBox(dc->prgnRao, &rcRgn)) + { + if (RECTL_bIntersectRect( &rcRgn, &rcRgn, &bounds )) IntUpdateBoundsRect(dc, &rcRgn); + } + else + IntUpdateBoundsRect(dc, &bounds); + } +} // Should use Fx in Point // @@ -131,6 +192,13 @@ pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + DPRINT1("Bounds dc %p l %d t %d\n",dc,Bounds.left,Bounds.top); + DPRINT1(" r %d b %d\n",Bounds.right,Bounds.bottom); + AddPenLinesBounds(dc, 2, Points); + } + if (!(pbrLine->flAttrs & BR_IS_NULL)) { Ret = IntEngLineTo(&psurf->SurfObj, @@ -258,6 +326,11 @@ { Points[i].x += dc->ptlDCOrig.x; Points[i].y += dc->ptlDCOrig.y; + } + + if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) + { + AddPenLinesBounds(dc, Count, Points); } Ret = IntEngPolyline(&psurf->SurfObj, Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.h?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.h [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -27,3 +27,5 @@ _In_ PPEN pPen, _In_ INT Count, _Out_ PLOGPEN Buffer); + +VOID FASTCALL AddPenLinesBounds(PDC,int,POINT *); Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Thu Dec 22 17:34:58 2016 @@ -231,6 +231,8 @@ /* New color use parameter. See support.microsoft.com/kb/kbview/108497 */ #define DIB_PAL_INDICES 2 +/* Get/SetBounds/Rect support. */ +#define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ /* TYPES *********************************************************************/

7 years, 8 months

[jimtabor] 73475: [Win32SS|RTL] - Fix clipping for Draw Text. Inspired by Katayama Hirofumi MZ patch and ComCtl32/RichEd20/UxThmems. See CORE-2201.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 22 16:39:33 2016 New Revision: 73475 URL: http://svn.reactos.org/svn/reactos?rev=73475&view=rev Log: [Win32SS|RTL] - Fix clipping for Draw Text. Inspired by Katayama Hirofumi MZ patch and ComCtl32/RichEd20/UxThmems. See CORE-2201. Modified: trunk/reactos/win32ss/user/rtl/text.c Modified: trunk/reactos/win32ss/user/rtl/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?re… ============================================================================== --- trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] Thu Dec 22 16:39:33 2016 @@ -986,6 +986,9 @@ int prefix_offset; ellipsis_data ellip; BOOL invert_y=FALSE; + + HRGN hrgn = 0; + #ifdef _WIN32K_ TRACE("%S, %d, %08x\n", str, count, flags); #else @@ -1072,7 +1075,40 @@ } if (flags & DT_CALCRECT) flags |= DT_NOCLIP; - +#ifndef _WIN32K_ ///// Fix CORE-2201. + if (!(flags & DT_NOCLIP) ) + { + int hasClip; + hrgn = CreateRectRgn(0,0,0,0); + if (hrgn) + { + hasClip = GetClipRgn(hdc, hrgn); + // If the region to be retrieved is NULL, the return value is 0. + if (hasClip != 1) + { + DeleteObject(hrgn); + hrgn = NULL; + } + IntersectClipRect(hdc, rect->left, rect->top, rect->right, rect->bottom); + } + } +#else + if (!(flags & DT_NOCLIP) ) + { + int hasClip; + hrgn = NtGdiCreateRectRgn(0,0,0,0); + if (hrgn) + { + hasClip = NtGdiGetRandomRgn(hdc, hrgn, CLIPRGN); + if (hasClip != 1) + { + GreDeleteObject(hrgn); + hrgn = NULL; + } + NtGdiIntersectClipRect(hdc, rect->left, rect->top, rect->right, rect->bottom); + } + } +#endif ///// if (flags & DT_MODIFYSTRING) { size_retstr = (count + 4) * sizeof (WCHAR); @@ -1226,6 +1262,26 @@ } while (strPtr && !last_line); +#ifndef _WIN32K_ + if (!(flags & DT_NOCLIP) ) + { + SelectClipRgn(hdc, hrgn); + if (hrgn) + { + DeleteObject(hrgn); + } + } +#else + if (!(flags & DT_NOCLIP) ) + { + NtGdiExtSelectClipRgn(hdc, hrgn, RGN_COPY); + if (hrgn) + { + GreDeleteObject(hrgn); + } + } +#endif + if (flags & DT_CALCRECT) { rect->right = rect->left + max_width;

7 years, 8 months

[jimtabor] 73474: [User32|RTL] - Move TEXT_TabbedTextOut back into User32.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 22 06:51:32 2016 New Revision: 73474 URL: http://svn.reactos.org/svn/reactos?rev=73474&view=rev Log: [User32|RTL] - Move TEXT_TabbedTextOut back into User32. Modified: trunk/reactos/win32ss/user/rtl/text.c trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/rtl/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?re… ============================================================================== --- trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/rtl/text.c [iso-8859-1] Thu Dec 22 06:51:32 2016 @@ -61,128 +61,6 @@ ExitProcess(3); for(;;); /* eliminate warning by mingw */ #endif -} - -/*********************************************************************** - * TEXT_TabbedTextOut - * - * Helper function for TabbedTextOut() and GetTabbedTextExtent(). - * Note: this doesn't work too well for text-alignment modes other - * than TA_LEFT|TA_TOP. But we want bug-for-bug compatibility :-) - */ -/* WINE synced 22-May-2006 */ -LONG TEXT_TabbedTextOut( HDC hdc, - INT x, - INT y, - LPCWSTR lpstr, - INT count, - INT cTabStops, - const INT *lpTabPos, - INT nTabOrg, - BOOL fDisplayText ) -{ - INT defWidth; - SIZE extent; - int i, j; - int start = x; - TEXTMETRICW tm; - - if (!lpTabPos) - cTabStops=0; - -#ifdef _WIN32K_ - GreGetTextMetricsW( hdc, &tm ); -#else - GetTextMetricsW( hdc, &tm ); -#endif - - if (cTabStops == 1) - { - defWidth = *lpTabPos; - cTabStops = 0; - } - else - { - defWidth = 8 * tm.tmAveCharWidth; - } - - while (count > 0) - { - RECT r; - INT x0; - x0 = x; - r.left = x0; - /* chop the string into substrings of 0 or more <tabs> - * possibly followed by 1 or more normal characters */ - for (i = 0; i < count; i++) - if (lpstr[i] != '\t') break; - for (j = i; j < count; j++) - if (lpstr[j] == '\t') break; - /* get the extent of the normal character part */ -#ifdef _WIN32K_ - GreGetTextExtentW( hdc, lpstr + i, j - i , &extent, 0 ); -#else - GetTextExtentPointW( hdc, lpstr + i, j - i , &extent ); -#endif - /* and if there is a <tab>, calculate its position */ - if( i) { - /* get x coordinate for the drawing of this string */ - for (; cTabStops > i; lpTabPos++, cTabStops--) - { - if( nTabOrg + abs( *lpTabPos) > x) { - if( lpTabPos[ i - 1] >= 0) { - /* a left aligned tab */ - x = nTabOrg + lpTabPos[ i-1] + extent.cx; - break; - } - else - { - /* if tab pos is negative then text is right-aligned - * to tab stop meaning that the string extends to the - * left, so we must subtract the width of the string */ - if (nTabOrg - lpTabPos[ i - 1] - extent.cx > x) - { - x = nTabOrg - lpTabPos[ i - 1]; - x0 = x - extent.cx; - break; - } - } - } - } - /* if we have run out of tab stops and we have a valid default tab - * stop width then round x up to that width */ - if ((cTabStops <= i) && (defWidth > 0)) { - x0 = nTabOrg + ((x - nTabOrg) / defWidth + i) * defWidth; - x = x0 + extent.cx; - } else if ((cTabStops <= i) && (defWidth < 0)) { - x = nTabOrg + ((x - nTabOrg + extent.cx) / -defWidth + i) - * -defWidth; - x0 = x - extent.cx; - } - } else - x += extent.cx; - - if (fDisplayText) - { - r.top = y; - r.right = x; - r.bottom = y + extent.cy; -#ifdef _WIN32K_ - GreExtTextOutW( hdc, x0, y, GreGetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, - &r, lpstr + i, j - i, NULL, 0 ); -#else - ExtTextOutW( hdc, x0, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, - &r, lpstr + i, j - i, NULL ); -#endif - } - count -= j; - lpstr += j; - } - - if(!extent.cy) - extent.cy = tm.tmHeight; - - return MAKELONG(x - start, extent.cy); } /********************************************************************* Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Thu Dec 22 06:51:32 2016 @@ -38,11 +38,119 @@ INT WINAPI DrawTextExWorker( HDC hdc, LPWSTR str, INT i_count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ); -LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, - INT count, INT cTabStops, const INT *lpTabPos, INT nTabOrg, - BOOL fDisplayText ); /* FUNCTIONS *****************************************************************/ + + +/*********************************************************************** + * TEXT_TabbedTextOut + * + * Helper function for TabbedTextOut() and GetTabbedTextExtent(). + * Note: this doesn't work too well for text-alignment modes other + * than TA_LEFT|TA_TOP. But we want bug-for-bug compatibility :-) + */ +/* WINE synced 22-May-2006 */ +LONG TEXT_TabbedTextOut( HDC hdc, + INT x, + INT y, + LPCWSTR lpstr, + INT count, + INT cTabStops, + const INT *lpTabPos, + INT nTabOrg, + BOOL fDisplayText ) +{ + INT defWidth; + SIZE extent; + int i, j; + int start = x; + TEXTMETRICW tm; + + if (!lpTabPos) + cTabStops=0; + + GetTextMetricsW( hdc, &tm ); + + if (cTabStops == 1) + { + defWidth = *lpTabPos; + cTabStops = 0; + } + else + { + defWidth = 8 * tm.tmAveCharWidth; + } + + while (count > 0) + { + RECT r; + INT x0; + x0 = x; + r.left = x0; + /* chop the string into substrings of 0 or more <tabs> + * possibly followed by 1 or more normal characters */ + for (i = 0; i < count; i++) + if (lpstr[i] != '\t') break; + for (j = i; j < count; j++) + if (lpstr[j] == '\t') break; + /* get the extent of the normal character part */ + GetTextExtentPointW( hdc, lpstr + i, j - i , &extent ); + /* and if there is a <tab>, calculate its position */ + if( i) { + /* get x coordinate for the drawing of this string */ + for (; cTabStops > i; lpTabPos++, cTabStops--) + { + if( nTabOrg + abs( *lpTabPos) > x) { + if( lpTabPos[ i - 1] >= 0) { + /* a left aligned tab */ + x = nTabOrg + lpTabPos[ i-1] + extent.cx; + break; + } + else + { + /* if tab pos is negative then text is right-aligned + * to tab stop meaning that the string extends to the + * left, so we must subtract the width of the string */ + if (nTabOrg - lpTabPos[ i - 1] - extent.cx > x) + { + x = nTabOrg - lpTabPos[ i - 1]; + x0 = x - extent.cx; + break; + } + } + } + } + /* if we have run out of tab stops and we have a valid default tab + * stop width then round x up to that width */ + if ((cTabStops <= i) && (defWidth > 0)) { + x0 = nTabOrg + ((x - nTabOrg) / defWidth + i) * defWidth; + x = x0 + extent.cx; + } else if ((cTabStops <= i) && (defWidth < 0)) { + x = nTabOrg + ((x - nTabOrg + extent.cx) / -defWidth + i) + * -defWidth; + x0 = x - extent.cx; + } + } else + x += extent.cx; + + if (fDisplayText) + { + r.top = y; + r.right = x; + r.bottom = y + extent.cy; + + ExtTextOutW( hdc, x0, y, GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0, + &r, lpstr + i, j - i, NULL ); + } + count -= j; + lpstr += j; + } + + if(!extent.cy) + extent.cy = tm.tmHeight; + + return MAKELONG(x - start, extent.cy); +} /* * @implemented

7 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016