Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 53059: [NTOSKRNL]: NLS tables should be mapped before PEB. [NTOSKRNL]: Handle failure of NLS and PEB mapping correctly. [NTOSKRNL]: Only set Peb->OsCSDVersion if NtHeader->Win32VersionValue i...
by ion＠svn.reactos.org 04 Aug '11

04 Aug '11

Author: ion Date: Thu Aug 4 13:10:57 2011 New Revision: 53059 URL: http://svn.reactos.org/svn/reactos?rev=53059&view=rev Log: [NTOSKRNL]: NLS tables should be mapped before PEB. [NTOSKRNL]: Handle failure of NLS and PEB mapping correctly. [NTOSKRNL]: Only set Peb->OsCSDVersion if NtHeader->Win32VersionValue is set. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Aug 4 13:10:57 2011 @@ -576,13 +576,7 @@ // Attach to Process // KeAttachProcess(&Process->Pcb); - - // - // Allocate the PEB - // - Status = MiCreatePebOrTeb(Process, sizeof(PEB), (PULONG_PTR)&Peb); - ASSERT(NT_SUCCESS(Status)); - + // // Map NLS Tables // @@ -596,7 +590,25 @@ ViewShare, MEM_TOP_DOWN, PAGE_READONLY); - if (!NT_SUCCESS(Status)) return Status; + DPRINT1("NLS Tables at: %p\n", TableBase); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + KeDetachProcess(); + return Status; + } + + // + // Allocate the PEB + // + Status = MiCreatePebOrTeb(Process, sizeof(PEB), (PULONG_PTR)&Peb); + DPRINT1("PEB at: %p\n", Peb); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + KeDetachProcess(); + return Status; + } // // Use SEH in case we can't load the PEB @@ -636,7 +648,7 @@ // Heap and Debug Data // Peb->NumberOfProcessors = KeNumberProcessors; - Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); + Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL); Peb->NtGlobalFlag = NtGlobalFlag; /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; Peb->HeapSegmentCommit = MmHeapSegmentCommit; @@ -730,34 +742,20 @@ Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; - } - - // - // Process the image config data overrides if specfied - // - if (ImageConfigData != NULL) - { - // - // Process CSD version override - // - if (ImageConfigData->CSDVersion) + + /* Process CSD version override */ + if ((ImageConfigData) && (ImageConfigData->CSDVersion)) { - // - // Set new data - // + /* Take the value from the image configuration directory */ Peb->OSCSDVersion = ImageConfigData->CSDVersion; } - - // - // Process affinity mask ovverride - // - if (ImageConfigData->ProcessAffinityMask) - { - // - // Set new data - // - ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; - } + } + + /* Process optional process affinity mask override */ + if ((ImageConfigData) && (ImageConfigData->ProcessAffinityMask)) + { + /* Take the value from the image configuration directory */ + ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; } // @@ -767,6 +765,7 @@ // // Force it to use CPU 0 // + /* FIXME: this should use the MmRotatingUniprocessorNumber */ Peb->ImageProcessAffinityMask = 0; } else

1 0

[cgutman] 53058: [RTL] - Fix RtlIpv4StringToAddressW definition
by cgutman＠svn.reactos.org 04 Aug '11

04 Aug '11

Author: cgutman Date: Thu Aug 4 04:15:17 2011 New Revision: 53058 URL: http://svn.reactos.org/svn/reactos?rev=53058&view=rev Log: [RTL] - Fix RtlIpv4StringToAddressW definition Modified: branches/aicom-network-branch/lib/rtl/network.c Modified: branches/aicom-network-branch/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/rtl/ne… ============================================================================== --- branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] Thu Aug 4 04:15:17 2011 @@ -105,7 +105,7 @@ NTAPI RtlIpv4StringToAddressW(IN PCWSTR String, IN BOOLEAN Strict, - OUT LPTSTR *Terminator, + OUT LPWSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

1 0

[ion] 53057: [KERNEL32]: Cleanup GetSystemInfo and friends, fix some bugs, mainly removing support for unsupported CPUs/architectures, and adding support for PROCESSOR_ARCHITECTURE_AMD64. Did some ...
by ion＠svn.reactos.org 04 Aug '11

04 Aug '11

Author: ion Date: Thu Aug 4 00:55:52 2011 New Revision: 53057 URL: http://svn.reactos.org/svn/reactos?rev=53057&view=rev Log: [KERNEL32]: Cleanup GetSystemInfo and friends, fix some bugs, mainly removing support for unsupported CPUs/architectures, and adding support for PROCESSOR_ARCHITECTURE_AMD64. Did some refactoring to support WoW64 in the future as well. Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Thu Aug 4 00:55:52 2011 @@ -1,25 +1,81 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: dll/win32/kernel32/misc/sysinfo.c - * PURPOSE: SystemInfo functions - * PROGRAMMER: Emanuele Aliberti +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: See COPYING in the top level directory + * FILE: dll/win32/kernel32/client/sysinfo.c + * PURPOSE: System Information Functions + * PROGRAMMERS: Emanuele Aliberti * Christoph von Wittich * Thomas Weidenmueller * Gunnar Andre Dalsnes - * UPDATE HISTORY: - * 2000-04-26 created - */ + */ + +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> - #define PV_NT351 0x00030033 +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +WINAPI +GetSystemInfoInternal(IN PSYSTEM_BASIC_INFORMATION BasicInfo, + IN PSYSTEM_PROCESSOR_INFORMATION ProcInfo, + OUT LPSYSTEM_INFO SystemInfo) +{ + RtlZeroMemory(SystemInfo, sizeof (SYSTEM_INFO)); + SystemInfo->wProcessorArchitecture = ProcInfo->ProcessorArchitecture; + SystemInfo->wReserved = 0; + SystemInfo->dwPageSize = BasicInfo->PageSize; + SystemInfo->lpMinimumApplicationAddress = (PVOID)BasicInfo->MinimumUserModeAddress; + SystemInfo->lpMaximumApplicationAddress = (PVOID)BasicInfo->MaximumUserModeAddress; + SystemInfo->dwActiveProcessorMask = BasicInfo->ActiveProcessorsAffinityMask; + SystemInfo->dwNumberOfProcessors = BasicInfo->NumberOfProcessors; + SystemInfo->wProcessorLevel = ProcInfo->ProcessorLevel; + SystemInfo->wProcessorRevision = ProcInfo->ProcessorRevision; + SystemInfo->dwAllocationGranularity = BasicInfo->AllocationGranularity; + + switch (ProcInfo->ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + switch (ProcInfo->ProcessorLevel) + { + case 3: + SystemInfo->dwProcessorType = PROCESSOR_INTEL_386; + break; + case 4: + SystemInfo->dwProcessorType = PROCESSOR_INTEL_486; + break; + default: + SystemInfo->dwProcessorType = PROCESSOR_INTEL_PENTIUM; + } + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + SystemInfo->dwProcessorType = PROCESSOR_AMD_X8664; + break; + + case PROCESSOR_ARCHITECTURE_IA64: + SystemInfo->dwProcessorType = PROCESSOR_INTEL_IA64; + break; + + default: + SystemInfo->dwProcessorType = 0; + break; + } + + if (PV_NT351 > GetProcessVersion(0)) + { + SystemInfo->wProcessorLevel = 0; + SystemInfo->wProcessorRevision = 0; + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + /* * @implemented */ @@ -27,189 +83,66 @@ WINAPI GetLargePageMinimum(VOID) { - return SharedUserData->LargePageMinimum; -} - -/* - * @unimplemented + return SharedUserData->LargePageMinimum; +} + +/* + * @implemented */ VOID WINAPI -GetSystemInfo ( - LPSYSTEM_INFO Si - ) -{ - SYSTEM_BASIC_INFORMATION Sbi; - SYSTEM_PROCESSOR_INFORMATION Spi; - DWORD ProcessVersion; - NTSTATUS Status; - - RtlZeroMemory (Si, sizeof (SYSTEM_INFO)); - Status = NtQuerySystemInformation ( - SystemBasicInformation, /* 0 */ - & Sbi, - sizeof Sbi, /* 44 */ - 0 - ); - if (STATUS_SUCCESS != Status) - { - BaseSetLastNTError (Status); - return; - } - Status = NtQuerySystemInformation ( - SystemProcessorInformation, /* 1 */ - & Spi, - sizeof Spi, /* 12 */ - 0 - ); - if (STATUS_SUCCESS != Status) - { - BaseSetLastNTError (Status); - return; - } - /* - * PROCESSOR_ARCHITECTURE_INTEL 0 - * PROCESSOR_ARCHITECTURE_MIPS 1 - * PROCESSOR_ARCHITECTURE_ALPHA 2 - * PROCESSOR_ARCHITECTURE_PPC 3 - * PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF - */ - Si->wProcessorArchitecture = Spi.ProcessorArchitecture; - /* For future use: always zero */ - Si->wReserved = 0; - Si->dwPageSize = Sbi.PageSize; - Si->lpMinimumApplicationAddress = (PVOID)Sbi.MinimumUserModeAddress; - Si->lpMaximumApplicationAddress = (PVOID)Sbi.MaximumUserModeAddress; - Si->dwActiveProcessorMask = Sbi.ActiveProcessorsAffinityMask; - Si->dwNumberOfProcessors = Sbi.NumberOfProcessors; - /* - * Compatibility (no longer relevant): - * PROCESSOR_INTEL_386 386 - * PROCESSOR_INTEL_486 486 - * PROCESSOR_INTEL_PENTIUM 586 - * PROCESSOR_MIPS_R4000 4000 - * PROCESSOR_ALPHA_21064 21064 - */ - switch (Spi.ProcessorArchitecture) - { - case PROCESSOR_ARCHITECTURE_INTEL: - switch (Spi.ProcessorLevel) - { - case 3: - Si->dwProcessorType = PROCESSOR_INTEL_386; - break; - case 4: - Si->dwProcessorType = PROCESSOR_INTEL_486; - break; - case 5: - Si->dwProcessorType = PROCESSOR_INTEL_PENTIUM; - break; - default: - /* FIXME: P2, P3, P4...? */ - Si->dwProcessorType = PROCESSOR_INTEL_PENTIUM; - } - break; - - case PROCESSOR_ARCHITECTURE_MIPS: - Si->dwProcessorType = PROCESSOR_MIPS_R4000; - break; - - case PROCESSOR_ARCHITECTURE_ALPHA: - Si->dwProcessorType = PROCESSOR_ALPHA_21064; - break; - - case PROCESSOR_ARCHITECTURE_IA64: - Si->dwProcessorType = PROCESSOR_INTEL_IA64; - break; - - case PROCESSOR_ARCHITECTURE_PPC: - switch (Spi.ProcessorLevel) - { - case 1: - Si->dwProcessorType = PROCESSOR_PPC_601; - break; - case 3: - Si->dwProcessorType = PROCESSOR_PPC_603; - break; - case 4: - Si->dwProcessorType = PROCESSOR_PPC_604; - break; - case 6: - /* PPC 603+ */ - Si->dwProcessorType = PROCESSOR_PPC_603; - break; - case 9: - /* PPC 604+ */ - Si->dwProcessorType = PROCESSOR_PPC_604; - break; - case 20: - Si->dwProcessorType = PROCESSOR_PPC_620; - break; - default: - Si->dwProcessorType = 0; - } - break; - - } - /* Once hardcoded to 64kb */ - Si->dwAllocationGranularity = Sbi.AllocationGranularity; - /* */ - Si->wProcessorLevel = Spi.ProcessorLevel; - Si->wProcessorRevision = Spi.ProcessorRevision; - /* - * Get the version of Windows on which - * the process expects to run. - */ - ProcessVersion = GetProcessVersion (0); /* current process */ - /* In NT 3.1 and 3.5 these fields were always zero. */ - if (PV_NT351 > ProcessVersion) - { - Si->wProcessorLevel = 0; - Si->wProcessorRevision = 0; - } -} - - -/* - * @implemented - */ -BOOL WINAPI -IsProcessorFeaturePresent(DWORD ProcessorFeature) -{ - if (ProcessorFeature >= PROCESSOR_FEATURE_MAX) - return(FALSE); - - return((BOOL)SharedUserData->ProcessorFeatures[ProcessorFeature]); -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetSystemRegistryQuota(PDWORD pdwQuotaAllowed, - PDWORD pdwQuotaUsed) -{ - SYSTEM_REGISTRY_QUOTA_INFORMATION srqi; +GetSystemInfo(IN LPSYSTEM_INFO lpSystemInfo) +{ + SYSTEM_BASIC_INFORMATION BasicInfo; + SYSTEM_PROCESSOR_INFORMATION ProcInfo; + NTSTATUS Status; + + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + 0); + if (!NT_SUCCESS(Status)) return; + + Status = NtQuerySystemInformation(SystemProcessorInformation, + &ProcInfo, + sizeof(ProcInfo), + 0); + if (!NT_SUCCESS(Status)) return; + + GetSystemInfoInternal(&BasicInfo, &ProcInfo, lpSystemInfo); +} + +/* + * @implemented + */ +BOOL +WINAPI +IsProcessorFeaturePresent(IN DWORD ProcessorFeature) +{ + if (ProcessorFeature >= PROCESSOR_FEATURE_MAX) return FALSE; + return ((BOOL)SharedUserData->ProcessorFeatures[ProcessorFeature]); +} + +/* + * @implemented + */ +BOOL +WINAPI +GetSystemRegistryQuota(OUT PDWORD pdwQuotaAllowed, + OUT PDWORD pdwQuotaUsed) +{ + SYSTEM_REGISTRY_QUOTA_INFORMATION QuotaInfo; ULONG BytesWritten; NTSTATUS Status; Status = NtQuerySystemInformation(SystemRegistryQuotaInformation, - &srqi, - sizeof(srqi), + &QuotaInfo, + sizeof(QuotaInfo), &BytesWritten); - if(NT_SUCCESS(Status)) - { - if(pdwQuotaAllowed != NULL) - { - *pdwQuotaAllowed = srqi.RegistryQuotaAllowed; - } - if(pdwQuotaUsed != NULL) - { - *pdwQuotaUsed = srqi.RegistryQuotaUsed; - } - + if (NT_SUCCESS(Status)) + { + if (pdwQuotaAllowed) *pdwQuotaAllowed = QuotaInfo.RegistryQuotaAllowed; + if (pdwQuotaUsed) *pdwQuotaUsed = QuotaInfo.RegistryQuotaUsed; return TRUE; } @@ -222,15 +155,27 @@ */ VOID WINAPI -GetNativeSystemInfo( - LPSYSTEM_INFO lpSystemInfo - ) -{ - //FIXME: GetNativeSystemInfo should return always the real Hardware Processorarchitecture - // in case a Program is running in 32bit Mode on AMD64 - // GetSystemInfo should return PROCESSOR_ARCHITECTURE_INTEL and - // GetNativeSystemInfo should return PROCESSOR_ARCHITECTURE_AMD64 - GetSystemInfo(lpSystemInfo); +GetNativeSystemInfo(IN LPSYSTEM_INFO lpSystemInfo) +{ + SYSTEM_BASIC_INFORMATION BasicInfo; + SYSTEM_PROCESSOR_INFORMATION ProcInfo; + NTSTATUS Status; + + /* FIXME: Should be SystemNativeBasicInformation */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + 0); + if (!NT_SUCCESS(Status)) return; + + /* FIXME: Should be SystemNativeProcessorInformation */ + Status = NtQuerySystemInformation(SystemProcessorInformation, + &ProcInfo, + sizeof(ProcInfo), + 0); + if (!NT_SUCCESS(Status)) return; + + GetSystemInfoInternal(&BasicInfo, &ProcInfo, lpSystemInfo); } /* @@ -254,15 +199,11 @@ *ReturnLength, ReturnLength); + /* Normalize the error to what Win32 expects */ + if (Status == STATUS_INFO_LENGTH_MISMATCH) Status = STATUS_BUFFER_TOO_SMALL; if (!NT_SUCCESS(Status)) { - /* - * When NtQuerySystemInformation says STATUS_INFO_LENGTH_MISMATCH, - * return ERROR_INSUFFICIENT_BUFFER instead of ERROR_BAD_LENGTH. - */ - BaseSetLastNTError(Status == STATUS_INFO_LENGTH_MISMATCH - ? STATUS_BUFFER_TOO_SMALL - : Status); + BaseSetLastNTError(Status); return FALSE; } @@ -274,42 +215,39 @@ */ BOOL WINAPI -GetNumaHighestNodeNumber( - PULONG HighestNodeNumber - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetNumaNodeProcessorMask( - UCHAR Node, - PULONGLONG ProcessorMask - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetNumaProcessorNode( - UCHAR Processor, - PUCHAR NodeNumber - ) -{ - STUB; - return 0; -} - +GetNumaHighestNodeNumber(OUT PULONG HighestNodeNumber) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetNumaNodeProcessorMask(IN UCHAR Node, + OUT PULONGLONG ProcessorMask) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetNumaProcessorNode(IN UCHAR Processor, + OUT PUCHAR NodeNumber) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ BOOL WINAPI GetNumaAvailableMemoryNode(IN UCHAR Node, @@ -324,28 +262,24 @@ */ DWORD WINAPI -GetFirmwareEnvironmentVariableW( - LPCWSTR lpName, - LPCWSTR lpGuid, - PVOID pBuffer, - DWORD nSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFirmwareEnvironmentVariableW( - LPCWSTR lpName, - LPCWSTR lpGuid, - PVOID pValue, - DWORD nSize - ) +GetFirmwareEnvironmentVariableW(IN LPCWSTR lpName, + IN LPCWSTR lpGuid, + IN PVOID pValue, + IN DWORD nSize) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFirmwareEnvironmentVariableW(IN LPCWSTR lpName, + IN LPCWSTR lpGuid, + IN PVOID pValue, + IN DWORD nSize) { STUB; return 0; @@ -356,33 +290,32 @@ */ DWORD WINAPI -GetFirmwareEnvironmentVariableA( - LPCSTR lpName, - LPCSTR lpGuid, - PVOID pBuffer, - DWORD nSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetFirmwareEnvironmentVariableA( - LPCSTR lpName, - LPCSTR lpGuid, - PVOID pValue, - DWORD nSize - ) -{ - STUB; - return 0; -} - +GetFirmwareEnvironmentVariableA(IN LPCSTR lpName, + IN LPCSTR lpGuid, + IN PVOID pValue, + IN DWORD nSize) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFirmwareEnvironmentVariableA(IN LPCSTR lpName, + IN LPCSTR lpGuid, + IN PVOID pValue, + IN DWORD nSize) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ UINT WINAPI EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, @@ -393,6 +326,9 @@ return 0; } +/* + * @unimplemented + */ UINT WINAPI GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, @@ -404,6 +340,9 @@ return 0; } +/* + * @unimplemented + */ BOOL WINAPI GetSystemFileCacheSize(OUT PSIZE_T lpMinimumFileCacheSize, @@ -414,7 +353,9 @@ return FALSE; } - +/* + * @unimplemented + */ BOOL WINAPI SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize, @@ -424,4 +365,3 @@ STUB; return FALSE; } -

1 0

[ion] 53056: [KERNEL32]: Cleanup and fix bugs in the TimerQueue implementation... mainly related to wrong/incorrect parameter checks and error codes.
by ion＠svn.reactos.org 04 Aug '11

04 Aug '11

Author: ion Date: Thu Aug 4 00:54:00 2011 New Revision: 53056 URL: http://svn.reactos.org/svn/reactos?rev=53056&view=rev Log: [KERNEL32]: Cleanup and fix bugs in the TimerQueue implementation... mainly related to wrong/incorrect parameter checks and error codes. Modified: trunk/reactos/dll/win32/kernel32/client/timerqueue.c Modified: trunk/reactos/dll/win32/kernel32/client/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/timerqueue.c [iso-8859-1] Thu Aug 4 00:54:00 2011 @@ -1,132 +1,112 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Timer Queue functions - * FILE: dll/win32/kernel32/misc/timerqueue.c - * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> - */ - -/* INCLUDES ******************************************************************/ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: See COPYING in the top level directory + * FILE: dll/win32/kernel32/client/timerqueue.c + * PURPOSE: Timer Queue Functions + * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -HANDLE DefaultTimerQueue = NULL; - -/* - * Create the default timer queue for the current process. This function is only - * called if CreateTimerQueueTimer() or SetTimerQueueTimer() is called. - * However, ChangeTimerQueueTimer() fails with ERROR_INVALID_PARAMETER if the - * default timer queue has not been created, because it assumes there has to be - * a timer queue with a timer if it want's to be changed. - */ -static BOOL -IntCreateDefaultTimerQueue(VOID) -{ - NTSTATUS Status; - - /* FIXME - make this thread safe */ - - /* create the timer queue */ - Status = RtlCreateTimerQueue(&DefaultTimerQueue); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - DPRINT1("Unable to create the default timer queue!\n"); - return FALSE; - } - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -CancelTimerQueueTimer(HANDLE TimerQueue, - HANDLE Timer) -{ - /* Since this function is not documented in PSDK and apparently does nothing - but delete the timer, we just do the same as DeleteTimerQueueTimer(), without - passing a completion event. */ - NTSTATUS Status; - - if(TimerQueue == NULL) - { - /* let's use the process' default timer queue. We assume the default timer - queue has been created with a previous call to CreateTimerQueueTimer() or - SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */ - if(!(TimerQueue = DefaultTimerQueue)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - } - - if(Timer == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* delete the timer */ - Status = RtlDeleteTimer(TimerQueue, Timer, NULL); - - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -ChangeTimerQueueTimer(HANDLE TimerQueue, - HANDLE Timer, - ULONG DueTime, - ULONG Period) -{ - NTSTATUS Status; - - if(TimerQueue == NULL) - { - /* let's use the process' default timer queue. We assume the default timer - queue has been created with a previous call to CreateTimerQueueTimer() or - SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */ - if(!(TimerQueue = DefaultTimerQueue)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - } - - if(Timer == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* update the timer */ - Status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; +/* GLOBALS ********************************************************************/ + +HANDLE BasepDefaultTimerQueue = NULL; + +/* PRIVATE FUNCTIONS **********************************************************/ + +/* FIXME - make this thread safe */ +BOOL +WINAPI +BasepCreateDefaultTimerQueue(VOID) +{ + NTSTATUS Status; + + /* Create the timer queue */ + Status = RtlCreateTimerQueue(&BasepDefaultTimerQueue); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + DPRINT1("Unable to create the default timer queue!\n"); + return FALSE; + } + + return TRUE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + + +/* + * @implemented + */ +BOOL +WINAPI +CancelTimerQueueTimer(IN HANDLE TimerQueue, + IN HANDLE Timer) +{ + NTSTATUS Status; + + if (!TimerQueue) + { + /* Use the default timer queue */ + TimerQueue = BasepDefaultTimerQueue; + if (!TimerQueue) + { + /* A timer is being cancelled before one was created... fail */ + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + } + + /* Delete the timer */ + Status = RtlDeleteTimer(TimerQueue, Timer, NULL); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +ChangeTimerQueueTimer(IN HANDLE TimerQueue, + IN HANDLE Timer, + IN ULONG DueTime, + IN ULONG Period) +{ + NTSTATUS Status; + + if (!TimerQueue) + { + /* Use the default timer queue */ + TimerQueue = BasepDefaultTimerQueue; + if (!TimerQueue) + { + /* A timer is being cancelled before one was created... fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + + /* Delete the timer */ + Status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } /* @@ -136,173 +116,161 @@ WINAPI CreateTimerQueue(VOID) { - HANDLE Handle; - NTSTATUS Status; - - /* create the timer queue */ - Status = RtlCreateTimerQueue(&Handle); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return NULL; - } - - return Handle; -} - -/* - * @implemented - */ -BOOL -WINAPI -CreateTimerQueueTimer(PHANDLE phNewTimer, - HANDLE TimerQueue, - WAITORTIMERCALLBACK Callback, - PVOID Parameter, - DWORD DueTime, - DWORD Period, - ULONG Flags) -{ - NTSTATUS Status; - - /* windows seems not to test this parameter at all, so we'll try to clear it here - so we don't crash somewhere inside ntdll */ - *phNewTimer = NULL; - - if(TimerQueue == NULL) - { - /* the default timer queue is requested, try to create it if it hasn't been already */ - if(!(TimerQueue = DefaultTimerQueue)) - { - if(!IntCreateDefaultTimerQueue()) - { - /* IntCreateDefaultTimerQueue() set the last error code already, just fail */ - return FALSE; - } - TimerQueue = DefaultTimerQueue; - } - } - - /* !!! Win doesn't even check if Callback == NULL, so we don't, too! That'll - raise a nice exception later... */ - - /* create the timer */ - Status = RtlCreateTimer(TimerQueue, phNewTimer, Callback, Parameter, DueTime, - Period, Flags); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -DeleteTimerQueue(HANDLE TimerQueue) -{ - NTSTATUS Status; - - /* We don't allow the user to delete the default timer queue */ - if(TimerQueue == NULL) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - /* delete the timer queue */ - Status = RtlDeleteTimerQueue(TimerQueue); - return NT_SUCCESS(Status); -} - -/* - * @implemented - */ -BOOL -WINAPI -DeleteTimerQueueEx(HANDLE TimerQueue, - HANDLE CompletionEvent) -{ - NTSTATUS Status; - - /* We don't allow the user to delete the default timer queue */ - if(TimerQueue == NULL) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - /* delete the queue */ - Status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent); - - if((CompletionEvent != INVALID_HANDLE_VALUE && Status == STATUS_PENDING) || - !NT_SUCCESS(Status)) - { - /* In case CompletionEvent == NULL, RtlDeleteTimerQueueEx() returns before - all callback routines returned. We set the last error code to STATUS_PENDING - and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only - can get here if another error occured. In case CompletionEvent is something - else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING). - We also handle all other failures the same way. */ - - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -DeleteTimerQueueTimer(HANDLE TimerQueue, - HANDLE Timer, - HANDLE CompletionEvent) -{ - NTSTATUS Status; - - if(TimerQueue == NULL) - { - /* let's use the process' default timer queue. We assume the default timer - queue has been created with a previous call to CreateTimerQueueTimer() or - SetTimerQueueTimer(), otherwise this call wouldn't make much sense. */ - if(!(TimerQueue = DefaultTimerQueue)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - } - - if(Timer == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* delete the timer */ - Status = RtlDeleteTimer(TimerQueue, Timer, CompletionEvent); - - if((CompletionEvent != INVALID_HANDLE_VALUE && Status == STATUS_PENDING) || - !NT_SUCCESS(Status)) - { - /* In case CompletionEvent == NULL, RtlDeleteTimer() returns before - the callback routine returned. We set the last error code to STATUS_PENDING - and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only - can get here if another error occured. In case CompletionEvent is something - else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING). - We also handle all other failures the same way. */ - - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + HANDLE Handle; + NTSTATUS Status; + + /* Create the timer queue */ + Status = RtlCreateTimerQueue(&Handle); + if(!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return NULL; + } + + return Handle; +} + +/* + * @implemented + */ +BOOL +WINAPI +CreateTimerQueueTimer(OUT PHANDLE phNewTimer, + IN HANDLE TimerQueue, + IN WAITORTIMERCALLBACK Callback, + IN PVOID Parameter, + IN DWORD DueTime, + IN DWORD Period, + IN ULONG Flags) +{ + NTSTATUS Status; + + /* Parameter is not optional -- clear it now */ + *phNewTimer = NULL; + + /* Check if no queue was given */ + if (!TimerQueue) + { + /* Create the queue if it didn't already exist */ + if (!(BasepDefaultTimerQueue) && !(BasepCreateDefaultTimerQueue())) + { + return FALSE; + } + + /* Use the default queue */ + TimerQueue = BasepDefaultTimerQueue; + } + + /* Create the timer. Note that no parameter checking is done here */ + Status = RtlCreateTimer(TimerQueue, + phNewTimer, + Callback, + Parameter, + DueTime, + Period, + Flags); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DeleteTimerQueue(IN HANDLE TimerQueue) +{ + /* We don't allow the user to delete the default timer queue */ + if (!TimerQueue) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Delete the timer queue */ + RtlDeleteTimerQueueEx(TimerQueue, 0); + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DeleteTimerQueueEx(IN HANDLE TimerQueue, + IN HANDLE CompletionEvent) +{ + NTSTATUS Status; + + /* We don't allow the user to delete the default timer queue */ + if (!TimerQueue) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Delete the timer queue */ + Status = RtlDeleteTimerQueueEx(TimerQueue, CompletionEvent); + if (((CompletionEvent != INVALID_HANDLE_VALUE) && (Status == STATUS_PENDING)) || + !(NT_SUCCESS(Status))) + { + /* In case CompletionEvent == NULL, RtlDeleteTimerQueueEx() returns before + all callback routines returned. We set the last error code to STATUS_PENDING + and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only + can get here if another error occured. In case CompletionEvent is something + else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING). + We also handle all other failures the same way. */ + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DeleteTimerQueueTimer(IN HANDLE TimerQueue, + IN HANDLE Timer, + IN HANDLE CompletionEvent) +{ + NTSTATUS Status; + + if (!TimerQueue) + { + /* Use the default timer queue */ + TimerQueue = BasepDefaultTimerQueue; + if (!TimerQueue) + { + /* A timer is being cancelled before one was created... fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + + /* Delete the timer */ + Status = RtlDeleteTimer(TimerQueue, Timer, CompletionEvent); + if (((CompletionEvent != INVALID_HANDLE_VALUE) && (Status == STATUS_PENDING)) || + !(NT_SUCCESS(Status))) + { + /* In case CompletionEvent == NULL, RtlDeleteTimerQueueEx() returns before + all callback routines returned. We set the last error code to STATUS_PENDING + and return FALSE. In case CompletionEvent == INVALID_HANDLE_VALUE we only + can get here if another error occured. In case CompletionEvent is something + else, we get here and fail, even though it isn't really an error (if Status == STATUS_PENDING). + We also handle all other failures the same way. */ + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } /* @@ -310,50 +278,44 @@ */ HANDLE WINAPI -SetTimerQueueTimer(HANDLE TimerQueue, - WAITORTIMERCALLBACK Callback, - PVOID Parameter, - DWORD DueTime, - DWORD Period, - BOOL PreferIo) -{ - /* Since this function is not documented in PSDK and apparently does nothing - but create a timer, we just do the same as CreateTimerQueueTimer(). Unfortunately - I don't really know what PreferIo is supposed to be, it propably just affects the - Flags parameter of CreateTimerQueueTimer(). Looking at the PSDK documentation of - CreateTimerQueueTimer() there's only one flag (WT_EXECUTEINIOTHREAD) that causes - the callback function queued to an I/O worker thread. I guess it uses this flag - if PreferIo == TRUE, otherwise let's just use WT_EXECUTEDEFAULT. We should - test this though, this is only guess work and I'm too lazy to do further - investigation. */ - - HANDLE Timer; - NTSTATUS Status; - - if(TimerQueue == NULL) - { - /* the default timer queue is requested, try to create it if it hasn't been already */ - if(!(TimerQueue = DefaultTimerQueue)) - { - if(!IntCreateDefaultTimerQueue()) - { - /* IntCreateDefaultTimerQueue() set the last error code already, just fail */ - return FALSE; - } - TimerQueue = DefaultTimerQueue; - } - } - - /* create the timer */ - Status = RtlCreateTimer(TimerQueue, &Timer, Callback, Parameter, DueTime, - Period, (PreferIo ? WT_EXECUTEINIOTHREAD : WT_EXECUTEDEFAULT)); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return NULL; - } - - return Timer; +SetTimerQueueTimer(IN HANDLE TimerQueue, + IN WAITORTIMERCALLBACK Callback, + IN PVOID Parameter, + IN DWORD DueTime, + IN DWORD Period, + IN BOOL PreferIo) +{ + HANDLE Timer; + NTSTATUS Status; + + /* Check if no queue was given */ + if (!TimerQueue) + { + /* Create the queue if it didn't already exist */ + if (!(BasepDefaultTimerQueue) && !(BasepCreateDefaultTimerQueue())) + { + return FALSE; + } + + /* Use the default queue */ + TimerQueue = BasepDefaultTimerQueue; + } + + /* Create the timer */ + Status = RtlCreateTimer(TimerQueue, + &Timer, + Callback, + Parameter, + DueTime, + Period, + PreferIo ? WT_EXECUTEINIOTHREAD : WT_EXECUTEDEFAULT); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return NULL; + } + + return Timer; } /* EOF */

1 0

[jgardou] 53055: [CMAKE] - add cmake visual ASM compiler detection script, from cmake 2.8.5 + modification to handle ml32/64
by jgardou＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: jgardou Date: Wed Aug 3 20:29:04 2011 New Revision: 53055 URL: http://svn.reactos.org/svn/reactos?rev=53055&view=rev Log: [CMAKE] - add cmake visual ASM compiler detection script, from cmake 2.8.5 + modification to handle ml32/64 Added: trunk/reactos/cmake/Compiler/ (with props) trunk/reactos/cmake/Compiler/VISUAL-ASM.cmake (with props) Propchange: trunk/reactos/cmake/Compiler/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 3 20:29:04 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/cmake/Compiler/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/cmake/Compiler/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: trunk/reactos/cmake/Compiler/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/cmake/Compiler/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/cmake/Compiler/VISUAL-ASM.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Compiler/VISUAL-ASM.… ============================================================================== --- trunk/reactos/cmake/Compiler/VISUAL-ASM.cmake (added) +++ trunk/reactos/cmake/Compiler/VISUAL-ASM.cmake [iso-8859-1] Wed Aug 3 20:29:04 2011 @@ -1,0 +1,2 @@ + +set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S) Propchange: trunk/reactos/cmake/Compiler/VISUAL-ASM.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 53054: [GDI FONT DRIVER] forgot these files
by tkreuzer＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: tkreuzer Date: Wed Aug 3 19:50:56 2011 New Revision: 53054 URL: http://svn.reactos.org/svn/reactos?rev=53054&view=rev Log: [GDI FONT DRIVER] forgot these files Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Wed Aug 3 19:50:56 2011 @@ -1,3 +1,4 @@ +#pragma once #define LFONT_GetObject FontGetObject @@ -74,9 +75,11 @@ typedef struct _PFF { ULONG sizeofThis; - LIST_ENTRY leLink; + struct _PFF *pPFFNext; + struct _PFF *pPFFPrev; PWSTR pwszPathname; ULONG cwc; + ULONG iFileNameHash; ULONG cFiles; FLONG flState; ULONG cLoaded; @@ -96,6 +99,56 @@ PFONTFILEVIEW apffv[FD_MAX_FILES]; PFE apfe[1]; } PFF, *PPFF; + +typedef struct _HASHBUCKET +{ + struct _HASHBUCKET *pbktCollision; + // PFELINK *ppfelEnumHead; + // PFELINK *ppfelEnumTail; + ULONG cTrueType; + FLONG fl; + struct _HASHBUCKET * pbktPrev; + struct _HASHBUCKET * pbktNext; + ULONG ulTime; + union + { + WCHAR wcCapName[1]; + UNIVERSAL_FONT_ID ufi; + } u; +} HASHBUCKET, *PHASHBUCKET; + +typedef enum _FONT_HASH_TYPE +{ + FHT_FAMILY = 1, + FHT_FACE, + FHT_UFI, +} FONT_HASH_TYPE; + +typedef struct +{ + DWORD id; + FONT_HASH_TYPE fht; + ULONG cBuckets; + ULONG cUsed; + ULONG cCollisions; + HASHBUCKET * pbktFirst; + HASHBUCKET * pbktLast; + HASHBUCKET * apbkt[]; +} FONTHASH, *PFONTHASH; + +#define MAX_FONT_LIST 100 +typedef struct _PFT +{ + PFONTHASH pfhFamily; + PFONTHASH pfhFace; + PFONTHASH pfhUFI; + ULONG cBuckets; + ULONG cFiles; + PPFF apPFF[MAX_FONT_LIST]; + + /* ROS specific */ + HSEMAPHORE hsem; +} PFT, *PPFT; typedef struct { @@ -222,6 +275,56 @@ ENUMLOGFONTEXDVW elfexw; } LFONT, *PLFONT; +enum _ESTROBJ_FLAGS +{ + TO_MEM_ALLOCATED = 0x0001, + TO_ALL_PTRS_VALID = 0x0002, + TO_VALID = 0x0004, + TO_ESC_NOT_ORIENT = 0x0008, + TO_PWSZ_ALLOCATED = 0x0010, + TSIM_UNDERLINE1 = 0x0020, + TSIM_UNDERLINE2 = 0x0040, + TSIM_STRIKEOUT = 0x0080, + TO_HIGHRESTEXT = 0x0100, + TO_BITMAPS = 0x0200, + TO_PARTITION_INIT = 0x0400, + TO_ALLOC_FACENAME = 0x0800, + TO_SYS_PARTITION = 0x1000, +}; + +typedef struct _ESTROBJ +{ + STROBJ stro; // Text string object header. + ULONG cgposCopied; + ULONG cgposPositionsEnumerated; + PRFONT prfnt; + FLONG flTO; + PGLYPHPOS pgpos; + POINTFIX ptfxRef; + POINTFIX ptfxUpdate; + POINTFIX ptfxEscapement; + RECTFX rcfx; + FIX fxExtent; + FIX fxExtra; + FIX fxBreakExtra; + DWORD dwCodePage; + ULONG cExtraRects; + RECTL arclExtra[3]; + RECTL rclBackGroundSave; + PWCHAR pwcPartition; + PLONG plPartition; + PLONG plNext; + PGLYPHPOS pgpNext; + PLONG plCurrentFont; + POINTL ptlBaseLineAdjust; + INT cTTSysGlyphs; + INT cSysGlyphs; + INT cDefGlyphs; + INT cNumFaceNameGlyphs; + PVOID pacFaceNameGlyphs; + ULONG acFaceNameGlyphs[8]; +} ESTROBJ, *PESTROBJ; + FORCEINLINE PLFONT LFONT_ShareLockFont(HFONT hfont) @@ -236,6 +339,17 @@ GDIOBJ_vDereferenceObject(&plfnt->baseobj); } +BOOL +NTAPI +PFT_bInit( + PFT *ppft); + +VOID +NTAPI +ESTROBJ_vInit( + IN ESTROBJ *pestro, + IN PWSTR pwsz, + IN ULONG cwc); HFONT NTAPI @@ -253,17 +367,34 @@ PPFF NTAPI EngLoadFontFileFD( - ULONG cFiles, - PFONTFILEVIEW *ppffv, + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, DESIGNVECTOR *pdv, ULONG ulCheckSum); INT NTAPI -GreAddFontResourceInternal( - IN PWCHAR apwszFiles[], +GreAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, IN ULONG cFiles, IN FLONG fl, IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv); +BOOL +NTAPI +GreExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL PRECTL lprc, + IN LPWSTR String, + IN INT Count, + IN OPTIONAL LPINT Dx, + IN DWORD dwCodePage); + + +#define DbgDefaultChannel 0x0 Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/text.h [iso-8859-1] Wed Aug 3 19:50:56 2011 @@ -1,116 +1,26 @@ #pragma once #include <include/engobjects.h> - -#define TAG_FINF 'FNIF' -// -// EXSTROBJ flags. -// -#define TO_MEM_ALLOCATED 0x0001 -#define TO_ALL_PTRS_VALID 0x0002 -#define TO_VALID 0x0004 -#define TO_ESC_NOT_ORIENT 0x0008 -#define TO_PWSZ_ALLOCATED 0x0010 -#define TSIM_UNDERLINE1 0x0020 -#define TSIM_UNDERLINE2 0x0040 -#define TSIM_STRIKEOUT 0x0080 -#define TO_HIGHRESTEXT 0x0100 -#define TO_BITMAPS 0x0200 -#define TO_PARTITION_INIT 0x0400 -#define TO_ALLOC_FACENAME 0x0800 -#define TO_SYS_PARTITION 0x1000 -// -// Extended STROBJ -// -typedef struct _STRGDI -{ - STROBJ StrObj; // Text string object header. - FLONG flTO; - INT cgposCopied; - INT cgposPositionsEnumerated; - PVOID prfo; // PRFONT -> PFONTGDI - PGLYPHPOS pgpos; - POINTFIX ptfxRef; - POINTFIX ptfxUpdate; - POINTFIX ptfxEscapement; - RECTFX rcfx; - FIX fxExtent; - FIX fxExtra; - FIX fxBreakExtra; - DWORD dwCodePage; - INT cExtraRects; - RECTL arclExtra[3]; - RECTL rclBackGroundSave; - PWCHAR pwcPartition; - PLONG plPartition; - PLONG plNext; - PGLYPHPOS pgpNext; - PLONG plCurrentFont; - POINTL ptlBaseLineAdjust; - INT cTTSysGlyphs; - INT cSysGlyphs; - INT cDefGlyphs; - INT cNumFaceNameGlyphs; - PVOID pacFaceNameGlyphs; - ULONG acFaceNameGlyphs[8]; -} STRGDI, *PSTRGDI; - -#define TEXTOBJECT_INIT 0x00010000 /* GDI logical font object */ typedef struct _LFONT TEXTOBJ, *PTEXTOBJ; /* Internal interface */ -#define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_LFONT_TYPE)) -#define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ))) -#define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjType_LO_FONT_TYPE) -#define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT) -#define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObject((HGDIOBJ) hBMObj, GDIObjType_LFONT_TYPE)) #define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_vUnlockObject ((POBJ)pBMObj) - -PTEXTOBJ FASTCALL RealizeFontInit(HFONT); -NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ); NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont); BOOL FASTCALL InitFontSupport(VOID); -BOOL FASTCALL IntIsFontRenderingEnabled(VOID); -BOOL FASTCALL IntIsFontRenderingEnabled(VOID); -VOID FASTCALL IntEnableFontRendering(BOOL Enable); INT FASTCALL FontGetObject(PTEXTOBJ TextObj, INT Count, PVOID Buffer); -VOID FASTCALL IntLoadSystemFonts(VOID); -INT FASTCALL IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics); -ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); -INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); -BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); -BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,INT,ULONG,LPINT,LPINT,LPSIZE,FLONG); -BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); -DWORD FASTCALL IntGetFontLanguageInfo(PDC); -INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); -DWORD FASTCALL ftGetFontUnicodeRanges(PFONTGDI, PGLYPHSET); -DWORD FASTCALL ftGdiGetFontData(PFONTGDI,DWORD,DWORD,PVOID,DWORD); -BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); -BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); -DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); -BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL RECTL*, - IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); -DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); -BOOL FASTCALL GreGetTextExtentW(HDC,LPWSTR,INT,LPSIZE,UINT); -BOOL FASTCALL GreGetTextExtentExW(HDC,LPWSTR,ULONG,ULONG,PULONG,PULONG,LPSIZE,FLONG); -#define IntLockProcessPrivateFonts(W32Process) \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) - -#define IntUnLockProcessPrivateFonts(W32Process) \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&W32Process->PrivateFontListLock) - -#define IntLockGlobalFonts \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&FontListLock) - -#define IntUnLockGlobalFonts \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&FontListLock) - -#define IntLockFreeType \ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&FreeTypeLock) - -#define IntUnLockFreeType \ - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&FreeTypeLock) +BOOL +NTAPI +GreExtTextOutW( + IN HDC, + IN INT, + IN INT, + IN UINT, + IN OPTIONAL RECTL*, + IN LPWSTR, + IN INT, + IN OPTIONAL LPINT, + IN DWORD); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed Aug 3 19:50:56 2011 @@ -192,7 +192,7 @@ struct _GDI_POOL *pPoolDcAttr; struct _GDI_POOL *pPoolBrushAttr; struct _GDI_POOL *pPoolRgnAttr; - + struct _PFT *ppftPrivate; #ifdef DBG BYTE DbgChannelLevel[DbgChCount]; #endif Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Wed Aug 3 19:50:56 2011 @@ -95,3 +95,4 @@ #include <include/mapping.h> #include <dib/dib.h> #include <include/gdidebug.h> +//#include <include/font.h>

1 0

[tkreuzer] 53053: [GDI FONT DRIVER] - Rewrite GreAddFontResourceW - slightly refactor EngLoadFontFileFD - Implement basic font table handling (insert and search physical fonts using a file name has...
by tkreuzer＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: tkreuzer Date: Wed Aug 3 19:49:13 2011 New Revision: 53053 URL: http://svn.reactos.org/svn/reactos?rev=53053&view=rev Log: [GDI FONT DRIVER] - Rewrite GreAddFontResourceW - slightly refactor EngLoadFontFileFD - Implement basic font table handling (insert and search physical fonts using a file name hash) - Implement FONTOBJ_pifi and FONTOBJ_vGetInfo - Implement NtGdiGetTextExtentExW and stubplement GreGetTextExtentExW Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/dcfont.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -58,6 +58,7 @@ /* Check if font is already realized */ if (pdc->hlfntCur != pdc->dclevel.plfnt->baseobj.hHmgr) { + __debugbreak(); //prfnt = LFONT_prfntRealizeFont(pdc->dclevel.plfnt); /* Dereference the old RFONT */ Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -30,15 +30,16 @@ HSEMAPHORE ghsemFontDriver; LIST_ENTRY gleFontDriverList = {&gleFontDriverList, &gleFontDriverList}; -extern HSEMAPHORE ghsemPFFList; +extern PFT gpftPublic; BOOL FASTCALL InitFontSupport(VOID) { ghsemFontDriver = EngCreateSemaphore(); if (!ghsemFontDriver) return FALSE; - ghsemPFFList = EngCreateSemaphore(); - if (!ghsemPFFList) return FALSE; + + if (!PFT_bInit(&gpftPublic)) return FALSE; + return TRUE; } @@ -76,7 +77,8 @@ sizeof(FD_DEVICEMETRICS)); } -static void +static +VOID PFE_vInitialize( PPFE ppfe, PPFF ppff, @@ -122,23 +124,72 @@ } +static +VOID +CopyFileName( + OUT PWCHAR pwcDest, + ULONG cwcBufSize, + IN OUT PWCHAR *ppwcSource) +{ + PWCHAR pwcSource = *ppwcSource; + ULONG cwc = 0; + WCHAR wc; + + while (++cwc < cwcBufSize) + { + wc = *pwcSource++; + + if ((wc == '|') || (wc == 0)) break; + + *pwcDest++ = wc; + } + + /* Zero terminate the destination string */ + *pwcDest = 0; + + *ppwcSource = pwcSource; +} + PPFF NTAPI EngLoadFontFileFD( - ULONG cFiles, - PFONTFILEVIEW *ppffv, + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, DESIGNVECTOR *pdv, ULONG ulCheckSum) { - PULONG_PTR piFiles = (PULONG_PTR)ppffv; PVOID apvView[FD_MAX_FILES]; ULONG acjView[FD_MAX_FILES]; + PFONTFILEVIEW apffv[FD_MAX_FILES]; + PULONG_PTR piFiles = (PULONG_PTR)apffv; + WCHAR awcFileName[MAX_PATH]; + PWCHAR pwcCurrent; KAPC_STATE ApcState; PLIST_ENTRY ple; PFONTDEV pfntdev = NULL; HFF hff = 0; ULONG cFaces, cjSize, i, ulLangID = 0; PPFF ppff = NULL; + + pwcCurrent = pwszFiles; + + /* Loop the files */ + for (i = 0; i < cFiles; i++) + { + /* Extract a file name */ + CopyFileName(awcFileName, MAX_PATH, &pwcCurrent); + + /* Try to load the file */ + apffv[i] = (PVOID)EngLoadModuleEx(awcFileName, 0, FVF_FONTFILE); + if (!apffv[i]) + { + DPRINT1("Failed to load file: '%ls'\n", awcFileName); + /* Cleanup and return */ + while (i--) EngFreeModule(apffv[i]); + return NULL; + } + } /* Attach to CSRSS */ AttachCSRSS(&ApcState); @@ -203,7 +254,7 @@ ppff->hff = hff; /* Copy the FONTFILEVIEW pointers */ - for (i = 0; i < cFiles; i++) ppff->apffv[i] = ppffv[i]; + for (i = 0; i < cFiles; i++) ppff->apffv[i] = apffv[i]; /* Loop all faces in the font file */ for (i = 0; i < cFaces; i++) @@ -231,7 +282,7 @@ pldev = EngLoadImageEx(pwszDriverName, LDEV_FONT); if (!pldev) { - DPRINT1("Failed to load freetype font driver\n"); + DPRINT1("Failed to load font driver: %ls\n", pwszDriverName); return FALSE; } @@ -292,7 +343,7 @@ DPRINT1("############ Started font drivers\n"); // lets load some fonts - cFonts = GreAddFontResourceInternal(&pwszFile, 1, 0, 0, NULL); + cFonts = GreAddFontResourceW(pwszFile, 31, 1, 0, 0, NULL); ASSERT(cFonts > 0); } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> -HSEMAPHORE ghsemPFFList; +PFT gpftPublic; static LIST_ENTRY glePrivatePFFList = {&glePrivatePFFList, &glePrivatePFFList}; static LIST_ENTRY glePublicPFFList = {&glePublicPFFList, &glePublicPFFList}; @@ -20,7 +20,7 @@ PFF_bCompareFiles( PPFF ppff, ULONG cFiles, - PFONTFILEVIEW pffv[]) + PFONTFILEVIEW apffv[]) { ULONG i; @@ -31,66 +31,178 @@ for (i = 0; i < cFiles; i++) { /* Check if the files match */ - if (pffv[i] != ppff->apffv[i]) return FALSE; + if (apffv[i] != ppff->apffv[i]) return FALSE; } return TRUE; } + +BOOL +NTAPI +PFT_bInit( + PFT *ppft) +{ + + RtlZeroMemory(ppft, sizeof(PFT)); + + ppft->hsem = EngCreateSemaphore(); + if (!ppft->hsem) return FALSE; + + return TRUE; +} + +static +PPFF +PFT_pffFindFont( + PFT *ppft, + PWSTR pwszFiles, + ULONG cwc, + ULONG cFiles, + ULONG iFileNameHash) +{ + ULONG iListIndex = iFileNameHash % MAX_FONT_LIST; + PPFF ppff = NULL; + + /* Acquire PFT lock */ + EngAcquireSemaphore(ppft->hsem); + + /* Loop all PFFs in the slot */ + for (ppff = ppft->apPFF[iListIndex]; ppff; ppff = ppff->pPFFNext) + { + /* Quick check */ + if (ppff->iFileNameHash != iFileNameHash) continue; + + /* Do a full check */ + if (!wcsncmp(ppff->pwszPathname, pwszFiles, cwc)) break; + } + + /* Release PFT lock */ + EngReleaseSemaphore(ppft->hsem); + + return ppff; +} + +static +VOID +PFT_vInsertPFE( + PPFT ppft, + PPFE ppfe) +{ + UCHAR ajWinChatSet[2] = {0, DEFAULT_CHARSET}; + UCHAR *pjCharSets; + PIFIMETRICS pifi = ppfe->pifi; + + if (pifi->dpCharSets) + { + pjCharSets = (PUCHAR)pifi + pifi->dpCharSets; + } + else + { + ajWinChatSet[0] = pifi->jWinCharSet; + pjCharSets = ajWinChatSet; + } + + +} + +static +VOID +PFT_vInsertPFF( + PPFT ppft, + PPFF ppff, + ULONG iFileNameHash) +{ + ULONG i, iListIndex = iFileNameHash % MAX_FONT_LIST; + + ppff->iFileNameHash = iFileNameHash; + + /* Acquire PFT lock */ + EngAcquireSemaphore(ppft->hsem); + + /* Insert the font file into the hash bucket */ + ppff->pPFFPrev = NULL; + ppff->pPFFNext = ppft->apPFF[iListIndex]; + ppft->apPFF[iListIndex] = ppff; + + /* Loop all PFE's */ + for (i = 0; i < ppff->cFonts; i++) + { + PFT_vInsertPFE(ppft, &ppff->apfe[i]); + } + + /* Release PFT lock */ + EngReleaseSemaphore(ppft->hsem); +} + +static +ULONG +CalculateNameHash(PWSTR pwszName) +{ + ULONG iHash = 0; + WCHAR wc; + + while ((wc = *pwszName++) != 0) + { + iHash = _rotl(iHash, 7); + iHash += wc; + } + + return iHash; +} + + INT NTAPI -GreAddFontResourceInternal( - IN PWCHAR apwszFiles[], +GreAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, IN ULONG cFiles, IN FLONG fl, IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv) { - PFONTFILEVIEW apffv[FD_MAX_FILES]; + PPFT ppft; PPFF ppff = NULL; - PLIST_ENTRY ple, pleListHead; - ULONG i, ulCheckSum = 0; - - /* Loop the files */ - for (i = 0; i < cFiles; i++) - { - /* Try to load the file */ - apffv[i] = (PVOID)EngLoadModuleEx(apwszFiles[i], 0, FVF_FONTFILE); - if (!apffv[i]) - { - DPRINT1("Failed to load file: '%ls'\n", apwszFiles[i]); - /* Cleanup and return */ - while (i--) EngFreeModule(apffv[i]); - return 0; - } - } - - pleListHead = fl & FR_PRIVATE ? &glePrivatePFFList : &glePublicPFFList; - - /* Acquire PFF list lock */ - EngAcquireSemaphore(ghsemPFFList); - - /* Loop all physical font files (PFF) */ - for (ple = pleListHead->Flink; ple != pleListHead; ple = ple->Flink) - { - ppff = CONTAINING_RECORD(ple, PFF, leLink); - - /* Check if the files are already loaded */ - if (PFF_bCompareFiles(ppff, cFiles, apffv)) break; - } - - /* Release PFF list lock */ - EngReleaseSemaphore(ghsemPFFList); - - if (ple == pleListHead) - { - /* Cleanup loaded files, we don't need them anymore */ - for (i = 0; i < cFiles; i++) EngFreeModule(apffv[i]); + ULONG ulCheckSum = 0; + PPROCESSINFO ppi; + ULONG iFileNameHash; + + // HACK: only global list for now + fl &= ~FR_PRIVATE; + + /* Add to private table? */ + if (fl & FR_PRIVATE) + { + /* Use the process owned private font table */ + ppi = PsGetCurrentProcessWin32Process(); + ppft = ppi->ppftPrivate; + } + else + { + /* Use the global font table */ + ppft = &gpftPublic; + } + + /* Get a hash value for the path name */ + iFileNameHash = CalculateNameHash(pwszFiles); + + /* Try to find the font in the font table */ + ppff = PFT_pffFindFont(ppft, pwszFiles, cwc, cFiles, iFileNameHash); + + /* Did we find the font? */ + if (ppff) + { + /* Return the number of faces */ return ppff->cFonts; } + // FIXME: check other list, "copy" pft if found + + + /* Load the font file with a font driver */ - ppff = EngLoadFontFileFD(cFiles, apffv, pdv, ulCheckSum); + ppff = EngLoadFontFileFD(pwszFiles, cwc, cFiles, pdv, ulCheckSum); if (!ppff) { DPRINT1("Failed to load font with font driver\n"); @@ -98,59 +210,10 @@ } /* Insert the PFF into the list */ - EngAcquireSemaphore(ghsemPFFList); - InsertTailList(pleListHead, &ppff->leLink); - EngReleaseSemaphore(ghsemPFFList); - + PFT_vInsertPFF(ppft, ppff, iFileNameHash); + + /* Return the number of faces */ return ppff->cFonts; -} - -static -BOOL -SeperateFileNames( - PWCHAR apwszFiles[], - PWCHAR pwcDest, - PWCHAR pwszFiles, - ULONG cwc, - ULONG cFiles) -{ - PWCHAR pwszEnd = pwszFiles + cwc; - WCHAR wc; - ULONG i = 0; - - apwszFiles[0] = pwcDest; - - /* Loop the file name string */ - while (pwszFiles < pwszEnd) - { - wc = *pwszFiles++; - - /* Must not be terminated before the end */ - if (wc == 0) return FALSE; - - /* Check for a seperator */ - if (wc == '|') - { - /* Zero terminate current path name */ - *pwcDest++ = 0; - - /* Go to next file name and check if its too many */ - if (++i >= cFiles) return FALSE; - apwszFiles[i] = pwcDest; - } - else - { - *pwcDest++ = wc; - } - } - - /* Must be terminated now */ - if (*pwszFiles != 0 || i != cFiles - 1) - { - return FALSE; - } - - return TRUE; } @@ -165,11 +228,11 @@ IN DWORD dwPidTid, IN OPTIONAL DESIGNVECTOR *pdv) { - PVOID pvBuffer; - PWCHAR apwszFiles[FD_MAX_FILES]; + PWCHAR pwszUpcase; ULONG cjSize; DESIGNVECTOR dv; INT iRes = 0; + ULONG i; /* Check parameters */ if (cFiles == 0 || cFiles > FD_MAX_FILES || @@ -180,8 +243,8 @@ } /* Allocate a buffer */ - pvBuffer = EngAllocMem(0, (cwc + 1) * sizeof(WCHAR), 'pmTG'); - if (!pvBuffer) + pwszUpcase = EngAllocMem(0, (cwc + 1) * sizeof(WCHAR), 'pmTG'); + if (!pwszUpcase) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -190,9 +253,17 @@ _SEH2_TRY { ProbeForRead(pwszFiles, cwc * sizeof(WCHAR), 2); - if (!SeperateFileNames(apwszFiles, pvBuffer, pwszFiles, cwc, cFiles)) + + /* Verify zero termination */ + if (pwszFiles[cwc] != 0) { _SEH2_YIELD(goto cleanup); + } + + /* Convert the string to upper case */ + for (i = 0; i < cwc; i++) + { + pwszUpcase[i] = RtlUpcaseUnicodeChar(pwszFiles[i]); } /* Check if we have a DESIGNVECTOR */ @@ -220,10 +291,10 @@ _SEH2_END /* Call the internal function */ - iRes = GreAddFontResourceInternal(apwszFiles, cFiles, fl, dwPidTid, pdv); + iRes = GreAddFontResourceW(pwszUpcase, cwc, cFiles, fl, dwPidTid, pdv); cleanup: - EngFreeMem(pvBuffer); + EngFreeMem(pwszUpcase); return iRes; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -11,12 +11,17 @@ #define NDEBUG #include <debug.h> + + + + +/* PUBLIC FUNCTIONS **********************************************************/ + ULONG APIENTRY -FONTOBJ_cGetAllGlyphHandles ( - IN FONTOBJ *FontObj, - IN HGLYPH *Glyphs - ) +FONTOBJ_cGetAllGlyphHandles( + IN FONTOBJ *pfo, + IN HGLYPH *phg) { ASSERT(FALSE); return 0; @@ -25,11 +30,11 @@ ULONG APIENTRY FONTOBJ_cGetGlyphs( - IN FONTOBJ *FontObj, - IN ULONG Mode, - IN ULONG NumGlyphs, - IN HGLYPH *GlyphHandles, - IN PVOID *OutGlyphs) + IN FONTOBJ *pfo, + IN ULONG iMode, + IN ULONG cGlyph, + IN HGLYPH *phg, + IN PVOID *ppvGlyph) { ASSERT(FALSE); return 0; @@ -37,17 +42,19 @@ IFIMETRICS* APIENTRY -FONTOBJ_pifi(IN FONTOBJ *pfo) +FONTOBJ_pifi( + IN FONTOBJ *pfo) { - ASSERT(FALSE); - return NULL; + PRFONT prfnt = CONTAINING_RECORD(pfo, RFONT, fobj); + + return prfnt->ppfe->pifi; } PVOID APIENTRY FONTOBJ_pvTrueTypeFontFile( - IN FONTOBJ *FontObj, - IN ULONG *FileSize) + IN FONTOBJ *FontObj, + IN ULONG *FileSize) { ASSERT(FALSE); return NULL; @@ -58,68 +65,84 @@ XFORMOBJ* APIENTRY FONTOBJ_pxoGetXform( - IN FONTOBJ *pfo) + IN FONTOBJ *pfo) { ASSERT(FALSE); return NULL; } -/* - * @unimplemented - */ + VOID APIENTRY FONTOBJ_vGetInfo( - IN FONTOBJ *FontObj, - IN ULONG InfoSize, - OUT PFONTINFO FontInfo) + IN FONTOBJ *pfo, + IN ULONG cjSize, + OUT PFONTINFO pfi) { - ASSERT(FALSE); + PRFONT prfnt = CONTAINING_RECORD(pfo, RFONT, fobj); + FLONG flInfo = prfnt->ppfe->pifi->flInfo; + + __debugbreak(); + + pfi->cjThis = sizeof(FONTINFO); + pfi->flCaps = 0; + if (pfo->flFontType & FO_TYPE_DEVICE) pfi->flCaps |= FO_DEVICE_FONT; + if (flInfo & FM_INFO_RETURNS_OUTLINES) pfi->flCaps |= FO_OUTLINE_CAPABLE; + pfi->cGlyphsSupported = prfnt->pfdg->cGlyphsSupported; + + /* Reset all sizes to 0 */ + pfi->cjMaxGlyph1 = 0; + pfi->cjMaxGlyph4 = 0; + pfi->cjMaxGlyph8 = 0; + pfi->cjMaxGlyph32 = 0; + + /* Set the appropriate field */ + switch (prfnt->cBitsPerPel) + { + case 1: pfi->cjMaxGlyph1 = prfnt->cache.cjGlyphMax; break; + case 4: pfi->cjMaxGlyph4 = prfnt->cache.cjGlyphMax; break; + case 8: pfi->cjMaxGlyph8 = prfnt->cache.cjGlyphMax; break; + case 32: pfi->cjMaxGlyph32 = prfnt->cache.cjGlyphMax; break; + default: ASSERT(FALSE); break; + } + } -/* - * @unimplemented - */ -FD_GLYPHSET * APIENTRY +FD_GLYPHSET * +APIENTRY FONTOBJ_pfdg( - IN FONTOBJ *FontObj) + IN FONTOBJ *pfo) { ASSERT(FALSE); return NULL; } -/* - * @unimplemented - */ -PBYTE APIENTRY +PBYTE +APIENTRY FONTOBJ_pjOpenTypeTablePointer( - IN FONTOBJ *FontObj, - IN ULONG Tag, - OUT ULONG *Table) + IN FONTOBJ *pfo, + IN ULONG ulTag, + OUT ULONG *pcjTable) { ASSERT(FALSE); return NULL; } -/* - * @unimplemented - */ -PFD_GLYPHATTR APIENTRY +PFD_GLYPHATTR +APIENTRY FONTOBJ_pQueryGlyphAttrs( - IN FONTOBJ *FontObj, - IN ULONG Mode) + IN FONTOBJ *pfo, + IN ULONG iMode) { ASSERT(FALSE); return NULL; } -/* - * @unimplemented - */ -LPWSTR APIENTRY +LPWSTR +APIENTRY FONTOBJ_pwszFontFilePaths( - IN FONTOBJ *FontObj, - OUT ULONG *PathLength) + IN FONTOBJ *pfo, + OUT ULONG *pcwc) { ASSERT(FALSE); return NULL; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/strobj.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -11,6 +11,21 @@ #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +ESTROBJ_vInit( + IN ESTROBJ *pestro, + IN PWSTR pwsz, + IN ULONG cwc) +{ + +} + + +/* PUBLIC FUNCTIONS **********************************************************/ BOOL APIENTRY Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -80,7 +80,7 @@ petm->emDoubleLowerUnderlineWidth = 0; // FIXME petm->emStrikeOutOffset = 0; // FIXME petm->emStrikeOutWidth = 0; // FIXME - petm->emKernPairs = pifi->cKerningPairs; + petm->emKernPairs = (WORD)pifi->cKerningPairs; petm->emKernTracks = 0; // FIXME } @@ -253,20 +253,150 @@ return FALSE; } -W32KAPI -BOOL -APIENTRY -NtGdiGetTextExtentExW( +BOOL +NTAPI +GreGetTextExtentExW( IN HDC hdc, IN OPTIONAL LPWSTR lpwsz, IN ULONG cwc, IN ULONG dxMax, - OUT OPTIONAL ULONG *pcCh, + OUT OPTIONAL ULONG *pcch, OUT OPTIONAL PULONG pdxOut, OUT LPSIZE psize, IN FLONG fl) { - ASSERT(FALSE); - return FALSE; -} - + PDC pdc; + PRFONT prfnt; + BOOL bResult; + ESTROBJ estro; + + DPRINT1("GreGetTextExtentExW()\n"); + + ESTROBJ_vInit(&estro, lpwsz, cwc); + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return FALSE; + } + + /* Get pointer to RFONT */ + prfnt = DC_prfnt(pdc); + + + + + /* Unlock the DC and return */ + DC_UnlockDc(pdc); + return bResult; + +} + +W32KAPI +BOOL +APIENTRY +NtGdiGetTextExtentExW( + IN HDC hdc, + IN OPTIONAL LPWSTR lpwsz, + IN ULONG cwc, + IN ULONG dxMax, + OUT OPTIONAL ULONG *pcch, + OUT OPTIONAL PULONG pdxOut, + OUT LPSIZE psize, + IN FLONG fl) +{ + ULONG aulBuffer[100]; + ULONG cjBufSize; + PVOID pvBuffer; + SIZEL sizel; + PWSTR pwszSafe; + PULONG pcchSafe = NULL, pdxSafe = NULL; + BOOL bResult = TRUE; + + DPRINT1("NtGdiGetTextExtentExW(%.*ls)\n", cwc, lpwsz); + + /* Check parameters */ + if ((cwc == 0) || (cwc > 1000)) return FALSE; + + /* Calculate size of the safe buffer */ + cjBufSize = cwc * sizeof(WCHAR); + if (pcch) cjBufSize += cwc * sizeof(ULONG); + if (pdxOut) cjBufSize += cwc * sizeof(ULONG); + + if (cjBufSize <= sizeof(aulBuffer)) + { + pvBuffer = aulBuffer; + } + else + { + pvBuffer = ExAllocatePoolWithTag(PagedPool, cjBufSize, GDITAG_TEXT); + if (!pvBuffer) + { + DPRINT1("Could not allocate buffer!\n"); + return FALSE; + } + } + + pwszSafe = pvBuffer; + if (pcch) + { + pcchSafe = (PULONG)pvBuffer; + pwszSafe = (PWCHAR)(pcchSafe + cwc); + } + + if (pdxOut) + { + pdxSafe = (PULONG)pwszSafe; + pwszSafe = (PWCHAR)(pdxSafe + cwc); + } + + /* Use SEH for buffer transfer */ + _SEH2_TRY + { + ProbeForRead(lpwsz, cwc * sizeof(WCHAR), 1); + if (pcch) ProbeForWrite(pcch, cwc * sizeof(ULONG), sizeof(ULONG)); + if (pdxOut) ProbeForWrite(pdxOut, cwc * sizeof(ULONG), sizeof(ULONG)); + RtlCopyMemory(pwszSafe, lpwsz, cwc * sizeof(WCHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bResult = FALSE; + } + _SEH2_END + + if (bResult) + { + /* Call the internal function */ + bResult = GreGetTextExtentExW(hdc, + pwszSafe, + cwc, + dxMax, + pcchSafe, + pdxSafe, + &sizel, + fl); + + /* Do we need to copy something back? */ + if (bResult && (pcch || pdxOut)) + { + _SEH2_TRY + { + /* Buffers are already probed */ + if (pcch) RtlCopyMemory(pcch, pcchSafe, cwc * sizeof(ULONG)); + if (pdxOut) RtlCopyMemory(pdxOut, pdxSafe, cwc * sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bResult = FALSE; + } + _SEH2_END + } + } + + /* Free temp buffer, if we allocated one */ + if (pvBuffer != aulBuffer) ExFreePoolWithTag(pvBuffer, GDITAG_TEXT); + + return bResult; +} + Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textout.c [iso-8859-1] Wed Aug 3 19:49:13 2011 @@ -34,7 +34,7 @@ } BOOL -APIENTRY +NTAPI GreExtTextOutW( IN HDC hDC, IN INT XStart,

1 0

[ion] 53052: [CSRSRV]: All the allocations must come from the CSRSS shared heap, not the current CSR heap.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 16:37:39 2011 New Revision: 53052 URL: http://svn.reactos.org/svn/reactos?rev=53052&view=rev Log: [CSRSRV]: All the allocations must come from the CSRSS shared heap, not the current CSR heap. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 16:37:39 2011 @@ -319,9 +319,13 @@ { NTSTATUS Status; WCHAR Buffer[MAX_PATH]; + PWCHAR HeapBuffer; UNICODE_STRING SystemRootString; UNICODE_STRING UnexpandedSystemRootString = RTL_CONSTANT_STRING(L"%SystemRoot%"); UNICODE_STRING BaseSrvCSDString; + UNICODE_STRING BaseSrvWindowsDirectory; + UNICODE_STRING BaseSrvWindowsSystemDirectory; + UNICODE_STRING BnoString; RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[2] = { { @@ -332,12 +336,6 @@ }, {0} }; - - /* Allocate the fake data */ - BaseStaticServerData = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(BASE_STATIC_SERVER_DATA)); - ASSERT(BaseStaticServerData != NULL); /* Get the Windows directory */ RtlInitEmptyUnicodeString(&SystemRootString, Buffer, sizeof(Buffer)); @@ -348,19 +346,76 @@ DPRINT1("Status: %lx. Root: %wZ\n", Status, &SystemRootString); ASSERT(NT_SUCCESS(Status)); + /* Create the base directory */ Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; - Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsDirectory, + Status = RtlCreateUnicodeString(&BaseSrvWindowsDirectory, SystemRootString.Buffer); ASSERT(NT_SUCCESS(Status)); + /* Create the system directory */ wcscat(SystemRootString.Buffer, L"\\system32"); - Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsSystemDirectory, + Status = RtlCreateUnicodeString(&BaseSrvWindowsSystemDirectory, SystemRootString.Buffer); ASSERT(NT_SUCCESS(Status)); - Status = RtlCreateUnicodeString(&BaseStaticServerData->NamedObjectDirectory, - L"\\BaseNamedObjects"); + /* FIXME: Check Session ID */ + wcscpy(Buffer, L"\\BaseNamedObjects"); + RtlInitUnicodeString(&BnoString, Buffer); + + /* Allocate the server data */ + BaseStaticServerData = RtlAllocateHeap(CsrSrvSharedSectionHeap, + HEAP_ZERO_MEMORY, + sizeof(BASE_STATIC_SERVER_DATA)); + ASSERT(BaseStaticServerData != NULL); + + /* Process timezone information */ + BaseStaticServerData->TermsrvClientTimeZoneId = TIME_ZONE_ID_INVALID; + BaseStaticServerData->TermsrvClientTimeZoneChangeNum = 0; + Status = NtQuerySystemInformation(SystemTimeOfDayInformation, + &BaseStaticServerData->TimeOfDay, + sizeof(BaseStaticServerData->TimeOfDay), + NULL); ASSERT(NT_SUCCESS(Status)); + + /* Make a shared heap copy of the Windows directory */ + BaseStaticServerData->WindowsDirectory = BaseSrvWindowsDirectory; + HeapBuffer = RtlAllocateHeap(CsrSrvSharedSectionHeap, + 0, + BaseSrvWindowsDirectory.MaximumLength); + ASSERT(HeapBuffer); + RtlCopyMemory(HeapBuffer, + BaseStaticServerData->WindowsDirectory.Buffer, + BaseSrvWindowsDirectory.MaximumLength); + BaseStaticServerData->WindowsDirectory.Buffer = HeapBuffer; + + /* Make a shared heap copy of the System directory */ + BaseStaticServerData->WindowsSystemDirectory = BaseSrvWindowsSystemDirectory; + HeapBuffer = RtlAllocateHeap(CsrSrvSharedSectionHeap, + 0, + BaseSrvWindowsSystemDirectory.MaximumLength); + ASSERT(HeapBuffer); + RtlCopyMemory(HeapBuffer, + BaseStaticServerData->WindowsSystemDirectory.Buffer, + BaseSrvWindowsSystemDirectory.MaximumLength); + BaseStaticServerData->WindowsSystemDirectory.Buffer = HeapBuffer; + + /* This string is not used */ + RtlInitEmptyUnicodeString(&BaseStaticServerData->WindowsSys32x86Directory, + NULL, + 0); + + /* Make a shared heap copy of the BNO directory */ + BaseStaticServerData->NamedObjectDirectory = BnoString; + BaseStaticServerData->NamedObjectDirectory.MaximumLength = BnoString.Length + + sizeof(UNICODE_NULL); + HeapBuffer = RtlAllocateHeap(CsrSrvSharedSectionHeap, + 0, + BaseStaticServerData->NamedObjectDirectory.MaximumLength); + ASSERT(HeapBuffer); + RtlCopyMemory(HeapBuffer, + BaseStaticServerData->NamedObjectDirectory.Buffer, + BaseStaticServerData->NamedObjectDirectory.MaximumLength); + BaseStaticServerData->NamedObjectDirectory.Buffer = HeapBuffer; /* * Confirmed that in Windows, CSDNumber and RCNumber are actually Length @@ -373,9 +428,8 @@ BaseStaticServerData->CSDNumber = 0; BaseStaticServerData->RCNumber = 0; - /* Initialize the CSD string */ + /* Initialize the CSD string and query its value from the registry */ RtlInitEmptyUnicodeString(&BaseSrvCSDString, Buffer, sizeof(Buffer)); - Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, L"", BaseServerRegistryConfigurationTable, @@ -383,33 +437,32 @@ NULL); if (NT_SUCCESS(Status)) { + /* Copy into the shared buffer */ wcsncpy(BaseStaticServerData->CSDVersion, BaseSrvCSDString.Buffer, BaseSrvCSDString.Length / sizeof(WCHAR)); } else { + /* NULL-terminate to indicate nothing is there */ BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; } + /* Cache the system information */ Status = NtQuerySystemInformation(SystemBasicInformation, &BaseStaticServerData->SysInfo, sizeof(BaseStaticServerData->SysInfo), NULL); ASSERT(NT_SUCCESS(Status)); + /* FIXME: Should query the registry for these */ BaseStaticServerData->DefaultSeparateVDM = FALSE; BaseStaticServerData->IsWowTaskReady = FALSE; BaseStaticServerData->LUIDDeviceMapsEnabled = FALSE; - BaseStaticServerData->TermsrvClientTimeZoneId = TIME_ZONE_ID_INVALID; - BaseStaticServerData->TermsrvClientTimeZoneChangeNum = 0; - - Status = NtQuerySystemInformation(SystemTimeOfDayInformation, - &BaseStaticServerData->TimeOfDay, - sizeof(BaseStaticServerData->TimeOfDay), - NULL); - ASSERT(NT_SUCCESS(Status)); - + + /* FIXME: Symlinks */ + + /* Finally, set the pointer */ CsrSrvSharedStaticServerData[CSR_CONSOLE] = BaseStaticServerData; }

1 0

[ion] 53051: [CSRSRV]: CSRSS tries to connect with itself and already has the region mapped, so allow this as a hack.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 15:45:16 2011 New Revision: 53051 URL: http://svn.reactos.org/svn/reactos?rev=53051&view=rev Log: [CSRSRV]: CSRSS tries to connect with itself and already has the region mapped, so allow this as a hack. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 15:45:16 2011 @@ -293,6 +293,12 @@ ViewUnmap, SEC_NO_CHANGE, PAGE_EXECUTE_READ); + if (Status == STATUS_CONFLICTING_ADDRESSES) + { + /* I Think our csrss tries to connect to itself... */ + DPRINT1("Multiple mapping hack\n"); + Status = STATUS_SUCCESS; + } if (!NT_SUCCESS(Status)) return Status; } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Aug 3 15:45:16 2011 @@ -497,6 +497,7 @@ static NTSTATUS CsrpCreateHeap (int argc, char ** argv, char ** envp) { + CHAR Value[] = "1024,3072,512"; NTSTATUS Status; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -512,7 +513,7 @@ } - Status = CsrSrvCreateSharedSection("1024,3072,512"); + Status = CsrSrvCreateSharedSection(Value); DPRINT1("Status: %lx\n", Status); ASSERT(Status == STATUS_SUCCESS);

1 0

[jgardou] 53050: [PSDK] - mark operators == et != of REFPROPERTYKEY as C++ externs
by jgardou＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: jgardou Date: Wed Aug 3 15:20:36 2011 New Revision: 53050 URL: http://svn.reactos.org/svn/reactos?rev=53050&view=rev Log: [PSDK] - mark operators == et != of REFPROPERTYKEY as C++ externs Modified: trunk/reactos/include/psdk/propkeydef.h Modified: trunk/reactos/include/psdk/propkeydef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propkeydef.h?… ============================================================================== --- trunk/reactos/include/psdk/propkeydef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propkeydef.h [iso-8859-1] Wed Aug 3 15:20:36 2011 @@ -58,6 +58,8 @@ #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ #define _PROPERTYKEY_EQUALITY_OPERATORS_ #ifdef __cplusplus +extern "C++" +{ inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return IsEqualPropertyKey(guidOne, guidOther); @@ -66,5 +68,6 @@ { return !(guidOne == guidOther); } +} //extern "C++" #endif #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs