Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 52859: [CSRSRV|NTOSKRNL|KERNEL32|NTDLL] Fix multiple definition of variables.
by dgorbachev＠svn.reactos.org 25 Jul '11

25 Jul '11

Author: dgorbachev Date: Mon Jul 25 05:54:37 2011 New Revision: 52859 URL: http://svn.reactos.org/svn/reactos?rev=52859&view=rev Log: [CSRSRV|NTOSKRNL|KERNEL32|NTDLL] Fix multiple definition of variables. Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -14,7 +14,6 @@ /* GLOBALS *******************************************************************/ -ULONG LdrpFatalHardErrorCount; PVOID LdrpManifestProberRoutine; ULONG LdrpNormalSnap; Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -34,7 +34,6 @@ RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle); UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH"); -UNICODE_STRING BaseDefaultPath; PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry; #define CMD_STRING L"cmd /c " Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -58,7 +58,6 @@ /* GLOBALS *******************************************************************/ ULONG_PTR MmSubsectionBase; -BOOLEAN MmAllocationFragment; NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -33,7 +33,6 @@ PFN_NUMBER MmResidentAvailablePages; PFN_NUMBER MmResidentAvailableAtInit; -SIZE_T MmTotalCommitLimit; SIZE_T MmTotalCommittedPages; SIZE_T MmSharedCommit; SIZE_T MmDriverCommit; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -123,8 +123,6 @@ /* GLOBALS *******************************************************************/ POBJECT_TYPE MmSectionObjectType = NULL; - -SIZE_T MmAllocationFragment; ULONG_PTR MmSubsectionBase; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -1,5 +1,5 @@ /* - * reactos/subsys/csrss/api/process.c + * subsystems/win32/csrss/csrsrv/api/process.c * * "\windows\ApiPort" port process management functions * Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/user.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -1,6 +1,6 @@ /* $Id$ * - * reactos/subsys/csrss/api/user.c + * subsystems/win32/csrss/csrsrv/api/user.c * * User functions * 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] Mon Jul 25 05:54:37 2011 @@ -1,6 +1,6 @@ /* $Id$ * - * reactos/subsys/csrss/api/wapi.c + * subsystems/win32/csrss/csrsrv/api/wapi.c * * CSRSS port message processing * 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] Mon Jul 25 05:54:37 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/init.c + * FILE: subsystems/win32/csrss/csrsrv/init.c * PURPOSE: CSR Server DLL Initialization * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/procsup.c + * FILE: subsystems/win32/csrss/csrsrv/procsup.c * PURPOSE: CSR Process Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu @@ -26,7 +26,6 @@ extern RTL_CRITICAL_SECTION ProcessDataLock; extern PCSRSS_PROCESS_DATA ProcessData[256]; PCSRSS_PROCESS_DATA CsrRootProcess; -LIST_ENTRY CsrThreadHashTable[256]; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { sizeof(SECURITY_QUALITY_OF_SERVICE), Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Mon Jul 25 05:54:37 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/procsup.c + * FILE: subsystems/win32/csrss/csrsrv/thredsup.c * PURPOSE: CSR Process Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu

1 0

[ion] 52858: [KERNEL32]: Define the BASE_STATIC_SERVER_DATA structure that BASESRV shares with KERNEL32 on Windows. In Windows, each CSR client/server pair can share such data through the PEB's Rea...
by ion＠svn.reactos.org 25 Jul '11

25 Jul '11

Author: ion Date: Mon Jul 25 03:28:33 2011 New Revision: 52858 URL: http://svn.reactos.org/svn/reactos?rev=52858&view=rev Log: [KERNEL32]: Define the BASE_STATIC_SERVER_DATA structure that BASESRV shares with KERNEL32 on Windows. In Windows, each CSR client/server pair can share such data through the PEB's ReadOnlyStaticServerData array. In ReactOS, this is not (yet) implemented, so if we don't have this data, kernel32 builds a "fake" copy instead. This "fake" copy will still be useful though as it'll let kernel32 cache some data (per-process). With proper CSRSS support, we could cache it per-system, but at least this is a start. Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Mon Jul 25 03:28:33 2011 @@ -21,6 +21,9 @@ extern UNICODE_STRING SystemDirectory; extern UNICODE_STRING WindowsDirectory; + + +PBASE_STATIC_SERVER_DATA BaseStaticServerData; BOOLEAN BaseRunningInServerProcess; @@ -252,6 +255,135 @@ return TRUE; } +VOID +WINAPI +BasepFakeStaticServerData(VOID) +{ + NTSTATUS Status; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING SystemRootString; + UNICODE_STRING UnexpandedSystemRootString = RTL_CONSTANT_STRING(L"%SystemRoot%"); + UNICODE_STRING BaseSrvCSDString; + ULONG BaseSrvCSDNumber; + RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CSDVersion", + &BaseSrvCSDString + }, + {0} + }; + RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable1[] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CSDVersion", + &BaseSrvCSDNumber + }, + {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)); + Status = RtlExpandEnvironmentStrings_U(NULL, + &UnexpandedSystemRootString, + &SystemRootString, + NULL); + ASSERT(NT_SUCCESS(Status)); + + Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; + Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsDirectory, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + + wcscat(SystemRootString.Buffer, L"\\system32"); + Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsSystemDirectory, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + + if (!SessionId) + { + Status = RtlCreateUnicodeString(&BaseStaticServerData->NamedObjectDirectory, + L"\\BaseNamedObjects"); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* Hopefully we'll fix CSRSS Before we add multiple sessions... */ + ASSERT(FALSE); + } + + RtlInitEmptyUnicodeString(&BaseSrvCSDString, Buffer, sizeof(Buffer)); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + L"", + BaseServerRegistryConfigurationTable1, + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + BaseStaticServerData->CSDNumber = (USHORT)(BaseSrvCSDNumber & 0xFFFF); + BaseStaticServerData->RCNumber = (USHORT)(BaseSrvCSDNumber >> 16); + } + else + { + BaseStaticServerData->CSDNumber = 0; + BaseStaticServerData->RCNumber = 0; + } + + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + L"", + BaseServerRegistryConfigurationTable, + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + wcsncpy(BaseStaticServerData->CSDVersion, + BaseSrvCSDString.Buffer, + BaseSrvCSDString.Length / sizeof(WCHAR)); + } + else + { + BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; + } + + Status = NtQuerySystemInformation(SystemBasicInformation, + &BaseStaticServerData->SysInfo, + sizeof(BaseStaticServerData->SysInfo), + NULL); + ASSERT(NT_SUCCESS(Status)); + + 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)); + + DPRINT1("ReactOS Base API Connected: %wZ %wZ %wZ %S (%lx.%lx) %d KB\n", + BaseStaticServerData->WindowsDirectory, + BaseStaticServerData->WindowsSystemDirectory, + BaseStaticServerData->NamedObjectDirectory, + BaseStaticServerData->CSDVersion, + BaseStaticServerData->CSDNumber, + BaseStaticServerData->RCNumber, + BaseStaticServerData->SysInfo.PageSize * + BaseStaticServerData->SysInfo.NumberOfPhysicalPages / 1024); +} BOOL WINAPI @@ -312,6 +444,25 @@ ZwTerminateProcess(NtCurrentProcess(), Status); return FALSE; } + + /* Get the server data */ + if (!Peb->ReadOnlyStaticServerData) + { + /* Build fake one for ReactOS */ + BasepFakeStaticServerData(); + + /* Allocate the array */ + Peb->ReadOnlyStaticServerData = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + 4 * sizeof(PVOID)); + + /* Set the data for the BASESRV DLL Index */ + Peb->ReadOnlyStaticServerData[CSR_CONSOLE] = BaseStaticServerData; + } + + /* Get the server data */ + BaseStaticServerData = Peb->ReadOnlyStaticServerData[CSR_CONSOLE]; + ASSERT(BaseStaticServerData); /* Check if we are running a CSR Server */ if (!BaseRunningInServerProcess) Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Mon Jul 25 03:28:33 2011 @@ -80,6 +80,75 @@ CPTABLEINFO CodePageTable; } CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; +typedef struct _NLS_USER_INFO +{ + WCHAR iCountry[80]; + WCHAR sCountry[80]; + WCHAR sList[80]; + WCHAR iMeasure[80]; + WCHAR iPaperSize[80]; + WCHAR sDecimal[80]; + WCHAR sThousand[80]; + WCHAR sGrouping[80]; + WCHAR iDigits[80]; + WCHAR iLZero[80]; + WCHAR iNegNumber[80]; + WCHAR sNativeDigits[80]; + WCHAR iDigitSubstitution[80]; + WCHAR sCurrency[80]; + WCHAR sMonDecSep[80]; + WCHAR sMonThouSep[80]; + WCHAR sMonGrouping[80]; + WCHAR iCurrDigits[80]; + WCHAR iCurrency[80]; + WCHAR iNegCurr[80]; + WCHAR sPosSign[80]; + WCHAR sNegSign[80]; + WCHAR sTimeFormat[80]; + WCHAR s1159[80]; + WCHAR s2359[80]; + WCHAR sShortDate[80]; + WCHAR sYearMonth[80]; + WCHAR sLongDate[80]; + WCHAR iCalType[80]; + WCHAR iFirstDay[80]; + WCHAR iFirstWeek[80]; + WCHAR sLocale[80]; + WCHAR sLocaleName[85]; + LCID UserLocaleId; + LUID InteractiveUserLuid; + CHAR InteractiveUserSid[SECURITY_MAX_SID_SIZE]; + ULONG ulCacheUpdateCount; +} NLS_USER_INFO, *PNLS_USER_INFO; + +typedef struct _BASE_STATIC_SERVER_DATA +{ + UNICODE_STRING WindowsDirectory; + UNICODE_STRING WindowsSystemDirectory; + UNICODE_STRING NamedObjectDirectory; + USHORT WindowsMajorVersion; + USHORT WindowsMinorVersion; + USHORT BuildNumber; + USHORT CSDNumber; + USHORT RCNumber; + WCHAR CSDVersion[128]; + SYSTEM_BASIC_INFORMATION SysInfo; + SYSTEM_TIMEOFDAY_INFORMATION TimeOfDay; + PVOID IniFileMapping; + NLS_USER_INFO NlsUserInfo; + BOOLEAN DefaultSeparateVDM; + BOOLEAN IsWowTaskReady; + UNICODE_STRING WindowsSys32x86Directory; + BOOLEAN fTermsrvAppInstallMode; + TIME_ZONE_INFORMATION tziTermsrvClientTimeZone; + KSYSTEM_TIME ktTermsrvClientBias; + ULONG TermsrvClientTimeZoneId; + BOOLEAN LUIDDeviceMapsEnabled; + ULONG TermsrvClientTimeZoneChangeNum; +} BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; + +extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; + typedef DWORD (*WaitForInputIdleType)(

1 0

[tkreuzer] 52857: [NTOSKRNL] - Use NtTib.ExceptionList instead of Used_ExceptionList - use ALIGN_DOWN_BY macro
by tkreuzer＠svn.reactos.org 25 Jul '11

25 Jul '11

Author: tkreuzer Date: Mon Jul 25 00:50:53 2011 New Revision: 52857 URL: http://svn.reactos.org/svn/reactos?rev=52857&view=rev Log: [NTOSKRNL] - Use NtTib.ExceptionList instead of Used_ExceptionList - use ALIGN_DOWN_BY macro Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Mon Jul 25 00:50:53 2011 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/ke/i386/usercall.c * PURPOSE: User-mode Callout Mechanisms (APC and Win32K Callbacks) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -208,8 +209,9 @@ return CallbackStatus; } -/* Stack layout: - * + +/* + * Stack layout for KiUserModeCallout: * ---------------------------------- * KCALLOUT_FRAME.ResultLength <= 2nd Parameter to KiCallUserMode * KCALLOUT_FRAME.Result <= 1st Parameter to KiCallUserMode @@ -271,8 +273,8 @@ } #endif - /* Align stack on 16-byte boundary */ - InitialStack = (ULONG_PTR)CalloutFrame & ~15; + /* Align stack on a 16-byte boundary */ + InitialStack = ALIGN_DOWN_BY(CalloutFrame, 16); /* Check if we have enough space on the stack */ if ((InitialStack - KERNEL_STACK_SIZE) < CurrentThread->StackLimit) @@ -322,20 +324,20 @@ Pcr = KeGetPcr(); /* Update the exception list */ - CallbackTrapFrame->ExceptionList = Pcr->Used_ExceptionList; + CallbackTrapFrame->ExceptionList = Pcr->NtTib.ExceptionList; /* Get TSS */ Tss = Pcr->TSS; - /* Bias the stack for V86 mode */ + /* Check for V86 mode */ if (CallbackTrapFrame->EFlags & EFLAGS_V86_MASK) { - /* Set new stack address in TSS */ + /* Set new stack address in TSS (full trap frame) */ Tss->Esp0 = (ULONG_PTR)(CallbackTrapFrame + 1); } else { - /* Set new stack address in TSS */ + /* Set new stack address in TSS (non-V86 trap frame) */ Tss->Esp0 = (ULONG_PTR)&CallbackTrapFrame->V86Es; }

1 0

[tkreuzer] 52856: [NTOSKRNL] Fix typos in comments
by tkreuzer＠svn.reactos.org 25 Jul '11

25 Jul '11

Author: tkreuzer Date: Mon Jul 25 00:07:07 2011 New Revision: 52856 URL: http://svn.reactos.org/svn/reactos?rev=52856&view=rev Log: [NTOSKRNL] Fix typos in comments Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Mon Jul 25 00:07:07 2011 @@ -215,7 +215,7 @@ * KCALLOUT_FRAME.Result <= 1st Parameter to KiCallUserMode * KCALLOUT_FRAME.ReturnAddress <= Return address of KiCallUserMode * KCALLOUT_FRAME.Ebp \ - * KCALLOUT_FRAME.Ebx | = volatile registers, pushed + * KCALLOUT_FRAME.Ebx | = non-volatile registers, pushed * KCALLOUT_FRAME.Esi | by KiCallUserMode * KCALLOUT_FRAME.Edi / * KCALLOUT_FRAME.CallbackStack Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Mon Jul 25 00:07:07 2011 @@ -49,7 +49,7 @@ PUBLIC _KiCallUserMode@8 _KiCallUserMode@8: - /* Push volatile registers on the stack. + /* Push non-volatile registers on the stack. This is part of the KCALLOUT_FRAME */ push ebp push ebx

1 0

[tkreuzer] 52855: [NTOSKRNL] - Convert KiCallUserMode from asm to C (with a small asm wrapper) - Convert KiGetUserModeStackAddress into a C inline function
by tkreuzer＠svn.reactos.org 25 Jul '11

25 Jul '11

Author: tkreuzer Date: Mon Jul 25 00:01:29 2011 New Revision: 52855 URL: http://svn.reactos.org/svn/reactos?rev=52855&view=rev Log: [NTOSKRNL] - Convert KiCallUserMode from asm to C (with a small asm wrapper) - Convert KiGetUserModeStackAddress into a C inline function Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jul 25 00:01:29 2011 @@ -846,4 +846,11 @@ KeGetContextSwitches(KeGetCurrentPrcb())); } +FORCEINLINE +PULONG +KiGetUserModeStackAddress(void) +{ + return &(KeGetCurrentThread()->TrapFrame->HardwareEsp); +} + #endif Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Jul 25 00:01:29 2011 @@ -164,7 +164,7 @@ #define TIMER_WAIT_BLOCK 0x3L #ifdef _M_ARM // FIXME: remove this once our headers are cleaned up -// +// // A system call ID is formatted as such: // .________________________________________________________________. // | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | @@ -187,7 +187,7 @@ // // NB. From assembly code, the table number must be computed as an offset into // the service descriptor table. -// +// // Each entry into the table is 16 bytes long on 32-bit architectures, and // 32 bytes long on 64-bit architectures. // @@ -864,7 +864,7 @@ ULONG_PTR BugCheckParameter4, PKTRAP_FRAME Tf ); - + BOOLEAN NTAPI KiHandleNmi(VOID); @@ -1020,12 +1020,6 @@ IN PULONG OutputLength ); -PULONG -NTAPI -KiGetUserModeStackAddress( - VOID -); - VOID NTAPI KiInitMachineDependent(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Jul 25 00:01:29 2011 @@ -6,6 +6,7 @@ struct _EPROCESS; +extern PMMSUPPORT MmKernelAddressSpace; extern PFN_NUMBER MiFreeSwapPages; extern PFN_NUMBER MiUsedSwapPages; extern SIZE_T MmTotalPagedPoolQuota; @@ -1134,7 +1135,7 @@ /* Make sure the PFN number is valid */ if (Pfn > MmHighestPhysicalPage) return NULL; - + /* Make sure this page actually has a PFN entry */ if ((MiPfnBitMap.Buffer) && !(RtlTestBit(&MiPfnBitMap, (ULONG)Pfn))) return NULL; @@ -1338,7 +1339,7 @@ VOID NTAPI MmGetPageFileMapping( - struct _EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, SWAPENTRY* SwapEntry); @@ -1735,7 +1736,15 @@ IN PLIST_ENTRY ListHead ); -extern PMMSUPPORT MmKernelAddressSpace; + +/* procsup.c *****************************************************************/ + +NTSTATUS +NTAPI +MmGrowKernelStack( + IN PVOID StackPointer +); + FORCEINLINE VOID Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c [iso-8859-1] Mon Jul 25 00:01:29 2011 @@ -208,4 +208,146 @@ return CallbackStatus; } +/* Stack layout: + * + * ---------------------------------- + * KCALLOUT_FRAME.ResultLength <= 2nd Parameter to KiCallUserMode + * KCALLOUT_FRAME.Result <= 1st Parameter to KiCallUserMode + * KCALLOUT_FRAME.ReturnAddress <= Return address of KiCallUserMode + * KCALLOUT_FRAME.Ebp \ + * KCALLOUT_FRAME.Ebx | = volatile registers, pushed + * KCALLOUT_FRAME.Esi | by KiCallUserMode + * KCALLOUT_FRAME.Edi / + * KCALLOUT_FRAME.CallbackStack + * KCALLOUT_FRAME.TrapFrame + * KCALLOUT_FRAME.InitialStack <= CalloutFrame points here + * ---------------------------------- + * ~~ optional alignment ~~ + * ---------------------------------- + * FX_SAVE_AREA + * ---------------------------------- + * KTRAP_FRAME + * ---------------------------------- + * ~~ begin of stack frame for KiUserModeCallout ~~ + * + */ + +NTSTATUS +FASTCALL +KiUserModeCallout(PKCALLOUT_FRAME CalloutFrame) +{ + PKTHREAD CurrentThread; + PKTRAP_FRAME TrapFrame, CallbackTrapFrame; + PFX_SAVE_AREA FxSaveArea, OldFxSaveArea; + PKPCR Pcr; + PKTSS Tss; + ULONG_PTR InitialStack; + NTSTATUS Status; + + /* Get the current thread */ + CurrentThread = KeGetCurrentThread(); + +#if DBG + /* Check if we are at pasive level */ + if (KeGetCurrentIrql() != PASSIVE_LEVEL) + { + /* We're not, bugcheck */ + KeBugCheckEx(IRQL_GT_ZERO_AT_SYSTEM_SERVICE, + 0, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Check if we are attached or APCs are disabled */ + if ((CurrentThread->ApcStateIndex != OriginalApcEnvironment) || + (CurrentThread->CombinedApcDisable > 0)) + { + KeBugCheckEx(APC_INDEX_MISMATCH, + 0, + CurrentThread->ApcStateIndex, + CurrentThread->CombinedApcDisable, + 0); + } +#endif + + /* Align stack on 16-byte boundary */ + InitialStack = (ULONG_PTR)CalloutFrame & ~15; + + /* Check if we have enough space on the stack */ + if ((InitialStack - KERNEL_STACK_SIZE) < CurrentThread->StackLimit) + { + /* We don't, we'll have to grow our stack */ + Status = MmGrowKernelStack((PVOID)InitialStack); + + /* Quit if we failed */ + if (!NT_SUCCESS(Status)) return Status; + } + + /* Save the current callback stack and initial stack */ + CalloutFrame->CallbackStack = (ULONG_PTR)CurrentThread->CallbackStack; + CalloutFrame->InitialStack = (ULONG_PTR)CurrentThread->InitialStack; + + /* Get and save the trap frame */ + TrapFrame = CurrentThread->TrapFrame; + CalloutFrame->TrapFrame = (ULONG_PTR)TrapFrame; + + /* Set the new callback stack */ + CurrentThread->CallbackStack = CalloutFrame; + + /* Set destination and origin NPX Areas */ + OldFxSaveArea = (PVOID)(CalloutFrame->InitialStack - sizeof(FX_SAVE_AREA)); + FxSaveArea = (PVOID)(InitialStack - sizeof(FX_SAVE_AREA)); + + /* Disable interrupts so we can fill the NPX State */ + _disable(); + + /* Now copy the NPX State */ + FxSaveArea->U.FnArea.ControlWord = OldFxSaveArea->U.FnArea.ControlWord; + FxSaveArea->U.FnArea.StatusWord = OldFxSaveArea->U.FnArea.StatusWord; + FxSaveArea->U.FnArea.TagWord = OldFxSaveArea->U.FnArea.TagWord; + FxSaveArea->U.FnArea.DataSelector = OldFxSaveArea->U.FnArea.DataSelector; + FxSaveArea->Cr0NpxState = OldFxSaveArea->Cr0NpxState; + + /* Set the stack address */ + CurrentThread->InitialStack = (PVOID)InitialStack; + + /* Locate the trap frame on the callback stack */ + CallbackTrapFrame = (PVOID)((ULONG_PTR)FxSaveArea - sizeof(KTRAP_FRAME)); + + /* Copy the trap frame to the new location */ + *CallbackTrapFrame = *TrapFrame; + + /* Get PCR */ + Pcr = KeGetPcr(); + + /* Update the exception list */ + CallbackTrapFrame->ExceptionList = Pcr->Used_ExceptionList; + + /* Get TSS */ + Tss = Pcr->TSS; + + /* Bias the stack for V86 mode */ + if (CallbackTrapFrame->EFlags & EFLAGS_V86_MASK) + { + /* Set new stack address in TSS */ + Tss->Esp0 = (ULONG_PTR)(CallbackTrapFrame + 1); + } + else + { + /* Set new stack address in TSS */ + Tss->Esp0 = (ULONG_PTR)&CallbackTrapFrame->V86Es; + } + + /* Set user-mode dispatcher address as EIP */ + CallbackTrapFrame->Eip = (ULONG_PTR)KeUserCallbackDispatcher; + + /* Bring interrupts back */ + _enable(); + + /* Exit to user-mode */ + KiServiceExit(CallbackTrapFrame, 0); +} + + /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Mon Jul 25 00:01:29 2011 @@ -17,19 +17,10 @@ EXTERN @KiServiceExit@8:PROC EXTERN _KeGetCurrentIrql@0:PROC EXTERN _KeBugCheckEx@20:PROC +EXTERN @KiUserModeCallout@4:PROC /* FUNCTIONS ****************************************************************/ .code - -PUBLIC _KiGetUserModeStackAddress@0 -_KiGetUserModeStackAddress@0: - - /* Get the current thread's trapframe and return the esp */ - mov eax, fs:[KPCR_CURRENT_THREAD] - mov eax, [eax+KTHREAD_TRAP_FRAME] - lea eax, [eax+KTRAP_FRAME_ESP] - ret - /*++ * @name KiCallUserMode @@ -58,166 +49,23 @@ PUBLIC _KiCallUserMode@8 _KiCallUserMode@8: - /* Save volatile registers */ + /* Push volatile registers on the stack. + This is part of the KCALLOUT_FRAME */ push ebp push ebx push esi push edi - /* Get the current thread */ - mov ebx, fs:[KPCR_CURRENT_THREAD] - - /* Make sure we're at passive */ -#if DBG - call _KeGetCurrentIrql@0 - or al, al - jz AtPassive - - /* We're not, bugcheck! */ - push 0 - push 0 - push eax - push 0 - push IRQL_GT_ZERO_AT_SYSTEM_SERVICE - call _KeBugCheckEx@20 - -AtPassive: - - /* Make sure that we are not attached and that APCs are not disabled */ - movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] - mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] - or eax, eax - jnz InvalidIndex - or edx, edx - jz ApcsEnabled - -InvalidIndex: - - push 0 - push edx - push eax - push 0 - push APC_INDEX_MISMATCH - call _KeBugCheckEx@20 -ApcsEnabled: -#endif - - /* Get the lowest stack limit and check if we can handle it */ - lea eax, [esp-HEX(3000)] - cmp eax, [ebx+KTHREAD_STACK_LIMIT] - jnb StackOk - - /* We can't, we'll have to grow our stack */ - push esp - call _MmGrowKernelStack@4 - - /* Quit if we failed */ - or eax, eax - jnz GrowFailed - - /* Save the current callback stack */ -StackOk: - push [ebx+KTHREAD_CALLBACK_STACK] - - /* Get and save the trap frame */ - mov edx, [ebx+KTHREAD_TRAP_FRAME] - push edx - - /* Get and save the initial stack */ - mov esi, [ebx+KTHREAD_INITIAL_STACK] - push esi - - /* Set the new callback stack */ - mov [ebx+KTHREAD_CALLBACK_STACK], esp - - /* Align stack on 16-byte boundary */ - and esp, NOT 15 - mov edi, esp - - /* Set destination and origin NPX Areas */ - sub esp, NPX_FRAME_LENGTH - sub esi, NPX_FRAME_LENGTH - - /* Disable interrupts so we can fill the NPX State */ - cli - - /* Now copy the NPX State */ - mov ecx, [esi+FP_CONTROL_WORD] - mov [esp+FP_CONTROL_WORD], ecx - mov ecx, [esi+FP_STATUS_WORD] - mov [esp+FP_STATUS_WORD], ecx - mov ecx, [esi+FP_TAG_WORD] - mov [esp+FP_TAG_WORD], ecx - mov ecx, [esi+FP_DATA_SELECTOR] - mov [esp+FP_DATA_SELECTOR], ecx - mov ecx, [esi+FN_CR0_NPX_STATE] - mov [esp+FN_CR0_NPX_STATE], ecx - - /* Get TSS */ - mov esi, fs:[KPCR_TSS] - - /* Set the stack address */ - mov [ebx+KTHREAD_INITIAL_STACK], edi - - /* Bias the stack for V86 mode */ - mov ecx, esp - sub esp, 16 - test dword ptr [edx+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz DontBias - mov ecx, esp - -DontBias: - /* Set new stack address in TSS */ - mov [esi+KTSS_ESP0], ecx - - /* Allocate the trap frame and set it */ - sub esp, KTRAP_FRAME_V86_ES - mov ebp, esp - - /* Set copy iterator and dest/origin parameters and do the copy */ - mov ecx, (KTRAP_FRAME_V86_ES - KTRAP_FRAME_FS) / 4 - lea edi, [esp+KTRAP_FRAME_FS] - lea esi, [edx+KTRAP_FRAME_FS] - rep movsd - - /* Copy DR7 */ - mov edi, [edx+KTRAP_FRAME_DR7] - test edi, NOT DR7_RESERVED_MASK - mov [esp+KTRAP_FRAME_DR7], edi - - /* Check if we need to save debug registers */ - jnz SaveDebug - - /* Get user-mode dispatcher address and set it as EIP */ -SetEip: - mov eax, dword ptr [_KeUserCallbackDispatcher] - mov [esp+KTRAP_FRAME_EIP], eax - - /* Set the exception list */ - mov eax, fs:[KPCR_EXCEPTION_LIST] - mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax - - /* Set the previous mode */ - mov eax, [edx+KTRAP_FRAME_PREVIOUS_MODE] - mov [esp+KTRAP_FRAME_PREVIOUS_MODE], eax - - /* Bring interrupts back */ - sti - - /* Exit to user-mode */ - mov ecx, esp - jmp @KiServiceExit@8 - -SaveDebug: - - /* Copy all 5 DRs */ - mov ecx, 5 - lea edi, [esp+KTRAP_FRAME_DR0] - lea esi, [edx+KTRAP_FRAME_DR0] - rep movsd - jmp SetEip - -GrowFailed: + /* load the address of the callout frame into ecx */ + lea ecx, [esp - 12] + + /* Allocate space for the inital stack */ + sub esp, 12 + NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + 16 + + call @KiUserModeCallout@4 + + add esp, 12 + NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + 16 + /* Restore registers */ pop edi pop esi

1 0

[ion] 52854: [KERNEL32]: Fix the spec/pspec files to match 100% the exports on NT 5.2's Kernel32.dll [KERNEL32]: Remove, add, fix, stub functions where necessary to handle these new/modified exports.
by ion＠svn.reactos.org 24 Jul '11

24 Jul '11

Author: ion Date: Sun Jul 24 23:42:09 2011 New Revision: 52854 URL: http://svn.reactos.org/svn/reactos?rev=52854&view=rev Log: [KERNEL32]: Fix the spec/pspec files to match 100% the exports on NT 5.2's Kernel32.dll [KERNEL32]: Remove, add, fix, stub functions where necessary to handle these new/modified exports. Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c trunk/reactos/dll/win32/kernel32/client/environ.c trunk/reactos/dll/win32/kernel32/client/time.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/wine/lzexpand.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/wine/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/lz… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…

1 0

[tkreuzer] 52853: [NTOSKRNL] Forgot this file
by tkreuzer＠svn.reactos.org 24 Jul '11

24 Jul '11

Author: tkreuzer Date: Sun Jul 24 23:19:16 2011 New Revision: 52853 URL: http://svn.reactos.org/svn/reactos?rev=52853&view=rev Log: [NTOSKRNL] Forgot this file Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jul 24 23:19:16 2011 @@ -218,7 +218,7 @@ <directory name="ex"> <if property="ARCH" value="i386"> <directory name="i386"> - <file>interlck_asm.S</file> + <file>interlocked.c</file> <file>fastinterlck_asm.S</file> <file>ioport.S</file> </directory>

1 0

[tkreuzer] 52852: [NTOSKRNL] Convert most ExInterlocked* functions from asm to C Exceptions are ExInterlockedAddLargeStatistic and SList funcions
by tkreuzer＠svn.reactos.org 24 Jul '11

24 Jul '11

Author: tkreuzer Date: Sun Jul 24 23:14:39 2011 New Revision: 52852 URL: http://svn.reactos.org/svn/reactos?rev=52852&view=rev Log: [NTOSKRNL] Convert most ExInterlocked* functions from asm to C Exceptions are ExInterlockedAddLargeStatistic and SList funcions Added: trunk/reactos/ntoskrnl/ex/i386/interlocked.c (with props) Removed: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sun Jul 24 23:14:39 2011 @@ -276,8 +276,8 @@ if(ARCH MATCHES i386) list(APPEND SOURCE config/i386/cmhardwr.c - ex/i386/interlck_asm.S ex/i386/fastinterlck_asm.S + ex/i386/interlocked.c ex/i386/ioport.S ke/i386/abios.c ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Sun Jul 24 23:14:39 2011 @@ -5,7 +5,7 @@ * PURPOSE: FASTCALL Interlocked Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ - + /* INCLUDES ******************************************************************/ #include <asm.inc> @@ -51,331 +51,7 @@ /* Return */ ret -/*ULONG - *FASTCALL - *ExfInterlockedAddUlong(IN PULONG Addend, - * IN ULONG Increment, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedAddUlong@12 -@ExfInterlockedAddUlong@12: - /* Save flags */ - pushfd - -#ifdef CONFIG_SMP - /* Get lock address */ - mov eax, [esp+8] -.start1: -#endif - /* Disable interrupts */ - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(eax, .spin1) - - /* Do the add */ - mov eax, [ecx] - add [ecx], edx - -#ifdef CONFIG_SMP - /* Get spinlock address and release it */ - mov edx, [esp+8] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags and return */ - popfd - ret 4 - -#ifdef CONFIG_SMP -.spin1: - /* Restore flags and spin */ - popfd - pushfd - SPIN_ON_LOCK(eax, .start1) -#endif - -/*PLIST_ENTRY - *FASTCALL - *ExfInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedInsertHeadList@12 -@ExfInterlockedInsertHeadList@12: - -#ifdef CONFIG_SMP - /* Save lock address */ - push esi - mov esi, [esp+8] -#endif - - /* Save flags and disable interrupts */ - pushfd -.start2: - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(esi, .spin2) - - /* Get list pointer */ - mov eax, [ecx] - - /* Do the insert */ - mov [edx], eax - mov [edx+4], ecx - mov [ecx], edx - mov [eax+4], edx - - /* Release lock and restore flags */ - RELEASE_SPINLOCK(esi) - popfd - -#ifdef CONFIG_SMP - pop esi -#endif - - /* Check if list was empty */ - xor eax, ecx - jz .l2 - - /* Return list pointer */ - xor eax, ecx -.l2: - ret 4 - -#ifdef CONFIG_SMP -.spin2: - popfd - pushfd - SPIN_ON_LOCK(esi, .start2) -#endif - -/*PLIST_ENTRY - *FASTCALL - *ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedInsertTailList@12 -@ExfInterlockedInsertTailList@12: - -#ifdef CONFIG_SMP - /* Save lock address */ - push esi - mov esi, [esp+8] -#endif - - /* Save flags and disable interrupts */ - pushfd -.start3: - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(esi, .spin3) - - /* Get list pointer */ - mov eax, [ecx+4] - - /* Do the insert */ - mov [edx], ecx - mov [edx+4], eax - mov [ecx+4], edx - mov [eax], edx - - /* Release lock and restore flags */ - RELEASE_SPINLOCK(esi) - popfd - -#ifdef CONFIG_SMP - pop esi -#endif - - /* Check if list was empty */ - xor eax, ecx - jz .l3 - - /* Return list pointer */ - xor eax, ecx -.l3: - ret 4 - -#ifdef CONFIG_SMP -.spin3: - popfd - pushfd - SPIN_ON_LOCK(esi, .start3) -#endif - -/*PLIST_ENTRY - *FASTCALL - *ExfInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedRemoveHeadList@8 -@ExfInterlockedRemoveHeadList@8: - - /* Save flags and disable interrupts */ -.start4: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin4) - - /* Get list pointer */ - mov eax, [ecx] - - /* Check if it's empty */ - cmp eax, ecx - je .l4 - - /* Get the next entry and do the deletion */ -#ifdef CONFIG_SMP - push ebx - mov ebx, [eax] - mov [ecx], ebx - mov [ebx+4], ecx -#else - mov edx, [eax] - mov [ecx], edx - mov [edx+4], ecx -#endif - - /* Release lock */ -#ifdef CONFIG_SMP - RELEASE_SPINLOCK(edx) - pop ebx -#endif - - /* Restore flags */ - popfd - - /* Return */ - ret - -.l4: - /* Release lock */ - RELEASE_SPINLOCK(edx) - - /* Restore flags */ - popfd - - /* Return empty list */ - xor eax, eax - ret - -#ifdef CONFIG_SMP -.spin4: - popfd - SPIN_ON_LOCK(edx, .start4) -#endif - -/*PSINGLE_LIST_ENTRY - *FASTCALL - *ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedPopEntryList@8 -@ExfInterlockedPopEntryList@8: - - /* Save flags and disable interrupts */ -.start5: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin5) - - /* Get list pointer */ - mov eax, [ecx] - - /* Check if it's empty */ - or eax, eax - je .l6 - - /* Get next entry and do deletion */ -#ifdef CONFIG_SMP - push edx -#endif - mov edx, [eax] - mov [ecx], edx -#ifdef CONFIG_SMP - pop edx -#endif - -.l5: - /* Release lock */ - RELEASE_SPINLOCK(edx) - - /* Restore flags */ - popfd - - /* Return */ - ret - -.l6: - /* Return empty list */ - xor eax, eax - jmp .l5 - -#ifdef CONFIG_SMP -.spin5: - popfd - SPIN_ON_LOCK(edx, .start5) -#endif - -/*PSINGLE_LIST_ENTRY - *FASTCALL - *ExfInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PSINGLE_LIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedPushEntryList@12 -@ExfInterlockedPushEntryList@12: - - /* Save flags */ - pushfd - - /* Save lock pointer */ -#ifdef CONFIG_SMP - push edx - mov edx, [esp+12] -#endif - - /* Disable interrupts */ -.start6: - cli -#ifdef CONFIG_SMP - ACQUIRE_SPINLOCK(edx, .spin6) - pop edx -#endif - - /* Get list pointer */ - mov eax, [ecx] - - /* Do push */ - mov [edx], eax - mov [ecx], edx - - /* Release lock */ -#ifdef CONFIG_SMP - mov edx, [esp+8] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags */ - popfd - - /* Return */ - ret 4 - -#ifdef CONFIG_SMP -.spin6: - pop edx - popfd - pushfd - push edx - mov edx, [esp+12] - SPIN_ON_LOCK(edx, .start6) -#endif /*PSINGLE_LIST_ENTRY *FASTCALL @@ -505,301 +181,5 @@ pop ebx ret -/*INTERLOCKED_RESULT - *FASTCALL - *Exfi386InterlockedIncrementLong(IN PLONG Addend) - */ -PUBLIC @Exfi386InterlockedIncrementLong@4 -@Exfi386InterlockedIncrementLong@4: - - /* Do the op */ - LOCK add dword ptr [ecx], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret - -/*INTERLOCKED_RESULT - *FASTCALL - *Exfi386InterlockedDecrementLong(IN PLONG Addend) - */ -PUBLIC @Exfi386InterlockedDecrementLong@4 -@Exfi386InterlockedDecrementLong@4: - - /* Do the op */ - LOCK sub dword ptr [ecx], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret - -/*ULONG - *FASTCALL - *Exfi386InterlockedExchangeUlong(IN PULONG Target, - * IN ULONG Value) - */ -PUBLIC @Exfi386InterlockedExchangeUlong@8 -@Exfi386InterlockedExchangeUlong@8: - -#ifdef CONFIG_SMP - /* On MP, do the exchange */ - xchg [ecx], edx - mov eax, edx -#else - /* On UP, use cmpxchg */ - mov eax, [ecx] -.l11: - cmpxchg [ecx], edx - jnz .l11 -#endif - - /* Return */ - ret - -/*PVOID - *FASTCALL - *ExfInterlockedCompareExchange64(IN PLONGLONG Destination, - * IN PLONGLONG Exchange, - * IN PLONGLONG Comperand) - */ -PUBLIC @ExfInterlockedCompareExchange64@12 -@ExfInterlockedCompareExchange64@12: - - /* Save registers */ - push ebx - push ebp - - /* Get destination pointer, exchange value and comperand value/address */ - mov ebp, ecx - mov ebx, [edx] - mov ecx, [edx+4] - mov edx, [esp+12] - mov eax, [edx] - mov edx, [edx+4] - - /* Do the op */ - LOCK cmpxchg8b qword ptr [ebp] - - /* Restore volatiles */ - pop ebp - pop ebx - - /* Return */ - ret 4 - -/*PVOID - *FASTCALL - *ExInterlockedCompareExchange64(IN PLONGLONG Destination, - * IN PLONGLONG Exchange, - * IN PLONGLONG Comperand, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExInterlockedCompareExchange64@16 -@ExInterlockedCompareExchange64@16: - - /* Save registers */ - push ebx - push ebp - - /* Get destination pointer, exchange value and comperand value/address */ - mov ebp, ecx - mov ebx, [edx] - mov ecx, [edx+4] - mov edx, [esp+12] - mov eax, [edx] - mov edx, [edx+4] - - /* Do the op */ - LOCK cmpxchg8b qword ptr [ebp] - - /* Restore volatiles */ - pop ebp - pop ebx - - /* Return */ - ret 8 - -/*** Non-586 functions ***/ - -/*PSINGLE_LIST_ENTRY - *FASTCALL - *ExfInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedPopEntrySList@8 -@ExfInterlockedPopEntrySList@8: - - /* Save flags */ -.starta: - pushfd - - /* Disable interrupts */ - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(edx, .spina) - - /* Get the next link and check if it's empty */ - mov eax, [ecx] - or eax, eax - jz .l12 - - /* Get address of the next link and store it */ - push [eax] - pop [ecx] - - /* Decrement list depth */ - dec dword ptr [ecx+4] - -.l12: -#ifdef CONFIG_SMP - /* Release spinlock */ - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags and return */ - popfd - ret 0 - -#ifdef CONFIG_SMP -.spina: - /* Restore flags and spin */ - popfd - SPIN_ON_LOCK(edx, .starta) -#endif - -/*PSINGLE_LIST_ENTRY - *FASTCALL - *ExfInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PSINGLE_LIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExfInterlockedPushEntrySList@12 -@ExfInterlockedPushEntrySList@12: - - /* Save flags */ -.startb: - pushfd - - /* Disable interrupts */ - cli - - /* Acquire lock */ -#ifndef CONFIG_SMP - mov eax, [esp+8] - ACQUIRE_SPINLOCK(eax, .spinb) -#endif - - /* Get the next link and check if it's empty */ - push [ecx] - - /* Get address of the next link and store it */ - pop [edx] - mov [ecx], edx - - /* Increment list depth */ - inc dword ptr [ecx+4] - -#ifdef CONFIG_SMP - /* Release spinlock */ - RELEASE_SPINLOCK(eax) -#endif - - /* Restore flags and return */ - popfd - ret 4 - -#ifdef CONFIG_SMP -.spinb: - /* Restore flags and spin */ - popfd - SPIN_ON_LOCK(eax, .startb) -#endif - -/*PVOID - *FASTCALL - *ExpInterlockedCompareExchange64(IN PLONGLONG Destination, - * IN PLONGLONG Exchange, - * IN PLONGLONG Comperand, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC @ExpInterlockedCompareExchange64@16 -@ExpInterlockedCompareExchange64@16: - - /* Save registers */ - push ebp - push ebp - - /* Get destination pointer, exchange value and comperand value/address */ - mov ebp, ecx - mov ebx, [edx] - mov ecx, [edx+4] - mov edx, [esp+12] - mov eax, [edx] - mov edx, [edx+4] - -#ifdef CONFIG_SMP - /* Save ESI so we can store KSPINLOCK in it */ - push esi - - /* Save flags and lock, and disable interrupts */ - pushfd - mov esi, [esp+24] -.startc: - cli - - /* Acquire the spinlock */ - ACQUIRE_SPINLOCK(esi, .spinc) -#else - /* Save flags and disable interrupts */ - pushfd - cli -#endif - - /* Compare bottom */ - cmp eax, [ebp] - jne NoMatch - - /* Compare top */ - cmp edx, [ebp+4] - jne NoMatch - - /* Save new value */ - mov [ebp], ebx - mov [ebp+4], ecx - -AfterSave: -#ifdef CONFIG_SMP - /* Release lock, restore volatiles and flags */ - RELEASE_SPINLOCK(esi) - popfd - pop esi -#else - popfd -#endif - - /* Restore the other volatiles and return */ - pop ebp - pop ebx - - /* Return */ - ret 8 - -NoMatch: - /* Return the current value */ - mov eax, [ebp] - mov edx, [ebp+4] - jmp AfterSave - -#ifdef CONFIG_SMP -.spinc: - /* Restore flags and spin */ - popfd - pushfd - SPIN_ON_LOCK(esi, .startc) -#endif - END /* EOF */ Removed: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S (removed) @@ -1,569 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/i386/interlck_asm.S - * PURPOSE: STDCALL Interlocked Functions - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ks386.inc> -#include <internal/i386/asmmacro.S> - -/* FUNCTIONS ****************************************************************/ - -.code32 - -/* - * NOTE: These functions must obey the following rules: - * - Acquire locks only on MP systems. - * - Be safe at HIGH_LEVEL (no paged access). - * - Preserve flags. - * - Disable interrups. - */ - -/*PLIST_ENTRY - *NTAPI - *ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend, - * IN LARGE_INTEGER Increment, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedAddLargeInteger@16 -_ExInterlockedAddLargeInteger@16: - - /* Prepare stack frame */ - push ebp - mov ebp, esp - sub esp, 8 - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov eax, [ebp+20] -#endif - - /* Save flags and disable interrupts */ -.start1: - pushfd - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(eax, .spin1) - - /* Do the calculation */ - mov eax, [ebp+8] - mov ecx, [eax] - mov edx, [eax+4] - - /* Save result */ - mov [ebp-8], ecx - mov [ebp-4], edx - - /* Add increment */ - add ecx, [ebp+12] - adc edx, [ebp+16] - - /* Save result */ - mov [eax], ecx - mov [eax+4], edx - - /* Release lock */ -#ifdef CONFIG_SMP - mov eax, [ebp+20] - RELEASE_SPINLOCK(eax) -#endif - - /* Restore flags */ - popfd - - /* Restore frame and return values */ - mov eax, [ebp-8] - mov edx, [ebp-4] - mov esp, ebp - pop ebp - ret 16 - -#ifdef CONFIG_SMP -.spin1: - popfd - SPIN_ON_LOCK(eax, .start1) -#endif - -/*PLIST_ENTRY - *NTAPI - *ExInterlockedAddUlong(IN PULONG Addend, - * IN ULONG Increment, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedAddUlong@12 -_ExInterlockedAddUlong@12: - - /* Save flags and disable interrupts */ - pushfd - - /* Get lock address */ -#ifdef CONFIG_SMP - mov edx, [ebp+16] -#endif -.start2: - cli - - /* Acquire lock */ - ACQUIRE_SPINLOCK(edx, .spin2) - - /* Do the calculation */ - mov ecx, [esp+8] -#ifdef CONFIG_SMP - mov eax, [ecx] - add eax, [esp+12] - - /* Save result */ - mov [ecx], eax -#else - - /* Do the calculation */ - mov edx, [ecx] - mov eax, edx - add edx, [esp+12] - - /* Save result */ - mov [ecx], edx -#endif - - /* Release lock, restore flags and return */ -#ifdef CONFIG_SMP - sub eax, [esp+12] - RELEASE_SPINLOCK(edx) -#endif - popfd - ret 12 - -#ifdef CONFIG_SMP -.spin2: - popfd - pushfd - SPIN_ON_LOCK(eax, .start2) -#endif - -/*PLIST_ENTRY - *NTAPI - *ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedInsertHeadList@12 -_ExInterlockedInsertHeadList@12: - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov edx, [esp+12] -#endif - - /* Save flags and disable interrupts */ -.start3: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin3) - - /* Get list pointers */ - mov eax, [esp+8] - mov ecx, [esp+12] - mov edx, [eax] - - /* Do the insert */ - mov [ecx], edx - mov [ecx+4], eax - mov [eax], ecx - mov [edx+4], ecx - - /* Release lock */ -#ifdef CONFIG_SMP - mov ecx, [esp+16] - RELEASE_SPINLOCK(ecx) -#endif - - /* Restore flags */ - popfd - - /* check if the list was empty and return NULL */ - xor eax, edx - jz .l2 - - /* Return pointer */ - mov eax, edx - -.l2: - ret 12 - -#ifdef CONFIG_SMP -.spin3: - popfd - SPIN_ON_LOCK(edx, .start3) -#endif - -/*PLIST_ENTRY - *NTAPI - *ExInterlockedInsertTailList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedInsertTailList@12 -_ExInterlockedInsertTailList@12: - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov edx, [esp+12] -#endif - - /* Save flags and disable interrupts */ -.start4: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin4) - - /* Get list pointers */ - mov eax, [esp+8] - mov ecx, [esp+12] - mov edx, [eax+4] - - /* Do the insert */ - mov [ecx], eax - mov [ecx+4], edx - mov [eax+4], ecx - mov [edx], ecx - - /* Release lock */ -#ifdef CONFIG_SMP - mov ecx, [esp+16] - RELEASE_SPINLOCK(ecx) -#endif - - /* Restore flags */ - popfd - - /* Check if the list was empty and return NULL */ - xor eax, edx - jz .l3 - - /* Return pointer */ - mov eax, edx - -.l3: - ret 12 - -#ifdef CONFIG_SMP -.spin4: - popfd - SPIN_ON_LOCK(edx, .start4) -#endif - -/*PLIST_ENTRY - *NTAPI - *ExInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedRemoveHeadList@8 -_ExInterlockedRemoveHeadList@8: - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov edx, [esp+8] -#endif - - /* Save flags and disable interrupts */ -.start5: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin5) - - /* Get list pointers */ - mov edx, [esp+8] - mov eax, [edx] - - /* Check if it's empty */ - cmp eax, edx - je .l4 - - /* Get next entry and do deletion */ - mov ecx, [eax] - mov [edx], ecx - mov [ecx+4], edx - - /* Release lock */ -#ifdef CONFIG_SMP - mov ecx, [esp+12] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags */ - popfd - - /* Return */ - ret 8 - -.l4: - /* Release lock */ -#ifdef CONFIG_SMP - mov edx, [esp+12] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags */ - popfd - - /* Return empty list */ - xor eax, eax - ret 8 - -#ifdef CONFIG_SMP -.spin5: - popfd - SPIN_ON_LOCK(edx, .start5) -#endif - -/*PSINGLE_LIST_ENTRY - *NTAPI - *ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedPopEntryList@8 -_ExInterlockedPopEntryList@8: - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov edx, [esp+8] -#endif - - /* Save flags and disable interrupts */ -.start6: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin6) - - /* Get list pointers */ - mov edx, [esp+8] - mov eax, [ecx] - - /* Check if it's empty */ - or eax, eax - je .l6 - - /* Get next entry and do deletion */ - mov edx, [eax] - mov [ecx], edx - -.l5: - /* Release lock */ -#ifdef CONFIG_SMP - mov ecx, [esp+12] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags */ - popfd - - /* Return */ - ret 8 - -.l6: - /* Return empty list */ - xor eax, eax - jmp .l5 - -#ifdef CONFIG_SMP -.spin6: - popfd - SPIN_ON_LOCK(edx, .start6) -#endif - -/*PSINGLE_LIST_ENTRY - *NTAPI - *ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, - * IN PSINGLE_LIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedPushEntryList@12 -_ExInterlockedPushEntryList@12: - - /* Save lock pointer */ -#ifdef CONFIG_SMP - mov edx, [esp+12] -#endif - - /* Save flags and disable interrupts */ -.start7: - pushfd - cli - ACQUIRE_SPINLOCK(edx, .spin7) - - /* Get list pointers */ - mov edx, [esp+8] - mov eax, [edx] - mov ecx, [esp+12] - - /* Do push */ - mov [ecx], eax - mov [edx], ecx - - /* Release lock */ -#ifdef CONFIG_SMP - mov ecx, [esp+16] - RELEASE_SPINLOCK(edx) -#endif - - /* Restore flags */ - popfd - - /* Return */ - ret 12 - -#ifdef CONFIG_SMP -.spin7: - popfd - SPIN_ON_LOCK(edx, .start7) -#endif - -/*INTERLOCKED_RESULT - *NTAPI - *ExInterlockedIncrementLong(IN PLONG Addend, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedIncrementLong@8 -_ExInterlockedIncrementLong@8: - - /* Get addend */ - mov eax, [esp+4] - - /* Do the op */ - LOCK add dword ptr [eax], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret 8 - -/*INTERLOCKED_RESULT - *NTAPI - *ExInterlockedDecrementLong(IN PLONG Addend, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedDecrementLong@8 -_ExInterlockedDecrementLong@8: - - /* Get addend */ - mov eax, [esp+4] - - /* Do the op */ - LOCK sub dword ptr [eax], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret 8 - -/*ULONG - *NTAPI - *ExInterlockedExchangeUlong(IN PULONG Target, - * IN ULONG Value, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _ExInterlockedExchangeUlong@12 -_ExInterlockedExchangeUlong@12: - -#ifdef CONFIG_SMP - /* Get pointers */ - mov edx, [esp+4] - mov eax, [esp+8] - - /* On MP, do the exchange */ - xchg [edx], eax -#else - /* Get pointers */ - mov edx, [esp+4] - mov ecx, [esp+8] - - /* On UP, disable interrupts and save flags */ - pushfd - cli - - /* Switch values */ - mov eax, [edx] - mov [edx], ecx - popfd -#endif - - /* Return */ - ret 12 - -/*INTERLOCKED_RESULT - *NTAPI - *Exi386InterlockedIncrementLong(IN PLONG Addend) - */ -PUBLIC _Exi386InterlockedIncrementLong@4 -_Exi386InterlockedIncrementLong@4: - - /* Get addend */ - mov eax, [esp+4] - - /* Do the op */ - LOCK add dword ptr [eax], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret 4 - -/*INTERLOCKED_RESULT - *NTAPI - *Exi386InterlockedDecrementLong(IN PLONG Addend) - */ -PUBLIC _Exi386InterlockedDecrementLong@4 -_Exi386InterlockedDecrementLong@4: - - /* Get addend */ - mov eax, [esp+4] - - /* Do the op */ - LOCK sub dword ptr [eax], 1 - - /* Return */ - lahf - and eax, EFLAG_SELECT - ret 4 - -/*ULONG - *NTAPI - *Exi386InterlockedExchangeUlong(IN PULONG Target, - * IN ULONG Value) - */ -PUBLIC _Exi386InterlockedExchangeUlong@8 -_Exi386InterlockedExchangeUlong@8: - -#ifdef CONFIG_SMP - /* Get pointers */ - mov edx, [esp+4] - mov eax, [esp+8] - - /* On MP, do the exchange */ - xchg [edx], eax -#else - /* Get pointers */ - mov edx, [esp+4] - mov ecx, [esp+8] - - /* On UP, disable interrupts and save flags */ - pushfd - cli - - /* Switch values */ - mov eax, [edx] - mov [edx], ecx - popfd -#endif - - /* Return */ - ret 8 - -END -/* EOF */ Added: trunk/reactos/ntoskrnl/ex/i386/interlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlock… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlocked.c (added) +++ trunk/reactos/ntoskrnl/ex/i386/interlocked.c [iso-8859-1] Sun Jul 24 23:14:39 2011 @@ -1,0 +1,542 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/ex/interlocked.c +* PURPOSE: Interlocked functions +* PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) +*/ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> + +#define NDEBUG +#include <debug.h> + +#undef ExInterlockedAddUlong +#undef ExInterlockedInsertHeadList +#undef ExInterlockedInsertTailList +#undef ExInterlockedRemoveHeadList +#undef ExInterlockedPopEntryList +#undef ExInterlockedPushEntryList +#undef ExInterlockedIncrementLong +#undef ExInterlockedDecrementLong +#undef ExInterlockedExchangeUlong +#undef ExInterlockedCompareExchange64 + + +/* FUNCTIONS ****************************************************************/ + +#if defined(_M_IX86 ) || defined(_M_AMD64) +FORCEINLINE +ULONG_PTR +_ExiDisableInteruptsAndAcquireSpinlock( + IN OUT PKSPIN_LOCK Lock) +{ + UINT_PTR EFlags; + + /* Save flags */ + EFlags = __readeflags(); + + /* Disable interrupts */ + _disable(); + + /* Acquire the spinlock (inline) */ + KxAcquireSpinLock(Lock); + + return EFlags; +} + +FORCEINLINE +VOID +_ExiReleaseSpinLockAndRestoreInterupts( + IN OUT PKSPIN_LOCK Lock, + ULONG_PTR EFlags) +{ + /* Release the spinlock */ + KxReleaseSpinLock(Lock); + + /* Restore flags */ + __writeeflags(EFlags); +} +#else +#error Unimplemented +#endif + +LARGE_INTEGER +NTAPI +ExInterlockedAddLargeInteger( + IN OUT PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN OUT PKSPIN_LOCK Lock) +{ + LARGE_INTEGER OldValue; + ULONG_PTR LockHandle; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the old value */ + OldValue.QuadPart = Addend->QuadPart; + + /* Do the operation */ + Addend->QuadPart += Increment.QuadPart; + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the old value */ + return OldValue; +} + +ULONG +NTAPI +ExInterlockedAddUlong( + IN OUT PULONG Addend, + IN ULONG Increment, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + ULONG OldValue; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the old value */ + OldValue = *Addend; + + /* Do the operation */ + *Addend += Increment; + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the old value */ + return OldValue; +} + +PLIST_ENTRY +NTAPI +ExInterlockedInsertHeadList( + IN OUT PLIST_ENTRY ListHead, + IN OUT PLIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY FirstEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the first entry */ + FirstEntry = ListHead->Flink; + + /* Insert the new entry */ + InsertHeadList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the first entry */ + return FirstEntry; +} + +PLIST_ENTRY +NTAPI +ExInterlockedInsertTailList( + IN OUT PLIST_ENTRY ListHead, + IN OUT PLIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY LastEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the last entry */ + LastEntry = ListHead->Blink; + + /* Insert the new entry */ + InsertTailList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the last entry */ + return LastEntry; +} + +PLIST_ENTRY +NTAPI +ExInterlockedRemoveHeadList( + IN OUT PLIST_ENTRY ListHead, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY ListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Remove the first entry from the list head */ + ListEntry = RemoveHeadList(ListHead); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return ListEntry; +} + +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntryList( + IN OUT PSINGLE_LIST_ENTRY ListHead, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PSINGLE_LIST_ENTRY ListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Pop the first entry from the list */ + ListEntry = PopEntryList(ListHead); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return ListEntry; +} + +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPushEntryList( + IN OUT PSINGLE_LIST_ENTRY ListHead, + IN OUT PSINGLE_LIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PSINGLE_LIST_ENTRY OldListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the old top entry */ + OldListEntry = ListHead->Next; + + /* Push a new entry on the list */ + PushEntryList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return OldListEntry; +} + +INTERLOCKED_RESULT +NTAPI +ExInterlockedIncrementLong( + IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + LONG Result; + + Result = _InterlockedIncrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +INTERLOCKED_RESULT +NTAPI +ExInterlockedDecrementLong( + IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + LONG Result; + + Result = _InterlockedDecrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +ULONG +NTAPI +ExInterlockedExchangeUlong( + IN PULONG Target, + IN ULONG Value, + IN PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchange((PLONG)Target, (LONG)Value); +} + +#ifdef _M_IX86 + +ULONG +FASTCALL +ExfInterlockedAddUlong( + IN OUT PULONG Addend, + IN ULONG Increment, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + ULONG OldValue; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the old value */ + OldValue = *Addend; + + /* Do the operation */ + *Addend += Increment; + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the old value */ + return OldValue; +} + +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertHeadList( + IN OUT PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY FirstEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the first entry */ + FirstEntry = ListHead->Flink; + + /* Insert the new entry */ + InsertHeadList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the first entry */ + return FirstEntry; +} + +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertTailList( + IN OUT PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY LastEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the last entry */ + LastEntry = ListHead->Blink; + + /* Insert the new entry */ + InsertTailList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the last entry */ + return LastEntry; +} + + +PLIST_ENTRY +FASTCALL +ExfInterlockedRemoveHeadList( + IN OUT PLIST_ENTRY ListHead, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PLIST_ENTRY ListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Check if the list is empty */ + if (IsListEmpty(ListHead)) + { + /* Return NULL */ + ListEntry = NULL; + } + else + { + /* Remove the first entry from the list head */ + ListEntry = RemoveHeadList(ListHead); + } + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return ListEntry; +} + +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPopEntryList( + IN OUT PSINGLE_LIST_ENTRY ListHead, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PSINGLE_LIST_ENTRY ListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Pop the first entry from the list */ + ListEntry = PopEntryList(ListHead); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return ListEntry; +} + +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPushEntryList( + IN OUT PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN OUT PKSPIN_LOCK Lock) +{ + ULONG_PTR LockHandle; + PSINGLE_LIST_ENTRY OldListEntry; + + /* Disable interrupts and acquire the spinlock */ + LockHandle = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + + /* Save the old top entry */ + OldListEntry = ListHead->Next; + + /* Push a new entry on the list */ + PushEntryList(ListHead, ListEntry); + + /* Release the spinlock and restore interrupts */ + _ExiReleaseSpinLockAndRestoreInterupts(Lock, LockHandle); + + /* return the entry */ + return OldListEntry; +} + +INTERLOCKED_RESULT +NTAPI +Exi386InterlockedIncrementLong( + IN PLONG Addend) +{ + LONG Result; + + Result = _InterlockedIncrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +INTERLOCKED_RESULT +FASTCALL +Exfi386InterlockedIncrementLong( + IN OUT LONG volatile *Addend) +{ + LONG Result; + + Result = _InterlockedIncrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +INTERLOCKED_RESULT +NTAPI +Exi386InterlockedDecrementLong( + IN PLONG Addend) +{ + LONG Result; + + Result = _InterlockedDecrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +INTERLOCKED_RESULT +FASTCALL +Exfi386InterlockedDecrementLong( + IN OUT PLONG Addend) +{ + LONG Result; + + Result = _InterlockedDecrement(Addend); + return (Result < 0) ? ResultNegative : + (Result > 0) ? ResultPositive : + ResultZero; +} + +LONG +NTAPI +Exi386InterlockedExchangeUlong( + PLONG Target, + LONG Exchange) +{ + return _InterlockedExchange(Target, Exchange); +} + +ULONG +FASTCALL +Exfi386InterlockedExchangeUlong( + IN OUT PULONG Target, + IN ULONG Exchange) +{ + return _InterlockedExchange((PLONG)Target, Exchange); +} + +LONGLONG +FASTCALL +ExInterlockedCompareExchange64( + IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand, + IN PKSPIN_LOCK Lock) +{ + return _InterlockedCompareExchange64(Destination, *Exchange, *Comparand); +} + +LONGLONG +FASTCALL +ExfInterlockedCompareExchange64( + IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand) +{ + return _InterlockedCompareExchange64(Destination, *Exchange, *Comparand); +} +#endif + +#if 0 + +VOID +FASTCALL +ExInterlockedAddLargeStatistic( + IN OUT PLARGE_INTEGER Addend, + IN ULONG Increment) +{ +} + + +#endif + Propchange: trunk/reactos/ntoskrnl/ex/i386/interlocked.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 52851: [ReactX] Add cmake build files for ReactX d3d8, d3d9, ddraw. Fix framebuf cmake build. Add a REACTX build flag to enable either ReactX or Wine dlls.
by spetreolle＠svn.reactos.org 24 Jul '11

24 Jul '11

Author: spetreolle Date: Sun Jul 24 21:30:07 2011 New Revision: 52851 URL: http://svn.reactos.org/svn/reactos?rev=52851&view=rev Log: [ReactX] Add cmake build files for ReactX d3d8, d3d9, ddraw. Fix framebuf cmake build. Add a REACTX build flag to enable either ReactX or Wine dlls. Added: branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt (with props) branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt (with props) branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt (with props) Modified: branches/reactx/reactos/cmake/config.cmake branches/reactx/reactos/dll/directx/CMakeLists.txt branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt branches/reactx/reactos/dll/directx/wine/CMakeLists.txt branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt Modified: branches/reactx/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/cmake/config.cma… ============================================================================== --- branches/reactx/reactos/cmake/config.cmake [iso-8859-1] (original) +++ branches/reactx/reactos/cmake/config.cmake [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -55,3 +55,6 @@ set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL "Whether to create a graphml dependency of dlls.") + +set(REACTX TRUE CACHE BOOL +"Wether to compile support for ReactX dlls.") Modified: branches/reactx/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/CMak… ============================================================================== --- branches/reactx/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,12 +1,13 @@ - if (NOT MSVC) add_subdirectory(amstream) add_subdirectory(d3d8thk) endif() #add_subdirectory(bdaplgin) #disabled in trunk -#add_subdirectory(d3d8) #disabled in trunk -#add_subdirectory(d3d9) #disabled in trunk -#add_subdirectory(ddraw) #disabled in trunk +if(REACTX) + add_subdirectory(d3d8) + add_subdirectory(d3d9) + add_subdirectory(ddraw) +endif() add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dinput8) Added: branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt (added) +++ branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,0 +1,20 @@ +set_rc_compiler() + +spec2def(d3d8.dll d3d8.spec) + +list(APPEND SOURCE + d3d8.c) + +add_library(d3d8 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) + +set_module_type(d3d8 win32dll) + +add_importlibs(d3d8 + user32 + gdi32 + advapi32 + msvcrt + kernel32 + ntdll) + +add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all) Propchange: branches/reactx/reactos/dll/directx/d3d8/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d8… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -10,3 +10,5 @@ add_dependencies(d3d8thk psdk) add_cd_file(TARGET d3d8thk DESTINATION reactos/system32 FOR all) + +add_importlib_target(d3d8thk.spec) Added: branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/d3d9… ============================================================================== --- branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt (added) +++ branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,0 +1,41 @@ +spec2def(d3d9.dll d3d9.spec) + +list(APPEND SOURCE + d3d9.c + d3d9_baseobject.c + d3d9_callbacks.c + d3d9_caps.c + d3d9_create.c + d3d9_cursor.c + d3d9_device.c + d3d9_haldevice.c + d3d9_helpers.c + d3d9_impl.c + d3d9_mipmap.c + d3d9_puredevice.c + d3d9_resource.c + d3d9_swapchain.c + d3d9_texture.c + adapter.c + device.c + format.c + d3d9.rc) + +add_library(d3d9 SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) + +set_module_type(d3d9 win32dll) + +target_link_libraries(d3d9 uuid dxguid) + +add_importlibs(d3d9 + advapi32 + user32 + gdi32 + version + d3d8thk + msvcrt + kernel32 + ntdll) +add_importlib_target(d3d9.spec) + +add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) Propchange: branches/reactx/reactos/dll/directx/d3d9/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt (added) +++ branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,0 +1,64 @@ +set_rc_compiler() + +spec2def(ddraw.dll ddraw.spec) + +list(APPEND SOURCE + ddraw.rc + main.c + startup.c + cleanup.c + Ddraw/ddraw_main.c + Ddraw/ddraw_displaymode.c + Ddraw/ddraw_setcooperativelevel.c + Ddraw/GetCaps.c + Ddraw/GetDeviceIdentifier.c + Ddraw/ddraw_stubs.c + Ddraw/callbacks_dd_hel.c + Surface/surface_stubs.c + Surface/surface_main.c + Surface/callbacks_surf_hel.c + Surface/createsurface.c + Clipper/clipper_stubs.c + Clipper/clipper_main.c + Color/color_stubs.c + d3d/DirectD3D_main.c + Gamma/gamma_stubs.c + Kernel/kernel_stubs.c + Palette/palette.c + Palette/createpalette.c + Videoport/videoport_stubs.c + Vtable/DirectDraw7_Vtable.c + Vtable/DirectDraw4_Vtable.c + Vtable/DirectDraw2_Vtable.c + Vtable/DirectDraw_Vtable.c + Vtable/DirectDrawSurface7_Vtable.c + Vtable/DirectDrawSurface4_Vtable.c + Vtable/DirectDrawSurface3_Vtable.c + Vtable/DirectDrawSurface2_Vtable.c + Vtable/DirectDrawSurface_Vtable.c + Vtable/DirectD3D_Vtable.c + Vtable/DirectD3D2_Vtable.c + Vtable/DirectD3D3_Vtable.c + Vtable/DirectD3D7_Vtable.c) + +add_library(ddraw SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) + +set_module_type(ddraw win32dll) + +target_link_libraries(ddraw + uuid + dxguid + ${PSEH_LIB}) + +add_importlibs(ddraw + user32 + gdi32 + d3d8thk + ole32 + advapi32 + msvcrt + kernel32 + ntdll) +add_importlib_target(ddraw.spec) + +add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) Propchange: branches/reactx/reactos/dll/directx/ddraw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… ============================================================================== --- branches/reactx/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,7 +1,11 @@ if(NOT MSVC) -add_subdirectory(d3d8) -add_subdirectory(d3d9) +if(NOT REACTX) + add_subdirectory(d3d8) + add_subdirectory(d3d9) + add_subdirectory(ddraw) + add_subdirectory(wined3d) +endif() add_subdirectory(d3dx9_24) add_subdirectory(d3dx9_25) add_subdirectory(d3dx9_26) @@ -21,6 +25,4 @@ add_subdirectory(d3dx9_40) add_subdirectory(d3dx9_41) add_subdirectory(d3dx9_42) -add_subdirectory(ddraw) -add_subdirectory(wined3d) endif() Modified: branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Sun Jul 24 21:30:07 2011 @@ -1,14 +1,21 @@ spec2def(framebuf.dll framebuf.spec) -add_library(framebuf SHARED +list(APPEND SOURCE enable.c palette.c pointer.c screen.c surface.c - framebuf.rc - ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) + framebuf.rc) + +if(REACTX) +list(APPEND SOURCE + dd.c + ddenable.c) +endif() + +add_library(framebuf SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) set_entrypoint(framebuf DrvEnableDriver@12) set_subsystem(framebuf native)

1 0

[spetreolle] 52850: [ReactX] Only emit a note when using d3dtypes.h for D3D version >= 8.0. This is what the DDK does, and this is needed to build d3d9.
by spetreolle＠svn.reactos.org 24 Jul '11

24 Jul '11

Author: spetreolle Date: Sun Jul 24 21:24:42 2011 New Revision: 52850 URL: http://svn.reactos.org/svn/reactos?rev=52850&view=rev Log: [ReactX] Only emit a note when using d3dtypes.h for D3D version >= 8.0. This is what the DDK does, and this is needed to build d3d9. Modified: branches/reactx/reactos/include/psdk/d3dtypes.h Modified: branches/reactx/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/psdk/d3d… ============================================================================== --- branches/reactx/reactos/include/psdk/d3dtypes.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/psdk/d3dtypes.h [iso-8859-1] Sun Jul 24 21:24:42 2011 @@ -28,7 +28,7 @@ /* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ #if (DIRECT3D_VERSION >= 0x0800) -#error "You should not include d3dtypes.h when compiling for DX8 or newer." +#pragma message("You should not include d3dtypes.h when compiling for DX8 or newer.") #endif #include <float.h>

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