Author: rharabien
Date: Sat Mar 26 21:41:49 2011
New Revision: 51165
URL: http://svn.reactos.org/svn/reactos?rev=51165&view=rev
Log:
Fix duplicated startup version string
Patch by Thomas Faber <thfabba at gmx dot de>
See issue #6015 for more details.
Modified:
trunk/reactos/ntoskrnl/ex/init.c
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=511…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Mar 26 21:41:49 2011
@@ -1410,9 +1410,12 @@
else
{
/* No version */
- *EndBuffer++ = ANSI_NULL; /* Null-terminate the string */
- --Remaining;
- }
+ *EndBuffer = ANSI_NULL; /* Null-terminate the string */
+ }
+
+ /* Skip over the null-terminator to start a new string */
+ ++EndBuffer;
+ --Remaining;
/* Build the version number */
StringBuffer = InitBuffer->VersionNumber;
Author: ekohl
Date: Sat Mar 26 20:07:09 2011
New Revision: 51164
URL: http://svn.reactos.org/svn/reactos?rev=51164&view=rev
Log:
Disable some misleading service tests because a test cannot determine wheter or not the number of active or inactive services is correct.
Modified:
trunk/rostests/winetests/advapi32/service.c
Modified: trunk/rostests/winetests/advapi32/service.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic…
==============================================================================
--- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Sat Mar 26 20:07:09 2011
@@ -1323,11 +1323,16 @@
}
HeapFree(GetProcessHeap(), 0, services);
+#if 0
+ /* These tests don't make sense on a real system because no test can determine
+ * how many service should be active or inactive.
+ */
todo_wine
{
ok(servicecountactive == 0, "Active services mismatch %u\n", servicecountactive);
ok(servicecountinactive == 0, "Inactive services mismatch %u\n", servicecountinactive);
}
+#endif
CloseServiceHandle(scm_handle);
@@ -1681,8 +1686,13 @@
}
HeapFree(GetProcessHeap(), 0, exservices);
+#if 0
+ /* These tests don't make sense on a real system because no test can determine
+ * how many service should be active or inactive.
+ */
ok(servicecountactive == 0, "Active services mismatch %u\n", servicecountactive);
ok(servicecountinactive == 0, "Inactive services mismatch %u\n", servicecountinactive);
+#endif
CloseServiceHandle(scm_handle);
}