Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57627: [BASESRV] Remove unneeded comments.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 23:18:49 2012 New Revision: 57627 URL: http://svn.reactos.org/svn/reactos?rev=57627&view=rev Log: [BASESRV] Remove unneeded comments. Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Sat Oct 27 23:18:49 2012 @@ -191,13 +191,13 @@ { BASE_CREATE_PROCESS CreateProcessRequest; BASE_CREATE_THREAD CreateThreadRequest; - BASE_EXIT_PROCESS ExitProcessRequest; // CSRSS_TERMINATE_PROCESS TerminateProcessRequest; + BASE_EXIT_PROCESS ExitProcessRequest; BASE_GET_TEMP_FILE GetTempFile; BASE_CHECK_VDM CheckVdm; BASE_UPDATE_VDM_ENTRY UpdateVdmEntry; BASE_GET_VDM_EXIT_CODE GetVdmExitCode; - BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; // CSRSS_SET_SHUTDOWN_PARAMETERS - BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; // CSRSS_GET_SHUTDOWN_PARAMETERS + BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; + BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; BASE_SOUND_SENTRY SoundSentryRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; } Data;

1 0

[ekohl] 57626: [SAMSRV] - Fix MSVC build warnings. - Implement SamrAddMultipeMembersToAlias. - Add missing user attributes to the user setup code.
by ekohl＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: ekohl Date: Sat Oct 27 19:38:12 2012 New Revision: 57626 URL: http://svn.reactos.org/svn/reactos?rev=57626&view=rev Log: [SAMSRV] - Fix MSVC build warnings. - Implement SamrAddMultipeMembersToAlias. - Add missing user attributes to the user setup code. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -764,8 +764,8 @@ goto done; } - String->Length = Length - sizeof(WCHAR); - String->MaximumLength = Length; + String->Length = (USHORT)(Length - sizeof(WCHAR)); + String->MaximumLength = (USHORT)Length; String->Buffer = midl_user_allocate(Length); if (String->Buffer == NULL) { Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -16,6 +16,7 @@ /* GLOBALS ********************************************************************/ static SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; + /* FUNCTIONS ***************************************************************/ @@ -3051,6 +3052,8 @@ Use->Count = 0; } + TRACE("Returned Status %lx\n", Status); + return Status; } @@ -3145,8 +3148,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3201,8 +3204,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -3259,8 +3262,8 @@ if (NT_SUCCESS(Status)) { - Names->Element[i].MaximumLength = DataLength; - Names->Element[i].Length = DataLength - sizeof(WCHAR); + Names->Element[i].MaximumLength = (USHORT)DataLength; + Names->Element[i].Length = (USHORT)(DataLength - sizeof(WCHAR)); Status = SampRegQueryValue(AccountKeyHandle, L"Name", @@ -4319,6 +4322,7 @@ return Status; } + /* Function 34 */ NTSTATUS NTAPI @@ -4366,6 +4370,7 @@ return STATUS_SUCCESS; } + /* Function 35 */ NTSTATUS @@ -4676,8 +4681,6 @@ return Status; } - - static @@ -6283,6 +6286,7 @@ return Status; } + /* Function 51 */ NTSTATUS NTAPI @@ -6299,15 +6303,34 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 52 */ NTSTATUS NTAPI SamrAddMultipleMembersToAlias(IN SAMPR_HANDLE AliasHandle, IN PSAMPR_PSID_ARRAY MembersBuffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("SamrAddMultipleMembersToAlias(%p %p)\n", + AliasHandle, MembersBuffer); + + for (i = 0; i < MembersBuffer->Count; i++) + { + Status = SamrAddMemberToAlias(AliasHandle, + ((PSID *)MembersBuffer->Sids)[i]); + + if (Status == STATUS_MEMBER_IN_ALIAS) + Status = STATUS_SUCCESS; + + if (!NT_SUCCESS(Status)) + break; + } + + return Status; +} + /* Function 53 */ NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Oct 27 19:38:12 2012 @@ -224,6 +224,7 @@ ULONG ulRelativeId) { SAM_USER_FIXED_DATA FixedUserData; + LPWSTR lpEmptyString = L""; DWORD dwDisposition; WCHAR szAccountKeyName[32]; HKEY hAccountKey = NULL; @@ -260,6 +261,62 @@ REG_SZ, (LPVOID)lpAccountName, (wcslen(lpAccountName) + 1) * sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"FullName", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectory", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"HomeDirectoryDrive", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ScriptPath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"ProfilePath", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"AdminComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"UserComment", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + + RegSetValueEx(hAccountKey, + L"WorkStations", + 0, + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); RegCloseKey(hAccountKey); }

1 0

[hbelusca] 57625: [NTDLL] - Code formatting. - Fix CSR message length computation. [CSR] - Remove unneeded comments. - Correct arguments names.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 19:05:10 2012 New Revision: 57625 URL: http://svn.reactos.org/svn/reactos?rev=57625&view=rev Log: [NTDLL] - Code formatting. - Fix CSR message length computation. [CSR] - Remove unneeded comments. - Correct arguments names. Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/ntdll/csr/capture.c branches/ros-csrss/dll/ntdll/csr/connect.c branches/ros-csrss/include/reactos/subsys/csr/csr.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/api.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,16 +6,16 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ extern HANDLE CsrApiPort; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented @@ -78,7 +78,7 @@ Status = CsrClientCallServer(&ApiMessage, NULL, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpIdentifyAlertable), - sizeof(CSR_SET_PRIORITY_CLASS)); + sizeof(CSR_IDENTIFY_ALTERTABLE_THREAD)); /* Return to caller */ return Status; Modified: branches/ros-csrss/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/capture… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/capture.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,16 +6,16 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ extern HANDLE CsrPortHeap; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -6,13 +6,13 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntdll.h> #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ HANDLE CsrApiPort; HANDLE CsrProcessId; @@ -28,7 +28,7 @@ #define UNICODE_PATH_SEP L"\\" -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ /* * @implemented @@ -45,10 +45,10 @@ */ NTSTATUS NTAPI -CsrClientCallServer(PCSR_API_MESSAGE ApiMessage, - PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - CSR_API_NUMBER ApiNumber, - ULONG RequestLength) +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength) { NTSTATUS Status; ULONG PointerCount; @@ -58,8 +58,11 @@ /* Fill out the Port Message Header */ ApiMessage->Header.u2.ZeroInit = 0; - ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); - ApiMessage->Header.u1.s1.TotalLength = RequestLength; + ApiMessage->Header.u1.s1.TotalLength = + FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + /* FIELD_OFFSET(CSR_API_MESSAGE, Data) <= sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data) */ + ApiMessage->Header.u1.s1.DataLength = + ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; @@ -113,7 +116,7 @@ /* Check if we got a a Capture Buffer */ if (CaptureBuffer) { - /* We have to convert from the remote view to our remote view */ + /* We have to convert back from the remote view to our local view */ DPRINT("Reconverting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) ApiMessage->CsrCaptureData - @@ -168,7 +171,7 @@ NTSTATUS NTAPI -CsrConnectToServer(IN PWSTR ObjectDirectory) +CsrpConnectToServer(IN PWSTR ObjectDirectory) { ULONG PortNameLength; UNICODE_STRING PortName; @@ -318,11 +321,11 @@ */ NTSTATUS NTAPI -CsrClientConnectToServer(PWSTR ObjectDirectory, - ULONG ServerId, - PVOID ConnectionInfo, - PULONG ConnectionInfoSize, - PBOOLEAN ServerToServerCall) +CsrClientConnectToServer(IN PWSTR ObjectDirectory, + IN ULONG ServerId, + IN PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoSize, + OUT PBOOLEAN ServerToServerCall) { NTSTATUS Status; PIMAGE_NT_HEADERS NtHeader; @@ -397,7 +400,7 @@ if (!CsrApiPort) { /* No, set it up now */ - if (!NT_SUCCESS(Status = CsrConnectToServer(ObjectDirectory))) + if (!NT_SUCCESS(Status = CsrpConnectToServer(ObjectDirectory))) { /* Failed */ DPRINT1("Failure to connect to CSR\n"); @@ -410,8 +413,7 @@ ClientConnect->ConnectionInfoSize = *ConnectionInfoSize; /* Setup a buffer for the connection info */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, - ClientConnect->ConnectionInfoSize); + CaptureBuffer = CsrAllocateCaptureBuffer(1, ClientConnect->ConnectionInfoSize); if (CaptureBuffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -435,12 +437,6 @@ CaptureBuffer, CSR_CREATE_API_NUMBER(CSRSRV_SERVERDLL_INDEX, CsrpClientConnect), sizeof(CSR_CLIENT_CONNECT)); -/* - Status = CsrClientCallServer(&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CSR_NATIVE, CONNECT_PROCESS), - sizeof(CSR_API_MESSAGE)); -*/ } else { Modified: branches/ros-csrss/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -33,10 +33,10 @@ NTSTATUS NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE Request, +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN ULONG ApiNumber, - IN ULONG RequestLength); + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength); PVOID NTAPI Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sat Oct 27 19:05:10 2012 @@ -94,7 +94,7 @@ struct _CSR_CAPTURE_BUFFER *PreviousCaptureBuffer; ULONG PointerCount; ULONG_PTR BufferEnd; - ULONG_PTR PointerArray[1]; // MessagePointerOffsets // Offsets within CSR_API_MSG of pointers + ULONG_PTR PointerArray[1]; } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER; @@ -122,8 +122,6 @@ CSR_SET_PRIORITY_CLASS SetPriorityClass; CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread; - // ULONG_PTR ApiMessageData[39]; //// what to do ???? - /*** win32csr thingies to remove. ***/ #if 1 CSRSS_CREATE_DESKTOP CreateDesktopRequest;

1 0

[gadamopoulos] 57624: [win32k] - Double the size of the user handle table in order to allow the test suite to complete despite the horrible object leaks
by gadamopoulos＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: gadamopoulos Date: Sat Oct 27 18:06:10 2012 New Revision: 57624 URL: http://svn.reactos.org/svn/reactos?rev=57624&view=rev Log: [win32k] - Double the size of the user handle table in order to allow the test suite to complete despite the horrible object leaks Modified: trunk/reactos/win32ss/user/ntuser/object.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Oct 27 18:06:10 2012 @@ -283,11 +283,11 @@ BOOL FASTCALL UserCreateHandleTable(VOID) { - PVOID mem; + INT HandleCount = 1024 * 4; // FIXME: Don't alloc all at once! Must be mapped into umode also... - mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * 1024*2); + mem = UserHeapAlloc(sizeof(USER_HANDLE_ENTRY) * HandleCount); if (!mem) { ERR("Failed creating handle table\n"); @@ -303,7 +303,7 @@ } // FIXME: Make auto growable - UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * 1024*2); + UserInitHandleTable(gHandleTable, mem, sizeof(USER_HANDLE_ENTRY) * HandleCount); return TRUE; }

1 0

[gadamopoulos] 57623: [win32k] - Fix WARN macros - Keep a list of the PROCESSINFO of all the running processes - Count how many handles a process owns per type in PROCESSINFO - Improve the debug ou...
by gadamopoulos＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: gadamopoulos Date: Sat Oct 27 16:39:18 2012 New Revision: 57623 URL: http://svn.reactos.org/svn/reactos?rev=57623&view=rev Log: [win32k] - Fix WARN macros - Keep a list of the PROCESSINFO of all the running processes - Count how many handles a process owns per type in PROCESSINFO - Improve the debug output when we run out of user handles to show all handle counts per process Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/win32kdebug.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -56,7 +56,8 @@ otHidData, otDeviceInfo, otTouchInput, - otGestureInfo + otGestureInfo, + USER_HANDLE_TYPE_COUNT } USER_OBJECT_TYPE; typedef enum _USERTHREADINFOCLASS Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -26,6 +26,7 @@ SHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; +PPROCESSINFO gppiList = NULL; extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; @@ -55,7 +56,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PPROCESSINFO ppiCurrent; + PPROCESSINFO ppiCurrent, *pppi; DECLARE_RETURN(NTSTATUS); ASSERT(Process->Peb); @@ -160,6 +161,10 @@ ASSERT(ppiCurrent->pPoolDcAttr); ASSERT(ppiCurrent->pPoolBrushAttr); ASSERT(ppiCurrent->pPoolRgnAttr); + + /* Add the process to the global list */ + ppiCurrent->ppiNext = gppiList; + gppiList = ppiCurrent; } else { @@ -212,11 +217,25 @@ if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + pppi = &gppiList; + while (*pppi != NULL && *pppi != ppiCurrent) + pppi = &(*pppi)->ppiNext; + + ASSERT(*pppi == ppiCurrent); + + *pppi = ppiCurrent->ppiNext; + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); /* Ftee the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + DbgUserDumpHandleTable(); + } +#endif } RETURN( STATUS_SUCCESS); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -12,6 +12,7 @@ extern BOOL gbInitialized; extern PSERVERINFO gpsi; extern PTHREADINFO gptiCurrent; +extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -12,6 +12,66 @@ //int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; +#if DBG + +void DbgUserDumpHandleTable() +{ + int HandleCounts[USER_HANDLE_TYPE_COUNT]; + PPROCESSINFO ppiList; + int i; + PWCHAR TypeNames[] = {L"Free",L"Window",L"Menu", L"CursorIcon", L"SMWP", L"Hook", L"ClipBoardData", L"CallProc", + L"Accel", L"DDEaccess", L"DDEconv", L"DDExact", L"Monitor", L"KBDlayout", L"KBDfile", + L"Event", L"Timer", L"InputContext", L"HidData", L"DeviceInfo", L"TouchInput",L"GestureInfo"}; + + ERR("Total handles count: %d\n", gpsi->cHandleEntries); + + memset(HandleCounts, 0, sizeof(HandleCounts)); + + /* First of all count the number of handles per tpe */ + ppiList = gppiList; + while (ppiList) + { + ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); + + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + HandleCounts[i] += ppiList->DbgHandleCount[i]; + + DbgPrint("%S: %d, ", TypeNames[i], ppiList->DbgHandleCount[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + ppiList = ppiList->ppiNext; + } + + /* Print total type counts */ + ERR("Total handles of the running processes: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); + + /* Now count the handle counts that are allocated from the handle table */ + memset(HandleCounts, 0, sizeof(HandleCounts)); + for (i = 0; i < gHandleTable->nb_handles; i++) + HandleCounts[gHandleTable->handles[i].type]++; + + ERR("Total handles count allocated: \n\t"); + for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + { + DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); + if (i % 6 == 0) + DbgPrint("\n\t"); + } + DbgPrint("\n"); +} + +#endif PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ) { @@ -51,55 +111,12 @@ if (ht->nb_handles >= ht->allocated_handles) /* Need to grow the array */ { -/**/ - int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0, iEvent = 0, iSMWP = 0; - /**/ - ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); -//#if 0 - for(i = 0; i < ht->nb_handles; i++) - { - switch (ht->handles[i].type) - { - case otFree: // Should be zero. - iFree++; - break; - case otWindow: - iWindow++; - break; - case otMenu: - iMenu++; - break; - case otCursorIcon: - iCursorIcon++; - break; - case otHook: - iHook++; - break; - case otCallProc: - iCallProc++; - break; - case otAccel: - iAccel++; - break; - case otMonitor: - iMonitor++; - break; - case otTimer: - iTimer++; - break; - case otEvent: - iEvent++; - break; - case otSMWP: - iSMWP++; - default: - break; - } - } - ERR("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d Event = %d SMWP = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer, iEvent, iSMWP ); -//#endif + ERR("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); + +#if DBG + DbgUserDumpHandleTable(); +#endif + return NULL; #if 0 PUSER_HANDLE_ENTRY new_handles; @@ -138,6 +155,11 @@ { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); void *ret; + +#if DBG + ppi->DbgHandleCount[entry->type]--; +#endif + ret = entry->ptr; entry->ptr = ht->freelist; entry->type = 0; @@ -339,6 +361,10 @@ return NULL; } +#if DBG + ppi->DbgHandleCount[type]++; +#endif + RtlZeroMemory(Object, size); switch (type) Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -39,6 +39,7 @@ PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); +void DbgUserDumpHandleTable(); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -195,6 +195,7 @@ PTHREADINFO ptiList; PTHREADINFO ptiMainThread; struct _DESKTOP* rpdeskStartup; + PPROCESSINFO ppiNext; PCLS pclsPrivateList; PCLS pclsPublicList; INT cThreads; @@ -224,6 +225,7 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[USER_HANDLE_TYPE_COUNT]; #endif } PROCESSINFO; Modified: trunk/reactos/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32k… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Sat Oct 27 16:39:18 2012 @@ -125,7 +125,7 @@ #define DBG_ENABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] |= level) #define DBG_DISABLE_CHANNEL(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] &= ~level) - #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) ((ppi)->DbgChannelLevel[ch] & level) + #define DBG_IS_CHANNEL_ENABLED(ppi,ch,level) (((ppi)->DbgChannelLevel[ch] & level) == level) #define DBG_PRINT(ppi,ch,level,fmt, ...) do { \ if((level == ERR_LEVEL) || (ppi && DBG_IS_CHANNEL_ENABLED(ppi,ch,level))) \

1 0

[hbelusca] 57622: [CSRSRV] Code formatting only.
by hbelusca＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: hbelusca Date: Sat Oct 27 14:30:32 2012 New Revision: 57622 URL: http://svn.reactos.org/svn/reactos?rev=57622&view=rev Log: [CSRSRV] Code formatting only. Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/wait.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -7,14 +7,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ static unsigned ApiDefinitionsCount = 0; static PCSRSS_API_DEFINITION ApiDefinitions = NULL; @@ -25,7 +25,7 @@ volatile LONG CsrpDynamicThreadTotal; extern ULONG CsrMaxApiRequestThreads; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ #if 0 NTSTATUS FASTCALL Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -6,14 +6,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] = { @@ -49,7 +49,7 @@ ULONG CsrSrvSharedSectionSize; HANDLE CsrSrvSharedSection; -/* PRIVATE FUNCTIONS**********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrServerDllInitialization @@ -583,7 +583,7 @@ return STATUS_INVALID_PARAMETER; } -/* PUBLIC FUNCTIONS***********************************************************/ +/* PUBLIC FUNCTIONS ***********************************************************/ /*++ * @name CsrSetCallingSpooler Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -6,14 +6,14 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ RTL_CRITICAL_SECTION CsrNtSessionLock; LIST_ENTRY CsrNtSessionList; @@ -37,7 +37,7 @@ "Unknown Csr Sb Api Number" }; -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrInitializeNtSessionList @@ -191,7 +191,7 @@ } } -/* SESSION MANAGER FUNCTIONS**************************************************/ +/* SESSION MANAGER FUNCTIONS **************************************************/ /*++ * @name CsrSbCreateSession Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 27 14:30:32 2012 @@ -7,18 +7,18 @@ * Alex Ionescu (alex(a)relsoft.net) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "srv.h" #define NDEBUG #include <debug.h> -/* DATA **********************************************************************/ +/* DATA ***********************************************************************/ RTL_CRITICAL_SECTION CsrWaitListsLock; -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ /*++ * @name CsrInitializeWait @@ -183,7 +183,7 @@ return FALSE; } -/* PUBLIC FUNCTIONS **********************************************************/ +/* PUBLIC FUNCTIONS ***********************************************************/ /*++ * @name CsrCreateWait

1 0

[jgardou] 57621: [GLU32] - From version 9.0, mesa doesn't ship the glu library anymore. It is maintained in another tree. - Introduce glu 9.0 to ReactOS code base.
by jgardou＠svn.reactos.org 27 Oct '12

27 Oct '12

Author: jgardou Date: Sat Oct 27 13:44:35 2012 New Revision: 57621 URL: http://svn.reactos.org/svn/reactos?rev=57621&view=rev Log: [GLU32] - From version 9.0, mesa doesn't ship the glu library anymore. It is maintained in another tree. - Introduce glu 9.0 to ReactOS code base. Added: trunk/reactos/dll/opengl/glu32/ trunk/reactos/dll/opengl/glu32/.gitignore (with props) trunk/reactos/dll/opengl/glu32/CMakeLists.txt (with props) trunk/reactos/dll/opengl/glu32/glu32.spec (with props) trunk/reactos/dll/opengl/glu32/include/ trunk/reactos/dll/opengl/glu32/include/GL/ trunk/reactos/dll/opengl/glu32/include/GL/glu.h (with props) trunk/reactos/dll/opengl/glu32/include/GL/glu_mangle.h (with props) trunk/reactos/dll/opengl/glu32/src/ trunk/reactos/dll/opengl/glu32/src/include/ trunk/reactos/dll/opengl/glu32/src/include/gluos.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/ trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/ trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glimports.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/mystdio.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/mystdlib.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/ trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/cachingeval.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/cachingeval.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/defines.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaymode.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridline.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridvertex.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/jarcloc.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/myassert.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mymath.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mysetjmp.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mystring.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsconsts.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertex.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/types.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/ trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/definitions.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/glimports.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/mystdio.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/mystdlib.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.h (with props) trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/zlassert.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/ trunk/reactos/dll/opengl/glu32/src/libtess/README (with props) trunk/reactos/dll/opengl/glu32/src/libtess/alg-outline (with props) trunk/reactos/dll/opengl/glu32/src/libtess/dict-list.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/dict.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/dict.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/geom.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/geom.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/memalloc.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/memalloc.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/mesh.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/mesh.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/normal.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/normal.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/priorityq.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/priorityq.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/render.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/render.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/sweep.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/sweep.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/tess.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/tess.h (with props) trunk/reactos/dll/opengl/glu32/src/libtess/tessmono.c (with props) trunk/reactos/dll/opengl/glu32/src/libtess/tessmono.h (with props) trunk/reactos/dll/opengl/glu32/src/libutil/ trunk/reactos/dll/opengl/glu32/src/libutil/error.c (with props) trunk/reactos/dll/opengl/glu32/src/libutil/glue.c (with props) trunk/reactos/dll/opengl/glu32/src/libutil/gluint.h (with props) trunk/reactos/dll/opengl/glu32/src/libutil/mipmap.c (with props) trunk/reactos/dll/opengl/glu32/src/libutil/project.c (with props) trunk/reactos/dll/opengl/glu32/src/libutil/quad.c (with props) trunk/reactos/dll/opengl/glu32/src/libutil/registry.c (with props) Removed: trunk/reactos/dll/opengl/mesa/src/glu/ Modified: trunk/reactos/dll/opengl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… Added: trunk/reactos/dll/opengl/glu32/.gitignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/.gitignor… Added: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… Added: trunk/reactos/dll/opengl/glu32/glu32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/glu32.spe… Added: trunk/reactos/dll/opengl/glu32/include/GL/glu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/include/G… Added: trunk/reactos/dll/opengl/glu32/include/GL/glu_mangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/include/G… Added: trunk/reactos/dll/opengl/glu32/src/include/gluos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/inclu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierEval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/bezierPatchMesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glcurveval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glimports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glinterface.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glrenderer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/glsurfeval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/incurveeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/insurfeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/mystdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/interface/mystdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arcsorter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/arctess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/backend.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basiccrveval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/basicsurfeval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bezierarc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/bufpool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/cachingeval.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/cachingeval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/ccw.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/coveandtiler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curve.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvelist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/curvesub.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/dataTransform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/defines.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaylist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/displaymode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/flistsorter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridtrimvertex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/gridvertex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/hull.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/intersect.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/jarcloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/knotvector.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdesc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mapdescv.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/maplist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mesher.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monoTriangulationBackend.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/monotonizer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/myassert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mycode.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mymath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mysetjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/mystring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsconsts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbsinterfac.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/nurbstess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/patchlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/pwlarc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/quilt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/renderhints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/simplemath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/slicer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/sorter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/splitarcs.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/subdivider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/tobezier.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimregion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/trimvertpool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/uarray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/internals/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/directedLine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/glimports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/gridWrap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoChain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoPolyPart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/monoTriangulation.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/mystdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/mystdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionX.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/partitionY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyDBG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/polyUtil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/primitiveStream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/quicksort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/rectBlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleComp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompBot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompRight.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleCompTop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampleMonoPoly.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/sampledLine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/searchTree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libnurbs/nurbtess/zlassert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libnu… Added: trunk/reactos/dll/opengl/glu32/src/libtess/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/alg-outline URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/dict-list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/dict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/geom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/geom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/memalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/memalloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/mesh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/normal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/normal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/priorityq-sort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/priorityq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/priorityq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/render.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/render.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/sweep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/sweep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/tess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/tess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/tessmono.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libtess/tessmono.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libte… Added: trunk/reactos/dll/opengl/glu32/src/libutil/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/glue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/gluint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/project.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/quad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Added: trunk/reactos/dll/opengl/glu32/src/libutil/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/src/libut… Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/CMakeL…

1 0

[hbelusca] 57620: [CONSRV/WINSRV] - Fix structures usage and headers inclusions. - Make winsrv compile. - Deactivate some code related to processes enumeration (for testing purposes).
by hbelusca＠svn.reactos.org 25 Oct '12

25 Oct '12

Author: hbelusca Date: Thu Oct 25 22:14:46 2012 New Revision: 57620 URL: http://svn.reactos.org/svn/reactos?rev=57620&view=rev Log: [CONSRV/WINSRV] - Fix structures usage and headers inclusions. - Make winsrv compile. - Deactivate some code related to processes enumeration (for testing purposes). Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/win32csr/win32csr.h branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/server.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -1365,7 +1365,7 @@ return Status; } -/* FIXME: Temporary hack. This is really "CsrShutdownProcess", mostly. Used by win32csr */ +/* FIXME: Temporary hack. This is really "CsrShutdownProcess", mostly. Used by winsrv */ #if 0 NTSTATUS WINAPI Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -31,6 +31,7 @@ /* Shared header with console.dll */ #include "console.h" + extern HANDLE ConSrvHeap; // extern HANDLE BaseSrvSharedHeap; Modified: branches/ros-csrss/win32ss/user/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… ============================================================================== --- branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/win32csr/win32csr.h [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -13,7 +13,6 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <psapi.h> /* External Winlogon Header */ #include <winlogon.h> Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/C… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -15,7 +15,7 @@ add_library(winsrv SHARED ${SOURCE}) -# target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() +target_link_libraries(winsrv win32ksys ${PSEH_LIB}) # win32ksys because of NtUser...() set_module_type(winsrv win32dll) Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -8,6 +8,10 @@ */ #include "winsrv.h" + +/* Public Win32K Headers */ +// For calling NtUser...() +#include <ntuser.h> #define NDEBUG #include <debug.h> Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -25,6 +25,8 @@ CSR_API(SrvRegisterServicesProcess) { + PCSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterServicesProcessRequest; + if (ServicesProcessIdValid == TRUE) { /* Only accept a single call */ @@ -32,7 +34,7 @@ } else { - ServicesProcessId = (ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId; + ServicesProcessId = (ULONG_PTR)RegisterServicesProcessRequest->ProcessId; ServicesProcessIdValid = TRUE; return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -15,29 +15,32 @@ #include <debug.h> - static HWND LogonNotifyWindow = NULL; static HANDLE LogonProcess = NULL; /* FUNCTIONS *****************************************************************/ +/* NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context) { return CsrEnumProcesses(EnumProc, Context); } +*/ CSR_API(SrvRegisterLogonProcess) { - if (ApiMessage->Data.RegisterLogonProcessRequest.Register) + PCSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.RegisterLogonProcessRequest; + + if (RegisterLogonProcessRequest->Register) { if (0 != LogonProcess) { return STATUS_LOGON_SESSION_EXISTS; } - LogonProcess = ApiMessage->Data.RegisterLogonProcessRequest.ProcessId; + LogonProcess = RegisterLogonProcessRequest->ProcessId; } else { @@ -55,9 +58,10 @@ CSR_API(CsrSetLogonNotifyWindow) { + PCSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.SetLogonNotifyWindowRequest; DWORD WindowCreator; - if (0 == GetWindowThreadProcessId(ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow, + if (0 == GetWindowThreadProcessId(SetLogonNotifyWindowRequest->LogonNotifyWindow, &WindowCreator)) { DPRINT1("Can't get window creator\n"); @@ -69,7 +73,7 @@ return STATUS_ACCESS_DENIED; } - LogonNotifyWindow = ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow; + LogonNotifyWindow = SetLogonNotifyWindowRequest->LogonNotifyWindow; return STATUS_SUCCESS; } @@ -142,14 +146,14 @@ TitleLength = SendMessageW(NotifyContext->WndClient, WM_GETTEXTLENGTH, 0, 0) + GetWindowTextLengthW(Dlg); - Title = HeapAlloc(Win32CsrApiHeap, 0, (TitleLength + 1) * sizeof(WCHAR)); + Title = HeapAlloc(UserSrvHeap, 0, (TitleLength + 1) * sizeof(WCHAR)); if (NULL != Title) { Len = GetWindowTextW(Dlg, Title, TitleLength + 1); SendMessageW(NotifyContext->WndClient, WM_GETTEXT, TitleLength + 1 - Len, (LPARAM) (Title + Len)); SetWindowTextW(Dlg, Title); - HeapFree(Win32CsrApiHeap, 0, Title); + HeapFree(UserSrvHeap, 0, Title); } ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); SendMessageW(ProgressBar, PBM_SETRANGE32, 0, @@ -467,6 +471,48 @@ return TRUE; } +/*** Taken from win32ss/user/win32csr/desktopbg.c ***/ +BOOL FASTCALL +DtbgIsDesktopVisible(VOID) +{ + HWND VisibleDesktopWindow = GetDesktopWindow(); // DESKTOPWNDPROC + + if (VisibleDesktopWindow != NULL && + !IsWindowVisible(VisibleDesktopWindow)) + { + VisibleDesktopWindow = NULL; + } + + return VisibleDesktopWindow != NULL; +} +/****************************************************/ + +/*** Taken from win32ss/user/consrv/console.c ***/ +/* TODO: Find another way to do it. */ +VOID FASTCALL +ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeout) +{ + HANDLE Thread; + + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ClientId.UniqueProcess); + + if (ProcessData->CtrlDispatcher) + { + + Thread = CreateRemoteThread(ProcessData->ProcessHandle, NULL, 0, + (LPTHREAD_START_ROUTINE) ProcessData->CtrlDispatcher, + UlongToPtr(Event), 0, NULL); + if (NULL == Thread) + { + DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); + return; + } + WaitForSingleObject(Thread, Timeout); + CloseHandle(Thread); + } +} +/************************************************/ + static BOOL FASTCALL NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, PSHUTDOWN_SETTINGS ShutdownSettings, @@ -555,6 +601,7 @@ DWORD CsrssProcess; } PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT; +#if 0 static NTSTATUS WINAPI ExitReactosProcessEnum(PCSR_PROCESS ProcessData, PVOID Data) { @@ -610,7 +657,7 @@ { ProcessData->ShutdownLevel = 0; } - NewData = HeapAlloc(Win32CsrApiHeap, 0, (Context->ProcessCount + 1) + NewData = HeapAlloc(UserSrvHeap, 0, (Context->ProcessCount + 1) * sizeof(PCSR_PROCESS)); if (NULL == NewData) { @@ -620,7 +667,7 @@ { memcpy(NewData, Context->ProcessData, Context->ProcessCount * sizeof(PCSR_PROCESS)); - HeapFree(Win32CsrApiHeap, 0, Context->ProcessData); + HeapFree(UserSrvHeap, 0, Context->ProcessData); } Context->ProcessData = NewData; Context->ProcessData[Context->ProcessCount] = ProcessData; @@ -629,6 +676,7 @@ return STATUS_SUCCESS; } +#endif static int ProcessDataCompare(const void *Elem1, const void *Elem2) @@ -723,7 +771,7 @@ } else { - KeyName = HeapAlloc(Win32CsrApiHeap, 0, + KeyName = HeapAlloc(UserSrvHeap, 0, (wcslen(StringSid) + wcslen(Subkey) + 1) * sizeof(WCHAR)); if (NULL == KeyName) @@ -739,7 +787,7 @@ ErrCode = RegOpenKeyExW(HKEY_USERS, KeyName, 0, KEY_QUERY_VALUE, &DesktopKey); if (KeyName != InitialKeyName) { - HeapFree(Win32CsrApiHeap, 0, KeyName); + HeapFree(UserSrvHeap, 0, KeyName); } if (ERROR_SUCCESS != ErrCode) { @@ -810,7 +858,7 @@ { if (sizeof(FixedUserInfo) < ReturnLength) { - UserInfo = HeapAlloc(Win32CsrApiHeap, 0, ReturnLength); + UserInfo = HeapAlloc(UserSrvHeap, 0, ReturnLength); if (NULL == UserInfo) { DPRINT1("Unable to allocate %u bytes for user info\n", @@ -823,7 +871,7 @@ { DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - HeapFree(Win32CsrApiHeap, 0, UserInfo); + HeapFree(UserSrvHeap, 0, UserInfo); CloseHandle(CallerToken); return STATUS_UNSUCCESSFUL; } @@ -843,7 +891,7 @@ LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); if (UserInfo != (TOKEN_USER *) FixedUserInfo) { - HeapFree(Win32CsrApiHeap, 0, UserInfo); + HeapFree(UserSrvHeap, 0, UserInfo); } Context.CsrssProcess = GetCurrentProcessId(); ShellWnd = GetShellWindow(); @@ -858,14 +906,14 @@ Context.ShellProcess = 0; } - Status = Win32CsrEnumProcesses(ExitReactosProcessEnum, &Context); + // Status = Win32CsrEnumProcesses(ExitReactosProcessEnum, &Context); if (! NT_SUCCESS(Status)) { DPRINT1("Failed to enumerate registered processes, status 0x%x\n", Status); if (NULL != Context.ProcessData) { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); + HeapFree(UserSrvHeap, 0, Context.ProcessData); } return Status; } @@ -890,7 +938,7 @@ /* Cleanup */ if (NULL != Context.ProcessData) { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); + HeapFree(UserSrvHeap, 0, Context.ProcessData); } return Status; @@ -928,16 +976,18 @@ CSR_API(SrvExitWindowsEx) { - if (0 == (ApiMessage->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) + PCSRSS_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; + + if (0 == (ExitReactosRequest->Flags & EWX_INTERNAL_FLAG)) { return UserExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - ApiMessage->Data.ExitReactosRequest.Flags); + ExitReactosRequest->Flags); } else { return InternalExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, (DWORD_PTR) ApiMessage->Header.ClientId.UniqueThread, - ApiMessage->Data.ExitReactosRequest.Flags); + ExitReactosRequest->Flags); } } Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Thu Oct 25 22:14:46 2012 @@ -19,6 +19,9 @@ // #include <stdio.h> +/* External Winlogon Header */ +#include <winlogon.h> + /* CSRSS Header */ #include <csr/csrsrv.h> @@ -27,8 +30,15 @@ // #include <win/base.h> // #include <win/windows.h> +/* Public Win32 Headers */ +#include <commctrl.h> + #include "resource.h" + +extern HANDLE UserSrvHeap; +// extern HANDLE BaseSrvSharedHeap; +// extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; /* init.c */ BOOL WINAPI _UserSoundSentry(VOID);

1 0

[hbelusca] 57619: [CSR/CONSRV/WINSRV] - Move some structures to better place, fix code.
by hbelusca＠svn.reactos.org 25 Oct '12

25 Oct '12

Author: hbelusca Date: Thu Oct 25 21:37:52 2012 New Revision: 57619 URL: http://svn.reactos.org/svn/reactos?rev=57619&view=rev Log: [CSR/CONSRV/WINSRV] - Move some structures to better place, fix code. Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/include/reactos/subsys/csr/csrss.h branches/ros-csrss/include/reactos/subsys/win/base.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/winsrv/harderror.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/shutdown.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -75,6 +75,12 @@ ULONG PriorityClass; } CSR_SET_PRIORITY_CLASS, *PCSR_SET_PRIORITY_CLASS; +typedef struct +{ + HANDLE UniqueThread; + CLIENT_ID Cid; +} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; + typedef struct _CSR_CLIENT_CONNECT { ULONG ServerId; @@ -118,19 +124,13 @@ // ULONG_PTR ApiMessageData[39]; //// what to do ???? - /*** Temporary ***/ + /*** win32csr thingies to remove. ***/ #if 1 - CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; - CSRSS_EXIT_REACTOS ExitReactosRequest; - CSRSS_CREATE_DESKTOP CreateDesktopRequest; CSRSS_SHOW_DESKTOP ShowDesktopRequest; CSRSS_HIDE_DESKTOP HideDesktopRequest; - CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest; - CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; - CSRSS_GET_PROCESS_LIST GetProcessListRequest; #endif - /*****************/ + /************************************/ } Data; }; }; Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -31,6 +31,7 @@ } CSR_NT_SESSION, *PCSR_NT_SESSION; /*** old thingie, remove it later... (put it in winsrv -- console) ***/ +#include <win/conmsg.h> typedef struct _CSRSS_CON_PROCESS_DATA { HANDLE ConsoleEvent; Modified: branches/ros-csrss/include/reactos/subsys/csr/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -3,58 +3,12 @@ #ifndef __INCLUDE_CSRSS_CSRSS_H #define __INCLUDE_CSRSS_CSRSS_H -#define CSR_NATIVE 0x0000 // CSRSRV -#define CSR_CONSOLE 0x0001 // WIN32CSR -#define CSR_GUI 0x0002 // WINSRV -#define CONSOLE_INPUT_MODE_VALID (0x0f) -#define CONSOLE_OUTPUT_MODE_VALID (0x03) +// Used in ntdll/csr/connect.c +#define CSR_CSRSS_SECTION_SIZE (65536) -#define CSR_CSRSS_SECTION_SIZE (65536) - -typedef VOID (CALLBACK *PCONTROLDISPATCHER)(DWORD); - -typedef struct -{ - USHORT nMaxIds; - PDWORD ProcessId; - ULONG nProcessIdsTotal; -} CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; - -typedef struct -{ - HANDLE UniqueThread; - CLIENT_ID Cid; -} CSRSS_IDENTIFY_ALERTABLE_THREAD, *PCSRSS_IDENTIFY_ALERTABLE_THREAD; - -typedef struct -{ - HANDLE ProcessId; -} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; - -typedef struct -{ - UINT Flags; - DWORD Reserved; -} CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; - -typedef struct -{ - HANDLE Handle; -} CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE; - -typedef struct -{ - HANDLE Handle; -} CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE; - -typedef struct -{ - HANDLE Handle; - DWORD Access; - BOOL Inheritable; - DWORD Options; -} CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE; +/*** win32csr thingies to remove. ***/ +#if 1 typedef struct { @@ -73,39 +27,7 @@ HWND DesktopWindow; } CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP; -typedef struct -{ - HWND LogonNotifyWindow; -} CSRSS_SET_LOGON_NOTIFY_WINDOW, *PCSRSS_SET_LOGON_NOTIFY_WINDOW; - -typedef struct -{ - HANDLE ProcessId; - BOOL Register; -} CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; - -typedef struct -{ - HANDLE InputWaitHandle; -} CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; - -#define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) - -#define REGISTER_SERVICES_PROCESS (0x1D) -#define EXIT_REACTOS (0x1E) -#define CLOSE_HANDLE (0x26) -#define VERIFY_HANDLE (0x27) -#define DUPLICATE_HANDLE (0x28) - -#define CREATE_DESKTOP (0x2B) -#define SHOW_DESKTOP (0x2C) -#define HIDE_DESKTOP (0x2D) - -#define SET_LOGON_NOTIFY_WINDOW (0x2F) -#define REGISTER_LOGON_PROCESS (0x30) -#define GET_INPUT_WAIT_HANDLE (0x35) -#define GET_PROCESS_LIST (0x36) -#define START_SCREEN_SAVER (0x37) - +#endif +/************************************/ #endif /* __INCLUDE_CSRSS_CSRSS_H */ Modified: branches/ros-csrss/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -14,7 +14,7 @@ typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); -CSR_SERVER_DLL_INIT(ServerDllInitialization); +// CSR_SERVER_DLL_INIT(ServerDllInitialization); typedef struct _NLS_USER_INFO { Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -112,11 +112,23 @@ } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER; +#define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) + +#define CONSOLE_INPUT_MODE_VALID (0x0f) +#define CONSOLE_OUTPUT_MODE_VALID (0x03) + + +typedef struct +{ + USHORT nMaxIds; + PDWORD ProcessId; + ULONG nProcessIdsTotal; +} CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; typedef struct { @@ -140,6 +152,8 @@ DWORD CtrlWakeupMask; DWORD ControlKeyState; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; + +typedef VOID (CALLBACK *PCONTROLDISPATCHER)(DWORD); typedef struct { @@ -349,6 +363,24 @@ typedef struct { + HANDLE Handle; +} CSRSS_CLOSE_HANDLE, *PCSRSS_CLOSE_HANDLE; + +typedef struct +{ + HANDLE Handle; +} CSRSS_VERIFY_HANDLE, *PCSRSS_VERIFY_HANDLE; + +typedef struct +{ + HANDLE Handle; + DWORD Access; + BOOL Inheritable; + DWORD Options; +} CSRSS_DUPLICATE_HANDLE, *PCSRSS_DUPLICATE_HANDLE; + +typedef struct +{ DWORD Access; BOOL Inheritable; HANDLE Handle; @@ -356,6 +388,10 @@ } CSRSS_GET_INPUT_HANDLE, *PCSRSS_GET_INPUT_HANDLE, CSRSS_GET_OUTPUT_HANDLE, *PCSRSS_GET_OUTPUT_HANDLE; +typedef struct +{ + HANDLE InputWaitHandle; +} CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; #define CONSOLE_HARDWARE_STATE_GET 0 #define CONSOLE_HARDWARE_STATE_SET 1 @@ -564,6 +600,7 @@ CSRSS_SET_CONSOLE_CP SetConsoleCodePage; CSRSS_GET_CONSOLE_OUTPUT_CP GetConsoleOutputCodePage; CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; + CSRSS_GET_PROCESS_LIST GetProcessListRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -17,6 +17,66 @@ // CSR_SERVER_DLL_INIT(UserServerDllInitialization); +typedef enum _USERSRV_API_NUMBER +{ + UserpExitWindowsEx = USERSRV_SERVERDLL_INDEX, + // UserpEndTask, + // UserpLogon, + UserpRegisterServicesProcess, // Not present in Win7 + // UserpActivateDebugger, + // UserpGetThreadConsoleDesktop, // Not present in Win7 + // UserpDeviceEvent, + UserpRegisterLogonProcess, // Not present in Win7 + // UserpCreateSystemThreads, + // UserpRecordShutdownReason, + // UserpCancelShutdown, // Added in Vista + // UserpConsoleHandleOperation, // Added in Win7 + // UserpGetSetShutdownBlockReason, // Added in Vista + + UserpMaxApiNumber +} USERSRV_API_NUMBER, *PUSERSRV_API_NUMBER; + + +typedef struct +{ + UINT Flags; + DWORD Reserved; +} CSRSS_EXIT_REACTOS, *PCSRSS_EXIT_REACTOS; + +typedef struct +{ + HANDLE ProcessId; +} CSRSS_REGISTER_SERVICES_PROCESS, *PCSRSS_REGISTER_SERVICES_PROCESS; + +typedef struct +{ + HANDLE ProcessId; + BOOL Register; +} CSRSS_REGISTER_LOGON_PROCESS, *PCSRSS_REGISTER_LOGON_PROCESS; + +typedef struct +{ + HWND LogonNotifyWindow; +} CSRSS_SET_LOGON_NOTIFY_WINDOW, *PCSRSS_SET_LOGON_NOTIFY_WINDOW; + + +typedef struct _USER_API_MESSAGE +{ + PORT_MESSAGE Header; + + PCSR_CAPTURE_BUFFER CsrCaptureData; + CSR_API_NUMBER ApiNumber; + ULONG Status; // ReturnValue; // NTSTATUS Status + ULONG Reserved; + union + { + CSRSS_EXIT_REACTOS ExitReactosRequest; + CSRSS_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; + CSRSS_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; + CSRSS_SET_LOGON_NOTIFY_WINDOW SetLogonNotifyWindowRequest; + } Data; +} USER_API_MESSAGE, *PUSER_API_MESSAGE; + #endif // _WINMSG_H /* EOF */ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -800,6 +800,7 @@ CSR_API(SrvGetConsoleProcessList) { + PCSRSS_GET_PROCESS_LIST GetProcessListRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetProcessListRequest; PDWORD Buffer; PCSR_PROCESS ProcessData = CsrGetClientThread()->Process; PCSRSS_CONSOLE Console; @@ -810,8 +811,8 @@ DPRINT("SrvGetConsoleProcessList\n"); - Buffer = ApiMessage->Data.GetProcessListRequest.ProcessId; - if (!Win32CsrValidateBuffer(ProcessData, Buffer, ApiMessage->Data.GetProcessListRequest.nMaxIds, sizeof(DWORD))) + Buffer = GetProcessListRequest->ProcessId; + if (!Win32CsrValidateBuffer(ProcessData, Buffer, GetProcessListRequest->nMaxIds, sizeof(DWORD))) return STATUS_ACCESS_VIOLATION; Status = ConioConsoleFromProcessData(ProcessData, &Console); @@ -825,7 +826,7 @@ current_entry = current_entry->Flink) { current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink); - if (++nItems <= ApiMessage->Data.GetProcessListRequest.nMaxIds) + if (++nItems <= GetProcessListRequest->nMaxIds) { *Buffer++ = HandleToUlong(current->ClientId.UniqueProcess); } @@ -833,7 +834,7 @@ ConioUnlockConsole(Console); - ApiMessage->Data.GetProcessListRequest.nProcessIdsTotal = nItems; + GetProcessListRequest->nProcessIdsTotal = nItems; return STATUS_SUCCESS; } Modified: branches/ros-csrss/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include "w32csr.h" +#include "winsrv.h" #define NDEBUG #include <debug.h> Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -24,22 +24,35 @@ PCSR_API_ROUTINE UserServerApiDispatchTable[UserpMaxApiNumber] = { SrvExitWindowsEx, - SrvEndTask, - SrvLogon, + // SrvEndTask, + // SrvLogon, SrvRegisterServicesProcess, // Not present in Win7 - SrvActivateDebugger, - SrvGetThreadConsoleDesktop, // Not present in Win7 - SrvDeviceEvent, + // SrvActivateDebugger, + // SrvGetThreadConsoleDesktop, // Not present in Win7 + // SrvDeviceEvent, SrvRegisterLogonProcess, // Not present in Win7 - SrvCreateSystemThreads, - SrvRecordShutdownReason, - SrvCancelShutdown, // Added in Vista - SrvConsoleHandleOperation, // Added in Win7 - SrvGetSetShutdownBlockReason, // Added in Vista + // SrvCreateSystemThreads, + // SrvRecordShutdownReason, + // SrvCancelShutdown, // Added in Vista + // SrvConsoleHandleOperation, // Added in Win7 + // SrvGetSetShutdownBlockReason, // Added in Vista }; BOOLEAN UserServerApiServerValidTable[UserpMaxApiNumber] = { + FALSE, // SrvExitWindowsEx + // FALSE, // SrvEndTask + // FALSE, // SrvLogon + FALSE, // SrvRegisterServicesProcess + // FALSE, // SrvActivateDebugger + // TRUE, // SrvGetThreadConsoleDesktop + // FALSE, // SrvDeviceEvent + FALSE, // SrvRegisterLogonProcess + // FALSE, // SrvCreateSystemThreads + // FALSE, // SrvRecordShutdownReason + // FALSE, // SrvCancelShutdown + // FALSE, // SrvConsoleHandleOperation + // FALSE, // SrvGetSetShutdownBlockReason // FALSE }; @@ -47,18 +60,18 @@ PCHAR UserServerApiNameTable[UserpMaxApiNumber] = { "SrvExitWindowsEx", - "SrvEndTask", - "SrvLogon", + // "SrvEndTask", + // "SrvLogon", "SrvRegisterServicesProcess", - "SrvActivateDebugger", - "SrvGetThreadConsoleDesktop", - "SrvDeviceEvent", + // "SrvActivateDebugger", + // "SrvGetThreadConsoleDesktop", + // "SrvDeviceEvent", "SrvRegisterLogonProcess", - "SrvCreateSystemThreads", - "SrvRecordShutdownReason", - "SrvCancelShutdown", - "SrvConsoleHandleOperation", - "SrvGetSetShutdownBlockReason", + // "SrvCreateSystemThreads", + // "SrvRecordShutdownReason", + // "SrvCancelShutdown", + // "SrvConsoleHandleOperation", + // "SrvGetSetShutdownBlockReason", // NULL }; @@ -301,7 +314,7 @@ * TODO: the console one */ NTSTATUS -CsrpInitVideo (VOID) +CsrpInitVideo(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); Modified: branches/ros-csrss/win32ss/user/winsrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include "w32csr.h" +#include "winsrv.h" #include <sddl.h> #define NDEBUG Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Thu Oct 25 21:37:52 2012 @@ -6,26 +6,47 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ +#ifndef __WINSRV_H__ +#define __WINSRV_H__ + #pragma once /* PSDK/NDK Headers */ -#include <stdio.h> +#define WIN32_NO_STATUS #include <windows.h> - #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <csr/server.h> -#include <win/base.h> -#include <win/windows.h> +// #include <stdio.h> +/* CSRSS Header */ +#include <csr/csrsrv.h> + +/* USER Headers */ +#include <win/winmsg.h> +// #include <win/base.h> +// #include <win/windows.h> + +#include "resource.h" + + +/* init.c */ +BOOL WINAPI _UserSoundSentry(VOID); + +/* harderror.c */ VOID WINAPI Win32CsrHardError(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message); - + + +/* shutdown.c */ +CSR_API(SrvExitWindowsEx); +CSR_API(CsrSetLogonNotifyWindow); +CSR_API(SrvRegisterLogonProcess); +// CSR_API(CsrRegisterSystemClasses); + CSR_API(SrvRegisterServicesProcess); - /***************************** @@ -40,12 +61,10 @@ } CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION; *\/ -/\* exitros.c *\/ -CSR_API(CsrExitReactos); -CSR_API(CsrSetLogonNotifyWindow); -CSR_API(CsrRegisterLogonProcess); -// CSR_API(CsrRegisterSystemClasses); + *****************************/ +#endif // __WINSRV_H__ + /* EOF */

1 0

[hbelusca] 57618: [CSR/BASESRV/CONSRV/WINSRV] - Fix code headers. No code changes. - Rename csrcl.h to csr.h for readability purposes. - exitros.c --> shutdown.c
by hbelusca＠svn.reactos.org 25 Oct '12

25 Oct '12

Author: hbelusca Date: Thu Oct 25 20:40:41 2012 New Revision: 57618 URL: http://svn.reactos.org/svn/reactos?rev=57618&view=rev Log: [CSR/BASESRV/CONSRV/WINSRV] - Fix code headers. No code changes. - Rename csrcl.h to csr.h for readability purposes. - exitros.c --> shutdown.c Added: branches/ros-csrss/include/reactos/subsys/csr/csr.h - copied, changed from r57617, branches/ros-csrss/include/reactos/subsys/csr/csrcl.h branches/ros-csrss/win32ss/user/winsrv/shutdown.c - copied, changed from r57617, branches/ros-csrss/win32ss/user/winsrv/exitros.c Removed: branches/ros-csrss/include/reactos/subsys/csr/csrcl.h branches/ros-csrss/win32ss/user/winsrv/exitros.c Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h branches/ros-csrss/dll/win32/kernel32/k32.h branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h branches/ros-csrss/include/reactos/subsys/win/base.h branches/ros-csrss/include/reactos/subsys/win/basemsg.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/include/reactos/subsys/win/winmsg.h branches/ros-csrss/subsystems/win/basesrv/basesrv.h branches/ros-csrss/subsystems/win/basesrv/init.c branches/ros-csrss/subsystems/win/basesrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/api.c branches/ros-csrss/subsystems/win32/csrsrv/include/csrplugin.h branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrsrv/srv.h branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrsrv/wait.c branches/ros-csrss/subsystems/win32/csrss/csrss.c branches/ros-csrss/win32ss/user/consrv/alias.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/resource.h branches/ros-csrss/win32ss/user/consrv/server.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt branches/ros-csrss/win32ss/user/winsrv/harderror.c branches/ros-csrss/win32ss/user/winsrv/init.c branches/ros-csrss/win32ss/user/winsrv/resource.h branches/ros-csrss/win32ss/user/winsrv/server.c branches/ros-csrss/win32ss/user/winsrv/winsrv.h Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntd… ============================================================================== --- branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -42,7 +42,7 @@ #include "ntdllp.h" /* CSRSS Header */ -#include <csr/csrcl.h> +#include <csr/csr.h> /* PSEH */ #include <pseh/pseh2.h> Modified: branches/ros-csrss/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/k3… ============================================================================== --- branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/win32/kernel32/k32.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -36,8 +36,8 @@ #include <ndk/umfuncs.h> /* CSRSS Header */ -#include <csrss/client.h> -#include <csrss/csrss.h> // FIXME: data header. +#include <csr/csr.h> +//#include <csr/csrss.h> // FIXME: data header. /* C Headers */ #include <ctype.h> Copied: branches/ros-csrss/include/reactos/subsys/csr/csr.h (from r57617, branches/ros-csrss/include/reactos/subsys/csr/csrcl.h) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrcl.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csr.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,13 +1,14 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/client.h - * PURPOSE: Public Definitions for CSR Clients + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csr.h + * PURPOSE: Public definitions for CSR Clients * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#ifndef _CSRCL_H -#define _CSRCL_H +#ifndef _CSR_H +#define _CSR_H #include "csrmsg.h" @@ -88,6 +89,6 @@ CsrSetPriorityClass(IN HANDLE Process, IN OUT PULONG PriorityClass); -#endif // _CSRCLIENT_H +#endif // _CSR_H /* EOF */ Removed: branches/ros-csrss/include/reactos/subsys/csr/csrcl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrcl.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrcl.h (removed) @@ -1,93 +1,0 @@ -/* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/client.h - * PURPOSE: Public Definitions for CSR Clients - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) - */ - -#ifndef _CSRCL_H -#define _CSRCL_H - -#include "csrmsg.h" - -/* -BOOLEAN -NTAPI -CsrCaptureArguments(IN PCSR_THREAD CsrThread, - IN PCSR_API_MESSAGE ApiMessage); - -VOID -NTAPI -CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage); -*/ - -NTSTATUS -NTAPI -CsrClientConnectToServer(IN PWSTR ObjectDirectory, - IN ULONG ServerId, - IN PVOID ConnectionInfo, - IN OUT PULONG ConnectionInfoSize, - OUT PBOOLEAN ServerToServerCall); - -NTSTATUS -NTAPI -CsrClientCallServer(IN OUT PCSR_API_MESSAGE Request, - IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, - IN ULONG ApiNumber, - IN ULONG RequestLength); - -PVOID -NTAPI -CsrAllocateCaptureBuffer(IN ULONG ArgumentCount, - IN ULONG BufferSize); - -VOID -NTAPI -CsrFreeCaptureBuffer(IN PCSR_CAPTURE_BUFFER CaptureBuffer); - -ULONG -NTAPI -CsrAllocateMessagePointer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN ULONG MessageLength, - OUT PVOID* CaptureData); - -VOID -NTAPI -CsrCaptureMessageBuffer(IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer, - IN PVOID MessageString, - IN ULONG StringLength, - OUT PVOID* CapturedData); - -VOID -NTAPI -CsrProbeForRead(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); - -VOID -NTAPI -CsrProbeForWrite(IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment); - -NTSTATUS -NTAPI -CsrIdentifyAlertableThread(VOID); - -HANDLE -NTAPI -CsrGetProcessId(VOID); - -NTSTATUS -NTAPI -CsrNewThread(VOID); - -NTSTATUS -NTAPI -CsrSetPriorityClass(IN HANDLE Process, - IN OUT PULONG PriorityClass); - -#endif // _CSRCLIENT_H - -/* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/msg.h - * PURPOSE: Public Definitions for communication - * between CSR Clients and Servers. + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csrmsg.h + * PURPOSE: Public definitions for communication + * between CSR Clients and Servers * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,8 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/csrsrv.h - * PURPOSE: Public Definitions for CSR Servers + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csrsrv.h + * PURPOSE: Public definitions for CSR Servers * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ @@ -440,6 +441,6 @@ #endif */ -#endif // _CSRSERVER_H +#endif // _CSRSRV_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,13 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/base.h + * PURPOSE: Public definitions for Base API Clients + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ -#ifndef __BASE_H__ -#define __BASE_H__ +#ifndef _BASE_H +#define _BASE_H #pragma once @@ -8,8 +15,6 @@ NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); CSR_SERVER_DLL_INIT(ServerDllInitialization); - - typedef struct _NLS_USER_INFO { @@ -79,6 +84,6 @@ ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; -#endif // __BASE_H__ +#endif // _BASE_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/basemsg.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,14 @@ - -#ifndef __BASEMSG_H__ -#define __BASEMSG_H__ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/basemsg.h + * PURPOSE: Public definitions for communication + * between Base API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _BASEMSG_H +#define _BASEMSG_H #pragma once @@ -177,7 +185,7 @@ PCSR_CAPTURE_BUFFER CsrCaptureData; CSR_API_NUMBER ApiNumber; - ULONG Status; + ULONG Status; // ReturnValue; // NTSTATUS Status ULONG Reserved; union { @@ -195,6 +203,6 @@ } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; -#endif // __BASEMSG_H__ +#endif // _BASEMSG_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,14 @@ - -#ifndef __CONMSG_H__ -#define __CONMSG_H__ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/conmsg.h + * PURPOSE: Public definitions for communication + * between Console API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _CONMSG_H +#define _CONMSG_H #pragma once @@ -559,6 +567,6 @@ } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; -#endif // __CONMSG_H__ +#endif // _CONMSG_H /* EOF */ Modified: branches/ros-csrss/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… ============================================================================== --- branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ branches/ros-csrss/include/reactos/subsys/win/winmsg.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/winmsg.h + * PURPOSE: Public definitions for communication + * between User-Mode API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ -#ifndef __WINMSG_H__ -#define __WINMSG_H__ +#ifndef _WINMSG_H +#define _WINMSG_H #pragma once @@ -9,6 +17,6 @@ // CSR_SERVER_DLL_INIT(UserServerDllInitialization); -#endif // __WINMSG_H__ +#endif // _WINMSG_H /* EOF */ Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/basesrv.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/basesrv.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * FILE: subsystems/win/basesrv/basesrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ #ifndef __BASESRV_H__ #define __BASESRV_H__ Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 base enviroment subsystem server + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server * FILE: subsystems/win/basesrv/init.c * PURPOSE: Initialization * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) Modified: branches/ros-csrss/subsystems/win/basesrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 base enviroment subsystem server + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server * FILE: subsystems/win/basesrv/server.c - * PURPOSE: Initialization + * PURPOSE: Server APIs * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR Sub System + * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: subsystems/win32/csrsrv/api.c * PURPOSE: CSR Server DLL API LPC Implementation * "\windows\ApiPort" port process management functions Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/csrplugin.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/csrplugin.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -19,7 +19,7 @@ #include <windows.h> -#include <csr/csrcl.h> +#include <csr/csr.h> //#include "api.h" /* Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/init.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/init.c * PURPOSE: CSR Server DLL Initialization * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * ReactOS Portable Systems Group Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,12 +1,12 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/procsup.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/procsup.c * PURPOSE: CSR Server DLL Process Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex(a)relsoft.net) */ - + /* INCLUDES *******************************************************************/ #include <srv.h> Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/server.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/server.c * PURPOSE: CSR Server DLL Server Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/session.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/session.c * PURPOSE: CSR Server DLL Session Implementation * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/srv.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/srv.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,3 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/srv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * ReactOS Portable Systems Group + */ + #ifndef _SRV_H #define _SRV_H @@ -36,4 +45,6 @@ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) -#endif +#endif // _SRV_H + +/* EOF */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/thredsup.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/thredsup.c * PURPOSE: CSR Server DLL Thread Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex(a)relsoft.net) Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR Sub System - * FILE: subsystems/win32/csrss/csrsrv/wait.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/wait.c * PURPOSE: CSR Server DLL Wait Implementation * PROGRAMMERS: Emanuele Aliberti * Alex Ionescu (alex(a)relsoft.net) Modified: branches/ros-csrss/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrss/csrss.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Client Server Runtime SubSystem (CSRSS) * LICENSE: BSD - See COPYING.ARM in root directory + * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: subsystems/win32/csrss/csrss.c - * PURPOSE: CSRSS Main Executable Code + * PURPOSE: CSRSS Process Main Executable Code * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * ReactOS Portable Systems Group */ Modified: branches/ros-csrss/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/a… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/alias.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS CSRSS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/api/alias.c - * PURPOSE: CSRSS alias support functions - * COPYRIGHT: Christoph Wittich - * Johannes Anderwald + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/alias.c + * PURPOSE: Alias support functions + * PROGRAMMERS: Christoph Wittich + * Johannes Anderwald */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/coninput.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,13 +1,12 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/include/conio.h - * PURPOSE: CSRSS internal console I/O interface + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/conio.h + * PURPOSE: Internal console I/O interface + * PROGRAMMERS: */ #pragma once - -// #include "api.h" #define CSR_DEFAULT_CURSOR_SIZE 25 Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/conoutput.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/console.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/consrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ #ifndef __CONSRV_H__ #define __CONSRV_H__ Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.c * PURPOSE: Implementation of gui-mode consoles + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.h - * PURPOSE: Interface to GUI consoles + * PURPOSE: Interface to gui-mode consoles + * PROGRAMMERS: */ -// #include "api.h" #include "conio.h" #define CONGUI_MIN_WIDTH 10 Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,9 +1,9 @@ /* - * reactos/subsys/csrss/api/handle.c - * - * CSRSS handle functions - * - * ReactOS Operating System + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/handle.c + * PURPOSE: Handle functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS CSRSS * LICENSE: GPL - See COPYING in the top level directory - * FILE: win32ss/user/consrv/lineinput.c + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/tuiconsole.c * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ Modified: branches/ros-csrss/win32ss/user/consrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/resource.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,7 @@ -/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 subsystem - * FILE: subsys/csrss/win32csr/resource.h + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/resource.h * PURPOSE: Resource #defines */ Modified: branches/ros-csrss/win32ss/user/consrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/server.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/init.c - * PURPOSE: Initialization + * PURPOSE: Server APIs * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.c - * PURPOSE: Implementation of text-mode consoles + * PURPOSE: Interface to text-mode consoles + * PROGRAMMERS: */ #include "consrv.h" Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.h * PURPOSE: Interface to text-mode consoles + * PROGRAMMERS: */ -// #include "api.h" #include "conio.h" extern NTSTATUS FASTCALL TuiInitConsole(PCSRSS_CONSOLE Console); Modified: branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/C… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -6,8 +6,10 @@ spec2def(winsrv.dll winsrv.spec) list(APPEND SOURCE + harderror.c init.c server.c + shutdown.c winsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/winsrv.def) Removed: branches/ros-csrss/win32ss/user/winsrv/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/e… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/exitros.c (removed) @@ -1,943 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSRSS subsystem - * FILE: win32ss/user/winsrv/exitros.c - * PURPOSE: Logout/shutdown - */ - -/* INCLUDES ******************************************************************/ - -#include "w32csr.h" -#include <sddl.h> - -#define NDEBUG -#include <debug.h> - - - -static HWND LogonNotifyWindow = NULL; -static HANDLE LogonProcess = NULL; - - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS FASTCALL -Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context) -{ - return CsrEnumProcesses(EnumProc, Context); -} - -CSR_API(CsrRegisterLogonProcess) -{ - if (ApiMessage->Data.RegisterLogonProcessRequest.Register) - { - if (0 != LogonProcess) - { - return STATUS_LOGON_SESSION_EXISTS; - } - LogonProcess = ApiMessage->Data.RegisterLogonProcessRequest.ProcessId; - } - else - { - if (ApiMessage->Header.ClientId.UniqueProcess != LogonProcess) - { - DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", - LogonProcess, ApiMessage->Header.ClientId.UniqueProcess); - return STATUS_NOT_LOGON_PROCESS; - } - LogonProcess = 0; - } - - return STATUS_SUCCESS; -} - -CSR_API(CsrSetLogonNotifyWindow) -{ - DWORD WindowCreator; - - if (0 == GetWindowThreadProcessId(ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow, - &WindowCreator)) - { - DPRINT1("Can't get window creator\n"); - return STATUS_INVALID_HANDLE; - } - if (WindowCreator != (DWORD_PTR)LogonProcess) - { - DPRINT1("Trying to register window not created by winlogon as notify window\n"); - return STATUS_ACCESS_DENIED; - } - - LogonNotifyWindow = ApiMessage->Data.SetLogonNotifyWindowRequest.LogonNotifyWindow; - - return STATUS_SUCCESS; -} - -typedef struct tagSHUTDOWN_SETTINGS -{ - BOOL AutoEndTasks; - DWORD HungAppTimeout; - DWORD WaitToKillAppTimeout; -} SHUTDOWN_SETTINGS, *PSHUTDOWN_SETTINGS; - -#define DEFAULT_AUTO_END_TASKS FALSE -#define DEFAULT_HUNG_APP_TIMEOUT 5000 -#define DEFAULT_WAIT_TO_KILL_APP_TIMEOUT 20000 - -typedef struct tagNOTIFY_CONTEXT -{ - DWORD ProcessId; - UINT Msg; - WPARAM wParam; - LPARAM lParam; - HDESK Desktop; - DWORD StartTime; - DWORD QueryResult; - HWND Dlg; - DWORD EndNowResult; - BOOL ShowUI; - HANDLE UIThread; - HWND WndClient; - PSHUTDOWN_SETTINGS ShutdownSettings; - LPTHREAD_START_ROUTINE SendMessageProc; -} NOTIFY_CONTEXT, *PNOTIFY_CONTEXT; - -#define QUERY_RESULT_ABORT 0 -#define QUERY_RESULT_CONTINUE 1 -#define QUERY_RESULT_TIMEOUT 2 -#define QUERY_RESULT_ERROR 3 -#define QUERY_RESULT_FORCE 4 - -static void FASTCALL -UpdateProgressBar(HWND ProgressBar, PNOTIFY_CONTEXT NotifyContext) -{ - DWORD Passed; - - Passed = GetTickCount() - NotifyContext->StartTime; - Passed -= NotifyContext->ShutdownSettings->HungAppTimeout; - if (NotifyContext->ShutdownSettings->WaitToKillAppTimeout < Passed) - { - Passed = NotifyContext->ShutdownSettings->WaitToKillAppTimeout; - } - SendMessageW(ProgressBar, PBM_SETPOS, Passed / 2, 0); -} - -static INT_PTR CALLBACK -EndNowDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - INT_PTR Result; - PNOTIFY_CONTEXT NotifyContext; - HWND ProgressBar; - DWORD TitleLength; - int Len; - LPWSTR Title; - - switch(Msg) - { - case WM_INITDIALOG: - NotifyContext = (PNOTIFY_CONTEXT) lParam; - NotifyContext->EndNowResult = QUERY_RESULT_ABORT; - SetWindowLongPtrW(Dlg, DWLP_USER, (LONG_PTR) lParam); - TitleLength = SendMessageW(NotifyContext->WndClient, WM_GETTEXTLENGTH, - 0, 0) + - GetWindowTextLengthW(Dlg); - Title = HeapAlloc(Win32CsrApiHeap, 0, (TitleLength + 1) * sizeof(WCHAR)); - if (NULL != Title) - { - Len = GetWindowTextW(Dlg, Title, TitleLength + 1); - SendMessageW(NotifyContext->WndClient, WM_GETTEXT, - TitleLength + 1 - Len, (LPARAM) (Title + Len)); - SetWindowTextW(Dlg, Title); - HeapFree(Win32CsrApiHeap, 0, Title); - } - ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); - SendMessageW(ProgressBar, PBM_SETRANGE32, 0, - NotifyContext->ShutdownSettings->WaitToKillAppTimeout / 2); - UpdateProgressBar(ProgressBar, NotifyContext); - SetTimer(Dlg, 0, 200, NULL); - Result = FALSE; - break; - - case WM_TIMER: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); - UpdateProgressBar(ProgressBar, NotifyContext); - Result = TRUE; - break; - - case WM_COMMAND: - if (BN_CLICKED == HIWORD(wParam) && IDC_END_NOW == LOWORD(wParam)) - { - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - NotifyContext->EndNowResult = QUERY_RESULT_FORCE; - SendMessageW(Dlg, WM_CLOSE, 0, 0); - Result = TRUE; - } - else - { - Result = FALSE; - } - break; - - case WM_CLOSE: - DestroyWindow(Dlg); - Result = TRUE; - break; - - case WM_DESTROY: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); - NotifyContext->Dlg = NULL; - KillTimer(Dlg, 0); - PostQuitMessage(NotifyContext->EndNowResult); - Result = TRUE; - break; - - default: - Result = FALSE; - break; - } - - return Result; -} - -typedef void (WINAPI *INITCOMMONCONTROLS_PROC)(void); - -static void -CallInitCommonControls() -{ - static BOOL Initialized = FALSE; - HMODULE Lib; - INITCOMMONCONTROLS_PROC InitProc; - - if (Initialized) - { - return; - } - - Lib = LoadLibraryW(L"COMCTL32.DLL"); - if (NULL == Lib) - { - return; - } - InitProc = (INITCOMMONCONTROLS_PROC) GetProcAddress(Lib, "InitCommonControls"); - if (NULL == InitProc) - { - return; - } - - (*InitProc)(); - - Initialized = TRUE; -} - -static DWORD WINAPI -EndNowThreadProc(LPVOID Parameter) -{ - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) Parameter; - MSG Msg; - - SetThreadDesktop(NotifyContext->Desktop); - SwitchDesktop(NotifyContext->Desktop); - CallInitCommonControls(); - NotifyContext->Dlg = CreateDialogParam(GetModuleHandleW(L"win32csr"), - MAKEINTRESOURCE(IDD_END_NOW), NULL, - EndNowDlgProc, (LPARAM) NotifyContext); - if (NULL == NotifyContext->Dlg) - { - return 0; - } - ShowWindow(NotifyContext->Dlg, SW_SHOWNORMAL); - - while (GetMessageW(&Msg, NULL, 0, 0)) - { - if (! IsDialogMessage(NotifyContext->Dlg, &Msg)) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } - } - - return Msg.wParam; -} - -typedef struct tagMESSAGE_CONTEXT -{ - HWND Wnd; - UINT Msg; - WPARAM wParam; - LPARAM lParam; - DWORD Timeout; -} MESSAGE_CONTEXT, *PMESSAGE_CONTEXT; - -static DWORD WINAPI -SendQueryEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - DWORD_PTR Result; - - if (SendMessageTimeoutW(Context->Wnd, WM_QUERYENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return Result ? QUERY_RESULT_CONTINUE : QUERY_RESULT_ABORT; - } - - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; -} - -static DWORD WINAPI -SendEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - DWORD_PTR Result; - - if (Context->wParam) - { - if (SendMessageTimeoutW(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return QUERY_RESULT_CONTINUE; - } - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; - } - else - { - SendMessage(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam); - return QUERY_RESULT_CONTINUE; - } -} - -static BOOL CALLBACK -NotifyTopLevelEnum(HWND Wnd, LPARAM lParam) -{ - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) lParam; - MESSAGE_CONTEXT MessageContext; - DWORD Now, Passed; - DWORD Timeout, WaitStatus; - DWORD ProcessId; - HANDLE MessageThread; - HANDLE Threads[2]; - - if (0 == GetWindowThreadProcessId(Wnd, &ProcessId)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - if (ProcessId == NotifyContext->ProcessId) - { - Now = GetTickCount(); - if (0 == NotifyContext->StartTime) - { - NotifyContext->StartTime = Now; - } - /* Note: Passed is computed correctly even when GetTickCount() wraps due - to unsigned arithmetic */ - Passed = Now - NotifyContext->StartTime; - MessageContext.Wnd = Wnd; - MessageContext.Msg = NotifyContext->Msg; - MessageContext.wParam = NotifyContext->wParam; - MessageContext.lParam = NotifyContext->lParam; - MessageContext.Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (! NotifyContext->ShutdownSettings->AutoEndTasks) - { - MessageContext.Timeout += NotifyContext->ShutdownSettings->WaitToKillAppTimeout; - } - if (Passed < MessageContext.Timeout) - { - MessageContext.Timeout -= Passed; - MessageThread = CreateThread(NULL, 0, NotifyContext->SendMessageProc, - (LPVOID) &MessageContext, 0, NULL); - if (NULL == MessageThread) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (Passed < Timeout) - { - Timeout -= Passed; - WaitStatus = WaitForSingleObjectEx(MessageThread, Timeout, FALSE); - } - else - { - WaitStatus = WAIT_TIMEOUT; - } - if (WAIT_TIMEOUT == WaitStatus) - { - NotifyContext->WndClient = Wnd; - if (NULL == NotifyContext->UIThread && NotifyContext->ShowUI) - { - NotifyContext->UIThread = CreateThread(NULL, 0, - EndNowThreadProc, - (LPVOID) NotifyContext, - 0, NULL); - } - Threads[0] = MessageThread; - Threads[1] = NotifyContext->UIThread; - WaitStatus = WaitForMultipleObjectsEx(NULL == NotifyContext->UIThread ? - 1 : 2, - Threads, FALSE, INFINITE, - FALSE); - if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else if (WAIT_OBJECT_0 + 1 == WaitStatus) - { - if (! GetExitCodeThread(NotifyContext->UIThread, - &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - if (WAIT_OBJECT_0 != WaitStatus) - { - TerminateThread(MessageThread, QUERY_RESULT_TIMEOUT); - } - } - else if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, - &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - CloseHandle(MessageThread); - } - else - { - NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; - } - } - - return QUERY_RESULT_CONTINUE == NotifyContext->QueryResult; -} - -static BOOL CALLBACK -NotifyDesktopEnum(LPWSTR DesktopName, LPARAM lParam) -{ - PNOTIFY_CONTEXT Context = (PNOTIFY_CONTEXT) lParam; - - Context->Desktop = OpenDesktopW(DesktopName, 0, FALSE, - DESKTOP_ENUMERATE | DESKTOP_SWITCHDESKTOP); - if (NULL == Context->Desktop) - { - DPRINT1("OpenDesktop failed with error %d\n", GetLastError()); - Context->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - EnumDesktopWindows(Context->Desktop, NotifyTopLevelEnum, lParam); - - CloseDesktop(Context->Desktop); - - return QUERY_RESULT_CONTINUE == Context->QueryResult; -} - -static BOOL FASTCALL -NotifyTopLevelWindows(PNOTIFY_CONTEXT Context) -{ - HWINSTA WindowStation; - - WindowStation = GetProcessWindowStation(); - if (NULL == WindowStation) - { - DPRINT1("GetProcessWindowStation failed with error %d\n", GetLastError()); - return TRUE; - } - - EnumDesktopsW(WindowStation, NotifyDesktopEnum, (LPARAM) Context); - - return TRUE; -} - -static BOOL FASTCALL -NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, - PSHUTDOWN_SETTINGS ShutdownSettings, - UINT Flags) -{ - NOTIFY_CONTEXT Context; - HANDLE Process; - DWORD QueryResult = QUERY_RESULT_CONTINUE; - - Context.QueryResult = QUERY_RESULT_CONTINUE; - - if (0 == (Flags & EWX_FORCE)) - { - if (NULL != ProcessData->Console) - { - ConioConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData, - ShutdownSettings->WaitToKillAppTimeout); - } - else - { - Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; - Context.wParam = 0; - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.StartTime = 0; - Context.UIThread = NULL; - Context.ShowUI = DtbgIsDesktopVisible(); - Context.Dlg = NULL; - Context.ShutdownSettings = ShutdownSettings; - Context.SendMessageProc = SendQueryEndSession; - - NotifyTopLevelWindows(&Context); - - Context.wParam = (QUERY_RESULT_ABORT != Context.QueryResult); - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.SendMessageProc = SendEndSession; - Context.ShowUI = DtbgIsDesktopVisible() && - (QUERY_RESULT_ABORT != Context.QueryResult); - QueryResult = Context.QueryResult; - Context.QueryResult = QUERY_RESULT_CONTINUE; - - NotifyTopLevelWindows(&Context); - - if (NULL != Context.UIThread) - { - if (NULL != Context.Dlg) - { - SendMessageW(Context.Dlg, WM_CLOSE, 0, 0); - } - else - { - TerminateThread(Context.UIThread, QUERY_RESULT_ERROR); - } - CloseHandle(Context.UIThread); - } - } - - if (QUERY_RESULT_ABORT == QueryResult) - { - return FALSE; - } - } - - /* Terminate this process */ - Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return TRUE; - } - TerminateProcess(Process, 0); - CloseHandle(Process); - - return TRUE; -} - -typedef struct tagPROCESS_ENUM_CONTEXT -{ - UINT ProcessCount; - PCSR_PROCESS *ProcessData; - TOKEN_ORIGIN TokenOrigin; - DWORD ShellProcess; - DWORD CsrssProcess; -} PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT; - -static NTSTATUS WINAPI -ExitReactosProcessEnum(PCSR_PROCESS ProcessData, PVOID Data) -{ - HANDLE Process; - HANDLE Token; - TOKEN_ORIGIN Origin; - DWORD ReturnLength; - PPROCESS_ENUM_CONTEXT Context = (PPROCESS_ENUM_CONTEXT) Data; - PCSR_PROCESS *NewData; - - /* Do not kill winlogon or csrss */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->CsrssProcess || - ProcessData->ClientId.UniqueProcess == LogonProcess) - { - return STATUS_SUCCESS; - } - - /* Get the login session of this process */ - Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return STATUS_UNSUCCESSFUL; - } - - if (! OpenProcessToken(Process, TOKEN_QUERY, &Token)) - { - DPRINT1("Unable to open token for process %d, error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Process); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Process); - - if (! GetTokenInformation(Token, TokenOrigin, &Origin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed for process %d with error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Token); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Token); - - /* This process will be killed if it's in the correct logon session */ - if (RtlEqualLuid(&(Context->TokenOrigin.OriginatingLogonSession), - &(Origin.OriginatingLogonSession))) - { - /* Kill the shell process last */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->ShellProcess) - { - ProcessData->ShutdownLevel = 0; - } - NewData = HeapAlloc(Win32CsrApiHeap, 0, (Context->ProcessCount + 1) - * sizeof(PCSR_PROCESS)); - if (NULL == NewData) - { - return STATUS_NO_MEMORY; - } - if (0 != Context->ProcessCount) - { - memcpy(NewData, Context->ProcessData, - Context->ProcessCount * sizeof(PCSR_PROCESS)); - HeapFree(Win32CsrApiHeap, 0, Context->ProcessData); - } - Context->ProcessData = NewData; - Context->ProcessData[Context->ProcessCount] = ProcessData; - Context->ProcessCount++; - } - - return STATUS_SUCCESS; -} - -static int -ProcessDataCompare(const void *Elem1, const void *Elem2) -{ - const PCSR_PROCESS *ProcessData1 = (PCSR_PROCESS *) Elem1; - const PCSR_PROCESS *ProcessData2 = (PCSR_PROCESS *) Elem2; - - if ((*ProcessData1)->ShutdownLevel < (*ProcessData2)->ShutdownLevel) - { - return +1; - } - else if ((*ProcessData2)->ShutdownLevel < (*ProcessData1)->ShutdownLevel) - { - return -1; - } - else if ((*ProcessData1)->ClientId.UniqueProcess < (*ProcessData2)->ClientId.UniqueProcess) - { - return +1; - } - else if ((*ProcessData2)->ClientId.UniqueProcess < (*ProcessData1)->ClientId.UniqueProcess) - { - return -1; - } - - return 0; -} - -static DWORD FASTCALL -GetShutdownSetting(HKEY DesktopKey, LPCWSTR ValueName, DWORD DefaultValue) -{ - BYTE ValueBuffer[16]; - LONG ErrCode; - DWORD Type; - DWORD ValueSize; - UNICODE_STRING StringValue; - ULONG Value; - - ValueSize = sizeof(ValueBuffer); - ErrCode = RegQueryValueExW(DesktopKey, ValueName, NULL, &Type, ValueBuffer, - &ValueSize); - if (ERROR_SUCCESS != ErrCode) - { - DPRINT("GetShutdownSetting for %S failed with error code %ld\n", - ValueName, ErrCode); - return DefaultValue; - } - - if (REG_SZ == Type) - { - RtlInitUnicodeString(&StringValue, (LPCWSTR) ValueBuffer); - if (! NT_SUCCESS(RtlUnicodeStringToInteger(&StringValue, 10, &Value))) - { - DPRINT1("Unable to convert value %S for setting %S\n", - StringValue.Buffer, ValueName); - return DefaultValue; - } - return (DWORD) Value; - } - else if (REG_DWORD == Type) - { - return *((DWORD *) ValueBuffer); - } - - DPRINT1("Unexpected registry type %d for setting %S\n", Type, ValueName); - return DefaultValue; -} - -static void FASTCALL -LoadShutdownSettings(PSID Sid, PSHUTDOWN_SETTINGS ShutdownSettings) -{ - static WCHAR Subkey[] = L"\\Control Panel\\Desktop"; - LPWSTR StringSid; - WCHAR InitialKeyName[128]; - LPWSTR KeyName; - HKEY DesktopKey; - LONG ErrCode; - - ShutdownSettings->AutoEndTasks = DEFAULT_AUTO_END_TASKS; - ShutdownSettings->HungAppTimeout = DEFAULT_HUNG_APP_TIMEOUT; - ShutdownSettings->WaitToKillAppTimeout = DEFAULT_WAIT_TO_KILL_APP_TIMEOUT; - - if (! ConvertSidToStringSidW(Sid, &StringSid)) - { - DPRINT1("ConvertSidToStringSid failed with error %d, using default shutdown settings\n", - GetLastError()); - return; - } - if (wcslen(StringSid) + wcslen(Subkey) + 1 <= - sizeof(InitialKeyName) / sizeof(WCHAR)) - { - KeyName = InitialKeyName; - } - else - { - KeyName = HeapAlloc(Win32CsrApiHeap, 0, - (wcslen(StringSid) + wcslen(Subkey) + 1) * - sizeof(WCHAR)); - if (NULL == KeyName) - { - DPRINT1("Failed to allocate memory, using default shutdown settings\n"); - LocalFree(StringSid); - return; - } - } - wcscat(wcscpy(KeyName, StringSid), Subkey); - LocalFree(StringSid); - - ErrCode = RegOpenKeyExW(HKEY_USERS, KeyName, 0, KEY_QUERY_VALUE, &DesktopKey); - if (KeyName != InitialKeyName) - { - HeapFree(Win32CsrApiHeap, 0, KeyName); - } - if (ERROR_SUCCESS != ErrCode) - { - DPRINT1("RegOpenKeyEx failed with error %ld, using default shutdown settings\n", ErrCode); - return; - } - - ShutdownSettings->AutoEndTasks = (BOOL) GetShutdownSetting(DesktopKey, L"AutoEndTasks", - (DWORD) DEFAULT_AUTO_END_TASKS); - ShutdownSettings->HungAppTimeout = GetShutdownSetting(DesktopKey, - L"HungAppTimeout", - DEFAULT_HUNG_APP_TIMEOUT); - ShutdownSettings->WaitToKillAppTimeout = GetShutdownSetting(DesktopKey, - L"WaitToKillAppTimeout", - DEFAULT_WAIT_TO_KILL_APP_TIMEOUT); - - RegCloseKey(DesktopKey); -} - -static NTSTATUS FASTCALL -InternalExitReactos(DWORD ProcessId, DWORD ThreadId, UINT Flags) -{ - HANDLE CallerThread; - HANDLE CallerToken; - NTSTATUS Status; - PROCESS_ENUM_CONTEXT Context; - DWORD ReturnLength; - HWND ShellWnd; - UINT ProcessIndex; - char FixedUserInfo[64]; - TOKEN_USER *UserInfo; - SHUTDOWN_SETTINGS ShutdownSettings; - - if (ProcessId != (DWORD_PTR) LogonProcess) - { - DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); - return STATUS_ACCESS_DENIED; - } - - DPRINT1("FIXME: Need to close all user processes!\n"); - return STATUS_SUCCESS; - - CallerThread = OpenThread(THREAD_QUERY_INFORMATION, FALSE, ThreadId); - if (NULL == CallerThread) - { - DPRINT1("OpenThread failed with error %d\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - if (! OpenThreadToken(CallerThread, TOKEN_QUERY, FALSE, &CallerToken)) - { - DPRINT1("OpenThreadToken failed with error %d\n", GetLastError()); - CloseHandle(CallerThread); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(CallerThread); - - Context.ProcessCount = 0; - Context.ProcessData = NULL; - if (! GetTokenInformation(CallerToken, TokenOrigin, &Context.TokenOrigin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - if (! GetTokenInformation(CallerToken, TokenUser, FixedUserInfo, - sizeof(FixedUserInfo), &ReturnLength)) - { - if (sizeof(FixedUserInfo) < ReturnLength) - { - UserInfo = HeapAlloc(Win32CsrApiHeap, 0, ReturnLength); - if (NULL == UserInfo) - { - DPRINT1("Unable to allocate %u bytes for user info\n", - (unsigned) ReturnLength); - CloseHandle(CallerToken); - return STATUS_NO_MEMORY; - } - if (! GetTokenInformation(CallerToken, TokenUser, UserInfo, - ReturnLength, &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", - GetLastError()); - HeapFree(Win32CsrApiHeap, 0, UserInfo); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - UserInfo = (TOKEN_USER *) FixedUserInfo; - } - CloseHandle(CallerToken); - LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); - if (UserInfo != (TOKEN_USER *) FixedUserInfo) - { - HeapFree(Win32CsrApiHeap, 0, UserInfo); - } - Context.CsrssProcess = GetCurrentProcessId(); - ShellWnd = GetShellWindow(); - if (NULL == ShellWnd) - { - DPRINT("No shell present\n"); - Context.ShellProcess = 0; - } - else if (0 == GetWindowThreadProcessId(ShellWnd, &Context.ShellProcess)) - { - DPRINT1("Can't get process id of shell window\n"); - Context.ShellProcess = 0; - } - - Status = Win32CsrEnumProcesses(ExitReactosProcessEnum, &Context); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to enumerate registered processes, status 0x%x\n", - Status); - if (NULL != Context.ProcessData) - { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); - } - return Status; - } - - qsort(Context.ProcessData, Context.ProcessCount, sizeof(PCSR_PROCESS), - ProcessDataCompare); - - /* Terminate processes, stop if we find one kicking and screaming it doesn't - want to die */ - Status = STATUS_SUCCESS; - for (ProcessIndex = 0; - ProcessIndex < Context.ProcessCount && NT_SUCCESS(Status); - ProcessIndex++) - { - if (! NotifyAndTerminateProcess(Context.ProcessData[ProcessIndex], - &ShutdownSettings, Flags)) - { - Status = STATUS_REQUEST_ABORTED; - } - } - - /* Cleanup */ - if (NULL != Context.ProcessData) - { - HeapFree(Win32CsrApiHeap, 0, Context.ProcessData); - } - - return Status; -} - -static NTSTATUS FASTCALL -UserExitReactos(DWORD UserProcessId, UINT Flags) -{ - NTSTATUS Status; - - if (NULL == LogonNotifyWindow) - { - DPRINT1("No LogonNotifyWindow registered\n"); - return STATUS_NOT_FOUND; - } - - /* FIXME Inside 2000 says we should impersonate the caller here */ - Status = SendMessageW(LogonNotifyWindow, PM_WINLOGON_EXITWINDOWS, - (WPARAM) UserProcessId, - (LPARAM) Flags); - /* If the message isn't handled, the return value is 0, so 0 doesn't indicate - success. Success is indicated by a 1 return value, if anything besides 0 - or 1 it's a NTSTATUS value */ - if (1 == Status) - { - Status = STATUS_SUCCESS; - } - else if (0 == Status) - { - Status = STATUS_NOT_IMPLEMENTED; - } - - return Status; -} - -CSR_API(CsrExitReactos) -{ - if (0 == (ApiMessage->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) - { - return UserExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - ApiMessage->Data.ExitReactosRequest.Flags); - } - else - { - return InternalExitReactos((DWORD_PTR) ApiMessage->Header.ClientId.UniqueProcess, - (DWORD_PTR) ApiMessage->Header.ClientId.UniqueThread, - ApiMessage->Data.ExitReactosRequest.Flags); - } -} - -/* EOF */ Modified: branches/ros-csrss/win32ss/user/winsrv/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/harderror.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: win32ss/user/winsrv/dllmain.c - * PURPOSE: Initialization + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/harderror.c + * PURPOSE: Hard errors * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: branches/ros-csrss/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/init.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,25 +1,10 @@ /* - * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program 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 program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/init.c + * PURPOSE: Initialization + * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #include "winsrv.h" Modified: branches/ros-csrss/win32ss/user/winsrv/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/resource.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,7 @@ -/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 subsystem - * FILE: subsys/csrss/win32csr/resource.h + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/resource.h * PURPOSE: Resource #defines */ Modified: branches/ros-csrss/win32ss/user/winsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,27 +1,10 @@ /* - * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program 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 program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- - * - * PROGRAMMER: Eric Kohl + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/server.c + * PURPOSE: Server APIs + * PROGRAMMERS: Eric Kohl + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES ******************************************************************/ Copied: branches/ros-csrss/win32ss/user/winsrv/shutdown.c (from r57617, branches/ros-csrss/win32ss/user/winsrv/exitros.c) URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/exitros.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/shutdown.c [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSRSS subsystem - * FILE: win32ss/user/winsrv/exitros.c + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/shutdown.c * PURPOSE: Logout/shutdown + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ @@ -28,7 +29,7 @@ return CsrEnumProcesses(EnumProc, Context); } -CSR_API(CsrRegisterLogonProcess) +CSR_API(SrvRegisterLogonProcess) { if (ApiMessage->Data.RegisterLogonProcessRequest.Register) { @@ -925,7 +926,7 @@ return Status; } -CSR_API(CsrExitReactos) +CSR_API(SrvExitWindowsEx) { if (0 == (ApiMessage->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/w… ============================================================================== --- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Thu Oct 25 20:40:41 2012 @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/winsrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + #pragma once /* PSDK/NDK Headers */

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