Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 16:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROSTESTS] fix x64 build and fix/disable warnings

Browse source
This commit is contained in:
Timo Kreuzer 2019-05-30 17:12:28 +02:00
parent 6a67450893
commit 42d2d5ec9c
56 changed files with 229 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/rostests/win32/user32/biditext/biditext.c
View file

@ -190,7 +190,7 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
const WCHAR szString[] = {ALEF, BET, GIMEL, DALET, HEY, 'A', 'B', 'C', 'D', VAV, ZAYIN, HET, TET, YUD, 0};
const WCHAR szReversedString[] = {HEY, DALET, GIMEL, BET, ALEF, 'A', 'B', 'C', 'D', YUD, TET, HET, ZAYIN, VAV, 0};
int Len = wcslen(szString);
int Len = lstrlenW(szString);
int i, xpos, tempLength;
WCHAR tempString[20] = { 0 };
WCHAR Glyphs[100] = { 0 };
@ -247,15 +247,15 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
for (i = 0, xpos = 10; i < Len; i++, xpos += 30)
{
StringCchPrintfW(tempString, 20, L"%d", i);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 430, tempString, tempLength);
StringCchPrintfW(tempString, 20, L"%d", lpOrder[i]);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 450, tempString, tempLength);
StringCchPrintfW(tempString, 20, L"%d", lpCaretPos[i]);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 470, tempString, tempLength);
TextOutW(hdc, xpos, 490, &szString[i], 1);
@ -271,15 +271,15 @@ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
for (i = 0, xpos = 10; i < Len; i++, xpos += 30)
{
StringCchPrintfW(tempString, 20, L"%d", i);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 530, tempString, tempLength);
StringCchPrintfW(tempString, 20, L"%d", lpOrder[i]);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 550, tempString, tempLength);
StringCchPrintfW(tempString, 20, L"%d", lpCaretPos[i]);
tempLength = wcslen(tempString);
tempLength = lstrlenW(tempString);
TextOutW(hdc, xpos, 570, tempString, tempLength);
TextOutW(hdc, xpos, 590, &szString[i], 1);

8
modules/rostests/win32/user32/psmtest/psmtest.c
View file

@ -32,15 +32,15 @@ static void DrawTest(HDC hdc, int ypos, LPCWSTR str, DWORD dwFlags, int testtype
if (testtype == LPK)
{
ret = LpkPSMTextOut(hdc, 0, ypos, str, (!str) ? 10 : wcslen(str), dwFlags);
ret = LpkPSMTextOut(hdc, 0, ypos, str, (!str) ? 10 : lstrlenW(str), dwFlags);
StringCchPrintfW(Result, 100, L"Return Value = %d", ret);
TextOutW(hdc, 200, ypos, Result, wcslen(Result));
TextOutW(hdc, 200, ypos, Result, lstrlenW(Result));
}
else if (testtype == USERLPK)
{
ret = UserLpkPSMTextOut(hdc, 400, ypos, str, wcslen(str), dwFlags);
ret = UserLpkPSMTextOut(hdc, 400, ypos, str, lstrlenW(str), dwFlags);
StringCchPrintfW(Result, 100, L"Return Value = %d", ret);
TextOutW(hdc, 600, ypos, Result, wcslen(Result));
TextOutW(hdc, 600, ypos, Result, lstrlenW(Result));
}
}