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

advapi32: Replace SERV_free by HeapFree.

This commit is contained in:
Lionel Debroux 2007-09-06 11:32:20 +02:00 committed by Alexandre Julliard
parent d7abb09b46
commit 82ef8d7239
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
dlls/advapi32/service.c
View File

@ -197,7 +197,9 @@ static void sc_handle_destroy_service(struct sc_handle *handle)
} }
/****************************************************************************** /******************************************************************************
* String management functions * String management functions (same behaviour as strdup)
* NOTE: the caller of those functions is responsible for calling HeapFree
* in order to release the memory allocated by those functions.
*/ */
static inline LPWSTR SERV_dup( LPCSTR str ) static inline LPWSTR SERV_dup( LPCSTR str )
{ {
@ -231,11 +233,6 @@ static inline LPWSTR SERV_dupmulti(LPCSTR str)
return wstr; return wstr;
} }
static inline VOID SERV_free( LPWSTR wstr )
{
HeapFree( GetProcessHeap(), 0, wstr );
}
/****************************************************************************** /******************************************************************************
* registry access functions and data * registry access functions and data
*/ */
@ -345,7 +342,7 @@ static HANDLE service_open_pipe(LPCWSTR service)
if (GetLastError() != ERROR_PIPE_BUSY) if (GetLastError() != ERROR_PIPE_BUSY)
break; break;
} while (WaitNamedPipeW(szPipe, NMPWAIT_WAIT_FOREVER)); } while (WaitNamedPipeW(szPipe, NMPWAIT_WAIT_FOREVER));
SERV_free(szPipe); HeapFree(GetProcessHeap(), 0, szPipe);
return handle; return handle;
} }
@ -366,7 +363,7 @@ static HANDLE service_get_event_handle(LPCWSTR service)
strcpyW(name, prefix); strcpyW(name, prefix);
strcatW(name, service); strcatW(name, service);
handle = CreateEventW(NULL, TRUE, FALSE, name); handle = CreateEventW(NULL, TRUE, FALSE, name);
SERV_free(name); HeapFree(GetProcessHeap(), 0, name);
return handle; return handle;
} }
@ -458,7 +455,7 @@ static BOOL service_handle_start(HANDLE pipe, service_data *service, DWORD count
goto end; goto end;
} }
SERV_free(service->args); HeapFree(GetProcessHeap(), 0, service->args);
service->args = args; service->args = args;
args = NULL; args = NULL;
service->thread = CreateThread( NULL, 0, service_thread, service->thread = CreateThread( NULL, 0, service_thread,
@ -688,7 +685,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg)
name = service_get_pipe_name(service->name); name = service_get_pipe_name(service->name);
pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX, pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX,
PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL );
SERV_free(name); HeapFree(GetProcessHeap(), 0, name);
/* let the process who started us know we've tried to create a pipe */ /* let the process who started us know we've tried to create a pipe */
event = service_get_event_handle(service->name); event = service_get_event_handle(service->name);
@ -921,7 +918,7 @@ RegisterServiceCtrlHandlerA( LPCSTR lpServiceName, LPHANDLER_FUNCTION lpfHandler
lpServiceNameW = SERV_dup(lpServiceName); lpServiceNameW = SERV_dup(lpServiceName);
ret = RegisterServiceCtrlHandlerW( lpServiceNameW, lpfHandler ); ret = RegisterServiceCtrlHandlerW( lpServiceNameW, lpfHandler );
SERV_free(lpServiceNameW); HeapFree(GetProcessHeap(), 0, lpServiceNameW);
return ret; return ret;
} }
@ -1011,8 +1008,8 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName,
lpMachineNameW = SERV_dup(lpMachineName); lpMachineNameW = SERV_dup(lpMachineName);
lpDatabaseNameW = SERV_dup(lpDatabaseName); lpDatabaseNameW = SERV_dup(lpDatabaseName);
ret = OpenSCManagerW(lpMachineNameW, lpDatabaseNameW, dwDesiredAccess); ret = OpenSCManagerW(lpMachineNameW, lpDatabaseNameW, dwDesiredAccess);
SERV_free(lpDatabaseNameW); HeapFree(GetProcessHeap(), 0, lpDatabaseNameW);
SERV_free(lpMachineNameW); HeapFree(GetProcessHeap(), 0, lpMachineNameW);
return ret; return ret;
} }
@ -1195,7 +1192,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
lpServiceNameW = SERV_dup(lpServiceName); lpServiceNameW = SERV_dup(lpServiceName);
ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess);
SERV_free(lpServiceNameW); HeapFree(GetProcessHeap(), 0, lpServiceNameW);
return ret; return ret;
} }
@ -1494,13 +1491,13 @@ CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
lpBinaryPathNameW, lpLoadOrderGroupW, lpdwTagId, lpBinaryPathNameW, lpLoadOrderGroupW, lpdwTagId,
lpDependenciesW, lpServiceStartNameW, lpPasswordW ); lpDependenciesW, lpServiceStartNameW, lpPasswordW );
SERV_free( lpServiceNameW ); HeapFree( GetProcessHeap(), 0, lpServiceNameW );
SERV_free( lpDisplayNameW ); HeapFree( GetProcessHeap(), 0, lpDisplayNameW );
SERV_free( lpBinaryPathNameW ); HeapFree( GetProcessHeap(), 0, lpBinaryPathNameW );
SERV_free( lpLoadOrderGroupW ); HeapFree( GetProcessHeap(), 0, lpLoadOrderGroupW );
SERV_free( lpDependenciesW ); HeapFree( GetProcessHeap(), 0, lpDependenciesW );
SERV_free( lpServiceStartNameW ); HeapFree( GetProcessHeap(), 0, lpServiceStartNameW );
SERV_free( lpPasswordW ); HeapFree( GetProcessHeap(), 0, lpPasswordW );
return r; return r;
} }
@ -1591,7 +1588,7 @@ BOOL WINAPI StartServiceA( SC_HANDLE hService, DWORD dwNumServiceArgs,
if (dwNumServiceArgs) if (dwNumServiceArgs)
{ {
for(i=0; i<dwNumServiceArgs; i++) for(i=0; i<dwNumServiceArgs; i++)
SERV_free(lpwstr[i]); HeapFree(GetProcessHeap(), 0, lpwstr[i]);
HeapFree(GetProcessHeap(), 0, lpwstr); HeapFree(GetProcessHeap(), 0, lpwstr);
} }
@ -2270,7 +2267,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
*lpcchBuffer = size; *lpcchBuffer = size;
HeapFree(GetProcessHeap(), 0, lpDisplayNameW); HeapFree(GetProcessHeap(), 0, lpDisplayNameW);
SERV_free(lpServiceNameW); HeapFree(GetProcessHeap(), 0, lpServiceNameW);
SetLastError(GLE); SetLastError(GLE);
return ret; return ret;
@ -2443,12 +2440,12 @@ BOOL WINAPI ChangeServiceConfigA( SC_HANDLE hService, DWORD dwServiceType,
wLoadOrderGroup, lpdwTagId, wDependencies, wLoadOrderGroup, lpdwTagId, wDependencies,
wServiceStartName, wPassword, wDisplayName); wServiceStartName, wPassword, wDisplayName);
SERV_free( wBinaryPathName ); HeapFree( GetProcessHeap(), 0, wBinaryPathName );
SERV_free( wLoadOrderGroup ); HeapFree( GetProcessHeap(), 0, wLoadOrderGroup );
SERV_free( wDependencies ); HeapFree( GetProcessHeap(), 0, wDependencies );
SERV_free( wServiceStartName ); HeapFree( GetProcessHeap(), 0, wServiceStartName );
SERV_free( wPassword ); HeapFree( GetProcessHeap(), 0, wPassword );
SERV_free( wDisplayName ); HeapFree( GetProcessHeap(), 0, wDisplayName );
return r; return r;
} }
@ -2472,7 +2469,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel,
r = ChangeServiceConfig2W( hService, dwInfoLevel, &sdw ); r = ChangeServiceConfig2W( hService, dwInfoLevel, &sdw );
SERV_free( sdw.lpDescription ); HeapFree( GetProcessHeap(), 0, sdw.lpDescription );
} }
else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS)
{ {
@ -2487,8 +2484,8 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel,
r = ChangeServiceConfig2W( hService, dwInfoLevel, &faw ); r = ChangeServiceConfig2W( hService, dwInfoLevel, &faw );
SERV_free( faw.lpRebootMsg ); HeapFree( GetProcessHeap(), 0, faw.lpRebootMsg );
SERV_free( faw.lpCommand ); HeapFree( GetProcessHeap(), 0, faw.lpCommand );
} }
else else
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );