Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 40493: forgot this file
by tkreuzer＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: tkreuzer Date: Tue Apr 14 01:40:14 2009 New Revision: 40493 URL: http://svn.reactos.org/svn/reactos?rev=40493&view=rev Log: forgot this file Added: trunk/rosapps/applications/sysutils/utils/rosperf/scroll.c (with props) Added: trunk/rosapps/applications/sysutils/utils/rosperf/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/scroll.c (added) +++ trunk/rosapps/applications/sysutils/utils/rosperf/scroll.c [iso-8859-1] Tue Apr 14 01:40:14 2009 @@ -1,0 +1,47 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include "rosperf.h" + +void +ScrollProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + unsigned Rep; + RECT rect; + int x = 0, y = 0, dx = 1, dy = 1; + + rect.left = rect.top = 0; + rect.right = PerfInfo->WndWidth; + rect.bottom = PerfInfo->WndHeight; + + DrawTextW(PerfInfo->ForegroundDc, L"rosperf", -1, &rect, DT_LEFT | DT_TOP); + + for (Rep = 0; Rep < Reps; Rep++) + { + ScrollDC((Rep & 0x100) ? PerfInfo->BackgroundDc : PerfInfo->ForegroundDc, + dx, dy, NULL, NULL, NULL, NULL); + x += dx; + y += dy; + if ((x >= PerfInfo->WndWidth -50) || x == 0) dx = -dx; + if ((y >= PerfInfo->WndHeight -10) || y == 0) dy = -dy; + } + +} + +/* EOF */ Propchange: trunk/rosapps/applications/sysutils/utils/rosperf/scroll.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 40492: Add RECTL_vMakeWellOrdered
by tkreuzer＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: tkreuzer Date: Tue Apr 14 01:38:37 2009 New Revision: 40492 URL: http://svn.reactos.org/svn/reactos?rev=40492&view=rev Log: Add RECTL_vMakeWellOrdered Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h trunk/reactos/subsystems/win32/win32k/objects/rect.c Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] Tue Apr 14 01:38:37 2009 @@ -54,7 +54,9 @@ FASTCALL RECTL_bIntersectRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); - +VOID +FASTCALL +RECTL_vMakeWellOrdered(RECTL *prcl); #endif /* _WIN32K_RECT_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] Tue Apr 14 01:38:37 2009 @@ -83,6 +83,24 @@ return FALSE; } +VOID +FASTCALL +RECTL_vMakeWellOrdered(RECTL *prcl) +{ + LONG lTmp; + if (prcl->left > prcl->right) + { + lTmp = prcl->left; + prcl->left = prcl->right; + prcl->right = lTmp; + } + if (prcl->top > prcl->bottom) + { + lTmp = prcl->top; + prcl->top = prcl->bottom; + prcl->bottom = lTmp; + } +} /* EOF */

1 0

[tkreuzer] 40491: Add rosperf test for scrolling.
by tkreuzer＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: tkreuzer Date: Tue Apr 14 01:36:56 2009 New Revision: 40491 URL: http://svn.reactos.org/svn/reactos?rev=40491&view=rev Log: Add rosperf test for scrolling. Modified: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.h trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild trunk/rosapps/applications/sysutils/utils/rosperf/testlist.c Modified: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.h [iso-8859-1] Tue Apr 14 01:36:56 2009 @@ -69,6 +69,8 @@ void GradientVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); void GradientProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +void ScrollProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); + #endif /* ROSPERF_H_INCLUDED */ /* EOF */ Modified: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild [iso-8859-1] Tue Apr 14 01:36:56 2009 @@ -12,6 +12,7 @@ <file>rosperf.c</file> <file>lines.c</file> <file>fill.c</file> + <file>scroll.c</file> <file>text.c</file> <file>alphablend.c</file> <file>testlist.c</file> Modified: trunk/rosapps/applications/sysutils/utils/rosperf/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/rosperf/testlist.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/rosperf/testlist.c [iso-8859-1] Tue Apr 14 01:36:56 2009 @@ -26,6 +26,7 @@ { L"hlines", L"Horizontal Lines", NullInit, LinesHorizontalProc, NullCleanup, NullCleanup }, { L"vlines", L"Vertical Lines", NullInit, LinesVerticalProc, NullCleanup, NullCleanup }, { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup }, + { L"scroll", L"Scroll", NullInit, ScrollProc, NullCleanup, NullCleanup }, { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup }, { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup }, { L"hgradient", L"Horizontal Gradient", NullInit, GradientHorizontalProc, NullCleanup, NullCleanup },

1 0

[gschneider] 40490: remove semicolon from define, thanks to Carlo Bramini for noticing
by gschneider＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: gschneider Date: Tue Apr 14 00:05:06 2009 New Revision: 40490 URL: http://svn.reactos.org/svn/reactos?rev=40490&view=rev Log: remove semicolon from define, thanks to Carlo Bramini for noticing Modified: trunk/reactos/include/psdk/shlwapi.h Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Tue Apr 14 00:05:06 2009 @@ -388,7 +388,7 @@ BOOL WINAPI PathIsFileSpecA(LPCSTR); BOOL WINAPI PathIsFileSpecW(LPCWSTR); -#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec); +#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec) BOOL WINAPI PathIsPrefixA(LPCSTR,LPCSTR); BOOL WINAPI PathIsPrefixW(LPCWSTR,LPCWSTR);

1 0

[dgoette] 368: * merge tree/tree_vendor_flat.php and tree/tree_vendor_flat_maintainer.php * merge tree/tree_category_tree.php and tree/tree_category_grouplist_1.php * merge tree/tree_vendor_id.php and tree/tree_vendor_id_maintainer.php * moved category browsing * moved name browsing * moved vendor browsing * move inc/tree to notree (remaining content needs to be moved to other files later) * remove more useless variables * minor fixes
by dgoette＠svn.reactos.org 13 Apr '09

13 Apr '09

1 0

[cwittich] 40489: sync kernel32 profile winetest with wine 1.1.19
by cwittich＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cwittich Date: Mon Apr 13 23:40:27 2009 New Revision: 40489 URL: http://svn.reactos.org/svn/reactos?rev=40489&view=rev Log: sync kernel32 profile winetest with wine 1.1.19 Modified: trunk/rostests/winetests/kernel32/profile.c Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… ============================================================================== --- trunk/rostests/winetests/kernel32/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/profile.c [iso-8859-1] Mon Apr 13 23:40:27 2009 @@ -174,13 +174,17 @@ SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( NULL, buf, sizeof(buf), testfile4 ); ok( ret == 0, "expected return size 0, got %d\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( "section1", buf, sizeof(buf), NULL ); ok( ret == 0, "expected return size 0, got %d\n", ret ); todo_wine - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* And a real one */ SetLastError(0xdeadbeef); @@ -190,7 +194,9 @@ ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", ret, buf); ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - ok( GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); DeleteFileA( testfile4 ); } @@ -215,33 +221,54 @@ CloseHandle( h); /* Test with sufficiently large buffer */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 29, testfile3 ); - ok( ret == 27, "expected return size 27, got %d\n", ret ); - ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( ret == 27 || + broken(ret == 28), /* Win9x, WinME */ + "expected return size 27, got %d\n", ret ); + ok( (buf[ret-1] == 0 && buf[ret] == 0) || + broken(buf[ret-1] == 0 && buf[ret-2] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Test with exactly fitting buffer */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 28, testfile3 ); - ok( ret == 26, "expected return size 26, got %d\n", ret ); - ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( ret == 26 || + broken(ret == 28), /* Win9x, WinME */ + "expected return size 26, got %d\n", ret ); + todo_wine + ok( (buf[ret+1] == 0 && buf[ret] == 0) || /* W2K3 and higher */ + broken(buf[ret+1] == 0xc && buf[ret] == 0) || /* NT4, W2K, WinXP */ + broken(buf[ret-1] == 0 && buf[ret-2] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Test with a buffer too small */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 27, testfile3 ); ok( ret == 25, "expected return size 25, got %d\n", ret ); - ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - + /* Win9x and WinME only fills the buffer with complete section names (double-null terminated) */ + count = strlen("section1") + sizeof(CHAR) + strlen("section2"); + todo_wine + ok( (buf[ret+1] == 0 && buf[ret] == 0) || + broken(buf[count] == 0 && buf[count+1] == 0), /* Win9x, WinME */ + "returned buffer not terminated with double-null\n" ); + /* Tests on nonexistent file */ - memset(buf, 0xcc, sizeof(buf)); + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 10, ".\\not_here.ini" ); - ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( ret == 0 || + broken(ret == 1), /* Win9x, WinME */ + "expected return size 0, got %d\n", ret ); ok( buf[0] == 0, "returned buffer not terminated with null\n" ); ok( buf[1] != 0, "returned buffer terminated with double-null\n" ); /* Test with sufficiently large buffer */ SetLastError(0xdeadbeef); + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); if (ret == 0 && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("GetPrivateProfileSectionNamesW is not implemented\n"); + win_skip("GetPrivateProfileSectionNamesW is not implemented\n"); DeleteFileA( testfile3 ); return; } @@ -249,11 +276,15 @@ ok( bufW[ret-1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Test with exactly fitting buffer */ + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 28, testfile3W ); ok( ret == 26, "expected return size 26, got %d\n", ret ); - ok( bufW[ret+1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); - + ok( (bufW[ret+1] == 0 && bufW[ret] == 0) || /* W2K3 and higher */ + broken(bufW[ret+1] == 0xcccc && bufW[ret] == 0), /* NT4, W2K, WinXP */ + "returned buffer not terminated with double-null\n" ); + /* Test with a buffer too small */ + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 27, testfile3W ); ok( ret == 25, "expected return size 25, got %d\n", ret ); ok( bufW[ret+1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); @@ -346,8 +377,11 @@ ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); ret = GetPrivateProfileStringA(SECTION, KEY, NULL, buffer, MAX_PATH, testfile2); + /* Win9x and WinME returns 0 for all cases except the first one */ if (!pe[i].read_error) - ok( ret, "%d: GetPrivateProfileString failed with error %u\n", i, GetLastError() ); + ok( ret || + broken(!ret && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "%d: GetPrivateProfileString failed with error %u\n", i, GetLastError() ); else ok( !ret, "%d: GetPrivateProfileString succeeded\n", i ); CloseHandle(h); @@ -355,7 +389,7 @@ ok( DeleteFile(testfile2), "delete failed\n" ); } -static void test_profile_delete_on_close() +static void test_profile_delete_on_close(void) { static CHAR testfile[] = ".\\testwine5.ini"; HANDLE h; @@ -368,8 +402,11 @@ "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 123, "Got %d instead of 123\n", res); + ok( res == 123 || + broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ + "Got %d instead of 123\n", res); /* This also deletes the file */ CloseHandle(h); @@ -389,8 +426,11 @@ "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 123, "Got %d instead of 123\n", res); + ok( res == 123 || + broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ + "Got %d instead of 123\n", res); CloseHandle(h); @@ -402,8 +442,11 @@ "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); + SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); - ok( res == 124, "Got %d instead of 124\n", res); + ok( res == 124 || + broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "Got %d instead of 124\n", res); /* This also deletes the file */ CloseHandle(h); @@ -436,7 +479,7 @@ static void test_GetPrivateProfileString(const char *content, const char *descript) { - DWORD ret; + DWORD ret, len; CHAR buf[MAX_PATH]; CHAR def_val[MAX_PATH]; CHAR path[MAX_PATH]; @@ -450,6 +493,18 @@ trace("test_GetPrivateProfileStringA: %s\n", descript); + if(!lstrcmpA(descript, "CR only")) + { + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStringW(NULL, NULL, NULL, + NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Win9x and WinME don't handle 'CR only' correctly\n"); + return; + } + } + create_test_file(filename, content, lstrlenA(content)); /* Run this test series with caching. Wine won't cache profile @@ -457,14 +512,19 @@ Sleep(2500); /* lpAppName is NULL */ + memset(buf, 0xc, sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, MAX_PATH, filename); - ok(ret == 18, "Expected 18, got %d\n", ret); - ok(!memcmp(buf, "section1\0section2\0", ret + 1), - "Expected \"section1\\0section2\\0\", got \"%s\"\n", buf); + ok(ret == 18 || + broken(ret == 19), /* Win9x and WinME */ + "Expected 18, got %d\n", ret); + len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0\0", len), + "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ + memset(buf, 0xc, sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(emptystr, "name1", "default", buf, MAX_PATH, filename); @@ -473,6 +533,7 @@ ok(emptystr_ok(emptystr), "AppName modified\n"); /* lpAppName is missing */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("notasection", "name1", "default", buf, MAX_PATH, filename); @@ -480,22 +541,27 @@ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpAppName is empty, lpDefault is NULL */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(emptystr, "name1", NULL, + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, "") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is empty, lpDefault is empty */ + memset(buf, 0xc,sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(emptystr, "name1", "", buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); ok(emptystr_ok(emptystr), "AppName modified\n"); - /* lpAppName is empty, lpDefault is empty */ - lstrcpyA(buf, "kumquat"); - ret = GetPrivateProfileStringA(emptystr, "name1", "", - buf, MAX_PATH, filename); - ok(ret == 0, "Expected 0, got %d\n", ret); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(emptystr_ok(emptystr), "AppName modified\n"); - /* lpAppName is empty, lpDefault has trailing blank characters */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "default "); @@ -506,6 +572,7 @@ ok(emptystr_ok(emptystr), "AppName modified\n"); /* lpAppName is empty, many blank characters in lpDefault */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "one two "); @@ -516,6 +583,7 @@ ok(emptystr_ok(emptystr), "AppName modified\n"); /* lpAppName is empty, blank character but not trailing in lpDefault */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(emptystr, "name1", "one two", buf, MAX_PATH, filename); @@ -524,6 +592,7 @@ ok(emptystr_ok(emptystr), "AppName modified\n"); /* lpKeyName is NULL */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", NULL, "default", buf, MAX_PATH, filename); @@ -532,6 +601,7 @@ "Expected \"name1\\0name2\\0name4\\0\", got \"%s\"\n", buf); /* lpKeyName is empty */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", emptystr, "default", buf, MAX_PATH, filename); @@ -540,6 +610,7 @@ ok(emptystr_ok(emptystr), "KeyName modified\n"); /* lpKeyName is missing */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "notakey", "default", buf, MAX_PATH, filename); @@ -547,22 +618,27 @@ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpKeyName is empty, lpDefault is NULL */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", emptystr, NULL, + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, "") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "KeyName modified\n"); + + /* lpKeyName is empty, lpDefault is empty */ + memset(buf, 0xc,sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", emptystr, "", buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); ok(emptystr_ok(emptystr), "KeyName modified\n"); - /* lpKeyName is empty, lpDefault is empty */ - lstrcpyA(buf, "kumquat"); - ret = GetPrivateProfileStringA("section1", emptystr, "", - buf, MAX_PATH, filename); - ok(ret == 0, "Expected 0, got %d\n", ret); - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(emptystr_ok(emptystr), "KeyName modified\n"); - /* lpKeyName is empty, lpDefault has trailing blank characters */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ lstrcpyA(def_val, "default "); @@ -580,13 +656,19 @@ } /* lpFileName is NULL */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, MAX_PATH, NULL); - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(ret == 7 || + broken(ret == 0), /* Win9x, WinME */ + "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default") || + broken(!lstrcmpA(buf, "kumquat")), /* Win9x, WinME */ + "Expected \"default\", got \"%s\"\n", buf); /* lpFileName is empty */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, MAX_PATH, ""); @@ -594,6 +676,7 @@ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpFileName is nonexistent */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, MAX_PATH, "nonexistent"); @@ -601,6 +684,7 @@ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* nSize is 0 */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, 0, filename); @@ -608,6 +692,7 @@ ok(!lstrcmpA(buf, "kumquat"), "Expected buf to be unchanged, got \"%s\"\n", buf); /* nSize is exact size of output */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, 4, filename); @@ -615,6 +700,7 @@ ok(!lstrcmpA(buf, "val"), "Expected \"val\", got \"%s\"\n", buf); /* nSize has room for NULL terminator */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, 5, filename); @@ -622,6 +708,7 @@ ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); /* output is 1 character */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name4", "default", buf, MAX_PATH, filename); @@ -629,6 +716,7 @@ ok(!lstrcmpA(buf, "a"), "Expected \"a\", got \"%s\"\n", buf); /* output is 1 character, no room for NULL terminator */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name4", "default", buf, 1, filename); @@ -636,22 +724,30 @@ ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* lpAppName is NULL, not enough room for final section name */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); - ok(!memcmp(buf, "section1\0secti\0", ret + 1), - "Expected \"section1\\0secti\\0\", got \"%s\"\n", buf); + len = lstrlenA("section1") + 2 * sizeof(CHAR); + todo_wine + ok(!memcmp(buf, "section1\0secti\0\0", ret + 2) || + broken(!memcmp(buf, "section1\0\0", len)), /* Win9x, WinME */ + "Expected \"section1\\0secti\\0\\0\", got \"%s\"\n", buf); /* lpKeyName is NULL, not enough room for final key name */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", NULL, "default", buf, 16, filename); ok(ret == 14, "Expected 14, got %d\n", ret); - ok(!memcmp(buf, "name1\0name2\0na\0", ret + 1), - "Expected \"name1\\0name2\\0na\\0\", got \"%s\"\n", buf); + todo_wine + ok(!memcmp(buf, "name1\0name2\0na\0\0", ret + 2) || + broken(!memcmp(buf, "name1\0name2\0n\0\0", ret + 1)), /* Win9x, WinME */ + "Expected \"name1\\0name2\\0na\\0\\0\", got \"%s\"\n", buf); /* key value has quotation marks which are stripped */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name2", "default", buf, MAX_PATH, filename); @@ -659,6 +755,7 @@ ok(!lstrcmpA(buf, "val2"), "Expected \"val2\", got \"%s\"\n", buf); /* case does not match */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "NaMe1", "default", buf, MAX_PATH, filename); @@ -666,6 +763,7 @@ ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); /* only filename is used */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "NaMe1", "default", buf, MAX_PATH, "winetest.ini"); @@ -673,11 +771,19 @@ ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); GetWindowsDirectoryA(windir, MAX_PATH); - GetTempFileNameA(windir, "pre", 0, path); + SetLastError(0xdeadbeef); + ret = GetTempFileNameA(windir, "pre", 0, path); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not allowed to create a file in the Windows directory\n"); + DeleteFileA(filename); + return; + } tempfile = strrchr(path, '\\') + 1; create_test_file(path, content, lstrlenA(content)); /* only filename is used, file exists in windows directory */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "NaMe1", "default", buf, MAX_PATH, tempfile); @@ -685,6 +791,7 @@ ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); /* successful case */ + memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "name1", "default", buf, MAX_PATH, filename); @@ -693,6 +800,227 @@ DeleteFileA(path); DeleteFileA(filename); +} + +static DWORD timeout = 0; + +static BOOL check_file_data(LPCSTR path, LPCSTR data) +{ + HANDLE file; + CHAR buf[MAX_PATH]; + DWORD size; + BOOL ret; + + /* Sleep() is needed on Win9x and WinME */ + if (timeout) + Sleep(timeout); + + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + size = GetFileSize(file, NULL); + buf[size] = '\0'; + ret = ReadFile(file, buf, size, &size, NULL); + CloseHandle(file); + if (!ret) + return FALSE; + + if (!*data && size != 0) + return FALSE; + + return !lstrcmpA(buf, data); +} + +static void test_WritePrivateProfileString(void) +{ + BOOL ret; + LPCSTR data; + CHAR path[MAX_PATH]; + CHAR temp[MAX_PATH]; + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + DeleteFileA(path); + + /* path is not created yet */ + + /* NULL lpAppName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + if (GetLastError() == 0xdeadbeef) + timeout = 1000; + ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, + "Expected path to not exist\n"); + + GetTempFileNameA(temp, "wine", 0, path); + + /* NULL lpAppName, path exists */ + data = ""; + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA(NULL, "key", "string", path); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ + broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + + if (0) + { + /* empty lpAppName, crashes on NT4 and higher */ + data = "[]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("", "key", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + } + + /* NULL lpKeyName */ + data = ""; + ret = WritePrivateProfileStringA("App", NULL, "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + + if (0) + { + /* empty lpKeyName, crashes on NT4 and higher */ + data = "[App]\r\n" + "=string\r\n"; + ret = WritePrivateProfileStringA("App", "", "string", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data), "File doesn't match\n"); + } + DeleteFileA(path); + } + + /* NULL lpString */ + data = ""; + ret = WritePrivateProfileStringA("App", "key", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + todo_wine + { + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); + } + DeleteFileA(path); + + /* empty lpString */ + data = "[App]\r\n" + "key=\r\n"; + ret = WritePrivateProfileStringA("App", "key", "", path); + ok(ret == TRUE || + broken(!ret), /* Win9x and WinME */ + "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data) || + (broken(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES)), /* Win9x and WinME */ + "File doesn't match\n"); + DeleteFileA(path); + + /* empty lpFileName */ + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringA("App", "key", "string", ""); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_ACCESS_DENIED || + broken(GetLastError() == ERROR_PATH_NOT_FOUND), /* Win9x and WinME */ + "Expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* The resulting file will be X:\\%WINDIR%\\win1.tmp */ + GetWindowsDirectoryA(temp, MAX_PATH); + GetTempFileNameA(temp, "win", 1, path); + DeleteFileA(path); + + /* relative path in lpFileName */ + data = "[App]\r\n" + "key=string\r\n"; + ret = WritePrivateProfileStringA("App", "key", "string", "win1.tmp"); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + DeleteFileA(path); + + GetTempPathA(MAX_PATH, temp); + GetTempFileNameA(temp, "wine", 0, path); + + /* build up an INI file */ + WritePrivateProfileStringA("App1", "key1", "string1", path); + WritePrivateProfileStringA("App1", "key2", "string2", path); + WritePrivateProfileStringA("App1", "key3", "string3", path); + WritePrivateProfileStringA("App2", "key4", "string4", path); + + /* make an addition and verify the INI */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key2=string2\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", "string5", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + /* lpString is NULL, key2 key is deleted */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + /* try to delete key2 again */ + data = "[App1]\r\n" + "key1=string1\r\n" + "key3=string3\r\n" + "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", "key2", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + /* lpKeyName is NULL, App1 section is deleted */ + data = "[App2]\r\n" + "key4=string4\r\n" + "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App1", NULL, "string1", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + /* lpString is not needed to delete a section */ + data = "[App3]\r\n" + "key5=string5\r\n"; + ret = WritePrivateProfileStringA("App2", NULL, NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + /* leave just the section */ + data = "[App3]\r\n"; + ret = WritePrivateProfileStringA("App3", "key5", NULL, path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + DeleteFileA(path); } START_TEST(profile) @@ -720,4 +1048,5 @@ "name4=a\r" "[section2]\r", "CR only"); -} + test_WritePrivateProfileString(); +}

1 0

[cwittich] 40488: James Hawkins : kernel32: Handle writing empty sections and keys in WritePrivateProfileString.
by cwittich＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cwittich Date: Mon Apr 13 22:53:56 2009 New Revision: 40488 URL: http://svn.reactos.org/svn/reactos?rev=40488&view=rev Log: James Hawkins : kernel32: Handle writing empty sections and keys in WritePrivateProfileString. Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Mon Apr 13 22:53:56 2009 @@ -213,31 +213,31 @@ for ( ; section; section = section->next) { - int len = 0; - - if (section->name[0]) len += wcslen(section->name) + 6; + int len = 4; + + if (section->name[0]) len += wcslen(section->name); for (key = section->key; key; key = key->next) { - len += wcslen(key->name) + 2; - if (key->value) len += wcslen(key->value) + 1; + len += wcslen(key->name); + if (key->value && key->value[0]) len += wcslen(key->value); + len += 3; /* '=' and "\r\n" */ } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) return; p = buffer; + *p++ = '['; if (section->name[0]) { - *p++ = '\r'; - *p++ = '\n'; - *p++ = '['; wcscpy( p, section->name ); p += wcslen(p); - *p++ = ']'; - *p++ = '\r'; - *p++ = '\n'; - } + } + *p++ = ']'; + *p++ = '\r'; + *p++ = '\n'; + for (key = section->key; key; key = key->next) { wcscpy( p, key->name ); @@ -607,12 +607,20 @@ int seclen, keylen; while (PROFILE_isspaceW(*section_name)) section_name++; - p = section_name + wcslen(section_name) - 1; + if (*section_name) + p = section_name + wcslen(section_name) - 1; + else + p = section_name; + while ((p > section_name) && PROFILE_isspaceW(*p)) p--; seclen = p - section_name + 1; while (PROFILE_isspaceW(*key_name)) key_name++; - p = key_name + wcslen(key_name) - 1; + if (*key_name) + p = key_name + wcslen(key_name) - 1; + else + p = key_name; + while ((p > key_name) && PROFILE_isspaceW(*p)) p--; keylen = p - key_name + 1;

1 0

[gschneider] 40487: - Deactivate unneeded debug prints, change DbgPrint to DPRINTx, remove unused performance checks, formatting - no functional changes
by gschneider＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: gschneider Date: Mon Apr 13 21:51:50 2009 New Revision: 40487 URL: http://svn.reactos.org/svn/reactos?rev=40487&view=rev Log: - Deactivate unneeded debug prints, change DbgPrint to DPRINTx, remove unused performance checks, formatting - no functional changes Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Apr 13 21:51:50 2009 @@ -971,7 +971,7 @@ LPWSTR p = NULL; DWORD ret; UINT c; - DPRINT1("GetGlyphOutlineA uChar %x\n", uChar); + DPRINT("GetGlyphOutlineA uChar %x\n", uChar); if(!(uFormat & GGO_GLYPH_INDEX)) { int len; char mbchs[2]; @@ -984,7 +984,7 @@ mbchs[0] = (uChar & 0xff); } p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); - c = p[0]; + c = p[0]; } else c = uChar; ret = NtGdiGetGlyphOutline(hdc, c, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); @@ -1008,7 +1008,7 @@ CONST MAT2 *lpmat2 ) { - DPRINT("GetGlyphOutlineW uChar %x\n", uChar); + DPRINT("GetGlyphOutlineW uChar %x\n", uChar); if (!lpgm & !lpmat2) return GDI_ERROR; if (!lpvBuffer) cbBuffer = 0; return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Apr 13 21:51:50 2009 @@ -75,8 +75,6 @@ static BOOL RenderingEnabled = TRUE; #define MAX_FONT_CACHE 256 -UINT Hits; -UINT Misses; typedef struct _FONT_CACHE_ENTRY { @@ -1322,8 +1320,6 @@ PLIST_ENTRY CurrentEntry; PFONT_CACHE_ENTRY FontEntry; -// DbgPrint("CacheGet\n"); - CurrentEntry = FontCacheListHead.Flink; while (CurrentEntry != &FontCacheListHead) { @@ -1337,29 +1333,11 @@ if (CurrentEntry == &FontCacheListHead) { -// DbgPrint("Miss! %x\n", FontEntry->Glyph); - /* - Misses++; - if (Misses>100) { - DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); - Hits = Misses = 0; - } - */ return NULL; } RemoveEntryList(CurrentEntry); InsertHeadList(&FontCacheListHead, CurrentEntry); - -// DbgPrint("Hit! %x\n", FontEntry->Glyph); - /* - Hits++; - - if (Hits>100) { - DbgPrint ("Hits: %d Misses: %d\n", Hits, Misses); - Hits = Misses = 0; - } - */ return FontEntry->Glyph; } @@ -1375,25 +1353,23 @@ INT error; PFONT_CACHE_ENTRY NewEntry; -// DbgPrint("CacheSet.\n"); - error = FT_Get_Glyph(GlyphSlot, &GlyphCopy); if (error) { - DbgPrint("Failure caching glyph.\n"); + DPRINT1("Failure caching glyph.\n"); return NULL; }; error = FT_Glyph_To_Bitmap(&GlyphCopy, RenderMode, 0, 1); if (error) { - DbgPrint("Failure rendering glyph.\n"); + DPRINT1("Failure rendering glyph.\n"); return NULL; }; NewEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_CACHE_ENTRY), TAG_FONT); if (!NewEntry) { - DbgPrint("Alloc failure caching glyph.\n"); + DPRINT1("Alloc failure caching glyph.\n"); FT_Done_Glyph(GlyphCopy); return NULL; } @@ -1412,8 +1388,6 @@ ExFreePool(NewEntry); FontCacheNumEntries--; } - -// DbgPrint("Returning the glyphcopy: %x\n", GlyphCopy); return GlyphCopy; } @@ -3457,8 +3431,6 @@ goto fail; } } -// DbgPrint("realglyph: %x\n", realglyph); -// DbgPrint("TextLeft: %d\n", TextLeft); /* retrieve kerning distance and move pen position */ if (use_kerning && previous && glyph_index && NULL == Dx) @@ -3467,12 +3439,12 @@ FT_Get_Kerning(face, previous, glyph_index, 0, &delta); TextLeft += delta.x; } -// DPRINT1("TextLeft: %d\n", TextLeft); -// DPRINT1("TextTop: %d\n", TextTop); + DPRINT("TextLeft: %d\n", TextLeft); + DPRINT("TextTop: %d\n", TextTop); if (realglyph->format == ft_glyph_format_outline) { - DbgPrint("Should already be done\n"); + DPRINT1("Should already be done\n"); // error = FT_Render_Glyph(glyph, RenderMode); error = FT_Glyph_To_Bitmap(&realglyph, RenderMode, 0, 0); if (error) @@ -3483,8 +3455,7 @@ } realglyph2 = (FT_BitmapGlyph)realglyph; -// DPRINT1("Pitch: %d\n", pitch); -// DPRINT1("Advance: %d\n", realglyph->advance.x); + DPRINT("Advance: %d\n", realglyph->advance.x); if (fuOptions & ETO_OPAQUE) { @@ -3586,12 +3557,12 @@ if (NULL == Dx) { TextLeft += realglyph->advance.x >> 10; -// DbgPrint("new TextLeft: %d\n", TextLeft); + DPRINT("new TextLeft: %d\n", TextLeft); } else { TextLeft += Dx[i<<DxShift] << 6; -// DbgPrint("new TextLeft2: %d\n", TextLeft); + DPRINT("new TextLeft2: %d\n", TextLeft); } if (DxShift)

1 0

[dchapyshev] 40486: - More correct fix of tests
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 21:13:35 2009 New Revision: 40486 URL: http://svn.reactos.org/svn/reactos?rev=40486&view=rev Log: - More correct fix of tests Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Mon Apr 13 21:13:35 2009 @@ -1252,6 +1252,7 @@ WINAPI IsValidCodePage(UINT CodePage) { + if (CodePage == 0) return FALSE; if (CodePage == CP_UTF8 || CodePage == CP_UTF7) return TRUE; if (IntGetLoadedCodePageEntry(CodePage)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 21:13:35 2009 @@ -2970,22 +2970,16 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (Request->Data.SetConsoleCodePage.CodePage == 0) - { - ConioUnlockConsole(Console); - return STATUS_INVALID_PARAMETER; - } - else - { - if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) + + if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) { Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } - } + ConioUnlockConsole(Console); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER; } CSR_API(CsrGetConsoleOutputCodePage) @@ -3023,22 +3017,16 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (Request->Data.SetConsoleOutputCodePage.CodePage == 0) - { - ConioUnlockConsole(Console); - return STATUS_INVALID_PARAMETER; - } - else - { - if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) + + if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) { Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } - } + ConioUnlockConsole(Console); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_PARAMETER; } CSR_API(CsrGetProcessList)

1 0

[sedwards] 40485: add telnet service, enable it by default
by sedwards＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: sedwards Date: Mon Apr 13 20:26:49 2009 New Revision: 40485 URL: http://svn.reactos.org/svn/reactos?rev=40485&view=rev Log: add telnet service, enable it by default Modified: trunk/reactos/base/services/services.rbuild trunk/reactos/base/services/telnetd/serviceentry.c trunk/reactos/base/services/telnetd/telnetd.c trunk/reactos/base/services/telnetd/telnetd.rbuild trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -22,6 +22,9 @@ <directory name="tcpsvcs"> <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> </directory> + <directory name="telnetd"> + <xi:include href="telnetd/telnetd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Modified: trunk/reactos/base/services/telnetd/serviceentry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/serv… ============================================================================== --- trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/serviceentry.c [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -15,19 +15,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 + #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include "wine/debug.h" -#define WINE_FIXME printf -#define WINE_TRACE printf +WINE_DEFAULT_DEBUG_CHANNEL(telnetd); -//#include "wine/debug.h" - -//WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); - -static WCHAR telnetdW[] = {'T','e','l','n','e','t','D',0}; +static WCHAR telnetdW[] = {'t','e','l','n','e','t','d',0}; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; @@ -106,6 +102,5 @@ StartServiceCtrlDispatcherW(servtbl); return 0; } -#endif /* EOF */ Modified: trunk/reactos/base/services/telnetd/telnetd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… ============================================================================== --- trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/telnetd.c [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -45,7 +45,7 @@ * rename this function * int kickoff_telnetd(void) */ -int main(int argc, char **argv) +int kickoff_telnetd(void) { printf("Attempting to start Simple TelnetD\n"); Modified: trunk/reactos/base/services/telnetd/telnetd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/teln… ============================================================================== --- trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/telnetd/telnetd.rbuild [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -6,6 +6,7 @@ <library>kernel32</library> <library>advapi32</library> <library>ws2_32</library> + <library>wine</library> <file>telnetd.c</file> <file>serviceentry.c</file> Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -1061,6 +1061,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 +; ReactOS Telnet Daemon +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Description",0x00000000,"ReactOS Telnet Daemon" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","DisplayName",0x00000000,"ReactOS Telnet Daemon" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","ImagePath",0x00020000,"%SystemRoot%\system32\telnetd.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\telnetd","Type",0x00010001,0x00000020 + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 20:26:49 2009 @@ -90,6 +90,7 @@ base\services\rpcss\rpcss.exe 1 base\services\spoolsv\spoolsv.exe 1 base\services\tcpsvcs\tcpsvcs.exe 1 +base\services\telnetd\telnetd.exe 1 base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 base\services\wlansvc\wlansvc.exe 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs