Revision: 2207
Author: mike.popoloski
Date: Sat Sep 15 11:39:05 2012
Log: Fixed text encoding issue in XFile parsing. Resolves issue 883.
http://code.google.com/p/slimdx/source/detail?r=2207
Modified:
/trunk/build/ReleaseNotes.txt
/trunk/source/direct3d9/XFile.cpp
=======================================
--- /trunk/build/ReleaseNotes.txt Sat Sep 15 11:24:14 2012
+++ /trunk/build/ReleaseNotes.txt Sat Sep 15 11:39:05 2012
@@ -14,6 +14,7 @@
Direct3D 9
* Fixed a bug in KeyframedAnimationSet.RegisterAnimationKeys that caused
invalid values to be set.
* Fixed the DeviceEx.FromPointer method.
+ * Fixed text encoding issue in XFile parsing.
Direct3D 10
* Added missing StateBlockMask constructor.
=======================================
--- /trunk/source/direct3d9/XFile.cpp Sat Jan 28 10:03:11 2012
+++ /trunk/source/direct3d9/XFile.cpp Sat Sep 15 11:39:05 2012
@@ -56,7 +56,7 @@
XFileEnumerationObject^ XFile::CreateEnumerationObject( String^ fileName,
CharSet charSet )
{
ID3DXFileEnumObject *result;
- array<unsigned char>^ nameBytes =
System::Text::ASCIIEncoding::ASCII->GetBytes( fileName );
+ array<unsigned char>^ nameBytes =
System::Text::Encoding::Unicode->GetBytes( fileName );
pin_ptr<unsigned char> pinnedName = &nameBytes[0];
DWORD flag;