Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 11:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32]

Browse source 
Use GdiGetDcAttr() where appropriate, improve SetLastError() situation.

svn path=/trunk/; revision=65320
This commit is contained in:
Timo Kreuzer 2014-11-08 13:12:07 +00:00
parent 583ff26215
commit b52f449aca
1 changed files with 123 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

181
reactos/win32ss/gdi/gdi32/objects/text.c
View file

@ -84,10 +84,20 @@ DWORD
WINAPI WINAPI
GdiGetCodePage(HDC hdc) GdiGetCodePage(HDC hdc)
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
if (Dc_Attr->ulDirty_ & DIRTY_CHARSET) return LOWORD(NtGdiGetCharSet(hdc)); /* Get the DC attribute */
return LOWORD(Dc_Attr->iCS_CP); pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
if (pdcattr->ulDirty_ & DIRTY_CHARSET)
return LOWORD(NtGdiGetCharSet(hdc));
return LOWORD(pdcattr->iCS_CP);
} }
@ -97,14 +107,20 @@ GdiGetCodePage(HDC hdc)
int int
WINAPI WINAPI
GetTextCharacterExtra( GetTextCharacterExtra(
HDC hDc HDC hdc
) )
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
if (!GdiGetHandleUserData((HGDIOBJ) hDc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; /* Get the DC attribute */
return Dc_Attr->lTextExtra; pdcattr = GdiGetDcAttr(hdc);
// return GetDCDWord( hDc, GdiGetTextCharExtra, 0); if (pdcattr == NULL)
{
/* Do not set LastError here! */
return 0x8000000;
}
return pdcattr->lTextExtra;
} }
@ -133,7 +149,7 @@ GetTextMetricsA(
{ {
TMW_INTERNAL tmwi; TMW_INTERNAL tmwi;
if (! NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) if (!NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL)))
{ {
return FALSE; return FALSE;
} }
@ -544,38 +560,46 @@ GetFontResourceInfoW(
int int
WINAPI WINAPI
SetTextCharacterExtra( SetTextCharacterExtra(
HDC hDC, HDC hdc,
int CharExtra int CharExtra
) )
{ {
INT cExtra = 0x80000000; INT cExtra;
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
if (CharExtra == cExtra) if (CharExtra == 0x80000000)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return cExtra; return 0x80000000;
} }
#if 0 #if 0
if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC)
{ {
return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port. return MFDRV_SetTextCharacterExtra( hdc, CharExtra ); // Wine port.
} }
#endif #endif
if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return cExtra;
if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) /* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{ {
if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) SetLastError(ERROR_INVALID_PARAMETER);
return 0x8000000;
}
if (NtCurrentTeb()->GdiTebBatch.HDC == hdc)
{
if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY)
{ {
NtGdiFlush(); // Sync up Dc_Attr from Kernel space. NtGdiFlush(); // Sync up pdcattr from Kernel space.
Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY);
} }
} }
cExtra = Dc_Attr->lTextExtra;
Dc_Attr->lTextExtra = CharExtra; cExtra = pdcattr->lTextExtra;
pdcattr->lTextExtra = CharExtra;
return cExtra; return cExtra;
// return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 );
} }
/* /*
@ -586,9 +610,17 @@ UINT
WINAPI WINAPI
GetTextAlign(HDC hdc) GetTextAlign(HDC hdc)
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
return Dc_Attr->lTextAlign; /* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
/* Do not set LastError here! */
return GDI_ERROR;
}
return pdcattr->lTextAlign;
} }
@ -600,11 +632,18 @@ COLORREF
WINAPI WINAPI
GetTextColor(HDC hdc) GetTextColor(HDC hdc)
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
return Dc_Attr->ulForegroundClr;
}
/* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
/* Do not set LastError here! */
return CLR_INVALID;
}
return pdcattr->ulForegroundClr;
}
/* /*
@ -615,8 +654,17 @@ WINAPI
SetTextAlign(HDC hdc, SetTextAlign(HDC hdc,
UINT fMode) UINT fMode)
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
INT OldMode; INT OldMode;
/* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
SetLastError(ERROR_INVALID_PARAMETER);
return GDI_ERROR;
}
#if 0 #if 0
if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)
{ {
@ -624,7 +672,7 @@ SetTextAlign(HDC hdc,
return MFDRV_SetTextAlign( hdc, fMode ) return MFDRV_SetTextAlign( hdc, fMode )
else else
{ {
PLDC pLDC = Dc_Attr->pvLDC; PLDC pLDC = pdcattr->pvLDC;
if ( !pLDC ) if ( !pLDC )
{ {
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
@ -637,15 +685,15 @@ SetTextAlign(HDC hdc,
} }
} }
#endif #endif
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR;
OldMode = Dc_Attr->lTextAlign; OldMode = pdcattr->lTextAlign;
Dc_Attr->lTextAlign = fMode; // Raw pdcattr->lTextAlign = fMode; // Raw
if (Dc_Attr->dwLayout & LAYOUT_RTL) if (pdcattr->dwLayout & LAYOUT_RTL)
{ {
if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT; if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT;
} }
Dc_Attr->flTextAlign = fMode & TA_MASK;
pdcattr->flTextAlign = fMode & TA_MASK;
return OldMode; return OldMode;
} }
@ -660,8 +708,17 @@ SetTextColor(
COLORREF crColor COLORREF crColor
) )
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
COLORREF OldColor = CLR_INVALID; COLORREF OldColor = CLR_INVALID;
/* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
SetLastError(ERROR_INVALID_PARAMETER);
return GDI_ERROR;
}
#if 0 #if 0
if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)
{ {
@ -669,7 +726,7 @@ SetTextColor(
return MFDRV_SetTextColor( hDC, crColor ); return MFDRV_SetTextColor( hDC, crColor );
else else
{ {
PLDC pLDC = Dc_Attr->pvLDC; PLDC pLDC = pdcattr->pvLDC;
if ( !pLDC ) if ( !pLDC )
{ {
SetLastError(ERROR_INVALID_HANDLE); SetLastError(ERROR_INVALID_HANDLE);
@ -682,15 +739,14 @@ SetTextColor(
} }
} }
#endif #endif
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldColor;
OldColor = (COLORREF) Dc_Attr->ulForegroundClr; OldColor = (COLORREF) pdcattr->ulForegroundClr;
Dc_Attr->ulForegroundClr = (ULONG) crColor; pdcattr->ulForegroundClr = (ULONG) crColor;
if ( Dc_Attr->crForegroundClr != crColor ) if ( pdcattr->crForegroundClr != crColor )
{ {
Dc_Attr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); pdcattr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL);
Dc_Attr->crForegroundClr = crColor; pdcattr->crForegroundClr = crColor;
} }
return OldColor; return OldColor;
} }
@ -706,7 +762,16 @@ SetTextJustification(
int breaks int breaks
) )
{ {
PDC_ATTR Dc_Attr; PDC_ATTR pdcattr;
/* Get the DC attribute */
pdcattr = GdiGetDcAttr(hdc);
if (pdcattr == NULL)
{
/* Do not set LastError here! */
return GDI_ERROR;
}
#if 0 #if 0
if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)
{ {
@ -718,21 +783,21 @@ SetTextJustification(
return FALSE; return FALSE;
} }
#endif #endif
if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE;
if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) if (NtCurrentTeb()->GdiTebBatch.HDC == hdc)
{
if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY)
{ {
if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) NtGdiFlush(); // Sync up pdcattr from Kernel space.
{ pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY);
NtGdiFlush(); // Sync up Dc_Attr from Kernel space.
Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY);
}
} }
Dc_Attr->cBreak = breaks;
Dc_Attr->lBreakExtra = extra;
return TRUE;
} }
pdcattr->cBreak = breaks;
pdcattr->lBreakExtra = extra;
return TRUE;
}
/* /*
* @implemented * @implemented
*/ */