Fix addHLShaderMaterialFromFiles to properly reset the file when being used...

Fix addHLShaderMaterialFromFiles to properly reset the file when being used twice, found by Kriolyth. Fixed affinityMask type, found by Kosuha.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1305 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CNullDriver.cpp

@@ -1644,6 +1644,9 @@ s32 CNullDriver::addHighLevelShaderMaterialFromFiles(
 		const long size = pixelShaderProgram->getSize();
 		if (size)
 		{
+			// if both handles are the same we must reset the file
+			if (pixelShaderProgram==vertexShaderProgram)
+				pixelShaderProgram->seek(0);
 			ps = new c8[size+1];
 			pixelShaderProgram->read(ps, size);
 			ps[size] = 0;

source/Irrlicht/os.cpp

@@ -100,7 +100,7 @@ namespace os
 #if !defined(_WIN32_WCE)
 			// Avoid potential timing inaccuracies across multiple cores by 
 			// temporarily setting the affinity of this process to one core.
-			DWORD affinityMask;
+			DWORD_PTR affinityMask;
 			if(MultiCore)
 				affinityMask = SetThreadAffinityMask(GetCurrentThread(), 1); 
 #endif