Ros-diffs November 2017

ros-diffs@reactos.org

22 participants
186 discussions

[reactos] 01/01: [FASTFAT] More FS statistics
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8503842309018f02eb43c… commit 8503842309018f02eb43c714d6d385f7bb75d0da Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 22:18:11 2017 +0100 [FASTFAT] More FS statistics --- drivers/filesystems/fastfat/rw.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 0ac467d87d..c945ee6044 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -673,6 +673,9 @@ VfatRead( Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS; } + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReadBytes, Length); + _SEH2_TRY { if (IrpContext->FileObject->PrivateCacheMap == NULL) @@ -722,8 +725,16 @@ VfatRead( Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + if (!IsVolume) + { + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + } + else + { + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReadBytes, Length); + } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); if (NT_SUCCESS(Status)) @@ -954,6 +965,9 @@ VfatWrite( { // cached write + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileWriteBytes, Length); + _SEH2_TRY { if (IrpContext->FileObject->PrivateCacheMap == NULL) @@ -1006,8 +1020,16 @@ VfatWrite( CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); } - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWrites, 1); - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWriteBytes, Length); + if (!IsVolume) + { + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWriteBytes, Length); + } + else + { + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataWriteBytes, Length); + } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); if (NT_SUCCESS(Status))

1 0

[reactos] 01/01: [SHELL32] Update French translation
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63dcfd2de3e3b8d75fd11… commit 63dcfd2de3e3b8d75fd111fb41b9b18cb7523c7c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 18:24:08 2017 +0100 [SHELL32] Update French translation --- dll/win32/shell32/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 325487e4fe..a16d160512 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -807,7 +807,7 @@ BEGIN IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ouvrir" - IDS_EXPLORE_VERB "Explore" + IDS_EXPLORE_VERB "Explorer" IDS_RUNAS_VERB "Exécuter en tant que..." IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher"

1 0

[reactos] 01/01: [FLTMGR] Latest from my branch (#135)
by Ged Murphy 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfb776380d4ca289a30b9… commit dfb776380d4ca289a30b999791040d80bd38e0ae Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Tue Nov 21 16:36:29 2017 +0000 [FLTMGR] Latest from my branch (#135) [FLTMGR][KMTEST] Squash and push my local branch across to master as the patch is getting a bit large. This is still WIP and none of this code is run in ros yet, so don't fret if you see ugly/unfinished code or int3's dotted around. [FLTMGR] Improve loading/reg of filters and start to implement client connections - Implement handling of connections from clients - Implement closing of client ports - Add a basic message waiter queue using CSQ's (untested) - Hand off messages for the comms object to be handled by the comms file - Initialize the connection list - Add a registry file which will contain lib functions for accessing filter service entries - [KMTEST] Initial usermode support for testing FS mini-filters - Add base routines to wrap the win32 'Filter' APis - Add support routines to be used when testing FS filter drivers - Move KmtCreateService to a private routine so it can be shared with KmtFltCreateService - Completely untested at the mo, so likely contains bugs at this point - Add support for adding altitude and flags registry entries for minifilters - Allow minifilters to setup without requiring instance attach/detach callbacks - Add tests for FltRegisterFilter and FltUnregisterFilter and start to add associated tests --- drivers/filters/fltmgr/CMakeLists.txt | 1 + drivers/filters/fltmgr/Filter.c | 223 +++++++++- drivers/filters/fltmgr/Interface.c | 22 +- drivers/filters/fltmgr/Messaging.c | 462 ++++++++++++++++++++- drivers/filters/fltmgr/Misc.c | 2 +- drivers/filters/fltmgr/Registry.c | 142 +++++++ drivers/filters/fltmgr/Registry.h | 20 + drivers/filters/fltmgr/fltmgr.h | 7 +- drivers/filters/fltmgr/fltmgrint.h | 180 +++++--- modules/rostests/kmtests/CMakeLists.txt | 4 + modules/rostests/kmtests/fltmgr/CMakeLists.txt | 1 + .../kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 12 +- .../kmtests/fltmgr/fltmgr_load/fltmgr_load.c | 2 +- .../kmtests/fltmgr/fltmgr_load/fltmgr_user.c | 28 ++ .../kmtests/fltmgr/fltmgr_register/CMakeLists.txt | 15 + .../fltmgr/fltmgr_register/fltmgr_reg_user.c | 23 + .../fltmgr/fltmgr_register/fltmgr_register.c | 248 +++++++++++ modules/rostests/kmtests/include/kmt_platform.h | 1 + modules/rostests/kmtests/include/kmt_test.h | 17 +- modules/rostests/kmtests/kmtest/filter.c | 88 +--- modules/rostests/kmtests/kmtest/fltsupport.c | 335 +++++++++++++-- modules/rostests/kmtests/kmtest/kmtest.h | 11 +- modules/rostests/kmtests/kmtest/testlist.c | 4 + .../kmtests/kmtest_drv/kmtest_fsminifilter.c | 121 ++++-- 24 files changed, 1739 insertions(+), 230 deletions(-) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index 5a02cab116..cb6ebbdd18 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE Messaging.c Misc.c Object.c + Registry.c Volume.c ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) diff --git a/drivers/filters/fltmgr/Filter.c b/drivers/filters/fltmgr/Filter.c index 71e45aea04..92a824c0d3 100644 --- a/drivers/filters/fltmgr/Filter.c +++ b/drivers/filters/fltmgr/Filter.c @@ -10,6 +10,7 @@ #include "fltmgr.h" #include "fltmgrint.h" +#include "Registry.h" #define NDEBUG #include <debug.h> @@ -25,6 +26,17 @@ FltpStartingToDrainObject( _Inout_ PFLT_OBJECT Object ); +VOID +FltpMiniFilterDriverUnload( +); + +static +NTSTATUS +GetFilterAltitude( + _In_ PFLT_FILTER Filter, + _Inout_ PUNICODE_STRING AltitudeString +); + /* EXPORTED FUNCTIONS ******************************************************/ @@ -56,8 +68,26 @@ NTSTATUS NTAPI FltUnloadFilter(_In_ PCUNICODE_STRING FilterName) { - UNREFERENCED_PARAMETER(FilterName); - return STATUS_NOT_IMPLEMENTED; + // + //FIXME: This is a temp hack, it needs properly implementing + // + + UNICODE_STRING DriverServiceName; + UNICODE_STRING ServicesKey; + CHAR Buffer[MAX_KEY_LENGTH]; + + /* Setup the base services key */ + RtlInitUnicodeString(&ServicesKey, SERVICES_KEY); + + /* Initialize the string data */ + DriverServiceName.Length = 0; + DriverServiceName.Buffer = (PWCH)Buffer; + DriverServiceName.MaximumLength = MAX_KEY_LENGTH; + + /* Create the full service key for this filter */ + RtlCopyUnicodeString(&DriverServiceName, &ServicesKey); + RtlAppendUnicodeStringToString(&DriverServiceName, FilterName); + return ZwUnloadDriver(&DriverServiceName); } NTSTATUS @@ -74,6 +104,8 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, PCHAR Ptr; NTSTATUS Status; + *RetFilter = NULL; + /* Make sure we're targeting the correct major revision */ if ((Registration->Version & 0xFF00) != FLT_MAJOR_VERSION) { @@ -145,6 +177,10 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, InitializeListHead(&Filter->ActiveOpens.mList); Filter->ActiveOpens.mCount = 0; + ExInitializeFastMutex(&Filter->ConnectionList.mLock); + InitializeListHead(&Filter->ConnectionList.mList); + Filter->ConnectionList.mCount = 0; + /* Initialize the usermode port list */ ExInitializeFastMutex(&Filter->PortList.mLock); InitializeListHead(&Filter->PortList.mList); @@ -199,15 +235,42 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, Filter->Name.Buffer = (PWCH)Ptr; RtlCopyUnicodeString(&Filter->Name, &DriverObject->DriverExtension->ServiceKeyName); + Status = GetFilterAltitude(Filter, &Filter->DefaultAltitude); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + // - // - Get the altitude string // - Slot the filter into the correct altitude location // - More stuff?? // + /* Store any existing driver unload routine before we make any changes */ + Filter->OldDriverUnload = (PFLT_FILTER_UNLOAD_CALLBACK)DriverObject->DriverUnload; + + /* Check we opted not to have an unload routine, or if we want to stop the driver from being unloaded */ + if (!FlagOn(Filter->Flags, FLTFL_REGISTRATION_DO_NOT_SUPPORT_SERVICE_STOP)) + { + DriverObject->DriverUnload = (PDRIVER_UNLOAD)FltpMiniFilterDriverUnload; + } + else + { + DriverObject->DriverUnload = (PDRIVER_UNLOAD)NULL; + } + + Quit: - if (!NT_SUCCESS(Status)) + + if (NT_SUCCESS(Status)) + { + DPRINT1("Loaded FS mini-filter %wZ\n", &DriverObject->DriverExtension->ServiceKeyName); + *RetFilter = Filter; + } + else { + DPRINT1("Failed to load FS mini-filter %wZ : 0x%X\n", &DriverObject->DriverExtension->ServiceKeyName, Status); + // Add cleanup for context resources ExDeleteResourceLite(&Filter->InstanceList.rLock); @@ -319,3 +382,155 @@ FltpStartingToDrainObject(_Inout_ PFLT_OBJECT Object) return STATUS_SUCCESS; } + +VOID +FltpMiniFilterDriverUnload() +{ + __debugbreak(); +} + +/* PRIVATE FUNCTIONS ******************************************************/ + +static +NTSTATUS +GetFilterAltitude( + _In_ PFLT_FILTER Filter, + _Inout_ PUNICODE_STRING AltitudeString) +{ + UNICODE_STRING InstancesKey = RTL_CONSTANT_STRING(L"Instances"); + UNICODE_STRING DefaultInstance = RTL_CONSTANT_STRING(L"DefaultInstance"); + UNICODE_STRING Altitude = RTL_CONSTANT_STRING(L"Altitude"); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING FilterInstancePath; + ULONG BytesRequired; + HANDLE InstHandle = NULL; + HANDLE RootHandle; + PWCH InstBuffer = NULL; + PWCH AltBuffer = NULL; + NTSTATUS Status; + + /* Get a handle to the instances key in the filter's services key */ + Status = FltpOpenFilterServicesKey(Filter, + KEY_QUERY_VALUE, + &InstancesKey, + &RootHandle); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Read the size 'default instances' string value */ + Status = FltpReadRegistryValue(RootHandle, + &DefaultInstance, + REG_SZ, + NULL, + 0, + &BytesRequired); + + /* We should get a buffer too small error */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate the buffer we need to hold the string */ + InstBuffer = ExAllocatePoolWithTag(PagedPool, BytesRequired, FM_TAG_UNICODE_STRING); + if (InstBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now read the string value */ + Status = FltpReadRegistryValue(RootHandle, + &DefaultInstance, + REG_SZ, + InstBuffer, + BytesRequired, + &BytesRequired); + } + + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Convert the string to a unicode_string */ + RtlInitUnicodeString(&FilterInstancePath, InstBuffer); + + /* Setup the attributes using the root key handle */ + InitializeObjectAttributes(&ObjectAttributes, + &FilterInstancePath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + RootHandle, + NULL); + + /* Now open the key name which was stored in the default instance */ + Status = ZwOpenKey(&InstHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Get the size of the buffer that holds the altitude */ + Status = FltpReadRegistryValue(InstHandle, + &Altitude, + REG_SZ, + NULL, + 0, + &BytesRequired); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate the required buffer */ + AltBuffer = ExAllocatePoolWithTag(PagedPool, BytesRequired, FM_TAG_UNICODE_STRING); + if (AltBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* And now finally read in the actual altitude string */ + Status = FltpReadRegistryValue(InstHandle, + &Altitude, + REG_SZ, + AltBuffer, + BytesRequired, + &BytesRequired); + if (NT_SUCCESS(Status)) + { + /* We made it, setup the return buffer */ + AltitudeString->Length = BytesRequired; + AltitudeString->MaximumLength = BytesRequired; + AltitudeString->Buffer = AltBuffer; + } + } + } + +Quit: + if (!NT_SUCCESS(Status)) + { + if (AltBuffer) + { + ExFreePoolWithTag(AltBuffer, FM_TAG_UNICODE_STRING); + } + } + + if (InstBuffer) + { + ExFreePoolWithTag(InstBuffer, FM_TAG_UNICODE_STRING); + } + + if (InstHandle) + { + ZwClose(InstHandle); + } + ZwClose(RootHandle); + + return Status; +} + + + +NTSTATUS +FltpReadRegistryValue( + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired +); \ No newline at end of file diff --git a/drivers/filters/fltmgr/Interface.c b/drivers/filters/fltmgr/Interface.c index be1288a7c2..158303be92 100644 --- a/drivers/filters/fltmgr/Interface.c +++ b/drivers/filters/fltmgr/Interface.c @@ -28,6 +28,8 @@ ((_devObj)->DriverObject == Dispatcher::DriverObject) && \ ((_devObj)->DeviceExtension != NULL)) +extern PDEVICE_OBJECT CommsDeviceObject; + DRIVER_INITIALIZE DriverEntry; NTSTATUS @@ -454,6 +456,13 @@ FltpDispatch(_In_ PDEVICE_OBJECT DeviceObject, return Status; } + /* Check if this is a request for a the messaging device */ + if (DeviceObject == CommsDeviceObject) + { + /* Hand off to our internal routine */ + return FltpMsgDispatch(DeviceObject, Irp); + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); @@ -494,6 +503,13 @@ FltpCreate(_In_ PDEVICE_OBJECT DeviceObject, return STATUS_SUCCESS; } + /* Check if this is a request for a the new comms connection */ + if (DeviceObject == CommsDeviceObject) + { + /* Hand off to our internal routine */ + return FltpMsgCreate(DeviceObject, Irp); + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); @@ -2104,9 +2120,9 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject, Status = SetupDispatchAndCallbacksTables(DriverObject); if (!NT_SUCCESS(Status)) goto Cleanup; - // - // TODO: Create fltmgr message device - // + /* Initialize the comms objects */ + Status = FltpSetupCommunicationObjects(DriverObject); + if (!NT_SUCCESS(Status)) goto Cleanup; /* Register for notifications when a new file system is loaded. This also enumerates any existing file systems */ Status = IoRegisterFsRegistrationChange(DriverObject, FltpFsNotification); diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index 97e6a94c9c..6a40e0d8c1 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -10,6 +10,7 @@ #include "fltmgr.h" #include "fltmgrint.h" +#include <fltmgr_shared.h> #define NDEBUG #include <debug.h> @@ -29,6 +30,32 @@ FltpDisconnectPort( _In_ PFLT_PORT_OBJECT PortObject ); +static +NTSTATUS +CreateClientPort( + _In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp +); + +static +NTSTATUS +CloseClientPort( + _In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp +); + +static +NTSTATUS +InitializeMessageWaiterQueue( + _Inout_ PFLT_MESSAGE_WAITER_QUEUE MsgWaiterQueue +); + +static +PPORT_CCB +CreatePortCCB( + _In_ PFLT_PORT_OBJECT PortObject +); + /* EXPORTED FUNCTIONS ******************************************************/ @@ -72,8 +99,8 @@ FltCreateCommunicationPort(_In_ PFLT_FILTER Filter, return Status; } - /* Create our new server port object */ - Status = ObCreateObject(0, + /* Create the server port object for this filter */ + Status = ObCreateObject(KernelMode, ServerPortObjectType, ObjectAttributes, KernelMode, @@ -191,6 +218,72 @@ FltSendMessage(_In_ PFLT_FILTER Filter, /* INTERNAL FUNCTIONS ******************************************************/ + +NTSTATUS +FltpMsgCreate(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + /* Get the stack location */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + + FLT_ASSERT(StackPtr->MajorFunction == IRP_MJ_CREATE); + + /* Check if this is a caller wanting to connect */ + if (StackPtr->MajorFunction == IRP_MJ_CREATE) + { + /* Create the client port for this connection and exit */ + Status = CreateClientPort(StackPtr->FileObject, Irp); + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + + return Status; +} + +NTSTATUS +FltpMsgDispatch(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + /* Get the stack location */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + + /* Check if this is a caller wanting to connect */ + if (StackPtr->MajorFunction == IRP_MJ_CLOSE) + { + /* Create the client port for this connection and exit */ + Status = CloseClientPort(StackPtr->FileObject, Irp); + } + else + { + // We don't support anything else yet + Status = STATUS_NOT_IMPLEMENTED; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + + return Status; +} + VOID NTAPI FltpServerPortClose(_In_opt_ PEPROCESS Process, @@ -369,5 +462,370 @@ Quit: return Status; } +/* CSQ IRP CALLBACKS *******************************************************/ + + +NTSTATUS +NTAPI +FltpAddMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp, + _In_ PVOID InsertContext) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Insert the IRP at the end of the queue */ + InsertTailList(&MessageWaiterQueue->WaiterQ.mList, + &Irp->Tail.Overlay.ListEntry); + + /* return success */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +FltpRemoveMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp) +{ + /* Remove the IRP from the queue */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); +} + +PIRP +NTAPI +FltpGetNextMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp, + _In_ PVOID PeekContext) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + PIRP NextIrp = NULL; + PLIST_ENTRY NextEntry; + PIO_STACK_LOCATION IrpStack; + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Is the IRP valid? */ + if (Irp == NULL) + { + /* Start peeking from the listhead */ + NextEntry = MessageWaiterQueue->WaiterQ.mList.Flink; + } + else + { + /* Start peeking from that IRP onwards */ + NextEntry = Irp->Tail.Overlay.ListEntry.Flink; + } + + /* Loop through the queue */ + while (NextEntry != &MessageWaiterQueue->WaiterQ.mList) + { + /* Store the next IRP in the list */ + NextIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + /* Did we supply a PeekContext on insert? */ + if (!PeekContext) + { + /* We already have the next IRP */ + break; + } + else + { + /* Get the stack of the next IRP */ + IrpStack = IoGetCurrentIrpStackLocation(NextIrp); + + /* Does the PeekContext match the object? */ + if (IrpStack->FileObject == (PFILE_OBJECT)PeekContext) + { + /* We have a match */ + break; + } + + /* Move to the next IRP */ + NextIrp = NULL; + NextEntry = NextEntry->Flink; + } + } + + return NextIrp; +} + +_Acquires_lock_(((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, FLT_MESSAGE_WAITER_QUEUE, Csq))->WaiterQ.mLock) +_IRQL_saves_global_(Irql, ((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_raises_(DISPATCH_LEVEL) +VOID +NTAPI +FltpAcquireMessageWaiterLock(_In_ PIO_CSQ Csq, + _Out_ PKIRQL Irql) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + UNREFERENCED_PARAMETER(Irql); + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Acquire the IRP queue lock */ + ExAcquireFastMutex(&MessageWaiterQueue->WaiterQ.mLock); +} + +_Releases_lock_(((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_restores_global_(Irql, ((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_requires_(DISPATCH_LEVEL) +VOID +NTAPI +FltpReleaseMessageWaiterLock(_In_ PIO_CSQ Csq, + _In_ KIRQL Irql) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + UNREFERENCED_PARAMETER(Irql); + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Release the IRP queue lock */ + ExReleaseFastMutex(&MessageWaiterQueue->WaiterQ.mLock); +} + +VOID +NTAPI +FltpCancelMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp) +{ + /* Cancel the IRP */ + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + + /* PRIVATE FUNCTIONS ******************************************************/ +static +NTSTATUS +CreateClientPort(_In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp) +{ + PFLT_SERVER_PORT_OBJECT ServerPortObject = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILTER_PORT_DATA FilterPortData; + PFLT_PORT_OBJECT ClientPortObject = NULL; + PFLT_PORT PortHandle = NULL; + PPORT_CCB PortCCB = NULL; + //ULONG BufferLength; + LONG NumConns; + NTSTATUS Status; + + /* We received the buffer via FilterConnectCommunicationPort, cast it back to its original form */ + FilterPortData = Irp->AssociatedIrp.SystemBuffer; + + /* Get a reference to the server port the filter created */ + Status = ObReferenceObjectByName(&FilterPortData->PortName, + 0, + 0, + FLT_PORT_ALL_ACCESS, + ServerPortObjectType, + ExGetPreviousMode(), + 0, + (PVOID *)&ServerPortObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Increment the number of connections on the server port */ + NumConns = InterlockedIncrement(&ServerPortObject->NumberOfConnections); + if (NumConns > ServerPortObject->MaxConnections) + { + Status = STATUS_CONNECTION_COUNT_LIMIT; + goto Quit; + } + + /* Initialize a basic kernel handle request */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Now create the new client port object */ + Status = ObCreateObject(KernelMode, + ClientPortObjectType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(FLT_PORT_OBJECT), + 0, + 0, + (PVOID *)&ClientPortObject); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Clear out the buffer */ + RtlZeroMemory(ClientPortObject, sizeof(FLT_PORT_OBJECT)); + + /* Initialize the locks */ + ExInitializeRundownProtection(&ClientPortObject->MsgNotifRundownRef); + ExInitializeFastMutex(&ClientPortObject->Lock); + + /* Set the server port object this belongs to */ + ClientPortObject->ServerPort = ServerPortObject; + + /* Setup the message queue */ + Status = InitializeMessageWaiterQueue(&ClientPortObject->MsgQ); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Create the CCB which we'll attach to the file object */ + PortCCB = CreatePortCCB(ClientPortObject); + if (PortCCB == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now insert the new client port into the object manager*/ + Status = ObInsertObject(ClientPortObject, 0, FLT_PORT_ALL_ACCESS, 1, 0, (PHANDLE)&PortHandle); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Add a reference to the filter to keep it alive while we do some work with it */ + Status = FltObjectReference(ServerPortObject->Filter); + if (NT_SUCCESS(Status)) + { + /* Invoke the callback to let the filter know we have a connection */ + Status = ServerPortObject->ConnectNotify(PortHandle, + ServerPortObject->Cookie, + NULL, //ConnectionContext + 0, //SizeOfContext + &ClientPortObject->Cookie); + if (NT_SUCCESS(Status)) + { + /* Add the client port CCB to the file object */ + FileObject->FsContext2 = PortCCB; + + /* Lock the port list on the filter and add this new port object to the list */ + ExAcquireFastMutex(&ServerPortObject->Filter->PortList.mLock); + InsertTailList(&ServerPortObject->Filter->PortList.mList, &ClientPortObject->FilterLink); + ExReleaseFastMutex(&ServerPortObject->Filter->PortList.mLock); + } + + /* We're done with the filter object, decremement the count */ + FltObjectDereference(ServerPortObject->Filter); + } + + +Quit: + if (!NT_SUCCESS(Status)) + { + if (ClientPortObject) + { + ObfDereferenceObject(ClientPortObject); + } + + if (PortHandle) + { + ZwClose(PortHandle); + } + else if (ServerPortObject) + { + InterlockedDecrement(&ServerPortObject->NumberOfConnections); + ObfDereferenceObject(ServerPortObject); + } + + if (PortCCB) + { + ExFreePoolWithTag(PortCCB, FM_TAG_CCB); + } + } + + return Status; +} + +static +NTSTATUS +CloseClientPort(_In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp) +{ + PFLT_CCB Ccb; + + Ccb = (PFLT_CCB)FileObject->FsContext2; + + /* Remove the reference on the filter we added when we opened the port */ + ObDereferenceObject(Ccb->Data.Port.Port); + + // FIXME: Free the CCB + + return STATUS_SUCCESS; +} + +static +NTSTATUS +InitializeMessageWaiterQueue(_Inout_ PFLT_MESSAGE_WAITER_QUEUE MsgWaiterQueue) +{ + NTSTATUS Status; + + /* Setup the IRP queue */ + Status = IoCsqInitializeEx(&MsgWaiterQueue->Csq, + FltpAddMessageWaiter, + FltpRemoveMessageWaiter, + FltpGetNextMessageWaiter, + FltpAcquireMessageWaiterLock, + FltpReleaseMessageWaiterLock, + FltpCancelMessageWaiter); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Initialize the waiter queue */ + ExInitializeFastMutex(&MsgWaiterQueue->WaiterQ.mLock); + InitializeListHead(&MsgWaiterQueue->WaiterQ.mList); + MsgWaiterQueue->WaiterQ.mCount = 0; + + /* We don't have a minimum waiter length */ + MsgWaiterQueue->MinimumWaiterLength = (ULONG)-1; + + /* Init the semaphore and event used for counting and signaling available IRPs */ + KeInitializeSemaphore(&MsgWaiterQueue->Semaphore, 0, MAXLONG); + KeInitializeEvent(&MsgWaiterQueue->Event, NotificationEvent, FALSE); + + return STATUS_SUCCESS; +} + +static +PPORT_CCB +CreatePortCCB(_In_ PFLT_PORT_OBJECT PortObject) +{ + PPORT_CCB PortCCB; + + /* Allocate a CCB struct to hold the client port object info */ + PortCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(PPORT_CCB), FM_TAG_CCB); + if (PortCCB) + { + /* Initialize the structure */ + PortCCB->Port = PortObject; + PortCCB->ReplyWaiterList.mCount = 0; + ExInitializeFastMutex(&PortCCB->ReplyWaiterList.mLock); + KeInitializeEvent(&PortCCB->ReplyWaiterList.mLock.Event, SynchronizationEvent, 0); + } + + return PortCCB; +} \ No newline at end of file diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c index 3ef1424d5f..8643c48882 100644 --- a/drivers/filters/fltmgr/Misc.c +++ b/drivers/filters/fltmgr/Misc.c @@ -29,8 +29,8 @@ FltBuildDefaultSecurityDescriptor( _In_ ACCESS_MASK DesiredAccess ) { - UNREFERENCED_PARAMETER(SecurityDescriptor); UNREFERENCED_PARAMETER(DesiredAccess); + *SecurityDescriptor = NULL; return 0; } diff --git a/drivers/filters/fltmgr/Registry.c b/drivers/filters/fltmgr/Registry.c new file mode 100644 index 0000000000..2470d70442 --- /dev/null +++ b/drivers/filters/fltmgr/Registry.c @@ -0,0 +1,142 @@ +/* + * PROJECT: Filesystem Filter Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filters/fltmgr/Misc.c + * PURPOSE: Uncataloged functions + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +#define REG_SERVICES_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" +#define REG_PATH_LENGTH 512 + + +/* INTERNAL FUNCTIONS ******************************************************/ + + +NTSTATUS +FltpOpenFilterServicesKey( + _In_ PFLT_FILTER Filter, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ PUNICODE_STRING SubKey, + _Out_ PHANDLE Handle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ServicesKey; + UNICODE_STRING Path; + WCHAR Buffer[REG_PATH_LENGTH]; + + /* Setup a local buffer to hold the services key path */ + Path.Length = 0; + Path.MaximumLength = REG_PATH_LENGTH; + Path.Buffer = Buffer; + + /* Build up the serices key name */ + RtlInitUnicodeString(&ServicesKey, REG_SERVICES_KEY); + RtlCopyUnicodeString(&Path, &ServicesKey); + RtlAppendUnicodeStringToString(&Path, &Filter->Name); + + if (SubKey) + { + /* Tag on any child key */ + RtlAppendUnicodeToString(&Path, L"\\"); + RtlAppendUnicodeStringToString(&Path, SubKey); + } + + InitializeObjectAttributes(&ObjectAttributes, + &Path, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open and return the key handle param*/ + return ZwOpenKey(Handle, DesiredAccess, &ObjectAttributes); +} + +NTSTATUS +FltpReadRegistryValue(_In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired) +{ + PKEY_VALUE_PARTIAL_INFORMATION Value = NULL; + ULONG ValueLength = 0; + NTSTATUS Status; + + PAGED_CODE(); + + /* Get the size of the buffer required to hold the string */ + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + NULL, + 0, + &ValueLength); + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + { + return Status; + } + + /* Allocate the buffer */ + Value = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePoolWithTag(PagedPool, + ValueLength, + FM_TAG_TEMP_REGISTRY); + if (Value == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now read in the value */ + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + Value, + ValueLength, + &ValueLength); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Make sure we got the type expected */ + if (Value->Type != Type) + { + Status = STATUS_INVALID_PARAMETER; + goto Quit; + } + + if (BytesRequired) + { + *BytesRequired = Value->DataLength; + } + + /* Make sure the caller buffer is big enough to hold the data */ + if (!BufferSize || BufferSize < Value->DataLength) + { + Status = STATUS_BUFFER_TOO_SMALL; + goto Quit; + } + + /* Copy the data into the caller buffer */ + RtlCopyMemory(Buffer, Value->Data, Value->DataLength); + +Quit: + + if (Value) + ExFreePoolWithTag(Value, FM_TAG_TEMP_REGISTRY); + + return Status; +} diff --git a/drivers/filters/fltmgr/Registry.h b/drivers/filters/fltmgr/Registry.h new file mode 100644 index 0000000000..b295daefac --- /dev/null +++ b/drivers/filters/fltmgr/Registry.h @@ -0,0 +1,20 @@ +#pragma once + + +NTSTATUS +FltpOpenFilterServicesKey( + _In_ PFLT_FILTER Filter, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ PUNICODE_STRING SubKey, + _Out_ PHANDLE Handle +); + +NTSTATUS +FltpReadRegistryValue( + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired +); \ No newline at end of file diff --git a/drivers/filters/fltmgr/fltmgr.h b/drivers/filters/fltmgr/fltmgr.h index 71e070b5f3..7008c1d094 100644 --- a/drivers/filters/fltmgr/fltmgr.h +++ b/drivers/filters/fltmgr/fltmgr.h @@ -18,6 +18,8 @@ #define FM_TAG_UNICODE_STRING 'suMF' #define FM_TAG_FILTER 'lfMF' #define FM_TAG_CONTEXT_REGISTA 'rcMF' +#define FM_TAG_CCB 'bcMF' +#define FM_TAG_TEMP_REGISTRY 'rtMF' #define MAX_DEVNAME_LENGTH 64 @@ -100,6 +102,9 @@ FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, VOID FltpFreeUnicodeString(_In_ PUNICODE_STRING String); + + + //////////////////////////////////////////////// @@ -252,7 +257,7 @@ FltGetUpperInstance FltGetVolumeContext FltGetVolumeFromDeviceObject FltGetVolumeFromFileObject -FltGetVolumeFromInstance +FltLoadFilter FltGetVolumeFromName FltGetVolumeGuidName FltGetVolumeInstanceFromName diff --git a/drivers/filters/fltmgr/fltmgrint.h b/drivers/filters/fltmgr/fltmgrint.h index a060b70eec..64065be763 100644 --- a/drivers/filters/fltmgr/fltmgrint.h +++ b/drivers/filters/fltmgr/fltmgrint.h @@ -58,10 +58,45 @@ typedef struct _FLT_MUTEX_LIST_HEAD } FLT_MUTEX_LIST_HEAD, *PFLT_MUTEX_LIST_HEAD; +typedef struct _FLT_TYPE +{ + USHORT Signature; + USHORT Size; + +} FLT_TYPE, *PFLT_TYPE; + +// http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-1.html +typedef struct _FLTP_FRAME +{ + FLT_TYPE Type; + LIST_ENTRY Links; + unsigned int FrameID; + ERESOURCE AltitudeLock; + UNICODE_STRING AltitudeIntervalLow; + UNICODE_STRING AltitudeIntervalHigh; + char LargeIrpCtrlStackSize; + char SmallIrpCtrlStackSize; + FLT_RESOURCE_LIST_HEAD RegisteredFilters; + FLT_RESOURCE_LIST_HEAD AttachedVolumes; + LIST_ENTRY MountingVolumes; + FLT_MUTEX_LIST_HEAD AttachedFileSystems; + FLT_MUTEX_LIST_HEAD ZombiedFltObjectContexts; + ERESOURCE FilterUnloadLock; + FAST_MUTEX DeviceObjectAttachLock; + //FLT_PRCB *Prcb; + void *PrcbPoolToFree; + void *LookasidePoolToFree; + //FLTP_IRPCTRL_STACK_PROFILER IrpCtrlStackProfiler; + NPAGED_LOOKASIDE_LIST SmallIrpCtrlLookasideList; + NPAGED_LOOKASIDE_LIST LargeIrpCtrlLookasideList; + //STATIC_IRP_CONTROL GlobalSIC; + +} FLTP_FRAME, *PFLTP_FRAME; + typedef struct _FLT_FILTER // size = 0x120 { FLT_OBJECT Base; - PVOID Frame; //FLTP_FRAME + PFLTP_FRAME Frame; UNICODE_STRING Name; UNICODE_STRING DefaultAltitude; FLT_FILTER_FLAGS Flags; @@ -97,12 +132,7 @@ typedef enum _FLT_yINSTANCE_FLAGS } FLT_INSTANCE_FLAGS, *PFLT_INSTANCE_FLAGS; -typedef struct _FLT_TYPE -{ - USHORT Signature; - USHORT Size; -} FLT_TYPE, *PFLT_TYPE; typedef struct _FLT_INSTANCE // size = 0x144 (324) { @@ -121,34 +151,18 @@ typedef struct _FLT_INSTANCE // size = 0x144 (324) } FLT_INSTANCE, *PFLT_INSTANCE; -// http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-1.html -typedef struct _FLTP_FRAME + +typedef struct _TREE_ROOT { - FLT_TYPE Type; - LIST_ENTRY Links; - unsigned int FrameID; - ERESOURCE AltitudeLock; - UNICODE_STRING AltitudeIntervalLow; - UNICODE_STRING AltitudeIntervalHigh; - char LargeIrpCtrlStackSize; - char SmallIrpCtrlStackSize; - FLT_RESOURCE_LIST_HEAD RegisteredFilters; - FLT_RESOURCE_LIST_HEAD AttachedVolumes; - LIST_ENTRY MountingVolumes; - FLT_MUTEX_LIST_HEAD AttachedFileSystems; - FLT_MUTEX_LIST_HEAD ZombiedFltObjectContexts; - ERESOURCE FilterUnloadLock; - FAST_MUTEX DeviceObjectAttachLock; - //FLT_PRCB *Prcb; - void *PrcbPoolToFree; - void *LookasidePoolToFree; - //FLTP_IRPCTRL_STACK_PROFILER IrpCtrlStackProfiler; - NPAGED_LOOKASIDE_LIST SmallIrpCtrlLookasideList; - NPAGED_LOOKASIDE_LIST LargeIrpCtrlLookasideList; - //STATIC_IRP_CONTROL GlobalSIC; + RTL_SPLAY_LINKS *Tree; -} FLTP_FRAME, *PFLTP_FRAME; +} TREE_ROOT, *PTREE_ROOT; + +typedef struct _CONTEXT_LIST_CTRL +{ + TREE_ROOT List; +} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; // http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-6.html typedef struct _STREAM_LIST_CTRL // size = 0xC8 (200) @@ -156,16 +170,16 @@ typedef struct _STREAM_LIST_CTRL // size = 0xC8 (200) FLT_TYPE Type; FSRTL_PER_STREAM_CONTEXT ContextCtrl; LIST_ENTRY VolumeLink; - //STREAM_LIST_CTRL_FLAGS Flags; + ULONG Flags; //STREAM_LIST_CTRL_FLAGS Flags; int UseCount; ERESOURCE ContextLock; - //CONTEXT_LIST_CTRL StreamContexts; - //CONTEXT_LIST_CTRL StreamHandleContexts; + CONTEXT_LIST_CTRL StreamContexts; + CONTEXT_LIST_CTRL StreamHandleContexts; ERESOURCE NameCacheLock; LARGE_INTEGER LastRenameCompleted; - //NAME_CACHE_LIST_CTRL NormalizedNameCache; - // NAME_CACHE_LIST_CTRL ShortNameCache; - // NAME_CACHE_LIST_CTRL OpenedNameCache; + ULONG NormalizedNameCache; //NAME_CACHE_LIST_CTRL NormalizedNameCache; + ULONG ShortNameCache; // NAME_CACHE_LIST_CTRL ShortNameCache; + ULONG OpenedNameCache; // NAME_CACHE_LIST_CTRL OpenedNameCache; int AllNameContextsTemporary; } STREAM_LIST_CTRL, *PSTREAM_LIST_CTRL; @@ -186,6 +200,17 @@ typedef struct _FLT_SERVER_PORT_OBJECT } FLT_SERVER_PORT_OBJECT, *PFLT_SERVER_PORT_OBJECT; +typedef struct _FLT_MESSAGE_WAITER_QUEUE +{ + IO_CSQ Csq; + FLT_MUTEX_LIST_HEAD WaiterQ; + ULONG MinimumWaiterLength; + KSEMAPHORE Semaphore; + KEVENT Event; + +} FLT_MESSAGE_WAITER_QUEUE, *PFLT_MESSAGE_WAITER_QUEUE; + + typedef struct _FLT_PORT_OBJECT { LIST_ENTRY FilterLink; @@ -193,7 +218,7 @@ typedef struct _FLT_PORT_OBJECT PVOID Cookie; EX_RUNDOWN_REF MsgNotifRundownRef; FAST_MUTEX Lock; - PVOID MsgQ; // FLT_MESSAGE_WAITER_QUEUE MsgQ; + FLT_MESSAGE_WAITER_QUEUE MsgQ; ULONGLONG MessageId; KEVENT DisconnectEvent; BOOLEAN Disconnected; @@ -232,18 +257,6 @@ typedef struct _CALLBACK_CTRL } CALLBACK_CTRL, *PCALLBACK_CTRL; -typedef struct _TREE_ROOT -{ - RTL_SPLAY_LINKS *Tree; - -} TREE_ROOT, *PTREE_ROOT; - - -typedef struct _CONTEXT_LIST_CTRL -{ - TREE_ROOT List; - -} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; typedef struct _NAME_CACHE_LIST_CTRL_STATS { @@ -311,6 +324,58 @@ typedef struct _FLT_VOLUME } FLT_VOLUME, *PFLT_VOLUME; +typedef struct _MANAGER_CCB +{ + PFLTP_FRAME Frame; + unsigned int Iterator; + +} MANAGER_CCB, *PMANAGER_CCB; + +typedef struct _FILTER_CCB +{ + PFLT_FILTER Filter; + unsigned int Iterator; + +} FILTER_CCB, *PFILTER_CCB; + +typedef struct _INSTANCE_CCB +{ + PFLT_INSTANCE Instance; + +} INSTANCE_CCB, *PINSTANCE_CCB; + +typedef struct _VOLUME_CCB +{ + UNICODE_STRING Volume; + unsigned int Iterator; + +} VOLUME_CCB, *PVOLUME_CCB; + +typedef struct _PORT_CCB +{ + PFLT_PORT_OBJECT Port; + FLT_MUTEX_LIST_HEAD ReplyWaiterList; + +} PORT_CCB, *PPORT_CCB; + + +typedef union _CCB_TYPE +{ + MANAGER_CCB Manager; + FILTER_CCB Filter; + INSTANCE_CCB Instance; + VOLUME_CCB Volume; + PORT_CCB Port; + +} CCB_TYPE, *PCCB_TYPE; + + +typedef struct _FLT_CCB +{ + FLT_TYPE Type; + CCB_TYPE Data; + +} FLT_CCB, *PFLT_CCB; VOID FltpExInitializeRundownProtection( @@ -387,6 +452,21 @@ FltpDispatchHandler( _Inout_ PIRP Irp ); +NTSTATUS +FltpMsgCreate( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); +NTSTATUS +FltpMsgDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +FltpSetupCommunicationObjects( + _In_ PDRIVER_OBJECT DriverObject +); #endif /* _FLTMGR_INTERNAL_H */ diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 64b088d221..c66ed9a38e 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -127,6 +127,10 @@ list(APPEND KMTEST_SOURCE kmtest/testlist.c example/Example_user.c + + fltmgr/fltmgr_load/fltmgr_user.c + fltmgr/fltmgr_register/fltmgr_reg_user.c + hidparse/HidP_user.c kernel32/FileAttributes_user.c kernel32/FindFile_user.c diff --git a/modules/rostests/kmtests/fltmgr/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/CMakeLists.txt index fd7a55e6bc..f0fdac80bc 100644 --- a/modules/rostests/kmtests/fltmgr/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(fltmgr_load) add_subdirectory(fltmgr_create) +add_subdirectory(fltmgr_register) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt index 7fa022d154..f93e516be8 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt @@ -5,10 +5,10 @@ list(APPEND FLTMGR_TEST_DRV_SOURCE ../../kmtest_drv/kmtest_fsminifilter.c fltmgr_load.c) -add_library(fltmgr_load SHARED ${FLTMGR_TEST_DRV_SOURCE}) -set_module_type(fltmgr_load kernelmodedriver) -target_link_libraries(fltmgr_load kmtest_printf ${PSEH_LIB}) -add_importlibs(fltmgr_load fltmgr ntoskrnl hal) -add_target_compile_definitions(fltmgr_load KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +add_library(FltMgrLoad_drv SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(FltMgrLoad_drv kernelmodedriver) +target_link_libraries(FltMgrLoad_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(FltMgrLoad_drv fltmgr ntoskrnl hal) +add_target_compile_definitions(FltMgrLoad_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(example_drv ../include/kmt_test.h) -add_rostests_file(TARGET fltmgr_load) +add_rostests_file(TARGET FltMgrLoad_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c index 7b9f5235cb..e56d7eb62a 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c @@ -89,7 +89,7 @@ TestEntry( ok_irql(PASSIVE_LEVEL); TestDriverObject = DriverObject; - *DeviceName = L"fltmgr_load"; + *DeviceName = L"FltMgrLoad"; trace("Hi, this is the filter manager load test driver\n"); diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c new file mode 100644 index 0000000000..727e9c0703 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filters load and connect correctly + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> + + +START_TEST(FltMgrLoad) +{ + static WCHAR FilterName[] = L"FltMgrLoad"; + SC_HANDLE hService; + HANDLE hPort; + + trace("Message from user-mode\n"); + + ok(KmtFltCreateService(FilterName, L"FltMgrLoad test driver", &hService) == ERROR_SUCCESS, "\n"); + ok(KmtFltLoadDriver(FALSE, FALSE, FALSE, &hPort) == ERROR_PRIVILEGE_NOT_HELD, "\n"); + ok(KmtFltLoadDriver(TRUE, FALSE, FALSE, &hPort) == ERROR_SUCCESS, "\n"); + + ok(KmtFltConnectComms(&hPort) == ERROR_SUCCESS, "\n"); + + ok(KmtFltDisconnectComms(hPort) == ERROR_SUCCESS, "\n"); + ok(KmtFltUnloadDriver(hPort, FALSE) == ERROR_SUCCESS, "\n"); + KmtFltDeleteService(NULL, &hService); +} diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt new file mode 100644 index 0000000000..2857a32bd6 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt @@ -0,0 +1,15 @@ + +include_directories(../../include) +include_directories(${REACTOS_SOURCE_DIR}/drivers/filters/fltmgr) + +list(APPEND FLTMGR_TEST_DRV_SOURCE + ../../kmtest_drv/kmtest_fsminifilter.c + fltmgr_register.c) + +add_library(fltmgrreg_drv SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(fltmgrreg_drv kernelmodedriver) +target_link_libraries(fltmgrreg_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(fltmgrreg_drv fltmgr ntoskrnl hal) +add_target_compile_definitions(fltmgrreg_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +#add_pch(example_drv ../include/kmt_test.h) +add_rostests_file(TARGET fltmgrreg_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c new file mode 100644 index 0000000000..da7d072988 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filter registration + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> + + +START_TEST(FltMgrReg) +{ + static WCHAR FilterName[] = L"FltMgrReg"; + SC_HANDLE hService; + HANDLE hPort; + + ok(KmtFltCreateService(FilterName, L"FltMgrLoad test driver", &hService) == ERROR_SUCCESS, "Failed to create the reg entry\n"); + ok(KmtFltAddAltitude(L"123456") == ERROR_SUCCESS, "\n"); + ok(KmtFltLoadDriver(TRUE, FALSE, FALSE, &hPort) == ERROR_SUCCESS, "Failed to load the driver\n"); + //__debugbreak(); + ok(KmtFltUnloadDriver(hPort, FALSE) == ERROR_SUCCESS, "Failed to unload the driver\n"); + ok(KmtFltDeleteService(NULL, &hService) == ERROR_SUCCESS, "Failed to delete the driver\n"); +} diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c new file mode 100644 index 0000000000..9703dfa8fd --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c @@ -0,0 +1,248 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filter registration + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +// This tests needs to be run via a standalone driver because FltRegisterFilter +// uses the DriverObject in its internal structures, and we don't want it to be +// linked to a device object from the test suite itself. + +#include <kmt_test.h> +#include <fltkernel.h> +#include <fltmgrint.h> + +//#define NDEBUG +#include <debug.h> + +#define RESET_REGISTRATION(basic) \ + do { \ + RtlZeroMemory(&FilterRegistration, sizeof(FLT_REGISTRATION)); \ + if (basic) { \ + FilterRegistration.Size = sizeof(FLT_REGISTRATION); \ + FilterRegistration.Version = FLT_REGISTRATION_VERSION; \ + } \ + } while (0) + +#define RESET_UNLOAD(DO) DO->DriverUnload = NULL; + + +NTSTATUS +FLTAPI +TestRegFilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags +); + +/* Globals */ +static PDRIVER_OBJECT TestDriverObject; +static FLT_REGISTRATION FilterRegistration; +static PFLT_FILTER TestFilter = NULL; + + + + +BOOLEAN +TestFltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject) +{ + UNICODE_STRING Altitude; + UNICODE_STRING Name; + PFLT_FILTER Filter = NULL; + PFLT_FILTER Temp = NULL; + NTSTATUS Status; + + RESET_REGISTRATION(FALSE); +#if 0 + KmtStartSeh() + Status = FltRegisterFilter(NULL, &FilterRegistration, &Filter); + KmtEndSeh(STATUS_INVALID_PARAMETER); + + KmtStartSeh() + Status = FltRegisterFilter(DriverObject, NULL, &Filter); + KmtEndSeh(STATUS_INVALID_PARAMETER); + + KmtStartSeh() + Status = FltRegisterFilter(DriverObject, &FilterRegistration, NULL); + KmtEndSeh(STATUS_INVALID_PARAMETER) +#endif + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0100; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0300; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0200; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + + /* Test invalid sizes. MSDN says this is required, but it doesn't appear to be */ + RESET_REGISTRATION(TRUE); + FilterRegistration.Size = 0; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Size = 0xFFFF; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + + /* Now make a valid registration */ + RESET_REGISTRATION(TRUE); + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Try to register again */ + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Temp); + ok_eq_hex(Status, STATUS_FLT_INSTANCE_ALTITUDE_COLLISION); + + + ok_eq_hex(Filter->Base.Flags, FLT_OBFL_TYPE_FILTER); + + /* Check we have the right filter name */ + RtlInitUnicodeString(&Name, L"Kmtest-FltMgrReg"); + ok_eq_long(RtlCompareUnicodeString(&Filter->Name, &Name, FALSE), 0); + + /* And the altitude is corect */ + RtlInitUnicodeString(&Altitude, L"123456"); + ok_eq_long(RtlCompareUnicodeString(&Filter->DefaultAltitude, &Altitude, FALSE), 0); + + // + // FIXME: More checks + // + + /* Cleanup the valid registration */ + FltUnregisterFilter(Filter); + + /* + * The last thing we'll do before we exit is to properly register with the filter manager + * and set an unload routine. This'll let us test the FltUnregisterFilter routine + */ + RESET_REGISTRATION(TRUE); + + /* Set a fake unload routine we'll use to test */ + DriverObject->DriverUnload = (PDRIVER_UNLOAD)0x1234FFFF; + + FilterRegistration.FilterUnloadCallback = TestRegFilterUnload; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &TestFilter); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Test all the unlod routines */ + ok_eq_pointer(TestFilter->FilterUnload, TestRegFilterUnload); + ok_eq_pointer(TestFilter->OldDriverUnload, (PFLT_FILTER_UNLOAD_CALLBACK)0x1234FFFF); + + // This should equal the fltmgr's private unload routine, but there's no easy way of testing it... + //ok_eq_pointer(DriverObject->DriverUnload, FltpMiniFilterDriverUnload); + + /* Make sure our test address is never actually called */ + TestFilter->OldDriverUnload = (PFLT_FILTER_UNLOAD_CALLBACK)NULL; + + return TRUE; +} + + +NTSTATUS +FLTAPI +TestRegFilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags) +{ + //__debugbreak(); + + ok_irql(PASSIVE_LEVEL); + ok(TestFilter != NULL, "Buffer is NULL\n"); + + // + // FIXME: Add tests + // + + FltUnregisterFilter(TestFilter); + + // + // FIXME: Add tests + // + + return STATUS_SUCCESS; +} + + + + + + + + + + +/* + * KMT Callback routines + */ + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT("FltMgrReg Entry!\n"); + trace("Entered FltMgrReg tests\n"); + + /* We'll do the work ourselves in this test */ + *Flags = TESTENTRY_NO_ALL; + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + + /* Run the tests */ + (VOID)TestFltRegisterFilter(DriverObject); + + return Status; +} + +VOID +TestFilterUnload( + IN ULONG Flags) +{ + PAGED_CODE(); + ok_irql(PASSIVE_LEVEL); +} + +NTSTATUS +TestInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType, + _In_ PUNICODE_STRING VolumeName, + _In_ ULONG SectorSize, + _In_ ULONG ReportedSectorSize +) +{ + return STATUS_FLT_DO_NOT_ATTACH; +} + +VOID +TestQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags) +{ + UNREFERENCED_PARAMETER(FltObjects); + UNREFERENCED_PARAMETER(Flags); +} diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 636f099cf6..3e29d2c9af 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -44,6 +44,7 @@ #include <strsafe.h> #include <fltuser.h> + #ifdef KMT_EMULATE_KERNEL #define ok_irql(i) #define KIRQL int diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 8fcc93a419..1c5ddeefa2 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -126,9 +126,12 @@ NTSTATUS KmtFilterRegisterCallbacks(_In_ CONST FLT_OPERATION_REGISTRATION *Opera typedef enum { - TESTENTRY_NO_REGISTER_FILTER = 1, - TESTENTRY_NO_CREATE_COMMS_PORT = 2, - TESTENTRY_NO_START_FILTERING = 4, + TESTENTRY_NO_REGISTER_FILTER = 0x01, + TESTENTRY_NO_CREATE_COMMS_PORT = 0x02, + TESTENTRY_NO_START_FILTERING = 0x04, + TESTENTRY_NO_INSTANCE_SETUP = 0x08, + TESTENTRY_NO_QUERY_TEARDOWN = 0x10, + TESTENTRY_NO_ALL = 0xFF } KMT_MINIFILTER_FLAGS; VOID TestFilterUnload(_In_ ULONG Flags); @@ -174,8 +177,14 @@ DWORD KmtSendWStringToDriver(IN DWORD ControlCode, IN PCWSTR String); DWORD KmtSendUlongToDriver(IN DWORD ControlCode, IN DWORD Value); DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); -DWORD KmtFltLoadDriver(_In_z_ PCWSTR ServiceName, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); + +DWORD KmtFltCreateService(_In_z_ PCWSTR ServiceName, _In_z_ PCWSTR DisplayName, _Out_ SC_HANDLE *ServiceHandle); +DWORD KmtFltDeleteService(_In_opt_z_ PCWSTR ServiceName, _Inout_ SC_HANDLE *ServiceHandle); +DWORD KmtFltAddAltitude(_In_z_ LPWSTR Altitude); +DWORD KmtFltLoadDriver(_In_ BOOLEAN EnableDriverLoadPrivlege, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); DWORD KmtFltUnloadDriver(_In_ HANDLE *hPort, _In_ BOOLEAN DisonnectComms); +DWORD KmtFltConnectComms(_Out_ HANDLE *hPort); +DWORD KmtFltDisconnectComms(_In_ HANDLE hPort); DWORD KmtFltRunKernelTest(_In_ HANDLE hPort, _In_z_ PCSTR TestName); DWORD KmtFltSendToDriver(_In_ HANDLE hPort, _In_ DWORD Message); DWORD KmtFltSendStringToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_ PCSTR String); diff --git a/modules/rostests/kmtests/kmtest/filter.c b/modules/rostests/kmtests/kmtest/filter.c index cb5957477c..042d1743b2 100644 --- a/modules/rostests/kmtests/kmtest/filter.c +++ b/modules/rostests/kmtests/kmtest/filter.c @@ -14,50 +14,8 @@ #define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) -/* - * We need to call the internal function in the service.c file - */ -DWORD -KmtpCreateService( - IN PCWSTR ServiceName, - IN PCWSTR ServicePath, - IN PCWSTR DisplayName OPTIONAL, - IN DWORD ServiceType, - OUT SC_HANDLE *ServiceHandle); - -static SC_HANDLE ScmHandle; -/** - * @name KmtFltCreateService - * - * Create the specified driver service and return a handle to it - * - * @param ServiceName - * Name of the service to create - * @param ServicePath - * File name of the driver, relative to the current directory - * @param DisplayName - * Service display name - * @param ServiceHandle - * Pointer to a variable to receive the handle to the service - * - * @return Win32 error code - */ -DWORD -KmtFltCreateService( - _In_z_ PCWSTR ServiceName, - _In_z_ PCWSTR ServicePath, - _In_z_ PCWSTR DisplayName OPTIONAL, - _Out_ SC_HANDLE *ServiceHandle) -{ - return KmtpCreateService(ServiceName, - ServicePath, - DisplayName, - SERVICE_FILE_SYSTEM_DRIVER, - ServiceHandle); -} - /** * @name KmtFltLoad * @@ -82,7 +40,7 @@ KmtFltLoad( return Error; } - +#if 0 /** * @name KmtFltCreateAndStartService * @@ -143,7 +101,7 @@ cleanup: assert(Error); return Error; } - +#endif /** * @name KmtFltConnect @@ -163,7 +121,7 @@ KmtFltConnect( _Out_ HANDLE *hPort) { HRESULT hResult; - DWORD Error = ERROR_SUCCESS; + DWORD Error; assert(ServiceName); assert(hPort); @@ -191,7 +149,7 @@ KmtFltConnect( */ DWORD KmtFltDisconnect( - _Out_ HANDLE *hPort) + _In_ HANDLE hPort) { DWORD Error = ERROR_SUCCESS; @@ -388,41 +346,3 @@ KmtFltUnload( return Error; } - -/** - * @name KmtFltDeleteService - * - * Delete the specified filter driver - * - * @param ServiceName - * If *ServiceHandle is NULL, name of the service to delete - * @param ServiceHandle - * Pointer to a variable containing the service handle. - * Will be set to NULL on success - * - * @return Win32 error code - */ -DWORD -KmtFltDeleteService( - _In_z_ PCWSTR ServiceName OPTIONAL, - _Inout_ SC_HANDLE *ServiceHandle) -{ - return KmtDeleteService(ServiceName, ServiceHandle); -} - -/** - * @name KmtFltCloseService - * - * Close the specified driver service handle - * - * @param ServiceHandle - * Pointer to a variable containing the service handle. - * Will be set to NULL on success - * - * @return Win32 error code - */ -DWORD KmtFltCloseService( - _Inout_ SC_HANDLE *ServiceHandle) -{ - return KmtCloseService(ServiceHandle); -} diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c index 772e98a211..4127ccad24 100644 --- a/modules/rostests/kmtests/kmtest/fltsupport.c +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -7,12 +7,28 @@ #include <kmt_test.h> +#define KMT_FLT_USER_MODE #include "kmtest.h" #include <kmt_public.h> #include <assert.h> #include <debug.h> +/* + * We need to call the internal function in the service.c file + */ +DWORD +KmtpCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + IN DWORD ServiceType, + OUT SC_HANDLE *ServiceHandle); + +DWORD EnablePrivilegeInCurrentProcess( + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable); + // move to a shared location typedef struct _KMTFLT_MESSAGE_HEADER { @@ -26,33 +42,30 @@ extern HANDLE KmtestHandle; static WCHAR TestServiceName[MAX_PATH]; + /** - * @name KmtFltLoadDriver + * @name KmtFltCreateService * - * Load the specified filter driver - * This routine will create the service entry if it doesn't already exist + * Create the specified driver service and return a handle to it * * @param ServiceName - * Name of the driver service (Kmtest- prefix will be added automatically) - * @param RestartIfRunning - * TRUE to stop and restart the service if it is already running - * @param ConnectComms - * TRUE to create a comms connection to the specified filter - * @param hPort - * Handle to the filter's comms port + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service * * @return Win32 error code */ DWORD -KmtFltLoadDriver( +KmtFltCreateService( _In_z_ PCWSTR ServiceName, - _In_ BOOLEAN RestartIfRunning, - _In_ BOOLEAN ConnectComms, - _Out_ HANDLE *hPort) + _In_z_ PCWSTR DisplayName, + _Out_ SC_HANDLE *ServiceHandle) { - DWORD Error = ERROR_SUCCESS; WCHAR ServicePath[MAX_PATH]; - SC_HANDLE TestServiceHandle; StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); @@ -60,11 +73,81 @@ KmtFltLoadDriver( StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); - Error = KmtFltCreateAndStartService(TestServiceName, ServicePath, NULL, &TestServiceHandle, TRUE); + return KmtpCreateService(TestServiceName, + ServicePath, + DisplayName, + SERVICE_FILE_SYSTEM_DRIVER, + ServiceHandle); +} + +/** + * @name KmtFltDeleteService + * + * Delete the specified filter driver + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to delete + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD +KmtFltDeleteService( + _In_opt_z_ PCWSTR ServiceName, + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtDeleteService(ServiceName, ServiceHandle); +} - if (Error == ERROR_SUCCESS && ConnectComms) +/** + * @name KmtFltLoadDriver + * + * Delete the specified filter driver + * + * @return Win32 error code + */ +DWORD +KmtFltLoadDriver( + _In_ BOOLEAN EnableDriverLoadPrivlege, + _In_ BOOLEAN RestartIfRunning, + _In_ BOOLEAN ConnectComms, + _Out_ HANDLE *hPort +) +{ + DWORD Error; + + if (EnableDriverLoadPrivlege) + { + Error = EnablePrivilegeInCurrentProcess(SE_LOAD_DRIVER_NAME , TRUE); + if (Error) + { + return Error; + } + } + + Error = KmtFltLoad(TestServiceName); + if ((Error == ERROR_SERVICE_ALREADY_RUNNING) && RestartIfRunning) + { + Error = KmtFltUnload(TestServiceName); + if (Error) + { + // TODO + __debugbreak(); + } + + Error = KmtFltLoad(TestServiceName); + } + + if (Error) { - Error = KmtFltConnect(ServiceName, hPort); + return Error; + } + + if (ConnectComms) + { + Error = KmtFltConnectComms(hPort); } return Error; @@ -77,7 +160,7 @@ KmtFltLoadDriver( * * @param hPort * Handle to the filter's comms port - * @param ConnectComms + * @param DisonnectComms * TRUE to disconnect the comms connection before unloading * * @return Win32 error code @@ -110,6 +193,57 @@ KmtFltUnloadDriver( return Error; } +/** + * @name KmtFltConnectComms + * + * Create a comms connection to the specified filter + * + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltConnectComms( + _Out_ HANDLE *hPort) +{ + return KmtFltConnect(TestServiceName, hPort); +} + +/** + * @name KmtFltDisconnectComms + * + * Disconenct from the comms port + * + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltDisconnectComms( + _In_ HANDLE hPort) +{ + return KmtFltDisconnect(hPort); +} + + +/** +* @name KmtFltCloseService +* +* Close the specified driver service handle +* +* @param ServiceHandle +* Pointer to a variable containing the service handle. +* Will be set to NULL on success +* +* @return Win32 error code +*/ +DWORD KmtFltCloseService( + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtCloseService(ServiceHandle); +} /** * @name KmtFltRunKernelTest @@ -141,7 +275,7 @@ KmtFltRunKernelTest( * @param Message * The message to send to the filter * -* @return Win32 error code as returned by DeviceIoControl +* @return Win32 error code */ DWORD KmtFltSendToDriver( @@ -165,7 +299,7 @@ KmtFltSendToDriver( * @param String * An ANSI string to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendStringToDriver( @@ -190,7 +324,7 @@ KmtFltSendStringToDriver( * @param String * An wide string to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendWStringToDriver( @@ -213,7 +347,7 @@ KmtFltSendWStringToDriver( * @param Value * An 32bit valueng to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendUlongToDriver( @@ -244,7 +378,7 @@ KmtFltSendUlongToDriver( * @param BytesReturned * Number of bytes written in the reply buffer * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendBufferToDriver( @@ -299,3 +433,154 @@ KmtFltSendBufferToDriver( return Error; } + +/** +* @name KmtFltAddAltitude +* +* Sets up the mini-filter altitude data in the registry +* +* @param hPort +* The altitude string to set +* +* @return Win32 error code +*/ +DWORD +KmtFltAddAltitude( + _In_z_ LPWSTR Altitude) +{ + WCHAR DefaultInstance[128]; + WCHAR KeyPath[256]; + HKEY hKey = NULL; + HKEY hSubKey = NULL; + DWORD Zero = 0; + LONG Error; + + StringCbCopy(KeyPath, sizeof KeyPath, L"SYSTEM\\CurrentControlSet\\Services\\"); + StringCbCat(KeyPath, sizeof KeyPath, TestServiceName); + StringCbCat(KeyPath, sizeof KeyPath, L"\\Instances\\"); + + Error = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + KeyPath, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + NULL, + &hKey, + NULL); + if (Error != ERROR_SUCCESS) + { + return Error; + } + + StringCbCopy(DefaultInstance, sizeof DefaultInstance, TestServiceName); + StringCbCat(DefaultInstance, sizeof DefaultInstance, L" Instance"); + + Error = RegSetValueExW(hKey, + L"DefaultInstance", + 0, + REG_SZ, + (LPBYTE)DefaultInstance, + (wcslen(DefaultInstance) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegCreateKeyW(hKey, DefaultInstance, &hSubKey); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegSetValueExW(hSubKey, + L"Altitude", + 0, + REG_SZ, + (LPBYTE)Altitude, + (wcslen(Altitude) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegSetValueExW(hSubKey, + L"Flags", + 0, + REG_DWORD, + (LPBYTE)&Zero, + sizeof(DWORD)); + +Quit: + if (hSubKey) + { + RegCloseKey(hSubKey); + } + if (hKey) + { + RegCloseKey(hKey); + } + + return Error; + +} + +/* +* Private functions, not meant for use in kmtests +*/ + +DWORD EnablePrivilege( + _In_ HANDLE hToken, + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable) +{ + TOKEN_PRIVILEGES TokenPrivileges; + LUID luid; + BOOL bSuccess; + DWORD dwError = ERROR_SUCCESS; + + /* Get the luid for this privilege */ + if (!LookupPrivilegeValueW(NULL, lpPrivName, &luid)) + return GetLastError(); + + /* Setup the struct with the priv info */ + TokenPrivileges.PrivilegeCount = 1; + TokenPrivileges.Privileges[0].Luid = luid; + TokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; + + /* Enable the privilege info in the token */ + bSuccess = AdjustTokenPrivileges(hToken, + FALSE, + &TokenPrivileges, + sizeof(TOKEN_PRIVILEGES), + NULL, + NULL); + if (bSuccess == FALSE) dwError = GetLastError(); + + /* return status */ + return dwError; +} + +DWORD EnablePrivilegeInCurrentProcess( + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable) +{ + HANDLE hToken; + BOOL bSuccess; + DWORD dwError = ERROR_SUCCESS; + + /* Get a handle to our token */ + bSuccess = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + if (bSuccess == FALSE) return GetLastError(); + + /* Enable the privilege in the agent token */ + dwError = EnablePrivilege(hToken, lpPrivName, bEnable); + + /* We're done with this now */ + CloseHandle(hToken); + + /* return status */ + return dwError; +} diff --git a/modules/rostests/kmtests/kmtest/kmtest.h b/modules/rostests/kmtests/kmtest/kmtest.h index 7329d18e48..f39c418b5d 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.h +++ b/modules/rostests/kmtests/kmtest/kmtest.h @@ -60,16 +60,9 @@ KmtDeleteService( DWORD KmtCloseService( IN OUT SC_HANDLE *ServiceHandle); - -/* FS Filter management functions */ -DWORD -KmtFltCreateService( - _In_z_ PCWSTR ServiceName, - _In_z_ PCWSTR ServicePath, - _In_z_ PCWSTR DisplayName OPTIONAL, - _Out_ SC_HANDLE *ServiceHandle); +#ifdef KMT_FLT_USER_MODE DWORD KmtFltLoad( @@ -132,4 +125,6 @@ KmtFltDeleteService( DWORD KmtFltCloseService( _Inout_ SC_HANDLE *ServiceHandle); +#endif /* KMT_FILTER_DRIVER */ + #endif /* !defined _KMTESTS_H_ */ diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 562691d6f0..01cb31cf53 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -11,6 +11,8 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; +KMT_TESTFUNC Test_FltMgrLoad; +KMT_TESTFUNC Test_FltMgrReg; KMT_TESTFUNC Test_HidPDescription; KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; @@ -37,6 +39,8 @@ const KMT_TEST TestList[] = { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, + { "FltMgrLoad", Test_FltMgrLoad }, + { "FltMgrReg", Test_FltMgrReg }, { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c index 2de7f3b159..3bb686de9e 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c @@ -2,7 +2,8 @@ * PROJECT: ReactOS kernel-mode tests - Filter Manager * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: FS Mini-filter wrapper to host the filter manager tests - * PROGRAMMER: Ged Murphy <ged.murphy(a)reactos.org> + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Ged Murphy <ged.murphy(a)reactos.org> */ #include <ntifs.h> @@ -35,6 +36,7 @@ DRIVER_INITIALIZE DriverEntry; /* Globals */ static PDRIVER_OBJECT TestDriverObject; +static PDEVICE_OBJECT KmtestDeviceObject; static FILTER_DATA FilterData; static PFLT_OPERATION_REGISTRATION Callbacks = NULL; static PFLT_CONTEXT_REGISTRATION Contexts = NULL; @@ -133,6 +135,9 @@ DriverEntry( PSECURITY_DESCRIPTOR SecurityDescriptor; UNICODE_STRING DeviceName; WCHAR DeviceNameBuffer[128] = L"\\Device\\Kmtest-"; + UNICODE_STRING KmtestDeviceName; + PFILE_OBJECT KmtestFileObject; + PKMT_DEVICE_EXTENSION KmtestDeviceExtension; PCWSTR DeviceNameSuffix; INT Flags = 0; PKPRCB Prcb; @@ -148,6 +153,32 @@ DriverEntry( KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0; TestDriverObject = DriverObject; + /* get the Kmtest device, so that we get a ResultBuffer pointer */ + RtlInitUnicodeString(&KmtestDeviceName, KMTEST_DEVICE_DRIVER_PATH); + Status = IoGetDeviceObjectPointer(&KmtestDeviceName, FILE_ALL_ACCESS, &KmtestFileObject, &KmtestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Kmtest device object pointer\n"); + goto cleanup; + } + + Status = ObReferenceObjectByPointer(KmtestDeviceObject, FILE_ALL_ACCESS, NULL, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference Kmtest device object\n"); + goto cleanup; + } + + ObDereferenceObject(KmtestFileObject); + KmtestFileObject = NULL; + KmtestDeviceExtension = KmtestDeviceObject->DeviceExtension; + ResultBuffer = KmtestDeviceExtension->ResultBuffer; + DPRINT("KmtestDeviceObject: %p\n", (PVOID)KmtestDeviceObject); + DPRINT("KmtestDeviceExtension: %p\n", (PVOID)KmtestDeviceExtension); + DPRINT("Setting ResultBuffer: %p\n", (PVOID)ResultBuffer); + /* call TestEntry */ RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); @@ -243,6 +274,7 @@ FilterUnload( { PAGED_CODE(); UNREFERENCED_PARAMETER(Flags); + //__debugbreak(); DPRINT("DriverUnload\n"); @@ -312,50 +344,54 @@ FilterInstanceSetup( UNREFERENCED_PARAMETER(FltObjects); UNREFERENCED_PARAMETER(Flags); - RtlInitUnicodeString(&VolumeName, NULL); + if (!(Flags & TESTENTRY_NO_INSTANCE_SETUP)) + { + RtlInitUnicodeString(&VolumeName, NULL); + #if 0 // FltGetVolumeProperties is not yet implemented /* Get the properties of this volume */ - Status = FltGetVolumeProperties(Volume, - VolumeProperties, - sizeof(VolPropBuffer), - &LengthReturned); - if (NT_SUCCESS(Status)) - { - FLT_ASSERT((VolumeProperties->SectorSize == 0) || (VolumeProperties->SectorSize >= MIN_SECTOR_SIZE)); - SectorSize = max(VolumeProperties->SectorSize, MIN_SECTOR_SIZE); - ReportedSectorSize = VolumeProperties->SectorSize; - } - else - { - DPRINT1("Failed to get the volume properties : 0x%X", Status); - return Status; - } + Status = FltGetVolumeProperties(Volume, + VolumeProperties, + sizeof(VolPropBuffer), + &LengthReturned); + if (NT_SUCCESS(Status)) + { + FLT_ASSERT((VolumeProperties->SectorSize == 0) || (VolumeProperties->SectorSize >= MIN_SECTOR_SIZE)); + SectorSize = max(VolumeProperties->SectorSize, MIN_SECTOR_SIZE); + ReportedSectorSize = VolumeProperties->SectorSize; + } + else + { + DPRINT1("Failed to get the volume properties : 0x%X", Status); + return Status; + } #endif - /* Get the storage device object we want a name for */ - Status = FltGetDiskDeviceObject(FltObjects->Volume, &DeviceObject); - if (NT_SUCCESS(Status)) - { - /* Get the dos device name */ - Status = IoVolumeDeviceToDosName(DeviceObject, &VolumeName); + /* Get the storage device object we want a name for */ + Status = FltGetDiskDeviceObject(FltObjects->Volume, &DeviceObject); if (NT_SUCCESS(Status)) { - DPRINT("VolumeDeviceType %lu, VolumeFilesystemType %lu, Real SectSize=0x%04x, Reported SectSize=0x%04x, Name=\"%wZ\"", - VolumeDeviceType, - VolumeFilesystemType, - SectorSize, - ReportedSectorSize, - &VolumeName); - - Status = TestInstanceSetup(FltObjects, - Flags, - VolumeDeviceType, - VolumeFilesystemType, - &VolumeName, - SectorSize, - ReportedSectorSize); - - /* The buffer was allocated by the IoMgr */ - ExFreePool(VolumeName.Buffer); + /* Get the dos device name */ + Status = IoVolumeDeviceToDosName(DeviceObject, &VolumeName); + if (NT_SUCCESS(Status)) + { + DPRINT("VolumeDeviceType %lu, VolumeFilesystemType %lu, Real SectSize=0x%04x, Reported SectSize=0x%04x, Name=\"%wZ\"", + VolumeDeviceType, + VolumeFilesystemType, + SectorSize, + ReportedSectorSize, + &VolumeName); + + Status = TestInstanceSetup(FltObjects, + Flags, + VolumeDeviceType, + VolumeFilesystemType, + &VolumeName, + SectorSize, + ReportedSectorSize); + + /* The buffer was allocated by the IoMgr */ + ExFreePool(VolumeName.Buffer); + } } } @@ -384,7 +420,10 @@ FilterQueryTeardown( { PAGED_CODE(); - TestQueryTeardown(FltObjects, Flags); + if (!(Flags & TESTENTRY_NO_QUERY_TEARDOWN)) + { + TestQueryTeardown(FltObjects, Flags); + } /* We always allow a volume to detach */ return STATUS_SUCCESS;

1 0

[reactos] 01/01: [SHELL32] Update Russian translation, following 6465705
by Stanislav Motylkov 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f884d29c90db2e62ef7f1… commit f884d29c90db2e62ef7f16f908587514ba450357 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Nov 21 14:16:31 2017 +0300 [SHELL32] Update Russian translation, following 6465705 --- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 5c424adadf..3430148392 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -783,8 +783,8 @@ BEGIN IDS_CANTLOCKVOLUME "Не удалось заблокировать том (код ошибки: %lu)." IDS_CANTDISMOUNTVOLUME "Не удалось размонтировать том (код ошибки: %lu)." IDS_CANTEJECTMEDIA "Не удалось извлечь носитель (код ошибки: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Не удалось вывести свойства (код ошибки: %lu)." + IDS_CANTDISCONNECT "Не удалось отсоединить сетевой диск (код ошибки: %lu)." IDS_DIRECTORY "Папка с файлами" IDS_BAT_FILE "Пакетный файл ReactOS"

1 0

[reactos] 01/01: [MSGINA] Fix buttons alignment in French translation
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9904aafd12eb017bf43b7… commit 9904aafd12eb017bf43b7e3fd3cbb512ac64c383 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 11:49:01 2017 +0100 [MSGINA] Fix buttons alignment in French translation --- dll/win32/msgina/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index fd6d0b61aa..cb4a9cb978 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -49,7 +49,7 @@ BEGIN PUSHBUTTON "Verrouiller l'ordinateur", IDC_LOCK, 4, 135, 82, 14 PUSHBUTTON "Déconnecter", IDC_LOGOFF, 93, 135, 85, 14 PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 184, 135, 70, 14 - PUSHBUTTON "Changer le mot de passe", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "Changer le mot de passe", IDC_CHANGEPWD, 4, 154, 82, 14 PUSHBUTTON "Gestionnaire de tâches", IDC_TASKMGR, 93, 154, 85, 14 PUSHBUTTON "Annuler", IDCANCEL, 184, 154, 70, 14 END

1 0

[reactos] 01/01: [FLOPPY] Don't wait forever while trying to determine media type. This should fix some virtual machines and real hardware machine with empty floopy drive not being able to boot ReactOS (stuck while initializing floppy.sys). This fixes a regression introduced in r70746. It could be generalized to other interrupts, floppy controllers not being reliable.
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b34e44782e44afe2af52… commit 4b34e44782e44afe2af5277887d8e7df0d436a87 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 10:22:50 2017 +0100 [FLOPPY] Don't wait forever while trying to determine media type. This should fix some virtual machines and real hardware machine with empty floopy drive not being able to boot ReactOS (stuck while initializing floppy.sys). This fixes a regression introduced in r70746. It could be generalized to other interrupts, floppy controllers not being reliable. For more information: http://wiki.osdev.org/Floppy_Disk_Controller CORE-7935 CORE-12908 CORE-13080 --- drivers/storage/floppy/floppy.c | 19 ++++++++++++------- drivers/storage/floppy/floppy.h | 4 ++-- drivers/storage/floppy/readwrite.c | 16 ++++++++++------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/drivers/storage/floppy/floppy.c b/drivers/storage/floppy/floppy.c index d388cf7d37..4234b0f8bb 100644 --- a/drivers/storage/floppy/floppy.c +++ b/drivers/storage/floppy/floppy.c @@ -159,12 +159,13 @@ StopMotor(PCONTROLLER_INFO ControllerInfo) } -VOID NTAPI -WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo) +NTSTATUS NTAPI +WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo, PLARGE_INTEGER Timeout) /* * FUNCTION: Wait for the controller to interrupt, and then clear the event * ARGUMENTS: * ControllerInfo: Controller to wait for + * Timeout: How long to wait for * NOTES: * - There is a small chance that an unexpected or spurious interrupt could * be lost with this clear/wait/clear scheme used in this driver. This is @@ -173,11 +174,15 @@ WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo) * - PAGED_CODE because it waits */ { + NTSTATUS Status; + PAGED_CODE(); ASSERT(ControllerInfo); - KeWaitForSingleObject(&ControllerInfo->SynchEvent, Executive, KernelMode, FALSE, NULL); + Status = KeWaitForSingleObject(&ControllerInfo->SynchEvent, Executive, KernelMode, FALSE, Timeout); KeClearEvent(&ControllerInfo->SynchEvent); + + return Status; } static DRIVER_DISPATCH CreateClose; @@ -262,7 +267,7 @@ Recalibrate(PDRIVE_INFO DriveInfo) continue; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); /* Get the results */ Status = HwRecalibrateResult(DriveInfo->ControllerInfo); @@ -323,7 +328,7 @@ ResetChangeFlag(PDRIVE_INFO DriveInfo) return STATUS_IO_DEVICE_ERROR; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -340,7 +345,7 @@ ResetChangeFlag(PDRIVE_INFO DriveInfo) return STATUS_IO_DEVICE_ERROR; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -701,7 +706,7 @@ InitController(PCONTROLLER_INFO ControllerInfo) INFO_(FLOPPY, "InitController: waiting for initial interrupt\n"); /* Wait for an interrupt */ - WaitForControllerInterrupt(ControllerInfo); + WaitForControllerInterrupt(ControllerInfo, NULL); /* Reset means you have to clear each of the four interrupts (one per drive) */ for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++) diff --git a/drivers/storage/floppy/floppy.h b/drivers/storage/floppy/floppy.h index e1d0efcd88..cd0301ca53 100644 --- a/drivers/storage/floppy/floppy.h +++ b/drivers/storage/floppy/floppy.h @@ -92,8 +92,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); VOID NTAPI SignalMediaChanged(PDEVICE_OBJECT DeviceObject, PIRP Irp); -VOID NTAPI -WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo); +NTSTATUS NTAPI +WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo, PLARGE_INTEGER Timeout); NTSTATUS NTAPI ResetChangeFlag(PDRIVE_INFO DriveInfo); diff --git a/drivers/storage/floppy/readwrite.c b/drivers/storage/floppy/readwrite.c index 594d9c7e8b..2ce3a6ccf1 100644 --- a/drivers/storage/floppy/readwrite.c +++ b/drivers/storage/floppy/readwrite.c @@ -170,6 +170,7 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) UCHAR HeadLoadTime; UCHAR HeadUnloadTime; UCHAR StepRateTime; + LARGE_INTEGER Timeout; PAGED_CODE(); @@ -181,9 +182,12 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) * Note that only 1.44 has been tested at all. */ + Timeout.QuadPart = -10000000; /* 1 second. Is that enough? */ + do { int i; + NTSTATUS Status; /* Program data rate */ if(HwSetDataRate(DriveInfo->ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) @@ -219,7 +223,7 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) } /* Wait for the recalibrate to finish */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); RecalStatus = HwRecalibrateResult(DriveInfo->ControllerInfo); @@ -244,9 +248,9 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) } /* Wait for the ReadID to finish */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + Status = WaitForControllerInterrupt(DriveInfo->ControllerInfo, &Timeout); - if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) + if(Status == STATUS_TIMEOUT || HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "RWDetermineMediaType(): ReadIdResult failed; continuing\n"); if (OneShot) @@ -303,7 +307,7 @@ RWSeekToCylinder(PDRIVE_INFO DriveInfo, UCHAR Cylinder) return STATUS_UNSUCCESSFUL; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -318,7 +322,7 @@ RWSeekToCylinder(PDRIVE_INFO DriveInfo, UCHAR Cylinder) return STATUS_UNSUCCESSFUL; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwReadIdResult(DriveInfo->ControllerInfo, &CurCylinder, NULL) != STATUS_SUCCESS) { @@ -732,7 +736,7 @@ ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp) * At this point, we block and wait for an interrupt * FIXME: this seems to take too long */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); /* Read is complete; flush & free adapter channel */ IoFlushAdapterBuffers(DriveInfo->ControllerInfo->AdapterObject, Irp->MdlAddress,

1 0

[reactos] 01/01: [UXTHEME] -Don't change the behaviour of DefWindowProc if SetWindowRgn was called before
by Giannis Adamopoulos 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f98574e1d4a2155061c4… commit 8f98574e1d4a2155061c40816a597b7697aa6654 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Nov 21 10:51:06 2017 +0200 [UXTHEME] -Don't change the behaviour of DefWindowProc if SetWindowRgn was called before --- dll/win32/uxtheme/themehooks.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index 43620d8ff3..48cfdb211a 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -267,8 +267,14 @@ int OnPostWinPosChanged(HWND hWnd, WINDOWPOS* pWinPos) static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) +{ + PWND_DATA pwndData; + + pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); + + if(!IsAppThemed() || + !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) || + (pwndData && pwndData->HasAppDefinedRgn)) { return g_user32ApiHook.DefWindowProcW(hWnd, Msg, @@ -286,7 +292,13 @@ ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) + PWND_DATA pwndData; + + pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); + + if(!IsAppThemed() || + !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) || + (pwndData && pwndData->HasAppDefinedRgn)) { return g_user32ApiHook.DefWindowProcA(hWnd, Msg,

1 0

[reactos] 05/05: [OPENGL32] - Get rid of the TLS based implementation CORE-14024
by Jérôme Gardou 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4067eb1454912b363bb71… commit 4067eb1454912b363bb710b0aa78607dad703f5a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 20 19:55:21 2017 +0100 [OPENGL32] - Get rid of the TLS based implementation CORE-14024 --- dll/opengl/opengl32/dllmain.c | 48 --------------------- dll/opengl/opengl32/glapi_x86.s | 17 +------- dll/opengl/opengl32/opengl32.h | 95 ----------------------------------------- 3 files changed, 1 insertion(+), 159 deletions(-) diff --git a/dll/opengl/opengl32/dllmain.c b/dll/opengl/opengl32/dllmain.c index 65649751fa..1aefff046b 100644 --- a/dll/opengl/opengl32/dllmain.c +++ b/dll/opengl/opengl32/dllmain.c @@ -7,61 +7,21 @@ #include "opengl32.h" -#ifdef OPENGL32_USE_TLS -DWORD OglTlsIndex = 0xFFFFFFFF; - -BOOL init_tls_data(void) -{ - struct Opengl32_ThreadData* ThreadData; - - ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ThreadData)); - if(!ThreadData) - return FALSE; - TlsSetValue(OglTlsIndex, ThreadData); - ThreadData->glDispatchTable = &StubTable.glDispatchTable; - ThreadData->hglrc = NULL; - ThreadData->hdc = NULL; - ThreadData->dc_data = NULL; - return TRUE; -} - -#endif - BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) { -#ifdef OPENGL32_USE_TLS - struct Opengl32_ThreadData* ThreadData; -#endif switch ( Reason ) { case DLL_PROCESS_ATTACH: -#ifdef OPENGL32_USE_TLS - OglTlsIndex = TlsAlloc(); - if(OglTlsIndex == TLS_OUT_OF_INDEXES) - return FALSE; -#endif /* Initialize Context list */ InitializeListHead(&ContextListHead); /* no break */ case DLL_THREAD_ATTACH: -#ifdef OPENGL32_USE_TLS - if (!init_tls_data()) - return FALSE; -#endif // defined(OPENGL32_USE_TLS) break; case DLL_THREAD_DETACH: /* Set NULL context for this thread */ wglMakeCurrent(NULL, NULL); - /* Clean up */ -#ifdef OPENGL32_USE_TLS - ThreadData = TlsGetValue(OglTlsIndex); - if(ThreadData) - HeapFree(GetProcessHeap(), 0, ThreadData); -#else - NtCurrentTeb()->glTable = NULL; -#endif // defined(OPENGL32_USE_TLS) break; case DLL_PROCESS_DETACH: /* Clean up */ @@ -71,15 +31,7 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) wglMakeCurrent(NULL, NULL); IntDeleteAllContexts(); IntDeleteAllICDs(); -#ifdef OPENGL32_USE_TLS - ThreadData = TlsGetValue(OglTlsIndex); - if(ThreadData) - HeapFree(GetProcessHeap(), 0, ThreadData); -#endif } -#ifdef OPENGL32_USE_TLS - TlsFree(OglTlsIndex); -#endif break; } diff --git a/dll/opengl/opengl32/glapi_x86.s b/dll/opengl/opengl32/glapi_x86.s index 017dc7ef81..a1eec929d0 100644 --- a/dll/opengl/opengl32/glapi_x86.s +++ b/dll/opengl/opengl32/glapi_x86.s @@ -16,31 +16,16 @@ ASSUME nothing .code -#ifdef OPENG32_USE_TLS -EXTERN _OglTlsIndex:DWORD -EXTERN _TlsGetValue@4:PROC -#endif - MACRO(USE_GL_FUNC, name, offset, stack) PUBLIC _gl&name&@&stack .PROC _gl&name&@&stack -FPO 0, 0, 0, 0, 0, FRAME_FPO + FPO 0, 0, 0, 0, 0, FRAME_FPO -#ifdef OPENG32_USE_TLS - push _OglTlsIndex - call _TlsGetValue@4 - /* If we don't have a thread data, this is a nop */ - test eax, eax - jz name&_fast_ret - /* Get the GL table */ - mov eax, [eax] -#else /* Get the TEB */ mov eax, fs:[TEB_SELF] /* Get the GL table */ mov eax, [eax + TEB_GL_TABLE] -#endif /* If we don't have a dispatch table, this is a nop */ test eax, eax diff --git a/dll/opengl/opengl32/opengl32.h b/dll/opengl/opengl32/opengl32.h index b454ac5051..8808ca55ff 100644 --- a/dll/opengl/opengl32/opengl32.h +++ b/dll/opengl/opengl32/opengl32.h @@ -112,99 +112,6 @@ struct wgl_dc_data void IntDeleteAllContexts(void); void IntDeleteAllICDs(void); -#ifdef OPENGL32_USE_TLS -extern DWORD OglTlsIndex; - -struct Opengl32_ThreadData -{ - const GLDISPATCHTABLE* glDispatchTable; - HGLRC hglrc; - HDC hdc; - struct wgl_dc_data* dc_data; - PVOID* icdData; -}; -C_ASSERT(FIELD_OFFSET(struct Opengl32_ThreadData, glDispatchTable) == 0); - -/* dllmain.c */ -BOOL init_tls_data(void); - -FORCEINLINE -void -IntMakeCurrent(HGLRC hglrc, HDC hdc, struct wgl_dc_data* dc_data) -{ - struct Opengl32_ThreadData* thread_data = TlsGetValue(OglTlsIndex); - if (!thread_data) - { - OutputDebugStringA("Calling init_tls_data from IntMakeCurrent\n"); - if (!init_tls_data()) - OutputDebugStringA("init_tls_data failed, brace for impact...\n"); - - thread_data = TlsGetValue(OglTlsIndex); - } - - thread_data->hglrc = hglrc; - thread_data->hdc = hdc; - thread_data->dc_data = dc_data; -} - -FORCEINLINE -HGLRC -IntGetCurrentRC(void) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - return data ? data->hglrc : NULL; -} - -FORCEINLINE -HDC -IntGetCurrentDC(void) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - return data ? data->hdc : NULL; -} - -FORCEINLINE -struct wgl_dc_data* -IntGetCurrentDcData(void) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - return data->dc_data; -} - -FORCEINLINE -const GLDISPATCHTABLE * -IntGetCurrentDispatchTable(void) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - return data->glDispatchTable; -} - -FORCEINLINE -void -IntSetCurrentDispatchTable(const GLDISPATCHTABLE* table) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - data->glDispatchTable = table; -} - -FORCEINLINE -void -IntSetCurrentICDPrivate(void* value) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - data->icdData = value; -} - -FORCEINLINE -void* -IntGetCurrentICDPrivate(void) -{ - struct Opengl32_ThreadData* data = TlsGetValue(OglTlsIndex); - return data->icdData; -} - - -#else FORCEINLINE const GLDISPATCHTABLE* IntGetCurrentDispatchTable(void) @@ -265,8 +172,6 @@ IntGetCurrentICDPrivate(void) return (void*)NtCurrentTeb()->glReserved1[0]; } -#endif // defined(OPENGL32_USE_TLS) - FORCEINLINE DHGLRC IntGetCurrentDHGLRC(void)

1 0

[reactos] 04/05: [OPENGL32] - Get rid of the default stub table, use NULL instead - Simplify stub code by using the appropriate macros CORE-14024
by Jérôme Gardou 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31acac46a1dbb45dc00f3… commit 31acac46a1dbb45dc00f3ceb73ae9b04aee426df Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 20 00:26:11 2017 +0100 [OPENGL32] - Get rid of the default stub table, use NULL instead - Simplify stub code by using the appropriate macros CORE-14024 --- dll/opengl/opengl32/apistubs.c | 3709 +-------------------------------------- dll/opengl/opengl32/dllmain.c | 1 - dll/opengl/opengl32/glapi_x86.s | 32 +- dll/opengl/opengl32/icd.h | 3 - dll/opengl/opengl32/wgl.c | 5 +- 5 files changed, 39 insertions(+), 3711 deletions(-) diff --git a/dll/opengl/opengl32/apistubs.c b/dll/opengl/opengl32/apistubs.c index 85c75874e5..65d6596c5b 100644 --- a/dll/opengl/opengl32/apistubs.c +++ b/dll/opengl/opengl32/apistubs.c @@ -7,3707 +7,30 @@ #include "opengl32.h" -void GLAPIENTRY nop_NewList(GLuint list, GLenum mode) -{ - (void) list; (void) mode; -} - -void GLAPIENTRY nop_EndList(void) -{ -} - -void GLAPIENTRY nop_CallList(GLuint list) -{ - (void) list; -} - -void GLAPIENTRY nop_CallLists(GLsizei n, GLenum type, const GLvoid * lists) -{ - (void) n; (void) type; (void) lists; -} - -void GLAPIENTRY nop_DeleteLists(GLuint list, GLsizei range) -{ - (void) list; (void) range; -} - -GLuint GLAPIENTRY nop_GenLists(GLsizei range) -{ - (void) range; - return 0; -} - -void GLAPIENTRY nop_ListBase(GLuint base) -{ - (void) base; -} - -void GLAPIENTRY nop_Begin(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_Bitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap) -{ - (void) width; (void) height; (void) xorig; (void) yorig; (void) xmove; (void) ymove; (void) bitmap; -} - -void GLAPIENTRY nop_Color3b(GLbyte red, GLbyte green, GLbyte blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3bv(const GLbyte * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3d(GLdouble red, GLdouble green, GLdouble blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3f(GLfloat red, GLfloat green, GLfloat blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3i(GLint red, GLint green, GLint blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3s(GLshort red, GLshort green, GLshort blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3ub(GLubyte red, GLubyte green, GLubyte blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3ubv(const GLubyte * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3ui(GLuint red, GLuint green, GLuint blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3uiv(const GLuint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color3us(GLushort red, GLushort green, GLushort blue) -{ - (void) red; (void) green; (void) blue; -} - -void GLAPIENTRY nop_Color3usv(const GLushort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4bv(const GLbyte * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4i(GLint red, GLint green, GLint blue, GLint alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4s(GLshort red, GLshort green, GLshort blue, GLshort alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4ubv(const GLubyte * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4uiv(const GLuint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Color4us(GLushort red, GLushort green, GLushort blue, GLushort alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_Color4usv(const GLushort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_EdgeFlag(GLboolean flag) -{ - (void) flag; -} - -void GLAPIENTRY nop_EdgeFlagv(const GLboolean * flag) -{ - (void) flag; -} - -void GLAPIENTRY nop_End(void) -{ -} - -void GLAPIENTRY nop_Indexd(GLdouble c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexdv(const GLdouble * c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexf(GLfloat c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexfv(const GLfloat * c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexi(GLint c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexiv(const GLint * c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexs(GLshort c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexsv(const GLshort * c) -{ - (void) c; -} - -void GLAPIENTRY nop_Normal3b(GLbyte nx, GLbyte ny, GLbyte nz) -{ - (void) nx; (void) ny; (void) nz; -} - -void GLAPIENTRY nop_Normal3bv(const GLbyte * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Normal3d(GLdouble nx, GLdouble ny, GLdouble nz) -{ - (void) nx; (void) ny; (void) nz; -} - -void GLAPIENTRY nop_Normal3dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) -{ - (void) nx; (void) ny; (void) nz; -} - -void GLAPIENTRY nop_Normal3fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Normal3i(GLint nx, GLint ny, GLint nz) -{ - (void) nx; (void) ny; (void) nz; -} - -void GLAPIENTRY nop_Normal3iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Normal3s(GLshort nx, GLshort ny, GLshort nz) -{ - (void) nx; (void) ny; (void) nz; -} - -void GLAPIENTRY nop_Normal3sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos2d(GLdouble x, GLdouble y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_RasterPos2dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos2f(GLfloat x, GLfloat y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_RasterPos2fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos2i(GLint x, GLint y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_RasterPos2iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos2s(GLshort x, GLshort y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_RasterPos2sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_RasterPos3dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_RasterPos3fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos3i(GLint x, GLint y, GLint z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_RasterPos3iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos3s(GLshort x, GLshort y, GLshort z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_RasterPos3sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_RasterPos4dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_RasterPos4fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos4i(GLint x, GLint y, GLint z, GLint w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_RasterPos4iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_RasterPos4sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) -{ - (void) x1; (void) y1; (void) x2; (void) y2; -} - -void GLAPIENTRY nop_Rectdv(const GLdouble * v1, const GLdouble * v2) -{ - (void) v1; (void) v2; -} - -void GLAPIENTRY nop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) -{ - (void) x1; (void) y1; (void) x2; (void) y2; -} - -void GLAPIENTRY nop_Rectfv(const GLfloat * v1, const GLfloat * v2) -{ - (void) v1; (void) v2; -} - -void GLAPIENTRY nop_Recti(GLint x1, GLint y1, GLint x2, GLint y2) -{ - (void) x1; (void) y1; (void) x2; (void) y2; -} - -void GLAPIENTRY nop_Rectiv(const GLint * v1, const GLint * v2) -{ - (void) v1; (void) v2; -} - -void GLAPIENTRY nop_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) -{ - (void) x1; (void) y1; (void) x2; (void) y2; -} - -void GLAPIENTRY nop_Rectsv(const GLshort * v1, const GLshort * v2) -{ - (void) v1; (void) v2; -} - -void GLAPIENTRY nop_TexCoord1d(GLdouble s) -{ - (void) s; -} - -void GLAPIENTRY nop_TexCoord1dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord1f(GLfloat s) -{ - (void) s; -} - -void GLAPIENTRY nop_TexCoord1fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord1i(GLint s) -{ - (void) s; -} - -void GLAPIENTRY nop_TexCoord1iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord1s(GLshort s) -{ - (void) s; -} - -void GLAPIENTRY nop_TexCoord1sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord2d(GLdouble s, GLdouble t) -{ - (void) s; (void) t; -} - -void GLAPIENTRY nop_TexCoord2dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord2f(GLfloat s, GLfloat t) -{ - (void) s; (void) t; -} - -void GLAPIENTRY nop_TexCoord2fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord2i(GLint s, GLint t) -{ - (void) s; (void) t; -} - -void GLAPIENTRY nop_TexCoord2iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord2s(GLshort s, GLshort t) -{ - (void) s; (void) t; -} - -void GLAPIENTRY nop_TexCoord2sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord3d(GLdouble s, GLdouble t, GLdouble r) -{ - (void) s; (void) t; (void) r; -} - -void GLAPIENTRY nop_TexCoord3dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord3f(GLfloat s, GLfloat t, GLfloat r) -{ - (void) s; (void) t; (void) r; -} - -void GLAPIENTRY nop_TexCoord3fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord3i(GLint s, GLint t, GLint r) -{ - (void) s; (void) t; (void) r; -} - -void GLAPIENTRY nop_TexCoord3iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord3s(GLshort s, GLshort t, GLshort r) -{ - (void) s; (void) t; (void) r; -} - -void GLAPIENTRY nop_TexCoord3sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q) -{ - (void) s; (void) t; (void) r; (void) q; -} - -void GLAPIENTRY nop_TexCoord4dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) -{ - (void) s; (void) t; (void) r; (void) q; -} - -void GLAPIENTRY nop_TexCoord4fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord4i(GLint s, GLint t, GLint r, GLint q) -{ - (void) s; (void) t; (void) r; (void) q; -} - -void GLAPIENTRY nop_TexCoord4iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_TexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q) -{ - (void) s; (void) t; (void) r; (void) q; -} - -void GLAPIENTRY nop_TexCoord4sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex2d(GLdouble x, GLdouble y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_Vertex2dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex2f(GLfloat x, GLfloat y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_Vertex2fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex2i(GLint x, GLint y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_Vertex2iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex2s(GLshort x, GLshort y) -{ - (void) x; (void) y; -} - -void GLAPIENTRY nop_Vertex2sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex3d(GLdouble x, GLdouble y, GLdouble z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Vertex3dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex3f(GLfloat x, GLfloat y, GLfloat z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Vertex3fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex3i(GLint x, GLint y, GLint z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Vertex3iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex3s(GLshort x, GLshort y, GLshort z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Vertex3sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_Vertex4dv(const GLdouble * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_Vertex4fv(const GLfloat * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex4i(GLint x, GLint y, GLint z, GLint w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_Vertex4iv(const GLint * v) -{ - (void) v; -} - -void GLAPIENTRY nop_Vertex4s(GLshort x, GLshort y, GLshort z, GLshort w) -{ - (void) x; (void) y; (void) z; (void) w; -} - -void GLAPIENTRY nop_Vertex4sv(const GLshort * v) -{ - (void) v; -} - -void GLAPIENTRY nop_ClipPlane(GLenum plane, const GLdouble * equation) -{ - (void) plane; (void) equation; -} - -void GLAPIENTRY nop_ColorMaterial(GLenum face, GLenum mode) -{ - (void) face; (void) mode; -} - -void GLAPIENTRY nop_CullFace(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_Fogf(GLenum pname, GLfloat param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_Fogfv(GLenum pname, const GLfloat * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_Fogi(GLenum pname, GLint param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_Fogiv(GLenum pname, const GLint * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_FrontFace(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_Hint(GLenum target, GLenum mode) -{ - (void) target; (void) mode; -} - -void GLAPIENTRY nop_Lightf(GLenum light, GLenum pname, GLfloat param) -{ - (void) light; (void) pname; (void) param; -} - -void GLAPIENTRY nop_Lightfv(GLenum light, GLenum pname, const GLfloat * params) -{ - (void) light; (void) pname; (void) params; -} - -void GLAPIENTRY nop_Lighti(GLenum light, GLenum pname, GLint param) -{ - (void) light; (void) pname; (void) param; -} - -void GLAPIENTRY nop_Lightiv(GLenum light, GLenum pname, const GLint * params) -{ - (void) light; (void) pname; (void) params; -} - -void GLAPIENTRY nop_LightModelf(GLenum pname, GLfloat param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_LightModelfv(GLenum pname, const GLfloat * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_LightModeli(GLenum pname, GLint param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_LightModeliv(GLenum pname, const GLint * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_LineStipple(GLint factor, GLushort pattern) -{ - (void) factor; (void) pattern; -} - -void GLAPIENTRY nop_LineWidth(GLfloat width) -{ - (void) width; -} - -void GLAPIENTRY nop_Materialf(GLenum face, GLenum pname, GLfloat param) -{ - (void) face; (void) pname; (void) param; -} - -void GLAPIENTRY nop_Materialfv(GLenum face, GLenum pname, const GLfloat * params) -{ - (void) face; (void) pname; (void) params; -} - -void GLAPIENTRY nop_Materiali(GLenum face, GLenum pname, GLint param) -{ - (void) face; (void) pname; (void) param; -} - -void GLAPIENTRY nop_Materialiv(GLenum face, GLenum pname, const GLint * params) -{ - (void) face; (void) pname; (void) params; -} - -void GLAPIENTRY nop_PointSize(GLfloat size) -{ - (void) size; -} - -void GLAPIENTRY nop_PolygonMode(GLenum face, GLenum mode) -{ - (void) face; (void) mode; -} - -void GLAPIENTRY nop_PolygonStipple(const GLubyte * mask) -{ - (void) mask; -} - -void GLAPIENTRY nop_Scissor(GLint x, GLint y, GLsizei width, GLsizei height) -{ - (void) x; (void) y; (void) width; (void) height; -} - -void GLAPIENTRY nop_ShadeModel(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_TexParameterf(GLenum target, GLenum pname, GLfloat param) -{ - (void) target; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexParameterfv(GLenum target, GLenum pname, const GLfloat * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexParameteri(GLenum target, GLenum pname, GLint param) -{ - (void) target; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexParameteriv(GLenum target, GLenum pname, const GLint * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -{ - (void) target; (void) level; (void) internalformat; (void) width; (void) border; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -{ - (void) target; (void) level; (void) internalformat; (void) width; (void) height; (void) border; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_TexEnvf(GLenum target, GLenum pname, GLfloat param) -{ - (void) target; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexEnvfv(GLenum target, GLenum pname, const GLfloat * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexEnvi(GLenum target, GLenum pname, GLint param) -{ - (void) target; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexEnviv(GLenum target, GLenum pname, const GLint * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexGend(GLenum coord, GLenum pname, GLdouble param) -{ - (void) coord; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexGendv(GLenum coord, GLenum pname, const GLdouble * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexGenf(GLenum coord, GLenum pname, GLfloat param) -{ - (void) coord; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexGenfv(GLenum coord, GLenum pname, const GLfloat * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_TexGeni(GLenum coord, GLenum pname, GLint param) -{ - (void) coord; (void) pname; (void) param; -} - -void GLAPIENTRY nop_TexGeniv(GLenum coord, GLenum pname, const GLint * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) -{ - (void) size; (void) type; (void) buffer; -} - -void GLAPIENTRY nop_SelectBuffer(GLsizei size, GLuint * buffer) -{ - (void) size; (void) buffer; -} - -GLint GLAPIENTRY nop_RenderMode(GLenum mode) -{ - (void) mode; - return 0; -} - -void GLAPIENTRY nop_InitNames(void) -{ -} - -void GLAPIENTRY nop_LoadName(GLuint name) -{ - (void) name; -} - -void GLAPIENTRY nop_PassThrough(GLfloat token) -{ - (void) token; -} - -void GLAPIENTRY nop_PopName(void) -{ -} - -void GLAPIENTRY nop_PushName(GLuint name) -{ - (void) name; -} - -void GLAPIENTRY nop_DrawBuffer(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_Clear(GLbitfield mask) -{ - (void) mask; -} - -void GLAPIENTRY nop_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_ClearIndex(GLfloat c) -{ - (void) c; -} - -void GLAPIENTRY nop_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_ClearStencil(GLint s) -{ - (void) s; -} - -void GLAPIENTRY nop_ClearDepth(GLclampd depth) -{ - (void) depth; -} - -void GLAPIENTRY nop_StencilMask(GLuint mask) -{ - (void) mask; -} - -void GLAPIENTRY nop_ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) -{ - (void) red; (void) green; (void) blue; (void) alpha; -} - -void GLAPIENTRY nop_DepthMask(GLboolean flag) -{ - (void) flag; -} - -void GLAPIENTRY nop_IndexMask(GLuint mask) -{ - (void) mask; -} - -void GLAPIENTRY nop_Accum(GLenum op, GLfloat value) -{ - (void) op; (void) value; -} - -void GLAPIENTRY nop_Disable(GLenum cap) -{ - (void) cap; -} - -void GLAPIENTRY nop_Enable(GLenum cap) -{ - (void) cap; -} - -void GLAPIENTRY nop_Finish(void) -{ -} - -void GLAPIENTRY nop_Flush(void) -{ -} - -void GLAPIENTRY nop_PopAttrib(void) -{ -} - -void GLAPIENTRY nop_PushAttrib(GLbitfield mask) -{ - (void) mask; -} - -void GLAPIENTRY nop_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points) -{ - (void) target; (void) u1; (void) u2; (void) stride; (void) order; (void) points; -} - -void GLAPIENTRY nop_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points) -{ - (void) target; (void) u1; (void) u2; (void) stride; (void) order; (void) points; -} - -void GLAPIENTRY nop_Map2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points) -{ - (void) target; (void) u1; (void) u2; (void) ustride; (void) uorder; (void) v1; (void) v2; (void) vstride; (void) vorder; (void) points; -} - -void GLAPIENTRY nop_Map2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points) -{ - (void) target; (void) u1; (void) u2; (void) ustride; (void) uorder; (void) v1; (void) v2; (void) vstride; (void) vorder; (void) points; -} - -void GLAPIENTRY nop_MapGrid1d(GLint un, GLdouble u1, GLdouble u2) -{ - (void) un; (void) u1; (void) u2; -} - -void GLAPIENTRY nop_MapGrid1f(GLint un, GLfloat u1, GLfloat u2) -{ - (void) un; (void) u1; (void) u2; -} - -void GLAPIENTRY nop_MapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2) -{ - (void) un; (void) u1; (void) u2; (void) vn; (void) v1; (void) v2; -} - -void GLAPIENTRY nop_MapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2) -{ - (void) un; (void) u1; (void) u2; (void) vn; (void) v1; (void) v2; -} - -void GLAPIENTRY nop_EvalCoord1d(GLdouble u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalCoord1dv(const GLdouble * u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalCoord1f(GLfloat u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalCoord1fv(const GLfloat * u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalCoord2d(GLdouble u, GLdouble v) -{ - (void) u; (void) v; -} - -void GLAPIENTRY nop_EvalCoord2dv(const GLdouble * u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalCoord2f(GLfloat u, GLfloat v) -{ - (void) u; (void) v; -} - -void GLAPIENTRY nop_EvalCoord2fv(const GLfloat * u) -{ - (void) u; -} - -void GLAPIENTRY nop_EvalMesh1(GLenum mode, GLint i1, GLint i2) -{ - (void) mode; (void) i1; (void) i2; -} - -void GLAPIENTRY nop_EvalPoint1(GLint i) -{ - (void) i; -} - -void GLAPIENTRY nop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) -{ - (void) mode; (void) i1; (void) i2; (void) j1; (void) j2; -} - -void GLAPIENTRY nop_EvalPoint2(GLint i, GLint j) -{ - (void) i; (void) j; -} - -void GLAPIENTRY nop_AlphaFunc(GLenum func, GLclampf ref) -{ - (void) func; (void) ref; -} - -void GLAPIENTRY nop_BlendFunc(GLenum sfactor, GLenum dfactor) -{ - (void) sfactor; (void) dfactor; -} - -void GLAPIENTRY nop_LogicOp(GLenum opcode) -{ - (void) opcode; -} - -void GLAPIENTRY nop_StencilFunc(GLenum func, GLint ref, GLuint mask) -{ - (void) func; (void) ref; (void) mask; -} - -void GLAPIENTRY nop_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) -{ - (void) fail; (void) zfail; (void) zpass; -} - -void GLAPIENTRY nop_DepthFunc(GLenum func) -{ - (void) func; -} - -void GLAPIENTRY nop_PixelZoom(GLfloat xfactor, GLfloat yfactor) -{ - (void) xfactor; (void) yfactor; -} - -void GLAPIENTRY nop_PixelTransferf(GLenum pname, GLfloat param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_PixelTransferi(GLenum pname, GLint param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_PixelStoref(GLenum pname, GLfloat param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_PixelStorei(GLenum pname, GLint param) -{ - (void) pname; (void) param; -} - -void GLAPIENTRY nop_PixelMapfv(GLenum map, GLsizei mapsize, const GLfloat * values) -{ - (void) map; (void) mapsize; (void) values; -} - -void GLAPIENTRY nop_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint * values) -{ - (void) map; (void) mapsize; (void) values; -} - -void GLAPIENTRY nop_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort * values) -{ - (void) map; (void) mapsize; (void) values; -} - -void GLAPIENTRY nop_ReadBuffer(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) -{ - (void) x; (void) y; (void) width; (void) height; (void) type; -} - -void GLAPIENTRY nop_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels) -{ - (void) x; (void) y; (void) width; (void) height; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_DrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -{ - (void) width; (void) height; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_GetBooleanv(GLenum pname, GLboolean * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetClipPlane(GLenum plane, GLdouble * equation) -{ - (void) plane; (void) equation; -} - -void GLAPIENTRY nop_GetDoublev(GLenum pname, GLdouble * params) -{ - (void) pname; (void) params; -} - -GLenum GLAPIENTRY nop_GetError(void) -{ - return 0; -} - -void GLAPIENTRY nop_GetFloatv(GLenum pname, GLfloat * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetIntegerv(GLenum pname, GLint * params) -{ - (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetLightfv(GLenum light, GLenum pname, GLfloat * params) -{ - (void) light; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetLightiv(GLenum light, GLenum pname, GLint * params) -{ - (void) light; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetMapdv(GLenum target, GLenum query, GLdouble * v) -{ - (void) target; (void) query; (void) v; -} - -void GLAPIENTRY nop_GetMapfv(GLenum target, GLenum query, GLfloat * v) -{ - (void) target; (void) query; (void) v; -} - -void GLAPIENTRY nop_GetMapiv(GLenum target, GLenum query, GLint * v) -{ - (void) target; (void) query; (void) v; -} - -void GLAPIENTRY nop_GetMaterialfv(GLenum face, GLenum pname, GLfloat * params) -{ - (void) face; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetMaterialiv(GLenum face, GLenum pname, GLint * params) -{ - (void) face; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetPixelMapfv(GLenum map, GLfloat * values) -{ - (void) map; (void) values; -} - -void GLAPIENTRY nop_GetPixelMapuiv(GLenum map, GLuint * values) -{ - (void) map; (void) values; -} - -void GLAPIENTRY nop_GetPixelMapusv(GLenum map, GLushort * values) -{ - (void) map; (void) values; -} - -void GLAPIENTRY nop_GetPolygonStipple(GLubyte * mask) -{ - (void) mask; -} - -const GLubyte * GLAPIENTRY nop_GetString(GLenum name) -{ - (void) name; - return (const GLubyte*)""; -} - -void GLAPIENTRY nop_GetTexEnvfv(GLenum target, GLenum pname, GLfloat * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexEnviv(GLenum target, GLenum pname, GLint * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexGendv(GLenum coord, GLenum pname, GLdouble * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexGenfv(GLenum coord, GLenum pname, GLfloat * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexGeniv(GLenum coord, GLenum pname, GLint * params) -{ - (void) coord; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels) -{ - (void) target; (void) level; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_GetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexParameteriv(GLenum target, GLenum pname, GLint * params) -{ - (void) target; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat * params) -{ - (void) target; (void) level; (void) pname; (void) params; -} - -void GLAPIENTRY nop_GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint * params) -{ - (void) target; (void) level; (void) pname; (void) params; -} - -GLboolean GLAPIENTRY nop_IsEnabled(GLenum cap) -{ - (void) cap; - return 0; -} - -GLboolean GLAPIENTRY nop_IsList(GLuint list) -{ - (void) list; - return 0; -} - -void GLAPIENTRY nop_DepthRange(GLclampd zNear, GLclampd zFar) -{ - (void) zNear; (void) zFar; -} - -void GLAPIENTRY nop_Frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) -{ - (void) left; (void) right; (void) bottom; (void) top; (void) zNear; (void) zFar; -} - -void GLAPIENTRY nop_LoadIdentity(void) -{ -} - -void GLAPIENTRY nop_LoadMatrixf(const GLfloat * m) -{ - (void) m; -} - -void GLAPIENTRY nop_LoadMatrixd(const GLdouble * m) -{ - (void) m; -} - -void GLAPIENTRY nop_MatrixMode(GLenum mode) -{ - (void) mode; -} - -void GLAPIENTRY nop_MultMatrixf(const GLfloat * m) -{ - (void) m; -} - -void GLAPIENTRY nop_MultMatrixd(const GLdouble * m) -{ - (void) m; -} - -void GLAPIENTRY nop_Ortho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) -{ - (void) left; (void) right; (void) bottom; (void) top; (void) zNear; (void) zFar; -} - -void GLAPIENTRY nop_PopMatrix(void) -{ -} - -void GLAPIENTRY nop_PushMatrix(void) -{ -} - -void GLAPIENTRY nop_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) -{ - (void) angle; (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) -{ - (void) angle; (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Scaled(GLdouble x, GLdouble y, GLdouble z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Scalef(GLfloat x, GLfloat y, GLfloat z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Translated(GLdouble x, GLdouble y, GLdouble z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Translatef(GLfloat x, GLfloat y, GLfloat z) -{ - (void) x; (void) y; (void) z; -} - -void GLAPIENTRY nop_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) -{ - (void) x; (void) y; (void) width; (void) height; -} - -void GLAPIENTRY nop_ArrayElement(GLint i) -{ - (void) i; -} - -void GLAPIENTRY nop_BindTexture(GLenum target, GLuint texture) -{ - (void) target; (void) texture; -} - -void GLAPIENTRY nop_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - (void) size; (void) type; (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_DisableClientState(GLenum array) -{ - (void) array; -} - -void GLAPIENTRY nop_DrawArrays(GLenum mode, GLint first, GLsizei count) -{ - (void) mode; (void) first; (void) count; -} - -void GLAPIENTRY nop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) -{ - (void) mode; (void) count; (void) type; (void) indices; -} - -void GLAPIENTRY nop_EdgeFlagPointer(GLsizei stride, const GLvoid * pointer) -{ - (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_EnableClientState(GLenum array) -{ - (void) array; -} - -void GLAPIENTRY nop_IndexPointer(GLenum type, GLsizei stride, const GLvoid * pointer) -{ - (void) type; (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_Indexub(GLubyte c) -{ - (void) c; -} - -void GLAPIENTRY nop_Indexubv(const GLubyte * c) -{ - (void) c; -} - -void GLAPIENTRY nop_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) -{ - (void) format; (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_NormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) -{ - (void) type; (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_PolygonOffset(GLfloat factor, GLfloat units) -{ - (void) factor; (void) units; -} - -void GLAPIENTRY nop_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - (void) size; (void) type; (void) stride; (void) pointer; -} - -void GLAPIENTRY nop_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - (void) size; (void) type; (void) stride; (void) pointer; -} - -GLboolean GLAPIENTRY nop_AreTexturesResident(GLsizei n, const GLuint * textures, GLboolean * residences) -{ - (void) n; (void) textures; (void) residences; - return 0; -} - -void GLAPIENTRY nop_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) -{ - (void) target; (void) level; (void) internalformat; (void) x; (void) y; (void) width; (void) border; -} - -void GLAPIENTRY nop_CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) -{ - (void) target; (void) level; (void) internalformat; (void) x; (void) y; (void) width; (void) height; (void) border; -} - -void GLAPIENTRY nop_CopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width) -{ - (void) target; (void) level; (void) xoffset; (void) x; (void) y; (void) width; -} - -void GLAPIENTRY nop_CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) -{ - (void) target; (void) level; (void) xoffset; (void) yoffset; (void) x; (void) y; (void) width; (void) height; -} - -void GLAPIENTRY nop_DeleteTextures(GLsizei n, const GLuint * textures) -{ - (void) n; (void) textures; -} - -void GLAPIENTRY nop_GenTextures(GLsizei n, GLuint * textures) -{ - (void) n; (void) textures; -} - -void GLAPIENTRY nop_GetPointerv(GLenum pname, GLvoid ** params) -{ - (void) pname; (void) params; -} - -GLboolean GLAPIENTRY nop_IsTexture(GLuint texture) -{ - (void) texture; - return 0; -} - -void GLAPIENTRY nop_PrioritizeTextures(GLsizei n, const GLuint * textures, const GLclampf * priorities) -{ - (void) n; (void) textures; (void) priorities; -} - -void GLAPIENTRY nop_TexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels) -{ - (void) target; (void) level; (void) xoffset; (void) width; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -{ - (void) target; (void) level; (void) xoffset; (void) yoffset; (void) width; (void) height; (void) format; (void) type; (void) pixels; -} - -void GLAPIENTRY nop_PopClientAttrib(void) -{ -} - -void GLAPIENTRY nop_PushClientAttrib(GLbitfield mask) -{ - (void) mask; -} - -const GLCLTPROCTABLE StubTable = -{ - OPENGL_VERSION_110_ENTRIES, - { - nop_NewList, - nop_EndList, - nop_CallList, - nop_CallLists, - nop_DeleteLists, - nop_GenLists, - nop_ListBase, - nop_Begin, - nop_Bitmap, - nop_Color3b, - nop_Color3bv, - nop_Color3d, - nop_Color3dv, - nop_Color3f, - nop_Color3fv, - nop_Color3i, - nop_Color3iv, - nop_Color3s, - nop_Color3sv, - nop_Color3ub, - nop_Color3ubv, - nop_Color3ui, - nop_Color3uiv, - nop_Color3us, - nop_Color3usv, - nop_Color4b, - nop_Color4bv, - nop_Color4d, - nop_Color4dv, - nop_Color4f, - nop_Color4fv, - nop_Color4i, - nop_Color4iv, - nop_Color4s, - nop_Color4sv, - nop_Color4ub, - nop_Color4ubv, - nop_Color4ui, - nop_Color4uiv, - nop_Color4us, - nop_Color4usv, - nop_EdgeFlag, - nop_EdgeFlagv, - nop_End, - nop_Indexd, - nop_Indexdv, - nop_Indexf, - nop_Indexfv, - nop_Indexi, - nop_Indexiv, - nop_Indexs, - nop_Indexsv, - nop_Normal3b, - nop_Normal3bv, - nop_Normal3d, - nop_Normal3dv, - nop_Normal3f, - nop_Normal3fv, - nop_Normal3i, - nop_Normal3iv, - nop_Normal3s, - nop_Normal3sv, - nop_RasterPos2d, - nop_RasterPos2dv, - nop_RasterPos2f, - nop_RasterPos2fv, - nop_RasterPos2i, - nop_RasterPos2iv, - nop_RasterPos2s, - nop_RasterPos2sv, - nop_RasterPos3d, - nop_RasterPos3dv, - nop_RasterPos3f, - nop_RasterPos3fv, - nop_RasterPos3i, - nop_RasterPos3iv, - nop_RasterPos3s, - nop_RasterPos3sv, - nop_RasterPos4d, - nop_RasterPos4dv, - nop_RasterPos4f, - nop_RasterPos4fv, - nop_RasterPos4i, - nop_RasterPos4iv, - nop_RasterPos4s, - nop_RasterPos4sv, - nop_Rectd, - nop_Rectdv, - nop_Rectf, - nop_Rectfv, - nop_Recti, - nop_Rectiv, - nop_Rects, - nop_Rectsv, - nop_TexCoord1d, - nop_TexCoord1dv, - nop_TexCoord1f, - nop_TexCoord1fv, - nop_TexCoord1i, - nop_TexCoord1iv, - nop_TexCoord1s, - nop_TexCoord1sv, - nop_TexCoord2d, - nop_TexCoord2dv, - nop_TexCoord2f, - nop_TexCoord2fv, - nop_TexCoord2i, - nop_TexCoord2iv, - nop_TexCoord2s, - nop_TexCoord2sv, - nop_TexCoord3d, - nop_TexCoord3dv, - nop_TexCoord3f, - nop_TexCoord3fv, - nop_TexCoord3i, - nop_TexCoord3iv, - nop_TexCoord3s, - nop_TexCoord3sv, - nop_TexCoord4d, - nop_TexCoord4dv, - nop_TexCoord4f, - nop_TexCoord4fv, - nop_TexCoord4i, - nop_TexCoord4iv, - nop_TexCoord4s, - nop_TexCoord4sv, - nop_Vertex2d, - nop_Vertex2dv, - nop_Vertex2f, - nop_Vertex2fv, - nop_Vertex2i, - nop_Vertex2iv, - nop_Vertex2s, - nop_Vertex2sv, - nop_Vertex3d, - nop_Vertex3dv, - nop_Vertex3f, - nop_Vertex3fv, - nop_Vertex3i, - nop_Vertex3iv, - nop_Vertex3s, - nop_Vertex3sv, - nop_Vertex4d, - nop_Vertex4dv, - nop_Vertex4f, - nop_Vertex4fv, - nop_Vertex4i, - nop_Vertex4iv, - nop_Vertex4s, - nop_Vertex4sv, - nop_ClipPlane, - nop_ColorMaterial, - nop_CullFace, - nop_Fogf, - nop_Fogfv, - nop_Fogi, - nop_Fogiv, - nop_FrontFace, - nop_Hint, - nop_Lightf, - nop_Lightfv, - nop_Lighti, - nop_Lightiv, - nop_LightModelf, - nop_LightModelfv, - nop_LightModeli, - nop_LightModeliv, - nop_LineStipple, - nop_LineWidth, - nop_Materialf, - nop_Materialfv, - nop_Materiali, - nop_Materialiv, - nop_PointSize, - nop_PolygonMode, - nop_PolygonStipple, - nop_Scissor, - nop_ShadeModel, - nop_TexParameterf, - nop_TexParameterfv, - nop_TexParameteri, - nop_TexParameteriv, - nop_TexImage1D, - nop_TexImage2D, - nop_TexEnvf, - nop_TexEnvfv, - nop_TexEnvi, - nop_TexEnviv, - nop_TexGend, - nop_TexGendv, - nop_TexGenf, - nop_TexGenfv, - nop_TexGeni, - nop_TexGeniv, - nop_FeedbackBuffer, - nop_SelectBuffer, - nop_RenderMode, - nop_InitNames, - nop_LoadName, - nop_PassThrough, - nop_PopName, - nop_PushName, - nop_DrawBuffer, - nop_Clear, - nop_ClearAccum, - nop_ClearIndex, - nop_ClearColor, - nop_ClearStencil, - nop_ClearDepth, - nop_StencilMask, - nop_ColorMask, - nop_DepthMask, - nop_IndexMask, - nop_Accum, - nop_Disable, - nop_Enable, - nop_Finish, - nop_Flush, - nop_PopAttrib, - nop_PushAttrib, - nop_Map1d, - nop_Map1f, - nop_Map2d, - nop_Map2f, - nop_MapGrid1d, - nop_MapGrid1f, - nop_MapGrid2d, - nop_MapGrid2f, - nop_EvalCoord1d, - nop_EvalCoord1dv, - nop_EvalCoord1f, - nop_EvalCoord1fv, - nop_EvalCoord2d, - nop_EvalCoord2dv, - nop_EvalCoord2f, - nop_EvalCoord2fv, - nop_EvalMesh1, - nop_EvalPoint1, - nop_EvalMesh2, - nop_EvalPoint2, - nop_AlphaFunc, - nop_BlendFunc, - nop_LogicOp, - nop_StencilFunc, - nop_StencilOp, - nop_DepthFunc, - nop_PixelZoom, - nop_PixelTransferf, - nop_PixelTransferi, - nop_PixelStoref, - nop_PixelStorei, - nop_PixelMapfv, - nop_PixelMapuiv, - nop_PixelMapusv, - nop_ReadBuffer, - nop_CopyPixels, - nop_ReadPixels, - nop_DrawPixels, - nop_GetBooleanv, - nop_GetClipPlane, - nop_GetDoublev, - nop_GetError, - nop_GetFloatv, - nop_GetIntegerv, - nop_GetLightfv, - nop_GetLightiv, - nop_GetMapdv, - nop_GetMapfv, - nop_GetMapiv, - nop_GetMaterialfv, - nop_GetMaterialiv, - nop_GetPixelMapfv, - nop_GetPixelMapuiv, - nop_GetPixelMapusv, - nop_GetPolygonStipple, - nop_GetString, - nop_GetTexEnvfv, - nop_GetTexEnviv, - nop_GetTexGendv, - nop_GetTexGenfv, - nop_GetTexGeniv, - nop_GetTexImage, - nop_GetTexParameterfv, - nop_GetTexParameteriv, - nop_GetTexLevelParameterfv, - nop_GetTexLevelParameteriv, - nop_IsEnabled, - nop_IsList, - nop_DepthRange, - nop_Frustum, - nop_LoadIdentity, - nop_LoadMatrixf, - nop_LoadMatrixd, - nop_MatrixMode, - nop_MultMatrixf, - nop_MultMatrixd, - nop_Ortho, - nop_PopMatrix, - nop_PushMatrix, - nop_Rotated, - nop_Rotatef, - nop_Scaled, - nop_Scalef, - nop_Translated, - nop_Translatef, - nop_Viewport, - nop_ArrayElement, - nop_BindTexture, - nop_ColorPointer, - nop_DisableClientState, - nop_DrawArrays, - nop_DrawElements, - nop_EdgeFlagPointer, - nop_EnableClientState, - nop_IndexPointer, - nop_Indexub, - nop_Indexubv, - nop_InterleavedArrays, - nop_NormalPointer, - nop_PolygonOffset, - nop_TexCoordPointer, - nop_VertexPointer, - nop_AreTexturesResident, - nop_CopyTexImage1D, - nop_CopyTexImage2D, - nop_CopyTexSubImage1D, - nop_CopyTexSubImage2D, - nop_DeleteTextures, - nop_GenTextures, - nop_GetPointerv, - nop_IsTexture, - nop_PrioritizeTextures, - nop_TexSubImage1D, - nop_TexSubImage2D, - nop_PopClientAttrib, - nop_PushClientAttrib - } -}; - - -#ifndef __i386__ - -void GLAPIENTRY glNewList(GLuint list, GLenum mode) -{ - IntGetCurrentDispatchTable()->NewList(list, mode); -} - -void GLAPIENTRY glEndList(void) -{ - IntGetCurrentDispatchTable()->EndList(); -} - -void GLAPIENTRY glCallList(GLuint list) -{ - IntGetCurrentDispatchTable()->CallList(list); -} - -void GLAPIENTRY glCallLists(GLsizei n, GLenum type, const GLvoid * lists) -{ - IntGetCurrentDispatchTable()->CallLists(n, type, lists); -} - -void GLAPIENTRY glDeleteLists(GLuint list, GLsizei range) -{ - IntGetCurrentDispatchTable()->DeleteLists(list, range); -} - -GLuint GLAPIENTRY glGenLists(GLsizei range) -{ - return IntGetCurrentDispatchTable()->GenLists(range); -} - -void GLAPIENTRY glListBase(GLuint base) -{ - IntGetCurrentDispatchTable()->ListBase(base); -} - -void GLAPIENTRY glBegin(GLenum mode) -{ - IntGetCurrentDispatchTable()->Begin(mode); -} - -void GLAPIENTRY glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap) -{ - IntGetCurrentDispatchTable()->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap); -} - -void GLAPIENTRY glColor3b(GLbyte red, GLbyte green, GLbyte blue) -{ - IntGetCurrentDispatchTable()->Color3b(red, green, blue); -} - -void GLAPIENTRY glColor3bv(const GLbyte * v) -{ - IntGetCurrentDispatchTable()->Color3bv(v); -} - -void GLAPIENTRY glColor3d(GLdouble red, GLdouble green, GLdouble blue) -{ - IntGetCurrentDispatchTable()->Color3d(red, green, blue); -} - -void GLAPIENTRY glColor3dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Color3dv(v); -} - -void GLAPIENTRY glColor3f(GLfloat red, GLfloat green, GLfloat blue) -{ - IntGetCurrentDispatchTable()->Color3f(red, green, blue); -} - -void GLAPIENTRY glColor3fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Color3fv(v); -} - -void GLAPIENTRY glColor3i(GLint red, GLint green, GLint blue) -{ - IntGetCurrentDispatchTable()->Color3i(red, green, blue); -} - -void GLAPIENTRY glColor3iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Color3iv(v); -} - -void GLAPIENTRY glColor3s(GLshort red, GLshort green, GLshort blue) -{ - IntGetCurrentDispatchTable()->Color3s(red, green, blue); -} - -void GLAPIENTRY glColor3sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Color3sv(v); -} - -void GLAPIENTRY glColor3ub(GLubyte red, GLubyte green, GLubyte blue) -{ - IntGetCurrentDispatchTable()->Color3ub(red, green, blue); -} - -void GLAPIENTRY glColor3ubv(const GLubyte * v) -{ - IntGetCurrentDispatchTable()->Color3ubv(v); -} - -void GLAPIENTRY glColor3ui(GLuint red, GLuint green, GLuint blue) -{ - IntGetCurrentDispatchTable()->Color3ui(red, green, blue); -} - -void GLAPIENTRY glColor3uiv(const GLuint * v) -{ - IntGetCurrentDispatchTable()->Color3uiv(v); -} - -void GLAPIENTRY glColor3us(GLushort red, GLushort green, GLushort blue) -{ - IntGetCurrentDispatchTable()->Color3us(red, green, blue); -} - -void GLAPIENTRY glColor3usv(const GLushort * v) -{ - IntGetCurrentDispatchTable()->Color3usv(v); -} - -void GLAPIENTRY glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha) -{ - IntGetCurrentDispatchTable()->Color4b(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4bv(const GLbyte * v) -{ - IntGetCurrentDispatchTable()->Color4bv(v); -} - -void GLAPIENTRY glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha) -{ - IntGetCurrentDispatchTable()->Color4d(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Color4dv(v); -} - -void GLAPIENTRY glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -{ - IntGetCurrentDispatchTable()->Color4f(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Color4fv(v); -} - -void GLAPIENTRY glColor4i(GLint red, GLint green, GLint blue, GLint alpha) -{ - IntGetCurrentDispatchTable()->Color4i(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Color4iv(v); -} - -void GLAPIENTRY glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha) -{ - IntGetCurrentDispatchTable()->Color4s(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Color4sv(v); -} - -void GLAPIENTRY glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) -{ - IntGetCurrentDispatchTable()->Color4ub(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4ubv(const GLubyte * v) -{ - IntGetCurrentDispatchTable()->Color4ubv(v); -} - -void GLAPIENTRY glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha) -{ - IntGetCurrentDispatchTable()->Color4ui(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4uiv(const GLuint * v) -{ - IntGetCurrentDispatchTable()->Color4uiv(v); -} - -void GLAPIENTRY glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha) -{ - IntGetCurrentDispatchTable()->Color4us(red, green, blue, alpha); -} - -void GLAPIENTRY glColor4usv(const GLushort * v) -{ - IntGetCurrentDispatchTable()->Color4usv(v); -} - -void GLAPIENTRY glEdgeFlag(GLboolean flag) -{ - IntGetCurrentDispatchTable()->EdgeFlag(flag); -} - -void GLAPIENTRY glEdgeFlagv(const GLboolean * flag) -{ - IntGetCurrentDispatchTable()->EdgeFlagv(flag); -} - -void GLAPIENTRY glEnd(void) -{ - IntGetCurrentDispatchTable()->End(); -} - -void GLAPIENTRY glIndexd(GLdouble c) -{ - IntGetCurrentDispatchTable()->Indexd(c); -} - -void GLAPIENTRY glIndexdv(const GLdouble * c) -{ - IntGetCurrentDispatchTable()->Indexdv(c); -} - -void GLAPIENTRY glIndexf(GLfloat c) -{ - IntGetCurrentDispatchTable()->Indexf(c); -} - -void GLAPIENTRY glIndexfv(const GLfloat * c) -{ - IntGetCurrentDispatchTable()->Indexfv(c); -} - -void GLAPIENTRY glIndexi(GLint c) -{ - IntGetCurrentDispatchTable()->Indexi(c); -} - -void GLAPIENTRY glIndexiv(const GLint * c) -{ - IntGetCurrentDispatchTable()->Indexiv(c); -} - -void GLAPIENTRY glIndexs(GLshort c) -{ - IntGetCurrentDispatchTable()->Indexs(c); -} - -void GLAPIENTRY glIndexsv(const GLshort * c) -{ - IntGetCurrentDispatchTable()->Indexsv(c); -} - -void GLAPIENTRY glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz) -{ - IntGetCurrentDispatchTable()->Normal3b(nx, ny, nz); -} - -void GLAPIENTRY glNormal3bv(const GLbyte * v) -{ - IntGetCurrentDispatchTable()->Normal3bv(v); -} - -void GLAPIENTRY glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz) -{ - IntGetCurrentDispatchTable()->Normal3d(nx, ny, nz); -} - -void GLAPIENTRY glNormal3dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Normal3dv(v); -} - -void GLAPIENTRY glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz) -{ - IntGetCurrentDispatchTable()->Normal3f(nx, ny, nz); -} - -void GLAPIENTRY glNormal3fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Normal3fv(v); -} - -void GLAPIENTRY glNormal3i(GLint nx, GLint ny, GLint nz) -{ - IntGetCurrentDispatchTable()->Normal3i(nx, ny, nz); -} - -void GLAPIENTRY glNormal3iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Normal3iv(v); -} - -void GLAPIENTRY glNormal3s(GLshort nx, GLshort ny, GLshort nz) -{ - IntGetCurrentDispatchTable()->Normal3s(nx, ny, nz); -} - -void GLAPIENTRY glNormal3sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Normal3sv(v); -} - -void GLAPIENTRY glRasterPos2d(GLdouble x, GLdouble y) -{ - IntGetCurrentDispatchTable()->RasterPos2d(x, y); -} - -void GLAPIENTRY glRasterPos2dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->RasterPos2dv(v); -} - -void GLAPIENTRY glRasterPos2f(GLfloat x, GLfloat y) -{ - IntGetCurrentDispatchTable()->RasterPos2f(x, y); -} - -void GLAPIENTRY glRasterPos2fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->RasterPos2fv(v); -} - -void GLAPIENTRY glRasterPos2i(GLint x, GLint y) -{ - IntGetCurrentDispatchTable()->RasterPos2i(x, y); -} - -void GLAPIENTRY glRasterPos2iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->RasterPos2iv(v); -} - -void GLAPIENTRY glRasterPos2s(GLshort x, GLshort y) -{ - IntGetCurrentDispatchTable()->RasterPos2s(x, y); -} - -void GLAPIENTRY glRasterPos2sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->RasterPos2sv(v); -} - -void GLAPIENTRY glRasterPos3d(GLdouble x, GLdouble y, GLdouble z) -{ - IntGetCurrentDispatchTable()->RasterPos3d(x, y, z); -} - -void GLAPIENTRY glRasterPos3dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->RasterPos3dv(v); -} - -void GLAPIENTRY glRasterPos3f(GLfloat x, GLfloat y, GLfloat z) -{ - IntGetCurrentDispatchTable()->RasterPos3f(x, y, z); -} - -void GLAPIENTRY glRasterPos3fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->RasterPos3fv(v); -} - -void GLAPIENTRY glRasterPos3i(GLint x, GLint y, GLint z) -{ - IntGetCurrentDispatchTable()->RasterPos3i(x, y, z); -} - -void GLAPIENTRY glRasterPos3iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->RasterPos3iv(v); -} - -void GLAPIENTRY glRasterPos3s(GLshort x, GLshort y, GLshort z) -{ - IntGetCurrentDispatchTable()->RasterPos3s(x, y, z); -} - -void GLAPIENTRY glRasterPos3sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->RasterPos3sv(v); -} - -void GLAPIENTRY glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -{ - IntGetCurrentDispatchTable()->RasterPos4d(x, y, z, w); -} - -void GLAPIENTRY glRasterPos4dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->RasterPos4dv(v); -} - -void GLAPIENTRY glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -{ - IntGetCurrentDispatchTable()->RasterPos4f(x, y, z, w); -} - -void GLAPIENTRY glRasterPos4fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->RasterPos4fv(v); -} - -void GLAPIENTRY glRasterPos4i(GLint x, GLint y, GLint z, GLint w) -{ - IntGetCurrentDispatchTable()->RasterPos4i(x, y, z, w); -} - -void GLAPIENTRY glRasterPos4iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->RasterPos4iv(v); -} - -void GLAPIENTRY glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) -{ - IntGetCurrentDispatchTable()->RasterPos4s(x, y, z, w); -} - -void GLAPIENTRY glRasterPos4sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->RasterPos4sv(v); -} - -void GLAPIENTRY glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) -{ - IntGetCurrentDispatchTable()->Rectd(x1, y1, x2, y2); -} - -void GLAPIENTRY glRectdv(const GLdouble * v1, const GLdouble * v2) -{ - IntGetCurrentDispatchTable()->Rectdv(v1, v2); -} - -void GLAPIENTRY glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) -{ - IntGetCurrentDispatchTable()->Rectf(x1, y1, x2, y2); -} - -void GLAPIENTRY glRectfv(const GLfloat * v1, const GLfloat * v2) -{ - IntGetCurrentDispatchTable()->Rectfv(v1, v2); -} - -void GLAPIENTRY glRecti(GLint x1, GLint y1, GLint x2, GLint y2) -{ - IntGetCurrentDispatchTable()->Recti(x1, y1, x2, y2); -} - -void GLAPIENTRY glRectiv(const GLint * v1, const GLint * v2) -{ - IntGetCurrentDispatchTable()->Rectiv(v1, v2); -} - -void GLAPIENTRY glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) -{ - IntGetCurrentDispatchTable()->Rects(x1, y1, x2, y2); -} - -void GLAPIENTRY glRectsv(const GLshort * v1, const GLshort * v2) -{ - IntGetCurrentDispatchTable()->Rectsv(v1, v2); -} - -void GLAPIENTRY glTexCoord1d(GLdouble s) -{ - IntGetCurrentDispatchTable()->TexCoord1d(s); -} - -void GLAPIENTRY glTexCoord1dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->TexCoord1dv(v); -} - -void GLAPIENTRY glTexCoord1f(GLfloat s) -{ - IntGetCurrentDispatchTable()->TexCoord1f(s); -} - -void GLAPIENTRY glTexCoord1fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->TexCoord1fv(v); -} - -void GLAPIENTRY glTexCoord1i(GLint s) -{ - IntGetCurrentDispatchTable()->TexCoord1i(s); -} - -void GLAPIENTRY glTexCoord1iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->TexCoord1iv(v); -} - -void GLAPIENTRY glTexCoord1s(GLshort s) -{ - IntGetCurrentDispatchTable()->TexCoord1s(s); -} - -void GLAPIENTRY glTexCoord1sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->TexCoord1sv(v); -} - -void GLAPIENTRY glTexCoord2d(GLdouble s, GLdouble t) -{ - IntGetCurrentDispatchTable()->TexCoord2d(s, t); -} - -void GLAPIENTRY glTexCoord2dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->TexCoord2dv(v); -} - -void GLAPIENTRY glTexCoord2f(GLfloat s, GLfloat t) -{ - IntGetCurrentDispatchTable()->TexCoord2f(s, t); -} - -void GLAPIENTRY glTexCoord2fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->TexCoord2fv(v); -} - -void GLAPIENTRY glTexCoord2i(GLint s, GLint t) -{ - IntGetCurrentDispatchTable()->TexCoord2i(s, t); -} - -void GLAPIENTRY glTexCoord2iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->TexCoord2iv(v); -} - -void GLAPIENTRY glTexCoord2s(GLshort s, GLshort t) -{ - IntGetCurrentDispatchTable()->TexCoord2s(s, t); -} - -void GLAPIENTRY glTexCoord2sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->TexCoord2sv(v); -} - -void GLAPIENTRY glTexCoord3d(GLdouble s, GLdouble t, GLdouble r) -{ - IntGetCurrentDispatchTable()->TexCoord3d(s, t, r); -} - -void GLAPIENTRY glTexCoord3dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->TexCoord3dv(v); -} - -void GLAPIENTRY glTexCoord3f(GLfloat s, GLfloat t, GLfloat r) -{ - IntGetCurrentDispatchTable()->TexCoord3f(s, t, r); -} - -void GLAPIENTRY glTexCoord3fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->TexCoord3fv(v); -} - -void GLAPIENTRY glTexCoord3i(GLint s, GLint t, GLint r) -{ - IntGetCurrentDispatchTable()->TexCoord3i(s, t, r); -} - -void GLAPIENTRY glTexCoord3iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->TexCoord3iv(v); -} - -void GLAPIENTRY glTexCoord3s(GLshort s, GLshort t, GLshort r) -{ - IntGetCurrentDispatchTable()->TexCoord3s(s, t, r); -} - -void GLAPIENTRY glTexCoord3sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->TexCoord3sv(v); -} - -void GLAPIENTRY glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q) -{ - IntGetCurrentDispatchTable()->TexCoord4d(s, t, r, q); -} - -void GLAPIENTRY glTexCoord4dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->TexCoord4dv(v); -} - -void GLAPIENTRY glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) -{ - IntGetCurrentDispatchTable()->TexCoord4f(s, t, r, q); -} - -void GLAPIENTRY glTexCoord4fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->TexCoord4fv(v); -} - -void GLAPIENTRY glTexCoord4i(GLint s, GLint t, GLint r, GLint q) -{ - IntGetCurrentDispatchTable()->TexCoord4i(s, t, r, q); -} - -void GLAPIENTRY glTexCoord4iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->TexCoord4iv(v); -} - -void GLAPIENTRY glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q) -{ - IntGetCurrentDispatchTable()->TexCoord4s(s, t, r, q); -} - -void GLAPIENTRY glTexCoord4sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->TexCoord4sv(v); -} - -void GLAPIENTRY glVertex2d(GLdouble x, GLdouble y) -{ - IntGetCurrentDispatchTable()->Vertex2d(x, y); -} - -void GLAPIENTRY glVertex2dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Vertex2dv(v); -} - -void GLAPIENTRY glVertex2f(GLfloat x, GLfloat y) -{ - IntGetCurrentDispatchTable()->Vertex2f(x, y); -} - -void GLAPIENTRY glVertex2fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Vertex2fv(v); -} - -void GLAPIENTRY glVertex2i(GLint x, GLint y) -{ - IntGetCurrentDispatchTable()->Vertex2i(x, y); -} - -void GLAPIENTRY glVertex2iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Vertex2iv(v); -} - -void GLAPIENTRY glVertex2s(GLshort x, GLshort y) -{ - IntGetCurrentDispatchTable()->Vertex2s(x, y); -} - -void GLAPIENTRY glVertex2sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Vertex2sv(v); -} - -void GLAPIENTRY glVertex3d(GLdouble x, GLdouble y, GLdouble z) -{ - IntGetCurrentDispatchTable()->Vertex3d(x, y, z); -} - -void GLAPIENTRY glVertex3dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Vertex3dv(v); -} - -void GLAPIENTRY glVertex3f(GLfloat x, GLfloat y, GLfloat z) -{ - IntGetCurrentDispatchTable()->Vertex3f(x, y, z); -} - -void GLAPIENTRY glVertex3fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Vertex3fv(v); -} - -void GLAPIENTRY glVertex3i(GLint x, GLint y, GLint z) -{ - IntGetCurrentDispatchTable()->Vertex3i(x, y, z); -} - -void GLAPIENTRY glVertex3iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Vertex3iv(v); -} - -void GLAPIENTRY glVertex3s(GLshort x, GLshort y, GLshort z) -{ - IntGetCurrentDispatchTable()->Vertex3s(x, y, z); -} - -void GLAPIENTRY glVertex3sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Vertex3sv(v); -} - -void GLAPIENTRY glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) -{ - IntGetCurrentDispatchTable()->Vertex4d(x, y, z, w); -} - -void GLAPIENTRY glVertex4dv(const GLdouble * v) -{ - IntGetCurrentDispatchTable()->Vertex4dv(v); -} - -void GLAPIENTRY glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) -{ - IntGetCurrentDispatchTable()->Vertex4f(x, y, z, w); -} - -void GLAPIENTRY glVertex4fv(const GLfloat * v) -{ - IntGetCurrentDispatchTable()->Vertex4fv(v); -} - -void GLAPIENTRY glVertex4i(GLint x, GLint y, GLint z, GLint w) -{ - IntGetCurrentDispatchTable()->Vertex4i(x, y, z, w); -} - -void GLAPIENTRY glVertex4iv(const GLint * v) -{ - IntGetCurrentDispatchTable()->Vertex4iv(v); -} - -void GLAPIENTRY glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w) -{ - IntGetCurrentDispatchTable()->Vertex4s(x, y, z, w); -} - -void GLAPIENTRY glVertex4sv(const GLshort * v) -{ - IntGetCurrentDispatchTable()->Vertex4sv(v); -} - -void GLAPIENTRY glClipPlane(GLenum plane, const GLdouble * equation) -{ - IntGetCurrentDispatchTable()->ClipPlane(plane, equation); -} - -void GLAPIENTRY glColorMaterial(GLenum face, GLenum mode) -{ - IntGetCurrentDispatchTable()->ColorMaterial(face, mode); -} - -void GLAPIENTRY glCullFace(GLenum mode) -{ - IntGetCurrentDispatchTable()->CullFace(mode); -} - -void GLAPIENTRY glFogf(GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->Fogf(pname, param); -} - -void GLAPIENTRY glFogfv(GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->Fogfv(pname, params); -} - -void GLAPIENTRY glFogi(GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->Fogi(pname, param); -} - -void GLAPIENTRY glFogiv(GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->Fogiv(pname, params); -} - -void GLAPIENTRY glFrontFace(GLenum mode) -{ - IntGetCurrentDispatchTable()->FrontFace(mode); -} - -void GLAPIENTRY glHint(GLenum target, GLenum mode) -{ - IntGetCurrentDispatchTable()->Hint(target, mode); -} - -void GLAPIENTRY glLightf(GLenum light, GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->Lightf(light, pname, param); -} - -void GLAPIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->Lightfv(light, pname, params); -} - -void GLAPIENTRY glLighti(GLenum light, GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->Lighti(light, pname, param); -} - -void GLAPIENTRY glLightiv(GLenum light, GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->Lightiv(light, pname, params); -} - -void GLAPIENTRY glLightModelf(GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->LightModelf(pname, param); -} - -void GLAPIENTRY glLightModelfv(GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->LightModelfv(pname, params); -} - -void GLAPIENTRY glLightModeli(GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->LightModeli(pname, param); -} - -void GLAPIENTRY glLightModeliv(GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->LightModeliv(pname, params); -} - -void GLAPIENTRY glLineStipple(GLint factor, GLushort pattern) -{ - IntGetCurrentDispatchTable()->LineStipple(factor, pattern); -} - -void GLAPIENTRY glLineWidth(GLfloat width) -{ - IntGetCurrentDispatchTable()->LineWidth(width); -} - -void GLAPIENTRY glMaterialf(GLenum face, GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->Materialf(face, pname, param); -} - -void GLAPIENTRY glMaterialfv(GLenum face, GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->Materialfv(face, pname, params); -} - -void GLAPIENTRY glMateriali(GLenum face, GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->Materiali(face, pname, param); -} - -void GLAPIENTRY glMaterialiv(GLenum face, GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->Materialiv(face, pname, params); -} - -void GLAPIENTRY glPointSize(GLfloat size) -{ - IntGetCurrentDispatchTable()->PointSize(size); -} - -void GLAPIENTRY glPolygonMode(GLenum face, GLenum mode) -{ - IntGetCurrentDispatchTable()->PolygonMode(face, mode); -} - -void GLAPIENTRY glPolygonStipple(const GLubyte * mask) -{ - IntGetCurrentDispatchTable()->PolygonStipple(mask); -} - -void GLAPIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height) -{ - IntGetCurrentDispatchTable()->Scissor(x, y, width, height); -} - -void GLAPIENTRY glShadeModel(GLenum mode) -{ - IntGetCurrentDispatchTable()->ShadeModel(mode); -} - -void GLAPIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->TexParameterf(target, pname, param); -} - -void GLAPIENTRY glTexParameterfv(GLenum target, GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->TexParameterfv(target, pname, params); -} - -void GLAPIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->TexParameteri(target, pname, param); -} - -void GLAPIENTRY glTexParameteriv(GLenum target, GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->TexParameteriv(target, pname, params); -} - -void GLAPIENTRY glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->TexImage1D(target, level, internalformat, width, border, format, type, pixels); -} - -void GLAPIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels); -} - -void GLAPIENTRY glTexEnvf(GLenum target, GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->TexEnvf(target, pname, param); -} - -void GLAPIENTRY glTexEnvfv(GLenum target, GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->TexEnvfv(target, pname, params); -} - -void GLAPIENTRY glTexEnvi(GLenum target, GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->TexEnvi(target, pname, param); -} - -void GLAPIENTRY glTexEnviv(GLenum target, GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->TexEnviv(target, pname, params); -} - -void GLAPIENTRY glTexGend(GLenum coord, GLenum pname, GLdouble param) -{ - IntGetCurrentDispatchTable()->TexGend(coord, pname, param); -} - -void GLAPIENTRY glTexGendv(GLenum coord, GLenum pname, const GLdouble * params) -{ - IntGetCurrentDispatchTable()->TexGendv(coord, pname, params); -} - -void GLAPIENTRY glTexGenf(GLenum coord, GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->TexGenf(coord, pname, param); -} - -void GLAPIENTRY glTexGenfv(GLenum coord, GLenum pname, const GLfloat * params) -{ - IntGetCurrentDispatchTable()->TexGenfv(coord, pname, params); -} - -void GLAPIENTRY glTexGeni(GLenum coord, GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->TexGeni(coord, pname, param); -} - -void GLAPIENTRY glTexGeniv(GLenum coord, GLenum pname, const GLint * params) -{ - IntGetCurrentDispatchTable()->TexGeniv(coord, pname, params); -} - -void GLAPIENTRY glFeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) -{ - IntGetCurrentDispatchTable()->FeedbackBuffer(size, type, buffer); -} - -void GLAPIENTRY glSelectBuffer(GLsizei size, GLuint * buffer) -{ - IntGetCurrentDispatchTable()->SelectBuffer(size, buffer); -} - -GLint GLAPIENTRY glRenderMode(GLenum mode) -{ - return IntGetCurrentDispatchTable()->RenderMode(mode); -} - -void GLAPIENTRY glInitNames(void) -{ - IntGetCurrentDispatchTable()->InitNames(); -} - -void GLAPIENTRY glLoadName(GLuint name) -{ - IntGetCurrentDispatchTable()->LoadName(name); -} - -void GLAPIENTRY glPassThrough(GLfloat token) -{ - IntGetCurrentDispatchTable()->PassThrough(token); -} - -void GLAPIENTRY glPopName(void) -{ - IntGetCurrentDispatchTable()->PopName(); -} - -void GLAPIENTRY glPushName(GLuint name) -{ - IntGetCurrentDispatchTable()->PushName(name); -} - -void GLAPIENTRY glDrawBuffer(GLenum mode) -{ - IntGetCurrentDispatchTable()->DrawBuffer(mode); -} - -void GLAPIENTRY glClear(GLbitfield mask) -{ - IntGetCurrentDispatchTable()->Clear(mask); -} - -void GLAPIENTRY glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) -{ - IntGetCurrentDispatchTable()->ClearAccum(red, green, blue, alpha); -} - -void GLAPIENTRY glClearIndex(GLfloat c) -{ - IntGetCurrentDispatchTable()->ClearIndex(c); -} - -void GLAPIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) -{ - IntGetCurrentDispatchTable()->ClearColor(red, green, blue, alpha); -} - -void GLAPIENTRY glClearStencil(GLint s) -{ - IntGetCurrentDispatchTable()->ClearStencil(s); -} - -void GLAPIENTRY glClearDepth(GLclampd depth) -{ - IntGetCurrentDispatchTable()->ClearDepth(depth); -} - -void GLAPIENTRY glStencilMask(GLuint mask) -{ - IntGetCurrentDispatchTable()->StencilMask(mask); -} - -void GLAPIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) -{ - IntGetCurrentDispatchTable()->ColorMask(red, green, blue, alpha); -} - -void GLAPIENTRY glDepthMask(GLboolean flag) -{ - IntGetCurrentDispatchTable()->DepthMask(flag); -} - -void GLAPIENTRY glIndexMask(GLuint mask) -{ - IntGetCurrentDispatchTable()->IndexMask(mask); -} - -void GLAPIENTRY glAccum(GLenum op, GLfloat value) -{ - IntGetCurrentDispatchTable()->Accum(op, value); -} - -void GLAPIENTRY glDisable(GLenum cap) -{ - IntGetCurrentDispatchTable()->Disable(cap); -} - -void GLAPIENTRY glEnable(GLenum cap) -{ - IntGetCurrentDispatchTable()->Enable(cap); -} - -void GLAPIENTRY glFinish(void) -{ - IntGetCurrentDispatchTable()->Finish(); -} - -void GLAPIENTRY glFlush(void) -{ - IntGetCurrentDispatchTable()->Flush(); -} - -void GLAPIENTRY glPopAttrib(void) -{ - IntGetCurrentDispatchTable()->PopAttrib(); -} - -void GLAPIENTRY glPushAttrib(GLbitfield mask) -{ - IntGetCurrentDispatchTable()->PushAttrib(mask); -} - -void GLAPIENTRY glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points) -{ - IntGetCurrentDispatchTable()->Map1d(target, u1, u2, stride, order, points); -} - -void GLAPIENTRY glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points) -{ - IntGetCurrentDispatchTable()->Map1f(target, u1, u2, stride, order, points); -} - -void GLAPIENTRY glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points) -{ - IntGetCurrentDispatchTable()->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); -} - -void GLAPIENTRY glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points) -{ - IntGetCurrentDispatchTable()->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); -} - -void GLAPIENTRY glMapGrid1d(GLint un, GLdouble u1, GLdouble u2) -{ - IntGetCurrentDispatchTable()->MapGrid1d(un, u1, u2); -} - -void GLAPIENTRY glMapGrid1f(GLint un, GLfloat u1, GLfloat u2) -{ - IntGetCurrentDispatchTable()->MapGrid1f(un, u1, u2); -} - -void GLAPIENTRY glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2) -{ - IntGetCurrentDispatchTable()->MapGrid2d(un, u1, u2, vn, v1, v2); -} - -void GLAPIENTRY glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2) -{ - IntGetCurrentDispatchTable()->MapGrid2f(un, u1, u2, vn, v1, v2); -} - -void GLAPIENTRY glEvalCoord1d(GLdouble u) -{ - IntGetCurrentDispatchTable()->EvalCoord1d(u); -} - -void GLAPIENTRY glEvalCoord1dv(const GLdouble * u) -{ - IntGetCurrentDispatchTable()->EvalCoord1dv(u); -} - -void GLAPIENTRY glEvalCoord1f(GLfloat u) -{ - IntGetCurrentDispatchTable()->EvalCoord1f(u); -} - -void GLAPIENTRY glEvalCoord1fv(const GLfloat * u) -{ - IntGetCurrentDispatchTable()->EvalCoord1fv(u); -} - -void GLAPIENTRY glEvalCoord2d(GLdouble u, GLdouble v) -{ - IntGetCurrentDispatchTable()->EvalCoord2d(u, v); -} - -void GLAPIENTRY glEvalCoord2dv(const GLdouble * u) -{ - IntGetCurrentDispatchTable()->EvalCoord2dv(u); -} - -void GLAPIENTRY glEvalCoord2f(GLfloat u, GLfloat v) -{ - IntGetCurrentDispatchTable()->EvalCoord2f(u, v); -} - -void GLAPIENTRY glEvalCoord2fv(const GLfloat * u) -{ - IntGetCurrentDispatchTable()->EvalCoord2fv(u); -} - -void GLAPIENTRY glEvalMesh1(GLenum mode, GLint i1, GLint i2) -{ - IntGetCurrentDispatchTable()->EvalMesh1(mode, i1, i2); -} - -void GLAPIENTRY glEvalPoint1(GLint i) -{ - IntGetCurrentDispatchTable()->EvalPoint1(i); -} - -void GLAPIENTRY glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) -{ - IntGetCurrentDispatchTable()->EvalMesh2(mode, i1, i2, j1, j2); -} - -void GLAPIENTRY glEvalPoint2(GLint i, GLint j) -{ - IntGetCurrentDispatchTable()->EvalPoint2(i, j); -} - -void GLAPIENTRY glAlphaFunc(GLenum func, GLclampf ref) -{ - IntGetCurrentDispatchTable()->AlphaFunc(func, ref); -} - -void GLAPIENTRY glBlendFunc(GLenum sfactor, GLenum dfactor) -{ - IntGetCurrentDispatchTable()->BlendFunc(sfactor, dfactor); -} - -void GLAPIENTRY glLogicOp(GLenum opcode) -{ - IntGetCurrentDispatchTable()->LogicOp(opcode); -} - -void GLAPIENTRY glStencilFunc(GLenum func, GLint ref, GLuint mask) -{ - IntGetCurrentDispatchTable()->StencilFunc(func, ref, mask); -} - -void GLAPIENTRY glStencilOp(GLenum fail, GLenum zfail, GLenum zpass) -{ - IntGetCurrentDispatchTable()->StencilOp(fail, zfail, zpass); -} - -void GLAPIENTRY glDepthFunc(GLenum func) -{ - IntGetCurrentDispatchTable()->DepthFunc(func); -} - -void GLAPIENTRY glPixelZoom(GLfloat xfactor, GLfloat yfactor) -{ - IntGetCurrentDispatchTable()->PixelZoom(xfactor, yfactor); -} - -void GLAPIENTRY glPixelTransferf(GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->PixelTransferf(pname, param); -} - -void GLAPIENTRY glPixelTransferi(GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->PixelTransferi(pname, param); -} - -void GLAPIENTRY glPixelStoref(GLenum pname, GLfloat param) -{ - IntGetCurrentDispatchTable()->PixelStoref(pname, param); -} - -void GLAPIENTRY glPixelStorei(GLenum pname, GLint param) -{ - IntGetCurrentDispatchTable()->PixelStorei(pname, param); -} - -void GLAPIENTRY glPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat * values) -{ - IntGetCurrentDispatchTable()->PixelMapfv(map, mapsize, values); -} - -void GLAPIENTRY glPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint * values) -{ - IntGetCurrentDispatchTable()->PixelMapuiv(map, mapsize, values); -} - -void GLAPIENTRY glPixelMapusv(GLenum map, GLsizei mapsize, const GLushort * values) -{ - IntGetCurrentDispatchTable()->PixelMapusv(map, mapsize, values); -} - -void GLAPIENTRY glReadBuffer(GLenum mode) -{ - IntGetCurrentDispatchTable()->ReadBuffer(mode); -} - -void GLAPIENTRY glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) -{ - IntGetCurrentDispatchTable()->CopyPixels(x, y, width, height, type); -} - -void GLAPIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->ReadPixels(x, y, width, height, format, type, pixels); -} - -void GLAPIENTRY glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->DrawPixels(width, height, format, type, pixels); -} - -void GLAPIENTRY glGetBooleanv(GLenum pname, GLboolean * params) -{ - IntGetCurrentDispatchTable()->GetBooleanv(pname, params); -} - -void GLAPIENTRY glGetClipPlane(GLenum plane, GLdouble * equation) -{ - IntGetCurrentDispatchTable()->GetClipPlane(plane, equation); -} - -void GLAPIENTRY glGetDoublev(GLenum pname, GLdouble * params) -{ - IntGetCurrentDispatchTable()->GetDoublev(pname, params); -} - -GLenum GLAPIENTRY glGetError(void) -{ - return IntGetCurrentDispatchTable()->GetError(); -} - -void GLAPIENTRY glGetFloatv(GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetFloatv(pname, params); -} - -void GLAPIENTRY glGetIntegerv(GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetIntegerv(pname, params); -} - -void GLAPIENTRY glGetLightfv(GLenum light, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetLightfv(light, pname, params); -} - -void GLAPIENTRY glGetLightiv(GLenum light, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetLightiv(light, pname, params); -} - -void GLAPIENTRY glGetMapdv(GLenum target, GLenum query, GLdouble * v) -{ - IntGetCurrentDispatchTable()->GetMapdv(target, query, v); -} - -void GLAPIENTRY glGetMapfv(GLenum target, GLenum query, GLfloat * v) -{ - IntGetCurrentDispatchTable()->GetMapfv(target, query, v); -} - -void GLAPIENTRY glGetMapiv(GLenum target, GLenum query, GLint * v) -{ - IntGetCurrentDispatchTable()->GetMapiv(target, query, v); -} - -void GLAPIENTRY glGetMaterialfv(GLenum face, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetMaterialfv(face, pname, params); -} - -void GLAPIENTRY glGetMaterialiv(GLenum face, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetMaterialiv(face, pname, params); -} - -void GLAPIENTRY glGetPixelMapfv(GLenum map, GLfloat * values) -{ - IntGetCurrentDispatchTable()->GetPixelMapfv(map, values); -} - -void GLAPIENTRY glGetPixelMapuiv(GLenum map, GLuint * values) -{ - IntGetCurrentDispatchTable()->GetPixelMapuiv(map, values); -} - -void GLAPIENTRY glGetPixelMapusv(GLenum map, GLushort * values) -{ - IntGetCurrentDispatchTable()->GetPixelMapusv(map, values); -} - -void GLAPIENTRY glGetPolygonStipple(GLubyte * mask) -{ - IntGetCurrentDispatchTable()->GetPolygonStipple(mask); -} - -const GLubyte * GLAPIENTRY glGetString(GLenum name) -{ - return IntGetCurrentDispatchTable()->GetString(name); -} - -void GLAPIENTRY glGetTexEnvfv(GLenum target, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetTexEnvfv(target, pname, params); -} - -void GLAPIENTRY glGetTexEnviv(GLenum target, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetTexEnviv(target, pname, params); -} - -void GLAPIENTRY glGetTexGendv(GLenum coord, GLenum pname, GLdouble * params) -{ - IntGetCurrentDispatchTable()->GetTexGendv(coord, pname, params); -} - -void GLAPIENTRY glGetTexGenfv(GLenum coord, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetTexGenfv(coord, pname, params); -} - -void GLAPIENTRY glGetTexGeniv(GLenum coord, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetTexGeniv(coord, pname, params); -} - -void GLAPIENTRY glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->GetTexImage(target, level, format, type, pixels); -} - -void GLAPIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetTexParameterfv(target, pname, params); -} - -void GLAPIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetTexParameteriv(target, pname, params); -} - -void GLAPIENTRY glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat * params) -{ - IntGetCurrentDispatchTable()->GetTexLevelParameterfv(target, level, pname, params); -} - -void GLAPIENTRY glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint * params) -{ - IntGetCurrentDispatchTable()->GetTexLevelParameteriv(target, level, pname, params); -} - -GLboolean GLAPIENTRY glIsEnabled(GLenum cap) -{ - return IntGetCurrentDispatchTable()->IsEnabled(cap); -} - -GLboolean GLAPIENTRY glIsList(GLuint list) -{ - return IntGetCurrentDispatchTable()->IsList(list); -} - -void GLAPIENTRY glDepthRange(GLclampd zNear, GLclampd zFar) -{ - IntGetCurrentDispatchTable()->DepthRange(zNear, zFar); -} - -void GLAPIENTRY glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) -{ - IntGetCurrentDispatchTable()->Frustum(left, right, bottom, top, zNear, zFar); -} - -void GLAPIENTRY glLoadIdentity(void) -{ - IntGetCurrentDispatchTable()->LoadIdentity(); -} -void GLAPIENTRY glLoadMatrixf(const GLfloat * m) -{ - IntGetCurrentDispatchTable()->LoadMatrixf(m); -} - -void GLAPIENTRY glLoadMatrixd(const GLdouble * m) -{ - IntGetCurrentDispatchTable()->LoadMatrixd(m); -} - -void GLAPIENTRY glMatrixMode(GLenum mode) -{ - IntGetCurrentDispatchTable()->MatrixMode(mode); -} - -void GLAPIENTRY glMultMatrixf(const GLfloat * m) -{ - IntGetCurrentDispatchTable()->MultMatrixf(m); -} - -void GLAPIENTRY glMultMatrixd(const GLdouble * m) -{ - IntGetCurrentDispatchTable()->MultMatrixd(m); -} - -void GLAPIENTRY glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) -{ - IntGetCurrentDispatchTable()->Ortho(left, right, bottom, top, zNear, zFar); -} - -void GLAPIENTRY glPopMatrix(void) -{ - IntGetCurrentDispatchTable()->PopMatrix(); -} - -void GLAPIENTRY glPushMatrix(void) -{ - IntGetCurrentDispatchTable()->PushMatrix(); -} - -void GLAPIENTRY glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) -{ - IntGetCurrentDispatchTable()->Rotated(angle, x, y, z); -} - -void GLAPIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) -{ - IntGetCurrentDispatchTable()->Rotatef(angle, x, y, z); -} - -void GLAPIENTRY glScaled(GLdouble x, GLdouble y, GLdouble z) -{ - IntGetCurrentDispatchTable()->Scaled(x, y, z); -} - -void GLAPIENTRY glScalef(GLfloat x, GLfloat y, GLfloat z) -{ - IntGetCurrentDispatchTable()->Scalef(x, y, z); -} - -void GLAPIENTRY glTranslated(GLdouble x, GLdouble y, GLdouble z) -{ - IntGetCurrentDispatchTable()->Translated(x, y, z); -} - -void GLAPIENTRY glTranslatef(GLfloat x, GLfloat y, GLfloat z) -{ - IntGetCurrentDispatchTable()->Translatef(x, y, z); -} - -void GLAPIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height) -{ - IntGetCurrentDispatchTable()->Viewport(x, y, width, height); -} - -void GLAPIENTRY glArrayElement(GLint i) -{ - IntGetCurrentDispatchTable()->ArrayElement(i); -} - -void GLAPIENTRY glBindTexture(GLenum target, GLuint texture) -{ - IntGetCurrentDispatchTable()->BindTexture(target, texture); -} - -void GLAPIENTRY glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->ColorPointer(size, type, stride, pointer); -} - -void GLAPIENTRY glDisableClientState(GLenum array) -{ - IntGetCurrentDispatchTable()->DisableClientState(array); -} - -void GLAPIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count) -{ - IntGetCurrentDispatchTable()->DrawArrays(mode, first, count); -} - -void GLAPIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) -{ - IntGetCurrentDispatchTable()->DrawElements(mode, count, type, indices); -} - -void GLAPIENTRY glEdgeFlagPointer(GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->EdgeFlagPointer(stride, pointer); -} - -void GLAPIENTRY glEnableClientState(GLenum array) -{ - IntGetCurrentDispatchTable()->EnableClientState(array); -} - -void GLAPIENTRY glIndexPointer(GLenum type, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->IndexPointer(type, stride, pointer); -} - -void GLAPIENTRY glIndexub(GLubyte c) -{ - IntGetCurrentDispatchTable()->Indexub(c); -} - -void GLAPIENTRY glIndexubv(const GLubyte * c) -{ - IntGetCurrentDispatchTable()->Indexubv(c); -} - -void GLAPIENTRY glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->InterleavedArrays(format, stride, pointer); -} - -void GLAPIENTRY glNormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->NormalPointer(type, stride, pointer); -} - -void GLAPIENTRY glPolygonOffset(GLfloat factor, GLfloat units) -{ - IntGetCurrentDispatchTable()->PolygonOffset(factor, units); -} - -void GLAPIENTRY glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->TexCoordPointer(size, type, stride, pointer); -} - -void GLAPIENTRY glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) -{ - IntGetCurrentDispatchTable()->VertexPointer(size, type, stride, pointer); -} - -GLboolean GLAPIENTRY glAreTexturesResident(GLsizei n, const GLuint * textures, GLboolean * residences) -{ - return IntGetCurrentDispatchTable()->AreTexturesResident(n, textures, residences); -} - -void GLAPIENTRY glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) -{ - IntGetCurrentDispatchTable()->CopyTexImage1D(target, level, internalformat, x, y, width, border); -} - -void GLAPIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) -{ - IntGetCurrentDispatchTable()->CopyTexImage2D(target, level, internalformat, x, y, width, height, border); -} - -void GLAPIENTRY glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width) -{ - IntGetCurrentDispatchTable()->CopyTexSubImage1D(target, level, xoffset, x, y, width); -} - -void GLAPIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) -{ - IntGetCurrentDispatchTable()->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); -} - -void GLAPIENTRY glDeleteTextures(GLsizei n, const GLuint * textures) -{ - IntGetCurrentDispatchTable()->DeleteTextures(n, textures); -} - -void GLAPIENTRY glGenTextures(GLsizei n, GLuint * textures) -{ - IntGetCurrentDispatchTable()->GenTextures(n, textures); -} - -void GLAPIENTRY glGetPointerv(GLenum pname, GLvoid ** params) -{ - IntGetCurrentDispatchTable()->GetPointerv(pname, params); -} -GLboolean GLAPIENTRY glIsTexture(GLuint texture) -{ - return IntGetCurrentDispatchTable()->IsTexture(texture); -} - -void GLAPIENTRY glPrioritizeTextures(GLsizei n, const GLuint * textures, const GLclampf * priorities) -{ - IntGetCurrentDispatchTable()->PrioritizeTextures(n, textures, priorities); -} +#ifndef __i386__ -void GLAPIENTRY glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->TexSubImage1D(target, level, xoffset, width, format, type, pixels); +#define USE_GL_FUNC(name, proto_args, call_args, offset, stack) \ +void GLAPIENTRY gl##name proto_args \ +{ \ + const GLDISPATCHTABLE * Dispatch = IntGetCurrentDispatchTable(); \ + if (!Dispatch) \ + return; \ + Dispatch->name call_args ; \ } -void GLAPIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) -{ - IntGetCurrentDispatchTable()->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); +#define USE_GL_FUNC_RET(name, ret_type, proto_args, call_args, offset, stack) \ +ret_type GLAPIENTRY gl##name proto_args \ +{ \ + const GLDISPATCHTABLE * Dispatch = IntGetCurrentDispatchTable(); \ + if (!Dispatch) \ + return 0; \ + return Dispatch->name call_args ; \ } -void GLAPIENTRY glPopClientAttrib(void) -{ - IntGetCurrentDispatchTable()->PopClientAttrib(); -} +#include "glfuncs.h" -void GLAPIENTRY glPushClientAttrib(GLbitfield mask) -{ - IntGetCurrentDispatchTable()->PushClientAttrib(mask); -} #endif //__i386__ /* Unknown debug function */ diff --git a/dll/opengl/opengl32/dllmain.c b/dll/opengl/opengl32/dllmain.c index 6639d0decd..65649751fa 100644 --- a/dll/opengl/opengl32/dllmain.c +++ b/dll/opengl/opengl32/dllmain.c @@ -49,7 +49,6 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) if (!init_tls_data()) return FALSE; #endif // defined(OPENGL32_USE_TLS) - IntSetCurrentDispatchTable(&StubTable.glDispatchTable); break; case DLL_THREAD_DETACH: diff --git a/dll/opengl/opengl32/glapi_x86.s b/dll/opengl/opengl32/glapi_x86.s index 81e697ea09..017dc7ef81 100644 --- a/dll/opengl/opengl32/glapi_x86.s +++ b/dll/opengl/opengl32/glapi_x86.s @@ -9,38 +9,48 @@ #include <asm.inc> #include <ks386.inc> +.data +ASSUME nothing + +.align 16 + .code #ifdef OPENG32_USE_TLS EXTERN _OglTlsIndex:DWORD EXTERN _TlsGetValue@4:PROC +#endif MACRO(USE_GL_FUNC, name, offset, stack) PUBLIC _gl&name&@&stack .PROC _gl&name&@&stack + +FPO 0, 0, 0, 0, 0, FRAME_FPO + +#ifdef OPENG32_USE_TLS push _OglTlsIndex call _TlsGetValue@4 + /* If we don't have a thread data, this is a nop */ + test eax, eax + jz name&_fast_ret + /* Get the GL table */ mov eax, [eax] - jmp dword ptr [eax+4*VAL(offset)] -.ENDP -ENDM #else -MACRO(USE_GL_FUNC, name, offset, stack) -EXTERN _nop_&name@&stack:PROC -PUBLIC _gl&name&@&stack -.PROC _gl&name&@&stack /* Get the TEB */ - mov eax, fs:[TEB_SELF] + mov eax, fs:[TEB_SELF] /* Get the GL table */ mov eax, [eax + TEB_GL_TABLE] - /* If we don't have a dispatch table, call the nop */ +#endif + + /* If we don't have a dispatch table, this is a nop */ test eax, eax - jz _nop_&name&@&stack + jz name&_fast_ret /* Jump into the ICD */ jmp dword ptr [eax+4*VAL(offset)] +name&_fast_ret: + ret VAL(stack) .ENDP ENDM -#endif USE_GL_FUNC Accum, 213, 8 USE_GL_FUNC AlphaFunc, 240, 8 diff --git a/dll/opengl/opengl32/icd.h b/dll/opengl/opengl32/icd.h index cc7c2e4908..2e1764e3cb 100644 --- a/dll/opengl/opengl32/icd.h +++ b/dll/opengl/opengl32/icd.h @@ -359,9 +359,6 @@ typedef struct _GLCLTPROCTABLE typedef VOID (APIENTRY * PFN_SETPROCTABLE)(const GLCLTPROCTABLE*); -/* Those functions are there in case GL calls are made without a context */ -extern const GLCLTPROCTABLE StubTable; - /* This doesn't seem to be anywhere in ddk or psdk */ DECLARE_HANDLE(DHGLRC); diff --git a/dll/opengl/opengl32/wgl.c b/dll/opengl/opengl32/wgl.c index cb50202310..a8547c1584 100644 --- a/dll/opengl/opengl32/wgl.c +++ b/dll/opengl/opengl32/wgl.c @@ -696,7 +696,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) ERR("DrvSetContext failed!\n"); /* revert */ InterlockedExchange(&ctx->thread_id, 0); - IntSetCurrentDispatchTable(&StubTable.glDispatchTable); + IntSetCurrentDispatchTable(NULL); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -728,8 +728,7 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) InterlockedExchange(&old_ctx->thread_id, 0); /* Unset it */ IntMakeCurrent(NULL, NULL, NULL); - /* Reset the no-op table */ - set_api_table(&StubTable); + IntSetCurrentDispatchTable(NULL); /* Test conformance (extreme cases) */ return hglrc == NULL; }

1 0

[reactos] 03/05: [OPENGL] - Always use the TEB to store opengl data CORE-14024
by Jérôme Gardou 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b060a81d5d771fcfd370e… commit b060a81d5d771fcfd370e2ef9a9d766c31909e71 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Nov 18 13:50:55 2017 +0100 [OPENGL] - Always use the TEB to store opengl data CORE-14024 --- dll/opengl/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/opengl/CMakeLists.txt b/dll/opengl/CMakeLists.txt index 7c6e62c0f8..21afb30de8 100644 --- a/dll/opengl/CMakeLists.txt +++ b/dll/opengl/CMakeLists.txt @@ -1,7 +1,4 @@ -#unset this if you want to use the current TEB instead of TLS -set(OPENGL32_USE_TLS TRUE) - add_subdirectory(glu32) add_subdirectory(mesa) add_subdirectory(opengl32)

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2017