- various msvc fixes

* inline -> __inline
 * use msvc generated interface name
 * fix duplicate definition of ElfrRegisterEventSourceA -> ElfrRegisterEventSourceW
 * fix memory leak in ElfrOpenELA 

svn path=/trunk/; revision=25097
This commit is contained in:
Johannes Anderwald 2006-12-09 09:07:15 +00:00
parent 880ee116c3
commit 659dc2230c
3 changed files with 11 additions and 8 deletions

View file

@ -154,7 +154,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
DWORD dwDataSize,
LPVOID lpRawData);
inline void LogfFreeRecord(LPVOID Rec);
void __inline LogfFreeRecord(LPVOID Rec);
/* eventlog.c */
VOID PRINT_HEADER(PFILE_HEADER header);

View file

@ -859,7 +859,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
return Buffer;
}
inline void LogfFreeRecord(LPVOID Rec)
void __inline LogfFreeRecord(LPVOID Rec)
{
HeapFree(MyHeap, 0, Rec);
}

View file

@ -22,8 +22,11 @@ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter)
DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status);
return 0;
}
#ifdef _MSC_VER
Status = RpcServerRegisterIf(eventlog_v0_0_s_ifspec, NULL, NULL);
#else
Status = RpcServerRegisterIf(eventlog_ServerIfHandle, NULL, NULL);
#endif
if(Status != RPC_S_OK)
{
@ -121,10 +124,10 @@ NTSTATUS ElfrOpenELW(
/* Function 8 */
NTSTATUS ElfrRegisterEventSourceA(
/* [unique][in] */ LPSTR ServerName,
/* [in] */ PANSI_STRING LogName,
/* [in] */ PANSI_STRING NullStr,
NTSTATUS ElfrRegisterEventSourceW(
/* [unique][in] */ LPWSTR ServerName,
/* [in] */ PUNICODE_STRING LogName,
/* [in] */ PUNICODE_STRING NullStr,
/* [in] */ long MajorVer,
/* [in] */ long MinorVer,
/* [out] */ PLOGHANDLE Handle)
@ -224,7 +227,7 @@ NTSTATUS ElfrOpenELA(
if(ServerName &&
!RtlCreateUnicodeStringFromAsciiz(&servername, ServerName))
{
RtlFreeUnicodeString(&servername);
RtlFreeUnicodeString(&logname);
return STATUS_NO_MEMORY;
}