mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/System.ServiceProcess/System.ServiceProcess/Win32ServiceController.cs
View File

@@ -390,17 +390,17 @@ namespace System.ServiceProcess
throw new Win32Exception (err);
}
} else {
int iPtr = buffer.ToInt32 ();
IntPtr iPtr = buffer;
services = new ServiceController [servicesReturned];
for (int i = 0; i < servicesReturned; i++) {
ENUM_SERVICE_STATUS serviceStatus = (ENUM_SERVICE_STATUS) Marshal.PtrToStructure (
new IntPtr (iPtr), typeof (ENUM_SERVICE_STATUS));
iPtr, typeof (ENUM_SERVICE_STATUS));
// TODO: use internal ctor that takes displayname too ?
services [i] = new ServiceController (serviceStatus.pServiceName,
machineName);
// move on to the next services
iPtr += ENUM_SERVICE_STATUS.SizeOf;
iPtr = IntPtr.Add(iPtr, ENUM_SERVICE_STATUS.SizeOf);
}
// we're done, so exit the loop
@@ -611,17 +611,17 @@ namespace System.ServiceProcess
throw new Win32Exception (err);
}
} else {
int iPtr = buffer.ToInt32 ();
IntPtr iPtr = buffer;
services = new ServiceController [servicesReturned];
for (int i = 0; i < servicesReturned; i++) {
ENUM_SERVICE_STATUS_PROCESS serviceStatus = (ENUM_SERVICE_STATUS_PROCESS) Marshal.PtrToStructure (
new IntPtr (iPtr), typeof (ENUM_SERVICE_STATUS_PROCESS));
iPtr, typeof (ENUM_SERVICE_STATUS_PROCESS));
// TODO: use internal ctor that takes displayname too
services [i] = new ServiceController (serviceStatus.pServiceName,
machineName);
// move on to the next services
iPtr += ENUM_SERVICE_STATUS_PROCESS.SizeOf;
iPtr = IntPtr.Add(iPtr, ENUM_SERVICE_STATUS_PROCESS.SizeOf);
}
// we're done, so exit the loop

1
mcs/class/System.ServiceProcess/System.ServiceProcess_test.dll.sources
View File

@@ -1,3 +1,4 @@
../../test-helpers/NunitHelpers.cs
System.ServiceProcess/ServiceBaseTest.cs
System.ServiceProcess/ServiceControllerTest.cs
System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs

2
mcs/class/System.ServiceProcess/Test/System.ServiceProcess/ServiceControllerTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
8f5b8f6000b50c1927c8e79c4b36e834fa09ca5b
17f7be4bbd84435420955bcc2deec4658a13005f