Author: janderwald Date: Sat Dec 9 12:07:15 2006 New Revision: 25097
URL: http://svn.reactos.org/svn/reactos?rev=25097&view=rev Log: - various msvc fixes * inline -> __inline * use msvc generated interface name * fix duplicate definition of ElfrRegisterEventSourceA -> ElfrRegisterEventSourceW * fix memory leak in ElfrOpenELA
Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c
Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/even... ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h (original) +++ trunk/reactos/base/services/eventlog/eventlog.h Sat Dec 9 12:07:15 2006 @@ -154,7 +154,7 @@ DWORD dwDataSize, LPVOID lpRawData);
-inline void LogfFreeRecord(LPVOID Rec); +void __inline LogfFreeRecord(LPVOID Rec);
/* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header);
Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/file... ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Sat Dec 9 12:07:15 2006 @@ -859,7 +859,7 @@ return Buffer; }
-inline void LogfFreeRecord(LPVOID Rec) +void __inline LogfFreeRecord(LPVOID Rec) { HeapFree(MyHeap, 0, Rec); }
Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc.... ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c (original) +++ trunk/reactos/base/services/eventlog/rpc.c Sat Dec 9 12:07:15 2006 @@ -22,8 +22,11 @@ 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 @@
/* 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 @@ if(ServerName && !RtlCreateUnicodeStringFromAsciiz(&servername, ServerName)) { - RtlFreeUnicodeString(&servername); + RtlFreeUnicodeString(&logname); return STATUS_NO_MEMORY; }