You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2010/12/20 16:35:16 UTC
svn commit: r1051146 - in
/commons/proper/daemon/trunk/src/native/windows/src: service.c utils.c
Author: mturk
Date: Mon Dec 20 15:35:15 2010
New Revision: 1051146
URL: http://svn.apache.org/viewvc?rev=1051146&view=rev
Log:
Combine core dependencies with --DependsOn cmdline
Modified:
commons/proper/daemon/trunk/src/native/windows/src/service.c
commons/proper/daemon/trunk/src/native/windows/src/utils.c
Modified: commons/proper/daemon/trunk/src/native/windows/src/service.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/service.c?rev=1051146&r1=1051145&r2=1051146&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/service.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/service.c Mon Dec 20 15:35:15 2010
@@ -517,6 +517,11 @@ apxServiceInstall(APXHANDLE hService, LP
lpService->stServiceEntry.lpConfig = NULL;
AplZeroMemory(&lpService->stServiceEntry, sizeof(APXSERVENTRY));
+ if (lpDependencies)
+ lpDependencies = apxMultiSzCombine(NULL, lpDependencies,
+ L"Tcpip\0Afd\0", NULL);
+ else
+ lpDependencies = L"Tcpip\0Afd\0";
lpService->hService = CreateServiceW(lpService->hManager,
szServiceName,
szDisplayName,
@@ -527,7 +532,7 @@ apxServiceInstall(APXHANDLE hService, LP
szImagePath,
NULL,
NULL,
- lpDependencies ? lpDependencies : L"Tcpip\0Afd\0",
+ lpDependencies,
NULL,
NULL);
Modified: commons/proper/daemon/trunk/src/native/windows/src/utils.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/utils.c?rev=1051146&r1=1051145&r2=1051146&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/utils.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/utils.c Mon Dec 20 15:35:15 2010
@@ -256,7 +256,7 @@ LPWSTR apxMultiSzCombine(APXHANDLE hPool
if (lb) {
AplMoveMemory(&rv[la], lpStrB, lb * sizeof(WCHAR));
}
- if (*lpdwLength)
+ if (lpdwLength)
*lpdwLength = (la + lb + 1) * sizeof(WCHAR);
return rv;
}
Re: svn commit: r1051146 - in /commons/proper/daemon/trunk/src/native/windows/src:
service.c utils.c
Posted by sebb <se...@gmail.com>.
On 20 December 2010 15:35, <mt...@apache.org> wrote:
> Author: mturk
> Date: Mon Dec 20 15:35:15 2010
> New Revision: 1051146
>
> URL: http://svn.apache.org/viewvc?rev=1051146&view=rev
> Log:
> Combine core dependencies with --DependsOn cmdline
>
> Modified:
> commons/proper/daemon/trunk/src/native/windows/src/service.c
> commons/proper/daemon/trunk/src/native/windows/src/utils.c
The change to utils.c seems to be an unrelated bug fix?
> Modified: commons/proper/daemon/trunk/src/native/windows/src/service.c
> URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/service.c?rev=1051146&r1=1051145&r2=1051146&view=diff
> ==============================================================================
> --- commons/proper/daemon/trunk/src/native/windows/src/service.c (original)
> +++ commons/proper/daemon/trunk/src/native/windows/src/service.c Mon Dec 20 15:35:15 2010
> @@ -517,6 +517,11 @@ apxServiceInstall(APXHANDLE hService, LP
> lpService->stServiceEntry.lpConfig = NULL;
> AplZeroMemory(&lpService->stServiceEntry, sizeof(APXSERVENTRY));
>
> + if (lpDependencies)
> + lpDependencies = apxMultiSzCombine(NULL, lpDependencies,
> + L"Tcpip\0Afd\0", NULL);
> + else
> + lpDependencies = L"Tcpip\0Afd\0";
> lpService->hService = CreateServiceW(lpService->hManager,
> szServiceName,
> szDisplayName,
> @@ -527,7 +532,7 @@ apxServiceInstall(APXHANDLE hService, LP
> szImagePath,
> NULL,
> NULL,
> - lpDependencies ? lpDependencies : L"Tcpip\0Afd\0",
> + lpDependencies,
> NULL,
> NULL);
>
>
> Modified: commons/proper/daemon/trunk/src/native/windows/src/utils.c
> URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/utils.c?rev=1051146&r1=1051145&r2=1051146&view=diff
> ==============================================================================
> --- commons/proper/daemon/trunk/src/native/windows/src/utils.c (original)
> +++ commons/proper/daemon/trunk/src/native/windows/src/utils.c Mon Dec 20 15:35:15 2010
> @@ -256,7 +256,7 @@ LPWSTR apxMultiSzCombine(APXHANDLE hPool
> if (lb) {
> AplMoveMemory(&rv[la], lpStrB, lb * sizeof(WCHAR));
> }
> - if (*lpdwLength)
> + if (lpdwLength)
Is this a different bug fix?
> *lpdwLength = (la + lb + 1) * sizeof(WCHAR);
> return rv;
> }
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org