Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hpoussin] 18208: Add stubs for InstallNewDevice, InstallSelectedDriver, UpdateDriverForPlugAndPlayDevicesA/W

by hpoussin＠svn.reactos.com

Add stubs for InstallNewDevice, InstallSelectedDriver, UpdateDriverForPlugAndPlayDevicesA/W Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.def Added: trunk/reactos/lib/newdev/newdev.h Modified: trunk/reactos/lib/newdev/newdev.xml Added: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.c 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,37 +1,15 @@ /* - * ReactOS New devices installation - * Copyright (C) 2004 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS New devices installation * FILE: lib/newdev/newdev.c * PURPOSE: New devices installation - * PROGRAMMER: HervÚ Poussineau (hpoussin(a)reactos.org) + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ -#include <windows.h> -#include <setupapi.h> +#include "newdev.h" -ULONG DbgPrint(PCH Format,...); -#define UNIMPLEMENTED \ - DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) -#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - -BOOL +BOOL WINAPI DevInstallW( IN HWND Hwnd, IN HINSTANCE Handle, @@ -44,8 +22,7 @@ DWORD index; BOOL ret; - DbgPrint("OK\n"); - DbgPrint("Installing device %S\n", InstanceId); + DPRINT1("Installing device %S\n", InstanceId); hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); if (hDevInfo == INVALID_HANDLE_VALUE) _____ Modified: trunk/reactos/lib/newdev/newdev.def --- trunk/reactos/lib/newdev/newdev.def 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.def 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,16 +1,15 @@ LIBRARY newdev.dll EXPORTS -DevInstallW +DevInstallW@16 ;InstallDevInst ;InstallDevInstEx -;InstallNewDevice +InstallNewDevice@12 ;InstallSelectedDevice -;InstallSelectedDriver +InstallSelectedDriverW@20 ;InstallWindowsUpdateDriver ;RollbackDriver -;UpdateDriverForPlugAndPlayDevicesA -;UpdateDriverForPlugAndPlayDevicesA@20=UpdateDriverForPlugAndPlayDevice sA -;UpdateDriverForPlugAndPlayDevicesW +UpdateDriverForPlugAndPlayDevicesA@20 +UpdateDriverForPlugAndPlayDevicesW@20 ;EOF \ No newline at end of file _____ Added: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.h 2005-10-02 10:33:25 UTC (rev 18208) @@ -0,0 +1,7 @@ +#include <windows.h> +#include <setupapi.h> + +ULONG DbgPrint(PCH Format,...); +#define UNIMPLEMENTED \ + DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint Property changes on: trunk/reactos/lib/newdev/newdev.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/newdev/newdev.xml --- trunk/reactos/lib/newdev/newdev.xml 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.xml 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,6 +1,7 @@ <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> <importlibrary definition="newdev.def" /> <file>newdev.c</file> + <file>stubs.c</file> <library>ntdll</library> <library>setupapi</library> </module> _____ Added: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/stubs.c 2005-10-02 10:33:25 UTC (rev 18208) @@ -0,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS New devices installation + * FILE: lib/newdev/stubs.c + * PURPOSE: Stubs + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#include "newdev.h" + +BOOL WINAPI +InstallNewDevice( + IN HWND hwndParent, + IN LPGUID ClassGuid OPTIONAL, + OUT PDWORD Reboot) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +InstallSelectedDriverW( + IN HWND hwndParent, + IN HDEVINFO DeviceInfoSet, + IN LPCWSTR Reserved, + IN BOOL Backup, + OUT PDWORD pReboot) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesA( + IN HWND hwndParent, + IN LPCSTR HardwareId, + IN LPCSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesW( + IN HWND hwndParent, + IN LPCWSTR HardwareId, + IN LPCWSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + Property changes on: trunk/reactos/lib/newdev/stubs.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

19 years

[ekohl] 18207: Implement CM_Request_Eject_PC[_Ex].

by ekohl＠svn.reactos.com

Implement CM_Request_Eject_PC[_Ex]. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-10-02 09:42:12 UTC (rev 18206) +++ trunk/reactos/include/idl/pnp.idl 2005-10-02 10:07:25 UTC (rev 18207) @@ -134,4 +134,7 @@ /* Function 38 */ CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, [out]PBOOL Present); + + /* Function 39 */ + CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-10-02 09:42:12 UTC (rev 18206) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-10-02 10:07:25 UTC (rev 18207) @@ -223,6 +223,9 @@ CONFIGRET WINAPI CM_Open_Class_Key_ExW(LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE); #define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) +CONFIGRET WINAPI CM_Request_Eject_PC( VOID ); +CONFIGRET WINAPI CM_Request_Eject_PC_Ex( HMACHINE ); + CONFIGRET WINAPI CM_Set_DevNode_Problem( DEVINST, ULONG, ULONG ); CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( DEVINST, ULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyA( DEVINST, ULONG, PCVOID, ULONG, ULONG ); _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-10-02 09:42:12 UTC (rev 18206) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-10-02 10:07:25 UTC (rev 18207) @@ -1539,7 +1539,7 @@ { RPC_BINDING_HANDLE BindingHandle = NULL; - FIXME("%p %lx\n", pbPresent, hMachine); + TRACE("%p %lx\n", pbPresent, hMachine); if (pbPresent == NULL) return CR_INVALID_POINTER; @@ -1836,6 +1836,42 @@ /*********************************************************************** + * CM_Request_Eject_PC [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Request_Eject_PC(VOID) +{ + TRACE("\n"); + return CM_Request_Eject_PC_Ex(NULL); +} + + +/********************************************************************** * + * CM_Request_Eject_PC_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Request_Eject_PC_Ex( + HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + + TRACE("%lx\n", hMachine); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_RequestEjectPC(BindingHandle); +} + + +/********************************************************************** * * CM_Set_DevNode_Problem [SETUPAPI.@] */ CONFIGRET WINAPI CM_Set_DevNode_Problem( _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-02 09:42:12 UTC (rev 18206) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-02 10:07:25 UTC (rev 18207) @@ -794,6 +794,7 @@ } +/* Function 38 */ CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, unsigned long *Present) @@ -844,6 +845,22 @@ } +/* Function 39 */ +CONFIGRET +PNP_RequestEjectPC(handle_t BindingHandle) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_RequestEjectPC() called\n"); + + ret = CR_FAILURE; /* FIXME */ + + DPRINT1("PNP_RequestEjectPC() done (returns %lx)\n", ret); + + return ret; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-10-02 09:42:12 UTC (rev 18206) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-10-02 10:07:25 UTC (rev 18207) @@ -1773,8 +1773,18 @@ #define CM_Request_Device_Eject_Ex CM_Request_Device_Eject_ExA #endif /* UNICODE */ -/* FIXME: Obsolete CM_Request_Eject_PC */ -/* FIXME: Obsolete CM_Request_Eject_PC_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Request_Eject_PC( + VOID); + +CMAPI +CONFIGRET +WINAPI +CM_Request_Eject_PC_Ex( + IN HMACHINE hMachine); + /* FIXME: Obsolete CM_Run_Detection */ /* FIXME: Obsolete CM_Run_Detection_Ex */ /* FIXME: Obsolete CM_Set_Class_Registry_Property */

19 years

[hbirr] 18206: Disable the serial debug output if the com port doesn't exist.

by hbirr＠svn.reactos.com

Disable the serial debug output if the com port doesn't exist. Modified: trunk/reactos/ntoskrnl/kd/kdio.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdio.c --- trunk/reactos/ntoskrnl/kd/kdio.c 2005-10-02 08:40:49 UTC (rev 18205) +++ trunk/reactos/ntoskrnl/kd/kdio.c 2005-10-02 09:42:12 UTC (rev 18206) @@ -171,7 +171,11 @@ DispatchTable->KdpPrintRoutine = KdpSerialDebugPrint; /* Initialize the Port */ - KdPortInitializeEx(&SerialPortInfo, 0, 0); + if (!KdPortInitializeEx(&SerialPortInfo, 0, 0)) + { + KdpDebugMode.Serial = FALSE; + return; + } /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);

19 years

[ion] 18205: - Fix gcc compilation issues

by ion＠svn.reactos.com

- Fix gcc compilation issues - Fix most ld linking issues. Modified: trunk/reactos/subsys/csr/csr.xml Modified: trunk/reactos/subsys/csr/csrsrv/api.c Modified: trunk/reactos/subsys/csr/csrsrv/csrsrv.def Modified: trunk/reactos/subsys/csr/csrsrv/csrsrv.xml Modified: trunk/reactos/subsys/csr/csrsrv/init.c Modified: trunk/reactos/subsys/csr/csrsrv/srv.h Modified: trunk/reactos/subsys/csr/main.c _____ Modified: trunk/reactos/subsys/csr/csr.xml --- trunk/reactos/subsys/csr/csr.xml 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csr.xml 2005-10-02 08:40:49 UTC (rev 18205) @@ -6,8 +6,6 @@ <library>ntdll</library> <library>csrsrv</library> <file>main.c</file> - <file>args.c</file> - <file>csr.rc</file> </module> <directory name="csrsrv"> <xi:include href="csrsrv/csrsrv.xml" /> _____ Modified: trunk/reactos/subsys/csr/csrsrv/api.c --- trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csrsrv/api.c 2005-10-02 08:40:49 UTC (rev 18205) @@ -62,7 +62,7 @@ 0, 0, 0, - CsrApiRequestThread, + (PVOID)CsrApiRequestThread, NULL, &hThread, &ClientId); @@ -550,7 +550,7 @@ { /* Get the information and check if it matches our thread */ ClientDiedMsg = (PCLIENT_DIED_MSG)&ReceiveMsg; - if (ClientDiedMsg->CreateTime.QuadPart = CsrThread->CreateTime.QuadPart) + if (ClientDiedMsg->CreateTime.QuadPart == CsrThread->CreateTime.QuadPart) { /* Reference the thread */ CsrThread->ReferenceCount++; _____ Modified: trunk/reactos/subsys/csr/csrsrv/csrsrv.def --- trunk/reactos/subsys/csr/csrsrv/csrsrv.def 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csrsrv/csrsrv.def 2005-10-02 08:40:49 UTC (rev 18205) @@ -1,38 +1,38 @@ LIBRARY CSRSRV EXPORTS -CsrAddStaticServerThread -CsrCallServerFromServer -CsrConnectToUser -CsrCreateProcess -CsrCreateRemoteThread -CsrCreateThread -CsrCreateWait -CsrDebugProcess -CsrDebugProcessStop -CsrDereferenceProcess -CsrDereferenceThread -CsrDereferenceWait -CsrDestroyProcess -CsrDestroyThread -CsrExecServerThread -CsrGetProcessLuid -CsrImpersonateClient -CsrLockProcessByClientId -CsrLockThreadByClientId -CsrMoveSatisfiedWait -CsrNotifyWait -CsrPopulateDosDevices -CsrQueryApiPort -CsrReferenceThread -CsrRevertToSelf -CsrServerInitialization -CsrSetBackgroundPriority -CsrSetCallingSpooler -CsrSetForegroundPriority -CsrShutdownProcesses -CsrUnhandledExceptionFilter -CsrUnlockProcess -CsrUnlockThread -CsrValidateMessageBuffer -CsrValidateMessageString +CsrAddStaticServerThread@12 +CsrCallServerFromServer@8 +CsrConnectToUser@0 +CsrCreateProcess@24 +CsrCreateRemoteThread@8 +CsrCreateThread@12 +CsrCreateWait@24 +CsrDebugProcess@4 +CsrDebugProcessStop@4 +CsrDereferenceProcess@4 +CsrDereferenceThread@4 +CsrDereferenceWait@4 +CsrDestroyProcess@8 +CsrDestroyThread@4 +CsrExecServerThread@8 +CsrGetProcessLuid@8 +CsrImpersonateClient@4 +CsrLockProcessByClientId@8 +CsrLockThreadByClientId@8 +CsrMoveSatisfiedWait@8 +CsrNotifyWait@16 +CsrPopulateDosDevices@0 +CsrQueryApiPort@0 +CsrReferenceThread@4 +CsrRevertToSelf@0 +CsrServerInitialization@8 +CsrSetBackgroundPriority@4 +CsrSetCallingSpooler@4 +CsrSetForegroundPriority@4 +CsrShutdownProcesses@8 +CsrUnhandledExceptionFilter@8 +CsrUnlockProcess@4 +CsrUnlockThread@4 +CsrValidateMessageBuffer@16 +CsrValidateMessageString@8 _____ Modified: trunk/reactos/subsys/csr/csrsrv/csrsrv.xml --- trunk/reactos/subsys/csr/csrsrv/csrsrv.xml 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csrsrv/csrsrv.xml 2005-10-02 08:40:49 UTC (rev 18205) @@ -5,13 +5,14 @@ <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> <library>ntdll</library> - <file>debug.c</file> - <file>dllmain.c</file> + <library>pseh</library> + <library>intrlck</library> + <file>api.c</file> <file>init.c</file> <file>process.c</file> <file>server.c</file> <file>session.c</file> <file>thread.c</file> <file>wait.c</file> - <file>csrsrv.rc</file> + <pch>srv.h</pch> </module> _____ Modified: trunk/reactos/subsys/csr/csrsrv/init.c --- trunk/reactos/subsys/csr/csrsrv/init.c 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csrsrv/init.c 2005-10-02 08:40:49 UTC (rev 18205) @@ -362,7 +362,7 @@ NTAPI CsrCreateLocalSystemSD(OUT PSECURITY_DESCRIPTOR *LocalSystemSd) { - SID_IDENTIFIER_AUTHORITY NtSidAuthority = SECURITY_NT_AUTHORITY; + SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; PSID SystemSid; ULONG SidLength; PSECURITY_DESCRIPTOR SecurityDescriptor; @@ -460,9 +460,9 @@ NTAPI CsrGetDosDevicesSd(OUT PSECURITY_DESCRIPTOR DosDevicesSd) { - SID_IDENTIFIER_AUTHORITY WorldAuthority = SECURITY_WORLD_SID_AUTHORITY; - SID_IDENTIFIER_AUTHORITY CreatorAuthority = SECURITY_CREATOR_SID_AUTHORITY; - SID_IDENTIFIER_AUTHORITY NtSidAuthority = SECURITY_NT_AUTHORITY; + SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY CreatorAuthority = {SECURITY_CREATOR_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; PSID WorldSid, CreatorSid, AdminSid, SystemSid; UCHAR KeyValueBuffer[0x40]; PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; @@ -589,7 +589,7 @@ SystemSid); /* Get the ACE back */ - Status = RtlGetAce(Dacl, 0, (PACE*)&Ace); + Status = RtlGetAce(Dacl, 0, (PVOID*)&Ace); /* Add some flags to it for the Admin SID */ Ace->Header.AceFlags |= (OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE); @@ -601,7 +601,7 @@ AdminSid); /* Get the ACE back */ - Status = RtlGetAce(Dacl, 1, (PACE*)&Ace); + Status = RtlGetAce(Dacl, 1, (PVOID*)&Ace); /* Add some flags to it for the Creator SID */ Ace->Header.AceFlags |= (OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE); @@ -613,7 +613,7 @@ CreatorSid); /* Get the ACE back */ - Status = RtlGetAce(Dacl, 2, (PACE*)&Ace); + Status = RtlGetAce(Dacl, 2, (PVOID*)&Ace); /* Add some flags to it for the SD */ Ace->Header.AceFlags |= (OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | @@ -662,7 +662,7 @@ WorldSid); /* Get the ACE back */ - Status = RtlGetAce(Dacl, 2, (PACE*)&Ace); + Status = RtlGetAce(Dacl, 2, (PVOID*)&Ace); /* Add some flags to it for the SD */ Ace->Header.AceFlags |= (OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | _____ Modified: trunk/reactos/subsys/csr/csrsrv/srv.h --- trunk/reactos/subsys/csr/csrsrv/srv.h 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/csrsrv/srv.h 2005-10-02 08:40:49 UTC (rev 18205) @@ -5,7 +5,9 @@ #define NTOS_MODE_USER #include <stdio.h> #include <windows.h> +#include <winnt.h> #include <ndk/ntndk.h> +#include <helper.h> /* CSR Header */ #include <csr/server.h> @@ -82,6 +84,13 @@ NTSTATUS NTAPI +CsrServerInitialization( + ULONG ArgumentCount, + PCHAR Arguments[] +); + +NTSTATUS +NTAPI CsrCreateSessionObjectDirectory(IN ULONG SessionId); NTSTATUS _____ Modified: trunk/reactos/subsys/csr/main.c --- trunk/reactos/subsys/csr/main.c 2005-10-02 08:33:38 UTC (rev 18204) +++ trunk/reactos/subsys/csr/main.c 2005-10-02 08:40:49 UTC (rev 18205) @@ -31,6 +31,7 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include <csr/server.h> #define NDEBUG #include <debug.h> @@ -50,12 +51,18 @@ sizeof(DefaultHardErrorMode)); } +/* + * Note: Standard entrypoint for Native C Programs. + * The OS backend (NtProcessStartup) which calls this routine is + * implemented in a CRT-like static library (much like mainCRTStartup). + * Do NOT manually add the NtProcessStartup entrypoint or anything else. + */ int _cdecl -main(int argc, - char *argv[], - char *envp[], - int DebugFlag) +_main(int argc, + char *argv[], + char *envp[], + int DebugFlag) { KPRIORITY BasePriority = (8 + 1) + 4; NTSTATUS Status;

19 years

[ion] 18204: - Don't undef DBG_CONTINUE.

by ion＠svn.reactos.com

- Don't undef DBG_CONTINUE. Modified: trunk/reactos/include/ndk/umtypes.h _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-10-02 08:32:37 UTC (rev 18203) +++ trunk/reactos/include/ndk/umtypes.h 2005-10-02 08:33:38 UTC (rev 18204) @@ -22,7 +22,6 @@ #undef STATUS_TIMEOUT #undef STATUS_PENDING #undef DBG_EXCEPTION_HANDLED -#undef DBG_CONTINUE #undef STATUS_SEGMENT_NOTIFICATION #undef DBG_TERMINATE_THREAD #undef DBG_TERMINATE_PROCESS

19 years

[ion] 18203: - Small csr server public header cleanup.

by ion＠svn.reactos.com

- Small csr server public header cleanup. Modified: trunk/reactos/include/subsys/csr/server.h _____ Modified: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-10-02 08:31:45 UTC (rev 18202) +++ trunk/reactos/include/subsys/csr/server.h 2005-10-02 08:32:37 UTC (rev 18203) @@ -1,50 +1,20 @@ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/subsys/csr/server.h + * PURPOSE: Public Definitions for CSR Servers + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ #ifndef _CSRSERVER_H #define _CSRSERVER_H -#define CSR_SRV_SERVER 0 +/* DEPENDENCIES **************************************************************/ -typedef enum _CSR_PROCESS_FLAGS -{ - CsrProcessTerminating = 0x1, - CsrProcessSkipShutdown = 0x2, - CsrProcessCreateNewGroup = 0x100, - CsrProcessTerminated = 0x200, - CsrProcessLastThreadTerminated = 0x400, - CsrProcessIsConsoleApp = 0x800 -} CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; - -typedef enum _CSR_THREAD_FLAGS -{ - CsrThreadAltertable = 0x1, - CsrThreadInTermination = 0x2, - CsrThreadTerminated = 0x4, - CsrThreadIsServerThread = 0x10 -} CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; - -typedef enum _SHUTDOWN_RESULT -{ - CsrShutdownCsrProcess = 1, - CsrShutdownNonCsrProcess, - CsrShutdownCancelled -} SHUTDOWN_RESULT, *PSHUTDOWN_RESULT; - -typedef enum _CSR_SHUTDOWN_FLAGS -{ - CsrShutdownSystem = 4, - CsrShutdownOther = 8 -} CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; - -typedef enum _CSR_DEBUG_FLAGS -{ - CsrDebugOnlyThisProcess = 1, - CsrDebugProcessChildren = 2 -} CSR_PROCESS_DEBUG_FLAGS, *PCSR_PROCESS_DEBUG_FLAGS; - +/* TYPES **********************************************************************/ typedef struct _CSR_NT_SESSION { ULONG ReferenceCount; LIST_ENTRY SessionList; - ULONG SessionId; + ULONG SessionId; } CSR_NT_SESSION, *PCSR_NT_SESSION; typedef struct _CSR_PROCESS @@ -89,6 +59,47 @@ ULONG ImpersonationCount; } CSR_THREAD, *PCSR_THREAD; +/* ENUMERATIONS **************************************************************/ +#define CSR_SRV_SERVER 0 + +typedef enum _CSR_PROCESS_FLAGS +{ + CsrProcessTerminating = 0x1, + CsrProcessSkipShutdown = 0x2, + CsrProcessCreateNewGroup = 0x100, + CsrProcessTerminated = 0x200, + CsrProcessLastThreadTerminated = 0x400, + CsrProcessIsConsoleApp = 0x800 +} CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; + +typedef enum _CSR_THREAD_FLAGS +{ + CsrThreadAltertable = 0x1, + CsrThreadInTermination = 0x2, + CsrThreadTerminated = 0x4, + CsrThreadIsServerThread = 0x10 +} CSR_THREAD_FLAGS, *PCSR_THREAD_FLAGS; + +typedef enum _SHUTDOWN_RESULT +{ + CsrShutdownCsrProcess = 1, + CsrShutdownNonCsrProcess, + CsrShutdownCancelled +} SHUTDOWN_RESULT, *PSHUTDOWN_RESULT; + +typedef enum _CSR_SHUTDOWN_FLAGS +{ + CsrShutdownSystem = 4, + CsrShutdownOther = 8 +} CSR_SHUTDOWN_FLAGS, *PCSR_SHUTDOWN_FLAGS; + +typedef enum _CSR_DEBUG_FLAGS +{ + CsrDebugOnlyThisProcess = 1, + CsrDebugProcessChildren = 2 +} CSR_PROCESS_DEBUG_FLAGS, *PCSR_PROCESS_DEBUG_FLAGS; + +/* FUNCTION TYPES ************************************************************/ typedef NTSTATUS (*PCSR_CONNECT_CALLBACK)( @@ -123,6 +134,7 @@ IN BOOLEAN FirstPhase ); + /* FIXME: Put into public NDK Header */ typedef ULONG CSR_API_NUMBER; @@ -303,4 +315,14 @@ IN ULONG SubsystemType OPTIONAL, OUT PHANDLE hSmApiPort ); + +/* PROTOTYPES ****************************************************************/ + +NTSTATUS +NTAPI +CsrServerInitialization( + ULONG ArgumentCount, + PCHAR Arguments[] +); + #endif

19 years

[ion] 18202: - Small semaphore code simplification/optimization.

by ion＠svn.reactos.com

- Small semaphore code simplification/optimization. Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/sem.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-10-02 08:22:49 UTC (rev 18201) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-10-02 08:31:45 UTC (rev 18202) @@ -473,7 +473,10 @@ { /* Get the Mutant */ Mutant = CONTAINING_RECORD(NextEntry, KMUTANT, MutantListEntry); - DPRINT1("Mutant: %p. Type, Size %x %x\n", Mutant, Mutant->Header.Type, Mutant->Header.Size); + DPRINT1("Mutant: %p. Type, Size %x %x\n", + Mutant, + Mutant->Header.Type, + Mutant->Header.Size); /* Make sure it's not terminating with APCs off */ if (Mutant->ApcDisable) _____ Modified: trunk/reactos/ntoskrnl/ke/sem.c --- trunk/reactos/ntoskrnl/ke/sem.c 2005-10-02 08:22:49 UTC (rev 18201) +++ trunk/reactos/ntoskrnl/ke/sem.c 2005-10-02 08:31:45 UTC (rev 18202) @@ -1,11 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/sem.c * PURPOSE: Implements kernel semaphores - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch (welch(a)mcmail.com) */ /* INCLUDES *****************************************************************/ @@ -25,13 +24,12 @@ LONG Count, LONG Limit) { - DPRINT("KeInitializeSemaphore Sem: %x\n", Semaphore); /* Simply Initialize the Header */ KeInitializeDispatcherHeader(&Semaphore->Header, SemaphoreObject, - sizeof(KSEMAPHORE)/sizeof(ULONG), + sizeof(KSEMAPHORE) / sizeof(ULONG), Count); /* Set the Limit */ @@ -46,7 +44,7 @@ KeReadStateSemaphore(PKSEMAPHORE Semaphore) { /* Just return the Signal State */ - return(Semaphore->Header.SignalState); + return Semaphore->Header.SignalState; } /* @@ -77,9 +75,8 @@ KPRIORITY Increment, LONG Adjustment, BOOLEAN Wait) - { - ULONG InitialState; + LONG InitialState, ULONG State; KIRQL OldIrql; PKTHREAD CurrentThread; @@ -92,36 +89,36 @@ /* Lock the Dispatcher Database */ OldIrql = KeAcquireDispatcherDatabaseLock(); - /* Save the Old State */ + /* Save the Old State and get new one */ InitialState = Semaphore->Header.SignalState; + State = InitialState + Adjustement; /* Check if the Limit was exceeded */ - if (Semaphore->Limit < (LONG) InitialState + Adjustment || - InitialState > InitialState + Adjustment) { - + if ((Semaphore->Limit < State) || (InitialState > State)) + { /* Raise an error if it was exceeded */ KeReleaseDispatcherDatabaseLock(OldIrql); ExRaiseStatus(STATUS_SEMAPHORE_LIMIT_EXCEEDED); } /* Now set the new state */ - Semaphore->Header.SignalState += Adjustment; + Semaphore->Header.SignalState = State; /* Check if we should wake it */ - if (InitialState == 0 && !IsListEmpty(&Semaphore->Header.WaitListHead)) { - + if (!(InitialState) && !(IsListEmpty(&Semaphore->Header.WaitListHead)) + { /* Wake the Semaphore */ KiWaitTest(&Semaphore->Header, Increment); } /* If the Wait is true, then return with a Wait and don't unlock the Dispatcher Database */ - if (Wait == FALSE) { - + if (Wait == FALSE) + { /* Release the Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); - - } else { - + } + else + { /* Set a wait */ CurrentThread = KeGetCurrentThread(); CurrentThread->WaitNext = TRUE;

19 years

[ion] 18201: - Add RtlSetProcessCritical

by ion＠svn.reactos.com

- Add RtlSetProcessCritical - Some fixes. Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umtypes.h _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-10-02 08:08:04 UTC (rev 18200) +++ trunk/reactos/include/ndk/ketypes.h 2005-10-02 08:22:49 UTC (rev 18201) @@ -172,8 +172,6 @@ /* TYPES *********************************************************************/ -typedef LONG KPRIORITY; - #ifdef NTOS_MODE_USER typedef CCHAR KPROCESSOR_MODE; _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-10-02 08:08:04 UTC (rev 18200) +++ trunk/reactos/include/ndk/pstypes.h 2005-10-02 08:22:49 UTC (rev 18201) @@ -13,7 +13,7 @@ #include "ldrtypes.h" #include "mmtypes.h" #include "obtypes.h" -#include "extypes.h" +//#include "extypes.h" #ifndef NTOS_MODE_USER #include "setypes.h" #endif @@ -207,6 +207,11 @@ /* TYPES *********************************************************************/ +struct _W32THREAD; +struct _W32PROCESS; + +struct _ETHREAD; + #ifdef NTOS_MODE_USER typedef struct _CLIENT_ID { @@ -215,11 +220,6 @@ } CLIENT_ID, *PCLIENT_ID; #endif -struct _W32THREAD; -struct _W32PROCESS; - -struct _ETHREAD; - typedef struct _DESCRIPTOR_TABLE_ENTRY { ULONG Selector; _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-10-02 08:08:04 UTC (rev 18200) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-10-02 08:22:49 UTC (rev 18201) @@ -1313,6 +1313,15 @@ NTAPI RtlReleasePebLock(VOID); +NTSYSAPI +VOID +NTAPI +RtlSetProcessIsCritical( + IN BOOLEAN NewValue, + OUT PBOOLEAN OldValue OPTIONAL, + IN BOOLEAN IsWinlogon +); + /* * Environment/Path Functions */ _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-10-02 08:08:04 UTC (rev 18200) +++ trunk/reactos/include/ndk/rtltypes.h 2005-10-02 08:22:49 UTC (rev 18201) @@ -10,6 +10,7 @@ #define _RTLTYPES_H /* DEPENDENCIES **************************************************************/ +#include "pstypes.h" /* CONSTANTS *****************************************************************/ #define MAXIMUM_LEADBYTES 12 _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-10-02 08:08:04 UTC (rev 18200) +++ trunk/reactos/include/ndk/umtypes.h 2005-10-02 08:22:49 UTC (rev 18201) @@ -110,6 +110,7 @@ typedef short CSHORT; typedef CSHORT *PCSHORT; typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; +typedef LONG KPRIORITY; typedef LONG NTSTATUS, *PNTSTATUS; #define STATIC static

19 years

[fireball] 18200: Add vcprojmaker.cpp to the msvc project

by fireball＠svn.reactos.com

Add vcprojmaker.cpp to the msvc project Modified: trunk/reactos/tools/rbuild/rbuild.dsp _____ Modified: trunk/reactos/tools/rbuild/rbuild.dsp --- trunk/reactos/tools/rbuild/rbuild.dsp 2005-10-02 07:42:52 UTC (rev 18199) +++ trunk/reactos/tools/rbuild/rbuild.dsp 2005-10-02 08:08:04 UTC (rev 18200) @@ -114,6 +114,10 @@ SOURCE=.\backend\msvc\msvcmaker.cpp # End Source File +# Begin Source File + +SOURCE=.\backend\msvc\vcprojmaker.cpp +# End Source File # End Group # Begin Group "mingw"

19 years

[ea] 18199: - add copyright notice

by ea＠svn.reactos.com

- add copyright notice - fix unmatched bracket Modified: trunk/reactos/subsys/csr/main.c _____ Modified: trunk/reactos/subsys/csr/main.c --- trunk/reactos/subsys/csr/main.c 2005-10-02 01:21:43 UTC (rev 18198) +++ trunk/reactos/subsys/csr/main.c 2005-10-02 07:42:52 UTC (rev 18199) @@ -1,3 +1,23 @@ +/* $Id$ + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System @@ -27,7 +47,7 @@ NtSetInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, &DefaultHardErrorMode, - sizeof(DefaultHardErrorMode); + sizeof(DefaultHardErrorMode)); } int

19 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005