Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[hpoussin] 17569: Implement SetupDiSelectBestCompatDrv, by sorting drivers by rank in drivers list

by hpoussin＠svn.reactos.com

Implement SetupDiSelectBestCompatDrv, by sorting drivers by rank in drivers list Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-27 14:56:17 UTC (rev 17568) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-27 14:59:22 UTC (rev 17569) @@ -127,6 +127,7 @@ { LIST_ENTRY ListEntry; + DWORD DriverRank; SP_DRVINFO_DATA_V2_W Info; }; @@ -3258,6 +3259,7 @@ struct DriverInfoElement *driverInfo; DWORD RequiredSize = 128; /* Initial buffer size */ BOOL Result = FALSE; + PLIST_ENTRY PreviousEntry; LPWSTR DeviceDescription = NULL; LPWSTR InfInstallSection = NULL; @@ -3318,6 +3320,7 @@ TRACE("Adding driver '%S' [%S/%S] (Rank 0x%lx)\n", DeviceDescription, InfFile, InfInstallSection, Rank); + driverInfo->DriverRank = Rank; driverInfo->Info.DriverType = DriverType; driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; wcsncpy(driverInfo->Info.Description, DeviceDescription, LINE_LEN - 1); @@ -3333,8 +3336,24 @@ driverInfo->Info.ProviderName[0] = '\0'; driverInfo->Info.DriverDate = DriverDate; driverInfo->Info.DriverVersion = DriverVersion; - InsertTailList(DriverListHead, &driverInfo->ListEntry); + /* Insert current driver in driver list, according to its rank */ + PreviousEntry = DriverListHead->Flink; + while (PreviousEntry != DriverListHead) + { + if (((struct DriverInfoElement *)PreviousEntry)->DriverRank >= Rank) + { + /* Insert before the current item */ + InsertHeadList(PreviousEntry, &driverInfo->ListEntry); + break; + } + } + if (PreviousEntry == DriverListHead) + { + /* Insert at the end of the list */ + InsertTailList(DriverListHead, &driverInfo->ListEntry); + } + HeapFree(GetProcessHeap(), 0, DeviceDescription); HeapFree(GetProcessHeap(), 0, InfInstallSection); return TRUE; @@ -4165,6 +4184,8 @@ *pDriverInfo = (struct DriverInfoElement *)ItemList; DriverInfoData->Reserved = (ULONG_PTR)ItemList; ret = TRUE; + TRACE("Choosing driver whose rank is 0x%lx\n", + ((struct DriverInfoElement *)ItemList)->DriverRank); } } } @@ -4186,8 +4207,9 @@ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - FIXME("SetupDiSelectBestCompatDrv() is selecting the 1st driver...\n"); - + /* Drivers are sorted by rank in the driver list, so + * the first driver in the list is the best one. + */ drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); ret = SetupDiEnumDriverInfoW( DeviceInfoSet,

19 years, 3 months

[ekohl] 17568: Implement LogonUserA.

by ekohl＠svn.reactos.com

Implement LogonUserA. Modified: trunk/reactos/lib/advapi32/misc/logon.c _____ Modified: trunk/reactos/lib/advapi32/misc/logon.c --- trunk/reactos/lib/advapi32/misc/logon.c 2005-08-27 09:55:27 UTC (rev 17567) +++ trunk/reactos/lib/advapi32/misc/logon.c 2005-08-27 14:56:17 UTC (rev 17568) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/misc/logon.c @@ -131,17 +130,70 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL -LogonUserA (LPSTR lpszUsername, - LPSTR lpszDomain, - LPSTR lpszPassword, - DWORD dwLogonType, - DWORD dwLogonProvider, - PHANDLE phToken) +LogonUserA(LPSTR lpszUsername, + LPSTR lpszDomain, + LPSTR lpszPassword, + DWORD dwLogonType, + DWORD dwLogonProvider, + PHANDLE phToken) { - return FALSE; + UNICODE_STRING UserName; + UNICODE_STRING Domain; + UNICODE_STRING Password; + NTSTATUS Status; + BOOL ret = FALSE; + + UserName.Buffer = NULL; + Domain.Buffer = NULL; + Password.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&UserName, + lpszUsername); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto UsernameDone; + } + + Status = RtlCreateUnicodeStringFromAsciiz(&Domain, + lpszDomain); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto DomainDone; + } + + Status = RtlCreateUnicodeStringFromAsciiz(&Password, + lpszPassword); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto PasswordDone; + } + + ret = LogonUserW(UserName.Buffer, + Domain.Buffer, + Password.Buffer, + dwLogonType, + dwLogonProvider, + phToken); + + if (Password.Buffer != NULL) + RtlFreeUnicodeString(&Password); + +PasswordDone: + if (Domain.Buffer != NULL) + RtlFreeUnicodeString(&Domain); + +DomainDone: + if (UserName.Buffer != NULL) + RtlFreeUnicodeString(&UserName); + +UsernameDone: + return ret; }

19 years, 3 months

[ea] 17567: SM: simplify and fix client (subsystem servers) management.

by ea＠svn.reactos.com

SM: simplify and fix client (subsystem servers) management. Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/client.c 2005-08-27 09:55:27 UTC (rev 17567) @@ -31,12 +31,14 @@ /* Private ADT */ +#define SM_MAX_CLIENT_COUNT 16 +#define SM_INVALID_CLIENT_INDEX -1 struct _SM_CLIENT_DIRECTORY { RTL_CRITICAL_SECTION Lock; ULONG Count; - PSM_CLIENT_DATA Client; + PSM_CLIENT_DATA Client [SM_MAX_CLIENT_COUNT]; PSM_CLIENT_DATA CandidateClient; } SmpClientDirectory; @@ -51,7 +53,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); RtlInitializeCriticalSection(& SmpClientDirectory.Lock); SmpClientDirectory.Count = 0; - SmpClientDirectory.Client = NULL; + RtlZeroMemory (SmpClientDirectory.Client, sizeof SmpClientDirectory.Client); SmpClientDirectory.CandidateClient = NULL; return STATUS_SUCCESS; @@ -66,58 +68,87 @@ Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; } /********************************************************************** - * SmpLookupClient/2 PRIVATE + * SmpGetFirstFreeClientEntry/0 PRIVATE * + * NOTE: call it holding SmpClientDirectory.Lock only + */ +static INT STDCALL SmpGetFirstFreeClientEntry (VOID) +{ + INT ClientIndex = 0; + + DPRINT("SM: %s called\n", __FUNCTION__); + + if (SmpClientDirectory.Count < SM_MAX_CLIENT_COUNT) + { + for (ClientIndex = 0; + (ClientIndex < SM_MAX_CLIENT_COUNT); + ClientIndex ++) + { + if (NULL == SmpClientDirectory.Client[ClientIndex]) + { + DPRINT("SM: %s => %d\n", __FUNCTION__, ClientIndex); + return ClientIndex; // found + } + } + } + return SM_INVALID_CLIENT_INDEX; // full! +} +/********************************************************************** + * SmpLookupClient/1 PRIVATE + * * DESCRIPTION - * Lookup the subsystem server descriptor given its image ID. + * Lookup the subsystem server descriptor (client data) given its + * base image ID. * * ARGUMENTS * SubsystemId: IMAGE_SUBSYSTEM_xxx - * Parent: optional: caller provided storage for the - * the pointer to the SM_CLIENT_DATA which - * Next field contains the value returned by - * the function (on success). * * RETURN VALUES - * NULL on error; otherwise a pointer to the SM_CLIENT_DATA - * looked up object. + * SM_INVALID_CLIENT_INDEX on error; + * otherwise an index in the range (0..SM_MAX_CLIENT_COUNT). * * WARNING * SmpClientDirectory.Lock must be held by the caller. */ -static PSM_CLIENT_DATA FASTCALL -SmpLookupClient (USHORT SubsystemId, - PSM_CLIENT_DATA * Parent) +static INT FASTCALL +SmpLookupClient (USHORT SubsystemId) { - PSM_CLIENT_DATA Client = NULL; + INT ClientIndex = 0; DPRINT("SM: %s(%d) called\n", __FUNCTION__, SubsystemId); - - if(NULL != Parent) + + if (0 != SmpClientDirectory.Count) { - *Parent = NULL; - } - if (SmpClientDirectory.Count > 0) - { - Client = SmpClientDirectory.Client; - while (NULL != Client) + for (ClientIndex = 0; (ClientIndex < SM_MAX_CLIENT_COUNT); ClientIndex ++) { - DPRINT("SM: %s: Client==%08lx\n", __FUNCTION__, Client); - if (SubsystemId == Client->SubsystemId) + if (NULL != SmpClientDirectory.Client[ClientIndex]) { - DPRINT("SM: %s: FOUND Client==%08lx\n", __FUNCTION__, Client); - break; + if (SubsystemId == SmpClientDirectory.Client[ClientIndex]->SubsystemId) + { + return ClientIndex; + } } - if(NULL != Parent) - { - *Parent = Client; - } - Client = Client->Next; } - } - return Client; + } + return SM_INVALID_CLIENT_INDEX; } /********************************************************************** + * SmpDestroyClientObject/2 PRIVATE + * + * WARNING + * SmpClientDirectory.Lock must be held by the caller. + */ +static NTSTATUS STDCALL +SmpDestroyClientObject (PSM_CLIENT_DATA Client, NTSTATUS DestroyReason) +{ + DPRINT("SM:%s(%08lx,%08lx) called\n", __FUNCTION__, DestroyReason); + /* TODO: send shutdown to the SB port */ + NtTerminateProcess (Client->ServerProcess, DestroyReason); + RtlFreeHeap (SmpHeap, 0, Client); + -- SmpClientDirectory.Count; + return STATUS_SUCCESS; +} +/********************************************************************** * SmBeginClientInitialization/1 * * DESCRIPTION @@ -135,18 +166,20 @@ SmBeginClientInitialization (IN PSM_PORT_MESSAGE Request, OUT PSM_CLIENT_DATA * ClientData) { - NTSTATUS Status = STATUS_SUCCESS; - PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); - ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); + NTSTATUS Status = STATUS_SUCCESS; + PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); + ULONG SbApiPortNameSize = SM_CONNECT_DATA_SIZE(*Request); + INT ClientIndex = SM_INVALID_CLIENT_INDEX; - DPRINT("SM: %s called\n", __FUNCTION__); + DPRINT("SM: %s(%08lx,%08lx) called\n", __FUNCTION__, + Request, ClientData); RtlEnterCriticalSection (& SmpClientDirectory.Lock); /* * Is there a subsystem bootstrap in progress? */ - if (SmpClientDirectory.CandidateClient) + if (NULL != SmpClientDirectory.CandidateClient) { PROCESS_BASIC_INFORMATION pbi; @@ -164,7 +197,6 @@ } else { - RtlFreeHeap (SmpHeap, 0, SmpClientDirectory.CandidateClient); DPRINT1("SM: %s: subsys booting with no descriptor!\n", __FUNCTION__); Status = STATUS_NOT_FOUND; RtlLeaveCriticalSection (& SmpClientDirectory.Lock); @@ -173,14 +205,28 @@ /* * Check if a client for the ID already exist. */ - if (SmpLookupClient(ConnectData->SubSystemId, NULL)) + if (SM_INVALID_CLIENT_INDEX != SmpLookupClient(ConnectData->SubSystemId)) { DPRINT("SM: %s: attempt to register again subsystem %d.\n", __FUNCTION__, ConnectData->SubSystemId); + // TODO something else to do here? RtlLeaveCriticalSection (& SmpClientDirectory.Lock); return STATUS_UNSUCCESSFUL; } + /* + * Check if a free entry exists in SmpClientDirectory.Client[]. + */ + ClientIndex = SmpGetFirstFreeClientEntry(); + if (SM_INVALID_CLIENT_INDEX == ClientIndex) + { + DPRINT("SM: %s: SM_INVALID_CLIENT_INDEX == ClientIndex ", __FUNCTION__); + SmpDestroyClientObject (SmpClientDirectory.CandidateClient, STATUS_NO_MEMORY); + SmpClientDirectory.CandidateClient = NULL; + return STATUS_NO_MEMORY; + } + + /* OK! */ DPRINT("SM: %s: registering subsystem ID=%d \n", __FUNCTION__, ConnectData->SubSystemId); @@ -191,12 +237,13 @@ /* SM && DBG auto-initializes; other subsystems are required to call * SM_API_COMPLETE_SESSION via SMDLL. */ if ((IMAGE_SUBSYSTEM_NATIVE == SmpClientDirectory.CandidateClient->SubsystemId) || - (IMAGE_SUBSYSTEM_UNKNOWN == SmpClientDirectory.CandidateClient->SubsystemId)) + ((USHORT)-1 == SmpClientDirectory.CandidateClient->SubsystemId)) { SmpSetClientInitialized (SmpClientDirectory.CandidateClient); } if (SbApiPortNameSize > 0) { + /* Only external servers have an SB port */ RtlCopyMemory (SmpClientDirectory.CandidateClient->SbApiPortName, ConnectData->SbName, SbApiPortNameSize); @@ -205,18 +252,7 @@ * Insert the new descriptor in the * client directory. */ - if (NULL == SmpClientDirectory.Client) - { - SmpClientDirectory.Client = SmpClientDirectory.CandidateClient; - } else { - PSM_CLIENT_DATA pCD = NULL; - - for (pCD=SmpClientDirectory.Client; - (NULL != pCD->Next); - pCD = pCD->Next); - pCD->Next = SmpClientDirectory.CandidateClient; - } - SmpClientDirectory.CandidateClient->Next = NULL; + SmpClientDirectory.Client [ClientIndex] = SmpClientDirectory.CandidateClient; /* * Increment the number of active subsystems. */ @@ -233,6 +269,7 @@ */ SmpClientDirectory.CandidateClient = NULL; + /* Done */ RtlLeaveCriticalSection (& SmpClientDirectory.Lock); return STATUS_SUCCESS; @@ -247,31 +284,102 @@ NTSTATUS STDCALL SmCompleteClientInitialization (ULONG ProcessId) { - NTSTATUS Status = STATUS_NOT_FOUND; - PSM_CLIENT_DATA Client = NULL; + NTSTATUS Status = STATUS_NOT_FOUND; + INT ClientIndex = SM_INVALID_CLIENT_INDEX; DPRINT("SM: %s(%lu) called\n", __FUNCTION__, ProcessId); RtlEnterCriticalSection (& SmpClientDirectory.Lock); if (SmpClientDirectory.Count > 0) { - Client = SmpClientDirectory.Client; - while (NULL != Client) - { - if (ProcessId == Client->ServerProcessId) + for (ClientIndex = 0; ClientIndex < SM_MAX_CLIENT_COUNT; ClientIndex ++) + { + if ((NULL != SmpClientDirectory.Client [ClientIndex]) && + (ProcessId == SmpClientDirectory.Client [ClientIndex]->ServerProcessId)) { - SmpSetClientInitialized (Client); + SmpSetClientInitialized (SmpClientDirectory.Client [ClientIndex]); Status = STATUS_SUCCESS; break; } - Client = Client->Next; } } RtlLeaveCriticalSection (& SmpClientDirectory.Lock); return Status; } +/********************************************************************** + * SmpDestroyClientByClientIndex/1 PRIVATE + */ +static NTSTATUS STDCALL +SmpDestroyClientByClientIndex (INT ClientIndex) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA Client = NULL; + DPRINT("SM: %s(%d) called\n", __FUNCTION__, ClientIndex); + + if (SM_INVALID_CLIENT_INDEX == ClientIndex) + { + DPRINT1("SM: %s: SM_INVALID_CLIENT_INDEX == ClientIndex!\n", + __FUNCTION__); + Status = STATUS_NOT_FOUND; + } + else + { + Client = SmpClientDirectory.Client [ClientIndex]; + SmpClientDirectory.Client [ClientIndex] = NULL; + if (NULL != Client) + { + Status = SmpDestroyClientObject (Client, STATUS_SUCCESS); + } else { + DPRINT("SM:%s: NULL == Client[%d]!\n", __FUNCTION__, + ClientIndex); + Status = STATUS_UNSUCCESSFUL; + } + } + return Status; +} /********************************************************************** + * SmpTimeoutCandidateClient/1 + * + * DESCRIPTION + * Give the candidate client time to bootstrap and complete + * session initialization. If the client fails in any way, + * drop the pending client and kill the process. + * + * ARGUMENTS + * x: HANDLE for the candidate process. + * + * RETURN VALUE + * NONE. + */ +static VOID STDCALL SmpTimeoutCandidateClient (PVOID x) +{ + NTSTATUS Status = STATUS_SUCCESS; + HANDLE CandidateClientProcessHandle = (HANDLE) x; + LARGE_INTEGER TimeOut; + + DPRINT("SM: %s(%lx) called\n", __FUNCTION__, x); + + TimeOut.QuadPart = (LONGLONG) -300000000L; // 30s + Status = NtWaitForSingleObject (CandidateClientProcessHandle, + FALSE, + & TimeOut); + if (STATUS_TIMEOUT == Status) + { + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + if (NULL != SmpClientDirectory.CandidateClient) + { + DPRINT("SM:%s: destroy candidate %08lx\n", __FUNCTION__, + SmpClientDirectory.CandidateClient); + Status = SmpDestroyClientObject (SmpClientDirectory.CandidateClient, + STATUS_TIMEOUT); + SmpClientDirectory.CandidateClient = NULL; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + } + NtTerminateThread (NtCurrentThread(), Status); +} +/********************************************************************** * SmpCreateClient/1 * * DESCRIPTION @@ -294,9 +402,8 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName) { NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("SM: %s(%lx) called\n", __FUNCTION__, ProcessInfo->ProcessHandle); + DPRINT("SM: %s(%lx, %S) called\n", __FUNCTION__, ProcessInfo->ProcessHandle, ProgramName); RtlEnterCriticalSection (& SmpClientDirectory.Lock); /* @@ -305,6 +412,16 @@ if (NULL == SmpClientDirectory.CandidateClient) { /* + * Check if there exist a free entry in the + * SmpClientDirectory.Client array. + */ + if (SM_INVALID_CLIENT_INDEX == SmpGetFirstFreeClientEntry()) + { + DPRINT("SM: %s(%lx): out of memory!\n", + __FUNCTION__, ProcessInfo->ProcessHandle); + Status = STATUS_NO_MEMORY; + } + /* * Allocate the storage for client data */ SmpClientDirectory.CandidateClient = @@ -319,6 +436,8 @@ } else { + DPRINT("SM:%s(%08lx,%S): candidate is %08lx\n", __FUNCTION__, + ProcessInfo, ProgramName, SmpClientDirectory.CandidateClient); /* Initialize the candidate client. */ RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); SmpClientDirectory.CandidateClient->ServerProcess = @@ -333,16 +452,35 @@ SM_SB_NAME_MAX_LENGTH); } } else { - DPRINT1("SM: %s: CandidateClient pending!\n", __FUNCTION__); - RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + DPRINT1("SM: %s: CandidateClient %08lx pending!\n", __FUNCTION__, + SmpClientDirectory.CandidateClient); Status = STATUS_DEVICE_BUSY; } RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + /* Create the timeout thread for external subsystems */ + if (_wcsicmp (ProgramName, L"Session Manager") && _wcsicmp (ProgramName, L"Debug")) + { + Status = RtlCreateUserThread (NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE) SmpTimeoutCandidateClient, + SmpClientDirectory.CandidateClient->ServerProcess, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM:%s: RtlCreateUserThread() failed (Status=%08lx)\n", + __FUNCTION__, Status); + } + } + return Status; } - /********************************************************************** * SmpDestroyClient/1 * @@ -353,42 +491,20 @@ NTSTATUS STDCALL SmDestroyClient (ULONG SubsystemId) { - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA Parent = NULL; - PSM_CLIENT_DATA Client = NULL; + NTSTATUS Status = STATUS_SUCCESS; + INT ClientIndex = SM_INVALID_CLIENT_INDEX; - DPRINT("SM: %s called\n", __FUNCTION__); + DPRINT("SM: %s(%lu) called\n", __FUNCTION__, SubsystemId); RtlEnterCriticalSection (& SmpClientDirectory.Lock); - Client = SmpLookupClient (SubsystemId, & Parent); - if(NULL == Client) + ClientIndex = SmpLookupClient (SubsystemId); + if (SM_INVALID_CLIENT_INDEX == ClientIndex) { DPRINT1("SM: %s: del req for non existent subsystem (id=%d)\n", __FUNCTION__, SubsystemId); - Status = STATUS_NOT_FOUND; + return STATUS_NOT_FOUND; } - else - { - /* 1st in the list? */ - if(NULL == Parent) - { - SmpClientDirectory.Client = Client->Next; - } - else - { - if(NULL != Parent) - { - Parent->Next = Client->Next; - } else { - DPRINT1("SM: %s: n-th has no parent!\n", __FUNCTION__); - Status = STATUS_UNSUCCESSFUL; /* FIXME */ - } - } - /* TODO: send shutdown or kill */ - NtTerminateProcess (Client->ServerProcess, 0); //FIXME - RtlFreeHeap (SmpHeap, 0, Client); - -- SmpClientDirectory.Count; - } + Status = SmpDestroyClientByClientIndex (ClientIndex); RtlLeaveCriticalSection (& SmpClientDirectory.Lock); return Status; } @@ -401,10 +517,10 @@ NTSTATUS FASTCALL SmGetClientBasicInformation (PSM_BASIC_INFORMATION i) { - INT Index = 0; - PSM_CLIENT_DATA ClientData = NULL; + INT ClientIndex = 0; + INT Index = 0; - DPRINT("SM: %s called\n", __FUNCTION__); + DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); RtlEnterCriticalSection (& SmpClientDirectory.Lock); @@ -413,13 +529,16 @@ if (SmpClientDirectory.Count > 0) { - ClientData = SmpClientDirectory.Client; - while ((NULL != ClientData) && (Index < SM_QRYINFO_MAX_SS_COUNT)) + for (ClientIndex = 0; (ClientIndex < SM_MAX_CLIENT_COUNT); ClientIndex ++) { - i->SubSystem[Index].Id = ClientData->SubsystemId; - i->SubSystem[Index].Flags = ClientData->Flags; - i->SubSystem[Index].ProcessId = ClientData->ServerProcessId; - ClientData = ClientData->Next; + if ((NULL != SmpClientDirectory.Client [ClientIndex]) && + (Index < SM_QRYINFO_MAX_SS_COUNT)) + { + i->SubSystem[Index].Id = SmpClientDirectory.Client [ClientIndex]->SubsystemId; + i->SubSystem[Index].Flags = SmpClientDirectory.Client [ClientIndex]->Flags; + i->SubSystem[Index].ProcessId = SmpClientDirectory.Client [ClientIndex]->ServerProcessId; + ++ Index; + } } } @@ -433,23 +552,23 @@ NTSTATUS FASTCALL SmGetSubSystemInformation (PSM_SUBSYSTEM_INFORMATION i) { - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA ClientData = NULL; + NTSTATUS Status = STATUS_SUCCESS; + INT ClientIndex = SM_INVALID_CLIENT_INDEX; - DPRINT("SM: %s called\n", __FUNCTION__); + DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); RtlEnterCriticalSection (& SmpClientDirectory.Lock); - ClientData = SmpLookupClient (i->SubSystemId, NULL); - if (NULL == ClientData) + ClientIndex = SmpLookupClient (i->SubSystemId); + if (SM_INVALID_CLIENT_INDEX == ClientIndex) { Status = STATUS_NOT_FOUND; } else { - i->Flags = ClientData->Flags; - i->ProcessId = ClientData->ServerProcessId; + i->Flags = SmpClientDirectory.Client [ClientIndex]->Flags; + i->ProcessId = SmpClientDirectory.Client [ClientIndex]->ServerProcessId; RtlCopyMemory (i->NameSpaceRootNode, - ClientData->SbApiPortName, + SmpClientDirectory.Client [ClientIndex]->SbApiPortName, (SM_QRYINFO_MAX_ROOT_NODE * sizeof(i->NameSpaceRootNode[0]))); } RtlLeaveCriticalSection (& SmpClientDirectory.Lock); _____ Modified: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/debug.c 2005-08-27 09:55:27 UTC (rev 17567) @@ -33,6 +33,7 @@ HANDLE DbgSsApiPort = (HANDLE) 0; HANDLE DbgUiApiPort = (HANDLE) 0; +HANDLE hSmDbgApiPort = (HANDLE) 0; /* FUNCTIONS *********************************************************/ @@ -135,8 +136,21 @@ NTSTATUS Status = STATUS_SUCCESS; HANDLE hDbgSsApiPortThread = (HANDLE) 0; + DPRINT("SM: %s called\n", __FUNCTION__); + /* Self register */ +#if 0 + Status = SmRegisterInternalSubsystem (L"Debug", + (USHORT)-1, + & hSmDbgApiPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("DBG:%s: SmRegisterInternalSubsystem failed with Status=%08lx\n", + __FUNCTION__, Status); + return Status; + } +#endif /* Create the \DbgSsApiPort object (LPC) */ Status = SmpCreatePT(& DbgSsApiPort, SM_DBGSS_PORT_NAME, _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/initss.c 2005-08-27 09:55:27 UTC (rev 17567) @@ -39,61 +39,59 @@ */ /********************************************************************** - * SmpRegisterSmss/0 - * + * SmRegisterInternalSubsystem/3 + * * DESCRIPTION - * Make smss register with itself for IMAGE_SUBSYSTEM_NATIVE - * (programmatically). This also opens hSmApiPort to be used - * in loading required subsystems. + * Register with itself for ImageSubsystemId + * (programmatically). */ - -static NTSTATUS -SmpRegisterSmss(VOID) +NTSTATUS STDCALL SmRegisterInternalSubsystem (LPWSTR PgmName, + USHORT ImageSubsystemId, + PHANDLE ApiPort) { - NTSTATUS Status = STATUS_SUCCESS; - RTL_USER_PROCESS_INFORMATION ProcessInfo; + NTSTATUS Status = STATUS_SUCCESS; + RTL_USER_PROCESS_INFORMATION ProcessInfo; - DPRINT("SM: %s called\n",__FUNCTION__); - + DPRINT("SM: %s(%S,%d) called\n",__FUNCTION__, PgmName, ImageSubsystemId); + RtlZeroMemory (& ProcessInfo, sizeof ProcessInfo); ProcessInfo.Size = sizeof ProcessInfo; ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; DPRINT("SM: %s: ProcessInfo.ProcessHandle=%lx\n", __FUNCTION__,ProcessInfo.ProcessHandle); - Status = SmCreateClient (& ProcessInfo, L"Session Manager"); + Status = SmCreateClient (& ProcessInfo, PgmName); if (NT_SUCCESS(Status)) { UNICODE_STRING SbApiPortName = {0,0,NULL}; RtlInitUnicodeString (& SbApiPortName, L""); Status = SmConnectApiPort(& SbApiPortName, - (HANDLE) -1, /* SM has no SB port */ - IMAGE_SUBSYSTEM_NATIVE, - & hSmApiPort); + (HANDLE) -1, /* internal SS have no SB port */ + ImageSubsystemId, + ApiPort); if(!NT_SUCCESS(Status)) { DPRINT("SM: %s: SMLIB!SmConnectApiPort failed (Status=0x%08lx)\n", __FUNCTION__,Status); return Status; } - DPRINT("SM self registered\n"); + DPRINT("SM:%s: %S self registered\n", __FUNCTION__, PgmName); } else { - DPRINT1("SM: %s: SmCreateClient failed (Status=0x%08lx)\n", - __FUNCTION__, Status); + DPRINT1("SM: %s: SmCreateClient(%S) failed (Status=0x%08lx)\n", + __FUNCTION__, PgmName, Status); } /* * Note that you don't need to call complete session - * because connection handling code autocompletes - * the client structure for IMAGE_SUBSYSTEM_NATIVE. + * here because connection handling code autocompletes + * the client structure for IMAGE_SUBSYSTEM_NATIVE and + * -1. */ return Status; } - - /********************************************************************** * SmpLoadRequiredSubsystems/0 */ @@ -157,15 +155,27 @@ NTSTATUS Status = STATUS_SUCCESS; - DPRINT("SM: loading subsystems\n"); + DPRINT("SM: loading subsystems...\n"); - /* SM self registers */ - Status = SmpRegisterSmss(); - if(!NT_SUCCESS(Status)) return Status; + /* + * SM self registers: this also opens hSmApiPort to be used + * in loading required subsystems. + */ + Status = SmRegisterInternalSubsystem (L"Session Manager", IMAGE_SUBSYSTEM_NATIVE, & hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: SmRegisterInternalSubsystem failed Status=%08lx\n", __FUNCTION__, Status); + return Status; + } /* Load Required subsystems (Debug Windows) */ Status = SmpLoadRequiredSubsystems(); - if(!NT_SUCCESS(Status)) return Status; + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: SmpLoadRequiredSubsystems failed Status=%08lx\n", __FUNCTION__, Status); + return Status; + } /* done */ + DPRINT("SM: done loading subsystems\n"); return Status; } _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/smapi.c 2005-08-27 09:55:27 UTC (rev 17567) @@ -71,7 +71,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); - if ( (IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) || + if ( ((USHORT)-1 == ConnectData->SubSystemId) || (IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId)) { DPRINT("SM: %s: we do not need calling back SM!\n", _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-08-27 09:55:27 UTC (rev 17567) @@ -34,7 +34,7 @@ * DESCRIPTION * * ARGUMENTS - * ImagePath: bsolute path of the image to run; + * ImagePath: absolute path of the image to run; * CommandLine: arguments and options for ImagePath; * WaitForIt: TRUE for boot time processes and FALSE for * subsystems bootstrapping; @@ -215,6 +215,8 @@ Status = NtResumeThread (ProcessInfo.ThreadHandle, NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("SM: %s: NtResumeThread failed (Status=0x%08lx)\n", + __FUNCTION__, Status); //Status = SmDestroyClient TODO } } else { _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-08-27 04:20:49 UTC (rev 17566) +++ trunk/reactos/subsys/smss/smss.h 2005-08-27 09:55:27 UTC (rev 17567) @@ -48,6 +48,7 @@ NTSTATUS SmInitializeRegistry(VOID); /* initss.c */ +NTSTATUS STDCALL SmRegisterInternalSubsystem(LPWSTR,USHORT,PHANDLE); NTSTATUS SmLoadSubsystems(VOID); /* smapi.c */ @@ -89,7 +90,6 @@ HANDLE ApiPortThread; HANDLE SbApiPort; WCHAR SbApiPortName [SM_SB_NAME_MAX_LENGTH]; - struct _SM_CLIENT_DATA * Next; } SM_CLIENT_DATA, *PSM_CLIENT_DATA; NTSTATUS SmInitializeClientManagement (VOID);

19 years, 3 months

[amunger] 17566: 17519 requires __REACTOS__ to be defined for KDB to work.

by amunger＠svn.reactos.com

17519 requires __REACTOS__ to be defined for KDB to work. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.xml _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.xml --- trunk/reactos/drivers/input/i8042prt/i8042prt.xml 2005-08-27 02:34:46 UTC (rev 17565) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.xml 2005-08-27 04:20:49 UTC (rev 17566) @@ -2,6 +2,7 @@ <bootstrap base="reactos" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> + <define name="__REACTOS__" /> <library>ntoskrnl</library> <library>hal</library> <file>i8042prt.c</file>

19 years, 3 months

[amunger] 17565: "." means current directory, not previous. Spotted by Talley.

by amunger＠svn.reactos.com

"." means current directory, not previous. Spotted by Talley. Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-08-26 21:02:47 UTC (rev 17564) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-08-27 02:34:46 UTC (rev 17565) @@ -46,7 +46,7 @@ CD [/D][drive:][path]\n\ CD[..|.]\n\n\ .. parent directory\n\ - . previous directory\n\ + . current directory\n\ /D Will change current drive and current directory.\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ Type CD without a parameter to display the current drive and directory.\n"

19 years, 3 months

[weiden] 17564: fixed code to compile both as ansi and unicode version, build as unicode by default

by weiden＠svn.reactos.com

fixed code to compile both as ansi and unicode version, build as unicode by default Modified: trunk/reactos/subsys/system/calc/calc.xml Modified: trunk/reactos/subsys/system/calc/dialog.c Modified: trunk/reactos/subsys/system/calc/stats.c Modified: trunk/reactos/subsys/system/calc/winecalc.c Modified: trunk/reactos/subsys/system/calc/winecalc.h _____ Modified: trunk/reactos/subsys/system/calc/calc.xml --- trunk/reactos/subsys/system/calc/calc.xml 2005-08-26 20:35:33 UTC (rev 17563) +++ trunk/reactos/subsys/system/calc/calc.xml 2005-08-26 21:02:47 UTC (rev 17564) @@ -1,7 +1,9 @@ -<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" warnings="true"> +<module name="calc" type="win32gui" installbase="system32" installname="calc.exe"> <include base="calc">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>user32</library> <library>gdi32</library> _____ Modified: trunk/reactos/subsys/system/calc/dialog.c --- trunk/reactos/subsys/system/calc/dialog.c 2005-08-26 20:35:33 UTC (rev 17563) +++ trunk/reactos/subsys/system/calc/dialog.c 2005-08-26 21:02:47 UTC (rev 17564) @@ -19,6 +19,7 @@ */ #include <windows.h> +#include <tchar.h> #include "dialog.h" #include "resource.h" #include "winecalc.h" @@ -50,32 +51,32 @@ HFONT hFont; HFONT hFontOrg; - char c1[CALC_BUF_SIZE]; - char c2[CALC_BUF_SIZE]; - char c3[CALC_BUF_SIZE]; - char c4[CALC_BUF_SIZE]; - char c5[CALC_BUF_SIZE]; + TCHAR c1[CALC_BUF_SIZE]; + TCHAR c2[CALC_BUF_SIZE]; + TCHAR c3[CALC_BUF_SIZE]; + TCHAR c4[CALC_BUF_SIZE]; + TCHAR c5[CALC_BUF_SIZE]; hdc = BeginPaint( hDlg, &ps ); hMemDC = CreateCompatibleDC( hdc ); - LoadString( hInstance, IDS_COPYRIGHT1, c1, sizeof(c1)); - LoadString( hInstance, IDS_COPYRIGHT2, c2, sizeof(c2)); - LoadString( hInstance, IDS_COPYRIGHT3, c3, sizeof(c3)); - LoadString( hInstance, IDS_COPYRIGHT4, c4, sizeof(c4)); - LoadString( hInstance, IDS_COPYRIGHT5, c5, sizeof(c5)); + LoadString( hInstance, IDS_COPYRIGHT1, c1, sizeof(c1) / sizeof(c1[0])); + LoadString( hInstance, IDS_COPYRIGHT2, c2, sizeof(c2) / sizeof(c2[0])); + LoadString( hInstance, IDS_COPYRIGHT3, c3, sizeof(c3) / sizeof(c3[0])); + LoadString( hInstance, IDS_COPYRIGHT4, c4, sizeof(c4) / sizeof(c4[0])); + LoadString( hInstance, IDS_COPYRIGHT5, c5, sizeof(c5) / sizeof(c5[0])); hFont = GetStockObject(DEFAULT_GUI_FONT); hFontOrg = SelectObject(hdc, hFont); SetBkMode(hdc, TRANSPARENT); - TextOut(hdc, 10, 10, c1, strlen(c1)); - TextOut(hdc, 10, 35, c2, strlen(c2)); - TextOut(hdc, 10, 50, c3, strlen(c3)); - TextOut(hdc, 10, 75, c4, strlen(c4)); - TextOut(hdc, 10, 90, c5, strlen(c5)); + TextOut(hdc, 10, 10, c1, _tcslen(c1)); + TextOut(hdc, 10, 35, c2, _tcslen(c2)); + TextOut(hdc, 10, 50, c3, _tcslen(c3)); + TextOut(hdc, 10, 75, c4, _tcslen(c4)); + TextOut(hdc, 10, 90, c5, _tcslen(c5)); SelectObject(hdc, hFontOrg); _____ Modified: trunk/reactos/subsys/system/calc/stats.c --- trunk/reactos/subsys/system/calc/stats.c 2005-08-26 20:35:33 UTC (rev 17563) +++ trunk/reactos/subsys/system/calc/stats.c 2005-08-26 21:02:47 UTC (rev 17564) @@ -21,6 +21,7 @@ #include <stdio.h> // sprintf #include <windows.h> +#include <tchar.h> #include "stats.h" #include "resource.h" @@ -41,8 +42,8 @@ case WM_INITDIALOG: hWndListBox = CreateWindow( - "LISTBOX", // pointer to registered class name - "Listbox", // pointer to window name + TEXT("LISTBOX"), // pointer to registered class name + TEXT("Listbox"), // pointer to window name WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT, // window style 6, // horizontal position of window 6, // vertical position of window @@ -100,7 +101,7 @@ case WM_PAINT: { - char s[CALC_BUF_SIZE]; + TCHAR s[CALC_BUF_SIZE]; int lb_count; HFONT hFont; HFONT hFontOrg; @@ -110,10 +111,10 @@ hFontOrg = SelectObject(hdc, hFont); lb_count = SendMessage(hWndListBox, LB_GETCOUNT, 0, 0); - sprintf(s, "n=%d", lb_count); + _stprintf(s, TEXT("n=%d"), lb_count); SetBkMode(hdc, TRANSPARENT); - TextOut(hdc, 98, 121, s, strlen(s)); + TextOut(hdc, 98, 121, s, _tcslen(s)); SelectObject(hdc, hFontOrg); EndPaint( hDlg, &ps ); @@ -121,7 +122,7 @@ } case WM_CLOSE: hWndDlgStats = 0; // invalidate stats dialog - SendMessage(GetParent(hDlg), WM_CHAR, '\x13', 1); // disable stats related calculator buttons + SendMessage(GetParent(hDlg), WM_CHAR, TEXT('\x13'), 1); // disable stats related calculator buttons DestroyWindow( hDlg ); return 0; _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-08-26 20:35:33 UTC (rev 17563) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-08-26 21:02:47 UTC (rev 17564) @@ -22,6 +22,7 @@ #include <math.h> #include <windows.h> +#include <tchar.h> // #include <commctrl.h> #include "winecalc.h" @@ -71,9 +72,9 @@ // various display error messages -static char err_invalid [CALC_BUF_SIZE]; -static char err_divide_by_zero [CALC_BUF_SIZE]; -static char err_undefined [CALC_BUF_SIZE]; +static TCHAR err_invalid [CALC_BUF_SIZE]; +static TCHAR err_divide_by_zero [CALC_BUF_SIZE]; +static TCHAR err_undefined [CALC_BUF_SIZE]; // calculator state is kept here @@ -105,7 +106,7 @@ static HMENU menus[3]; -static char appname[40]; +static TCHAR appname[40]; static int debug; @@ -123,33 +124,45 @@ WNDCLASS wc; HWND hWnd; HACCEL haccel; - - char s[CALC_BUF_SIZE]; +#ifdef UNICODE + CHAR s_ansi[CALC_BUF_SIZE]; +#endif + TCHAR s[CALC_BUF_SIZE]; int r; hInstance = hInst; - r = GetProfileString("SciCalc", - "layout", - "0", + r = GetProfileString(TEXT("SciCalc"), + TEXT("layout"), + TEXT("0"), s, CALC_BUF_SIZE ); +#ifdef UNICODE + wcstombs(s_ansi, s, sizeof(s_ansi)); + calc.sciMode = atoi(s_ansi); +#else calc.sciMode = atoi(s); +#endif if (calc.sciMode != 0 && calc.sciMode != 1) calc.sciMode = 1; // Standard Mode - r = GetProfileString("SciCalc", - "UseSep", - "0", + r = GetProfileString(TEXT("SciCalc"), + TEXT("UseSep"), + TEXT("0"), s, CALC_BUF_SIZE ); - calc.digitGrouping = atoi(s); +#ifdef UNICODE + wcstombs(s_ansi, s, sizeof(s_ansi)); + calc.digitGrouping = atoi(s_ansi); +#else + calc.digitGrouping = atoi(s); +#endif if (calc.digitGrouping != 0 && calc.digitGrouping != 1) @@ -157,13 +170,13 @@ calc.new = 1; // initialize struct values - if (!LoadString( hInst, IDS_APPNAME, appname, sizeof(appname))) + if (!LoadString( hInst, IDS_APPNAME, appname, sizeof(appname) / sizeof(appname[0]))) exit(1); - if (!LoadString( hInst, IDS_ERR_INVALID_INPUT, err_invalid, sizeof(err_invalid))) + if (!LoadString( hInst, IDS_ERR_INVALID_INPUT, err_invalid, sizeof(err_invalid) / sizeof(err_invalid[0]))) exit(1); - if (!LoadString( hInst, IDS_ERR_DIVIDE_BY_ZERO, err_divide_by_zero, sizeof(err_divide_by_zero))) + if (!LoadString( hInst, IDS_ERR_DIVIDE_BY_ZERO, err_divide_by_zero, sizeof(err_divide_by_zero) / sizeof(err_divide_by_zero[0]))) exit(1); - if (!LoadString( hInst, IDS_ERR_UNDEFINED, err_undefined, sizeof(err_undefined))) + if (!LoadString( hInst, IDS_ERR_UNDEFINED, err_undefined, sizeof(err_undefined) / sizeof(err_undefined[0]))) exit(1); wc.style = CS_HREDRAW | CS_VREDRAW; @@ -197,7 +210,7 @@ ShowWindow( hWnd, cmdshow ); UpdateWindow( hWnd ); - if (!(haccel = LoadAccelerators(hInst, "MAIN_MENU"))) + if (!(haccel = LoadAccelerators(hInst, TEXT("MAIN_MENU")))) exit(1); while( GetMessage(&msg, NULL, 0, 0) ) { @@ -259,13 +272,13 @@ case WM_DESTROY: { int r; - char s[CALC_BUF_SIZE]; + TCHAR s[CALC_BUF_SIZE]; - sprintf(s, "%d", calc.sciMode); - r = WriteProfileString("SciCalc", "layout", s); + _stprintf(s, TEXT("%d"), calc.sciMode); + r = WriteProfileString(TEXT("SciCalc"), TEXT("layout"), s); - sprintf(s, "%d", calc.digitGrouping); - r = WriteProfileString("SciCalc", "UseSep", s); + _stprintf(s, TEXT("%d"), calc.digitGrouping); + r = WriteProfileString(TEXT("SciCalc"), TEXT("UseSep"), s); } DestroyCalc( &calc ); @@ -277,7 +290,7 @@ case VK_F1: calc.next = 1; - MessageBox(hWnd, "No Help Available", "Windows Help", MB_OK); + MessageBox(hWnd, TEXT("No Help Available"), TEXT("Windows Help"), MB_OK); return 0; case VK_F2: // DWORD @@ -365,7 +378,7 @@ case VK_DELETE: calc.next = 1; - calc.buffer[0] = '\0'; + calc.buffer[0] = TEXT('\0'); calc_buffer_display(&calc); return 0; @@ -377,11 +390,11 @@ case WM_CHAR: if (debug) - show_debug(&calc, "Start WM_CHAR", wParam, lParam); + show_debug(&calc, TEXT("Start WM_CHAR"), wParam, lParam); switch (wParam) { - case '\x13': // Ctrl+S Sta Statistics + case TEXT('\x13'): // Ctrl+S Sta Statistics if (hWndDlgStats) { // Statistics Box already displayed, focus but don't create another one // SetFocus(hWndDlgStats); @@ -400,7 +413,7 @@ hWndDlgStats = CreateDialog( // modeless dialog calc.hInst, // handle to application instance - "DLG_STATS", // identifies dialog box template name + TEXT("DLG_STATS"), // identifies dialog box template name hWnd, // handle to owner window StatsDlgProc); // pointer to dialog box procedure @@ -413,14 +426,14 @@ break; - case '\x01': // Ctrl+A Ave Statistics - case '\x04': // Ctrl+D s Standard Deviation Statistics - case '\x14': // Ctrl+T Sum Statistics + case TEXT('\x01'): // Ctrl+A Ave Statistics + case TEXT('\x04'): // Ctrl+D s Standard Deviation Statistics + case TEXT('\x14'): // Ctrl+T Sum Statistics { int i; int n; - char s[CALC_BUF_SIZE]; + TCHAR s[CALC_BUF_SIZE]; double val = 0L; double avg = 0L; double total = 0L; @@ -438,10 +451,10 @@ x[i] = val; } - if (LOWORD(wParam) != '\x14') // not sum only + if (LOWORD(wParam) != TEXT('\x14')) // not sum only avg = total / n; - if (LOWORD(wParam == '\x04')) { // standard deviation is sqrt(sum( xbar - x )^2 / (n-1)) + if (LOWORD(wParam == TEXT('\x04'))) { // standard deviation is sqrt(sum( xbar - x )^2 / (n-1)) val = 0L; for (i=0;i<n;i++) @@ -453,28 +466,28 @@ total = sqrt(val / (n - 1)); // sample of population } - if (LOWORD(wParam) == '\x01') // average or mean + if (LOWORD(wParam) == TEXT('\x01')) // average or mean total = avg; calc_ftoa(&calc, total, s); - strcpy(calc.buffer, s); + _tcscpy(calc.buffer, s); calc_buffer_display(&calc); } break; - case '\x03': // Ctrl+C Copy + case TEXT('\x03'): // Ctrl+C Copy { int i; int len; - char *s; + TCHAR *s; HGLOBAL hGlobalMemory; PSTR pGlobalMemory; - if (!(len = strlen(calc.display))) + if (!(len = _tcslen(calc.display))) return 0; - if (!(hGlobalMemory = GlobalAlloc(GHND, len + 1))) + if (!(hGlobalMemory = GlobalAlloc(GHND, (len + 1) * sizeof(TCHAR)))) return 0; if (!(pGlobalMemory = GlobalLock(hGlobalMemory))) @@ -502,15 +515,15 @@ } break; - case '\x16': // Ctrl+V Paste + case TEXT('\x16'): // Ctrl+V Paste { - char *s; + TCHAR *s; int c; int cmd = 0; int size = 0; int i = 0; HGLOBAL hGlobalMemory; - PSTR pGlobalMemory; + LPTSTR pGlobalMemory; if (IsClipboardFormatAvailable(CF_TEXT)) { if (!OpenClipboard(hWnd)) @@ -522,13 +535,13 @@ if (!(size = GlobalSize(hGlobalMemory))) return 0; - if (!(s = (char *)malloc(size))) + if (!(s = (TCHAR *)malloc(size))) return 0; if (!(pGlobalMemory = GlobalLock(hGlobalMemory))) return 0; - strcpy(s, pGlobalMemory); + _tcscpy(s, pGlobalMemory); GlobalUnlock(hGlobalMemory); @@ -548,11 +561,11 @@ // parse the pasted data, validate and SendMessage it one character at a time. // it would appear wincalc does it this way (slow), although very slow appearing on Wine. - while ((c = *s++) && (i++ < size)) { - if (c == ':') { + while ((c = *s++) && (i++ < size / sizeof(TCHAR))) { + if (c == TEXT(':')) { cmd = 1; } - else if (c == '\\') { + else if (c == TEXT('\\')) { SendMessage(hWnd, WM_KEYDOWN, VK_INSERT, lParam); } else { @@ -560,34 +573,34 @@ cmd = 0; switch(c) { - case 'c': // clear memory + case TEXT('c'): // clear memory - case 'C': + case TEXT('C'): SendMessage(hWnd, WM_CHAR, 0x0c, lParam); break; - case 'e': // enable scientific notation + case TEXT('e'): // enable scientific notation - case 'E': + case TEXT('E'): SendMessage(hWnd, WM_CHAR, 'v', lParam); break; - case 'm': // store display in memory + case TEXT('m'): // store display in memory - case 'M': + case TEXT('M'): SendMessage(hWnd, WM_CHAR, 0x0d, NUMBER_OF_THE_BEAST); break; - case 'p': // add display to memory + case TEXT('p'): // add display to memory - case 'P': + case TEXT('P'): SendMessage(hWnd, WM_CHAR, 0x10, lParam); break; - case 'q': // clear current calculation + case TEXT('q'): // clear current calculation - case 'Q': - SendMessage(hWnd, WM_CHAR, '\x1b', lParam); + case TEXT('Q'): + SendMessage(hWnd, WM_CHAR, TEXT('\x1b'), lParam); break; - case 'r': // read memory into display + case TEXT('r'): // read memory into display - case 'R': + case TEXT('R'): SendMessage(hWnd, WM_CHAR, 0x12, lParam); break; default: // just eat it but complain @@ -598,32 +611,32 @@ } else { if ((calc.numBase == NBASE_HEX) && - ((c >= '0' && c <= '9') || - (c >= 'a' && c <= 'f') || - (c >= 'A' && c <= 'F'))) { + ((c >= TEXT('0') && c <= TEXT('9')) || + (c >= TEXT('a') && c <= TEXT('f')) || + (c >= TEXT('A') && c <= TEXT('F')))) { SendMessage(hWnd, WM_CHAR, c, lParam); } else if ((calc.numBase == NBASE_DECIMAL) && - (c >= '0' && c <= '9')) { + (c >= TEXT('0') && c <= TEXT('9'))) { SendMessage(hWnd, WM_CHAR, c, lParam); } else if ((calc.numBase == NBASE_OCTAL) && - (c >= '0' && c <= '7')) { + (c >= TEXT('0') && c <= TEXT('7'))) { SendMessage(hWnd, WM_CHAR, c, lParam); } else if ((calc.numBase == NBASE_BINARY) && - (c == '0' || c == '1')) { + (c == TEXT('0') || c == TEXT('1'))) { SendMessage(hWnd, WM_CHAR, c, lParam); } - else if (c == '.' || c == ',' || - c == 'e' || c == 'E' || - c == '+' || c == '-') { + else if (c == TEXT('.') || c == TEXT(',') || + c == TEXT('e') || c == TEXT('E') || + c == TEXT('+') || c == TEXT('-')) { SendMessage(hWnd, WM_CHAR, c, lParam); } - else if (c == ' ' || // eat harmless trash here - c == ';' || - c == ':') { + else if (c == TEXT(' ') || // eat harmless trash here + c == TEXT(';') || + c == TEXT(':')) { ; // noop } else { // extra spicy trash gets noticed @@ -650,11 +663,11 @@ switch(LOWORD(wParam)) { case IDM_COPY: - SendMessage(hWnd, WM_CHAR, '\x03', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('\x03'), lParam); return 0; case IDM_PASTE: - SendMessage(hWnd, WM_CHAR, '\x16', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('\x16'), lParam); return 0; case IDM_MODE_STANDARD: @@ -739,11 +752,11 @@ return 0; case IDM_HELP_TOPICS: - MessageBox(hWnd, "No Help Available", "Windows Help", MB_OK); + MessageBox(hWnd, TEXT("No Help Available"), TEXT("Windows Help"), MB_OK); return 0; case IDM_ABOUT: - DialogBox( calc.hInst, "DLG_ABOUT", hWnd, AboutDlgProc ); + DialogBox( calc.hInst, TEXT("DLG_ABOUT"), hWnd, AboutDlgProc ); return 0; case ID_CALC_NS_HEX: @@ -944,39 +957,39 @@ case ID_CALC_SEVEN: case ID_CALC_EIGHT: case ID_CALC_NINE: - SendMessage(hWnd, WM_CHAR, LOWORD(wParam)+'0' , lParam); + SendMessage(hWnd, WM_CHAR, LOWORD(wParam)+TEXT('0') , lParam); break; case ID_CALC_A: - SendMessage(hWnd, WM_CHAR, 'a', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('a'), lParam); break; case ID_CALC_B: - SendMessage(hWnd, WM_CHAR, 'b', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('b'), lParam); break; case ID_CALC_C: - SendMessage(hWnd, WM_CHAR, 'c', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('c'), lParam); break; case ID_CALC_D: - SendMessage(hWnd, WM_CHAR, 'd', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('d'), lParam); break; case ID_CALC_E: - SendMessage(hWnd, WM_CHAR, 'e', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('e'), lParam); break; case ID_CALC_F: - SendMessage(hWnd, WM_CHAR, 'f', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('f'), lParam); break; case ID_CALC_DECIMAL: - SendMessage(hWnd, WM_CHAR, '.', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('.'), lParam); break; case ID_CALC_BACKSPACE: - SendMessage(hWnd, WM_CHAR, '\b', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('\b'), lParam); break; case ID_CALC_CLEAR_ENTRY: @@ -984,7 +997,7 @@ break; case ID_CALC_CLEAR_ALL: - SendMessage(hWnd, WM_CHAR, '\x1b', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('\x1b'), lParam); break; case ID_CALC_MEM_CLEAR: @@ -1004,75 +1017,75 @@ break; case ID_CALC_SQRT: - SendMessage(hWnd, WM_CHAR, '?', lParam); // this is not a wincalc keystroke + SendMessage(hWnd, WM_CHAR, TEXT('?'), lParam); // this is not a wincalc keystroke break; case ID_CALC_SQUARE: - SendMessage(hWnd, WM_CHAR, '@', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('@'), lParam); break; case ID_CALC_PI: - SendMessage(hWnd, WM_CHAR, 'p', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('p'), lParam); break; case ID_CALC_LN: - SendMessage(hWnd, WM_CHAR, 'n', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('n'), lParam); break; case ID_CALC_LOG10: - SendMessage(hWnd, WM_CHAR, 'l', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('l'), lParam); break; case ID_CALC_CUBE: - SendMessage(hWnd, WM_CHAR, '#', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('#'), lParam); break; case ID_CALC_POWER: - SendMessage(hWnd, WM_CHAR, 'y', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('y'), lParam); break; case ID_CALC_SIN: - SendMessage(hWnd, WM_CHAR, 's', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('s'), lParam); break; case ID_CALC_COS: - SendMessage(hWnd, WM_CHAR, 'o', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('o'), lParam); break; case ID_CALC_TAN: - SendMessage(hWnd, WM_CHAR, 't', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('t'), lParam); break; case ID_CALC_LSH: - SendMessage(hWnd, WM_CHAR, '<', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('<'), lParam); break; case ID_CALC_NOT: - SendMessage(hWnd, WM_CHAR, '~', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('~'), lParam); break; case ID_CALC_AND: - SendMessage(hWnd, WM_CHAR, '&', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('&'), lParam); break; case ID_CALC_OR: - SendMessage(hWnd, WM_CHAR, '|', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('|'), lParam); break; case ID_CALC_XOR: - SendMessage(hWnd, WM_CHAR, '^', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('^'), lParam); break; case ID_CALC_INT: - SendMessage(hWnd, WM_CHAR, ';', lParam); + SendMessage(hWnd, WM_CHAR, TEXT(';'), lParam); break; case ID_CALC_FACTORIAL: - SendMessage(hWnd, WM_CHAR, '!', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('!'), lParam); break; case ID_CALC_RECIPROCAL: - SendMessage(hWnd, WM_CHAR, 'r', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('r'), lParam); break; case ID_CALC_SIGN: @@ -1080,47 +1093,47 @@ break; case ID_CALC_PLUS: - SendMessage(hWnd, WM_CHAR, '+', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('+'), lParam); break; case ID_CALC_MINUS: - SendMessage(hWnd, WM_CHAR, '-', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('-'), lParam); break; case ID_CALC_MULTIPLY: - SendMessage(hWnd, WM_CHAR, '*', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('*'), lParam); break; case ID_CALC_DIVIDE: - SendMessage(hWnd, WM_CHAR, '/', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('/'), lParam); break; case ID_CALC_EQUALS: - SendMessage(hWnd, WM_CHAR, '=', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('='), lParam); break; case ID_CALC_PERCENT: - SendMessage(hWnd, WM_CHAR, '%', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('%'), lParam); break; case ID_CALC_EXP: - SendMessage(hWnd, WM_CHAR, 'x', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('x'), lParam); break; case ID_CALC_FE: - SendMessage(hWnd, WM_CHAR, 'v', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('v'), lParam); break; case ID_CALC_LEFTPAREN: - SendMessage(hWnd, WM_CHAR, '(', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('('), lParam); break; case ID_CALC_RIGHTPAREN: - SendMessage(hWnd, WM_CHAR, ')', lParam); + SendMessage(hWnd, WM_CHAR, TEXT(')'), lParam); break; case ID_CALC_MOD: - SendMessage(hWnd, WM_CHAR, '%', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('%'), lParam); break; case ID_CALC_DAT: @@ -1128,23 +1141,23 @@ break; case ID_CALC_AVE: - SendMessage(hWnd, WM_CHAR, '\x01', lParam); // Ctrl+A + SendMessage(hWnd, WM_CHAR, TEXT('\x01'), lParam); // Ctrl+A break; case ID_CALC_S: - SendMessage(hWnd, WM_CHAR, '\x04', lParam); // Ctrl+D + SendMessage(hWnd, WM_CHAR, TEXT('\x04'), lParam); // Ctrl+D break; case ID_CALC_STA: - SendMessage(hWnd, WM_CHAR, '\x13', lParam); // Ctrl+S + SendMessage(hWnd, WM_CHAR, TEXT('\x13'), lParam); // Ctrl+S break; case ID_CALC_SUM: - SendMessage(hWnd, WM_CHAR, '\x14', lParam); // Ctrl+T + SendMessage(hWnd, WM_CHAR, TEXT('\x14'), lParam); // Ctrl+T break; case ID_CALC_DMS: - SendMessage(hWnd, WM_CHAR, 'm', lParam); + SendMessage(hWnd, WM_CHAR, TEXT('m'), lParam); break; default: @@ -1156,7 +1169,7 @@ SetFocus(hWnd); if (debug) - show_debug(&calc, "After WM_CHAR", wParam, lParam); + show_debug(&calc, TEXT("After WM_CHAR"), wParam, lParam); return 0; @@ -1172,33 +1185,33 @@ // initialize keys lut for validating keystrokes in various number bases - for (i='0';i<='9';i++) { + for (i=TEXT('0');i<=TEXT('9');i++) { keys[NBASE_HEX][i] = 1; keys[NBASE_DECIMAL][i] = 1; - if (i <= '7') + if (i <= TEXT('7')) keys[NBASE_OCTAL][i] = 1; - if (i <= '1') + if (i <= TEXT('1')) keys[NBASE_BINARY][i] = 1; } - for (i='a';i<='f';i++) + for (i=TEXT('a');i<=TEXT('f');i++) keys[NBASE_HEX][i] = 1; - for (i='A';i<='F';i++) + for (i=TEXT('A');i<=TEXT('F');i++) keys[NBASE_HEX][i] = 1; } void InitMenus(HINSTANCE hInst) { - if (!(menus[MENU_STD] = LoadMenu(hInst,"MAIN_MENU"))) + if (!(menus[MENU_STD] = LoadMenu(hInst,TEXT("MAIN_MENU")))) exit(1); - if (!(menus[MENU_SCIMS] = LoadMenu(hInst,"SCIMS_MENU"))) + if (!(menus[MENU_SCIMS] = LoadMenu(hInst,TEXT("SCIMS_MENU")))) exit(1); - if (!(menus[MENU_SCIWS] = LoadMenu(hInst,"SCIWS_MENU"))) + if (!(menus[MENU_SCIWS] = LoadMenu(hInst,TEXT("SCIWS_MENU")))) exit(1); CheckMenuItem(menus[MENU_STD], IDM_MODE_STANDARD, MF_CHECKED); @@ -1264,11 +1277,11 @@ calc->value = 0; calc->memory = 0; calc->displayMode = 0; - calc->buffer[0] = '\0'; - strcpy(calc->display, "0."); + calc->buffer[0] = TEXT('\0'); + _tcscpy(calc->display, TEXT("0.")); calc->err = 0; - calc->next = '\0'; + calc->next = TEXT('\0'); calc->wordSize = WORDSIZE_QWORD; calc->invMode = 0; @@ -1284,7 +1297,7 @@ skipy = CALC_STANDARD_MARGIN_TOP + CALC_EDIT_HEIGHT; calc->cb[0].id = 0; - strcpy(calc->cb[0].label,"FILLER"); + _tcscpy(calc->cb[0].label,TEXT("FILLER")); calc->cb[0].color = CALC_COLOR_BLUE; calc->cb[0].r.left = skipx + 4; calc->cb[0].r.top = skipy + 2; @@ -1295,7 +1308,7 @@ skipx = SZ_FILLER_X + MARGIN_STANDARD_BIG_X + 11; calc->cb[1].id = ID_CALC_BACKSPACE; - LoadString( hInst, IDS_BTN_BACKSPACE, calc->cb[1].label, sizeof(calc->cb[1].label)); + LoadString( hInst, IDS_BTN_BACKSPACE, calc->cb[1].label, sizeof(calc->cb[1].label) / sizeof(calc->cb[1].label[0])); calc->cb[1].color = CALC_COLOR_RED; calc->cb[1].r.left = skipx; calc->cb[1].r.top = skipy; @@ -1306,7 +1319,7 @@ skipx += SZ_BIGBTN_X + MARGIN_SMALL_X; calc->cb[2].id = ID_CALC_CLEAR_ENTRY; - LoadString( hInst, IDS_BTN_CLEAR_ENTRY, calc->cb[2].label, sizeof(calc->cb[2].label)); + LoadString( hInst, IDS_BTN_CLEAR_ENTRY, calc->cb[2].label, sizeof(calc->cb[2].label) / sizeof(calc->cb[2].label[0])); calc->cb[2].color = CALC_COLOR_RED; calc->cb[2].r.left = skipx; calc->cb[2].r.top = skipy; @@ -1317,7 +1330,7 @@ skipx += SZ_BIGBTN_X + MARGIN_SMALL_X; calc->cb[3].id = ID_CALC_CLEAR_ALL; - LoadString( hInst, IDS_BTN_CLEAR_ALL, calc->cb[3].label, sizeof(calc->cb[3].label)); + LoadString( hInst, IDS_BTN_CLEAR_ALL, calc->cb[3].label, sizeof(calc->cb[3].label) / sizeof(calc->cb[3].label[0])); calc->cb[3].color = CALC_COLOR_RED; calc->cb[3].r.left = skipx; calc->cb[3].r.top = skipy; @@ -1331,7 +1344,7 @@ skipy += SZ_BIGBTN_Y + MARGIN_BIG_Y; calc->cb[4].id = ID_CALC_MEM_CLEAR; - LoadString( hInst, IDS_BTN_MEM_CLEAR, calc->cb[4].label, sizeof(calc->cb[4].label)); + LoadString( hInst, IDS_BTN_MEM_CLEAR, calc->cb[4].label, sizeof(calc->cb[4].label) / sizeof(calc->cb[4].label[0])); calc->cb[4].color = CALC_COLOR_RED; calc->cb[4].r.left = skipx; calc->cb[4].r.top = skipy; @@ -1342,7 +1355,7 @@ skipx += SZ_MEDBTN_X + MARGIN_STANDARD_BIG_X; calc->cb[5].id = ID_CALC_SEVEN; - strcpy(calc->cb[5].label,"7"); + _tcscpy(calc->cb[5].label,TEXT("7")); calc->cb[5].color = CALC_COLOR_BLUE; calc->cb[5].r.left = skipx; calc->cb[5].r.top = skipy; @@ -1353,7 +1366,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[6].id = ID_CALC_EIGHT; - strcpy(calc->cb[6].label,"8"); + _tcscpy(calc->cb[6].label,TEXT("8")); calc->cb[6].color = CALC_COLOR_BLUE; calc->cb[6].r.left = skipx; calc->cb[6].r.top = skipy; @@ -1364,7 +1377,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[7].id = ID_CALC_NINE; - strcpy(calc->cb[7].label,"9"); + _tcscpy(calc->cb[7].label,TEXT("9")); calc->cb[7].color = CALC_COLOR_BLUE; calc->cb[7].r.left = skipx; calc->cb[7].r.top = skipy; @@ -1375,7 +1388,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[8].id = ID_CALC_DIVIDE; - strcpy(calc->cb[8].label,"/"); + _tcscpy(calc->cb[8].label,TEXT("/")); calc->cb[8].color = CALC_COLOR_RED; calc->cb[8].r.left = skipx; calc->cb[8].r.top = skipy; @@ -1386,7 +1399,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[9].id = ID_CALC_SQRT; - LoadString( hInst, IDS_BTN_SQRT, calc->cb[9].label, sizeof(calc->cb[9].label)); + LoadString( hInst, IDS_BTN_SQRT, calc->cb[9].label, sizeof(calc->cb[9].label) / sizeof(calc->cb[9].label[0])); calc->cb[9].color = CALC_COLOR_BLUE; calc->cb[9].r.left = skipx; calc->cb[9].r.top = skipy; @@ -1400,7 +1413,7 @@ skipy += SZ_MEDBTN_Y + MARGIN_SMALL_Y; calc->cb[10].id = ID_CALC_MEM_RECALL; - LoadString( hInst, IDS_BTN_MEM_RECALL, calc->cb[10].label, sizeof(calc->cb[10].label)); + LoadString( hInst, IDS_BTN_MEM_RECALL, calc->cb[10].label, sizeof(calc->cb[10].label) / sizeof(calc->cb[10].label[0])); calc->cb[10].color = CALC_COLOR_RED; calc->cb[10].r.left = skipx; calc->cb[10].r.top = skipy; @@ -1411,7 +1424,7 @@ skipx += SZ_MEDBTN_X + MARGIN_STANDARD_BIG_X; calc->cb[11].id = ID_CALC_FOUR; - strcpy(calc->cb[11].label,"4"); + _tcscpy(calc->cb[11].label,TEXT("4")); calc->cb[11].color = CALC_COLOR_BLUE; calc->cb[11].r.left = skipx; calc->cb[11].r.top = skipy; @@ -1422,7 +1435,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[12].id = ID_CALC_FIVE; - strcpy(calc->cb[12].label,"5"); + _tcscpy(calc->cb[12].label,TEXT("5")); calc->cb[12].color = CALC_COLOR_BLUE; calc->cb[12].r.left = skipx; calc->cb[12].r.top = skipy; @@ -1433,7 +1446,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[13].id = ID_CALC_SIX; - strcpy(calc->cb[13].label,"6"); + _tcscpy(calc->cb[13].label,TEXT("6")); calc->cb[13].color = CALC_COLOR_BLUE; calc->cb[13].r.left = skipx; calc->cb[13].r.top = skipy; @@ -1444,7 +1457,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[14].id = ID_CALC_MULTIPLY; - strcpy(calc->cb[14].label,"*"); + _tcscpy(calc->cb[14].label,TEXT("*")); calc->cb[14].color = CALC_COLOR_RED; calc->cb[14].r.left = skipx; calc->cb[14].r.top = skipy; @@ -1455,7 +1468,7 @@ skipx += SZ_MEDBTN_X + MARGIN_SMALL_X; calc->cb[15].id = ID_CALC_PERCENT; - strcpy(calc->cb[15].label,"%"); + _tcscpy(calc->cb[15].label,TEXT("%")); calc->cb[15].color = CALC_COLOR_BLUE; calc->cb[15].r.left = skipx; calc->cb[15].r.top = skipy; @@ -1469,7 +1482,7 @@ skipy += SZ_MEDBTN_Y + MARGIN_SMALL_Y; calc->cb[16].id = ID_CALC_MEM_STORE; - LoadString( hInst, IDS_BTN_MEM_STORE, calc->cb[16].label, sizeof(calc->cb[16].label)); + LoadString( hInst, IDS_BTN_MEM_STORE, calc->cb[16].label, sizeof(calc->cb[16].label) / sizeof(calc->cb[16].label[0])); calc->cb[16].color = CALC_COLOR_RED; [truncated at 1000 lines; 1910 more skipped]

19 years, 3 months

[hbirr] 17563: - Moved all members with variable length in CSRSS_XXX structures to the end.

by hbirr＠svn.reactos.com

- Moved all members with variable length in CSRSS_XXX structures to the end. - Defined all members with variable length as arrays with a size of zero. - Used the stack for allocating CSR_API_MESSAGE structures. Modified: trunk/reactos/include/subsys/csrss/csrss.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/include/subsys/csrss/csrss.h --- trunk/reactos/include/subsys/csrss/csrss.h 2005-08-26 20:03:41 UTC (rev 17562) +++ trunk/reactos/include/subsys/csrss/csrss.h 2005-08-26 20:35:33 UTC (rev 17563) @@ -46,7 +46,7 @@ ULONG nMaxIds; ULONG nProcessIdsCopied; ULONG nProcessIdsTotal; - HANDLE ProcessId[1]; + HANDLE ProcessId[0]; } CSRSS_GET_PROCESS_LIST, *PCSRSS_GET_PROCESS_LIST; typedef struct @@ -54,8 +54,8 @@ HANDLE ConsoleHandle; BOOL Unicode; ULONG NrCharactersToWrite; - BYTE Buffer[1]; ULONG NrCharactersWritten; + BYTE Buffer[0]; } CSRSS_WRITE_CONSOLE, *PCSRSS_WRITE_CONSOLE; typedef struct @@ -66,7 +66,7 @@ WORD nCharsCanBeDeleted; /* number of chars already in buffer that can be backspaced */ HANDLE EventHandle; ULONG NrCharactersRead; - BYTE Buffer[1]; + BYTE Buffer[0]; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct @@ -132,9 +132,9 @@ BOOL Unicode; WORD Length; COORD Coord; - CHAR String[1]; COORD EndCoord; ULONG NrCharactersWritten; + CHAR String[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_CHAR, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR; typedef struct @@ -142,8 +142,8 @@ HANDLE ConsoleHandle; WORD Length; COORD Coord; - CHAR String[1]; COORD EndCoord; + WORD Attribute[0]; } CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB; typedef struct @@ -197,14 +197,14 @@ { HANDLE Console; DWORD Length; - WCHAR Title[1]; + WCHAR Title[0]; } CSRSS_SET_TITLE, *PCSRSS_SET_TITLE; typedef struct { - HANDLE ConsoleHandle; + HANDLE ConsoleHandle; DWORD Length; - WCHAR Title[1]; + WCHAR Title[0]; } CSRSS_GET_TITLE, *PCSRSS_GET_TITLE; typedef struct @@ -241,7 +241,7 @@ COORD ReadCoord; COORD EndCoord; DWORD CharsRead; - CHAR String[1]; + CHAR String[0]; }CSRSS_READ_CONSOLE_OUTPUT_CHAR, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR; typedef struct @@ -250,13 +250,13 @@ DWORD NumAttrsToRead; COORD ReadCoord; COORD EndCoord; - CHAR String[1]; + WORD Attribute[0]; }CSRSS_READ_CONSOLE_OUTPUT_ATTRIB, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB; typedef struct { HANDLE ConsoleHandle; - DWORD NumInputEvents; + DWORD NumInputEvents; }CSRSS_GET_NUM_INPUT_EVENTS, *PCSRSS_GET_NUM_INPUT_EVENTS; typedef struct @@ -410,21 +410,15 @@ HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; -#define CSRSS_MAX_WRITE_CONSOLE \ - (LPC_MAX_DATA_LENGTH - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE)) +#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_SET_TITLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE)) +#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 (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE)) +#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 CSRSS_MAX_SET_TITLE (LPC_MAX_DATA_LENGTH - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - sizeof(PORT_MESSAGE)) - -#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR )) - -#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ((LPC_MAX_DATA_LENGTH - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB )) / 2) - -#define CSRSS_MAX_READ_CONSOLE (LPC_MAX_DATA_LENGTH - sizeof( ULONG ) - sizeof( CSRSS_READ_CONSOLE )) - -#define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) - -#define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) - /* WCHARs, not bytes! */ #define CSRSS_MAX_TITLE_LENGTH 80 _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-08-26 20:03:41 UTC (rev 17562) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-08-26 20:35:33 UTC (rev 17563) @@ -1097,55 +1097,44 @@ LPVOID lpReserved, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; + ULONG CsrRequest; NTSTATUS Status; USHORT nChars; - ULONG MessageSize, BufferSize, SizeBytes, CharSize; + ULONG SizeBytes, CharSize; DWORD Written = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - BufferSize = sizeof(CSR_API_MESSAGE) + min(nNumberOfCharsToWrite * CharSize, CSRSS_MAX_WRITE_CONSOLE); - Request = RtlAllocateHeap(GetProcessHeap(), 0, BufferSize); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - CsrRequest = MAKE_CSR_API(WRITE_CONSOLE, CSR_CONSOLE); - Request->Data.WriteConsoleRequest.ConsoleHandle = hConsoleOutput; - Request->Data.WriteConsoleRequest.Unicode = bUnicode; + Request.Data.WriteConsoleRequest.ConsoleHandle = hConsoleOutput; + Request.Data.WriteConsoleRequest.Unicode = bUnicode; while(nNumberOfCharsToWrite > 0) { nChars = min(nNumberOfCharsToWrite, CSRSS_MAX_WRITE_CONSOLE) / CharSize; - Request->Data.WriteConsoleRequest.NrCharactersToWrite = nChars; + Request.Data.WriteConsoleRequest.NrCharactersToWrite = nChars; SizeBytes = nChars * CharSize; - memcpy(Request->Data.WriteConsoleRequest.Buffer, lpBuffer, SizeBytes); + memcpy(Request.Data.WriteConsoleRequest.Buffer, lpBuffer, SizeBytes); - MessageSize = CSRSS_HEADER_SIZE + sizeof(CSRSS_WRITE_CONSOLE) + SizeBytes; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - MessageSize); + sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { - RtlFreeHeap(GetProcessHeap(), 0, Request); SetLastErrorByStatus(Status); return FALSE; } nNumberOfCharsToWrite -= nChars; lpBuffer = (PVOID)((ULONG_PTR)lpBuffer + (ULONG_PTR)SizeBytes); - Written += Request->Data.WriteConsoleRequest.NrCharactersWritten; + Written += Request.Data.WriteConsoleRequest.NrCharactersWritten; } - RtlFreeHeap(GetProcessHeap(), 0, Request); - if(lpNumberOfCharsWritten != NULL) { *lpNumberOfCharsWritten = Written; @@ -1207,27 +1196,20 @@ LPVOID lpReserved, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; + ULONG CsrRequest; NTSTATUS Status; - ULONG BufferSize, CharSize, CharsRead = 0; + ULONG CharSize, CharsRead = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - BufferSize = sizeof(CSR_API_MESSAGE) + min(nNumberOfCharsToRead * CharSize, CSRSS_MAX_READ_CONSOLE); - Request = RtlAllocateHeap(GetProcessHeap(), 0, BufferSize); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } + Request.Status = STATUS_SUCCESS; - Request->Status = STATUS_SUCCESS; - do { - if(Request->Status == STATUS_PENDING) + if(Request.Status == STATUS_PENDING) { - Status = NtWaitForSingleObject(Request->Data.ReadConsoleRequest.EventHandle, FALSE, 0); + Status = NtWaitForSingleObject(Request.Data.ReadConsoleRequest.EventHandle, FALSE, 0); if(!NT_SUCCESS(Status)) { DPRINT1("Wait for console input failed!\n"); @@ -1236,39 +1218,38 @@ } CsrRequest = MAKE_CSR_API(READ_CONSOLE, CSR_CONSOLE); - Request->Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; - Request->Data.ReadConsoleRequest.Unicode = bUnicode; - Request->Data.ReadConsoleRequest.NrCharactersToRead = min(nNumberOfCharsToRead, CSRSS_MAX_READ_CONSOLE) / CharSize; - Request->Data.ReadConsoleRequest.nCharsCanBeDeleted = CharsRead; - Status = CsrClientCallServer(Request, + Request.Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; + Request.Data.ReadConsoleRequest.Unicode = bUnicode; + Request.Data.ReadConsoleRequest.NrCharactersToRead = min(nNumberOfCharsToRead, CSRSS_MAX_READ_CONSOLE) / CharSize; + Request.Data.ReadConsoleRequest.nCharsCanBeDeleted = CharsRead; + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - sizeof(CSR_API_MESSAGE) + (Request->Data.ReadConsoleRequest.NrCharactersToRead * CharSize)); + sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { DPRINT1("CSR returned error in ReadConsole\n"); SetLastErrorByStatus(Status); - RtlFreeHeap(GetProcessHeap(), 0, Request); return FALSE; } - nNumberOfCharsToRead -= Request->Data.ReadConsoleRequest.NrCharactersRead; + nNumberOfCharsToRead -= Request.Data.ReadConsoleRequest.NrCharactersRead; memcpy((PVOID)((ULONG_PTR)lpBuffer + (ULONG_PTR)(CharsRead * CharSize)), - Request->Data.ReadConsoleRequest.Buffer, - Request->Data.ReadConsoleRequest.NrCharactersRead * CharSize); - CharsRead += Request->Data.ReadConsoleRequest.NrCharactersRead; + Request.Data.ReadConsoleRequest.Buffer, + Request.Data.ReadConsoleRequest.NrCharactersRead * CharSize); + CharsRead += Request.Data.ReadConsoleRequest.NrCharactersRead; - if(Request->Status == STATUS_NOTIFY_CLEANUP) + if(Request.Status == STATUS_NOTIFY_CLEANUP) { if(CharsRead > 0) { CharsRead--; nNumberOfCharsToRead++; } - Request->Status = STATUS_PENDING; + Request.Status = STATUS_PENDING; } - } while(Request->Status == STATUS_PENDING && nNumberOfCharsToRead > 0); + } while(Request.Status == STATUS_PENDING && nNumberOfCharsToRead > 0); if(lpNumberOfCharsRead != NULL) { @@ -1539,7 +1520,7 @@ LPDWORD lpNumberOfEventsRead, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; PVOID BufferBase; PVOID BufferTargetBase; @@ -1560,39 +1541,30 @@ return FALSE; } - Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CSR_API_MESSAGE)); - if(Request == NULL) - { - CsrReleaseParameterBuffer(BufferBase); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - CsrRequest = MAKE_CSR_API(PEEK_CONSOLE_INPUT, CSR_CONSOLE); - Request->Data.PeekConsoleInputRequest.ConsoleHandle = hConsoleInput; - Request->Data.PeekConsoleInputRequest.Unicode = bUnicode; - Request->Data.PeekConsoleInputRequest.Length = nLength; - Request->Data.PeekConsoleInputRequest.InputRecord = (INPUT_RECORD*)BufferTargetBase; + Request.Data.PeekConsoleInputRequest.ConsoleHandle = hConsoleInput; + Request.Data.PeekConsoleInputRequest.Unicode = bUnicode; + Request.Data.PeekConsoleInputRequest.Length = nLength; + Request.Data.PeekConsoleInputRequest.InputRecord = (INPUT_RECORD*)BufferTargetBase; - Status = CsrClientCallServer(Request, NULL, + Status = CsrClientCallServer(&Request, + NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { - RtlFreeHeap(GetProcessHeap(), 0, Request); CsrReleaseParameterBuffer(BufferBase); return FALSE; } - memcpy(lpBuffer, BufferBase, sizeof(INPUT_RECORD) * Request->Data.PeekConsoleInputRequest.Length); + memcpy(lpBuffer, BufferBase, sizeof(INPUT_RECORD) * Request.Data.PeekConsoleInputRequest.Length); - RtlFreeHeap(GetProcessHeap(), 0, Request); CsrReleaseParameterBuffer(BufferBase); if(lpNumberOfEventsRead != NULL) { - *lpNumberOfEventsRead = Request->Data.PeekConsoleInputRequest.Length; + *lpNumberOfEventsRead = Request.Data.PeekConsoleInputRequest.Length; } return TRUE; @@ -1853,7 +1825,7 @@ PSMALL_RECT lpReadRegion, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; PVOID BufferBase; PVOID BufferTargetBase; @@ -1875,43 +1847,34 @@ return FALSE; } - Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CSR_API_MESSAGE)); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - CsrReleaseParameterBuffer(BufferBase); - return FALSE; - } - CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT, CSR_CONSOLE); - Request->Data.ReadConsoleOutputRequest.ConsoleHandle = hConsoleOutput; - Request->Data.ReadConsoleOutputRequest.Unicode = bUnicode; - Request->Data.ReadConsoleOutputRequest.BufferSize = dwBufferSize; - Request->Data.ReadConsoleOutputRequest.BufferCoord = dwBufferCoord; - Request->Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; - Request->Data.ReadConsoleOutputRequest.CharInfo = (PCHAR_INFO)BufferTargetBase; + Request.Data.ReadConsoleOutputRequest.ConsoleHandle = hConsoleOutput; + Request.Data.ReadConsoleOutputRequest.Unicode = bUnicode; + Request.Data.ReadConsoleOutputRequest.BufferSize = dwBufferSize; + Request.Data.ReadConsoleOutputRequest.BufferCoord = dwBufferCoord; + Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; + Request.Data.ReadConsoleOutputRequest.CharInfo = (PCHAR_INFO)BufferTargetBase; - Status = CsrClientCallServer(Request, NULL, + Status = CsrClientCallServer(&Request, + NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - RtlFreeHeap(GetProcessHeap(), 0, Request); CsrReleaseParameterBuffer(BufferBase); return FALSE; } - SizeX = Request->Data.ReadConsoleOutputRequest.ReadRegion.Right - Request->Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; - SizeY = Request->Data.ReadConsoleOutputRequest.ReadRegion.Bottom - Request->Data.ReadConsoleOutputRequest.ReadRegion.Top + 1; + SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; + SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - Request.Data.ReadConsoleOutputRequest.ReadRegion.Top + 1; memcpy(lpBuffer, BufferBase, sizeof(CHAR_INFO) * SizeX * SizeY); - RtlFreeHeap(GetProcessHeap(), 0, Request); CsrReleaseParameterBuffer(BufferBase); - *lpReadRegion = Request->Data.ReadConsoleOutputRequest.ReadRegion; + *lpReadRegion = Request.Data.ReadConsoleOutputRequest.ReadRegion; return TRUE; } @@ -1964,7 +1927,7 @@ PSMALL_RECT lpWriteRegion, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; ULONG Size; PVOID BufferBase; @@ -1982,40 +1945,30 @@ return(FALSE); } - Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(CSR_API_MESSAGE)); - if (Request == NULL) - { - CsrReleaseParameterBuffer(BufferBase); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE); - Request->Data.WriteConsoleOutputRequest.ConsoleHandle = hConsoleOutput; - Request->Data.WriteConsoleOutputRequest.Unicode = bUnicode; - Request->Data.WriteConsoleOutputRequest.BufferSize = dwBufferSize; - Request->Data.WriteConsoleOutputRequest.BufferCoord = dwBufferCoord; - Request->Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; - Request->Data.WriteConsoleOutputRequest.CharInfo = + Request.Data.WriteConsoleOutputRequest.ConsoleHandle = hConsoleOutput; + Request.Data.WriteConsoleOutputRequest.Unicode = bUnicode; + Request.Data.WriteConsoleOutputRequest.BufferSize = dwBufferSize; + Request.Data.WriteConsoleOutputRequest.BufferCoord = dwBufferCoord; + Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; + Request.Data.WriteConsoleOutputRequest.CharInfo = (CHAR_INFO*)BufferTargetBase; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { CsrReleaseParameterBuffer(BufferBase); - RtlFreeHeap(GetProcessHeap(), 0, Request); SetLastErrorByStatus(Status); return FALSE; } - RtlFreeHeap(GetProcessHeap(), 0, Request); CsrReleaseParameterBuffer(BufferBase); - *lpWriteRegion = Request->Data.WriteConsoleOutputRequest.WriteRegion; + *lpWriteRegion = Request.Data.WriteConsoleOutputRequest.WriteRegion; return(TRUE); } @@ -2065,7 +2018,7 @@ LPDWORD lpNumberOfCharsRead, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; ULONG nChars, SizeBytes, CharSize; DWORD CharsRead = 0; @@ -2075,47 +2028,37 @@ nChars = min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR) / CharSize; SizeBytes = nChars * CharSize; - Request = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(CSR_API_MESSAGE) + SizeBytes); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT_CHAR, CSR_CONSOLE); - Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; - Request->Data.ReadConsoleOutputCharRequest.Unicode = bUnicode; - Request->Data.ReadConsoleOutputCharRequest.ReadCoord = dwReadCoord; + Request.Data.ReadConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; + Request.Data.ReadConsoleOutputCharRequest.Unicode = bUnicode; + Request.Data.ReadConsoleOutputCharRequest.ReadCoord = dwReadCoord; while(nLength > 0) { DWORD BytesRead; - Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead = min(nLength, nChars); + Request.Data.ReadConsoleOutputCharRequest.NumCharsToRead = min(nLength, nChars); + SizeBytes = Request.Data.ReadConsoleOutputCharRequest.NumCharsToRead * CharSize; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - sizeof(CSR_API_MESSAGE) + SizeBytes); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Request->Status)) + sizeof(CSR_API_MESSAGE)); + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Request.Status)) { SetLastErrorByStatus(Status); break; } - BytesRead = Request->Data.ReadConsoleOutputCharRequest.CharsRead * CharSize; - memcpy(lpCharacter, &Request->Data.ReadConsoleOutputCharRequest.String[0], BytesRead); + BytesRead = Request.Data.ReadConsoleOutputCharRequest.CharsRead * CharSize; + memcpy(lpCharacter, Request.Data.ReadConsoleOutputCharRequest.String, BytesRead); lpCharacter = (PVOID)((ULONG_PTR)lpCharacter + (ULONG_PTR)BytesRead); - CharsRead += Request->Data.ReadConsoleOutputCharRequest.CharsRead; - nLength -= Request->Data.ReadConsoleOutputCharRequest.CharsRead; + CharsRead += Request.Data.ReadConsoleOutputCharRequest.CharsRead; + nLength -= Request.Data.ReadConsoleOutputCharRequest.CharsRead; - Request->Data.ReadConsoleOutputCharRequest.ReadCoord = Request->Data.ReadConsoleOutputCharRequest.EndCoord; + Request.Data.ReadConsoleOutputCharRequest.ReadCoord = Request.Data.ReadConsoleOutputCharRequest.EndCoord; } - RtlFreeHeap(GetProcessHeap(), 0, Request); - if(lpNumberOfCharsRead != NULL) { *lpNumberOfCharsRead = CharsRead; @@ -2188,55 +2131,42 @@ LPDWORD lpNumberOfAttrsRead ) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - DWORD Size, i; + DWORD Size; - Request = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(CSR_API_MESSAGE) + min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB)); - if (Request == NULL) - { - SetLastError(ERROR_OUTOFMEMORY); - return(FALSE); - } - if (lpNumberOfAttrsRead != NULL) *lpNumberOfAttrsRead = nLength; CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT_ATTRIB, CSR_CONSOLE); - Request->Data.ReadConsoleOutputAttribRequest.ConsoleHandle = hConsoleOutput; - Request->Data.ReadConsoleOutputAttribRequest.ReadCoord = dwReadCoord; + Request.Data.ReadConsoleOutputAttribRequest.ConsoleHandle = hConsoleOutput; + Request.Data.ReadConsoleOutputAttribRequest.ReadCoord = dwReadCoord; while (nLength != 0) { - if (nLength > CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB) - Size = CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB; + if (nLength > CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB / sizeof(WORD)) + Size = CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB / sizeof(WCHAR); else Size = nLength; - Request->Data.ReadConsoleOutputAttribRequest.NumAttrsToRead = Size; + Request.Data.ReadConsoleOutputAttribRequest.NumAttrsToRead = Size; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - sizeof(CSR_API_MESSAGE) + Size); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Request->Status)) + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Request.Status)) { - RtlFreeHeap(GetProcessHeap(), 0, Request); SetLastErrorByStatus(Status); return(FALSE); } - // Convert CHARs to WORDs - for(i = 0; i < Size; ++i) - *lpAttribute++ = Request->Data.ReadConsoleOutputAttribRequest.String[i]; - + memcpy(lpAttribute, Request.Data.ReadConsoleOutputAttribRequest.Attribute, Size * sizeof(WORD)); + lpAttribute += Size; nLength -= Size; - Request->Data.ReadConsoleOutputAttribRequest.ReadCoord = Request->Data.ReadConsoleOutputAttribRequest.EndCoord; + Request.Data.ReadConsoleOutputAttribRequest.ReadCoord = Request.Data.ReadConsoleOutputAttribRequest.EndCoord; } - RtlFreeHeap(GetProcessHeap(), 0, Request); - return(TRUE); } @@ -2249,59 +2179,48 @@ LPDWORD lpNumberOfCharsWritten, BOOL bUnicode) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; ULONG SizeBytes, CharSize, nChars; DWORD Written = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - nChars = min(nLength, CSRSS_MAX_WRITE_CONSOLE) / CharSize; + nChars = min(nLength, CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR / CharSize); SizeBytes = nChars * CharSize; - Request = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(CSR_API_MESSAGE) + (nChars * CharSize)); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT_CHAR, CSR_CONSOLE); - Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; - Request->Data.WriteConsoleOutputCharRequest.Unicode = bUnicode; - Request->Data.WriteConsoleOutputCharRequest.Coord = dwWriteCoord; + Request.Data.WriteConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; + Request.Data.WriteConsoleOutputCharRequest.Unicode = bUnicode; + Request.Data.WriteConsoleOutputCharRequest.Coord = dwWriteCoord; while(nLength > 0) { DWORD BytesWrite; - Request->Data.WriteConsoleOutputCharRequest.Length = min(nLength, nChars); - BytesWrite = Request->Data.WriteConsoleOutputCharRequest.Length * CharSize; + Request.Data.WriteConsoleOutputCharRequest.Length = min(nLength, nChars); + BytesWrite = Request.Data.WriteConsoleOutputCharRequest.Length * CharSize; - memcpy(&Request->Data.WriteConsoleOutputCharRequest.String[0], lpCharacter, BytesWrite); + memcpy(Request.Data.WriteConsoleOutputCharRequest.String, lpCharacter, BytesWrite); - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - sizeof(CSR_API_MESSAGE) + BytesWrite); + sizeof(CSR_API_MESSAGE)); - if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { - RtlFreeHeap(GetProcessHeap(), 0, Request); SetLastErrorByStatus(Status); return FALSE; } - nLength -= Request->Data.WriteConsoleOutputCharRequest.NrCharactersWritten; - lpCharacter = (PVOID)((ULONG_PTR)lpCharacter + (ULONG_PTR)(Request->Data.WriteConsoleOutputCharRequest.NrCharactersWrit ten * CharSize)); - Written += Request->Data.WriteConsoleOutputCharRequest.NrCharactersWritten; + nLength -= Request.Data.WriteConsoleOutputCharRequest.NrCharactersWritten; + lpCharacter = (PVOID)((ULONG_PTR)lpCharacter + (ULONG_PTR)(Request.Data.WriteConsoleOutputCharRequest.NrCharactersWritt en * CharSize)); + Written += Request.Data.WriteConsoleOutputCharRequest.NrCharactersWritten; - Request->Data.WriteConsoleOutputCharRequest.Coord = Request->Data.WriteConsoleOutputCharRequest.EndCoord; + Request.Data.WriteConsoleOutputCharRequest.Coord = Request.Data.WriteConsoleOutputCharRequest.EndCoord; } - RtlFreeHeap(GetProcessHeap(), 0, Request); - if(lpNumberOfCharsWritten != NULL) { *lpNumberOfCharsWritten = Written; @@ -2368,43 +2287,32 @@ LPDWORD lpNumberOfAttrsWritten ) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; WORD Size; - int c; - Request = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(CSR_API_MESSAGE) + - min(nLength, CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB)); - if( !Request ) - { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT_ATTRIB, CSR_CONSOLE); - Request->Data.WriteConsoleOutputAttribRequest.ConsoleHandle = hConsoleOutput; - Request->Data.WriteConsoleOutputAttribRequest.Coord = dwWriteCoord; + Request.Data.WriteConsoleOutputAttribRequest.ConsoleHandle = hConsoleOutput; + Request.Data.WriteConsoleOutputAttribRequest.Coord = dwWriteCoord; if( lpNumberOfAttrsWritten ) *lpNumberOfAttrsWritten = nLength; while( nLength ) { - Size = nLength > CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ? CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB : nLength; - Request->Data.WriteConsoleOutputAttribRequest.Length = Size; - for( c = 0; c < Size; c++ ) - Request->Data.WriteConsoleOutputAttribRequest.String[c] = (char)lpAttribute[c]; - Status = CsrClientCallServer( Request, NULL, CsrRequest, sizeof( CSR_API_MESSAGE ) + (Size * 2)); - if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Request->Status ) ) + Size = min(nLength, CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB / sizeof(WORD)); + Request.Data.WriteConsoleOutputAttribRequest.Length = Size; + memcpy(Request.Data.WriteConsoleOutputAttribRequest.Attribute, lpAttribute, Size * sizeof(WORD)); + + Status = CsrClientCallServer( &Request, NULL, CsrRequest, sizeof(CSR_API_MESSAGE)); + if( !NT_SUCCESS( Status ) || !NT_SUCCESS( Status = Request.Status ) ) { - RtlFreeHeap( GetProcessHeap(), 0, Request ); SetLastErrorByStatus ( Status ); return FALSE; } nLength -= Size; lpAttribute += Size; - Request->Data.WriteConsoleOutputAttribRequest.Coord = Request->Data.WriteConsoleOutputAttribRequest.EndCoord; + Request.Data.WriteConsoleOutputAttribRequest.Coord = Request.Data.WriteConsoleOutputAttribRequest.EndCoord; } - RtlFreeHeap( GetProcessHeap(), 0, Request ); return TRUE; } @@ -2971,7 +2879,7 @@ DWORD nSize ) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; HANDLE hConsole; @@ -2981,42 +2889,32 @@ return 0; } - Request = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CSR_API_MESSAGE) + CSRSS_MAX_TITLE_LENGTH * sizeof(WCHAR)); - if(Request == NULL) - { - CloseHandle(hConsole); - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - CsrRequest = MAKE_CSR_API(GET_TITLE, CSR_CONSOLE); - Request->Data.GetTitleRequest.ConsoleHandle = hConsole; + Request.Data.GetTitleRequest.ConsoleHandle = hConsole; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - sizeof(CSR_API_MESSAGE) + CSRSS_MAX_TITLE_LENGTH * sizeof(WCHAR)); + sizeof(CSR_API_MESSAGE)); CloseHandle(hConsole); - if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request->Status))) + if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = Request.Status))) { SetLastErrorByStatus(Status); - RtlFreeHeap(GetProcessHeap(), 0, Request); return 0; } - if(nSize * sizeof(WCHAR) < Request->Data.GetTitleRequest.Length) + if(nSize * sizeof(WCHAR) < Request.Data.GetTitleRequest.Length) { - wcsncpy(lpConsoleTitle, Request->Data.GetTitleRequest.Title, nSize - 1); + wcsncpy(lpConsoleTitle, Request.Data.GetTitleRequest.Title, nSize - 1); lpConsoleTitle[nSize--] = L'\0'; } else { - nSize = Request->Data.GetTitleRequest.Length / sizeof (WCHAR); - wcscpy(lpConsoleTitle, Request->Data.GetTitleRequest.Title); + nSize = Request.Data.GetTitleRequest.Length / sizeof (WCHAR); + wcscpy(lpConsoleTitle, Request.Data.GetTitleRequest.Title); lpConsoleTitle[nSize] = L'\0'; } - RtlFreeHeap(GetProcessHeap(), 0, Request); return nSize; } @@ -3073,7 +2971,7 @@ LPCWSTR lpConsoleTitle ) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; unsigned int c; HANDLE hConsole; @@ -3084,37 +2982,24 @@ return FALSE; } - Request = RtlAllocateHeap(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(CSR_API_MESSAGE) + CSRSS_MAX_SET_TITLE); - if (Request == NULL) - { - CloseHandle(hConsole); - SetLastError(ERROR_OUTOFMEMORY); - return(FALSE); - } - CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - Request->Data.SetTitleRequest.Console = hConsole; + Request.Data.SetTitleRequest.Console = hConsole; for( c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++ ) - Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; + Request.Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; // add null - Request->Data.SetTitleRequest.Title[c] = 0; - Request->Data.SetTitleRequest.Length = c; - Status = CsrClientCallServer(Request, + Request.Data.SetTitleRequest.Title[c] = 0; + Request.Data.SetTitleRequest.Length = c; + Status = CsrClientCallServer(&Request, NULL, - CsrRequest, - sizeof(CSR_API_MESSAGE) + - c * sizeof(WCHAR)); + CsrRequest, + sizeof(CSR_API_MESSAGE)); CloseHandle(hConsole); - if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Request->Status ) ) + if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Request.Status ) ) { - RtlFreeHeap( GetProcessHeap(), 0, Request ); SetLastErrorByStatus (Status); return(FALSE); } - RtlFreeHeap( GetProcessHeap(), 0, Request ); return TRUE; } @@ -3132,7 +3017,7 @@ LPCSTR lpConsoleTitle ) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; + CSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; unsigned int c; HANDLE hConsole; @@ -3143,37 +3028,24 @@ return FALSE; } - Request = RtlAllocateHeap(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(CSR_API_MESSAGE) + CSRSS_MAX_SET_TITLE); - if (Request == NULL) - { - CloseHandle(hConsole); - SetLastError(ERROR_OUTOFMEMORY); - return(FALSE); - } - CsrRequest = MAKE_CSR_API(SET_TITLE, CSR_CONSOLE); - Request->Data.SetTitleRequest.Console = hConsole; + Request.Data.SetTitleRequest.Console = hConsole; for( c = 0; lpConsoleTitle[c] && c < CSRSS_MAX_TITLE_LENGTH; c++ ) - Request->Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; + Request.Data.SetTitleRequest.Title[c] = lpConsoleTitle[c]; // add null - Request->Data.SetTitleRequest.Title[c] = 0; - Request->Data.SetTitleRequest.Length = c; - Status = CsrClientCallServer(Request, + Request.Data.SetTitleRequest.Title[c] = 0; + Request.Data.SetTitleRequest.Length = c; + Status = CsrClientCallServer(&Request, NULL, - CsrRequest, - sizeof(CSR_API_MESSAGE) + - c * sizeof(WCHAR)); + CsrRequest, + sizeof(CSR_API_MESSAGE)); CloseHandle(hConsole); - if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Request->Status ) ) + if (!NT_SUCCESS(Status) || !NT_SUCCESS( Status = Request.Status ) ) { - RtlFreeHeap( GetProcessHeap(), 0, Request ); SetLastErrorByStatus (Status); return(FALSE); } - RtlFreeHeap( GetProcessHeap(), 0, Request ); return TRUE; } @@ -3322,8 +3194,8 @@ GetConsoleProcessList(LPDWORD lpdwProcessList, DWORD dwProcessCount) { - PCSR_API_MESSAGE Request; ULONG CsrRequest; - ULONG BufferSize, nProcesses; + CSR_API_MESSAGE Request; ULONG CsrRequest; + ULONG nProcesses; NTSTATUS Status; if(lpdwProcessList == NULL || dwProcessCount == 0) @@ -3332,47 +3204,34 @@ return 0; } - BufferSize = sizeof(CSR_API_MESSAGE) + - (dwProcessCount * sizeof(Request->Data.GetProcessListRequest.ProcessId[0])); - - Request = RtlAllocateHeap(GetProcessHeap(), 0, BufferSize); - if(Request == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; - } - - Request->Status = STATUS_SUCCESS; - CsrRequest = MAKE_CSR_API(GET_PROCESS_LIST, CSR_CONSOLE); - Request->Data.GetProcessListRequest.nMaxIds = dwProcessCount; + Request.Data.GetProcessListRequest.nMaxIds = dwProcessCount; - Status = CsrClientCallServer(Request, + Status = CsrClientCallServer(&Request, NULL, CsrRequest, - BufferSize); - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus (Status); nProcesses = 0; } else { - if(dwProcessCount >= Request->Data.GetProcessListRequest.nProcessIdsTotal) + if(dwProcessCount >= Request.Data.GetProcessListRequest.nProcessIdsTotal) { - nProcesses = Request->Data.GetProcessListRequest.nProcessIdsCopied; - for(nProcesses = 0; nProcesses < Request->Data.GetProcessListRequest.nProcessIdsCopied; nProcesses++) + nProcesses = Request.Data.GetProcessListRequest.nProcessIdsCopied; + for(nProcesses = 0; nProcesses < Request.Data.GetProcessListRequest.nProcessIdsCopied; nProcesses++) { - *(lpdwProcessList++) = (DWORD)Request->Data.GetProcessListRequest.ProcessId[nProcesses]; + *(lpdwProcessList++) = (DWORD)Request.Data.GetProcessListRequest.ProcessId[nProcesses]; } } else { - nProcesses = Request->Data.GetProcessListRequest.nProcessIdsTotal; + nProcesses = Request.Data.GetProcessListRequest.nProcessIdsTotal; } } - RtlFreeHeap(GetProcessHeap(), 0, Request); return nProcesses; } _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-26 20:03:41 UTC (rev 17562) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-26 20:35:33 UTC (rev 17563) @@ -346,7 +346,9 @@ DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); /* Insert into the list */ +//////////////////////////// InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); +/////////////////////////// return STATUS_SUCCESS; } @@ -922,7 +924,7 @@ DPRINT("CsrWriteConsole\n"); if (Request->Header.u1.s1.DataLength - < sizeof(CSRSS_WRITE_CONSOLE) - 1 + < sizeof(CSRSS_WRITE_CONSOLE) + (Request->Data.WriteConsoleRequest.NrCharactersToWrite * CharSize)) { DPRINT1("Invalid request size\n"); @@ -1557,7 +1559,7 @@ CharSize = (Request->Data.WriteConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); if (Request->Header.u1.s1.DataLength [truncated at 1000 lines; 73 more skipped]

19 years, 3 months

[navaraf] 17562: Make the explorer taskbar look a bit nicer.

by navaraf＠svn.reactos.com

Make the explorer taskbar look a bit nicer. Added: trunk/reactos/subsys/system/explorer/explorer.exe.manifest Modified: trunk/reactos/subsys/system/explorer/explorer.rc Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp _____ Added: trunk/reactos/subsys/system/explorer/explorer.exe.manifest --- trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-08-26 20:02:53 UTC (rev 17561) +++ trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-08-26 20:03:41 UTC (rev 17562) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="IrfanView" + type="win32" +/> +<description>Universal picture viewer</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> _____ Modified: trunk/reactos/subsys/system/explorer/explorer.rc --- trunk/reactos/subsys/system/explorer/explorer.rc 2005-08-26 20:02:53 UTC (rev 17561) +++ trunk/reactos/subsys/system/explorer/explorer.rc 2005-08-26 20:03:41 UTC (rev 17562) @@ -19,3 +19,7 @@ IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION IDS_EXPLORER_VERSION_STR "ReactOS %s Explorer" END + +#define MANIFEST_RESOURCE_ID 1 + +MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-08-26 20:02:53 UTC (rev 17561) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-08-26 20:03:41 UTC (rev 17562) @@ -99,7 +99,7 @@ _taskbar_pos = start_btn_width + 6; - new PictureButton(Button(_hwnd, start_str, 2, 2, start_btn_width, DESKTOPBARBAR_HEIGHT-8, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW), + new PictureButton(Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW), SmallIcon(IDI_STARTMENU)/*, GetStockBrush(WHITE_BRUSH)*/); // create task bar @@ -124,36 +124,33 @@ _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| RBS_VARHEIGHT|RBS_AUTOSIZE|RBS_DBLCLKTOGGLE| //|RBS_REGISTERDROP - CCS_NODIVIDER|CCS_NOPARENTALIGN, + CCS_NODIVIDER|CCS_NOPARENTALIGN|CCS_TOP, 0, 0, 0, 0, _hwnd, 0, g_Globals._hInstance, 0); REBARBANDINFO rbBand; rbBand.cbSize = sizeof(REBARBANDINFO); - rbBand.fMask = RBBIM_TEXT|RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; + rbBand.fMask = RBBIM_TEXT|RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE|RBBIM_ID|R BBIM_IDEALSIZE; #ifndef RBBS_HIDETITLE // missing in MinGW headers as of 25.02.2004 #define RBBS_HIDETITLE 0x400 #endif - rbBand.fStyle = RBBS_CHILDEDGE|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; + rbBand.cyChild = REBARBAND_HEIGHT; + rbBand.cyMaxChild = (ULONG)-1; + rbBand.cyMinChild = REBARBAND_HEIGHT; + rbBand.cyIntegral = REBARBAND_HEIGHT + 3; //@@ OK? + rbBand.cxMinChild = rbBand.cyIntegral * 3; + rbBand.fStyle = RBBS_VARIABLEHEIGHT|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; - rbBand.cxMinChild = 0; - rbBand.cyMinChild = 0; - rbBand.cyChild = 0; - rbBand.cyMaxChild = 0; - rbBand.cyIntegral = DESKTOPBARBAR_HEIGHT; //@@ OK? - rbBand.lpText = TEXT("Quicklaunch"); rbBand.hwndChild = _hwndQuickLaunch; - rbBand.cxMinChild = 0; - rbBand.cyMinChild = HIWORD(SendMessage(_hwndQuickLaunch, TB_GETBUTTONSIZE, 0, 0)) + 2; rbBand.cx = 250; + rbBand.wID = IDW_QUICKLAUNCHBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); rbBand.lpText = TEXT("Taskbar"); rbBand.hwndChild = _hwndTaskBar; - rbBand.cxMinChild = 0; - rbBand.cyMinChild = ClientRect(_hwndTaskBar).bottom + 2; rbBand.cx = 200; //pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1); + rbBand.wID = IDW_TASKTOOLBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -274,7 +271,21 @@ return 0; } +int DesktopBar::Notify(int id, NMHDR* pnmh) +{ + if (pnmh->code == RBN_CHILDSIZE) { + /* align the task bands to the top, so it's in row with the Start button */ + NMREBARCHILDSIZE *childSize = (NMREBARCHILDSIZE*)pnmh; + if (childSize->wID == IDW_TASKTOOLBAR) { + int cy = childSize->rcChild.top - childSize->rcBand.top; + childSize->rcChild.bottom -= cy; + childSize->rcChild.top -= cy; + } + } + return 0; +} + void DesktopBar::Resize(int cx, int cy) { ///@todo general children resizing algorithm @@ -284,7 +295,7 @@ HDWP hdwp = BeginDeferWindowPos(3); if (_hwndrebar) - DeferWindowPos(hdwp, _hwndrebar, 0, _taskbar_pos, 0, cx-_taskbar_pos-(notifyarea_width+1), cy, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, _hwndrebar, 0, _taskbar_pos, 1, cx-_taskbar_pos-(notifyarea_width+1), cy-2, SWP_NOZORDER|SWP_NOACTIVATE); else { if (_hwndQuickLaunch) DeferWindowPos(hdwp, _hwndQuickLaunch, 0, _taskbar_pos, 1, quicklaunch_width, cy-2, SWP_NOZORDER|SWP_NOACTIVATE); _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-08-26 20:02:53 UTC (rev 17561) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-08-26 20:03:41 UTC (rev 17562) @@ -30,7 +30,8 @@ #define TITLE_EXPLORERBAR TEXT("") // use an empty window title, so windows taskmanager does not show the window in its application list -#define DESKTOPBARBAR_HEIGHT 29 +#define DESKTOPBARBAR_HEIGHT (GetSystemMetrics(SM_CYSIZE) + 5 * GetSystemMetrics(SM_CYEDGE)) +#define REBARBAND_HEIGHT (GetSystemMetrics(SM_CYSIZE) + 2 * GetSystemMetrics(SM_CYEDGE)) #define IDC_START 0x1000 @@ -89,6 +90,7 @@ LRESULT Init(LPCREATESTRUCT pcs); LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); + int Notify(int id, NMHDR* pnmh); int Command(int id, int code); void Resize(int cx, int cy); _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-08-26 20:02:53 UTC (rev 17561) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-08-26 20:03:41 UTC (rev 17562) @@ -118,12 +118,15 @@ LRESULT TaskBar::Init(LPCREATESTRUCT pcs) { + TBMETRICS metrics; + if (super::Init(pcs)) return 1; + /* FIXME: There's an internal padding for non-flat toolbar. Get rid of it somehow. */ _htoolbar = CreateToolbarEx(_hwnd, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| - CCS_TOP|CCS_NODIVIDER | TBSTYLE_LIST|TBSTYLE_TOOLTIPS|TBSTYLE_WRAPABLE,//|TBSTYLE_AUTOSIZE + CCS_TOP|CCS_NODIVIDER|TBSTYLE_LIST|TBSTYLE_TOOLTIPS|TBSTYLE_WRAPABLE,//| TBSTYLE_AUTOSIZE IDW_TASKTOOLBAR, 0, 0, 0, NULL, 0, 0, 0, 16, 16, sizeof(TBBUTTON)); SendMessage(_htoolbar, TB_SETBUTTONWIDTH, 0, MAKELONG(TASKBUTTONWIDTH_MAX,TASKBUTTONWIDTH_MAX)); @@ -132,6 +135,14 @@ //SetWindowFont(_htoolbar, GetStockFont(ANSI_VAR_FONT), FALSE); //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); + metrics.cbSize = sizeof(TBMETRICS); + metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; + metrics.cxBarPad = 0; + metrics.cyBarPad = 0; + metrics.cxButtonSpacing = 3; + metrics.cyButtonSpacing = 3; + SendMessage(_htoolbar, TB_SETMETRICS, 0, (LPARAM)&metrics); + _next_id = IDC_FIRST_APP; // register the taskbar window as task manager window to make the following call to RegisterShellHookWindow working

19 years, 3 months

[navaraf] 17561: Add TBMETRICS structure and associated constants.

by navaraf＠svn.reactos.com

Add TBMETRICS structure and associated constants. Modified: trunk/reactos/w32api/include/commctrl.h _____ Modified: trunk/reactos/w32api/include/commctrl.h --- trunk/reactos/w32api/include/commctrl.h 2005-08-26 18:39:20 UTC (rev 17560) +++ trunk/reactos/w32api/include/commctrl.h 2005-08-26 20:02:53 UTC (rev 17561) @@ -636,6 +636,10 @@ #define TB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TB_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #endif +#if (_WIN32_WINNT >= 0x0501) +#define TB_GETMETRICS (WM_USER + 101) +#define TB_SETMETRICS (WM_USER + 102) +#endif /* _WIN32_WINNT >= 0x0501 */ #define TBBF_LARGE 1 #define TBN_GETBUTTONINFOA (TBN_FIRST-0) #define TBN_BEGINDRAG (TBN_FIRST-1) @@ -670,6 +674,11 @@ #define TBNF_TEXT 2 #define TBNF_DI_SETITEM 0x10000000 #endif /* _WIN32_IE >= 0x0500 */ +#if (_WIN32_WINNT >= 0x0501) +#define TBMF_PAD 1 +#define TBMF_BARPAD 2 +#define TBMF_BUTTONSPACING 4 +#endif /* _WIN32_IE >= 0x0501 */ #define TTS_ALWAYSTIP 1 #define TTS_NOPREFIX 2 #if( _WIN32_IE >= 0x0500 ) @@ -2269,6 +2278,18 @@ UINT nIDNew; int nButtons; } TBREPLACEBITMAP,*LPTBREPLACEBITMAP; +#if (_WIN32_WINNT >= 0x0501) +typedef struct { + UINT cbSize; + DWORD dwMask; + INT cxPad; + INT cyPad; + INT cxBarPad; + INT cyBarPad; + INT cxButtonSpacing; + INT cyButtonSpacing; +} TBMETRICS, *LPTBMETRICS; +#endif /* _WIN32_WINNT >= 0x0501 */ typedef struct tagNMTOOLBARA { NMHDR hdr; int iItem;

19 years, 3 months

[sedwards] 17560: Add constants for DBG_CONTROL_C and DBG_CONTROL_BREAK to ntstatus.h, Work around conflict including ntstatus.h with the NDK

by sedwards＠svn.reactos.com

Add constants for DBG_CONTROL_C and DBG_CONTROL_BREAK to ntstatus.h, Work around conflict including ntstatus.h with the NDK Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/w32api/include/ntstatus.h _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-08-26 13:47:56 UTC (rev 17559) +++ trunk/reactos/include/ndk/umtypes.h 2005-08-26 18:39:20 UTC (rev 17560) @@ -13,8 +13,54 @@ /* DEPENDENCIES **************************************************************/ #include <winioctl.h> +#include <ntnls.h> + +/* Undef the following to avoid conflects including ntstatus.h with winnt.h */ +#undef STATUS_WAIT_0 +#undef STATUS_ABANDONED_WAIT_0 +#undef STATUS_USER_APC +#undef STATUS_TIMEOUT +#undef STATUS_PENDING +#undef DBG_EXCEPTION_HANDLED +#undef DBG_CONTINUE +#undef STATUS_SEGMENT_NOTIFICATION +#undef DBG_TERMINATE_THREAD +#undef DBG_TERMINATE_PROCESS +#undef DBG_CONTROL_C +#undef DBG_CONTROL_BREAK +#undef DBG_COMMAND_EXCEPTION +#undef STATUS_GUARD_PAGE_VIOLATION +#undef STATUS_DATATYPE_MISALIGNMENT +#undef STATUS_BREAKPOINT +#undef STATUS_SINGLE_STEP +#undef DBG_EXCEPTION_NOT_HANDLED +#undef STATUS_ACCESS_VIOLATION +#undef STATUS_IN_PAGE_ERROR +#undef STATUS_INVALID_HANDLE +#undef STATUS_NO_MEMORY +#undef STATUS_ILLEGAL_INSTRUCTION +#undef STATUS_NONCONTINUABLE_EXCEPTION +#undef STATUS_INVALID_DISPOSITION +#undef STATUS_ARRAY_BOUNDS_EXCEEDED +#undef STATUS_FLOAT_DENORMAL_OPERAND +#undef STATUS_FLOAT_DIVIDE_BY_ZERO +#undef STATUS_FLOAT_INEXACT_RESULT +#undef STATUS_FLOAT_INVALID_OPERATION +#undef STATUS_FLOAT_OVERFLOW +#undef STATUS_FLOAT_STACK_CHECK +#undef STATUS_FLOAT_UNDERFLOW +#undef STATUS_INTEGER_DIVIDE_BY_ZERO +#undef STATUS_INTEGER_OVERFLOW +#undef STATUS_PRIVILEGED_INSTRUCTION +#undef STATUS_STACK_OVERFLOW +#undef STATUS_CONTROL_C_EXIT +#undef STATUS_FLOAT_MULTIPLE_FAULTS +#undef STATUS_FLOAT_MULTIPLE_TRAPS +#undef STATUS_REG_NAT_CONSUMPTION +#undef STATUS_SXS_EARLY_DEACTIVATION +#undef STATUS_SXS_INVALID_DEACTIVATION + #include <ntstatus.h> -#include <ntnls.h> #define STATIC static /* CONSTANTS *****************************************************************/ _____ Modified: trunk/reactos/w32api/include/ntstatus.h --- trunk/reactos/w32api/include/ntstatus.h 2005-08-26 13:47:56 UTC (rev 17559) +++ trunk/reactos/w32api/include/ntstatus.h 2005-08-26 18:39:20 UTC (rev 17560) @@ -22,6 +22,11 @@ #define __WINE_NTSTATUS_H #ifndef WIN32_NO_STATUS +/* + * Debug codes + */ +#define DBG_CONTROL_C ((NTSTATUS)0x40010005L) +#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008L) /* * Exception codes

19 years, 3 months

← Newer
1
2
3
4
5
6
7
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005