ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 04:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GDI32]

Browse Source 
Fix SetTextAlign:
- return GDI_ERROR (-1) not 0 on error
- properly handle LAYOUT_RTL

svn path=/trunk/; revision=57286
This commit is contained in:
Timo Kreuzer
2012-09-12 18:17:10 +00:00
parent f8b44df7df
commit 32d7126aa5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/gdi/gdi32/objects/text.c
+4 -5
View File
@@ -572,7 +572,7 @@ SetTextAlign(HDC hdc,
UINT fMode)
{
PDC_ATTR Dc_Attr;
INT OldMode = 0;
INT OldMode;
#if 0
if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)
{
@@ -593,17 +593,16 @@ SetTextAlign(HDC hdc,
}
}
#endif
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldMode;
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR;
OldMode = Dc_Attr->lTextAlign;
Dc_Attr->lTextAlign = fMode; // Raw
if (Dc_Attr->dwLayout & LAYOUT_RTL)
{
if(!(fMode & TA_CENTER)) fMode |= TA_RIGHT;
if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT;
}
Dc_Attr->flTextAlign = fMode & (TA_BASELINE|TA_UPDATECP|TA_CENTER);
Dc_Attr->flTextAlign = fMode & TA_MASK;
return OldMode;
}