Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cwittich] 40733: sync shell32_winetest with wine 1.1.20

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Apr 29 19:11:22 2009 New Revision: 40733 URL: http://svn.reactos.org/svn/reactos?rev=40733&view=rev Log: sync shell32_winetest with wine 1.1.20 Added: trunk/rostests/winetests/shell32/appbar.c (with props) trunk/rostests/winetests/shell32/autocomplete.c (with props) trunk/rostests/winetests/shell32/rsrc.rc (with props) trunk/rostests/winetests/shell32/shfldr_special.c (with props) Modified: trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shell32/shell32.rbuild trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/shell32/appbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/appbar.… Added: trunk/rostests/winetests/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/autocom… Modified: trunk/rostests/winetests/shell32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/generat… Added: trunk/rostests/winetests/shell32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/rsrc.rc… Modified: trunk/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Added: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…

15 years, 9 months

[cwittich] 40732: sync shlwapi_winetest with wine 1.1.20

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Apr 29 18:59:03 2009 New Revision: 40732 URL: http://svn.reactos.org/svn/reactos?rev=40732&view=rev Log: sync shlwapi_winetest with wine 1.1.20 Modified: trunk/rostests/winetests/shlwapi/ordinal.c trunk/rostests/winetests/shlwapi/path.c trunk/rostests/winetests/shlwapi/shreg.c trunk/rostests/winetests/shlwapi/string.c Modified: trunk/rostests/winetests/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal… ============================================================================== --- trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/ordinal.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -380,7 +380,9 @@ } psd = pGetShellSecurityDescriptor(NULL, 2); - ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL || + broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ + "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); @@ -390,6 +392,11 @@ { /* The previous calls to GetShellSecurityDescriptor don't set the last error */ win_skip("GetShellSecurityDescriptor is not implemented\n"); + return; + } + if (psd==INVALID_HANDLE_VALUE) + { + win_skip("GetShellSecurityDescriptor is broken on IE5\n"); return; } ok(psd!=NULL, "GetShellSecurityDescriptor failed\n"); @@ -464,7 +471,7 @@ HRESULT hres; if(!pSHPackDispParams) - skip("SHPackSidpParams not available\n"); + win_skip("SHPackSidpParams not available\n"); memset(&params, 0xc0, sizeof(params)); memset(vars, 0xc0, sizeof(vars)); @@ -475,7 +482,7 @@ ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); ok(params.rgvarg == vars, "params.rgvarg = %p\n", params.rgvarg); ok(V_VT(vars) == VT_I4, "V_VT(var) = %d\n", V_VT(vars)); - ok(V_DISPATCH(vars) == (void*)0xdeadbeef, "failed\n"); + ok(V_I4(vars) == 0xdeadbeef, "failed %x\n", V_I4(vars)); memset(&params, 0xc0, sizeof(params)); hres = pSHPackDispParams(&params, NULL, 0, 0); Modified: trunk/rostests/winetests/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?… ============================================================================== --- trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/path.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -392,8 +392,12 @@ /* Some NULL */ wszString2[0] = 'a'; wszString = pPathCombineW(wszString2, NULL, NULL); - ok (wszString == NULL, "Expected a NULL return\n"); - ok (wszString2[0] == 0, "Destination string not empty\n"); + ok (wszString == NULL || + broken(wszString[0] == 'a'), /* Win95 and some W2K */ + "Expected a NULL return\n"); + ok (wszString2[0] == 0 || + broken(wszString2[0] == 'a'), /* Win95 and some W2K */ + "Destination string not empty\n"); HeapFree(GetProcessHeap(), 0, wszString2); @@ -406,7 +410,9 @@ wszString = pPathCombineW(wbuf, wstr1, wstr2); ok(wszString == NULL, "Expected a NULL return\n"); - ok(wbuf[0] == 0, "Buffer contains data\n"); + ok(wbuf[0] == 0 || + broken(wbuf[0] == 0xbfbf), /* Win95 and some W2K */ + "Buffer contains data\n"); /* PathCombineW can be used in place */ wstr1[3] = 0; @@ -465,7 +471,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, "", ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "control")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory */ @@ -481,15 +489,23 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, ""); ok(str == dest, "Expected str == dest, got %p\n", str); - ok(!lstrcmp(str, "\\"), "Expected \\, got %s\n", str); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(!lstrcmp(str, "\\") || + broken(!lstrcmp(str, "one\\two\\three")), /* Win95 and some W2K */ + "Expected \\, got %s\n", str); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win95 */ + "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try NULL directory and file part */ SetLastError(0xdeadbeef); lstrcpyA(dest, "control"); str = PathCombineA(dest, NULL, NULL); - ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(str == NULL || + broken(str != NULL), /* Win95 and some W2K */ + "Expected str == NULL, got %p\n", str); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try directory without backslash */ @@ -577,7 +593,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, "C:\\", too_long); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); /* try a directory longer than MAX_PATH */ @@ -585,7 +603,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, too_long, "one\\two\\three"); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); memset(one, 'b', HALF_LEN); @@ -598,7 +618,9 @@ lstrcpyA(dest, "control"); str = PathCombineA(dest, one, two); ok(str == NULL, "Expected str == NULL, got %p\n", str); - ok(lstrlenA(dest) == 0, "Expected 0 length, got %i\n", lstrlenA(dest)); + ok(lstrlenA(dest) == 0 || + broken(!lstrcmp(dest, "control")), /* Win95 and some W2K */ + "Expected 0 length, got %i\n", lstrlenA(dest)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -764,7 +786,9 @@ res = PathAppendA(too_long, "two\\three"); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(too_long) == 0, "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); + ok(lstrlen(too_long) == 0 || + broken(lstrlen(too_long) == (LONG_LEN - 1)), /* Win95 and some W2K */ + "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); /* pszMore is too long */ lstrcpy(path, "C:\\one"); @@ -774,7 +798,9 @@ res = PathAppendA(path, too_long); ok(!res, "Expected failure\n"); todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(lstrlen(path) == 0, "Expected length of path to be zero, got %i\n", lstrlen(path)); + ok(lstrlen(path) == 0 || + broken(!lstrcmp(path, "C:\\one")), /* Win95 and some W2K */ + "Expected length of path to be zero, got %i\n", lstrlen(path)); /* both params combined are too long */ memset(one, 'a', HALF_LEN); @@ -784,7 +810,9 @@ SetLastError(0xdeadbeef); res = PathAppendA(one, two); ok(!res, "Expected failure\n"); - ok(lstrlen(one) == 0, "Expected length of one to be zero, got %i\n", lstrlen(one)); + ok(lstrlen(one) == 0 || + broken(lstrlen(one) == (HALF_LEN - 1)), /* Win95 and some W2K */ + "Expected length of one to be zero, got %i\n", lstrlen(one)); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } @@ -810,7 +838,9 @@ res = PathCanonicalizeA(dest, ""); ok(res, "Expected success\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(!lstrcmp(dest, "\\"), "Expected \\, got %s\n", dest); + ok(!lstrcmp(dest, "\\") || + broken(!lstrcmp(dest, "test")), /* Win95 and some W2K */ + "Expected \\, got %s\n", dest); /* try a NULL dest */ SetLastError(0xdeadbeef); @@ -903,7 +933,9 @@ lstrcpy(dest, "test"); SetLastError(0xdeadbeef); res = PathCanonicalizeA(dest, too_long); - ok(!res, "Expected failure\n"); + ok(!res || + broken(res), /* Win95, some W2K and XP-SP1 */ + "Expected failure\n"); todo_wine { ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_FILENAME_EXCED_RANGE /* Vista */, Modified: trunk/rostests/winetests/shlwapi/shreg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/shreg.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/shreg.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -122,8 +122,12 @@ dwType = -1; dwRet = SHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &dwType, buf, &dwSize); ok( ERROR_SUCCESS == dwRet, "SHGetValueA failed, ret=%u\n", dwRet); - ok( 0 == strcmp(sExpTestpath1, buf), "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); - ok( REG_SZ == dwType, "Expected REG_SZ, got (%u)\n", dwType); + ok( 0 == strcmp(sExpTestpath1, buf) || + broken(0 == strcmp(sTestpath1, buf)), /* IE4.x */ + "Comparing of (%s) with (%s) failed\n", buf, sExpTestpath1); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* IE4.x */ + "Expected REG_SZ, got (%u)\n", dwType); strcpy(buf, sEmptyBuffer); dwSize = MAX_PATH; @@ -196,7 +200,9 @@ dwSize = 6; dwRet = SHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE4.x */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); /* * Case 1 string shrinks during expanding @@ -208,7 +214,9 @@ ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); ok( dwSize == nUsedBuffer1, "Buffer sizes (%u) and (%u) are not equal\n", dwSize, nUsedBuffer1); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -220,8 +228,12 @@ dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); ok( 0 == strcmp(sEmptyBuffer, buf) , "Comparing (%s) with (%s) failed\n", buf, sEmptyBuffer); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); - ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* < IE6 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( REG_SZ == dwType || + broken(REG_EXPAND_SZ == dwType), /* < IE6 */ + "Expected REG_SZ, got (%u)\n", dwType); /* * string grows during expanding @@ -233,7 +245,10 @@ dwSize = strlen(sEnvvar2) - 2; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5*/ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { @@ -241,7 +256,9 @@ "Expected empty or unexpanded string (win98), got (%s)\n", buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen("") + 1)), /* < IE 5.5 */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -254,15 +271,22 @@ dwSize = nExpLen2 - 4; dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, buf, &dwSize); - ok( ERROR_MORE_DATA == dwRet, "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); + ok( ERROR_MORE_DATA == dwRet || + broken(ERROR_ENVVAR_NOT_FOUND == dwRet) || /* IE5.5 */ + broken(ERROR_SUCCESS == dwRet), /* < IE5.5 */ + "Expected ERROR_MORE_DATA, got (%u)\n", dwRet); todo_wine { - ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)), - "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); + ok( (0 == strcmp("", buf)) || (0 == strcmp(sEnvvar2, buf)) || + broken(0 == strcmp(sTestpath2, buf)), /* IE 5.5 */ + "Expected empty or first part of the string \"%s\", got \"%s\"\n", sEnvvar2, buf); } - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sEnvvar2) + 1)) || /* IE4.01 SP1 (W98) and IE5 (W98SE) */ + broken(dwSize == (strlen("") + 1)), /* IE4.01 (NT4) and IE5.x (W2K) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); /* @@ -273,7 +297,9 @@ dwType = -1; dwRet = SHQueryValueExA( hKey, "Test3", NULL, &dwType, NULL, &dwSize); ok( ERROR_SUCCESS == dwRet, "%s failed, ret=%u\n", sTestedFunction, dwRet); - ok( dwSize >= nUsedBuffer2, "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); + ok( dwSize >= nUsedBuffer2 || + broken(dwSize == (strlen(sTestpath2) + 1)), /* IE4.01 SP1 (Win98) */ + "Buffer size (%u) should be >= (%u)\n", dwSize, nUsedBuffer2); ok( REG_SZ == dwType , "Expected REG_SZ, got (%u)\n", dwType); RegCloseKey(hKey); Modified: trunk/rostests/winetests/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/string.… ============================================================================== --- trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/string.c [iso-8859-1] Wed Apr 29 18:59:03 2009 @@ -504,7 +504,7 @@ if (!pStrFormatByteSize64A) { - skip("StrFormatByteSize64A() is not available. Tests skipped\n"); + win_skip("StrFormatByteSize64A() is not available\n"); return; } @@ -528,7 +528,7 @@ if (!pStrFormatKBSizeW) { - skip("StrFormatKBSizeW() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeW() is not available\n"); return; } @@ -550,7 +550,7 @@ if (!pStrFormatKBSizeA) { - skip("StrFormatKBSizeA() is not available. Tests skipped\n"); + win_skip("StrFormatKBSizeA() is not available\n"); return; } @@ -596,7 +596,7 @@ ok(!pStrIsIntlEqualA(TRUE, str1, str2, 5), "StrIsIntlEqualA(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualA() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualA() is not available\n"); if (pIntlStrEqWorkerA) { @@ -604,7 +604,7 @@ ok(!pIntlStrEqWorkerA(TRUE, str1, str2, 5), "pIntlStrEqWorkerA(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerA() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerA() is not available\n"); } static void test_StrCmpW(void) @@ -623,7 +623,7 @@ ok(!pStrIsIntlEqualW(TRUE, str1, str2, 5), "StrIsIntlEqualW(TRUE,...) isn't case-sensitive\n"); } else - skip("StrIsIntlEqualW() is not available. Tests skipped\n"); + win_skip("StrIsIntlEqualW() is not available\n"); if (pIntlStrEqWorkerW) { @@ -631,7 +631,7 @@ ok(!pIntlStrEqWorkerW(TRUE, str1, str2, 5), "IntlStrEqWorkerW(TRUE,...) isn't case-sensitive\n"); } else - skip("IntlStrEqWorkerW() is not available. Tests skipped\n"); + win_skip("IntlStrEqWorkerW() is not available\n"); } static WCHAR *CoDupStrW(const char* src) @@ -652,7 +652,7 @@ if (!pStrRetToBSTR) { - skip("StrRetToBSTR() is not available. Tests skipped\n"); + win_skip("StrRetToBSTR() is not available\n"); return; } @@ -690,7 +690,7 @@ if (!pStrCpyNXA) { - skip("StrCpyNXA() is not available. Tests skipped\n"); + win_skip("StrCpyNXA() is not available\n"); return; } @@ -711,7 +711,7 @@ if (!pStrCpyNXW) { - skip("StrCpyNXW() is not available. Tests skipped\n"); + win_skip("StrCpyNXW() is not available\n"); return; } @@ -768,7 +768,7 @@ if (!pSHAnsiToAnsi) { - skip("SHAnsiToAnsi() is not available. Tests skipped\n"); + win_skip("SHAnsiToAnsi() is not available\n"); return; } @@ -789,7 +789,7 @@ if (!pSHUnicodeToUnicode) { - skip("SHUnicodeToUnicode() is not available. Tests skipped\n"); + win_skip("SHUnicodeToUnicode() is not available\n"); return; } @@ -829,7 +829,7 @@ expect_eq(buf[100], '\xbf', CHAR, "%x"); } else - skip("StrCatBuffA() is not available. Tests skipped\n"); + win_skip("StrCatBuffA() is not available\n"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, wstr1, 10), wbuf, PWCHAR, "%p"); @@ -843,7 +843,7 @@ expect_eq(wbuf[100], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrCatBuffW() is not available. Tests skipped\n"); + win_skip("StrCatBuffW() is not available\n"); if (pStrRetToBufW) { @@ -855,7 +855,7 @@ expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("StrRetToBufW() is not available. Tests skipped\n"); + win_skip("StrRetToBufW() is not available\n"); if (pStrRetToBufA) { @@ -867,7 +867,7 @@ expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("StrRetToBufA() is not available. Tests skipped\n"); + win_skip("StrRetToBufA() is not available\n"); if (pwnsprintfA) { @@ -878,7 +878,7 @@ expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } else - skip("wnsprintfA() is not available. Tests skipped\n"); + win_skip("wnsprintfA() is not available\n"); if (pwnsprintfW) { @@ -889,7 +889,7 @@ expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } else - skip("wnsprintfW() is not available. Tests skipped\n"); + win_skip("wnsprintfW() is not available\n"); } START_TEST(string)

15 years, 9 months

[gedmurphy] 40731: - Add a temporary manifest to servman which contains support for comctl32 v6 and more importantly, support for UAC elevation in NT6+ This will be required for any app which needs to run with elevated privs. As we've previously stated, rbuild needs to generate the manifest hence this is only temporary. We therefore need a UAC tag adding to rbuild so the generated manifest can contain support for UAC elevation for any apps which require it. If anyone wishes to add this support t

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Apr 29 16:09:40 2009 New Revision: 40731 URL: http://svn.reactos.org/svn/reactos?rev=40731&view=rev Log: - Add a temporary manifest to servman which contains support for comctl32 v6 and more importantly, support for UAC elevation in NT6+ This will be required for any app which needs to run with elevated privs. As we've previously stated, rbuild needs to generate the manifest hence this is only temporary. We therefore need a UAC tag adding to rbuild so the generated manifest can contain support for UAC elevation for any apps which require it. If anyone wishes to add this support to rbuild, feel free to do so. Added: trunk/reactos/base/applications/mscutils/servman/manifest.xml (with props) Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc Added: trunk/reactos/base/applications/mscutils/servman/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/manifest.xml (added) +++ trunk/reactos/base/applications/mscutils/servman/manifest.xml [iso-8859-1] Wed Apr 29 16:09:40 2009 @@ -1,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8' standalone='yes'?> +<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> + <dependency> + <dependentAssembly> + <assemblyIdentity type='win32' + name='Microsoft.Windows.Common-Controls' + version='6.0.0.0' + processorArchitecture='X86' + publicKeyToken='6595b64144ccf1df' + language='*' /> + </dependentAssembly> + </dependency> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level='highestAvailable' uiAccess='false' /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Propchange: trunk/reactos/base/applications/mscutils/servman/manifest.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/servman.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rc [iso-8859-1] Wed Apr 29 16:09:40 2009 @@ -8,6 +8,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" #include <reactos/version.rc> +1 24 DISCARDABLE "manifest.xml" + #include "rsrc.rc"

15 years, 9 months

[gedmurphy] 40730: Fix the build and a fix mem leak. We should consider setting msvc to /W4.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Apr 29 14:18:41 2009 New Revision: 40730 URL: http://svn.reactos.org/svn/reactos?rev=40730&view=rev Log: Fix the build and a fix mem leak. We should consider setting msvc to /W4. Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Wed Apr 29 14:18:41 2009 @@ -16,7 +16,7 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; - SERVICE_STATUS_PROCESS ServiceStatus; + SERVICE_STATUS_PROCESS ServiceStatus = {0}; SERVICE_STATUS Status; DWORD BytesNeeded = 0; BOOL bRet = FALSE; Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Wed Apr 29 14:18:41 2009 @@ -197,8 +197,6 @@ DoInitDependsDialog(PSTOP_INFO pStopInfo, HWND hDlg) { - SC_HANDLE hSCManager; - SC_HANDLE hService; LPENUM_SERVICE_STATUS lpDependencies; DWORD dwCount; LPTSTR lpPartialStr, lpStr; @@ -277,6 +275,10 @@ 0, (LPARAM)lpEnumServiceStatus->lpDisplayName); } + + HeapFree(ProcessHeap, + 0, + lpDependencies); } } @@ -340,7 +342,6 @@ STOP_INFO stopInfo; SC_HANDLE hSCManager; SC_HANDLE hService; - BOOL bHasDepends; BOOL bRet = FALSE; if (pInfo)

15 years, 9 months

[mkupfer] 40729: - continue "marletting" - use marlett font for scrollbar control - TODO: scrollbar size grip with marlett

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Apr 29 13:55:05 2009 New Revision: 40729 URL: http://svn.reactos.org/svn/reactos?rev=40729&view=rev Log: - continue "marletting" - use marlett font for scrollbar control - TODO: scrollbar size grip with marlett Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Apr 29 13:55:05 2009 @@ -880,59 +880,43 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) { + int colorIdx = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; + LOGFONT lf; + HFONT hFont, hOldFont; + COLORREF clrsave; + RECT myr; + INT bkmode; + TCHAR Symbol; + // for scrollgripsize POINT Line[4]; - RECT myr; int SmallDiam = UITOOLS_MakeSquareRect(r, &myr) - 2; int i; HBRUSH hbsave, hb, hb2; HPEN hpsave, hp, hp2; int tri = 290*SmallDiam/1000 - 1; int d46, d93; - - /* - * This fixes a problem with really tiny "scroll" buttons. In particular - * with the updown control. - * Making sure that the arrow is as least 3 pixels wide (or high). - */ - if (tri == 0) - tri = 1; - + // end scrollgripsize switch(uFlags & 0xff) { case DFCS_SCROLLCOMBOBOX: case DFCS_SCROLLDOWN: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.top + 687*SmallDiam/1000 + 1; - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y - tri; - break; - - case DFCS_SCROLLUP: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.bottom - (687*SmallDiam/1000 + 1); - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y + tri; - break; - - case DFCS_SCROLLLEFT: - Line[2].x = myr.right - (687*SmallDiam/1000 + 1); - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x + tri; - break; - - case DFCS_SCROLLRIGHT: - Line[2].x = myr.left + 687*SmallDiam/1000 + 1; - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x - tri; - break; - - case DFCS_SCROLLSIZEGRIP: + Symbol = '6'; + break; + + case DFCS_SCROLLUP: + Symbol = '5'; + break; + + case DFCS_SCROLLLEFT: + Symbol = '3'; + break; + + case DFCS_SCROLLRIGHT: + Symbol = '4'; + break; + + case DFCS_SCROLLSIZEGRIP: + // FIXME: needs to use marlett too, copied for compatibility only /* This one breaks the flow... */ IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN)); @@ -1005,42 +989,50 @@ SelectObject(dc, hpsave); SelectObject(dc, hbsave); return TRUE; - - default: + case DFCS_SCROLLSIZEGRIPRIGHT: + return FALSE; // unimplemented yet + default: return FALSE; } - - /* Here do the real scroll-bar controls end up */ - if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) ) - /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ - /* want for the normal scroll-arrow button. */ - IntDrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); + if(uFlags & DFCS_PUSHED) + IntDrawRectEdge(dc,r,EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_SOFT); else - UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) ); - + IntDrawRectEdge(dc,r,BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_RECT | + BF_SOFT | BF_MIDDLE); + ZeroMemory(&lf, sizeof(LOGFONT)); + UITOOLS_MakeSquareRect(r, &myr); + myr.left += 1; + myr.top += 1; + myr.right -= 1; + myr.bottom -= 1; + if(uFlags & DFCS_PUSHED) + OffsetRect(&myr,1,1); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); if(uFlags & DFCS_INACTIVE) { - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(COLOR_BTNHIGHLIGHT)); - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(COLOR_BTNHIGHLIGHT)); - Polygon(dc, Line, 3); - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - } - - if( (uFlags & DFCS_INACTIVE) || !(uFlags & DFCS_PUSHED) ) - for(i = 0; i < 3; i++) - { - Line[i].x--; - Line[i].y--; - } - - i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; - hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i)); - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i)); - Polygon(dc, Line, 3); - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - + /* draw shadow */ + SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); + TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); + } + SetTextColor(dc, GetSysColor(colorIdx)); + /* draw selected symbol */ + TextOut(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); return TRUE; } @@ -1054,6 +1046,10 @@ case DFCS_MENUARROW: Symbol = '8'; break; + + case DFCS_MENUARROWRIGHT: + Symbol = 'w'; // FIXME: needs to confirm + break; case DFCS_MENUBULLET: Symbol = 'h';

15 years, 9 months

[gedmurphy] 40728: - Add the list of dependencies to the listbox so we know what else will be stopping - Restructure the stop code

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Apr 29 13:53:10 2009 New Revision: 40728 URL: http://svn.reactos.org/svn/reactos?rev=40728&view=rev Log: - Add the list of dependencies to the listbox so we know what else will be stopping - Restructure the stop code Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -154,7 +154,7 @@ BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 - EDITTEXT IDC_DEL_DESC, 15, 40, 210, 60, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -178,4 +178,5 @@ /* stop dependencies */ #define IDD_DLG_DEPEND_STOP 12000 #define IDC_STOP_DEPENDS 12001 -#define IDS_STOP_DEPENDS 12001 +#define IDS_STOP_DEPENDS 12002 +#define IDC_STOP_DEPENDS_LB 12003 Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -23,22 +23,22 @@ DWORD dwMaxWait; BOOL bRet = FALSE; - hSCManager = OpenSCManagerW(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (!hSCManager) { return FALSE; } - hService = OpenServiceW(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_START | SERVICE_QUERY_STATUS); + hService = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); if (hService) { - bRet = StartServiceW(hService, - 0, - NULL); + bRet = StartService(hService, + 0, + NULL); if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) { bRet = TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Wed Apr 29 13:53:10 2009 @@ -9,8 +9,16 @@ #include "precomp.h" +typedef struct _STOP_INFO +{ + PMAIN_WND_INFO pInfo; + SC_HANDLE hSCManager; + SC_HANDLE hMainService; +} STOP_INFO, *PSTOP_INFO; + + static BOOL -StopService(PMAIN_WND_INFO pInfo, +StopService(PSTOP_INFO pStopInfo, SC_HANDLE hService) { SERVICE_STATUS_PROCESS ServiceStatus; @@ -23,8 +31,8 @@ dwStartTime = GetTickCount(); dwTimeout = 30000; // 30 secs - hProgDlg = CreateProgressDialog(pInfo->hMainWnd, - pInfo->pCurrentService->lpServiceName, + hProgDlg = CreateProgressDialog(pStopInfo->pInfo->hMainWnd, + pStopInfo->pInfo->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); if (hProgDlg) { @@ -67,8 +75,7 @@ } static LPENUM_SERVICE_STATUS -GetDependentServices(PMAIN_WND_INFO pInfo, - SC_HANDLE hService, +GetDependentServices(SC_HANDLE hService, LPDWORD lpdwCount) { LPENUM_SERVICE_STATUS lpDependencies; @@ -88,7 +95,7 @@ else { if (GetLastError() != ERROR_MORE_DATA) - return NULL; // Unexpected error + return NULL; /* Unexpected error */ lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), 0, @@ -120,8 +127,7 @@ } static BOOL -StopDependentServices(PMAIN_WND_INFO pInfo, - SC_HANDLE hSCManager, +StopDependentServices(PSTOP_INFO pStopInfo, SC_HANDLE hService) { LPENUM_SERVICE_STATUS lpDependencies; @@ -129,7 +135,7 @@ DWORD dwCount; BOOL bRet = FALSE; - lpDependencies = GetDependentServices(pInfo, hService, &dwCount); + lpDependencies = GetDependentServices(hService, &dwCount); if (lpDependencies) { LPENUM_SERVICE_STATUS lpEnumServiceStatus; @@ -139,12 +145,12 @@ { lpEnumServiceStatus = &lpDependencies[i]; - hDepService = OpenService(hSCManager, + hDepService = OpenService(pStopInfo->hSCManager, lpEnumServiceStatus->lpServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (hDepService) { - bRet = StopService(pInfo, hDepService); + bRet = StopService(pStopInfo, hDepService); CloseServiceHandle(hDepService); @@ -165,57 +171,46 @@ } static BOOL -HasDependentServices(PMAIN_WND_INFO pInfo) +HasDependentServices(SC_HANDLE hService) +{ + DWORD dwBytesNeeded, dwCount; + BOOL bRet = FALSE; + + if (hService) + { + if (!EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + if (GetLastError() == ERROR_MORE_DATA) + bRet = TRUE; + } + } + + return bRet; +} + +static BOOL +DoInitDependsDialog(PSTOP_INFO pStopInfo, + HWND hDlg) { SC_HANDLE hSCManager; SC_HANDLE hService; - DWORD dwBytesNeeded, dwCount; - BOOL bRet = FALSE; - - hSCManager = OpenSCManagerW(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenServiceW(hSCManager, - pInfo->pCurrentService->lpServiceName, - SERVICE_ENUMERATE_DEPENDENTS); - if (hService) - { - if (!EnumDependentServices(hService, - SERVICE_ACTIVE, - NULL, - 0, - &dwBytesNeeded, - &dwCount)) - { - if (GetLastError() == ERROR_MORE_DATA) - bRet = TRUE; - } - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } - - return bRet; -} - -static BOOL -DoInitDependsDialog(PMAIN_WND_INFO pInfo, - HWND hDlg) -{ + LPENUM_SERVICE_STATUS lpDependencies; + DWORD dwCount; LPTSTR lpPartialStr, lpStr; DWORD fullLen; HICON hIcon = NULL; BOOL bRet = FALSE; - if (pInfo) + if (pStopInfo) { SetWindowLongPtr(hDlg, GWLP_USERDATA, - (LONG_PTR)pInfo); + (LONG_PTR)pStopInfo); hIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), @@ -232,18 +227,19 @@ DestroyIcon(hIcon); } + /* Add the label */ if (AllocAndLoadString(&lpPartialStr, hInstance, IDS_STOP_DEPENDS)) { - fullLen = _tcslen(lpPartialStr) + _tcslen(pInfo->pCurrentService->lpDisplayName) + 1; + fullLen = _tcslen(lpPartialStr) + _tcslen(pStopInfo->pInfo->pCurrentService->lpDisplayName) + 1; lpStr = HeapAlloc(ProcessHeap, 0, fullLen * sizeof(TCHAR)); if (lpStr) { - _sntprintf(lpStr, fullLen, lpPartialStr, pInfo->pCurrentService->lpDisplayName); + _sntprintf(lpStr, fullLen, lpPartialStr, pStopInfo->pInfo->pCurrentService->lpDisplayName); SendDlgItemMessage(hDlg, IDC_STOP_DEPENDS, @@ -262,6 +258,26 @@ 0, lpPartialStr); } + + /* Get the list of dependencies */ + lpDependencies = GetDependentServices(pStopInfo->hMainService, &dwCount); + if (lpDependencies) + { + LPENUM_SERVICE_STATUS lpEnumServiceStatus; + DWORD i; + + for (i = 0; i < dwCount; i++) + { + lpEnumServiceStatus = &lpDependencies[i]; + + /* Add the service to the listbox */ + SendDlgItemMessage(hDlg, + IDC_STOP_DEPENDS_LB, + LB_ADDSTRING, + 0, + (LPARAM)lpEnumServiceStatus->lpDisplayName); + } + } } return bRet; @@ -270,17 +286,16 @@ INT_PTR CALLBACK StopDependsDialogProc(HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - PMAIN_WND_INFO pInfo = NULL; - + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + PSTOP_INFO pStopInfo = NULL; /* Get the window context */ - pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + pStopInfo = (PSTOP_INFO)GetWindowLongPtr(hDlg, GWLP_USERDATA); - if (pInfo == NULL && message != WM_INITDIALOG) + if (pStopInfo == NULL && message != WM_INITDIALOG) { return FALSE; } @@ -291,10 +306,10 @@ { BOOL bRet = FALSE; - pInfo = (PMAIN_WND_INFO)lParam; - if (pInfo != NULL) - { - bRet = DoInitDependsDialog(pInfo, hDlg); + pStopInfo = (PSTOP_INFO)lParam; + if (pStopInfo != NULL) + { + bRet = DoInitDependsDialog(pStopInfo, hDlg); } return bRet; @@ -322,47 +337,55 @@ BOOL DoStop(PMAIN_WND_INFO pInfo) { - SC_HANDLE hSCManager = NULL; + STOP_INFO stopInfo; + SC_HANDLE hSCManager; SC_HANDLE hService; BOOL bHasDepends; BOOL bRet = FALSE; - bHasDepends = HasDependentServices(pInfo); - if (bHasDepends) - { - INT ret = DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)pInfo); - if (ret != IDOK) - return FALSE; - } - - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenService(hSCManager, - pInfo->pCurrentService->lpServiceName, - SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); - if (hService) - { - if (bHasDepends) - { - StopDependentServices(pInfo, - hSCManager, - hService); - } - - bRet = StopService(pInfo, hService); - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - } - - return bRet; -} + if (pInfo) + { + stopInfo.pInfo = pInfo; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + stopInfo.hSCManager = hSCManager; + stopInfo.hMainService = hService; + + if (HasDependentServices(hService)) + { + INT ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)&stopInfo); + if (ret == IDOK) + { + if (StopDependentServices(&stopInfo, hService)) + { + bRet = StopService(&stopInfo, hService); + } + } + } + else + { + bRet = StopService(&stopInfo, hService); + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); + } + } + + return bRet; +}

15 years, 9 months

[fireball] 40727: - Debug pool allocator: Add support for paged pool debugging.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 29 13:48:31 2009 New Revision: 40727 URL: http://svn.reactos.org/svn/reactos?rev=40727&view=rev Log: - Debug pool allocator: Add support for paged pool debugging. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/dbgpool.c trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -574,7 +574,7 @@ VOID NTAPI -ExpFreeDebugPool(PVOID Block); +ExpFreeDebugPool(PVOID Block, BOOLEAN PagedPool); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -91,7 +91,7 @@ VOID NTAPI -ExpFreeDebugPool(PVOID Block) +ExpFreeDebugPool(PVOID Block, BOOLEAN PagedPool) { PEI_WHOLE_PAGE_HEADER Header; PVOID ProtectedPage; @@ -111,7 +111,10 @@ MmSetPageProtect(NULL, ProtectedPage, PAGE_READWRITE); /* Free storage */ - ExFreeNonPagedPool(Header->ActualAddress); + if (PagedPool) + ExFreePagedPool(Header->ActualAddress); + else + ExFreeNonPagedPool(Header->ActualAddress); } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Apr 29 13:48:31 2009 @@ -58,7 +58,12 @@ { if (KeGetCurrentIrql() > APC_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); - Block = ExAllocatePagedPoolWithTag(PoolType, NumberOfBytes, Tag); +#ifdef DEBUG_PPOOL + if (ExpIsPoolTagDebuggable(Tag)) + Block = ExpAllocateDebugPool(PoolType, NumberOfBytes, Tag, Caller, TRUE); + else +#endif + Block = ExAllocatePagedPoolWithTag(PoolType, NumberOfBytes, Tag); } else { @@ -277,7 +282,12 @@ (ULONG_PTR)Block); /* Free from paged pool */ - ExFreePagedPool(Block); +#ifdef DEBUG_PPOOL + if (ExpIsPoolTagDebuggable(Tag)) + ExpFreeDebugPool(Block, TRUE); + else +#endif + ExFreePagedPool(Block); } /* Check for non-paged pool */ @@ -303,7 +313,7 @@ /* Free from non-paged pool */ #ifdef DEBUG_NPOOL if (ExpIsPoolTagDebuggable(Tag)) - ExpFreeDebugPool(Block); + ExpFreeDebugPool(Block, FALSE); else #endif ExFreeNonPagedPool(Block);

15 years, 9 months

[fireball] 40726: - Implement a special "debug pool" allocator which catches pool overruns. It evolved from an initial patch by Art Yerkes, and is fully independent from underlying pool implementation. It supports only non-paged pool and detects only overruns now. To enable, uncomment DEBUG_NPOOL define in mm/pool.c.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 29 13:41:32 2009 New Revision: 40726 URL: http://svn.reactos.org/svn/reactos?rev=40726&view=rev Log: - Implement a special "debug pool" allocator which catches pool overruns. It evolved from an initial patch by Art Yerkes, and is fully independent from underlying pool implementation. It supports only non-paged pool and detects only overruns now. To enable, uncomment DEBUG_NPOOL define in mm/pool.c. Added: trunk/reactos/ntoskrnl/mm/dbgpool.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -558,6 +558,24 @@ NTAPI ExFreePagedPool(IN PVOID Block); +BOOLEAN +NTAPI +ExpIsPoolTagDebuggable(ULONG Tag); + +PVOID +NTAPI +ExpAllocateDebugPool( + POOL_TYPE Type, + ULONG Size, + ULONG Tag, + PVOID Caller, + BOOLEAN EndOfPage +); + +VOID +NTAPI +ExpFreeDebugPool(PVOID Block); + VOID NTAPI MmInitializePagedPool(VOID); Added: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c (added) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -1,0 +1,117 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/dbgpool.c + * PURPOSE: Debug version of a pool allocator + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS **************************************************************/ + +typedef struct _EI_WHOLE_PAGE_HEADER { + PVOID ActualAddress; + ULONG Size; + ULONG Tag; +} EI_WHOLE_PAGE_HEADER, *PEI_WHOLE_PAGE_HEADER; + +BOOLEAN +NTAPI +ExpIsPoolTagDebuggable(ULONG Tag) +{ + if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE; + if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE; + if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE; + if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE; + + return FALSE;//TRUE; +} + + +PVOID +NTAPI +ExpAllocateDebugPool(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller, BOOLEAN EndOfPage) +{ + ULONG UserSize = Size + sizeof(EI_WHOLE_PAGE_HEADER); + ULONG TotalSize = UserSize + 2*PAGE_SIZE; + ULONG_PTR UserData, GuardArea; + PEI_WHOLE_PAGE_HEADER Header; + ULONG_PTR Buffer; + + /* Right now we support only end-of-page allocations */ + ASSERT(EndOfPage); + + /* Allocate space using default routine */ + if (Type & PAGED_POOL_MASK) + { + Buffer = (ULONG_PTR) + ExAllocatePagedPoolWithTag(Type, TotalSize, Tag); + } + else + { + Buffer = (ULONG_PTR) + ExAllocateNonPagedPoolWithTag(Type, TotalSize, Tag, Caller); + } + + /* If allocation failed - fail too */ + if (!Buffer) + { + DPRINT1("A big problem! Pool allocation failed!\n"); + return NULL; + } + + /* Calculate guard area as placed on a page boundary + * at the end of allocated area */ + GuardArea = PAGE_ROUND_DOWN(Buffer + TotalSize - PAGE_SIZE + 1); + + /* Calculate user data and header pointers */ + UserData = GuardArea - Size; + Header = (PEI_WHOLE_PAGE_HEADER)(UserData - sizeof(EI_WHOLE_PAGE_HEADER)); + + /* Fill out the header */ + Header->ActualAddress = (PVOID)Buffer; + Header->Tag = Tag; + Header->Size = Size; + + /* Protect the guard page */ + MmSetPageProtect(NULL, (PVOID)GuardArea, PAGE_NOACCESS); + + DPRINT1("Allocating whole page block Tag %c%c%c%c, Buffer %p, Header %p, UserData %p, GuardArea %p, Size %d\n", + Tag & 0xFF, (Tag >> 8) & 0xFF, + (Tag >> 16) & 0xFF, (Tag >> 24) & 0xFF, + Buffer, Header, UserData, GuardArea, Size); + + return (PVOID)UserData; +} + +VOID +NTAPI +ExpFreeDebugPool(PVOID Block) +{ + PEI_WHOLE_PAGE_HEADER Header; + PVOID ProtectedPage; + + /* Get pointer to our special header */ + Header = (PEI_WHOLE_PAGE_HEADER) + (((PCHAR)Block) - sizeof(EI_WHOLE_PAGE_HEADER)); + + DPRINT1("Freeing whole page block at %08x (Tag %c%c%c%c, %x Header %x)\n", Block, + Header->Tag & 0xFF, (Header->Tag >> 8) & 0xFF, + (Header->Tag >> 16) & 0xFF, (Header->Tag >> 24) & 0xFF, Header->Tag, Header); + + /* Calculate protected page adresss */ + ProtectedPage = ((PCHAR)Block) + Header->Size; + + /* Unprotect it */ + MmSetPageProtect(NULL, ProtectedPage, PAGE_READWRITE); + + /* Free storage */ + ExFreeNonPagedPool(Header->ActualAddress); +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/dbgpool.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -14,6 +14,10 @@ #define NDEBUG #include <debug.h> +/* Uncomment to enable pool overruns debugging */ +//#define DEBUG_NPOOL +//#define DEBUG_PPOOL + extern PVOID MiNonPagedPoolStart; extern ULONG MiNonPagedPoolLength; extern ULONG MmTotalPagedPoolQuota; @@ -60,7 +64,12 @@ { if (KeGetCurrentIrql() > DISPATCH_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); - Block = ExAllocateNonPagedPoolWithTag(PoolType, NumberOfBytes, Tag, Caller); +#ifdef DEBUG_NPOOL + if (ExpIsPoolTagDebuggable(Tag)) + Block = ExpAllocateDebugPool(PoolType, NumberOfBytes, Tag, Caller, TRUE); + else +#endif + Block = ExAllocateNonPagedPoolWithTag(PoolType, NumberOfBytes, Tag, Caller); } if ((PoolType & MUST_SUCCEED_POOL_MASK) && !Block) @@ -292,7 +301,12 @@ (ULONG_PTR)Block); /* Free from non-paged pool */ - ExFreeNonPagedPool(Block); +#ifdef DEBUG_NPOOL + if (ExpIsPoolTagDebuggable(Tag)) + ExpFreeDebugPool(Block); + else +#endif + ExFreeNonPagedPool(Block); } else { Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Wed Apr 29 13:41:32 2009 @@ -362,6 +362,7 @@ <file>anonmem.c</file> <file>balance.c</file> <file>cont.c</file> + <file>dbgpool.c</file> <file>drvlck.c</file> <file>freelist.c</file> <file>hypermap.c</file>

15 years, 9 months

[gedmurphy] 40725: - Rewrite start and stop routines to make them much more robust - Add the ability to check for and stop dependent services - Untested at the moment, but unfinished anyway.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Apr 29 12:32:52 2009 New Revision: 40725 URL: http://svn.reactos.org/svn/reactos?rev=40725&view=rev Log: - Rewrite start and stop routines to make them much more robust - Add the ability to check for and stop dependent services - Untested at the moment, but unfinished anyway. Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -147,6 +147,19 @@ DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Stop Other Services" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + EDITTEXT IDC_DEL_DESC, 15, 40, 210, 60, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 +END + IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Options" FONT 8, "MS Shell Dlg",0,0 @@ -191,6 +204,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." END Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -174,3 +174,8 @@ #define IDS_PROGRESS_INFO_STOP 7005 #define IDS_PROGRESS_INFO_PAUSE 7006 #define IDS_PROGRESS_INFO_RESUME 7007 + +/* stop dependencies */ +#define IDD_DLG_DEPEND_STOP 12000 +#define IDC_STOP_DEPENDS 12001 +#define IDS_STOP_DEPENDS 12001 Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/start.c * PURPOSE: Start a service - * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2005-2009 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -14,102 +14,100 @@ HWND hProgDlg) { SC_HANDLE hSCManager; - SC_HANDLE hSc; + SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; + DWORD dwStartTickCount; + DWORD dwOldCheckPoint; + DWORD dwWaitTime; + DWORD dwMaxWait; BOOL bRet = FALSE; - BOOL bDispErr = TRUE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager != NULL) + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (!hSCManager) { - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_ALL_ACCESS); - if (hSc != NULL) + return FALSE; + } + + hService = OpenServiceW(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); + if (hService) + { + bRet = StartServiceW(hService, + 0, + NULL); + if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) { - if (StartService(hSc, - 0, - NULL)) + bRet = TRUE; + } + else if (bRet) + { + bRet = FALSE; + + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { - bDispErr = FALSE; + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + dwMaxWait = 30000; // 30 secs - if (QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) { - DWORD dwStartTickCount = GetTickCount(); - DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; - DWORD dwMaxWait = 2000 * 60; // wait for 2 mins + dwWaitTime = ServiceStatus.dwWaitHint / 10; - IncrementProgressBar(hProgDlg); + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + break; + } - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { - DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; - - if (!QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + /* The service is making progress*/ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if (GetTickCount() >= dwStartTickCount + dwMaxWait) { + /* We exceeded our max wait time, give up */ break; } + } - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* The service is making progress, increment the progress bar */ - IncrementProgressBar(hProgDlg); - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - if(GetTickCount() >= dwStartTickCount + dwMaxWait) - { - /* give up */ - break; - } - } + if (dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; - if(dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; + Sleep(dwWaitTime); + } - Sleep(dwWaitTime); - } + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + bRet = TRUE; } } - - CloseServiceHandle(hSc); } - CloseServiceHandle(hSCManager); + CloseServiceHandle(hService); } - if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) - { - CompleteProgressBar(hProgDlg); - Sleep(500); - bRet = TRUE; - } - else - { - if (bDispErr) - GetError(); - else - DisplayString(_T("The service failed to start")); - } + CloseServiceHandle(hSCManager); + return bRet; } - BOOL DoStart(PMAIN_WND_INFO Info) @@ -128,8 +126,20 @@ bRet = DoStartService(Info, hProgDlg); + if (bRet) + { + CompleteProgressBar(hProgDlg); + Sleep(500); + bRet = TRUE; + } + else + { + GetError(); + } + DestroyWindow(hProgDlg); } return bRet; } + Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Wed Apr 29 12:32:52 2009 @@ -3,96 +3,366 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/stop.c * PURPOSE: Stops running a service - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2009 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" +static BOOL +StopService(PMAIN_WND_INFO pInfo, + SC_HANDLE hService) +{ + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwBytesNeeded; + DWORD dwStartTime; + DWORD dwTimeout; + HWND hProgDlg; + BOOL bRet = FALSE; + + dwStartTime = GetTickCount(); + dwTimeout = 30000; // 30 secs + + hProgDlg = CreateProgressDialog(pInfo->hMainWnd, + pInfo->pCurrentService->lpServiceName, + IDS_PROGRESS_INFO_STOP); + if (hProgDlg) + { + IncrementProgressBar(hProgDlg); + + if (ControlService(hService, + SERVICE_CONTROL_STOP, + (LPSERVICE_STATUS)&ServiceStatus)) + { + while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) + { + Sleep(ServiceStatus.dwWaitHint); + + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &dwBytesNeeded)) + { + if (GetTickCount() - dwStartTime > dwTimeout) + { + /* We exceeded our max wait time, give up */ + break; + } + } + } + + if (ServiceStatus.dwCurrentState == SERVICE_STOPPED) + { + bRet = TRUE; + } + } + + CompleteProgressBar(hProgDlg); + Sleep(500); + DestroyWindow(hProgDlg); + } + + return bRet; +} + +static LPENUM_SERVICE_STATUS +GetDependentServices(PMAIN_WND_INFO pInfo, + SC_HANDLE hService, + LPDWORD lpdwCount) +{ + LPENUM_SERVICE_STATUS lpDependencies; + DWORD dwBytesNeeded; + DWORD dwCount; + + if (EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + /* There are no dependent services */ + return NULL; + } + else + { + if (GetLastError() != ERROR_MORE_DATA) + return NULL; // Unexpected error + + lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(), + 0, + dwBytesNeeded); + if (lpDependencies) + { + if (EnumDependentServices(hService, + SERVICE_ACTIVE, + lpDependencies, + dwBytesNeeded, + &dwBytesNeeded, + &dwCount)) + { + *lpdwCount = dwCount; + } + else + { + HeapFree(ProcessHeap, + 0, + lpDependencies); + + lpDependencies = NULL; + } + } + } + + return lpDependencies; + +} + +static BOOL +StopDependentServices(PMAIN_WND_INFO pInfo, + SC_HANDLE hSCManager, + SC_HANDLE hService) +{ + LPENUM_SERVICE_STATUS lpDependencies; + SC_HANDLE hDepService; + DWORD dwCount; + BOOL bRet = FALSE; + + lpDependencies = GetDependentServices(pInfo, hService, &dwCount); + if (lpDependencies) + { + LPENUM_SERVICE_STATUS lpEnumServiceStatus; + DWORD i; + + for (i = 0; i < dwCount; i++) + { + lpEnumServiceStatus = &lpDependencies[i]; + + hDepService = OpenService(hSCManager, + lpEnumServiceStatus->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS); + if (hDepService) + { + bRet = StopService(pInfo, hDepService); + + CloseServiceHandle(hDepService); + + if (!bRet) + { + GetError(); + break; + } + } + } + + HeapFree(GetProcessHeap(), + 0, + lpDependencies); + } + + return bRet; +} + +static BOOL +HasDependentServices(PMAIN_WND_INFO pInfo) +{ + SC_HANDLE hSCManager; + SC_HANDLE hService; + DWORD dwBytesNeeded, dwCount; + BOOL bRet = FALSE; + + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenServiceW(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + if (!EnumDependentServices(hService, + SERVICE_ACTIVE, + NULL, + 0, + &dwBytesNeeded, + &dwCount)) + { + if (GetLastError() == ERROR_MORE_DATA) + bRet = TRUE; + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); + } + + return bRet; +} + +static BOOL +DoInitDependsDialog(PMAIN_WND_INFO pInfo, + HWND hDlg) +{ + LPTSTR lpPartialStr, lpStr; + DWORD fullLen; + HICON hIcon = NULL; + BOOL bRet = FALSE; + + if (pInfo) + { + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)pInfo); + + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } + + if (AllocAndLoadString(&lpPartialStr, + hInstance, + IDS_STOP_DEPENDS)) + { + fullLen = _tcslen(lpPartialStr) + _tcslen(pInfo->pCurrentService->lpDisplayName) + 1; + + lpStr = HeapAlloc(ProcessHeap, + 0, + fullLen * sizeof(TCHAR)); + if (lpStr) + { + _sntprintf(lpStr, fullLen, lpPartialStr, pInfo->pCurrentService->lpDisplayName); + + SendDlgItemMessage(hDlg, + IDC_STOP_DEPENDS, + WM_SETTEXT, + 0, + (LPARAM)lpStr); + + bRet = TRUE; + + HeapFree(ProcessHeap, + 0, + lpStr); + } + + HeapFree(ProcessHeap, + 0, + lpPartialStr); + } + } + + return bRet; +} + + +INT_PTR CALLBACK +StopDependsDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + PMAIN_WND_INFO pInfo = NULL; + + + /* Get the window context */ + pInfo = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (pInfo == NULL && message != WM_INITDIALOG) + { + return FALSE; + } + + switch (message) + { + case WM_INITDIALOG: + { + BOOL bRet = FALSE; + + pInfo = (PMAIN_WND_INFO)lParam; + if (pInfo != NULL) + { + bRet = DoInitDependsDialog(pInfo, hDlg); + } + + return bRet; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + { + EndDialog(hDlg, + LOWORD(wParam)); + return TRUE; + } + } + } + } + + return FALSE; +} + + BOOL -DoStop(PMAIN_WND_INFO Info) +DoStop(PMAIN_WND_INFO pInfo) { SC_HANDLE hSCManager = NULL; - SC_HANDLE hSc = NULL; - LPQUERY_SERVICE_CONFIG lpServiceConfig = NULL; - HWND hProgDlg; - DWORD BytesNeeded = 0; - BOOL ret = FALSE; + SC_HANDLE hService; + BOOL bHasDepends; + BOOL bRet = FALSE; + + bHasDepends = HasDependentServices(pInfo); + if (bHasDepends) + { + INT ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)pInfo); + if (ret != IDOK) + return FALSE; + } hSCManager = OpenSCManager(NULL, NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (hSCManager == NULL) - { - GetError(); - return FALSE; - } - - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_QUERY_CONFIG); - if (hSc) - { - if (!QueryServiceConfig(hSc, - lpServiceConfig, - 0, - &BytesNeeded)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - lpServiceConfig = (LPQUERY_SERVICE_CONFIG)HeapAlloc(ProcessHeap, - 0, - BytesNeeded); - if (lpServiceConfig == NULL) - goto cleanup; - - if (QueryServiceConfig(hSc, - lpServiceConfig, - BytesNeeded, - &BytesNeeded)) - { -#if 0 - if (lpServiceConfig->lpDependencies) - { - TCHAR str[500]; - - _sntprintf(str, 499, _T("%s depends on this service, implement the dialog to allow closing of other services"), - lpServiceConfig->lpDependencies); - MessageBox(NULL, str, NULL, 0); - - //FIXME: open 'stop other services' box - } - else - { -#endif - hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, - IDS_PROGRESS_INFO_STOP); - if (hProgDlg) - { - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_STOP); - - DestroyWindow(hProgDlg); - } - //} - - HeapFree(ProcessHeap, - 0, - lpServiceConfig); - - lpServiceConfig = NULL; - } - } - } - } - -cleanup: - if (hSCManager != NULL) + SC_MANAGER_ALL_ACCESS); + if (hSCManager) + { + hService = OpenService(hSCManager, + pInfo->pCurrentService->lpServiceName, + SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + if (hService) + { + if (bHasDepends) + { + StopDependentServices(pInfo, + hSCManager, + hService); + } + + bRet = StopService(pInfo, hService); + + CloseServiceHandle(hService); + } + CloseServiceHandle(hSCManager); - if (hSc != NULL) - CloseServiceHandle(hSc); - - return ret; -} + } + + return bRet; +}

15 years, 9 months

[cgutman] 40724: - Fix build (try 2)

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 29 02:46:28 2009 New Revision: 40724 URL: http://svn.reactos.org/svn/reactos?rev=40724&view=rev Log: - Fix build (try 2) Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Wed Apr 29 02:46:28 2009 @@ -238,7 +238,7 @@ return 0; /* Skip SrcOffset bytes in the source packet */ - NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer, &SrcData, &SrcSize, &Total); + NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer, (PVOID)&SrcData, &SrcSize, &Total); if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1) return 0; Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Apr 29 02:46:28 2009 @@ -881,7 +881,7 @@ if (NT_SUCCESS(Status)) { - PCHAR DataBuffer; + PVOID DataBuffer; UINT BufferSize; NdisQueryBuffer( (PNDIS_BUFFER)Irp->MdlAddress, @@ -961,7 +961,7 @@ TI_DbgPrint(MID_TRACE,("TCPIP<<< Got an MDL: %x\n", Irp->MdlAddress)); if (NT_SUCCESS(Status)) { - PCHAR Data; + PVOID Data; UINT Len; NdisQueryBuffer( Irp->MdlAddress, &Data, &Len ); @@ -1033,7 +1033,7 @@ (PDRIVER_CANCEL)DispCancelRequest); if (NT_SUCCESS(Status)) { - PCHAR DataBuffer; + PVOID DataBuffer; UINT BufferSize; TI_DbgPrint(MID_TRACE,("About to query buffer %x\n", Irp->MdlAddress));

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009