Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[navaraf] 17148: - Fix size check in SystemBasicInformation and SystemTimeOfDayInformation.

by navaraf＠svn.reactos.com

- Fix size check in SystemBasicInformation and SystemTimeOfDayInformation. - Add SEH protection to SystemProcessInformation. - Implement SystemKernelDebuggerInformation. - Fix returning of ResultLength in NtQuerySystemInformation. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:03:35 UTC (rev 17147) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:12:10 UTC (rev 17148) @@ -57,7 +57,7 @@ TotalTime = Prcb->KernelTime + Prcb->UserTime; if (TotalTime != 0) *CpuUsage = 100 - (ScaledIdle / TotalTime); - else + else *CpuUsage = 0; } @@ -360,7 +360,7 @@ /* * Check user buffer's size */ - if (Size < sizeof (SYSTEM_BASIC_INFORMATION)) + if (Size != sizeof (SYSTEM_BASIC_INFORMATION)) { return (STATUS_INFO_LENGTH_MISMATCH); } @@ -539,7 +539,7 @@ *ReqSize = sizeof (SYSTEM_TIMEOFDAY_INFORMATION); /* Check user buffer's size */ - if (Size < sizeof (SYSTEM_TIMEOFDAY_INFORMATION)) + if (Size != sizeof (SYSTEM_TIMEOFDAY_INFORMATION)) { return STATUS_INFO_LENGTH_MISMATCH; } @@ -570,131 +570,141 @@ ULONG ovlSize=0, nThreads; PEPROCESS pr, syspr; unsigned char *pCur; + NTSTATUS Status; - /* scan the process list */ - - PSYSTEM_PROCESS_INFORMATION Spi - = (PSYSTEM_PROCESS_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - - if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) + _SEH_TRY { - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } + /* scan the process list */ - syspr = PsGetNextProcess(NULL); - pr = syspr; - pCur = (unsigned char *)Spi; + PSYSTEM_PROCESS_INFORMATION Spi + = (PSYSTEM_PROCESS_INFORMATION) Buffer; - do - { - PSYSTEM_PROCESS_INFORMATION SpiCur; - int curSize, i = 0; - ANSI_STRING imgName; - int inLen=32; // image name len in bytes - PLIST_ENTRY current_entry; - PETHREAD current; + *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - - nThreads = 0; - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) + if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) { - nThreads++; - current_entry = current_entry->Flink; + return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } - // size of the structure for every process - curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+siz eof(SYSTEM_THREAD_INFORMATION)*nThreads; - ovlSize += curSize+inLen; + syspr = PsGetNextProcess(NULL); + pr = syspr; + pCur = (unsigned char *)Spi; - if (ovlSize > Size) + do { - *ReqSize = ovlSize; - ObDereferenceObject(pr); + PSYSTEM_PROCESS_INFORMATION SpiCur; + int curSize, i = 0; + ANSI_STRING imgName; + int inLen=32; // image name len in bytes + PLIST_ENTRY current_entry; + PETHREAD current; - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } + SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - // fill system information - SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure - SpiCur->NumberOfThreads = nThreads; - SpiCur->CreateTime = pr->CreateTime; - SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; - SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; - SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = inLen; - SpiCur->ImageName.Buffer = (void*)(pCur+curSize); + nThreads = 0; + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + nThreads++; + current_entry = current_entry->Flink; + } - // copy name to the end of the struct - if(pr != PsIdleProcess) - { - RtlInitAnsiString(&imgName, pr->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); - } - else - { - RtlInitUnicodeString(&SpiCur->ImageName, NULL); - } + // size of the structure for every process + curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+siz eof(SYSTEM_THREAD_INFORMATION)*nThreads; + ovlSize += curSize+inLen; - SpiCur->BasePriority = pr->Pcb.BasePriority; - SpiCur->UniqueProcessId = pr->UniqueProcessId; - SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; - SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - SpiCur->PeakVirtualSize = pr->PeakVirtualSize; - SpiCur->VirtualSize = pr->VirtualSize; - SpiCur->PageFaultCount = pr->Vm.PageFaultCount; - SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ? - SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ? - SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; - SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; - SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; - SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; - SpiCur->PagefileUsage = pr->QuotaUsage[3]; - SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; - SpiCur->PrivateUsage = pr->CommitCharge; + if (ovlSize > Size) + { + *ReqSize = ovlSize; + ObDereferenceObject(pr); - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) - { - current = CONTAINING_RECORD(current_entry, ETHREAD, - ThreadListEntry); + return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } - SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; - SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL; -// SpiCur->TH[i].CreateTime = current->CreateTime; - SpiCur->TH[i].WaitTime = current->Tcb.WaitTime; - SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress; - SpiCur->TH[i].ClientId = current->Cid; - SpiCur->TH[i].Priority = current->Tcb.Priority; - SpiCur->TH[i].BasePriority = current->Tcb.BasePriority; - SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches; - SpiCur->TH[i].ThreadState = current->Tcb.State; - SpiCur->TH[i].WaitReason = current->Tcb.WaitReason; - i++; - current_entry = current_entry->Flink; - } + // fill system information + SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure + SpiCur->NumberOfThreads = nThreads; + SpiCur->CreateTime = pr->CreateTime; + SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; + SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; + SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); + SpiCur->ImageName.MaximumLength = inLen; + SpiCur->ImageName.Buffer = (void*)(pCur+curSize); - pr = PsGetNextProcess(pr); - nThreads = 0; - if ((pr == syspr) || (pr == NULL)) - { - SpiCur->NextEntryOffset = 0; - break; - } - else - pCur = pCur + curSize + inLen; - } while ((pr != syspr) && (pr != NULL)); + // copy name to the end of the struct + if(pr != PsIdleProcess) + { + RtlInitAnsiString(&imgName, pr->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); + } + else + { + RtlInitUnicodeString(&SpiCur->ImageName, NULL); + } - if(pr != NULL) + SpiCur->BasePriority = pr->Pcb.BasePriority; + SpiCur->UniqueProcessId = pr->UniqueProcessId; + SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; + SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + SpiCur->PeakVirtualSize = pr->PeakVirtualSize; + SpiCur->VirtualSize = pr->VirtualSize; + SpiCur->PageFaultCount = pr->Vm.PageFaultCount; + SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; + SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; + SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; + SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; + SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; + SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; + SpiCur->PagefileUsage = pr->QuotaUsage[3]; + SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; + SpiCur->PrivateUsage = pr->CommitCharge; + + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + current = CONTAINING_RECORD(current_entry, ETHREAD, + ThreadListEntry); + + SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; + SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL; +// SpiCur->TH[i].CreateTime = current->CreateTime; + SpiCur->TH[i].WaitTime = current->Tcb.WaitTime; + SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress; + SpiCur->TH[i].ClientId = current->Cid; + SpiCur->TH[i].Priority = current->Tcb.Priority; + SpiCur->TH[i].BasePriority = current->Tcb.BasePriority; + SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches; + SpiCur->TH[i].ThreadState = current->Tcb.State; + SpiCur->TH[i].WaitReason = current->Tcb.WaitReason; + i++; + current_entry = current_entry->Flink; + } + + pr = PsGetNextProcess(pr); + nThreads = 0; + if ((pr == syspr) || (pr == NULL)) + { + SpiCur->NextEntryOffset = 0; + break; + } + else + pCur = pCur + curSize + inLen; + } while ((pr != syspr) && (pr != NULL)); + + if(pr != NULL) + ObDereferenceObject(pr); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE { - ObDereferenceObject(pr); + if(pr != NULL) + ObDereferenceObject(pr); + Status = _SEH_GetExceptionCode(); } + _SEH_END *ReqSize = ovlSize; - return (STATUS_SUCCESS); + return Status; } /* Class 6 - Call Count Information */ @@ -1213,9 +1223,18 @@ /* Class 35 - Kernel Debugger Information */ QSI_DEF(SystemKernelDebuggerInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemKernelDebuggerInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + PSYSTEM_KERNEL_DEBUGGER_INFORMATION skdi = (PSYSTEM_KERNEL_DEBUGGER_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); + if (Size < sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + skdi->KernelDebuggerEnabled = KD_DEBUGGER_ENABLED; + skdi->KernelDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + + return STATUS_SUCCESS; } /* Class 36 - Context Switch Information */ @@ -1551,11 +1570,10 @@ FStatus = CallQS [SystemInformationClass].Query(SystemInformation, Length, &ResultLength); - if (NT_SUCCESS(FStatus) && UnsafeResultLength != NULL) + if (UnsafeResultLength != NULL) { if (PreviousMode != KernelMode) { - FStatus = STATUS_SUCCESS; _SEH_TRY { *UnsafeResultLength = ResultLength;

19 years, 1 month

[ekohl] 17147: Fix CM_Get_Registry_Property_ExW.

by ekohl＠svn.reactos.com

Fix CM_Get_Registry_Property_ExW. Implement CM_Set_Registry_Property_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-08-07 08:06:56 UTC (rev 17146) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-08-07 09:03:35 UTC (rev 17147) @@ -148,7 +148,6 @@ ULONG ulClassIndex, LPGUID ClassGuid, ULONG ulFlags) { TRACE("%lx %p %lx\n", ulClassIndex, ClassGuid, ulFlags); - return CM_Enumerate_Classes_Ex(ulClassIndex, ClassGuid, ulFlags, NULL); } @@ -192,10 +191,16 @@ { HKEY hRelativeKey, hKey; DWORD rc; - WCHAR Buffer[39]; + WCHAR Buffer[MAX_GUID_STRING_LEN]; TRACE("%lx %p %lx %p\n", ulClassIndex, ClassGuid, ulFlags, hMachine); + if (ClassGuid == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { FIXME("hMachine argument ignored\n"); @@ -224,7 +229,7 @@ if (rc == ERROR_SUCCESS) { /* Remove the {} */ - Buffer[37] = UNICODE_NULL; + Buffer[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL; /* Convert the buffer to a GUID */ if (UuidFromStringW(&Buffer[1], ClassGuid) != RPC_S_OK) return CR_FAILURE; @@ -476,6 +481,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; + ulTransferLength = *pulLength; ret = PNP_GetDeviceRegProp(BindingHandle, lpDevInst, ulProperty, @@ -1332,9 +1338,129 @@ DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, ULONG ulFlags, HMACHINE hMachine) { + CONFIGRET ret = CR_SUCCESS; + LPWSTR lpBuffer; + ULONG ulType; + FIXME("%lx %lu %p %lx %lx %lx\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + + if (Buffer == NULL && ulLength != 0) + return CR_INVALID_POINTER; + + if (Buffer == NULL) + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + NULL, + 0, + ulFlags, + hMachine); + } + else + { + /* Get property type */ + switch (ulProperty) + { + case CM_DRP_DEVICEDESC: + ulType = REG_SZ; + break; + + case CM_DRP_HARDWAREID: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_COMPATIBLEIDS: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_SERVICE: + ulType = REG_SZ; + break; + + case CM_DRP_CLASS: + ulType = REG_SZ; + break; + + case CM_DRP_CLASSGUID: + ulType = REG_SZ; + break; + + case CM_DRP_DRIVER: + ulType = REG_SZ; + break; + + case CM_DRP_CONFIGFLAGS: + ulType = REG_DWORD; + break; + + case CM_DRP_MFG: + ulType = REG_SZ; + break; + + case CM_DRP_FRIENDLYNAME: + ulType = REG_SZ; + break; + + case CM_DRP_LOCATION_INFORMATION: + ulType = REG_SZ; + break; + + case CM_DRP_UPPERFILTERS: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_LOWERFILTERS: + ulType = REG_MULTI_SZ; + break; + + default: + return CR_INVALID_PROPERTY; + } + + /* Allocate buffer if needed */ + if (ulType == REG_SZ || + ulType == REG_MULTI_SZ) + { + lpBuffer = MyMalloc(ulLength * sizeof(WCHAR)); + if (lpBuffer == NULL) + { + ret = CR_OUT_OF_MEMORY; + } + else + { + if (!MultiByteToWideChar(CP_ACP, 0, Buffer, + ulLength, lpBuffer, ulLength)) + { + MyFree(lpBuffer); + ret = CR_FAILURE; + } + else + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + lpBuffer, + ulLength * sizeof(WCHAR), + ulFlags, + hMachine); + MyFree(lpBuffer); + } + } + } + else + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + Buffer, + ulLength, + ulFlags, + hMachine); + } + + ret = CR_CALL_NOT_IMPLEMENTED; + } + + return ret; } @@ -1350,7 +1476,7 @@ LPWSTR lpDevInst; ULONG ulType; - FIXME("%lx %lu %p %lx %lx %lx\n", + TRACE("%lx %lu %p %lx %lx %lx\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); if (dnDevInst == 0) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-08-07 08:06:56 UTC (rev 17146) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-08-07 09:03:35 UTC (rev 17147) @@ -457,11 +457,13 @@ unsigned long *Length, DWORD Flags) { + PLUGPLAY_CONTROL_PROPERTY_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; LPWSTR lpValueName = NULL; - ULONG Data; + HKEY hKey = 0; + NTSTATUS Status; - DPRINT1("PNP_GetDeviceRegProp() called\n"); + DPRINT("PNP_GetDeviceRegProp() called\n"); switch (Property) { @@ -518,6 +520,7 @@ break; case CM_DRP_UI_NUMBER: + lpValueName = NULL; break; case CM_DRP_UPPERFILTERS: @@ -529,41 +532,104 @@ break; case CM_DRP_BUSTYPEGUID: + lpValueName = NULL; break; case CM_DRP_LEGACYBUSTYPE: + lpValueName = NULL; break; case CM_DRP_BUSNUMBER: + lpValueName = NULL; break; case CM_DRP_ENUMERATOR_NAME: + lpValueName = NULL; break; default: return CR_INVALID_PROPERTY; } - DPRINT1("Value name: %S\n", lpValueName); + DPRINT("Value name: %S\n", lpValueName); if (lpValueName) { /* Retrieve information from the Registry */ + if (RegOpenKeyExW(hEnumKey, + DeviceInstance, + 0, + KEY_ALL_ACCESS, + &hKey)) + return CR_INVALID_DEVNODE; + if (RegQueryValueExW(hKey, + lpValueName, + NULL, + DataType, + (LPBYTE)Buffer, + Length)) + ret = CR_REGISTRY_ERROR; + + /* FIXME: Check buffer size */ + + RegCloseKey(hKey); } else { /* Retrieve information from the Device Node */ + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + DeviceInstance); + PlugPlayData.Buffer = Buffer; + PlugPlayData.BufferSize = *TransferLen; - } + switch (Property) + { +#if 0 + case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: + PlugPlayData.Property = DevicePropertyPhysicalDeviceObjectName; + break; + case CM_DRP_UI_NUMBER: + PlugPlayData.Property = DevicePropertyUINumber; + break; - Data = 0xbaadf00d; - memcpy(Buffer, &Data, sizeof(ULONG)); - *Length = sizeof(ULONG); + case CM_DRP_BUSTYPEGUID: + PlugPlayData.Property = DevicePropertyBusTypeGuid; + break; - DPRINT1("PNP_GetDeviceRegProp() done (returns %lx)\n", ret); + case CM_DRP_LEGACYBUSTYPE: + PlugPlayData.Property = DevicePropertyLegacyBusType; + break; + case CM_DRP_BUSNUMBER: + PlugPlayData.Property = DevicePropertyBusNumber; + break; + + case CM_DRP_ENUMERATOR_NAME: + PlugPlayData.Property = DevicePropertyEnumeratorName; + break; +#endif + + default: + return CR_INVALID_PROPERTY; + } + + Status = NtPlugPlayControl(PlugPlayControlProperty, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)); + if (NT_SUCCESS(Status)) + { + *Length = PlugPlayData.BufferSize; + } + else + { + ret = CR_FAILURE; /* FIXME */ + } + } + + DPRINT("PNP_GetDeviceRegProp() done (returns %lx)\n", ret); + return ret; }

19 years, 1 month

[hbirr] 17146: Allocated a converting buffer for WideCharToMultiByte. This does fix bug #702.

by hbirr＠svn.reactos.com

Allocated a converting buffer for WideCharToMultiByte. This does fix bug #702. Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-07 07:49:07 UTC (rev 17145) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-07 08:06:56 UTC (rev 17146) @@ -37,8 +37,6 @@ #define ConsoleAnsiCharToUnicodeChar(Console, sWChar, dChar) \ MultiByteToWideChar((Console)->CodePage, 0, (dChar), 1, (sWChar), 1) -#define ConsoleUnicodeToAnsiN(Console, dChar, sWChar, nChars) \ - WideCharToMultiByte((Console)->CodePage, 0, (sWChar), (nChars), (dChar), (nChars) * sizeof(WCHAR), NULL, NULL) /* FUNCTIONS *****************************************************************/ @@ -903,18 +901,22 @@ { if (InputEvent->EventType == KEY_EVENT) { + WCHAR UnicodeChar = InputEvent->Event.KeyEvent.uChar.UnicodeChar; + InputEvent->Event.KeyEvent.uChar.UnicodeChar = 0; ConsoleUnicodeCharToAnsiChar(Console, &InputEvent->Event.KeyEvent.uChar.AsciiChar, - &InputEvent->Event.KeyEvent.uChar.UnicodeChar); + &UnicodeChar); } } CSR_API(CsrWriteConsole) { NTSTATUS Status; - PCHAR Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer; + PCHAR Buffer; PCSRSS_SCREEN_BUFFER Buff; PCSRSS_CONSOLE Console; + DWORD Written = 0; + ULONG Length; ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); DPRINT("CsrWriteConsole\n"); @@ -939,38 +941,55 @@ } if(Request->Data.WriteConsoleRequest.Unicode) - { - ConsoleUnicodeToAnsiN(Console, Buffer, (PWCHAR)Buffer, Request->Data.WriteConsoleRequest.NrCharactersToWrite); - } - - Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff); - if (! NT_SUCCESS(Status)) { - if (NULL != Console) + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, + NULL, 0, NULL, NULL); + Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length); + if (Buffer) { - ConioUnlockConsole(Console); + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, + Buffer, Length, NULL, NULL); } - return Request->Status = Status; + else + { + Status = STATUS_NO_MEMORY; + } } - - Request->Status = ConioWriteConsole(Console, Buff, Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); - ConioUnlockScreenBuffer(Buff); + else + { + Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer; + } + + if (Buffer) + { + Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff); + if (NT_SUCCESS(Status)) + { + Request->Status = ConioWriteConsole(Console, Buff, Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, TRUE); + if (NT_SUCCESS(Status)) + { + Written = Request->Data.WriteConsoleRequest.NrCharactersToWrite; + } + ConioUnlockScreenBuffer(Buff); + } + if (Request->Data.WriteConsoleRequest.Unicode) + { + RtlFreeHeap(GetProcessHeap(), 0, Buffer); + } + } if (NULL != Console) { ConioUnlockConsole(Console); } - if(NT_SUCCESS(Request->Status)) - { - Request->Data.WriteConsoleRequest.NrCharactersWritten = Request->Data.WriteConsoleRequest.NrCharactersToWrite; - } - else - { - Request->Data.WriteConsoleRequest.NrCharactersWritten = 0; /* FIXME - return the actual number of characters written! */ - } + Request->Data.WriteConsoleRequest.NrCharactersWritten = Written; - return Request->Status = STATUS_SUCCESS; + return Request->Status = Status; } VOID STDCALL @@ -1526,7 +1545,7 @@ CSR_API(CsrWriteConsoleOutputChar) { NTSTATUS Status; - PCHAR String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String; + PCHAR tmpString, String; PBYTE Buffer; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; @@ -1550,66 +1569,82 @@ Status = ConioConsoleFromProcessData(ProcessData, &Console); Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; - if (! NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - return Request->Status = Status; - } + if(Request->Data.WriteConsoleOutputCharRequest.Unicode) + { + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, + NULL, 0, NULL, NULL); + tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length); + if (String) + { + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, + String, Length, NULL, NULL); + } + else + { + Status = STATUS_NO_MEMORY; + } + } + else + { + String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String; + } + + if (String) + { + Status = ConioLockScreenBuffer(ProcessData, + Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, + &Buff); + if (NT_SUCCESS(Status)) + { + X = Request->Data.WriteConsoleOutputCharRequest.Coord.X + Buff->ShowX; + Y = (Request->Data.WriteConsoleOutputCharRequest.Coord.Y + Buff->ShowY) % Buff->MaxY; + Length = Request->Data.WriteConsoleOutputCharRequest.Length; + Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X)]; + while (Length--) + { + *Buffer = *String++; + Written++; + Buffer += 2; + if (++X == Buff->MaxX) + { + if (++Y == Buff->MaxY) + { + Y = 0; + Buffer = Buff->Buffer; + } + X = 0; + } + } + if (NULL != Console && Buff == Console->ActiveBuffer) + { + ConioComputeUpdateRect(Buff, &UpdateRect, &Request->Data.WriteConsoleOutputCharRequest.Coord, + Request->Data.WriteConsoleOutputCharRequest.Length); + ConioDrawRegion(Console, &UpdateRect); + } - if(Request->Data.WriteConsoleOutputCharRequest.Unicode) - { - ConsoleUnicodeToAnsiN(Console, String, (PWCHAR)String, Request->Data.WriteConsoleOutputCharRequest.Length); - } + Request->Data.WriteConsoleOutputCharRequest.EndCoord.X = X - Buff->ShowX; + Request->Data.WriteConsoleOutputCharRequest.EndCoord.Y = (Y + Buff->MaxY - Buff->ShowY) % Buff->MaxY; - Status = ConioLockScreenBuffer(ProcessData, - Request->Data.WriteConsoleOutputCharRequest.ConsoleHandle, - &Buff); - if (! NT_SUCCESS(Status)) - { + ConioUnlockScreenBuffer(Buff); + } + if (Request->Data.WriteConsoleRequest.Unicode) + { + RtlFreeHeap(GetProcessHeap(), 0, tmpString); + } + } if (NULL != Console) { ConioUnlockConsole(Console); } - return Request->Status = Status; } - - X = Request->Data.WriteConsoleOutputCharRequest.Coord.X + Buff->ShowX; - Y = (Request->Data.WriteConsoleOutputCharRequest.Coord.Y + Buff->ShowY) % Buff->MaxY; - Length = Request->Data.WriteConsoleOutputCharRequest.Length; - Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X)]; - while (Length--) - { - *Buffer = *String++; - Written++; - Buffer += 2; - if (++X == Buff->MaxX) - { - if (++Y == Buff->MaxY) - { - Y = 0; - Buffer = Buff->Buffer; - } - X = 0; - } - } - - if (NULL != Console && Buff == Console->ActiveBuffer) - { - ConioComputeUpdateRect(Buff, &UpdateRect, &Request->Data.WriteConsoleOutputCharRequest.Coord, - Request->Data.WriteConsoleOutputCharRequest.Length); - ConioDrawRegion(Console, &UpdateRect); - } - - Request->Data.WriteConsoleOutputCharRequest.EndCoord.X = X - Buff->ShowX; - Request->Data.WriteConsoleOutputCharRequest.EndCoord.Y = (Y + Buff->MaxY - Buff->ShowY) % Buff->MaxY; - - ConioUnlockScreenBuffer(Buff); - if (NULL != Console) - { - ConioUnlockConsole(Console); - } - Request->Data.WriteConsoleOutputCharRequest.NrCharactersWritten = Written; - return Request->Status = STATUS_SUCCESS; + return Request->Status = Status; } CSR_API(CsrFillOutputChar)

19 years, 1 month

[mf] 17145: update SVN properties

by mf＠svn.reactos.com

update SVN properties Modified: trunk/rosapps/sysutils/lib/lib.xml _____ Modified: trunk/rosapps/sysutils/lib/lib.xml --- trunk/rosapps/sysutils/lib/lib.xml 2005-08-07 07:42:36 UTC (rev 17144) +++ trunk/rosapps/sysutils/lib/lib.xml 2005-08-07 07:49:07 UTC (rev 17145) @@ -1,6 +1,6 @@ -<module name="lib" type="objectlibrary"> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <file>win32err.c</file> -</module> +<module name="lib" type="objectlibrary"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <file>win32err.c</file> +</module> Property changes on: trunk/rosapps/sysutils/lib/lib.xml ___________________________________________________________________ Name: svn:eol-style + native

19 years, 1 month

[mf] 17144: update SVN properties

by mf＠svn.reactos.com

update SVN properties Property changes on: trunk/reactos/regtests/winetests/gdi32/gdi32_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/kernel32_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/msvcrt/msvcrt_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/ntdll_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/psapi/psapi_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/user32_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/version/version_test.xml ___________________________________________________________________ Name: svn:eol-style + native

19 years, 1 month

[mf] 17143: update SVN properties

by mf＠svn.reactos.com

update SVN properties Modified: trunk/rosapps/games/solitaire/cardlib/card.h Modified: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardbutton.h Modified: trunk/rosapps/games/solitaire/cardlib/cardcolor.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardcolor.h Modified: trunk/rosapps/games/solitaire/cardlib/cardcount.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardcount.h Modified: trunk/rosapps/games/solitaire/cardlib/cardlib.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardlib.h Modified: trunk/rosapps/games/solitaire/cardlib/cardregion.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardregion.h Modified: trunk/rosapps/games/solitaire/cardlib/cardrgndraw.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardrgnmouse.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardstack.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardstack.h Modified: trunk/rosapps/games/solitaire/cardlib/cardwindow.cpp Modified: trunk/rosapps/games/solitaire/cardlib/cardwindow.h Modified: trunk/rosapps/games/solitaire/cardlib/dropzone.cpp Modified: trunk/rosapps/games/solitaire/cardlib/dropzone.h Modified: trunk/rosapps/games/solitaire/cardlib/globals.h Modified: trunk/rosapps/games/solitaire/solcreate.cpp Modified: trunk/rosapps/games/solitaire/solgame.cpp Modified: trunk/rosapps/games/solitaire/solitaire.cpp Modified: trunk/rosapps/packmgr/cmd-line/main.c Modified: trunk/rosapps/packmgr/cmd-line/main.h Modified: trunk/rosapps/packmgr/gui/main.c Modified: trunk/rosapps/packmgr/gui/main.h Modified: trunk/rosapps/packmgr/gui/resource.h Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/error.h Modified: trunk/rosapps/packmgr/lib/expat.h Modified: trunk/rosapps/packmgr/lib/functions.cpp Modified: trunk/rosapps/packmgr/lib/log.cpp Modified: trunk/rosapps/packmgr/lib/log.h Modified: trunk/rosapps/packmgr/lib/main.cpp Modified: trunk/rosapps/packmgr/lib/options.cpp Modified: trunk/rosapps/packmgr/lib/package.cpp Modified: trunk/rosapps/packmgr/lib/package.h Modified: trunk/rosapps/packmgr/lib/package.hpp Modified: trunk/rosapps/packmgr/lib/script.cpp Modified: trunk/rosapps/packmgr/lib/script.h Modified: trunk/rosapps/packmgr/lib/tree.cpp Modified: trunk/rosapps/sysutils/ctm/resource.h Modified: trunk/rosapps/sysutils/dosfsck/boot.c Modified: trunk/rosapps/sysutils/dosfsck/boot.h Modified: trunk/rosapps/sysutils/dosfsck/byteorder.h Modified: trunk/rosapps/sysutils/dosfsck/byteswap.h Modified: trunk/rosapps/sysutils/dosfsck/byteswap1.h Modified: trunk/rosapps/sysutils/dosfsck/check.c Modified: trunk/rosapps/sysutils/dosfsck/check.h Modified: trunk/rosapps/sysutils/dosfsck/common.c Modified: trunk/rosapps/sysutils/dosfsck/common.h Modified: trunk/rosapps/sysutils/dosfsck/compiler.h Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.c Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h Modified: trunk/rosapps/sysutils/dosfsck/fat.c Modified: trunk/rosapps/sysutils/dosfsck/fat.h Modified: trunk/rosapps/sysutils/dosfsck/file.c Modified: trunk/rosapps/sysutils/dosfsck/file.h Modified: trunk/rosapps/sysutils/dosfsck/io.c Modified: trunk/rosapps/sysutils/dosfsck/io.h Modified: trunk/rosapps/sysutils/dosfsck/lfn.c Modified: trunk/rosapps/sysutils/dosfsck/lfn.h Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h Modified: trunk/rosapps/sysutils/dosfsck/swab.h Modified: trunk/rosapps/sysutils/dosfsck/version.h Modified: trunk/rosapps/sysutils/dosfsck/vfat.h Modified: trunk/rosapps/sysutils/mkdosfs/mkdosfs.c _____ Modified: trunk/rosapps/games/solitaire/cardlib/card.h --- trunk/rosapps/games/solitaire/cardlib/card.h 2005-08-07 07:32:36 UTC (rev 17142) +++ trunk/rosapps/games/solitaire/cardlib/card.h 2005-08-07 07:33:14 UTC (rev 17143) @@ -1,105 +1,105 @@ -// -// CardLib - Card class -// -// Freeware -// Copyright J Brown 2001 -// - -#ifndef _CARD_INCLUDED -#define _CARD_INCLUDED - -enum eSuit { Clubs = 0, Diamonds = 1, Hearts = 2, Spades = 3 }; -enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, - Eight = 8, Nine = 9, Ten = 10, Jack = 11, Queen = 12, King = 13 }; - -inline int MAKE_CARD(int Value, int Suit) -{ - if(Value < 1) Value = 1; - if(Value == 14) Value = 1; - if(Value > 13) Value = 13; - - if(Suit < 0) Suit = 0; - if(Suit > 3) Suit = 3; - - return ((Value - 1) * 4 + Suit); -} - -class Card -{ - friend class CardStack; - -public: - - Card() - { - nValue = 0; //ace of spades by default - fFaceUp = true; - } - - Card(int value, int suit) //specify a face value [1-13] and suit [0-3] - { - nValue = MAKE_CARD(value, suit); - fFaceUp = true; - } - - Card(int index) //specify a 0-51 index - { - if(index < 0) index = 0; - if(index > 51) index = 51; - - nValue = index; - fFaceUp = true; - } - - int Suit() const - { - return (nValue % 4); - } - - int LoVal() const - { - return (nValue / 4) + 1; - } - - int HiVal() const - { - return ((nValue < 4) ? 14 : (nValue / 4) + 1); - } - - int Idx() const //unique value (0-51 etc) - { - return nValue; - } - - bool FaceUp() const - { - return fFaceUp; - } - - bool FaceDown() const - { - return !fFaceUp; - } - - void SetFaceUp(bool fTrue) - { - fFaceUp = fTrue; - } - - bool IsBlack() const - { - return Suit() == 0 || Suit() == 3; - } - - bool IsRed() const - { - return !IsBlack(); - } - -private: - - int nValue; - bool fFaceUp; -}; - -#endif +// +// CardLib - Card class +// +// Freeware +// Copyright J Brown 2001 +// + +#ifndef _CARD_INCLUDED +#define _CARD_INCLUDED + +enum eSuit { Clubs = 0, Diamonds = 1, Hearts = 2, Spades = 3 }; +enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, + Eight = 8, Nine = 9, Ten = 10, Jack = 11, Queen = 12, King = 13 }; + +inline int MAKE_CARD(int Value, int Suit) +{ + if(Value < 1) Value = 1; + if(Value == 14) Value = 1; + if(Value > 13) Value = 13; + + if(Suit < 0) Suit = 0; + if(Suit > 3) Suit = 3; + + return ((Value - 1) * 4 + Suit); +} + +class Card +{ + friend class CardStack; + +public: + + Card() + { + nValue = 0; //ace of spades by default + fFaceUp = true; + } + + Card(int value, int suit) //specify a face value [1-13] and suit [0-3] + { + nValue = MAKE_CARD(value, suit); + fFaceUp = true; + } + + Card(int index) //specify a 0-51 index + { + if(index < 0) index = 0; + if(index > 51) index = 51; + + nValue = index; + fFaceUp = true; + } + + int Suit() const + { + return (nValue % 4); + } + + int LoVal() const + { + return (nValue / 4) + 1; + } + + int HiVal() const + { + return ((nValue < 4) ? 14 : (nValue / 4) + 1); + } + + int Idx() const //unique value (0-51 etc) + { + return nValue; + } + + bool FaceUp() const + { + return fFaceUp; + } + + bool FaceDown() const + { + return !fFaceUp; + } + + void SetFaceUp(bool fTrue) + { + fFaceUp = fTrue; + } + + bool IsBlack() const + { + return Suit() == 0 || Suit() == 3; + } + + bool IsRed() const + { + return !IsBlack(); + } + +private: + + int nValue; + bool fFaceUp; +}; + +#endif Property changes on: trunk/rosapps/games/solitaire/cardlib/card.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp --- trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-08-07 07:32:36 UTC (rev 17142) +++ trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp 2005-08-07 07:33:14 UTC (rev 17143) @@ -1,281 +1,281 @@ -// -// CardLib - Card bitmap support -// -// Freeware -// Copyright J Brown 2001 -// -#include <windows.h> -#include "globals.h" -#include "cardcolor.h" - -#ifndef __REACTOS__ -#pragma comment( lib, "..\\CardLib\\cards16.lib" ) - -extern "C" HINSTANCE WINAPI LoadLibrary16( PSTR ); -extern "C" void WINAPI FreeLibrary16( HINSTANCE ); -#endif - -#define NUMCARDBITMAPS (52+16) - -void PaintRect(HDC hdc, RECT *rect, COLORREF col); - -void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight) -{ - HBITMAP hBitmap; - HDC hdcCard = NULL; - HANDLE hOld; - int i, xpos; - int width, height; - BITMAP bmp; - - for(i = 0; i < NUMCARDBITMAPS; i++) - { - //convert into the range used by the cdt_xxx functions - int val; - - if(i < 52) val = (i % 4) * 13 + (i/4); - else val = i; - - hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1)); - GetObject(hBitmap, sizeof(bmp), &bmp); - - width = bmp.bmWidth; - height = bmp.bmHeight; - - if(i == 0) //if first time through, create BIG bitmap.. - { - HDC hdc = GetDC(0); - __hdcCardBitmaps = CreateCompatibleDC(hdc); - __hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height); - SelectObject(__hdcCardBitmaps, __hbmCardBitmaps); - - hdcCard = CreateCompatibleDC(0); - - ReleaseDC(0, hdc); - } - - hOld = SelectObject(hdcCard, hBitmap); - BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY); - SelectObject(hdcCard, hOld); - - //Now draw a black border around each card... - xpos = i*width; - MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0); - LineTo(__hdcCardBitmaps, xpos+width - 3, 0); - LineTo(__hdcCardBitmaps, xpos+width - 1, 2); - LineTo(__hdcCardBitmaps, xpos+width - 1, height - 3); //vertical - LineTo(__hdcCardBitmaps, xpos+width - 3, height - 1); - LineTo(__hdcCardBitmaps, xpos+2, height - 1); - LineTo(__hdcCardBitmaps, xpos+0, height - 3); - LineTo(__hdcCardBitmaps, xpos+0, 2); - LineTo(__hdcCardBitmaps, xpos+2, 0); - - DeleteObject(hBitmap); - } - - DeleteDC(hdcCard); - - *pwidth = width; - *pheight = height; - -} - -void LoadCardBitmaps(void) -{ - HINSTANCE hCardDll; - - - //If Windows NT/2000/XP - if(GetVersion() < 0x80000000) - { - hCardDll = LoadLibrary("cards.dll"); - - if(hCardDll == 0) - { - MessageBox(0, "Error loading cards.dll (32bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); - PostQuitMessage(0); - return; - } - - LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); - - FreeLibrary(hCardDll); - } -#ifndef __REACTOS__ - //Else, Win9X - else - { - hCardDll = LoadLibrary16("cards.dll"); - - if(hCardDll == 0) - { - MessageBox(0, "Error loading cards.dll (16bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); - PostQuitMessage(0); - return; - } - - LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); - - FreeLibrary16(hCardDll); - } -#endif -} - -void FreeCardBitmaps() -{ - DeleteObject (__hbmCardBitmaps); - DeleteDC (__hdcCardBitmaps); -} -// -// Paint a checkered rectangle, with each alternate -// pixel being assigned a different colour -// -static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg) -{ - static WORD wCheckPat[8] = - { - 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 - }; - - HBITMAP hbmp; - HBRUSH hbr, hbrold; - COLORREF fgold, bgold; - - hbmp = CreateBitmap(8, 8, 1, 1, wCheckPat); - hbr = CreatePatternBrush(hbmp); - - //UnrealizeObject(hbr); - - SetBrushOrgEx(hdc, rect->left, rect->top, 0); - - hbrold = (HBRUSH)SelectObject(hdc, hbr); - - fgold = SetTextColor(hdc, fg); - bgold = SetBkColor(hdc, bg); - - PatBlt(hdc, rect->left, rect->top, - rect->right - rect->left, - rect->bottom - rect->top, - PATCOPY); - - SetBkColor(hdc, bgold); - SetTextColor(hdc, fgold); - - SelectObject(hdc, hbrold); - DeleteObject(hbr); - DeleteObject(hbmp); -} - -void GetSinkCols(COLORREF crBase, COLORREF *fg, COLORREF *bg, COLORREF *sh1, COLORREF *sh2) -{ - if(bg) *bg = crBase; - if(fg) *fg = ColorScaleRGB(crBase, RGB(255,255,255), 0.2);//RGB(49, 99, 140); - if(sh1) *sh1 = ColorScaleRGB(crBase, RGB(0,0,0), 0.4); - if(sh2) *sh2 = ColorScaleRGB(crBase, RGB(0,0,0), 0.2); -} - -HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int height) -{ - HANDLE hold, hpold; - HBITMAP hbm = CreateCompatibleBitmap(hdcCompat, width, height); - - HPEN hpfg, hpbg, hpsh, hpsh2; - - RECT rect; - COLORREF fg, bg, shadow, shadow2; - - GetSinkCols(col, &fg, &bg, &shadow, &shadow2); - - hold = SelectObject(hdc, hbm); - - //fill with a solid base colour - SetRect(&rect, 0,0,width,height); - PaintRect(hdc, &rect, MAKE_PALETTERGB(bg)); - - //draw the outline - hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg)); - hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg)); - hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow)); - hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2)); - - hpold = SelectObject(hdc, hpsh); - MoveToEx(hdc, 2, 0, NULL); - LineTo (hdc, width-3,0); - LineTo (hdc, width-1, 2); - - SelectObject(hdc, hpold); - hpold = SelectObject(hdc, hpsh2); - LineTo (hdc, width-1, height-3); //vertical - LineTo (hdc, width-3, height-1); - LineTo (hdc, 2, height-1); - LineTo (hdc, 0, height-3); - SelectObject(hdc, hpold); - hpold = SelectObject(hdc, hpsh); - - //MoveToEx( hdc, 0, height-3,0); - LineTo (hdc, 0, 2); - LineTo (hdc, 2, 0); - - SelectObject(hdc, hpold); - - //draw the highlight (vertical) - hpold = SelectObject(hdc, hpfg); - MoveToEx(hdc, width - 2, 3, NULL); - LineTo (hdc, width - 2, height - 2); - - //(horz) - MoveToEx(hdc, width - 3, height-2, NULL); - LineTo (hdc, 3, height-2); - SelectObject(hdc, hpold); - - //draw the background - InflateRect(&rect, -2, -2); - DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg)); - - //overwrite the top-left background pixel - SetPixel(hdc, 2, 2, MAKE_PALETTERGB(bg)); - - DeleteObject(hpsh); - DeleteObject(hpsh2); - DeleteObject(hpfg); - DeleteObject(hpbg); - - - return hbm; -} - - - -void CopyColor(PALETTEENTRY *pe, COLORREF col) -{ - pe->peBlue = GetBValue(col); - pe->peGreen = GetGValue(col); - pe->peRed = GetRValue(col); - pe->peFlags = 0; -} - -HPALETTE MakePaletteFromCols(COLORREF cols[], int nNumColours) -{ - LOGPALETTE *lp; - HPALETTE hPalette; - - // Allocate memory for the logical palette - lp = (LOGPALETTE *)HeapAlloc( - GetProcessHeap(), 0, sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * nNumColours); - - lp->palNumEntries = nNumColours; - lp->palVersion = 0x300; - - //copy the colours into the logical palette format - for(int i = 0; i < nNumColours; i++) - { - CopyColor(&lp->palPalEntry[i], cols[i]); - } - - // create palette! - hPalette = CreatePalette(lp); - - HeapFree(GetProcessHeap(), 0, lp); - - return hPalette; -} +// +// CardLib - Card bitmap support +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include "globals.h" +#include "cardcolor.h" + +#ifndef __REACTOS__ +#pragma comment( lib, "..\\CardLib\\cards16.lib" ) + +extern "C" HINSTANCE WINAPI LoadLibrary16( PSTR ); +extern "C" void WINAPI FreeLibrary16( HINSTANCE ); +#endif + +#define NUMCARDBITMAPS (52+16) + +void PaintRect(HDC hdc, RECT *rect, COLORREF col); + +void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight) +{ + HBITMAP hBitmap; + HDC hdcCard = NULL; + HANDLE hOld; + int i, xpos; + int width, height; + BITMAP bmp; + + for(i = 0; i < NUMCARDBITMAPS; i++) + { + //convert into the range used by the cdt_xxx functions + int val; + + if(i < 52) val = (i % 4) * 13 + (i/4); + else val = i; + + hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1)); + GetObject(hBitmap, sizeof(bmp), &bmp); + + width = bmp.bmWidth; + height = bmp.bmHeight; + + if(i == 0) //if first time through, create BIG bitmap.. + { + HDC hdc = GetDC(0); + __hdcCardBitmaps = CreateCompatibleDC(hdc); + __hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height); + SelectObject(__hdcCardBitmaps, __hbmCardBitmaps); + + hdcCard = CreateCompatibleDC(0); + + ReleaseDC(0, hdc); + } + + hOld = SelectObject(hdcCard, hBitmap); + BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY); + SelectObject(hdcCard, hOld); + + //Now draw a black border around each card... + xpos = i*width; + MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0); + LineTo(__hdcCardBitmaps, xpos+width - 3, 0); + LineTo(__hdcCardBitmaps, xpos+width - 1, 2); + LineTo(__hdcCardBitmaps, xpos+width - 1, height - 3); //vertical + LineTo(__hdcCardBitmaps, xpos+width - 3, height - 1); + LineTo(__hdcCardBitmaps, xpos+2, height - 1); + LineTo(__hdcCardBitmaps, xpos+0, height - 3); + LineTo(__hdcCardBitmaps, xpos+0, 2); + LineTo(__hdcCardBitmaps, xpos+2, 0); + + DeleteObject(hBitmap); + } + + DeleteDC(hdcCard); + + *pwidth = width; + *pheight = height; + +} + +void LoadCardBitmaps(void) +{ + HINSTANCE hCardDll; + + + //If Windows NT/2000/XP + if(GetVersion() < 0x80000000) + { + hCardDll = LoadLibrary("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (32bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary(hCardDll); + } +#ifndef __REACTOS__ + //Else, Win9X + else + { + hCardDll = LoadLibrary16("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (16bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary16(hCardDll); + } +#endif +} + +void FreeCardBitmaps() +{ + DeleteObject (__hbmCardBitmaps); + DeleteDC (__hdcCardBitmaps); +} +// +// Paint a checkered rectangle, with each alternate +// pixel being assigned a different colour +// +static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg) +{ + static WORD wCheckPat[8] = + { + 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 + }; + + HBITMAP hbmp; + HBRUSH hbr, hbrold; + COLORREF fgold, bgold; + + hbmp = CreateBitmap(8, 8, 1, 1, wCheckPat); + hbr = CreatePatternBrush(hbmp); + + //UnrealizeObject(hbr); + + SetBrushOrgEx(hdc, rect->left, rect->top, 0); + + hbrold = (HBRUSH)SelectObject(hdc, hbr); + + fgold = SetTextColor(hdc, fg); + bgold = SetBkColor(hdc, bg); + + PatBlt(hdc, rect->left, rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + PATCOPY); + + SetBkColor(hdc, bgold); + SetTextColor(hdc, fgold); + + SelectObject(hdc, hbrold); + DeleteObject(hbr); + DeleteObject(hbmp); +} + +void GetSinkCols(COLORREF crBase, COLORREF *fg, COLORREF *bg, COLORREF *sh1, COLORREF *sh2) +{ + if(bg) *bg = crBase; + if(fg) *fg = ColorScaleRGB(crBase, RGB(255,255,255), 0.2);//RGB(49, 99, 140); + if(sh1) *sh1 = ColorScaleRGB(crBase, RGB(0,0,0), 0.4); + if(sh2) *sh2 = ColorScaleRGB(crBase, RGB(0,0,0), 0.2); +} + +HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int height) +{ + HANDLE hold, hpold; + HBITMAP hbm = CreateCompatibleBitmap(hdcCompat, width, height); + + HPEN hpfg, hpbg, hpsh, hpsh2; + + RECT rect; + COLORREF fg, bg, shadow, shadow2; + + GetSinkCols(col, &fg, &bg, &shadow, &shadow2); + + hold = SelectObject(hdc, hbm); + + //fill with a solid base colour + SetRect(&rect, 0,0,width,height); + PaintRect(hdc, &rect, MAKE_PALETTERGB(bg)); + + //draw the outline + hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg)); + hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg)); + hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow)); + hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2)); + + hpold = SelectObject(hdc, hpsh); + MoveToEx(hdc, 2, 0, NULL); + LineTo (hdc, width-3,0); + LineTo (hdc, width-1, 2); + + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh2); + LineTo (hdc, width-1, height-3); //vertical + LineTo (hdc, width-3, height-1); + LineTo (hdc, 2, height-1); + LineTo (hdc, 0, height-3); + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh); + + //MoveToEx( hdc, 0, height-3,0); + LineTo (hdc, 0, 2); + LineTo (hdc, 2, 0); + + SelectObject(hdc, hpold); + + //draw the highlight (vertical) + hpold = SelectObject(hdc, hpfg); + MoveToEx(hdc, width - 2, 3, NULL); + LineTo (hdc, width - 2, height - 2); + + //(horz) + MoveToEx(hdc, width - 3, height-2, NULL); + LineTo (hdc, 3, height-2); + SelectObject(hdc, hpold); + + //draw the background + InflateRect(&rect, -2, -2); + DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg)); + + //overwrite the top-left background pixel + SetPixel(hdc, 2, 2, MAKE_PALETTERGB(bg)); + + DeleteObject(hpsh); + DeleteObject(hpsh2); + DeleteObject(hpfg); + DeleteObject(hpbg); + + + return hbm; +} + + + +void CopyColor(PALETTEENTRY *pe, COLORREF col) +{ + pe->peBlue = GetBValue(col); + pe->peGreen = GetGValue(col); + pe->peRed = GetRValue(col); + pe->peFlags = 0; +} + +HPALETTE MakePaletteFromCols(COLORREF cols[], int nNumColours) +{ + LOGPALETTE *lp; + HPALETTE hPalette; + + // Allocate memory for the logical palette + lp = (LOGPALETTE *)HeapAlloc( + GetProcessHeap(), 0, sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * nNumColours); + + lp->palNumEntries = nNumColours; + lp->palVersion = 0x300; + + //copy the colours into the logical palette format + for(int i = 0; i < nNumColours; i++) + { + CopyColor(&lp->palPalEntry[i], cols[i]); + } + + // create palette! + hPalette = CreatePalette(lp); + + HeapFree(GetProcessHeap(), 0, lp); + + return hPalette; +} Property changes on: trunk/rosapps/games/solitaire/cardlib/cardbitmaps.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp --- trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp 2005-08-07 07:32:36 UTC (rev 17142) +++ trunk/rosapps/games/solitaire/cardlib/cardbutton.cpp 2005-08-07 07:33:14 UTC (rev 17143) @@ -1,489 +1,489 @@ -// -// CardLib - CardButton class -// -// Freeware -// Copyright J Brown 2001 -// -#include <windows.h> -#include <tchar.h> - -#include "cardlib.h" -#include "cardwindow.h" -#include "cardbutton.h" -#include "cardcolor.h" - -HPALETTE UseNicePalette(HDC, HPALETTE); -void RestorePalette(HDC, HPALETTE); - -void PaintRect(HDC hdc, RECT *rect, COLORREF colour); - -CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bool visible, - int x, int y, int width, int height) - - : parentWnd(parent), id(Id), uStyle(Style), fVisible(visible), ButtonCallback(0) -{ - crText = RGB(255,255,255); - crBack = RGB(0, 128, 0); - - xadjust = 0; - yadjust = 0; - xjustify = 0; - yjustify = 0; - - fMouseDown = false; - fButtonDown = false; - - hIcon = 0; - - SetText(szText); - Move(x, y, width, height); - - mxlock = CreateMutex(0, FALSE, 0); - - hFont = 0; -} - -CardButton::~CardButton() -{ - CloseHandle(mxlock); -} - -void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal) -{ - RECT fill; - - HANDLE hOld; - - HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); - HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); - HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); - - int x = rect->left; - int y = rect->top; - int width = rect->right-rect->left - 1; - int height = rect->bottom-rect->top - 1; - - SetRect(&fill, x+1, y+1, x+width-1, y+height-1); - - int one = 1; - - if(!fNormal) - { - x += width; - y += height; - width = -width; - height = -height; - one = -1; - OffsetRect(&fill, 1, 1); - } - - if(fNormal) - hOld = SelectObject(hdc, hhi); - else - hOld = SelectObject(hdc, hhi); - - MoveToEx(hdc, x, y+height, 0); - LineTo(hdc, x, y); - LineTo(hdc, x+width, y); - SelectObject(hdc, hOld); - - hOld = SelectObject(hdc, hbl); - LineTo(hdc, x+width, y+height); - LineTo(hdc, x-one, y+height); - SelectObject(hdc, hOld); - - hOld = SelectObject(hdc, hsh); - MoveToEx(hdc, x+one, y+height-one, 0); - LineTo(hdc, x+width-one, y+height-one); - LineTo(hdc, x+width-one, y); - SelectObject(hdc, hOld); - - PaintRect(hdc, &fill, MAKE_PALETTERGB(crBack)); - - DeleteObject(hhi); - DeleteObject(hsh); -} - -void CardButton::Clip(HDC hdc) -{ - if(fVisible == false) return; - - ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); -} - -void CardButton::Draw(HDC hdc, bool fNormal) -{ - SIZE textsize; - int x, y; //text x, y - int ix, iy; //icon x, y - int iconwidth = 0; - - RECT cliprect; - - if(fVisible == 0) return; - - if(hFont == 0) - SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - else - SelectObject(hdc, hFont); - - GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize); - - if(hIcon) - { - x = rect.left + 32 + 8; - } - else - { - if(uStyle & CB_ALIGN_LEFT) - { - x = rect.left + iconwidth; - } - else if(uStyle & CB_ALIGN_RIGHT) - { - x = rect.left + (rect.right-rect.left-iconwidth-textsize.cx); - } - else //centered - { - x = rect.right - rect.left - iconwidth; - x = (x - textsize.cx) / 2; - x += rect.left + iconwidth; - } - } - - y = rect.bottom - rect.top; - y = (y - textsize.cy) / 2; - y += rect.top; - - //calc icon position.. - ix = rect.left + 4; - iy = rect.top + (rect.bottom-rect.top-32) / 2; - - //if button is pressed, then shift text - if(fNormal == false && (uStyle & CB_PUSHBUTTON)) - { - x += 1; - y += 1; - ix += 1; - iy += 1; - } - - SetRect(&cliprect, x, y, x+textsize.cx, y+textsize.cy); - ExcludeClipRect(hdc, x, y, x+textsize.cx, y+textsize.cy); - - // - // Calc icon pos - // - - if(hIcon) - { - ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32); - } - - if(uStyle & CB_PUSHBUTTON) - { - DrawRect(hdc, &rect, fNormal); - - SetBkColor(hdc, MAKE_PALETTERGB(crBack)); - SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); - - SelectClipRgn(hdc, 0); - - ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0); - } - else - { - SetBkColor(hdc, MAKE_PALETTERGB(crBack)); - SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); - - SelectClipRgn(hdc, 0); - - ExtTextOut(hdc, x, y, ETO_OPAQUE, &rect, szText, lstrlen(szText), 0); - } - - if(hIcon) - { [truncated at 1000 lines; 29211 more skipped]

19 years, 1 month

[mf] 17142: update SVN properties

by mf＠svn.reactos.com

update SVN properties Modified: trunk/reactos/tools/pefixup.c Property changes on: trunk/reactos/regtests/winetests/gdi32/bitmap.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/gdi32/brush.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/gdi32/gdiobj.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/gdi32/metafile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/gdi32/testlist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/alloc.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/atom.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/change.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/codepage.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/comm.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/console.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/directory.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/drive.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/environ.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/file.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/format_msg.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/heap.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/locale.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/mailslot.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/module.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/path.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/pipe.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/process.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/profile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/sync.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/testlist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/thread.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/time.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/timer.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/kernel32/virtual.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/atom.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/env.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/error.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/generated.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/info.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/large_int.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/ntdll_test.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/path.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/reg.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/rtl.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/rtlbitmap.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/rtlstr.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/string.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/testlist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/ntdll/time.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/clist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/clsid.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/generated.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/ordinal.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/path.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/shreg.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/string.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/shlwapi/testlist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/class.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/clipboard.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/dce.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/dde.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/dialog.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/edit.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/input.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/listbox.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/menu.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/msg.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/resource.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/sysparams.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/testlist.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/text.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/win.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/winstation.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/user32/wsprintf.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/pefixup.c --- trunk/reactos/tools/pefixup.c 2005-08-07 07:30:46 UTC (rev 17141) +++ trunk/reactos/tools/pefixup.c 2005-08-07 07:32:36 UTC (rev 17142) @@ -1,375 +1,375 @@ -/* - * PE Fixup Utility - * Copyright (C) 2005 Filip Navara - * - * The purpose of this utility is fix PE binaries generated by binutils and - * to manipulate flags that can't be set by binutils. - * - * Currently two features are implemented: - * - * - Setting flags on PE sections for use by drivers. The sections - * .text, .data, .idata, .bss are marked as non-pageable and - * non-discarable, section PAGE is marked as pageable and section - * INIT is marked as discaradable. - * - * - Sorting of export name table in executables. DLLTOOL has bug - * in sorting algorithm when the --kill-at flag is used. The exports - * are sorted in the decorated form and so the fastcall symbols are - * incorrectly put at the beginning of export table. This option - * allow to correct sort the table, so binary search can be used - * to process them. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <fcntl.h> - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* The following definitions are ripped from MinGW W32API headers. We don't - use these headers directly in order to allow compilation on Linux hosts. */ - -typedef unsigned char BYTE; -typedef unsigned short WORD; -typedef unsigned int DWORD; -typedef int LONG; - -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -#define IMAGE_SIZEOF_SHORT_NAME 8 -#define IMAGE_DOS_SIGNATURE 0x5A4D -#define IMAGE_NT_SIGNATURE 0x00004550 -#define IMAGE_SCN_MEM_DISCARDABLE 0x2000000 -#define IMAGE_SCN_MEM_NOT_PAGED 0x8000000 -#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f)) -#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEAD ERS)(h))->FileHeader.SizeOfOptionalHeader)) -#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 - -#pragma pack(push,2) -typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) -#pragma pack(push,4) -typedef struct _IMAGE_EXPORT_DIRECTORY { - DWORD Characteristics; - DWORD TimeDateStamp; - WORD MajorVersion; - WORD MinorVersion; - DWORD Name; - DWORD Base; - DWORD NumberOfFunctions; - DWORD NumberOfNames; - DWORD AddressOfFunctions; - DWORD AddressOfNames; - DWORD AddressOfNameOrdinals; -} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; -typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; -typedef struct _IMAGE_DATA_DIRECTORY { - DWORD VirtualAddress; - DWORD Size; -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; -typedef struct _IMAGE_OPTIONAL_HEADER { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Reserved1; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; -typedef struct _IMAGE_NT_HEADERS { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER OptionalHeader; -} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS; -typedef struct _IMAGE_SECTION_HEADER { - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; -#pragma pack(pop) - -/* End of ripped definitions */ - -typedef struct _export_t { - DWORD name; - WORD ordinal; -} export_t; - -unsigned char *buffer; -PIMAGE_DOS_HEADER dos_header; -PIMAGE_NT_HEADERS nt_header; - -void *rva_to_ptr(DWORD rva) -{ - PIMAGE_SECTION_HEADER section_header; - unsigned int i; - - for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < nt_header->OptionalHeader.NumberOfRvaAndSizes; - i++, section_header++) - { - if (rva >= section_header->VirtualAddress && - rva < section_header->VirtualAddress + - section_header->Misc.VirtualSize) - { - return buffer + rva - section_header->VirtualAddress + - section_header->PointerToRawData; - } - } - - return NULL; -} - -int export_compare_func(const void *a, const void *b) -{ - const export_t *ap = a; - const export_t *bp = b; - char *an = rva_to_ptr(ap->name); - char *bn = rva_to_ptr(bp->name); - return strcmp(an, bn); -} - -int main(int argc, char **argv) -{ - int fd_in, fd_out; - long len; - PIMAGE_SECTION_HEADER section_header; - PIMAGE_DATA_DIRECTORY data_dir; - unsigned int i; - unsigned long checksum; - int fixup_exports = 0; - int fixup_sections = 0; - - /* - * Process parameters. - */ - - if (argc < 2) - { - printf("Usage: %s <filename> <options>\n" - "Options:\n" - " -sections Sets section flags for PE image.\n" - " -exports Sort the names in export table.\n", - argv[0]); - return 1; - } - - for (i = 2; i < argc; i++) - { - if (!strcmp(argv[i], "-sections")) - fixup_sections = 1; - else if (!strcmp(argv[i], "-exports")) - fixup_exports = 1; - else - { printf("Invalid option: %s\n", argv[i]); return 1; } - } - - if (fixup_sections == 0 && fixup_exports == 0) - { - printf("Nothing to do.\n"); - return 0; - } - - /* - * Read the whole file to memory. - */ - - fd_in = open(argv[1], O_RDONLY | O_BINARY); - if (fd_in == 0) - { - printf("Can't open input file.\n"); - return 1; - } - - len = lseek(fd_in, 0, SEEK_END); - if (len < sizeof(IMAGE_DOS_HEADER)) - { - close(fd_in); - printf("'%s' isn't a PE image.\n", argv[1]); - return 1; - } - - buffer = malloc((len + 1) & ~1); - if (buffer == NULL) - { - close(fd_in); - printf("Not enough memory available.\n"); - return 1; - } - - /* Read the whole input file into a buffer */ - lseek(fd_in, 0, SEEK_SET); - read(fd_in, buffer, len); - if (len & 1) - buffer[len] = 0; - - close(fd_in); - - /* - * Check the headers and save pointers to them. - */ - - dos_header = (PIMAGE_DOS_HEADER)buffer; - nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew); - - if (dos_header->e_magic != IMAGE_DOS_SIGNATURE || - nt_header->Signature != IMAGE_NT_SIGNATURE) - { - printf("'%s' isn't a PE image.\n", argv[1]); - free(buffer); - return 1; - } - - if (fixup_exports) - { - /* Sort export directory */ - data_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; - if (data_dir->Size != 0) - { - PIMAGE_EXPORT_DIRECTORY export_directory; - DWORD *name_ptr; - WORD *ordinal_ptr; - export_t *exports; - - export_directory = (PIMAGE_EXPORT_DIRECTORY)rva_to_ptr(data_dir->VirtualAddress); - if (export_directory != NULL) - { - exports = malloc(sizeof(export_t) * export_directory->NumberOfNames); - if (exports == NULL) - { - printf("Not enough memory.\n"); - free(buffer); - return 1; - } - - name_ptr = (DWORD *)rva_to_ptr(export_directory->AddressOfNames); - ordinal_ptr = (WORD *)rva_to_ptr(export_directory->AddressOfNameOrdinals); - - for (i = 0; i < export_directory->NumberOfNames; i++) - { - exports[i].name = name_ptr[i]; - exports[i].ordinal = ordinal_ptr[i]; - } - - qsort(exports, export_directory->NumberOfNames, sizeof(export_t), - export_compare_func); - - for (i = 0; i < export_directory->NumberOfNames; i++) - { - name_ptr[i] = exports[i].name; - ordinal_ptr[i] = exports[i].ordinal; - } - - free(exports); - } - } - } - - if (fixup_sections) - { - /* Update section flags */ - for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < nt_header->OptionalHeader.NumberOfRvaAndSizes; - i++, section_header++) - { - if (!strcmp((char*)section_header->Name, ".text") || - !strcmp((char*)section_header->Name, ".data") || - !strcmp((char*)section_header->Name, ".idata") || - !strcmp((char*)section_header->Name, ".bss")) - { - section_header->Characteristics |= IMAGE_SCN_MEM_NOT_PAGED; - section_header->Characteristics &= ~IMAGE_SCN_MEM_DISCARDABLE; - } - else if (!strcmp((char*)section_header->Name, "INIT")) - { - section_header->Characteristics |= IMAGE_SCN_MEM_DISCARDABLE; - } - else if (!strcmp((char*)section_header->Name, "PAGE")) - { - section_header->Characteristics |= IMAGE_SCN_MEM_NOT_PAGED; - } - } - } - - /* Recalculate checksum */ - nt_header->OptionalHeader.CheckSum = 0; - checksum = 0; - for (i = 0; i < len; i += 2) - { - checksum += *(unsigned short *)(buffer + i); - checksum = (checksum + (checksum >> 16)) & 0xffff; - } - checksum += len; - nt_header->OptionalHeader.CheckSum = checksum; - - /* Write the output file */ - fd_out = open(argv[1], O_WRONLY | O_BINARY); - write(fd_out, buffer, len); - close(fd_out); - - return 0; -} +/* + * PE Fixup Utility + * Copyright (C) 2005 Filip Navara + * + * The purpose of this utility is fix PE binaries generated by binutils and + * to manipulate flags that can't be set by binutils. + * + * Currently two features are implemented: + * + * - Setting flags on PE sections for use by drivers. The sections + * .text, .data, .idata, .bss are marked as non-pageable and + * non-discarable, section PAGE is marked as pageable and section + * INIT is marked as discaradable. + * + * - Sorting of export name table in executables. DLLTOOL has bug + * in sorting algorithm when the --kill-at flag is used. The exports + * are sorted in the decorated form and so the fastcall symbols are + * incorrectly put at the beginning of export table. This option + * allow to correct sort the table, so binary search can be used + * to process them. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + +/* The following definitions are ripped from MinGW W32API headers. We don't + use these headers directly in order to allow compilation on Linux hosts. */ + +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned int DWORD; +typedef int LONG; + +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 +#define IMAGE_SIZEOF_SHORT_NAME 8 +#define IMAGE_DOS_SIGNATURE 0x5A4D +#define IMAGE_NT_SIGNATURE 0x00004550 +#define IMAGE_SCN_MEM_DISCARDABLE 0x2000000 +#define IMAGE_SCN_MEM_NOT_PAGED 0x8000000 +#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f)) +#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEAD ERS)(h))->FileHeader.SizeOfOptionalHeader)) +#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 + +#pragma pack(push,2) +typedef struct _IMAGE_DOS_HEADER { + WORD e_magic; + WORD e_cblp; + WORD e_cp; + WORD e_crlc; + WORD e_cparhdr; + WORD e_minalloc; + WORD e_maxalloc; + WORD e_ss; + WORD e_sp; + WORD e_csum; + WORD e_ip; + WORD e_cs; + WORD e_lfarlc; + WORD e_ovno; + WORD e_res[4]; + WORD e_oemid; + WORD e_oeminfo; + WORD e_res2[10]; + LONG e_lfanew; +} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; +#pragma pack(pop) +#pragma pack(push,4) +typedef struct _IMAGE_EXPORT_DIRECTORY { + DWORD Characteristics; + DWORD TimeDateStamp; + WORD MajorVersion; + WORD MinorVersion; + DWORD Name; + DWORD Base; + DWORD NumberOfFunctions; + DWORD NumberOfNames; + DWORD AddressOfFunctions; + DWORD AddressOfNames; + DWORD AddressOfNameOrdinals; +} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; +typedef struct _IMAGE_FILE_HEADER { + WORD Machine; + WORD NumberOfSections; + DWORD TimeDateStamp; + DWORD PointerToSymbolTable; + DWORD NumberOfSymbols; + WORD SizeOfOptionalHeader; + WORD Characteristics; +} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; +typedef struct _IMAGE_DATA_DIRECTORY { + DWORD VirtualAddress; + DWORD Size; +} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; +typedef struct _IMAGE_OPTIONAL_HEADER { + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + DWORD BaseOfData; + DWORD ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Reserved1; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + DWORD SizeOfStackReserve; + DWORD SizeOfStackCommit; + DWORD SizeOfHeapReserve; + DWORD SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; +typedef struct _IMAGE_NT_HEADERS { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + IMAGE_OPTIONAL_HEADER OptionalHeader; +} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS; +typedef struct _IMAGE_SECTION_HEADER { + BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; + union { + DWORD PhysicalAddress; + DWORD VirtualSize; + } Misc; + DWORD VirtualAddress; + DWORD SizeOfRawData; + DWORD PointerToRawData; + DWORD PointerToRelocations; + DWORD PointerToLinenumbers; + WORD NumberOfRelocations; + WORD NumberOfLinenumbers; + DWORD Characteristics; +} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; +#pragma pack(pop) + +/* End of ripped definitions */ + +typedef struct _export_t { + DWORD name; + WORD ordinal; +} export_t; + +unsigned char *buffer; +PIMAGE_DOS_HEADER dos_header; +PIMAGE_NT_HEADERS nt_header; + +void *rva_to_ptr(DWORD rva) +{ + PIMAGE_SECTION_HEADER section_header; + unsigned int i; + + for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); + i < nt_header->OptionalHeader.NumberOfRvaAndSizes; + i++, section_header++) + { + if (rva >= section_header->VirtualAddress && + rva < section_header->VirtualAddress + + section_header->Misc.VirtualSize) + { + return buffer + rva - section_header->VirtualAddress + + section_header->PointerToRawData; + } + } + + return NULL; +} + +int export_compare_func(const void *a, const void *b) +{ + const export_t *ap = a; + const export_t *bp = b; + char *an = rva_to_ptr(ap->name); + char *bn = rva_to_ptr(bp->name); + return strcmp(an, bn); +} + +int main(int argc, char **argv) +{ + int fd_in, fd_out; + long len; + PIMAGE_SECTION_HEADER section_header; + PIMAGE_DATA_DIRECTORY data_dir; + unsigned int i; + unsigned long checksum; + int fixup_exports = 0; + int fixup_sections = 0; + + /* + * Process parameters. + */ + + if (argc < 2) + { + printf("Usage: %s <filename> <options>\n" + "Options:\n" + " -sections Sets section flags for PE image.\n" + " -exports Sort the names in export table.\n", + argv[0]); + return 1; + } + + for (i = 2; i < argc; i++) + { + if (!strcmp(argv[i], "-sections")) + fixup_sections = 1; + else if (!strcmp(argv[i], "-exports")) + fixup_exports = 1; + else + { printf("Invalid option: %s\n", argv[i]); return 1; } + } + + if (fixup_sections == 0 && fixup_exports == 0) + { + printf("Nothing to do.\n"); + return 0; + } + + /* + * Read the whole file to memory. + */ + + fd_in = open(argv[1], O_RDONLY | O_BINARY); + if (fd_in == 0) + { + printf("Can't open input file.\n"); + return 1; + } + + len = lseek(fd_in, 0, SEEK_END); + if (len < sizeof(IMAGE_DOS_HEADER)) + { + close(fd_in); + printf("'%s' isn't a PE image.\n", argv[1]); + return 1; + } + + buffer = malloc((len + 1) & ~1); + if (buffer == NULL) + { + close(fd_in); + printf("Not enough memory available.\n"); + return 1; + } + + /* Read the whole input file into a buffer */ + lseek(fd_in, 0, SEEK_SET); + read(fd_in, buffer, len); + if (len & 1) + buffer[len] = 0; + + close(fd_in); + + /* + * Check the headers and save pointers to them. + */ + + dos_header = (PIMAGE_DOS_HEADER)buffer; + nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew); + + if (dos_header->e_magic != IMAGE_DOS_SIGNATURE || + nt_header->Signature != IMAGE_NT_SIGNATURE) + { + printf("'%s' isn't a PE image.\n", argv[1]); + free(buffer); + return 1; + } + + if (fixup_exports) + { + /* Sort export directory */ + data_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; + if (data_dir->Size != 0) + { + PIMAGE_EXPORT_DIRECTORY export_directory; + DWORD *name_ptr; + WORD *ordinal_ptr; + export_t *exports; + + export_directory = (PIMAGE_EXPORT_DIRECTORY)rva_to_ptr(data_dir->VirtualAddress); + if (export_directory != NULL) + { + exports = malloc(sizeof(export_t) * export_directory->NumberOfNames); + if (exports == NULL) + { + printf("Not enough memory.\n"); + free(buffer); + return 1; + } + + name_ptr = (DWORD *)rva_to_ptr(export_directory->AddressOfNames); + ordinal_ptr = (WORD *)rva_to_ptr(export_directory->AddressOfNameOrdinals); + + for (i = 0; i < export_directory->NumberOfNames; i++) + { + exports[i].name = name_ptr[i]; + exports[i].ordinal = ordinal_ptr[i]; + } + + qsort(exports, export_directory->NumberOfNames, sizeof(export_t), + export_compare_func); + + for (i = 0; i < export_directory->NumberOfNames; i++) + { + name_ptr[i] = exports[i].name; + ordinal_ptr[i] = exports[i].ordinal; + } + + free(exports); + } + } + } + + if (fixup_sections) + { + /* Update section flags */ + for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); + i < nt_header->OptionalHeader.NumberOfRvaAndSizes; + i++, section_header++) + { + if (!strcmp((char*)section_header->Name, ".text") || + !strcmp((char*)section_header->Name, ".data") || [truncated at 1000 lines; 39 more skipped]

19 years, 1 month

[ion] 17141: And here goes another test for two unsupported flags.

by ion＠svn.reactos.com

And here goes another test for two unsupported flags. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 07:14:52 UTC (rev 17140) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 07:30:46 UTC (rev 17141) @@ -646,6 +646,18 @@ return STATUS_INVALID_PARAMETER_4; } + /* + * Copy on Write is reserved for system use. This case is a certain failure + * but there may be other cases...needs more testing + */ + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY))) + { + DPRINT1("Copy on write is not supported by VirtualAlloc\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, NULL,

19 years, 1 month

[ion] 17140: One more test can't hurt.

by ion＠svn.reactos.com

One more test can't hurt. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 07:11:03 UTC (rev 17139) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 07:14:52 UTC (rev 17140) @@ -562,6 +562,13 @@ return STATUS_INVALID_PAGE_PROTECTION; } + /* Check for valid Zero bits */ + if (ZeroBits > 21) + { + DPRINT1("Too many zero bits\n"); + return STATUS_INVALID_PARAMETER_3; + } + /* Check for valid Allocation Types */ if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | MEM_TOP_DOWN | MEM_WRITE_WATCH)))

19 years, 1 month

[ion] 17139: Add failure cases for more things then a WINE test could shake a stick at (hopefully)

by ion＠svn.reactos.com

Add failure cases for more things then a WINE test could shake a stick at (hopefully) Modified: trunk/reactos/ntoskrnl/mm/anonmem.c _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 03:15:15 UTC (rev 17138) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-08-07 07:11:03 UTC (rev 17139) @@ -555,18 +555,61 @@ *UBaseAddress,ZeroBits,*URegionSize,AllocationType, Protect); - /* - * Check the validity of the parameters - */ + /* Check for valid protection flags */ if ((Protect & PAGE_FLAGS_VALID_FROM_USER_MODE) != Protect) { - return(STATUS_INVALID_PAGE_PROTECTION); + DPRINT1("Invalid page protection\n"); + return STATUS_INVALID_PAGE_PROTECTION; } - if ((AllocationType & (MEM_COMMIT | MEM_RESERVE)) == 0) + + /* Check for valid Allocation Types */ + if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + MEM_TOP_DOWN | MEM_WRITE_WATCH))) { - return(STATUS_INVALID_PARAMETER); + DPRINT1("Invalid Allocation Type\n"); + return STATUS_INVALID_PARAMETER_5; } + /* Check for at least one of these Allocation Types to be set */ + if (!(AllocationType & (MEM_COMMIT | MEM_RESERVE | MEM_RESET))) + { + DPRINT1("No memory allocation base type\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_RESET is an exclusive flag, make sure that is valid too */ + if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) + { + DPRINT1("MEM_RESET used illegaly\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_WRITE_WATCH can only be used if MEM_RESERVE is also used */ + if ((AllocationType & MEM_WRITE_WATCH) && !(AllocationType & MEM_RESERVE)) + { + DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_PHYSICAL can only be used with MEM_RESERVE, and can only be R/W */ + if (AllocationType & MEM_PHYSICAL) + { + /* First check for MEM_RESERVE exclusivity */ + if (AllocationType != (MEM_RESERVE | MEM_PHYSICAL)) + { + DPRINT1("MEM_PHYSICAL used with other flags then MEM_RESERVE or" + "MEM_RESERVE was not present at all\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Then make sure PAGE_READWRITE is used */ + if (Protect != PAGE_READWRITE) + { + DPRINT1("MEM_PHYSICAL used without PAGE_READWRITE\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + } + PBaseAddress = *UBaseAddress; PRegionSize = *URegionSize; BoundaryAddressMultiple.QuadPart = 0; @@ -575,6 +618,27 @@ RegionSize = PAGE_ROUND_UP(PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); + /* + * We've captured and calculated the data, now do more checks + * Yes, MmCreateMemoryArea does similar checks, but they don't return + * the right status codes that a caller of this routine would expect. + */ + if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) + { + DPRINT1("Virtual allocation above User Space\n"); + return STATUS_INVALID_PARAMETER_2; + } + if (!RegionSize) + { + DPRINT1("Region size is invalid\n"); + return STATUS_INVALID_PARAMETER_4; + } + if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_4; + } + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, NULL,

19 years, 1 month

← Newer
1
...
43
44
45
46
47
48
49
...
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