Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37689: - DXAPI: Fix incompatible header inclusion - DXG: Change the way PDC is defined -- treat the DC structure as opaque instead of including internal win32k headers. Also rework the way DD_BASEOBJECT is defined.
by sginsberg＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: sginsberg Date: Thu Nov 27 09:34:33 2008 New Revision: 37689 URL: http://svn.reactos.org/svn/reactos?rev=37689&view=rev Log: - DXAPI: Fix incompatible header inclusion - DXG: Change the way PDC is defined -- treat the DC structure as opaque instead of including internal win32k headers. Also rework the way DD_BASEOBJECT is defined. Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h trunk/reactos/include/reactos/drivers/directx/directxint.h Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Thu Nov 27 09:34:33 2008 @@ -1,7 +1,4 @@ - - -/* DDK/NDK/SDK Headers */ /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntddmou.h> @@ -14,10 +11,9 @@ #include <winerror.h> #include <wingdi.h> #include <winddi.h> -#include <winuser.h> #include <prntfont.h> #include <dde.h> -#include <wincon.h> + #include <ddk/ddkmapi.h> Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Thu Nov 27 09:34:33 2008 @@ -17,22 +17,23 @@ #include <winerror.h> #include <wingdi.h> #include <winddi.h> -#include <winuser.h> #include <prntfont.h> #include <dde.h> -#include <wincon.h> -/* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> -#include <win32k/ntgdityp.h> -#include <win32k/ntgdihdl.h> -#include <win32.h> -#include <gdiobj.h> -#include <dc.h> +/* DXG treats this as opaque */ +typedef PVOID PDC; +typedef PVOID PW32THREAD; + +typedef struct _DD_BASEOBJECT +{ + HGDIOBJ hHmgr; + ULONG ulShareCount; + USHORT cExclusiveLock; + USHORT BaseFlags; + PW32THREAD Tid; +} DD_BASEOBJECT, *PDD_BASEOBJECT; #include <drivers/directx/directxint.h> - #include <drivers/directx/dxg.h> #include <drivers/directx/dxeng.h> Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu Nov 27 09:34:33 2008 @@ -2,8 +2,10 @@ #ifndef _DXINTERNEL_ #define _DXINTERNEL_ +#ifdef __W32K_H #define PDD_BASEOBJECT POBJ #define DD_BASEOBJECT BASEOBJECT +#endif /* _EDD_DIRECTDRAW_LOCAL is 0x54 bytes long on Windows XP */ typedef struct _EDD_DIRECTDRAW_LOCAL

1 0

[sginsberg] 37688: - ACPI: Don't redefine standard DDK types - TCPIP/IP/TDI/Uniata: Don't use user mode types - USBDRIVER: Remove a peculiar redefinition of ULONG_PTR - NDIS: Remove duplicate (and undocumented) types from ndis.h, defined in an internal NDIS header long ago. Also fix some warnings, define UINT as appropriate, and add a clever (not really) workaround for a gcc/msvc incompatibility. -- For some obnoxious reason msvc is fine with redeclaring types compatibly, while gcc treats it as
by sginsberg＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: sginsberg Date: Thu Nov 27 09:02:47 2008 New Revision: 37688 URL: http://svn.reactos.org/svn/reactos?rev=37688&view=rev Log: - ACPI: Don't redefine standard DDK types - TCPIP/IP/TDI/Uniata: Don't use user mode types - USBDRIVER: Remove a peculiar redefinition of ULONG_PTR - NDIS: Remove duplicate (and undocumented) types from ndis.h, defined in an internal NDIS header long ago. Also fix some warnings, define UINT as appropriate, and add a clever (not really) workaround for a gcc/msvc incompatibility. -- For some obnoxious reason msvc is fine with redeclaring types compatibly, while gcc treats it as an error. PSDK and DDK require this, so we need...extended header checks. Modified: trunk/reactos/drivers/bus/acpi/include/platform/types.h trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/address.h trunk/reactos/drivers/network/tcpip/include/interface.h trunk/reactos/drivers/network/tcpip/include/lan.h trunk/reactos/drivers/network/tcpip/include/lock.h trunk/reactos/drivers/network/tcpip/include/neighbor.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/drivers/network/tcpip/tcpip/lock.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/drivers/network/tdi/tdi/stubs.c trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h trunk/reactos/include/ddk/ndis.h trunk/reactos/lib/drivers/ip/network/address.c trunk/reactos/lib/drivers/ip/network/interface.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/drivers/bus/acpi/include/platform/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/p… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/platform/types.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/platform/types.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -16,8 +16,4 @@ #include <ntddk.h> #include <stdio.h> -typedef UCHAR UINT8; -typedef USHORT UINT16; -typedef ULONGLONG UINT64; - #endif /* __INCLUDE_ACPI_TYPES_H */ Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -28,7 +28,11 @@ PDRIVER_OBJECT DriverObject; /* Driver object of miniport */ LIST_ENTRY DeviceList; /* Adapters created by miniport */ PUNICODE_STRING RegistryPath; /* SCM Registry key */ +#if !defined(_MSC_VER) && defined(__NDIS_H) +} NDIS_M_DRIVER_BLOCK_COMPATIBILITY_HACK_DONT_USE; +#else } NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK; +#endif /* resources allocated on behalf on the miniport */ #define MINIPORT_RESOURCE_TYPE_MEMORY 0 Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -166,14 +166,14 @@ NTSTATUS TcpipLanGetDwordOid ( PIP_INTERFACE Interface, NDIS_OID Oid, - PDWORD Result ) { + PULONG Result ) { /* Get maximum frame size */ if( Interface->Context ) { return NDISCall((PLAN_ADAPTER)Interface->Context, NdisRequestQueryInformation, Oid, Result, - sizeof(DWORD)); + sizeof(ULONG)); } else switch( Oid ) { /* Loopback Case */ case OID_GEN_HARDWARE_STATUS: *Result = NdisHardwareStatusReady; @@ -782,7 +782,7 @@ NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst, PUNICODE_STRING Second, - BOOL Deallocate) { + BOOLEAN Deallocate) { NTSTATUS Status; UNICODE_STRING Ustr = *ResultFirst; PWSTR new_string = ExAllocatePoolWithTag Modified: trunk/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -69,7 +69,7 @@ PADDRESS_FILE AddrSearchNext( PAF_SEARCH SearchContext); -unsigned long PASCAL inet_addr(const char*); +unsigned long NTAPI inet_addr(const char*); ULONG IPv4NToHl( ULONG Address ); Modified: trunk/reactos/drivers/network/tcpip/include/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/interface.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -14,7 +14,7 @@ NTSTATUS GetInterfaceName( PIP_INTERFACE Interface, PCHAR NameBuffer, UINT NameMaxLen ); NTSTATUS GetInterfaceConnectionStatus( PIP_INTERFACE Interface, - PDWORD OperStatus ); + PULONG OperStatus ); PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address); #endif//_TCPIP_INTERFACE_H Modified: trunk/reactos/drivers/network/tcpip/include/lan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/lan.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/lan.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -99,7 +99,7 @@ VOID LANShutdown(); NTSTATUS TcpipLanGetDwordOid( PIP_INTERFACE Interface, NDIS_OID Oid, - PDWORD Result ); + PULONG Result ); NDIS_STATUS NDISCall( PLAN_ADAPTER Adapter, Modified: trunk/reactos/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/lock.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -14,7 +14,7 @@ extern VOID TcpipReleaseFastMutex( PFAST_MUTEX Mutex ); extern VOID TcpipRecursiveMutexInit( PRECURSIVE_MUTEX RecMutex ); extern UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, - BOOL ToWrite ); + BOOLEAN ToWrite ); extern VOID TcpipRecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); #endif/*_LOCK_H*/ Modified: trunk/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/neighbor.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -107,7 +107,7 @@ VOID NBRemoveNeighbor( PNEIGHBOR_CACHE_ENTRY NCE); -DWORD NBCopyNeighbors( +ULONG NBCopyNeighbors( PIP_INTERFACE Interface, PIPARP_ENTRY ArpTable); Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -176,40 +176,40 @@ /* Connection indication handler */ PTDI_IND_CONNECT ConnectHandler; PVOID ConnectHandlerContext; - BOOL RegisteredConnectHandler; + BOOLEAN RegisteredConnectHandler; /* Disconnect indication handler */ PTDI_IND_DISCONNECT DisconnectHandler; PVOID DisconnectHandlerContext; - BOOL RegisteredDisconnectHandler; + BOOLEAN RegisteredDisconnectHandler; /* Error indication handler */ PTDI_IND_ERROR ErrorHandler; PVOID ErrorHandlerContext; PVOID ErrorHandlerOwner; - BOOL RegisteredErrorHandler; + BOOLEAN RegisteredErrorHandler; /* Receive indication handler */ PTDI_IND_RECEIVE ReceiveHandler; PVOID ReceiveHandlerContext; - BOOL RegisteredReceiveHandler; + BOOLEAN RegisteredReceiveHandler; /* Receive datagram indication handler */ PTDI_IND_RECEIVE_DATAGRAM ReceiveDatagramHandler; PVOID ReceiveDatagramHandlerContext; - BOOL RegisteredReceiveDatagramHandler; + BOOLEAN RegisteredReceiveDatagramHandler; /* Expedited receive indication handler */ PTDI_IND_RECEIVE_EXPEDITED ExpeditedReceiveHandler; PVOID ExpeditedReceiveHandlerContext; - BOOL RegisteredExpeditedReceiveHandler; + BOOLEAN RegisteredExpeditedReceiveHandler; /* Chained receive indication handler */ PTDI_IND_CHAINED_RECEIVE ChainedReceiveHandler; PVOID ChainedReceiveHandlerContext; - BOOL RegisteredChainedReceiveHandler; + BOOLEAN RegisteredChainedReceiveHandler; /* Chained receive datagram indication handler */ PTDI_IND_CHAINED_RECEIVE_DATAGRAM ChainedReceiveDatagramHandler; PVOID ChainedReceiveDatagramHandlerContext; - BOOL RegisteredChainedReceiveDatagramHandler; + BOOLEAN RegisteredChainedReceiveDatagramHandler; /* Chained expedited receive indication handler */ PTDI_IND_CHAINED_RECEIVE_EXPEDITED ChainedReceiveExpeditedHandler; PVOID ChainedReceiveExpeditedHandlerContext; - BOOL RegisteredChainedReceiveExpeditedHandler; + BOOLEAN RegisteredChainedReceiveExpeditedHandler; } ADDRESS_FILE, *PADDRESS_FILE; /* Address File Flag constants */ @@ -334,7 +334,7 @@ CONNECTION_CONTEXT ConnectionContext; HANDLE ControlChannel; } Handle; - BOOL CancelIrps; + BOOLEAN CancelIrps; KEVENT CleanupEvent; } TRANSPORT_CONTEXT, *PTRANSPORT_CONTEXT; Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -83,8 +83,8 @@ PNDIS_BUFFER Buffer, PUINT BufferSize) { NTSTATUS Status; - DWORD NumNeighbors = NBCopyNeighbors( Interface, NULL ); - DWORD MemSize = NumNeighbors * sizeof(IPARP_ENTRY); + ULONG NumNeighbors = NBCopyNeighbors( Interface, NULL ); + ULONG MemSize = NumNeighbors * sizeof(IPARP_ENTRY); PIPARP_ENTRY ArpEntries = ExAllocatePoolWithTag ( NonPagedPool, MemSize, FOURCC('A','R','P','t') ); @@ -104,7 +104,7 @@ PNDIS_BUFFER Buffer, PUINT BufferSize) { NTSTATUS Status; - DWORD Capability = 0x280; + ULONG Capability = 0x280; TI_DbgPrint(MID_TRACE,("Copying out %d bytes (AT_ENTITY capability)\n", sizeof(Capability))); Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -143,7 +143,7 @@ UINT i; PVOID context = NULL; NTSTATUS Status = TDI_INVALID_PARAMETER; - BOOL FoundEntity = FALSE; + BOOLEAN FoundEntity = FALSE; InfoRequest_f InfoRequest = NULL; TI_DbgPrint(DEBUG_INFO, Modified: trunk/reactos/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/lock.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -48,7 +48,7 @@ RecursiveMutexInit( RecMutex ); } -UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOL ToWrite ) { +UINT TcpipRecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToWrite ) { UINT Ret; //TI_DbgPrint(DEBUG_LOCK,("Locking\n")); Ret = RecursiveMutexEnter( RecMutex, ToWrite ); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -387,7 +387,7 @@ */ { NTSTATUS Status; - BOOL Complete = TRUE; + BOOLEAN Complete = TRUE; PIO_STACK_LOCATION IrpSp; RIRP(Irp); @@ -912,11 +912,11 @@ VOID NTAPI IPAddInterface( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4) { UNIMPLEMENTED } @@ -924,7 +924,7 @@ VOID NTAPI IPDelInterface( - DWORD Unknown0) + ULONG Unknown0) { UNIMPLEMENTED } @@ -932,8 +932,8 @@ VOID NTAPI LookupRoute( - DWORD Unknown0, - DWORD Unknown1) + ULONG Unknown0, + ULONG Unknown1) { UNIMPLEMENTED } Modified: trunk/reactos/drivers/network/tdi/tdi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/st… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -103,10 +103,10 @@ VOID STDCALL TdiOpenNetbiosAddress ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3 ) { } Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -504,8 +504,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT)VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT)DeviceID); + sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); + sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -3,8 +3,6 @@ /* * Some USB bandwidth allocation constants. */ - -typedef unsigned long ULONG_PTR, *PULONG_PTR; #define USB2_HOST_DELAY 5 /* nsec, guess */ #define BW_HOST_DELAY 1000L /* nanoseconds */ Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=376… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -41,6 +41,10 @@ #include "netpnp.h" #include "netevent.h" #include <qos.h> + +#if !defined(_WINDEF_H) +typedef unsigned int UINT, *PUINT; +#endif #ifdef __cplusplus extern "C" { @@ -4106,6 +4110,11 @@ typedef struct _NDIS_M_DRIVER_BLOCK NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK; typedef struct _NDIS_AF_LIST NDIS_AF_LIST, *PNDIS_AF_LIST; +// +// FIXME: Should be typedef struct _X_FILTER ETH_FILTER, *PETH_FILTER; +// +typedef PVOID ETH_FILTER, *PETH_FILTER; + typedef struct _NDIS_MINIPORT_INTERRUPT { PKINTERRUPT InterruptObject; @@ -4165,11 +4174,8 @@ PVOID WorkItemContext; } NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; -/* Forward declare to pick up a consistent type */ -typedef struct _NDIS_WORK_ITEM; -#pragma warning(push) -typedef VOID (*NDIS_PROC)(struct _NDIS_WORK_ITEM *, PVOID); -#pragma warning(pop) +struct _NDIS_WORK_ITEM; +typedef VOID (*NDIS_PROC)(struct _NDIS_WORK_ITEM *, PVOID); typedef struct _NDIS_WORK_ITEM { PVOID Context; @@ -4182,43 +4188,6 @@ NDIS_STRING Paths[1]; } NDIS_BIND_PATHS, *PNDIS_BIND_PATHS; -#define DECLARE_UNKNOWN_STRUCT(BaseName) \ - typedef struct _##BaseName BaseName, *P##BaseName; - -#define DECLARE_UNKNOWN_PROTOTYPE(Name) \ - typedef VOID (*(Name))(VOID); - -#define ETH_LENGTH_OF_ADDRESS 6 - -DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO) - -DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE) -DECLARE_UNKNOWN_PROTOTYPE(ETH_FILTER_CHANGE) -DECLARE_UNKNOWN_PROTOTYPE(ETH_DEFERRED_CLOSE) - -typedef struct _ETH_FILTER { - PNDIS_SPIN_LOCK Lock; - CHAR (*MCastAddressBuf)[ETH_LENGTH_OF_ADDRESS]; - struct _NDIS_MINIPORT_BLOCK *Miniport; - UINT CombinedPacketFilter; - PETH_BINDING_INFO OpenList; - ETH_ADDRESS_CHANGE AddressChangeAction; - ETH_FILTER_CHANGE FilterChangeAction; - ETH_DEFERRED_CLOSE CloseAction; - UINT MaxMulticastAddresses; - UINT NumAddresses; - UCHAR AdapterAddress[ETH_LENGTH_OF_ADDRESS]; - UINT OldCombinedPacketFilter; - CHAR (*OldMCastAddressBuf)[ETH_LENGTH_OF_ADDRESS]; - UINT OldNumAddresses; - PETH_BINDING_INFO DirectedList; - PETH_BINDING_INFO BMList; - PETH_BINDING_INFO MCastSet; -#if defined(NDIS_WRAPPER) - UINT NumOpens; - PVOID BindListLock; -#endif -} ETH_FILTER, *PETH_FILTER; typedef VOID DDKAPI (*ETH_RCV_COMPLETE_HANDLER)( @@ -4624,7 +4593,7 @@ PVOID MacHandle; \ NDIS_HANDLE BindingHandle; \ PNDIS_MINIPORT_BLOCK MiniportHandle; \ - PNDIS_PROTOCOL_BLOCK ProtocolHandle; \ + PNDIS_PROTOCOL_BLOCK ProtocolHandle; \ NDIS_HANDLE ProtocolBindingContext; \ PNDIS_OPEN_BLOCK MiniportNextOpen; \ PNDIS_OPEN_BLOCK ProtocolNextOpen; \ @@ -4667,23 +4636,6 @@ #else NDIS_COMMON_OPEN_BLOCK_S #endif -#if defined(NDIS_WRAPPER) - struct _NDIS_OPEN_CO - { - struct _NDIS_CO_AF_BLOCK * NextAf; - W_CO_CREATE_VC_HANDLER MiniportCoCreateVcHandler; - W_CO_REQUEST_HANDLER MiniportCoRequestHandler; - CO_CREATE_VC_HANDLER CoCreateVcHandler; - CO_DELETE_VC_HANDLER CoDeleteVcHandler; - PVOID CmActivateVcCompleteHandler; - PVOID CmDeactivateVcCompleteHandler; - PVOID CoRequestCompleteHandler; - LIST_ENTRY ActiveVcHead; - LIST_ENTRY InactiveVcHead; - LONG PendingAfNotifications; - PKEVENT AfNotifyCompleteEvent; - }; -#endif /* _NDIS_ */ }; Modified: trunk/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/add… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -303,7 +303,7 @@ } -unsigned long PASCAL inet_addr(const char *AddrString) +unsigned long NTAPI inet_addr(const char *AddrString) /* * Convert an ansi string dotted-quad address to a ulong * NOTES: Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -39,7 +39,7 @@ } UINT CountInterfaces() { - DWORD Count = 0; + ULONG Count = 0; KIRQL OldIrql; IF_LIST_ITER(CurrentIF); @@ -211,7 +211,7 @@ } NTSTATUS GetInterfaceConnectionStatus -( PIP_INTERFACE Interface, PDWORD Result ) { +( PIP_INTERFACE Interface, PULONG Result ) { NTSTATUS Status = TcpipLanGetDwordOid ( Interface, OID_GEN_HARDWARE_STATUS, Result ); if( NT_SUCCESS(Status) ) switch( *Result ) { Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Thu Nov 27 09:02:47 2008 @@ -64,7 +64,7 @@ /* Must be called with table lock acquired */ VOID NBFlushPacketQueue( PNEIGHBOR_CACHE_ENTRY NCE, - BOOL CallComplete, + BOOLEAN CallComplete, NTSTATUS ErrorCode ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet;

1 0

[mjmartin] 37687: - Add WM_SYSCHAR to U32IsValidAccelMessage. See bug #543 for more info.
by mjmartin＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: mjmartin Date: Thu Nov 27 07:54:29 2008 New Revision: 37687 URL: http://svn.reactos.org/svn/reactos?rev=37687&view=rev Log: - Add WM_SYSCHAR to U32IsValidAccelMessage. See bug #543 for more info. Modified: trunk/reactos/dll/win32/user32/windows/accel.c Modified: trunk/reactos/dll/win32/user32/windows/accel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/accel.c [iso-8859-1] Thu Nov 27 07:54:29 2008 @@ -165,6 +165,7 @@ case WM_KEYDOWN: case WM_KEYUP: case WM_CHAR: + case WM_SYSCHAR: case WM_SYSKEYDOWN: case WM_SYSKEYUP: return TRUE;

1 0

[greatlrd] 37686: setup wined3d Caps for D3DHAL_GLOBALDRIVERDATA inside DdQueryDirectDrawObject Bugfix so it return right return value if anything fails
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Thu Nov 27 06:26:06 2008 New Revision: 37686 URL: http://svn.reactos.org/svn/reactos?rev=37686&view=rev Log: setup wined3d Caps for D3DHAL_GLOBALDRIVERDATA inside DdQueryDirectDrawObject Bugfix so it return right return value if anything fails Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 06:26:06 2008 @@ -1775,7 +1775,7 @@ DWORD *pMasks; IWineD3D* pWineD3d; - //WINED3DCAPS WineCaps; + WINED3DCAPS WineCaps; /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ @@ -1798,14 +1798,16 @@ /* Get wined3d interface */ pWineD3d = (IWineD3D*) GetDdHandle(pDirectDrawGlobal->hDD); - /* Get adapter res, we can use windows own api here */ - //IWineD3D_GetAdapterDisplayMode( pWineD3d, D3DADAPTER_DEFAULT, &d3ddm); + /* Get adapter res, we can use windows own api here for we need getting the d3d support caps*/ + IWineD3D_GetDeviceCaps(pWineD3d, 0, WINED3DDEVTYPE_HAL,(WINED3DCAPS *)&WineCaps); + EnumDisplaySettingsW(NULL,ENUM_CURRENT_SETTINGS,&DevMode); /* Dectect RGB bit mask */ hdc = GetDC(GetDesktopWindow()); if (hdc == NULL) { + retVal = FALSE; goto cleanup; } @@ -1813,6 +1815,7 @@ if (hbmp==NULL) { DeleteDC(hdc); + retVal = FALSE; goto cleanup; } @@ -1823,6 +1826,7 @@ { DeleteDC(hdc); DeleteObject(hbmp); + retVal = FALSE; goto cleanup; } @@ -1909,9 +1913,6 @@ pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); // FIXME fill in with wined3d caps here */ - // WINED3DCAPS WineCaps; - //pWineD3d->GetDeviceCaps(0,&WineCaps); - //IWineD3DDevice_GetDeviceCaps(This->WineD3DDevice, &WineCaps); /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE @@ -2016,6 +2017,11 @@ pHalInfo->lpdwFourCC = pdwFourCC; */ } + else + { + retVal = FALSE; + goto cleanup; + } /* Now check if we got any DD callbacks */ if (pDDCallbacks) @@ -2033,6 +2039,11 @@ pDDCallbacks->CanCreateSurface = DdCanCreateSurface; pDDCallbacks->GetScanLine = DdGetScanLine; } + else + { + retVal = FALSE; + goto cleanup; + } /* Check for DD Surface Callbacks */ @@ -2061,6 +2072,11 @@ pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; } + else + { + retVal = FALSE; + goto cleanup; + } /* Check for DD Palette Callbacks, This interface are dead for user mode, @@ -2075,6 +2091,11 @@ pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); pDDPaletteCallbacks->dwFlags = 0; } + else + { + retVal = FALSE; + goto cleanup; + } if (pD3dCallbacks) { @@ -2089,16 +2110,94 @@ // FIXME pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; // FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; } + else + { + retVal = FALSE; + goto cleanup; + } /* Check for D3D Driver Data */ if (pD3dDriverData) { - /* Copy the struct */ - //FIXME RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); + /* Zero the struct */ + RtlZeroMemory(pD3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* Write the header */ + pD3dDriverData->dwSize = sizeof(D3DHAL_GLOBALDRIVERDATA); + //pD3dDriverData->hwCaps.dwSize = sizeof(D3DHALDEVICEDESC); // FIXME + + pD3dDriverData->hwCaps.dwFlags = D3DDD_TRICAPS | D3DDD_LINECAPS | D3DDD_DEVCAPS | D3DDD_LIGHTINGCAPS; + // MSDN D3DDD_BCLIPPING The bClipping member contains valid data. + // MSDN D3DDD_COLORMODEL The dcmColorModel member contains valid data. + // MSDN D3DDD_DEVICERENDERBITDEPTH The dwDeviceRenderBitDepth member contains valid data. + // MSDN D3DDD_DEVICEZBUFFERBITDEPTH The dwDeviceZBufferBitDepth member contains valid data. + // MSDN D3DDD_MAXBUFFERSIZE The dwMaxBufferSize member contains valid data. + //MSDN D3DDD_MAXVERTEXCOUNT The dwMaxVertexCount member contains valid data. + + + pD3dDriverData->hwCaps.dlcLightingCaps.dwSize = sizeof(D3DLIGHTINGCAPS); + pD3dDriverData->hwCaps.dlcLightingCaps.dwCaps = 0; // FIXME + pD3dDriverData->hwCaps.dlcLightingCaps.dwLightingModel = D3DLIGHTINGMODEL_RGB; + pD3dDriverData->hwCaps.dlcLightingCaps.dwNumLights = 0; // FIXME + + /* FIXME ? + pD3dDriverData->hwCaps.bClipping + pD3dDriverData->hwCaps.dcmColorModel + pD3dDriverData->hwCaps.dlcLightingCaps + pD3dDriverData->hwCaps.dtcTransformCaps + pD3dDriverData->hwCaps.dwDeviceRenderBitDepth + pD3dDriverData->hwCaps.dwDeviceZBufferBitDepth + pD3dDriverData->hwCaps.dwMaxBufferSize + pD3dDriverData->hwCaps.dwMaxVertexCount = + */ + + /* Fill in the caps */ + // pD3dDriverData->dwNumVertices = WineCaps.MaxVertexIndex; ?? + //pD3dDriverData->dwNumClipVertices = WineCaps.MaxUserClipPlanes; // ? + + pD3dDriverData->hwCaps.dwDevCaps = WineCaps.DevCaps; + + pD3dDriverData->hwCaps.dpcLineCaps.dwSize = sizeof(D3DPRIMCAPS); + // pD3dDriverData->hwCaps.dpcLineCaps.dwMiscCaps = + pD3dDriverData->hwCaps.dpcLineCaps.dwRasterCaps = WineCaps.RasterCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps = WineCaps.ZCmpCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps = WineCaps.SrcBlendCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps = WineCaps.DestBlendCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps = WineCaps.AlphaCmpCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps = WineCaps.ShadeCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps = WineCaps.TextureCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps = WineCaps.TextureFilterCaps; + // pD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps // ? + pD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps = WineCaps.TextureAddressCaps; + pD3dDriverData->hwCaps.dpcLineCaps.dwStippleWidth = 32; + pD3dDriverData->hwCaps.dpcLineCaps.dwStippleHeight = 32; + + pD3dDriverData->hwCaps.dpcTriCaps.dwSize = sizeof(D3DPRIMCAPS); + // pD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps = + pD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps = WineCaps.RasterCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps = WineCaps.ZCmpCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps = WineCaps.SrcBlendCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps = WineCaps.DestBlendCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps = WineCaps.AlphaCmpCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps = WineCaps.ShadeCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps = WineCaps.TextureCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps = WineCaps.TextureFilterCaps; + // pD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps // ? + pD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps = WineCaps.TextureAddressCaps; + pD3dDriverData->hwCaps.dpcTriCaps.dwStippleWidth = 32; // correct ? + pD3dDriverData->hwCaps.dpcTriCaps.dwStippleHeight = 32; // correct ? + + /* FIXME Fill in more caps */ /* Write the pointer to the texture formats */ + // pD3dDriverData->dwNumTextureFormats; //FIXME pD3dDriverData->lpTextureFormats = pD3dTextureFormats; + } + else + { + retVal = FALSE; + goto cleanup; } @@ -2117,6 +2216,11 @@ pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; + } + else + { + retVal = FALSE; + goto cleanup; } /* FIXME VidMemList */

1 0

[greatlrd] 37685: setup wined3d Caps for HALLINFO inside DdQueryDirectDrawObject
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Thu Nov 27 04:02:24 2008 New Revision: 37685 URL: http://svn.reactos.org/svn/reactos?rev=37685&view=rev Log: setup wined3d Caps for HALLINFO inside DdQueryDirectDrawObject Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 04:02:24 2008 @@ -1775,6 +1775,7 @@ DWORD *pMasks; IWineD3D* pWineD3d; + //WINED3DCAPS WineCaps; /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ @@ -1910,22 +1911,77 @@ // FIXME fill in with wined3d caps here */ // WINED3DCAPS WineCaps; //pWineD3d->GetDeviceCaps(0,&WineCaps); - - /* example value and member that need be fill in */ - // pHalInfo->ddCaps.dwCaps : 0x94427bc1 - // pHalInfo->ddCaps.dwCaps2 : 0x004afe78 - // pHalInfo->ddCaps.dwCKeyCaps : 0x0003a311 - // pHalInfo->ddCaps.dwFXCaps : 0x27f95420 - // pHalInfo->ddCaps.dwMaxVisibleOverlays : 0x00000001 - // pHalInfo->ddCaps.dwNumFourCCCodes : 0x0000001c - // pHalInfo->ddCaps.ddsCaps.dwCaps : 0x30c272fc - // pHalInfo->ddCaps.dwMinOverlayStretch : 0x00000020 - // pHalInfo->ddCaps.dwMaxOverlayStretch : 0x0007d000 - // pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x00000020 - // pHalInfo->ddCaps.dwMaxLiveVideoStretch : 0x00003e80 - // pHalInfo->ddCaps.dwMinHwCodecStretch : 0x00000020 - // pHalInfo->ddCaps.dwMaxHwCodecStretch : 0x00003e80 - // pHalInfo->ddCaps.dwSVBCaps : 0x80000040 + //IWineD3DDevice_GetDeviceCaps(This->WineD3DDevice, &WineCaps); + + /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps + DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE + DDCAPS_ALPHA + DDCAPS_BLTFOURCC, DDCAPS_BLTQUEUE + DDCAPS_OVERLAY, DDCAPS_OVERLAYCANTCLIP, DDCAPS_OVERLAYFOURCC, DDCAPS_OVERLAYSTRETCH + DDCAPS_PALETTE, DDCAPS_PALETTEVSYNC + DDCAPS_READSCANLINE + DDCAPS_STEREOVIEW + DDCAPS_VBI + DDCAPS_ZBLTS + DDCAPS_ZOVERLAYS + */ + pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | + DDCAPS_BLTCOLORFILL | + DDCAPS_BLTDEPTHFILL | + DDCAPS_BLTSTRETCH | + DDCAPS_CANBLTSYSMEM | + DDCAPS_CANCLIP | + DDCAPS_CANCLIPSTRETCHED | + DDCAPS_COLORKEY | + DDCAPS_COLORKEYHWASSIST | + DDCAPS_ALIGNBOUNDARYSRC | + DDCAPS_GDI | + DDCAPS_PALETTE | + DDCAPS_3D; + + /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | + DDCAPS2_NOPAGELOCKREQUIRED | + DDCAPS2_PRIMARYGAMMA | + DDCAPS2_WIDESURFACES | + DDCAPS2_CANRENDERWINDOWED; + + /* See msdn what pHalInfo->ddCaps.dwCKeyCaps does not support */ + pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_DESTBLT | + DDCKEYCAPS_SRCBLT; + + /* See msdn what pHalInfo->ddCaps.dwFXCaps does not support */ + pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTALPHA | + DDFXCAPS_BLTMIRRORLEFTRIGHT | + DDFXCAPS_BLTMIRRORUPDOWN | + DDFXCAPS_BLTROTATION90 | + DDFXCAPS_BLTSHRINKX | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSHRINKY | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSTRETCHX | + DDFXCAPS_BLTSTRETCHXN | + DDFXCAPS_BLTSTRETCHY | + DDFXCAPS_BLTSTRETCHYN; + + /* See msdn what pHalInfo->ddCaps.dwSVBCaps does not support */ + pHalInfo->ddCaps.dwSVBCaps = pHalInfo->ddCaps.dwCaps; + + /* See msdn what pHalInfo->ddCaps.dwCaps does not support */ + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_ALPHA | + DDSCAPS_BACKBUFFER | + DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | + DDSCAPS_OFFSCREENPLAIN | + DDSCAPS_PALETTE | + DDSCAPS_PRIMARYSURFACE | + DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VIDEOMEMORY | + DDSCAPS_VISIBLE | + DDSCAPS_3DDEVICE | + DDSCAPS_MIPMAP | + DDSCAPS_TEXTURE | + DDSCAPS_ZBUFFER; /* always force rope 0x1000 for hal it mean only source copy is supported */ pHalInfo->ddCaps.dwRops[6] = 0x1000;

1 0

[khornicek] 37684: - sync wined3d, d3d8, d3d9 to wine HEAD part 2/2
by khornicek＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: khornicek Date: Thu Nov 27 03:20:38 2008 New Revision: 37684 URL: http://svn.reactos.org/svn/reactos?rev=37684&view=rev Log: - sync wined3d, d3d8, d3d9 to wine HEAD part 2/2 Modified: trunk/reactos/include/reactos/wine/wined3d_gl.h trunk/reactos/include/reactos/wine/wined3d_interface.h trunk/reactos/include/reactos/wine/wined3d_types.h Modified: trunk/reactos/include/reactos/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d_gl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wined3d_gl.h [iso-8859-1] Thu Nov 27 03:20:38 2008 @@ -690,6 +690,7 @@ #define GL_UNSIGNED_INT_10_10_10_2 0x8036 #define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 #define GL_RESCALE_NORMAL 0x803A +#define GL_TEXTURE_BINDING_3D 0x806A #define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 #define GL_SINGLE_COLOR 0x81F9 #define GL_SEPARATE_SPECULAR_COLOR 0x81FA @@ -1670,9 +1671,15 @@ typedef void (WINE_GLAPI *WINED3D_PFNGLACTIVETEXTUREARBPROC) (GLenum texture); typedef void (WINE_GLAPI *WINED3D_PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); +typedef void (WINE_GLAPI *WINED3D_PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); /* GL_ARB_texture_cube_map */ #ifndef GL_ARB_texture_cube_map @@ -1847,6 +1854,16 @@ #define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA #endif typedef void (WINE_GLAPI * PGLFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); + +/* GL_EXT_framebuffer_multisample */ +#ifndef GL_EXT_framebuffer_multisample +#define GL_EXT_framebuffer_multisample 1 +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8cab +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8d56 +#define GL_MAX_SAMPLES_EXT 0x8d57 +#endif +typedef void (WINE_GLAPI * PGLFNRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); + /* GL_EXT_secondary_color */ #ifndef GL_EXT_secondary_color #define GL_EXT_secondary_color 1 @@ -1948,8 +1965,8 @@ /* GL_EXT_texture_env_dot3 */ #ifndef GL_EXT_texture_env_dot3 #define GL_EXT_texture_env_dot3 1 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 +#define GL_DOT3_RGB_EXT 0x8740 +#define GL_DOT3_RGBA_EXT 0x8741 #endif /* GL_EXT_texture_lod_bias */ #ifndef GL_EXT_texture_lod_bias @@ -2723,7 +2740,7 @@ #endif /** - * Point sprites + * Point sprites */ /* GL_ARB_point_sprite */ #ifndef GL_ARB_point_sprite @@ -2732,11 +2749,11 @@ #define GL_COORD_REPLACE_ARB 0x8862 #endif /** - * @TODO: GL_NV_point_sprite + * @TODO: GL_NV_point_sprite */ /** - * Occlusion Queries + * Occlusion Queries */ /* GL_ARB_occlusion_query */ #ifndef GL_ARB_occlusion_query @@ -2826,23 +2843,6 @@ #define GL_APPLE_client_storage 1 #define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 #endif -/* GL_ATI_envmap_bumpmap */ -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif -typedef void (WINE_GLAPI * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLint *); -typedef void (WINE_GLAPI * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLfloat *); -typedef void (WINE_GLAPI * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLint *); -typedef void (WINE_GLAPI * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLfloat *); - /* GLX_SGI_video_sync */ typedef int (WINE_GLAPI * PGLXFNGETVIDEOSYNCSGIPROC) (unsigned int *); typedef int (WINE_GLAPI * PGLXFNWAITVIDEOSYNCSGIPROC) (int, int, unsigned int *); @@ -3192,8 +3192,8 @@ /**************************************************** - * OpenGL Official Version - * defines + * OpenGL Official Version + * defines ****************************************************/ /* GL_VERSION_1_3 */ #if !defined(GL_DOT3_RGBA) @@ -3329,6 +3329,7 @@ EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, EXT_FRAMEBUFFER_BLIT, + EXT_FRAMEBUFFER_MULTISAMPLE, EXT_PALETTED_TEXTURE, EXT_PIXEL_BUFFER_OBJECT, EXT_POINT_PARAMETERS, @@ -3371,7 +3372,6 @@ ATI_TEXTURE_ENV_COMBINE3, ATI_TEXTURE_MIRROR_ONCE, EXT_VERTEX_SHADER, - ATI_ENVMAP_BUMPMAP, ATI_FRAGMENT_SHADER, ATI_TEXTURE_COMPRESSION_3DC, /* APPLE */ @@ -3396,7 +3396,7 @@ /**************************************************** - * #Defines + * #Defines ****************************************************/ #define GL_EXT_FUNCS_GEN \ /** ARB Extensions **/ \ @@ -3413,9 +3413,15 @@ USE_GL_FUNC(WINED3D_PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB, ARB_MULTITEXTURE, NULL )\ USE_GL_FUNC(WINED3D_PFNGLCLIENTACTIVETEXTUREARBPROC, glClientActiveTextureARB, ARB_MULTITEXTURE, NULL )\ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD1FARBPROC, glMultiTexCoord1fARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD1FVARBPROC, glMultiTexCoord1fvARB, ARB_MULTITEXTURE, NULL )\ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2FARBPROC, glMultiTexCoord2fARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2FVARBPROC, glMultiTexCoord2fvARB, ARB_MULTITEXTURE, NULL )\ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD3FARBPROC, glMultiTexCoord3fARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD3FVARBPROC, glMultiTexCoord3fvARB, ARB_MULTITEXTURE, NULL )\ USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4FARBPROC, glMultiTexCoord4fARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4FVARBPROC, glMultiTexCoord4fvARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD2SVARBPROC, glMultiTexCoord2svARB, ARB_MULTITEXTURE, NULL )\ + USE_GL_FUNC(WINED3D_PFNGLMULTITEXCOORD4SVARBPROC, glMultiTexCoord4svARB, ARB_MULTITEXTURE, NULL )\ /* GL_ARB_occlusion_query */ \ USE_GL_FUNC(PGLFNGENQUERIESARBPROC, glGenQueriesARB, ARB_OCCLUSION_QUERY, NULL )\ USE_GL_FUNC(PGLFNDELETEQUERIESARBPROC, glDeleteQueriesARB, ARB_OCCLUSION_QUERY, NULL )\ @@ -3486,6 +3492,8 @@ USE_GL_FUNC(PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC, glGetFramebufferAttachmentParameterivEXT, EXT_FRAMEBUFFER_OBJECT, NULL )\ /* GL_EXT_framebuffer_blit */ \ USE_GL_FUNC(PGLFNGLBLITFRAMEBUFFEREXTPROC, glBlitFramebufferEXT, EXT_FRAMEBUFFER_BLIT, NULL )\ + /* GL_EXT_framebuffer_multisample */ \ + USE_GL_FUNC(PGLFNRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC, glRenderbufferStorageMultisampleEXT, EXT_FRAMEBUFFER_MULTISAMPLE, NULL )\ /* GL_EXT_paletted_texture */ \ USE_GL_FUNC(PGLFNGLCOLORTABLEEXTPROC, glColorTableEXT, EXT_PALETTED_TEXTURE, NULL )\ /* GL_EXT_point_parameters */ \ @@ -3665,11 +3673,6 @@ USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE, APPLE_FENCE, NULL )\ USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE, APPLE_FENCE, NULL )\ USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE, APPLE_FENCE, NULL )\ - /* GL_ATI_envmap_bumpmap */ \ - USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI, ATI_ENVMAP_BUMPMAP, NULL )\ - USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI, ATI_ENVMAP_BUMPMAP, NULL )\ - USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI, ATI_ENVMAP_BUMPMAP, NULL )\ - USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI, ATI_ENVMAP_BUMPMAP, NULL )\ /* GLX_SGI_video_sync */ \ USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, glXGetVideoSyncSGI, SGI_VIDEO_SYNC, NULL )\ USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI, SGI_VIDEO_SYNC, NULL )\ @@ -3806,7 +3809,7 @@ /**************************************************** - * Structures + * Structures ****************************************************/ typedef struct { @@ -3837,7 +3840,7 @@ DWORD driver_version_hipart; CHAR gl_renderer[255]; /** - * CAPS Constants + * CAPS Constants */ UINT max_buffers; UINT max_lights; Modified: trunk/reactos/include/reactos/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d_interface.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wined3d_interface.h [iso-8859-1] Thu Nov 27 03:20:38 2008 @@ -4,7 +4,7 @@ * Copyright 2002-2003 The wine-d3d team * Copyright 2002-2003 Raphael Junqueira * Copyright 2005 Oliver Stieber - * Copyright 2006 Stefan Dösinger for CodeWeavers + * Copyright 2006 Stefan DÃ¶singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -116,9 +116,9 @@ DEFINE_GUID(IID_IWineD3DBase, 0x46799311, 0x8e0e, 0x40ce, 0xb2, 0xec, 0xdd, 0xb9, 0x9f, 0x18, 0xfc, 0xb4); -/* {108F9C44-6F30-11d9-C687-00046142C14F} */ +/* {6d10a2ce-09d0-4a53-a427-11388f9f8ca5} */ DEFINE_GUID(IID_IWineD3DDevice, -0x108f9c44, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); +0x6d10a2ce, 0x09d0, 0x4a53, 0xa4, 0x27, 0x11, 0x38, 0x8f, 0x9f, 0x8c, 0xa5); /* {f756720c-32b9-4439-b5a3-1d6c97037d9e} */ DEFINE_GUID(IID_IWineD3DPalette, @@ -243,7 +243,7 @@ struct IWineD3DVolume **ppVolume, HANDLE *pSharedHandle); -typedef HRESULT (WINAPI *D3DCB_CREATEADDITIONALSWAPCHAIN) (IUnknown *pDevice, +typedef HRESULT (WINAPI *D3DCB_CREATESWAPCHAIN) (IUnknown *pDevice, WINED3DPRESENT_PARAMETERS *pPresentationParameters, struct IWineD3DSwapChain **pSwapChain ); @@ -343,7 +343,7 @@ #endif /* Define the main WineD3D entrypoint */ -IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent); +IWineD3D* WINAPI WineDirect3DCreate(UINT dxVersion, IUnknown *parent); /***************************************************************************** * IWineD3DDevice interface @@ -367,14 +367,14 @@ STDMETHOD(CreateVolume)(THIS_ UINT Width, UINT Height, UINT Depth, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DVolume** ppVolumeTexture, HANDLE* pSharedHandle, IUnknown *parent) PURE; STDMETHOD(CreateCubeTexture)(THIS_ UINT EdgeLength, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DCubeTexture** ppCubeTexture, HANDLE* pSharedHandle, IUnknown *parent, D3DCB_CREATESURFACEFN pFn) PURE; STDMETHOD(CreateQuery)(THIS_ WINED3DQUERYTYPE Type, struct IWineD3DQuery **ppQuery, IUnknown *pParent); - STDMETHOD(CreateAdditionalSwapChain)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters, struct IWineD3DSwapChain **pSwapChain, IUnknown *pParent, D3DCB_CREATERENDERTARGETFN pFn, D3DCB_CREATEDEPTHSTENCILSURFACEFN pFn2, WINED3DSURFTYPE surface_type); + STDMETHOD(CreateSwapChain)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters, struct IWineD3DSwapChain **pSwapChain, IUnknown *pParent, D3DCB_CREATERENDERTARGETFN pFn, D3DCB_CREATEDEPTHSTENCILSURFACEFN pFn2, WINED3DSURFTYPE surface_type); STDMETHOD(CreateVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, const WINED3DVERTEXELEMENT *elements, UINT element_count) PURE; STDMETHOD(CreateVertexDeclarationFromFVF)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, DWORD Fvf) PURE; STDMETHOD(CreateVertexShader)(THIS_ struct IWineD3DVertexDeclaration *vertex_declaration, CONST DWORD* pFunction, struct IWineD3DVertexShader** ppShader, IUnknown *pParent) PURE; STDMETHOD(CreatePixelShader)(THIS_ CONST DWORD* pFunction, struct IWineD3DPixelShader** ppShader, IUnknown *pParent) PURE; STDMETHOD_(HRESULT,CreatePalette)(THIS_ DWORD Flags, PALETTEENTRY *PalEnt, struct IWineD3DPalette **Palette, IUnknown *Parent); - STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); - STDMETHOD(InitGDI)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); + STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATESWAPCHAIN D3DCB_CreateSwapChain); + STDMETHOD(InitGDI)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATESWAPCHAIN D3DCB_CreateSwapChain); STDMETHOD(Uninit3D)(THIS, D3DCB_DESTROYSURFACEFN pFn, D3DCB_DESTROYSWAPCHAINFN pFn2); STDMETHOD(UninitGDI)(THIS, D3DCB_DESTROYSWAPCHAINFN pFn2); STDMETHOD_(void, SetMultithreaded)(THIS); @@ -507,7 +507,7 @@ #define IWineD3DDevice_CreateVolume(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateVolume(p,a,b,c,d,e,f,g,h,i) #define IWineD3DDevice_CreateCubeTexture(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateCubeTexture(p,a,b,c,d,e,f,g,h,i) #define IWineD3DDevice_CreateQuery(p,a,b,c) (p)->lpVtbl->CreateQuery(p,a,b,c) -#define IWineD3DDevice_CreateAdditionalSwapChain(p,a,b,c,d,e,f) (p)->lpVtbl->CreateAdditionalSwapChain(p,a,b,c,d,e,f) +#define IWineD3DDevice_CreateSwapChain(p,a,b,c,d,e,f) (p)->lpVtbl->CreateSwapChain(p,a,b,c,d,e,f) #define IWineD3DDevice_CreateVertexDeclaration(p,a,b,c,d) (p)->lpVtbl->CreateVertexDeclaration(p,a,b,c,d) #define IWineD3DDevice_CreateVertexDeclarationFromFVF(p,a,b,c) (p)->lpVtbl->CreateVertexDeclarationFromFVF(p,a,b,c) #define IWineD3DDevice_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) @@ -1157,7 +1157,6 @@ STDMETHOD_(void, BindTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; - STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; STDMETHOD_(void,GetGlDesc)(THIS_ glDescriptor **glDescription) PURE; STDMETHOD_(CONST void *, GetData)(THIS) PURE; STDMETHOD(SetFormat)(THIS_ WINED3DFORMAT format) PURE; @@ -1218,7 +1217,6 @@ #define IWineD3DSurface_BindTexture(p) (p)->lpVtbl->BindTexture(p) #define IWineD3DSurface_SaveSnapshot(p,a) (p)->lpVtbl->SaveSnapshot(p,a) #define IWineD3DSurface_SetContainer(p,a) (p)->lpVtbl->SetContainer(p,a) -#define IWineD3DSurface_SetGlTextureDesc(p,a,b) (p)->lpVtbl->SetGlTextureDesc(p,a,b) #define IWineD3DSurface_GetGlDesc(p,a) (p)->lpVtbl->GetGlDesc(p,a) #define IWineD3DSurface_GetData(p) (p)->lpVtbl->GetData(p) #define IWineD3DSurface_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) Modified: trunk/reactos/include/reactos/wine/wined3d_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d_types.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wined3d_types.h [iso-8859-1] Thu Nov 27 03:20:38 2008 @@ -5,7 +5,7 @@ * Copyright 2002-2003 Jason Edmeades * Raphael Junqueira * Copyright 2005 Oliver Stieber - * Copyright 2006 Stefan Dösinger + * Copyright 2006 Stefan DÃ¶singer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -122,83 +122,6 @@ WORD wRepeatFactor; WORD wLinePattern; } WINED3DLINEPATTERN; - -#define WINED3D_VSHADER_MAX_CONSTANTS 96 -#define WINED3D_PSHADER_MAX_CONSTANTS 32 - -typedef struct _WINED3DVECTOR_3 { - float x; - float y; - float z; -} WINED3DVECTOR_3; - -typedef struct _WINED3DVECTOR_4 { - float x; - float y; - float z; - float w; -} WINED3DVECTOR_4; - -typedef struct WINED3DSHADERVECTOR { - float x; - float y; - float z; - float w; -} WINED3DSHADERVECTOR; - -typedef struct WINED3DSHADERSCALAR { - float x; -} WINED3DSHADERSCALAR; - -typedef WINED3DSHADERVECTOR WINEVSHADERCONSTANTS8[WINED3D_VSHADER_MAX_CONSTANTS]; - -typedef struct VSHADERDATA { - /** Run Time Shader Function Constants */ - /*D3DXBUFFER* constants;*/ - WINEVSHADERCONSTANTS8 C; - /** Shader Code as char ... */ - CONST DWORD* code; - UINT codeLength; -} VSHADERDATA; - -/** temporary here waiting for buffer code */ -typedef struct VSHADERINPUTDATA { - WINED3DSHADERVECTOR V[17]; -} WINEVSHADERINPUTDATA; - -/** temporary here waiting for buffer code */ -typedef struct VSHADEROUTPUTDATA { - WINED3DSHADERVECTOR oPos; - WINED3DSHADERVECTOR oD[2]; - WINED3DSHADERVECTOR oT[8]; - WINED3DSHADERVECTOR oFog; - WINED3DSHADERVECTOR oPts; -} WINEVSHADEROUTPUTDATA; - -typedef WINED3DSHADERVECTOR WINEPSHADERCONSTANTS8[WINED3D_PSHADER_MAX_CONSTANTS]; - -typedef struct PSHADERDATA { - /** Run Time Shader Function Constants */ - /*D3DXBUFFER* constants;*/ - WINEPSHADERCONSTANTS8 C; - /** Shader Code as char ... */ - CONST DWORD* code; - UINT codeLength; -} PSHADERDATA; - -/** temporary here waiting for buffer code */ -typedef struct PSHADERINPUTDATA { - WINED3DSHADERVECTOR V[2]; - WINED3DSHADERVECTOR T[8]; - WINED3DSHADERVECTOR S[16]; - /*D3DSHADERVECTOR R[12];*/ -} WINEPSHADERINPUTDATA; - -/** temporary here waiting for buffer code */ -typedef struct PSHADEROUTPUTDATA { - WINED3DSHADERVECTOR oC[4]; - WINED3DSHADERVECTOR oDepth; -} WINEPSHADEROUTPUTDATA; /***************************************************************************** * WineD3D Structures to be used when d3d8 and d3d9 are incompatible @@ -886,7 +809,15 @@ DWORD Flags; UINT FullScreen_RefreshRateInHz; UINT PresentationInterval; + BOOL AutoRestoreDisplayMode; } WINED3DPRESENT_PARAMETERS; + +#define WINED3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 +#define WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 +#define WINED3DPRESENTFLAG_DEVICECLIP 0x00000004 +#define WINED3DPRESENTFLAG_VIDEO 0x00000010 +#define WINED3DPRESENTFLAG_NOAUTOROTATE 0x00000020 +#define WINED3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 typedef enum _WINED3DRESOURCETYPE { WINED3DRTYPE_SURFACE = 1,

1 0

[khornicek] 37683: - sync wined3d, d3d8, d3d9 to wine HEAD part 1/2
by khornicek＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: khornicek Date: Thu Nov 27 03:20:16 2008 New Revision: 37683 URL: http://svn.reactos.org/svn/reactos?rev=37683&view=rev Log: - sync wined3d, d3d8, d3d9 to wine HEAD part 1/2 Modified: trunk/reactos/dll/directx/wine/d3d8/Makefile.in trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/basetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/resource.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/Makefile.in trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.def trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/Make… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/base… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/reso… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/wined3d/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/M… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…

1 0

[greatlrd] 37682: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Thu Nov 27 02:55:13 2008 New Revision: 37682 URL: http://svn.reactos.org/svn/reactos?rev=37682&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. and fixing a hdc leak Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 02:55:13 2008 @@ -1834,6 +1834,7 @@ GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); DeleteObject(hbmp); pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + DeleteDC(hdc); /* End dectect RGB bit mask */ if (pHalInfo) @@ -1903,8 +1904,32 @@ // FIXME pHalInfo->ddCaps DDCORECAPS + RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); + pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); + + // FIXME fill in with wined3d caps here */ + // WINED3DCAPS WineCaps; + //pWineD3d->GetDeviceCaps(0,&WineCaps); + + /* example value and member that need be fill in */ + // pHalInfo->ddCaps.dwCaps : 0x94427bc1 + // pHalInfo->ddCaps.dwCaps2 : 0x004afe78 + // pHalInfo->ddCaps.dwCKeyCaps : 0x0003a311 + // pHalInfo->ddCaps.dwFXCaps : 0x27f95420 + // pHalInfo->ddCaps.dwMaxVisibleOverlays : 0x00000001 + // pHalInfo->ddCaps.dwNumFourCCCodes : 0x0000001c + // pHalInfo->ddCaps.ddsCaps.dwCaps : 0x30c272fc + // pHalInfo->ddCaps.dwMinOverlayStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxOverlayStretch : 0x0007d000 + // pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxLiveVideoStretch : 0x00003e80 + // pHalInfo->ddCaps.dwMinHwCodecStretch : 0x00000020 + // pHalInfo->ddCaps.dwMaxHwCodecStretch : 0x00003e80 + // pHalInfo->ddCaps.dwSVBCaps : 0x80000040 + /* always force rope 0x1000 for hal it mean only source copy is supported */ pHalInfo->ddCaps.dwRops[6] = 0x1000; + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo;

1 0

[dchapyshev] 37681: - .DEF -> .SPEC - Add some stubs
by dchapyshev＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: dchapyshev Date: Thu Nov 27 02:40:47 2008 New Revision: 37681 URL: http://svn.reactos.org/svn/reactos?rev=37681&view=rev Log: - .DEF -> .SPEC - Add some stubs Added: trunk/reactos/dll/win32/secur32/secur32.spec (with props) trunk/reactos/dll/win32/security/security.spec (with props) Removed: trunk/reactos/dll/win32/secur32/secur32.def trunk/reactos/dll/win32/security/security.def Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild trunk/reactos/dll/win32/secur32/sspi.c trunk/reactos/dll/win32/security/security.rbuild Removed: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.def (removed) @@ -1,79 +1,0 @@ -LIBRARY SECUR32.DLL -EXPORTS -LsaRegisterLogonProcess@12 -LsaLogonUser@56 -LsaDeregisterLogonProcess@4 -LsaConnectUntrusted@4 -LsaLookupAuthenticationPackage@12 -LsaFreeReturnBuffer@4 -LsaCallAuthenticationPackage@28 -;AcceptSecurityContext@36 -AcquireCredentialsHandleA@36 -AcquireCredentialsHandleW@36 -;@AddCredentialsA -;@AddCredentialsW -;@AddSecurityPackageA -;@AddSecurityPackageW -;ApplyControlTokenA@8 -ApplyControlToken@8=ApplyControlTokenW@8 -CompleteAuthToken@8 -;@CredMarshalTargetInfo -;@CredUnmarshalTargetInfo -DecryptMessage@16 -DeleteSecurityContext@4 -;@DeleteSecurityPackageA -;@DeleteSecurityPackageW -EncryptMessage@16 -EnumerateSecurityPackagesA@8 -EnumerateSecurityPackagesW@8 -;@ExportSecurityContext -FreeContextBuffer@4 -FreeCredentialsHandle@4 -GetComputerObjectNameA@12 -GetComputerObjectNameW@12 -;GetSecurityUserInfo -GetUserNameExA@12 -GetUserNameExW@12 -;ImpersonateSecurityContext@4 -;@ImportSecurityContextA -;@ImportSecurityContextW -;@InitSecurityInterfaceA -InitSecurityInterfaceW@0 -InitializeSecurityContextA@48 -InitializeSecurityContextW@48 -LsaEnumerateLogonSessions@8 -LsaGetLogonSessionData@8 -LsaRegisterPolicyChangeNotification@8 -LsaUnregisterPolicyChangeNotification@8 -MakeSignature@16 -QueryContextAttributesA@12 -QueryContextAttributesW@12 -;QueryCredentialsAttributesA@12 -;QueryCredentialsAttributesW@12 -;@QuerySecurityContextToken -QuerySecurityPackageInfoA@8 -QuerySecurityPackageInfoW@8 -;RevertSecurityContext@4 -;@SaslAcceptSecurityContext -;@SaslEnumerateProfilesA -;@SaslEnumerateProfilesW -;@SaslGetProfilePackageA -;@SaslGetProfilePackageW -;@SaslIdentifyPackageA -;@SaslIdentifyPackageW -;@SaslInitializeSecurityContextA -;@SaslInitializeSecurityContextW -;SealMessage -;SecCacheSspiPackages -;SecDeleteUserModeContext -;SecGetLocaleSpecificEncryptionRules -;SecInitUserModeContext -;SecpFreeMemory -;SecpTranslateName -;SecpTranslateNameEx -;@SetContextAttributesA -;@SetContextAttributesW -;TranslateNameA@20 -;TranslateNameW@20 -;UnsealMessage -VerifySignature@16 Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,5 +1,5 @@ <module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll"> - <importlibrary definition="secur32.def" /> + <importlibrary definition="secur32.spec" /> <include base="secur32">.</include> <include base="ReactOS">include/reactos/subsys</include> <define name="__SECUR32__" /> Added: trunk/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.spec (added) +++ trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,0 +1,77 @@ +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaDeregisterLogonProcess(long) +@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) +@ stdcall LsaFreeReturnBuffer(ptr) +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) +@ stub AddSecurityPackageA +@ stub AddSecurityPackageW +@ stdcall ApplyControlTokenA(ptr ptr) +@ stdcall ApplyControlToken(ptr ptr) ApplyControlTokenW +@ stdcall CompleteAuthToken(ptr ptr) +@ stub CredMarshalTargetInfo +@ stub CredUnmarshalTargetInfo +@ stdcall DecryptMessage(ptr ptr long ptr) +@ stdcall DeleteSecurityContext(ptr) +@ stub DeleteSecurityPackageA +@ stub DeleteSecurityPackageW +@ stdcall EncryptMessage(ptr long ptr long) +@ stdcall EnumerateSecurityPackagesA(ptr ptr) +@ stdcall EnumerateSecurityPackagesW(ptr ptr) +@ stdcall ExportSecurityContext(ptr long ptr ptr) +@ stdcall FreeContextBuffer(ptr) +@ stdcall FreeCredentialsHandle(ptr) +@ stdcall GetComputerObjectNameA(long ptr ptr) +@ stdcall GetComputerObjectNameW(long ptr ptr) +@ stub GetSecurityUserInfo +@ stdcall GetUserNameExA(long ptr ptr) +@ stdcall GetUserNameExW(long ptr ptr) +@ stdcall ImpersonateSecurityContext(ptr) +@ stdcall ImportSecurityContextA(str ptr ptr ptr) +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) +@ stdcall InitSecurityInterfaceA() +@ stdcall InitSecurityInterfaceW() +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) +@ stdcall LsaEnumerateLogonSessions(ptr ptr) +@ stdcall LsaGetLogonSessionData(ptr ptr) +@ stdcall LsaRegisterPolicyChangeNotification(long ptr) +@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) +@ stdcall MakeSignature(ptr long ptr long) +@ stdcall QueryContextAttributesA(ptr long ptr) +@ stdcall QueryContextAttributesW(ptr long ptr) +@ stdcall QueryCredentialsAttributesA(ptr long ptr) +@ stdcall QueryCredentialsAttributesW(ptr long ptr) +@ stdcall QuerySecurityContextToken(ptr ptr) +@ stdcall QuerySecurityPackageInfoA(str ptr) +@ stdcall QuerySecurityPackageInfoW(wstr ptr) +@ stdcall RevertSecurityContext(ptr) +@ stub SaslAcceptSecurityContext +@ stub SaslEnumerateProfilesA +@ stub SaslEnumerateProfilesW +@ stub SaslGetProfilePackageA +@ stub SaslGetProfilePackageW +@ stub SaslIdentifyPackageA +@ stub SaslIdentifyPackageW +@ stub SaslInitializeSecurityContextA +@ stub SaslInitializeSecurityContextW +@ stdcall SealMessage(ptr long ptr long) EncryptMessage +@ stub SecCacheSspiPackages +@ stub SecDeleteUserModeContext +@ stub SecGetLocaleSpecificEncryptionRules +@ stub SecInitUserModeContext +@ stub SecpFreeMemory +@ stub SecpTranslateName +@ stub SecpTranslateNameEx +@ stub SetContextAttributesA +@ stub SetContextAttributesW +@ stdcall TranslateNameA(str long long ptr ptr) +@ stdcall TranslateNameW(wstr long long ptr ptr) +@ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage +@ stdcall VerifySignature(ptr ptr long ptr) Propchange: trunk/reactos/dll/win32/secur32/secur32.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -85,6 +85,15 @@ SECURITY_STATUS WINAPI ApplyControlTokenW(PCtxtHandle Handle, + PSecBufferDesc Buffer) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ApplyControlTokenA(PCtxtHandle Handle, PSecBufferDesc Buffer) { DPRINT1("%s() not implemented!\n", __FUNCTION__); @@ -247,3 +256,185 @@ DPRINT1("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; } + +SECURITY_STATUS +WINAPI +AcceptSecurityContext( + PCredHandle phCredential, + PCtxtHandle phContext, + PSecBufferDesc pInput, + ULONG fContextReq, + ULONG TargetDataRep, + PCtxtHandle phNewContext, + PSecBufferDesc pOutput, + ULONG *pfContextAttr, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +AddCredentialsA( + PCredHandle hCredentials, + SEC_CHAR *pszPrincipal, + SEC_CHAR *pszPackage, + ULONG fCredentialUse, + LPVOID pAuthData, + SEC_GET_KEY_FN pGetKeyFn, + LPVOID pvGetKeyArgument, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +AddCredentialsW( + PCredHandle hCredentials, + SEC_WCHAR *pszPrincipal, + SEC_WCHAR *pszPackage, + ULONG fCredentialUse, + LPVOID pAuthData, + SEC_GET_KEY_FN pGetKeyFn, + LPVOID pvGetKeyArgument, + PTimeStamp ptsExpiry +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ExportSecurityContext( + PCtxtHandle phContext, + ULONG fFlags, + PSecBuffer pPackedContext, + LPVOID *pToken +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImpersonateSecurityContext( + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImportSecurityContextA( + SEC_CHAR *pszPackage, + PSecBuffer pPackedContext, + LPVOID Token, + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +ImportSecurityContextW( + SEC_WCHAR *pszPackage, + PSecBuffer pPackedContext, + LPVOID Token, + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QueryCredentialsAttributesA( + PCredHandle phCredential, + ULONG ulAttribute, + LPVOID pBuffer +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QueryCredentialsAttributesW( + PCredHandle phCredential, + ULONG ulAttribute, + LPVOID pBuffer +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +QuerySecurityContextToken( + PCtxtHandle phContext, + PHANDLE phToken +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +SECURITY_STATUS +WINAPI +RevertSecurityContext( + PCtxtHandle phContext +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +PSecurityFunctionTableA +WINAPI +InitSecurityInterfaceA(VOID) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return NULL; +} + +BOOLEAN +WINAPI +TranslateNameA( + LPCSTR lpAccountName, + EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, + LPSTR lpTranslatedName, + PULONG nSize +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} + +BOOLEAN +WINAPI +TranslateNameW( + LPCWSTR lpAccountName, + EXTENDED_NAME_FORMAT AccountNameFormat, + EXTENDED_NAME_FORMAT DesiredNameFormat, + LPWSTR lpTranslatedName, + PULONG nSize +) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return FALSE; +} Removed: trunk/reactos/dll/win32/security/security.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/security/security.def (removed) @@ -1,79 +1,0 @@ -LIBRARY SECURITY.DLL -EXPORTS; -LsaRegisterLogonProcess(a)12=SECUR32.LsaRegisterLogonProcess -LsaLogonUser(a)56=SECUR32.LsaLogonUser -LsaDeregisterLogonProcess(a)4=SECUR32.LsaDeregisterLogonProcess -LsaConnectUntrusted(a)4=SECUR32.LsaConnectUntrusted -LsaLookupAuthenticationPackage(a)12=SECUR32.LsaLookupAuthenticationPackage -LsaFreeReturnBuffer(a)4=SECUR32.LsaFreeReturnBuffer -LsaCallAuthenticationPackage(a)28=SECUR32.LsaCallAuthenticationPackage -;AcceptSecurityContext(a)36=SECUR32.AcceptSecurityContext -;AcquireCredentialsHandleA(a)36=SECUR32.AcquireCredentialsHandleA -;AcquireCredentialsHandleW(a)36=SECUR32.AcquireCredentialsHandleW -;(a)AddCredentialsA=SECUR32.AddCredentialsA -;(a)AddCredentialsW=SECUR32.AddCredentialsW -;(a)AddSecurityPackageA=SECUR32.AddSecurityPackageA -;(a)AddSecurityPackageW=SECUR32.AddSecurityPackageW -;ApplyControlTokenA(a)8=SECUR32.ApplyControlTokenA -;ApplyControlTokenW(a)8=SECUR32.ApplyControlTokenW -;CompleteAuthToken(a)8=SECUR32.CompleteAuthToken -;(a)CredMarshalTargetInfo=SECUR32.CredMarshalTargetInfo -;(a)CredUnmarshalTargetInfo=SECUR32.CredUnmarshalTargetInfo -;DecryptMessage(a)16=SECUR32.DecryptMessage -;DeleteSecurityContext(a)4=SECUR32.DeleteSecurityContext -;(a)DeleteSecurityPackageA=SECUR32.DeleteSecurityPackageA -;(a)DeleteSecurityPackageW=SECUR32.DeleteSecurityPackageW -;EncryptMessage(a)16=SECUR32.EncryptMessage -EnumerateSecurityPackagesA(a)8=SECUR32.EnumerateSecurityPackagesA -EnumerateSecurityPackagesW(a)8=SECUR32.EnumerateSecurityPackagesW -;(a)ExportSecurityContext=SECUR32.ExportSecurityContext -FreeContextBuffer(a)4=SECUR32.FreeContextBuffer -;FreeCredentialsHandle(a)4=SECUR32.FreeCredentialsHandle -GetComputerObjectNameA(a)12=SECUR32.GetComputerObjectNameA -GetComputerObjectNameW(a)12=SECUR32.GetComputerObjectNameW -;GetSecurityUserInfo=SECUR32.GetSecurityUserInfo -GetUserNameExA(a)12=SECUR32.GetUserNameExA -GetUserNameExW(a)12=SECUR32.GetUserNameExW -;ImpersonateSecurityContext(a)4=SECUR32.ImpersonateSecurityContext -;(a)ImportSecurityContextA=SECUR32.ImportSecurityContextA -;(a)ImportSecurityContextW=SECUR32.ImportSecurityContextW -;(a)InitSecurityInterfaceA=SECUR32.InitSecurityInterfaceA -;(a)InitSecurityInterfaceW=SECUR32.InitSecurityInterfaceW -;InitializeSecurityContextA(a)48=SECUR32.InitializeSecurityContextA -;InitializeSecurityContextW(a)48=SECUR32.InitializeSecurityContextW -LsaEnumerateLogonSessions(a)8=SECUR32.LsaEnumerateLogonSessions -LsaGetLogonSessionData(a)8=SECUR32.LsaGetLogonSessionData -LsaRegisterPolicyChangeNotification(a)8=SECUR32.LsaRegisterPolicyChangeNotification -LsaUnregisterPolicyChangeNotification(a)8=SECUR32.LsaUnregisterPolicyChangeNotification -;MakeSignature(a)16=SECUR32.MakeSignature -;QueryContextAttributesA(a)12=SECUR32.QueryContextAttributesA -;QueryContextAttributesW(a)12=SECUR32.QueryContextAttributesW -;QueryCredentialsAttributesA(a)12=SECUR32.QueryCredentialsAttributesA -;QueryCredentialsAttributesW(a)12=SECUR32.QueryCredentialsAttributesW -;(a)QuerySecurityContextToken=SECUR32.QuerySecurityContextToken -;(a)QuerySecurityPackageInfoA=SECUR32.QuerySecurityPackageInfoA -;(a)QuerySecurityPackageInfoW=SECUR32.QuerySecurityPackageInfoW -;RevertSecurityContext(a)4=SECUR32.RevertSecurityContext -;(a)SaslAcceptSecurityContext=SECUR32.SaslAcceptSecurityContext -;(a)SaslEnumerateProfilesA=SECUR32.SaslEnumerateProfilesA -;(a)SaslEnumerateProfilesW=SECUR32.SaslEnumerateProfilesW -;(a)SaslGetProfilePackageA=SECUR32.SaslGetProfilePackageA -;(a)SaslGetProfilePackageW=SECUR32.SaslGetProfilePackageW -;(a)SaslIdentifyPackageA=SECUR32.SaslIdentifyPackageA -;(a)SaslIdentifyPackageW=SECUR32.SaslIdentifyPackageW -;@SaslInitializeSecurityContextA=SECUR32.SaslInitializeSecurityContextA -;@SaslInitializeSecurityContextW=SECUR32.SaslInitializeSecurityContextW -;SealMessage=SECUR32.SealMessage -;SecCacheSspiPackages=SECUR32.SecCacheSspiPackages -;SecDeleteUserModeContext=SECUR32.SecDeleteUserModeContext -;SecGetLocaleSpecificEncryptionRules=SECUR32.SecGetLocaleSpecificEncryptionRules -;SecInitUserModeContext=SECUR32.SecInitUserModeContext -;SecpFreeMemory=SECUR32.SecpFreeMemory -;SecpTranslateName=SECUR32.SecpTranslateName -;SecpTranslateNameEx=SECUR32.SecpTranslateNameEx -;(a)SetContextAttributesA=SECUR32.SetContextAttributesA -;(a)SetContextAttributesW=SECUR32.SetContextAttributesW -;TranslateNameA(a)20=SECUR32.TranslateNameA -;TranslateNameW(a)20=SECUR32.TranslateNameW -;UnsealMessage=SECUR32.UnsealMessage -;VerifySignature(a)16=SECUR32.VerifySignature Modified: trunk/reactos/dll/win32/security/security.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/security/security.rbuild [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,5 +1,5 @@ <module name="security" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="security.dll"> - <importlibrary definition="security.def" /> + <importlibrary definition="security.spec" /> <include base="security">.</include> <define name="__SECURITY__" /> <library>ntdll</library> Added: trunk/reactos/dll/win32/security/security.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.spec (added) +++ trunk/reactos/dll/win32/security/security.spec [iso-8859-1] Thu Nov 27 02:40:47 2008 @@ -1,0 +1,77 @@ +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser +@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess +@ stdcall LsaConnectUntrusted(long) secur32.LsaConnectUntrusted +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) SECUR32.LsaLookupAuthenticationPackage +@ stdcall LsaFreeReturnBuffer(ptr) SECUR32.LsaFreeReturnBuffer +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) SECUR32.LsaCallAuthenticationPackage +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) SECUR32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleW +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) SECUR32.AddCredentialsA +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) SECUR32.AddCredentialsW +@ stub AddSecurityPackageA # SECUR32.AddSecurityPackageA +@ stub AddSecurityPackageW # SECUR32.AddSecurityPackageW +@ stdcall ApplyControlTokenA(ptr ptr) SECUR32.ApplyControlTokenA +@ stdcall ApplyControlTokenW(ptr ptr) SECUR32.ApplyControlTokenW +@ stdcall CompleteAuthToken(ptr ptr) SECUR32.CompleteAuthToken +@ stub CredMarshalTargetInfo # SECUR32.CredMarshalTargetInfo +@ stub CredUnmarshalTargetInfo # SECUR32.CredUnmarshalTargetInfo +@ stdcall DecryptMessage(ptr ptr long ptr) SECUR32.DecryptMessage +@ stdcall DeleteSecurityContext(ptr) SECUR32.DeleteSecurityContext +@ stub DeleteSecurityPackageA # SECUR32.DeleteSecurityPackageA +@ stub DeleteSecurityPackageW # SECUR32.DeleteSecurityPackageW +@ stdcall EncryptMessage(ptr long ptr long) SECUR32.EncryptMessage +@ stdcall EnumerateSecurityPackagesA(ptr ptr) SECUR32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) SECUR32.EnumerateSecurityPackagesW +@ stdcall ExportSecurityContext(ptr long ptr ptr) SECUR32.ExportSecurityContext +@ stdcall FreeContextBuffer(ptr) SECUR32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) SECUR32.FreeCredentialsHandle +@ stdcall GetComputerObjectNameA(long ptr ptr) SECUR32.GetComputerObjectNameA +@ stdcall GetComputerObjectNameW(long ptr ptr) SECUR32.GetComputerObjectNameW +@ stub GetSecurityUserInfo # SECUR32.GetSecurityUserInfo +@ stdcall GetUserNameExA(long ptr ptr) SECUR32.GetUserNameExA +@ stdcall GetUserNameExW(long ptr ptr) SECUR32.GetUserNameExW +@ stdcall ImpersonateSecurityContext(ptr) SECUR32.ImpersonateSecurityContext +@ stdcall ImportSecurityContextA(str ptr ptr ptr) SECUR32.ImportSecurityContextA +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) SECUR32.ImportSecurityContextW +@ stdcall InitSecurityInterfaceA() SECUR32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() SECUR32.InitSecurityInterfaceW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW +@ stdcall LsaEnumerateLogonSessions(ptr ptr) SECUR32.LsaEnumerateLogonSessions +@ stdcall LsaGetLogonSessionData(ptr ptr) SECUR32.LsaGetLogonSessionData +@ stdcall LsaRegisterPolicyChangeNotification(long ptr) SECUR32.LsaRegisterPolicyChangeNotification +@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) SECUR32.LsaUnregisterPolicyChangeNotification +@ stdcall MakeSignature(ptr long ptr long) SECUR32.MakeSignature +@ stdcall QueryContextAttributesA(ptr long ptr) SECUR32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) SECUR32.QueryContextAttributesW +@ stdcall QueryCredentialsAttributesA(ptr long ptr) SECUR32.QueryCredentialsAttributesA +@ stdcall QueryCredentialsAttributesW(ptr long ptr) SECUR32.QueryCredentialsAttributesW +@ stdcall QuerySecurityContextToken(ptr ptr) SECUR32.QuerySecurityContextToken +@ stdcall QuerySecurityPackageInfoA(str ptr) SECUR32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) SECUR32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) SECUR32.RevertSecurityContext +@ stub SaslAcceptSecurityContext # SECUR32.SaslAcceptSecurityContext +@ stub SaslEnumerateProfilesA # SECUR32.SaslEnumerateProfilesA +@ stub SaslEnumerateProfilesW # SECUR32.SaslEnumerateProfilesW +@ stub SaslGetProfilePackageA # SECUR32.SaslGetProfilePackageA +@ stub SaslGetProfilePackageW # SECUR32.SaslGetProfilePackageW +@ stub SaslIdentifyPackageA # SECUR32.SaslIdentifyPackageA +@ stub SaslIdentifyPackageW # SECUR32.SaslIdentifyPackageW +@ stub SaslInitializeSecurityContextA # SECUR32.SaslInitializeSecurityContextA +@ stub SaslInitializeSecurityContextW # SECUR32.SaslInitializeSecurityContextW +@ stdcall SealMessage(ptr long ptr long) SECUR32.EncryptMessage +@ stub SecCacheSspiPackages # SECUR32.SecCacheSspiPackages +@ stub SecDeleteUserModeContext # SECUR32.SecDeleteUserModeContext +@ stub SecGetLocaleSpecificEncryptionRules # SECUR32.SecGetLocaleSpecificEncryptionRules +@ stub SecInitUserModeContext # SECUR32.SecInitUserModeContext +@ stub SecpFreeMemory # SECUR32.SecpFreeMemory +@ stub SecpTranslateName # SECUR32.SecpTranslateName +@ stub SecpTranslateNameEx # SECUR32.SecpTranslateNameEx +@ stub SetContextAttributesA # SECUR32.SetContextAttributesA +@ stub SetContextAttributesW #SECUR32.SetContextAttributesW +@ stdcall TranslateNameA(str long long ptr ptr) SECUR32.TranslateNameA +@ stdcall TranslateNameW(wstr long long ptr ptr) SECUR32.TranslateNameW +@ stdcall UnsealMessage(ptr ptr long ptr) SECUR32.DecryptMessage +@ stdcall VerifySignature(ptr ptr long ptr) SECUR32.VerifySignature Propchange: trunk/reactos/dll/win32/security/security.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 37680: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d.
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Thu Nov 27 02:34:16 2008 New Revision: 37680 URL: http://svn.reactos.org/svn/reactos?rev=37680&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Thu Nov 27 02:34:16 2008 @@ -1735,6 +1735,7 @@ /* Set the return value */ Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; + } /* Return to caller */ @@ -1761,13 +1762,20 @@ LPVIDMEM pvmList) { + HDC hdc; + DEVMODEW DevMode; PVIDEOMEMORY VidMemList = NULL; //DWORD dwNumHeaps=0, FourCCs=0; - BOOL retVal = TRUE; + HBITMAP hbmp; + const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; + UCHAR *pbmiData; + BITMAPINFO *pbmi; + DWORD *pMasks; + IWineD3D* pWineD3d; - WINED3DDISPLAYMODE d3ddm; + /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ if ( (pvmList != NULL) && @@ -1790,64 +1798,143 @@ pWineD3d = (IWineD3D*) GetDdHandle(pDirectDrawGlobal->hDD); /* Get adapter res, we can use windows own api here */ - IWineD3D_GetAdapterDisplayMode( pWineD3d, D3DADAPTER_DEFAULT, &d3ddm); - - /* Clear the incoming pointer */ - RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); - - /* Convert all the data */ - pHalInfo->dwSize = sizeof(DDHALINFO); - pHalInfo->lpDDCallbacks = pDDCallbacks; - pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; - pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; - - /* Check for NT5+ D3D Data */ -/* FIXME - if ( (D3dCallbacks.dwSize != 0) && - (D3dDriverData.dwSize != 0) ) - { + //IWineD3D_GetAdapterDisplayMode( pWineD3d, D3DADAPTER_DEFAULT, &d3ddm); + EnumDisplaySettingsW(NULL,ENUM_CURRENT_SETTINGS,&DevMode); + + /* Dectect RGB bit mask */ + hdc = GetDC(GetDesktopWindow()); + if (hdc == NULL) + { + goto cleanup; + } + + hbmp = CreateCompatibleBitmap(hdc, 1, 1); + if (hbmp==NULL) + { + DeleteDC(hdc); + goto cleanup; + } + + pbmiData = (UCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmiSize); + pbmi = (BITMAPINFO*)pbmiData; + + if (pbmiData==NULL) + { + DeleteDC(hdc); + DeleteObject(hbmp); + goto cleanup; + } + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = (WORD)DevMode.dmBitsPerPel; + pbmi->bmiHeader.biCompression = BI_BITFIELDS; + pbmi->bmiHeader.biWidth = 1; + pbmi->bmiHeader.biHeight = 1; + + GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); + DeleteObject(hbmp); + pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + /* End dectect RGB bit mask */ + + if (pHalInfo) + { + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. + + pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; + pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; + + /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen + * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch + */ + pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; + + /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + switch(DevMode.dmBitsPerPel) + { + case 1: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; + break; + + case 2: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; + break; + + case 4: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; + break; + + case 8: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; + break; + + case 16: + case 24: + case 32: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + break; + default: + break; + } + + pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; + pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; + + /* ToDo ? align setting for wined3d */ + pHalInfo->vmiData.dwOffscreenAlign = 0; + pHalInfo->vmiData.dwOverlayAlign = 0; + pHalInfo->vmiData.dwTextureAlign = 0; + pHalInfo->vmiData.dwZBufferAlign = 0; + pHalInfo->vmiData.dwAlphaAlign = 0; + + pHalInfo->vmiData.dwNumHeaps = 0; + pHalInfo->vmiData.pvmList = NULL; + + // FIXME pHalInfo->ddCaps DDCORECAPS + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + + pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver + /* DDHALINFO_ISPRIMARYDISPLAY + * Driver is the primary display driver. + * + * DDHALINFO_MODEXILLEGAL + * Hardware does not support ModeX modes + * + * DDHALINFO_GETDRIVERINFOSET + * The GetDriverInfo member is set, gdi32 does always set it + * + * DDHALINFO_GETDRIVERINFO2 + * Driver supports GetDriverInfo2 variant of GetDriverInfo + */ + + /* Setup callbacks */ + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - } -*/ - /* Continue converting the rest */ - /* FIXME pHalInfo->vmiData.dwFlags */ - //pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; - pHalInfo->vmiData.dwDisplayWidth = d3ddm.Width; // HalInfo.vmiData.dwDisplayWidth; - pHalInfo->vmiData.dwDisplayHeight = d3ddm.Height;//HalInfo.vmiData.dwDisplayHeight; - // FIXME pHalInfo->vmiData.lDisplayPitch = d3ddm.Format//HalInfo.vmiData.lDisplayPitch; - pHalInfo->vmiData.fpPrimary = 0; - - /* FIXME - RtlCopyMemory( &pHalInfo->vmiData.ddpfDisplay, - &HalInfo.vmiData.ddpfDisplay, - sizeof(DDPIXELFORMAT)); - - pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; - pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; - pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; - pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; - pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; - - pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; - pHalInfo->vmiData.pvmList = pvmList; - - RtlCopyMemory( &pHalInfo->ddCaps, - &HalInfo.ddCaps, - sizeof(DDCORECAPS )); - - pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; - pHalInfo->lpdwFourCC = pdwFourCC; - */ - - /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - - pHalInfo->dwFlags = DDHALINFO_GETDRIVERINFOSET; - pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + /* FIXME + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + */ + } /* Now check if we got any DD callbacks */ if (pDDCallbacks)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs