Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 37124: - Release the guarded mutex before we return
by cgutman＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: cgutman Date: Fri Oct 31 19:36:24 2008 New Revision: 37124 URL: http://svn.reactos.org/svn/reactos?rev=37124&view=rev Log: - Release the guarded mutex before we return Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpnoti… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpnotify.c [iso-8859-1] Fri Oct 31 19:36:24 2008 @@ -96,6 +96,7 @@ default: { DPRINT1("IopNotifyPlugPlayNotification(): unknown EventCategory 0x%x UNIMPLEMENTED\n", EventCategory); + KeReleaseGuardedMutex(&PnpNotifyListLock); return; } }

1 0

[sserapion] 37123: Fix explorer build a bit more.
by sserapion＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sserapion Date: Fri Oct 31 19:31:10 2008 New Revision: 37123 URL: http://svn.reactos.org/svn/reactos?rev=37123&view=rev Log: Fix explorer build a bit more. Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h Modified: branches/ros-amd64-bringup/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/time.h [iso-8859-1] Fri Oct 31 19:31:10 2008 @@ -119,10 +119,10 @@ #define CLOCKS_PER_SEC 1000 - _CRTIMP int _daylight; - _CRTIMP long _dstbias; - _CRTIMP long _timezone; - _CRTIMP char * _tzname[2]; + __MINGW_IMPORT int _daylight; + __MINGW_IMPORT long _dstbias; + __MINGW_IMPORT long _timezone; + __MINGW_IMPORT char * _tzname[2]; _CRTIMP errno_t __cdecl _get_daylight(int *_Daylight); _CRTIMP errno_t __cdecl _get_dstbias(long *_Daylight_savings_bias);

1 0

[sserapion] 37122: Fix explorer build a bit.
by sserapion＠svn.reactos.org 01 Nov '08

01 Nov '08

Author: sserapion Date: Fri Oct 31 19:30:48 2008 New Revision: 37122 URL: http://svn.reactos.org/svn/reactos?rev=37122&view=rev Log: Fix explorer build a bit. Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] Fri Oct 31 19:30:48 2008 @@ -148,8 +148,8 @@ w32fd.nFileSizeLow = e.size; // convert date/time attribute into FILETIME - const fdate& date = e.date; - const ftime& time = e.time; + const filedate& date = e.date; + const filetime& time = e.time; SYSTEMTIME stime; FILETIME ftime; Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/shell/fatfs.h [iso-8859-1] Fri Oct 31 19:30:48 2008 @@ -118,13 +118,13 @@ }; -struct ftime { +struct filetime { WORD sec2 : 5; WORD min : 6; WORD hour : 5; }; -struct fdate { +struct filedate { WORD day : 5; WORD month : 4; WORD year : 7; @@ -150,15 +150,15 @@ char ext[3]; char attr; char rsrvd[10]; - struct ftime time; - struct fdate date; + struct filetime time; + struct filedate date; WORD fclus; DWORD size; }; union DEntry { DEntry_E E; - BYTE B[8+3+1+10+sizeof(struct ftime)+sizeof(struct fdate)+sizeof(WORD)+sizeof(DWORD)]; + BYTE B[8+3+1+10+sizeof(struct filetime)+sizeof(struct filedate)+sizeof(WORD)+sizeof(DWORD)]; }; #pragma pack(pop)

1 0

[cgutman] 37121: - Fix the check for too many devices
by cgutman＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: cgutman Date: Fri Oct 31 18:59:49 2008 New Revision: 37121 URL: http://svn.reactos.org/svn/reactos?rev=37121&view=rev Log: - Fix the check for too many devices Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Fri Oct 31 18:59:49 2008 @@ -162,7 +162,7 @@ if (Status == STATUS_NO_SUCH_DEVICE) break; } - if (i > 9999) + if (i == 9999) { DPRINT1("Too much legacy devices reported for service '%wZ'\n", &LocalServiceName); Status = STATUS_INSUFFICIENT_RESOURCES;

1 0

[cgutman] 37120: - We already do this in the SEH block. No need to do it twice.
by cgutman＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: cgutman Date: Fri Oct 31 18:34:54 2008 New Revision: 37120 URL: http://svn.reactos.org/svn/reactos?rev=37120&view=rev Log: - We already do this in the SEH block. No need to do it twice. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Fri Oct 31 18:34:54 2008 @@ -529,19 +529,17 @@ DeviceNode = IopGetDeviceNode(DeviceObject); - DepthData->Depth = DeviceNode->Level; + _SEH_TRY + { + DepthData->Depth = DeviceNode->Level; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; ObDereferenceObject(DeviceObject); - - _SEH_TRY - { - DepthData->Depth = DeviceNode->Level; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; return Status; }

1 0

[janderwald] 37119: - Include zero byte in byte count to NtSetValueKey
by janderwald＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: janderwald Date: Fri Oct 31 18:34:34 2008 New Revision: 37119 URL: http://svn.reactos.org/svn/reactos?rev=37119&view=rev Log: - Include zero byte in byte count to NtSetValueKey Modified: trunk/reactos/base/setup/usetup/registry.c Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Fri Oct 31 18:34:34 2008 @@ -679,7 +679,7 @@ 0, REG_SZ, (PVOID)InstallPath->Buffer, - InstallPath->Length); + InstallPath->Length + sizeof(WCHAR)); NtClose(KeyHandle); if (!NT_SUCCESS(Status)) {

1 0

[janderwald] 37118: - Include zero byte in byte count to NtSetValueKey
by janderwald＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: janderwald Date: Fri Oct 31 18:21:15 2008 New Revision: 37118 URL: http://svn.reactos.org/svn/reactos?rev=37118&view=rev Log: - Include zero byte in byte count to NtSetValueKey Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Fri Oct 31 18:21:15 2008 @@ -403,7 +403,7 @@ 0, REG_SZ, (PVOID)MuiLayouts[uIndex].LayoutID, - wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -420,7 +420,7 @@ 0, REG_SZ, (PVOID)szLangID, - wcslen(szLangID) * sizeof(WCHAR)); + (wcslen(szLangID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -436,7 +436,7 @@ 0, REG_SZ, (PVOID)MuiLayouts[uIndex].LayoutID, - wcslen(MuiLayouts[uIndex].LayoutID) * sizeof(WCHAR)); + (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); @@ -513,7 +513,7 @@ 0, REG_SZ, (PVOID)ACPage, - wcslen(ACPage) * sizeof(PWCHAR)); + (wcslen(ACPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -528,7 +528,7 @@ 0, REG_SZ, (PVOID)OEMCPage, - wcslen(OEMCPage) * sizeof(PWCHAR)); + (wcslen(OEMCPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -543,7 +543,7 @@ 0, REG_SZ, (PVOID)MACCPage, - wcslen(MACCPage) * sizeof(PWCHAR)); + (wcslen(MACCPage)+1) * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);

1 0

[ekohl] 37117: Pass machine name to RpcStringBindingComposeA/W properly.
by ekohl＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: ekohl Date: Fri Oct 31 17:21:34 2008 New Revision: 37117 URL: http://svn.reactos.org/svn/reactos?rev=37117&view=rev Log: Pass machine name to RpcStringBindingComposeA/W properly. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Fri Oct 31 17:21:34 2008 @@ -26,9 +26,9 @@ TRACE("PLSAPR_SERVER_NAME_bind() called\n"); - status = RpcStringBindingComposeW(pszSystemName, + status = RpcStringBindingComposeW(NULL, L"ncacn_np", - NULL, + pszSystemName, L"\\pipe\\lsarpc", NULL, &pszStringBinding); Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Oct 31 17:21:34 2008 @@ -30,9 +30,9 @@ TRACE("SVCCTL_HANDLEA_bind() called\n"); - status = RpcStringBindingComposeA((UCHAR *)szMachineName, + status = RpcStringBindingComposeA(NULL, (UCHAR *)"ncacn_np", - NULL, + (UCHAR *)szMachineName, (UCHAR *)"\\pipe\\ntsvcs", NULL, (UCHAR **)&pszStringBinding); @@ -85,9 +85,9 @@ TRACE("SVCCTL_HANDLEW_bind() called\n"); - status = RpcStringBindingComposeW(szMachineName, + status = RpcStringBindingComposeW(NULL, L"ncacn_np", - NULL, + szMachineName, L"\\pipe\\ntsvcs", NULL, &pszStringBinding);

1 0

[ekohl] 37116: EVENTLOG: - Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. - Add workarounds to eventlogrpc.idl because WIDL is not yet able to handle attributes in typedefs correctly.
by ekohl＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: ekohl Date: Fri Oct 31 17:18:12 2008 New Revision: 37116 URL: http://svn.reactos.org/svn/reactos?rev=37116&view=rev Log: EVENTLOG: - Get rid of the globally created binding handle and use the WIDL-generated custom binding handles and context handles instead. - Add workarounds to eventlogrpc.idl because WIDL is not yet able to handle attributes in typedefs correctly. Modified: trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/rpc.c trunk/reactos/include/reactos/idl/eventlogrpc.idl 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 [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Fri Oct 31 17:18:12 2008 @@ -44,7 +44,6 @@ /* Function 0 */ NTSTATUS ElfrClearELFW( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { @@ -55,7 +54,6 @@ /* Function 1 */ NTSTATUS ElfrBackupELFW( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_UNICODE_STRING BackupFileName) { @@ -66,7 +64,6 @@ /* Function 2 */ NTSTATUS ElfrCloseEL( - handle_t BindingHandle, IELF_HANDLE *LogHandle) { UNIMPLEMENTED; @@ -76,7 +73,6 @@ /* Function 3 */ NTSTATUS ElfrDeregisterEventSource( - handle_t BindingHandle, IELF_HANDLE *LogHandle) { UNIMPLEMENTED; @@ -86,7 +82,6 @@ /* Function 4 */ NTSTATUS ElfrNumberOfRecords( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD *NumberOfRecords) { @@ -97,7 +92,6 @@ /* Function 5 */ NTSTATUS ElfrOldestRecord( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD *OldestRecordNumber) { @@ -108,7 +102,6 @@ /* Function 6 */ NTSTATUS ElfrChangeNotify( - handle_t BindingHandle, IELF_HANDLE *LogHandle, RPC_CLIENT_ID ClientId, DWORD Event) @@ -120,7 +113,6 @@ /* Function 7 */ NTSTATUS ElfrOpenELW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING ModuleName, PRPC_UNICODE_STRING RegModuleName, @@ -136,7 +128,6 @@ /* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING ModuleName, PRPC_UNICODE_STRING RegModuleName, @@ -152,7 +143,6 @@ /* Function 9 */ NTSTATUS ElfrOpenBELW( - handle_t BindingHandle, EVENTLOG_HANDLE_W UNCServerName, PRPC_UNICODE_STRING BackupFileName, DWORD MajorVersion, @@ -166,7 +156,6 @@ /* Function 10 */ NTSTATUS ElfrReadELW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD ReadFlags, DWORD RecordOffset, @@ -182,7 +171,6 @@ /* Function 11 */ NTSTATUS ElfrReportEventW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, @@ -233,7 +221,6 @@ /* Function 12 */ NTSTATUS ElfrClearELFA( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { @@ -244,7 +231,6 @@ /* Function 13 */ NTSTATUS ElfrBackupELFA( - handle_t BindingHandle, IELF_HANDLE LogHandle, PRPC_STRING BackupFileName) { @@ -255,7 +241,6 @@ /* Function 14 */ NTSTATUS ElfrOpenELA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING ModuleName, PRPC_STRING RegModuleName, @@ -290,7 +275,6 @@ } Status = ElfrOpenELW( - BindingHandle, UNCServerName ? UNCServerNameW.Buffer : NULL, ModuleName ? (PRPC_UNICODE_STRING)&ModuleNameW : NULL, RegModuleName ? (PRPC_UNICODE_STRING)&RegModuleNameW : NULL, @@ -308,7 +292,6 @@ /* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING ModuleName, PRPC_STRING RegModuleName, @@ -323,7 +306,6 @@ /* Function 16 */ NTSTATUS ElfrOpenBELA( - handle_t BindingHandle, EVENTLOG_HANDLE_A UNCServerName, PRPC_STRING BackupFileName, DWORD MajorVersion, @@ -337,7 +319,6 @@ /* Function 17 */ NTSTATUS ElfrReadELA( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD ReadFlags, DWORD RecordOffset, @@ -353,7 +334,6 @@ /* Function 18 */ NTSTATUS ElfrReportEventA( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, @@ -403,7 +383,6 @@ /* Function 22 */ NTSTATUS ElfrGetLogInformation( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD InfoLevel, BYTE *Buffer, @@ -417,7 +396,6 @@ /* Function 23 */ NTSTATUS ElfrFlushEL( - handle_t BindingHandle, IELF_HANDLE LogHandle) { UNIMPLEMENTED; @@ -427,7 +405,6 @@ /* Function 24 */ NTSTATUS ElfrReportEventAndSourceW( - handle_t BindingHandle, IELF_HANDLE LogHandle, DWORD Time, USHORT EventType, Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Fri Oct 31 17:18:12 2008 @@ -27,14 +27,118 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); WINE_DECLARE_DEBUG_CHANNEL(eventlog); -typedef struct _LOG_INFO -{ - RPC_BINDING_HANDLE BindingHandle; - IELF_HANDLE LogHandle; - BOOL bLocal; -} LOG_INFO, *PLOG_INFO; - static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; + + +handle_t __RPC_USER +EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) +{ + handle_t hBinding = NULL; + UCHAR *pszStringBinding; + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_A_bind() called\n"); + + status = RpcStringBindingComposeA(NULL, + (UCHAR *)"ncacn_np", + (UCHAR *)UNCServerName, + (UCHAR *)"\\pipe\\ntsvcs", + NULL, + (UCHAR **)&pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingA(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeA(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +EVENTLOG_HANDLE_A_unbind(EVENTLOG_HANDLE_A UNCServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_A_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +EVENTLOG_HANDLE_W_bind(EVENTLOG_HANDLE_W UNCServerName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_W_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (LPWSTR)UNCServerName, + L"\\pipe\\EventLog", + NULL, + &pszStringBinding); + if (status) + { + ERR("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +EVENTLOG_HANDLE_W_unbind(EVENTLOG_HANDLE_W UNCServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("EVENTLOG_HANDLE_W_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + /****************************************************************************** * BackupEventLogA [ADVAPI32.@] @@ -43,9 +147,8 @@ BackupEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -53,15 +156,7 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrBackupELFA(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrBackupELFA(hEventLog, &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -83,9 +178,8 @@ BackupEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); @@ -93,15 +187,7 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrBackupELFW(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrBackupELFW(hEventLog, &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -120,9 +206,8 @@ ClearEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -130,15 +215,7 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? strlen(lpBackupFileName) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrClearELFA(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrClearELFA(hEventLog, &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -157,9 +234,8 @@ ClearEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING BackupFileName; + NTSTATUS Status; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); @@ -167,15 +243,7 @@ BackupFileName.Length = BackupFileName.MaximumLength = lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrClearELFW(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrClearELFW(hEventLog, &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -193,35 +261,16 @@ BOOL WINAPI CloseEventLog(IN HANDLE hEventLog) { - PLOG_INFO pLog; NTSTATUS Status; TRACE("%p\n", hEventLog); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - return TRUE; - - if (pLog->bLocal == FALSE) - { - if (!EvtUnbindRpc(pLog->BindingHandle)) - { - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - } - else - { - Status = ElfrCloseEL(pLog->BindingHandle, - &pLog->LogHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - HeapFree(GetProcessHeap(), 0, pLog); + Status = ElfrCloseEL(&hEventLog); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -239,17 +288,11 @@ BOOL WINAPI DeregisterEventSource(IN HANDLE hEventLog) { - PLOG_INFO pLog; NTSTATUS Status; TRACE("%p\n", hEventLog); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - return TRUE; - - Status = ElfrDeregisterEventSource(pLog->BindingHandle, - &pLog->LogHandle); + Status = ElfrDeregisterEventSource(&hEventLog); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -271,21 +314,12 @@ GetNumberOfEventLogRecords(IN HANDLE hEventLog, OUT PDWORD NumberOfRecords) { - PLOG_INFO pLog; NTSTATUS Status; DWORD Records; TRACE("%p, %p\n", hEventLog, NumberOfRecords); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrNumberOfRecords(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrNumberOfRecords(hEventLog, &Records); if (!NT_SUCCESS(Status)) { @@ -310,21 +344,12 @@ GetOldestEventLogRecord(IN HANDLE hEventLog, OUT PDWORD OldestRecord) { - PLOG_INFO pLog; NTSTATUS Status; DWORD Oldest; TRACE("%p, %p\n", hEventLog, OldestRecord); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrOldestRecord(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrOldestRecord(hEventLog, &Oldest); if (!NT_SUCCESS(Status)) { @@ -403,9 +428,9 @@ OpenBackupEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpFileName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING FileName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpFileName)); @@ -413,52 +438,18 @@ FileName.Length = FileName.MaximumLength = lpFileName ? wcslen(lpFileName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) - { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } - } - else - { - pLog->bLocal = FALSE; - - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrOpenBELW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, + Status = ElfrOpenBELW((LPWSTR)lpUNCServerName, &FileName, 0, 0, - &pLog->LogHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); - return NULL; - } - - return pLog; + &LogHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return NULL; + } + + return (HANDLE)LogHandle; } @@ -507,9 +498,9 @@ OpenEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING SourceName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); @@ -517,53 +508,19 @@ SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) - { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } - } - else - { - pLog->bLocal = FALSE; - - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrOpenELW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, + Status = ElfrOpenELW((LPWSTR)lpUNCServerName, &SourceName, &EmptyString, 0, 0, - &pLog->LogHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); - return NULL; - } - - return pLog; + &LogHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return NULL; + } + + return (HANDLE)LogHandle; } @@ -579,7 +536,6 @@ OUT DWORD *pnBytesRead, OUT DWORD *pnMinNumberOfBytesNeeded) { - PLOG_INFO pLog; NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; @@ -587,15 +543,7 @@ hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrReadELA(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrReadELA(hEventLog, dwReadFlags, dwRecordOffset, nNumberOfBytesToRead, @@ -636,7 +584,6 @@ OUT DWORD *pnBytesRead, OUT DWORD *pnMinNumberOfBytesNeeded) { - PLOG_INFO pLog; NTSTATUS Status; DWORD bytesRead, minNumberOfBytesNeeded; @@ -644,15 +591,7 @@ hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = ElfrReadELW(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrReadELW(hEventLog, dwReadFlags, dwRecordOffset, nNumberOfBytesToRead, @@ -724,9 +663,9 @@ RegisterEventSourceW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - PLOG_INFO pLog; - NTSTATUS Status; RPC_UNICODE_STRING SourceName; + IELF_HANDLE LogHandle; + NTSTATUS Status; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); @@ -734,53 +673,19 @@ SourceName.Length = SourceName.MaximumLength = lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; - pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); - if (!pLog) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - ZeroMemory(pLog, sizeof(LOG_INFO)); - - if (lpUNCServerName == NULL || *lpUNCServerName == 0) - { - pLog->bLocal = TRUE; - - if (!EvtGetLocalHandle(&pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_GEN_FAILURE); - return NULL; - } - } - else - { - pLog->bLocal = FALSE; - - if (!EvtBindRpc(lpUNCServerName, &pLog->BindingHandle)) - { - HeapFree(GetProcessHeap(), 0, pLog); - SetLastError(ERROR_INVALID_COMPUTERNAME); - return NULL; - } - } - - Status = ElfrRegisterEventSourceW(pLog->BindingHandle, - (LPWSTR)lpUNCServerName, + Status = ElfrRegisterEventSourceW((LPWSTR)lpUNCServerName, &SourceName, &EmptyString, 0, 0, - &pLog->LogHandle); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - HeapFree(GetProcessHeap(), 0, pLog); - return NULL; - } - - return pLog; + &LogHandle); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return NULL; + } + + return (HANDLE)LogHandle; } @@ -882,7 +787,6 @@ IN LPVOID lpRawData) { #if 0 - PLOG_INFO pLog; NTSTATUS Status; UNICODE_STRING *Strings; WORD i; @@ -890,13 +794,6 @@ TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); - - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } Strings = HeapAlloc(GetProcessHeap(), 0, @@ -910,8 +807,7 @@ for (i = 0; i < wNumStrings; i++) RtlInitUnicodeString(&Strings[i], lpStrings[i]); - Status = ElfrReportEventW(pLog->BindingHandle, - pLog->LogHandle, + Status = ElfrReportEventW(hEventLog, 0, /* FIXME: Time */ wType, wCategory, Modified: trunk/reactos/dll/win32/advapi32/service/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/rpc.c [iso-8859-1] Fri Oct 31 17:18:12 2008 @@ -10,69 +10,6 @@ #include <advapi32.h> -static RPC_BINDING_HANDLE LocalBindingHandle = NULL; - -RPC_STATUS -EvtBindRpc(LPCWSTR pszMachine, - RPC_BINDING_HANDLE* BindingHandle) -{ - PWSTR pszStringBinding = NULL; - RPC_STATUS Status; - - Status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - (LPWSTR)pszMachine, - L"\\pipe\\EventLog", - NULL, - &pszStringBinding); - if (Status != RPC_S_OK) - return Status; - - Status = RpcBindingFromStringBindingW(pszStringBinding, - BindingHandle); - - RpcStringFreeW(&pszStringBinding); - - return Status; -} - -RPC_STATUS -EvtUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) -{ - if (BindingHandle != NULL) - { - RpcBindingFree(*BindingHandle); - *BindingHandle = NULL; - } - - return RPC_S_OK; -} - -BOOL -EvtGetLocalHandle(RPC_BINDING_HANDLE *BindingHandle) -{ - if (LocalBindingHandle != NULL) - { - if (BindingHandle != NULL) - *BindingHandle = LocalBindingHandle; - - return TRUE; - } - - if (EvtBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) - return FALSE; - - if (BindingHandle != NULL) - *BindingHandle = LocalBindingHandle; - - return TRUE; -} - -RPC_STATUS -EvtUnbindLocalHandle(VOID) -{ - return EvtUnbindRpc(&LocalBindingHandle); -} void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Fri Oct 31 17:18:12 2008 @@ -17,10 +17,10 @@ [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; } RPC_STRING, *PRPC_STRING; -typedef /*[context_handle]*/ unsigned long IELF_HANDLE; +typedef [context_handle] PVOID IELF_HANDLE; typedef IELF_HANDLE *PIELF_HANDLE; -typedef /*[handle, unique]*/ LPWSTR EVENTLOG_HANDLE_W; -typedef /*[handle, unique]*/ LPSTR EVENTLOG_HANDLE_A; +typedef [handle, unique] LPWSTR EVENTLOG_HANDLE_W; +typedef [handle, unique] LPSTR EVENTLOG_HANDLE_A; typedef struct _RPC_CLIENT_ID { DWORD UniqueProcess; @@ -40,65 +40,41 @@ { /* Function 0 */ NTSTATUS ElfrClearELFW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_UNICODE_STRING BackupFileName); /* Function 1 */ NTSTATUS ElfrBackupELFW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_UNICODE_STRING BackupFileName); /* Function 2 */ NTSTATUS ElfrCloseEL( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in, out] IELF_HANDLE *LogHandle); /* Function 3 */ NTSTATUS ElfrDeregisterEventSource( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in, out] IELF_HANDLE *LogHandle); /* Function 4 */ NTSTATUS ElfrNumberOfRecords( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [out] DWORD *NumberOfRecords); /* Function 5 */ NTSTATUS ElfrOldestRecord( -#ifndef __midl - handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [out] DWORD *OldestRecordNumber); /* Function 6 */ NTSTATUS ElfrChangeNotify( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE *LogHandle, [in] RPC_CLIENT_ID ClientId, [in] DWORD Event); /* Function 7 */ NTSTATUS ElfrOpenELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING ModuleName, [in] PRPC_UNICODE_STRING RegModuleName, [in] DWORD MajorVersion, @@ -107,10 +83,7 @@ /* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING ModuleName, [in] PRPC_UNICODE_STRING RegModuleName, [in] DWORD MajorVersion, @@ -119,10 +92,7 @@ /* Function 9 */ NTSTATUS ElfrOpenBELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_W UNCServerName, + [in, unique] EVENTLOG_HANDLE_W UNCServerName, /* FIXME */ [in] PRPC_UNICODE_STRING BackupFileName, [in] DWORD MajorVersion, [in] DWORD MinorVersion, @@ -130,9 +100,6 @@ /* Function 10 */ NTSTATUS ElfrReadELW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD ReadFlags, [in] DWORD RecordOffset, @@ -143,9 +110,6 @@ /* Function 11 */ NTSTATUS ElfrReportEventW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType, @@ -163,26 +127,17 @@ /* Function 12 */ NTSTATUS ElfrClearELFA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_STRING BackupFileName); /* Function 13 */ NTSTATUS ElfrBackupELFA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in, unique] PRPC_STRING BackupFileName); /* Function 14 */ NTSTATUS ElfrOpenELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING ModuleName, [in] PRPC_STRING RegModuleName, [in] DWORD MajorVersion, @@ -191,10 +146,7 @@ /* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING ModuleName, [in] PRPC_STRING RegModuleName, [in] DWORD MajorVersion, @@ -203,10 +155,7 @@ /* Function 16 */ NTSTATUS ElfrOpenBELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif - [in] EVENTLOG_HANDLE_A UNCServerName, + [in, unique] EVENTLOG_HANDLE_A UNCServerName, /* FIXME */ [in] PRPC_STRING BackupFileName, [in] DWORD MajorVersion, [in] DWORD MinorVersion, @@ -214,9 +163,6 @@ /* Function 17 */ NTSTATUS ElfrReadELA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD ReadFlags, [in] DWORD RecordOffset, @@ -227,9 +173,6 @@ /* Function 18 */ NTSTATUS ElfrReportEventA( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType, @@ -268,9 +211,6 @@ /* Function 22 */ NTSTATUS ElfrGetLogInformation( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD InfoLevel, [out, size_is(cbBufSize)] BYTE *Buffer, @@ -279,16 +219,10 @@ /* Function 23 */ NTSTATUS ElfrFlushEL( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle); /* Function 24 */ NTSTATUS ElfrReportEventAndSourceW( -#ifndef __midl - [in] handle_t BindingHandle, -#endif [in] IELF_HANDLE LogHandle, [in] DWORD Time, [in] USHORT EventType,

1 0

[tkreuzer] 37115: merge 35742, 35773, 35780, 35824, 35969, 36725, 36952 from amd64 branch
by tkreuzer＠svn.reactos.org 31 Oct '08

31 Oct '08

Author: tkreuzer Date: Fri Oct 31 16:28:09 2008 New Revision: 37115 URL: http://svn.reactos.org/svn/reactos?rev=37115&view=rev Log: merge 35742,35773,35780,35824,35969,36725,36952 from amd64 branch Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ddk/winnt4.h trunk/reactos/include/ndk/cmtypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -3631,6 +3631,8 @@ IN BOOLEAN AllowRawMount ); +#if !defined (_M_AMD64) + NTHALAPI KIRQL FASTCALL @@ -3645,6 +3647,51 @@ IN KSPIN_LOCK_QUEUE_NUMBER Number, IN KIRQL OldIrql ); + +NTHALAPI +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock +); + +NTHALAPI +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock( + KSPIN_LOCK_QUEUE_NUMBER Number, + PKIRQL OldIrql); + +#else + +NTKERNELAPI +KIRQL +FASTCALL +KeAcquireQueuedSpinLock ( + IN KSPIN_LOCK_QUEUE_NUMBER Number +); + +NTKERNELAPI +VOID +FASTCALL +KeReleaseQueuedSpinLock ( + IN KSPIN_LOCK_QUEUE_NUMBER Number, + IN KIRQL OldIrql +); + +NTKERNELAPI +KIRQL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock +); + +NTKERNELAPI +LOGICAL +KeTryToAcquireQueuedSpinLock( + KSPIN_LOCK_QUEUE_NUMBER Number, + PKIRQL OldIrql); + +#endif NTKERNELAPI VOID Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -1759,8 +1759,25 @@ struct { ULONG Level; ULONG Vector; - ULONG Affinity; + KAFFINITY Affinity; } Interrupt; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct { + union { + struct { + USHORT Reserved; + USHORT MessageCount; + ULONG Vector; + KAFFINITY Affinity; + } Raw; + struct { + ULONG Level; + ULONG Vector; + KAFFINITY Affinity; + } Translated; + }; + } MessageInterrupt; +#endif struct { PHYSICAL_ADDRESS Start; ULONG Length; @@ -1783,6 +1800,20 @@ ULONG Reserved1; ULONG Reserved2; } DeviceSpecificData; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct { + PHYSICAL_ADDRESS Start; + ULONG Length40; + } Memory40; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length48; + } Memory48; + struct { + PHYSICAL_ADDRESS Start; + ULONG Length64; + } Memory64; +#endif } u; } CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR; @@ -5444,6 +5475,8 @@ ULONG HalReserved[16]; // For use by Hal } KPCR, *PKPCR; /* 54 */ +#define KeGetPcr() PCR + typedef struct _KFLOATING_SAVE { ULONG ControlWord; ULONG StatusWord; @@ -5661,6 +5694,8 @@ UCHAR Number; /* 51 */ } KPCR, *PKPCR; /* 54 */ +#define KeGetPcr() PCR + static __inline ULONG DDKAPI @@ -5695,6 +5730,8 @@ ULONG IDR; /* 30 */ } KPCR, *PKPCR; +#define KeGetPcr() PCR + typedef struct _KFLOATING_SAVE { } KFLOATING_SAVE, *PKFLOATING_SAVE; @@ -5792,6 +5829,7 @@ } PCIBUSDATA, *PPCIBUSDATA; +/** INTERLOCKED FUNCTIONS *****************************************************/ #if !defined(__INTERLOCKED_DECLARED) #define __INTERLOCKED_DECLARED @@ -5908,38 +5946,30 @@ #define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry) #define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) #define QueryDepthSList(Head) ExQueryDepthSList(Head) -#endif // !defined(_WINBASE_ +#endif // !defined(_WINBASE_) #endif // _M_AMD64 #endif /* !__INTERLOCKED_DECLARED */ -NTKERNELAPI -VOID + +/** SPINLOCK FUNCTIONS ********************************************************/ + +NTKERNELAPI +BOOLEAN FASTCALL -KefAcquireSpinLockAtDpcLevel( +KeTryToAcquireSpinLockAtDpcLevel( + IN OUT PKSPIN_LOCK SpinLock +); + +#if defined (_X86_) + +NTKERNELAPI +VOID +NTAPI +KeInitializeSpinLock( IN PKSPIN_LOCK SpinLock); -NTKERNELAPI -VOID -FASTCALL -KefReleaseSpinLockFromDpcLevel( - IN PKSPIN_LOCK SpinLock); - -#if defined(_M_AMD64) -NTKERNELAPI -KIRQL -FASTCALL -KfAcquireSpinLock( - IN PKSPIN_LOCK SpinLock); - -NTKERNELAPI -VOID -FASTCALL -KfReleaseSpinLock( - IN PKSPIN_LOCK SpinLock, - IN KIRQL NewIrql); -#else NTHALAPI KIRQL FASTCALL @@ -5952,19 +5982,60 @@ KfReleaseSpinLock( IN PKSPIN_LOCK SpinLock, IN KIRQL NewIrql); -#endif - -NTKERNELAPI -BOOLEAN + +NTKERNELAPI +VOID FASTCALL -KeTryToAcquireSpinLockAtDpcLevel( - IN OUT PKSPIN_LOCK SpinLock -); +KefAcquireSpinLockAtDpcLevel( + IN PKSPIN_LOCK SpinLock); + +NTKERNELAPI +VOID +FASTCALL +KefReleaseSpinLockFromDpcLevel( + IN PKSPIN_LOCK SpinLock); #define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) #define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) #define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) #define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +#else // !defined (_X86_) + +FORCEINLINE +VOID +NTAPI +KeInitializeSpinLock( + PKSPIN_LOCK SpinLock) +{ + *SpinLock = 0; +} + +NTKERNELAPI +VOID +KeReleaseSpinLock( + IN PKSPIN_LOCK SpinLock, + IN KIRQL NewIrql); + +NTKERNELAPI +VOID +KeAcquireSpinLockAtDpcLevel( + IN PKSPIN_LOCK SpinLock); + +NTKERNELAPI +VOID +KeReleaseSpinLockFromDpcLevel( + IN PKSPIN_LOCK SpinLock); + +NTKERNELAPI +KIRQL +KeAcquireSpinLockRaiseToDpc( + IN PKSPIN_LOCK SpinLock); + +#define KeAcquireSpinLock(SpinLock, OldIrql) \ + *(OldIrql) = KeAcquireSpinLockRaiseToDpc(SpinLock) + +#endif // !defined (_X86_) #define RtlCopyMemoryNonTemporal RtlCopyMemory @@ -6364,23 +6435,60 @@ return Result; } +static __inline +LARGE_INTEGER +NTAPI_INLINE +RtlConvertUlongToLargeInteger( + ULONG UnsignedInteger) +{ + LARGE_INTEGER ret; + ret.QuadPart = UnsignedInteger; + return ret; +} + NTSYSAPI LUID NTAPI RtlConvertLongToLuid( IN LONG Long); -NTSYSAPI -LARGE_INTEGER -NTAPI -RtlConvertUlongToLargeInteger( - IN ULONG UnsignedInteger); NTSYSAPI LUID NTAPI RtlConvertUlongToLuid( ULONG Ulong); + +#ifdef _M_AMD64 + +static __inline +LARGE_INTEGER +NTAPI_INLINE +RtlExtendedIntegerMultiply( + LARGE_INTEGER Multiplicand, + LONG Multiplier) +{ + LARGE_INTEGER ret; + ret.QuadPart = Multiplicand.QuadPart * Multiplier; + return ret; +} + +static __inline +LARGE_INTEGER +NTAPI_INLINE +RtlExtendedLargeIntegerDivide( + LARGE_INTEGER Dividend, + ULONG Divisor, + PULONG Remainder) +{ + LARGE_INTEGER ret; + ret.QuadPart = (ULONG64)Dividend.QuadPart / Divisor; + if (Remainder) + *Remainder = (ULONG)(Dividend.QuadPart % Divisor); + return ret; +} + +#endif /* * VOID @@ -9590,12 +9698,6 @@ NTKERNELAPI VOID NTAPI -KeInitializeSpinLock( - IN PKSPIN_LOCK SpinLock); - -NTKERNELAPI -VOID -NTAPI KeInitializeTimer( IN PKTIMER Timer); @@ -10331,11 +10433,11 @@ * IN MM_PAGE_PRIORITY Priority) */ #define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \ - ((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ + (((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \ | MDL_SOURCE_IS_NONPAGED_POOL)) ? \ (_Mdl)->MappedSystemVa : \ (PVOID) MmMapLockedPagesSpecifyCache((_Mdl), \ - KernelMode, MmCached, NULL, FALSE, _Priority) + KernelMode, MmCached, NULL, FALSE, (_Priority))) NTKERNELAPI PVOID Modified: trunk/reactos/include/ddk/winnt4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winnt4.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winnt4.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winnt4.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -411,6 +411,7 @@ IN ULONG Multiplicand, IN ULONG Multiplier); +#ifndef _M_AMD64 NTSYSAPI LARGE_INTEGER NTAPI @@ -425,6 +426,7 @@ IN LARGE_INTEGER Dividend, IN ULONG Divisor, IN OUT PULONG Remainder); +#endif NTSYSAPI LARGE_INTEGER Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -433,8 +433,29 @@ { ULONG Level; ULONG Vector; - ULONG Affinity; + KAFFINITY Affinity; } Interrupt; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct + { + union + { + struct + { + USHORT Reserved; + USHORT MessageCount; + ULONG Vector; + KAFFINITY Affinity; + } Raw; + struct + { + ULONG Level; + ULONG Vector; + KAFFINITY Affinity; + } Translated; + }; + } MessageInterrupt; +#endif struct { PHYSICAL_ADDRESS Start; @@ -448,7 +469,7 @@ } Dma; struct { - ULONG Data[3]; + ULONG Data[3]; } DevicePrivate; struct { @@ -462,6 +483,23 @@ ULONG Reserved1; ULONG Reserved2; } DeviceSpecificData; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + struct + { + PHYSICAL_ADDRESS Start; + ULONG Length40; + } Memory40; + struct + { + PHYSICAL_ADDRESS Start; + ULONG Length48; + } Memory48; + struct + { + PHYSICAL_ADDRESS Start; + ULONG Length64; + } Memory64; +#endif } u; } CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR; Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -133,11 +133,6 @@ IN PKLOCK_QUEUE_HANDLE LockHandle ); -KIRQL -FASTCALL -KeAcquireSpinLockRaiseToSynch( - IN OUT PKSPIN_LOCK SpinLock -); // // Interrupt Functions Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Fri Oct 31 16:28:09 2008 @@ -106,11 +106,6 @@ #else #define KINTERRUPT_DISPATCH_CODES 106 #endif - -// -// Get KPCR -// -#define KeGetPcr() PCR #ifdef NTOS_MODE_USER

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs