You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2017/11/03 09:12:04 UTC
svn commit: r1814147 - in /commons/proper/daemon/trunk/src/native/windows:
include/rprocess.h src/rprocess.c
Author: markt
Date: Fri Nov 3 09:12:04 2017
New Revision: 1814147
URL: http://svn.apache.org/viewvc?rev=1814147&view=rev
Log:
More unicode clean-up. It appears the use of apxCreateProcessW was hard-coded so this was all unused anyway.
Modified:
commons/proper/daemon/trunk/src/native/windows/include/rprocess.h
commons/proper/daemon/trunk/src/native/windows/src/rprocess.c
Modified: commons/proper/daemon/trunk/src/native/windows/include/rprocess.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/rprocess.h?rev=1814147&r1=1814146&r2=1814147&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/rprocess.h (original)
+++ commons/proper/daemon/trunk/src/native/windows/include/rprocess.h Fri Nov 3 09:12:04 2017
@@ -21,21 +21,11 @@ __APXBEGIN_DECLS
BOOL apxProcessExecute(APXHANDLE hProcess);
-APXHANDLE apxCreateProcessA(APXHANDLE hPool, DWORD dwOptions,
- LPAPXFNCALLBACK fnCallback,
- LPCSTR szUsername, LPCSTR szPassword,
- BOOL bLogonAsService);
APXHANDLE apxCreateProcessW(APXHANDLE hPool, DWORD dwOptions,
LPAPXFNCALLBACK fnCallback,
LPCWSTR szUsername, LPCWSTR szPassword,
BOOL bLogonAsService);
-#ifdef _UNICODE
-#define apxCreateProcess apxCreateProcessW
-#else
-#define apxCreateProcess apxCreateProcessA
-#endif
-
BOOL apxProcessSetExecutableA(APXHANDLE hProcess, LPCSTR szName);
BOOL apxProcessSetExecutableW(APXHANDLE hProcess, LPCWSTR szName);
Modified: commons/proper/daemon/trunk/src/native/windows/src/rprocess.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/rprocess.c?rev=1814147&r1=1814146&r2=1814147&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/rprocess.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/rprocess.c Fri Nov 3 09:12:04 2017
@@ -422,26 +422,6 @@ static BOOL __apxProcessCallback(APXHAND
return TRUE;
}
- APXHANDLE
-apxCreateProcessA(APXHANDLE hPool, DWORD dwOptions,
- LPAPXFNCALLBACK fnCallback,
- LPCSTR szUsername, LPCSTR szPassword,
- BOOL bLogonAsService)
-{
-
- if (szUsername && szPassword) {
- WCHAR wsUsername[256];
- WCHAR wsPassword[256];
- AsciiToWide(szUsername, wsUsername);
- AsciiToWide(szPassword, wsPassword);
- return apxCreateProcessW(hPool, dwOptions, fnCallback,
- wsUsername, wsPassword, bLogonAsService);
- }
- else
- return apxCreateProcessW(hPool, dwOptions, fnCallback,
- NULL, NULL, bLogonAsService);
-}
-
APXHANDLE
apxCreateProcessW(APXHANDLE hPool, DWORD dwOptions,
LPAPXFNCALLBACK fnCallback,