git://git.jankratochvil.net
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
branch update for HEAD-2003050101
[reactos.git]
/
lib
/
gdi32
/
objects
/
text.c
diff --git
a/lib/gdi32/objects/text.c
b/lib/gdi32/objects/text.c
index
b0e9390
..
3a9977e
100644
(file)
--- a/
lib/gdi32/objects/text.c
+++ b/
lib/gdi32/objects/text.c
@@
-55,17
+55,17
@@
BOOL
STDCALL
GetTextMetricsA(
HDC hdc,
STDCALL
GetTextMetricsA(
HDC hdc,
- LPTEXTMETRIC
tm
+ LPTEXTMETRIC
A
tm
)
{
)
{
- return W32kGetTextMetrics(hdc, tm);
+ return W32kGetTextMetrics(hdc,
(LPTEXTMETRICW)
tm);
}
BOOL
STDCALL
GetTextMetricsW(
HDC hdc,
}
BOOL
STDCALL
GetTextMetricsW(
HDC hdc,
- LPTEXTMETRIC
tm
+ LPTEXTMETRIC
W
tm
)
{
return W32kGetTextMetrics(hdc, tm);
)
{
return W32kGetTextMetrics(hdc, tm);
@@
-152,20
+152,20
@@
ExtTextOutW(
HFONT
STDCALL
CreateFontIndirectA(
HFONT
STDCALL
CreateFontIndirectA(
- CONST LOGFONT
*lf
+ CONST LOGFONT
A
*lf
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
HFONT ret;
)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
HFONT ret;
- LOGFONT tlf;
+ LOGFONT
W
tlf;
RtlInitAnsiString(&StringA, (LPSTR)lf->lfFaceName);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
RtlInitAnsiString(&StringA, (LPSTR)lf->lfFaceName);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- memcpy(&tlf, lf, sizeof(LOGFONT));
+ memcpy(&tlf, lf, sizeof(LOGFONT
A
));
memcpy(&tlf.lfFaceName, &StringU.Buffer, StringU.Length);
memcpy(&tlf.lfFaceName, &StringU.Buffer, StringU.Length);
- ret = CreateFontIndirectW(
(CONST LOGFONT *)&
lf);
+ ret = CreateFontIndirectW(
&t
lf);
RtlFreeUnicodeString(&StringU);
RtlFreeUnicodeString(&StringU);
@@
-175,10
+175,10
@@
CreateFontIndirectA(
HFONT
STDCALL
CreateFontIndirectW(
HFONT
STDCALL
CreateFontIndirectW(
- CONST LOGFONT
*lf
+ CONST LOGFONT
W
*lf
)
{
)
{
- return W32kCreateFontIndirect((CONST LPLOGFONT)lf);
+ return W32kCreateFontIndirect((CONST LPLOGFONT
W
)lf);
}
HFONT
}
HFONT