ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed some Unicode -> Ascii cross-calls.

This commit is contained in:
Matthew Davison 2003-01-24 00:45:51 +00:00 committed by Alexandre Julliard
parent f2710545ba
commit 620323e294
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/advapi32/service.c
View File

@ -133,13 +133,16 @@ StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent )
BOOL WINAPI BOOL WINAPI
StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent ) StartServiceCtrlDispatcherW( LPSERVICE_TABLE_ENTRYW servent )
{ {
static const WCHAR _ServiceStartDataW[] = {'A','D','V','A','P','I','_','S',
'e','r','v','i','c','e','S','t',
'a','r','t','D','a','t','a',0};
LPSERVICE_MAIN_FUNCTIONW fpMain; LPSERVICE_MAIN_FUNCTIONW fpMain;
HANDLE wait; HANDLE wait;
DWORD dwNumServiceArgs ; DWORD dwNumServiceArgs ;
LPWSTR *lpServiceArgVectors ; LPWSTR *lpServiceArgVectors ;
TRACE("(%p)\n", servent); TRACE("(%p)\n", servent);
wait = OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, FALSE, "ADVAPI32_ServiceStartData"); wait = OpenSemaphoreW(SEMAPHORE_ALL_ACCESS, FALSE, _ServiceStartDataW);
if(wait == 0) if(wait == 0)
{ {
ERR("Couldn't find wait semaphore\n"); ERR("Couldn't find wait semaphore\n");
@ -603,37 +606,45 @@ BOOL WINAPI
StartServiceW( SC_HANDLE hService, DWORD dwNumServiceArgs, StartServiceW( SC_HANDLE hService, DWORD dwNumServiceArgs,
LPCWSTR *lpServiceArgVectors ) LPCWSTR *lpServiceArgVectors )
{ {
CHAR path[MAX_PATH],str[MAX_PATH]; static const WCHAR _ServiceStartDataW[] = {'A','D','V','A','P','I','_','S',
'e','r','v','i','c','e','S','t',
'a','r','t','D','a','t','a',0};
static const WCHAR _WaitServiceStartW[] = {'A','D','V','A','P','I','_','W',
'a','i','t','S','e','r','v','i',
'c','e','S','t','a','r','t',0};
static const WCHAR _ImagePathW[] = {'I','m','a','g','e','P','a','t','h',0};
WCHAR path[MAX_PATH],str[MAX_PATH];
DWORD type,size; DWORD type,size;
long r; long r;
HANDLE data,wait; HANDLE data,wait;
PROCESS_INFORMATION procinfo; PROCESS_INFORMATION procinfo;
STARTUPINFOA startupinfo; STARTUPINFOW startupinfo;
TRACE("(%p,%ld,%p)\n",hService,dwNumServiceArgs, TRACE("(%p,%ld,%p)\n",hService,dwNumServiceArgs,
lpServiceArgVectors); lpServiceArgVectors);
size = sizeof str; size = sizeof str;
r = RegQueryValueExA(hService, "ImagePath", NULL, &type, (LPVOID)str, &size); r = RegQueryValueExW(hService, _ImagePathW, NULL, &type, (LPVOID)str, &size);
if (r!=ERROR_SUCCESS) if (r!=ERROR_SUCCESS)
return FALSE; return FALSE;
ExpandEnvironmentStringsA(str,path,sizeof path); ExpandEnvironmentStringsW(str,path,sizeof path);
TRACE("Starting service %s\n", debugstr_a(path) ); TRACE("Starting service %s\n", debugstr_w(path) );
data = CreateSemaphoreA(NULL,1,1,"ADVAPI32_ServiceStartData"); data = CreateSemaphoreW(NULL,1,1,_ServiceStartDataW);
if (!data) if (!data)
{ {
data = OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, FALSE, "ADVAPI32_ServiceStartData"); data = OpenSemaphoreW(SEMAPHORE_ALL_ACCESS, FALSE, _ServiceStartDataW);
if(data == 0) if(data == 0)
{ {
ERR("Couldn't create data semaphore\n"); ERR("Couldn't create data semaphore\n");
return FALSE; return FALSE;
} }
} }
wait = CreateSemaphoreA(NULL,0,1,"ADVAPI32_WaitServiceStart"); wait = CreateSemaphoreW(NULL,0,1,_WaitServiceStartW);
{ {
wait = OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, FALSE, "ADVAPI32_ServiceStartData"); wait = OpenSemaphoreW(SEMAPHORE_ALL_ACCESS, FALSE, _ServiceStartDataW);
if(wait == 0) if(wait == 0)
{ {
ERR("Couldn't create wait semaphore\n"); ERR("Couldn't create wait semaphore\n");
@ -658,10 +669,10 @@ StartServiceW( SC_HANDLE hService, DWORD dwNumServiceArgs,
start_dwNumServiceArgs = dwNumServiceArgs; start_dwNumServiceArgs = dwNumServiceArgs;
start_lpServiceArgVectors = (LPWSTR *)lpServiceArgVectors; start_lpServiceArgVectors = (LPWSTR *)lpServiceArgVectors;
ZeroMemory(&startupinfo,sizeof(STARTUPINFOA)); ZeroMemory(&startupinfo,sizeof(STARTUPINFOW));
startupinfo.cb = sizeof(STARTUPINFOA); startupinfo.cb = sizeof(STARTUPINFOW);
r = CreateProcessA(path, r = CreateProcessW(path,
NULL, NULL,
NULL, /* process security attribs */ NULL, /* process security attribs */
NULL, /* thread security attribs */ NULL, /* thread security attribs */