Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-26 02:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FONTVIEW]

Browse source 
Fix some MSVC/x64 warnings

svn path=/trunk/; revision=58316
This commit is contained in:
Timo Kreuzer 2013-02-16 11:46:05 +00:00
parent 413592e946
commit aa173340b2
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/base/applications/fontview/display.c
View file

@ -88,7 +88,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
GetTextMetrics(hDC, &tm); GetTextMetrics(hDC, &tm);
swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat); swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat);
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
y += tm.tmHeight + SPACING1; y += tm.tmHeight + SPACING1;
/* Draw a seperation Line */ /* Draw a seperation Line */
@ -103,15 +103,15 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
SelectObject(hDC, pData->hCharSetFont); SelectObject(hDC, pData->hCharSetFont);
GetTextMetrics(hDC, &tm); GetTextMetrics(hDC, &tm);
swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz");
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
y += tm.tmHeight + 1; y += tm.tmHeight + 1;
swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ");
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
y += tm.tmHeight + 1; y += tm.tmHeight + 1;
swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')"); swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')");
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
y += tm.tmHeight + 1; y += tm.tmHeight + 1;
/* Draw a seperation Line */ /* Draw a seperation Line */
@ -124,12 +124,12 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
for (i = 0; i < MAX_SIZES; i++) for (i = 0; i < MAX_SIZES; i++)
{ {
SelectObject(hDC, pData->hFonts[i]); SelectObject(hDC, pData->hFonts[i]);
TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); TextOutW(hDC, 20, y, pData->szString, (INT)wcslen(pData->szString));
GetTextMetrics(hDC, &tm); GetTextMetrics(hDC, &tm);
y += tm.tmHeight + 1; y += tm.tmHeight + 1;
SelectObject(hDC, pData->hSizeFont); SelectObject(hDC, pData->hSizeFont);
swprintf(szSize, L"%d", pData->nSizes[i]); swprintf(szSize, L"%d", pData->nSizes[i]);
TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize)); TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, (INT)wcslen(szSize));
} }
SelectObject(hDC, hOldFont); SelectObject(hDC, hOldFont);

2
reactos/base/applications/fontview/fontview.c
View file

@ -221,7 +221,7 @@ WinMain (HINSTANCE hThisInstance,
RemoveFontResourceW(argv[1]); RemoveFontResourceW(argv[1]);
return msg.wParam; return (int)msg.wParam;
} }
static LRESULT static LRESULT