Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[cwittich] 19826: fixed BaseAddress
by cwittich＠svn.reactos.com 02 Dec '05

02 Dec '05

fixed BaseAddress Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-02 09:32:31 UTC (rev 19825) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-02 12:47:42 UTC (rev 19826) @@ -90,6 +90,8 @@ defines.push_back ( "_CRT_NON_CONFORMING_SWPRINTFS" ); defines.push_back ( "STDCALL=__stdcall" ); + string baseaddr; + while ( ifs_list.size() ) { const IfableData& data = *ifs_list.back(); @@ -138,6 +140,12 @@ else defines.push_back ( defs[i]->name ); } + for ( i = 0; i < data.properties.size(); i++ ) + { + Property& prop = *data.properties[i]; + if ( strstr ( module.baseaddress.c_str(), prop.name.c_str() ) ) + baseaddr = prop.value; + } } vector<string> header_files; @@ -345,7 +353,7 @@ fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x10000" : module.baseaddress.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); } else if ( exe ) { @@ -354,14 +362,14 @@ fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); } else if ( module.type == NativeCUI ) { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); } else if ( module.type == Win32CUI || module.type == Win32GUI ) { @@ -371,7 +379,7 @@ else if ( dll ) { fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); - fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x40000" : module.baseaddress.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); }

1 0

[hpoussin] 19825: - Implement PciIdeXSetBusData
by hpoussin＠svn.reactos.com 02 Dec '05

02 Dec '05

- Implement PciIdeXSetBusData - Return documented status code in PciIdeXGetBusData Modified: trunk/reactos/drivers/storage/pciidex/miniport.c _____ Modified: trunk/reactos/drivers/storage/pciidex/miniport.c --- trunk/reactos/drivers/storage/pciidex/miniport.c 2005-12-02 08:13:52 UTC (rev 19824) +++ trunk/reactos/drivers/storage/pciidex/miniport.c 2005-12-02 09:32:31 UTC (rev 19825) @@ -66,8 +66,8 @@ IN ULONG BufferLength) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; - ULONG BytesRead = 0; - NTSTATUS Status = STATUS_IO_DEVICE_ERROR; + ULONG BytesRead; + NTSTATUS Status = STATUS_UNSUCCESSFUL; DPRINT("PciIdeXGetBusData(%p %p 0x%lx 0x%lx)\n", DeviceExtension, Buffer, ConfigDataOffset, BufferLength); @@ -97,8 +97,47 @@ IN ULONG ConfigDataOffset, IN ULONG BufferLength) { - DPRINT1("PciIdeXSetBusData(%p %p %p 0x%lx 0x%lx)\n", + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PBYTE CurrentBuffer = NULL; + ULONG i, BytesWritten; + NTSTATUS Status; + + DPRINT("PciIdeXSetBusData(%p %p %p 0x%lx 0x%lx)\n", DeviceExtension, Buffer, DataMask, ConfigDataOffset, BufferLength); - return STATUS_NOT_IMPLEMENTED; + CurrentBuffer = ExAllocatePool(NonPagedPool, BufferLength); + if (!CurrentBuffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + Status = PciIdeXGetBusData(DeviceExtension, Buffer, ConfigDataOffset, BufferLength); + if (!NT_SUCCESS(Status)) + goto cleanup; + + for (i = 0; i < BufferLength; i++) + CurrentBuffer[i] = (CurrentBuffer[i] & ~((PBYTE)DataMask)[i]) | (((PBYTE)DataMask)[i] & ((PBYTE)Buffer)[i]); + + FdoDeviceExtension = CONTAINING_RECORD(DeviceExtension, FDO_DEVICE_EXTENSION, MiniControllerExtension); + if (!FdoDeviceExtension->BusInterface) + { + Status = STATUS_UNSUCCESSFUL; + goto cleanup; + } + + BytesWritten = (*FdoDeviceExtension->BusInterface->SetBusData)( + FdoDeviceExtension->BusInterface->Context, + PCI_WHICHSPACE_CONFIG, + CurrentBuffer, + ConfigDataOffset, + BufferLength); + if (BytesWritten == BufferLength) + Status = STATUS_SUCCESS; + else + Status = STATUS_UNSUCCESSFUL; + +cleanup: + ExFreePool(CurrentBuffer); + return Status; }

1 0

[cwittich] 19824: fixed vcproj files for modules which do not use pch
by cwittich＠svn.reactos.com 02 Dec '05

02 Dec '05

fixed vcproj files for modules which do not use pch Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-02 04:05:04 UTC (rev 19823) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-02 08:13:52 UTC (rev 19824) @@ -428,7 +428,7 @@ { std::string& config = cfgs[iconfig]; - if ( isrcfile == 0 ) + if (( isrcfile == 0 ) && ( module.pch != NULL )) { /* little hack to speed up PCH */ fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" );

1 0

[sedwards] 19823: incress the number of passes to detect the mouse and keyboard under VMware if the VM does not have ownership of the mouse. Thanks to GreatLord and Royce
by sedwards＠svn.reactos.com 02 Dec '05

02 Dec '05

incress the number of passes to detect the mouse and keyboard under VMware if the VM does not have ownership of the mouse. Thanks to GreatLord and Royce Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-12-01 23:52:14 UTC (rev 19822) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-12-02 04:05:04 UTC (rev 19823) @@ -538,7 +538,7 @@ } // Wait longer? - Counter = 3; + Counter = 10; do { Status = I8042ReadDataWait(DevExt, &Value); } while ((Counter--) && (STATUS_IO_TIMEOUT == Status));

1 0

[arty] 19822: Added struct tag.
by arty＠svn.reactos.com 01 Dec '05

01 Dec '05

Added struct tag. Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-12-01 23:28:34 UTC (rev 19821) +++ trunk/reactos/w32api/include/winnt.h 2005-12-01 23:52:14 UTC (rev 19822) @@ -1677,7 +1677,7 @@ #define CONTEXT_INTEGER 4L #define CONTEXT_DEBUG_REGISTERS 8L #define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_FLOATING_POINT|CONTEXT_INTEGER) -typedef struct { +typedef struct _CONTEXT { double Fpr0; double Fpr1; double Fpr2;

1 0

[weiden] 19821: fixed a device status check (take two)
by weiden＠svn.reactos.com 01 Dec '05

01 Dec '05

fixed a device status check (take two) Modified: trunk/reactos/lib/devmgr/misc.c _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-01 23:14:30 UTC (rev 19820) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-01 23:28:34 UTC (rev 19821) @@ -439,6 +439,7 @@ UINT MessageId = IDS_UNKNOWN; BOOL Ret = FALSE; + szBuffer[0] = L'\0'; cr = CM_Get_DevNode_Status_Ex(&Status, &ProblemNumber, DevInst, @@ -446,48 +447,58 @@ hMachine); if (cr == CR_SUCCESS) { - if (ProblemNumber < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) - MessageId = ProblemStringId[ProblemNumber]; + if (Status & DN_HAS_PROBLEM) + { + if (ProblemNumber < sizeof(ProblemStringId) / sizeof(ProblemStringId[0])) + MessageId = ProblemStringId[ProblemNumber]; - szBuffer[0] = L'\0'; - if (ProblemNumber == 0) - { - if (!(Status & (DN_DRIVER_LOADED | DN_STARTED))) + if (ProblemNumber == 0) { - MessageId = IDS_NODRIVERLOADED; + goto GeneralMessage; } + else + { + LPWSTR szProblem; + UINT StringIDs[] = + { + MessageId, + IDS_DEVCODE, + }; - goto GeneralProblem; + if (LoadAndFormatStringsCat(hDllInstance, + StringIDs, + sizeof(StringIDs) / sizeof(StringIDs[0]), + &szProblem, + ProblemNumber)) + { + wcsncpy(szBuffer, + szProblem, + BufferSize - 1); + szBuffer[BufferSize - 1] = L'\0'; + + LocalFree((HLOCAL)szProblem); + + Ret = TRUE; + } + } } else { - LPWSTR szProblem; - UINT StringIDs[] = + if (!(Status & (DN_DRIVER_LOADED | DN_STARTED))) { - MessageId, - IDS_DEVCODE, - }; - - if (LoadAndFormatStringsCat(hDllInstance, - StringIDs, - sizeof(StringIDs) / sizeof(StringIDs[0]), - &szProblem, - ProblemNumber)) + MessageId = IDS_NODRIVERLOADED; + } + else { - wcsncpy(szBuffer, - szProblem, - BufferSize - 1); - szBuffer[BufferSize - 1] = L'\0'; + MessageId = IDS_DEV_NO_PROBLEM; + } - LocalFree((HLOCAL)szProblem); - - Ret = TRUE; - } + goto GeneralMessage; } } else { -GeneralProblem: +GeneralMessage: if (LoadString(hDllInstance, MessageId, szBuffer,

1 0

[weiden] 19820: fixed a device status check
by weiden＠svn.reactos.com 01 Dec '05

01 Dec '05

fixed a device status check Modified: trunk/reactos/lib/devmgr/misc.c _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-01 23:02:50 UTC (rev 19819) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-01 23:14:30 UTC (rev 19820) @@ -452,12 +452,12 @@ szBuffer[0] = L'\0'; if (ProblemNumber == 0) { - if (!(Status & DN_DRIVER_LOADED)) + if (!(Status & (DN_DRIVER_LOADED | DN_STARTED))) { MessageId = IDS_NODRIVERLOADED; } - goto UnknownProblem; + goto GeneralProblem; } else { @@ -487,7 +487,7 @@ } else { -UnknownProblem: +GeneralProblem: if (LoadString(hDllInstance, MessageId, szBuffer,

1 0

[gvg] 19819: Complain if used outside ntoskrnl/win32k
by gvg＠svn.reactos.com 01 Dec '05

01 Dec '05

Complain if used outside ntoskrnl/win32k Modified: trunk/reactos/include/reactos/probe.h _____ Modified: trunk/reactos/include/reactos/probe.h --- trunk/reactos/include/reactos/probe.h 2005-12-01 22:40:58 UTC (rev 19818) +++ trunk/reactos/include/reactos/probe.h 2005-12-01 23:02:50 UTC (rev 19819) @@ -1,6 +1,10 @@ #ifndef INCLUDE_REACTOS_CAPTURE_H #define INCLUDE_REACTOS_CAPTURE_H +#if ! defined(_NTOSKRNL_) && ! defined(_WIN32K_) +#error Header intended for use by NTOSKRNL/WIN32K only! +#endif + static const UNICODE_STRING __emptyUnicodeString = {0}; static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}};

1 0

[weiden] 19818: fixed difference in signedness warnings
by weiden＠svn.reactos.com 01 Dec '05

01 Dec '05

fixed difference in signedness warnings Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c --- trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-12-01 22:38:03 UTC (rev 19817) +++ trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-12-01 22:40:58 UTC (rev 19818) @@ -278,7 +278,7 @@ SendQueryEndSession(LPVOID Parameter) { PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - LRESULT Result; + DWORD_PTR Result; if (SendMessageTimeoutW(Context->Wnd, WM_QUERYENDSESSION, Context->wParam, Context->lParam, SMTO_NORMAL, Context->Timeout, @@ -294,7 +294,7 @@ SendEndSession(LPVOID Parameter) { PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - LRESULT Result; + DWORD_PTR Result; if (Context->wParam) {

1 0

[gvg] 19817: Files forgotten in r19815
by gvg＠svn.reactos.com 01 Dec '05

01 Dec '05

Files forgotten in r19815 Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/include/conio.h Modified: trunk/reactos/subsys/csrss/include/csrplugin.h Modified: trunk/reactos/subsys/csrss/include/win32csr.h Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/api/process.c 2005-12-01 22:38:03 UTC (rev 19817) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * reactos/subsys/csrss/api/process.c * * "\windows\ApiPort" port process management functions @@ -115,6 +114,14 @@ { DPRINT1("CsrCreateProcessData() failed\n"); } + else + { + pProcessData->Terminated = FALSE; + + /* Set default shutdown parameters */ + pProcessData->ShutdownLevel = 0x280; + pProcessData->ShutdownFlags = 0; + } return pProcessData; } @@ -185,7 +192,35 @@ return STATUS_INVALID_PARAMETER; } +NTSTATUS STDCALL +CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context) +{ + UINT Hash; + PCSRSS_PROCESS_DATA pProcessData; + NTSTATUS Status = STATUS_SUCCESS; + LOCK; + + for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + { + pProcessData = ProcessData[Hash]; + while (NULL != pProcessData) + { + Status = EnumProc(pProcessData, Context); + if (STATUS_SUCCESS != Status) + { + UNLOCK; + return Status; + } + pProcessData = pProcessData->next; + } + } + + UNLOCK; + + return Status; +} + /********************************************************************** * CSRSS API *********************************************************************/ @@ -233,6 +268,7 @@ return(Request->Status = STATUS_INVALID_PARAMETER); } + ProcessData->Terminated = TRUE; Request->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } @@ -373,6 +409,13 @@ Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); ProcessData = CsrGetProcessData(Request->Data.DuplicateHandleRequest.ProcessId); + if (NULL == ProcessData || ProcessData->Terminated) + { + DPRINT1("Invalid source process %d\n", Request->Data.DuplicateHandleRequest.ProcessId); + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + Request->Status = CsrGetObject(ProcessData, Request->Data.DuplicateHandleRequest.Handle, &Object); if (! NT_SUCCESS(Request->Status)) { _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-12-01 22:38:03 UTC (rev 19817) @@ -13,6 +13,8 @@ #include <csrss.h> #define NDEBUG + +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -128,8 +130,8 @@ &Request->Header); if (!NT_SUCCESS(Status)) { - DPRINT1("CSR: NtReplyWaitReceivePort failed\n"); - break; + DPRINT1("NtReplyWaitReceivePort failed\n"); + break; } /* If the connection was closed, handle that */ @@ -147,11 +149,17 @@ ProcessData = CsrGetProcessData(Request->Header.ClientId.UniqueProcess); if (ProcessData == NULL) { - DPRINT1("CSR: Message %d: Unable to find data for process 0x%x\n", + DPRINT1("Message %d: Unable to find data for process 0x%x\n", Request->Header.u2.s2.Type, Request->Header.ClientId.UniqueProcess); break; } + if (ProcessData->Terminated) + { + DPRINT1("Message %d: process %d already terminated\n", + Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess); + continue; + } /* Call the Handler */ CsrApiCallHandler(ProcessData, Request); _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/include/api.h 2005-12-01 22:38:03 UTC (rev 19817) @@ -50,6 +50,7 @@ struct _CSRSS_PROCESS_DATA * next; LIST_ENTRY ProcessEntry; PCONTROLDISPATCHER CtrlDispatcher; + BOOL Terminated; } CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA; typedef VOID (STDCALL *CSR_CLEANUP_OBJECT_PROC)(Object_t *Object); @@ -110,10 +111,13 @@ VOID STDCALL CsrInitConsoleSupport(VOID); /* api/process.c */ +typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESS_PROC)(PCSRSS_PROCESS_DATA ProcessData, + PVOID Context); VOID STDCALL CsrInitProcessData(VOID); PCSRSS_PROCESS_DATA STDCALL CsrGetProcessData(HANDLE ProcessId); PCSRSS_PROCESS_DATA STDCALL CsrCreateProcessData(HANDLE ProcessId); NTSTATUS STDCALL CsrFreeProcessData( HANDLE Pid ); +NTSTATUS STDCALL CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); /* api/handle.c */ NTSTATUS FASTCALL CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions); _____ Modified: trunk/reactos/subsys/csrss/include/conio.h --- trunk/reactos/subsys/csrss/include/conio.h 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/include/conio.h 2005-12-01 22:38:03 UTC (rev 19817) @@ -100,6 +100,8 @@ LONG *LogicalY); VOID FASTCALL ConioDrawConsole(PCSRSS_CONSOLE Console); VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData); +VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSRSS_PROCESS_DATA ProcessData, + DWORD Timeout); /* api/conio.c */ CSR_API(CsrWriteConsole); _____ Modified: trunk/reactos/subsys/csrss/include/csrplugin.h --- trunk/reactos/subsys/csrss/include/csrplugin.h 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/include/csrplugin.h 2005-12-01 22:38:03 UTC (rev 19817) @@ -30,12 +30,15 @@ Object_t **Object); typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); +typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, + PVOID Context); typedef struct tagCSRSS_EXPORTED_FUNCS { CSRSS_INSERT_OBJECT_PROC CsrInsertObjectProc; CSRSS_GET_OBJECT_PROC CsrGetObjectProc; CSRSS_RELEASE_OBJECT_PROC CsrReleaseObjectProc; + CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS; typedef BOOL (STDCALL *CSRPLUGIN_INIT_COMPLETE_PROC)(void); _____ Modified: trunk/reactos/subsys/csrss/include/win32csr.h --- trunk/reactos/subsys/csrss/include/win32csr.h 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/include/win32csr.h 2005-12-01 22:38:03 UTC (rev 19817) @@ -11,6 +11,7 @@ #define WIN32CSR_H_INCLUDED #include <windows.h> +#include <commctrl.h> extern HANDLE Win32CsrApiHeap; extern HINSTANCE Win32CsrDllHandle; @@ -24,13 +25,13 @@ long Type); VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); -#ifndef TODO NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object); -#endif +NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, + PVOID Context); #endif /* WIN32CSR_H_INCLUDED */ _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-12-01 22:35:53 UTC (rev 19816) +++ trunk/reactos/subsys/csrss/init.c 2005-12-01 22:38:03 UTC (rev 19817) @@ -200,6 +200,7 @@ Exports.CsrInsertObjectProc = CsrInsertObject; Exports.CsrGetObjectProc = CsrGetObject; Exports.CsrReleaseObjectProc = CsrReleaseObject; + Exports.CsrEnumProcessesProc = CsrEnumProcesses; if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc, &Exports, CsrssApiHeap)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005