Index: build/vs2010/SlimDX.DirectInput.vcxproj
===================================================================
--- build/vs2010/SlimDX.DirectInput.vcxproj (revision 0)
+++ build/vs2010/SlimDX.DirectInput.vcxproj (revision 0)
@@ -0,0 +1,489 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Public
+ Win32
+
+
+ Public
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}
+ v2.0
+ SlimDX
+ ManagedCProj
+
+
+
+ DynamicLibrary
+ Unicode
+ true
+ true
+
+
+ DynamicLibrary
+ Unicode
+ true
+ true
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+ DynamicLibrary
+ Unicode
+ true
+ true
+
+
+ DynamicLibrary
+ Unicode
+ true
+ true
+
+
+ DynamicLibrary
+ Unicode
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ bin\x86\$(Configuration)\
+ obj\x86\$(Configuration)\
+ false
+ bin\x64\$(Configuration)\
+ obj\x64\$(Configuration)\
+ false
+ bin\x86\$(Configuration)\
+ obj\x86\$(Configuration)\
+ false
+ bin\x64\$(Configuration)\
+ obj\x64\$(Configuration)\
+ false
+ bin\x86\$(Configuration)\
+ obj\x86\$(Configuration)\
+ false
+ true
+ bin\x64\$(Configuration)\
+ obj\x64\$(Configuration)\
+ false
+ true
+
+
+
+ Disabled
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ Use
+ stdafx.h
+ false
+ Level4
+ ProgramDatabase
+ true
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;Effects11.lib;advapi32.lib
+ 0.0.0.0
+ $(OutDir);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ true
+
+
+ false
+
+
+ MachineX86
+
+
+
+
+ true
+
+
+
+
+ X64
+
+
+ Disabled
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;%(PreprocessorDefinitions)
+ MultiThreadedDebugDLL
+ Use
+ stdafx.h
+ false
+ Level4
+ ProgramDatabase
+ true
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;Effects11.lib;advapi32.lib
+ 0.0.0.0
+ $(OutDir);$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ true
+
+
+ false
+
+
+ MachineX64
+
+
+
+
+ true
+
+
+
+
+ Full
+ AnySuitable
+ Speed
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;XMLDOCS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Precise
+ Use
+ stdafx.h
+ true
+ $(IntDir)
+ Level4
+ ProgramDatabase
+ true
+ true
+ true
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;Effects11.lib;advapi32.lib
+ 0.0.0.0
+ $(OutDir);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ false
+
+
+ MachineX86
+
+
+ true
+
+
+
+
+ X64
+
+
+ MaxSpeed
+ AnySuitable
+ Speed
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;XMLDOCS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Use
+ stdafx.h
+ true
+ $(IntDir)
+ Level4
+ ProgramDatabase
+ true
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;Effects11.lib;advapi32.lib
+ 0.0.0.0
+ $(OutDir);$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ false
+
+
+ MachineX64
+
+
+ true
+
+
+
+
+ Full
+ AnySuitable
+ Speed
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;XMLDOCS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Use
+ stdafx.h
+ true
+ Level4
+ ProgramDatabase
+ true
+ true
+ true
+ true
+ false
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;advapi32.lib
+ 4.0.10.43
+ $(OutDir);$(DXSDK_DIR)Lib\x86;$(OutDir)..\Release;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ false
+
+
+ MachineX86
+ e:\nuclex.snk
+ false
+ true
+
+
+ sn -R $(TargetPath) D:\slimdxKey.snk
+
+
+
+
+ X64
+
+
+ Full
+ AnySuitable
+ Speed
+ $(ProjectDir)..\..\external\;$(ProjectDir)..\..\external\Effects11\Inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;D3D_DEBUG_INFO;WINVER=0x501;_WIN32_WINNT=0x501;DIRECTINPUT_VERSION=0x0800;XMLDOCS;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ Use
+ stdafx.h
+ true
+ Level4
+ ProgramDatabase
+ true
+ true
+ true
+ true
+ false
+
+
+ user32.lib;gdi32.lib;dxguid.lib;d3d9.lib;d3dx9.lib;dxgi.lib;d3d10.lib;d3dx10.lib;d3d10_1.lib;dinput8.lib;xinput.lib;dxerr.lib;ole32.lib;x3daudio.lib;xapobase.lib;winmm.lib;dsound.lib;d3dcompiler.lib;d3d11.lib;d3dx11.lib;d2d1.lib;dwrite.lib;d3dcsx.lib;advapi32.lib
+ 4.0.10.43
+ $(OutDir);$(DXSDK_DIR)Lib\x64;$(OutDir)..\Release;%(AdditionalLibraryDirectories)
+ d3d9.dll;d3dx9_43.dll;d3dx10_43.dll;d3dx11_43.dll;d3dcompiler_43.dll;d3dcsx_43.dll;d3d10.dll;d3d10_1.dll;d3d11.dll;d2d1.dll;dwrite.dll;dxgi.dll;dinput8.dll;x3daudio1_7.dll;xinput1_3.dll;dsound.dll;%(DelayLoadDLLs)
+ true
+ false
+
+
+ MachineX64
+ D:\slimdxKey.snk
+ false
+ true
+
+
+ sn -R $(TargetPath) D:\slimdxKey.snk
+
+
+
+
+ true
+ true
+
+
+ true
+ true
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create
+ stdafx.h
+ Create
+ stdafx.h
+ Create
+ stdafx.h
+ Create
+ stdafx.h
+ Create
+ stdafx.h
+ Create
+ stdafx.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: build/vs2010/SlimDX.DirectInput.sln
===================================================================
--- build/vs2010/SlimDX.DirectInput.sln (revision 0)
+++ build/vs2010/SlimDX.DirectInput.sln (revision 0)
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlimDX.DirectInput", "SlimDX.DirectInput.vcxproj", "{8ECCE443-0440-40F4-A94C-F02E027282C3}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Public|Win32 = Public|Win32
+ Public|x64 = Public|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|Win32.Build.0 = Debug|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.ActiveCfg = Debug|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Debug|x64.Build.0 = Debug|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public|Win32.ActiveCfg = Public|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public|Win32.Build.0 = Public|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public|x64.ActiveCfg = Public|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Public|x64.Build.0 = Public|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|Win32.ActiveCfg = Release|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|Win32.Build.0 = Release|Win32
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.ActiveCfg = Release|x64
+ {8ECCE443-0440-40F4-A94C-F02E027282C3}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Index: build/vs2010/SlimDX.DirectInput.vcxproj.filters
===================================================================
--- build/vs2010/SlimDX.DirectInput.vcxproj.filters (revision 0)
+++ build/vs2010/SlimDX.DirectInput.vcxproj.filters (revision 0)
@@ -0,0 +1,413 @@
+
+
+
+
+ {37768987-11cb-4026-a388-ea4936321fea}
+
+
+ {3cd41058-453a-419d-b7dc-6698d8cbcbea}
+
+
+ {affda823-8873-44bd-b7f0-1cceaf9ba7b5}
+
+
+ {6694604c-f8d0-4aff-a861-b3c27b1e7a48}
+
+
+ {f2ccdc5f-eacb-49bb-93ca-5fdf5806495a}
+
+
+ {abc6ebd0-3bf0-474e-a2a9-bea276b979e0}
+
+
+ {9ef81ff7-6ec8-402a-aaa4-5c4a128c9cf3}
+
+
+ {d607ed1d-0161-493e-ae1b-b7837e4e62d2}
+
+
+ {921d0a04-67c2-46e0-8067-6187af63b690}
+
+
+ {b952ec8a-d06f-4b8a-a3bb-c973e0819245}
+
+
+ {652542e4-ff2e-4b34-bb0c-869082e78732}
+
+
+ {00a284fc-daaf-4d7c-8419-d1bfdd4fd379}
+
+
+ {48fbc218-4a8a-418e-9c0f-5bbe344f481b}
+
+
+ {607458f0-9ad6-4795-b5ca-088717f303bc}
+
+
+ {930ba2ac-ba65-401c-8433-fce9b981ed40}
+
+
+ {eddd92c6-fb78-4019-a9da-cb16a3e7e3e2}
+
+
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base\Data
+
+
+ Base\Data
+
+
+ Base\Data
+
+
+ Base\Resources
+
+
+ DirectInput
+
+
+ DirectInput
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Exceptions
+
+
+ DirectInput\Exceptions
+
+
+ DirectInput\Properties
+
+
+ DirectInput\Properties
+
+
+ DirectInput\State
+
+
+ DirectInput\State
+
+
+ DirectInput\State
+
+
+ DirectInput\DeviceConstants
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect\TypeSpecificParameters
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Conditions
+
+
+ DirectInput\Effect\Conditions
+
+
+
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base
+
+
+ Base\Data
+
+
+ Base\Data
+
+
+ Base\Data
+
+
+ Base\Resources
+
+
+ DirectInput
+
+
+ DirectInput
+
+
+ DirectInput
+
+
+ DirectInput
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Device
+
+
+ DirectInput\Exceptions
+
+
+ DirectInput\Exceptions
+
+
+ DirectInput\Properties
+
+
+ DirectInput\Properties
+
+
+ DirectInput\Attributes
+
+
+ DirectInput\Attributes
+
+
+ DirectInput\State
+
+
+ DirectInput\State
+
+
+ DirectInput\State
+
+
+ DirectInput\DeviceConstants
+
+
+ DirectInput\DeviceConstants
+
+
+ DirectInput\DeviceConstants
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\DeviceInfo
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\ActionMapping
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect
+
+
+ DirectInput\Effect\TypeSpecificParameters
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Forces
+
+
+ DirectInput\Effect\Conditions
+
+
+ DirectInput\Effect\Conditions
+
+
+
+
+
+ Base\Resources
+
+
+
+
+ Base\Resources
+
+
+ Base\Resources
+
+
+
+
+
\ No newline at end of file
Index: source/stdafx.h
===================================================================
--- source/stdafx.h (revision 1628)
+++ source/stdafx.h (working copy)
@@ -29,9 +29,10 @@
#include
#include
+//#include
+/*
#include
#include
-#include
#include
#include
#include
@@ -40,20 +41,21 @@
#include
#include
#include
-#include
-#include
-#include
-#include
+*/
+//#include
+//#include
+//#include
+//#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+//#include
+//#include
+//#include
+//#include
+//#include
+//#include
+//#include
-#include
+//#include
#include
#include
Index: source/directinput/DeviceDI.cpp
===================================================================
--- source/directinput/DeviceDI.cpp (revision 1628)
+++ source/directinput/DeviceDI.cpp (working copy)
@@ -89,6 +89,8 @@
{
HRESULT hr = InternalPointer->RunControlPanel( NULL, 0 );
return RECORD_DINPUT( hr );
+
+
}
Result Device::RunControlPanel( Control^ parent )
Index: source/Utilities.cpp
===================================================================
--- source/Utilities.cpp (revision 1628)
+++ source/Utilities.cpp (working copy)
@@ -23,7 +23,7 @@
#include "DataStream.h"
#include "Utilities.h"
-#include "multimedia/WaveStream.h"
+//#include "multimedia/WaveStream.h"
#include "SlimDXException.h"
@@ -32,7 +32,7 @@
using namespace System::IO;
using namespace System::Reflection;
using namespace System::Globalization;
-using namespace SlimDX::Multimedia;
+//using namespace SlimDX::Multimedia;
namespace SlimDX
{
@@ -287,14 +287,14 @@
{
return ms->GetBuffer();
}*/
-
+ /*
WaveStream^ ws = dynamic_cast( stream );
if( ws != nullptr && dataStream != NULL && ws->InternalMemory != nullptr )
{
*dataStream = ws->InternalMemory;
return nullptr;
}
-
+ */
array^ buffer = gcnew array( readLength );
int bytesRead = 0;
while( bytesRead < readLength )
@@ -357,7 +357,7 @@
return true;
}
-
+/*
String^ Utilities::BufferToString( ID3DXBuffer *buffer )
{
if( buffer != NULL )
@@ -383,7 +383,7 @@
else
return String::Empty;
}
-
+*/
void Utilities::FreeNativeString( LPCSTR string )
{
if( string == NULL )
Index: source/multimedia/Enums.h
===================================================================
--- source/multimedia/Enums.h (revision 1628)
+++ source/multimedia/Enums.h (working copy)
@@ -924,7 +924,7 @@
///
Msr = 0x8E
};
-
+/*
///
/// Specifies possible speaker combinations for audio devices.
///
@@ -1100,5 +1100,6 @@
Extensible = WAVE_FORMAT_EXTENSIBLE,
};
#pragma warning(default: 4369)
+*/
}
}
\ No newline at end of file
Index: source/Utilities.h
===================================================================
--- source/Utilities.h (revision 1628)
+++ source/Utilities.h (working copy)
@@ -56,10 +56,10 @@
static System::Drawing::Rectangle ConvertRect(RECT rect);
static void ConvertRect(System::Drawing::Rectangle& source, RECT& dest);
-
+/*
static System::String^ BlobToString( ID3D10Blob *blob );
static System::String^ BufferToString( ID3DXBuffer *buffer );
-
+*/
static array^ ReadStream( System::IO::Stream^ stream, DataStream^* dataStream );
static array^ ReadStream( System::IO::Stream^ stream, int% readLength, DataStream^* dataStream );
Index: source/AssemblyInfo.cpp
===================================================================
--- source/AssemblyInfo.cpp (revision 1628)
+++ source/AssemblyInfo.cpp (working copy)
@@ -33,11 +33,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
-[assembly:AssemblyTitleAttribute("SlimDX")];
-[assembly:AssemblyDescriptionAttribute("Provides a managed wrapper around Microsoft DirectX.")];
+[assembly:AssemblyTitleAttribute("SlimDX.DirectInput")];
+[assembly:AssemblyDescriptionAttribute("Provides a managed wrapper around Microsoft DirectX (special build containing only DirectInput)")];
[assembly:AssemblyConfigurationAttribute("")];
[assembly:AssemblyCompanyAttribute("SlimDX Group")];
-[assembly:AssemblyProductAttribute("SlimDX")];
+[assembly:AssemblyProductAttribute("SlimDX.DirectInput")];
[assembly:AssemblyCopyrightAttribute("Copyright © 2007-2010 SlimDX Group")];
[assembly:AssemblyTrademarkAttribute("")];
[assembly:AssemblyCultureAttribute("")];
@@ -53,11 +53,7 @@
// You can specify all the value or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-#if _MSC_VER < 1600
[assembly:AssemblyVersionAttribute("2.0.10.43")];
-#else
-[assembly:AssemblyVersionAttribute("4.0.10.43")];
-#endif
[assembly:ComVisible(false)];