diff --git a/src/Client/ControlSocket.cpp b/src/Client/ControlSocket.cpp
index 753807a..47d9523 100644
--- a/src/Client/ControlSocket.cpp
+++ b/src/Client/ControlSocket.cpp
@@ -13,7 +13,7 @@ ControlSocket::ControlSocket(SocketHandler& h) : TcpSocket(h)
 void ControlSocket::OnAccept(void)
 {
     logdetail("ControlSocket: Incoming connection from %s:%u [host:%s]",GetRemoteAddress().c_str(),GetRemotePort(),GetRemoteHostname().c_str());
-   
+
     // must perform some crappy ptr conversion here, doesnt want to typecast SocketHandler -> ControlSocketHandler directly
     SocketHandler& hnd = Handler();
     ControlSocketHandler *chnd = static_cast<ControlSocketHandler*>(&hnd);
@@ -33,7 +33,7 @@ void ControlSocket::OnAccept(void)
     if(_instance->GetConf()->rmcontrolpass.size())
     {
         SendTelnetText("Authentication?");
-    } 
+    }
 
     _ok = true;
 }
diff --git a/src/Client/DefScript/DefScript.cpp b/src/Client/DefScript/DefScript.cpp
index 5e14c4a..0785350 100644
--- a/src/Client/DefScript/DefScript.cpp
+++ b/src/Client/DefScript/DefScript.cpp
@@ -280,7 +280,7 @@ bool DefScriptPackage::LoadScriptFromFile(std::string fn){
         //    line.erase(line.length()-1);
 		if(line.empty())
 			continue;
-		if(line.at(0)=='/' && line.at(1)=='/') 
+		if(line.at(0)=='/' && line.at(1)=='/')
 			continue; // line is comment, proceed with next line
 
         if(line_strip)
@@ -315,7 +315,7 @@ bool DefScriptPackage::LoadScriptFromFile(std::string fn){
             commented = false;
             continue;
         }
-        
+
         // commented lines will not be loaded nor have any #-tags evaluated (except the one above!)
         if(commented)
             continue;
@@ -582,7 +582,7 @@ DefReturnResult DefScriptPackage::RunScript(std::string name, CmdSet *pSet,std::
     std::string line;
 
     for(unsigned int i=0;i<sc->GetLines();i++)
-    {   
+    {
         line=sc->GetLine(i);
         if(line.empty() || line[0] == '#') // skip markers and preload statements if not removed before
             continue;
@@ -765,8 +765,8 @@ void DefScriptPackage::SplitLine(CmdSet& Set,std::string line)
                 curParam++;
             }
             tempLine.clear();
-            
-        } 
+
+        }
         else if( line[i]==' ' && !bracketsOpen)
         {
             if(!cmdDefined){
@@ -777,8 +777,8 @@ void DefScriptPackage::SplitLine(CmdSet& Set,std::string line)
             }
 
             Set.defaultarg=line.substr(i+1,line.length()-i);
-            break;            
-            
+            break;
+
         }
         else if(line[i]=='\\')
         {
@@ -836,7 +836,7 @@ std::string DefScriptPackage::RemoveBracketsFromString(std::string t)
                     t.erase(ob,blen);
                     t.insert(ob,retStr);
                     i=ob-1;
-                    
+
                 }
             isVar=false;
             }
@@ -882,7 +882,7 @@ DefXChgResult DefScriptPackage::ReplaceVars(std::string str, CmdSet *pSet, unsig
         bracketsOpen=0, // amount of brackets opened
         bLen=0; // the lenth of the string in brackets, e.g. ${abc} == 3
 
-    unsigned char 
+    unsigned char
         nextVar=DEFSCRIPT_NONE; // '$' or '?'
     bool
         hasChanged=false, // additional helper. once true, xchg.result will be true later also
@@ -1071,7 +1071,7 @@ std::string DefScriptPackage::_NormalizeVarName(std::string vn, std::string sn)
             break;
     }
 
-    if( (!global) && (vn[0]!='@') )  
+    if( (!global) && (vn[0]!='@') )
         vn=sn+"::"+vn;
 
     return vn;
@@ -1099,7 +1099,7 @@ DefReturnResult DefScriptPackage::Interpret(CmdSet& Set)
         {
             if(_functable[i].escape) // if we are going to use a C++ function, unescape the whole set, if supposed to do so.
                 UnescapeSet(Set);    // it will not have any bad side effects, we leave the func within this block!
-            
+
             result=(this->*(_functable[i].func))(Set);
             if(_functable[i].escape)
                 result.ret = EscapeString(result.ret); // and since we are returning a string into the engine, escape it again, if set.
@@ -1118,7 +1118,7 @@ DefReturnResult DefScriptPackage::Interpret(CmdSet& Set)
 	result=RunScript(Set.cmd, &Set);
     if((!result.ok) /*&& Script[Set.cmd]->GetDebug()*/)
         PRINT_ERROR("Could not execute script command '%s'",Set.cmd.c_str());
-    
+
 
     return result;
 }
@@ -1148,7 +1148,7 @@ std::string DefScriptPackage::SecureString(std::string s)
     return out;
 }
 
-// escapes whole string, which can no longer be parsed & interpreted 
+// escapes whole string, which can no longer be parsed & interpreted
 std::string DefScriptPackage::EscapeString(std::string s)
 {
     std::string out;
diff --git a/src/Client/DefScript/DefScript.h b/src/Client/DefScript/DefScript.h
index d22ee94..107dda8 100644
--- a/src/Client/DefScript/DefScript.h
+++ b/src/Client/DefScript/DefScript.h
@@ -45,7 +45,7 @@ struct DefXChgResult
     bool changed;
     std::string str;
     DefReturnResult result;
-}; 
+};
 
 typedef std::map<unsigned int,std::string> _CmdSetArgMap;
 
@@ -103,7 +103,7 @@ private:
 	std::string scriptname;
 	unsigned char permission;
     bool debugmode;
-    
+
     DefScriptPackage *_parent;   	
 };
 
@@ -142,7 +142,7 @@ public:
     std::string EscapeString(std::string);
     std::string UnescapeString(std::string);
     std::string GetUnescapedVar(std::string);
-    
+
     std::string scPath;
 
     // Own executor functions
diff --git a/src/Client/DefScript/DefScriptBBFunctions.cpp b/src/Client/DefScript/DefScriptBBFunctions.cpp
index fab405c..562137f 100644
--- a/src/Client/DefScript/DefScriptBBFunctions.cpp
+++ b/src/Client/DefScript/DefScriptBBFunctions.cpp
@@ -46,7 +46,7 @@ DefReturnResult DefScriptPackage::func_bbappend(CmdSet& Set)
 
     std::string dtype = DefScriptTools::stringToLower(Set.arg[1]);
 
-    if (dtype == "string") 
+    if (dtype == "string")
     {
         *bb << Set.defaultarg;
         return true;
diff --git a/src/Client/DefScript/DefScriptFunctions.cpp b/src/Client/DefScript/DefScriptFunctions.cpp
index e49b515..9f61f92 100644
--- a/src/Client/DefScript/DefScriptFunctions.cpp
+++ b/src/Client/DefScript/DefScriptFunctions.cpp
@@ -53,7 +53,7 @@ DefReturnResult DefScriptPackage::func_reloaddef(CmdSet& Set){
     }
     if(ppos==std::string::npos || ppos < slashpos) // even if there was neither / nor . they will be equal
         fn+=".def";
-    
+
     result=LoadScriptFromFile(fn);
 
     r.ret=fn;
@@ -127,7 +127,7 @@ DefReturnResult DefScriptPackage::func_set(CmdSet& Set)
 
     variables.Set(vname,vval);
     r.ret=vval;
-    
+
     DefScript *sc = GetScript(Set.myname);
     if(sc && sc->GetDebug())
         printf("VAR: %s = '%s'\n",vname.c_str(),vval.c_str());
@@ -523,7 +523,7 @@ DefReturnResult DefScriptPackage::func_strfind(CmdSet& Set)
     unsigned int pos = Set.defaultarg.find(Set.arg[0],(unsigned int)toNumber(Set.arg[1]));
     if(pos == std::string::npos)
         return "";
-    return toString((uint64)pos);    
+    return toString((uint64)pos);
 }
 
 DefReturnResult DefScriptPackage::func_scriptexists(CmdSet& Set)
diff --git a/src/Client/DefScript/DefScriptListFunctions.cpp b/src/Client/DefScript/DefScriptListFunctions.cpp
index a12c3ed..e267b32 100644
--- a/src/Client/DefScript/DefScriptListFunctions.cpp
+++ b/src/Client/DefScript/DefScriptListFunctions.cpp
@@ -261,7 +261,7 @@ DefReturnResult DefScriptPackage::func_lerase(CmdSet& Set)
     unsigned int pos = (unsigned int)toNumber(Set.defaultarg);
     if(pos > l->size()) // if the list is too short to erase at that pos...
         return ""; // ... return nothing
- 
+
     DefList::iterator it = l->begin();
     advance(it,pos);
     r = *it;
diff --git a/src/Client/DefScriptInterface.cpp b/src/Client/DefScriptInterface.cpp
index 0db7901..1018070 100644
--- a/src/Client/DefScriptInterface.cpp
+++ b/src/Client/DefScriptInterface.cpp
@@ -57,7 +57,7 @@ void DefScriptPackage::_InitDefScriptInterface(void)
     AddFunc("getobjectdist",&DefScriptPackage::SCGetObjectDistance);
     AddFunc("getobjectpos",&DefScriptPackage::SCGetPos);
     AddFunc("switchopcodehandler",&DefScriptPackage::SCSwitchOpcodeHandler);
-    AddFunc("opcodedisabled",&DefScriptPackage::SCOpcodeDisabled);    
+    AddFunc("opcodedisabled",&DefScriptPackage::SCOpcodeDisabled);
     AddFunc("spoofworldpacket",&DefScriptPackage::SCSpoofWorldPacket);
     AddFunc("loaddb",&DefScriptPackage::SCLoadDB);
     AddFunc("adddbpath",&DefScriptPackage::SCAddDBPath);
@@ -404,7 +404,7 @@ DefReturnResult DefScriptPackage::SCGetScpValue(CmdSet& Set)
                 {
                     return DefScriptTools::toString(db->GetInt(keyid,(char*)entry.c_str()));
                 }
-                case SCP_TYPE_FLOAT: 
+                case SCP_TYPE_FLOAT:
                 {
                     return DefScriptTools::toString(db->GetFloat(keyid,(char*)entry.c_str()));
                 }
diff --git a/src/Client/GUI/DrawObjMgr.cpp b/src/Client/GUI/DrawObjMgr.cpp
index e79a5d8..4ec3c8b 100644
--- a/src/Client/GUI/DrawObjMgr.cpp
+++ b/src/Client/GUI/DrawObjMgr.cpp
@@ -75,7 +75,7 @@ void DrawObjMgr::Update(void)
         uint64 guid = _del.next();
         if(_storage.find(guid) != _storage.end())
         {
-            
+
             DrawObject *o = _storage[guid];
             DEBUG(logdebug("DrawObjMgr: removing DrawObj 0x%X guid "I64FMT" from main storage",o,guid));
             _storage.erase(guid);
diff --git a/src/Client/GUI/DrawObject.cpp b/src/Client/GUI/DrawObject.cpp
index 7bff563..d97ffbc 100644
--- a/src/Client/GUI/DrawObject.cpp
+++ b/src/Client/GUI/DrawObject.cpp
@@ -69,10 +69,10 @@ void DrawObject::_Init(void)
             MemoryDataHolder::MakeModelFilename(buf,(cmd ? cmd->GetString(modelid,"mpqfilename") : ""));
             modelfilename = buf;
             logdebug("Unit %s",cmd->GetString(modelid,"mpqfilename"));
-//             if (cdi && strcmp(cdi->GetString(displayid,"name1"), "") != 0) 
+//             if (cdi && strcmp(cdi->GetString(displayid,"name1"), "") != 0)
 //                 texturename = std::string("data/texture/") + cdi->GetString(displayid,"name1");
             opacity = cdi && displayid ? cdi->GetUint32(displayid,"opacity") : 255;
-        } 
+        }
         else if (_obj->IsCorpse())
         {
             uint8 race = (_obj->GetUInt32Value(CORPSE_FIELD_BYTES_1) >> 8)&0xFF;
@@ -92,12 +92,12 @@ void DrawObject::_Init(void)
             modelfilename = buf;
             logdebug("Corpse %s",buf);
 
-        
+
         }
         else if (_obj->IsGameObject())
         {
             GameobjectTemplate* gotempl = _instance->GetWSession()->objmgr.GetGOTemplate(_obj->GetEntry());
-            while (!gotempl) 
+            while (!gotempl)
             {
                 ZThread::Thread::sleep(10);
                 gotempl = _instance->GetWSession()->objmgr.GetGOTemplate(_obj->GetEntry());
@@ -127,7 +127,7 @@ void DrawObject::_Init(void)
                         texturename = buf;
                     }
                 }
-                
+
                 DEBUG(logdebug("GAMEOBJECT: %u - %u", _obj->GetEntry(), displayid));
             } else {
                 DEBUG(logdebug("GAMEOBJECT UNKNOWN: %u", _obj->GetEntry()));
@@ -146,7 +146,7 @@ void DrawObject::_Init(void)
         {
             node = _smgr->addAnimatedMeshSceneNode(mesh);
             scene::IAnimatedMeshSceneNode* aninode = (scene::IAnimatedMeshSceneNode*)node;
-            
+
             aninode->setAnimationSpeed(1000);
             aninode->setM2Animation(0);
             //video::ITexture *tex = _device->getVideoDriver()->getTexture("data/misc/square.jpg");
@@ -163,7 +163,7 @@ void DrawObject::_Init(void)
             if (!texturefile)
                 {
                     logerror("DrawObject: texture file not found: %s", texturename.c_str());
-                }   
+                }
 
             node->setMaterialTexture(0, _device->getVideoDriver()->getTexture(texturefile));
         }
diff --git a/src/Client/GUI/MCamera.h b/src/Client/GUI/MCamera.h
index f4f0523..a8a82fc 100644
--- a/src/Client/GUI/MCamera.h
+++ b/src/Client/GUI/MCamera.h
@@ -22,7 +22,7 @@ class MCameraFPS
     f32 rotationX;
     f32 rotationY;
     core::vector3df direction;
-    
+
 public:
     MCameraFPS(scene::ISceneManager* smgr)
     {
@@ -31,7 +31,7 @@ public:
         rotationY = 0.0f;
         direction = core::vector3df(0,0,1);
     }
-    
+
     ~MCameraFPS(){}
 
     void update(void)
@@ -71,23 +71,23 @@ public:
         camera->updateAbsolutePosition();
     }
 
-    
+
     void turnRight(f32 i)
     {
         rotationY += i;
         if(rotationY>=360)rotationY-=360;
         if(rotationY<0)rotationY+=360;
-        
+
         direction = core::vector3df(0,0,1);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
         matrix.rotateVect(direction);
-        
+
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void turnLeft(f32 i)
     {
         rotationY -= i;
@@ -103,169 +103,169 @@ public:
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void turnUp(f32 i)
     {
         rotationX += i;
         if(rotationX>=360)rotationX-=360;
         if(rotationX<0)rotationX+=360;
-        
+
         direction = core::vector3df(0,0,1);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
         matrix.rotateVect(direction);
-        
+
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void turnDown(f32 i)
     {
         rotationX -= i;
         if(rotationX>=360)rotationX-=360;
         if(rotationX<0)rotationX+=360;
-        
+
         direction = core::vector3df(0,0,1);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
         matrix.rotateVect(direction);
-        
+
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void moveForward(f32 i)
     {
         core::vector3df step = core::vector3df(0,0,i);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
         matrix.rotateVect(step);
-        
+
         camera->setPosition(camera->getPosition() + step);
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void moveBack(f32 i)
     {
         core::vector3df step = core::vector3df(0,0,-i);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
         matrix.rotateVect(step);
-        
+
         camera->setPosition(camera->getPosition() + step);
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void moveRight(f32 i)
     {
         core::vector3df step = core::vector3df(i,0,0);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
         matrix.rotateVect(step);
-        
+
         camera->setPosition(camera->getPosition() + step);
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void moveLeft(f32 i)
     {
         core::vector3df step = core::vector3df(-i,0,0);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
         matrix.rotateVect(step);
-        
+
         camera->setPosition(camera->getPosition() + step);
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void setHeight(f32 i)
     {
         camera->setPosition(core::vector3df(camera->getPosition().X, i, camera->getPosition().Z));
         camera->setTarget(camera->getPosition() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
     void setPosition(core::vector3df pos)
     {
         camera->setPosition(pos);
         camera->updateAbsolutePosition();
     }
-    
+
     core::vector3df getPosition()
     {
         return camera->getPosition();
     }
-    
+
     core::vector3df getDirection()
     {
         return direction;
     }
-    
+
     core::vector3df getTarget()
     {
         return camera->getTarget();
     }
-    
+
     f32 getHeading()
     {
         return rotationY;
     }
-    
+
     f32 getPitch()
     {
         return rotationX;
     }
-    
+
     f32 getFarValue()
     {
         return camera->getFarValue();
     }
-    
+
     void setFarValue(f32 f)
     {
         camera->setFarValue(f);
     }
-    
+
     f32 getNearValue()
     {
         return camera->getNearValue();
     }
-    
+
     void setNearValue(f32 n)
     {
         camera->setNearValue(n);
     }
-    
+
     f32 getFOV()
     {
         return camera->getFOV();
     }
-    
+
     void setFOV(f32 v)
     {
         camera->setFOV(v);
     }
-    
+
     f32 getAspectRatio()
     {
         return camera->getAspectRatio();
     }
-    
+
     void setAspectRatio(f32 a)
     {
         camera->setAspectRatio(a);
     }
-    
+
     scene::ISceneNode* getNode()
     {
         return camera;
@@ -281,19 +281,19 @@ class MCameraOrbit
     f32 rotationX;
     f32 rotationY;
     f32 distance;
-    
+
     void update()
     {
         core::vector3df direction = core::vector3df(0,0,distance);
-        
+
         core::matrix4 matrix;
         matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
         matrix.rotateVect(direction);
-        
+
         camera->setPosition(camera->getTarget() + direction);
         camera->updateAbsolutePosition();
     }
-    
+
 public:
     MCameraOrbit(scene::ISceneManager* smgr)
     {
@@ -304,9 +304,9 @@ public:
         camera->setTarget(core::vector3df(0,0,0));
         update();
     }
-    
+
     ~MCameraOrbit(){}
-    
+
     void turnRight(f32 i)
     {
         rotationY += i;
@@ -314,7 +314,7 @@ public:
         if(rotationY<0)rotationY+=360;
         update();
     }
-    
+
     void turnLeft(f32 i)
     {
         rotationY -= i;
@@ -322,7 +322,7 @@ public:
         if(rotationY<0)rotationY+=360;
         update();
     }
-    
+
     void turnUp(f32 i)
     {
         rotationX += i;
@@ -330,7 +330,7 @@ public:
         if(rotationX<0)rotationX+=360;
         update();
     }
-    
+
     void turnDown(f32 i)
     {
         rotationX -= i;
@@ -338,90 +338,90 @@ public:
         if(rotationX<0)rotationX+=360;
         update();
     }
-    
+
     core::vector3df getTarget()
     {
         return camera->getTarget();
     }
-    
+
     void setTarget(core::vector3df target)
     {
         camera->setTarget(target);
         update();
     }
-    
+
     core::vector3df getPosition()
     {
         return camera->getPosition();
     }
-    
+
     f32 getDistance()
     {
         return distance;
     }
-    
+
     void setDistance(f32 i)
     {
         distance = i;
         update();
     }
-    
+
     void adjustDistance(f32 i)
     {
         distance += i;
         update();
     }
-    
+
     f32 getHeading()
     {
         return rotationY;
     }
-    
+
     f32 getPitch()
     {
         return rotationX;
     }
-    
+
     f32 getFarValue()
     {
         return camera->getFarValue();
     }
-    
+
     void setFarValue(f32 f)
     {
         camera->setFarValue(f);
     }
-    
+
     f32 getNearValue()
     {
         return camera->getNearValue();
     }
-    
+
     void setNearValue(f32 n)
     {
         camera->setNearValue(n);
     }
-    
+
     f32 getFOV()
     {
         return camera->getFOV();
     }
-    
+
     void setFOV(f32 v)
     {
         camera->setFOV(v);
     }
-    
+
     f32 getAspectRatio()
     {
         return camera->getAspectRatio();
     }
-    
+
     void setAspectRatio(f32 a)
     {
         camera->setAspectRatio(a);
     }
-    
+
     scene::ISceneNode* getNode()
     {
         return camera;
diff --git a/src/Client/GUI/SceneGuiStart.cpp b/src/Client/GUI/SceneGuiStart.cpp
index f2cd9b0..99ace16 100644
--- a/src/Client/GUI/SceneGuiStart.cpp
+++ b/src/Client/GUI/SceneGuiStart.cpp
@@ -6,7 +6,7 @@
 
 SceneGuiStart::SceneGuiStart(PseuGUI *gui) : Scene(gui)
 {
-    
+
     irrlogo = guienv->addImage(driver->getTexture("data/misc/irrlichtlogo.png"), core::position2d<s32>(5,5));
     const char *fn;
     switch(gui->_driverType)
diff --git a/src/Client/GUI/SceneWorld.cpp b/src/Client/GUI/SceneWorld.cpp
index e056ab4..92637ae 100644
--- a/src/Client/GUI/SceneWorld.cpp
+++ b/src/Client/GUI/SceneWorld.cpp
@@ -463,7 +463,7 @@ void SceneWorld::OnUpdate(s32 timediff)
 
     str += driver->getFPS();
     str += L" FPS";
-    
+
     debugText->setText(str.c_str());
 
 
@@ -642,7 +642,7 @@ void SceneWorld::UpdateTerrain(void)
                               {
                                   logerror("Error! modelfile not found: %s", filename.c_str());
                                   continue;
-                              }    
+                              }
                           mesh = smgr->getMesh(modelfile);
                           modelfile->drop();
                         }
@@ -706,7 +706,7 @@ void SceneWorld::UpdateTerrain(void)
                         {
                             filename= wmo->model.c_str();
                         }
-                        
+
                         scene::IAnimatedMesh *mesh;
                         if(!smgr->getMeshCache()->isMeshLoaded(filename.c_str()))
                         {
@@ -715,7 +715,7 @@ void SceneWorld::UpdateTerrain(void)
                               {
                                   logerror("Error! modelfile not found: %s", filename.c_str());
                                   continue;
-                              }    
+                              }
                           mesh = smgr->getMesh(modelfile);
                           modelfile->drop();
                         }
diff --git a/src/Client/GUI/decoder/mpaudectab.h b/src/Client/GUI/decoder/mpaudectab.h
index 7db90e1..9fea40a 100644
--- a/src/Client/GUI/decoder/mpaudectab.h
+++ b/src/Client/GUI/decoder/mpaudectab.h
@@ -65,137 +65,137 @@ static const int quant_steps[17] = {
 
 /* we use a negative value if grouped */
 static const int quant_bits[17] = {
-    -5,  -7,  3, -10, 4, 
+    -5,  -7,  3, -10, 4,
      5,  6,  7,  8,  9,
     10, 11, 12, 13, 14,
-    15, 16 
+    15, 16
 };
 
 /* encoding tables which give the quantization index. Note how it is
    possible to store them efficiently ! */
 static const unsigned char alloc_table_0[] = {
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
 };
 
 static const unsigned char alloc_table_1[] = {
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 3,  0,  1,  2,  3,  4,  5, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
- 2,  0,  1, 16, 
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  2,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 3,  0,  1,  2,  3,  4,  5, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
+ 2,  0,  1, 16,
 };
 
 static const unsigned char alloc_table_2[] = {
- 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 
- 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
+ 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+ 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
 };
 
 static const unsigned char alloc_table_3[] = {
- 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 
- 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
+ 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+ 4,  0,  1,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
 };
 
 static const unsigned char alloc_table_4[] = {
  4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 
- 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 3,  0,  1,  3,  4,  5,  6,  7, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
- 2,  0,  1,  3, 
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+ 4,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 3,  0,  1,  3,  4,  5,  6,  7,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
+ 2,  0,  1,  3,
 };
 
-static const unsigned char *alloc_tables[5] = 
+static const unsigned char *alloc_tables[5] =
 { alloc_table_0, alloc_table_1, alloc_table_2, alloc_table_3, alloc_table_4, };
 
 /*******************************************************/
@@ -212,7 +212,7 @@ static const uint8_t lsf_nsf_table[6][3][4] = {
     { {  6,  5,  5, 5 }, {  9,  9,  9, 9 }, {  6,  9,  9, 9 } },
     { {  6,  5,  7, 3 }, {  9,  9, 12, 6 }, {  6,  9, 12, 6 } },
     { { 11, 10,  0, 0 }, { 18, 18,  0, 0 }, { 15, 18,  0, 0 } },
-    { {  7,  7,  7, 0 }, { 12, 12, 12, 0 }, {  6, 15, 12, 0 } }, 
+    { {  7,  7,  7, 0 }, { 12, 12, 12, 0 }, {  6, 15, 12, 0 } },
     { {  6,  6,  6, 3 }, { 12,  9,  9, 6 }, {  6, 12,  9, 6 } },
     { {  8,  8,  5, 0 }, { 15, 12,  9, 0 }, {  6, 18,  9, 0 } },
 };
diff --git a/src/Client/GUI/decoder/mpegaudio.h b/src/Client/GUI/decoder/mpegaudio.h
index 51f0291..b99dda2 100644
--- a/src/Client/GUI/decoder/mpegaudio.h
+++ b/src/Client/GUI/decoder/mpegaudio.h
@@ -2,7 +2,7 @@
    stand-alone mpaudec library.  Based on mpegaudio.h from libavcodec. */
 
 /* max frame size, in samples */
-#define MPA_FRAME_SIZE 1152 
+#define MPA_FRAME_SIZE 1152
 
 /* max compressed frame size */
 #define MPA_MAX_CODED_FRAME_SIZE 1792
diff --git a/src/Client/GUI/irrKlangSceneNode.cpp b/src/Client/GUI/irrKlangSceneNode.cpp
index d9b25bb..ba10a18 100644
--- a/src/Client/GUI/irrKlangSceneNode.cpp
+++ b/src/Client/GUI/irrKlangSceneNode.cpp
@@ -10,7 +10,7 @@ const char* irrKlangSceneNodeTypeName = "irrKlangSceneNode";
 
 
 
-CIrrKlangSceneNode::CIrrKlangSceneNode(irrklang::ISoundEngine* soundEngine, 
+CIrrKlangSceneNode::CIrrKlangSceneNode(irrklang::ISoundEngine* soundEngine,
 									   scene::ISceneNode* parent,
 									   scene::ISceneManager* mgr, s32 id)
 	: scene::ISceneNode(parent, mgr, id), SoundEngine(soundEngine)
@@ -188,7 +188,7 @@ void CIrrKlangSceneNode::render()
 
 	video::IVideoDriver* driver = SceneManager->getVideoDriver();
 	driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
-      
+
 	scene::ICameraSceneNode* camera = SceneManager->getActiveCamera();
 	if (camera)
 	{
@@ -288,7 +288,7 @@ void CIrrKlangSceneNode::stop()
 }
 
 
-//! Sets the play mode to 'play once', a sound file is played once, and 
+//! Sets the play mode to 'play once', a sound file is played once, and
 //! the scene node deletes itself then, if wished.
 void CIrrKlangSceneNode::setPlayOnceMode(bool deleteWhenFinished)
 {
@@ -384,7 +384,7 @@ ISceneNode* CIrrKlangSceneNodeFactory::addSceneNode(ESCENE_NODE_TYPE type, IScen
 	{
 		CIrrKlangSceneNode* node = new CIrrKlangSceneNode(SoundEngine, parent, Manager, -1);
 		node->drop();
-		return node; 
+		return node;
 	}
 
 	return 0;
@@ -415,7 +415,7 @@ ESCENE_NODE_TYPE CIrrKlangSceneNodeFactory::getCreateableSceneNodeType(u32 idx)
 }
 
 
-//! returns type name of a createable scene node type 
+//! returns type name of a createable scene node type
 const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(u32 idx) const
 {
 	if (idx==0)
@@ -425,7 +425,7 @@ const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(u32 idx) con
 }
 
 
-//! returns type name of a createable scene node type 
+//! returns type name of a createable scene node type
 const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(ESCENE_NODE_TYPE type) const
 {
 	if (type == IRRKLANG_SCENE_NODE_ID)
diff --git a/src/Client/GUI/irrKlangSceneNode.h b/src/Client/GUI/irrKlangSceneNode.h
index b306fe2..3e66f47 100644
--- a/src/Client/GUI/irrKlangSceneNode.h
+++ b/src/Client/GUI/irrKlangSceneNode.h
@@ -5,7 +5,7 @@
 // play back sounds and music in 3D. Just place it into 3d space and set
 // what sound it should play.
 // It uses the free irrKlang sound engine (http://www.ambiera.com/irrklang).
-// This file also contains a sound engine factory, CIrrKlangSceneNodeFactory. Just 
+// This file also contains a sound engine factory, CIrrKlangSceneNodeFactory. Just
 // register this factory in your scene manager, and you will be able to load and
 // save irrKlang scene nodes from and into .irr files:
 //
@@ -32,7 +32,7 @@ scene::ISceneManager* smgr = device->getSceneManager();
 
 // .. other code here
 
-CIrrKlangSceneNode* soundNode = 
+CIrrKlangSceneNode* soundNode =
   new CIrrKlangSceneNode(soundEngine, smgr->getRootSceneNode(), smgr, 666);
 
   soundNode->setSoundFilename("yourfile.wav");
@@ -40,7 +40,7 @@ CIrrKlangSceneNode* soundNode =
   soundNode->setRandomMode(1000, 5000); // plays sound multiple times with random interval
 
   // other modes would be:
-  // soundNode->setLoopingStreamMode() 
+  // soundNode->setLoopingStreamMode()
   // or
   // soundNode->setPlayOnceMode();
 
@@ -57,7 +57,7 @@ public:
 
 	// play modes:
 
-	//! Sets the play mode to 'play once', a sound file is played once, and 
+	//! Sets the play mode to 'play once', a sound file is played once, and
 	//! the scene node deletes itself then, if wished.
 	void setPlayOnceMode(bool deleteWhenFinished=false);
 
diff --git a/src/Client/PseuWoW.h b/src/Client/PseuWoW.h
index a7e0bc4..cb42b76 100644
--- a/src/Client/PseuWoW.h
+++ b/src/Client/PseuWoW.h
@@ -81,7 +81,7 @@ class PseuInstanceConf
     bool softquit;
     uint8 dataLoaderThreads;
     bool useMPQ;
-    
+
     // gui related
     bool enablegui;
     uint32 terrainsectors;
diff --git a/src/Client/Realm/RealmSession.cpp b/src/Client/Realm/RealmSession.cpp
index 4126093..f7ec966 100644
--- a/src/Client/Realm/RealmSession.cpp
+++ b/src/Client/Realm/RealmSession.cpp
@@ -276,7 +276,7 @@ void RealmSession::_HandleRealmList(ByteBuffer& pkt)
         {
           uint32 icon;
           pkt >> icon;
-          _realms[i].icon=icon;          
+          _realms[i].icon=icon;
           _realms[i].locked=0x00; //locked is specified in the RealmFlags
         }
         else
@@ -622,7 +622,7 @@ void RealmSession::_HandleLogonProof(ByteBuffer& pkt)
     {
       pkt.read((uint8*)&lp, sizeof(sAuthLogonProof_S));
     }
-      
+
     //printchex((char*)&lp, sizeof(sAuthLogonProof_S),true);
     if(!memcmp(lp.M2,this->_m2,20))
     {
diff --git a/src/Client/Realm/RealmSocket.cpp b/src/Client/Realm/RealmSocket.cpp
index 53b8270..fd7276b 100644
--- a/src/Client/Realm/RealmSocket.cpp
+++ b/src/Client/Realm/RealmSocket.cpp
@@ -93,4 +93,4 @@ uint32 RealmSocket::GetMyIP(void)
 {
     return GetRemoteIP4();
 }
-    
+
diff --git a/src/Client/SCPDatabase.cpp b/src/Client/SCPDatabase.cpp
index 996eebd..d8d2b77 100644
--- a/src/Client/SCPDatabase.cpp
+++ b/src/Client/SCPDatabase.cpp
@@ -125,7 +125,7 @@ uint32 SCPDatabase::GetFieldByStringValue(const char *entry, const char *val)
     std::map<std::string,SCPFieldDef>::iterator fi = _fielddefs.find(entry);
     if(fi == _fielddefs.end())
         return SCP_INVALID_INT;
-    
+
     uint32 field_id = _fielddefs[entry].id;
     return GetFieldByStringValue(field_id,val);
 }
@@ -696,7 +696,7 @@ void SCPDatabaseMgr::AddSearchPath(const char *path)
             return;
 #endif
     }
-        
+
     _paths.push_back(p);
 }
 
diff --git a/src/Client/World/CMSGConstructor.cpp b/src/Client/World/CMSGConstructor.cpp
index cfa0445..6e46f61 100644
--- a/src/Client/World/CMSGConstructor.cpp
+++ b/src/Client/World/CMSGConstructor.cpp
@@ -121,14 +121,14 @@ void WorldSession::SendCastSpell(uint32 spellid, bool nocheck)
     packet << (uint8)0; // unk
     packet << spellid;
     packet << (uint8)0; // unk
-    
+
     if(target && my->GetTarget() != GetGuid()) // self cast?
     {
         if(target->GetTypeId() == TYPEID_PLAYER || target->GetTypeId() == TYPEID_UNIT)
         {
             flags |= TARGET_FLAG_UNIT;
             temp << (uint8)0xFF << my->GetTarget(); // need to send packed guid?
-        }     
+        }
         if(target->GetTypeId() == TYPEID_OBJECT)
         {
             flags |= TARGET_FLAG_OBJECT;
diff --git a/src/Client/World/CacheHandler.h b/src/Client/World/CacheHandler.h
index d872868..5746812 100644
--- a/src/Client/World/CacheHandler.h
+++ b/src/Client/World/CacheHandler.h
@@ -1,7 +1,7 @@
 #ifndef _CACHEHANDLER_H
 #define _CACHEHANDLER_H
 
-typedef std::map<uint64,std::string> PlayerNameMap; 
+typedef std::map<uint64,std::string> PlayerNameMap;
 
 class PlayerNameCache
 {
diff --git a/src/Client/World/Item.cpp b/src/Client/World/Item.cpp
index d04cca6..6c1e4e5 100644
--- a/src/Client/World/Item.cpp
+++ b/src/Client/World/Item.cpp
@@ -109,7 +109,7 @@ void WorldSession::_HandleItemQuerySingleResponseOpcode(WorldPacket& recvPacket)
 		recvPacket >> proto->socketBonus;
 		recvPacket >> proto->GemProperties;
 		recvPacket >> proto->RequiredDisenchantSkill;
-		recvPacket >> proto->ArmorDamageModifier; 
+		recvPacket >> proto->ArmorDamageModifier;
         recvPacket >> proto->Duration;
         recvPacket >> proto->ItemLimitCategory;
         recvPacket >> proto->HolidayId;
diff --git a/src/Client/World/Item.h b/src/Client/World/Item.h
index 440d204..0cb61da 100644
--- a/src/Client/World/Item.h
+++ b/src/Client/World/Item.h
@@ -294,14 +294,14 @@ enum ITEM_SUBCLASS_TRADE_GOODS
     ITEM_SUBCLASS_PARTS             = 1,
     ITEM_SUBCLASS_EXPLOSIVES        = 2,
     ITEM_SUBCLASS_DEVICES           = 3,
-    ITEM_SUBCLASS_JEWELCRAFTING     = 4, 
-    ITEM_SUBCLASS_CLOTH             = 5, 
-    ITEM_SUBCLASS_LEATHER           = 6, 
-    ITEM_SUBCLASS_METAL_STONE       = 7, 
-    ITEM_SUBCLASS_MEAT              = 8, 
-    ITEM_SUBCLASS_HERB              = 9, 
-    ITEM_SUBCLASS_ELEMENTAZL        = 10, 
-    ITEM_SUBCLASS_TRADE_GOODS_OTHER = 11, 
+    ITEM_SUBCLASS_JEWELCRAFTING     = 4,
+    ITEM_SUBCLASS_CLOTH             = 5,
+    ITEM_SUBCLASS_LEATHER           = 6,
+    ITEM_SUBCLASS_METAL_STONE       = 7,
+    ITEM_SUBCLASS_MEAT              = 8,
+    ITEM_SUBCLASS_HERB              = 9,
+    ITEM_SUBCLASS_ELEMENTAZL        = 10,
+    ITEM_SUBCLASS_TRADE_GOODS_OTHER = 11,
     ITEM_SUBCLASS_ENCHANTING        = 12,
     ITEM_SUBCLASS_MATERIAL          = 13,
     ITEM_SUBCLASS_ARMOR_ENCHANTMENT = 14,
diff --git a/src/Client/World/MapMgr.cpp b/src/Client/World/MapMgr.cpp
index 31948f3..c4acead 100644
--- a/src/Client/World/MapMgr.cpp
+++ b/src/Client/World/MapMgr.cpp
@@ -13,7 +13,7 @@ char* MapMgr::MapID2Name(uint32 mid)
   }
   uint32 name_id = mapdb->GetFieldId("name_general");
   return mapdb->GetString(mid,name_id);
-  
+
 }
 
 
@@ -41,7 +41,7 @@ void MapMgr::Update(float x, float y, uint32 m)
         char buf[255];
         std::string mapname = MapID2Name(m);
         MemoryDataHolder::MakeWDTFilename(buf,m,mapname);
-        
+
         // Loading WDT
         MemoryDataHolder::MemoryDataResult mdr = MemoryDataHolder::GetFileBasic(buf);
         if(mdr.flags & MemoryDataHolder::MDH_FILE_OK && mdr.data.size)
@@ -98,7 +98,7 @@ void MapMgr::_LoadNearTiles(uint32 gx, uint32 gy, uint32 m)
 
 void MapMgr::_LoadTile(uint32 gx, uint32 gy, uint32 m)
 {
-    
+
     _mapsLoaded = false;
     std::string mapname = MapID2Name(m);
     logdebug("Mapname: %s",mapname.c_str());
diff --git a/src/Client/World/MovementInfo.h b/src/Client/World/MovementInfo.h
index cd9e665..e89ab8b 100644
--- a/src/Client/World/MovementInfo.h
+++ b/src/Client/World/MovementInfo.h
@@ -92,11 +92,11 @@ enum SplineFlags{
 struct MovementInfo
 {
     static uint8 _c; //Version switch helper
-    
+
     // Read/Write methods
     void Read(ByteBuffer &data);
     void Write(ByteBuffer &data) const;
-    
+
     // common
     uint32  flags;
     uint16  flags2;
diff --git a/src/Client/World/MovementMgr.cpp b/src/Client/World/MovementMgr.cpp
index e399c51..9694807 100644
--- a/src/Client/World/MovementMgr.cpp
+++ b/src/Client/World/MovementMgr.cpp
@@ -128,7 +128,7 @@ void MovementMgr::Update(bool sendDirect)
         else if(pos.o > 2 * M_PI)
             pos.o -= float(2 * M_PI);
         //pos.z = _instance->GetWSession()->GetWorld()->GetPosZ(pos.x,pos.y);
-        
+
         if(_movemode == MOVEMODE_AUTO)
         {
             _mychar->SetPosition(pos);
diff --git a/src/Client/World/ObjMgr.cpp b/src/Client/World/ObjMgr.cpp
index 39f5afb..16704d0 100644
--- a/src/Client/World/ObjMgr.cpp
+++ b/src/Client/World/ObjMgr.cpp
@@ -49,11 +49,11 @@ void ObjMgr::RemoveAll(void)
 void ObjMgr::Remove(uint64 guid, bool del)
 {
     Object *o = GetObj(guid, true); // here get also depleted objs and delete if necessary
-    if(o) 
+    if(o)
     {
         o->_SetDepleted();
         if(!del)
-            logdebug("ObjMgr: "I64FMT" '%s' -> depleted.",guid,o->GetName().c_str()); 
+            logdebug("ObjMgr: "I64FMT" '%s' -> depleted.",guid,o->GetName().c_str());
         PseuGUI *gui = _instance->GetGUI();
         if(gui)
             gui->NotifyObjectDeletion(guid); // we have a gui, which must delete linked DrawObject
@@ -67,8 +67,8 @@ void ObjMgr::Remove(uint64 guid, bool del)
     {
         _obj.erase(guid); // we can safely erase an object that does not exist
                           // - if we reach this point there was a bug anyway
-        logcustom(2,LRED,"ObjMgr::Remove("I64FMT") - not existing",guid); 
-    }        
+        logcustom(2,LRED,"ObjMgr::Remove("I64FMT") - not existing",guid);
+    }
 }
 
 // -- Object part --
diff --git a/src/Client/World/Object.h b/src/Client/World/Object.h
index 94088b4..be1f1f4 100644
--- a/src/Client/World/Object.h
+++ b/src/Client/World/Object.h
@@ -112,14 +112,14 @@ public:
     void Create(uint64 guid);
     inline bool _IsDepleted(void) { return _depleted; }
     inline void _SetDepleted(void) { _depleted = true; }
-    
+
     static uint32 maxvalues[];
     static UpdateField updatefields[];
-    
+
 protected:
     Object();
     void _InitValues(void);
-        
+
     uint16 _valuescount;
     union
     {
@@ -130,7 +130,7 @@ protected:
     uint8 _typeid;
     std::string _name;
     bool _depleted : 1; // true if the object was deleted from the objmgr, but not from memory
-    
+
 };
 
 
diff --git a/src/Client/World/ObjectDefines.h b/src/Client/World/ObjectDefines.h
index 5f0fb73..287bc33 100644
--- a/src/Client/World/ObjectDefines.h
+++ b/src/Client/World/ObjectDefines.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,17 +21,17 @@
 
 enum HighGuid
 {
- 	HIGHGUID_ITEM           = 0x4000,                       // blizz 4000 
- 	HIGHGUID_CONTAINER      = 0x4000,                       // blizz 4000 
- 	HIGHGUID_PLAYER         = 0x0000,                       // blizz 0000 
- 	HIGHGUID_GAMEOBJECT     = 0xF110,                       // blizz F110 
- 	HIGHGUID_TRANSPORT      = 0xF120,                       // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT) 
- 	HIGHGUID_UNIT           = 0xF130,                       // blizz F130 
- 	HIGHGUID_PET            = 0xF140,                       // blizz F140 
+ 	HIGHGUID_ITEM           = 0x4000,                       // blizz 4000
+ 	HIGHGUID_CONTAINER      = 0x4000,                       // blizz 4000
+ 	HIGHGUID_PLAYER         = 0x0000,                       // blizz 0000
+ 	HIGHGUID_GAMEOBJECT     = 0xF110,                       // blizz F110
+ 	HIGHGUID_TRANSPORT      = 0xF120,                       // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
+ 	HIGHGUID_UNIT           = 0xF130,                       // blizz F130
+ 	HIGHGUID_PET            = 0xF140,                       // blizz F140
  	HIGHGUID_VEHICLE        = 0xF150,
- 	HIGHGUID_DYNAMICOBJECT  = 0xF100,                       // blizz F100 
- 	HIGHGUID_CORPSE         = 0xF101,                       // blizz F100 
- 	HIGHGUID_MO_TRANSPORT   = 0x1FC0,                       // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT) 
+ 	HIGHGUID_DYNAMICOBJECT  = 0xF100,                       // blizz F100
+ 	HIGHGUID_CORPSE         = 0xF101,                       // blizz F100
+ 	HIGHGUID_MO_TRANSPORT   = 0x1FC0,                       // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
 };
 
 #define IS_CREATURE_GUID(Guid)       ( GUID_HIPART(Guid) == HIGHGUID_UNIT )
diff --git a/src/Client/World/Opcodes.cpp b/src/Client/World/Opcodes.cpp
index 9bdce93..db3c915 100644
--- a/src/Client/World/Opcodes.cpp
+++ b/src/Client/World/Opcodes.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/Client/World/Opcodes.h b/src/Client/World/Opcodes.h
index bb205a7..3b33dae 100644
--- a/src/Client/World/Opcodes.h
+++ b/src/Client/World/Opcodes.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/Client/World/SharedDefines.h b/src/Client/World/SharedDefines.h
index 8001264..88cf823 100644
--- a/src/Client/World/SharedDefines.h
+++ b/src/Client/World/SharedDefines.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/Client/World/UpdateFields.cpp b/src/Client/World/UpdateFields.cpp
index 7e1db51..f6cdf72 100644
--- a/src/Client/World/UpdateFields.cpp
+++ b/src/Client/World/UpdateFields.cpp
@@ -19,10 +19,10 @@ void WorldSession::_SetupObjectFields()
                 CORPSE_END
             };
             memcpy(Object::maxvalues,mv,sizeof(mv));
-            
+
             Object::updatefields[ OBJECT_FIELD_GUID                         ] = UpdateField(                      0x0000 ,  UF_UINT64 );  // Size:2
-            Object::updatefields[ OBJECT_FIELD_GUID_LOW                     ] = UpdateField(                      0x0000 ,  UF_UINT32 ); 
-            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                    ] = UpdateField(                      0x0001 ,  UF_UINT32 ); 
+            Object::updatefields[ OBJECT_FIELD_GUID_LOW                     ] = UpdateField(                      0x0000 ,  UF_UINT32 );
+            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                    ] = UpdateField(                      0x0001 ,  UF_UINT32 );
             Object::updatefields[ OBJECT_FIELD_TYPE                         ] = UpdateField(                      0x0002 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ OBJECT_FIELD_ENTRY                        ] = UpdateField(                      0x0003 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ OBJECT_FIELD_SCALE_X                      ] = UpdateField(                      0x0004 ,   UF_FLOAT );  // Size:1
@@ -35,10 +35,10 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ ITEM_FIELD_STACK_COUNT                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0008 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ ITEM_FIELD_DURATION                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0009 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ ITEM_FIELD_SPELL_CHARGES                  ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000A ,  UF_UINT32 );  // Size:5
-            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_01               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000B ,  UF_UINT32 ); 
-            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_02               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000C ,  UF_UINT32 ); 
-            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_03               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000D ,  UF_UINT32 ); 
-            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_04               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000E ,  UF_UINT32 ); 
+            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_01               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000B ,  UF_UINT32 );
+            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_02               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000C ,  UF_UINT32 );
+            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_03               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000D ,  UF_UINT32 );
+            Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_04               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000E ,  UF_UINT32 );
             Object::updatefields[ ITEM_FIELD_FLAGS                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000F ,  UF_UINT32 );  // Size:1
             Object::updatefields[ ITEM_FIELD_ENCHANTMENT                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0010 ,  UF_UINT32 );  // Count=21
             Object::updatefields[ ITEM_FIELD_PROPERTY_SEED                  ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0025 ,  UF_UINT32 );  // Size:1
@@ -50,7 +50,7 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ CONTAINER_FIELD_NUM_SLOTS                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x0000 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ CONTAINER_ALIGN_PAD                       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0001 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ CONTAINER_FIELD_SLOT_1                    ] = UpdateField(    mv[TYPEID_UNIT] + 0x0002 ,  UF_UINT32 );  // Count=56
-            Object::updatefields[ CONTAINER_FIELD_SLOT_LAST                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x0038 ,  UF_UINT32 ); 
+            Object::updatefields[ CONTAINER_FIELD_SLOT_LAST                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x0038 ,  UF_UINT32 );
 
             Object::updatefields[ UNIT_FIELD_CHARM                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 );  // Size:2
             Object::updatefields[ UNIT_FIELD_SUMMON                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT64 );  // Size:2
@@ -76,27 +76,27 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ UNIT_FIELD_FACTIONTEMPLATE                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001D ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_BYTES_0                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001E ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY            ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001F ,  UF_UINT32 );  // Size:3
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0020 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0021 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0020 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0021 ,  UF_UINT32 );
             Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0022 ,  UF_UINT32 );  // Size:6
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0023 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0024 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0025 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0026 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0027 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0023 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0024 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0025 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0026 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0027 ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_FLAGS                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0028 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_AURA                           ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0029 ,  UF_UINT32 );  // Size:48
-            Object::updatefields[ UNIT_FIELD_AURA_LAST                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0058 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_AURA_LAST                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0058 ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_AURAFLAGS                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0059 ,  UF_UINT32 );  // Size:6
-            Object::updatefields[ UNIT_FIELD_AURAFLAGS_01                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005A ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_AURAFLAGS_02                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005B ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_AURAFLAGS_03                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005C ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_AURAFLAGS_04                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005D ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_AURAFLAGS_05                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005E ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_AURAFLAGS_01                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005A ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_AURAFLAGS_02                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005B ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_AURAFLAGS_03                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005C ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_AURAFLAGS_04                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005D ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_AURAFLAGS_05                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005E ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_AURALEVELS                     ] = UpdateField(  mv[TYPEID_OBJECT] + 0x005F ,  UF_UINT32 );  // Size:12
-            Object::updatefields[ UNIT_FIELD_AURALEVELS_LAST                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x006A ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_AURALEVELS_LAST                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x006A ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS               ] = UpdateField(  mv[TYPEID_OBJECT] + 0x006B ,  UF_UINT32 );  // Size:12
-            Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS_LAST          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0076 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS_LAST          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0076 ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_AURASTATE                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0077 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_BASEATTACKTIME                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0078 ,  UF_UINT64 );  // Size:2
             Object::updatefields[ UNIT_FIELD_OFFHANDATTACKTIME              ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0079 ,  UF_UINT64 );  // Size:2
@@ -128,12 +128,12 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ UNIT_FIELD_STAT3                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0093 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_STAT4                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0094 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_RESISTANCES                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0095 ,  UF_UINT32 );  // Size:7
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0096 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0097 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0098 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0099 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009A ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_RESISTANCES_06                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009B ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0096 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0097 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0098 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0099 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009A ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_RESISTANCES_06                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009B ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_BASE_MANA                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009C ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_BASE_HEALTH                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009D ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_BYTES_2                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x009E ,  UF_UINT32 );  // Size:1
@@ -146,20 +146,20 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ UNIT_FIELD_MINRANGEDDAMAGE                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A5 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_MAXRANGEDDAMAGE                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A6 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER            ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A7 ,  UF_UINT32 );  // Size:7
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A8 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A9 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_03         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AA ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_04         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AB ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_05         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AC ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_06         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AD ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A8 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00A9 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_03         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AA ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_04         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AB ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_05         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AC ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_06         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AD ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AE ,  UF_UINT32 );  // Size:7
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_01       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AF ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_02       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B0 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_03       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B1 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_04       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B2 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_05       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B3 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_06       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B4 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B5 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_01       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00AF ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_02       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B0 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_03       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B1 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_04       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B2 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_05       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B3 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_06       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B4 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00B5 ,  UF_UINT32 );
 
             Object::updatefields[ PLAYER_DUEL_ARBITER                       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0000 ,  UF_UINT64 );  // Size:2
             Object::updatefields[ PLAYER_FLAGS                              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0002 ,  UF_UINT32 );  // Size:1
@@ -171,30 +171,30 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ PLAYER_DUEL_TEAM                          ] = UpdateField(    mv[TYPEID_UNIT] + 0x0008 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_GUILD_TIMESTAMP                    ] = UpdateField(    mv[TYPEID_UNIT] + 0x0009 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_QUEST_LOG_1_1                      ] = UpdateField(    mv[TYPEID_UNIT] + 0x000A ,  UF_UINT32 );  // Count = 20
-            Object::updatefields[ PLAYER_QUEST_LOG_1_2                      ] = UpdateField(    mv[TYPEID_UNIT] + 0x000B ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_QUEST_LOG_1_3                      ] = UpdateField(    mv[TYPEID_UNIT] + 0x000C ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_QUEST_LOG_LAST_1                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0043 ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_QUEST_LOG_LAST_2                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0044 ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_QUEST_LOG_LAST_3                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0045 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_QUEST_LOG_1_2                      ] = UpdateField(    mv[TYPEID_UNIT] + 0x000B ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_QUEST_LOG_1_3                      ] = UpdateField(    mv[TYPEID_UNIT] + 0x000C ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_QUEST_LOG_LAST_1                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0043 ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_QUEST_LOG_LAST_2                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0044 ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_QUEST_LOG_LAST_3                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0045 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_VISIBLE_ITEM_1_CREATOR             ] = UpdateField(    mv[TYPEID_UNIT] + 0x0046 ,  UF_UINT64 );  // Size:2, Count = 19
             Object::updatefields[ PLAYER_VISIBLE_ITEM_1_0                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x0048 ,  UF_UINT64 );  // Size:8
             Object::updatefields[ PLAYER_VISIBLE_ITEM_1_PROPERTIES          ] = UpdateField(    mv[TYPEID_UNIT] + 0x0050 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_VISIBLE_ITEM_1_PAD                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x0051 ,  UF_UINT32 );  // Size:1
-            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_CREATOR          ] = UpdateField(    mv[TYPEID_UNIT] + 0x011E ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_0                ] = UpdateField(    mv[TYPEID_UNIT] + 0x0120 ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PROPERTIES       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0128 ,  UF_UINT32 ); 
-            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PAD              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0129 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_CREATOR          ] = UpdateField(    mv[TYPEID_UNIT] + 0x011E ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_0                ] = UpdateField(    mv[TYPEID_UNIT] + 0x0120 ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PROPERTIES       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0128 ,  UF_UINT32 );
+            Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PAD              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0129 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_INV_SLOT_HEAD                ] = UpdateField(    mv[TYPEID_UNIT] + 0x012A ,  UF_UINT32 );  // Size:46
             Object::updatefields[ PLAYER_FIELD_PACK_SLOT_1                  ] = UpdateField(    mv[TYPEID_UNIT] + 0x0158 ,  UF_UINT32 );  // Size:32
-            Object::updatefields[ PLAYER_FIELD_PACK_SLOT_LAST               ] = UpdateField(    mv[TYPEID_UNIT] + 0x0176 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_PACK_SLOT_LAST               ] = UpdateField(    mv[TYPEID_UNIT] + 0x0176 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_BANK_SLOT_1                  ] = UpdateField(    mv[TYPEID_UNIT] + 0x0178 ,  UF_UINT32 );  // Size:48
-            Object::updatefields[ PLAYER_FIELD_BANK_SLOT_LAST               ] = UpdateField(    mv[TYPEID_UNIT] + 0x01A6 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_BANK_SLOT_LAST               ] = UpdateField(    mv[TYPEID_UNIT] + 0x01A6 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_1               ] = UpdateField(    mv[TYPEID_UNIT] + 0x01A8 ,  UF_UINT32 );  // Size:12
-            Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_LAST            ] = UpdateField(    mv[TYPEID_UNIT] + 0x0AB2 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_LAST            ] = UpdateField(    mv[TYPEID_UNIT] + 0x0AB2 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_1         ] = UpdateField(    mv[TYPEID_UNIT] + 0x01B4 ,  UF_UINT32 );  // Size:24
-            Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_LAST      ] = UpdateField(    mv[TYPEID_UNIT] + 0x01CA ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_LAST      ] = UpdateField(    mv[TYPEID_UNIT] + 0x01CA ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_1               ] = UpdateField(    mv[TYPEID_UNIT] + 0x01CC ,  UF_UINT32 );  // Size:64
-            Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_LAST            ] = UpdateField(    mv[TYPEID_UNIT] + 0x020A ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_LAST            ] = UpdateField(    mv[TYPEID_UNIT] + 0x020A ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FARSIGHT                           ] = UpdateField(    mv[TYPEID_UNIT] + 0x020C ,  UF_UINT64 );  // Size:2
             Object::updatefields[ PLAYER_FIELD_COMBO_TARGET                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x020E ,  UF_UINT64 );  // Size:2
             Object::updatefields[ PLAYER_XP                                 ] = UpdateField(    mv[TYPEID_UNIT] + 0x0210 ,  UF_UINT32 );  // Size:1
@@ -232,9 +232,9 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ PLAYER_SELF_RES_SPELL                     ] = UpdateField(    mv[TYPEID_UNIT] + 0x040C ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_FIELD_PVP_MEDALS                   ] = UpdateField(    mv[TYPEID_UNIT] + 0x040D ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_1              ] = UpdateField(    mv[TYPEID_UNIT] + 0x040E ,  UF_UINT32 );  // Count=12
-            Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_LAST           ] = UpdateField(    mv[TYPEID_UNIT] + 0x0419 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_LAST           ] = UpdateField(    mv[TYPEID_UNIT] + 0x0419 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_1          ] = UpdateField(    mv[TYPEID_UNIT] + 0x041A ,  UF_UINT32 );  // Count=12
-            Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_LAST       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0425 ,  UF_UINT32 ); 
+            Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_LAST       ] = UpdateField(    mv[TYPEID_UNIT] + 0x0425 ,  UF_UINT32 );
             Object::updatefields[ PLAYER_FIELD_SESSION_KILLS                ] = UpdateField(    mv[TYPEID_UNIT] + 0x0426 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_FIELD_YESTERDAY_KILLS              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0427 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_FIELD_LAST_WEEK_KILLS              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0428 ,  UF_UINT32 );  // Size:1
@@ -249,47 +249,47 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ PLAYER_FIELD_WATCHED_FACTION_INDEX        ] = UpdateField(    mv[TYPEID_UNIT] + 0x0431 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ PLAYER_FIELD_COMBAT_RATING_1              ] = UpdateField(    mv[TYPEID_UNIT] + 0x0432 ,  UF_UINT32 );  // Size:20
 
-            Object::updatefields[ OBJECT_FIELD_CREATED_BY                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 ); 
-            Object::updatefields[ GAMEOBJECT_DISPLAYID                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_FLAGS                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_ROTATION                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_STATE                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0008 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_POS_X                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0009 ,   UF_FLOAT ); 
-            Object::updatefields[ GAMEOBJECT_POS_Y                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000A ,   UF_FLOAT ); 
-            Object::updatefields[ GAMEOBJECT_POS_Z                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000B ,   UF_FLOAT ); 
-            Object::updatefields[ GAMEOBJECT_FACING                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000C ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_DYN_FLAGS                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000D ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_FACTION                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000E ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_TYPE_ID                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000F ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_LEVEL                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0010 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_ARTKIT                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0011 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_ANIMPROGRESS                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0012 ,  UF_UINT32 ); 
-            Object::updatefields[ GAMEOBJECT_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0013 ,  UF_UINT32 ); 
+            Object::updatefields[ OBJECT_FIELD_CREATED_BY                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 );
+            Object::updatefields[ GAMEOBJECT_DISPLAYID                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_FLAGS                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_ROTATION                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_STATE                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0008 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_POS_X                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0009 ,   UF_FLOAT );
+            Object::updatefields[ GAMEOBJECT_POS_Y                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000A ,   UF_FLOAT );
+            Object::updatefields[ GAMEOBJECT_POS_Z                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000B ,   UF_FLOAT );
+            Object::updatefields[ GAMEOBJECT_FACING                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000C ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_DYN_FLAGS                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000D ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_FACTION                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000E ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_TYPE_ID                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x000F ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_LEVEL                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0010 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_ARTKIT                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0011 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_ANIMPROGRESS                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0012 ,  UF_UINT32 );
+            Object::updatefields[ GAMEOBJECT_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0013 ,  UF_UINT32 );
 
-            Object::updatefields[ DYNAMICOBJECT_CASTER                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 ); 
-            Object::updatefields[ DYNAMICOBJECT_BYTES                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_SPELLID                     ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_RADIUS                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_POS_X                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0005 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_POS_Y                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0006 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_POS_Z                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0007 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_FACING                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0008 ,  UF_UINT32 ); 
-            Object::updatefields[ DYNAMICOBJECT_PAD                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0009 ,  UF_UINT32 ); 
+            Object::updatefields[ DYNAMICOBJECT_CASTER                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 );
+            Object::updatefields[ DYNAMICOBJECT_BYTES                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_SPELLID                     ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_RADIUS                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_POS_X                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0005 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_POS_Y                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0006 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_POS_Z                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0007 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_FACING                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0008 ,  UF_UINT32 );
+            Object::updatefields[ DYNAMICOBJECT_PAD                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0009 ,  UF_UINT32 );
 
-            Object::updatefields[ CORPSE_FIELD_OWNER                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 ); 
-            Object::updatefields[ CORPSE_FIELD_FACING                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_POS_X                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_POS_Y                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_POS_Z                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0005 ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_DISPLAY_ID                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0006 ,  UF_UINT32 ); 
+            Object::updatefields[ CORPSE_FIELD_OWNER                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64 );
+            Object::updatefields[ CORPSE_FIELD_FACING                       ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_POS_X                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0003 ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_POS_Y                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_POS_Z                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0005 ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_DISPLAY_ID                   ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0006 ,  UF_UINT32 );
             Object::updatefields[ CORPSE_FIELD_ITEM                         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0007 ,  UF_UINT32 );  // 19
-            Object::updatefields[ CORPSE_FIELD_BYTES_1                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001A ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_BYTES_2                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001B ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_GUILD                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001C ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_FLAGS                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001D ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001E ,  UF_UINT32 ); 
-            Object::updatefields[ CORPSE_FIELD_PAD                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001F ,  UF_UINT32 ); 
-  
+            Object::updatefields[ CORPSE_FIELD_BYTES_1                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001A ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_BYTES_2                      ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001B ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_GUILD                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001C ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_FLAGS                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001D ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001E ,  UF_UINT32 );
+            Object::updatefields[ CORPSE_FIELD_PAD                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001F ,  UF_UINT32 );
+
             break;
         }
         case CLIENT_TBC: //2.4.3
@@ -307,13 +307,13 @@ void WorldSession::_SetupObjectFields()
             memcpy(Object::maxvalues,mv,sizeof(mv));
 
             Object::updatefields[ OBJECT_FIELD_GUID                       ] = UpdateField(                     0x0000 ,  UF_UINT64);
-            Object::updatefields[ OBJECT_FIELD_GUID_LOW                   ] = UpdateField(                     0x0000 ,  UF_UINT32); 
-            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                  ] = UpdateField(                     0x0001 ,  UF_UINT32); 
+            Object::updatefields[ OBJECT_FIELD_GUID_LOW                   ] = UpdateField(                     0x0000 ,  UF_UINT32);
+            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                  ] = UpdateField(                     0x0001 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_TYPE                       ] = UpdateField(                     0x0002 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_ENTRY                      ] = UpdateField(                     0x0003 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_SCALE_X                    ] = UpdateField(                     0x0004 ,   UF_FLOAT);
             Object::updatefields[ OBJECT_FIELD_PADDING                    ] = UpdateField(                     0x0005 ,  UF_UINT32);
-            
+
             Object::updatefields[ ITEM_FIELD_OWNER                        ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 ,  UF_UINT64);
             Object::updatefields[ ITEM_FIELD_CONTAINED                    ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 ,  UF_UINT64);
             Object::updatefields[ ITEM_FIELD_CREATOR                      ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 ,  UF_UINT64);
@@ -357,14 +357,14 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ UNIT_FIELD_FACTIONTEMPLATE                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001D ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_BYTES_0                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001E ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY            ] = UpdateField(  mv[TYPEID_OBJECT] + 0x001F ,  UF_UINT32 );  // Size:3
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0020 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0021 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0020 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02         ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0021 ,  UF_UINT32 );
             Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO                    ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0022 ,  UF_UINT32 );  // Size:6
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0023 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0024 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0025 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0026 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0027 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0023 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0024 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0025 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0026 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05                 ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0027 ,  UF_UINT32 );
             Object::updatefields[ UNIT_FIELD_FLAGS                          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0028 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_FLAGS_2                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x0029 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_AURA                           ] = UpdateField(  mv[TYPEID_OBJECT] + 0x002A ,  UF_UINT32 );  // Size:56
@@ -427,8 +427,8 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ UNIT_FIELD_MAXRANGEDDAMAGE                ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00D3 ,  UF_UINT32 );  // Size:1
             Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER            ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00D4 ,  UF_UINT32 );  // Size:7
             Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER          ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00DB ,  UF_UINT32 );  // Size:7
-            Object::updatefields[ UNIT_FIELD_MAXHEALTHMODIFIER              ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00E2 ,  UF_UINT32 ); 
-            Object::updatefields[ UNIT_FIELD_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00E3 ,  UF_UINT32 ); 
+            Object::updatefields[ UNIT_FIELD_MAXHEALTHMODIFIER              ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00E2 ,  UF_UINT32 );
+            Object::updatefields[ UNIT_FIELD_PADDING                        ] = UpdateField(  mv[TYPEID_OBJECT] + 0x00E3 ,  UF_UINT32 );
 
             Object::updatefields[ PLAYER_DUEL_ARBITER                      ] = UpdateField(  mv[TYPEID_UNIT] + 0x0000 ,  UF_UINT32 );  // Size: 2, Type: LONG, Flags: PUBLIC
             Object::updatefields[ PLAYER_FLAGS                             ] = UpdateField(  mv[TYPEID_UNIT] + 0x0002 ,  UF_UINT32 );  // Size: 1, Type: INT, Flags: PUBLIC
@@ -730,10 +730,10 @@ void WorldSession::_SetupObjectFields()
                 CORPSE_END
             };
             memcpy(Object::maxvalues,mv,sizeof(mv));
-          
+
             Object::updatefields[ OBJECT_FIELD_GUID                       ] = UpdateField(                     0x0000 ,  UF_UINT64);
-            Object::updatefields[ OBJECT_FIELD_GUID_LOW                   ] = UpdateField(                     0x0000 ,  UF_UINT32); 
-            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                  ] = UpdateField(                     0x0001 ,  UF_UINT32); 
+            Object::updatefields[ OBJECT_FIELD_GUID_LOW                   ] = UpdateField(                     0x0000 ,  UF_UINT32);
+            Object::updatefields[ OBJECT_FIELD_GUID_HIGH                  ] = UpdateField(                     0x0001 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_TYPE                       ] = UpdateField(                     0x0002 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_ENTRY                      ] = UpdateField(                     0x0003 ,  UF_UINT32);
             Object::updatefields[ OBJECT_FIELD_SCALE_X                    ] = UpdateField(                     0x0004 ,   UF_FLOAT);
@@ -1110,8 +1110,8 @@ void WorldSession::_SetupObjectFields()
             Object::updatefields[ CORPSE_FIELD_FLAGS                      ] = UpdateField( mv[TYPEID_OBJECT] + 0x001B ,  UF_UINT32);
             Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS              ] = UpdateField( mv[TYPEID_OBJECT] + 0x001C ,  UF_UINT32);
             Object::updatefields[ CORPSE_FIELD_PAD                        ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D ,  UF_UINT32);
-          
-          
+
+
             break;
         }
     }
diff --git a/src/Client/World/UpdateFields.h b/src/Client/World/UpdateFields.h
index d7272b9..c3e22b8 100644
--- a/src/Client/World/UpdateFields.h
+++ b/src/Client/World/UpdateFields.h
@@ -11,7 +11,7 @@ enum UpdateFieldTypes
 
 enum UpdateFieldLimits
 {
-    OBJECT_END                                = 0x0006,  
+    OBJECT_END                                = 0x0006,
     ITEM_END                                  = OBJECT_END + 0x003A,
     CONTAINER_END                             = ITEM_END + 0x004A,
     UNIT_END                                  = OBJECT_END + 0x008E,
@@ -26,13 +26,13 @@ enum UpdateFieldLimits
     GAMEOBJECT_END_8606                       = OBJECT_END + 0x0014,
     DYNAMICOBJECT_END_8606                    = OBJECT_END + 0x000A,
     CORPSE_END_8606                           = OBJECT_END + 0x0022,
-    
+
     ITEM_END_6005                             = OBJECT_END + 0x002A,
     CONTAINER_END_6005                        = ITEM_END_6005 + 0x003A,
     UNIT_END_6005                             = OBJECT_END + 0x00B6,
     PLAYER_END_6005                           = UNIT_END_6005 + 0x0446,
     GAMEOBJECT_END_6005                       = OBJECT_END + 0x0014
-     
+
 };
 
 
@@ -288,7 +288,7 @@ enum UpdateFieldName
     PLAYER_FIELD_MOD_HEALING_DONE_POS,
     PLAYER_FIELD_MOD_HEALING_PCT,
     PLAYER_FIELD_MOD_MANA_REGEN,
-    PLAYER_FIELD_MOD_MANA_REGEN_INTERRUPT,    
+    PLAYER_FIELD_MOD_MANA_REGEN_INTERRUPT,
     PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,
     PLAYER_FIELD_MOD_TARGET_RESISTANCE,
     PLAYER_FIELD_NEGSTAT0,
@@ -582,7 +582,7 @@ enum UpdateFieldName
     PLAYER_VISIBLE_ITEM_19_0,
     PLAYER_VISIBLE_ITEM_19_PROPERTIES,
     PLAYER_VISIBLE_ITEM_19_PAD,
-    
+
     PLAYER_VISIBLE_ITEM_LAST_PROPERTIES,
     PLAYER_XP,
 
diff --git a/src/Client/World/UpdateMask.h b/src/Client/World/UpdateMask.h
index a2c81f7..a24e066 100644
--- a/src/Client/World/UpdateMask.h
+++ b/src/Client/World/UpdateMask.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -52,12 +52,12 @@ class UpdateMask
         inline uint32 GetLength() { return mBlocks << 2; }
         inline uint32 GetCount() { return mCount; }
         inline uint8* GetMask() { return (uint8*)mUpdateMask; }
-		inline void SetMask(uint32 *updateMask) 
-		{ 
+		inline void SetMask(uint32 *updateMask)
+		{
 			if(mUpdateMask)
 				delete [] mUpdateMask;
 
-			mUpdateMask = updateMask; 
+			mUpdateMask = updateMask;
 		}
 
         inline void SetCount (uint32 valuesCount)
diff --git a/src/Client/World/WorldSession.cpp b/src/Client/World/WorldSession.cpp
index 94f8b79..2a3411b 100644
--- a/src/Client/World/WorldSession.cpp
+++ b/src/Client/World/WorldSession.cpp
@@ -45,7 +45,7 @@ WorldSession::WorldSession(PseuInstance *in)
 
     _SetupObjectFields();
     MovementInfo::_c=in->GetConf()->client;
-    
+
     in->GetScripts()->RunScriptIfExists("_onworldsessioncreate");
 
     DEBUG(logdebug("WorldSession 0x%X constructor finished",this));
@@ -529,7 +529,7 @@ std::string WorldSession::GetOrRequestPlayerName(uint64 guid)
 
 void WorldSession::_HandleAuthChallengeOpcode(WorldPacket& recvPacket)
 {
-    //Read Packet    
+    //Read Packet
     uint32 sp, serverseed;
     if(GetInstance()->GetConf()->client > CLIENT_TBC)
     {
@@ -553,7 +553,7 @@ void WorldSession::_HandleAuthChallengeOpcode(WorldPacket& recvPacket)
     digest.UpdateData((uint8*)&serverseed,sizeof(uint32));
     digest.UpdateBigNumbers(GetInstance()->GetSessionKey(),NULL);
     digest.Finalize();
-    
+
     // Send Reply
     WorldPacket auth;
     if(GetInstance()->GetConf()->client<=CLIENT_TBC)
@@ -1059,7 +1059,7 @@ void WorldSession::_HandleNameQueryResponseOpcode(WorldPacket& recvPacket)
 
     if(GetInstance()->GetConf()->client > CLIENT_TBC)
       recvPacket >> unk;
-    
+
     recvPacket >> pname >> realm;
     if(GetInstance()->GetConf()->client > CLIENT_TBC)
     {
@@ -1134,7 +1134,7 @@ void WorldSession::_HandleSetSpeedOpcode(WorldPacket& recvPacket)
     float speed;
     uint32 movetype;
     MovementInfo mi;
-    
+
     switch(recvPacket.GetOpcode())
     {
     case MSG_MOVE_SET_WALK_SPEED:
@@ -1278,7 +1278,7 @@ void WorldSession::_HandleTelePortAckOpcode(WorldPacket& recvPacket)
       wp << guid;
     wp << (uint32)0 << (uint32)getMSTime(); //First value is some counter
     SendWorldPacket(wp);
-    
+
     _world->GetMoveMgr()->SetFallTime(100);
     _world->GetMoveMgr()->MoveFallLand();
 
@@ -1334,7 +1334,7 @@ void WorldSession::_HandleNewWorldOpcode(WorldPacket& recvPacket)
         my->ClearSpells(); // will be resent by server
         my->SetPosition(x,y,z,o,mapid);
     }
-    
+
     _world->GetMoveMgr()->SetFallTime(100);
     _world->GetMoveMgr()->MoveFallLand();//Must be sent after character was set to new position
 
@@ -1413,7 +1413,7 @@ void WorldSession::_HandleInitialSpellsOpcode(WorldPacket& recvPacket)
               logdebug("Initial Spell: id=%u slot=%u",spellid,not_spellslot);
               GetMyChar()->AddSpell(spellid, not_spellslot);
           }
-          
+
         }
         //TODO: Parse packet completely
 }
@@ -1696,7 +1696,7 @@ void WorldSession::_HandleCreatureQueryResponseOpcode(WorldPacket& recvPacket)
       recvPacket >> unkf;
       recvPacket >> ct->RacialLeader;
       if(GetInstance()->GetConf()->client == CLIENT_WOTLK)
-      {      
+      {
           for(uint32 i = 0; i < 4; i++)
               recvPacket >> ct->questItems[i];
           recvPacket >> ct->movementId;
@@ -1806,7 +1806,7 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
 {
     uint64 guid;
     guid = recvPacket.readPackGUID();
-    
+
     Object* obj = objmgr.GetObj(guid);
     if (!obj || !obj->IsWorldObject())
         return;
@@ -1816,7 +1816,7 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
     float x, y, z;
     if(GetInstance()->GetConf()->client > CLIENT_TBC)
       recvPacket >> unk;
-    
+
     recvPacket >> x >> y >> z >> time >> type;
 
     float oldx = ((WorldObject*)obj)->GetX(),
@@ -1825,19 +1825,19 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
     // not much good, better than nothing
 
     ((WorldObject*)obj)->SetPosition(x, y, z, o);
-    switch(type) 
+    switch(type)
     {
         case 0: break; // normal packet
         case 1: return; // stop packet
-        case 2: 
+        case 2:
             float unkf;
             recvPacket >> unkf >> unkf >> unkf;
             break;
-        case 3: 
+        case 3:
             uint64 unkguid;
             recvPacket >> unkguid;
             break;
-        case 4: 
+        case 4:
             float angle;
             recvPacket >> angle;
             break;
diff --git a/src/Client/World/WorldSocket.cpp b/src/Client/World/WorldSocket.cpp
index 1101fcb..1ac8ff9 100644
--- a/src/Client/World/WorldSocket.cpp
+++ b/src/Client/World/WorldSocket.cpp
@@ -11,7 +11,7 @@ WorldSocket::WorldSocket(SocketHandler &h, WorldSession *s) : TcpSocket(h)
     _session = s;
     _gothdr = false;
     _ok=false;
-    
+
     //Dummy functions for unencrypted packets on WorldSocket
     pDecryptRecv = &AuthCrypt::DecryptRecvDummy;
     pEncryptSend = &AuthCrypt::EncryptSendDummy;
@@ -120,9 +120,9 @@ void WorldSocket::OnRead()
 
               _remaining = ntohs(hdr.size) - 2;
               _opcode = hdr.cmd;
-              
+
             }
-            
+
             if(_opcode > MAX_OPCODE_ID)
             {
                 logcritical("CRYPT ERROR: opcode=%u, remain=%u",_opcode,_remaining); // this should never be the case!
diff --git a/src/Client/main.cpp b/src/Client/main.cpp
index ca04abf..b397c0d 100644
--- a/src/Client/main.cpp
+++ b/src/Client/main.cpp
@@ -38,7 +38,7 @@ void _OnSignal(int s)
         case SIGINT:
         case SIGQUIT:
         case SIGTERM:
-            quitproc();            
+            quitproc();
             break;
         case SIGABRT:
         #ifndef _DEBUG
@@ -98,7 +98,7 @@ int main(int argc, char* argv[])
         logcustom(0,GREEN,"Platform: %s",PLATFORM_NAME);
         logcustom(0,GREEN,"Compiler: %s ("COMPILER_VERSION_OUT")",COMPILER_NAME,COMPILER_VERSION);
         logcustom(0,GREEN,"Compiled: %s  %s",__DATE__,__TIME__);
-        
+
         _HookSignals();
         MemoryDataHolder::Init();
 
@@ -116,10 +116,10 @@ int main(int argc, char* argv[])
         raise(SIGABRT);  // this way to terminate is not nice but the only way to quit the CLI thread
         raise(SIGQUIT);
         return 0;
-	} 
+	}
     catch (...)
     {
-        printf("ERROR: Unhandled exception in main thread!\n"); 
+        printf("ERROR: Unhandled exception in main thread!\n");
         raise(SIGABRT);
         return 1;
     }
diff --git a/src/Client/resource.h b/src/Client/resource.h
index 93d6742..e2a148b 100644
--- a/src/Client/resource.h
+++ b/src/Client/resource.h
@@ -5,7 +5,7 @@
 #define IDI_ICON1                       101
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        102
diff --git a/src/dep/include/DXSDK/include/D3D10.h b/src/dep/include/DXSDK/include/D3D10.h
index a6d5fbd..c6192fa 100644
--- a/src/dep/include/DXSDK/include/D3D10.h
+++ b/src/dep/include/DXSDK/include/D3D10.h
@@ -7,8 +7,8 @@
 /* Compiler settings for d3d10.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -46,7 +46,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __ID3D10DeviceChild_FWD_DEFINED__
 #define __ID3D10DeviceChild_FWD_DEFINED__
@@ -211,11 +211,11 @@ typedef interface ID3D10Multithread ID3D10Multithread;
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 /* interface __MIDL_itf_d3d10_0000_0000 */
-/* [local] */ 
+/* [local] */
 
 #ifndef _D3D10_CONSTANTS
 #define _D3D10_CONSTANTS
@@ -618,7 +618,7 @@ extern "C"{
 #define MAKE_D3D10HRESULT( code )  MAKE_HRESULT( 1, _FACD3D10, code )
 #define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS  MAKE_D3D10HRESULT(1)
 #define D3D10_ERROR_FILE_NOT_FOUND  MAKE_D3D10HRESULT(2)
-typedef 
+typedef
 enum D3D10_INPUT_CLASSIFICATION
     {	D3D10_INPUT_PER_VERTEX_DATA	= 0,
 	D3D10_INPUT_PER_INSTANCE_DATA	= 1
@@ -635,13 +635,13 @@ typedef struct D3D10_INPUT_ELEMENT_DESC
     UINT InstanceDataStepRate;
     } 	D3D10_INPUT_ELEMENT_DESC;
 
-typedef 
+typedef
 enum D3D10_FILL_MODE
     {	D3D10_FILL_WIREFRAME	= 2,
 	D3D10_FILL_SOLID	= 3
     } 	D3D10_FILL_MODE;
 
-typedef 
+typedef
 enum D3D10_PRIMITIVE_TOPOLOGY
     {	D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED	= 0,
 	D3D10_PRIMITIVE_TOPOLOGY_POINTLIST	= 1,
@@ -655,7 +655,7 @@ enum D3D10_PRIMITIVE_TOPOLOGY
 	D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ	= 13
     } 	D3D10_PRIMITIVE_TOPOLOGY;
 
-typedef 
+typedef
 enum D3D10_PRIMITIVE
     {	D3D10_PRIMITIVE_UNDEFINED	= 0,
 	D3D10_PRIMITIVE_POINT	= 1,
@@ -665,14 +665,14 @@ enum D3D10_PRIMITIVE
 	D3D10_PRIMITIVE_TRIANGLE_ADJ	= 7
     } 	D3D10_PRIMITIVE;
 
-typedef 
+typedef
 enum D3D10_CULL_MODE
     {	D3D10_CULL_NONE	= 1,
 	D3D10_CULL_FRONT	= 2,
 	D3D10_CULL_BACK	= 3
     } 	D3D10_CULL_MODE;
 
-typedef 
+typedef
 enum D3D10_FRONT_WINDING
     {	D3D10_FRONT_CW	= 1,
 	D3D10_FRONT_CCW	= 2
@@ -705,7 +705,7 @@ typedef struct D3D10_VIEWPORT
     FLOAT MaxDepth;
     } 	D3D10_VIEWPORT;
 
-typedef 
+typedef
 enum D3D10_RESOURCE
     {	D3D10_RESOURCE_BUFFER	= 1,
 	D3D10_RESOURCE_TEXTURE1D	= 2,
@@ -714,7 +714,7 @@ enum D3D10_RESOURCE
 	D3D10_RESOURCE_TEXTURECUBE	= 5
     } 	D3D10_RESOURCE;
 
-typedef 
+typedef
 enum D3D10_USAGE
     {	D3D10_USAGE_DEFAULT	= 0,
 	D3D10_USAGE_IMMUTABLE	= 1,
@@ -722,7 +722,7 @@ enum D3D10_USAGE
 	D3D10_USAGE_STAGING	= 3
     } 	D3D10_USAGE;
 
-typedef 
+typedef
 enum D3D10_BIND_FLAG
     {	D3D10_BIND_VERTEX_BUFFER	= 0x1L,
 	D3D10_BIND_INDEX_BUFFER	= 0x2L,
@@ -733,19 +733,19 @@ enum D3D10_BIND_FLAG
 	D3D10_BIND_DEPTH_STENCIL	= 0x40L
     } 	D3D10_BIND_FLAG;
 
-typedef 
+typedef
 enum D3D10_CPU_ACCESS_FLAG
     {	D3D10_CPU_ACCESS_WRITE	= 0x10000L,
 	D3D10_CPU_ACCESS_READ	= 0x20000L
     } 	D3D10_CPU_ACCESS_FLAG;
 
-typedef 
+typedef
 enum D3D10_RESOURCE_MISC_FLAG
     {	D3D10_RESOURCE_MISC_GENERATE_MIPS	= 0x1L,
 	D3D10_RESOURCE_MISC_COPY_DESTINATION	= 0x2L
     } 	D3D10_RESOURCE_MISC_FLAG;
 
-typedef 
+typedef
 enum D3D10_MAP
     {	D3D10_MAP_READ	= 1,
 	D3D10_MAP_WRITE	= 2,
@@ -754,19 +754,19 @@ enum D3D10_MAP
 	D3D10_MAP_WRITE_NO_OVERWRITE	= 5
     } 	D3D10_MAP;
 
-typedef 
+typedef
 enum D3D10_MAP_FLAG
     {	D3D10_MAP_FLAG_DO_NOT_WAIT	= 0x100000L
     } 	D3D10_MAP_FLAG;
 
-typedef 
+typedef
 enum D3D10_RAISE_FLAG
     {	D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR	= 0x1L
     } 	D3D10_RAISE_FLAG;
 
 #define	D3D10_BUFFEROFFSET_APPEND	( 0xffffffffL )
 
-typedef 
+typedef
 enum D3D10_CLEAR_FLAG
     {	D3D10_CLEAR_DEPTH	= 0x1L,
 	D3D10_CLEAR_STENCIL	= 0x2L
@@ -794,75 +794,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0000_v0_0_s_ifspec;
 #define __ID3D10DeviceChild_INTERFACE_DEFINED__
 
 /* interface ID3D10DeviceChild */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10DeviceChild;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C00-342C-4106-A19F-4F2704F689F0")
     ID3D10DeviceChild : public IUnknown
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDevice( 
+        virtual void STDMETHODCALLTYPE GetDevice(
             /* [retval][out] */ ID3D10Device **ppDevice) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetPrivateData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateData( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10DeviceChildVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10DeviceChild * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10DeviceChild * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10DeviceChild * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10DeviceChild * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10DeviceChild * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10DeviceChild * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10DeviceChild * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
+
         END_INTERFACE
     } ID3D10DeviceChildVtbl;
 
@@ -871,32 +871,32 @@ EXTERN_C const IID IID_ID3D10DeviceChild;
         CONST_VTBL struct ID3D10DeviceChildVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10DeviceChild_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10DeviceChild_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10DeviceChild_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10DeviceChild_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10DeviceChild_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10DeviceChild_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10DeviceChild_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 #endif /* COBJMACROS */
 
@@ -910,9 +910,9 @@ EXTERN_C const IID IID_ID3D10DeviceChild;
 
 
 /* interface __MIDL_itf_d3d10_0000_0001 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_COMPARISON_FUNC
     {	D3D10_COMPARISON_NEVER	= 1,
 	D3D10_COMPARISON_LESS	= 2,
@@ -924,13 +924,13 @@ enum D3D10_COMPARISON_FUNC
 	D3D10_COMPARISON_ALWAYS	= 8
     } 	D3D10_COMPARISON_FUNC;
 
-typedef 
+typedef
 enum D3D10_DEPTH_WRITE_MASK
     {	D3D10_DEPTH_WRITE_MASK_ZERO	= 0,
 	D3D10_DEPTH_WRITE_MASK_ALL	= 1
     } 	D3D10_DEPTH_WRITE_MASK;
 
-typedef 
+typedef
 enum D3D10_STENCIL_OP
     {	D3D10_STENCIL_OP_KEEP	= 1,
 	D3D10_STENCIL_OP_ZERO	= 2,
@@ -971,65 +971,65 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0001_v0_0_s_ifspec;
 #define __ID3D10DepthStencilState_INTERFACE_DEFINED__
 
 /* interface ID3D10DepthStencilState */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10DepthStencilState;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("2B4B1CC8-A4AD-41f8-8322-CA86FC3EC675")
     ID3D10DepthStencilState : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_DEPTH_STENCIL_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10DepthStencilStateVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10DepthStencilState * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10DepthStencilState * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10DepthStencilState * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10DepthStencilState * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10DepthStencilState * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10DepthStencilState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10DepthStencilState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10DepthStencilState * This,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10DepthStencilStateVtbl;
 
@@ -1038,36 +1038,36 @@ EXTERN_C const IID IID_ID3D10DepthStencilState;
         CONST_VTBL struct ID3D10DepthStencilStateVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10DepthStencilState_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10DepthStencilState_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10DepthStencilState_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10DepthStencilState_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10DepthStencilState_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10DepthStencilState_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10DepthStencilState_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10DepthStencilState_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -1081,9 +1081,9 @@ EXTERN_C const IID IID_ID3D10DepthStencilState;
 
 
 /* interface __MIDL_itf_d3d10_0000_0002 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_BLEND
     {	D3D10_BLEND_ZERO	= 1,
 	D3D10_BLEND_ONE	= 2,
@@ -1104,7 +1104,7 @@ enum D3D10_BLEND
 	D3D10_BLEND_INV_SRC1_ALPHA	= 19
     } 	D3D10_BLEND;
 
-typedef 
+typedef
 enum D3D10_BLEND_OP
     {	D3D10_BLEND_OP_ADD	= 1,
 	D3D10_BLEND_OP_SUBTRACT	= 2,
@@ -1113,13 +1113,13 @@ enum D3D10_BLEND_OP
 	D3D10_BLEND_OP_MAX	= 5
     } 	D3D10_BLEND_OP;
 
-typedef 
+typedef
 enum D3D10_COLOR_WRITE_ENABLE
     {	D3D10_COLOR_WRITE_ENABLE_RED	= 1,
 	D3D10_COLOR_WRITE_ENABLE_GREEN	= 2,
 	D3D10_COLOR_WRITE_ENABLE_BLUE	= 4,
 	D3D10_COLOR_WRITE_ENABLE_ALPHA	= 8,
-	D3D10_COLOR_WRITE_ENABLE_ALL	= ( ( ( D3D10_COLOR_WRITE_ENABLE_RED | D3D10_COLOR_WRITE_ENABLE_GREEN )  | D3D10_COLOR_WRITE_ENABLE_BLUE )  | D3D10_COLOR_WRITE_ENABLE_ALPHA ) 
+	D3D10_COLOR_WRITE_ENABLE_ALL	= ( ( ( D3D10_COLOR_WRITE_ENABLE_RED | D3D10_COLOR_WRITE_ENABLE_GREEN )  | D3D10_COLOR_WRITE_ENABLE_BLUE )  | D3D10_COLOR_WRITE_ENABLE_ALPHA )
     } 	D3D10_COLOR_WRITE_ENABLE;
 
 typedef struct D3D10_BLEND_DESC
@@ -1144,65 +1144,65 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0002_v0_0_s_ifspec;
 #define __ID3D10BlendState_INTERFACE_DEFINED__
 
 /* interface ID3D10BlendState */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10BlendState;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("EDAD8D19-8A35-4d6d-8566-2EA276CDE161")
     ID3D10BlendState : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_BLEND_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10BlendStateVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10BlendState * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10BlendState * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10BlendState * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10BlendState * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10BlendState * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10BlendState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10BlendState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10BlendState * This,
             /* [retval][out] */ D3D10_BLEND_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10BlendStateVtbl;
 
@@ -1211,36 +1211,36 @@ EXTERN_C const IID IID_ID3D10BlendState;
         CONST_VTBL struct ID3D10BlendStateVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10BlendState_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10BlendState_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10BlendState_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10BlendState_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10BlendState_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10BlendState_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10BlendState_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10BlendState_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -1254,7 +1254,7 @@ EXTERN_C const IID IID_ID3D10BlendState;
 
 
 /* interface __MIDL_itf_d3d10_0000_0003 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_RASTERIZER_DESC
     {
@@ -1279,65 +1279,65 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0003_v0_0_s_ifspec;
 #define __ID3D10RasterizerState_INTERFACE_DEFINED__
 
 /* interface ID3D10RasterizerState */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10RasterizerState;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("A2A07292-89AF-4345-BE2E-C53D9FBB6E9F")
     ID3D10RasterizerState : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_RASTERIZER_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10RasterizerStateVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10RasterizerState * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10RasterizerState * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10RasterizerState * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10RasterizerState * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10RasterizerState * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10RasterizerState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10RasterizerState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10RasterizerState * This,
             /* [retval][out] */ D3D10_RASTERIZER_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10RasterizerStateVtbl;
 
@@ -1346,36 +1346,36 @@ EXTERN_C const IID IID_ID3D10RasterizerState;
         CONST_VTBL struct ID3D10RasterizerStateVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10RasterizerState_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10RasterizerState_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10RasterizerState_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10RasterizerState_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10RasterizerState_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10RasterizerState_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10RasterizerState_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10RasterizerState_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -1389,7 +1389,7 @@ EXTERN_C const IID IID_ID3D10RasterizerState;
 
 
 /* interface __MIDL_itf_d3d10_0000_0004 */
-/* [local] */ 
+/* [local] */
 
 #if !defined( D3D10_NO_HELPERS ) && defined( __cplusplus )
 inline UINT D3D10CalcSubresource( UINT MipSlice, UINT ArraySlice, UINT MipLevels )
@@ -1411,18 +1411,18 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0004_v0_0_s_ifspec;
 #define __ID3D10Resource_INTERFACE_DEFINED__
 
 /* interface ID3D10Resource */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Resource;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C01-342C-4106-A19F-4F2704F689F0")
     ID3D10Resource : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE CopySubresourceRegion( 
+        virtual void STDMETHODCALLTYPE CopySubresourceRegion(
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
             /* [in] */ SIZE_T DstY,
@@ -1430,67 +1430,67 @@ EXTERN_C const IID IID_ID3D10Resource;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox) = 0;
-        
-        virtual void STDMETHODCALLTYPE CopyResource( 
+
+        virtual void STDMETHODCALLTYPE CopyResource(
             /* [in] */ ID3D10Resource *pSrcResource) = 0;
-        
-        virtual void STDMETHODCALLTYPE UpdateSubresource( 
+
+        virtual void STDMETHODCALLTYPE UpdateSubresource(
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetType( 
+
+        virtual void STDMETHODCALLTYPE GetType(
             /* [out] */ D3D10_RESOURCE *rType) = 0;
-        
-        virtual void STDMETHODCALLTYPE SetEvictionPriority( 
+
+        virtual void STDMETHODCALLTYPE SetEvictionPriority(
             /* [in] */ UINT EvictionPriority) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetEvictionPriority( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10ResourceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Resource * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Resource * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Resource * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Resource * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Resource * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Resource * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Resource * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10Resource * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -1499,30 +1499,30 @@ EXTERN_C const IID IID_ID3D10Resource;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10Resource * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10Resource * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10Resource * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10Resource * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10Resource * This);
-        
+
         END_INTERFACE
     } ID3D10ResourceVtbl;
 
@@ -1531,51 +1531,51 @@ EXTERN_C const IID IID_ID3D10Resource;
         CONST_VTBL struct ID3D10ResourceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Resource_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Resource_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Resource_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Resource_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Resource_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Resource_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Resource_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Resource_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10Resource_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10Resource_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10Resource_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10Resource_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10Resource_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 #endif /* COBJMACROS */
 
@@ -1589,7 +1589,7 @@ EXTERN_C const IID IID_ID3D10Resource;
 
 
 /* interface __MIDL_itf_d3d10_0000_0005 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_BUFFER_DESC
     {
@@ -1634,69 +1634,69 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0005_v0_0_s_ifspec;
 #define __ID3D10Buffer_INTERFACE_DEFINED__
 
 /* interface ID3D10Buffer */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Buffer;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C02-342C-4106-A19F-4F2704F689F0")
     ID3D10Buffer : public ID3D10Resource
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ void **ppData) = 0;
-        
+
         virtual void STDMETHODCALLTYPE Unmap( void) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_BUFFER_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10BufferVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Buffer * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Buffer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Buffer * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Buffer * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Buffer * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Buffer * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Buffer * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10Buffer * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -1705,43 +1705,43 @@ EXTERN_C const IID IID_ID3D10Buffer;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10Buffer * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10Buffer * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10Buffer * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10Buffer * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10Buffer * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             ID3D10Buffer * This,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ void **ppData);
-        
-        void ( STDMETHODCALLTYPE *Unmap )( 
+
+        void ( STDMETHODCALLTYPE *Unmap )(
             ID3D10Buffer * This);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10Buffer * This,
             /* [retval][out] */ D3D10_BUFFER_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10BufferVtbl;
 
@@ -1750,61 +1750,61 @@ EXTERN_C const IID IID_ID3D10Buffer;
         CONST_VTBL struct ID3D10BufferVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Buffer_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Buffer_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Buffer_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Buffer_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Buffer_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Buffer_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Buffer_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Buffer_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10Buffer_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10Buffer_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10Buffer_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10Buffer_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10Buffer_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 
 #define ID3D10Buffer_Map(This,MapType,Flags,ppData)	\
-    ( (This)->lpVtbl -> Map(This,MapType,Flags,ppData) ) 
+    ( (This)->lpVtbl -> Map(This,MapType,Flags,ppData) )
 
 #define ID3D10Buffer_Unmap(This)	\
-    ( (This)->lpVtbl -> Unmap(This) ) 
+    ( (This)->lpVtbl -> Unmap(This) )
 
 #define ID3D10Buffer_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -1818,7 +1818,7 @@ EXTERN_C const IID IID_ID3D10Buffer;
 
 
 /* interface __MIDL_itf_d3d10_0000_0006 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_TEXTURE1D_DESC
     {
@@ -1877,76 +1877,76 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0006_v0_0_s_ifspec;
 #define __ID3D10Texture1D_INTERFACE_DEFINED__
 
 /* interface ID3D10Texture1D */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Texture1D;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C03-342C-4106-A19F-4F2704F689F0")
     ID3D10Texture1D : public ID3D10Resource
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ void **ppData) = 0;
-        
-        virtual void STDMETHODCALLTYPE Unmap( 
+
+        virtual void STDMETHODCALLTYPE Unmap(
             /* [in] */ UINT Subresource) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_TEXTURE1D_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat(
             /* [in] */ DXGI_FORMAT Format) = 0;
-        
+
         virtual DXGI_FORMAT STDMETHODCALLTYPE GetMultisampleResolveFormat( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10Texture1DVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Texture1D * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Texture1D * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Texture1D * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Texture1D * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Texture1D * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Texture1D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Texture1D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10Texture1D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -1955,52 +1955,52 @@ EXTERN_C const IID IID_ID3D10Texture1D;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10Texture1D * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10Texture1D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10Texture1D * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10Texture1D * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10Texture1D * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             ID3D10Texture1D * This,
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ void **ppData);
-        
-        void ( STDMETHODCALLTYPE *Unmap )( 
+
+        void ( STDMETHODCALLTYPE *Unmap )(
             ID3D10Texture1D * This,
             /* [in] */ UINT Subresource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10Texture1D * This,
             /* [retval][out] */ D3D10_TEXTURE1D_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )(
             ID3D10Texture1D * This,
             /* [in] */ DXGI_FORMAT Format);
-        
-        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )( 
+
+        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )(
             ID3D10Texture1D * This);
-        
+
         END_INTERFACE
     } ID3D10Texture1DVtbl;
 
@@ -2009,67 +2009,67 @@ EXTERN_C const IID IID_ID3D10Texture1D;
         CONST_VTBL struct ID3D10Texture1DVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Texture1D_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Texture1D_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Texture1D_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Texture1D_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Texture1D_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Texture1D_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Texture1D_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Texture1D_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10Texture1D_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10Texture1D_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10Texture1D_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10Texture1D_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10Texture1D_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 
 #define ID3D10Texture1D_Map(This,Subresource,MapType,Flags,ppData)	\
-    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,ppData) ) 
+    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,ppData) )
 
 #define ID3D10Texture1D_Unmap(This,Subresource)	\
-    ( (This)->lpVtbl -> Unmap(This,Subresource) ) 
+    ( (This)->lpVtbl -> Unmap(This,Subresource) )
 
 #define ID3D10Texture1D_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define ID3D10Texture1D_SetMultisampleResolveFormat(This,Format)	\
-    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) ) 
+    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) )
 
 #define ID3D10Texture1D_GetMultisampleResolveFormat(This)	\
-    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) ) 
+    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) )
 
 #endif /* COBJMACROS */
 
@@ -2083,7 +2083,7 @@ EXTERN_C const IID IID_ID3D10Texture1D;
 
 
 /* interface __MIDL_itf_d3d10_0000_0007 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_TEXTURE2D_DESC
     {
@@ -2151,76 +2151,76 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0007_v0_0_s_ifspec;
 #define __ID3D10Texture2D_INTERFACE_DEFINED__
 
 /* interface ID3D10Texture2D */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Texture2D;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C04-342C-4106-A19F-4F2704F689F0")
     ID3D10Texture2D : public ID3D10Resource
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE2D *pMappedTex2D) = 0;
-        
-        virtual void STDMETHODCALLTYPE Unmap( 
+
+        virtual void STDMETHODCALLTYPE Unmap(
             /* [in] */ UINT Subresource) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_TEXTURE2D_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat(
             /* [in] */ DXGI_FORMAT Format) = 0;
-        
+
         virtual DXGI_FORMAT STDMETHODCALLTYPE GetMultisampleResolveFormat( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10Texture2DVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Texture2D * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Texture2D * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Texture2D * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Texture2D * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Texture2D * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Texture2D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Texture2D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10Texture2D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -2229,52 +2229,52 @@ EXTERN_C const IID IID_ID3D10Texture2D;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10Texture2D * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10Texture2D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10Texture2D * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10Texture2D * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10Texture2D * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             ID3D10Texture2D * This,
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE2D *pMappedTex2D);
-        
-        void ( STDMETHODCALLTYPE *Unmap )( 
+
+        void ( STDMETHODCALLTYPE *Unmap )(
             ID3D10Texture2D * This,
             /* [in] */ UINT Subresource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10Texture2D * This,
             /* [retval][out] */ D3D10_TEXTURE2D_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )(
             ID3D10Texture2D * This,
             /* [in] */ DXGI_FORMAT Format);
-        
-        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )( 
+
+        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )(
             ID3D10Texture2D * This);
-        
+
         END_INTERFACE
     } ID3D10Texture2DVtbl;
 
@@ -2283,67 +2283,67 @@ EXTERN_C const IID IID_ID3D10Texture2D;
         CONST_VTBL struct ID3D10Texture2DVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Texture2D_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Texture2D_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Texture2D_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Texture2D_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Texture2D_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Texture2D_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Texture2D_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Texture2D_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10Texture2D_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10Texture2D_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10Texture2D_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10Texture2D_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10Texture2D_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 
 #define ID3D10Texture2D_Map(This,Subresource,MapType,Flags,pMappedTex2D)	\
-    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedTex2D) ) 
+    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedTex2D) )
 
 #define ID3D10Texture2D_Unmap(This,Subresource)	\
-    ( (This)->lpVtbl -> Unmap(This,Subresource) ) 
+    ( (This)->lpVtbl -> Unmap(This,Subresource) )
 
 #define ID3D10Texture2D_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define ID3D10Texture2D_SetMultisampleResolveFormat(This,Format)	\
-    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) ) 
+    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) )
 
 #define ID3D10Texture2D_GetMultisampleResolveFormat(This)	\
-    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) ) 
+    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) )
 
 #endif /* COBJMACROS */
 
@@ -2357,7 +2357,7 @@ EXTERN_C const IID IID_ID3D10Texture2D;
 
 
 /* interface __MIDL_itf_d3d10_0000_0008 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_TEXTURE3D_DESC
     {
@@ -2426,76 +2426,76 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0008_v0_0_s_ifspec;
 #define __ID3D10Texture3D_INTERFACE_DEFINED__
 
 /* interface ID3D10Texture3D */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Texture3D;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C05-342C-4106-A19F-4F2704F689F0")
     ID3D10Texture3D : public ID3D10Resource
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE3D *pMappedTex3D) = 0;
-        
-        virtual void STDMETHODCALLTYPE Unmap( 
+
+        virtual void STDMETHODCALLTYPE Unmap(
             /* [in] */ UINT Subresource) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_TEXTURE3D_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat(
             /* [in] */ DXGI_FORMAT Format) = 0;
-        
+
         virtual DXGI_FORMAT STDMETHODCALLTYPE GetMultisampleResolveFormat( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10Texture3DVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Texture3D * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Texture3D * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Texture3D * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Texture3D * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Texture3D * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Texture3D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Texture3D * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10Texture3D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -2504,52 +2504,52 @@ EXTERN_C const IID IID_ID3D10Texture3D;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10Texture3D * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10Texture3D * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10Texture3D * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10Texture3D * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10Texture3D * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             ID3D10Texture3D * This,
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE3D *pMappedTex3D);
-        
-        void ( STDMETHODCALLTYPE *Unmap )( 
+
+        void ( STDMETHODCALLTYPE *Unmap )(
             ID3D10Texture3D * This,
             /* [in] */ UINT Subresource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10Texture3D * This,
             /* [retval][out] */ D3D10_TEXTURE3D_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )(
             ID3D10Texture3D * This,
             /* [in] */ DXGI_FORMAT Format);
-        
-        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )( 
+
+        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )(
             ID3D10Texture3D * This);
-        
+
         END_INTERFACE
     } ID3D10Texture3DVtbl;
 
@@ -2558,67 +2558,67 @@ EXTERN_C const IID IID_ID3D10Texture3D;
         CONST_VTBL struct ID3D10Texture3DVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Texture3D_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Texture3D_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Texture3D_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Texture3D_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Texture3D_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Texture3D_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Texture3D_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Texture3D_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10Texture3D_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10Texture3D_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10Texture3D_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10Texture3D_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10Texture3D_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 
 #define ID3D10Texture3D_Map(This,Subresource,MapType,Flags,pMappedTex3D)	\
-    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedTex3D) ) 
+    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedTex3D) )
 
 #define ID3D10Texture3D_Unmap(This,Subresource)	\
-    ( (This)->lpVtbl -> Unmap(This,Subresource) ) 
+    ( (This)->lpVtbl -> Unmap(This,Subresource) )
 
 #define ID3D10Texture3D_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define ID3D10Texture3D_SetMultisampleResolveFormat(This,Format)	\
-    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) ) 
+    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) )
 
 #define ID3D10Texture3D_GetMultisampleResolveFormat(This)	\
-    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) ) 
+    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) )
 
 #endif /* COBJMACROS */
 
@@ -2632,7 +2632,7 @@ EXTERN_C const IID IID_ID3D10Texture3D;
 
 
 /* interface __MIDL_itf_d3d10_0000_0009 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_TEXTURECUBE_DESC
     {
@@ -2688,76 +2688,76 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0009_v0_0_s_ifspec;
 #define __ID3D10TextureCube_INTERFACE_DEFINED__
 
 /* interface ID3D10TextureCube */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10TextureCube;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C06-342C-4106-A19F-4F2704F689F0")
     ID3D10TextureCube : public ID3D10Resource
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE2D *pMappedFace) = 0;
-        
-        virtual void STDMETHODCALLTYPE Unmap( 
+
+        virtual void STDMETHODCALLTYPE Unmap(
             /* [in] */ UINT Subresource) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_TEXTURECUBE_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetMultisampleResolveFormat(
             /* [in] */ DXGI_FORMAT Format) = 0;
-        
+
         virtual DXGI_FORMAT STDMETHODCALLTYPE GetMultisampleResolveFormat( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10TextureCubeVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10TextureCube * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10TextureCube * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10TextureCube * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10TextureCube * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10TextureCube * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10TextureCube * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10TextureCube * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *CopySubresourceRegion )( 
+
+        void ( STDMETHODCALLTYPE *CopySubresourceRegion )(
             ID3D10TextureCube * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ SIZE_T DstX,
@@ -2766,52 +2766,52 @@ EXTERN_C const IID IID_ID3D10TextureCube;
             /* [in] */ ID3D10Resource *pSrcResource,
             /* [in] */ UINT SrcSubresource,
             /* [in] */ const D3D10_BOX *pSrcBox);
-        
-        void ( STDMETHODCALLTYPE *CopyResource )( 
+
+        void ( STDMETHODCALLTYPE *CopyResource )(
             ID3D10TextureCube * This,
             /* [in] */ ID3D10Resource *pSrcResource);
-        
-        void ( STDMETHODCALLTYPE *UpdateSubresource )( 
+
+        void ( STDMETHODCALLTYPE *UpdateSubresource )(
             ID3D10TextureCube * This,
             /* [in] */ UINT DstSubresource,
             /* [in] */ const D3D10_BOX *pDstBox,
             /* [in] */ const void *pSrcData,
             /* [in] */ SIZE_T SrcRowPitch,
             /* [in] */ SIZE_T SrcDepthPitch);
-        
-        void ( STDMETHODCALLTYPE *GetType )( 
+
+        void ( STDMETHODCALLTYPE *GetType )(
             ID3D10TextureCube * This,
             /* [out] */ D3D10_RESOURCE *rType);
-        
-        void ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        void ( STDMETHODCALLTYPE *SetEvictionPriority )(
             ID3D10TextureCube * This,
             /* [in] */ UINT EvictionPriority);
-        
-        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        UINT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             ID3D10TextureCube * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             ID3D10TextureCube * This,
             /* [in] */ UINT Subresource,
             /* [in] */ D3D10_MAP MapType,
             /* [in] */ UINT Flags,
             /* [out] */ D3D10_MAPPED_TEXTURE2D *pMappedFace);
-        
-        void ( STDMETHODCALLTYPE *Unmap )( 
+
+        void ( STDMETHODCALLTYPE *Unmap )(
             ID3D10TextureCube * This,
             /* [in] */ UINT Subresource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10TextureCube * This,
             /* [retval][out] */ D3D10_TEXTURECUBE_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMultisampleResolveFormat )(
             ID3D10TextureCube * This,
             /* [in] */ DXGI_FORMAT Format);
-        
-        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )( 
+
+        DXGI_FORMAT ( STDMETHODCALLTYPE *GetMultisampleResolveFormat )(
             ID3D10TextureCube * This);
-        
+
         END_INTERFACE
     } ID3D10TextureCubeVtbl;
 
@@ -2820,67 +2820,67 @@ EXTERN_C const IID IID_ID3D10TextureCube;
         CONST_VTBL struct ID3D10TextureCubeVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10TextureCube_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10TextureCube_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10TextureCube_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10TextureCube_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10TextureCube_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10TextureCube_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10TextureCube_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10TextureCube_CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox)	\
-    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) 
+    ( (This)->lpVtbl -> CopySubresourceRegion(This,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) )
 
 #define ID3D10TextureCube_CopyResource(This,pSrcResource)	\
-    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) ) 
+    ( (This)->lpVtbl -> CopyResource(This,pSrcResource) )
 
 #define ID3D10TextureCube_UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch)	\
-    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) 
+    ( (This)->lpVtbl -> UpdateSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) )
 
 #define ID3D10TextureCube_GetType(This,rType)	\
-    ( (This)->lpVtbl -> GetType(This,rType) ) 
+    ( (This)->lpVtbl -> GetType(This,rType) )
 
 #define ID3D10TextureCube_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define ID3D10TextureCube_GetEvictionPriority(This)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This) )
 
 
 #define ID3D10TextureCube_Map(This,Subresource,MapType,Flags,pMappedFace)	\
-    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedFace) ) 
+    ( (This)->lpVtbl -> Map(This,Subresource,MapType,Flags,pMappedFace) )
 
 #define ID3D10TextureCube_Unmap(This,Subresource)	\
-    ( (This)->lpVtbl -> Unmap(This,Subresource) ) 
+    ( (This)->lpVtbl -> Unmap(This,Subresource) )
 
 #define ID3D10TextureCube_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define ID3D10TextureCube_SetMultisampleResolveFormat(This,Format)	\
-    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) ) 
+    ( (This)->lpVtbl -> SetMultisampleResolveFormat(This,Format) )
 
 #define ID3D10TextureCube_GetMultisampleResolveFormat(This)	\
-    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) ) 
+    ( (This)->lpVtbl -> GetMultisampleResolveFormat(This) )
 
 #endif /* COBJMACROS */
 
@@ -2894,9 +2894,9 @@ EXTERN_C const IID IID_ID3D10TextureCube;
 
 
 /* interface __MIDL_itf_d3d10_0000_0010 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_TEXTURECUBE_FACE
     {	D3D10_TEXTURECUBE_FACE_POSITIVE_X	= 0,
 	D3D10_TEXTURECUBE_FACE_NEGATIVE_X	= 1,
@@ -2915,65 +2915,65 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0010_v0_0_s_ifspec;
 #define __ID3D10View_INTERFACE_DEFINED__
 
 /* interface ID3D10View */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10View;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("C902B03F-60A7-49BA-9936-2A3AB37A7E33")
     ID3D10View : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE GetResource( 
+        virtual void STDMETHODCALLTYPE GetResource(
             /* [retval][out] */ ID3D10Resource **ppResource) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10ViewVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10View * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10View * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10View * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10View * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10View * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10View * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10View * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetResource )( 
+
+        void ( STDMETHODCALLTYPE *GetResource )(
             ID3D10View * This,
             /* [retval][out] */ ID3D10Resource **ppResource);
-        
+
         END_INTERFACE
     } ID3D10ViewVtbl;
 
@@ -2982,36 +2982,36 @@ EXTERN_C const IID IID_ID3D10View;
         CONST_VTBL struct ID3D10ViewVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10View_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10View_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10View_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10View_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10View_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10View_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10View_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10View_GetResource(This,ppResource)	\
-    ( (This)->lpVtbl -> GetResource(This,ppResource) ) 
+    ( (This)->lpVtbl -> GetResource(This,ppResource) )
 
 #endif /* COBJMACROS */
 
@@ -3025,7 +3025,7 @@ EXTERN_C const IID IID_ID3D10View;
 
 
 /* interface __MIDL_itf_d3d10_0000_0011 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_BUFFER_SRV
     {
@@ -3065,7 +3065,7 @@ typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC
     {
     DXGI_FORMAT Format;
     D3D10_RESOURCE ResourceType;
-    union 
+    union
         {
         D3D10_BUFFER_SRV Buffer;
         D3D10_TEX1D_SRV Texture1D;
@@ -3084,69 +3084,69 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0011_v0_0_s_ifspec;
 #define __ID3D10ShaderResourceView_INTERFACE_DEFINED__
 
 /* interface ID3D10ShaderResourceView */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10ShaderResourceView;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C07-342C-4106-A19F-4F2704F689F0")
     ID3D10ShaderResourceView : public ID3D10View
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10ShaderResourceViewVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10ShaderResourceView * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10ShaderResourceView * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10ShaderResourceView * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10ShaderResourceView * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10ShaderResourceView * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10ShaderResourceView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10ShaderResourceView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetResource )( 
+
+        void ( STDMETHODCALLTYPE *GetResource )(
             ID3D10ShaderResourceView * This,
             /* [retval][out] */ ID3D10Resource **ppResource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10ShaderResourceView * This,
             /* [retval][out] */ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10ShaderResourceViewVtbl;
 
@@ -3155,40 +3155,40 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView;
         CONST_VTBL struct ID3D10ShaderResourceViewVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10ShaderResourceView_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10ShaderResourceView_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10ShaderResourceView_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10ShaderResourceView_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10ShaderResourceView_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10ShaderResourceView_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10ShaderResourceView_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10ShaderResourceView_GetResource(This,ppResource)	\
-    ( (This)->lpVtbl -> GetResource(This,ppResource) ) 
+    ( (This)->lpVtbl -> GetResource(This,ppResource) )
 
 
 #define ID3D10ShaderResourceView_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -3202,7 +3202,7 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView;
 
 
 /* interface __MIDL_itf_d3d10_0000_0012 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_BUFFER_RTV
     {
@@ -3242,7 +3242,7 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC
     {
     DXGI_FORMAT Format;
     D3D10_RESOURCE ResourceType;
-    union 
+    union
         {
         D3D10_BUFFER_RTV Buffer;
         D3D10_TEX1D_RTV Texture1D;
@@ -3261,69 +3261,69 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0012_v0_0_s_ifspec;
 #define __ID3D10RenderTargetView_INTERFACE_DEFINED__
 
 /* interface ID3D10RenderTargetView */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10RenderTargetView;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C08-342C-4106-A19F-4F2704F689F0")
     ID3D10RenderTargetView : public ID3D10View
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_RENDER_TARGET_VIEW_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10RenderTargetViewVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10RenderTargetView * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10RenderTargetView * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10RenderTargetView * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10RenderTargetView * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10RenderTargetView * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10RenderTargetView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10RenderTargetView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetResource )( 
+
+        void ( STDMETHODCALLTYPE *GetResource )(
             ID3D10RenderTargetView * This,
             /* [retval][out] */ ID3D10Resource **ppResource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10RenderTargetView * This,
             /* [retval][out] */ D3D10_RENDER_TARGET_VIEW_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10RenderTargetViewVtbl;
 
@@ -3332,40 +3332,40 @@ EXTERN_C const IID IID_ID3D10RenderTargetView;
         CONST_VTBL struct ID3D10RenderTargetViewVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10RenderTargetView_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10RenderTargetView_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10RenderTargetView_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10RenderTargetView_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10RenderTargetView_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10RenderTargetView_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10RenderTargetView_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10RenderTargetView_GetResource(This,ppResource)	\
-    ( (This)->lpVtbl -> GetResource(This,ppResource) ) 
+    ( (This)->lpVtbl -> GetResource(This,ppResource) )
 
 
 #define ID3D10RenderTargetView_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -3379,7 +3379,7 @@ EXTERN_C const IID IID_ID3D10RenderTargetView;
 
 
 /* interface __MIDL_itf_d3d10_0000_0013 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_TEX1D_DSV
     {
@@ -3406,7 +3406,7 @@ typedef struct D3D10_DEPTH_STENCIL_VIEW_DESC
     {
     DXGI_FORMAT Format;
     D3D10_RESOURCE ResourceType;
-    union 
+    union
         {
         D3D10_TEX1D_DSV Texture1D;
         D3D10_TEX2D_DSV Texture2D;
@@ -3423,69 +3423,69 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0013_v0_0_s_ifspec;
 #define __ID3D10DepthStencilView_INTERFACE_DEFINED__
 
 /* interface ID3D10DepthStencilView */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10DepthStencilView;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C09-342C-4106-A19F-4F2704F689F0")
     ID3D10DepthStencilView : public ID3D10View
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10DepthStencilViewVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10DepthStencilView * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10DepthStencilView * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10DepthStencilView * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10DepthStencilView * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10DepthStencilView * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10DepthStencilView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10DepthStencilView * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetResource )( 
+
+        void ( STDMETHODCALLTYPE *GetResource )(
             ID3D10DepthStencilView * This,
             /* [retval][out] */ ID3D10Resource **ppResource);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10DepthStencilView * This,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10DepthStencilViewVtbl;
 
@@ -3494,40 +3494,40 @@ EXTERN_C const IID IID_ID3D10DepthStencilView;
         CONST_VTBL struct ID3D10DepthStencilViewVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10DepthStencilView_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10DepthStencilView_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10DepthStencilView_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10DepthStencilView_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10DepthStencilView_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10DepthStencilView_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10DepthStencilView_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10DepthStencilView_GetResource(This,ppResource)	\
-    ( (This)->lpVtbl -> GetResource(This,ppResource) ) 
+    ( (This)->lpVtbl -> GetResource(This,ppResource) )
 
 
 #define ID3D10DepthStencilView_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -3541,7 +3541,7 @@ EXTERN_C const IID IID_ID3D10DepthStencilView;
 
 
 /* interface __MIDL_itf_d3d10_0000_0014 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_VERTEX_SHADER_DESC
     {
@@ -3558,58 +3558,58 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0014_v0_0_s_ifspec;
 #define __ID3D10VertexShader_INTERFACE_DEFINED__
 
 /* interface ID3D10VertexShader */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10VertexShader;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0A-342C-4106-A19F-4F2704F689F0")
     ID3D10VertexShader : public ID3D10DeviceChild
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10VertexShaderVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10VertexShader * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10VertexShader * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10VertexShader * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10VertexShader * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10VertexShader * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10VertexShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10VertexShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
+
         END_INTERFACE
     } ID3D10VertexShaderVtbl;
 
@@ -3618,32 +3618,32 @@ EXTERN_C const IID IID_ID3D10VertexShader;
         CONST_VTBL struct ID3D10VertexShaderVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10VertexShader_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10VertexShader_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10VertexShader_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10VertexShader_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10VertexShader_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10VertexShader_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10VertexShader_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #endif /* COBJMACROS */
@@ -3658,7 +3658,7 @@ EXTERN_C const IID IID_ID3D10VertexShader;
 
 
 /* interface __MIDL_itf_d3d10_0000_0015 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_GEOMETRY_SHADER_DESC
     {
@@ -3678,58 +3678,58 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0015_v0_0_s_ifspec;
 #define __ID3D10GeometryShader_INTERFACE_DEFINED__
 
 /* interface ID3D10GeometryShader */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10GeometryShader;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("6316BE88-54CD-4040-AB44-20461BC81F68")
     ID3D10GeometryShader : public ID3D10DeviceChild
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10GeometryShaderVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10GeometryShader * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10GeometryShader * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10GeometryShader * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10GeometryShader * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10GeometryShader * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10GeometryShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10GeometryShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
+
         END_INTERFACE
     } ID3D10GeometryShaderVtbl;
 
@@ -3738,32 +3738,32 @@ EXTERN_C const IID IID_ID3D10GeometryShader;
         CONST_VTBL struct ID3D10GeometryShaderVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10GeometryShader_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10GeometryShader_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10GeometryShader_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10GeometryShader_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10GeometryShader_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10GeometryShader_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10GeometryShader_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #endif /* COBJMACROS */
@@ -3778,7 +3778,7 @@ EXTERN_C const IID IID_ID3D10GeometryShader;
 
 
 /* interface __MIDL_itf_d3d10_0000_0016 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_PIXEL_SHADER_DESC
     {
@@ -3795,58 +3795,58 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0016_v0_0_s_ifspec;
 #define __ID3D10PixelShader_INTERFACE_DEFINED__
 
 /* interface ID3D10PixelShader */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10PixelShader;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("4968B601-9D00-4cde-8346-8E7F675819B6")
     ID3D10PixelShader : public ID3D10DeviceChild
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10PixelShaderVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10PixelShader * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10PixelShader * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10PixelShader * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10PixelShader * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10PixelShader * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10PixelShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10PixelShader * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
+
         END_INTERFACE
     } ID3D10PixelShaderVtbl;
 
@@ -3855,32 +3855,32 @@ EXTERN_C const IID IID_ID3D10PixelShader;
         CONST_VTBL struct ID3D10PixelShaderVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10PixelShader_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10PixelShader_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10PixelShader_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10PixelShader_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10PixelShader_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10PixelShader_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10PixelShader_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #endif /* COBJMACROS */
@@ -3895,7 +3895,7 @@ EXTERN_C const IID IID_ID3D10PixelShader;
 
 
 /* interface __MIDL_itf_d3d10_0000_0017 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_INPUT_LAYOUT_DESC
     {
@@ -3913,58 +3913,58 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0017_v0_0_s_ifspec;
 #define __ID3D10InputLayout_INTERFACE_DEFINED__
 
 /* interface ID3D10InputLayout */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10InputLayout;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0B-342C-4106-A19F-4F2704F689F0")
     ID3D10InputLayout : public ID3D10DeviceChild
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10InputLayoutVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10InputLayout * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10InputLayout * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10InputLayout * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10InputLayout * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10InputLayout * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10InputLayout * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10InputLayout * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
+
         END_INTERFACE
     } ID3D10InputLayoutVtbl;
 
@@ -3973,32 +3973,32 @@ EXTERN_C const IID IID_ID3D10InputLayout;
         CONST_VTBL struct ID3D10InputLayoutVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10InputLayout_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10InputLayout_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10InputLayout_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10InputLayout_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10InputLayout_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10InputLayout_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10InputLayout_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #endif /* COBJMACROS */
@@ -4013,9 +4013,9 @@ EXTERN_C const IID IID_ID3D10InputLayout;
 
 
 /* interface __MIDL_itf_d3d10_0000_0018 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_FILTER
     {	D3D10_FILTER_MIN_MAG_MIP_POINT	= 0,
 	D3D10_FILTER_MIN_MAG_POINT_MIP_LINEAR	= 0x1,
@@ -4038,7 +4038,7 @@ enum D3D10_FILTER
 	D3D10_FILTER_TEXT_1BIT	= 0x80000000
     } 	D3D10_FILTER;
 
-typedef 
+typedef
 enum D3D10_FILTER_TYPE
     {	D3D10_FILTER_TYPE_POINT	= 0,
 	D3D10_FILTER_TYPE_LINEAR	= 1
@@ -4063,14 +4063,14 @@ enum D3D10_FILTER_TYPE
                                    ( ( bComparison ) ? D3D10_COMPARISON_FILTERING_BIT : 0 ) |       \
                                    ( ( min & D3D10_FILTER_TYPE_MASK ) << D3D10_MIN_FILTER_SHIFT ) |   \
                                    ( ( mag & D3D10_FILTER_TYPE_MASK ) << D3D10_MAG_FILTER_SHIFT ) |   \
-                                   ( ( mip & D3D10_FILTER_TYPE_MASK ) << D3D10_MIP_FILTER_SHIFT ) )    
+                                   ( ( mip & D3D10_FILTER_TYPE_MASK ) << D3D10_MIP_FILTER_SHIFT ) )
 #define D3D10_ENCODE_ANISOTROPIC_FILTER( bComparison )                                              \
                                          ( D3D10_FILTER ) (                                         \
                                          D3D10_ANISOTROPIC_FILTERING_BIT |                          \
                                          D3D10_ENCODE_BASIC_FILTER( D3D10_FILTER_TYPE_LINEAR,         \
                                                                     D3D10_FILTER_TYPE_LINEAR,         \
                                                                     D3D10_FILTER_TYPE_LINEAR,         \
-                                                                    bComparison ) )                  
+                                                                    bComparison ) )
 #define D3D10_DECODE_MIN_FILTER( d3d10Filter )                                                      \
                                  (D3D10_FILTER_TYPE)                                                  \
                                  ( ( d3d10Filter >> D3D10_MIN_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK )
@@ -4081,15 +4081,15 @@ enum D3D10_FILTER_TYPE
                                  (D3D10_FILTER_TYPE)                                                  \
                                  ( ( d3d10Filter >> D3D10_MIP_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK )
 #define D3D10_DECODE_IS_COMPARISON_FILTER( d3d10Filter )                                            \
-                                 ( d3d10Filter & D3D10_COMPARISON_FILTERING_BIT )                    
+                                 ( d3d10Filter & D3D10_COMPARISON_FILTERING_BIT )
 #define D3D10_DECODE_IS_ANISOTROPIC_FILTER( d3d10Filter )                                           \
                           ( ( d3d10Filter & D3D10_ANISOTROPIC_FILTERING_BIT ) &&                    \
                             ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIN_FILTER( d3d10Filter ) ) && \
                             ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MAG_FILTER( d3d10Filter ) ) && \
-                            ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIP_FILTER( d3d10Filter ) ) )    
+                            ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIP_FILTER( d3d10Filter ) ) )
 #define D3D10_DECODE_IS_TEXT_1BIT_FILTER( d3d10Filter )                                             \
-                                 ( d3d10Filter == D3D10_TEXT_1BIT_BIT )                              
-typedef 
+                                 ( d3d10Filter == D3D10_TEXT_1BIT_BIT )
+typedef
 enum D3D10_TEXTURE_ADDRESS_MODE
     {	D3D10_TEXTURE_ADDRESS_WRAP	= 1,
 	D3D10_TEXTURE_ADDRESS_MIRROR	= 2,
@@ -4121,65 +4121,65 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0018_v0_0_s_ifspec;
 #define __ID3D10SamplerState_INTERFACE_DEFINED__
 
 /* interface ID3D10SamplerState */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10SamplerState;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0C-342C-4106-A19F-4F2704F689F0")
     ID3D10SamplerState : public ID3D10DeviceChild
     {
     public:
-        virtual void STDMETHODCALLTYPE GetDesc( 
+        virtual void STDMETHODCALLTYPE GetDesc(
             /* [retval][out] */ D3D10_SAMPLER_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10SamplerStateVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10SamplerState * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10SamplerState * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10SamplerState * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10SamplerState * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10SamplerState * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10SamplerState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10SamplerState * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *GetDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDesc )(
             ID3D10SamplerState * This,
             /* [retval][out] */ D3D10_SAMPLER_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10SamplerStateVtbl;
 
@@ -4188,36 +4188,36 @@ EXTERN_C const IID IID_ID3D10SamplerState;
         CONST_VTBL struct ID3D10SamplerStateVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10SamplerState_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10SamplerState_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10SamplerState_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10SamplerState_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10SamplerState_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10SamplerState_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10SamplerState_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10SamplerState_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -4231,9 +4231,9 @@ EXTERN_C const IID IID_ID3D10SamplerState;
 
 
 /* interface __MIDL_itf_d3d10_0000_0019 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_FORMAT_SUPPORT
     {	D3D10_FORMAT_SUPPORT_BUFFER	= 0x1,
 	D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER	= 0x2,
@@ -4267,84 +4267,84 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0019_v0_0_s_ifspec;
 #define __ID3D10Asynchronous_INTERFACE_DEFINED__
 
 /* interface ID3D10Asynchronous */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Asynchronous;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0D-342C-4106-A19F-4F2704F689F0")
     ID3D10Asynchronous : public ID3D10DeviceChild
     {
     public:
         virtual void STDMETHODCALLTYPE Begin( void) = 0;
-        
+
         virtual void STDMETHODCALLTYPE End( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetData(
             /* [size_is][out] */ void *pData,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ UINT Flags) = 0;
-        
+
         virtual SIZE_T STDMETHODCALLTYPE GetDataSize( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10AsynchronousVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Asynchronous * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Asynchronous * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Asynchronous * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Asynchronous * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Asynchronous * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Asynchronous * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Asynchronous * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *Begin )( 
+
+        void ( STDMETHODCALLTYPE *Begin )(
             ID3D10Asynchronous * This);
-        
-        void ( STDMETHODCALLTYPE *End )( 
+
+        void ( STDMETHODCALLTYPE *End )(
             ID3D10Asynchronous * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetData )(
             ID3D10Asynchronous * This,
             /* [size_is][out] */ void *pData,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ UINT Flags);
-        
-        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )( 
+
+        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )(
             ID3D10Asynchronous * This);
-        
+
         END_INTERFACE
     } ID3D10AsynchronousVtbl;
 
@@ -4353,45 +4353,45 @@ EXTERN_C const IID IID_ID3D10Asynchronous;
         CONST_VTBL struct ID3D10AsynchronousVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Asynchronous_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Asynchronous_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Asynchronous_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Asynchronous_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Asynchronous_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Asynchronous_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Asynchronous_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Asynchronous_Begin(This)	\
-    ( (This)->lpVtbl -> Begin(This) ) 
+    ( (This)->lpVtbl -> Begin(This) )
 
 #define ID3D10Asynchronous_End(This)	\
-    ( (This)->lpVtbl -> End(This) ) 
+    ( (This)->lpVtbl -> End(This) )
 
 #define ID3D10Asynchronous_GetData(This,pData,DataSize,Flags)	\
-    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) ) 
+    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) )
 
 #define ID3D10Asynchronous_GetDataSize(This)	\
-    ( (This)->lpVtbl -> GetDataSize(This) ) 
+    ( (This)->lpVtbl -> GetDataSize(This) )
 
 #endif /* COBJMACROS */
 
@@ -4405,11 +4405,11 @@ EXTERN_C const IID IID_ID3D10Asynchronous;
 
 
 /* interface __MIDL_itf_d3d10_0000_0020 */
-/* [local] */ 
+/* [local] */
 
 #define	D3D10_GETDATA_DONOTFLUSH	( 1 )
 
-typedef 
+typedef
 enum D3D10_QUERY
     {	D3D10_QUERY_EVENT	= 0,
 	D3D10_QUERY_OCCLUSION	= ( D3D10_QUERY_EVENT + 1 ) ,
@@ -4418,7 +4418,7 @@ enum D3D10_QUERY
 	D3D10_QUERY_PIPELINE_STATISTICS	= ( D3D10_QUERY_TIMESTAMP_DISJOINT + 1 ) ,
 	D3D10_QUERY_OCCLUSION_PREDICATE	= ( D3D10_QUERY_PIPELINE_STATISTICS + 1 ) ,
 	D3D10_QUERY_SO_STATISTICS	= ( D3D10_QUERY_OCCLUSION_PREDICATE + 1 ) ,
-	D3D10_QUERY_SO_OVERFLOW_PREDICATE	= ( D3D10_QUERY_SO_STATISTICS + 1 ) 
+	D3D10_QUERY_SO_OVERFLOW_PREDICATE	= ( D3D10_QUERY_SO_STATISTICS + 1 )
     } 	D3D10_QUERY;
 
 #define	D3D10_QUERY_MISCFLAG_PREDICATEHINT	( 0x1 )
@@ -4438,73 +4438,73 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0020_v0_0_s_ifspec;
 #define __ID3D10Query_INTERFACE_DEFINED__
 
 /* interface ID3D10Query */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Query;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0E-342C-4106-A19F-4F2704F689F0")
     ID3D10Query : public ID3D10Asynchronous
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10QueryVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Query * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Query * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Query * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Query * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Query * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Query * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Query * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *Begin )( 
+
+        void ( STDMETHODCALLTYPE *Begin )(
             ID3D10Query * This);
-        
-        void ( STDMETHODCALLTYPE *End )( 
+
+        void ( STDMETHODCALLTYPE *End )(
             ID3D10Query * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetData )(
             ID3D10Query * This,
             /* [size_is][out] */ void *pData,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ UINT Flags);
-        
-        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )( 
+
+        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )(
             ID3D10Query * This);
-        
+
         END_INTERFACE
     } ID3D10QueryVtbl;
 
@@ -4513,45 +4513,45 @@ EXTERN_C const IID IID_ID3D10Query;
         CONST_VTBL struct ID3D10QueryVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Query_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Query_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Query_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Query_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Query_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Query_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Query_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Query_Begin(This)	\
-    ( (This)->lpVtbl -> Begin(This) ) 
+    ( (This)->lpVtbl -> Begin(This) )
 
 #define ID3D10Query_End(This)	\
-    ( (This)->lpVtbl -> End(This) ) 
+    ( (This)->lpVtbl -> End(This) )
 
 #define ID3D10Query_GetData(This,pData,DataSize,Flags)	\
-    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) ) 
+    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) )
 
 #define ID3D10Query_GetDataSize(This)	\
-    ( (This)->lpVtbl -> GetDataSize(This) ) 
+    ( (This)->lpVtbl -> GetDataSize(This) )
 
 
 #endif /* COBJMACROS */
@@ -4569,73 +4569,73 @@ EXTERN_C const IID IID_ID3D10Query;
 #define __ID3D10Predicate_INTERFACE_DEFINED__
 
 /* interface ID3D10Predicate */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Predicate;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C10-342C-4106-A19F-4F2704F689F0")
     ID3D10Predicate : public ID3D10Query
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10PredicateVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Predicate * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Predicate * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Predicate * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Predicate * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Predicate * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Predicate * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Predicate * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *Begin )( 
+
+        void ( STDMETHODCALLTYPE *Begin )(
             ID3D10Predicate * This);
-        
-        void ( STDMETHODCALLTYPE *End )( 
+
+        void ( STDMETHODCALLTYPE *End )(
             ID3D10Predicate * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetData )(
             ID3D10Predicate * This,
             /* [size_is][out] */ void *pData,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ UINT Flags);
-        
-        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )( 
+
+        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )(
             ID3D10Predicate * This);
-        
+
         END_INTERFACE
     } ID3D10PredicateVtbl;
 
@@ -4644,45 +4644,45 @@ EXTERN_C const IID IID_ID3D10Predicate;
         CONST_VTBL struct ID3D10PredicateVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Predicate_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Predicate_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Predicate_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Predicate_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Predicate_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Predicate_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Predicate_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Predicate_Begin(This)	\
-    ( (This)->lpVtbl -> Begin(This) ) 
+    ( (This)->lpVtbl -> Begin(This) )
 
 #define ID3D10Predicate_End(This)	\
-    ( (This)->lpVtbl -> End(This) ) 
+    ( (This)->lpVtbl -> End(This) )
 
 #define ID3D10Predicate_GetData(This,pData,DataSize,Flags)	\
-    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) ) 
+    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) )
 
 #define ID3D10Predicate_GetDataSize(This)	\
-    ( (This)->lpVtbl -> GetDataSize(This) ) 
+    ( (This)->lpVtbl -> GetDataSize(This) )
 
 
 
@@ -4698,7 +4698,7 @@ EXTERN_C const IID IID_ID3D10Predicate;
 
 
 /* interface __MIDL_itf_d3d10_0000_0022 */
-/* [local] */ 
+/* [local] */
 
 typedef struct D3D10_QUERY_DATA_TIMESTAMP_DISJOINT
     {
@@ -4724,7 +4724,7 @@ typedef struct D3D10_QUERY_DATA_SO_STATISTICS
     UINT64 PrimitivesStorageNeeded;
     } 	D3D10_QUERY_DATA_SO_STATISTICS;
 
-typedef 
+typedef
 enum D3D10_COUNTER
     {	D3D10_COUNTER_GPU_IDLE	= 0,
 	D3D10_COUNTER_VERTEX_PROCESSING	= ( D3D10_COUNTER_GPU_IDLE + 1 ) ,
@@ -4747,12 +4747,12 @@ enum D3D10_COUNTER
 	D3D10_COUNTER_DEVICE_DEPENDENT_0	= 0x40000000
     } 	D3D10_COUNTER;
 
-typedef 
+typedef
 enum D3D10_COUNTER_TYPE
     {	D3D10_COUNTER_TYPE_FLOAT32	= 0,
 	D3D10_COUNTER_TYPE_UINT16	= ( D3D10_COUNTER_TYPE_FLOAT32 + 1 ) ,
 	D3D10_COUNTER_TYPE_UINT32	= ( D3D10_COUNTER_TYPE_UINT16 + 1 ) ,
-	D3D10_COUNTER_TYPE_UINT64	= ( D3D10_COUNTER_TYPE_UINT32 + 1 ) 
+	D3D10_COUNTER_TYPE_UINT64	= ( D3D10_COUNTER_TYPE_UINT32 + 1 )
     } 	D3D10_COUNTER_TYPE;
 
 typedef struct D3D10_COUNTER_DESC
@@ -4777,73 +4777,73 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0022_v0_0_s_ifspec;
 #define __ID3D10Counter_INTERFACE_DEFINED__
 
 /* interface ID3D10Counter */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Counter;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C11-342C-4106-A19F-4F2704F689F0")
     ID3D10Counter : public ID3D10Asynchronous
     {
     public:
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10CounterVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Counter * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Counter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Counter * This);
-        
-        void ( STDMETHODCALLTYPE *GetDevice )( 
+
+        void ( STDMETHODCALLTYPE *GetDevice )(
             ID3D10Counter * This,
             /* [retval][out] */ ID3D10Device **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Counter * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Counter * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Counter * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *Begin )( 
+
+        void ( STDMETHODCALLTYPE *Begin )(
             ID3D10Counter * This);
-        
-        void ( STDMETHODCALLTYPE *End )( 
+
+        void ( STDMETHODCALLTYPE *End )(
             ID3D10Counter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetData )(
             ID3D10Counter * This,
             /* [size_is][out] */ void *pData,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ UINT Flags);
-        
-        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )( 
+
+        SIZE_T ( STDMETHODCALLTYPE *GetDataSize )(
             ID3D10Counter * This);
-        
+
         END_INTERFACE
     } ID3D10CounterVtbl;
 
@@ -4852,45 +4852,45 @@ EXTERN_C const IID IID_ID3D10Counter;
         CONST_VTBL struct ID3D10CounterVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Counter_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Counter_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Counter_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Counter_GetDevice(This,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,ppDevice) )
 
 #define ID3D10Counter_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Counter_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Counter_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 
 #define ID3D10Counter_Begin(This)	\
-    ( (This)->lpVtbl -> Begin(This) ) 
+    ( (This)->lpVtbl -> Begin(This) )
 
 #define ID3D10Counter_End(This)	\
-    ( (This)->lpVtbl -> End(This) ) 
+    ( (This)->lpVtbl -> End(This) )
 
 #define ID3D10Counter_GetData(This,pData,DataSize,Flags)	\
-    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) ) 
+    ( (This)->lpVtbl -> GetData(This,pData,DataSize,Flags) )
 
 #define ID3D10Counter_GetDataSize(This)	\
-    ( (This)->lpVtbl -> GetDataSize(This) ) 
+    ( (This)->lpVtbl -> GetDataSize(This) )
 
 
 #endif /* COBJMACROS */
@@ -4908,938 +4908,938 @@ EXTERN_C const IID IID_ID3D10Counter;
 #define __ID3D10Device_INTERFACE_DEFINED__
 
 /* interface ID3D10Device */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Device;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4C0F-342C-4106-A19F-4F2704F689F0")
     ID3D10Device : public IUnknown
     {
     public:
-        virtual void STDMETHODCALLTYPE VSSetConstantBuffers( 
+        virtual void STDMETHODCALLTYPE VSSetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSSetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE PSSetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSSetShader( 
+
+        virtual void STDMETHODCALLTYPE PSSetShader(
             /* [in] */ ID3D10PixelShader *pPixelShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSSetSamplers( 
+
+        virtual void STDMETHODCALLTYPE PSSetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSSetShader( 
+
+        virtual void STDMETHODCALLTYPE VSSetShader(
             /* [in] */ ID3D10VertexShader *pVertexShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE DrawIndexed( 
+
+        virtual void STDMETHODCALLTYPE DrawIndexed(
             /* [in] */ UINT IndexCount,
             /* [in] */ UINT StartIndexLocation,
             /* [in] */ INT BaseVertexLocation) = 0;
-        
-        virtual void STDMETHODCALLTYPE Draw( 
+
+        virtual void STDMETHODCALLTYPE Draw(
             /* [in] */ UINT VertexCount,
             /* [in] */ UINT StartVertexLocation) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSSetConstantBuffers( 
+
+        virtual void STDMETHODCALLTYPE PSSetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE IASetInputLayout( 
+
+        virtual void STDMETHODCALLTYPE IASetInputLayout(
             /* [in] */ ID3D10InputLayout *pInputLayout) = 0;
-        
-        virtual void STDMETHODCALLTYPE IASetVertexBuffers( 
+
+        virtual void STDMETHODCALLTYPE IASetVertexBuffers(
             /* [in] */ UINT StartSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppVertexBuffers,
             /* [size_is][in] */ const UINT *pStrides,
             /* [size_is][in] */ const UINT *pOffsets) = 0;
-        
-        virtual void STDMETHODCALLTYPE IASetIndexBuffer( 
+
+        virtual void STDMETHODCALLTYPE IASetIndexBuffer(
             /* [in] */ ID3D10Buffer *pIndexBuffer,
             /* [in] */ DXGI_FORMAT Format,
             /* [in] */ UINT Offset) = 0;
-        
-        virtual void STDMETHODCALLTYPE DrawIndexedInstanced( 
+
+        virtual void STDMETHODCALLTYPE DrawIndexedInstanced(
             /* [in] */ UINT IndexCountPerInstance,
             /* [in] */ UINT InstanceCount,
             /* [in] */ UINT StartIndexLocation,
             /* [in] */ INT BaseVertexLocation,
             /* [in] */ UINT StartInstanceLocation) = 0;
-        
-        virtual void STDMETHODCALLTYPE DrawInstanced( 
+
+        virtual void STDMETHODCALLTYPE DrawInstanced(
             /* [in] */ UINT VertexCountPerInstance,
             /* [in] */ UINT InstanceCount,
             /* [in] */ UINT StartVertexLocation,
             /* [in] */ UINT StartInstanceLocation) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSSetConstantBuffers( 
+
+        virtual void STDMETHODCALLTYPE GSSetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSSetShader( 
+
+        virtual void STDMETHODCALLTYPE GSSetShader(
             /* [in] */ ID3D10GeometryShader *pShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( 
+
+        virtual void STDMETHODCALLTYPE IASetPrimitiveTopology(
             /* [in] */ D3D10_PRIMITIVE_TOPOLOGY Topology) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSSetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE VSSetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSSetSamplers( 
+
+        virtual void STDMETHODCALLTYPE VSSetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE SetPredication( 
+
+        virtual void STDMETHODCALLTYPE SetPredication(
             /* [in] */ ID3D10Predicate *pPredicate,
             /* [in] */ BOOL PredicateValue) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSSetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE GSSetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSSetSamplers( 
+
+        virtual void STDMETHODCALLTYPE GSSetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMSetRenderTargets( 
+
+        virtual void STDMETHODCALLTYPE OMSetRenderTargets(
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10RenderTargetView *const *ppRenderTargetViews,
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMSetBlendState( 
+
+        virtual void STDMETHODCALLTYPE OMSetBlendState(
             /* [in] */ ID3D10BlendState *pBlendState,
             /* [in] */ const FLOAT BlendFactor[ 4 ],
             /* [in] */ UINT SampleMask) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMSetDepthStencilState( 
+
+        virtual void STDMETHODCALLTYPE OMSetDepthStencilState(
             /* [in] */ ID3D10DepthStencilState *pDepthStencilState,
             /* [in] */ UINT StencilRef) = 0;
-        
-        virtual void STDMETHODCALLTYPE SOSetTargets( 
+
+        virtual void STDMETHODCALLTYPE SOSetTargets(
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppSOTargets,
             /* [size_is][in] */ const UINT *pOffsets) = 0;
-        
+
         virtual void STDMETHODCALLTYPE DrawAuto( void) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSSetState( 
+
+        virtual void STDMETHODCALLTYPE RSSetState(
             /* [in] */ ID3D10RasterizerState *pRasterizerState) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSSetViewports( 
+
+        virtual void STDMETHODCALLTYPE RSSetViewports(
             /* [in] */ UINT NumViewports,
             /* [size_is][in] */ const D3D10_VIEWPORT *pViewports) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSSetScissorRects( 
+
+        virtual void STDMETHODCALLTYPE RSSetScissorRects(
             /* [in] */ UINT NumRects,
             /* [size_is][in] */ const D3D10_RECT *pRects) = 0;
-        
-        virtual void STDMETHODCALLTYPE ClearRenderTargetView( 
+
+        virtual void STDMETHODCALLTYPE ClearRenderTargetView(
             /* [in] */ ID3D10RenderTargetView *pRenderTargetView,
             /* [in] */ const FLOAT ColorRGBA[ 4 ]) = 0;
-        
-        virtual void STDMETHODCALLTYPE ClearDepthStencilView( 
+
+        virtual void STDMETHODCALLTYPE ClearDepthStencilView(
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView,
             /* [in] */ UINT Flags,
             /* [in] */ FLOAT Depth,
             /* [in] */ UINT8 Stencil) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GenerateMips( 
+
+        virtual HRESULT STDMETHODCALLTYPE GenerateMips(
             /* [in] */ ID3D10ShaderResourceView *pShaderResourceView) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSGetConstantBuffers( 
+
+        virtual void STDMETHODCALLTYPE VSGetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSGetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE PSGetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSGetShader( 
+
+        virtual void STDMETHODCALLTYPE PSGetShader(
             /* [out][in] */ ID3D10PixelShader **ppPixelShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSGetSamplers( 
+
+        virtual void STDMETHODCALLTYPE PSGetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSGetShader( 
+
+        virtual void STDMETHODCALLTYPE VSGetShader(
             /* [out][in] */ ID3D10VertexShader **ppVertexShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE PSGetConstantBuffers( 
+
+        virtual void STDMETHODCALLTYPE PSGetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE IAGetInputLayout( 
+
+        virtual void STDMETHODCALLTYPE IAGetInputLayout(
             /* [out][in] */ ID3D10InputLayout **ppInputLayout) = 0;
-        
-        virtual void STDMETHODCALLTYPE IAGetVertexBuffers( 
+
+        virtual void STDMETHODCALLTYPE IAGetVertexBuffers(
             /* [in] */ UINT StartSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppVertexBuffers,
             /* [size_is][out] */ UINT *pStrides,
             /* [size_is][out] */ UINT *pOffsets) = 0;
-        
-        virtual void STDMETHODCALLTYPE IAGetIndexBuffer( 
+
+        virtual void STDMETHODCALLTYPE IAGetIndexBuffer(
             /* [out] */ ID3D10Buffer **pIndexBuffer,
             /* [out] */ DXGI_FORMAT *Format,
             /* [out] */ UINT *Offset) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSGetConstantBuffers( 
+
+        virtual void STDMETHODCALLTYPE GSGetConstantBuffers(
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSGetShader( 
+
+        virtual void STDMETHODCALLTYPE GSGetShader(
             /* [out] */ ID3D10GeometryShader **ppGeometryShader) = 0;
-        
-        virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology( 
+
+        virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology(
             /* [out] */ D3D10_PRIMITIVE_TOPOLOGY *pTopology) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSGetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE VSGetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE VSGetSamplers( 
+
+        virtual void STDMETHODCALLTYPE VSGetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetPredication( 
+
+        virtual void STDMETHODCALLTYPE GetPredication(
             /* [out] */ ID3D10Predicate **ppPredicate,
             /* [out] */ BOOL *pPredicateValue) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSGetShaderResources( 
+
+        virtual void STDMETHODCALLTYPE GSGetShaderResources(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews) = 0;
-        
-        virtual void STDMETHODCALLTYPE GSGetSamplers( 
+
+        virtual void STDMETHODCALLTYPE GSGetSamplers(
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMGetRenderTargets( 
+
+        virtual void STDMETHODCALLTYPE OMGetRenderTargets(
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10RenderTargetView **ppRenderTargetViews,
             /* [out] */ ID3D10DepthStencilView **ppDepthStencilView) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMGetBlendState( 
+
+        virtual void STDMETHODCALLTYPE OMGetBlendState(
             /* [out] */ ID3D10BlendState **ppBlendState,
             /* [out] */ FLOAT BlendFactor[ 4 ],
             /* [out] */ UINT *pSampleMask) = 0;
-        
-        virtual void STDMETHODCALLTYPE OMGetDepthStencilState( 
+
+        virtual void STDMETHODCALLTYPE OMGetDepthStencilState(
             /* [out] */ ID3D10DepthStencilState **ppDepthStencilState,
             /* [out] */ UINT *pStencilRef) = 0;
-        
-        virtual void STDMETHODCALLTYPE SOGetTargets( 
+
+        virtual void STDMETHODCALLTYPE SOGetTargets(
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppSOTargets,
             /* [size_is][out] */ UINT *pOffsets) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSGetState( 
+
+        virtual void STDMETHODCALLTYPE RSGetState(
             /* [out] */ ID3D10RasterizerState **ppRasterizerState) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSGetViewports( 
+
+        virtual void STDMETHODCALLTYPE RSGetViewports(
             /* [out][in] */ UINT *NumViewports,
             /* [size_is][out] */ D3D10_VIEWPORT *pViewports) = 0;
-        
-        virtual void STDMETHODCALLTYPE RSGetScissorRects( 
+
+        virtual void STDMETHODCALLTYPE RSGetScissorRects(
             /* [out][in] */ UINT *NumRects,
             /* [size_is][out] */ D3D10_RECT *pRects) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetExceptionMode( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetExceptionMode(
             UINT RaiseFlags) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetExceptionMode( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetPrivateData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateData( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData) = 0;
-        
+
         virtual void STDMETHODCALLTYPE Enter( void) = 0;
-        
+
         virtual void STDMETHODCALLTYPE Leave( void) = 0;
-        
+
         virtual void STDMETHODCALLTYPE Flush( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateBuffer( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateBuffer(
             /* [in] */ const D3D10_BUFFER_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Buffer **ppBuffer) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateTexture1D( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateTexture1D(
             /* [in] */ const D3D10_TEXTURE1D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture1D **ppTexture1D) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateTexture2D( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateTexture2D(
             /* [in] */ const D3D10_TEXTURE2D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture2D **ppTexture2D) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateTexture3D( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateTexture3D(
             /* [in] */ const D3D10_TEXTURE3D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture3D **ppTexture3D) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateTextureCube( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateTextureCube(
             /* [in] */ const D3D10_TEXTURECUBE_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10TextureCube **ppTextureCube) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView(
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc,
             /* [out] */ ID3D10ShaderResourceView **ppSRView) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView(
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_RENDER_TARGET_VIEW_DESC *pDesc,
             /* [out] */ ID3D10RenderTargetView **ppRTView) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView(
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc,
             /* [out] */ ID3D10DepthStencilView **ppDepthStencilView) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateInputLayout( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateInputLayout(
             /* [size_is][in] */ const D3D10_INPUT_ELEMENT_DESC *pInputElementDescs,
             /* [in] */ UINT NumElements,
             /* [in] */ const void *pShaderBytecodeWithInputSignature,
             /* [out] */ ID3D10InputLayout **ppInputLayout) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateVertexShader( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateVertexShader(
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10VertexShader **ppVertexShader) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader(
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10GeometryShader **ppGeometryShader) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput(
             /* [in] */ const void *pShaderBytecode,
             /* [size_is][in] */ const D3D10_SO_DECLARATION_ENTRY *pSODeclaration,
             /* [in] */ UINT NumEntries,
             /* [in] */ UINT OutputStreamStride,
             /* [out] */ ID3D10GeometryShader **ppGeometryShader) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreatePixelShader( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreatePixelShader(
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10PixelShader **ppPixelShader) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateBlendState( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateBlendState(
             /* [in] */ const D3D10_BLEND_DESC *pBlendStateDesc,
             /* [out] */ ID3D10BlendState **ppBlendState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState(
             /* [in] */ const D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc,
             /* [out] */ ID3D10DepthStencilState **ppDepthStencilState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState(
             /* [in] */ const D3D10_RASTERIZER_DESC *pRasterizerDesc,
             /* [out] */ ID3D10RasterizerState **ppRasterizerState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSamplerState( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateSamplerState(
             /* [in] */ const D3D10_SAMPLER_DESC *pSamplerDesc,
             /* [out] */ ID3D10SamplerState **ppSamplerState) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateQuery( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateQuery(
             /* [in] */ const D3D10_QUERY_DESC *pQueryDesc,
             /* [out] */ ID3D10Query **ppQuery) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreatePredicate( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreatePredicate(
             /* [in] */ const D3D10_QUERY_DESC *pPredicateDesc,
             /* [out] */ ID3D10Predicate **ppPredicate) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateCounter( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateCounter(
             /* [in] */ const D3D10_COUNTER_DESC *pCounterDesc,
             /* [out] */ ID3D10Counter **ppCounter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport( 
+
+        virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport(
             /* [in] */ DXGI_FORMAT Format,
             /* [retval][out] */ UINT *pFormatSupport) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels( 
+
+        virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels(
             /* [in] */ UINT SampleCount,
             /* [retval][out] */ UINT *pNumQualityLevels) = 0;
-        
-        virtual void STDMETHODCALLTYPE CheckVertexCache( 
+
+        virtual void STDMETHODCALLTYPE CheckVertexCache(
             /* [out] */ D3D10_VERTEX_CACHE_DESC *pVertexCacheDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE CheckCounterInfo( 
+
+        virtual void STDMETHODCALLTYPE CheckCounterInfo(
             /* [retval][out] */ D3D10_COUNTER_INFO *pCounterInfo) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckCounter( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE CheckCounter(
+            /*  */
             __in  const D3D10_COUNTER_DESC *pDesc,
-            /*  */ 
+            /*  */
             __out  D3D10_COUNTER_TYPE *pType,
-            /*  */ 
+            /*  */
             __out  UINT *pActiveCounters,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pNameLength)  LPWSTR wszName,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pNameLength,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pUnitsLength)  LPWSTR wszUnits,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pUnitsLength,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pDescriptionLength)  LPWSTR wszDescription,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pDescriptionLength) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetCreationFlags( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10DeviceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Device * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Device * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Device * This);
-        
-        void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *VSSetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *PSSetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *PSSetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *PSSetShader )( 
+
+        void ( STDMETHODCALLTYPE *PSSetShader )(
             ID3D10Device * This,
             /* [in] */ ID3D10PixelShader *pPixelShader);
-        
-        void ( STDMETHODCALLTYPE *PSSetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *PSSetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *VSSetShader )( 
+
+        void ( STDMETHODCALLTYPE *VSSetShader )(
             ID3D10Device * This,
             /* [in] */ ID3D10VertexShader *pVertexShader);
-        
-        void ( STDMETHODCALLTYPE *DrawIndexed )( 
+
+        void ( STDMETHODCALLTYPE *DrawIndexed )(
             ID3D10Device * This,
             /* [in] */ UINT IndexCount,
             /* [in] */ UINT StartIndexLocation,
             /* [in] */ INT BaseVertexLocation);
-        
-        void ( STDMETHODCALLTYPE *Draw )( 
+
+        void ( STDMETHODCALLTYPE *Draw )(
             ID3D10Device * This,
             /* [in] */ UINT VertexCount,
             /* [in] */ UINT StartVertexLocation);
-        
-        void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *PSSetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *IASetInputLayout )( 
+
+        void ( STDMETHODCALLTYPE *IASetInputLayout )(
             ID3D10Device * This,
             /* [in] */ ID3D10InputLayout *pInputLayout);
-        
-        void ( STDMETHODCALLTYPE *IASetVertexBuffers )( 
+
+        void ( STDMETHODCALLTYPE *IASetVertexBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppVertexBuffers,
             /* [size_is][in] */ const UINT *pStrides,
             /* [size_is][in] */ const UINT *pOffsets);
-        
-        void ( STDMETHODCALLTYPE *IASetIndexBuffer )( 
+
+        void ( STDMETHODCALLTYPE *IASetIndexBuffer )(
             ID3D10Device * This,
             /* [in] */ ID3D10Buffer *pIndexBuffer,
             /* [in] */ DXGI_FORMAT Format,
             /* [in] */ UINT Offset);
-        
-        void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( 
+
+        void ( STDMETHODCALLTYPE *DrawIndexedInstanced )(
             ID3D10Device * This,
             /* [in] */ UINT IndexCountPerInstance,
             /* [in] */ UINT InstanceCount,
             /* [in] */ UINT StartIndexLocation,
             /* [in] */ INT BaseVertexLocation,
             /* [in] */ UINT StartInstanceLocation);
-        
-        void ( STDMETHODCALLTYPE *DrawInstanced )( 
+
+        void ( STDMETHODCALLTYPE *DrawInstanced )(
             ID3D10Device * This,
             /* [in] */ UINT VertexCountPerInstance,
             /* [in] */ UINT InstanceCount,
             /* [in] */ UINT StartVertexLocation,
             /* [in] */ UINT StartInstanceLocation);
-        
-        void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *GSSetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *GSSetShader )( 
+
+        void ( STDMETHODCALLTYPE *GSSetShader )(
             ID3D10Device * This,
             /* [in] */ ID3D10GeometryShader *pShader);
-        
-        void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( 
+
+        void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )(
             ID3D10Device * This,
             /* [in] */ D3D10_PRIMITIVE_TOPOLOGY Topology);
-        
-        void ( STDMETHODCALLTYPE *VSSetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *VSSetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *VSSetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *VSSetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *SetPredication )( 
+
+        void ( STDMETHODCALLTYPE *SetPredication )(
             ID3D10Device * This,
             /* [in] */ ID3D10Predicate *pPredicate,
             /* [in] */ BOOL PredicateValue);
-        
-        void ( STDMETHODCALLTYPE *GSSetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *GSSetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10ShaderResourceView *const *ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *GSSetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *GSSetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][in] */ ID3D10SamplerState *const *ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *OMSetRenderTargets )( 
+
+        void ( STDMETHODCALLTYPE *OMSetRenderTargets )(
             ID3D10Device * This,
             /* [in] */ UINT NumViews,
             /* [size_is][in] */ ID3D10RenderTargetView *const *ppRenderTargetViews,
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView);
-        
-        void ( STDMETHODCALLTYPE *OMSetBlendState )( 
+
+        void ( STDMETHODCALLTYPE *OMSetBlendState )(
             ID3D10Device * This,
             /* [in] */ ID3D10BlendState *pBlendState,
             /* [in] */ const FLOAT BlendFactor[ 4 ],
             /* [in] */ UINT SampleMask);
-        
-        void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( 
+
+        void ( STDMETHODCALLTYPE *OMSetDepthStencilState )(
             ID3D10Device * This,
             /* [in] */ ID3D10DepthStencilState *pDepthStencilState,
             /* [in] */ UINT StencilRef);
-        
-        void ( STDMETHODCALLTYPE *SOSetTargets )( 
+
+        void ( STDMETHODCALLTYPE *SOSetTargets )(
             ID3D10Device * This,
             /* [in] */ UINT NumBuffers,
             /* [size_is][in] */ ID3D10Buffer *const *ppSOTargets,
             /* [size_is][in] */ const UINT *pOffsets);
-        
-        void ( STDMETHODCALLTYPE *DrawAuto )( 
+
+        void ( STDMETHODCALLTYPE *DrawAuto )(
             ID3D10Device * This);
-        
-        void ( STDMETHODCALLTYPE *RSSetState )( 
+
+        void ( STDMETHODCALLTYPE *RSSetState )(
             ID3D10Device * This,
             /* [in] */ ID3D10RasterizerState *pRasterizerState);
-        
-        void ( STDMETHODCALLTYPE *RSSetViewports )( 
+
+        void ( STDMETHODCALLTYPE *RSSetViewports )(
             ID3D10Device * This,
             /* [in] */ UINT NumViewports,
             /* [size_is][in] */ const D3D10_VIEWPORT *pViewports);
-        
-        void ( STDMETHODCALLTYPE *RSSetScissorRects )( 
+
+        void ( STDMETHODCALLTYPE *RSSetScissorRects )(
             ID3D10Device * This,
             /* [in] */ UINT NumRects,
             /* [size_is][in] */ const D3D10_RECT *pRects);
-        
-        void ( STDMETHODCALLTYPE *ClearRenderTargetView )( 
+
+        void ( STDMETHODCALLTYPE *ClearRenderTargetView )(
             ID3D10Device * This,
             /* [in] */ ID3D10RenderTargetView *pRenderTargetView,
             /* [in] */ const FLOAT ColorRGBA[ 4 ]);
-        
-        void ( STDMETHODCALLTYPE *ClearDepthStencilView )( 
+
+        void ( STDMETHODCALLTYPE *ClearDepthStencilView )(
             ID3D10Device * This,
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView,
             /* [in] */ UINT Flags,
             /* [in] */ FLOAT Depth,
             /* [in] */ UINT8 Stencil);
-        
-        HRESULT ( STDMETHODCALLTYPE *GenerateMips )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GenerateMips )(
             ID3D10Device * This,
             /* [in] */ ID3D10ShaderResourceView *pShaderResourceView);
-        
-        void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *VSGetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *PSGetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *PSGetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *PSGetShader )( 
+
+        void ( STDMETHODCALLTYPE *PSGetShader )(
             ID3D10Device * This,
             /* [out][in] */ ID3D10PixelShader **ppPixelShader);
-        
-        void ( STDMETHODCALLTYPE *PSGetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *PSGetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *VSGetShader )( 
+
+        void ( STDMETHODCALLTYPE *VSGetShader )(
             ID3D10Device * This,
             /* [out][in] */ ID3D10VertexShader **ppVertexShader);
-        
-        void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *PSGetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *IAGetInputLayout )( 
+
+        void ( STDMETHODCALLTYPE *IAGetInputLayout )(
             ID3D10Device * This,
             /* [out][in] */ ID3D10InputLayout **ppInputLayout);
-        
-        void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( 
+
+        void ( STDMETHODCALLTYPE *IAGetVertexBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppVertexBuffers,
             /* [size_is][out] */ UINT *pStrides,
             /* [size_is][out] */ UINT *pOffsets);
-        
-        void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( 
+
+        void ( STDMETHODCALLTYPE *IAGetIndexBuffer )(
             ID3D10Device * This,
             /* [out] */ ID3D10Buffer **pIndexBuffer,
             /* [out] */ DXGI_FORMAT *Format,
             /* [out] */ UINT *Offset);
-        
-        void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( 
+
+        void ( STDMETHODCALLTYPE *GSGetConstantBuffers )(
             ID3D10Device * This,
             /* [in] */ UINT StartConstantSlot,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppConstantBuffers);
-        
-        void ( STDMETHODCALLTYPE *GSGetShader )( 
+
+        void ( STDMETHODCALLTYPE *GSGetShader )(
             ID3D10Device * This,
             /* [out] */ ID3D10GeometryShader **ppGeometryShader);
-        
-        void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( 
+
+        void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )(
             ID3D10Device * This,
             /* [out] */ D3D10_PRIMITIVE_TOPOLOGY *pTopology);
-        
-        void ( STDMETHODCALLTYPE *VSGetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *VSGetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *VSGetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *VSGetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *GetPredication )( 
+
+        void ( STDMETHODCALLTYPE *GetPredication )(
             ID3D10Device * This,
             /* [out] */ ID3D10Predicate **ppPredicate,
             /* [out] */ BOOL *pPredicateValue);
-        
-        void ( STDMETHODCALLTYPE *GSGetShaderResources )( 
+
+        void ( STDMETHODCALLTYPE *GSGetShaderResources )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10ShaderResourceView **ppShaderResourceViews);
-        
-        void ( STDMETHODCALLTYPE *GSGetSamplers )( 
+
+        void ( STDMETHODCALLTYPE *GSGetSamplers )(
             ID3D10Device * This,
             /* [in] */ UINT Offset,
             /* [in] */ UINT NumSamplers,
             /* [size_is][out] */ ID3D10SamplerState **ppSamplers);
-        
-        void ( STDMETHODCALLTYPE *OMGetRenderTargets )( 
+
+        void ( STDMETHODCALLTYPE *OMGetRenderTargets )(
             ID3D10Device * This,
             /* [in] */ UINT NumViews,
             /* [size_is][out] */ ID3D10RenderTargetView **ppRenderTargetViews,
             /* [out] */ ID3D10DepthStencilView **ppDepthStencilView);
-        
-        void ( STDMETHODCALLTYPE *OMGetBlendState )( 
+
+        void ( STDMETHODCALLTYPE *OMGetBlendState )(
             ID3D10Device * This,
             /* [out] */ ID3D10BlendState **ppBlendState,
             /* [out] */ FLOAT BlendFactor[ 4 ],
             /* [out] */ UINT *pSampleMask);
-        
-        void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( 
+
+        void ( STDMETHODCALLTYPE *OMGetDepthStencilState )(
             ID3D10Device * This,
             /* [out] */ ID3D10DepthStencilState **ppDepthStencilState,
             /* [out] */ UINT *pStencilRef);
-        
-        void ( STDMETHODCALLTYPE *SOGetTargets )( 
+
+        void ( STDMETHODCALLTYPE *SOGetTargets )(
             ID3D10Device * This,
             /* [in] */ UINT NumBuffers,
             /* [size_is][out] */ ID3D10Buffer **ppSOTargets,
             /* [size_is][out] */ UINT *pOffsets);
-        
-        void ( STDMETHODCALLTYPE *RSGetState )( 
+
+        void ( STDMETHODCALLTYPE *RSGetState )(
             ID3D10Device * This,
             /* [out] */ ID3D10RasterizerState **ppRasterizerState);
-        
-        void ( STDMETHODCALLTYPE *RSGetViewports )( 
+
+        void ( STDMETHODCALLTYPE *RSGetViewports )(
             ID3D10Device * This,
             /* [out][in] */ UINT *NumViewports,
             /* [size_is][out] */ D3D10_VIEWPORT *pViewports);
-        
-        void ( STDMETHODCALLTYPE *RSGetScissorRects )( 
+
+        void ( STDMETHODCALLTYPE *RSGetScissorRects )(
             ID3D10Device * This,
             /* [out][in] */ UINT *NumRects,
             /* [size_is][out] */ D3D10_RECT *pRects);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )(
             ID3D10Device * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )(
             ID3D10Device * This,
             UINT RaiseFlags);
-        
-        UINT ( STDMETHODCALLTYPE *GetExceptionMode )( 
+
+        UINT ( STDMETHODCALLTYPE *GetExceptionMode )(
             ID3D10Device * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             ID3D10Device * This,
             /* [in] */ REFGUID guid,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [size_is][out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             ID3D10Device * This,
             /* [in] */ REFGUID guid,
             /* [in] */ SIZE_T DataSize,
             /* [size_is][in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             ID3D10Device * This,
             /* [in] */ REFGUID guid,
             /* [in] */ const IUnknown *pData);
-        
-        void ( STDMETHODCALLTYPE *Enter )( 
+
+        void ( STDMETHODCALLTYPE *Enter )(
             ID3D10Device * This);
-        
-        void ( STDMETHODCALLTYPE *Leave )( 
+
+        void ( STDMETHODCALLTYPE *Leave )(
             ID3D10Device * This);
-        
-        void ( STDMETHODCALLTYPE *Flush )( 
+
+        void ( STDMETHODCALLTYPE *Flush )(
             ID3D10Device * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateBuffer )(
             ID3D10Device * This,
             /* [in] */ const D3D10_BUFFER_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Buffer **ppBuffer);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )(
             ID3D10Device * This,
             /* [in] */ const D3D10_TEXTURE1D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture1D **ppTexture1D);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )(
             ID3D10Device * This,
             /* [in] */ const D3D10_TEXTURE2D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture2D **ppTexture2D);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )(
             ID3D10Device * This,
             /* [in] */ const D3D10_TEXTURE3D_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10Texture3D **ppTexture3D);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateTextureCube )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateTextureCube )(
             ID3D10Device * This,
             /* [in] */ const D3D10_TEXTURECUBE_DESC *pDesc,
             /* [in] */ const D3D10_SUBRESOURCE_UP *pInitialData,
             /* [out] */ ID3D10TextureCube **ppTextureCube);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )(
             ID3D10Device * This,
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc,
             /* [out] */ ID3D10ShaderResourceView **ppSRView);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )(
             ID3D10Device * This,
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_RENDER_TARGET_VIEW_DESC *pDesc,
             /* [out] */ ID3D10RenderTargetView **ppRTView);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )(
             ID3D10Device * This,
             /* [in] */ ID3D10Resource *pResource,
             /* [in] */ const D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc,
             /* [out] */ ID3D10DepthStencilView **ppDepthStencilView);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )(
             ID3D10Device * This,
             /* [size_is][in] */ const D3D10_INPUT_ELEMENT_DESC *pInputElementDescs,
             /* [in] */ UINT NumElements,
             /* [in] */ const void *pShaderBytecodeWithInputSignature,
             /* [out] */ ID3D10InputLayout **ppInputLayout);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )(
             ID3D10Device * This,
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10VertexShader **ppVertexShader);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )(
             ID3D10Device * This,
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10GeometryShader **ppGeometryShader);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )(
             ID3D10Device * This,
             /* [in] */ const void *pShaderBytecode,
             /* [size_is][in] */ const D3D10_SO_DECLARATION_ENTRY *pSODeclaration,
             /* [in] */ UINT NumEntries,
             /* [in] */ UINT OutputStreamStride,
             /* [out] */ ID3D10GeometryShader **ppGeometryShader);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )(
             ID3D10Device * This,
             /* [in] */ const void *pShaderBytecode,
             /* [out] */ ID3D10PixelShader **ppPixelShader);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateBlendState )(
             ID3D10Device * This,
             /* [in] */ const D3D10_BLEND_DESC *pBlendStateDesc,
             /* [out] */ ID3D10BlendState **ppBlendState);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )(
             ID3D10Device * This,
             /* [in] */ const D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc,
             /* [out] */ ID3D10DepthStencilState **ppDepthStencilState);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )(
             ID3D10Device * This,
             /* [in] */ const D3D10_RASTERIZER_DESC *pRasterizerDesc,
             /* [out] */ ID3D10RasterizerState **ppRasterizerState);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )(
             ID3D10Device * This,
             /* [in] */ const D3D10_SAMPLER_DESC *pSamplerDesc,
             /* [out] */ ID3D10SamplerState **ppSamplerState);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateQuery )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateQuery )(
             ID3D10Device * This,
             /* [in] */ const D3D10_QUERY_DESC *pQueryDesc,
             /* [out] */ ID3D10Query **ppQuery);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreatePredicate )(
             ID3D10Device * This,
             /* [in] */ const D3D10_QUERY_DESC *pPredicateDesc,
             /* [out] */ ID3D10Predicate **ppPredicate);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateCounter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateCounter )(
             ID3D10Device * This,
             /* [in] */ const D3D10_COUNTER_DESC *pCounterDesc,
             /* [out] */ ID3D10Counter **ppCounter);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )(
             ID3D10Device * This,
             /* [in] */ DXGI_FORMAT Format,
             /* [retval][out] */ UINT *pFormatSupport);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )(
             ID3D10Device * This,
             /* [in] */ UINT SampleCount,
             /* [retval][out] */ UINT *pNumQualityLevels);
-        
-        void ( STDMETHODCALLTYPE *CheckVertexCache )( 
+
+        void ( STDMETHODCALLTYPE *CheckVertexCache )(
             ID3D10Device * This,
             /* [out] */ D3D10_VERTEX_CACHE_DESC *pVertexCacheDesc);
-        
-        void ( STDMETHODCALLTYPE *CheckCounterInfo )( 
+
+        void ( STDMETHODCALLTYPE *CheckCounterInfo )(
             ID3D10Device * This,
             /* [retval][out] */ D3D10_COUNTER_INFO *pCounterInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckCounter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CheckCounter )(
             ID3D10Device * This,
-            /*  */ 
+            /*  */
             __in  const D3D10_COUNTER_DESC *pDesc,
-            /*  */ 
+            /*  */
             __out  D3D10_COUNTER_TYPE *pType,
-            /*  */ 
+            /*  */
             __out  UINT *pActiveCounters,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pNameLength)  LPWSTR wszName,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pNameLength,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pUnitsLength)  LPWSTR wszUnits,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pUnitsLength,
-            /*  */ 
+            /*  */
             __out_ecount_opt(*pDescriptionLength)  LPWSTR wszDescription,
-            /*  */ 
+            /*  */
             __inout_opt  SIZE_T *pDescriptionLength);
-        
-        UINT ( STDMETHODCALLTYPE *GetCreationFlags )( 
+
+        UINT ( STDMETHODCALLTYPE *GetCreationFlags )(
             ID3D10Device * This);
-        
+
         END_INTERFACE
     } ID3D10DeviceVtbl;
 
@@ -5848,293 +5848,293 @@ EXTERN_C const IID IID_ID3D10Device;
         CONST_VTBL struct ID3D10DeviceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Device_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Device_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Device_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Device_VSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_PSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> PSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> PSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_PSSetShader(This,pPixelShader)	\
-    ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) ) 
+    ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) )
 
 #define ID3D10Device_PSSetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> PSSetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> PSSetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_VSSetShader(This,pVertexShader)	\
-    ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) ) 
+    ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) )
 
 #define ID3D10Device_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation)	\
-    ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) 
+    ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) )
 
 #define ID3D10Device_Draw(This,VertexCount,StartVertexLocation)	\
-    ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) 
+    ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) )
 
 #define ID3D10Device_PSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_IASetInputLayout(This,pInputLayout)	\
-    ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) 
+    ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) )
 
 #define ID3D10Device_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets)	\
-    ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) 
+    ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) )
 
 #define ID3D10Device_IASetIndexBuffer(This,pIndexBuffer,Format,Offset)	\
-    ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) 
+    ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) )
 
 #define ID3D10Device_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation)	\
-    ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) 
+    ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) )
 
 #define ID3D10Device_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation)	\
-    ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) 
+    ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) )
 
 #define ID3D10Device_GSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_GSSetShader(This,pShader)	\
-    ( (This)->lpVtbl -> GSSetShader(This,pShader) ) 
+    ( (This)->lpVtbl -> GSSetShader(This,pShader) )
 
 #define ID3D10Device_IASetPrimitiveTopology(This,Topology)	\
-    ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) 
+    ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) )
 
 #define ID3D10Device_VSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> VSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> VSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_VSSetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> VSSetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> VSSetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_SetPredication(This,pPredicate,PredicateValue)	\
-    ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) 
+    ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) )
 
 #define ID3D10Device_GSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> GSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> GSSetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_GSSetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> GSSetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> GSSetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView)	\
-    ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) 
+    ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) )
 
 #define ID3D10Device_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask)	\
-    ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) 
+    ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) )
 
 #define ID3D10Device_OMSetDepthStencilState(This,pDepthStencilState,StencilRef)	\
-    ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) 
+    ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) )
 
 #define ID3D10Device_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets)	\
-    ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) 
+    ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) )
 
 #define ID3D10Device_DrawAuto(This)	\
-    ( (This)->lpVtbl -> DrawAuto(This) ) 
+    ( (This)->lpVtbl -> DrawAuto(This) )
 
 #define ID3D10Device_RSSetState(This,pRasterizerState)	\
-    ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) 
+    ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) )
 
 #define ID3D10Device_RSSetViewports(This,NumViewports,pViewports)	\
-    ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) 
+    ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) )
 
 #define ID3D10Device_RSSetScissorRects(This,NumRects,pRects)	\
-    ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) 
+    ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) )
 
 #define ID3D10Device_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA)	\
-    ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) 
+    ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) )
 
 #define ID3D10Device_ClearDepthStencilView(This,pDepthStencilView,Flags,Depth,Stencil)	\
-    ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,Flags,Depth,Stencil) ) 
+    ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,Flags,Depth,Stencil) )
 
 #define ID3D10Device_GenerateMips(This,pShaderResourceView)	\
-    ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) 
+    ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) )
 
 #define ID3D10Device_VSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_PSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> PSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> PSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_PSGetShader(This,ppPixelShader)	\
-    ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) ) 
+    ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) )
 
 #define ID3D10Device_PSGetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> PSGetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> PSGetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_VSGetShader(This,ppVertexShader)	\
-    ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) ) 
+    ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) )
 
 #define ID3D10Device_PSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_IAGetInputLayout(This,ppInputLayout)	\
-    ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) 
+    ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) )
 
 #define ID3D10Device_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets)	\
-    ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) 
+    ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) )
 
 #define ID3D10Device_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset)	\
-    ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) 
+    ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) )
 
 #define ID3D10Device_GSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers)	\
-    ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) ) 
+    ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartConstantSlot,NumBuffers,ppConstantBuffers) )
 
 #define ID3D10Device_GSGetShader(This,ppGeometryShader)	\
-    ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) ) 
+    ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) )
 
 #define ID3D10Device_IAGetPrimitiveTopology(This,pTopology)	\
-    ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) 
+    ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) )
 
 #define ID3D10Device_VSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> VSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> VSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_VSGetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> VSGetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> VSGetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_GetPredication(This,ppPredicate,pPredicateValue)	\
-    ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) 
+    ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) )
 
 #define ID3D10Device_GSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews)	\
-    ( (This)->lpVtbl -> GSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) ) 
+    ( (This)->lpVtbl -> GSGetShaderResources(This,Offset,NumViews,ppShaderResourceViews) )
 
 #define ID3D10Device_GSGetSamplers(This,Offset,NumSamplers,ppSamplers)	\
-    ( (This)->lpVtbl -> GSGetSamplers(This,Offset,NumSamplers,ppSamplers) ) 
+    ( (This)->lpVtbl -> GSGetSamplers(This,Offset,NumSamplers,ppSamplers) )
 
 #define ID3D10Device_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView)	\
-    ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) 
+    ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) )
 
 #define ID3D10Device_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask)	\
-    ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) 
+    ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) )
 
 #define ID3D10Device_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef)	\
-    ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) 
+    ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) )
 
 #define ID3D10Device_SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets)	\
-    ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) 
+    ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) )
 
 #define ID3D10Device_RSGetState(This,ppRasterizerState)	\
-    ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) 
+    ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) )
 
 #define ID3D10Device_RSGetViewports(This,NumViewports,pViewports)	\
-    ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) ) 
+    ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) )
 
 #define ID3D10Device_RSGetScissorRects(This,NumRects,pRects)	\
-    ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) ) 
+    ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) )
 
 #define ID3D10Device_GetDeviceRemovedReason(This)	\
-    ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) 
+    ( (This)->lpVtbl -> GetDeviceRemovedReason(This) )
 
 #define ID3D10Device_SetExceptionMode(This,RaiseFlags)	\
-    ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) 
+    ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) )
 
 #define ID3D10Device_GetExceptionMode(This)	\
-    ( (This)->lpVtbl -> GetExceptionMode(This) ) 
+    ( (This)->lpVtbl -> GetExceptionMode(This) )
 
 #define ID3D10Device_GetPrivateData(This,guid,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) )
 
 #define ID3D10Device_SetPrivateData(This,guid,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) )
 
 #define ID3D10Device_SetPrivateDataInterface(This,guid,pData)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) )
 
 #define ID3D10Device_Enter(This)	\
-    ( (This)->lpVtbl -> Enter(This) ) 
+    ( (This)->lpVtbl -> Enter(This) )
 
 #define ID3D10Device_Leave(This)	\
-    ( (This)->lpVtbl -> Leave(This) ) 
+    ( (This)->lpVtbl -> Leave(This) )
 
 #define ID3D10Device_Flush(This)	\
-    ( (This)->lpVtbl -> Flush(This) ) 
+    ( (This)->lpVtbl -> Flush(This) )
 
 #define ID3D10Device_CreateBuffer(This,pDesc,pInitialData,ppBuffer)	\
-    ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) 
+    ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) )
 
 #define ID3D10Device_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D)	\
-    ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) 
+    ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) )
 
 #define ID3D10Device_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D)	\
-    ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) 
+    ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) )
 
 #define ID3D10Device_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D)	\
-    ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) 
+    ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) )
 
 #define ID3D10Device_CreateTextureCube(This,pDesc,pInitialData,ppTextureCube)	\
-    ( (This)->lpVtbl -> CreateTextureCube(This,pDesc,pInitialData,ppTextureCube) ) 
+    ( (This)->lpVtbl -> CreateTextureCube(This,pDesc,pInitialData,ppTextureCube) )
 
 #define ID3D10Device_CreateShaderResourceView(This,pResource,pDesc,ppSRView)	\
-    ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) 
+    ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) )
 
 #define ID3D10Device_CreateRenderTargetView(This,pResource,pDesc,ppRTView)	\
-    ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) 
+    ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) )
 
 #define ID3D10Device_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView)	\
-    ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) 
+    ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) )
 
 #define ID3D10Device_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,ppInputLayout)	\
-    ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,ppInputLayout) ) 
+    ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,ppInputLayout) )
 
 #define ID3D10Device_CreateVertexShader(This,pShaderBytecode,ppVertexShader)	\
-    ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,ppVertexShader) ) 
+    ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,ppVertexShader) )
 
 #define ID3D10Device_CreateGeometryShader(This,pShaderBytecode,ppGeometryShader)	\
-    ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,ppGeometryShader) ) 
+    ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,ppGeometryShader) )
 
 #define ID3D10Device_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader)	\
-    ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) ) 
+    ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) )
 
 #define ID3D10Device_CreatePixelShader(This,pShaderBytecode,ppPixelShader)	\
-    ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,ppPixelShader) ) 
+    ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,ppPixelShader) )
 
 #define ID3D10Device_CreateBlendState(This,pBlendStateDesc,ppBlendState)	\
-    ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) 
+    ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) )
 
 #define ID3D10Device_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState)	\
-    ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) 
+    ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) )
 
 #define ID3D10Device_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState)	\
-    ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) 
+    ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) )
 
 #define ID3D10Device_CreateSamplerState(This,pSamplerDesc,ppSamplerState)	\
-    ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) 
+    ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) )
 
 #define ID3D10Device_CreateQuery(This,pQueryDesc,ppQuery)	\
-    ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) 
+    ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) )
 
 #define ID3D10Device_CreatePredicate(This,pPredicateDesc,ppPredicate)	\
-    ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) 
+    ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) )
 
 #define ID3D10Device_CreateCounter(This,pCounterDesc,ppCounter)	\
-    ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) 
+    ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) )
 
 #define ID3D10Device_CheckFormatSupport(This,Format,pFormatSupport)	\
-    ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) 
+    ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) )
 
 #define ID3D10Device_CheckMultisampleQualityLevels(This,SampleCount,pNumQualityLevels)	\
-    ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,SampleCount,pNumQualityLevels) ) 
+    ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,SampleCount,pNumQualityLevels) )
 
 #define ID3D10Device_CheckVertexCache(This,pVertexCacheDesc)	\
-    ( (This)->lpVtbl -> CheckVertexCache(This,pVertexCacheDesc) ) 
+    ( (This)->lpVtbl -> CheckVertexCache(This,pVertexCacheDesc) )
 
 #define ID3D10Device_CheckCounterInfo(This,pCounterInfo)	\
-    ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) 
+    ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) )
 
 #define ID3D10Device_CheckCounter(This,pDesc,pType,pActiveCounters,wszName,pNameLength,wszUnits,pUnitsLength,wszDescription,pDescriptionLength)	\
-    ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,wszName,pNameLength,wszUnits,pUnitsLength,wszDescription,pDescriptionLength) ) 
+    ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,wszName,pNameLength,wszUnits,pUnitsLength,wszDescription,pDescriptionLength) )
 
 #define ID3D10Device_GetCreationFlags(This)	\
-    ( (This)->lpVtbl -> GetCreationFlags(This) ) 
+    ( (This)->lpVtbl -> GetCreationFlags(This) )
 
 #endif /* COBJMACROS */
 
@@ -6151,206 +6151,206 @@ EXTERN_C const IID IID_ID3D10Device;
 #define __ID3D10StateMirror_INTERFACE_DEFINED__
 
 /* interface ID3D10StateMirror */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10StateMirror;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4D0F-342C-4106-A19F-4F2704F689F0")
     ID3D10StateMirror : public IUnknown
     {
     public:
-        virtual void STDMETHODCALLTYPE GetBufferDesc( 
+        virtual void STDMETHODCALLTYPE GetBufferDesc(
             /* [in] */ ID3D10Buffer *pBuffer,
             /* [retval][out] */ D3D10_BUFFER_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetTexture1DDesc( 
+
+        virtual void STDMETHODCALLTYPE GetTexture1DDesc(
             /* [in] */ ID3D10Texture1D *pTexture1D,
             /* [retval][out] */ D3D10_TEXTURE1D_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetTexture2DDesc( 
+
+        virtual void STDMETHODCALLTYPE GetTexture2DDesc(
             /* [in] */ ID3D10Texture2D *pTexture2D,
             /* [retval][out] */ D3D10_TEXTURE2D_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetTexture3DDesc( 
+
+        virtual void STDMETHODCALLTYPE GetTexture3DDesc(
             /* [in] */ ID3D10Texture3D *pTexture3D,
             /* [retval][out] */ D3D10_TEXTURE3D_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetTextureCubeDesc( 
+
+        virtual void STDMETHODCALLTYPE GetTextureCubeDesc(
             /* [in] */ ID3D10TextureCube *pTextureCube,
             /* [retval][out] */ D3D10_TEXTURECUBE_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetShaderResourceViewDesc( 
+
+        virtual void STDMETHODCALLTYPE GetShaderResourceViewDesc(
             /* [in] */ ID3D10ShaderResourceView *pShaderResourceView,
             /* [retval][out] */ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetRenderTargetViewDesc( 
+
+        virtual void STDMETHODCALLTYPE GetRenderTargetViewDesc(
             /* [in] */ ID3D10RenderTargetView *pRenderTargetView,
             /* [retval][out] */ D3D10_RENDER_TARGET_VIEW_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDepthStencilViewDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDepthStencilViewDesc(
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetVertexShaderDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetVertexShaderDesc(
             /* [in] */ ID3D10VertexShader *pShader,
             /* [out][in] */ D3D10_VERTEX_SHADER_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGeometryShaderDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetGeometryShaderDesc(
             /* [in] */ ID3D10GeometryShader *pShader,
             /* [out][in] */ D3D10_GEOMETRY_SHADER_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetPixelShaderDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetPixelShaderDesc(
             /* [in] */ ID3D10PixelShader *pShader,
             /* [out][in] */ D3D10_PIXEL_SHADER_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetInputLayoutDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetInputLayoutDesc(
             /* [in] */ ID3D10InputLayout *pInputLayout,
             /* [out][in] */ D3D10_INPUT_LAYOUT_DESC *pDesc) = 0;
-        
-        virtual SIZE_T STDMETHODCALLTYPE GetInputLayoutDeclarationElements( 
+
+        virtual SIZE_T STDMETHODCALLTYPE GetInputLayoutDeclarationElements(
             /* [in] */ ID3D10InputLayout *pInputLayout) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetSamplerDesc( 
+
+        virtual void STDMETHODCALLTYPE GetSamplerDesc(
             /* [in] */ ID3D10SamplerState *pSampler,
             /* [retval][out] */ D3D10_SAMPLER_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetBlendStateDesc( 
+
+        virtual void STDMETHODCALLTYPE GetBlendStateDesc(
             /* [in] */ ID3D10BlendState *pBlendState,
             /* [retval][out] */ D3D10_BLEND_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetDepthStencilStateDesc( 
+
+        virtual void STDMETHODCALLTYPE GetDepthStencilStateDesc(
             /* [in] */ ID3D10DepthStencilState *pDepthStencilState,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetRasterizerStateDesc( 
+
+        virtual void STDMETHODCALLTYPE GetRasterizerStateDesc(
             /* [in] */ ID3D10RasterizerState *pRasterizerState,
             /* [retval][out] */ D3D10_RASTERIZER_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetQueryDesc( 
+
+        virtual void STDMETHODCALLTYPE GetQueryDesc(
             /* [in] */ ID3D10Query *pQuery,
             /* [retval][out] */ D3D10_QUERY_DESC *pDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE GetCounterDesc( 
+
+        virtual void STDMETHODCALLTYPE GetCounterDesc(
             /* [in] */ ID3D10Counter *pCounter,
             /* [retval][out] */ D3D10_COUNTER_DESC *pDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10StateMirrorVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10StateMirror * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10StateMirror * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10StateMirror * This);
-        
-        void ( STDMETHODCALLTYPE *GetBufferDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetBufferDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Buffer *pBuffer,
             /* [retval][out] */ D3D10_BUFFER_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetTexture1DDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetTexture1DDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Texture1D *pTexture1D,
             /* [retval][out] */ D3D10_TEXTURE1D_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetTexture2DDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetTexture2DDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Texture2D *pTexture2D,
             /* [retval][out] */ D3D10_TEXTURE2D_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetTexture3DDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetTexture3DDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Texture3D *pTexture3D,
             /* [retval][out] */ D3D10_TEXTURE3D_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetTextureCubeDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetTextureCubeDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10TextureCube *pTextureCube,
             /* [retval][out] */ D3D10_TEXTURECUBE_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetShaderResourceViewDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetShaderResourceViewDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10ShaderResourceView *pShaderResourceView,
             /* [retval][out] */ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetRenderTargetViewDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetRenderTargetViewDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10RenderTargetView *pRenderTargetView,
             /* [retval][out] */ D3D10_RENDER_TARGET_VIEW_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetDepthStencilViewDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDepthStencilViewDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10DepthStencilView *pDepthStencilView,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetVertexShaderDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetVertexShaderDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10VertexShader *pShader,
             /* [out][in] */ D3D10_VERTEX_SHADER_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGeometryShaderDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGeometryShaderDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10GeometryShader *pShader,
             /* [out][in] */ D3D10_GEOMETRY_SHADER_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPixelShaderDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPixelShaderDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10PixelShader *pShader,
             /* [out][in] */ D3D10_PIXEL_SHADER_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetInputLayoutDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetInputLayoutDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10InputLayout *pInputLayout,
             /* [out][in] */ D3D10_INPUT_LAYOUT_DESC *pDesc);
-        
-        SIZE_T ( STDMETHODCALLTYPE *GetInputLayoutDeclarationElements )( 
+
+        SIZE_T ( STDMETHODCALLTYPE *GetInputLayoutDeclarationElements )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10InputLayout *pInputLayout);
-        
-        void ( STDMETHODCALLTYPE *GetSamplerDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetSamplerDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10SamplerState *pSampler,
             /* [retval][out] */ D3D10_SAMPLER_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetBlendStateDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetBlendStateDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10BlendState *pBlendState,
             /* [retval][out] */ D3D10_BLEND_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetDepthStencilStateDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetDepthStencilStateDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10DepthStencilState *pDepthStencilState,
             /* [retval][out] */ D3D10_DEPTH_STENCIL_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetRasterizerStateDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetRasterizerStateDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10RasterizerState *pRasterizerState,
             /* [retval][out] */ D3D10_RASTERIZER_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetQueryDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetQueryDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Query *pQuery,
             /* [retval][out] */ D3D10_QUERY_DESC *pDesc);
-        
-        void ( STDMETHODCALLTYPE *GetCounterDesc )( 
+
+        void ( STDMETHODCALLTYPE *GetCounterDesc )(
             ID3D10StateMirror * This,
             /* [in] */ ID3D10Counter *pCounter,
             /* [retval][out] */ D3D10_COUNTER_DESC *pDesc);
-        
+
         END_INTERFACE
     } ID3D10StateMirrorVtbl;
 
@@ -6359,77 +6359,77 @@ EXTERN_C const IID IID_ID3D10StateMirror;
         CONST_VTBL struct ID3D10StateMirrorVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10StateMirror_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10StateMirror_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10StateMirror_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10StateMirror_GetBufferDesc(This,pBuffer,pDesc)	\
-    ( (This)->lpVtbl -> GetBufferDesc(This,pBuffer,pDesc) ) 
+    ( (This)->lpVtbl -> GetBufferDesc(This,pBuffer,pDesc) )
 
 #define ID3D10StateMirror_GetTexture1DDesc(This,pTexture1D,pDesc)	\
-    ( (This)->lpVtbl -> GetTexture1DDesc(This,pTexture1D,pDesc) ) 
+    ( (This)->lpVtbl -> GetTexture1DDesc(This,pTexture1D,pDesc) )
 
 #define ID3D10StateMirror_GetTexture2DDesc(This,pTexture2D,pDesc)	\
-    ( (This)->lpVtbl -> GetTexture2DDesc(This,pTexture2D,pDesc) ) 
+    ( (This)->lpVtbl -> GetTexture2DDesc(This,pTexture2D,pDesc) )
 
 #define ID3D10StateMirror_GetTexture3DDesc(This,pTexture3D,pDesc)	\
-    ( (This)->lpVtbl -> GetTexture3DDesc(This,pTexture3D,pDesc) ) 
+    ( (This)->lpVtbl -> GetTexture3DDesc(This,pTexture3D,pDesc) )
 
 #define ID3D10StateMirror_GetTextureCubeDesc(This,pTextureCube,pDesc)	\
-    ( (This)->lpVtbl -> GetTextureCubeDesc(This,pTextureCube,pDesc) ) 
+    ( (This)->lpVtbl -> GetTextureCubeDesc(This,pTextureCube,pDesc) )
 
 #define ID3D10StateMirror_GetShaderResourceViewDesc(This,pShaderResourceView,pDesc)	\
-    ( (This)->lpVtbl -> GetShaderResourceViewDesc(This,pShaderResourceView,pDesc) ) 
+    ( (This)->lpVtbl -> GetShaderResourceViewDesc(This,pShaderResourceView,pDesc) )
 
 #define ID3D10StateMirror_GetRenderTargetViewDesc(This,pRenderTargetView,pDesc)	\
-    ( (This)->lpVtbl -> GetRenderTargetViewDesc(This,pRenderTargetView,pDesc) ) 
+    ( (This)->lpVtbl -> GetRenderTargetViewDesc(This,pRenderTargetView,pDesc) )
 
 #define ID3D10StateMirror_GetDepthStencilViewDesc(This,pDepthStencilView,pDesc)	\
-    ( (This)->lpVtbl -> GetDepthStencilViewDesc(This,pDepthStencilView,pDesc) ) 
+    ( (This)->lpVtbl -> GetDepthStencilViewDesc(This,pDepthStencilView,pDesc) )
 
 #define ID3D10StateMirror_GetVertexShaderDesc(This,pShader,pDesc)	\
-    ( (This)->lpVtbl -> GetVertexShaderDesc(This,pShader,pDesc) ) 
+    ( (This)->lpVtbl -> GetVertexShaderDesc(This,pShader,pDesc) )
 
 #define ID3D10StateMirror_GetGeometryShaderDesc(This,pShader,pDesc)	\
-    ( (This)->lpVtbl -> GetGeometryShaderDesc(This,pShader,pDesc) ) 
+    ( (This)->lpVtbl -> GetGeometryShaderDesc(This,pShader,pDesc) )
 
 #define ID3D10StateMirror_GetPixelShaderDesc(This,pShader,pDesc)	\
-    ( (This)->lpVtbl -> GetPixelShaderDesc(This,pShader,pDesc) ) 
+    ( (This)->lpVtbl -> GetPixelShaderDesc(This,pShader,pDesc) )
 
 #define ID3D10StateMirror_GetInputLayoutDesc(This,pInputLayout,pDesc)	\
-    ( (This)->lpVtbl -> GetInputLayoutDesc(This,pInputLayout,pDesc) ) 
+    ( (This)->lpVtbl -> GetInputLayoutDesc(This,pInputLayout,pDesc) )
 
 #define ID3D10StateMirror_GetInputLayoutDeclarationElements(This,pInputLayout)	\
-    ( (This)->lpVtbl -> GetInputLayoutDeclarationElements(This,pInputLayout) ) 
+    ( (This)->lpVtbl -> GetInputLayoutDeclarationElements(This,pInputLayout) )
 
 #define ID3D10StateMirror_GetSamplerDesc(This,pSampler,pDesc)	\
-    ( (This)->lpVtbl -> GetSamplerDesc(This,pSampler,pDesc) ) 
+    ( (This)->lpVtbl -> GetSamplerDesc(This,pSampler,pDesc) )
 
 #define ID3D10StateMirror_GetBlendStateDesc(This,pBlendState,pDesc)	\
-    ( (This)->lpVtbl -> GetBlendStateDesc(This,pBlendState,pDesc) ) 
+    ( (This)->lpVtbl -> GetBlendStateDesc(This,pBlendState,pDesc) )
 
 #define ID3D10StateMirror_GetDepthStencilStateDesc(This,pDepthStencilState,pDesc)	\
-    ( (This)->lpVtbl -> GetDepthStencilStateDesc(This,pDepthStencilState,pDesc) ) 
+    ( (This)->lpVtbl -> GetDepthStencilStateDesc(This,pDepthStencilState,pDesc) )
 
 #define ID3D10StateMirror_GetRasterizerStateDesc(This,pRasterizerState,pDesc)	\
-    ( (This)->lpVtbl -> GetRasterizerStateDesc(This,pRasterizerState,pDesc) ) 
+    ( (This)->lpVtbl -> GetRasterizerStateDesc(This,pRasterizerState,pDesc) )
 
 #define ID3D10StateMirror_GetQueryDesc(This,pQuery,pDesc)	\
-    ( (This)->lpVtbl -> GetQueryDesc(This,pQuery,pDesc) ) 
+    ( (This)->lpVtbl -> GetQueryDesc(This,pQuery,pDesc) )
 
 #define ID3D10StateMirror_GetCounterDesc(This,pCounter,pDesc)	\
-    ( (This)->lpVtbl -> GetCounterDesc(This,pCounter,pDesc) ) 
+    ( (This)->lpVtbl -> GetCounterDesc(This,pCounter,pDesc) )
 
 #endif /* COBJMACROS */
 
@@ -6446,49 +6446,49 @@ EXTERN_C const IID IID_ID3D10StateMirror;
 #define __ID3D10Multithread_INTERFACE_DEFINED__
 
 /* interface ID3D10Multithread */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Multithread;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4E00-342C-4106-A19F-4F2704F689F0")
     ID3D10Multithread : public IUnknown
     {
     public:
-        virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected( 
+        virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected(
             /* [in] */ BOOL bMTProtect) = 0;
-        
+
         virtual BOOL STDMETHODCALLTYPE GetMultithreadProtected( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10MultithreadVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Multithread * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Multithread * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Multithread * This);
-        
-        BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )( 
+
+        BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )(
             ID3D10Multithread * This,
             /* [in] */ BOOL bMTProtect);
-        
-        BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )( 
+
+        BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )(
             ID3D10Multithread * This);
-        
+
         END_INTERFACE
     } ID3D10MultithreadVtbl;
 
@@ -6497,26 +6497,26 @@ EXTERN_C const IID IID_ID3D10Multithread;
         CONST_VTBL struct ID3D10MultithreadVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Multithread_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Multithread_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Multithread_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Multithread_SetMultithreadProtected(This,bMTProtect)	\
-    ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) ) 
+    ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) )
 
 #define ID3D10Multithread_GetMultithreadProtected(This)	\
-    ( (This)->lpVtbl -> GetMultithreadProtected(This) ) 
+    ( (This)->lpVtbl -> GetMultithreadProtected(This) )
 
 #endif /* COBJMACROS */
 
@@ -6530,9 +6530,9 @@ EXTERN_C const IID IID_ID3D10Multithread;
 
 
 /* interface __MIDL_itf_d3d10_0000_0026 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_CREATE_DEVICE_FLAG
     {	D3D10_CREATE_DEVICE_SINGLETHREADED	= 0x1,
 	D3D10_CREATE_DEVICE_MIRROR_STATE	= 0x2,
@@ -6542,12 +6542,12 @@ enum D3D10_CREATE_DEVICE_FLAG
 
 #define	D3D10_SDK_VERSION	( 20 )
 
-#if !defined( D3D10_IGNORE_SDK_LAYERS ) 
-#include "d3d10sdklayers.h" 
-#endif 
-#include "d3d10misc.h" 
-#include "d3d10shader.h" 
-#include "d3d10effect.h" 
+#if !defined( D3D10_IGNORE_SDK_LAYERS )
+#include "d3d10sdklayers.h"
+#endif
+#include "d3d10misc.h"
+#include "d3d10shader.h"
+#include "d3d10effect.h"
 
 
 extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0026_v0_0_c_ifspec;
diff --git a/src/dep/include/DXSDK/include/D3D10effect.h b/src/dep/include/DXSDK/include/D3D10effect.h
index c716c6e..f3686d1 100644
--- a/src/dep/include/DXSDK/include/D3D10effect.h
+++ b/src/dep/include/DXSDK/include/D3D10effect.h
@@ -43,7 +43,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES
     D3D10_DST_PS_SAMPLERS,              // Count: D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT
     D3D10_DST_PS_SHADER_RESOURCES,      // Count: D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT
     D3D10_DST_PS_CONSTANT_BUFFERS,      // Count: D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT
-    
+
     D3D10_DST_IA_VERTEX_BUFFERS,        // Count: D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT
     D3D10_DST_IA_INDEX_BUFFER,          // Single-value state
     D3D10_DST_IA_INPUT_LAYOUT,          // Single-value state
@@ -79,32 +79,32 @@ typedef struct _D3D10_STATE_BLOCK_MASK
     BYTE VSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
     BYTE VSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
     BYTE VSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
-    
+
     BYTE GS;
     BYTE GSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
     BYTE GSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
     BYTE GSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
-    
+
     BYTE PS;
     BYTE PSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
     BYTE PSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
     BYTE PSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
-    
+
     BYTE IAVertexBuffers[D3D10_BYTES_FROM_BITS(D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT)];
     BYTE IAIndexBuffer;
     BYTE IAInputLayout;
     BYTE IAPrimitiveTopology;
-    
+
     BYTE OMRenderTargets;
     BYTE OMDepthStencilState;
     BYTE OMBlendState;
-    
+
     BYTE RSViewports;
     BYTE RSScissorRects;
     BYTE RSRasterizerState;
-    
+
     BYTE SOBuffers;
-    
+
     BYTE Predication;
 } D3D10_STATE_BLOCK_MASK;
 
@@ -116,7 +116,7 @@ typedef interface ID3D10StateBlock ID3D10StateBlock;
 typedef interface ID3D10StateBlock *LPD3D10STATEBLOCK;
 
 // {0803425A-57F5-4dd6-9465-A87570834A08}
-DEFINE_GUID(IID_ID3D10StateBlock, 
+DEFINE_GUID(IID_ID3D10StateBlock,
 0x803425a, 0x57f5, 0x4dd6, 0x94, 0x65, 0xa8, 0x75, 0x70, 0x83, 0x4a, 0x8);
 
 #undef INTERFACE
@@ -127,7 +127,7 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown)
     STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
-    
+
     STDMETHOD(Capture)(THIS) PURE;
     STDMETHOD(Apply)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ ID3D10Device **ppDevice) PURE;
@@ -156,8 +156,8 @@ extern "C" {
 //
 // UINT RangeStart, RangeLength, Entry
 //   The specific bit or range of bits for a given state type to operate on.
-//   Consult the comments for D3D10_DEVICE_STATE_TYPES and 
-//   D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for 
+//   Consult the comments for D3D10_DEVICE_STATE_TYPES and
+//   D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for
 //   each state.
 //
 //----------------------------------------------------------------------------
@@ -259,21 +259,21 @@ HRESULT D3D10CreateStateBlock(ID3D10Device *pDevice, D3D10_STATE_BLOCK_MASK *pSt
 
 typedef struct _D3D10_EFFECT_TYPE_DESC
 {
-    LPCSTR  TypeName;               // Name of the type 
+    LPCSTR  TypeName;               // Name of the type
                                     // (e.g. "float4" or "MyStruct")
 
     D3D10_SHADER_VARIABLE_CLASS    Class;  // (e.g. scalar, vector, object, etc.)
     D3D10_SHADER_VARIABLE_TYPE     Type;   // (e.g. float, texture, vertexshader, etc.)
-    
+
     UINT    Elements;               // Number of elements in this type
-                                    // (0 if not an array) 
+                                    // (0 if not an array)
     UINT    Members;                // Number of members
                                     // (0 if not a structure)
     UINT    Rows;                   // Number of rows in this type
                                     // (0 if not a numeric primitive)
     UINT    Columns;                // Number of columns in this type
                                     // (0 if not a numeric primitive)
-    
+
     UINT    PackedSize;             // Number of bytes required to represent
                                     // this data type, when tightly packed
     UINT    UnpackedSize;           // Number of bytes occupied by this data
@@ -286,7 +286,7 @@ typedef interface ID3D10EffectType ID3D10EffectType;
 typedef interface ID3D10EffectType *LPD3D10EFFECTTYPE;
 
 // {4E9E1DDC-CD9D-4772-A837-00180B9B88FD}
-DEFINE_GUID(IID_ID3D10EffectType, 
+DEFINE_GUID(IID_ID3D10EffectType,
 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x0, 0x18, 0xb, 0x9b, 0x88, 0xfd);
 
 #undef INTERFACE
@@ -315,12 +315,12 @@ DECLARE_INTERFACE(ID3D10EffectType)
 
 typedef struct _D3D10_EFFECT_VARIABLE_DESC
 {
-    LPCSTR  Name;                   // Name of this variable, annotation, 
+    LPCSTR  Name;                   // Name of this variable, annotation,
                                     // or structure member
     LPCSTR  Semantic;               // Semantic string of this variable
-                                    // or structure member (NULL for 
+                                    // or structure member (NULL for
                                     // annotations or if not present)
-    
+
     UINT    Flags;                  // D3D10_EFFECT_VARIABLE_* flags
     UINT    Annotations;            // Number of annotations on this variable
                                     // (always 0 for annotations)
@@ -334,7 +334,7 @@ typedef interface ID3D10EffectVariable ID3D10EffectVariable;
 typedef interface ID3D10EffectVariable *LPD3D10EFFECTVARIABLE;
 
 // {AE897105-00E6-45bf-BB8E-281DD6DB8E1B}
-DEFINE_GUID(IID_ID3D10EffectVariable, 
+DEFINE_GUID(IID_ID3D10EffectVariable,
 0xae897105, 0xe6, 0x45bf, 0xbb, 0x8e, 0x28, 0x1d, 0xd6, 0xdb, 0x8e, 0x1b);
 
 #undef INTERFACE
@@ -358,18 +358,18 @@ DECLARE_INTERFACE(ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
 
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -381,7 +381,7 @@ DECLARE_INTERFACE(ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
 };
@@ -394,7 +394,7 @@ typedef interface ID3D10EffectScalarVariable ID3D10EffectScalarVariable;
 typedef interface ID3D10EffectScalarVariable *LPD3D10EFFECTSCALARVARIABLE;
 
 // {00E48F7B-D2C8-49e8-A86C-022DEE53431F}
-DEFINE_GUID(IID_ID3D10EffectScalarVariable, 
+DEFINE_GUID(IID_ID3D10EffectScalarVariable,
 0xe48f7b, 0xd2c8, 0x49e8, 0xa8, 0x6c, 0x2, 0x2d, 0xee, 0x53, 0x43, 0x1f);
 
 #undef INTERFACE
@@ -405,18 +405,18 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -428,25 +428,25 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
-    
+
     STDMETHOD(SetFloat)(THIS_ float Value) PURE;
-    STDMETHOD(GetFloat)(THIS_ float *pValue) PURE;    
-    
+    STDMETHOD(GetFloat)(THIS_ float *pValue) PURE;
+
     STDMETHOD(SetFloatArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetFloatArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(SetInt)(THIS_ int Value) PURE;
     STDMETHOD(GetInt)(THIS_ int *pValue) PURE;
-    
+
     STDMETHOD(SetIntArray)(THIS_ int *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetIntArray)(THIS_ int *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(SetBool)(THIS_ BOOL Value) PURE;
     STDMETHOD(GetBool)(THIS_ BOOL *pValue) PURE;
-    
+
     STDMETHOD(SetBoolArray)(THIS_ BOOL *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetBoolArray)(THIS_ BOOL *pData, UINT Offset, UINT Count) PURE;
 };
@@ -459,7 +459,7 @@ typedef interface ID3D10EffectVectorVariable ID3D10EffectVectorVariable;
 typedef interface ID3D10EffectVectorVariable *LPD3D10EFFECTVECTORVARIABLE;
 
 // {62B98C44-1F82-4c67-BCD0-72CF8F217E81}
-DEFINE_GUID(IID_ID3D10EffectVectorVariable, 
+DEFINE_GUID(IID_ID3D10EffectVectorVariable,
 0x62b98c44, 0x1f82, 0x4c67, 0xbc, 0xd0, 0x72, 0xcf, 0x8f, 0x21, 0x7e, 0x81);
 
 #undef INTERFACE
@@ -470,22 +470,22 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
-    STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE; 
+    STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE;
     STDMETHOD_(ID3D10EffectShaderResourceVariable*, AsShaderResource)(THIS) PURE;
     STDMETHOD_(ID3D10EffectConstantBuffer*, AsConstantBuffer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectShaderVariable*, AsShader)(THIS) PURE;
@@ -493,10 +493,10 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
-    
+
     STDMETHOD(SetBoolVector) (THIS_ BOOL *pData) PURE;
     STDMETHOD(SetIntVector)  (THIS_ int *pData) PURE;
     STDMETHOD(SetFloatVector)(THIS_ float *pData) PURE;
@@ -522,7 +522,7 @@ typedef interface ID3D10EffectMatrixVariable ID3D10EffectMatrixVariable;
 typedef interface ID3D10EffectMatrixVariable *LPD3D10EFFECTMATRIXVARIABLE;
 
 // {50666C24-B82F-4eed-A172-5B6E7E8522E0}
-DEFINE_GUID(IID_ID3D10EffectMatrixVariable, 
+DEFINE_GUID(IID_ID3D10EffectMatrixVariable,
 0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0);
 
 #undef INTERFACE
@@ -533,18 +533,18 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -556,19 +556,19 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
-    
+
     STDMETHOD(SetMatrix)(THIS_ float *pData) PURE;
     STDMETHOD(GetMatrix)(THIS_ float *pData) PURE;
-    
+
     STDMETHOD(SetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(SetMatrixTranspose)(THIS_ float *pData) PURE;
     STDMETHOD(GetMatrixTranspose)(THIS_ float *pData) PURE;
-    
+
     STDMETHOD(SetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
 };
@@ -581,7 +581,7 @@ typedef interface ID3D10EffectStringVariable ID3D10EffectStringVariable;
 typedef interface ID3D10EffectStringVariable *LPD3D10EFFECTSTRINGVARIABLE;
 
 // {71417501-8DF9-4e0a-A78A-255F9756BAFF}
-DEFINE_GUID(IID_ID3D10EffectStringVariable, 
+DEFINE_GUID(IID_ID3D10EffectStringVariable,
 0x71417501, 0x8df9, 0x4e0a, 0xa7, 0x8a, 0x25, 0x5f, 0x97, 0x56, 0xba, 0xff);
 
 #undef INTERFACE
@@ -592,18 +592,18 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -615,10 +615,10 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetString)(THIS_ LPCSTR *ppString) PURE;
     STDMETHOD(GetStringArray)(THIS_ LPCSTR *ppStrings, UINT Offset, UINT Count) PURE;
 };
@@ -631,7 +631,7 @@ typedef interface ID3D10EffectShaderResourceVariable ID3D10EffectShaderResourceV
 typedef interface ID3D10EffectShaderResourceVariable *LPD3D10EFFECTSHADERRESOURCEVARIABLE;
 
 // {C0A7157B-D872-4b1d-8073-EFC2ACD4B1FC}
-DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable, 
+DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable,
 0xc0a7157b, 0xd872, 0x4b1d, 0x80, 0x73, 0xef, 0xc2, 0xac, 0xd4, 0xb1, 0xfc);
 
 
@@ -643,18 +643,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -666,13 +666,13 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(SetResource)(THIS_ ID3D10ShaderResourceView *pResource) PURE;
     STDMETHOD(GetResource)(THIS_ ID3D10ShaderResourceView **ppResource) PURE;
-    
+
     STDMETHOD(SetResourceArray)(THIS_ ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetResourceArray)(THIS_ ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE;
 };
@@ -685,7 +685,7 @@ typedef interface ID3D10EffectConstantBuffer ID3D10EffectConstantBuffer;
 typedef interface ID3D10EffectConstantBuffer *LPD3D10EFFECTCONSTANTBUFFER;
 
 // {56648F4D-CC8B-4444-A5AD-B5A3D76E91B3}
-DEFINE_GUID(IID_ID3D10EffectConstantBuffer, 
+DEFINE_GUID(IID_ID3D10EffectConstantBuffer,
 0x56648f4d, 0xcc8b, 0x4444, 0xa5, 0xad, 0xb5, 0xa3, 0xd7, 0x6e, 0x91, 0xb3);
 
 #undef INTERFACE
@@ -695,18 +695,18 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -718,13 +718,13 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(SetConstantBuffer)(THIS_ ID3D10Buffer *pConstantBuffer) PURE;
     STDMETHOD(GetConstantBuffer)(THIS_ ID3D10Buffer **ppConstantBuffer) PURE;
-    
+
     STDMETHOD(SetTextureBuffer)(THIS_ ID3D10ShaderResourceView *pTextureBuffer) PURE;
     STDMETHOD(GetTextureBuffer)(THIS_ ID3D10ShaderResourceView **ppTextureBuffer) PURE;
 };
@@ -743,17 +743,17 @@ typedef struct _D3D10_EFFECT_SHADER_DESC
 {
     CONST BYTE *pInputSignature;    // Passed into CreateInputLayout,
                                     // valid on VS and GS only
-    
+
     BOOL IsInline;                  // Is this an anonymous shader variable
                                     // resulting from an inline shader assignment?
-    
-    
+
+
     // -- The following fields are not valid after Optimize() --
     CONST BYTE *pBytecode;          // Shader bytecode
     UINT BytecodeLength;
-    
+
     LPCSTR SODecl;                  // Stream out declaration string (for GS with SO)
-    
+
     UINT NumInputSignatureEntries;  // Number of entries in the input signature
     UINT NumOutputSignatureEntries; // Number of entries in the output signature
 } D3D10_EFFECT_SHADER_DESC;
@@ -763,7 +763,7 @@ typedef interface ID3D10EffectShaderVariable ID3D10EffectShaderVariable;
 typedef interface ID3D10EffectShaderVariable *LPD3D10EFFECTSHADERVARIABLE;
 
 // {80849279-C799-4797-8C33-0407A07D9E06}
-DEFINE_GUID(IID_ID3D10EffectShaderVariable, 
+DEFINE_GUID(IID_ID3D10EffectShaderVariable,
 0x80849279, 0xc799, 0x4797, 0x8c, 0x33, 0x4, 0x7, 0xa0, 0x7d, 0x9e, 0x6);
 
 #undef INTERFACE
@@ -773,18 +773,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -796,16 +796,16 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetShaderDesc)(THIS_ UINT ShaderIndex, D3D10_EFFECT_SHADER_DESC *pDesc) PURE;
-    
+
     STDMETHOD(GetVertexShader)(THIS_ UINT ShaderIndex, ID3D10VertexShader **ppVS) PURE;
     STDMETHOD(GetGeometryShader)(THIS_ UINT ShaderIndex, ID3D10GeometryShader **ppGS) PURE;
     STDMETHOD(GetPixelShader)(THIS_ UINT ShaderIndex, ID3D10PixelShader **ppPS) PURE;
-    
+
     STDMETHOD(GetInputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
     STDMETHOD(GetOutputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
 };
@@ -818,7 +818,7 @@ typedef interface ID3D10EffectBlendVariable ID3D10EffectBlendVariable;
 typedef interface ID3D10EffectBlendVariable *LPD3D10EFFECTBLENDVARIABLE;
 
 // {1FCD2294-DF6D-4eae-86B3-0E9160CFB07B}
-DEFINE_GUID(IID_ID3D10EffectBlendVariable, 
+DEFINE_GUID(IID_ID3D10EffectBlendVariable,
 0x1fcd2294, 0xdf6d, 0x4eae, 0x86, 0xb3, 0xe, 0x91, 0x60, 0xcf, 0xb0, 0x7b);
 
 #undef INTERFACE
@@ -828,18 +828,18 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -851,10 +851,10 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetBlendState)(THIS_ UINT Index, ID3D10BlendState **ppBlendState) PURE;
     STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_BLEND_DESC *pBlendDesc) PURE;
 };
@@ -867,7 +867,7 @@ typedef interface ID3D10EffectDepthStencilVariable ID3D10EffectDepthStencilVaria
 typedef interface ID3D10EffectDepthStencilVariable *LPD3D10EFFECTDEPTHSTENCILVARIABLE;
 
 // {AF482368-330A-46a5-9A5C-01C71AF24C8D}
-DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable, 
+DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable,
 0xaf482368, 0x330a, 0x46a5, 0x9a, 0x5c, 0x1, 0xc7, 0x1a, 0xf2, 0x4c, 0x8d);
 
 #undef INTERFACE
@@ -877,18 +877,18 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -900,10 +900,10 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetDepthStencilState)(THIS_ UINT Index, ID3D10DepthStencilState **ppDepthStencilState) PURE;
     STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc) PURE;
 };
@@ -916,7 +916,7 @@ typedef interface ID3D10EffectRasterizerVariable ID3D10EffectRasterizerVariable;
 typedef interface ID3D10EffectRasterizerVariable *LPD3D10EFFECTRASTERIZERVARIABLE;
 
 // {21AF9F0E-4D94-4ea9-9785-2CB76B8C0B34}
-DEFINE_GUID(IID_ID3D10EffectRasterizerVariable, 
+DEFINE_GUID(IID_ID3D10EffectRasterizerVariable,
 0x21af9f0e, 0x4d94, 0x4ea9, 0x97, 0x85, 0x2c, 0xb7, 0x6b, 0x8c, 0xb, 0x34);
 
 #undef INTERFACE
@@ -926,18 +926,18 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -949,10 +949,10 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetRasterizerState)(THIS_ UINT Index, ID3D10RasterizerState **ppRasterizerState) PURE;
     STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_RASTERIZER_DESC *pRasterizerDesc) PURE;
 };
@@ -965,7 +965,7 @@ typedef interface ID3D10EffectSamplerVariable ID3D10EffectSamplerVariable;
 typedef interface ID3D10EffectSamplerVariable *LPD3D10EFFECTSAMPLERVARIABLE;
 
 // {6530D5C7-07E9-4271-A418-E7CE4BD1E480}
-DEFINE_GUID(IID_ID3D10EffectSamplerVariable, 
+DEFINE_GUID(IID_ID3D10EffectSamplerVariable,
 0x6530d5c7, 0x7e9, 0x4271, 0xa4, 0x18, 0xe7, 0xce, 0x4b, 0xd1, 0xe4, 0x80);
 
 #undef INTERFACE
@@ -975,18 +975,18 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
 {
     STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
     STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
     STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@@ -998,10 +998,10 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
     STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
     STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
     STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
-    
+
     STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
     STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
-    
+
     STDMETHOD(GetSampler)(THIS_ UINT Index, ID3D10SamplerState **ppSampler) PURE;
     STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_SAMPLER_DESC *pSamplerDesc) PURE;
 };
@@ -1018,12 +1018,12 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
 
 typedef struct _D3D10_PASS_DESC
 {
-    LPCSTR Name;                    // Name of this pass (NULL if not anonymous)    
+    LPCSTR Name;                    // Name of this pass (NULL if not anonymous)
     UINT Annotations;               // Number of annotations on this pass
-    
+
     BYTE *pIAInputSignature;        // Signature from VS or GS (if there is no VS)
                                     // or NULL if neither exists
-                                    
+
     UINT StencilRef;                // Specified in SetDepthStencilState()
     UINT SampleMask;                // Specified in SetBlendState()
     FLOAT BlendFactor[4];           // Specified in SetBlendState()
@@ -1039,7 +1039,7 @@ typedef struct _D3D10_PASS_SHADER_DESC
 {
     ID3D10EffectShaderVariable *pShaderVariable;    // The variable that this shader came from.
                                                     // If this is an inline shader assignment,
-                                                    //   the returned interface will be an 
+                                                    //   the returned interface will be an
                                                     //   anonymous shader variable, which is
                                                     //   not retrievable any other way.  It's
                                                     //   name in the variable description will
@@ -1047,7 +1047,7 @@ typedef struct _D3D10_PASS_SHADER_DESC
                                                     // If there is no assignment of this type in
                                                     //   the pass block, pShaderVariable != NULL,
                                                     //   but pShaderVariable->IsValid() == FALSE.
-    
+
     UINT                        ShaderIndex;        // The element of pShaderVariable (if an array)
                                                     // or 0 if not applicable
 } D3D10_PASS_SHADER_DESC;
@@ -1056,7 +1056,7 @@ typedef interface ID3D10EffectPass ID3D10EffectPass;
 typedef interface ID3D10EffectPass *LPD3D10EFFECTPASS;
 
 // {5CFBEB89-1A06-46e0-B282-E3F9BFA36A54}
-DEFINE_GUID(IID_ID3D10EffectPass, 
+DEFINE_GUID(IID_ID3D10EffectPass,
 0x5cfbeb89, 0x1a06, 0x46e0, 0xb2, 0x82, 0xe3, 0xf9, 0xbf, 0xa3, 0x6a, 0x54);
 
 #undef INTERFACE
@@ -1066,16 +1066,16 @@ DECLARE_INTERFACE(ID3D10EffectPass)
 {
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_PASS_DESC *pDesc) PURE;
-    
+
     STDMETHOD(GetVertexShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
     STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
     STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD(Apply)(THIS_ UINT Flags) PURE;
-    
+
     STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE;
 };
 
@@ -1100,7 +1100,7 @@ typedef interface ID3D10EffectTechnique ID3D10EffectTechnique;
 typedef interface ID3D10EffectTechnique *LPD3D10EFFECTTECHNIQUE;
 
 // {DB122CE8-D1C9-4292-B237-24ED3DE8B175}
-DEFINE_GUID(IID_ID3D10EffectTechnique, 
+DEFINE_GUID(IID_ID3D10EffectTechnique,
 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75);
 
 #undef INTERFACE
@@ -1110,13 +1110,13 @@ DECLARE_INTERFACE(ID3D10EffectTechnique)
 {
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectPass*, GetPassByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectPass*, GetPassByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE;
 };
 
@@ -1135,20 +1135,20 @@ typedef struct _D3D10_EFFECT_DESC
     //TODO: do we need these?
     //LPCSTR  Creator;
     //UINT    Version;
-    
-    BOOL    IsChildEffect;          // TRUE if this is a child effect, 
+
+    BOOL    IsChildEffect;          // TRUE if this is a child effect,
                                     // FALSE if this is standalone or an effect pool.
-                                    
+
     UINT    ConstantBuffers;        // Number of constant buffers in this effect,
                                     // excluding the effect pool.
     UINT    SharedConstantBuffers;  // Number of constant buffers shared in this
                                     // effect's pool.
-                                    
+
     UINT    GlobalVariables;        // Number of global variables in this effect,
                                     // excluding the effect pool.
     UINT    SharedGlobalVariables;  // Number of global variables shared in this
                                     // effect's pool.
-                                    
+
     UINT    Techniques;             // Number of techniques in this effect,
                                     // excluding the effect pool.
 } D3D10_EFFECT_DESC;
@@ -1157,7 +1157,7 @@ typedef interface ID3D10Effect ID3D10Effect;
 typedef interface ID3D10Effect *LPD3D10EFFECT;
 
 // {51B0CA8B-EC0B-4519-870D-8EE1CB5017C7}
-DEFINE_GUID(IID_ID3D10Effect, 
+DEFINE_GUID(IID_ID3D10Effect,
 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0xd, 0x8e, 0xe1, 0xcb, 0x50, 0x17, 0xc7);
 
 #undef INTERFACE
@@ -1169,26 +1169,26 @@ DECLARE_INTERFACE_(ID3D10Effect, IUnknown)
     STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
-    
+
     STDMETHOD_(BOOL, IsValid)(THIS) PURE;
     STDMETHOD_(BOOL, IsPool)(THIS) PURE;
 
     // Managing D3D Device
     STDMETHOD(GetDevice)(THIS_ ID3D10Device** ppDevice) PURE;
-    
+
     // New Reflection APIs
     STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD_(ID3D10EffectVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(ID3D10EffectVariable*, GetVariableBySemantic)(THIS_ LPCSTR Semantic) PURE;
-    
+
     STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD(Optimize)(THIS) PURE;
     STDMETHOD_(BOOL, IsOptimized)(THIS) PURE;
 
@@ -1202,7 +1202,7 @@ typedef interface ID3D10EffectPool ID3D10EffectPool;
 typedef interface ID3D10EffectPool *LPD3D10EFFECTPOOL;
 
 // {9537AB04-3250-412e-8213-FCD2F8677933}
-DEFINE_GUID(IID_ID3D10EffectPool, 
+DEFINE_GUID(IID_ID3D10EffectPool,
 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33);
 
 #undef INTERFACE
@@ -1214,9 +1214,9 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown)
     STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
-    
+
     STDMETHOD_(ID3D10Effect*, AsEffect)(THIS) PURE;
-    
+
     // No public methods
 };
 
@@ -1277,16 +1277,16 @@ extern "C" {
 //  ppEffectPool
 //      Address of the newly created Effect pool interface
 //  ppErrors
-//      If non-NULL, address of a buffer with error messages that occurred 
+//      If non-NULL, address of a buffer with error messages that occurred
 //      during parsing or compilation
 //
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI D3D10CompileEffectFromMemory(void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, 
+HRESULT WINAPI D3D10CompileEffectFromMemory(void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
     ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3D10CreateEffectFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3D10CreateEffectFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3D10Effect **ppEffect);
 
 HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice,
diff --git a/src/dep/include/DXSDK/include/D3D10shader.h b/src/dep/include/DXSDK/include/D3D10shader.h
index 37ebd44..5d63e39 100644
--- a/src/dep/include/DXSDK/include/D3D10shader.h
+++ b/src/dep/include/DXSDK/include/D3D10shader.h
@@ -33,9 +33,9 @@
 //   you KNOW will work.  (ie. have compiled before without this option.)
 //   Shaders are always validated by D3D before they are set to the device.
 //
-// D3D10_SHADER_SKIP_OPTIMIZATION 
+// D3D10_SHADER_SKIP_OPTIMIZATION
 //   Instructs the compiler to skip optimization steps during code generation.
-//   Unless you are trying to isolate a problem in your code using this option 
+//   Unless you are trying to isolate a problem in your code using this option
 //   is not recommended.
 //
 // D3D10_SHADER_PACK_MATRIX_ROW_MAJOR
@@ -43,8 +43,8 @@
 //   on input and output from the shader.
 //
 // D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR
-//   Unless explicitly specified, matrices will be packed in column-major 
-//   order on input and output from the shader.  This is generally more 
+//   Unless explicitly specified, matrices will be packed in column-major
+//   order on input and output from the shader.  This is generally more
 //   efficient, since it allows vector-matrix multiplication to be performed
 //   using a series of dot-products.
 //
@@ -54,16 +54,16 @@
 //
 // D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT
 //   Force compiler to compile against the next highest available software
-//   target for vertex shaders.  This flag also turns optimizations off, 
-//   and debugging on.  
+//   target for vertex shaders.  This flag also turns optimizations off,
+//   and debugging on.
 //
 // D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT
 //   Force compiler to compile against the next highest available software
-//   target for pixel shaders.  This flag also turns optimizations off, 
+//   target for pixel shaders.  This flag also turns optimizations off,
 //   and debugging on.
 //
 // D3D10_SHADER_NO_PRESHADER
-//   Disables Preshaders. Using this flag will cause the compiler to not 
+//   Disables Preshaders. Using this flag will cause the compiler to not
 //   pull out static expression for evaluation on the host cpu
 //
 // D3D10_SHADER_AVOID_FLOW_CONTROL
@@ -289,7 +289,7 @@ typedef struct _D3D10_SHADER_DESC
     UINT                    Version;            // Shader version
     LPCSTR                  Creator;            // Creator string
     UINT                    Flags;              // Shader compilation/parse flags
-    
+
     UINT                    ConstantBuffers;    // Number of constant buffers
     UINT                    BoundResources;     // Number of bound resources
     UINT                    InputParameters;    // Number of parameters in the input signature
@@ -328,7 +328,7 @@ typedef struct _D3D10_SHADER_INPUT_BIND_DESC
     D3D10_SHADER_INPUT_TYPE     Type;           // Type of resource (e.g. texture, cbuffer, etc.)
     UINT                        BindPoint;      // Starting bind point
     UINT                        BindCount;      // Number of contiguous bind points (for arrays)
-    
+
     D3D10_RESOURCE_RETURN_TYPE  ReturnType;     // Return type (if texture)
     D3D10_RESOURCE_DIMENSION    Dimension;      // Dimension (if texture)
 } D3D10_SHADER_INPUT_BIND_DESC;
@@ -342,11 +342,11 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
     D3D10_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.)
     BYTE                        Mask;           // Mask to indicate which components of the register
                                                 // are used (combination of D3D10_COMPONENT_MASK values)
-    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is 
+    BYTE                        ReadWriteMask;  // Mask to indicate whether a given component is
                                                 // never written (if this is an output signature) or
                                                 // always read (if this is an input signature).
                                                 // (combination of D3D10_COMPONENT_MASK values)
-    
+
 } D3D10_SIGNATURE_PARAMETER_DESC;
 
 //
@@ -357,7 +357,7 @@ typedef interface ID3D10ShaderReflectionType ID3D10ShaderReflectionType;
 typedef interface ID3D10ShaderReflectionType *LPD3D10SHADERREFLECTIONTYPE;
 
 // {C530AD7D-9B16-4395-A979-BA2ECFF83ADD}
-DEFINE_GUID(IID_ID3D10ShaderReflectionType, 
+DEFINE_GUID(IID_ID3D10ShaderReflectionType,
 0xc530ad7d, 0x9b16, 0x4395, 0xa9, 0x79, 0xba, 0x2e, 0xcf, 0xf8, 0x3a, 0xdd);
 
 #undef INTERFACE
@@ -366,7 +366,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionType,
 DECLARE_INTERFACE(ID3D10ShaderReflectionType)
 {
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByName)(THIS_ LPCSTR Name) PURE;
     STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT Index) PURE;
@@ -376,7 +376,7 @@ typedef interface ID3D10ShaderReflectionVariable ID3D10ShaderReflectionVariable;
 typedef interface ID3D10ShaderReflectionVariable *LPD3D10SHADERREFLECTIONVARIABLE;
 
 // {1BF63C95-2650-405d-99C1-3636BD1DA0A1}
-DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, 
+DEFINE_GUID(IID_ID3D10ShaderReflectionVariable,
 0x1bf63c95, 0x2650, 0x405d, 0x99, 0xc1, 0x36, 0x36, 0xbd, 0x1d, 0xa0, 0xa1);
 
 #undef INTERFACE
@@ -385,7 +385,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionVariable,
 DECLARE_INTERFACE(ID3D10ShaderReflectionVariable)
 {
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_VARIABLE_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10ShaderReflectionType*, GetType)(THIS) PURE;
 };
 
@@ -393,7 +393,7 @@ typedef interface ID3D10ShaderReflectionConstantBuffer ID3D10ShaderReflectionCon
 typedef interface ID3D10ShaderReflectionConstantBuffer *LPD3D10SHADERREFLECTIONCONSTANTBUFFER;
 
 // {66C66A94-DDDD-4b62-A66A-F0DA33C2B4D0}
-DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer, 
+DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer,
 0x66c66a94, 0xdddd, 0x4b62, 0xa6, 0x6a, 0xf0, 0xda, 0x33, 0xc2, 0xb4, 0xd0);
 
 #undef INTERFACE
@@ -402,7 +402,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer,
 DECLARE_INTERFACE(ID3D10ShaderReflectionConstantBuffer)
 {
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_BUFFER_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE;
 };
@@ -411,7 +411,7 @@ typedef interface ID3D10ShaderReflection ID3D10ShaderReflection;
 typedef interface ID3D10ShaderReflection *LPD3D10SHADERREFLECTION;
 
 // {D40E20B6-F8F7-42ad-AB20-4BAF8F15DFAA}
-DEFINE_GUID(IID_ID3D10ShaderReflection, 
+DEFINE_GUID(IID_ID3D10ShaderReflection,
 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, 0x4b, 0xaf, 0x8f, 0x15, 0xdf, 0xaa);
 
 #undef INTERFACE
@@ -424,15 +424,15 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
     STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *pDesc) PURE;
-    
+
     STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE;
     STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE;
-    
+
     STDMETHOD(GetResourceBindingDesc)(THIS_ UINT ResourceIndex, D3D10_SHADER_INPUT_BIND_DESC *pDesc) PURE;
-    
+
     STDMETHOD(GetInputParameterDesc)(THIS_ UINT ParameterIndex, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
     STDMETHOD(GetOutputParameterDesc)(THIS_ UINT ParameterIndex, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
-    
+
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -483,7 +483,7 @@ extern "C" {
 //      these are the same messages you will see in your debug output.
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
     LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
 
 //----------------------------------------------------------------------------
@@ -521,7 +521,7 @@ UINT WINAPI D3D10GetShaderSize(CONST UINT *pFunction);
 //----------------------------------------------------------------------------
 // D3D10GetShaderVersion:
 // -----------------------
-// Returns the shader version of a given shader.  Returns zero if the shader 
+// Returns the shader version of a given shader.  Returns zero if the shader
 // function is NULL.
 //
 // Parameters:
@@ -561,7 +561,7 @@ LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
 //  BytecodeLength
 //      Length of the shader bytecode buffer
 //  ppReflector
-//      [out] Returns a ID3D10ShaderReflection object that can be used to 
+//      [out] Returns a ID3D10ShaderReflection object that can be used to
 //      retrieve shader resource and constant buffer information
 //
 //----------------------------------------------------------------------------
@@ -596,7 +596,7 @@ HRESULT WINAPI D3D10ReflectShader(void *pShaderBytecode, SIZE_T BytecodeLength,
 //      these are the same messages you will see in your debug output.
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
 //////////////////////////////////////////////////////////////////////////
@@ -605,14 +605,14 @@ HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR
 // ---------------------------------
 //
 // void *pShaderBytecode - a buffer containing the result of an HLSL
-//  compilation.  Typically this opaque buffer contains several 
+//  compilation.  Typically this opaque buffer contains several
 //  discrete sections including the shader executable code, the input
-//  signature, and the output signature.  This can typically be retrieved 
+//  signature, and the output signature.  This can typically be retrieved
 //  by calling ID3D10Blob::GetBufferPointer() on the returned blob
 //  from HLSL's compile APIs.
 //
-// UINT BytecodeLength - the length of pShaderBytecode.  This can 
-//  typically be retrieved by calling ID3D10Blob::GetBufferSize() 
+// UINT BytecodeLength - the length of pShaderBytecode.  This can
+//  typically be retrieved by calling ID3D10Blob::GetBufferSize()
 //  on the returned blob from HLSL's compile APIs.
 //
 // ID3D10Blob **ppSignatureBlob(s) - a newly created buffer that
@@ -635,6 +635,6 @@ HRESULT D3D10GetInputAndOutputSignatureBlob(void *pShaderBytecode, SIZE_T Byteco
 #ifdef __cplusplus
 }
 #endif //__cplusplus
-    
+
 #endif //__D3D10SHADER_H__
 
diff --git a/src/dep/include/DXSDK/include/D3DX10core.h b/src/dep/include/DXSDK/include/D3DX10core.h
index 63dcc7a..2bc9b90 100644
--- a/src/dep/include/DXSDK/include/D3DX10core.h
+++ b/src/dep/include/DXSDK/include/D3DX10core.h
@@ -17,7 +17,7 @@
 #define D3DX10_DLL_A "d3dx10.dll"
 
 #ifdef UNICODE
-    #define D3DX10_DLL D3DX10_DLL_W 
+    #define D3DX10_DLL D3DX10_DLL_W
 #else
     #define D3DX10_DLL D3DX10_DLL_A
 #endif
@@ -30,9 +30,9 @@ extern "C" {
 // D3DX10_SDK_VERSION:
 // -----------------
 // This identifier is passed to D3DX10CheckVersion in order to ensure that an
-// application was built against the correct header files and lib files. 
-// This number is incremented whenever a header (or other) change would 
-// require applications to be rebuilt. If the version doesn't match, 
+// application was built against the correct header files and lib files.
+// This number is incremented whenever a header (or other) change would
+// require applications to be rebuilt. If the version doesn't match,
 // D3DX10CreateVersion will return FALSE. (The number itself has no meaning.)
 ///////////////////////////////////////////////////////////////////////////
 
@@ -57,10 +57,10 @@ UINT WINAPI D3DX10GetDriverLevel(ID3D10Device *pDevice);
 //   drawing non-overlapping sprites of uniform depth.  For example, drawing
 //   screen-aligned text with ID3DX10Font.
 // D3DX10SPRITE_SORT_DEPTH_FRONT_TO_BACK
-//   Sprites are sorted by depth front-to-back prior to drawing.  This is 
+//   Sprites are sorted by depth front-to-back prior to drawing.  This is
 //   recommended when drawing opaque sprites of varying depths.
 // D3DX10SPRITE_SORT_DEPTH_BACK_TO_FRONT
-//   Sprites are sorted by depth back-to-front prior to drawing.  This is 
+//   Sprites are sorted by depth back-to-front prior to drawing.  This is
 //   recommended when drawing transparent sprites of varying depths.
 // D3DX10SPRITE_ADDREF_TEXTURES
 //   AddRef/Release all textures passed in to DrawSpritesBuffered
@@ -94,7 +94,7 @@ typedef struct _D3DX10_SPRITE
 // ------------
 // This object intends to provide an easy way to drawing sprites using D3D.
 //
-// Begin - 
+// Begin -
 //    Prepares device for drawing sprites.
 //
 // Draw -
@@ -103,7 +103,7 @@ typedef struct _D3DX10_SPRITE
 // Flush -
 //    Forces all batched sprites to submitted to the device.
 //
-// End - 
+// End -
 //    Restores device state to how it was when Begin was called.
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ typedef interface ID3DX10Sprite *LPD3DX10SPRITE;
 
 
 // {BA0B762D-8D28-43ec-B9DC-2F84443B0614}
-DEFINE_GUID(IID_ID3DX10Sprite, 
+DEFINE_GUID(IID_ID3DX10Sprite,
 0xba0b762d, 0x8d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x6, 0x14);
 
 
@@ -129,7 +129,7 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown)
 
     // ID3DX10Sprite
     STDMETHOD(Begin)(THIS_ UINT flags) PURE;
-    
+
     STDMETHOD(DrawSpritesBuffered)(THIS_ D3DX10_SPRITE *pSprites, UINT cSprites) PURE;
     STDMETHOD(Flush)(THIS) PURE;
 
@@ -149,9 +149,9 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown)
 extern "C" {
 #endif //__cplusplus
 
-HRESULT WINAPI 
-    D3DX10CreateSprite( 
-        ID3D10Device*         pDevice, 
+HRESULT WINAPI
+    D3DX10CreateSprite(
+        ID3D10Device*         pDevice,
         UINT                  cDeviceBufferSize,
         LPD3DX10SPRITE*       ppSprite);
 
@@ -185,7 +185,7 @@ DECLARE_INTERFACE(ID3DX10DataProcessor)
 };
 
 // {C93FECFA-6967-478a-ABBC-402D90621FCB}
-DEFINE_GUID(IID_ID3DX10ThreadPump, 
+DEFINE_GUID(IID_ID3DX10ThreadPump,
 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb);
 
 #undef INTERFACE
@@ -201,13 +201,13 @@ DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown)
     // ID3DX10ThreadPump
     STDMETHOD(AddWorkItem)(THIS_ ID3DX10DataLoader *pDataLoader, ID3DX10DataProcessor *pDataProcessor, HRESULT *pHResult, void **ppDeviceObject) PURE;
     STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE;
-      
+
     STDMETHOD(WaitForAllItems)(THIS) PURE;
     STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT iWorkItemCount);
 
     STDMETHOD(PurgeAllItems)(THIS) PURE;
     STDMETHOD(GetQueueStatus)(THIS_ UINT *pIoQueue, UINT *pProcessQueue, UINT *pDeviceQueue) PURE;
-    
+
 };
 
 HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX10ThreadPump **ppThreadPump);
@@ -216,7 +216,7 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1
 //////////////////////////////////////////////////////////////////////////////
 // ID3DX10Font:
 // ----------
-// Font objects contain the textures and resources needed to render a specific 
+// Font objects contain the textures and resources needed to render a specific
 // font on a specific device.
 //
 // GetGlyphData -
@@ -226,8 +226,8 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1
 //    Preloads glyphs into the glyph cache textures.
 //
 // DrawText -
-//    Draws formatted text on a D3D device.  Some parameters are 
-//    surprisingly similar to those of GDI's DrawText function.  See GDI 
+//    Draws formatted text on a D3D device.  Some parameters are
+//    surprisingly similar to those of GDI's DrawText function.  See GDI
 //    documentation for a detailed description of these parameters.
 //    If pSprite is NULL, an internal sprite object will be used.
 //
@@ -277,7 +277,7 @@ typedef interface ID3DX10Font *LPD3DX10FONT;
 
 
 // {D79DBB70-5F21-4d36-BBC2-FF525C213CDC}
-DEFINE_GUID(IID_ID3DX10Font, 
+DEFINE_GUID(IID_ID3DX10Font,
 0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc);
 
 
@@ -342,9 +342,9 @@ extern "C" {
 #endif //__cplusplus
 
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DX10CreateFontA(
-        ID3D10Device*           pDevice,  
+        ID3D10Device*           pDevice,
         INT                     Height,
         UINT                    Width,
         UINT                    Weight,
@@ -357,9 +357,9 @@ HRESULT WINAPI
         LPCSTR                  pFaceName,
         LPD3DX10FONT*           ppFont);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DX10CreateFontW(
-        ID3D10Device*           pDevice,  
+        ID3D10Device*           pDevice,
         INT                     Height,
         UINT                    Width,
         UINT                    Weight,
@@ -379,16 +379,16 @@ HRESULT WINAPI
 #endif
 
 
-HRESULT WINAPI 
-    D3DX10CreateFontIndirectA( 
-        ID3D10Device*             pDevice,  
-        CONST D3DX10_FONT_DESCA*   pDesc, 
+HRESULT WINAPI
+    D3DX10CreateFontIndirectA(
+        ID3D10Device*             pDevice,
+        CONST D3DX10_FONT_DESCA*   pDesc,
         LPD3DX10FONT*             ppFont);
 
-HRESULT WINAPI 
-    D3DX10CreateFontIndirectW( 
-        ID3D10Device*             pDevice,  
-        CONST D3DX10_FONT_DESCW*   pDesc, 
+HRESULT WINAPI
+    D3DX10CreateFontIndirectW(
+        ID3D10Device*             pDevice,
+        CONST D3DX10_FONT_DESCW*   pDesc,
         LPD3DX10FONT*             ppFont);
 
 #ifdef UNICODE
@@ -406,7 +406,7 @@ HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *pDevice);
 ///////////////////////////////////////////////////////////////////////////
 //
 // TODO: move these to a central error header file
-// 
+//
 #define _FACD3D  0x876
 #define MAKE_D3DHRESULT( code )  MAKE_HRESULT( 1, _FACD3D, code )
 #define MAKE_D3DSTATUS( code )  MAKE_HRESULT( 0, _FACD3D, code )
diff --git a/src/dep/include/DXSDK/include/D3DX10math.h b/src/dep/include/DXSDK/include/D3DX10math.h
index 1ff8fa3..72ae8b9 100644
--- a/src/dep/include/DXSDK/include/D3DX10math.h
+++ b/src/dep/include/DXSDK/include/D3DX10math.h
@@ -397,7 +397,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
 // This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
 // It aligns matrices on the stack and on the heap or in global scope.
 // It does this using __declspec(align(16)) which works on VC7 and on VC 6
-// with the processor pack. Unfortunately there is no way to detect the 
+// with the processor pack. Unfortunately there is no way to detect the
 // latter so this is turned on only on VC7. On other compilers this is the
 // the same as D3DXMATRIX.
 //
@@ -424,9 +424,9 @@ typedef struct _D3DXMATRIXA16 : public D3DXMATRIX
     void* operator new[] ( size_t );
 
     // delete operators
-    void operator delete   ( void* );   // These are NOT virtual; Do not 
+    void operator delete   ( void* );   // These are NOT virtual; Do not
     void operator delete[] ( void* );   // cast to D3DXMATRIX and delete.
-    
+
     // assignment operators
     _D3DXMATRIXA16& operator = ( CONST D3DXMATRIX& );
 
@@ -693,7 +693,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord
 // Transform (x, y, 0, 0) by matrix.
 D3DXVECTOR2* WINAPI D3DXVec2TransformNormal
     ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, CONST D3DXMATRIX *pM );
-     
+
 // Transform Array (x, y, 0, 1) by matrix.
 D3DXVECTOR4* WINAPI D3DXVec2TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n);
@@ -705,8 +705,8 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray
 // Transform Array (x, y, 0, 0) by matrix.
 D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray
     ( D3DXVECTOR2 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
-    
-    
+
+
 
 #ifdef __cplusplus
 }
@@ -785,14 +785,14 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
 D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
 
-// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a 
-// non-affine matrix, the matrix you pass to this function should be the 
+// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a
+// non-affine matrix, the matrix you pass to this function should be the
 // transpose of the inverse of the matrix you would use to transform a coord.
 D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
-    
-    
-// Transform Array (x, y, z, 1) by matrix. 
+
+
+// Transform Array (x, y, z, 1) by matrix.
 D3DXVECTOR4* WINAPI D3DXVec3TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
 
@@ -800,8 +800,8 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray
 D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray
     ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
 
-// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a 
-// non-affine matrix, the matrix you pass to this function should be the 
+// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a
+// non-affine matrix, the matrix you pass to this function should be the
 // transpose of the inverse of the matrix you would use to transform a coord.
 D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray
     ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@@ -815,7 +815,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Project
 D3DXVECTOR3* WINAPI D3DXVec3Unproject
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3D10_VIEWPORT *pViewport,
       CONST D3DXMATRIX *pProjection, CONST D3DXMATRIX *pView, CONST D3DXMATRIX *pWorld);
-      
+
 // Project vector Array from object space into screen space
 D3DXVECTOR3* WINAPI D3DXVec3ProjectArray
     ( D3DXVECTOR3 *pOut, UINT OutStride,CONST D3DXVECTOR3 *pV, UINT VStride,CONST D3D10_VIEWPORT *pViewport,
@@ -902,7 +902,7 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric
 // Transform vector by matrix.
 D3DXVECTOR4* WINAPI D3DXVec4Transform
     ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, CONST D3DXMATRIX *pM );
-    
+
 // Transform vector array by matrix.
 D3DXVECTOR4* WINAPI D3DXVec4TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR4 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@@ -934,7 +934,7 @@ FLOAT WINAPI D3DXMatrixDeterminant
     ( CONST D3DXMATRIX *pM );
 
 HRESULT WINAPI D3DXMatrixDecompose
-    ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation, 
+    ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
 	  D3DXVECTOR3 *pOutTranslation, CONST D3DXMATRIX *pM );
 
 D3DXMATRIX* WINAPI D3DXMatrixTranspose
@@ -999,9 +999,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation
 // Build 2D transformation matrix in XY plane.  NULL arguments are treated as identity.
 // Mout = Msc-1 * Msr-1 * Ms * Msr * Msc * Mrc-1 * Mr * Mrc * Mt
 D3DXMATRIX* WINAPI D3DXMatrixTransformation2D
-    ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter, 
-      FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling, 
-      CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, 
+    ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
+      FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
+      CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
       CONST D3DXVECTOR2* pTranslation);
 
 // Build affine transformation matrix.  NULL arguments are treated as identity.
@@ -1013,7 +1013,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation
 // Build 2D affine transformation matrix in XY plane.  NULL arguments are treated as identity.
 // Mout = Ms * Mrc-1 * Mr * Mrc * Mt
 D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D
-    ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter, 
+    ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
       FLOAT Rotation, CONST D3DXVECTOR2* pTranslation);
 
 // Build a lookat matrix. (right-handed)
@@ -1157,7 +1157,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
 // if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
 D3DXQUATERNION* WINAPI D3DXQuaternionExp
     ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
-      
+
 // Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
 // Expects unit quaternions.
 D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@@ -1172,11 +1172,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
       CONST D3DXQUATERNION *pC, FLOAT t );
 
 // Setup control points for spherical quadrangle interpolation
-// from Q1 to Q2.  The control points are chosen in such a way 
+// from Q1 to Q2.  The control points are chosen in such a way
 // to ensure the continuity of tangents with adjacent segments.
 void WINAPI D3DXQuaternionSquadSetup
     ( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
-      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1, 
+      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
       CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
 
 // Barycentric interpolation.
@@ -1240,7 +1240,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints
 // M should be the inverse transpose of the transformation desired.
 D3DXPLANE* WINAPI D3DXPlaneTransform
     ( D3DXPLANE *pOut, CONST D3DXPLANE *pP, CONST D3DXMATRIX *pM );
-    
+
 // Transform an array of planes by a matrix.  The vectors (a,b,c) must be normal.
 // M should be the inverse transpose of the transformation desired.
 D3DXPLANE* WINAPI D3DXPlaneTransformArray
@@ -1310,7 +1310,7 @@ extern "C" {
 // Calculate Fresnel term given the cosine of theta (likely obtained by
 // taking the dot of two normals), and the refraction index of the material.
 FLOAT WINAPI D3DXFresnelTerm
-    (FLOAT CosTheta, FLOAT RefractionIndex);     
+    (FLOAT CosTheta, FLOAT RefractionIndex);
 
 #ifdef __cplusplus
 }
@@ -1328,7 +1328,7 @@ typedef interface ID3DXMatrixStack ID3DXMatrixStack;
 typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK;
 
 // {C7885BA7-F990-4fe7-922D-8515E477DD85}
-DEFINE_GUID(IID_ID3DXMatrixStack, 
+DEFINE_GUID(IID_ID3DXMatrixStack,
 0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85);
 
 
@@ -1423,9 +1423,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
 extern "C" {
 #endif
 
-HRESULT WINAPI 
-    D3DXCreateMatrixStack( 
-        UINT                Flags, 
+HRESULT WINAPI
+    D3DXCreateMatrixStack(
+        UINT                Flags,
         LPD3DXMATRIXSTACK*  ppStack);
 
 #ifdef __cplusplus
@@ -1465,7 +1465,7 @@ extern "C" {
 
 FLOAT* WINAPI D3DXSHEvalDirection
     (  FLOAT *pOut, UINT Order, CONST D3DXVECTOR3 *pDir );
-    
+
 //============================================================================
 //
 //  D3DXSHRotate:
@@ -1488,7 +1488,7 @@ FLOAT* WINAPI D3DXSHEvalDirection
 
 FLOAT* WINAPI D3DXSHRotate
     ( FLOAT *pOut, UINT Order, CONST D3DXMATRIX *pMatrix, CONST FLOAT *pIn );
-    
+
 //============================================================================
 //
 //  D3DXSHRotateZ:
@@ -1511,7 +1511,7 @@ FLOAT* WINAPI D3DXSHRotate
 
 FLOAT* WINAPI D3DXSHRotateZ
     ( FLOAT *pOut, UINT Order, FLOAT Angle, CONST FLOAT *pIn );
-    
+
 //============================================================================
 //
 //  D3DXSHAdd:
@@ -1555,7 +1555,7 @@ FLOAT* WINAPI D3DXSHAdd
 
 FLOAT* WINAPI D3DXSHScale
     ( FLOAT *pOut, UINT Order, CONST FLOAT *pIn, CONST FLOAT Scale );
-    
+
 //============================================================================
 //
 //  D3DXSHDot:
@@ -1585,7 +1585,7 @@ FLOAT WINAPI D3DXSHDot
 //
 //  D3DXSHEvalDirectionalLight:
 //  --------------------
-//  Evaluates a directional light and returns spectral SH data.  The output 
+//  Evaluates a directional light and returns spectral SH data.  The output
 //  vector is computed so that if the intensity of R/G/B is unit the resulting
 //  exit radiance of a point directly under the light on a diffuse object with
 //  an albedo of 1 would be 1.0.  This will compute 3 spectral samples, pROut
@@ -1607,12 +1607,12 @@ FLOAT WINAPI D3DXSHDot
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
 HRESULT WINAPI D3DXSHEvalDirectionalLight
-    ( UINT Order, CONST D3DXVECTOR3 *pDir, 
+    ( UINT Order, CONST D3DXVECTOR3 *pDir,
       FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
       FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
 
@@ -1620,10 +1620,10 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
 //
 //  D3DXSHEvalSphericalLight:
 //  --------------------
-//  Evaluates a spherical light and returns spectral SH data.  There is no 
+//  Evaluates a spherical light and returns spectral SH data.  There is no
 //  normalization of the intensity of the light like there is for directional
-//  lights, care has to be taken when specifiying the intensities.  This will 
-//  compute 3 spectral samples, pROut has to be specified, while pGout and 
+//  lights, care has to be taken when specifiying the intensities.  This will
+//  compute 3 spectral samples, pROut has to be specified, while pGout and
 //  pBout are optional.
 //
 //  Parameters:
@@ -1644,7 +1644,7 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
@@ -1682,7 +1682,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
@@ -1690,7 +1690,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
     ( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT Radius,
       FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
       FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
-      
+
 //============================================================================
 //
 //  D3DXSHEvalHemisphereLight:
@@ -1702,7 +1702,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
 //  is normalized so that a point on a perfectly diffuse surface with no
 //  shadowing and a normal pointed in the direction pDir would result in exit
 //  radiance with a value of 1 if the top color was white and the bottom color
-//  was black.  This is a very simple model where Top represents the intensity 
+//  was black.  This is a very simple model where Top represents the intensity
 //  of the "sky" and Bottom represents the intensity of the "ground".
 //
 //  Parameters:
@@ -1719,7 +1719,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
 //   pGOut
 //      Output SH vector for Green
 //   pBOut
-//      Output SH vector for Blue        
+//      Output SH vector for Blue
 //
 //============================================================================
 
@@ -1729,7 +1729,7 @@ HRESULT WINAPI D3DXSHEvalHemisphereLight
 
 // Math intersection functions
 
-BOOL WINAPI D3DXIntersectTri 
+BOOL WINAPI D3DXIntersectTri
 (
     CONST D3DXVECTOR3 *p0,           // Triangle vertex 0 position
     CONST D3DXVECTOR3 *p1,           // Triangle vertex 1 position
@@ -1747,27 +1747,27 @@ BOOL WINAPI
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
 
-BOOL WINAPI 
+BOOL WINAPI
     D3DXBoxBoundProbe(
-        CONST D3DXVECTOR3 *pMin, 
+        CONST D3DXVECTOR3 *pMin,
         CONST D3DXVECTOR3 *pMax,
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingSphere(
         CONST D3DXVECTOR3 *pFirstPosition,	// pointer to first position
-        DWORD NumVertices, 
+        DWORD NumVertices,
         DWORD dwStride,							// count in bytes to subsequent position vectors
-        D3DXVECTOR3 *pCenter, 
+        D3DXVECTOR3 *pCenter,
         FLOAT *pRadius);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingBox(
         CONST D3DXVECTOR3 *pFirstPosition,	// pointer to first position
-        DWORD NumVertices, 
+        DWORD NumVertices,
         DWORD dwStride,							// count in bytes to subsequent position vectors
-        D3DXVECTOR3 *pMin, 
+        D3DXVECTOR3 *pMin,
         D3DXVECTOR3 *pMax);
 
 
diff --git a/src/dep/include/DXSDK/include/D3DX10mesh.h b/src/dep/include/DXSDK/include/D3DX10mesh.h
index 9171022..a0ca33e 100644
--- a/src/dep/include/DXSDK/include/D3DX10mesh.h
+++ b/src/dep/include/DXSDK/include/D3DX10mesh.h
@@ -13,27 +13,27 @@
 #define __D3DX10MESH_H__
 
 // {7ED943DD-52E8-40b5-A8D8-76685C406330}
-DEFINE_GUID(IID_ID3DX10BaseMesh, 
+DEFINE_GUID(IID_ID3DX10BaseMesh,
 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30);
 
 // {04B0D117-1041-46b1-AA8A-3952848BA22E}
-DEFINE_GUID(IID_ID3DX10MeshBuffer, 
+DEFINE_GUID(IID_ID3DX10MeshBuffer,
 0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e);
 
 // {4020E5C2-1403-4929-883F-E2E849FAC195}
-DEFINE_GUID(IID_ID3DX10Mesh, 
+DEFINE_GUID(IID_ID3DX10Mesh,
 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95);
 
 // {8875769A-D579-4088-AAEB-534D1AD84E96}
-DEFINE_GUID(IID_ID3DX10PMesh, 
+DEFINE_GUID(IID_ID3DX10PMesh,
 0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96);
 
 // {667EA4C7-F1CD-4386-B523-7C0290B83CC5}
-DEFINE_GUID(IID_ID3DX10SPMesh, 
+DEFINE_GUID(IID_ID3DX10SPMesh,
 0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5);
 
 // {3CE6CC22-DBF2-44f4-894D-F9C34A337139}
-DEFINE_GUID(IID_ID3DX10PatchMesh, 
+DEFINE_GUID(IID_ID3DX10PatchMesh,
 0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39);
 
 
@@ -85,7 +85,7 @@ typedef D3DX10_WELD_EPSILONS* LPD3DX10_WELD_EPSILONS;
 typedef struct _D3DX10_INTERSECT_INFO
 {
     UINT  FaceIndex;                // index of face intersected
-    FLOAT U;                        // Barycentric Hit Coordinates    
+    FLOAT U;                        // Barycentric Hit Coordinates
     FLOAT V;                        // Barycentric Hit Coordinates
     FLOAT Dist;                     // Ray-Intersection Parameter Distance
 } D3DX10_INTERSECT_INFO, *LPD3DX10_INTERSECT_INFO;
@@ -100,7 +100,7 @@ DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown)
     STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
-    
+
     // ID3DX10MeshBuffer
     STDMETHOD(Map)(THIS_ void **ppData, SIZE_T *pSize) PURE;
     STDMETHOD(Unmap)(THIS) PURE;
@@ -145,18 +145,18 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown)
 
     STDMETHOD(SetPointRepData)(THIS_ CONST UINT *pPointReps) PURE;
     STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **ppPointReps) PURE;
-    
+
     STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS dwDiscard) PURE;
     STDMETHOD(CloneMesh)(THIS_ UINT Flags, LPCWSTR pPosSemantic, CONST D3D10_INPUT_ELEMENT_DESC *pDesc, UINT  DeclCount, ID3DX10Mesh** ppCloneMesh) PURE;
 
     STDMETHOD(Optimize)(THIS_ UINT Flags, UINT * pFaceRemap, LPD3D10BLOB *ppVertexRemap) PURE;
     STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE;
-    
-	STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, 
+
+	STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
                                         UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits);
-    STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, 
+    STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
                                         UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits);
-    
+
     // ID3DX10Mesh - Device functions
     STDMETHOD(CommitToDevice)(THIS) PURE;
     STDMETHOD(DrawSubset)(THIS_ UINT AttribId) PURE;
@@ -172,15 +172,15 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown)
 extern "C" {
 #endif //__cplusplus
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DX10CreateMesh(
         ID3D10Device *pDevice,
-        CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration, 
+        CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration,
         UINT  DeclCount,
         LPCWSTR pPositionSemantic,
         UINT  VertexCount,
         UINT  FaceCount,
-        UINT  Options, 
+        UINT  Options,
         ID3DX10Mesh **ppMesh);
 
 #ifdef __cplusplus
@@ -197,7 +197,7 @@ enum _D3DX10MESHOPT {
     D3DX10_MESHOPT_IGNORE_VERTS   = 0x10000000,  // optimize faces only, don't touch vertices
     D3DX10_MESHOPT_DO_NOT_SPLIT    = 0x20000000,  // do not split vertices shared between attribute groups when attribute sorting
     D3DX10_MESHOPT_DEVICE_INDEPENDENT = 0x00400000,  // Only affects VCache.  uses a static known good cache size for all cards
-                            
+
     // D3DX10_MESHOPT_SHAREVB has been removed, please use D3DX10MESH_VB_SHARE instead
 
 };
@@ -208,7 +208,7 @@ enum _D3DX10MESHOPT {
 //////////////////////////////////////////////////////////////////////////
 
 // {420BD604-1C76-4a34-A466-E45D0658A32C}
-DEFINE_GUID(IID_ID3DX10SkinInfo, 
+DEFINE_GUID(IID_ID3DX10SkinInfo,
 0x420bd604, 0x1c76, 0x4a34, 0xa4, 0x66, 0xe4, 0x5d, 0x6, 0x58, 0xa3, 0x2c);
 
 // scaling modes for ID3DX10SkinInfo::Compact() & ID3DX10SkinInfo::UpdateMesh()
@@ -264,7 +264,7 @@ extern "C" {
 
 HRESULT WINAPI
     D3DX10CreateSkinInfo(LPD3DX10SKININFO* ppSkinInfo);
-        
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus
diff --git a/src/dep/include/DXSDK/include/D3DX10tex.h b/src/dep/include/DXSDK/include/D3DX10tex.h
index 43bf939..25f0005 100644
--- a/src/dep/include/DXSDK/include/D3DX10tex.h
+++ b/src/dep/include/DXSDK/include/D3DX10tex.h
@@ -27,14 +27,14 @@
 //      from the source image.
 //  D3DX10_FILTER_LINEAR
 //      Each destination pixel is computed by linearly interpolating between
-//      the nearest pixels in the source image.  This filter works best 
+//      the nearest pixels in the source image.  This filter works best
 //      when the scale on each axis is less than 2.
 //  D3DX10_FILTER_TRIANGLE
 //      Every pixel in the source image contributes equally to the
 //      destination image.  This is the slowest of all the filters.
 //  D3DX10_FILTER_BOX
-//      Each pixel is computed by averaging a 2x2(x2) box pixels from 
-//      the source image. Only works when the dimensions of the 
+//      Each pixel is computed by averaging a 2x2(x2) box pixels from
+//      the source image. Only works when the dimensions of the
 //      destination are half those of the source. (as with mip maps)
 //
 // And can be OR'd with any of these optional flags:
@@ -98,7 +98,7 @@ typedef enum D3DX10_FILTER_FLAG
 //  D3DX10_NORMALMAP_MIRROR
 //      Same as specifying D3DX10_NORMALMAP_MIRROR_U | D3DX10_NORMALMAP_MIRROR_V
 //  D3DX10_NORMALMAP_INVERTSIGN
-//      Inverts the direction of each normal 
+//      Inverts the direction of each normal
 //  D3DX10_NORMALMAP_COMPUTE_OCCLUSION
 //      Compute the per pixel Occlusion term and encodes it into the alpha.
 //      An Alpha of 1 means that the pixel is not obscured in anyway, and
@@ -130,7 +130,7 @@ typedef enum D3DX10_NORMALMAP_FLAG
 // D3DX10_CHANNEL_ALPHA
 //     Indicates the alpha channel should be used
 // D3DX10_CHANNEL_LUMINANCE
-//     Indicates the luminaces of the red green and blue channels should be 
+//     Indicates the luminaces of the red green and blue channels should be
 //     used.
 //
 //----------------------------------------------------------------------------
@@ -171,7 +171,7 @@ typedef enum _D3DX10_IMAGE_FILE_FORMAT
 // ---------------
 // This structure is used to return a rough description of what the
 // the original contents of an image file looked like.
-// 
+//
 //  Width
 //      Width of original image in pixels
 //  Height
@@ -222,10 +222,10 @@ extern "C" {
 //----------------------------------------------------------------------------
 // D3DX10_IMAGE_LOAD_INFO:
 // ---------------
-// This structure can be optionally passed in to texture loader APIs to 
+// This structure can be optionally passed in to texture loader APIs to
 // control how textures get loaded. Pass in D3DX10_DEFAULT for any of these
 // to have D3DX automatically pick defaults based on the source file.
-// 
+//
 //  Width
 //      Rescale texture to Width texels wide
 //  Height
@@ -249,10 +249,10 @@ extern "C" {
 //  Filter
 //      Filter the texture using the specified filter (only when resampling)
 //  MipFilter
-//      Filter the texture mip levels using the specified filter (only if 
+//      Filter the texture mip levels using the specified filter (only if
 //      generating mips)
 //  pSrcInfo
-//      (optional) pointer to a D3DX10_IMAGE_INFO structure that will get 
+//      (optional) pointer to a D3DX10_IMAGE_INFO structure that will get
 //      populated with source image information
 //
 //----------------------------------------------------------------------------
@@ -274,7 +274,7 @@ typedef struct _D3DX10_IMAGE_LOAD_INFO
     UINT                       Filter;
     UINT                       MipFilter;
     D3DX10_IMAGE_INFO*         pSrcInfo;
-    
+
 #ifdef __cplusplus
     _D3DX10_IMAGE_LOAD_INFO()
     {
@@ -291,7 +291,7 @@ typedef struct _D3DX10_IMAGE_LOAD_INFO
         Filter = D3DX10_DEFAULT;
         MipFilter = D3DX10_DEFAULT;
         pSrcInfo = NULL;
-    }  
+    }
 #endif
 
 } D3DX10_IMAGE_LOAD_INFO;
@@ -338,7 +338,7 @@ HRESULT WINAPI D3DX10CreateAsyncShaderResourceViewProcessor(ID3D10Device *pDevic
 //  pPump
 //      Optional pointer to a thread pump object to use.
 //  pSrcInfo
-//      Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file.
 //
 //----------------------------------------------------------------------------
@@ -505,8 +505,8 @@ HRESULT WINAPI
         ID3D10Device*            pDevice,
         HMODULE                  hSrcModule,
         LPCSTR                   pSrcResource,
-        D3DX10_IMAGE_LOAD_INFO   *pLoadInfo,  
-        ID3DX10ThreadPump*       pPump,   
+        D3DX10_IMAGE_LOAD_INFO   *pLoadInfo,
+        ID3DX10ThreadPump*       pPump,
         ID3D10Resource**         ppTexture);
 
 HRESULT WINAPI
@@ -533,7 +533,7 @@ HRESULT WINAPI
         LPCVOID                   pSrcData,
         SIZE_T                    SrcDataSize,
         D3DX10_IMAGE_LOAD_INFO    *pLoadInfo,
-        ID3DX10ThreadPump*        pPump,        
+        ID3DX10ThreadPump*        pPump,
         ID3D10ShaderResourceView** ppShaderResourceView);
 
 HRESULT WINAPI
@@ -541,8 +541,8 @@ HRESULT WINAPI
         ID3D10Device*             pDevice,
         LPCVOID                   pSrcData,
         SIZE_T                    SrcDataSize,
-        D3DX10_IMAGE_LOAD_INFO    *pLoadInfo,    
-        ID3DX10ThreadPump*        pPump,    
+        D3DX10_IMAGE_LOAD_INFO    *pLoadInfo,
+        ID3DX10ThreadPump*        pPump,
         ID3D10Resource**          ppTexture);
 
 
@@ -610,7 +610,7 @@ HRESULT WINAPI
 //
 // Parameters
 //  pSrcTexture
-//      Pointer to the source heightmap texture 
+//      Pointer to the source heightmap texture
 //  Flags
 //      D3DX10_NORMALMAP flags
 //  Channel
diff --git a/src/dep/include/DXSDK/include/DXGI.h b/src/dep/include/DXSDK/include/DXGI.h
index 2c203e5..f32305b 100644
--- a/src/dep/include/DXSDK/include/DXGI.h
+++ b/src/dep/include/DXSDK/include/DXGI.h
@@ -7,8 +7,8 @@
 /* Compiler settings for dxgi.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -46,7 +46,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IDXGIObject_FWD_DEFINED__
 #define __IDXGIObject_FWD_DEFINED__
@@ -107,84 +107,84 @@ typedef interface IDXGIDevice IDXGIDevice;
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 #ifndef __IDXGIObject_INTERFACE_DEFINED__
 #define __IDXGIObject_INTERFACE_DEFINED__
 
 /* interface IDXGIObject */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIObject;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("aec22fb8-76f3-4639-9be0-28eb43a67a2e")
     IDXGIObject : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateData( 
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateData(
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetPrivateData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetParent( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetParent(
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIObjectVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIObject * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIObject * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIObject * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIObject * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIObject * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIObject * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIObject * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
+
         END_INTERFACE
     } IDXGIObjectVtbl;
 
@@ -193,32 +193,32 @@ EXTERN_C const IID IID_IDXGIObject;
         CONST_VTBL struct IDXGIObjectVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIObject_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIObject_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIObject_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIObject_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIObject_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIObject_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIObject_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 #endif /* COBJMACROS */
 
@@ -235,68 +235,68 @@ EXTERN_C const IID IID_IDXGIObject;
 #define __IDXGIDeviceSubObject_INTERFACE_DEFINED__
 
 /* interface IDXGIDeviceSubObject */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIDeviceSubObject;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("3d3e0379-f9de-4d58-bb6c-18d62992f1a6")
     IDXGIDeviceSubObject : public IDXGIObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetDevice( 
+        virtual HRESULT STDMETHODCALLTYPE GetDevice(
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppDevice) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIDeviceSubObjectVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIDeviceSubObject * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIDeviceSubObject * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDevice )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDevice )(
             IDXGIDeviceSubObject * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppDevice);
-        
+
         END_INTERFACE
     } IDXGIDeviceSubObjectVtbl;
 
@@ -305,36 +305,36 @@ EXTERN_C const IID IID_IDXGIDeviceSubObject;
         CONST_VTBL struct IDXGIDeviceSubObjectVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIDeviceSubObject_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIDeviceSubObject_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIDeviceSubObject_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIDeviceSubObject_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIDeviceSubObject_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIDeviceSubObject_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIDeviceSubObject_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIDeviceSubObject_GetDevice(This,riid,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) )
 
 #endif /* COBJMACROS */
 
@@ -351,92 +351,92 @@ EXTERN_C const IID IID_IDXGIDeviceSubObject;
 #define __IDXGIResource_INTERFACE_DEFINED__
 
 /* interface IDXGIResource */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIResource;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("035f3ab4-482e-4e50-b41f-8a7f8bd8960b")
     IDXGIResource : public IDXGIDeviceSubObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetSharedHandle( 
+        virtual HRESULT STDMETHODCALLTYPE GetSharedHandle(
             /* [out] */ HANDLE *pSharedHandle) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetUsage( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetUsage(
             /* [out] */ DXGI_USAGE *pUsage) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetEvictionPriority( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetEvictionPriority(
             /* [in] */ UINT EvictionPriority) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetEvictionPriority( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetEvictionPriority(
             /* [retval][out] */ UINT *pEvictionPriority) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIResourceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIResource * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIResource * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIResource * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIResource * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIResource * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIResource * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIResource * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDevice )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDevice )(
             IDXGIResource * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )(
             IDXGIResource * This,
             /* [out] */ HANDLE *pSharedHandle);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetUsage )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetUsage )(
             IDXGIResource * This,
             /* [out] */ DXGI_USAGE *pUsage);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )(
             IDXGIResource * This,
             /* [in] */ UINT EvictionPriority);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )(
             IDXGIResource * This,
             /* [retval][out] */ UINT *pEvictionPriority);
-        
+
         END_INTERFACE
     } IDXGIResourceVtbl;
 
@@ -445,49 +445,49 @@ EXTERN_C const IID IID_IDXGIResource;
         CONST_VTBL struct IDXGIResourceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIResource_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIResource_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIResource_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIResource_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIResource_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIResource_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIResource_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIResource_GetDevice(This,riid,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) )
 
 
 #define IDXGIResource_GetSharedHandle(This,pSharedHandle)	\
-    ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) ) 
+    ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) )
 
 #define IDXGIResource_GetUsage(This,pUsage)	\
-    ( (This)->lpVtbl -> GetUsage(This,pUsage) ) 
+    ( (This)->lpVtbl -> GetUsage(This,pUsage) )
 
 #define IDXGIResource_SetEvictionPriority(This,EvictionPriority)	\
-    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) 
+    ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) )
 
 #define IDXGIResource_GetEvictionPriority(This,pEvictionPriority)	\
-    ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) ) 
+    ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) )
 
 #endif /* COBJMACROS */
 
@@ -501,7 +501,7 @@ EXTERN_C const IID IID_IDXGIResource;
 
 
 /* interface __MIDL_itf_dxgi_0000_0003 */
-/* [local] */ 
+/* [local] */
 
 #define	DXGI_MAP_READ	( 1UL )
 
@@ -518,85 +518,85 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0003_v0_0_s_ifspec;
 #define __IDXGISurface_INTERFACE_DEFINED__
 
 /* interface IDXGISurface */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGISurface;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("cafcb56c-6ac3-4889-bf47-9e23bbd260ec")
     IDXGISurface : public IDXGIDeviceSubObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetDesc( 
+        virtual HRESULT STDMETHODCALLTYPE GetDesc(
             /* [out] */ DXGI_SURFACE_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Map( 
+
+        virtual HRESULT STDMETHODCALLTYPE Map(
             /* [out] */ DXGI_MAPPED_RECT *pLockedRect,
             /* [in] */ UINT Flags) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE Unmap( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGISurfaceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGISurface * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGISurface * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGISurface * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGISurface * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGISurface * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGISurface * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGISurface * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDevice )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDevice )(
             IDXGISurface * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDesc )(
             IDXGISurface * This,
             /* [out] */ DXGI_SURFACE_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *Map )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Map )(
             IDXGISurface * This,
             /* [out] */ DXGI_MAPPED_RECT *pLockedRect,
             /* [in] */ UINT Flags);
-        
-        HRESULT ( STDMETHODCALLTYPE *Unmap )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Unmap )(
             IDXGISurface * This);
-        
+
         END_INTERFACE
     } IDXGISurfaceVtbl;
 
@@ -605,46 +605,46 @@ EXTERN_C const IID IID_IDXGISurface;
         CONST_VTBL struct IDXGISurfaceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGISurface_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGISurface_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGISurface_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGISurface_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGISurface_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGISurface_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGISurface_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGISurface_GetDevice(This,riid,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) )
 
 
 #define IDXGISurface_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define IDXGISurface_Map(This,pLockedRect,Flags)	\
-    ( (This)->lpVtbl -> Map(This,pLockedRect,Flags) ) 
+    ( (This)->lpVtbl -> Map(This,pLockedRect,Flags) )
 
 #define IDXGISurface_Unmap(This)	\
-    ( (This)->lpVtbl -> Unmap(This) ) 
+    ( (This)->lpVtbl -> Unmap(This) )
 
 #endif /* COBJMACROS */
 
@@ -658,7 +658,7 @@ EXTERN_C const IID IID_IDXGISurface;
 
 
 /* interface __MIDL_itf_dxgi_0000_0004 */
-/* [local] */ 
+/* [local] */
 
 
 
@@ -670,91 +670,91 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0004_v0_0_s_ifspec;
 #define __IDXGIAdapter_INTERFACE_DEFINED__
 
 /* interface IDXGIAdapter */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIAdapter;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("2411e7e1-12ac-4ccf-bd14-9798e8534dc0")
     IDXGIAdapter : public IDXGIObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE EnumOutputs( 
+        virtual HRESULT STDMETHODCALLTYPE EnumOutputs(
             /* [in] */ UINT Output,
             /* [out][in] */ IDXGIOutput **ppOutput) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetDesc(
             /* [out] */ DXGI_ADAPTER_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE RegisterDriver( 
+
+        virtual HRESULT STDMETHODCALLTYPE RegisterDriver(
             /* [in] */ HMODULE Module) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport( 
+
+        virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport(
             /* [in] */ REFGUID InterfaceName,
             /* [out] */ LARGE_INTEGER *pUMDVersion) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIAdapterVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIAdapter * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIAdapter * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIAdapter * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIAdapter * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIAdapter * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIAdapter * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIAdapter * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( 
+
+        HRESULT ( STDMETHODCALLTYPE *EnumOutputs )(
             IDXGIAdapter * This,
             /* [in] */ UINT Output,
             /* [out][in] */ IDXGIOutput **ppOutput);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDesc )(
             IDXGIAdapter * This,
             /* [out] */ DXGI_ADAPTER_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *RegisterDriver )( 
+
+        HRESULT ( STDMETHODCALLTYPE *RegisterDriver )(
             IDXGIAdapter * This,
             /* [in] */ HMODULE Module);
-        
-        HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )(
             IDXGIAdapter * This,
             /* [in] */ REFGUID InterfaceName,
             /* [out] */ LARGE_INTEGER *pUMDVersion);
-        
+
         END_INTERFACE
     } IDXGIAdapterVtbl;
 
@@ -763,45 +763,45 @@ EXTERN_C const IID IID_IDXGIAdapter;
         CONST_VTBL struct IDXGIAdapterVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIAdapter_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIAdapter_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIAdapter_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIAdapter_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIAdapter_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIAdapter_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIAdapter_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIAdapter_EnumOutputs(This,Output,ppOutput)	\
-    ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) 
+    ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) )
 
 #define IDXGIAdapter_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define IDXGIAdapter_RegisterDriver(This,Module)	\
-    ( (This)->lpVtbl -> RegisterDriver(This,Module) ) 
+    ( (This)->lpVtbl -> RegisterDriver(This,Module) )
 
 #define IDXGIAdapter_CheckInterfaceSupport(This,InterfaceName,pUMDVersion)	\
-    ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) 
+    ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) )
 
 #endif /* COBJMACROS */
 
@@ -815,7 +815,7 @@ EXTERN_C const IID IID_IDXGIAdapter;
 
 
 /* interface __MIDL_itf_dxgi_0000_0005 */
-/* [local] */ 
+/* [local] */
 
 #define	DXGI_ENUM_MODES_INTERLACED	( 1UL )
 
@@ -832,151 +832,151 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0005_v0_0_s_ifspec;
 #define __IDXGIOutput_INTERFACE_DEFINED__
 
 /* interface IDXGIOutput */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIOutput;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("ae02eedb-c735-4690-8d52-5a8dc20213aa")
     IDXGIOutput : public IDXGIObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetDesc( 
+        virtual HRESULT STDMETHODCALLTYPE GetDesc(
             /* [out] */ DXGI_OUTPUT_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(
             /* [out] */ DXGI_GAMMA_CONTROL_CAPABILIITES *pGammaCaps) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE EnumDisplayModes( 
+
+        virtual HRESULT STDMETHODCALLTYPE EnumDisplayModes(
             /* [in] */ UINT Mode,
             /* [in] */ DXGI_FORMAT EnumFormat,
             /* [out] */ DXGI_MODE_DESC *pDesc,
             /* [in] */ UINT Flags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDisplayMode( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetDisplayMode(
             /* [out] */ DXGI_MODE_DESC *pMode) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode( 
+
+        virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(
             /* [in] */ const DXGI_MODE_DESC *pModeToMatch,
             /* [out] */ DXGI_MODE_DESC *pClosestMatch) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE WaitForVBlank( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TakeOwnership( 
+
+        virtual HRESULT STDMETHODCALLTYPE TakeOwnership(
             /* [in] */ IUnknown *pDevice,
             BOOL Exclusive) = 0;
-        
+
         virtual void STDMETHODCALLTYPE ReleaseOwnership( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface(
             /* [in] */ IDXGISurface *pScanoutSurface,
             /* [in] */ DXGI_MODE_DESC *pMode) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(
             /* [in] */ IDXGISurface *pDestination) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(
             /* [out] */ DXGI_FRAME_STATISTICS *pStats) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetGammaControl( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetGammaControl(
             /* [in] */ const DXGI_GAMMA_CONTROL *pArray) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIOutputVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIOutput * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIOutput * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIOutput * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIOutput * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIOutput * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIOutput * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIOutput * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDesc )(
             IDXGIOutput * This,
             /* [out] */ DXGI_OUTPUT_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )(
             IDXGIOutput * This,
             /* [out] */ DXGI_GAMMA_CONTROL_CAPABILIITES *pGammaCaps);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumDisplayModes )( 
+
+        HRESULT ( STDMETHODCALLTYPE *EnumDisplayModes )(
             IDXGIOutput * This,
             /* [in] */ UINT Mode,
             /* [in] */ DXGI_FORMAT EnumFormat,
             /* [out] */ DXGI_MODE_DESC *pDesc,
             /* [in] */ UINT Flags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplayMode )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDisplayMode )(
             IDXGIOutput * This,
             /* [out] */ DXGI_MODE_DESC *pMode);
-        
-        HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( 
+
+        HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )(
             IDXGIOutput * This,
             /* [in] */ const DXGI_MODE_DESC *pModeToMatch,
             /* [out] */ DXGI_MODE_DESC *pClosestMatch);
-        
-        HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( 
+
+        HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )(
             IDXGIOutput * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( 
+
+        HRESULT ( STDMETHODCALLTYPE *TakeOwnership )(
             IDXGIOutput * This,
             /* [in] */ IUnknown *pDevice,
             BOOL Exclusive);
-        
-        void ( STDMETHODCALLTYPE *ReleaseOwnership )( 
+
+        void ( STDMETHODCALLTYPE *ReleaseOwnership )(
             IDXGIOutput * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )(
             IDXGIOutput * This,
             /* [in] */ IDXGISurface *pScanoutSurface,
             /* [in] */ DXGI_MODE_DESC *pMode);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )(
             IDXGIOutput * This,
             /* [in] */ IDXGISurface *pDestination);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )(
             IDXGIOutput * This,
             /* [out] */ DXGI_FRAME_STATISTICS *pStats);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetGammaControl )(
             IDXGIOutput * This,
             /* [in] */ const DXGI_GAMMA_CONTROL *pArray);
-        
+
         END_INTERFACE
     } IDXGIOutputVtbl;
 
@@ -985,69 +985,69 @@ EXTERN_C const IID IID_IDXGIOutput;
         CONST_VTBL struct IDXGIOutputVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIOutput_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIOutput_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIOutput_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIOutput_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIOutput_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIOutput_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIOutput_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIOutput_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define IDXGIOutput_GetGammaControlCapabilities(This,pGammaCaps)	\
-    ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) 
+    ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) )
 
 #define IDXGIOutput_EnumDisplayModes(This,Mode,EnumFormat,pDesc,Flags)	\
-    ( (This)->lpVtbl -> EnumDisplayModes(This,Mode,EnumFormat,pDesc,Flags) ) 
+    ( (This)->lpVtbl -> EnumDisplayModes(This,Mode,EnumFormat,pDesc,Flags) )
 
 #define IDXGIOutput_GetDisplayMode(This,pMode)	\
-    ( (This)->lpVtbl -> GetDisplayMode(This,pMode) ) 
+    ( (This)->lpVtbl -> GetDisplayMode(This,pMode) )
 
 #define IDXGIOutput_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch)	\
-    ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch) ) 
+    ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch) )
 
 #define IDXGIOutput_WaitForVBlank(This)	\
-    ( (This)->lpVtbl -> WaitForVBlank(This) ) 
+    ( (This)->lpVtbl -> WaitForVBlank(This) )
 
 #define IDXGIOutput_TakeOwnership(This,pDevice,Exclusive)	\
-    ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) 
+    ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) )
 
 #define IDXGIOutput_ReleaseOwnership(This)	\
-    ( (This)->lpVtbl -> ReleaseOwnership(This) ) 
+    ( (This)->lpVtbl -> ReleaseOwnership(This) )
 
 #define IDXGIOutput_SetDisplaySurface(This,pScanoutSurface,pMode)	\
-    ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface,pMode) ) 
+    ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface,pMode) )
 
 #define IDXGIOutput_GetDisplaySurfaceData(This,pDestination)	\
-    ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) 
+    ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) )
 
 #define IDXGIOutput_GetFrameStatistics(This,pStats)	\
-    ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) 
+    ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) )
 
 #define IDXGIOutput_SetGammaControl(This,pArray)	\
-    ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) 
+    ( (This)->lpVtbl -> SetGammaControl(This,pArray) )
 
 #endif /* COBJMACROS */
 
@@ -1061,7 +1061,7 @@ EXTERN_C const IID IID_IDXGIOutput;
 
 
 /* interface __MIDL_itf_dxgi_0000_0006 */
-/* [local] */ 
+/* [local] */
 
 #define DXGI_MAX_BACKBUFFERS    ( 16 )
 #define DXGI_PRESENT_TEST       0x00000001UL
@@ -1074,106 +1074,106 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0006_v0_0_s_ifspec;
 #define __IDXGISwapChain_INTERFACE_DEFINED__
 
 /* interface IDXGISwapChain */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGISwapChain;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("310d36a0-d2e7-4c0a-aa04-6a9d23b8886a")
     IDXGISwapChain : public IDXGIDeviceSubObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Present( 
+        virtual HRESULT STDMETHODCALLTYPE Present(
             /* [in] */ RECT *pSrc,
             /* [in] */ RECT *pDest,
             /* [in] */ RECT *pSourceDirtyRects,
             /* [in] */ UINT NumSourceRects,
             /* [in] */ UINT SyncInterval,
             /* [in] */ UINT Flags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetBackBuffer( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetBackBuffer(
             /* [in] */ UINT Buffer,
             /* [in] */ REFIID riid,
             /* [out][in] */ void **ppSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetFullscreenState( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetFullscreenState(
             /* [in] */ BOOL Fullscreen,
             /* [in] */ IDXGIOutput *pTarget) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFullscreenState( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetFullscreenState(
             /* [out] */ BOOL *pFullscreen,
             /* [out] */ IDXGIOutput **ppTarget) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDesc( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetDesc(
             /* [out] */ DXGI_SWAP_CHAIN_DESC *pDesc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ResizeBackBuffers( 
+
+        virtual HRESULT STDMETHODCALLTYPE ResizeBackBuffers(
             /* [in] */ UINT Width,
             /* [in] */ UINT Height,
             /* [in] */ DXGI_FORMAT NewFormat) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ResizeTarget( 
+
+        virtual HRESULT STDMETHODCALLTYPE ResizeTarget(
             /* [in] */ const DXGI_MODE_DESC *pNewTargetParameters) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetContainingOutput( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetContainingOutput(
             IDXGIOutput **ppOutput) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics(
             /* [out] */ DXGI_FRAME_STATISTICS *pStats) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount(
             /* [out] */ UINT *pLastPresentCount) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGISwapChainVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGISwapChain * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGISwapChain * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGISwapChain * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGISwapChain * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGISwapChain * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGISwapChain * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGISwapChain * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDevice )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDevice )(
             IDXGISwapChain * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppDevice);
-        
-        HRESULT ( STDMETHODCALLTYPE *Present )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Present )(
             IDXGISwapChain * This,
             /* [in] */ RECT *pSrc,
             /* [in] */ RECT *pDest,
@@ -1181,49 +1181,49 @@ EXTERN_C const IID IID_IDXGISwapChain;
             /* [in] */ UINT NumSourceRects,
             /* [in] */ UINT SyncInterval,
             /* [in] */ UINT Flags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetBackBuffer )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetBackBuffer )(
             IDXGISwapChain * This,
             /* [in] */ UINT Buffer,
             /* [in] */ REFIID riid,
             /* [out][in] */ void **ppSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )(
             IDXGISwapChain * This,
             /* [in] */ BOOL Fullscreen,
             /* [in] */ IDXGIOutput *pTarget);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )(
             IDXGISwapChain * This,
             /* [out] */ BOOL *pFullscreen,
             /* [out] */ IDXGIOutput **ppTarget);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDesc )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDesc )(
             IDXGISwapChain * This,
             /* [out] */ DXGI_SWAP_CHAIN_DESC *pDesc);
-        
-        HRESULT ( STDMETHODCALLTYPE *ResizeBackBuffers )( 
+
+        HRESULT ( STDMETHODCALLTYPE *ResizeBackBuffers )(
             IDXGISwapChain * This,
             /* [in] */ UINT Width,
             /* [in] */ UINT Height,
             /* [in] */ DXGI_FORMAT NewFormat);
-        
-        HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( 
+
+        HRESULT ( STDMETHODCALLTYPE *ResizeTarget )(
             IDXGISwapChain * This,
             /* [in] */ const DXGI_MODE_DESC *pNewTargetParameters);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )(
             IDXGISwapChain * This,
             IDXGIOutput **ppOutput);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )(
             IDXGISwapChain * This,
             /* [out] */ DXGI_FRAME_STATISTICS *pStats);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )(
             IDXGISwapChain * This,
             /* [out] */ UINT *pLastPresentCount);
-        
+
         END_INTERFACE
     } IDXGISwapChainVtbl;
 
@@ -1232,67 +1232,67 @@ EXTERN_C const IID IID_IDXGISwapChain;
         CONST_VTBL struct IDXGISwapChainVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGISwapChain_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGISwapChain_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGISwapChain_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGISwapChain_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGISwapChain_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGISwapChain_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGISwapChain_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGISwapChain_GetDevice(This,riid,ppDevice)	\
-    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) 
+    ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) )
 
 
 #define IDXGISwapChain_Present(This,pSrc,pDest,pSourceDirtyRects,NumSourceRects,SyncInterval,Flags)	\
-    ( (This)->lpVtbl -> Present(This,pSrc,pDest,pSourceDirtyRects,NumSourceRects,SyncInterval,Flags) ) 
+    ( (This)->lpVtbl -> Present(This,pSrc,pDest,pSourceDirtyRects,NumSourceRects,SyncInterval,Flags) )
 
 #define IDXGISwapChain_GetBackBuffer(This,Buffer,riid,ppSurface)	\
-    ( (This)->lpVtbl -> GetBackBuffer(This,Buffer,riid,ppSurface) ) 
+    ( (This)->lpVtbl -> GetBackBuffer(This,Buffer,riid,ppSurface) )
 
 #define IDXGISwapChain_SetFullscreenState(This,Fullscreen,pTarget)	\
-    ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) 
+    ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) )
 
 #define IDXGISwapChain_GetFullscreenState(This,pFullscreen,ppTarget)	\
-    ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) 
+    ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) )
 
 #define IDXGISwapChain_GetDesc(This,pDesc)	\
-    ( (This)->lpVtbl -> GetDesc(This,pDesc) ) 
+    ( (This)->lpVtbl -> GetDesc(This,pDesc) )
 
 #define IDXGISwapChain_ResizeBackBuffers(This,Width,Height,NewFormat)	\
-    ( (This)->lpVtbl -> ResizeBackBuffers(This,Width,Height,NewFormat) ) 
+    ( (This)->lpVtbl -> ResizeBackBuffers(This,Width,Height,NewFormat) )
 
 #define IDXGISwapChain_ResizeTarget(This,pNewTargetParameters)	\
-    ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) 
+    ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) )
 
 #define IDXGISwapChain_GetContainingOutput(This,ppOutput)	\
-    ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) 
+    ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) )
 
 #define IDXGISwapChain_GetFrameStatistics(This,pStats)	\
-    ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) 
+    ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) )
 
 #define IDXGISwapChain_GetLastPresentCount(This,pLastPresentCount)	\
-    ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) 
+    ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) )
 
 #endif /* COBJMACROS */
 
@@ -1306,7 +1306,7 @@ EXTERN_C const IID IID_IDXGISwapChain;
 
 
 /* interface __MIDL_itf_dxgi_0000_0007 */
-/* [local] */ 
+/* [local] */
 
 #define DXGI_MWA_NO_WINDOW_CHANGES    ( 1 << 0 )
 #define DXGI_MWA_NO_ALT_ENTER    ( 1 << 1 )
@@ -1320,95 +1320,95 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0007_v0_0_s_ifspec;
 #define __IDXGIFactory_INTERFACE_DEFINED__
 
 /* interface IDXGIFactory */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIFactory;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("7b7166ec-21c7-44ae-b21a-c9ae321ae369")
     IDXGIFactory : public IDXGIObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE EnumAdapters( 
+        virtual HRESULT STDMETHODCALLTYPE EnumAdapters(
             /* [in] */ UINT Adapter,
             /* [out] */ IDXGIAdapter **ppAdapter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation( 
+
+        virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation(
             HWND WindowHandle,
             UINT Flags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation(
             HWND *pWindowHandle) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSwapChain( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateSwapChain(
             IUnknown *pDevice,
             DXGI_SWAP_CHAIN_DESC *pDesc,
             IDXGISwapChain **ppSwapChain) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIFactoryVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIFactory * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIFactory * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIFactory * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIFactory * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIFactory * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIFactory * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIFactory * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( 
+
+        HRESULT ( STDMETHODCALLTYPE *EnumAdapters )(
             IDXGIFactory * This,
             /* [in] */ UINT Adapter,
             /* [out] */ IDXGIAdapter **ppAdapter);
-        
-        HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( 
+
+        HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )(
             IDXGIFactory * This,
             HWND WindowHandle,
             UINT Flags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )(
             IDXGIFactory * This,
             HWND *pWindowHandle);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )(
             IDXGIFactory * This,
             IUnknown *pDevice,
             DXGI_SWAP_CHAIN_DESC *pDesc,
             IDXGISwapChain **ppSwapChain);
-        
+
         END_INTERFACE
     } IDXGIFactoryVtbl;
 
@@ -1417,45 +1417,45 @@ EXTERN_C const IID IID_IDXGIFactory;
         CONST_VTBL struct IDXGIFactoryVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIFactory_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIFactory_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIFactory_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIFactory_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIFactory_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIFactory_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIFactory_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIFactory_EnumAdapters(This,Adapter,ppAdapter)	\
-    ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) 
+    ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) )
 
 #define IDXGIFactory_MakeWindowAssociation(This,WindowHandle,Flags)	\
-    ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) 
+    ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) )
 
 #define IDXGIFactory_GetWindowAssociation(This,pWindowHandle)	\
-    ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) 
+    ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) )
 
 #define IDXGIFactory_CreateSwapChain(This,pDevice,pDesc,ppSwapChain)	\
-    ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) 
+    ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) )
 
 #endif /* COBJMACROS */
 
@@ -1469,7 +1469,7 @@ EXTERN_C const IID IID_IDXGIFactory;
 
 
 /* interface __MIDL_itf_dxgi_0000_0008 */
-/* [local] */ 
+/* [local] */
 
 HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **ppFactory);
 
@@ -1481,106 +1481,106 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0008_v0_0_s_ifspec;
 #define __IDXGIDevice_INTERFACE_DEFINED__
 
 /* interface IDXGIDevice */
-/* [unique][local][uuid][object] */ 
+/* [unique][local][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGIDevice;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("54ec77fa-1377-44e6-8c32-88fd5f44c84c")
     IDXGIDevice : public IDXGIObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetAdapter( 
+        virtual HRESULT STDMETHODCALLTYPE GetAdapter(
             /* [out] */ IDXGIAdapter **pAdapter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateSurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateSurface(
             /* [in] */ const DXGI_SURFACE_DESC *pDesc,
             /* [in] */ UINT NumSurfaces,
             /* [in] */ DXGI_USAGE Usage,
             /* [in] */ const DXGI_SHARED_RESOURCE *pSharedResource,
             /* [out] */ IDXGISurface **ppSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency( 
+
+        virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency(
             /* [size_is][in] */ IUnknown *const *ppResources,
             /* [size_is][out] */ DXGI_RESIDENCY *pResidencyStatus,
             /* [in] */ SIZE_T NumResources) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority(
             /* [in] */ INT Priority) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority(
             /* [retval][out] */ INT *pPriority) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGIDeviceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGIDevice * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGIDevice * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGIDevice * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateData )(
             IDXGIDevice * This,
             /* [in] */ REFGUID Name,
             /* [in] */ SIZE_T DataSize,
             /* [in] */ const void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )(
             IDXGIDevice * This,
             /* [in] */ REFGUID Name,
             /* [in] */ const IUnknown *pUnknown);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPrivateData )(
             IDXGIDevice * This,
             /* [in] */ REFGUID Name,
             /* [out][in] */ SIZE_T *pDataSize,
             /* [out] */ void *pData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetParent )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetParent )(
             IDXGIDevice * This,
             /* [in] */ REFIID riid,
             /* [retval][out] */ void **ppParent);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetAdapter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetAdapter )(
             IDXGIDevice * This,
             /* [out] */ IDXGIAdapter **pAdapter);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateSurface )(
             IDXGIDevice * This,
             /* [in] */ const DXGI_SURFACE_DESC *pDesc,
             /* [in] */ UINT NumSurfaces,
             /* [in] */ DXGI_USAGE Usage,
             /* [in] */ const DXGI_SHARED_RESOURCE *pSharedResource,
             /* [out] */ IDXGISurface **ppSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )(
             IDXGIDevice * This,
             /* [size_is][in] */ IUnknown *const *ppResources,
             /* [size_is][out] */ DXGI_RESIDENCY *pResidencyStatus,
             /* [in] */ SIZE_T NumResources);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )(
             IDXGIDevice * This,
             /* [in] */ INT Priority);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )(
             IDXGIDevice * This,
             /* [retval][out] */ INT *pPriority);
-        
+
         END_INTERFACE
     } IDXGIDeviceVtbl;
 
@@ -1589,48 +1589,48 @@ EXTERN_C const IID IID_IDXGIDevice;
         CONST_VTBL struct IDXGIDeviceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IDXGIDevice_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IDXGIDevice_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IDXGIDevice_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IDXGIDevice_SetPrivateData(This,Name,DataSize,pData)	\
-    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) 
+    ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) )
 
 #define IDXGIDevice_SetPrivateDataInterface(This,Name,pUnknown)	\
-    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) 
+    ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) )
 
 #define IDXGIDevice_GetPrivateData(This,Name,pDataSize,pData)	\
-    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) 
+    ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) )
 
 #define IDXGIDevice_GetParent(This,riid,ppParent)	\
-    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) 
+    ( (This)->lpVtbl -> GetParent(This,riid,ppParent) )
 
 
 #define IDXGIDevice_GetAdapter(This,pAdapter)	\
-    ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) 
+    ( (This)->lpVtbl -> GetAdapter(This,pAdapter) )
 
 #define IDXGIDevice_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface)	\
-    ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) 
+    ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) )
 
 #define IDXGIDevice_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources)	\
-    ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) 
+    ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) )
 
 #define IDXGIDevice_SetGPUThreadPriority(This,Priority)	\
-    ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) 
+    ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) )
 
 #define IDXGIDevice_GetGPUThreadPriority(This,pPriority)	\
-    ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) 
+    ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) )
 
 #endif /* COBJMACROS */
 
@@ -1644,7 +1644,7 @@ EXTERN_C const IID IID_IDXGIDevice;
 
 
 /* interface __MIDL_itf_dxgi_0000_0009 */
-/* [local] */ 
+/* [local] */
 
 HRESULT WINAPI CreateDataTransportDevice( IDXGIAdapter *pAdapter, IDXGIDevice **pOut);
 #ifdef __cplusplus
diff --git a/src/dep/include/DXSDK/include/DXGIType.h b/src/dep/include/DXSDK/include/DXGIType.h
index fc65fee..d3c416c 100644
--- a/src/dep/include/DXSDK/include/DXGIType.h
+++ b/src/dep/include/DXSDK/include/DXGIType.h
@@ -7,8 +7,8 @@
 /* Compiler settings for dxgitype.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -42,7 +42,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 /* header files for imported files */
 #include "oaidl.h"
@@ -50,11 +50,11 @@
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 /* interface __MIDL_itf_dxgitype_0000_0000 */
-/* [local] */ 
+/* [local] */
 
 #define _FACDXGI    0x87a
 #define MAKE_DXGI_HRESULT( code )    MAKE_HRESULT( 1, _FACDXGI, code )
@@ -84,7 +84,7 @@ extern "C"{
 #define DXGI_USAGE_PRIMARY    ( 1L << (4 + 4) )
 typedef UINT DXGI_USAGE;
 
-typedef 
+typedef
 enum DXGI_FORMAT
     {	DXGI_FORMAT_UNKNOWN	= 0,
 	DXGI_FORMAT_R32G32B32A32_TYPELESS	= 1,
@@ -216,7 +216,7 @@ typedef struct DXGI_RATIONAL
     UINT Denominator;
     } 	DXGI_RATIONAL;
 
-typedef 
+typedef
 enum DXGI_MODE_SCANLINE_ORDER
     {	DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED	= 0,
 	DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE	= 1,
@@ -224,14 +224,14 @@ enum DXGI_MODE_SCANLINE_ORDER
 	DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST	= 3
     } 	DXGI_MODE_SCANLINE_ORDER;
 
-typedef 
+typedef
 enum DXGI_MODE_SCALING
     {	DXGI_MODE_SCALING_UNSPECIFIED	= 0,
 	DXGI_MODE_SCALING_CENTERED	= 1,
 	DXGI_MODE_SCALING_STRETCHED	= 2
     } 	DXGI_MODE_SCALING;
 
-typedef 
+typedef
 enum DXGI_MODE_ROTATION
     {	DXGI_MODE_ROTATION_UNSPECIFIED	= 0,
 	DXGI_MODE_ROTATION_IDENTITY	= 1,
@@ -306,7 +306,7 @@ typedef struct DXGI_SHARED_RESOURCE
 
 #define	DXGI_RESOURCE_PRIORITY_MAXIMUM	( 0xc8000000 )
 
-typedef 
+typedef
 enum DXGI_RESIDENCY
     {	DXGI_RESIDENCY_FULLY_RESIDENT	= 1,
 	DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY	= 2,
@@ -321,7 +321,7 @@ typedef struct DXGI_SURFACE_DESC
     DXGI_SAMPLE_DESC SampleDesc;
     } 	DXGI_SURFACE_DESC;
 
-typedef 
+typedef
 enum DXGI_SWAP_EFFECT
     {	DXGI_SWAP_EFFECT_DISCARD	= 0,
 	DXGI_SWAP_EFFECT_COPY	= 1
diff --git a/src/dep/include/DXSDK/include/DxErr.h b/src/dep/include/DXSDK/include/DxErr.h
index c44f607..a9401d9 100644
--- a/src/dep/include/DXSDK/include/DxErr.h
+++ b/src/dep/include/DXSDK/include/DxErr.h
@@ -15,13 +15,13 @@ extern "C" {
 
 //
 //  DXGetErrorString
-//  
-//  Desc:  Converts a DirectX HRESULT to a string 
+//
+//  Desc:  Converts a DirectX HRESULT to a string
 //
 //  Args:  HRESULT hr   Can be any error code from
 //                      XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
 //
-//  Return: Converted string 
+//  Return: Converted string
 //
 const char*  WINAPI DXGetErrorStringA(HRESULT hr);
 const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
@@ -30,16 +30,16 @@ const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
 #define DXGetErrorString DXGetErrorStringW
 #else
 #define DXGetErrorString DXGetErrorStringA
-#endif 
+#endif
 
 
 //
 //  DXGetErrorDescription
-//  
+//
 //  Desc:  Returns a string description of a DirectX HRESULT
 //
 //  Args:  HRESULT hr   Can be any error code from
-//                      XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW 
+//                      XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
 //
 //  Return: String description
 //
@@ -50,7 +50,7 @@ const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
     #define DXGetErrorDescription DXGetErrorDescriptionW
 #else
     #define DXGetErrorDescription DXGetErrorDescriptionA
-#endif 
+#endif
 
 
 //
@@ -58,15 +58,15 @@ const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
 //
 //  Desc:  Outputs a formatted error message to the debug stream
 //
-//  Args:  CHAR* strFile   The current file, typically passed in using the 
+//  Args:  CHAR* strFile   The current file, typically passed in using the
 //                         __FILE__ macro.
-//         DWORD dwLine    The current line number, typically passed in using the 
+//         DWORD dwLine    The current line number, typically passed in using the
 //                         __LINE__ macro.
 //         HRESULT hr      An HRESULT that will be traced to the debug stream.
 //         CHAR* strMsg    A string that will be traced to the debug stream (may be NULL)
 //         BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
 //
-//  Return: The hr that was passed in.  
+//  Return: The hr that was passed in.
 //
 HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox );
 HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox );
@@ -75,7 +75,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
 #define DXTrace DXTraceW
 #else
 #define DXTrace DXTraceA
-#endif 
+#endif
 
 
 //
diff --git a/src/dep/include/DXSDK/include/PIXPlugin.h b/src/dep/include/DXSDK/include/PIXPlugin.h
index 9c249af..17b4e49 100644
--- a/src/dep/include/DXSDK/include/PIXPlugin.h
+++ b/src/dep/include/DXSDK/include/PIXPlugin.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -55,7 +55,7 @@ struct PIXPLUGININFO
 
 
 //==================================================================================================
-// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX 
+// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX
 //                  to allow PIX to determine information about the counters in the plugin.
 //==================================================================================================
 struct PIXCOUNTERINFO
@@ -73,7 +73,7 @@ BOOL WINAPI PIXGetPluginInfo( PIXPLUGININFO* pPIXPluginInfo );
 
 
 //==================================================================================================
-// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX.  
+// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX.
 //                     These PIXCOUNTERINFOs allow PIX to enumerate the counters contained
 //                     in this plugin.
 //==================================================================================================
@@ -96,8 +96,8 @@ BOOL WINAPI PIXBeginExperiment( PIXCOUNTERID id, const WCHAR* pstrApplication );
 // PIXEndFrame - This is called by PIX once per counter at the end of each frame to gather the
 //               counter value for that frame.  Note that the pointer to the return data must
 //               continue to point to valid counter data until the next call to PIXEndFrame (or
-//               PIXEndExperiment) for the same counter.  So do not set *ppReturnData to the same 
-//               pointer for multiple counters, or point to a local variable that will go out of 
+//               PIXEndExperiment) for the same counter.  So do not set *ppReturnData to the same
+//               pointer for multiple counters, or point to a local variable that will go out of
 //               scope.  See the sample PIX plugin for an example of how to structure a plugin
 //               properly.
 //==================================================================================================
diff --git a/src/dep/include/DXSDK/include/XInput.h b/src/dep/include/DXSDK/include/XInput.h
index 7cb52e1..4691783 100644
--- a/src/dep/include/DXSDK/include/XInput.h
+++ b/src/dep/include/DXSDK/include/XInput.h
@@ -19,7 +19,7 @@
     #define XINPUT_DLL XINPUT_DLL_W
 #else
     #define XINPUT_DLL XINPUT_DLL_A
-#endif 
+#endif
 
 //
 // Device types available in XINPUT_CAPABILITIES
@@ -135,7 +135,7 @@ DWORD WINAPI XInputGetCapabilities
 
 void WINAPI XInputEnable
 (
-    BOOL enable     // [in] Indicates weather xinput is enabled or disabled. 
+    BOOL enable     // [in] Indicates weather xinput is enabled or disabled.
 );
 
 
diff --git a/src/dep/include/DXSDK/include/d3d10misc.h b/src/dep/include/DXSDK/include/d3d10misc.h
index 13c86f8..62bc437 100644
--- a/src/dep/include/DXSDK/include/d3d10misc.h
+++ b/src/dep/include/DXSDK/include/d3d10misc.h
@@ -28,7 +28,7 @@ typedef interface ID3D10Blob ID3D10Blob;
 typedef interface ID3D10Blob *LPD3D10BLOB;
 
 // {8BA5FB08-5195-40e2-AC58-0D989C3A0102}
-DEFINE_GUID(IID_ID3D10Blob, 
+DEFINE_GUID(IID_ID3D10Blob,
 0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
 
 #undef INTERFACE
@@ -68,7 +68,7 @@ typedef enum D3D10_DRIVER_TYPE
     D3D10_DRIVER_TYPE_SOFTWARE  = 3,
 } D3D10_DRIVER_TYPE;
 
-DEFINE_GUID(GUID_DeviceType, 
+DEFINE_GUID(GUID_DeviceType,
 0xd722fb4d, 0x7a68, 0x437a, 0xb2, 0x0c, 0x58, 0x04, 0xee, 0x24, 0x94, 0xa6);
 
 ///////////////////////////////////////////////////////////////////////////
@@ -76,13 +76,13 @@ DEFINE_GUID(GUID_DeviceType,
 // ------------------
 //
 // pAdapter
-//      If NULL, D3D10CreateDevice will choose the primary adapter and 
+//      If NULL, D3D10CreateDevice will choose the primary adapter and
 //      create a new instance from a temporarily created IDXGIFactory.
-//      If non-NULL, D3D10CreateDevice will register the appropriate 
-//      device, if necessary (via IDXGIAdapter::RegisterDrver), before 
+//      If non-NULL, D3D10CreateDevice will register the appropriate
+//      device, if necessary (via IDXGIAdapter::RegisterDrver), before
 //      creating the device.
 // DriverType
-//      Specifies the driver type to be created: hardware, reference or 
+//      Specifies the driver type to be created: hardware, reference or
 //      null.
 // Software
 //      HMODULE of a DLL implementing a software rasterizer. Must be NULL for
@@ -95,12 +95,12 @@ DEFINE_GUID(GUID_DeviceType,
 //      Pointer to returned interface.
 //
 // Return Values
-//  Any of those documented for 
+//  Any of those documented for
 //          CreateDXGIFactory
 //          IDXGIFactory::EnumAdapters
 //          IDXGIAdapter::RegisterDriver
 //          D3D10CreateDevice
-//      
+//
 ///////////////////////////////////////////////////////////////////////////
 HRESULT WINAPI D3D10CreateDevice(
     IDXGIAdapter *pAdapter,
@@ -115,13 +115,13 @@ HRESULT WINAPI D3D10CreateDevice(
 // ------------------------------
 //
 // ppAdapter
-//      If NULL, D3D10CreateDevice will choose the primary adapter and 
+//      If NULL, D3D10CreateDevice will choose the primary adapter and
 //      create a new instance from a temporarily created IDXGIFactory.
-//      If non-NULL, D3D10CreateDevice will register the appropriate 
-//      device, if necessary (via IDXGIAdapter::RegisterDrver), before 
+//      If non-NULL, D3D10CreateDevice will register the appropriate
+//      device, if necessary (via IDXGIAdapter::RegisterDrver), before
 //      creating the device.
 // DriverType
-//      Specifies the driver type to be created: hardware, reference or 
+//      Specifies the driver type to be created: hardware, reference or
 //      null.
 // Software
 //      HMODULE of a DLL implementing a software rasterizer. Must be NULL for
@@ -138,13 +138,13 @@ HRESULT WINAPI D3D10CreateDevice(
 //      Pointer to returned interface.
 //
 // Return Values
-//  Any of those documented for 
+//  Any of those documented for
 //          CreateDXGIFactory
 //          IDXGIFactory::EnumAdapters
 //          IDXGIAdapter::RegisterDriver
 //          D3D10CreateDevice
 //          IDXGIFactory::CreateSwapChain
-//      
+//
 ///////////////////////////////////////////////////////////////////////////
 HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
     IDXGIAdapter *pAdapter,
@@ -153,7 +153,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
     UINT Flags,
     UINT SDKVersion,
     DXGI_SWAP_CHAIN_DESC *pSwapChainDesc,
-    IDXGISwapChain **ppSwapChain,    
+    IDXGISwapChain **ppSwapChain,
     ID3D10Device **ppDevice);
 
 
diff --git a/src/dep/include/DXSDK/include/d3d10sdklayers.h b/src/dep/include/DXSDK/include/d3d10sdklayers.h
index 6ae103f..f9cafd7 100644
--- a/src/dep/include/DXSDK/include/d3d10sdklayers.h
+++ b/src/dep/include/DXSDK/include/d3d10sdklayers.h
@@ -7,8 +7,8 @@
 /* Compiler settings for d3d10sdklayers.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -46,7 +46,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __ID3D10Debug_FWD_DEFINED__
 #define __ID3D10Debug_FWD_DEFINED__
@@ -66,11 +66,11 @@ typedef interface ID3D10InfoQueue ID3D10InfoQueue;
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 /* interface __MIDL_itf_d3d10sdklayers_0000_0000 */
-/* [local] */ 
+/* [local] */
 
 #define	D3D10_SDK_LAYERS_VERSION	( 2 )
 
@@ -85,54 +85,54 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0000_v0_0_s_ifspec;
 #define __ID3D10Debug_INTERFACE_DEFINED__
 
 /* interface ID3D10Debug */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10Debug;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9B7E4E01-342C-4106-A19F-4F2704F689F0")
     ID3D10Debug : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( 
+        virtual HRESULT STDMETHODCALLTYPE SetFeatureMask(
             UINT Mask) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetFeatureMask( void) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE Validate( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10DebugVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10Debug * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10Debug * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10Debug * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )(
             ID3D10Debug * This,
             UINT Mask);
-        
-        UINT ( STDMETHODCALLTYPE *GetFeatureMask )( 
+
+        UINT ( STDMETHODCALLTYPE *GetFeatureMask )(
             ID3D10Debug * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *Validate )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Validate )(
             ID3D10Debug * This);
-        
+
         END_INTERFACE
     } ID3D10DebugVtbl;
 
@@ -141,29 +141,29 @@ EXTERN_C const IID IID_ID3D10Debug;
         CONST_VTBL struct ID3D10DebugVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10Debug_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10Debug_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10Debug_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10Debug_SetFeatureMask(This,Mask)	\
-    ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) 
+    ( (This)->lpVtbl -> SetFeatureMask(This,Mask) )
 
 #define ID3D10Debug_GetFeatureMask(This)	\
-    ( (This)->lpVtbl -> GetFeatureMask(This) ) 
+    ( (This)->lpVtbl -> GetFeatureMask(This) )
 
 #define ID3D10Debug_Validate(This)	\
-    ( (This)->lpVtbl -> Validate(This) ) 
+    ( (This)->lpVtbl -> Validate(This) )
 
 #endif /* COBJMACROS */
 
@@ -177,9 +177,9 @@ EXTERN_C const IID IID_ID3D10Debug;
 
 
 /* interface __MIDL_itf_d3d10sdklayers_0000_0001 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum D3D10_MESSAGE_CATEGORY
     {	D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED	= 0,
 	D3D10_MESSAGE_CATEGORY_MISCELLANEOUS	= ( D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED + 1 ) ,
@@ -190,18 +190,18 @@ enum D3D10_MESSAGE_CATEGORY
 	D3D10_MESSAGE_CATEGORY_STATE_SETTING	= ( D3D10_MESSAGE_CATEGORY_STATE_CREATION + 1 ) ,
 	D3D10_MESSAGE_CATEGORY_STATE_GETTING	= ( D3D10_MESSAGE_CATEGORY_STATE_SETTING + 1 ) ,
 	D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION	= ( D3D10_MESSAGE_CATEGORY_STATE_GETTING + 1 ) ,
-	D3D10_MESSAGE_CATEGORY_EXECUTION	= ( D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 ) 
+	D3D10_MESSAGE_CATEGORY_EXECUTION	= ( D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 )
     } 	D3D10_MESSAGE_CATEGORY;
 
-typedef 
+typedef
 enum D3D10_MESSAGE_SEVERITY
     {	D3D10_MESSAGE_SEVERITY_CORRUPTION	= 0,
 	D3D10_MESSAGE_SEVERITY_ERROR	= ( D3D10_MESSAGE_SEVERITY_CORRUPTION + 1 ) ,
 	D3D10_MESSAGE_SEVERITY_WARNING	= ( D3D10_MESSAGE_SEVERITY_ERROR + 1 ) ,
-	D3D10_MESSAGE_SEVERITY_INFO	= ( D3D10_MESSAGE_SEVERITY_WARNING + 1 ) 
+	D3D10_MESSAGE_SEVERITY_INFO	= ( D3D10_MESSAGE_SEVERITY_WARNING + 1 )
     } 	D3D10_MESSAGE_SEVERITY;
 
-typedef 
+typedef
 enum D3D10_MESSAGE_ID
     {	D3D10_MESSAGE_ID_UNKNOWN	= 0,
 	D3D10_MESSAGE_ID_STRING_FROM_APPLICATION	= ( D3D10_MESSAGE_ID_UNKNOWN + 1 ) ,
@@ -594,7 +594,7 @@ enum D3D10_MESSAGE_ID
 	D3D10_MESSAGE_ID_DEVICE_PSGETCONSTANTBUFFERS_BUFFERS_EMPTY	= ( D3D10_MESSAGE_ID_DEVICE_PSGETSHADERRESOURCES_VIEWS_EMPTY + 1 ) ,
 	D3D10_MESSAGE_ID_DEVICE_PSGETSAMPLERS_SAMPLERS_EMPTY	= ( D3D10_MESSAGE_ID_DEVICE_PSGETCONSTANTBUFFERS_BUFFERS_EMPTY + 1 ) ,
 	D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY	= ( D3D10_MESSAGE_ID_DEVICE_PSGETSAMPLERS_SAMPLERS_EMPTY + 1 ) ,
-	D3D10_MESSAGE_ID_DEVICE_RSGETSCISSORRECTS_RECTS_EMPTY	= ( D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY + 1 ) 
+	D3D10_MESSAGE_ID_DEVICE_RSGETSCISSORRECTS_RECTS_EMPTY	= ( D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY + 1 )
     } 	D3D10_MESSAGE_ID;
 
 typedef struct D3D10_MESSAGE
@@ -632,244 +632,244 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0001_v0_0_s_ifspec;
 #define __ID3D10InfoQueue_INTERFACE_DEFINED__
 
 /* interface ID3D10InfoQueue */
-/* [unique][local][object][uuid] */ 
+/* [unique][local][object][uuid] */
 
 
 EXTERN_C const IID IID_ID3D10InfoQueue;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("1b940b17-2642-4d1f-ab1f-b99bad0c395f")
     ID3D10InfoQueue : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( 
-            /*  */ 
+        virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit(
+            /*  */
             __in  UINT64 MessageCountLimit) = 0;
-        
+
         virtual void STDMETHODCALLTYPE ClearStoredMessages( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMessage( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE GetMessage(
+            /*  */
             __in  UINT64 MessageIndex,
-            /*  */ 
+            /*  */
             __out_bcount_opt(*pMessageByteLength)  D3D10_MESSAGE *pMessage,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pMessageByteLength) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( void) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( void) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( void) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilter( void) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( void) = 0;
-        
+
         virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries(
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE GetStorageFilter(
+            /*  */
             __out_bcount_opt(*pFilterByteLength)  D3D10_INFO_QUEUE_FILTER *pFilter,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pFilterByteLength) = 0;
-        
+
         virtual void STDMETHODCALLTYPE ClearStorageFilter( void) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( void) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE PushStorageFilter(
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
-        
+
         virtual void STDMETHODCALLTYPE PopStorageFilter( void) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries(
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter(
+            /*  */
             __out_bcount_opt(*pFilterByteLength)  D3D10_INFO_QUEUE_FILTER *pFilter,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pFilterByteLength) = 0;
-        
+
         virtual void STDMETHODCALLTYPE ClearRetrievalFilter( void) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( void) = 0;
-        
+
         virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter(
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
-        
+
         virtual void STDMETHODCALLTYPE PopRetrievalFilter( void) = 0;
-        
+
         virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( void) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddMessage( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE AddMessage(
+            /*  */
             __in  D3D10_MESSAGE_CATEGORY Category,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_SEVERITY Severity,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_ID ID,
-            /*  */ 
+            /*  */
             __in  LPCWSTR pDescription) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( 
-            /*  */ 
+
+        virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage(
+            /*  */
             __in  D3D10_MESSAGE_SEVERITY Severity,
-            /*  */ 
+            /*  */
             __in  LPCWSTR pDescription) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ID3D10InfoQueueVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ID3D10InfoQueue * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ID3D10InfoQueue * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  UINT64 MessageCountLimit);
-        
-        void ( STDMETHODCALLTYPE *ClearStoredMessages )( 
+
+        void ( STDMETHODCALLTYPE *ClearStoredMessages )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMessage )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetMessage )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  UINT64 MessageIndex,
-            /*  */ 
+            /*  */
             __out_bcount_opt(*pMessageByteLength)  D3D10_MESSAGE *pMessage,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pMessageByteLength);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )(
             ID3D10InfoQueue * This);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )(
             ID3D10InfoQueue * This);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )(
             ID3D10InfoQueue * This);
-        
-        UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( 
+
+        UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( 
+
+        HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __out_bcount_opt(*pFilterByteLength)  D3D10_INFO_QUEUE_FILTER *pFilter,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pFilterByteLength);
-        
-        void ( STDMETHODCALLTYPE *ClearStorageFilter )( 
+
+        void ( STDMETHODCALLTYPE *ClearStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter);
-        
-        void ( STDMETHODCALLTYPE *PopStorageFilter )( 
+
+        void ( STDMETHODCALLTYPE *PopStorageFilter )(
             ID3D10InfoQueue * This);
-        
-        UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( 
+
+        UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( 
+
+        HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __out_bcount_opt(*pFilterByteLength)  D3D10_INFO_QUEUE_FILTER *pFilter,
-            /*  */ 
+            /*  */
             __inout  SIZE_T *pFilterByteLength);
-        
-        void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( 
+
+        void ( STDMETHODCALLTYPE *ClearRetrievalFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_INFO_QUEUE_FILTER *pFilter);
-        
-        void ( STDMETHODCALLTYPE *PopRetrievalFilter )( 
+
+        void ( STDMETHODCALLTYPE *PopRetrievalFilter )(
             ID3D10InfoQueue * This);
-        
-        UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( 
+
+        UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )(
             ID3D10InfoQueue * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddMessage )( 
+
+        HRESULT ( STDMETHODCALLTYPE *AddMessage )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_CATEGORY Category,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_SEVERITY Severity,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_ID ID,
-            /*  */ 
+            /*  */
             __in  LPCWSTR pDescription);
-        
-        HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( 
+
+        HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )(
             ID3D10InfoQueue * This,
-            /*  */ 
+            /*  */
             __in  D3D10_MESSAGE_SEVERITY Severity,
-            /*  */ 
+            /*  */
             __in  LPCWSTR pDescription);
-        
+
         END_INTERFACE
     } ID3D10InfoQueueVtbl;
 
@@ -878,101 +878,101 @@ EXTERN_C const IID IID_ID3D10InfoQueue;
         CONST_VTBL struct ID3D10InfoQueueVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define ID3D10InfoQueue_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define ID3D10InfoQueue_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define ID3D10InfoQueue_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define ID3D10InfoQueue_SetMessageCountLimit(This,MessageCountLimit)	\
-    ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) 
+    ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) )
 
 #define ID3D10InfoQueue_ClearStoredMessages(This)	\
-    ( (This)->lpVtbl -> ClearStoredMessages(This) ) 
+    ( (This)->lpVtbl -> ClearStoredMessages(This) )
 
 #define ID3D10InfoQueue_GetMessage(This,MessageIndex,pMessage,pMessageByteLength)	\
-    ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) 
+    ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) )
 
 #define ID3D10InfoQueue_GetNumMessagesAllowedByStorageFilter(This)	\
-    ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) 
+    ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) )
 
 #define ID3D10InfoQueue_GetNumMessagesDeniedByStorageFilter(This)	\
-    ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) 
+    ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) )
 
 #define ID3D10InfoQueue_GetNumStoredMessages(This)	\
-    ( (This)->lpVtbl -> GetNumStoredMessages(This) ) 
+    ( (This)->lpVtbl -> GetNumStoredMessages(This) )
 
 #define ID3D10InfoQueue_GetNumStoredMessagesAllowedByRetrievalFilter(This)	\
-    ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) 
+    ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) )
 
 #define ID3D10InfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This)	\
-    ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) 
+    ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) )
 
 #define ID3D10InfoQueue_GetMessageCountLimit(This)	\
-    ( (This)->lpVtbl -> GetMessageCountLimit(This) ) 
+    ( (This)->lpVtbl -> GetMessageCountLimit(This) )
 
 #define ID3D10InfoQueue_AddStorageFilterEntries(This,pFilter)	\
-    ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) 
+    ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) )
 
 #define ID3D10InfoQueue_GetStorageFilter(This,pFilter,pFilterByteLength)	\
-    ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) 
+    ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) )
 
 #define ID3D10InfoQueue_ClearStorageFilter(This)	\
-    ( (This)->lpVtbl -> ClearStorageFilter(This) ) 
+    ( (This)->lpVtbl -> ClearStorageFilter(This) )
 
 #define ID3D10InfoQueue_PushEmptyStorageFilter(This)	\
-    ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) 
+    ( (This)->lpVtbl -> PushEmptyStorageFilter(This) )
 
 #define ID3D10InfoQueue_PushCopyOfStorageFilter(This)	\
-    ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) 
+    ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) )
 
 #define ID3D10InfoQueue_PushStorageFilter(This,pFilter)	\
-    ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) 
+    ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) )
 
 #define ID3D10InfoQueue_PopStorageFilter(This)	\
-    ( (This)->lpVtbl -> PopStorageFilter(This) ) 
+    ( (This)->lpVtbl -> PopStorageFilter(This) )
 
 #define ID3D10InfoQueue_GetStorageFilterStackSize(This)	\
-    ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) 
+    ( (This)->lpVtbl -> GetStorageFilterStackSize(This) )
 
 #define ID3D10InfoQueue_AddRetrievalFilterEntries(This,pFilter)	\
-    ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) 
+    ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) )
 
 #define ID3D10InfoQueue_GetRetrievalFilter(This,pFilter,pFilterByteLength)	\
-    ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) 
+    ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) )
 
 #define ID3D10InfoQueue_ClearRetrievalFilter(This)	\
-    ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) 
+    ( (This)->lpVtbl -> ClearRetrievalFilter(This) )
 
 #define ID3D10InfoQueue_PushEmptyRetrievalFilter(This)	\
-    ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) 
+    ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) )
 
 #define ID3D10InfoQueue_PushCopyOfRetrievalFilter(This)	\
-    ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) 
+    ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) )
 
 #define ID3D10InfoQueue_PushRetrievalFilter(This,pFilter)	\
-    ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) 
+    ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) )
 
 #define ID3D10InfoQueue_PopRetrievalFilter(This)	\
-    ( (This)->lpVtbl -> PopRetrievalFilter(This) ) 
+    ( (This)->lpVtbl -> PopRetrievalFilter(This) )
 
 #define ID3D10InfoQueue_GetRetrievalFilterStackSize(This)	\
-    ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) 
+    ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) )
 
 #define ID3D10InfoQueue_AddMessage(This,Category,Severity,ID,pDescription)	\
-    ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) 
+    ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) )
 
 #define ID3D10InfoQueue_AddApplicationMessage(This,Severity,pDescription)	\
-    ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) 
+    ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) )
 
 #endif /* COBJMACROS */
 
diff --git a/src/dep/include/DXSDK/include/d3d8types.h b/src/dep/include/DXSDK/include/d3d8types.h
index 5d622af..78d8233 100644
--- a/src/dep/include/DXSDK/include/d3d8types.h
+++ b/src/dep/include/DXSDK/include/d3d8types.h
@@ -967,7 +967,7 @@ typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE
     D3DSPDM_FORCE_DWORD  = 0x7fffffff,      // force 32-bit size enum
 } D3DSHADER_PARAM_DSTMOD_TYPE;
 
-// destination parameter 
+// destination parameter
 #define D3DSP_DSTSHIFT_SHIFT    24
 #define D3DSP_DSTSHIFT_MASK     0x0F000000
 
@@ -1098,7 +1098,7 @@ typedef enum _D3DSHADER_PARAM_SRCMOD_TYPE
     D3DSPSM_COMP    = 6<<D3DSP_SRCMOD_SHIFT, // complement
     D3DSPSM_X2      = 7<<D3DSP_SRCMOD_SHIFT, // *2
     D3DSPSM_X2NEG   = 8<<D3DSP_SRCMOD_SHIFT, // *2 and negate
-    D3DSPSM_DZ      = 9<<D3DSP_SRCMOD_SHIFT, // divide through by z component 
+    D3DSPSM_DZ      = 9<<D3DSP_SRCMOD_SHIFT, // divide through by z component
     D3DSPSM_DW      = 10<<D3DSP_SRCMOD_SHIFT, // divide through by w component
     D3DSPSM_FORCE_DWORD = 0x7fffffff,        // force 32-bit size enum
 } D3DSHADER_PARAM_SRCMOD_TYPE;
diff --git a/src/dep/include/DXSDK/include/d3d9.h b/src/dep/include/DXSDK/include/d3d9.h
index 85bd957..6ba6c82 100644
--- a/src/dep/include/DXSDK/include/d3d9.h
+++ b/src/dep/include/DXSDK/include/d3d9.h
@@ -229,7 +229,7 @@ IDirect3D9 * WINAPI Direct3DCreate9(UINT SDKVersion);
 /*
  * Stubs for graphics profiling.
  */
- 
+
 int WINAPI D3DPERF_BeginEvent( D3DCOLOR col, LPCWSTR wszName );
 int WINAPI D3DPERF_EndEvent( void );
 void WINAPI D3DPERF_SetMarker( D3DCOLOR col, LPCWSTR wszName );
@@ -273,12 +273,12 @@ DECLARE_INTERFACE_(IDirect3D9, IUnknown)
     STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps) PURE;
     STDMETHOD_(HMONITOR, GetAdapterMonitor)(THIS_ UINT Adapter) PURE;
     STDMETHOD(CreateDevice)(THIS_ UINT Adapter,D3DDEVTYPE DeviceType,HWND hFocusWindow,DWORD BehaviorFlags,D3DPRESENT_PARAMETERS* pPresentationParameters,IDirect3DDevice9** ppReturnedDeviceInterface) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Version;
     #endif
 };
-    
+
 typedef struct IDirect3D9 *LPDIRECT3D9, *PDIRECT3D9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -468,13 +468,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9, IUnknown)
     STDMETHOD(DrawTriPatch)(THIS_ UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE;
     STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE;
     STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type,IDirect3DQuery9** ppQuery) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     D3DDEVICE_CREATION_PARAMETERS CreationParameters;
     D3DPRESENT_PARAMETERS PresentParameters;
     D3DDISPLAYMODE DisplayMode;
     D3DCAPS9 Caps;
-    
+
     UINT AvailableTextureMem;
     UINT SwapChains;
     UINT Textures;
@@ -482,29 +482,29 @@ DECLARE_INTERFACE_(IDirect3DDevice9, IUnknown)
     UINT IndexBuffers;
     UINT VertexShaders;
     UINT PixelShaders;
-    
+
     D3DVIEWPORT9 Viewport;
     D3DMATRIX ProjectionMatrix;
     D3DMATRIX ViewMatrix;
     D3DMATRIX WorldMatrix;
     D3DMATRIX TextureMatrices[8];
-    
+
     DWORD FVF;
     UINT VertexSize;
     DWORD VertexShaderVersion;
     DWORD PixelShaderVersion;
     BOOL SoftwareVertexProcessing;
-    
+
     D3DMATERIAL9 Material;
     D3DLIGHT9 Lights[16];
     BOOL LightsEnabled[16];
-    
+
     D3DGAMMARAMP GammaRamp;
     RECT ScissorRect;
     BOOL DialogBoxMode;
     #endif
 };
-    
+
 typedef struct IDirect3DDevice9 *LPDIRECT3DDEVICE9, *PDIRECT3DDEVICE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -764,12 +764,12 @@ DECLARE_INTERFACE_(IDirect3DStateBlock9, IUnknown)
     STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
     STDMETHOD(Capture)(THIS) PURE;
     STDMETHOD(Apply)(THIS) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DStateBlock9 *LPDIRECT3DSTATEBLOCK9, *PDIRECT3DSTATEBLOCK9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -809,14 +809,14 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9, IUnknown)
     STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE;
     STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
     STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     D3DPRESENT_PARAMETERS PresentParameters;
     D3DDISPLAYMODE DisplayMode;
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DSwapChain9 *LPDIRECT3DSWAPCHAIN9, *PDIRECT3DSWAPCHAIN9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -865,7 +865,7 @@ DECLARE_INTERFACE_(IDirect3DResource9, IUnknown)
     STDMETHOD_(void, PreLoad)(THIS) PURE;
     STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE;
 };
-    
+
 typedef struct IDirect3DResource9 *LPDIRECT3DRESOURCE9, *PDIRECT3DRESOURCE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -910,12 +910,12 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration9, IUnknown)
     /*** IDirect3DVertexDeclaration9 methods ***/
     STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
     STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9* pElement,UINT* pNumElements) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DVertexDeclaration9 *LPDIRECT3DVERTEXDECLARATION9, *PDIRECT3DVERTEXDECLARATION9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -948,13 +948,13 @@ DECLARE_INTERFACE_(IDirect3DVertexShader9, IUnknown)
     /*** IDirect3DVertexShader9 methods ***/
     STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
     STDMETHOD(GetFunction)(THIS_ void*,UINT* pSizeOfData) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     DWORD Version;
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DVertexShader9 *LPDIRECT3DVERTEXSHADER9, *PDIRECT3DVERTEXSHADER9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -987,13 +987,13 @@ DECLARE_INTERFACE_(IDirect3DPixelShader9, IUnknown)
     /*** IDirect3DPixelShader9 methods ***/
     STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
     STDMETHOD(GetFunction)(THIS_ void*,UINT* pSizeOfData) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     DWORD Version;
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DPixelShader9 *LPDIRECT3DPIXELSHADER9, *PDIRECT3DPIXELSHADER9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1039,7 +1039,7 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture9, IDirect3DResource9)
     STDMETHOD_(D3DTEXTUREFILTERTYPE, GetAutoGenFilterType)(THIS) PURE;
     STDMETHOD_(void, GenerateMipSubLevels)(THIS) PURE;
 };
-    
+
 typedef struct IDirect3DBaseTexture9 *LPDIRECT3DBASETEXTURE9, *PDIRECT3DBASETEXTURE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1114,7 +1114,7 @@ DECLARE_INTERFACE_(IDirect3DTexture9, IDirect3DBaseTexture9)
     STDMETHOD(LockRect)(THIS_ UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) PURE;
     STDMETHOD(UnlockRect)(THIS_ UINT Level) PURE;
     STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pDirtyRect) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Width;
@@ -1130,7 +1130,7 @@ DECLARE_INTERFACE_(IDirect3DTexture9, IDirect3DBaseTexture9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DTexture9 *LPDIRECT3DTEXTURE9, *PDIRECT3DTEXTURE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1215,7 +1215,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9, IDirect3DBaseTexture9)
     STDMETHOD(LockBox)(THIS_ UINT Level,D3DLOCKED_BOX* pLockedVolume,CONST D3DBOX* pBox,DWORD Flags) PURE;
     STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE;
     STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Width;
@@ -1232,7 +1232,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9, IDirect3DBaseTexture9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DVolumeTexture9 *LPDIRECT3DVOLUMETEXTURE9, *PDIRECT3DVOLUMETEXTURE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9, IDirect3DBaseTexture9)
     STDMETHOD(LockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) PURE;
     STDMETHOD(UnlockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level) PURE;
     STDMETHOD(AddDirtyRect)(THIS_ D3DCUBEMAP_FACES FaceType,CONST RECT* pDirtyRect) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Width;
@@ -1333,7 +1333,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9, IDirect3DBaseTexture9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DCubeTexture9 *LPDIRECT3DCUBETEXTURE9, *PDIRECT3DCUBETEXTURE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1409,7 +1409,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9, IDirect3DResource9)
     STDMETHOD(Lock)(THIS_ UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) PURE;
     STDMETHOD(Unlock)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC *pDesc) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Length;
@@ -1421,7 +1421,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9, IDirect3DResource9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DVertexBuffer9 *LPDIRECT3DVERTEXBUFFER9, *PDIRECT3DVERTEXBUFFER9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1481,7 +1481,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9, IDirect3DResource9)
     STDMETHOD(Lock)(THIS_ UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) PURE;
     STDMETHOD(Unlock)(THIS) PURE;
     STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC *pDesc) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Length;
@@ -1493,7 +1493,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9, IDirect3DResource9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DIndexBuffer9 *LPDIRECT3DINDEXBUFFER9, *PDIRECT3DINDEXBUFFER9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1556,7 +1556,7 @@ DECLARE_INTERFACE_(IDirect3DSurface9, IDirect3DResource9)
     STDMETHOD(UnlockRect)(THIS) PURE;
     STDMETHOD(GetDC)(THIS_ HDC *phdc) PURE;
     STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Width;
@@ -1572,7 +1572,7 @@ DECLARE_INTERFACE_(IDirect3DSurface9, IDirect3DResource9)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DSurface9 *LPDIRECT3DSURFACE9, *PDIRECT3DSURFACE9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1636,7 +1636,7 @@ DECLARE_INTERFACE_(IDirect3DVolume9, IUnknown)
     STDMETHOD(GetDesc)(THIS_ D3DVOLUME_DESC *pDesc) PURE;
     STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX * pLockedVolume,CONST D3DBOX* pBox,DWORD Flags) PURE;
     STDMETHOD(UnlockBox)(THIS) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     LPCWSTR Name;
     UINT Width;
@@ -1649,7 +1649,7 @@ DECLARE_INTERFACE_(IDirect3DVolume9, IUnknown)
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DVolume9 *LPDIRECT3DVOLUME9, *PDIRECT3DVOLUME9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1697,14 +1697,14 @@ DECLARE_INTERFACE_(IDirect3DQuery9, IUnknown)
     STDMETHOD_(DWORD, GetDataSize)(THIS) PURE;
     STDMETHOD(Issue)(THIS_ DWORD dwIssueFlags) PURE;
     STDMETHOD(GetData)(THIS_ void* pData,DWORD dwSize,DWORD dwGetDataFlags) PURE;
-    
+
     #ifdef D3D_DEBUG_INFO
     D3DQUERYTYPE Type;
     DWORD DataSize;
     LPCWSTR CreationCallStack;
     #endif
 };
-    
+
 typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
 
 #if !defined(__cplusplus) || defined(CINTERFACE)
@@ -1757,9 +1757,9 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
 #define D3DCREATE_ADAPTERGROUP_DEVICE           0x00000200L
 #define D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX  0x00000400L
 
-// This flag causes the D3D runtime not to alter the focus 
+// This flag causes the D3D runtime not to alter the focus
 // window in any way. Use with caution- the burden of supporting
-// focus management events (alt-tab, etc.) falls on the 
+// focus management events (alt-tab, etc.) falls on the
 // application, and appropriate responses (switching display
 // mode, etc.) should be coded.
 #define D3DCREATE_NOWINDOWCHANGES				0x00000800L
diff --git a/src/dep/include/DXSDK/include/d3d9caps.h b/src/dep/include/DXSDK/include/d3d9caps.h
index 6489f0e..d411bbc 100644
--- a/src/dep/include/DXSDK/include/d3d9caps.h
+++ b/src/dep/include/DXSDK/include/d3d9caps.h
@@ -156,7 +156,7 @@ typedef struct _D3DCAPS9
     DWORD   VertexTextureFilterCaps;    // D3DPTFILTERCAPS for IDirect3DTexture9's for texture, used in vertex shaders
     DWORD   MaxVShaderInstructionsExecuted; // maximum number of vertex shader instructions that can be executed
     DWORD   MaxPShaderInstructionsExecuted; // maximum number of pixel shader instructions that can be executed
-    DWORD   MaxVertexShader30InstructionSlots; 
+    DWORD   MaxVertexShader30InstructionSlots;
     DWORD   MaxPixelShader30InstructionSlots;
 } D3DCAPS9;
 
@@ -189,7 +189,7 @@ typedef struct _D3DCAPS9
 // COPY and COPYVSYNC swap effects work whether or not this flag is set.
 #define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD   0x00000020L
 
-// Indicates that the device can perform a gamma correction from 
+// Indicates that the device can perform a gamma correction from
 // a windowed back buffer containing linear content to the sRGB desktop.
 #define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080L
 
@@ -288,7 +288,7 @@ typedef struct _D3DCAPS9
 #define D3DPRASTERCAPS_COLORPERSPECTIVE       0x00400000L /* Device iterates colors perspective correct */
 #define D3DPRASTERCAPS_SCISSORTEST            0x01000000L
 #define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS    0x02000000L
-#define D3DPRASTERCAPS_DEPTHBIAS              0x04000000L 
+#define D3DPRASTERCAPS_DEPTHBIAS              0x04000000L
 #define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE     0x08000000L
 
 //
@@ -351,7 +351,7 @@ typedef struct _D3DCAPS9
 #define D3DPTEXTURECAPS_MIPCUBEMAP          0x00010000L /* Device can do mipmapped cube maps */
 #define D3DPTEXTURECAPS_CUBEMAP_POW2        0x00020000L /* Device requires that cubemaps be power-of-2 dimension */
 #define D3DPTEXTURECAPS_VOLUMEMAP_POW2      0x00040000L /* Device requires that volume maps be power-of-2 dimension */
-#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV  0x00200000L /* Device does not support projected bump env lookup operation 
+#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV  0x00200000L /* Device does not support projected bump env lookup operation
                                                            in programmable and fixed function pixel shaders */
 
 //
diff --git a/src/dep/include/DXSDK/include/d3d9types.h b/src/dep/include/DXSDK/include/d3d9types.h
index 4c2108f..a0251eb 100644
--- a/src/dep/include/DXSDK/include/d3d9types.h
+++ b/src/dep/include/DXSDK/include/d3d9types.h
@@ -972,7 +972,7 @@ typedef enum _D3DSAMPLER_TEXTURE_TYPE
                                                                 //      "Centroid" is some location within the covered
                                                                 //      region of the pixel.
 
-// destination parameter 
+// destination parameter
 #define D3DSP_DSTSHIFT_SHIFT    24
 #define D3DSP_DSTSHIFT_MASK     0x0F000000
 
@@ -1572,7 +1572,7 @@ typedef enum _D3DCUBEMAP_FACES
 #define D3DLOCK_DISCARD            0x00002000L
 #define D3DLOCK_NOOVERWRITE        0x00001000L
 #define D3DLOCK_NOSYSLOCK          0x00000800L
-#define D3DLOCK_DONOTWAIT          0x00004000L                  
+#define D3DLOCK_DONOTWAIT          0x00004000L
 
 #define D3DLOCK_NO_DIRTY_UPDATE     0x00008000L
 
diff --git a/src/dep/include/DXSDK/include/d3dcaps.h b/src/dep/include/DXSDK/include/d3dcaps.h
index 6066c7a..323bfea 100644
--- a/src/dep/include/DXSDK/include/d3dcaps.h
+++ b/src/dep/include/DXSDK/include/d3dcaps.h
@@ -1,6 +1,6 @@
 /*==========================================================================;
  *
- *  Copyright (C) Microsoft Corporation.  All Rights Reserved. 
+ *  Copyright (C) Microsoft Corporation.  All Rights Reserved.
  *
  *  File:       d3dcaps.h
  *  Content:    Direct3D capabilities include file
diff --git a/src/dep/include/DXSDK/include/d3dx10async.h b/src/dep/include/DXSDK/include/d3dx10async.h
index 227eaf1..a6d26ff 100644
--- a/src/dep/include/DXSDK/include/d3dx10async.h
+++ b/src/dep/include/DXSDK/include/d3dx10async.h
@@ -44,7 +44,7 @@ extern "C" {
 //      Name of the entrypoint function where execution should begin.
 //  pProfile
 //      Instruction set to be used when generating code.  Currently supported
-//      profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1", 
+//      profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
 //      "ps_1_2", "ps_1_3", "ps_1_4", "ps_2_0", "ps_2_a", "ps_2_sw", "tx_1_0"
 //  Flags
 //      See D3D10_SHADER_xxx flags.
@@ -70,10 +70,10 @@ HRESULT WINAPI D3DX10CompileShaderFromFileW(LPCWSTR pSrcFile, CONST D3D10_SHADER
 #define D3DX10CompileShaderFromFile D3DX10CompileShaderFromFileA
 #endif
 
-HRESULT WINAPI D3DX10CompileShaderFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10CompileShaderFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
 
-HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
 
 #ifdef UNICODE
@@ -82,7 +82,7 @@ HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrc
 #define D3DX10CompileShaderFromResource D3DX10CompileShaderFromResourceA
 #endif
 
-HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
     LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
 
 //----------------------------------------------------------------------------
@@ -134,30 +134,30 @@ HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen,
 //  ppEffectPool
 //      Address of the newly created Effect pool interface
 //  ppErrors
-//      If non-NULL, address of a buffer with error messages that occurred 
+//      If non-NULL, address of a buffer with error messages that occurred
 //      during parsing or compilation
 //
 //----------------------------------------------------------------------------
 
 
-HRESULT WINAPI D3DX10CompileEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump, 
+HRESULT WINAPI D3DX10CompileEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
     ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CompileEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump, 
+HRESULT WINAPI D3DX10CompileEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
     ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CompileEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, 
+HRESULT WINAPI D3DX10CompileEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
     ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CompileEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, 
+HRESULT WINAPI D3DX10CompileEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
     ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, 
+HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
     ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
 
 #ifdef UNICODE
@@ -168,24 +168,24 @@ HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResour
 #define D3DX10CompileEffectFromResource     D3DX10CompileEffectFromResourceA
 #endif
 
-HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, 
+HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
 
 
@@ -197,23 +197,23 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourc
 #define D3DX10CreateEffectFromResource      D3DX10CreateEffectFromResourceA
 #endif
 
-HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, 
+HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
     ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, 
-    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, 
+HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
+    ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
     ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
+HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
     ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
 
-HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
+HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
     ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
-                                         
-HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, 
+
+HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
     ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
     ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
 
@@ -225,19 +225,19 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pRes
 #define D3DX10CreateEffectPoolFromResource  D3DX10CreateEffectPoolFromResourceA
 #endif
 
-HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
-HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
-HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
-HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
-HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, 
+HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
     LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
 
 #ifdef UNICODE
@@ -252,23 +252,23 @@ HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pRes
 // Async processors
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI D3DX10CreateAsyncShaderCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CreateAsyncShaderCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
         LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags,
         ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
 
-HRESULT WINAPI D3DX10CreateAsyncEffectCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CreateAsyncEffectCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
         UINT Flags, UINT FXFlags,
         ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
 
-HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
         UINT Flags, UINT FXFlags, ID3D10Device *pDevice,
         ID3D10EffectPool *pPool, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
 
-HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
         UINT Flags, UINT FXFlags, ID3D10Device *pDevice,
         ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
 
-HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, 
+HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
         ID3D10Blob** ppShaderText, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
 
 #ifdef __cplusplus
diff --git a/src/dep/include/DXSDK/include/d3dx8core.h b/src/dep/include/DXSDK/include/d3dx8core.h
index 46552a9..2d70af6 100644
--- a/src/dep/include/DXSDK/include/d3dx8core.h
+++ b/src/dep/include/DXSDK/include/d3dx8core.h
@@ -30,7 +30,7 @@ typedef interface ID3DXBuffer ID3DXBuffer;
 typedef interface ID3DXBuffer *LPD3DXBUFFER;
 
 // {932E6A7E-C68E-45dd-A7BF-53D19C86DB1F}
-DEFINE_GUID(IID_ID3DXBuffer, 
+DEFINE_GUID(IID_ID3DXBuffer,
 0x932e6a7e, 0xc68e, 0x45dd, 0xa7, 0xbf, 0x53, 0xd1, 0x9c, 0x86, 0xdb, 0x1f);
 
 #undef INTERFACE
@@ -61,8 +61,8 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
 //    is called outside of Begin/End, it will call Begin and End for you.
 //
 // DrawText -
-//    Draws formatted text on a D3D device.  Some parameters are 
-//    surprisingly similar to those of GDI's DrawText function.  See GDI 
+//    Draws formatted text on a D3D device.  Some parameters are
+//    surprisingly similar to those of GDI's DrawText function.  See GDI
 //    documentation for a detailed description of these parameters.
 //
 // End -
@@ -80,7 +80,7 @@ typedef interface ID3DXFont *LPD3DXFONT;
 
 
 // {89FAD6A5-024D-49af-8FE7-F51123B85E25}
-DEFINE_GUID( IID_ID3DXFont, 
+DEFINE_GUID( IID_ID3DXFont,
 0x89fad6a5, 0x24d, 0x49af, 0x8f, 0xe7, 0xf5, 0x11, 0x23, 0xb8, 0x5e, 0x25);
 
 
@@ -145,15 +145,15 @@ HRESULT WINAPI
 // ------------
 // This object intends to provide an easy way to drawing sprites using D3D.
 //
-// Begin - 
+// Begin -
 //    Prepares device for drawing sprites
 //
 // Draw, DrawAffine, DrawTransform -
 //    Draws a sprite in screen-space.  Before transformation, the sprite is
-//    the size of SrcRect, with its top-left corner at the origin (0,0).  
+//    the size of SrcRect, with its top-left corner at the origin (0,0).
 //    The color and alpha channels are modulated by Color.
 //
-// End - 
+// End -
 //     Restores device state to how it was when Begin was called.
 //
 // OnLostDevice, OnResetDevice -
@@ -167,7 +167,7 @@ typedef interface ID3DXSprite *LPD3DXSPRITE;
 
 
 // {13D69D15-F9B0-4e0f-B39E-C91EB33F6CE7}
-DEFINE_GUID( IID_ID3DXSprite, 
+DEFINE_GUID( IID_ID3DXSprite,
 0x13d69d15, 0xf9b0, 0x4e0f, 0xb3, 0x9e, 0xc9, 0x1e, 0xb3, 0x3f, 0x6c, 0xe7);
 
 
@@ -186,13 +186,13 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
 
     STDMETHOD(Begin)(THIS) PURE;
 
-    STDMETHOD(Draw)(THIS_ LPDIRECT3DTEXTURE8  pSrcTexture, 
-        CONST RECT* pSrcRect, CONST D3DXVECTOR2* pScaling, 
-        CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, 
+    STDMETHOD(Draw)(THIS_ LPDIRECT3DTEXTURE8  pSrcTexture,
+        CONST RECT* pSrcRect, CONST D3DXVECTOR2* pScaling,
+        CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
         CONST D3DXVECTOR2* pTranslation, D3DCOLOR Color) PURE;
 
-    STDMETHOD(DrawTransform)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture, 
-        CONST RECT* pSrcRect, CONST D3DXMATRIX* pTransform, 
+    STDMETHOD(DrawTransform)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture,
+        CONST RECT* pSrcRect, CONST D3DXMATRIX* pTransform,
         D3DCOLOR Color) PURE;
 
     STDMETHOD(End)(THIS) PURE;
@@ -222,14 +222,14 @@ HRESULT WINAPI
 ///////////////////////////////////////////////////////////////////////////
 // ID3DXRenderToSurface:
 // ---------------------
-// This object abstracts rendering to surfaces.  These surfaces do not 
+// This object abstracts rendering to surfaces.  These surfaces do not
 // necessarily need to be render targets.  If they are not, a compatible
 // render target is used, and the result copied into surface at end scene.
 //
 // BeginScene, EndScene -
 //    Call BeginScene() and EndScene() at the beginning and ending of your
-//    scene.  These calls will setup and restore render targets, viewports, 
-//    etc.. 
+//    scene.  These calls will setup and restore render targets, viewports,
+//    etc..
 //
 // OnLostDevice, OnResetDevice -
 //    Call OnLostDevice() on this object before calling Reset() on the
@@ -253,7 +253,7 @@ typedef interface ID3DXRenderToSurface *LPD3DXRENDERTOSURFACE;
 
 
 // {82DF5B90-E34E-496e-AC1C-62117A6A5913}
-DEFINE_GUID( IID_ID3DXRenderToSurface, 
+DEFINE_GUID( IID_ID3DXRenderToSurface,
 0x82df5b90, 0xe34e, 0x496e, 0xac, 0x1c, 0x62, 0x11, 0x7a, 0x6a, 0x59, 0x13);
 
 
@@ -302,8 +302,8 @@ HRESULT WINAPI
 ///////////////////////////////////////////////////////////////////////////
 // ID3DXRenderToEnvMap:
 // --------------------
-// This object abstracts rendering to environment maps.  These surfaces 
-// do not necessarily need to be render targets.  If they are not, a 
+// This object abstracts rendering to environment maps.  These surfaces
+// do not necessarily need to be render targets.  If they are not, a
 // compatible render target is used, and the result copied into the
 // environment map at end scene.
 //
@@ -313,8 +313,8 @@ HRESULT WINAPI
 //    the resulting environment map.
 //
 // Face -
-//    Call this function to initiate the drawing of each face.  For each 
-//    environment map, you will call this six times.. once for each face 
+//    Call this function to initiate the drawing of each face.  For each
+//    environment map, you will call this six times.. once for each face
 //    in D3DCUBEMAP_FACES.
 //
 // End -
@@ -340,7 +340,7 @@ typedef interface ID3DXRenderToEnvMap ID3DXRenderToEnvMap;
 typedef interface ID3DXRenderToEnvMap *LPD3DXRenderToEnvMap;
 
 // {4E42C623-9451-44b7-8C86-ABCCDE5D52C8}
-DEFINE_GUID( IID_ID3DXRenderToEnvMap, 
+DEFINE_GUID( IID_ID3DXRenderToEnvMap,
 0x4e42c623, 0x9451, 0x44b7, 0x8c, 0x86, 0xab, 0xcc, 0xde, 0x5d, 0x52, 0xc8);
 
 
@@ -358,17 +358,17 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
     STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC* pDesc) PURE;
 
-    STDMETHOD(BeginCube)(THIS_ 
+    STDMETHOD(BeginCube)(THIS_
         LPDIRECT3DCUBETEXTURE8 pCubeTex) PURE;
 
     STDMETHOD(BeginSphere)(THIS_
         LPDIRECT3DTEXTURE8 pTex) PURE;
 
-    STDMETHOD(BeginHemisphere)(THIS_ 
+    STDMETHOD(BeginHemisphere)(THIS_
         LPDIRECT3DTEXTURE8 pTexZPos,
         LPDIRECT3DTEXTURE8 pTexZNeg) PURE;
 
-    STDMETHOD(BeginParabolic)(THIS_ 
+    STDMETHOD(BeginParabolic)(THIS_
         LPDIRECT3DTEXTURE8 pTexZPos,
         LPDIRECT3DTEXTURE8 pTexZNeg) PURE;
 
@@ -427,7 +427,7 @@ extern "C" {
 //-------------------------------------------------------------------------
 // D3DXAssembleShader:
 // -------------------
-// Assembles an ascii description of a vertex or pixel shader into 
+// Assembles an ascii description of a vertex or pixel shader into
 // binary form.
 //
 // Parameters:
diff --git a/src/dep/include/DXSDK/include/d3dx8effect.h b/src/dep/include/DXSDK/include/d3dx8effect.h
index 97c44df..8444935 100644
--- a/src/dep/include/DXSDK/include/d3dx8effect.h
+++ b/src/dep/include/DXSDK/include/d3dx8effect.h
@@ -75,7 +75,7 @@ typedef interface ID3DXEffect ID3DXEffect;
 typedef interface ID3DXEffect *LPD3DXEFFECT;
 
 // {648B1CEB-8D4E-4d66-B6FA-E44969E82E89}
-DEFINE_GUID( IID_ID3DXEffect, 
+DEFINE_GUID( IID_ID3DXEffect,
 0x648b1ceb, 0x8d4e, 0x4d66, 0xb6, 0xfa, 0xe4, 0x49, 0x69, 0xe8, 0x2e, 0x89);
 
 
@@ -103,9 +103,9 @@ DECLARE_INTERFACE_(ID3DXEffect, IUnknown)
     STDMETHOD(GetTechnique)(THIS_ LPCSTR* ppTechnique) PURE;
 
     STDMETHOD(SetDword)(THIS_ LPCSTR pParameter, DWORD dw) PURE;
-    STDMETHOD(GetDword)(THIS_ LPCSTR pParameter, DWORD* pdw) PURE; 
+    STDMETHOD(GetDword)(THIS_ LPCSTR pParameter, DWORD* pdw) PURE;
     STDMETHOD(SetFloat)(THIS_ LPCSTR pParameter, FLOAT f) PURE;
-    STDMETHOD(GetFloat)(THIS_ LPCSTR pParameter, FLOAT* pf) PURE;    
+    STDMETHOD(GetFloat)(THIS_ LPCSTR pParameter, FLOAT* pf) PURE;
     STDMETHOD(SetVector)(THIS_ LPCSTR pParameter, CONST D3DXVECTOR4* pVector) PURE;
     STDMETHOD(GetVector)(THIS_ LPCSTR pParameter, D3DXVECTOR4* pVector) PURE;
     STDMETHOD(SetMatrix)(THIS_ LPCSTR pParameter, CONST D3DXMATRIX* pMatrix) PURE;
diff --git a/src/dep/include/DXSDK/include/d3dx8math.h b/src/dep/include/DXSDK/include/d3dx8math.h
index 9c8f203..2c08d68 100644
--- a/src/dep/include/DXSDK/include/d3dx8math.h
+++ b/src/dep/include/DXSDK/include/d3dx8math.h
@@ -227,7 +227,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
 // This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
 // It aligns matrices on the stack and on the heap or in global scope.
 // It does this using __declspec(align(16)) which works on VC7 and on VC 6
-// with the processor pack. Unfortunately there is no way to detect the 
+// with the processor pack. Unfortunately there is no way to detect the
 // latter so this is turned on only on VC7. On other compilers this is the
 // the same as D3DXMATRIX.
 // Using this class on a compiler that does not actually do the alignment
@@ -616,8 +616,8 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
 D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
 
-// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a 
-// non-affine matrix, the matrix you pass to this function should be the 
+// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a
+// non-affine matrix, the matrix you pass to this function should be the
 // transpose of the inverse of the matrix you would use to transform a coord.
 D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
@@ -941,7 +941,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
 // if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
 D3DXQUATERNION* WINAPI D3DXQuaternionExp
     ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
-      
+
 // Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
 // Expects unit quaternions.
 D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@@ -956,11 +956,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
       CONST D3DXQUATERNION *pC, FLOAT t );
 
 // Setup control points for spherical quadrangle interpolation
-// from Q1 to Q2.  The control points are chosen in such a way 
+// from Q1 to Q2.  The control points are chosen in such a way
 // to ensure the continuity of tangents with adjacent segments.
 void WINAPI D3DXQuaternionSquadSetup
     ( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
-      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1, 
+      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
       CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
 
 // Barycentric interpolation.
@@ -1086,7 +1086,7 @@ extern "C" {
 // Calculate Fresnel term given the cosine of theta (likely obtained by
 // taking the dot of two normals), and the refraction index of the material.
 FLOAT WINAPI D3DXFresnelTerm
-    (FLOAT CosTheta, FLOAT RefractionIndex);     
+    (FLOAT CosTheta, FLOAT RefractionIndex);
 
 #ifdef __cplusplus
 }
@@ -1199,9 +1199,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
 extern "C" {
 #endif
 
-HRESULT WINAPI 
-    D3DXCreateMatrixStack( 
-        DWORD               Flags, 
+HRESULT WINAPI
+    D3DXCreateMatrixStack(
+        DWORD               Flags,
         LPD3DXMATRIXSTACK*  ppStack);
 
 #ifdef __cplusplus
diff --git a/src/dep/include/DXSDK/include/d3dx8mesh.h b/src/dep/include/DXSDK/include/d3dx8mesh.h
index 5408cd3..f17d92c 100644
--- a/src/dep/include/DXSDK/include/d3dx8mesh.h
+++ b/src/dep/include/DXSDK/include/d3dx8mesh.h
@@ -15,34 +15,34 @@
 #include "dxfile.h"     // defines LPDIRECTXFILEDATA
 
 // {2A835771-BF4D-43f4-8E14-82A809F17D8A}
-DEFINE_GUID(IID_ID3DXBaseMesh, 
+DEFINE_GUID(IID_ID3DXBaseMesh,
 0x2a835771, 0xbf4d, 0x43f4, 0x8e, 0x14, 0x82, 0xa8, 0x9, 0xf1, 0x7d, 0x8a);
 
 // {CCAE5C3B-4DD1-4d0f-997E-4684CA64557F}
-DEFINE_GUID(IID_ID3DXMesh, 
+DEFINE_GUID(IID_ID3DXMesh,
 0xccae5c3b, 0x4dd1, 0x4d0f, 0x99, 0x7e, 0x46, 0x84, 0xca, 0x64, 0x55, 0x7f);
 
 // {19FBE386-C282-4659-97BD-CB869B084A6C}
-DEFINE_GUID(IID_ID3DXPMesh, 
+DEFINE_GUID(IID_ID3DXPMesh,
 0x19fbe386, 0xc282, 0x4659, 0x97, 0xbd, 0xcb, 0x86, 0x9b, 0x8, 0x4a, 0x6c);
 
 // {4E3CA05C-D4FF-4d11-8A02-16459E08F6F4}
-DEFINE_GUID(IID_ID3DXSPMesh, 
+DEFINE_GUID(IID_ID3DXSPMesh,
 0x4e3ca05c, 0xd4ff, 0x4d11, 0x8a, 0x2, 0x16, 0x45, 0x9e, 0x8, 0xf6, 0xf4);
 
 // {8DB06ECC-EBFC-408a-9404-3074B4773515}
-DEFINE_GUID(IID_ID3DXSkinMesh, 
+DEFINE_GUID(IID_ID3DXSkinMesh,
 0x8db06ecc, 0xebfc, 0x408a, 0x94, 0x4, 0x30, 0x74, 0xb4, 0x77, 0x35, 0x15);
 
 // Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags
 enum _D3DXMESH {
     D3DXMESH_32BIT                  = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices.
     D3DXMESH_DONOTCLIP              = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB.
-    D3DXMESH_POINTS                 = 0x004, // Use D3DUSAGE_POINTS for VB & IB. 
-    D3DXMESH_RTPATCHES              = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB. 
-    D3DXMESH_NPATCHES               = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB. 
+    D3DXMESH_POINTS                 = 0x004, // Use D3DUSAGE_POINTS for VB & IB.
+    D3DXMESH_RTPATCHES              = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB.
+    D3DXMESH_NPATCHES               = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB.
     D3DXMESH_VB_SYSTEMMEM           = 0x010, // Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER
-    D3DXMESH_VB_MANAGED             = 0x020, // Use D3DPOOL_MANAGED for VB. 
+    D3DXMESH_VB_MANAGED             = 0x020, // Use D3DPOOL_MANAGED for VB.
     D3DXMESH_VB_WRITEONLY           = 0x040, // Use D3DUSAGE_WRITEONLY for VB.
     D3DXMESH_VB_DYNAMIC             = 0x080, // Use D3DUSAGE_DYNAMIC for VB.
     D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, // Use D3DUSAGE_SOFTWAREPROCESSING for VB.
@@ -124,7 +124,7 @@ enum _D3DXWELDEPSILONSFLAGS
 {
     D3DXWELDEPSILONS_WELDALL = 0x1,              // weld all vertices marked by adjacency as being overlapping
 
-    D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2,   // if a given vertex component is within epsilon, modify partial matched 
+    D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2,   // if a given vertex component is within epsilon, modify partial matched
                                                     // vertices so that both components identical AND if all components "equal"
                                                     // remove one of the vertices
     D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4,  // instructs weld to only allow modifications to vertices and not removal
@@ -161,9 +161,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
     STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@@ -198,9 +198,9 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
     STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@@ -218,10 +218,10 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
     // ID3DXMesh
     STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE;
     STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
-    STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, 
-                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,  
+    STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
+                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
                      LPD3DXMESH* ppOptMesh) PURE;
-    STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, 
+    STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
                      DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap) PURE;
 
 };
@@ -245,9 +245,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@@ -263,9 +263,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE;
 
     // ID3DXPMesh
-    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMesh)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE;
     STDMETHOD(SetNumFaces)(THIS_ DWORD Faces) PURE;
     STDMETHOD(SetNumVertices)(THIS_ DWORD Vertices) PURE;
@@ -275,8 +275,8 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD_(DWORD, GetMinVertices)(THIS) PURE;
     STDMETHOD(Save)(THIS_ IStream *pStream, LPD3DXMATERIAL pMaterials, DWORD NumMaterials) PURE;
 
-    STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut, 
-                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,  
+    STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut,
+                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
                      LPD3DXMESH* ppOptMesh) PURE;
 
     STDMETHOD(OptimizeBaseLOD)(THIS_ DWORD Flags, DWORD* pFaceRemap) PURE;
@@ -304,13 +304,13 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
     STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3D, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE8 pD3D, DWORD *pVertexRemapOut, LPD3DXPMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMesh)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
                 CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3D, DWORD *pVertexRemapOut, LPD3DXPMESH* ppCloneMesh) PURE;
     STDMETHOD(ReduceFaces)(THIS_ DWORD Faces) PURE;
     STDMETHOD(ReduceVertices)(THIS_ DWORD Vertices) PURE;
@@ -380,31 +380,31 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
     STDMETHOD(GetMaxVertexInfluences)(THIS_ DWORD* maxVertexInfluences) PURE;
     STDMETHOD(GetMaxFaceInfluences)(THIS_ DWORD* maxFaceInfluences) PURE;
 
-    STDMETHOD(ConvertToBlendedMesh)(THIS_ DWORD Options, 
-                                    CONST LPDWORD pAdjacencyIn, 
+    STDMETHOD(ConvertToBlendedMesh)(THIS_ DWORD Options,
+                                    CONST LPDWORD pAdjacencyIn,
                                     LPDWORD pAdjacencyOut,
-                                    DWORD* pNumBoneCombinations, 
-                                    LPD3DXBUFFER* ppBoneCombinationTable, 
-                                    DWORD* pFaceRemap, 
-                                    LPD3DXBUFFER *ppVertexRemap, 
+                                    DWORD* pNumBoneCombinations,
+                                    LPD3DXBUFFER* ppBoneCombinationTable,
+                                    DWORD* pFaceRemap,
+                                    LPD3DXBUFFER *ppVertexRemap,
                                     LPD3DXMESH* ppMesh) PURE;
 
-    STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ DWORD Options, 
-                                           CONST LPDWORD pAdjacencyIn, 
-                                           DWORD paletteSize, 
-                                           LPDWORD pAdjacencyOut, 
-                                           DWORD* pNumBoneCombinations, 
-                                           LPD3DXBUFFER* ppBoneCombinationTable, 
-                                           DWORD* pFaceRemap, 
-                                           LPD3DXBUFFER *ppVertexRemap, 
+    STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ DWORD Options,
+                                           CONST LPDWORD pAdjacencyIn,
+                                           DWORD paletteSize,
+                                           LPDWORD pAdjacencyOut,
+                                           DWORD* pNumBoneCombinations,
+                                           LPD3DXBUFFER* ppBoneCombinationTable,
+                                           DWORD* pFaceRemap,
+                                           LPD3DXBUFFER *ppVertexRemap,
                                            LPD3DXMESH* ppMesh) PURE;
 
-    STDMETHOD(GenerateSkinnedMesh)(THIS_ DWORD Options, 
-                                   FLOAT minWeight, 
-                                   CONST LPDWORD pAdjacencyIn, 
-                                   LPDWORD pAdjacencyOut, 
-                                   DWORD* pFaceRemap, 
-                                   LPD3DXBUFFER *ppVertexRemap, 
+    STDMETHOD(GenerateSkinnedMesh)(THIS_ DWORD Options,
+                                   FLOAT minWeight,
+                                   CONST LPDWORD pAdjacencyIn,
+                                   LPDWORD pAdjacencyOut,
+                                   DWORD* pFaceRemap,
+                                   LPD3DXBUFFER *ppVertexRemap,
                                    LPD3DXMESH* ppMesh) PURE;
     STDMETHOD(UpdateSkinnedMesh)(THIS_ CONST D3DXMATRIX* pBoneTransforms, CONST D3DXMATRIX* pBoneInvTransforms, LPD3DXMESH pMesh) PURE;
 };
@@ -413,28 +413,28 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
 extern "C" {
 #endif //__cplusplus
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateMesh(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
-        DWORD Options, 
-        CONST DWORD *pDeclaration, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD NumFaces,
+        DWORD NumVertices,
+        DWORD Options,
+        CONST DWORD *pDeclaration,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateMeshFVF(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
-        DWORD Options, 
-        DWORD FVF, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD NumFaces,
+        DWORD NumVertices,
+        DWORD Options,
+        DWORD FVF,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateSPMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
         LPD3DXSPMESH* ppSMesh);
@@ -454,87 +454,87 @@ HRESULT WINAPI
     CONST DWORD* pAdjacency,
     LPD3DXBUFFER* ppErrorsAndWarnings);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXGeneratePMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
-        DWORD MinValue, 
-        DWORD Options, 
+        DWORD MinValue,
+        DWORD Options,
         LPD3DXPMESH* ppPMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSimplifyMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
-        DWORD MinValue, 
-        DWORD Options, 
+        DWORD MinValue,
+        DWORD Options,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingSphere(
-        PVOID pPointsFVF, 
-        DWORD NumVertices, 
+        PVOID pPointsFVF,
+        DWORD NumVertices,
         DWORD FVF,
-        D3DXVECTOR3 *pCenter, 
+        D3DXVECTOR3 *pCenter,
         FLOAT *pRadius);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingBox(
-        PVOID pPointsFVF, 
-        DWORD NumVertices, 
+        PVOID pPointsFVF,
+        DWORD NumVertices,
         DWORD FVF,
-        D3DXVECTOR3 *pMin, 
+        D3DXVECTOR3 *pMin,
         D3DXVECTOR3 *pMax);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeNormals(
         LPD3DXBASEMESH pMesh,
         CONST DWORD *pAdjacency);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateBuffer(
-        DWORD NumBytes, 
+        DWORD NumBytes,
         LPD3DXBUFFER *ppBuffer);
 
 
 HRESULT WINAPI
     D3DXLoadMeshFromX(
-        LPSTR pFilename, 
-        DWORD Options, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        LPSTR pFilename,
+        DWORD Options,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
+        LPD3DXBUFFER *ppMaterials,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXInMemory(
         PBYTE Memory,
         DWORD SizeOfMemory,
-        DWORD Options, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD Options,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
+        LPD3DXBUFFER *ppMaterials,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXResource(
         HMODULE Module,
         LPCTSTR Name,
         LPCTSTR Type,
-        DWORD Options, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD Options,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
+        LPD3DXBUFFER *ppMaterials,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSaveMeshToX(
         LPSTR pFilename,
         LPD3DXMESH pMesh,
@@ -544,33 +544,33 @@ HRESULT WINAPI
         DWORD Format
         );
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreatePMeshFromStream(
-        IStream *pStream, 
+        IStream *pStream,
         DWORD Options,
-        LPDIRECT3DDEVICE8 pD3DDevice, 
+        LPDIRECT3DDEVICE8 pD3DDevice,
         LPD3DXBUFFER *ppMaterials,
         DWORD* pNumMaterials,
         LPD3DXPMESH *ppPMesh);
 
 HRESULT WINAPI
     D3DXCreateSkinMesh(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
+        DWORD NumFaces,
+        DWORD NumVertices,
         DWORD NumBones,
-        DWORD Options, 
-        CONST DWORD *pDeclaration, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD Options,
+        CONST DWORD *pDeclaration,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXSKINMESH* ppSkinMesh);
 
 HRESULT WINAPI
     D3DXCreateSkinMeshFVF(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
+        DWORD NumFaces,
+        DWORD NumVertices,
         DWORD NumBones,
-        DWORD Options, 
-        DWORD FVF, 
-        LPDIRECT3DDEVICE8 pD3D, 
+        DWORD Options,
+        DWORD FVF,
+        LPDIRECT3DDEVICE8 pD3D,
         LPD3DXSKINMESH* ppSkinMesh);
 
 HRESULT WINAPI
@@ -579,19 +579,19 @@ HRESULT WINAPI
         DWORD numBones,
         LPD3DXSKINMESH* ppSkinMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXof(
-        LPDIRECTXFILEDATA pXofObjMesh, 
-        DWORD Options, 
-        LPDIRECT3DDEVICE8 pD3DDevice, 
+        LPDIRECTXFILEDATA pXofObjMesh,
+        DWORD Options,
+        LPDIRECT3DDEVICE8 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
+        LPD3DXBUFFER *ppMaterials,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
 HRESULT WINAPI
     D3DXLoadSkinMeshFromXof(
-        LPDIRECTXFILEDATA pxofobjMesh, 
+        LPDIRECTXFILEDATA pxofobjMesh,
         DWORD Options,
         LPDIRECT3DDEVICE8 pD3D,
         LPD3DXBUFFER* ppAdjacency,
@@ -603,9 +603,9 @@ HRESULT WINAPI
 
 HRESULT WINAPI
     D3DXTessellateNPatches(
-        LPD3DXMESH pMeshIn,             
-        CONST DWORD* pAdjacencyIn,             
-        FLOAT NumSegs,                    
+        LPD3DXMESH pMeshIn,
+        CONST DWORD* pAdjacencyIn,
+        FLOAT NumSegs,
         BOOL  QuadraticInterpNormals,     // if false use linear intrep for normals, if true use quadratic
         LPD3DXMESH *ppMeshOut,
         LPD3DXBUFFER *ppAdjacencyOut);
@@ -623,19 +623,19 @@ HRESULT WINAPI
         CONST DWORD *pDeclarator,
         DWORD *pFVF);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXWeldVertices(
-        CONST LPD3DXMESH pMesh,         
-        LPD3DXWELDEPSILONS pEpsilons,                 
-        CONST DWORD *pAdjacencyIn, 
+        CONST LPD3DXMESH pMesh,
+        LPD3DXWELDEPSILONS pEpsilons,
+        CONST DWORD *pAdjacencyIn,
         DWORD *pAdjacencyOut,
-        DWORD* pFaceRemap, 
+        DWORD* pFaceRemap,
         LPD3DXBUFFER *ppVertexRemap);
 
 typedef struct _D3DXINTERSECTINFO
 {
     DWORD FaceIndex;                // index of face intersected
-    FLOAT U;                        // Barycentric Hit Coordinates    
+    FLOAT U;                        // Barycentric Hit Coordinates
     FLOAT V;                        // Barycentric Hit Coordinates
     FLOAT Dist;                     // Ray-Intersection Parameter Distance
 } D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO;
@@ -645,13 +645,13 @@ HRESULT WINAPI
     D3DXIntersect(
         LPD3DXBASEMESH pMesh,
         CONST D3DXVECTOR3 *pRayPos,
-        CONST D3DXVECTOR3 *pRayDir, 
+        CONST D3DXVECTOR3 *pRayDir,
         BOOL    *pHit,              // True if any faces were intersected
         DWORD   *pFaceIndex,        // index of closest face intersected
-        FLOAT   *pU,                // Barycentric Hit Coordinates    
+        FLOAT   *pU,                // Barycentric Hit Coordinates
         FLOAT   *pV,                // Barycentric Hit Coordinates
         FLOAT   *pDist,             // Ray-Intersection Parameter Distance
-        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest) 
+        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest)
         DWORD   *pCountOfHits);     // Number of entries in AllHits array
 
 HRESULT WINAPI
@@ -659,20 +659,20 @@ HRESULT WINAPI
         LPD3DXBASEMESH pMesh,
         DWORD AttribId,
         CONST D3DXVECTOR3 *pRayPos,
-        CONST D3DXVECTOR3 *pRayDir, 
+        CONST D3DXVECTOR3 *pRayDir,
         BOOL    *pHit,              // True if any faces were intersected
         DWORD   *pFaceIndex,        // index of closest face intersected
-        FLOAT   *pU,                // Barycentric Hit Coordinates    
+        FLOAT   *pU,                // Barycentric Hit Coordinates
         FLOAT   *pV,                // Barycentric Hit Coordinates
         FLOAT   *pDist,             // Ray-Intersection Parameter Distance
-        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest) 
+        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest)
         DWORD   *pCountOfHits);     // Number of entries in AllHits array
 
 
 HRESULT WINAPI D3DXSplitMesh
     (
-    CONST LPD3DXMESH pMeshIn,         
-    CONST DWORD *pAdjacencyIn, 
+    CONST LPD3DXMESH pMeshIn,
+    CONST DWORD *pAdjacencyIn,
     CONST DWORD MaxSize,
     CONST DWORD Options,
     DWORD *pMeshesOut,
@@ -682,7 +682,7 @@ HRESULT WINAPI D3DXSplitMesh
     LPD3DXBUFFER *ppVertRemapArrayOut
     );
 
-BOOL D3DXIntersectTri 
+BOOL D3DXIntersectTri
 (
     CONST D3DXVECTOR3 *p0,           // Triangle vertex 0 position
     CONST D3DXVECTOR3 *p1,           // Triangle vertex 1 position
@@ -700,9 +700,9 @@ BOOL WINAPI
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
 
-BOOL WINAPI 
+BOOL WINAPI
     D3DXBoxBoundProbe(
-        CONST D3DXVECTOR3 *pMin, 
+        CONST D3DXVECTOR3 *pMin,
         CONST D3DXVECTOR3 *pMax,
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
diff --git a/src/dep/include/DXSDK/include/d3dx8shape.h b/src/dep/include/DXSDK/include/d3dx8shape.h
index b7ab637..e874d64 100644
--- a/src/dep/include/DXSDK/include/d3dx8shape.h
+++ b/src/dep/include/DXSDK/include/d3dx8shape.h
@@ -22,7 +22,7 @@ extern "C" {
 
 
 //-------------------------------------------------------------------------
-// D3DXCreatePolygon: 
+// D3DXCreatePolygon:
 // ------------------
 // Creates a mesh containing an n-sided polygon.  The polygon is centered
 // at the origin.
@@ -35,17 +35,17 @@ extern "C" {
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreatePolygon(
         LPDIRECT3DDEVICE8   pDevice,
-        FLOAT               Length, 
-        UINT                Sides, 
+        FLOAT               Length,
+        UINT                Sides,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateBox: 
+// D3DXCreateBox:
 // --------------
 // Creates a mesh containing an axis-aligned box.  The box is centered at
 // the origin.
@@ -59,9 +59,9 @@ HRESULT WINAPI
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateBox(
-        LPDIRECT3DDEVICE8   pDevice, 
+        LPDIRECT3DDEVICE8   pDevice,
         FLOAT               Width,
         FLOAT               Height,
         FLOAT               Depth,
@@ -86,14 +86,14 @@ HRESULT WINAPI
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateCylinder(
         LPDIRECT3DDEVICE8   pDevice,
-        FLOAT               Radius1, 
-        FLOAT               Radius2, 
-        FLOAT               Length, 
-        UINT                Slices, 
-        UINT                Stacks,   
+        FLOAT               Radius1,
+        FLOAT               Radius2,
+        FLOAT               Length,
+        UINT                Slices,
+        UINT                Stacks,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
@@ -115,9 +115,9 @@ HRESULT WINAPI
 //-------------------------------------------------------------------------
 HRESULT WINAPI
     D3DXCreateSphere(
-        LPDIRECT3DDEVICE8  pDevice, 
-        FLOAT              Radius, 
-        UINT               Slices, 
+        LPDIRECT3DDEVICE8  pDevice,
+        FLOAT              Radius,
+        UINT               Slices,
         UINT               Stacks,
         LPD3DXMESH*        ppMesh,
         LPD3DXBUFFER*      ppAdjacency);
@@ -129,7 +129,7 @@ HRESULT WINAPI
 // Creates a mesh containing a torus.  The generated torus is centered at
 // the origin, and its axis is aligned with the Z-axis.
 //
-// Parameters: 
+// Parameters:
 //
 //  pDevice     The D3D device with which the mesh is going to be used.
 //  InnerRadius Inner radius of the torus (should be >= 0.0f)
@@ -143,19 +143,19 @@ HRESULT WINAPI
     D3DXCreateTorus(
         LPDIRECT3DDEVICE8   pDevice,
         FLOAT               InnerRadius,
-        FLOAT               OuterRadius, 
+        FLOAT               OuterRadius,
         UINT                Sides,
-        UINT                Rings, 
+        UINT                Rings,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateTeapot: 
+// D3DXCreateTeapot:
 // -----------------
 // Creates a mesh containing a teapot.
 //
-// Parameters: 
+// Parameters:
 //
 //  pDevice     The D3D device with which the mesh is going to be used.
 //  ppMesh      The mesh object which will be created
@@ -169,8 +169,8 @@ HRESULT WINAPI
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateText: 
-// --------------- 
+// D3DXCreateText:
+// ---------------
 // Creates a mesh containing the specified text using the font associated
 // with the device context.
 //
@@ -215,6 +215,6 @@ HRESULT WINAPI
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus    
+#endif //__cplusplus
 
 #endif //__D3DX8SHAPES_H__
diff --git a/src/dep/include/DXSDK/include/d3dx8tex.h b/src/dep/include/DXSDK/include/d3dx8tex.h
index dd9fe9d..cb30a7c 100644
--- a/src/dep/include/DXSDK/include/d3dx8tex.h
+++ b/src/dep/include/DXSDK/include/d3dx8tex.h
@@ -27,14 +27,14 @@
 //      from the source image.
 //  D3DX_FILTER_LINEAR
 //      Each destination pixel is computed by linearly interpolating between
-//      the nearest pixels in the source image.  This filter works best 
+//      the nearest pixels in the source image.  This filter works best
 //      when the scale on each axis is less than 2.
 //  D3DX_FILTER_TRIANGLE
 //      Every pixel in the source image contributes equally to the
 //      destination image.  This is the slowest of all the filters.
 //  D3DX_FILTER_BOX
-//      Each pixel is computed by averaging a 2x2(x2) box pixels from 
-//      the source image. Only works when the dimensions of the 
+//      Each pixel is computed by averaging a 2x2(x2) box pixels from
+//      the source image. Only works when the dimensions of the
 //      destination are half those of the source. (as with mip maps)
 //
 // And can be OR'd with any of these optional flags:
@@ -84,7 +84,7 @@
 //  D3DX_NORMALMAP_MIRROR
 //      Same as specifying D3DX_NORMALMAP_MIRROR_U | D3DX_NORMALMAP_MIRROR_V
 //  D3DX_NORMALMAP_INVERTSIGN
-//      Inverts the direction of each normal 
+//      Inverts the direction of each normal
 //  D3DX_NORMALMAP_COMPUTE_OCCLUSION
 //      Compute the per pixel Occlusion term and encodes it into the alpha.
 //      An Alpha of 1 means that the pixel is not obscured in anyway, and
@@ -118,7 +118,7 @@
 // D3DX_CHANNEL_ALPHA
 //     Indicates the alpha channel should be used
 // D3DX_CHANNEL_LUMINANCE
-//     Indicates the luminaces of the red green and blue channels should be 
+//     Indicates the luminaces of the red green and blue channels should be
 //     used.
 //
 //----------------------------------------------------------------------------
@@ -161,10 +161,10 @@ typedef enum _D3DXIMAGE_FILEFORMAT
 // Parameters:
 //  pOut
 //      Pointer to a vector which the function uses to return its result.
-//      X,Y,Z,W will be mapped to R,G,B,A respectivly. 
+//      X,Y,Z,W will be mapped to R,G,B,A respectivly.
 //  pTexCoord
-//      Pointer to a vector containing the coordinates of the texel currently 
-//      being evaluated.  Textures and VolumeTexture texcoord components 
+//      Pointer to a vector containing the coordinates of the texel currently
+//      being evaluated.  Textures and VolumeTexture texcoord components
 //      range from 0 to 1. CubeTexture texcoord component range from -1 to 1.
 //  pTexelSize
 //      Pointer to a vector containing the dimensions of the current texel.
@@ -175,7 +175,7 @@ typedef enum _D3DXIMAGE_FILEFORMAT
 
 typedef VOID (*LPD3DXFILL2D)(D3DXVECTOR4 *pOut, D3DXVECTOR2 *pTexCoord, D3DXVECTOR2 *pTexelSize, LPVOID pData);
 typedef VOID (*LPD3DXFILL3D)(D3DXVECTOR4 *pOut, D3DXVECTOR3 *pTexCoord, D3DXVECTOR3 *pTexelSize, LPVOID pData);
- 
+
 
 
 //----------------------------------------------------------------------------
@@ -183,7 +183,7 @@ typedef VOID (*LPD3DXFILL3D)(D3DXVECTOR4 *pOut, D3DXVECTOR3 *pTexCoord, D3DXVECT
 // ---------------
 // This structure is used to return a rough description of what the
 // the original contents of an image file looked like.
-// 
+//
 //  Width
 //      Width of original image in pixels
 //  Height
@@ -246,7 +246,7 @@ extern "C" {
 //  SrcDataSize
 //      Size in bytes of file in memory.
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file.
 //
 //----------------------------------------------------------------------------
@@ -331,10 +331,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //
 //----------------------------------------------------------------------------
@@ -440,7 +440,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -486,7 +486,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -584,10 +584,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //
 //----------------------------------------------------------------------------
@@ -691,7 +691,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -741,7 +741,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -965,10 +965,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //  pPalette
 //      256 color palette to be filled in, or NULL
@@ -1496,7 +1496,7 @@ HRESULT WINAPI
 //  pPalette
 //      256 color palette to be used, or NULL for non-palettized formats
 //  SrcLevel
-//      The level whose image is used to generate the subsequent levels. 
+//      The level whose image is used to generate the subsequent levels.
 //  Filter
 //      D3DX_FILTER flags controlling how each miplevel is filtered.
 //      Or D3DX_DEFAULT for D3DX_FILTER_BOX,
@@ -1525,10 +1525,10 @@ HRESULT WINAPI
 //  pTexture, pCubeTexture, pVolumeTexture
 //      Pointer to the texture to be filled.
 //  pFunction
-//      Pointer to user provided evalutor function which will be used to 
+//      Pointer to user provided evalutor function which will be used to
 //      compute the value of each texel.
 //  pData
-//      Pointer to an arbitrary block of user defined data.  This pointer 
+//      Pointer to an arbitrary block of user defined data.  This pointer
 //      will be passed to the function provided in pFunction
 //-----------------------------------------------------------------------------
 
@@ -1562,7 +1562,7 @@ HRESULT WINAPI
 //  pTexture
 //      Pointer to the destination texture
 //  pSrcTexture
-//      Pointer to the source heightmap texture 
+//      Pointer to the source heightmap texture
 //  pSrcPalette
 //      Source palette of 256 colors, or NULL
 //  Flags
diff --git a/src/dep/include/DXSDK/include/d3dx9anim.h b/src/dep/include/DXSDK/include/d3dx9anim.h
index fedb1db..47e23dc 100644
--- a/src/dep/include/DXSDK/include/d3dx9anim.h
+++ b/src/dep/include/DXSDK/include/d3dx9anim.h
@@ -11,19 +11,19 @@
 #define __D3DX9ANIM_H__
 
 // {698CFB3F-9289-4d95-9A57-33A94B5A65F9}
-DEFINE_GUID(IID_ID3DXAnimationSet, 
+DEFINE_GUID(IID_ID3DXAnimationSet,
 0x698cfb3f, 0x9289, 0x4d95, 0x9a, 0x57, 0x33, 0xa9, 0x4b, 0x5a, 0x65, 0xf9);
 
 // {FA4E8E3A-9786-407d-8B4C-5995893764AF}
-DEFINE_GUID(IID_ID3DXKeyframedAnimationSet, 
+DEFINE_GUID(IID_ID3DXKeyframedAnimationSet,
 0xfa4e8e3a, 0x9786, 0x407d, 0x8b, 0x4c, 0x59, 0x95, 0x89, 0x37, 0x64, 0xaf);
 
 // {6CC2480D-3808-4739-9F88-DE49FACD8D4C}
-DEFINE_GUID(IID_ID3DXCompressedAnimationSet, 
+DEFINE_GUID(IID_ID3DXCompressedAnimationSet,
 0x6cc2480d, 0x3808, 0x4739, 0x9f, 0x88, 0xde, 0x49, 0xfa, 0xcd, 0x8d, 0x4c);
 
 // {AC8948EC-F86D-43e2-96DE-31FC35F96D9E}
-DEFINE_GUID(IID_ID3DXAnimationController, 
+DEFINE_GUID(IID_ID3DXAnimationController,
 0xac8948ec, 0xf86d, 0x43e2, 0x96, 0xde, 0x31, 0xfc, 0x35, 0xf9, 0x6d, 0x9e);
 
 
@@ -43,7 +43,7 @@ typedef enum _D3DXMESHDATATYPE {
 //----------------------------------------------------------------------------
 // D3DXMESHDATA:
 // -------------
-// This struct encapsulates a the mesh data that can be present in a mesh 
+// This struct encapsulates a the mesh data that can be present in a mesh
 // container.  The supported mesh types are pMesh, pPMesh, pPatchMesh.
 // The valid way to access this is determined by the Type enum.
 //----------------------------------------------------------------------------
@@ -131,7 +131,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
 	//		Returns the created frame object
 	//
 	//------------------------------------------------------------------------
-    STDMETHOD(CreateFrame)(THIS_ LPCSTR Name, 
+    STDMETHOD(CreateFrame)(THIS_ LPCSTR Name,
                             LPD3DXFRAME *ppNewFrame) PURE;
 
 	//------------------------------------------------------------------------
@@ -159,20 +159,20 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
 	//	pSkinInfo
 	//		Pointer to the skininfo object if the mesh is skinned
 	//	pBoneNames
-	//		Array of names, one for each bone in the skinned mesh. 
+	//		Array of names, one for each bone in the skinned mesh.
 	//		The numberof bones can be found from the pSkinMesh object
 	//	pBoneOffsetMatrices
 	//		Array of matrices, one for each bone in the skinned mesh.
 	//
 	//------------------------------------------------------------------------
-    STDMETHOD(CreateMeshContainer)(THIS_ 
-        LPCSTR Name, 
-        CONST D3DXMESHDATA *pMeshData, 
-        CONST D3DXMATERIAL *pMaterials, 
-        CONST D3DXEFFECTINSTANCE *pEffectInstances, 
-        DWORD NumMaterials, 
-        CONST DWORD *pAdjacency, 
-        LPD3DXSKININFO pSkinInfo, 
+    STDMETHOD(CreateMeshContainer)(THIS_
+        LPCSTR Name,
+        CONST D3DXMESHDATA *pMeshData,
+        CONST D3DXMATERIAL *pMaterials,
+        CONST D3DXEFFECTINSTANCE *pEffectInstances,
+        DWORD NumMaterials,
+        CONST DWORD *pAdjacency,
+        LPD3DXSKININFO pSkinInfo,
         LPD3DXMESHCONTAINER *ppNewMeshContainer) PURE;
 
 	//------------------------------------------------------------------------
@@ -185,7 +185,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
 	//		Pointer to the frame to be de-allocated
 	//
 	//------------------------------------------------------------------------
-    STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME pFrameToFree) PURE; 
+    STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME pFrameToFree) PURE;
 
 	//------------------------------------------------------------------------
 	// DestroyMeshContainer:
@@ -197,7 +197,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
 	//		Pointer to the mesh container object to be de-allocated
 	//
 	//------------------------------------------------------------------------
-    STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER pMeshContainerToFree) PURE; 
+    STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER pMeshContainerToFree) PURE;
 };
 
 //----------------------------------------------------------------------------
@@ -216,12 +216,12 @@ typedef interface ID3DXLoadUserData *LPD3DXLOADUSERDATA;
 DECLARE_INTERFACE(ID3DXLoadUserData)
 {
     STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA pXofChildData) PURE;
-                            
-    STDMETHOD(LoadFrameChildData)(LPD3DXFRAME pFrame, 
+
+    STDMETHOD(LoadFrameChildData)(LPD3DXFRAME pFrame,
+                            LPD3DXFILEDATA pXofChildData) PURE;
+
+    STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER pMeshContainer,
                             LPD3DXFILEDATA pXofChildData) PURE;
-                            
-    STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER pMeshContainer, 
-                            LPD3DXFILEDATA pXofChildData) PURE;                            
 };
 
 //----------------------------------------------------------------------------
@@ -239,29 +239,29 @@ typedef interface ID3DXSaveUserData *LPD3DXSAVEUSERDATA;
 
 DECLARE_INTERFACE(ID3DXSaveUserData)
 {
-    STDMETHOD(AddFrameChildData)(CONST D3DXFRAME *pFrame, 
-                            LPD3DXFILESAVEOBJECT pXofSave, 
+    STDMETHOD(AddFrameChildData)(CONST D3DXFRAME *pFrame,
+                            LPD3DXFILESAVEOBJECT pXofSave,
                             LPD3DXFILESAVEDATA pXofFrameData) PURE;
-                            
-    STDMETHOD(AddMeshChildData)(CONST D3DXMESHCONTAINER *pMeshContainer, 
-                            LPD3DXFILESAVEOBJECT pXofSave, 
+
+    STDMETHOD(AddMeshChildData)(CONST D3DXMESHCONTAINER *pMeshContainer,
+                            LPD3DXFILESAVEOBJECT pXofSave,
                             LPD3DXFILESAVEDATA pXofMeshData) PURE;
-                            
-    // NOTE: this is called once per Save.  All top level objects should be added using the 
+
+    // NOTE: this is called once per Save.  All top level objects should be added using the
     //    provided interface.  One call adds objects before the frame hierarchy, the other after
-    STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT pXofSave) PURE; 
-    STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT pXofSave) PURE;                             
+    STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
+    STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
 
     // callbacks for the user to register and then save templates to the XFile
-    STDMETHOD(RegisterTemplates)(LPD3DXFILE pXFileApi) PURE;                             
-    STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT pXofSave) PURE;                             
+    STDMETHOD(RegisterTemplates)(LPD3DXFILE pXFileApi) PURE;
+    STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
 };
 
 
 //----------------------------------------------------------------------------
 // D3DXCALLBACK_SEARCH_FLAGS:
 // --------------------------
-// Flags that can be passed into ID3DXAnimationSet::GetCallback. 
+// Flags that can be passed into ID3DXAnimationSet::GetCallback.
 //----------------------------------------------------------------------------
 typedef enum _D3DXCALLBACK_SEARCH_FLAGS
 {
@@ -302,7 +302,7 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
     STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
 
     // SRT
-    STDMETHOD(GetSRT)(THIS_ 
+    STDMETHOD(GetSRT)(THIS_
         DOUBLE PeriodicPosition,            // Position mapped to period (use GetPeriodicPosition)
         UINT Animation,                     // Animation index
         D3DXVECTOR3 *pScale,                // Returns the scale
@@ -310,7 +310,7 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
         D3DXVECTOR3 *pTranslation) PURE;    // Returns the translation
 
     // Callbacks
-    STDMETHOD(GetCallback)(THIS_ 
+    STDMETHOD(GetCallback)(THIS_
         DOUBLE Position,                    // Position from which to find callbacks
         DWORD Flags,                        // Callback search flags
         DOUBLE *pCallbackPosition,          // Returns the position of the callback
@@ -365,7 +365,7 @@ typedef struct _D3DXKEY_QUATERNION
 // D3DXKEY_CALLBACK:
 // -----------------
 // This structure describes an callback key for use in keyframe animation.
-// It specifies a pointer to user data at a given Time. 
+// It specifies a pointer to user data at a given Time.
 //----------------------------------------------------------------------------
 typedef struct _D3DXKEY_CALLBACK
 {
@@ -377,7 +377,7 @@ typedef struct _D3DXKEY_CALLBACK
 //----------------------------------------------------------------------------
 // D3DXCOMPRESSION_FLAGS:
 // ----------------------
-// Flags that can be passed into ID3DXKeyframedAnimationSet::Compress. 
+// Flags that can be passed into ID3DXKeyframedAnimationSet::Compress.
 //----------------------------------------------------------------------------
 typedef enum _D3DXCOMPRESSION_FLAGS
 {
@@ -418,7 +418,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
     STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
 
     // SRT
-    STDMETHOD(GetSRT)(THIS_ 
+    STDMETHOD(GetSRT)(THIS_
         DOUBLE PeriodicPosition,            // Position mapped to period (use GetPeriodicPosition)
         UINT Animation,                     // Animation index
         D3DXVECTOR3 *pScale,                // Returns the scale
@@ -426,7 +426,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
         D3DXVECTOR3 *pTranslation) PURE;    // Returns the translation
 
     // Callbacks
-    STDMETHOD(GetCallback)(THIS_ 
+    STDMETHOD(GetCallback)(THIS_
         DOUBLE Position,                    // Position from which to find callbacks
         DWORD Flags,                        // Callback search flags
         DOUBLE *pCallbackPosition,          // Returns the position of the callback
@@ -466,7 +466,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
 	STDMETHOD(UnregisterTranslationKey)(THIS_ UINT Animation, UINT Key) PURE;
 
     // One-time animaton SRT keyframe registration
-    STDMETHOD(RegisterAnimationSRTKeys)(THIS_ 
+    STDMETHOD(RegisterAnimationSRTKeys)(THIS_
         LPCSTR pName,                                   // Animation name
         UINT NumScaleKeys,                              // Number of scale keys
         UINT NumRotationKeys,                           // Number of rotation keys
@@ -474,10 +474,10 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
         CONST D3DXKEY_VECTOR3 *pScaleKeys,              // Array of scale keys
         CONST D3DXKEY_QUATERNION *pRotationKeys,        // Array of rotation keys
         CONST D3DXKEY_VECTOR3 *pTranslationKeys,		// Array of translation keys
-		DWORD *pAnimationIndex) PURE;					// Returns the animation index 
+		DWORD *pAnimationIndex) PURE;					// Returns the animation index
 
     // Compression
-    STDMETHOD(Compress)(THIS_ 
+    STDMETHOD(Compress)(THIS_
         DWORD Flags,                            // Compression flags (use D3DXCOMPRESS_STRONG for better results)
         FLOAT Lossiness,                        // Compression loss ratio in the [0, 1] range
         LPD3DXFRAME pHierarchy,                 // Frame hierarchy (optional)
@@ -518,7 +518,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
     STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
 
     // SRT
-    STDMETHOD(GetSRT)(THIS_ 
+    STDMETHOD(GetSRT)(THIS_
         DOUBLE PeriodicPosition,            // Position mapped to period (use GetPeriodicPosition)
         UINT Animation,                     // Animation index
         D3DXVECTOR3 *pScale,                // Returns the scale
@@ -526,7 +526,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
         D3DXVECTOR3 *pTranslation) PURE;    // Returns the translation
 
     // Callbacks
-    STDMETHOD(GetCallback)(THIS_ 
+    STDMETHOD(GetCallback)(THIS_
         DOUBLE Position,                    // Position from which to find callbacks
         DWORD Flags,                        // Callback search flags
         DOUBLE *pCallbackPosition,          // Returns the position of the callback
@@ -560,12 +560,12 @@ typedef enum _D3DXPRIORITY_TYPE {
 //----------------------------------------------------------------------------
 // D3DXTRACK_DESC:
 // ---------------
-// This structure describes the mixing information of an animation track. 
-// The mixing information consists of the current position, speed, and blending 
-// weight for the track.  The Flags field also specifies whether the track is 
+// This structure describes the mixing information of an animation track.
+// The mixing information consists of the current position, speed, and blending
+// weight for the track.  The Flags field also specifies whether the track is
 // low or high priority.  Tracks with the same priority are blended together
 // and then the two resulting values are blended using the priority blend factor.
-// A track also has an animation set (stored separately) associated with it.  
+// A track also has an animation set (stored separately) associated with it.
 //----------------------------------------------------------------------------
 typedef struct _D3DXTRACK_DESC
 {
@@ -595,7 +595,7 @@ typedef enum _D3DXEVENT_TYPE
 //----------------------------------------------------------------------------
 // D3DXTRANSITION_TYPE:
 // --------------------
-// This enum defines the type of transtion performed on a event that 
+// This enum defines the type of transtion performed on a event that
 // transitions from one value to another.
 //----------------------------------------------------------------------------
 typedef enum _D3DXTRANSITION_TYPE {
@@ -609,7 +609,7 @@ typedef enum _D3DXTRANSITION_TYPE {
 // D3DXEVENT_DESC:
 // ---------------
 // This structure describes a animation controller event.
-// It gives the event's type, track (if the event is a track event), global 
+// It gives the event's type, track (if the event is a track event), global
 // start time, duration, transition method, and target value.
 //----------------------------------------------------------------------------
 typedef struct _D3DXEVENT_DESC
@@ -641,8 +641,8 @@ typedef D3DXEVENTHANDLE *LPD3DXEVENTHANDLE;
 // ID3DXAnimationCallbackHandler:
 // ------------------------------
 // This interface is intended to be implemented by the application, and can
-// be used to handle callbacks in animation sets generated when 
-// ID3DXAnimationController::AdvanceTime() is called.  
+// be used to handle callbacks in animation sets generated when
+// ID3DXAnimationController::AdvanceTime() is called.
 //----------------------------------------------------------------------------
 typedef interface ID3DXAnimationCallbackHandler ID3DXAnimationCallbackHandler;
 typedef interface ID3DXAnimationCallbackHandler *LPD3DXANIMATIONCALLBACKHANDLER;
@@ -656,7 +656,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
     // ID3DXAnimationCallbackHandler::HandleCallback:
     // ----------------------------------------------
     // This method gets called when a callback occurs for an animation set in one
-    // of the tracks during the ID3DXAnimationController::AdvanceTime() call.  
+    // of the tracks during the ID3DXAnimationController::AdvanceTime() call.
     //
     // Parameters:
     //  Track
@@ -665,7 +665,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
     //      Pointer to user owned callback data.
     //
     //----------------------------------------------------------------------------
-    STDMETHOD(HandleCallback)(THIS_ UINT Track, LPVOID pCallbackData) PURE; 
+    STDMETHOD(HandleCallback)(THIS_ UINT Track, LPVOID pCallbackData) PURE;
 };
 
 
@@ -675,7 +675,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
 // This interface implements the main animation functionality. It connects
 // animation sets with the transform frames that are being animated. Allows
 // mixing multiple animations for blended animations or for transistions
-// It adds also has methods to modify blending parameters over time to 
+// It adds also has methods to modify blending parameters over time to
 // enable smooth transistions and other effects.
 //----------------------------------------------------------------------------
 typedef interface ID3DXAnimationController ID3DXAnimationController;
@@ -698,11 +698,11 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
     STDMETHOD_(UINT, GetMaxNumEvents)(THIS) PURE;
 
     // Animation output registration
-    STDMETHOD(RegisterAnimationOutput)(THIS_ 
-        LPCSTR pName, 
-        D3DXMATRIX *pMatrix, 
-        D3DXVECTOR3 *pScale, 
-        D3DXQUATERNION *pRotation, 
+    STDMETHOD(RegisterAnimationOutput)(THIS_
+        LPCSTR pName,
+        D3DXMATRIX *pMatrix,
+        D3DXVECTOR3 *pScale,
+        D3DXQUATERNION *pRotation,
         D3DXVECTOR3 *pTranslation) PURE;
 
     // Animation set registration
@@ -762,11 +762,11 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
     STDMETHOD(GetEventDesc)(THIS_ D3DXEVENTHANDLE hEvent, LPD3DXEVENT_DESC pDesc) PURE;
 
     // Cloning
-    STDMETHOD(CloneAnimationController)(THIS_ 
-        UINT MaxNumAnimationOutputs, 
-        UINT MaxNumAnimationSets, 
-        UINT MaxNumTracks, 
-        UINT MaxNumEvents, 
+    STDMETHOD(CloneAnimationController)(THIS_
+        UINT MaxNumAnimationOutputs,
+        UINT MaxNumAnimationSets,
+        UINT MaxNumTracks,
+        UINT MaxNumEvents,
         LPD3DXANIMATIONCONTROLLER *ppAnimController) PURE;
 };
 
@@ -798,26 +798,26 @@ extern "C" {
 //		in the .X file. This is created with default max tracks and events
 //
 //----------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXLoadMeshHierarchyFromXA
     (
     LPCSTR Filename,
     DWORD MeshOptions,
     LPDIRECT3DDEVICE9 pD3DDevice,
     LPD3DXALLOCATEHIERARCHY pAlloc,
-    LPD3DXLOADUSERDATA pUserDataLoader, 
+    LPD3DXLOADUSERDATA pUserDataLoader,
     LPD3DXFRAME *ppFrameHierarchy,
     LPD3DXANIMATIONCONTROLLER *ppAnimController
     );
 
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXLoadMeshHierarchyFromXW
     (
     LPCWSTR Filename,
     DWORD MeshOptions,
     LPDIRECT3DDEVICE9 pD3DDevice,
     LPD3DXALLOCATEHIERARCHY pAlloc,
-    LPD3DXLOADUSERDATA pUserDataLoader, 
+    LPD3DXLOADUSERDATA pUserDataLoader,
     LPD3DXFRAME *ppFrameHierarchy,
     LPD3DXANIMATIONCONTROLLER *ppAnimController
     );
@@ -828,7 +828,7 @@ D3DXLoadMeshHierarchyFromXW
 #define D3DXLoadMeshHierarchyFromX D3DXLoadMeshHierarchyFromXA
 #endif
 
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXLoadMeshHierarchyFromXInMemory
     (
     LPCVOID Memory,
@@ -836,7 +836,7 @@ D3DXLoadMeshHierarchyFromXInMemory
     DWORD MeshOptions,
     LPDIRECT3DDEVICE9 pD3DDevice,
     LPD3DXALLOCATEHIERARCHY pAlloc,
-    LPD3DXLOADUSERDATA pUserDataLoader, 
+    LPD3DXLOADUSERDATA pUserDataLoader,
     LPD3DXFRAME *ppFrameHierarchy,
     LPD3DXANIMATIONCONTROLLER *ppAnimController
     );
@@ -861,22 +861,22 @@ D3DXLoadMeshHierarchyFromXInMemory
 //        data objects saved to .X file
 //
 //----------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXSaveMeshHierarchyToFileA
     (
     LPCSTR Filename,
     DWORD XFormat,
-    CONST D3DXFRAME *pFrameRoot, 
+    CONST D3DXFRAME *pFrameRoot,
     LPD3DXANIMATIONCONTROLLER pAnimcontroller,
     LPD3DXSAVEUSERDATA pUserDataSaver
     );
 
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXSaveMeshHierarchyToFileW
     (
     LPCWSTR Filename,
     DWORD XFormat,
-    CONST D3DXFRAME *pFrameRoot, 
+    CONST D3DXFRAME *pFrameRoot,
     LPD3DXANIMATIONCONTROLLER pAnimController,
     LPD3DXSAVEUSERDATA pUserDataSaver
     );
@@ -918,7 +918,7 @@ D3DXFrameDestroy
 //      Pointer to the child node
 //
 //----------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
 D3DXFrameAppendChild
     (
     LPD3DXFRAME pFrameParent,
@@ -937,7 +937,7 @@ D3DXFrameAppendChild
 //      Name of frame to find
 //
 //----------------------------------------------------------------------------
-LPD3DXFRAME WINAPI 
+LPD3DXFRAME WINAPI
 D3DXFrameFind
     (
     CONST D3DXFRAME *pFrameRoot,
@@ -967,7 +967,7 @@ D3DXFrameRegisterNamedMatrices
 //----------------------------------------------------------------------------
 // D3DXFrameNumNamedMatrices:
 // --------------------------
-// Counts number of frames in a subtree that have non-null names 
+// Counts number of frames in a subtree that have non-null names
 //
 // Parameters:
 //	pFrameRoot
@@ -999,9 +999,9 @@ D3DXFrameNumNamedMatrices
 HRESULT WINAPI
 D3DXFrameCalculateBoundingSphere
     (
-    CONST D3DXFRAME *pFrameRoot,       
-    LPD3DXVECTOR3 pObjectCenter,  
-    FLOAT *pObjectRadius          
+    CONST D3DXFRAME *pFrameRoot,
+    LPD3DXVECTOR3 pObjectCenter,
+    FLOAT *pObjectRadius
     );
 
 
@@ -1009,7 +1009,7 @@ D3DXFrameCalculateBoundingSphere
 // D3DXCreateKeyframedAnimationSet:
 // --------------------------------
 // This function creates a compressable keyframed animations set interface.
-// 
+//
 // Parameters:
 //  pName
 //      Name of the animation set
@@ -1025,27 +1025,27 @@ D3DXFrameCalculateBoundingSphere
 //      Array of callback keys
 //  ppAnimationSet
 //      Returns the animation set interface
-// 
+//
 //-----------------------------------------------------------------------------		
 HRESULT WINAPI
 D3DXCreateKeyframedAnimationSet
     (
-    LPCSTR pName,                               
+    LPCSTR pName,
     DOUBLE TicksPerSecond,
     D3DXPLAYBACK_TYPE Playback,
-    UINT NumAnimations,                         
-    UINT NumCallbackKeys,                       
-    CONST D3DXKEY_CALLBACK *pCallbackKeys,           
-    LPD3DXKEYFRAMEDANIMATIONSET *ppAnimationSet 
+    UINT NumAnimations,
+    UINT NumCallbackKeys,
+    CONST D3DXKEY_CALLBACK *pCallbackKeys,
+    LPD3DXKEYFRAMEDANIMATIONSET *ppAnimationSet
     );
 
 
 //----------------------------------------------------------------------------
 // D3DXCreateCompressedAnimationSet:
 // --------------------------------
-// This function creates a compressed animations set interface from 
+// This function creates a compressed animations set interface from
 // compressed data.
-// 
+//
 // Parameters:
 //  pName
 //      Name of the animation set
@@ -1061,18 +1061,18 @@ D3DXCreateKeyframedAnimationSet
 //      Array of callback keys
 //  ppAnimationSet
 //      Returns the animation set interface
-// 
+//
 //-----------------------------------------------------------------------------		
 HRESULT WINAPI
 D3DXCreateCompressedAnimationSet
     (
-    LPCSTR pName,                               
+    LPCSTR pName,
     DOUBLE TicksPerSecond,
     D3DXPLAYBACK_TYPE Playback,
-    LPD3DXBUFFER pCompressedData,                         
-    UINT NumCallbackKeys,                       
-    CONST D3DXKEY_CALLBACK *pCallbackKeys,           
-    LPD3DXCOMPRESSEDANIMATIONSET *ppAnimationSet 
+    LPD3DXBUFFER pCompressedData,
+    UINT NumCallbackKeys,
+    CONST D3DXKEY_CALLBACK *pCallbackKeys,
+    LPD3DXCOMPRESSEDANIMATIONSET *ppAnimationSet
     );
 
 
@@ -1097,10 +1097,10 @@ D3DXCreateCompressedAnimationSet
 HRESULT WINAPI
 D3DXCreateAnimationController
     (
-    UINT MaxNumMatrices,                       
-    UINT MaxNumAnimationSets,                  
-    UINT MaxNumTracks,                         
-    UINT MaxNumEvents,                         
+    UINT MaxNumMatrices,
+    UINT MaxNumAnimationSets,
+    UINT MaxNumTracks,
+    UINT MaxNumEvents,
     LPD3DXANIMATIONCONTROLLER *ppAnimController
     );
 
diff --git a/src/dep/include/DXSDK/include/d3dx9core.h b/src/dep/include/DXSDK/include/d3dx9core.h
index 3c3cee0..d0b3a52 100644
--- a/src/dep/include/DXSDK/include/d3dx9core.h
+++ b/src/dep/include/DXSDK/include/d3dx9core.h
@@ -17,9 +17,9 @@
 // D3DX_SDK_VERSION:
 // -----------------
 // This identifier is passed to D3DXCheckVersion in order to ensure that an
-// application was built against the correct header files and lib files. 
-// This number is incremented whenever a header (or other) change would 
-// require applications to be rebuilt. If the version doesn't match, 
+// application was built against the correct header files and lib files.
+// This number is incremented whenever a header (or other) change would
+// require applications to be rebuilt. If the version doesn't match,
 // D3DXCheckVersion will return FALSE. (The number itself has no meaning.)
 ///////////////////////////////////////////////////////////////////////////
 
@@ -52,7 +52,7 @@ extern "C" {
 #endif //__cplusplus
 
 BOOL WINAPI
-    D3DXDebugMute(BOOL Mute);  
+    D3DXDebugMute(BOOL Mute);
 
 #ifdef __cplusplus
 }
@@ -96,7 +96,7 @@ typedef interface ID3DXBuffer ID3DXBuffer;
 typedef interface ID3DXBuffer *LPD3DXBUFFER;
 
 // {8BA5FB08-5195-40e2-AC58-0D989C3A0102}
-DEFINE_GUID(IID_ID3DXBuffer, 
+DEFINE_GUID(IID_ID3DXBuffer,
 0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
 
 #undef INTERFACE
@@ -123,13 +123,13 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
 //   Specifies device state is not to be saved and restored in Begin/End.
 // D3DXSPRITE_DONOTMODIFY_RENDERSTATE
 //   Specifies device render state is not to be changed in Begin.  The device
-//   is assumed to be in a valid state to draw vertices containing POSITION0, 
+//   is assumed to be in a valid state to draw vertices containing POSITION0,
 //   TEXCOORD0, and COLOR0 data.
 // D3DXSPRITE_OBJECTSPACE
-//   The WORLD, VIEW, and PROJECTION transforms are NOT modified.  The 
-//   transforms currently set to the device are used to transform the sprites 
-//   when the batch is drawn (at Flush or End).  If this is not specified, 
-//   WORLD, VIEW, and PROJECTION transforms are modified so that sprites are 
+//   The WORLD, VIEW, and PROJECTION transforms are NOT modified.  The
+//   transforms currently set to the device are used to transform the sprites
+//   when the batch is drawn (at Flush or End).  If this is not specified,
+//   WORLD, VIEW, and PROJECTION transforms are modified so that sprites are
 //   drawn in screenspace coordinates.
 // D3DXSPRITE_BILLBOARD
 //   Rotates each sprite about its center so that it is facing the viewer.
@@ -141,10 +141,10 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
 //   drawing non-overlapping sprites of uniform depth.  For example, drawing
 //   screen-aligned text with ID3DXFont.
 // D3DXSPRITE_SORT_DEPTH_FRONTTOBACK
-//   Sprites are sorted by depth front-to-back prior to drawing.  This is 
+//   Sprites are sorted by depth front-to-back prior to drawing.  This is
 //   recommended when drawing opaque sprites of varying depths.
 // D3DXSPRITE_SORT_DEPTH_BACKTOFRONT
-//   Sprites are sorted by depth back-to-front prior to drawing.  This is 
+//   Sprites are sorted by depth back-to-front prior to drawing.  This is
 //   recommended when drawing transparent sprites of varying depths.
 //////////////////////////////////////////////////////////////////////////////
 
@@ -163,18 +163,18 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
 // ------------
 // This object intends to provide an easy way to drawing sprites using D3D.
 //
-// Begin - 
+// Begin -
 //    Prepares device for drawing sprites.
 //
 // Draw -
-//    Draws a sprite.  Before transformation, the sprite is the size of 
-//    SrcRect, with its top-left corner specified by Position.  The color 
+//    Draws a sprite.  Before transformation, the sprite is the size of
+//    SrcRect, with its top-left corner specified by Position.  The color
 //    and alpha channels are modulated by Color.
 //
 // Flush -
 //    Forces all batched sprites to submitted to the device.
 //
-// End - 
+// End -
 //    Restores device state to how it was when Begin was called.
 //
 // OnLostDevice, OnResetDevice -
@@ -188,7 +188,7 @@ typedef interface ID3DXSprite *LPD3DXSPRITE;
 
 
 // {BA0B762D-7D28-43ec-B9DC-2F84443B0614}
-DEFINE_GUID(IID_ID3DXSprite, 
+DEFINE_GUID(IID_ID3DXSprite,
 0xba0b762d, 0x7d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x6, 0x14);
 
 
@@ -225,9 +225,9 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
 extern "C" {
 #endif //__cplusplus
 
-HRESULT WINAPI 
-    D3DXCreateSprite( 
-        LPDIRECT3DDEVICE9   pDevice, 
+HRESULT WINAPI
+    D3DXCreateSprite(
+        LPDIRECT3DDEVICE9   pDevice,
         LPD3DXSPRITE*       ppSprite);
 
 #ifdef __cplusplus
@@ -239,7 +239,7 @@ HRESULT WINAPI
 //////////////////////////////////////////////////////////////////////////////
 // ID3DXFont:
 // ----------
-// Font objects contain the textures and resources needed to render a specific 
+// Font objects contain the textures and resources needed to render a specific
 // font on a specific device.
 //
 // GetGlyphData -
@@ -249,8 +249,8 @@ HRESULT WINAPI
 //    Preloads glyphs into the glyph cache textures.
 //
 // DrawText -
-//    Draws formatted text on a D3D device.  Some parameters are 
-//    surprisingly similar to those of GDI's DrawText function.  See GDI 
+//    Draws formatted text on a D3D device.  Some parameters are
+//    surprisingly similar to those of GDI's DrawText function.  See GDI
 //    documentation for a detailed description of these parameters.
 //    If pSprite is NULL, an internal sprite object will be used.
 //
@@ -304,7 +304,7 @@ typedef interface ID3DXFont *LPD3DXFONT;
 
 
 // {D79DBB70-5F21-4d36-BBC2-FF525C213CDC}
-DEFINE_GUID(IID_ID3DXFont, 
+DEFINE_GUID(IID_ID3DXFont,
 0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc);
 
 
@@ -372,9 +372,9 @@ extern "C" {
 #endif //__cplusplus
 
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateFontA(
-        LPDIRECT3DDEVICE9       pDevice,  
+        LPDIRECT3DDEVICE9       pDevice,
         INT                     Height,
         UINT                    Width,
         UINT                    Weight,
@@ -387,9 +387,9 @@ HRESULT WINAPI
         LPCSTR                  pFaceName,
         LPD3DXFONT*             ppFont);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateFontW(
-        LPDIRECT3DDEVICE9       pDevice,  
+        LPDIRECT3DDEVICE9       pDevice,
         INT                     Height,
         UINT                    Width,
         UINT                    Weight,
@@ -409,16 +409,16 @@ HRESULT WINAPI
 #endif
 
 
-HRESULT WINAPI 
-    D3DXCreateFontIndirectA( 
-        LPDIRECT3DDEVICE9       pDevice, 
-        CONST D3DXFONT_DESCA*   pDesc, 
+HRESULT WINAPI
+    D3DXCreateFontIndirectA(
+        LPDIRECT3DDEVICE9       pDevice,
+        CONST D3DXFONT_DESCA*   pDesc,
         LPD3DXFONT*             ppFont);
 
-HRESULT WINAPI 
-    D3DXCreateFontIndirectW( 
-        LPDIRECT3DDEVICE9       pDevice, 
-        CONST D3DXFONT_DESCW*   pDesc, 
+HRESULT WINAPI
+    D3DXCreateFontIndirectW(
+        LPDIRECT3DDEVICE9       pDevice,
+        CONST D3DXFONT_DESCW*   pDesc,
         LPD3DXFONT*             ppFont);
 
 #ifdef UNICODE
@@ -437,14 +437,14 @@ HRESULT WINAPI
 ///////////////////////////////////////////////////////////////////////////
 // ID3DXRenderToSurface:
 // ---------------------
-// This object abstracts rendering to surfaces.  These surfaces do not 
+// This object abstracts rendering to surfaces.  These surfaces do not
 // necessarily need to be render targets.  If they are not, a compatible
 // render target is used, and the result copied into surface at end scene.
 //
 // BeginScene, EndScene -
 //    Call BeginScene() and EndScene() at the beginning and ending of your
-//    scene.  These calls will setup and restore render targets, viewports, 
-//    etc.. 
+//    scene.  These calls will setup and restore render targets, viewports,
+//    etc..
 //
 // OnLostDevice, OnResetDevice -
 //    Call OnLostDevice() on this object before calling Reset() on the
@@ -468,7 +468,7 @@ typedef interface ID3DXRenderToSurface *LPD3DXRENDERTOSURFACE;
 
 
 // {6985F346-2C3D-43b3-BE8B-DAAE8A03D894}
-DEFINE_GUID(IID_ID3DXRenderToSurface, 
+DEFINE_GUID(IID_ID3DXRenderToSurface,
 0x6985f346, 0x2c3d, 0x43b3, 0xbe, 0x8b, 0xda, 0xae, 0x8a, 0x3, 0xd8, 0x94);
 
 
@@ -517,8 +517,8 @@ HRESULT WINAPI
 ///////////////////////////////////////////////////////////////////////////
 // ID3DXRenderToEnvMap:
 // --------------------
-// This object abstracts rendering to environment maps.  These surfaces 
-// do not necessarily need to be render targets.  If they are not, a 
+// This object abstracts rendering to environment maps.  These surfaces
+// do not necessarily need to be render targets.  If they are not, a
 // compatible render target is used, and the result copied into the
 // environment map at end scene.
 //
@@ -528,8 +528,8 @@ HRESULT WINAPI
 //    the resulting environment map.
 //
 // Face -
-//    Call this function to initiate the drawing of each face.  For each 
-//    environment map, you will call this six times.. once for each face 
+//    Call this function to initiate the drawing of each face.  For each
+//    environment map, you will call this six times.. once for each face
 //    in D3DCUBEMAP_FACES.
 //
 // End -
@@ -558,7 +558,7 @@ typedef interface ID3DXRenderToEnvMap *LPD3DXRenderToEnvMap;
 
 
 // {313F1B4B-C7B0-4fa2-9D9D-8D380B64385E}
-DEFINE_GUID(IID_ID3DXRenderToEnvMap, 
+DEFINE_GUID(IID_ID3DXRenderToEnvMap,
 0x313f1b4b, 0xc7b0, 0x4fa2, 0x9d, 0x9d, 0x8d, 0x38, 0xb, 0x64, 0x38, 0x5e);
 
 
@@ -576,17 +576,17 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
     STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC* pDesc) PURE;
 
-    STDMETHOD(BeginCube)(THIS_ 
+    STDMETHOD(BeginCube)(THIS_
         LPDIRECT3DCUBETEXTURE9 pCubeTex) PURE;
 
     STDMETHOD(BeginSphere)(THIS_
         LPDIRECT3DTEXTURE9 pTex) PURE;
 
-    STDMETHOD(BeginHemisphere)(THIS_ 
+    STDMETHOD(BeginHemisphere)(THIS_
         LPDIRECT3DTEXTURE9 pTexZPos,
         LPDIRECT3DTEXTURE9 pTexZNeg) PURE;
 
-    STDMETHOD(BeginParabolic)(THIS_ 
+    STDMETHOD(BeginParabolic)(THIS_
         LPDIRECT3DTEXTURE9 pTexZPos,
         LPDIRECT3DTEXTURE9 pTexZNeg) PURE;
 
@@ -623,44 +623,44 @@ HRESULT WINAPI
 // ------------
 // This object intends to provide an easy way to draw lines using D3D.
 //
-// Begin - 
+// Begin -
 //    Prepares device for drawing lines
 //
 // Draw -
 //    Draws a line strip in screen-space.
-//    Input is in the form of a array defining points on the line strip. of D3DXVECTOR2 
+//    Input is in the form of a array defining points on the line strip. of D3DXVECTOR2
 //
 // DrawTransform -
 //    Draws a line in screen-space with a specified input transformation matrix.
 //
-// End - 
+// End -
 //     Restores device state to how it was when Begin was called.
 //
-// SetPattern - 
+// SetPattern -
 //     Applies a stipple pattern to the line.  Input is one 32-bit
 //     DWORD which describes the stipple pattern. 1 is opaque, 0 is
 //     transparent.
 //
-// SetPatternScale - 
+// SetPatternScale -
 //     Stretches the stipple pattern in the u direction.  Input is one
 //     floating-point value.  0.0f is no scaling, whereas 1.0f doubles
 //     the length of the stipple pattern.
 //
-// SetWidth - 
+// SetWidth -
 //     Specifies the thickness of the line in the v direction.  Input is
 //     one floating-point value.
 //
-// SetAntialias - 
+// SetAntialias -
 //     Toggles line antialiasing.  Input is a BOOL.
 //     TRUE  = Antialiasing on.
 //     FALSE = Antialiasing off.
 //
-// SetGLLines - 
+// SetGLLines -
 //     Toggles non-antialiased OpenGL line emulation.  Input is a BOOL.
 //     TRUE  = OpenGL line emulation on.
 //     FALSE = OpenGL line emulation off.
 //
-// OpenGL line:     Regular line:  
+// OpenGL line:     Regular line:
 //   *\                *\
 //   | \              /  \
 //   |  \            *\   \
@@ -683,7 +683,7 @@ typedef interface ID3DXLine *LPD3DXLINE;
 
 
 // {D379BA7F-9042-4ac4-9F5E-58192A4C6BD8}
-DEFINE_GUID(IID_ID3DXLine, 
+DEFINE_GUID(IID_ID3DXLine,
 0xd379ba7f, 0x9042, 0x4ac4, 0x9f, 0x5e, 0x58, 0x19, 0x2a, 0x4c, 0x6b, 0xd8);
 
 #undef INTERFACE
@@ -705,7 +705,7 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown)
         DWORD dwVertexListCount, D3DCOLOR Color) PURE;
 
     STDMETHOD(DrawTransform)(THIS_ CONST D3DXVECTOR3 *pVertexList,
-        DWORD dwVertexListCount, CONST D3DXMATRIX* pTransform, 
+        DWORD dwVertexListCount, CONST D3DXMATRIX* pTransform,
         D3DCOLOR Color) PURE;
 
     STDMETHOD(SetPattern)(THIS_ DWORD dwPattern) PURE;
diff --git a/src/dep/include/DXSDK/include/d3dx9effect.h b/src/dep/include/DXSDK/include/d3dx9effect.h
index 6af6d47..cf330d5 100644
--- a/src/dep/include/DXSDK/include/d3dx9effect.h
+++ b/src/dep/include/DXSDK/include/d3dx9effect.h
@@ -29,7 +29,7 @@
 //   This flag is used as a parameter to the D3DXCreateEffect family of APIs.
 //   When this flag is specified, the effect will be non-cloneable and will not
 //   contain any shader binary data.
-//   Furthermore, GetPassDesc will not return shader function pointers. 
+//   Furthermore, GetPassDesc will not return shader function pointers.
 //   Setting this flag reduces effect memory usage by about 50%.
 //----------------------------------------------------------------------------
 
@@ -139,7 +139,7 @@ typedef interface ID3DXEffectPool ID3DXEffectPool;
 typedef interface ID3DXEffectPool *LPD3DXEFFECTPOOL;
 
 // {9537AB04-3250-412e-8213-FCD2F8677933}
-DEFINE_GUID(IID_ID3DXEffectPool, 
+DEFINE_GUID(IID_ID3DXEffectPool,
 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33);
 
 
@@ -165,7 +165,7 @@ typedef interface ID3DXBaseEffect ID3DXBaseEffect;
 typedef interface ID3DXBaseEffect *LPD3DXBASEEFFECT;
 
 // {017C18AC-103F-4417-8C51-6BF6EF1E56BE}
-DEFINE_GUID(IID_ID3DXBaseEffect, 
+DEFINE_GUID(IID_ID3DXBaseEffect,
 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe);
 
 
@@ -240,7 +240,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
 
     //Set Range of an Array to pass to device
     //Useful for sending only a subrange of an array down to the device
-    STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; 
+    STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
 
 };
 
@@ -248,7 +248,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
 //----------------------------------------------------------------------------
 // ID3DXEffectStateManager:
 // ------------------------
-// This is a user implemented interface that can be used to manage device 
+// This is a user implemented interface that can be used to manage device
 // state changes made by an Effect.
 //----------------------------------------------------------------------------
 
@@ -256,7 +256,7 @@ typedef interface ID3DXEffectStateManager ID3DXEffectStateManager;
 typedef interface ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER;
 
 // {79AAB587-6DBC-4fa7-82DE-37FA1781C5CE}
-DEFINE_GUID(IID_ID3DXEffectStateManager, 
+DEFINE_GUID(IID_ID3DXEffectStateManager,
 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce);
 
 #undef INTERFACE
@@ -271,11 +271,11 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
     STDMETHOD_(ULONG, AddRef)(THIS) PURE;
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
-    // The following methods are called by the Effect when it wants to make 
+    // The following methods are called by the Effect when it wants to make
     // the corresponding device call.  Note that:
-    // 1. Users manage the state and are therefore responsible for making the 
-    //    the corresponding device calls themselves inside their callbacks.  
-    // 2. Effects pay attention to the return values of the callbacks, and so 
+    // 1. Users manage the state and are therefore responsible for making the
+    //    the corresponding device calls themselves inside their callbacks.
+    // 2. Effects pay attention to the return values of the callbacks, and so
     //    users must pay attention to what they return in their callbacks.
 
     STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) PURE;
@@ -307,7 +307,7 @@ typedef interface ID3DXEffect ID3DXEffect;
 typedef interface ID3DXEffect *LPD3DXEFFECT;
 
 // {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5}
-DEFINE_GUID(IID_ID3DXEffect, 
+DEFINE_GUID(IID_ID3DXEffect,
 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
 
 #undef INTERFACE
@@ -381,10 +381,10 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
 
 	//Set Range of an Array to pass to device
 	//Usefull for sending only a subrange of an array down to the device
-	STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; 
+	STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
 	// ID3DXBaseEffect
-    
-    
+
+
     // Pool
     STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* ppPool) PURE;
 
@@ -425,7 +425,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
 
     // Cloning
     STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect) PURE;
-    
+
     // Fast path for setting variables directly in ID3DXEffect
     STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes) PURE;
 };
@@ -439,7 +439,7 @@ typedef interface ID3DXEffectCompiler ID3DXEffectCompiler;
 typedef interface ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
 
 // {51B8A949-1A31-47e6-BEA0-4B30DB53F1E0}
-DEFINE_GUID(IID_ID3DXEffectCompiler, 
+DEFINE_GUID(IID_ID3DXEffectCompiler,
 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0);
 
 
@@ -511,10 +511,10 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
     STDMETHOD(GetTexture)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DBASETEXTURE9 *ppTexture) PURE;
     STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE;
     STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE;
-    
+
 	//Set Range of an Array to pass to device
 	//Usefull for sending only a subrange of an array down to the device
-	STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; 
+	STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
 	// ID3DXBaseEffect
 
     // Parameter sharing, specialization, and information
@@ -681,7 +681,7 @@ HRESULT WINAPI
         LPCSTR                          pSrcFile,
         CONST D3DXMACRO*                pDefines,
         LPD3DXINCLUDE                   pInclude,
-        LPCSTR                          pSkipConstants, 
+        LPCSTR                          pSkipConstants,
         DWORD                           Flags,
         LPD3DXEFFECTPOOL                pPool,
         LPD3DXEFFECT*                   ppEffect,
@@ -693,7 +693,7 @@ HRESULT WINAPI
         LPCWSTR                         pSrcFile,
         CONST D3DXMACRO*                pDefines,
         LPD3DXINCLUDE                   pInclude,
-        LPCSTR                          pSkipConstants, 
+        LPCSTR                          pSkipConstants,
         DWORD                           Flags,
         LPD3DXEFFECTPOOL                pPool,
         LPD3DXEFFECT*                   ppEffect,
@@ -713,7 +713,7 @@ HRESULT WINAPI
         LPCSTR                          pSrcResource,
         CONST D3DXMACRO*                pDefines,
         LPD3DXINCLUDE                   pInclude,
-        LPCSTR                          pSkipConstants, 
+        LPCSTR                          pSkipConstants,
         DWORD                           Flags,
         LPD3DXEFFECTPOOL                pPool,
         LPD3DXEFFECT*                   ppEffect,
@@ -726,7 +726,7 @@ HRESULT WINAPI
         LPCWSTR                         pSrcResource,
         CONST D3DXMACRO*                pDefines,
         LPD3DXINCLUDE                   pInclude,
-        LPCSTR                          pSkipConstants, 
+        LPCSTR                          pSkipConstants,
         DWORD                           Flags,
         LPD3DXEFFECTPOOL                pPool,
         LPD3DXEFFECT*                   ppEffect,
@@ -746,7 +746,7 @@ HRESULT WINAPI
         UINT                            SrcDataLen,
         CONST D3DXMACRO*                pDefines,
         LPD3DXINCLUDE                   pInclude,
-        LPCSTR                          pSkipConstants, 
+        LPCSTR                          pSkipConstants,
         DWORD                           Flags,
         LPD3DXEFFECTPOOL                pPool,
         LPD3DXEFFECT*                   ppEffect,
@@ -854,12 +854,12 @@ HRESULT WINAPI
 // Parameters:
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXDisassembleEffect(
-        LPD3DXEFFECT pEffect, 
-        BOOL EnableColorCode, 
+        LPD3DXEFFECT pEffect,
+        BOOL EnableColorCode,
         LPD3DXBUFFER *ppDisassembly);
-        
+
 
 
 #ifdef __cplusplus
diff --git a/src/dep/include/DXSDK/include/d3dx9math.h b/src/dep/include/DXSDK/include/d3dx9math.h
index 8f9bbc9..3e766ce 100644
--- a/src/dep/include/DXSDK/include/d3dx9math.h
+++ b/src/dep/include/DXSDK/include/d3dx9math.h
@@ -366,7 +366,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
 // This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
 // It aligns matrices on the stack and on the heap or in global scope.
 // It does this using __declspec(align(16)) which works on VC7 and on VC 6
-// with the processor pack. Unfortunately there is no way to detect the 
+// with the processor pack. Unfortunately there is no way to detect the
 // latter so this is turned on only on VC7. On other compilers this is the
 // the same as D3DXMATRIX.
 //
@@ -393,9 +393,9 @@ typedef struct _D3DXMATRIXA16 : public D3DXMATRIX
     void* operator new[] ( size_t );
 
     // delete operators
-    void operator delete   ( void* );   // These are NOT virtual; Do not 
+    void operator delete   ( void* );   // These are NOT virtual; Do not
     void operator delete[] ( void* );   // cast to D3DXMATRIX and delete.
-    
+
     // assignment operators
     _D3DXMATRIXA16& operator = ( CONST D3DXMATRIX& );
 
@@ -669,7 +669,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord
 // Transform (x, y, 0, 0) by matrix.
 D3DXVECTOR2* WINAPI D3DXVec2TransformNormal
     ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, CONST D3DXMATRIX *pM );
-     
+
 // Transform Array (x, y, 0, 1) by matrix.
 D3DXVECTOR4* WINAPI D3DXVec2TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n);
@@ -681,8 +681,8 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray
 // Transform Array (x, y, 0, 0) by matrix.
 D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray
     ( D3DXVECTOR2 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
-    
-    
+
+
 
 #ifdef __cplusplus
 }
@@ -761,14 +761,14 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
 D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
 
-// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a 
-// non-affine matrix, the matrix you pass to this function should be the 
+// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a
+// non-affine matrix, the matrix you pass to this function should be the
 // transpose of the inverse of the matrix you would use to transform a coord.
 D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
-    
-    
-// Transform Array (x, y, z, 1) by matrix. 
+
+
+// Transform Array (x, y, z, 1) by matrix.
 D3DXVECTOR4* WINAPI D3DXVec3TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
 
@@ -776,8 +776,8 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray
 D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray
     ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
 
-// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a 
-// non-affine matrix, the matrix you pass to this function should be the 
+// Transform (x, y, z, 0) by matrix.  If you transforming a normal by a
+// non-affine matrix, the matrix you pass to this function should be the
 // transpose of the inverse of the matrix you would use to transform a coord.
 D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray
     ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@@ -791,7 +791,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Project
 D3DXVECTOR3* WINAPI D3DXVec3Unproject
     ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DVIEWPORT9 *pViewport,
       CONST D3DXMATRIX *pProjection, CONST D3DXMATRIX *pView, CONST D3DXMATRIX *pWorld);
-      
+
 // Project vector Array from object space into screen space
 D3DXVECTOR3* WINAPI D3DXVec3ProjectArray
     ( D3DXVECTOR3 *pOut, UINT OutStride,CONST D3DXVECTOR3 *pV, UINT VStride,CONST D3DVIEWPORT9 *pViewport,
@@ -878,7 +878,7 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric
 // Transform vector by matrix.
 D3DXVECTOR4* WINAPI D3DXVec4Transform
     ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, CONST D3DXMATRIX *pM );
-    
+
 // Transform vector array by matrix.
 D3DXVECTOR4* WINAPI D3DXVec4TransformArray
     ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR4 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@@ -910,7 +910,7 @@ FLOAT WINAPI D3DXMatrixDeterminant
     ( CONST D3DXMATRIX *pM );
 
 HRESULT WINAPI D3DXMatrixDecompose
-    ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation, 
+    ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
 	  D3DXVECTOR3 *pOutTranslation, CONST D3DXMATRIX *pM );
 
 D3DXMATRIX* WINAPI D3DXMatrixTranspose
@@ -975,9 +975,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation
 // Build 2D transformation matrix in XY plane.  NULL arguments are treated as identity.
 // Mout = Msc-1 * Msr-1 * Ms * Msr * Msc * Mrc-1 * Mr * Mrc * Mt
 D3DXMATRIX* WINAPI D3DXMatrixTransformation2D
-    ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter, 
-      FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling, 
-      CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, 
+    ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
+      FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
+      CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
       CONST D3DXVECTOR2* pTranslation);
 
 // Build affine transformation matrix.  NULL arguments are treated as identity.
@@ -989,7 +989,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation
 // Build 2D affine transformation matrix in XY plane.  NULL arguments are treated as identity.
 // Mout = Ms * Mrc-1 * Mr * Mrc * Mt
 D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D
-    ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter, 
+    ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
       FLOAT Rotation, CONST D3DXVECTOR2* pTranslation);
 
 // Build a lookat matrix. (right-handed)
@@ -1133,7 +1133,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
 // if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
 D3DXQUATERNION* WINAPI D3DXQuaternionExp
     ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
-      
+
 // Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
 // Expects unit quaternions.
 D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@@ -1148,11 +1148,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
       CONST D3DXQUATERNION *pC, FLOAT t );
 
 // Setup control points for spherical quadrangle interpolation
-// from Q1 to Q2.  The control points are chosen in such a way 
+// from Q1 to Q2.  The control points are chosen in such a way
 // to ensure the continuity of tangents with adjacent segments.
 void WINAPI D3DXQuaternionSquadSetup
     ( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
-      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1, 
+      CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
       CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
 
 // Barycentric interpolation.
@@ -1216,7 +1216,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints
 // M should be the inverse transpose of the transformation desired.
 D3DXPLANE* WINAPI D3DXPlaneTransform
     ( D3DXPLANE *pOut, CONST D3DXPLANE *pP, CONST D3DXMATRIX *pM );
-    
+
 // Transform an array of planes by a matrix.  The vectors (a,b,c) must be normal.
 // M should be the inverse transpose of the transformation desired.
 D3DXPLANE* WINAPI D3DXPlaneTransformArray
@@ -1286,7 +1286,7 @@ extern "C" {
 // Calculate Fresnel term given the cosine of theta (likely obtained by
 // taking the dot of two normals), and the refraction index of the material.
 FLOAT WINAPI D3DXFresnelTerm
-    (FLOAT CosTheta, FLOAT RefractionIndex);     
+    (FLOAT CosTheta, FLOAT RefractionIndex);
 
 #ifdef __cplusplus
 }
@@ -1304,7 +1304,7 @@ typedef interface ID3DXMatrixStack ID3DXMatrixStack;
 typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK;
 
 // {C7885BA7-F990-4fe7-922D-8515E477DD85}
-DEFINE_GUID(IID_ID3DXMatrixStack, 
+DEFINE_GUID(IID_ID3DXMatrixStack,
 0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85);
 
 
@@ -1399,9 +1399,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
 extern "C" {
 #endif
 
-HRESULT WINAPI 
-    D3DXCreateMatrixStack( 
-        DWORD               Flags, 
+HRESULT WINAPI
+    D3DXCreateMatrixStack(
+        DWORD               Flags,
         LPD3DXMATRIXSTACK*  ppStack);
 
 #ifdef __cplusplus
@@ -1414,7 +1414,7 @@ HRESULT WINAPI
 //
 // NOTE:
 //  * Most of these functions can take the same object as in and out parameters.
-//    The exceptions are the rotation functions.  
+//    The exceptions are the rotation functions.
 //
 //  * Out parameters are typically also returned as return values, so that
 //    the output of one function may be used as a parameter to another.
@@ -1455,7 +1455,7 @@ extern "C" {
 
 FLOAT* WINAPI D3DXSHEvalDirection
     (  FLOAT *pOut, UINT Order, CONST D3DXVECTOR3 *pDir );
-    
+
 //============================================================================
 //
 //  D3DXSHRotate:
@@ -1478,7 +1478,7 @@ FLOAT* WINAPI D3DXSHEvalDirection
 
 FLOAT* WINAPI D3DXSHRotate
     ( FLOAT *pOut, UINT Order, CONST D3DXMATRIX *pMatrix, CONST FLOAT *pIn );
-    
+
 //============================================================================
 //
 //  D3DXSHRotateZ:
@@ -1501,7 +1501,7 @@ FLOAT* WINAPI D3DXSHRotate
 
 FLOAT* WINAPI D3DXSHRotateZ
     ( FLOAT *pOut, UINT Order, FLOAT Angle, CONST FLOAT *pIn );
-    
+
 //============================================================================
 //
 //  D3DXSHAdd:
@@ -1545,7 +1545,7 @@ FLOAT* WINAPI D3DXSHAdd
 
 FLOAT* WINAPI D3DXSHScale
     ( FLOAT *pOut, UINT Order, CONST FLOAT *pIn, CONST FLOAT Scale );
-    
+
 //============================================================================
 //
 //  D3DXSHDot:
@@ -1575,7 +1575,7 @@ FLOAT WINAPI D3DXSHDot
 //
 //  D3DXSHEvalDirectionalLight:
 //  --------------------
-//  Evaluates a directional light and returns spectral SH data.  The output 
+//  Evaluates a directional light and returns spectral SH data.  The output
 //  vector is computed so that if the intensity of R/G/B is unit the resulting
 //  exit radiance of a point directly under the light on a diffuse object with
 //  an albedo of 1 would be 1.0.  This will compute 3 spectral samples, pROut
@@ -1597,12 +1597,12 @@ FLOAT WINAPI D3DXSHDot
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
 HRESULT WINAPI D3DXSHEvalDirectionalLight
-    ( UINT Order, CONST D3DXVECTOR3 *pDir, 
+    ( UINT Order, CONST D3DXVECTOR3 *pDir,
       FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
       FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
 
@@ -1610,10 +1610,10 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
 //
 //  D3DXSHEvalSphericalLight:
 //  --------------------
-//  Evaluates a spherical light and returns spectral SH data.  There is no 
+//  Evaluates a spherical light and returns spectral SH data.  There is no
 //  normalization of the intensity of the light like there is for directional
-//  lights, care has to be taken when specifiying the intensities.  This will 
-//  compute 3 spectral samples, pROut has to be specified, while pGout and 
+//  lights, care has to be taken when specifiying the intensities.  This will
+//  compute 3 spectral samples, pROut has to be specified, while pGout and
 //  pBout are optional.
 //
 //  Parameters:
@@ -1634,7 +1634,7 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
@@ -1672,7 +1672,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight
 //   pGOut
 //      Output SH vector for Green (optional.)
 //   pBOut
-//      Output SH vector for Blue (optional.)        
+//      Output SH vector for Blue (optional.)
 //
 //============================================================================
 
@@ -1680,7 +1680,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
     ( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT Radius,
       FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
       FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
-      
+
 //============================================================================
 //
 //  D3DXSHEvalHemisphereLight:
@@ -1692,7 +1692,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
 //  is normalized so that a point on a perfectly diffuse surface with no
 //  shadowing and a normal pointed in the direction pDir would result in exit
 //  radiance with a value of 1 if the top color was white and the bottom color
-//  was black.  This is a very simple model where Top represents the intensity 
+//  was black.  This is a very simple model where Top represents the intensity
 //  of the "sky" and Bottom represents the intensity of the "ground".
 //
 //  Parameters:
@@ -1709,7 +1709,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
 //   pGOut
 //      Output SH vector for Green
 //   pBOut
-//      Output SH vector for Blue        
+//      Output SH vector for Blue
 //
 //============================================================================
 
@@ -1739,7 +1739,7 @@ HRESULT WINAPI D3DXSHEvalHemisphereLight
 //   pGOut
 //      Output SH vector for Green
 //   pBOut
-//      Output SH vector for Blue        
+//      Output SH vector for Blue
 //
 //============================================================================
 
diff --git a/src/dep/include/DXSDK/include/d3dx9mesh.h b/src/dep/include/DXSDK/include/d3dx9mesh.h
index 2f81eaf..52bc7a2 100644
--- a/src/dep/include/DXSDK/include/d3dx9mesh.h
+++ b/src/dep/include/DXSDK/include/d3dx9mesh.h
@@ -13,27 +13,27 @@
 #define __D3DX9MESH_H__
 
 // {7ED943DD-52E8-40b5-A8D8-76685C406330}
-DEFINE_GUID(IID_ID3DXBaseMesh, 
+DEFINE_GUID(IID_ID3DXBaseMesh,
 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30);
 
 // {4020E5C2-1403-4929-883F-E2E849FAC195}
-DEFINE_GUID(IID_ID3DXMesh, 
+DEFINE_GUID(IID_ID3DXMesh,
 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95);
 
 // {8875769A-D579-4088-AAEB-534D1AD84E96}
-DEFINE_GUID(IID_ID3DXPMesh, 
+DEFINE_GUID(IID_ID3DXPMesh,
 0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96);
 
 // {667EA4C7-F1CD-4386-B523-7C0290B83CC5}
-DEFINE_GUID(IID_ID3DXSPMesh, 
+DEFINE_GUID(IID_ID3DXSPMesh,
 0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5);
 
 // {11EAA540-F9A6-4d49-AE6A-E19221F70CC4}
-DEFINE_GUID(IID_ID3DXSkinInfo, 
+DEFINE_GUID(IID_ID3DXSkinInfo,
 0x11eaa540, 0xf9a6, 0x4d49, 0xae, 0x6a, 0xe1, 0x92, 0x21, 0xf7, 0xc, 0xc4);
 
 // {3CE6CC22-DBF2-44f4-894D-F9C34A337139}
-DEFINE_GUID(IID_ID3DXPatchMesh, 
+DEFINE_GUID(IID_ID3DXPatchMesh,
 0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39);
 
 //patch mesh can be quads or tris
@@ -49,11 +49,11 @@ typedef enum _D3DXPATCHMESHTYPE {
 enum _D3DXMESH {
     D3DXMESH_32BIT                  = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices.
     D3DXMESH_DONOTCLIP              = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB.
-    D3DXMESH_POINTS                 = 0x004, // Use D3DUSAGE_POINTS for VB & IB. 
-    D3DXMESH_RTPATCHES              = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB. 
-    D3DXMESH_NPATCHES               = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB. 
+    D3DXMESH_POINTS                 = 0x004, // Use D3DUSAGE_POINTS for VB & IB.
+    D3DXMESH_RTPATCHES              = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB.
+    D3DXMESH_NPATCHES               = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB.
     D3DXMESH_VB_SYSTEMMEM           = 0x010, // Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER
-    D3DXMESH_VB_MANAGED             = 0x020, // Use D3DPOOL_MANAGED for VB. 
+    D3DXMESH_VB_MANAGED             = 0x020, // Use D3DPOOL_MANAGED for VB.
     D3DXMESH_VB_WRITEONLY           = 0x040, // Use D3DUSAGE_WRITEONLY for VB.
     D3DXMESH_VB_DYNAMIC             = 0x080, // Use D3DUSAGE_DYNAMIC for VB.
     D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, // Use D3DUSAGE_SOFTWAREPROCESSING for VB.
@@ -160,7 +160,7 @@ typedef D3DXMATERIAL *LPD3DXMATERIAL;
 
 typedef enum _D3DXEFFECTDEFAULTTYPE
 {
-    D3DXEDT_STRING = 0x1,       // pValue points to a null terminated ASCII string 
+    D3DXEDT_STRING = 0x1,       // pValue points to a null terminated ASCII string
     D3DXEDT_FLOATS = 0x2,       // pValue points to an array of floats - number of floats is NumBytes / sizeof(float)
     D3DXEDT_DWORD  = 0x3,       // pValue points to a DWORD
 
@@ -198,7 +198,7 @@ enum _D3DXWELDEPSILONSFLAGS
 {
     D3DXWELDEPSILONS_WELDALL             = 0x1,  // weld all vertices marked by adjacency as being overlapping
 
-    D3DXWELDEPSILONS_WELDPARTIALMATCHES  = 0x2,  // if a given vertex component is within epsilon, modify partial matched 
+    D3DXWELDEPSILONS_WELDPARTIALMATCHES  = 0x2,  // if a given vertex component is within epsilon, modify partial matched
                                                     // vertices so that both components identical AND if all components "equal"
                                                     // remove one of the vertices
     D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4,  // instructs weld to only allow modifications to vertices and not removal
@@ -248,9 +248,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
     STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE;
@@ -288,9 +288,9 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
     STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE;
@@ -310,10 +310,10 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
     // ID3DXMesh
     STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE;
     STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
-    STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, 
-                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,  
+    STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
+                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
                      LPD3DXMESH* ppOptMesh) PURE;
-    STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut, 
+    STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
                      DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap) PURE;
     STDMETHOD(SetAttributeTable)(THIS_ CONST D3DXATTRIBUTERANGE *pAttribTable, DWORD cAttribTableSize) PURE;
 };
@@ -338,9 +338,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD_(DWORD, GetNumBytesPerVertex)(THIS) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE;
@@ -358,9 +358,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
 
     // ID3DXPMesh
-    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXPMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMesh)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, LPD3DXPMESH* ppCloneMesh) PURE;
     STDMETHOD(SetNumFaces)(THIS_ DWORD Faces) PURE;
     STDMETHOD(SetNumVertices)(THIS_ DWORD Vertices) PURE;
@@ -370,8 +370,8 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
     STDMETHOD_(DWORD, GetMinVertices)(THIS) PURE;
     STDMETHOD(Save)(THIS_ IStream *pStream, CONST D3DXMATERIAL* pMaterials, CONST D3DXEFFECTINSTANCE* pEffectInstances, DWORD NumMaterials) PURE;
 
-    STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut, 
-                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,  
+    STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut,
+                     DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
                      LPD3DXMESH* ppOptMesh) PURE;
 
     STDMETHOD(OptimizeBaseLOD)(THIS_ DWORD Flags, DWORD* pFaceRemap) PURE;
@@ -403,13 +403,13 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
     STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
     STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
-    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(CloneMesh)(THIS_ DWORD Options, 
+    STDMETHOD(CloneMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
                 DWORD FVF, LPDIRECT3DDEVICE9 pD3DDevice, DWORD *pVertexRemapOut, FLOAT *pErrorsByFace, LPD3DXPMESH* ppCloneMesh) PURE;
-    STDMETHOD(ClonePMesh)(THIS_ DWORD Options, 
+    STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
                 CONST D3DVERTEXELEMENT9 *pDeclaration, LPDIRECT3DDEVICE9 pD3DDevice, DWORD *pVertexRemapOut, FLOAT *pErrorsbyFace, LPD3DXPMESH* ppCloneMesh) PURE;
     STDMETHOD(ReduceFaces)(THIS_ DWORD Faces) PURE;
     STDMETHOD(ReduceVertices)(THIS_ DWORD Vertices) PURE;
@@ -431,7 +431,7 @@ enum _D3DXMESHOPT {
     D3DXMESHOPT_IGNOREVERTS   = 0x10000000,  // optimize faces only, don't touch vertices
     D3DXMESHOPT_DONOTSPLIT    = 0x20000000,  // do not split vertices shared between attribute groups when attribute sorting
     D3DXMESHOPT_DEVICEINDEPENDENT = 0x00400000,  // Only affects VCache.  uses a static known good cache size for all cards
-                            
+
     // D3DXMESHOPT_SHAREVB has been removed, please use D3DXMESH_VB_SHARE instead
 
 };
@@ -484,7 +484,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
     STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *ppDevice) PURE;
     STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO PatchInfo) PURE;
 
-    // Control mesh access    
+    // Control mesh access
     STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* ppVB) PURE;
     STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* ppIB) PURE;
     STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID *ppData) PURE;
@@ -497,18 +497,18 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
     // This function returns the size of the tessellated mesh given a tessellation level.
     // This assumes uniform tessellation. For adaptive tessellation the Adaptive parameter must
     // be set to TRUE and TessellationLevel should be the max tessellation.
-    // This will result in the max mesh size necessary for adaptive tessellation.    
+    // This will result in the max mesh size necessary for adaptive tessellation.
     STDMETHOD(GetTessSize)(THIS_ FLOAT fTessLevel,DWORD Adaptive, DWORD *NumTriangles,DWORD *NumVertices) PURE;
-    
+
     //GenerateAdjacency determines which patches are adjacent with provided tolerance
     //this information is used internally to optimize tessellation
     STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Tolerance) PURE;
-    
+
     //CloneMesh Creates a new patchmesh with the specified decl, and converts the vertex buffer
     //to the new decl. Entries in the new decl which are new are set to 0. If the current mesh
     //has adjacency, the new mesh will also have adjacency
     STDMETHOD(CloneMesh)(THIS_ DWORD Options, CONST D3DVERTEXELEMENT9 *pDecl, LPD3DXPATCHMESH *pMesh) PURE;
-    
+
     // Optimizes the patchmesh for efficient tessellation. This function is designed
     // to perform one time optimization for patch meshes that need to be tessellated
     // repeatedly by calling the Tessellate() method. The optimization performed is
@@ -532,8 +532,8 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
                                 D3DTEXTUREFILTERTYPE *MipFilter,
                                 D3DTEXTUREADDRESS *Wrap,
                                 DWORD *dwLODBias) PURE;
-        
-    // Performs the uniform tessellation based on the tessellation level. 
+
+    // Performs the uniform tessellation based on the tessellation level.
     // This function will perform more efficiently if the patch mesh has been optimized using the Optimize() call.
     STDMETHOD(Tessellate)(THIS_ FLOAT fTessLevel,LPD3DXMESH pMesh) PURE;
 
@@ -543,9 +543,9 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
     // at the 2 vertices it connects.
     // MaxTessLevel specifies the upper limit for adaptive tesselation.
     // This function will perform more efficiently if the patch mesh has been optimized using the Optimize() call.
-    STDMETHOD(TessellateAdaptive)(THIS_ 
+    STDMETHOD(TessellateAdaptive)(THIS_
         CONST D3DXVECTOR4 *pTrans,
-        DWORD dwMaxTessLevel, 
+        DWORD dwMaxTessLevel,
         DWORD dwMinTessLevel,
         LPD3DXMESH pMesh) PURE;
 
@@ -573,24 +573,24 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
 
     // This gets the max face influences based on a triangle mesh with the specified index buffer
     STDMETHOD(GetMaxFaceInfluences)(THIS_ LPDIRECT3DINDEXBUFFER9 pIB, DWORD NumFaces, DWORD* maxFaceInfluences) PURE;
-    
+
     // Set min bone influence. Bone influences that are smaller than this are ignored
     STDMETHOD(SetMinBoneInfluence)(THIS_ FLOAT MinInfl) PURE;
-    // Get min bone influence. 
+    // Get min bone influence.
     STDMETHOD_(FLOAT, GetMinBoneInfluence)(THIS) PURE;
-    
+
     // Bone names are returned by D3DXLoadSkinMeshFromXof. They are not used by any other method of this object
     STDMETHOD(SetBoneName)(THIS_ DWORD Bone, LPCSTR pName) PURE; // pName is copied to an internal string buffer
     STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD Bone) PURE; // A pointer to an internal string buffer is returned. Do not free this.
-    
+
     // Bone offset matrices are returned by D3DXLoadSkinMeshFromXof. They are not used by any other method of this object
     STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD Bone, CONST D3DXMATRIX *pBoneTransform) PURE; // pBoneTransform is copied to an internal buffer
     STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD Bone) PURE; // A pointer to an internal matrix is returned. Do not free this.
-    
+
     // Clone a skin info object
     STDMETHOD(Clone)(THIS_ LPD3DXSKININFO* ppSkinInfo) PURE;
-    
-    // Update bone influence information to match vertices after they are reordered. This should be called 
+
+    // Update bone influence information to match vertices after they are reordered. This should be called
     // if the target vertex buffer has been reordered externally.
     STDMETHOD(Remap)(THIS_ DWORD NumVertices, DWORD* pVertexRemap) PURE;
 
@@ -601,39 +601,39 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
     STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9 Declaration[MAX_FVF_DECL_SIZE]) PURE;
 
     // Apply SW skinning based on current pose matrices to the target vertices.
-    STDMETHOD(UpdateSkinnedMesh)(THIS_ 
-        CONST D3DXMATRIX* pBoneTransforms, 
-        CONST D3DXMATRIX* pBoneInvTransposeTransforms, 
-        LPCVOID pVerticesSrc, 
+    STDMETHOD(UpdateSkinnedMesh)(THIS_
+        CONST D3DXMATRIX* pBoneTransforms,
+        CONST D3DXMATRIX* pBoneInvTransposeTransforms,
+        LPCVOID pVerticesSrc,
         PVOID pVerticesDst) PURE;
 
     // Takes a mesh and returns a new mesh with per vertex blend weights and a bone combination
     // table that describes which bones affect which subsets of the mesh
-    STDMETHOD(ConvertToBlendedMesh)(THIS_ 
+    STDMETHOD(ConvertToBlendedMesh)(THIS_
         LPD3DXMESH pMesh,
-        DWORD Options, 
-        CONST DWORD *pAdjacencyIn, 
+        DWORD Options,
+        CONST DWORD *pAdjacencyIn,
         LPDWORD pAdjacencyOut,
-        DWORD* pFaceRemap, 
-        LPD3DXBUFFER *ppVertexRemap, 
+        DWORD* pFaceRemap,
+        LPD3DXBUFFER *ppVertexRemap,
         DWORD* pMaxFaceInfl,
-        DWORD* pNumBoneCombinations, 
-        LPD3DXBUFFER* ppBoneCombinationTable, 
+        DWORD* pNumBoneCombinations,
+        LPD3DXBUFFER* ppBoneCombinationTable,
         LPD3DXMESH* ppMesh) PURE;
 
-    // Takes a mesh and returns a new mesh with per vertex blend weights and indices 
+    // Takes a mesh and returns a new mesh with per vertex blend weights and indices
     // and a bone combination table that describes which bones palettes affect which subsets of the mesh
-    STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ 
+    STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_
         LPD3DXMESH pMesh,
-        DWORD Options, 
-        DWORD paletteSize, 
-        CONST DWORD *pAdjacencyIn, 
-        LPDWORD pAdjacencyOut, 
-        DWORD* pFaceRemap, 
-        LPD3DXBUFFER *ppVertexRemap, 
+        DWORD Options,
+        DWORD paletteSize,
+        CONST DWORD *pAdjacencyIn,
+        LPDWORD pAdjacencyOut,
+        DWORD* pFaceRemap,
+        LPD3DXBUFFER *ppVertexRemap,
         DWORD* pMaxVertexInfl,
-        DWORD* pNumBoneCombinations, 
-        LPD3DXBUFFER* ppBoneCombinationTable, 
+        DWORD* pNumBoneCombinations,
+        LPD3DXBUFFER* ppBoneCombinationTable,
         LPD3DXMESH* ppMesh) PURE;
 };
 
@@ -642,28 +642,28 @@ extern "C" {
 #endif //__cplusplus
 
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateMesh(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
-        DWORD Options, 
-        CONST D3DVERTEXELEMENT9 *pDeclaration, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        DWORD NumFaces,
+        DWORD NumVertices,
+        DWORD Options,
+        CONST D3DVERTEXELEMENT9 *pDeclaration,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateMeshFVF(
-        DWORD NumFaces, 
-        DWORD NumVertices, 
-        DWORD Options, 
-        DWORD FVF, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        DWORD NumFaces,
+        DWORD NumVertices,
+        DWORD Options,
+        DWORD FVF,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateSPMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST D3DXATTRIBUTEWEIGHTS *pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
         LPD3DXSPMESH* ppSMesh);
@@ -684,72 +684,72 @@ HRESULT WINAPI
     CONST DWORD* pAdjacency,
     LPD3DXBUFFER* ppErrorsAndWarnings);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXGeneratePMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST D3DXATTRIBUTEWEIGHTS *pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
-        DWORD MinValue, 
-        DWORD Options, 
+        DWORD MinValue,
+        DWORD Options,
         LPD3DXPMESH* ppPMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSimplifyMesh(
-        LPD3DXMESH pMesh, 
-        CONST DWORD* pAdjacency, 
+        LPD3DXMESH pMesh,
+        CONST DWORD* pAdjacency,
         CONST D3DXATTRIBUTEWEIGHTS *pVertexAttributeWeights,
         CONST FLOAT *pVertexWeights,
-        DWORD MinValue, 
-        DWORD Options, 
+        DWORD MinValue,
+        DWORD Options,
         LPD3DXMESH* ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingSphere(
         CONST D3DXVECTOR3 *pFirstPosition,  // pointer to first position
-        DWORD NumVertices, 
+        DWORD NumVertices,
         DWORD dwStride,                     // count in bytes to subsequent position vectors
-        D3DXVECTOR3 *pCenter, 
+        D3DXVECTOR3 *pCenter,
         FLOAT *pRadius);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeBoundingBox(
         CONST D3DXVECTOR3 *pFirstPosition,  // pointer to first position
-        DWORD NumVertices, 
+        DWORD NumVertices,
         DWORD dwStride,                     // count in bytes to subsequent position vectors
-        D3DXVECTOR3 *pMin, 
+        D3DXVECTOR3 *pMin,
         D3DXVECTOR3 *pMax);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXComputeNormals(
         LPD3DXBASEMESH pMesh,
         CONST DWORD *pAdjacency);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateBuffer(
-        DWORD NumBytes, 
+        DWORD NumBytes,
         LPD3DXBUFFER *ppBuffer);
 
 
 HRESULT WINAPI
     D3DXLoadMeshFromXA(
-        LPCSTR pFilename, 
-        DWORD Options, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPCSTR pFilename,
+        DWORD Options,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppMaterials,
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
 HRESULT WINAPI
     D3DXLoadMeshFromXW(
-        LPCWSTR pFilename, 
-        DWORD Options, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPCWSTR pFilename,
+        DWORD Options,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppMaterials,
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
@@ -759,67 +759,67 @@ HRESULT WINAPI
 #define D3DXLoadMeshFromX D3DXLoadMeshFromXA
 #endif
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXInMemory(
         LPCVOID Memory,
         DWORD SizeOfMemory,
-        DWORD Options, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        DWORD Options,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppMaterials,
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXResource(
         HMODULE Module,
         LPCSTR Name,
         LPCSTR Type,
-        DWORD Options, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        DWORD Options,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppMaterials,
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSaveMeshToXA(
         LPCSTR pFilename,
         LPD3DXMESH pMesh,
         CONST DWORD* pAdjacency,
         CONST D3DXMATERIAL* pMaterials,
-        CONST D3DXEFFECTINSTANCE* pEffectInstances, 
+        CONST D3DXEFFECTINSTANCE* pEffectInstances,
         DWORD NumMaterials,
         DWORD Format
         );
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSaveMeshToXW(
         LPCWSTR pFilename,
         LPD3DXMESH pMesh,
         CONST DWORD* pAdjacency,
         CONST D3DXMATERIAL* pMaterials,
-        CONST D3DXEFFECTINSTANCE* pEffectInstances, 
+        CONST D3DXEFFECTINSTANCE* pEffectInstances,
         DWORD NumMaterials,
         DWORD Format
         );
-        
+
 #ifdef UNICODE
 #define D3DXSaveMeshToX D3DXSaveMeshToXW
 #else
 #define D3DXSaveMeshToX D3DXSaveMeshToXA
 #endif
-        
 
-HRESULT WINAPI 
+
+HRESULT WINAPI
     D3DXCreatePMeshFromStream(
-        IStream *pStream, 
+        IStream *pStream,
         DWORD Options,
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppMaterials,
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD* pNumMaterials,
         LPD3DXPMESH *ppPMesh);
 
@@ -828,10 +828,10 @@ HRESULT WINAPI
 HRESULT WINAPI
     D3DXCreateSkinInfo(
         DWORD NumVertices,
-        CONST D3DVERTEXELEMENT9 *pDeclaration, 
+        CONST D3DVERTEXELEMENT9 *pDeclaration,
         DWORD NumBones,
         LPD3DXSKININFO* ppSkinInfo);
-        
+
 // Creates a skin info object based on the number of vertices, number of bones, and a FVF describing the vertex layout of the target vertices
 // The bone names and initial bone transforms are not filled in the skin info object by this method.
 HRESULT WINAPI
@@ -840,34 +840,34 @@ HRESULT WINAPI
         DWORD FVF,
         DWORD NumBones,
         LPD3DXSKININFO* ppSkinInfo);
-        
+
 #ifdef __cplusplus
 }
 
 extern "C" {
 #endif //__cplusplus
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadMeshFromXof(
-        LPD3DXFILEDATA pxofMesh, 
-        DWORD Options, 
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPD3DXFILEDATA pxofMesh,
+        DWORD Options,
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppAdjacency,
-        LPD3DXBUFFER *ppMaterials, 
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppMaterials,
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pNumMaterials,
         LPD3DXMESH *ppMesh);
 
 // This similar to D3DXLoadMeshFromXof, except also returns skinning info if present in the file
-// If skinning info is not present, ppSkinInfo will be NULL     
+// If skinning info is not present, ppSkinInfo will be NULL
 HRESULT WINAPI
     D3DXLoadSkinMeshFromXof(
-        LPD3DXFILEDATA pxofMesh, 
+        LPD3DXFILEDATA pxofMesh,
         DWORD Options,
         LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER* ppAdjacency,
         LPD3DXBUFFER* ppMaterials,
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppEffectInstances,
         DWORD *pMatOut,
         LPD3DXSKININFO* ppSkinInfo,
         LPD3DXMESH* ppMesh);
@@ -884,12 +884,12 @@ HRESULT WINAPI
         DWORD NumBones,
         CONST D3DXBONECOMBINATION *pBoneCombinationTable,
         LPD3DXSKININFO* ppSkinInfo);
-        
+
 HRESULT WINAPI
     D3DXTessellateNPatches(
-        LPD3DXMESH pMeshIn,             
-        CONST DWORD* pAdjacencyIn,             
-        FLOAT NumSegs,                    
+        LPD3DXMESH pMeshIn,
+        CONST DWORD* pAdjacencyIn,
+        FLOAT NumSegs,
         BOOL  QuadraticInterpNormals,     // if false use linear intrep for normals, if true use quadratic
         LPD3DXMESH *ppMeshOut,
         LPD3DXBUFFER *ppAdjacencyOut);
@@ -897,7 +897,7 @@ HRESULT WINAPI
 
 //generates implied outputdecl from input decl
 //the decl generated from this should be used to generate the output decl for
-//the tessellator subroutines. 
+//the tessellator subroutines.
 
 HRESULT WINAPI
     D3DXGenerateOutputDecl(
@@ -907,14 +907,14 @@ HRESULT WINAPI
 //loads patches from an XFileData
 //since an X file can have up to 6 different patch meshes in it,
 //returns them in an array - pNumPatches will contain the number of
-//meshes in the actual file. 
+//meshes in the actual file.
 HRESULT WINAPI
     D3DXLoadPatchMeshFromXof(
         LPD3DXFILEDATA pXofObjMesh,
         DWORD Options,
         LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXBUFFER *ppMaterials,
-        LPD3DXBUFFER *ppEffectInstances, 
+        LPD3DXBUFFER *ppEffectInstances,
         PDWORD pNumMaterials,
         LPD3DXPATCHMESH *ppMesh);
 
@@ -925,10 +925,10 @@ HRESULT WINAPI
         DWORD *pdwTriangles,    //output number of triangles
         DWORD *pdwVertices);    //output number of vertices
 
-//computes the size of a single triangle patch      
+//computes the size of a single triangle patch
 HRESULT WINAPI
     D3DXTriPatchSize(
-        CONST FLOAT *pfNumSegs, //segments for each edge (3)    
+        CONST FLOAT *pfNumSegs, //segments for each edge (3)
         DWORD *pdwTriangles,    //output number of triangles
         DWORD *pdwVertices);    //output number of vertices
 
@@ -954,25 +954,25 @@ HRESULT WINAPI
 
 
 
-//creates an NPatch PatchMesh from a D3DXMESH 
+//creates an NPatch PatchMesh from a D3DXMESH
 HRESULT WINAPI
     D3DXCreateNPatchMesh(
         LPD3DXMESH pMeshSysMem,
         LPD3DXPATCHMESH *pPatchMesh);
 
-      
+
 //creates a patch mesh
 HRESULT WINAPI
     D3DXCreatePatchMesh(
         CONST D3DXPATCHINFO *pInfo,     //patch type
         DWORD dwNumPatches,             //number of patches
         DWORD dwNumVertices,            //number of control vertices
-        DWORD dwOptions,                //options 
+        DWORD dwOptions,                //options
         CONST D3DVERTEXELEMENT9 *pDecl, //format of control vertices
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXPATCHMESH *pPatchMesh);
 
-        
+
 //returns the number of degenerates in a patch mesh -
 //text output put in string.
 HRESULT WINAPI
@@ -984,10 +984,10 @@ HRESULT WINAPI
 UINT WINAPI
     D3DXGetFVFVertexSize(DWORD FVF);
 
-UINT WINAPI 
+UINT WINAPI
     D3DXGetDeclVertexSize(CONST D3DVERTEXELEMENT9 *pDecl,DWORD Stream);
 
-UINT WINAPI 
+UINT WINAPI
     D3DXGetDeclLength(CONST D3DVERTEXELEMENT9 *pDecl);
 
 HRESULT WINAPI
@@ -1000,20 +1000,20 @@ HRESULT WINAPI
         CONST D3DVERTEXELEMENT9 *pDeclarator,
         DWORD *pFVF);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXWeldVertices(
-        LPD3DXMESH pMesh,         
+        LPD3DXMESH pMesh,
         DWORD Flags,
-        CONST D3DXWELDEPSILONS *pEpsilons,                 
-        CONST DWORD *pAdjacencyIn, 
+        CONST D3DXWELDEPSILONS *pEpsilons,
+        CONST DWORD *pAdjacencyIn,
         DWORD *pAdjacencyOut,
-        DWORD *pFaceRemap, 
+        DWORD *pFaceRemap,
         LPD3DXBUFFER *ppVertexRemap);
 
 typedef struct _D3DXINTERSECTINFO
 {
     DWORD FaceIndex;                // index of face intersected
-    FLOAT U;                        // Barycentric Hit Coordinates    
+    FLOAT U;                        // Barycentric Hit Coordinates
     FLOAT V;                        // Barycentric Hit Coordinates
     FLOAT Dist;                     // Ray-Intersection Parameter Distance
 } D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO;
@@ -1023,13 +1023,13 @@ HRESULT WINAPI
     D3DXIntersect(
         LPD3DXBASEMESH pMesh,
         CONST D3DXVECTOR3 *pRayPos,
-        CONST D3DXVECTOR3 *pRayDir, 
+        CONST D3DXVECTOR3 *pRayDir,
         BOOL    *pHit,              // True if any faces were intersected
         DWORD   *pFaceIndex,        // index of closest face intersected
-        FLOAT   *pU,                // Barycentric Hit Coordinates    
+        FLOAT   *pU,                // Barycentric Hit Coordinates
         FLOAT   *pV,                // Barycentric Hit Coordinates
         FLOAT   *pDist,             // Ray-Intersection Parameter Distance
-        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest) 
+        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest)
         DWORD   *pCountOfHits);     // Number of entries in AllHits array
 
 HRESULT WINAPI
@@ -1037,20 +1037,20 @@ HRESULT WINAPI
         LPD3DXBASEMESH pMesh,
         DWORD AttribId,
         CONST D3DXVECTOR3 *pRayPos,
-        CONST D3DXVECTOR3 *pRayDir, 
+        CONST D3DXVECTOR3 *pRayDir,
         BOOL    *pHit,              // True if any faces were intersected
         DWORD   *pFaceIndex,        // index of closest face intersected
-        FLOAT   *pU,                // Barycentric Hit Coordinates    
+        FLOAT   *pU,                // Barycentric Hit Coordinates
         FLOAT   *pV,                // Barycentric Hit Coordinates
         FLOAT   *pDist,             // Ray-Intersection Parameter Distance
-        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest) 
+        LPD3DXBUFFER *ppAllHits,    // Array of D3DXINTERSECTINFOs for all hits (not just closest)
         DWORD   *pCountOfHits);     // Number of entries in AllHits array
 
 
 HRESULT WINAPI D3DXSplitMesh
     (
-    LPD3DXMESH pMeshIn,         
-    CONST DWORD *pAdjacencyIn, 
+    LPD3DXMESH pMeshIn,
+    CONST DWORD *pAdjacencyIn,
     CONST DWORD MaxSize,
     CONST DWORD Options,
     DWORD *pMeshesOut,
@@ -1060,7 +1060,7 @@ HRESULT WINAPI D3DXSplitMesh
     LPD3DXBUFFER *ppVertRemapArrayOut
     );
 
-BOOL WINAPI D3DXIntersectTri 
+BOOL WINAPI D3DXIntersectTri
 (
     CONST D3DXVECTOR3 *p0,           // Triangle vertex 0 position
     CONST D3DXVECTOR3 *p1,           // Triangle vertex 1 position
@@ -1078,9 +1078,9 @@ BOOL WINAPI
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
 
-BOOL WINAPI 
+BOOL WINAPI
     D3DXBoxBoundProbe(
-        CONST D3DXVECTOR3 *pMin, 
+        CONST D3DXVECTOR3 *pMin,
         CONST D3DXVECTOR3 *pMax,
         CONST D3DXVECTOR3 *pRayPosition,
         CONST D3DXVECTOR3 *pRayDirection);
@@ -1114,11 +1114,11 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *pMesh,
 //puts the binorm in BINORM[BinormIndex] also specified in the decl.
 //
 //If neither the binorm or the tangnet are in the meshes declaration,
-//the function will fail. 
+//the function will fail.
 //
 //If a tangent or Binorm field is in the Decl, but the user does not
 //wish D3DXComputeTangent to replace them, then D3DX_DEFAULT specified
-//in the TangentIndex or BinormIndex will cause it to ignore the specified 
+//in the TangentIndex or BinormIndex will cause it to ignore the specified
 //semantic.
 //
 //Wrap should be specified if the texture coordinates wrap.
@@ -1176,7 +1176,7 @@ typedef HRESULT (WINAPI *LPD3DXUVATLASCB)(FLOAT fPercentDone,  LPVOID lpUserCont
 //               integrated metric tensor for that face. This lets you control
 //               the way this triangle may be stretched in the atlas. The IMT
 //               passed in will be 3 floats (a,b,c) and specify a symmetric
-//               matrix (a b) that, given a vector (s,t), specifies the 
+//               matrix (a b) that, given a vector (s,t), specifies the
 //                      (b c)
 //               distance between a vector v1 and a vector v2 = v1 + (s,t) as
 //               sqrt((s, t) * M * (s, t)^T).
@@ -1192,7 +1192,7 @@ typedef HRESULT (WINAPI *LPD3DXUVATLASCB)(FLOAT fPercentDone,  LPVOID lpUserCont
 //               in some 2-D space. For D3DXUVAtlas, this space is created by
 //               letting S be the direction from the first to the second
 //               vertex, and T be the cross product between the normal and S.
-//               
+//
 //  pStatusCallback - Since the atlas creation process can be very CPU intensive,
 //                    this allows the programmer to specify a function to be called
 //                    periodically, similarly to how it is done in the PRT simulation
@@ -1444,7 +1444,7 @@ HRESULT WINAPI
         LPD3DXBUFFER *ppStripLengths,
         DWORD *pNumStrips);
 
-        
+
 //============================================================================
 //
 //  D3DXOptimizeFaces:
@@ -1470,17 +1470,17 @@ HRESULT WINAPI
 //============================================================================
 HRESULT WINAPI
     D3DXOptimizeFaces(
-        LPCVOID pbIndices, 
-        UINT cFaces, 
-        UINT cVertices, 
-        BOOL b32BitIndices, 
+        LPCVOID pbIndices,
+        UINT cFaces,
+        UINT cVertices,
+        BOOL b32BitIndices,
         DWORD* pFaceRemap);
-        
+
 //============================================================================
 //
 //  D3DXOptimizeVertices:
 //  --------------------
-//  Generate a vertex remapping to optimize for in order use of vertices for 
+//  Generate a vertex remapping to optimize for in order use of vertices for
 //    a given set of indices.  This is commonly used after applying the face
 //    remap generated by D3DXOptimizeFaces
 //
@@ -1501,10 +1501,10 @@ HRESULT WINAPI
 //============================================================================
 HRESULT WINAPI
     D3DXOptimizeVertices(
-        LPCVOID pbIndices, 
-        UINT cFaces, 
-        UINT cVertices, 
-        BOOL b32BitIndices, 
+        LPCVOID pbIndices,
+        UINT cFaces,
+        UINT cVertices,
+        BOOL b32BitIndices,
         DWORD* pVertexRemap);
 
 #ifdef __cplusplus
@@ -1531,8 +1531,8 @@ typedef enum _D3DXSHGPUSIMOPT {
     D3DXSHGPUSIMOPT_SHADOWRES1024 = 2,
     D3DXSHGPUSIMOPT_SHADOWRES2048 = 3,
 
-    D3DXSHGPUSIMOPT_HIGHQUALITY = 4,    
-    
+    D3DXSHGPUSIMOPT_HIGHQUALITY = 4,
+
     D3DXSHGPUSIMOPT_FORCE_DWORD = 0x7fffffff
 } D3DXSHGPUSIMOPT;
 
@@ -1545,7 +1545,7 @@ typedef struct _D3DXSHMATERIAL {
     BOOL          bMirror;  // Must be set to FALSE.  bMirror == TRUE not currently supported
     BOOL          bSubSurf; // true if the object does subsurface scattering - can't do this and be a mirror
 
-    // subsurface scattering parameters 
+    // subsurface scattering parameters
     FLOAT         RelativeIndexOfRefraction;
     D3DCOLORVALUE Absorption;
     D3DCOLORVALUE ReducedScattering;
@@ -1568,10 +1568,10 @@ typedef struct _D3DXSHPRTSPLITMESHVERTDATA {
 typedef struct _D3DXSHPRTSPLITMESHCLUSTERDATA {
     UINT uVertStart;     // initial index into remapped vertex array
     UINT uVertLength;    // number of vertices in this super cluster
-    
+
     UINT uFaceStart;     // initial index into face array
     UINT uFaceLength;    // number of faces in this super cluster
-    
+
     UINT uClusterStart;  // initial index into cluster array
     UINT uClusterLength; // number of clusters in this super cluster
 } D3DXSHPRTSPLITMESHCLUSTERDATA;
@@ -1586,19 +1586,19 @@ typedef HRESULT (WINAPI *LPD3DXSHPRTSIMCB)(float fPercentDone,  LPVOID lpUserCon
 
 // GUIDs
 // {F1827E47-00A8-49cd-908C-9D11955F8728}
-DEFINE_GUID(IID_ID3DXPRTBuffer, 
+DEFINE_GUID(IID_ID3DXPRTBuffer,
 0xf1827e47, 0xa8, 0x49cd, 0x90, 0x8c, 0x9d, 0x11, 0x95, 0x5f, 0x87, 0x28);
 
 // {A758D465-FE8D-45ad-9CF0-D01E56266A07}
-DEFINE_GUID(IID_ID3DXPRTCompBuffer, 
+DEFINE_GUID(IID_ID3DXPRTCompBuffer,
 0xa758d465, 0xfe8d, 0x45ad, 0x9c, 0xf0, 0xd0, 0x1e, 0x56, 0x26, 0x6a, 0x7);
 
 // {838F01EC-9729-4527-AADB-DF70ADE7FEA9}
-DEFINE_GUID(IID_ID3DXTextureGutterHelper, 
+DEFINE_GUID(IID_ID3DXTextureGutterHelper,
 0x838f01ec, 0x9729, 0x4527, 0xaa, 0xdb, 0xdf, 0x70, 0xad, 0xe7, 0xfe, 0xa9);
 
 // {683A4278-CD5F-4d24-90AD-C4E1B6855D53}
-DEFINE_GUID(IID_ID3DXPRTEngine, 
+DEFINE_GUID(IID_ID3DXPRTEngine,
 0x683a4278, 0xcd5f, 0x4d24, 0x90, 0xad, 0xc4, 0xe1, 0xb6, 0x85, 0x5d, 0x53);
 
 // interface defenitions
@@ -1639,26 +1639,26 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown)
 
     // every scalar in buffer is multiplied by Scale
     STDMETHOD(ScaleBuffer)(THIS_ FLOAT Scale) PURE;
-    
+
     // every scalar contains the sum of this and pBuffers values
-    // pBuffer must have the same storage class/dimensions 
+    // pBuffer must have the same storage class/dimensions
     STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER pBuffer) PURE;
 
     // GutterHelper (described below) will fill in the gutter
     // regions of a texture by interpolating "internal" values
     STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE;
     STDMETHOD(ReleaseGH)(THIS) PURE;
-    
+
     // Evaluates attached gutter helper on the contents of this buffer
     STDMETHOD(EvalGH)(THIS) PURE;
 
     // extracts a given channel into texture pTexture
     // NumCoefficients starting from StartCoefficient are copied
-    STDMETHOD(ExtractTexture)(THIS_ UINT Channel, UINT StartCoefficient, 
+    STDMETHOD(ExtractTexture)(THIS_ UINT Channel, UINT StartCoefficient,
                               UINT NumCoefficients, LPDIRECT3DTEXTURE9 pTexture) PURE;
 
     // extracts NumCoefficients coefficients into mesh - only applicable on single channel
-    // buffers, otherwise just lockbuffer and copy data.  With SHPRT data NumCoefficients 
+    // buffers, otherwise just lockbuffer and copy data.  With SHPRT data NumCoefficients
     // should be Order^2
     STDMETHOD(ExtractToMesh)(THIS_ UINT NumCoefficients, D3DDECLUSAGE Usage, UINT UsageIndexStart,
                              LPD3DXMESH pScene) PURE;
@@ -1702,19 +1702,19 @@ DECLARE_INTERFACE_(ID3DXPRTCompBuffer, IUnknown)
     // copies basis vectors for cluster "Cluster" into pClusterBasis
     // (NumPCA+1)*NumCoeffs*NumChannels floats
     STDMETHOD(ExtractBasis)(THIS_ UINT Cluster, FLOAT *pClusterBasis) PURE;
-    
+
     // UINT per sample - which cluster it belongs to
     STDMETHOD(ExtractClusterIDs)(THIS_ UINT *pClusterIDs) PURE;
-    
+
     // copies NumExtract PCA projection coefficients starting at StartPCA
     // into pPCACoefficients - NumSamples*NumExtract floats copied
     STDMETHOD(ExtractPCA)(THIS_ UINT StartPCA, UINT NumExtract, FLOAT *pPCACoefficients) PURE;
 
     // copies NumPCA projection coefficients starting at StartPCA
     // into pTexture - should be able to cope with signed formats
-    STDMETHOD(ExtractTexture)(THIS_ UINT StartPCA, UINT NumpPCA, 
+    STDMETHOD(ExtractTexture)(THIS_ UINT StartPCA, UINT NumpPCA,
                               LPDIRECT3DTEXTURE9 pTexture) PURE;
-                              
+
     // copies NumPCA projection coefficients into mesh pScene
     // Usage is D3DDECLUSAGE where coefficients are to be stored
     // UsageIndexStart is starting index
@@ -1752,7 +1752,7 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
     // ID3DXTextureGutterHelper
-    
+
     // dimensions of texture this is bound too
     STDMETHOD_(UINT, GetWidth)(THIS) PURE;
     STDMETHOD_(UINT, GetHeight)(THIS) PURE;
@@ -1760,19 +1760,19 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
 
     // Applying gutters recomputes all of the gutter texels of class "2"
     // based on texels of class "1" or "4"
-    
+
     // Applies gutters to a raw float buffer - each texel is NumCoeffs floats
     // Width and Height must match GutterHelper
     STDMETHOD(ApplyGuttersFloat)(THIS_ FLOAT *pDataIn, UINT NumCoeffs, UINT Width, UINT Height);
-    
+
     // Applies gutters to pTexture
     // Dimensions must match GutterHelper
     STDMETHOD(ApplyGuttersTex)(THIS_ LPDIRECT3DTEXTURE9 pTexture);
-    
+
     // Applies gutters to a D3DXPRTBuffer
     // Dimensions must match GutterHelper
     STDMETHOD(ApplyGuttersPRT)(THIS_ LPD3DXPRTBUFFER pBuffer);
-       
+
     // Resamples a texture from a mesh onto this gutterhelpers
     // parameterization.  It is assumed that the UV coordinates
     // for this gutter helper are in TEXTURE 0 (usage/usage index)
@@ -1787,63 +1787,63 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
     //              for pTextureIn
     // UsageIndex - which index for Usage above for pTextureIn
     // pTextureOut- Resampled texture
-    // 
+    //
     // Usage would generally be D3DDECLUSAGE_TEXCOORD  and UsageIndex other than zero
     STDMETHOD(ResampleTex)(THIS_ LPDIRECT3DTEXTURE9 pTextureIn,
                                  LPD3DXMESH pMeshIn,
                                  D3DDECLUSAGE Usage, UINT UsageIndex,
-                                 LPDIRECT3DTEXTURE9 pTextureOut);    
-    
+                                 LPDIRECT3DTEXTURE9 pTextureOut);
+
     // the routines below provide access to the data structures
     // used by the Apply functions
 
     // face map is a UINT per texel that represents the
-    // face of the mesh that texel belongs too - 
+    // face of the mesh that texel belongs too -
     // only valid if same texel is valid in pGutterData
     // pFaceData must be allocated by the user
     STDMETHOD(GetFaceMap)(THIS_ UINT *pFaceData) PURE;
-    
+
     // BaryMap is a D3DXVECTOR2 per texel
     // the 1st two barycentric coordinates for the corresponding
     // face (3rd weight is always 1-sum of first two)
     // only valid if same texel is valid in pGutterData
     // pBaryData must be allocated by the user
     STDMETHOD(GetBaryMap)(THIS_ D3DXVECTOR2 *pBaryData) PURE;
-    
+
     // TexelMap is a D3DXVECTOR2 per texel that
     // stores the location in pixel coordinates where the
     // corresponding texel is mapped
     // pTexelData must be allocated by the user
     STDMETHOD(GetTexelMap)(THIS_ D3DXVECTOR2 *pTexelData) PURE;
-    
+
     // GutterMap is a BYTE per texel
     // 0/1/2 for Invalid/Internal/Gutter texels
     // 4 represents a gutter texel that will be computed
     // during PRT
     // pGutterData must be allocated by the user
     STDMETHOD(GetGutterMap)(THIS_ BYTE *pGutterData) PURE;
-    
+
     // face map is a UINT per texel that represents the
-    // face of the mesh that texel belongs too - 
+    // face of the mesh that texel belongs too -
     // only valid if same texel is valid in pGutterData
     STDMETHOD(SetFaceMap)(THIS_ UINT *pFaceData) PURE;
-    
+
     // BaryMap is a D3DXVECTOR2 per texel
     // the 1st two barycentric coordinates for the corresponding
     // face (3rd weight is always 1-sum of first two)
     // only valid if same texel is valid in pGutterData
     STDMETHOD(SetBaryMap)(THIS_ D3DXVECTOR2 *pBaryData) PURE;
-    
+
     // TexelMap is a D3DXVECTOR2 per texel that
     // stores the location in pixel coordinates where the
     // corresponding texel is mapped
     STDMETHOD(SetTexelMap)(THIS_ D3DXVECTOR2 *pTexelData) PURE;
-    
+
     // GutterMap is a BYTE per texel
     // 0/1/2 for Invalid/Internal/Gutter texels
     // 4 represents a gutter texel that will be computed
     // during PRT
-    STDMETHOD(SetGutterMap)(THIS_ BYTE *pGutterData) PURE;    
+    STDMETHOD(SetGutterMap)(THIS_ BYTE *pGutterData) PURE;
 };
 
 
@@ -1880,7 +1880,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     STDMETHOD_(ULONG, Release)(THIS) PURE;
 
     // ID3DXPRTEngine
-    
+
     // This sets a material per attribute in the scene mesh and it is
     // the only way to specify subsurface scattering parameters.  if
     // bSetAlbedo is FALSE, NumChannels must match the current
@@ -1894,53 +1894,53 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     //  albedo that might have been set before.  FALSE won't clobber.
     // fLengthScale is used for subsurface scattering - scene is mapped into a 1mm unit cube
     //  and scaled by this amount
-    STDMETHOD(SetMeshMaterials)(THIS_ CONST D3DXSHMATERIAL **ppMaterials, UINT NumMeshes, 
+    STDMETHOD(SetMeshMaterials)(THIS_ CONST D3DXSHMATERIAL **ppMaterials, UINT NumMeshes,
                                 UINT NumChannels, BOOL bSetAlbedo, FLOAT fLengthScale) PURE;
-    
+
     // setting albedo per-vertex or per-texel over rides the albedos stored per mesh
     // but it does not over ride any other settings
-    
+
     // sets an albedo to be used per vertex - the albedo is represented as a float
     // pDataIn input pointer (pointint to albedo of 1st sample)
     // NumChannels 1 implies "grayscale" materials, set this to 3 to enable
     //  color bleeding effects
     // Stride - stride in bytes to get to next samples albedo
     STDMETHOD(SetPerVertexAlbedo)(THIS_ CONST VOID *pDataIn, UINT NumChannels, UINT Stride) PURE;
-    
+
     // represents the albedo per-texel instead of per-vertex (even if per-vertex PRT is used)
     // pAlbedoTexture - texture that stores the albedo (dimension arbitrary)
     // NumChannels 1 implies "grayscale" materials, set this to 3 to enable
     //  color bleeding effects
     // pGH - optional gutter helper, otherwise one is constructed in computation routines and
     //  destroyed (if not attached to buffers)
-    STDMETHOD(SetPerTexelAlbedo)(THIS_ LPDIRECT3DTEXTURE9 pAlbedoTexture, 
-                                 UINT NumChannels, 
+    STDMETHOD(SetPerTexelAlbedo)(THIS_ LPDIRECT3DTEXTURE9 pAlbedoTexture,
+                                 UINT NumChannels,
                                  LPD3DXTEXTUREGUTTERHELPER pGH) PURE;
-                                 
+
     // gets the per-vertex albedo
-    STDMETHOD(GetVertexAlbedo)(THIS_ D3DXCOLOR *pVertColors, UINT NumVerts) PURE;                                 
-                                 
+    STDMETHOD(GetVertexAlbedo)(THIS_ D3DXCOLOR *pVertColors, UINT NumVerts) PURE;
+
     // If pixel PRT is being computed normals default to ones that are interpolated
     // from the vertex normals.  This specifies a texture that stores an object
     // space normal map instead (must use a texture format that can represent signed values)
-    // pNormalTexture - normal map, must be same dimensions as PRTBuffers, signed                                
+    // pNormalTexture - normal map, must be same dimensions as PRTBuffers, signed
     STDMETHOD(SetPerTexelNormal)(THIS_ LPDIRECT3DTEXTURE9 pNormalTexture) PURE;
-                                 
+
     // Copies per-vertex albedo from mesh
     // pMesh - mesh that represents the scene.  It must have the same
     //  properties as the mesh used to create the PRTEngine
     // Usage - D3DDECLUSAGE to extract albedos from
     // NumChannels 1 implies "grayscale" materials, set this to 3 to enable
     //  color bleeding effects
-    STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH pMesh, 
-                                      D3DDECLUSAGE Usage, 
+    STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH pMesh,
+                                      D3DDECLUSAGE Usage,
                                       UINT NumChannels) PURE;
 
     // Resamples the input buffer into the output buffer
     // can be used to move between per-vertex and per-texel buffers.  This can also be used
     // to convert single channel buffers to 3-channel buffers and vice-versa.
     STDMETHOD(ResampleBuffer)(THIS_ LPD3DXPRTBUFFER pBufferIn, LPD3DXPRTBUFFER pBufferOut) PURE;
-    
+
     // Returns the scene mesh - including modifications from adaptive spatial sampling
     // The returned mesh only has positions, normals and texture coordinates (if defined)
     // pD3DDevice - d3d device that will be used to allocate the mesh
@@ -1983,10 +1983,10 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // Adaptive - if TRUE adaptive sampling (angular) is used
     // AdaptiveThresh - threshold used to terminate adaptive angular sampling
     //  ignored if adaptive sampling is not set
-    STDMETHOD(SetSamplingInfo)(THIS_ UINT NumRays, 
-                               BOOL UseSphere, 
-                               BOOL UseCosine, 
-                               BOOL Adaptive, 
+    STDMETHOD(SetSamplingInfo)(THIS_ UINT NumRays,
+                               BOOL UseSphere,
+                               BOOL UseCosine,
+                               BOOL Adaptive,
                                FLOAT AdaptiveThresh) PURE;
 
     // Methods that compute the direct lighting contribution for objects
@@ -1996,9 +1996,9 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     //
     // SHOrder - order of SH to use
     // pDataOut - PRT buffer that is generated.  Can be single channel
-    STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT SHOrder, 
+    STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT SHOrder,
                                        LPD3DXPRTBUFFER pDataOut) PURE;
-                                       
+
     // Adaptive variant of above function.  This will refine the mesh
     // generating new vertices/faces to approximate the PRT signal
     // more faithfully.
@@ -2008,15 +2008,15 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // MinEdgeLength - minimum edge length that will be generated
     //  if value is too small a fairly conservative model dependent value
     //  is used
-    // MaxSubdiv - maximum subdivision level, if 0 is specified it 
+    // MaxSubdiv - maximum subdivision level, if 0 is specified it
     //  will default to 4
     // pDataOut - PRT buffer that is generated.  Can be single channel.
-    STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT SHOrder, 
+    STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT SHOrder,
                                                FLOAT AdaptiveThresh,
                                                FLOAT MinEdgeLength,
                                                UINT MaxSubdiv,
                                                LPD3DXPRTBUFFER pDataOut) PURE;
-                                       
+
     // Function that computes the direct lighting contribution for objects
     // light is always represented using spherical harmonics (SH)
     // This is done on the GPU and is much faster then using the CPU.
@@ -2053,7 +2053,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // pDataIn - input data (previous bounce)
     // pDataOut - result of subsurface scattering simulation
     // pDataTotal - [optional] results can be summed into this buffer
-    STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER pDataIn, 
+    STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER pDataIn,
                          LPD3DXPRTBUFFER pDataOut, LPD3DXPRTBUFFER pDataTotal) PURE;
 
     // Adaptive version of ComputeSS.
@@ -2064,11 +2064,11 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // MinEdgeLength - minimum edge length that will be generated
     //  if value is too small a fairly conservative model dependent value
     //  is used
-    // MaxSubdiv - maximum subdivision level, if 0 is specified it 
-    //  will default to 4    
+    // MaxSubdiv - maximum subdivision level, if 0 is specified it
+    //  will default to 4
     // pDataOut - result of subsurface scattering simulation
     // pDataTotal - [optional] results can be summed into this buffer
-    STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER pDataIn, 
+    STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER pDataIn,
                                  FLOAT AdaptiveThresh,
                                  FLOAT MinEdgeLength,
                                  UINT MaxSubdiv,
@@ -2078,7 +2078,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // works for SH based PRT or generic lighting
     // Albedo is not multiplied by result
     //
-    // pDataIn - previous bounces data 
+    // pDataIn - previous bounces data
     // pDataOut - PRT buffer that is generated
     // pDataTotal - [optional] can be used to keep a running sum
     STDMETHOD(ComputeBounce)(THIS_ LPD3DXPRTBUFFER pDataIn,
@@ -2087,16 +2087,16 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
 
     // Adaptive version of above function.
     //
-    // pDataIn - previous bounces data, can be single channel 
+    // pDataIn - previous bounces data, can be single channel
     // AdaptiveThresh - threshold for adaptive subdivision (in PRT vector error)
     //  if value is less then 1e-6f, 1e-6f is specified
     // MinEdgeLength - minimum edge length that will be generated
     //  if value is too small a fairly conservative model dependent value
     //  is used
-    // MaxSubdiv - maximum subdivision level, if 0 is specified it 
+    // MaxSubdiv - maximum subdivision level, if 0 is specified it
     //  will default to 4
     // pDataOut - PRT buffer that is generated
-    // pDataTotal - [optional] can be used to keep a running sum    
+    // pDataTotal - [optional] can be used to keep a running sum
     STDMETHOD(ComputeBounceAdaptive)(THIS_ LPD3DXPRTBUFFER pDataIn,
                                      FLOAT AdaptiveThresh,
                                      FLOAT MinEdgeLength,
@@ -2105,7 +2105,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
                                      LPD3DXPRTBUFFER pDataTotal) PURE;
 
     // Computes projection of distant SH radiance into a local SH radiance
-    // function.  This models how direct lighting is attenuated by the 
+    // function.  This models how direct lighting is attenuated by the
     // scene and is a form of "neighborhood transfer."  The result is
     // a linear operator (matrix) at every sample point, if you multiply
     // this matrix by the distant SH lighting coefficients you get an
@@ -2114,24 +2114,24 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // than be projected into another basis or used with any rendering
     // technique that uses spherical harmonics as input.
     // SetSamplingInfo must be called with TRUE for UseSphere and
-    // FALSE for UseCosine before this method is called.  
-    // Generates SHOrderIn*SHOrderIn*SHOrderOut*SHOrderOut scalars 
+    // FALSE for UseCosine before this method is called.
+    // Generates SHOrderIn*SHOrderIn*SHOrderOut*SHOrderOut scalars
     // per channel at each sample location.
     //
     // SHOrderIn  - Order of the SH representation of distant lighting
     // SHOrderOut - Order of the SH representation of local lighting
     // NumVolSamples  - Number of sample locations
     // pSampleLocs    - position of sample locations
-    // pDataOut       - PRT Buffer that will store output results    
-    STDMETHOD(ComputeVolumeSamplesDirectSH)(THIS_ UINT SHOrderIn, 
-                                            UINT SHOrderOut, 
+    // pDataOut       - PRT Buffer that will store output results
+    STDMETHOD(ComputeVolumeSamplesDirectSH)(THIS_ UINT SHOrderIn,
+                                            UINT SHOrderOut,
                                             UINT NumVolSamples,
                                             CONST D3DXVECTOR3 *pSampleLocs,
                                             LPD3DXPRTBUFFER pDataOut) PURE;
-                                    
+
     // At each sample location computes a linear operator (matrix) that maps
     // the representation of source radiance (NumCoeffs in pSurfDataIn)
-    // into a local incident radiance function approximated with spherical 
+    // into a local incident radiance function approximated with spherical
     // harmonics.  For example if a light map data is specified in pSurfDataIn
     // the result is an SH representation of the flow of light at each sample
     // point.  If PRT data for an outdoor scene is used, each sample point
@@ -2140,7 +2140,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // ComputeVolumeSamplesDirectSH this gives the complete representation for
     // how light arrives at each sample point parameterized by distant lighting.
     // SetSamplingInfo must be called with TRUE for UseSphere and
-    // FALSE for UseCosine before this method is called.    
+    // FALSE for UseCosine before this method is called.
     // Generates pSurfDataIn->NumCoeffs()*SHOrder*SHOrder scalars
     // per channel at each sample location.
     //
@@ -2149,8 +2149,8 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // NumVolSamples  - Number of sample locations
     // pSampleLocs    - position of sample locations
     // pDataOut       - PRT Buffer that will store output results
-    STDMETHOD(ComputeVolumeSamples)(THIS_ LPD3DXPRTBUFFER pSurfDataIn, 
-                                    UINT SHOrder, 
+    STDMETHOD(ComputeVolumeSamples)(THIS_ LPD3DXPRTBUFFER pSurfDataIn,
+                                    UINT SHOrder,
                                     UINT NumVolSamples,
                                     CONST D3DXVECTOR3 *pSampleLocs,
                                     LPD3DXPRTBUFFER pDataOut) PURE;
@@ -2170,7 +2170,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
                                           LPD3DXPRTBUFFER pDataOut) PURE;
 
 
-    // given the solution for PRT or light maps, computes transfer vector at arbitrary 
+    // given the solution for PRT or light maps, computes transfer vector at arbitrary
     // position/normal pairs in space
     //
     // pSurfDataIn  - input data
@@ -2189,21 +2189,21 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // Frees temporary data structures that can be created for subsurface scattering
     // this data is freed when the PRTComputeEngine is freed and is lazily created
     STDMETHOD(FreeSSData)(THIS) PURE;
-    
+
     // Frees temporary data structures that can be created for bounce simulations
     // this data is freed when the PRTComputeEngine is freed and is lazily created
     STDMETHOD(FreeBounceData)(THIS) PURE;
 
-    // This computes the Local Deformable PRT (LDPRT) coefficients relative to the 
-    // per sample normals that minimize error in a least squares sense with respect 
-    // to the input PRT data set.  These coefficients can be used with skinned/transformed 
-    // normals to model global effects with dynamic objects.  Shading normals can 
+    // This computes the Local Deformable PRT (LDPRT) coefficients relative to the
+    // per sample normals that minimize error in a least squares sense with respect
+    // to the input PRT data set.  These coefficients can be used with skinned/transformed
+    // normals to model global effects with dynamic objects.  Shading normals can
     // optionally be solved for - these normals (along with the LDPRT coefficients) can
     // more accurately represent the PRT signal.  The coefficients are for zonal
     // harmonics oriented in the normal/shading normal direction.
     //
     // pDataIn  - SH PRT dataset that is input
-    // SHOrder  - Order of SH to compute conv coefficients for 
+    // SHOrder  - Order of SH to compute conv coefficients for
     // pNormOut - Optional array of vectors (passed in) that will be filled with
     //             "shading normals", LDPRT coefficients are optimized for
     //             these normals.  This array must be the same size as the number of
@@ -2218,7 +2218,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // can be useful when using subsurface scattering
     // fScale - value to scale each vector in submesh by
     STDMETHOD(ScaleMeshChunk)(THIS_ UINT uMeshChunk, FLOAT fScale, LPD3DXPRTBUFFER pDataOut) PURE;
-    
+
     // mutliplies each PRT vector by the albedo - can be used if you want to have the albedo
     // burned into the dataset, often better not to do this.  If this is not done the user
     // must mutliply the albedo themselves when rendering - just multiply the albedo times
@@ -2230,7 +2230,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     //
     // pDataOut - dataset that will get albedo pushed into it
     STDMETHOD(MultiplyAlbedo)(THIS_ LPD3DXPRTBUFFER pDataOut) PURE;
-    
+
     // Sets a pointer to an optional call back function that reports back to the
     // user percentage done and gives them the option of quitting
     // pCB - pointer to call back function, return S_OK for the simulation
@@ -2239,16 +2239,16 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     //  will be invoked
     // lpUserContext - will be passed back to the users call back
     STDMETHOD(SetCallBack)(THIS_ LPD3DXSHPRTSIMCB pCB, FLOAT Frequency,  LPVOID lpUserContext) PURE;
-    
+
     // Returns TRUE if the ray intersects the mesh, FALSE if it does not.  This function
     // takes into account settings from SetMinMaxIntersection.  If the closest intersection
     // is not needed this function is more efficient compared to the ClosestRayIntersection
     // method.
     // pRayPos - origin of ray
     // pRayDir - normalized ray direction (normalization required for SetMinMax to be meaningful)
-    
+
     STDMETHOD_(BOOL, ShadowRayIntersects)(THIS_ CONST D3DXVECTOR3 *pRayPos, CONST D3DXVECTOR3 *pRayDir) PURE;
-    
+
     // Returns TRUE if the ray intersects the mesh, FALSE if it does not.  If there is an
     // intersection the closest face that was intersected and its first two barycentric coordinates
     // are returned.  This function takes into account settings from SetMinMaxIntersection.
@@ -2261,7 +2261,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
     // pU          - Barycentric coordinate for vertex 0
     // pV          - Barycentric coordinate for vertex 1
     // pDist       - Distance along ray where the intersection occured
-    
+
     STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *pRayPos, CONST D3DXVECTOR3 *pRayDir,
                                            DWORD *pFaceIndex, FLOAT *pU, FLOAT *pV, FLOAT *pDist) PURE;
 };
@@ -2293,8 +2293,8 @@ extern "C" {
 //
 //============================================================================
 
-HRESULT WINAPI 
-    D3DXCreatePRTBuffer( 
+HRESULT WINAPI
+    D3DXCreatePRTBuffer(
         UINT NumSamples,
         UINT NumCoeffs,
         UINT NumChannels,
@@ -2323,7 +2323,7 @@ HRESULT WINAPI
 //============================================================================
 
 HRESULT WINAPI
-    D3DXCreatePRTBufferTex( 
+    D3DXCreatePRTBufferTex(
         UINT Width,
         UINT Height,
         UINT NumCoeffs,
@@ -2346,12 +2346,12 @@ HRESULT WINAPI
 
 HRESULT WINAPI
     D3DXLoadPRTBufferFromFileA(
-        LPCSTR pFilename, 
+        LPCSTR pFilename,
         LPD3DXPRTBUFFER*       ppBuffer);
-        
+
 HRESULT WINAPI
     D3DXLoadPRTBufferFromFileW(
-        LPCWSTR pFilename, 
+        LPCWSTR pFilename,
         LPD3DXPRTBUFFER*       ppBuffer);
 
 #ifdef UNICODE
@@ -2379,7 +2379,7 @@ HRESULT WINAPI
     D3DXSavePRTBufferToFileA(
         LPCSTR pFileName,
         LPD3DXPRTBUFFER pBuffer);
-        
+
 HRESULT WINAPI
     D3DXSavePRTBufferToFileW(
         LPCWSTR pFileName,
@@ -2389,7 +2389,7 @@ HRESULT WINAPI
 #define D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileW
 #else
 #define D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileA
-#endif                
+#endif
 
 
 //============================================================================
@@ -2408,12 +2408,12 @@ HRESULT WINAPI
 
 HRESULT WINAPI
     D3DXLoadPRTCompBufferFromFileA(
-        LPCSTR pFilename, 
+        LPCSTR pFilename,
         LPD3DXPRTCOMPBUFFER*       ppBuffer);
-        
+
 HRESULT WINAPI
     D3DXLoadPRTCompBufferFromFileW(
-        LPCWSTR pFilename, 
+        LPCWSTR pFilename,
         LPD3DXPRTCOMPBUFFER*       ppBuffer);
 
 #ifdef UNICODE
@@ -2440,7 +2440,7 @@ HRESULT WINAPI
     D3DXSavePRTCompBufferToFileA(
         LPCSTR pFileName,
         LPD3DXPRTCOMPBUFFER pBuffer);
-        
+
 HRESULT WINAPI
     D3DXSavePRTCompBufferToFileW(
         LPCWSTR pFileName,
@@ -2450,7 +2450,7 @@ HRESULT WINAPI
 #define D3DXSavePRTCompBufferToFile D3DXSavePRTCompBufferToFileW
 #else
 #define D3DXSavePRTCompBufferToFile D3DXSavePRTCompBufferToFileA
-#endif 
+#endif
 
 //============================================================================
 //
@@ -2481,10 +2481,10 @@ HRESULT WINAPI
 HRESULT WINAPI
     D3DXCreatePRTCompBuffer(
         D3DXSHCOMPRESSQUALITYTYPE Quality,
-        UINT NumClusters, 
+        UINT NumClusters,
         UINT NumPCA,
         LPD3DXSHPRTSIMCB pCB,
-        LPVOID lpUserContext,        
+        LPVOID lpUserContext,
         LPD3DXPRTBUFFER  pBufferIn,
         LPD3DXPRTCOMPBUFFER *ppBufferOut
     );
@@ -2512,11 +2512,11 @@ HRESULT WINAPI
 //============================================================================
 
 
-HRESULT WINAPI 
-    D3DXCreateTextureGutterHelper( 
+HRESULT WINAPI
+    D3DXCreateTextureGutterHelper(
         UINT Width,
         UINT Height,
-        LPD3DXMESH pMesh, 
+        LPD3DXMESH pMesh,
         FLOAT GutterSize,
         LPD3DXTEXTUREGUTTERHELPER* ppBuffer);
 
@@ -2545,12 +2545,12 @@ HRESULT WINAPI
 //============================================================================
 
 
-HRESULT WINAPI 
-    D3DXCreatePRTEngine( 
+HRESULT WINAPI
+    D3DXCreatePRTEngine(
         LPD3DXMESH pMesh,
         DWORD *pAdjacency,
         BOOL ExtractUVs,
-        LPD3DXMESH pBlockerMesh, 
+        LPD3DXMESH pBlockerMesh,
         LPD3DXPRTENGINE* ppEngine);
 
 //============================================================================
@@ -2587,15 +2587,15 @@ HRESULT WINAPI
 //============================================================================
 
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXConcatenateMeshes(
-        LPD3DXMESH *ppMeshes, 
-        UINT NumMeshes, 
-        DWORD Options, 
-        CONST D3DXMATRIX *pGeomXForms, 
-        CONST D3DXMATRIX *pTextureXForms, 
+        LPD3DXMESH *ppMeshes,
+        UINT NumMeshes,
+        DWORD Options,
+        CONST D3DXMATRIX *pGeomXForms,
+        CONST D3DXMATRIX *pTextureXForms,
         CONST D3DVERTEXELEMENT9 *pDecl,
-        LPDIRECT3DDEVICE9 pD3DDevice, 
+        LPDIRECT3DDEVICE9 pD3DDevice,
         LPD3DXMESH *ppMeshOut);
 
 //============================================================================
@@ -2621,16 +2621,16 @@ HRESULT WINAPI
 //      that corresponding cluster was assigned to
 //   pNumSuperClusters
 //      Returns the number of super clusters allocated
-//      
+//
 //============================================================================
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSHPRTCompSuperCluster(
-        UINT *pClusterIDs, 
-        LPD3DXMESH pScene, 
-        UINT MaxNumClusters, 
+        UINT *pClusterIDs,
+        LPD3DXMESH pScene,
+        UINT MaxNumClusters,
         UINT NumClusters,
-        UINT *pSuperClusterIDs, 
+        UINT *pSuperClusterIDs,
         UINT *pNumSuperClusters);
 
 //============================================================================
@@ -2642,7 +2642,7 @@ HRESULT WINAPI
 //  to split the mesh into a group of faces/vertices per super cluster.
 //  Each super cluster contains all of the faces that contain any vertex
 //  classified in one of its clusters.  All of the vertices connected to this
-//  set of faces are also included with the returned array ppVertStatus 
+//  set of faces are also included with the returned array ppVertStatus
 //  indicating whether or not the vertex belongs to the supercluster.
 //
 //  Parameters:
@@ -2665,12 +2665,12 @@ HRESULT WINAPI
 //   NumFaces
 //      Number of faces in the original mesh (pInputIB is 3 times this length)
 //   ppIBData
-//      LPD3DXBUFFER holds raw index buffer that will contain the resulting split faces.  
+//      LPD3DXBUFFER holds raw index buffer that will contain the resulting split faces.
 //      Format determined by bIBIs32Bit.  Allocated by function
 //   pIBDataLength
 //      Length of ppIBData, assigned in function
 //   OutputIBIs32Bit
-//      Indicates whether the output index buffer is to be 32-bit (otherwise 
+//      Indicates whether the output index buffer is to be 32-bit (otherwise
 //      16-bit is assumed)
 //   ppFaceRemap
 //      LPD3DXBUFFER mapping of each face in ppIBData to original faces.  Length is
@@ -2688,33 +2688,33 @@ HRESULT WINAPI
 //
 //============================================================================
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXSHPRTCompSplitMeshSC(
-        UINT *pClusterIDs, 
-        UINT NumVertices, 
-        UINT NumClusters, 
-        UINT *pSuperClusterIDs, 
+        UINT *pClusterIDs,
+        UINT NumVertices,
+        UINT NumClusters,
+        UINT *pSuperClusterIDs,
         UINT NumSuperClusters,
-        LPVOID pInputIB, 
-        BOOL InputIBIs32Bit, 
+        LPVOID pInputIB,
+        BOOL InputIBIs32Bit,
         UINT NumFaces,
-        LPD3DXBUFFER *ppIBData, 
-        UINT *pIBDataLength, 
-        BOOL OutputIBIs32Bit, 
-        LPD3DXBUFFER *ppFaceRemap, 
-        LPD3DXBUFFER *ppVertData, 
-        UINT *pVertDataLength, 
+        LPD3DXBUFFER *ppIBData,
+        UINT *pIBDataLength,
+        BOOL OutputIBIs32Bit,
+        LPD3DXBUFFER *ppFaceRemap,
+        LPD3DXBUFFER *ppVertData,
+        UINT *pVertDataLength,
         UINT *pSCClusterList,
         D3DXSHPRTSPLITMESHCLUSTERDATA *pSCData);
-        
-        
+
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus
 
 //////////////////////////////////////////////////////////////////////////////
 //
-//  Definitions of .X file templates used by mesh load/save functions 
+//  Definitions of .X file templates used by mesh load/save functions
 //    that are not RM standard
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -2724,35 +2724,35 @@ DEFINE_GUID(DXFILEOBJ_XSkinMeshHeader,
 0x3cf169ce, 0xff7c, 0x44ab, 0x93, 0xc0, 0xf7, 0x8f, 0x62, 0xd1, 0x72, 0xe2);
 
 // {B8D65549-D7C9-4995-89CF-53A9A8B031E3}
-DEFINE_GUID(DXFILEOBJ_VertexDuplicationIndices, 
+DEFINE_GUID(DXFILEOBJ_VertexDuplicationIndices,
 0xb8d65549, 0xd7c9, 0x4995, 0x89, 0xcf, 0x53, 0xa9, 0xa8, 0xb0, 0x31, 0xe3);
 
 // {A64C844A-E282-4756-8B80-250CDE04398C}
-DEFINE_GUID(DXFILEOBJ_FaceAdjacency, 
+DEFINE_GUID(DXFILEOBJ_FaceAdjacency,
 0xa64c844a, 0xe282, 0x4756, 0x8b, 0x80, 0x25, 0xc, 0xde, 0x4, 0x39, 0x8c);
 
 // {6F0D123B-BAD2-4167-A0D0-80224F25FABB}
-DEFINE_GUID(DXFILEOBJ_SkinWeights, 
+DEFINE_GUID(DXFILEOBJ_SkinWeights,
 0x6f0d123b, 0xbad2, 0x4167, 0xa0, 0xd0, 0x80, 0x22, 0x4f, 0x25, 0xfa, 0xbb);
 
 // {A3EB5D44-FC22-429d-9AFB-3221CB9719A6}
-DEFINE_GUID(DXFILEOBJ_Patch, 
+DEFINE_GUID(DXFILEOBJ_Patch,
 0xa3eb5d44, 0xfc22, 0x429d, 0x9a, 0xfb, 0x32, 0x21, 0xcb, 0x97, 0x19, 0xa6);
 
 // {D02C95CC-EDBA-4305-9B5D-1820D7704BBF}
-DEFINE_GUID(DXFILEOBJ_PatchMesh, 
+DEFINE_GUID(DXFILEOBJ_PatchMesh,
 0xd02c95cc, 0xedba, 0x4305, 0x9b, 0x5d, 0x18, 0x20, 0xd7, 0x70, 0x4b, 0xbf);
 
 // {B9EC94E1-B9A6-4251-BA18-94893F02C0EA}
-DEFINE_GUID(DXFILEOBJ_PatchMesh9, 
+DEFINE_GUID(DXFILEOBJ_PatchMesh9,
 0xb9ec94e1, 0xb9a6, 0x4251, 0xba, 0x18, 0x94, 0x89, 0x3f, 0x2, 0xc0, 0xea);
 
 // {B6C3E656-EC8B-4b92-9B62-681659522947}
-DEFINE_GUID(DXFILEOBJ_PMInfo, 
+DEFINE_GUID(DXFILEOBJ_PMInfo,
 0xb6c3e656, 0xec8b, 0x4b92, 0x9b, 0x62, 0x68, 0x16, 0x59, 0x52, 0x29, 0x47);
 
 // {917E0427-C61E-4a14-9C64-AFE65F9E9844}
-DEFINE_GUID(DXFILEOBJ_PMAttributeRange, 
+DEFINE_GUID(DXFILEOBJ_PMAttributeRange,
 0x917e0427, 0xc61e, 0x4a14, 0x9c, 0x64, 0xaf, 0xe6, 0x5f, 0x9e, 0x98, 0x44);
 
 // {574CCC14-F0B3-4333-822D-93E8A8A08E4C}
@@ -2760,35 +2760,35 @@ DEFINE_GUID(DXFILEOBJ_PMVSplitRecord,
 0x574ccc14, 0xf0b3, 0x4333, 0x82, 0x2d, 0x93, 0xe8, 0xa8, 0xa0, 0x8e, 0x4c);
 
 // {B6E70A0E-8EF9-4e83-94AD-ECC8B0C04897}
-DEFINE_GUID(DXFILEOBJ_FVFData, 
+DEFINE_GUID(DXFILEOBJ_FVFData,
 0xb6e70a0e, 0x8ef9, 0x4e83, 0x94, 0xad, 0xec, 0xc8, 0xb0, 0xc0, 0x48, 0x97);
 
 // {F752461C-1E23-48f6-B9F8-8350850F336F}
-DEFINE_GUID(DXFILEOBJ_VertexElement, 
+DEFINE_GUID(DXFILEOBJ_VertexElement,
 0xf752461c, 0x1e23, 0x48f6, 0xb9, 0xf8, 0x83, 0x50, 0x85, 0xf, 0x33, 0x6f);
 
 // {BF22E553-292C-4781-9FEA-62BD554BDD93}
-DEFINE_GUID(DXFILEOBJ_DeclData, 
+DEFINE_GUID(DXFILEOBJ_DeclData,
 0xbf22e553, 0x292c, 0x4781, 0x9f, 0xea, 0x62, 0xbd, 0x55, 0x4b, 0xdd, 0x93);
 
 // {F1CFE2B3-0DE3-4e28-AFA1-155A750A282D}
-DEFINE_GUID(DXFILEOBJ_EffectFloats, 
+DEFINE_GUID(DXFILEOBJ_EffectFloats,
 0xf1cfe2b3, 0xde3, 0x4e28, 0xaf, 0xa1, 0x15, 0x5a, 0x75, 0xa, 0x28, 0x2d);
 
 // {D55B097E-BDB6-4c52-B03D-6051C89D0E42}
-DEFINE_GUID(DXFILEOBJ_EffectString, 
+DEFINE_GUID(DXFILEOBJ_EffectString,
 0xd55b097e, 0xbdb6, 0x4c52, 0xb0, 0x3d, 0x60, 0x51, 0xc8, 0x9d, 0xe, 0x42);
 
 // {622C0ED0-956E-4da9-908A-2AF94F3CE716}
-DEFINE_GUID(DXFILEOBJ_EffectDWord, 
+DEFINE_GUID(DXFILEOBJ_EffectDWord,
 0x622c0ed0, 0x956e, 0x4da9, 0x90, 0x8a, 0x2a, 0xf9, 0x4f, 0x3c, 0xe7, 0x16);
 
 // {3014B9A0-62F5-478c-9B86-E4AC9F4E418B}
-DEFINE_GUID(DXFILEOBJ_EffectParamFloats, 
+DEFINE_GUID(DXFILEOBJ_EffectParamFloats,
 0x3014b9a0, 0x62f5, 0x478c, 0x9b, 0x86, 0xe4, 0xac, 0x9f, 0x4e, 0x41, 0x8b);
 
 // {1DBC4C88-94C1-46ee-9076-2C28818C9481}
-DEFINE_GUID(DXFILEOBJ_EffectParamString, 
+DEFINE_GUID(DXFILEOBJ_EffectParamString,
 0x1dbc4c88, 0x94c1, 0x46ee, 0x90, 0x76, 0x2c, 0x28, 0x81, 0x8c, 0x94, 0x81);
 
 // {E13963BC-AE51-4c5d-B00F-CFA3A9D97CE5}
@@ -2796,15 +2796,15 @@ DEFINE_GUID(DXFILEOBJ_EffectParamDWord,
 0xe13963bc, 0xae51, 0x4c5d, 0xb0, 0xf, 0xcf, 0xa3, 0xa9, 0xd9, 0x7c, 0xe5);
 
 // {E331F7E4-0559-4cc2-8E99-1CEC1657928F}
-DEFINE_GUID(DXFILEOBJ_EffectInstance, 
+DEFINE_GUID(DXFILEOBJ_EffectInstance,
 0xe331f7e4, 0x559, 0x4cc2, 0x8e, 0x99, 0x1c, 0xec, 0x16, 0x57, 0x92, 0x8f);
 
 // {9E415A43-7BA6-4a73-8743-B73D47E88476}
-DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond, 
+DEFINE_GUID(DXFILEOBJ_AnimTicksPerSecond,
 0x9e415a43, 0x7ba6, 0x4a73, 0x87, 0x43, 0xb7, 0x3d, 0x47, 0xe8, 0x84, 0x76);
 
 // {7F9B00B3-F125-4890-876E-1CFFBF697C4D}
-DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet, 
+DEFINE_GUID(DXFILEOBJ_CompressedAnimationSet,
 0x7f9b00b3, 0xf125, 0x4890, 0x87, 0x6e, 0x1c, 0x42, 0xbf, 0x69, 0x7c, 0x4d);
 
 #pragma pack(push, 1)
@@ -2986,7 +2986,7 @@ typedef struct _XFILECOMPRESSEDANIMATIONSET
             DWORD nAttributeMispredicts; \
             array DWORD attributeMispredicts[nAttributeMispredicts]; \
         } "
-        
+
 #endif //__D3DX9MESH_H__
 
 
diff --git a/src/dep/include/DXSDK/include/d3dx9shader.h b/src/dep/include/DXSDK/include/d3dx9shader.h
index f84d75e..b0bfb26 100644
--- a/src/dep/include/DXSDK/include/d3dx9shader.h
+++ b/src/dep/include/DXSDK/include/d3dx9shader.h
@@ -35,9 +35,9 @@
 //   you KNOW will work.  (ie. have compiled before without this option.)
 //   Shaders are always validated by D3D before they are set to the device.
 //
-// D3DXSHADER_SKIPOPTIMIZATION 
+// D3DXSHADER_SKIPOPTIMIZATION
 //   Instructs the compiler to skip optimization steps during code generation.
-//   Unless you are trying to isolate a problem in your code using this option 
+//   Unless you are trying to isolate a problem in your code using this option
 //   is not recommended.
 //
 // D3DXSHADER_PACKMATRIX_ROWMAJOR
@@ -45,8 +45,8 @@
 //   on input and output from the shader.
 //
 // D3DXSHADER_PACKMATRIX_COLUMNMAJOR
-//   Unless explicitly specified, matrices will be packed in column-major 
-//   order on input and output from the shader.  This is generally more 
+//   Unless explicitly specified, matrices will be packed in column-major
+//   order on input and output from the shader.  This is generally more
 //   efficient, since it allows vector-matrix multiplication to be performed
 //   using a series of dot-products.
 //
@@ -56,16 +56,16 @@
 //
 // D3DXSHADER_FORCE_VS_SOFTWARE_NOOPT
 //   Force compiler to compile against the next highest available software
-//   target for vertex shaders.  This flag also turns optimizations off, 
-//   and debugging on.  
+//   target for vertex shaders.  This flag also turns optimizations off,
+//   and debugging on.
 //
 // D3DXSHADER_FORCE_PS_SOFTWARE_NOOPT
 //   Force compiler to compile against the next highest available software
-//   target for pixel shaders.  This flag also turns optimizations off, 
+//   target for pixel shaders.  This flag also turns optimizations off,
 //   and debugging on.
 //
 // D3DXSHADER_NO_PRESHADER
-//   Disables Preshaders. Using this flag will cause the compiler to not 
+//   Disables Preshaders. Using this flag will cause the compiler to not
 //   pull out static expression for evaluation on the host cpu
 //
 // D3DXSHADER_AVOID_FLOW_CONTROL
@@ -258,7 +258,7 @@ typedef interface ID3DXConstantTable ID3DXConstantTable;
 typedef interface ID3DXConstantTable *LPD3DXCONSTANTTABLE;
 
 // {AB3C758F-093E-4356-B762-4DB18F1B3A01}
-DEFINE_GUID(IID_ID3DXConstantTable, 
+DEFINE_GUID(IID_ID3DXConstantTable,
 0xab3c758f, 0x93e, 0x4356, 0xb7, 0x62, 0x4d, 0xb1, 0x8f, 0x1b, 0x3a, 0x1);
 
 
@@ -314,7 +314,7 @@ typedef interface ID3DXTextureShader ID3DXTextureShader;
 typedef interface ID3DXTextureShader *LPD3DXTEXTURESHADER;
 
 // {3E3D67F8-AA7A-405d-A857-BA01D4758426}
-DEFINE_GUID(IID_ID3DXTextureShader, 
+DEFINE_GUID(IID_ID3DXTextureShader,
 0x3e3d67f8, 0xaa7a, 0x405d, 0xa8, 0x57, 0xba, 0x1, 0xd4, 0x75, 0x84, 0x26);
 
 #undef INTERFACE
@@ -369,7 +369,7 @@ typedef interface ID3DXFragmentLinker ID3DXFragmentLinker;
 typedef interface ID3DXFragmentLinker *LPD3DXFRAGMENTLINKER;
 
 // {1A2C0CC2-E5B6-4ebc-9E8D-390E057811B6}
-DEFINE_GUID(IID_ID3DXFragmentLinker, 
+DEFINE_GUID(IID_ID3DXFragmentLinker,
 0x1a2c0cc2, 0xe5b6, 0x4ebc, 0x9e, 0x8d, 0x39, 0xe, 0x5, 0x78, 0x11, 0xb6);
 
 #undef INTERFACE
@@ -584,7 +584,7 @@ HRESULT WINAPI
 //      Name of the entrypoint function where execution should begin.
 //  pProfile
 //      Instruction set to be used when generating code.  Currently supported
-//      profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1", 
+//      profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
 //      "ps_1_2", "ps_1_3", "ps_1_4", "ps_2_0", "ps_2_a", "ps_2_sw", "tx_1_0"
 //  Flags
 //      See D3DXSHADER_xxx flags.
@@ -701,9 +701,9 @@ HRESULT WINAPI
 
 HRESULT WINAPI
     D3DXDisassembleShader(
-        CONST DWORD*                    pShader, 
-        BOOL                            EnableColorCode, 
-        LPCSTR                          pComments, 
+        CONST DWORD*                    pShader,
+        BOOL                            EnableColorCode,
+        LPCSTR                          pComments,
         LPD3DXBUFFER*                   ppDisassembly);
 
 
@@ -771,7 +771,7 @@ UINT WINAPI
 //----------------------------------------------------------------------------
 // D3DXGetShaderVersion:
 // -----------------------
-// Returns the shader version of a given shader.  Returns zero if the shader 
+// Returns the shader version of a given shader.  Returns zero if the shader
 // function is NULL.
 //
 // Parameters:
@@ -869,13 +869,13 @@ HRESULT WINAPI
 //  pFunction
 //      Pointer to the function DWORD stream
 //  ppTextureShader
-//      Returns a ID3DXTextureShader object which can be used to procedurally 
+//      Returns a ID3DXTextureShader object which can be used to procedurally
 //      fill the contents of a texture using the D3DXFillTextureTX functions.
 //----------------------------------------------------------------------------
 
 HRESULT WINAPI
     D3DXCreateTextureShader(
-        CONST DWORD*                    pFunction, 
+        CONST DWORD*                    pFunction,
         LPD3DXTEXTURESHADER*            ppTextureShader);
 
 
@@ -982,7 +982,7 @@ HRESULT WINAPI
 //----------------------------------------------------------------------------
 // D3DXCreateFragmentLinker:
 // -------------------------
-// Creates a fragment linker with a given cache size.  The interface returned 
+// Creates a fragment linker with a given cache size.  The interface returned
 // can be used to link together shader fragments.  (both HLSL & ASM fragements)
 //
 // Parameters:
@@ -1036,15 +1036,15 @@ HRESULT WINAPI
 //      these are the same messages you will see in your debug output.
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXPreprocessShaderFromFileA(
         LPCSTR                       pSrcFile,
         CONST D3DXMACRO*             pDefines,
         LPD3DXINCLUDE                pInclude,
         LPD3DXBUFFER*                ppShaderText,
         LPD3DXBUFFER*                ppErrorMsgs);
-                                             
-HRESULT WINAPI 
+
+HRESULT WINAPI
     D3DXPreprocessShaderFromFileW(
         LPCWSTR                      pSrcFile,
         CONST D3DXMACRO*             pDefines,
@@ -1057,8 +1057,8 @@ HRESULT WINAPI
 #else
 #define D3DXPreprocessShaderFromFile D3DXPreprocessShaderFromFileA
 #endif
-                                             
-HRESULT WINAPI 
+
+HRESULT WINAPI
     D3DXPreprocessShaderFromResourceA(
         HMODULE                      hSrcModule,
         LPCSTR                       pSrcResource,
@@ -1067,7 +1067,7 @@ HRESULT WINAPI
         LPD3DXBUFFER*                ppShaderText,
         LPD3DXBUFFER*                ppErrorMsgs);
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXPreprocessShaderFromResourceW(
         HMODULE                      hSrcModule,
         LPCWSTR                      pSrcResource,
@@ -1082,7 +1082,7 @@ HRESULT WINAPI
 #define D3DXPreprocessShaderFromResource D3DXPreprocessShaderFromResourceA
 #endif
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXPreprocessShader(
         LPCSTR                       pSrcData,
         UINT                         SrcDataSize,
@@ -1117,7 +1117,7 @@ typedef struct _D3DXSHADER_CONSTANTTABLE
     DWORD Constants;        // number of constants
     DWORD ConstantInfo;     // D3DXSHADER_CONSTANTINFO[Constants] offset
     DWORD Flags;            // flags shader was compiled with
-    DWORD Target;           // LPCSTR offset 
+    DWORD Target;           // LPCSTR offset
 
 } D3DXSHADER_CONSTANTTABLE, *LPD3DXSHADER_CONSTANTTABLE;
 
diff --git a/src/dep/include/DXSDK/include/d3dx9shape.h b/src/dep/include/DXSDK/include/d3dx9shape.h
index 4c23091..0dfc15f 100644
--- a/src/dep/include/DXSDK/include/d3dx9shape.h
+++ b/src/dep/include/DXSDK/include/d3dx9shape.h
@@ -22,7 +22,7 @@ extern "C" {
 
 
 //-------------------------------------------------------------------------
-// D3DXCreatePolygon: 
+// D3DXCreatePolygon:
 // ------------------
 // Creates a mesh containing an n-sided polygon.  The polygon is centered
 // at the origin.
@@ -35,17 +35,17 @@ extern "C" {
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreatePolygon(
         LPDIRECT3DDEVICE9   pDevice,
-        FLOAT               Length, 
-        UINT                Sides, 
+        FLOAT               Length,
+        UINT                Sides,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateBox: 
+// D3DXCreateBox:
 // --------------
 // Creates a mesh containing an axis-aligned box.  The box is centered at
 // the origin.
@@ -59,9 +59,9 @@ HRESULT WINAPI
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateBox(
-        LPDIRECT3DDEVICE9   pDevice, 
+        LPDIRECT3DDEVICE9   pDevice,
         FLOAT               Width,
         FLOAT               Height,
         FLOAT               Depth,
@@ -86,14 +86,14 @@ HRESULT WINAPI
 //  ppMesh      The mesh object which will be created
 //  ppAdjacency Returns a buffer containing adjacency info.  Can be NULL.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateCylinder(
         LPDIRECT3DDEVICE9   pDevice,
-        FLOAT               Radius1, 
-        FLOAT               Radius2, 
-        FLOAT               Length, 
-        UINT                Slices, 
-        UINT                Stacks,   
+        FLOAT               Radius1,
+        FLOAT               Radius2,
+        FLOAT               Length,
+        UINT                Slices,
+        UINT                Stacks,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
@@ -115,9 +115,9 @@ HRESULT WINAPI
 //-------------------------------------------------------------------------
 HRESULT WINAPI
     D3DXCreateSphere(
-        LPDIRECT3DDEVICE9  pDevice, 
-        FLOAT              Radius, 
-        UINT               Slices, 
+        LPDIRECT3DDEVICE9  pDevice,
+        FLOAT              Radius,
+        UINT               Slices,
         UINT               Stacks,
         LPD3DXMESH*        ppMesh,
         LPD3DXBUFFER*      ppAdjacency);
@@ -129,7 +129,7 @@ HRESULT WINAPI
 // Creates a mesh containing a torus.  The generated torus is centered at
 // the origin, and its axis is aligned with the Z-axis.
 //
-// Parameters: 
+// Parameters:
 //
 //  pDevice     The D3D device with which the mesh is going to be used.
 //  InnerRadius Inner radius of the torus (should be >= 0.0f)
@@ -143,19 +143,19 @@ HRESULT WINAPI
     D3DXCreateTorus(
         LPDIRECT3DDEVICE9   pDevice,
         FLOAT               InnerRadius,
-        FLOAT               OuterRadius, 
+        FLOAT               OuterRadius,
         UINT                Sides,
-        UINT                Rings, 
+        UINT                Rings,
         LPD3DXMESH*         ppMesh,
         LPD3DXBUFFER*       ppAdjacency);
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateTeapot: 
+// D3DXCreateTeapot:
 // -----------------
 // Creates a mesh containing a teapot.
 //
-// Parameters: 
+// Parameters:
 //
 //  pDevice     The D3D device with which the mesh is going to be used.
 //  ppMesh      The mesh object which will be created
@@ -169,8 +169,8 @@ HRESULT WINAPI
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateText: 
-// --------------- 
+// D3DXCreateText:
+// ---------------
 // Creates a mesh containing the specified text using the font associated
 // with the device context.
 //
@@ -215,7 +215,7 @@ HRESULT WINAPI
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus    
+#endif //__cplusplus
 
 #endif //__D3DX9SHAPES_H__
 
diff --git a/src/dep/include/DXSDK/include/d3dx9tex.h b/src/dep/include/DXSDK/include/d3dx9tex.h
index 34cd8e2..ad67ae4 100644
--- a/src/dep/include/DXSDK/include/d3dx9tex.h
+++ b/src/dep/include/DXSDK/include/d3dx9tex.h
@@ -27,14 +27,14 @@
 //      from the source image.
 //  D3DX_FILTER_LINEAR
 //      Each destination pixel is computed by linearly interpolating between
-//      the nearest pixels in the source image.  This filter works best 
+//      the nearest pixels in the source image.  This filter works best
 //      when the scale on each axis is less than 2.
 //  D3DX_FILTER_TRIANGLE
 //      Every pixel in the source image contributes equally to the
 //      destination image.  This is the slowest of all the filters.
 //  D3DX_FILTER_BOX
-//      Each pixel is computed by averaging a 2x2(x2) box pixels from 
-//      the source image. Only works when the dimensions of the 
+//      Each pixel is computed by averaging a 2x2(x2) box pixels from
+//      the source image. Only works when the dimensions of the
 //      destination are half those of the source. (as with mip maps)
 //
 // And can be OR'd with any of these optional flags:
@@ -107,7 +107,7 @@
 //  D3DX_NORMALMAP_MIRROR
 //      Same as specifying D3DX_NORMALMAP_MIRROR_U | D3DX_NORMALMAP_MIRROR_V
 //  D3DX_NORMALMAP_INVERTSIGN
-//      Inverts the direction of each normal 
+//      Inverts the direction of each normal
 //  D3DX_NORMALMAP_COMPUTE_OCCLUSION
 //      Compute the per pixel Occlusion term and encodes it into the alpha.
 //      An Alpha of 1 means that the pixel is not obscured in anyway, and
@@ -141,7 +141,7 @@
 // D3DX_CHANNEL_ALPHA
 //     Indicates the alpha channel should be used
 // D3DX_CHANNEL_LUMINANCE
-//     Indicates the luminaces of the red green and blue channels should be 
+//     Indicates the luminaces of the red green and blue channels should be
 //     used.
 //
 //----------------------------------------------------------------------------
@@ -186,10 +186,10 @@ typedef enum _D3DXIMAGE_FILEFORMAT
 // Parameters:
 //  pOut
 //      Pointer to a vector which the function uses to return its result.
-//      X,Y,Z,W will be mapped to R,G,B,A respectivly. 
+//      X,Y,Z,W will be mapped to R,G,B,A respectivly.
 //  pTexCoord
-//      Pointer to a vector containing the coordinates of the texel currently 
-//      being evaluated.  Textures and VolumeTexture texcoord components 
+//      Pointer to a vector containing the coordinates of the texel currently
+//      being evaluated.  Textures and VolumeTexture texcoord components
 //      range from 0 to 1. CubeTexture texcoord component range from -1 to 1.
 //  pTexelSize
 //      Pointer to a vector containing the dimensions of the current texel.
@@ -198,12 +198,12 @@ typedef enum _D3DXIMAGE_FILEFORMAT
 //
 //----------------------------------------------------------------------------
 
-typedef VOID (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *pOut, 
+typedef VOID (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *pOut,
     CONST D3DXVECTOR2 *pTexCoord, CONST D3DXVECTOR2 *pTexelSize, LPVOID pData);
 
-typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut, 
+typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut,
     CONST D3DXVECTOR3 *pTexCoord, CONST D3DXVECTOR3 *pTexelSize, LPVOID pData);
- 
+
 
 
 //----------------------------------------------------------------------------
@@ -211,7 +211,7 @@ typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut,
 // ---------------
 // This structure is used to return a rough description of what the
 // the original contents of an image file looked like.
-// 
+//
 //  Width
 //      Width of original image in pixels
 //  Height
@@ -274,7 +274,7 @@ extern "C" {
 //  SrcDataSize
 //      Size in bytes of file in memory.
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file.
 //
 //----------------------------------------------------------------------------
@@ -359,10 +359,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //
 //----------------------------------------------------------------------------
@@ -468,7 +468,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -514,7 +514,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -637,10 +637,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //
 //----------------------------------------------------------------------------
@@ -744,7 +744,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -794,7 +794,7 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //
 //----------------------------------------------------------------------------
@@ -1022,15 +1022,15 @@ HRESULT WINAPI
 //  SrcDataSize
 //      Size in bytes of file in memory.
 //  Width, Height, Depth, Size
-//      Size in pixels.  If zero or D3DX_DEFAULT, the size will be taken from 
-//      the file and rounded up to a power of two.  If D3DX_DEFAULT_NONPOW2, 
+//      Size in pixels.  If zero or D3DX_DEFAULT, the size will be taken from
+//      the file and rounded up to a power of two.  If D3DX_DEFAULT_NONPOW2,
 //      and the device supports NONPOW2 textures, the size will not be rounded.
-//      If D3DX_FROM_FILE, the size will be taken exactly as it is in the file, 
+//      If D3DX_FROM_FILE, the size will be taken exactly as it is in the file,
 //      and the call will fail if this violates device capabilities.
 //  MipLevels
 //      Number of mip levels.  If zero or D3DX_DEFAULT, a complete mipmap
-//      chain will be created.  If D3DX_FROM_FILE, the size will be taken 
-//      exactly as it is in the file, and the call will fail if this violates 
+//      chain will be created.  If D3DX_FROM_FILE, the size will be taken
+//      exactly as it is in the file, and the call will fail if this violates
 //      device capabilities.
 //  Usage
 //      Texture usage flags
@@ -1052,10 +1052,10 @@ HRESULT WINAPI
 //  ColorKey
 //      Color to replace with transparent black, or 0 to disable colorkey.
 //      This is always a 32-bit ARGB color, independent of the source image
-//      format.  Alpha is significant, and should usually be set to FF for 
+//      format.  Alpha is significant, and should usually be set to FF for
 //      opaque colorkeys.  (ex. Opaque black == 0xff000000)
 //  pSrcInfo
-//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the 
+//      Pointer to a D3DXIMAGE_INFO structure to be filled in with the
 //      description of the data in the source image file, or NULL.
 //  pPalette
 //      256 color palette to be filled in, or NULL
@@ -1607,7 +1607,7 @@ HRESULT WINAPI
 //  pPalette
 //      256 color palette to be used, or NULL for non-palettized formats
 //  SrcLevel
-//      The level whose image is used to generate the subsequent levels. 
+//      The level whose image is used to generate the subsequent levels.
 //  Filter
 //      D3DX_FILTER flags controlling how each miplevel is filtered.
 //      Or D3DX_DEFAULT for D3DX_FILTER_BOX,
@@ -1636,10 +1636,10 @@ HRESULT WINAPI
 //  pTexture, pCubeTexture, pVolumeTexture
 //      Pointer to the texture to be filled.
 //  pFunction
-//      Pointer to user provided evalutor function which will be used to 
+//      Pointer to user provided evalutor function which will be used to
 //      compute the value of each texel.
 //  pData
-//      Pointer to an arbitrary block of user defined data.  This pointer 
+//      Pointer to an arbitrary block of user defined data.  This pointer
 //      will be passed to the function provided in pFunction
 //-----------------------------------------------------------------------------
 
@@ -1665,7 +1665,7 @@ HRESULT WINAPI
 // D3DXFillTextureTX:
 // ------------------
 // Uses a TX Shader target to function to fill each texel of each mip level
-// of a given texture. The TX Shader target should be a compiled function 
+// of a given texture. The TX Shader target should be a compiled function
 // taking 2 paramters and returning a float4 color.
 //
 // Paramters:
@@ -1675,7 +1675,7 @@ HRESULT WINAPI
 //      Pointer to the texture shader to be used to fill in the texture
 //----------------------------------------------------------------------------
 
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXFillTextureTX(
         LPDIRECT3DTEXTURE9        pTexture,
         LPD3DXTEXTURESHADER       pTextureShader);
@@ -1685,9 +1685,9 @@ HRESULT WINAPI
     D3DXFillCubeTextureTX(
         LPDIRECT3DCUBETEXTURE9    pCubeTexture,
         LPD3DXTEXTURESHADER       pTextureShader);
-                                                
-                                                        
-HRESULT WINAPI 
+
+
+HRESULT WINAPI
     D3DXFillVolumeTextureTX(
         LPDIRECT3DVOLUMETEXTURE9  pVolumeTexture,
         LPD3DXTEXTURESHADER       pTextureShader);
@@ -1704,7 +1704,7 @@ HRESULT WINAPI
 //  pTexture
 //      Pointer to the destination texture
 //  pSrcTexture
-//      Pointer to the source heightmap texture 
+//      Pointer to the source heightmap texture
 //  pSrcPalette
 //      Source palette of 256 colors, or NULL
 //  Flags
diff --git a/src/dep/include/DXSDK/include/d3dx9xof.h b/src/dep/include/DXSDK/include/d3dx9xof.h
index c513f0f..c592abd 100644
--- a/src/dep/include/DXSDK/include/d3dx9xof.h
+++ b/src/dep/include/DXSDK/include/d3dx9xof.h
@@ -82,23 +82,23 @@ typedef struct _D3DXF_FILELOADMEMORY
 #if defined( _WIN32 ) && !defined( _NO_COM )
 
 // {cef08cf9-7b4f-4429-9624-2a690a933201}
-DEFINE_GUID( IID_ID3DXFile, 
+DEFINE_GUID( IID_ID3DXFile,
 0xcef08cf9, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
 
 // {cef08cfa-7b4f-4429-9624-2a690a933201}
-DEFINE_GUID( IID_ID3DXFileSaveObject, 
+DEFINE_GUID( IID_ID3DXFileSaveObject,
 0xcef08cfa, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
 
 // {cef08cfb-7b4f-4429-9624-2a690a933201}
-DEFINE_GUID( IID_ID3DXFileSaveData, 
+DEFINE_GUID( IID_ID3DXFileSaveData,
 0xcef08cfb, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
 
 // {cef08cfc-7b4f-4429-9624-2a690a933201}
-DEFINE_GUID( IID_ID3DXFileEnumObject, 
+DEFINE_GUID( IID_ID3DXFileEnumObject,
 0xcef08cfc, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
 
 // {cef08cfd-7b4f-4429-9624-2a690a933201}
-DEFINE_GUID( IID_ID3DXFileData, 
+DEFINE_GUID( IID_ID3DXFileData,
 0xcef08cfd, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
 
 #endif // defined( _WIN32 ) && !defined( _NO_COM )
@@ -155,7 +155,7 @@ DECLARE_INTERFACE_( ID3DXFile, IUnknown )
     STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
     STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
     STDMETHOD_( ULONG, Release )( THIS ) PURE;
-    
+
     STDMETHOD( CreateEnumObject )( THIS_ LPCVOID, D3DXF_FILELOADOPTIONS,
         ID3DXFileEnumObject** ) PURE;
     STDMETHOD( CreateSaveObject )( THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS,
@@ -176,7 +176,7 @@ DECLARE_INTERFACE_( ID3DXFileSaveObject, IUnknown )
     STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
     STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
     STDMETHOD_( ULONG, Release )( THIS ) PURE;
-    
+
     STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE;
     STDMETHOD( AddDataObject )( THIS_ REFGUID, LPCSTR, CONST GUID*,
         SIZE_T, LPCVOID, ID3DXFileSaveData** ) PURE;
@@ -195,7 +195,7 @@ DECLARE_INTERFACE_( ID3DXFileSaveData, IUnknown )
     STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
     STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
     STDMETHOD_( ULONG, Release )( THIS ) PURE;
-    
+
     STDMETHOD( GetSave )( THIS_ ID3DXFileSaveObject** ) PURE;
     STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE;
     STDMETHOD( GetId )( THIS_ LPGUID ) PURE;
@@ -217,7 +217,7 @@ DECLARE_INTERFACE_( ID3DXFileEnumObject, IUnknown )
     STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
     STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
     STDMETHOD_( ULONG, Release )( THIS ) PURE;
-    
+
     STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE;
     STDMETHOD( GetChildren )( THIS_ SIZE_T* ) PURE;
     STDMETHOD( GetChild )( THIS_ SIZE_T, ID3DXFileData** ) PURE;
@@ -237,7 +237,7 @@ DECLARE_INTERFACE_( ID3DXFileData, IUnknown )
     STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
     STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
     STDMETHOD_( ULONG, Release )( THIS ) PURE;
-    
+
     STDMETHOD( GetEnum )( THIS_ ID3DXFileEnumObject** ) PURE;
     STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE;
     STDMETHOD( GetId )( THIS_ LPGUID ) PURE;
diff --git a/src/dep/include/DXSDK/include/d3dxcore.h b/src/dep/include/DXSDK/include/d3dxcore.h
index da1e989..db79f78 100644
--- a/src/dep/include/DXSDK/include/d3dxcore.h
+++ b/src/dep/include/DXSDK/include/d3dxcore.h
@@ -18,7 +18,7 @@
 typedef struct ID3DXContext *LPD3DXCONTEXT;
 
 // {9B74ED7A-BBEF-11d2-9F8E-0000F8080835}
-DEFINE_GUID(IID_ID3DXContext, 
+DEFINE_GUID(IID_ID3DXContext,
      0x9b74ed7a, 0xbbef, 0x11d2, 0x9f, 0x8e, 0x0, 0x0, 0xf8, 0x8, 0x8, 0x35);
 
 
@@ -29,22 +29,22 @@ DEFINE_GUID(IID_ID3DXContext,
 //-------------------------------------------------------------------------
 // D3DX_DEFAULT:
 // ---------
-// A predefined value that could be used for any parameter in D3DX APIs or 
-// member functions that is an enumerant or a handle.  The D3DX 
-// documentation indicates wherever D3DX_DEFAULT may be used, 
+// A predefined value that could be used for any parameter in D3DX APIs or
+// member functions that is an enumerant or a handle.  The D3DX
+// documentation indicates wherever D3DX_DEFAULT may be used,
 // and how it will be interpreted in each situation.
 //-------------------------------------------------------------------------
 #define D3DX_DEFAULT ULONG_MAX
-                            
+
 //-------------------------------------------------------------------------
 // D3DX_DEFAULT_FLOAT:
 // ------------------
 // Similar to D3DX_DEFAULT, but used for floating point parameters.
-// The D3DX documentation indicates wherever D3DX_DEFAULT_FLOAT may be used, 
+// The D3DX documentation indicates wherever D3DX_DEFAULT_FLOAT may be used,
 // and how it will be interpreted in each situation.
 //-------------------------------------------------------------------------
 #define D3DX_DEFAULT_FLOAT FLT_MAX
-                            
+
 //-------------------------------------------------------------------------
 // Hardware Acceleration Level:
 // ---------------------------
@@ -55,39 +55,39 @@ DEFINE_GUID(IID_ID3DXContext,
 // D3DXGetDeviceDescription().
 //
 // The only case these pre-defines should be used as device indices is if
-// a particular level of acceleration is required, and given more than 
+// a particular level of acceleration is required, and given more than
 // one capable device on the computer, it does not matter which one
 // is used.
 //
-// The method of selection is as follows: If one of the D3DX devices on 
-// the primary DDraw device supports a requested hardware acceleration 
-// level, it will be used. Otherwise, the first matching device discovered 
-// by D3DX will be used.  
+// The method of selection is as follows: If one of the D3DX devices on
+// the primary DDraw device supports a requested hardware acceleration
+// level, it will be used. Otherwise, the first matching device discovered
+// by D3DX will be used.
 //
 // Of course, it is possible for no match to exist for any of the
 // pre-defines on a particular computer.  Passing such a value into the
 // D3DX apis will simply cause them to fail, reporting that no match
 // is available.
-// 
+//
 // D3DX_HWLEVEL_NULL:      Null implementation (draws nothing)
 // D3DX_HWLEVEL_REFERENCE: Reference implementation (slowest)
 // D3DX_HWLEVEL_2D:        2D acceleration only (RGB rasterizer used)
 // D3DX_HWLEVEL_RASTER:    Rasterization acceleration (likely most useful)
-// D3DX_HWLEVEL_TL:        Transform and lighting acceleration 
+// D3DX_HWLEVEL_TL:        Transform and lighting acceleration
 // D3DX_DEFAULT:           The highest level of acceleration available
 //                         on the primary DDraw device.
 //-------------------------------------------------------------------------
 #define D3DX_HWLEVEL_NULL       (D3DX_DEFAULT - 1)
 #define D3DX_HWLEVEL_REFERENCE  (D3DX_DEFAULT - 2)
-#define D3DX_HWLEVEL_2D         (D3DX_DEFAULT - 3) 
-#define D3DX_HWLEVEL_RASTER     (D3DX_DEFAULT - 4) 
-#define D3DX_HWLEVEL_TL         (D3DX_DEFAULT - 5) 
+#define D3DX_HWLEVEL_2D         (D3DX_DEFAULT - 3)
+#define D3DX_HWLEVEL_RASTER     (D3DX_DEFAULT - 4)
+#define D3DX_HWLEVEL_TL         (D3DX_DEFAULT - 5)
 
 //-------------------------------------------------------------------------
 // Surface Class:
 // -------------
 // These are the various types of 2D-surfaces classified according to their
-// usage. Note that a number of them overlap. e.g. STENCILBUFFERS and 
+// usage. Note that a number of them overlap. e.g. STENCILBUFFERS and
 // DEPTHBUFFERS overlap (since in DX7 implementation the stencil and depth
 // bits are part of the same pixel format).
 //
@@ -95,15 +95,15 @@ DEFINE_GUID(IID_ID3DXContext,
 // -----------------------------------------
 // D3DX_SC_DEPTHBUFFER:    All ddpfs which have the DDPF_ZPIXELS or the
 //                           DDPF_ZBUFFER flags set.
-// D3DX_SC_STENCILBUFFER:  All ddpfs which have the DDPF_STENCILBUFFER 
+// D3DX_SC_STENCILBUFFER:  All ddpfs which have the DDPF_STENCILBUFFER
 //                          flag set.
-// D3DX_SC_BUMPMAP:        All ddpfs which have the DDPF_BUMPLUMINANCE 
+// D3DX_SC_BUMPMAP:        All ddpfs which have the DDPF_BUMPLUMINANCE
 //                           or the DDPF_BUMPDUDV flags set.
 // D3DX_SC_LUMINANCEMAP:   All ddpfs which have the DDPF_BUMPLUMINANCE
 //                           or the DDPF_LUMINANCE flags set.
 // D3DX_SC_COLORTEXTURE:   All the surfaces that have color information in
 //                           them and can be used for texturing.
-// D3DX_SC_COLORRENDERTGT: All the surfaces that contain color 
+// D3DX_SC_COLORRENDERTGT: All the surfaces that contain color
 //                           information and can be used as render targets.
 //-------------------------------------------------------------------------
 #define D3DX_SC_DEPTHBUFFER     0x01
@@ -116,11 +116,11 @@ DEFINE_GUID(IID_ID3DXContext,
 //-------------------------------------------------------------------------
 // Surface Formats:
 // ---------------
-// These are the various types of surface formats that can be enumerated, 
-// there is no DDPIXELFORMAT structure in D3DX, the enums carry the meaning 
+// These are the various types of surface formats that can be enumerated,
+// there is no DDPIXELFORMAT structure in D3DX, the enums carry the meaning
 // (like FOURCCs).
 //
-// All the surface classes are represented here.  
+// All the surface classes are represented here.
 //
 //-------------------------------------------------------------------------
 typedef enum _D3DX_SURFACEFORMAT
@@ -162,10 +162,10 @@ typedef enum _D3DX_SURFACEFORMAT
 } D3DX_SURFACEFORMAT;
 
 //-------------------------------------------------------------------------
-// Filtering types for Texture APIs 
+// Filtering types for Texture APIs
 //
 // -------------
-// These are the various filter types for generation of mip-maps 
+// These are the various filter types for generation of mip-maps
 //
 // D3DX_FILTERTYPE
 // -----------------------------------------
@@ -187,7 +187,7 @@ typedef enum _D3DX_FILTERTYPE
 //-------------------------------------------------------------------------
 // D3DX_VIDMODEDESC: Display mode description.
 // ----------------
-// width:       Screen Width 
+// width:       Screen Width
 // height:      Screen Height
 // bpp:         Bits per pixel
 // refreshRate: Refresh rate
@@ -216,10 +216,10 @@ typedef struct  _D3DX_VIDMODEDESC
 //                a particular driver revision on a particular video card.
 // driverDesc:    String describing the driver
 // monitor:       Handle to the video monitor used by this device (multimon
-//                specific).  Devices that use different monitors on a 
+//                specific).  Devices that use different monitors on a
 //                multimon system report different values in this field.
-//                Therefore, to test for a multimon system, an application 
-//                should look for more than one different monitor handle in 
+//                Therefore, to test for a multimon system, an application
+//                should look for more than one different monitor handle in
 //                the list of D3DX devices.
 // onPrimary:     Indicates if this device is on the primary monitor
 //                (multimon specific).
@@ -228,12 +228,12 @@ typedef struct  _D3DX_VIDMODEDESC
 
 typedef struct _D3DX_DEVICEDESC
 {
-    DWORD       deviceIndex;  
+    DWORD       deviceIndex;
     DWORD       hwLevel;
-    GUID        ddGuid;       
-    GUID        d3dDeviceGuid;   
-    GUID        ddDeviceID;      
-    char        driverDesc[D3DX_DRIVERDESC_LENGTH];          
+    GUID        ddGuid;
+    GUID        d3dDeviceGuid;
+    GUID        ddDeviceID;
+    char        driverDesc[D3DX_DRIVERDESC_LENGTH];
     HMONITOR    monitor;
     BOOL        onPrimary;
 } D3DX_DEVICEDESC;
@@ -244,7 +244,7 @@ typedef struct _D3DX_DEVICEDESC
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
-    
+
 //-------------------------------------------------------------------------
 // D3DXInitialize: The very first call a D3DX app must make.
 //-------------------------------------------------------------------------
@@ -258,27 +258,27 @@ HRESULT WINAPI
     D3DXUninitialize();
 
 //-------------------------------------------------------------------------
-// D3DXGetDeviceCount: Returns the maximum number of D3DXdevices 
+// D3DXGetDeviceCount: Returns the maximum number of D3DXdevices
 // ------------------  available.
 //
-// D3DXGetDeviceDescription: Lists the 2D and 3D capabilities of the devices. 
+// D3DXGetDeviceDescription: Lists the 2D and 3D capabilities of the devices.
 // ------------------------  Also, the various guids needed by ddraw and d3d.
 //
-// Params: 
+// Params:
 //     [in] DWORD deviceIndex: Which device? Starts at 0.
 //     [in] D3DX_DEVICEDESC* pd3dxDevice: Pointer to the D3DX_DEVICEDESC
 //                                        structure to be filled in.
 //-------------------------------------------------------------------------
-DWORD WINAPI 
+DWORD WINAPI
     D3DXGetDeviceCount();
 
 HRESULT WINAPI
-    D3DXGetDeviceDescription(DWORD            deviceIndex, 
+    D3DXGetDeviceDescription(DWORD            deviceIndex,
                              D3DX_DEVICEDESC* pd3dxDeviceDesc);
 
 //-------------------------------------------------------------------------
 // D3DXGetMaxNumVideoModes: Returns the maximum number of video-modes .
-// -----------------------  
+// -----------------------
 //
 // Params:
 //     [in]  DWORD deviceIndex: The device being referred to.
@@ -290,9 +290,9 @@ HRESULT WINAPI
 //
 // Note:  These queries will simply give you a list of modes that the
 //        display adapter tells DirectX that it supports.
-//        There is no guarantee that D3DXCreateContext(Ex) will succeed 
-//        with all listed video modes.  This is a fundamental limitation 
-//        of the current DirectX architecture which D3DX cannot hide in 
+//        There is no guarantee that D3DXCreateContext(Ex) will succeed
+//        with all listed video modes.  This is a fundamental limitation
+//        of the current DirectX architecture which D3DX cannot hide in
 //        any clean way.
 //
 // Params:
@@ -303,14 +303,14 @@ HRESULT WINAPI
 //     [out] D3DX_VIDMODEDESC* pModeList: Pointer to the D3DX_VIDMODEDESC
 //                        structure that will be filled in.
 //-------------------------------------------------------------------------
-DWORD WINAPI 
-    D3DXGetMaxNumVideoModes(DWORD       deviceIndex, 
+DWORD WINAPI
+    D3DXGetMaxNumVideoModes(DWORD       deviceIndex,
                             DWORD       flags);
 
 HRESULT WINAPI
-    D3DXGetVideoMode(DWORD             deviceIndex, 
-                     DWORD             flags, 
-                     DWORD             modeIndex, 
+    D3DXGetVideoMode(DWORD             deviceIndex,
+                     DWORD             flags,
+                     DWORD             modeIndex,
                      D3DX_VIDMODEDESC* pModeDesc);
 
 #define D3DX_GVM_REFRESHRATE      0x00000001
@@ -320,31 +320,31 @@ HRESULT WINAPI
 //                           video mode.
 //
 // D3DXGetSurfaceFormat: Describes one of the supported surface formats.
-// --------------------- 
+// ---------------------
 //
 // Params:
 //     [in]  DWORD  deviceIndex: The device being referred to.
 //     [in]  D3DX_VIDMODEDESC* pDesc: The display mode at which the supported
 //                                    surface formats are requested. If it is
-//                                    NULL, the current display mode is 
+//                                    NULL, the current display mode is
 //                                    assumed.
 //     [in]  DWORD surfClassFlags: Required surface classes.  Only surface
-//                                 formats which support all specified 
-//                                 surface classes will be returned.  
+//                                 formats which support all specified
+//                                 surface classes will be returned.
 //                                 (Multiple surface classes may be specified
-//                                 using bitwise OR.) 
+//                                 using bitwise OR.)
 //     [in]  DWORD which: Which surface formats to retrieve. Starts at 0.
 //     [out] D3DX_SURFACEFORMAT* pFormat: The surface format
 //-------------------------------------------------------------------------
-DWORD WINAPI 
-    D3DXGetMaxSurfaceFormats(DWORD             deviceIndex, 
+DWORD WINAPI
+    D3DXGetMaxSurfaceFormats(DWORD             deviceIndex,
                              D3DX_VIDMODEDESC* pDesc,
                              DWORD             surfClassFlags);
 HRESULT WINAPI
     D3DXGetSurfaceFormat(DWORD               deviceIndex,
                          D3DX_VIDMODEDESC*   pDesc,
-                         DWORD               surfClassFlags,                   
-                         DWORD               surfaceIndex, 
+                         DWORD               surfClassFlags,
+                         DWORD               surfaceIndex,
                          D3DX_SURFACEFORMAT* pFormat);
 
 
@@ -357,26 +357,26 @@ HRESULT WINAPI
 //     [out] D3DX_VIDMODEDESC* pVidMode: The current video mode
 //-------------------------------------------------------------------------
 HRESULT WINAPI
-    D3DXGetCurrentVideoMode(DWORD             deviceIndex, 
+    D3DXGetCurrentVideoMode(DWORD             deviceIndex,
                             D3DX_VIDMODEDESC* pVidMode);
 
 //-------------------------------------------------------------------------
-// D3DXGetDeviceCaps: Lists all the capabilities of a device at a display 
+// D3DXGetDeviceCaps: Lists all the capabilities of a device at a display
 //                    mode.
 // ----------------
 //
 // Params:
 //     [in]  DWORD  deviceIndex: The device being referred to.
-//     [in]  D3DX_VIDMODEDESC* pDesc:  If this is NULL, we will return the 
-//                                     caps at the current display mode of 
+//     [in]  D3DX_VIDMODEDESC* pDesc:  If this is NULL, we will return the
+//                                     caps at the current display mode of
 //                                     the device.
-//     [out] D3DDEVICEDESC7* pD3DDeviceDesc7: D3D Caps ( NULL to ignore 
+//     [out] D3DDEVICEDESC7* pD3DDeviceDesc7: D3D Caps ( NULL to ignore
 //                                              parameter)
 //     [out] DDCAPS7* pDDHalCaps: DDraw HAL Caps (NULL to ignore parameter)
 //     [out] DDCAPS7* pDDHelCaps: DDraw HEL Caps (NULL to ignore  paramter)
 //-------------------------------------------------------------------------
 HRESULT WINAPI
-    D3DXGetDeviceCaps(DWORD             deviceIndex, 
+    D3DXGetDeviceCaps(DWORD             deviceIndex,
                       D3DX_VIDMODEDESC* pVidMode,
                       D3DDEVICEDESC7*   pD3DCaps,
                       DDCAPS*           pDDHALCaps,
@@ -385,7 +385,7 @@ HRESULT WINAPI
 //-------------------------------------------------------------------------
 // D3DXCreateContext: Initializes the chosen device. It is the simplest init
 // -----------------  function available.  Parameters are treated the same
-//                    as the matching subset of parameters in 
+//                    as the matching subset of parameters in
 //                    D3DXCreateContextEx, documented below.
 //                    Remaining D3DXCreateContextEx parameters that are
 //                    not present in D3DXCreateContext are treated as
@@ -398,29 +398,29 @@ HRESULT WINAPI
 //
 // Note: Do not expect D3DXCreateContext(Ex) to be fail-safe (as with any
 //       API).  Supported device capablilites should be used as a guide
-//       for choosing parameter values.  Keep in mind that there will 
+//       for choosing parameter values.  Keep in mind that there will
 //       inevitably be some combinations of parameters that just do not work.
-// 
+//
 // Params:
-//     [in]  DWORD deviceIndex: The device being referred to.   
+//     [in]  DWORD deviceIndex: The device being referred to.
 //     [in]  DWORD flags: The valid flags are D3DX_CONTEXT_FULLSCREEN, and
 //                        D3DX_CONTEXT_OFFSCREEN.  These flags cannot both
 //                        be specified.  If no flags are specified, the
 //                        context defaults to windowed mode.
 //
 //     [in]  HWND  hwnd: Device window.  See note.
-//     [in]  HWND  hwndFocus: Window which receives keyboard messages from 
-//                            the device window.  The device window should be 
-//                            a child of focus window.  Useful for multimon 
+//     [in]  HWND  hwndFocus: Window which receives keyboard messages from
+//                            the device window.  The device window should be
+//                            a child of focus window.  Useful for multimon
 //                            applications.  See note.
-//     NOTE: 
-//         windowed:   
-//             hwnd must be a valid window.  hwndFocus must be NULL or 
+//     NOTE:
+//         windowed:
+//             hwnd must be a valid window.  hwndFocus must be NULL or
 //             D3DX_DEFAULT.
 //
-//         fullscreen: 
+//         fullscreen:
 //             Either hwnd or hwndFocus must be a valid window.  (Both cannot
-//             be NULL or D3DX_DEFAULT).  If hwnd is NULL or D3DX_DEFAULT, 
+//             be NULL or D3DX_DEFAULT).  If hwnd is NULL or D3DX_DEFAULT,
 //             a default device window will be created as a child of hwndFocus.
 //
 //         offscreen:
@@ -429,7 +429,7 @@ HRESULT WINAPI
 //     [in]  DWORD numColorBits: If D3DX_DEFAULT is passed for windowed mode,
 //                               the current desktop's color depth is chosen.
 //                               For full screen mode, D3DX_DEFAULT causes 16
-//                               bit color to be used.                               
+//                               bit color to be used.
 //     [in]  DWORD numAlphaBits: If D3DX_DEFAULT is passed, 0 is chosen.
 //     [in]  DWORD numDepthbits: If D3DX_DEFAULT is passed,
 //                               the highest available number of depth bits
@@ -440,10 +440,10 @@ HRESULT WINAPI
 //
 //     NOTE: If both numDepthBits and numStencilBits are D3DX_DEFAULT,
 //           D3DX first picks the highest available number of stencil
-//           bits.  Then, for the chosen number of stencil bits, 
+//           bits.  Then, for the chosen number of stencil bits,
 //           the highest available number of depth bits is chosen.
-//           If only one of numStencilBits or numDepthBits 
-//           is D3DX_DEFAULT, the highest number of bits available 
+//           If only one of numStencilBits or numDepthBits
+//           is D3DX_DEFAULT, the highest number of bits available
 //           for this parameter is chosen out of only the formats
 //           that support the number of bits requested for the
 //           fixed parameter.
@@ -457,47 +457,47 @@ HRESULT WINAPI
 //        fullscreen: D3DX_DEFAULT means 1.  Any number of back buffers can be
 //            specified.
 //
-//        offscreen: D3DX_DEFAULT means 0.  You cannot specify additional back 
+//        offscreen: D3DX_DEFAULT means 0.  You cannot specify additional back
 //            buffers.
 //
 //     [in]  DWORD width: Width, in pixels, or D3DX_DEFAULT.  See note.
 //     [in]  DWORD height: Height, in pixels, or D3DX_DEFAULT.  See note.
 //
-//     NOTE: 
+//     NOTE:
 //        windowed: If either width or height is D3DX_DEFAULT, both values
 //            default to the dimensions of the client area of hwnd.
 //
-//        fullscreen: If either width or height is D3DX_DEFAULT, width 
+//        fullscreen: If either width or height is D3DX_DEFAULT, width
 //            defaults to 640, and height defaults to 480.
 //
-//        offscreen: An error is returned if either width or height is 
+//        offscreen: An error is returned if either width or height is
 //            D3DX_DEFAULT.
 //
-//     [in]  DWORD refreshRate: D3DX_DEFAULT means we let ddraw choose for 
+//     [in]  DWORD refreshRate: D3DX_DEFAULT means we let ddraw choose for
 //                              us.  Ignored for windowed and offscreen modes.
 //     [out] LPD3DXCONTEXT* ppCtx: This is the Context object that is used for
 //                                 rendering on that device.
 //
 //-------------------------------------------------------------------------
 HRESULT WINAPI
-    D3DXCreateContext(DWORD          deviceIndex,  
+    D3DXCreateContext(DWORD          deviceIndex,
                       DWORD          flags,
                       HWND           hwnd,
-                      DWORD          width, 
+                      DWORD          width,
                       DWORD          height,
                       LPD3DXCONTEXT* ppCtx);
 
 HRESULT WINAPI
-    D3DXCreateContextEx(DWORD          deviceIndex,  
+    D3DXCreateContextEx(DWORD          deviceIndex,
                         DWORD          flags,
                         HWND           hwnd,
-                        HWND           hwndFocus, 
+                        HWND           hwndFocus,
                         DWORD          numColorBits,
                         DWORD          numAlphaBits,
                         DWORD          numDepthbits,
                         DWORD          numStencilBits,
                         DWORD          numBackBuffers,
-                        DWORD          width, 
+                        DWORD          width,
                         DWORD          height,
                         DWORD          refreshRate,
                         LPD3DXCONTEXT* ppCtx);
@@ -518,12 +518,12 @@ HRESULT WINAPI
 //                       size needs to be passed in.
 //-------------------------------------------------------------------------
 void WINAPI
-    D3DXGetErrorString(HRESULT hr, 
-                       DWORD   strLength, 
+    D3DXGetErrorString(HRESULT hr,
+                       DWORD   strLength,
                        LPSTR   pStr);
 
 //-------------------------------------------------------------------------
-// D3DXMakeDDPixelFormat: Fills in a DDPIXELFORMAT structure based on the 
+// D3DXMakeDDPixelFormat: Fills in a DDPIXELFORMAT structure based on the
 // ---------------------   D3DX surface format requested.
 //
 // Params:
@@ -532,12 +532,12 @@ void WINAPI
 //                                          surface format.
 //-------------------------------------------------------------------------
 HRESULT WINAPI
-    D3DXMakeDDPixelFormat(D3DX_SURFACEFORMAT d3dxFormat, 
+    D3DXMakeDDPixelFormat(D3DX_SURFACEFORMAT d3dxFormat,
                           DDPIXELFORMAT*     pddpf);
 
 //-------------------------------------------------------------------------
-// D3DXMakeSurfaceFormat: Determines the surface format corresponding to 
-// ---------------------  a given DDPIXELFORMAT. 
+// D3DXMakeSurfaceFormat: Determines the surface format corresponding to
+// ---------------------  a given DDPIXELFORMAT.
 //
 // Params:
 //     [in]  DDPIXELFORMAT* pddpf: Pixel format.
@@ -550,17 +550,17 @@ D3DX_SURFACEFORMAT WINAPI
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus    
+#endif //__cplusplus
 
 ///////////////////////////////////////////////////////////////////////////
 // Interfaces:
 ///////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------
-// ID3DXContext interface: 
+// ID3DXContext interface:
 //
-// This encapsulates all the stuff that the app might 
-// want to do at initialization time and any global control over d3d and 
+// This encapsulates all the stuff that the app might
+// want to do at initialization time and any global control over d3d and
 // ddraw.
 //-------------------------------------------------------------------------
 
@@ -568,14 +568,14 @@ D3DX_SURFACEFORMAT WINAPI
 DECLARE_INTERFACE_(ID3DXContext, IUnknown)
 {
     //
-    // IUnknown methods 
+    // IUnknown methods
     //
     STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* ppvObj) PURE;
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
 
     // Get the DDraw and Direct3D objects to call DirectDraw or
-    // Direct3D Immediate Mode functions. 
+    // Direct3D Immediate Mode functions.
     // If the objects don't exist (because they have not
     // been created for some reason) NULL is returned.
     // All the objects returned in the following Get* functions
@@ -592,53 +592,53 @@ DECLARE_INTERFACE_(ID3DXContext, IUnknown)
     STDMETHOD_(LPDIRECTDRAWSURFACE7,GetZBuffer)(THIS) PURE;
     STDMETHOD_(LPDIRECTDRAWSURFACE7,GetBackBuffer)(THIS_ DWORD which) PURE;
 
-    // Get the associated window handles 
+    // Get the associated window handles
     STDMETHOD_(HWND,GetWindow)(THIS) PURE;
     STDMETHOD_(HWND,GetFocusWindow)(THIS) PURE;
 
-    // 
+    //
     // Various Get methods, in case the user had specified default
     // parameters
     //
-    STDMETHOD(GetDeviceIndex)(THIS_ 
-                              LPDWORD pDeviceIndex, 
+    STDMETHOD(GetDeviceIndex)(THIS_
+                              LPDWORD pDeviceIndex,
                               LPDWORD pHwLevel) PURE;
 
     STDMETHOD_(DWORD, GetNumBackBuffers)(THIS) PURE;
 
     STDMETHOD(GetNumBits)(THIS_
-                          LPDWORD pColorBits, 
+                          LPDWORD pColorBits,
                           LPDWORD pDepthBits,
-                          LPDWORD pAlphaBits, 
+                          LPDWORD pAlphaBits,
                           LPDWORD pStencilBits) PURE;
 
-    STDMETHOD(GetBufferSize)(THIS_ 
-                             LPDWORD pWidth, 
+    STDMETHOD(GetBufferSize)(THIS_
+                             LPDWORD pWidth,
                              LPDWORD pHeight) PURE;
 
     // Get the flags that were used to create this context
     STDMETHOD_(DWORD, GetCreationFlags)(THIS) PURE;
     STDMETHOD_(DWORD, GetRefreshRate)(THIS) PURE;
-    
+
     // Restoring surfaces in case stuff is lost
     STDMETHOD(RestoreSurfaces)(THIS) PURE;
-    
+
     // Resize all the buffers to the new width and height
     STDMETHOD(Resize)(THIS_ DWORD width, DWORD height) PURE;
 
     // Update the frame using a flip or a blit,
-    // If the D3DX_UPDATE_NOVSYNC flag is set, blit is used if the 
+    // If the D3DX_UPDATE_NOVSYNC flag is set, blit is used if the
     // driver cannot flip without waiting for vsync in full-screen mode.
     STDMETHOD(UpdateFrame)(THIS_ DWORD flags) PURE;
 
-    // Render a string at the specified coordinates, with the specified 
-    // colour. This is only provided as a convenience for 
+    // Render a string at the specified coordinates, with the specified
+    // colour. This is only provided as a convenience for
     // debugging/information during development.
     // topLeftX and topLeftY represent the location of the top left corner
-    // of the string, on the render target.  
+    // of the string, on the render target.
     // The coordinate and color parameters each have a range of 0.0-1.0
     STDMETHOD(DrawDebugText)(THIS_
-                             float topLeftX, 
+                             float topLeftX,
                              float topLeftY,
                              D3DCOLOR color,
                              LPSTR pString) PURE;
@@ -670,9 +670,9 @@ DECLARE_INTERFACE_(ID3DXContext, IUnknown)
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
-    
+
 //-------------------------------------------------------------------------
-// D3DXCheckTextureRequirements: Return information about texture creation 
+// D3DXCheckTextureRequirements: Return information about texture creation
 // ----------------------------  (used by CreateTexture, CreateTextureFromFile
 //                                and CreateCubeMapTexture)
 //
@@ -680,33 +680,33 @@ extern "C" {
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
-//  pFlags   
+//  pFlags
 //      allows specification of D3DX_TEXTURE_NOMIPMAP
-//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation 
+//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
 //      is not supported.
 //  pWidth
-//      width in pixels or NULL 
+//      width in pixels or NULL
 //      returns corrected width
-//  pHeight       
+//  pHeight
 //      height in pixels or NULL
 //      returns corrected height
 //  pPixelFormat
-//      surface format 
+//      surface format
 //      returns best match to input format
 //
-//  Notes: 1. Unless the flags is set to specifically prevent creating 
+//  Notes: 1. Unless the flags is set to specifically prevent creating
 //            mipmaps, mipmaps are generated all the way till 1x1 surface.
-//         2. width, height and pixelformat are altered based on available 
+//         2. width, height and pixelformat are altered based on available
 //            hardware. For example:
 //              a. Texture dimensions may be required to be powers of 2
 //              b. We may require width == height for some devices
 //              c. If PixelFormat is unavailable, a best fit is made
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCheckTextureRequirements( LPDIRECT3DDEVICE7     pd3dDevice,
-                                  LPDWORD               pFlags, 
-                                  LPDWORD               pWidth,  
-                                  LPDWORD               pHeight,  
+                                  LPDWORD               pFlags,
+                                  LPDWORD               pWidth,
+                                  LPDWORD               pHeight,
                                   D3DX_SURFACEFORMAT*   pPixelFormat);
 
 //-------------------------------------------------------------------------
@@ -717,18 +717,18 @@ HRESULT WINAPI
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
-//  pFlags   
+//  pFlags
 //      allows specification of D3DX_TEXTURE_NOMIPMAP
-//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation 
+//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
 //      is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
-//      to indicate which texture stage the texture is for e.g. 
-//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture 
+//      to indicate which texture stage the texture is for e.g.
+//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
 //      stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
 //      set.
 //  pWidth
 //      width in pixels; 0 or NULL is unacceptable
 //      returns corrected width
-//  pHeight       
+//  pHeight
 //      height in pixels; 0 or NULL is unacceptable
 //      returns corrected height
 //  pPixelFormat
@@ -742,13 +742,13 @@ HRESULT WINAPI
 //  pNumMipMaps
 //      the number of mipmaps actually generated
 //
-//  Notes: See notes for D3DXCheckTextureRequirements. 
+//  Notes: See notes for D3DXCheckTextureRequirements.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateTexture( LPDIRECT3DDEVICE7     pd3dDevice,
-                       LPDWORD               pFlags, 
-                       LPDWORD               pWidth,  
-                       LPDWORD               pHeight,  
+                       LPDWORD               pFlags,
+                       LPDWORD               pWidth,
+                       LPDWORD               pHeight,
                        D3DX_SURFACEFORMAT*   pPixelFormat,
                        LPDIRECTDRAWPALETTE   pDDPal,
                        LPDIRECTDRAWSURFACE7* ppDDSurf,
@@ -762,12 +762,12 @@ HRESULT WINAPI
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
-//  pFlags   
+//  pFlags
 //      allows specification of D3DX_TEXTURE_NOMIPMAP
-//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation 
+//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
 //      is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
-//      to indicate which texture stage the texture is for e.g. 
-//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture 
+//      to indicate which texture stage the texture is for e.g.
+//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
 //      stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
 //      set.
 //  cubefaces
@@ -784,7 +784,7 @@ HRESULT WINAPI
 //  pWidth
 //      width in pixels; 0 or NULL is unacceptable
 //      returns corrected width
-//  pHeight       
+//  pHeight
 //      height in pixels; 0 or NULL is unacceptable
 //      returns corrected height
 //  pPixelFormat
@@ -796,18 +796,18 @@ HRESULT WINAPI
 //  ppDDSurf
 //      the ddraw surface that will be created
 //  pNumMipMaps
-//      the number of mipmaps generated for a particular face of the 
+//      the number of mipmaps generated for a particular face of the
 //      cubemap.
 //
-//  Notes: See notes for D3DXCheckTextureRequirements. 
+//  Notes: See notes for D3DXCheckTextureRequirements.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateCubeMapTexture( LPDIRECT3DDEVICE7     pd3dDevice,
-                              LPDWORD               pFlags, 
+                              LPDWORD               pFlags,
                               DWORD                 cubefaces,
                               D3DCOLOR              colorEmptyFaces,
-                              LPDWORD               pWidth,  
-                              LPDWORD               pHeight,  
+                              LPDWORD               pWidth,
+                              LPDWORD               pHeight,
                               D3DX_SURFACEFORMAT    *pPixelFormat,
                               LPDIRECTDRAWPALETTE   pDDPal,
                               LPDIRECTDRAWSURFACE7* ppDDSurf,
@@ -815,7 +815,7 @@ HRESULT WINAPI
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateTextureFromFile: Create a texture object from a file or from the 
+// D3DXCreateTextureFromFile: Create a texture object from a file or from the
 // -------------------------  resource. Only BMP and DIB are supported from the
 //                            resource portion of the executable.
 //
@@ -823,24 +823,24 @@ HRESULT WINAPI
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
-//  pFlags   
+//  pFlags
 //      allows specification of D3DX_TEXTURE_NOMIPMAP
-//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation 
+//      D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
 //      is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
-//      to indicate which texture stage the texture is for e.g. 
-//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture 
+//      to indicate which texture stage the texture is for e.g.
+//      D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
 //      stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
 //      set.
-//  pWidth  
-//      Width in pixels. If 0 or D3DX_DEFAULT, the width will be taken 
+//  pWidth
+//      Width in pixels. If 0 or D3DX_DEFAULT, the width will be taken
 //      from the file
 //      returns corrected width
-//  pHeight   
-//      Height in pixels. If 0 or D3DX_DEFAULT, the height will be taken 
+//  pHeight
+//      Height in pixels. If 0 or D3DX_DEFAULT, the height will be taken
 //      from the file
 //      returns corrected height
 //  pPixelFormat
-//      If D3DX_SF_UNKNOWN is passed in, pixel format closest to the bitmap 
+//      If D3DX_SF_UNKNOWN is passed in, pixel format closest to the bitmap
 //      will be chosen
 //      returns actual format that was used
 //  pDDPal
@@ -851,21 +851,21 @@ HRESULT WINAPI
 //  pNumMipMaps
 //      The number of mipmaps generated.
 //  pSrcName
-//      File name. BMP, DIB, DDS, are supported. 
-//      
-//      TGA is supported for the following cases: 16, 24, 32bpp direct color and 8bpp palettized. 
-//      Also, 8, 16bpp grayscale is supported. RLE versions of the above 
-//      TGA formats are also supported. ColorKey and Premultiplied Alpha 
+//      File name. BMP, DIB, DDS, are supported.
+//
+//      TGA is supported for the following cases: 16, 24, 32bpp direct color and 8bpp palettized.
+//      Also, 8, 16bpp grayscale is supported. RLE versions of the above
+//      TGA formats are also supported. ColorKey and Premultiplied Alpha
 //      are not currently supported for TGA files.
 //      returns created format
 //
-//  Notes: See notes for D3DXCheckTextureRequirements. 
+//  Notes: See notes for D3DXCheckTextureRequirements.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateTextureFromFile( LPDIRECT3DDEVICE7     pd3dDevice,
-                               LPDWORD               pFlags, 
-                               LPDWORD               pWidth,  
-                               LPDWORD               pHeight,  
+                               LPDWORD               pFlags,
+                               LPDWORD               pWidth,
+                               LPDWORD               pHeight,
                                D3DX_SURFACEFORMAT*   pPixelFormat,
                                LPDIRECTDRAWPALETTE   pDDPal,
                                LPDIRECTDRAWSURFACE7* ppDDSurf,
@@ -874,19 +874,19 @@ HRESULT WINAPI
                                D3DX_FILTERTYPE       filterType);
 
 //-------------------------------------------------------------------------
-// D3DXLoadTextureFromFile: Load from a file into a mipmap level. Doing the 
+// D3DXLoadTextureFromFile: Load from a file into a mipmap level. Doing the
 // -----------------------  necessary color conversion and rescaling. File
-//                          format support is identical to 
+//                          format support is identical to
 //                          D3DXCreateTextureFromFile's.
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
 // pTexture
-//      a pointer to a DD7Surface which was created with either 
+//      a pointer to a DD7Surface which was created with either
 //      CreateTextureFromFile or CreateTexture.
 // mipMapLevel
 //      indicates mipmap level
-//      Note: 
+//      Note:
 //          1. Error if mipmap level doesn't exist
 //          2. If D3DX_DEFAULT and equal number of mipmap levels exist
 //             then all the source mip-levels are loaded
@@ -894,37 +894,37 @@ HRESULT WINAPI
 //          4. If the dest has miplevels and source doesn't, we expand
 //          5. If there are unequal numbers of miplevels, we expand
 // pSrcName
-//      File name. BMP, DIB, DDS, are supported. 
-//      For details on TGA support, refer to the comments for 
+//      File name. BMP, DIB, DDS, are supported.
+//      For details on TGA support, refer to the comments for
 //      D3DXCreateTextureFromFile
 // pSrcRect
 //      the source rectangle or null (whole surface)
 // pDestRect
 //      the destination rectangle or null (whole surface)
-// filterType 
+// filterType
 //      filter used for mipmap generation
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadTextureFromFile( LPDIRECT3DDEVICE7    pd3dDevice,
                              LPDIRECTDRAWSURFACE7 pTexture,
                              DWORD                mipMapLevel,
-                             LPSTR                pSrcName, 
-                             RECT*                pSrcRect, 
+                             LPSTR                pSrcName,
+                             RECT*                pSrcRect,
                              RECT*                pDestRect,
                              D3DX_FILTERTYPE      filterType);
 
 //-------------------------------------------------------------------------
-// D3DXLoadTextureFromSurface: Load from a DDraw Surface into a mipmap level. 
+// D3DXLoadTextureFromSurface: Load from a DDraw Surface into a mipmap level.
 // --------------------------  Doing the necessary color conversion.
 //
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
 // pTexture
-//      a pointer to a DD7Surface which was created with either 
+//      a pointer to a DD7Surface which was created with either
 //      CreateTextureFromFile or CreateTexture.
 // mipMapLevel
 //      indicates mipmap level
-//      Note: 
+//      Note:
 //          1. Error if mipmap level doesn't exist
 //          2. If D3DX_DEFAULT and equal number of mipmap levels exist
 //             then all the source mip-levels are loaded
@@ -937,15 +937,15 @@ HRESULT WINAPI
 //      the source rectangle or null (whole surface)
 // pDestRect
 //      the destination rectangle or null (whole surface)
-// filterType 
+// filterType
 //      filter used for mipmap generation
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXLoadTextureFromSurface( LPDIRECT3DDEVICE7    pd3dDevice,
                                 LPDIRECTDRAWSURFACE7 pTexture,
                                 DWORD                mipMapLevel,
-                                LPDIRECTDRAWSURFACE7 pSurfaceSrc, 
-                                RECT*                pSrcRect, 
+                                LPDIRECTDRAWSURFACE7 pSurfaceSrc,
+                                RECT*                pSrcRect,
                                 RECT*                pDestRect,
                                 D3DX_FILTERTYPE      filterType);
 
@@ -956,11 +956,11 @@ HRESULT WINAPI
 //  pd3dDevice
 //      The D3D device with which the texture is going to be used.
 // pTexture
-//      a pointer to a DD7Surface which was created with either 
+//      a pointer to a DD7Surface which was created with either
 //      CreateTextureFromFile or CreateTexture.
 // mipMapLevel
 //      indicates mipmap level
-//      Note: 
+//      Note:
 //          1. Error if mipmap level doesn't exist
 //          2. If D3DX_DEFAULT and equal number of mipmap levels exist
 //             then all the source mip-levels are loaded
@@ -970,7 +970,7 @@ HRESULT WINAPI
 // pMemory
 //      pointer to source memory from which the texture will be loaded
 // pDDPal
-//      DirectDraw Palette, that the app passes in optionally if the memory is 
+//      DirectDraw Palette, that the app passes in optionally if the memory is
 //      supposed to be paletteized.
 // srcPixelFormat
 //      PixelFormat of the source.
@@ -978,15 +978,15 @@ HRESULT WINAPI
 //      The pitch of the memory or D3DX_DEFAULT (based on srcPixelFormat)
 // pDestRect
 //      The destination rectangle or null (whole surface)
-// filterType 
+// filterType
 //      filter used for mipmap generation
-// 
+//
 // Assumptions: The source (memory) is loaded in full
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
-    D3DXLoadTextureFromMemory( LPDIRECT3DDEVICE7    pd3dDevice, 
+HRESULT WINAPI
+    D3DXLoadTextureFromMemory( LPDIRECT3DDEVICE7    pd3dDevice,
                                LPDIRECTDRAWSURFACE7 pTexture,
-                               DWORD                mipMapLevel, 
+                               DWORD                mipMapLevel,
                                LPVOID               pMemory,
                                LPDIRECTDRAWPALETTE  pDDPal,
                                D3DX_SURFACEFORMAT   srcPixelFormat,
@@ -996,10 +996,10 @@ HRESULT WINAPI
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus    
+#endif //__cplusplus
 
 //-------------------------------------------------------------------------
-// Flags for texture create functions; applies to 
+// Flags for texture create functions; applies to
 // D3DXCreateTexture, D3DXCreateCubeMapTexture and D3DXCreateTextureFromFile.
 //
 
diff --git a/src/dep/include/DXSDK/include/d3dxerr.h b/src/dep/include/DXSDK/include/d3dxerr.h
index 155005b..d3c0e63 100644
--- a/src/dep/include/DXSDK/include/d3dxerr.h
+++ b/src/dep/include/DXSDK/include/d3dxerr.h
@@ -1,14 +1,14 @@
 //----------------------------------------------------------------------
-//                                                                      
-//   d3dxerr.h --  0xC code definitions for the D3DX API                
-//                                                                      
-//   Copyright (c) Microsoft Corp. All rights reserved.      
-//                                                                      
+//
+//   d3dxerr.h --  0xC code definitions for the D3DX API
+//
+//   Copyright (c) Microsoft Corp. All rights reserved.
+//
 //----------------------------------------------------------------------
 #ifndef __D3DXERR_H__
 #define __D3DXERR_H__
 
-// 
+//
 //
 //  Values are 32 bit values layed out as follows:
 //
@@ -48,7 +48,7 @@
 // MessageText:
 //
 //  Out of memory.
-// 
+//
 #define D3DXERR_NOMEMORY    ((HRESULT)0xC8770BB8L)
 
 
@@ -58,7 +58,7 @@
 // MessageText:
 //
 //  A NULL pointer was passed as a parameter.
-// 
+//
 #define D3DXERR_NULLPOINTER    ((HRESULT)0xC8770BB9L)
 
 
@@ -68,7 +68,7 @@
 // MessageText:
 //
 //  The Device Index passed in is invalid.
-// 
+//
 #define D3DXERR_INVALIDD3DXDEVICEINDEX    ((HRESULT)0xC8770BBAL)
 
 
@@ -78,7 +78,7 @@
 // MessageText:
 //
 //  DirectDraw has not been created.
-// 
+//
 #define D3DXERR_NODIRECTDRAWAVAILABLE    ((HRESULT)0xC8770BBBL)
 
 
@@ -88,7 +88,7 @@
 // MessageText:
 //
 //  Direct3D has not been created.
-// 
+//
 #define D3DXERR_NODIRECT3DAVAILABLE    ((HRESULT)0xC8770BBCL)
 
 
@@ -98,7 +98,7 @@
 // MessageText:
 //
 //  Direct3D device has not been created.
-// 
+//
 #define D3DXERR_NODIRECT3DDEVICEAVAILABLE    ((HRESULT)0xC8770BBDL)
 
 
@@ -108,7 +108,7 @@
 // MessageText:
 //
 //  Primary surface has not been created.
-// 
+//
 #define D3DXERR_NOPRIMARYAVAILABLE    ((HRESULT)0xC8770BBEL)
 
 
@@ -118,7 +118,7 @@
 // MessageText:
 //
 //  Z buffer has not been created.
-// 
+//
 #define D3DXERR_NOZBUFFERAVAILABLE    ((HRESULT)0xC8770BBFL)
 
 
@@ -128,7 +128,7 @@
 // MessageText:
 //
 //  Backbuffer has not been created.
-// 
+//
 #define D3DXERR_NOBACKBUFFERAVAILABLE    ((HRESULT)0xC8770BC0L)
 
 
@@ -138,7 +138,7 @@
 // MessageText:
 //
 //  Failed to update caps database after changing display mode.
-// 
+//
 #define D3DXERR_COULDNTUPDATECAPS    ((HRESULT)0xC8770BC1L)
 
 
@@ -148,7 +148,7 @@
 // MessageText:
 //
 //  Could not create Z buffer.
-// 
+//
 #define D3DXERR_NOZBUFFER    ((HRESULT)0xC8770BC2L)
 
 
@@ -158,7 +158,7 @@
 // MessageText:
 //
 //  Display mode is not valid.
-// 
+//
 #define D3DXERR_INVALIDMODE    ((HRESULT)0xC8770BC3L)
 
 
@@ -168,7 +168,7 @@
 // MessageText:
 //
 //  One or more of the parameters passed is invalid.
-// 
+//
 #define D3DXERR_INVALIDPARAMETER    ((HRESULT)0xC8770BC4L)
 
 
@@ -178,7 +178,7 @@
 // MessageText:
 //
 //  D3DX failed to initialize itself.
-// 
+//
 #define D3DXERR_INITFAILED    ((HRESULT)0xC8770BC5L)
 
 
@@ -188,7 +188,7 @@
 // MessageText:
 //
 //  D3DX failed to start up.
-// 
+//
 #define D3DXERR_STARTUPFAILED    ((HRESULT)0xC8770BC6L)
 
 
@@ -198,7 +198,7 @@
 // MessageText:
 //
 //  D3DXInitialize() must be called first.
-// 
+//
 #define D3DXERR_D3DXNOTSTARTEDYET    ((HRESULT)0xC8770BC7L)
 
 
@@ -208,7 +208,7 @@
 // MessageText:
 //
 //  D3DX is not initialized yet.
-// 
+//
 #define D3DXERR_NOTINITIALIZED    ((HRESULT)0xC8770BC8L)
 
 
@@ -218,7 +218,7 @@
 // MessageText:
 //
 //  Failed to render text to the surface.
-// 
+//
 #define D3DXERR_FAILEDDRAWTEXT    ((HRESULT)0xC8770BC9L)
 
 
@@ -228,7 +228,7 @@
 // MessageText:
 //
 //  Bad D3DX context.
-// 
+//
 #define D3DXERR_BADD3DXCONTEXT    ((HRESULT)0xC8770BCAL)
 
 
@@ -238,7 +238,7 @@
 // MessageText:
 //
 //  The requested device capabilities are not supported.
-// 
+//
 #define D3DXERR_CAPSNOTSUPPORTED    ((HRESULT)0xC8770BCBL)
 
 
@@ -248,7 +248,7 @@
 // MessageText:
 //
 //  The image file format is unrecognized.
-// 
+//
 #define D3DXERR_UNSUPPORTEDFILEFORMAT    ((HRESULT)0xC8770BCCL)
 
 
@@ -258,7 +258,7 @@
 // MessageText:
 //
 //  The image file loading library error.
-// 
+//
 #define D3DXERR_IFLERROR    ((HRESULT)0xC8770BCDL)
 
 
@@ -268,7 +268,7 @@
 // MessageText:
 //
 //  Could not obtain device caps.
-// 
+//
 #define D3DXERR_FAILEDGETCAPS    ((HRESULT)0xC8770BCEL)
 
 
@@ -278,7 +278,7 @@
 // MessageText:
 //
 //  Resize does not work for full-screen.
-// 
+//
 #define D3DXERR_CANNOTRESIZEFULLSCREEN    ((HRESULT)0xC8770BCFL)
 
 
@@ -288,7 +288,7 @@
 // MessageText:
 //
 //  Resize does not work for non-windowed contexts.
-// 
+//
 #define D3DXERR_CANNOTRESIZENONWINDOWED    ((HRESULT)0xC8770BD0L)
 
 
@@ -298,7 +298,7 @@
 // MessageText:
 //
 //  Front buffer already exists.
-// 
+//
 #define D3DXERR_FRONTBUFFERALREADYEXISTS    ((HRESULT)0xC8770BD1L)
 
 
@@ -308,7 +308,7 @@
 // MessageText:
 //
 //  The app is using the primary in full-screen mode.
-// 
+//
 #define D3DXERR_FULLSCREENPRIMARYEXISTS    ((HRESULT)0xC8770BD2L)
 
 
@@ -318,7 +318,7 @@
 // MessageText:
 //
 //  Could not get device context.
-// 
+//
 #define D3DXERR_GETDCFAILED    ((HRESULT)0xC8770BD3L)
 
 
@@ -328,7 +328,7 @@
 // MessageText:
 //
 //  Could not bitBlt.
-// 
+//
 #define D3DXERR_BITBLTFAILED    ((HRESULT)0xC8770BD4L)
 
 
@@ -338,7 +338,7 @@
 // MessageText:
 //
 //  There is no surface backing up this texture.
-// 
+//
 #define D3DXERR_NOTEXTURE    ((HRESULT)0xC8770BD5L)
 
 
@@ -348,7 +348,7 @@
 // MessageText:
 //
 //  There is no such miplevel for this surface.
-// 
+//
 #define D3DXERR_MIPLEVELABSENT    ((HRESULT)0xC8770BD6L)
 
 
@@ -358,7 +358,7 @@
 // MessageText:
 //
 //  The surface is not paletted.
-// 
+//
 #define D3DXERR_SURFACENOTPALETTED    ((HRESULT)0xC8770BD7L)
 
 
@@ -368,7 +368,7 @@
 // MessageText:
 //
 //  An error occured while enumerating surface formats.
-// 
+//
 #define D3DXERR_ENUMFORMATSFAILED    ((HRESULT)0xC8770BD8L)
 
 
@@ -378,7 +378,7 @@
 // MessageText:
 //
 //  D3DX only supports color depths of 16 bit or greater.
-// 
+//
 #define D3DXERR_COLORDEPTHTOOLOW    ((HRESULT)0xC8770BD9L)
 
 
@@ -388,7 +388,7 @@
 // MessageText:
 //
 //  The file format is invalid.
-// 
+//
 #define D3DXERR_INVALIDFILEFORMAT    ((HRESULT)0xC8770BDAL)
 
 
@@ -398,7 +398,7 @@
 // MessageText:
 //
 //  No suitable match found.
-// 
+//
 #define D3DXERR_NOMATCHFOUND    ((HRESULT)0xC8770BDBL)
 
 
diff --git a/src/dep/include/DXSDK/include/d3dxmath.h b/src/dep/include/DXSDK/include/d3dxmath.h
index 685cc33..80a55fd 100644
--- a/src/dep/include/DXSDK/include/d3dxmath.h
+++ b/src/dep/include/DXSDK/include/d3dxmath.h
@@ -648,7 +648,7 @@ extern "C" {
 float WINAPI D3DXMatrixfDeterminant
     ( const D3DXMATRIX *pM );
 
-// Matrix multiplication.  The result represents the transformation M2 
+// Matrix multiplication.  The result represents the transformation M2
 // followed by the transformation M1.  (Out = M1 * M2)
 D3DXMATRIX* WINAPI D3DXMatrixMultiply
     ( D3DXMATRIX *pOut, const D3DXMATRIX *pM1, const D3DXMATRIX *pM2 );
@@ -829,7 +829,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis
 D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll
     ( D3DXQUATERNION *pOut, float yaw, float pitch, float roll );
 
-// Quaternion multiplication.  The result represents the rotation Q2 
+// Quaternion multiplication.  The result represents the rotation Q2
 // followed by the rotation Q1.  (Out = Q2 * Q1)
 D3DXQUATERNION* WINAPI D3DXQuaternionMultiply
     ( D3DXQUATERNION *pOut, const D3DXQUATERNION *pQ1,
diff --git a/src/dep/include/DXSDK/include/d3dxshapes.h b/src/dep/include/DXSDK/include/d3dxshapes.h
index 765c59f..9c6b76d 100644
--- a/src/dep/include/DXSDK/include/d3dxshapes.h
+++ b/src/dep/include/DXSDK/include/d3dxshapes.h
@@ -18,7 +18,7 @@
 typedef struct ID3DXSimpleShape *LPD3DXSIMPLESHAPE;
 
 // {CFCD4602-EB7B-11d2-A440-00A0C90629A8}
-DEFINE_GUID( IID_ID3DXSimpleShape, 
+DEFINE_GUID( IID_ID3DXSimpleShape,
 0xcfcd4602, 0xeb7b, 0x11d2, 0xa4, 0x40, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8 );
 
 
@@ -27,12 +27,12 @@ DEFINE_GUID( IID_ID3DXSimpleShape,
 ///////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------
-// ID3DXSimpleShape interface: 
+// ID3DXSimpleShape interface:
 //-------------------------------------------------------------------------
 
 DECLARE_INTERFACE_(ID3DXSimpleShape, IUnknown)
 {
-    // IUnknown methods 
+    // IUnknown methods
     STDMETHOD(QueryInterface)(THIS_ REFIID  riid, LPVOID* ppvObj) PURE;
     STDMETHOD_(ULONG,AddRef)(THIS) PURE;
     STDMETHOD_(ULONG,Release)(THIS) PURE;
@@ -59,131 +59,131 @@ extern "C" {
 // ----------------  specified. It returns a vertex buffer that can be used
 //                   for drawing or manipulation by the program later on.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  float sideSize: Length of a side.
 //     [in]  DWORD numTexCoords:   The number of texture coordinates desired
 //                                 in the vertex-buffer. (Default is 1)
 //                                 D3DX_DEFAULT is a valid input.
 //     [out] IDirect3DVertexBuffer7** ppVB: The output shape interface.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreatePolygon(LPDIRECT3DDEVICE7  pDevice,
-                      float              sideSize, 
-                      DWORD              numSides, 
-                      DWORD              numTexCoords, 
+                      float              sideSize,
+                      DWORD              numSides,
+                      DWORD              numTexCoords,
                       LPD3DXSIMPLESHAPE* ppShape );
 
 //-------------------------------------------------------------------------
-// D3DXCreateBox: Creates a box (cuboid) of given dimensions using the  
+// D3DXCreateBox: Creates a box (cuboid) of given dimensions using the
 // ------------  device. It returns a vertex buffer that can
 //               be used for drawing or manipulation by the program later on.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  float width: Width of the box (along x-axis)
 //     [in]  float height: Height of the box (along y-axis)
 //     [in]  float depth: Depth of the box (along z-axis)
 //     [in]  DWORD numTexCoords: The number of texture coordinates desired
-//                               in the vertex-buffer. Default is 1. 
+//                               in the vertex-buffer. Default is 1.
 //                               D3DX_DEFAULT is a valid input here.
 //     [out] LPD3DXSIMPLESHAPE* ppShape: The output vertex-buffer.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
-    D3DXCreateBox(LPDIRECT3DDEVICE7  pDevice, 
+HRESULT WINAPI
+    D3DXCreateBox(LPDIRECT3DDEVICE7  pDevice,
                   float              width,
                   float              height,
                   float              depth,
-                  DWORD              numTexCoords, 
+                  DWORD              numTexCoords,
                   LPD3DXSIMPLESHAPE* ppShape );
 
 //-------------------------------------------------------------------------
-// D3DXCreateCylinder: Creates a cylinder of given dimensions using the  
+// D3DXCreateCylinder: Creates a cylinder of given dimensions using the
 // -----------------  device. It returns a vertex buffer that
 //                    can be used for drawing or manipulation by the program
 //                    later on.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  float baseRadius: Base-radius (default is 1.0f, shd be >= 0.0f)
 //     [in]  float topRadius: Top-radius (default is 1.0f, shd be >= 0.0f)
 //     [in]  float height: Height (default is 1.0f, shd be >= 0.0f)
 //     [in]  DWORD numSlices: Number of slices about the main axis.
 //                            (default is 8) D3DX_DEFAULT is a valid input.
-//     [in]  DWORD numStacks: Number of stacks along the main axis. 
+//     [in]  DWORD numStacks: Number of stacks along the main axis.
 //                            (default is 8) D3DX_DEFAULT is a valid input.
 //     [in]  DWORD numTexCoords: The number of texture coordinates desired
-//                               in the vertex-buffer. Default is 1. 
+//                               in the vertex-buffer. Default is 1.
 //                               D3DX_DEFAULT is a valid input here.
 //     [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
 //-------------------------------------------------------------------------
-HRESULT WINAPI 
+HRESULT WINAPI
     D3DXCreateCylinder(LPDIRECT3DDEVICE7  pDevice,
-                       float              baseRadius, 
-                       float              topRadius, 
-                       float              height, 
-                       DWORD              numSlices, 
-                       DWORD              numStacks,   
-                       DWORD              numTexCoords, 
+                       float              baseRadius,
+                       float              topRadius,
+                       float              height,
+                       DWORD              numSlices,
+                       DWORD              numStacks,
+                       DWORD              numTexCoords,
                        LPD3DXSIMPLESHAPE* ppShape );
 
 
 //-------------------------------------------------------------------------
-// D3DXCreateTorus: Creates a torus of given dimensions using the  
+// D3DXCreateTorus: Creates a torus of given dimensions using the
 // --------------  device specified. It returns a vertex buffer that can
 //                 be used for drawing or manipulation by the program later
-//                 on. It draws a doughnut, centered at (0, 0, 0) whose axis 
+//                 on. It draws a doughnut, centered at (0, 0, 0) whose axis
 //                 is aligned with the z-axis. With the innerRadius used
-//                 as the radius of the cross-section (minor-Radius) and 
-//                 the outerRadius used as the radius of the central 'hole'. 
+//                 as the radius of the cross-section (minor-Radius) and
+//                 the outerRadius used as the radius of the central 'hole'.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  float innerRadius: inner radius (default is 1.0f, shd be >= 0.0f)
 //     [in]  float outerRadius: outer radius (default is 2.0f, shd be >= 0.0f)
-//     [in]  DWORD numSides: Number of sides in the cross-section 
+//     [in]  DWORD numSides: Number of sides in the cross-section
 //                           (default is 8). D3DX_DEFAULT is a valid input.
-//     [in]  DWORD numRings: Number of rings making up the torus 
+//     [in]  DWORD numRings: Number of rings making up the torus
 //                           (default is 8) D3DX_DEFAULT is a valid input.
 //     [in]  DWORD numTexCoords: The number of texture coordinates desired
-//                                 in the vertex-buffer. Default is 1. 
+//                                 in the vertex-buffer. Default is 1.
 //                                 D3DX_DEFAULT is a valid input here.
 //     [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
 //-------------------------------------------------------------------------
 HRESULT WINAPI
     D3DXCreateTorus(LPDIRECT3DDEVICE7  pDevice,
                     float              innerRadius,
-                    float              outerRadius, 
+                    float              outerRadius,
                     DWORD              numSides,
-                    DWORD              numRings, 
-                    DWORD              numTexCoords,  
+                    DWORD              numRings,
+                    DWORD              numTexCoords,
                     LPD3DXSIMPLESHAPE* ppShape );
 
 //-------------------------------------------------------------------------
-// D3DXCreateTeapot: Creates a teapot using the device specified. 
+// D3DXCreateTeapot: Creates a teapot using the device specified.
 // ----------------  It returns a vertex buffer that can be used for
 //                   drawing or manipulation by the program later on.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  DWORD numTexCoords: The number of texture coordinates desired
-//                               in the vertex-buffer. Default is 1. 
+//                               in the vertex-buffer. Default is 1.
 //                               D3DX_DEFAULT is a valid input here.
 //     [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
 //-------------------------------------------------------------------------
 HRESULT WINAPI
     D3DXCreateTeapot(LPDIRECT3DDEVICE7  pDevice,
-                     DWORD              numTexCoords, 
+                     DWORD              numTexCoords,
                      LPD3DXSIMPLESHAPE* ppShape);
 
 //-------------------------------------------------------------------------
 // D3DXCreateSphere: Creates a cylinder of given dimensions using the
-// ----------------  device specified. 
+// ----------------  device specified.
 //                   It returns a vertex buffer that can be used for
 //                   drawing or manipulation by the program later on.
 //
-// Params: 
-//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off. 
+// Params:
+//     [in]  LPDIRECT3DDEVICE7 pDevice: The device to create off.
 //     [in]  float radius: radius (default is 1.0f, shd be >= 0.0f)
 //     [in]  float height: Height (default is 1.0f, shd be >= 0.0f)
 //     [in]  DWORD numSlices: Number of slices about the main axis
@@ -191,19 +191,19 @@ HRESULT WINAPI
 //     [in]  DWORD numStacks: Number of stacks along the main axis
 //                            (default is 8) D3DX_DEFAULT is a valid input.
 //     [in]  DWORD numTexCoords: The number of texture coordinates desired
-//                               in the vertex-buffer. Default is 1. 
+//                               in the vertex-buffer. Default is 1.
 //                               D3DX_DEFAULT is a valid input here.
 //     [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
 //-------------------------------------------------------------------------
 HRESULT WINAPI
-    D3DXCreateSphere(LPDIRECT3DDEVICE7  pDevice, 
-                     float              radius, 
-                     DWORD              numSlices, 
+    D3DXCreateSphere(LPDIRECT3DDEVICE7  pDevice,
+                     float              radius,
+                     DWORD              numSlices,
                      DWORD              numStacks,
-                     DWORD              numTexCoords, 
+                     DWORD              numTexCoords,
                      LPD3DXSIMPLESHAPE* ppShape);
 
 #ifdef __cplusplus
 }
-#endif //__cplusplus    
+#endif //__cplusplus
 #endif //__D3DXSHAPES_H__
diff --git a/src/dep/include/DXSDK/include/d3dxsprite.h b/src/dep/include/DXSDK/include/d3dxsprite.h
index a08b4a9..6e89e96 100644
--- a/src/dep/include/DXSDK/include/d3dxsprite.h
+++ b/src/dep/include/DXSDK/include/d3dxsprite.h
@@ -6,15 +6,15 @@
 //  Content:    D3DX sprite helper functions
 //
 //      These functions allow you to use sprites with D3DX. A "sprite" is
-//      loosely defined as a 2D image that you want to transfer to the 
+//      loosely defined as a 2D image that you want to transfer to the
 //      rendering target. The source image can be a texture created
 //      with the help of the D3DX texture loader; though advanced users may
 //      want to create their own. A helper function (PrepareDeviceForSprite)
-//      is provided to make it easy to set up render states on a device. 
-//      (Again, advanced users can use their own created devices.) 
+//      is provided to make it easy to set up render states on a device.
+//      (Again, advanced users can use their own created devices.)
 //
 //      There are two general techniques for sprites; the simpler one just
-//      specifies a destination rectangle and a rotation anlge. A more 
+//      specifies a destination rectangle and a rotation anlge. A more
 //      powerful technique supports rendering to non-rectangular quads.
 //
 //      Both techniques support clipping, alpha, and rotation. More
@@ -46,14 +46,14 @@ extern "C" {
 // Warning: This function modifies render states and may impact performance
 // negatively on some 3D hardware if it is called too often per frame.
 //
-// Warning: If the render state changes (other than through calls to 
-// BltSprite or WarpSprite), you will need to call this function again before 
+// Warning: If the render state changes (other than through calls to
+// BltSprite or WarpSprite), you will need to call this function again before
 // calling BltSprite or WarpSprite.
 //
-// Details: This function modifies the the rendering first texture stage and 
-// it modifies some renderstates for the entire device. Here is the exact 
+// Details: This function modifies the the rendering first texture stage and
+// it modifies some renderstates for the entire device. Here is the exact
 // list:
-// 
+//
 //   SetTextureStageState(0, D3DTSS_COLORARG1,         D3DTA_TEXTURE);
 //   SetTextureStageState(0, D3DTSS_COLOROP,           D3DTOP_SELECTARG1);
 //   SetTextureStageState(0, D3DTSS_ALPHAARG1,         D3DTA_TEXTURE);
@@ -61,7 +61,7 @@ extern "C" {
 //   SetTextureStageState(0, D3DTSS_ALPHAOP,           D3DTOP_MODULATE);
 //   SetTextureStageState(0, D3DTSS_MINFILTER,         D3DTFN_LINEAR);
 //   SetTextureStageState(0, D3DTSS_MAGFILTER,         D3DTFG_LINEAR);
-// 
+//
 //   SetRenderState(D3DRENDERSTATE_SRCBLEND,           D3DBLEND_SRCALPHA);
 //   SetRenderState(D3DRENDERSTATE_DESTBLEND,          D3DBLEND_INVSRCALPHA);
 //   SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE,   TRUE);
@@ -72,51 +72,51 @@ extern "C" {
 //   - or -
 //   SetRenderState(D3DRENDERSTATE_ZENABLE,            TRUE);
 //
-// Parameters: 
+// Parameters:
 //      pd3dDevice  - a pointer to the d3d device that you wish to prepare
 //                    for use with D3DX Sprite Services
 //      ZEnable     - a flag indicating whether you want the sprites to
 //                    check and update the Z buffer as part of rendering.
 //                    If ZEnable is FALSE, OR you are using
 //                    alpha-blending, then it is necessary to render your
-//                    sprites from back-to-front. 
+//                    sprites from back-to-front.
 //
 //-------------------------------------------------------------------------
 
 #ifdef __cplusplus
 HRESULT WINAPI
-    D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice, 
+    D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
                                 BOOL ZEnable = FALSE);
 #else
 HRESULT WINAPI
-    D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice, 
+    D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
                                 BOOL ZEnable);
 #endif
 
 
 
 //-------------------------------------------------------------------------
-// The D3DXDrawBasicSprite() function performs blitting of source images onto 
-// a 3D rendering device. This function only calls SetTexture on the first 
-// renderstage with the parameter (pd3dTexture) if that parameter is non-null. 
-// This function assumes that D3DXPrepareDeviceForSprite has been called on 
-// the device or that caller has in some other way correctly prepared the 
+// The D3DXDrawBasicSprite() function performs blitting of source images onto
+// a 3D rendering device. This function only calls SetTexture on the first
+// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
+// This function assumes that D3DXPrepareDeviceForSprite has been called on
+// the device or that caller has in some other way correctly prepared the
 // renderstates.
 //
-// This function supports scaling, rotations, alpha-blending, and choosing 
+// This function supports scaling, rotations, alpha-blending, and choosing
 // a source sub-rect.
-// 
+//
 // Rotation angle is specified in radians. Both rotations and scales
 // are applied around the center of the sprite; where the center of the
-// sprite is half the width/height of the sprite, plus the offset parameter. 
+// sprite is half the width/height of the sprite, plus the offset parameter.
 //
-// Use the offset parameter if you want the sprite's center to be something 
+// Use the offset parameter if you want the sprite's center to be something
 // other than the image center.
 //
 // The destination point indicates where you would like the center of
 // the sprite to draw to.
 //
-// Parameters: 
+// Parameters:
 //      pd3dTexture - a pointer to the surface containing the texture
 //      pd3dDevice  - a pointer to the d3d device to render to. It is
 //                    assumed that render states are set up. (See
@@ -125,42 +125,42 @@ HRESULT WINAPI
 //                    components of the vector must be in screen
 //                    space.
 //      alpha       - alpha value to apply to sprite. 1.0 means totally
-//                    opaque; and 0.0 means totally transparent. 
+//                    opaque; and 0.0 means totally transparent.
 //                    WARNING: If you are using alpha, then you should render
 //                    from back to front in order to avoid rendering
 //                    artifacts.
 //      angleRad    - angle of rotation around the 'center' of the rect
 //      scale       - a uniform scale that is applied to the source rect
 //                    to specify the size of the image that is rendered
-//      pOffset     - offset from the center of the source rect to use as the 
+//      pOffset     - offset from the center of the source rect to use as the
 //                    center of rotation
 //      pSourceRect - a rect that indicates what portion of the source
 //                    source texture to use. If NULL is passed, then the
-//                    entire source is used. If the source texture was 
+//                    entire source is used. If the source texture was
 //                    created via D3DX, then the rect should be specified
 //                    in the coordinates of the original image (so that you
 //                    don't have to worry about stretching/scaling that D3DX
 //                    may have done to make the image work with your current
-//                    3D Device.) Note that horizontal or vertical mirroring 
-//                    may be simply accomplished by swapping the left/right 
+//                    3D Device.) Note that horizontal or vertical mirroring
+//                    may be simply accomplished by swapping the left/right
 //                    or top/bottom fields of this RECT.
 //-------------------------------------------------------------------------
 
 #ifdef __cplusplus
-HRESULT WINAPI 
-    D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                         LPDIRECT3DDEVICE7     pd3dDevice, 
-                         const D3DXVECTOR3     *ppointDest, 
+HRESULT WINAPI
+    D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                         LPDIRECT3DDEVICE7     pd3dDevice,
+                         const D3DXVECTOR3     *ppointDest,
                          float                 alpha        = 1.0f,
                          float                 scale        = 1.0f,
                          float                 angleRad     = 0.0f,
                          const D3DXVECTOR2     *pOffset     = NULL,
                          const RECT            *pSourceRect = NULL);
 #else
-HRESULT WINAPI 
-    D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                         LPDIRECT3DDEVICE7     pd3dDevice, 
-                         D3DXVECTOR3           *ppointDest, 
+HRESULT WINAPI
+    D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                         LPDIRECT3DDEVICE7     pd3dDevice,
+                         D3DXVECTOR3           *ppointDest,
                          float                 alpha,
                          float                 scale,
                          float                 angleRad,
@@ -169,20 +169,20 @@ HRESULT WINAPI
 #endif
 
 //-------------------------------------------------------------------------
-// The D3DXDrawSprite() function transforms source images onto a 3D 
+// The D3DXDrawSprite() function transforms source images onto a 3D
 // rendering device. It takes a general 4x4 matrix which is use to transform
 // the points of a default rect: (left=-.5, top=-.5, right=+.5, bottom=+.5).
 // (This default rect was chosen so that it was centered around the origin
 // to ease setting up rotations. And it was chosen to have a width/height of one
 // to ease setting up scales.)
-// 
-// This function only calls SetTexture on the first 
-// renderstage with the parameter (pd3dTexture) if that parameter is non-null. 
-// This function assumes that D3DXPrepareDeviceForSprite has been called on 
-// the device or that caller has in some other way correctly prepared the 
+//
+// This function only calls SetTexture on the first
+// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
+// This function assumes that D3DXPrepareDeviceForSprite has been called on
+// the device or that caller has in some other way correctly prepared the
 // renderstates.
 //
-// This function supports alpha-blending, and choosing 
+// This function supports alpha-blending, and choosing
 // a source sub-rect. (A value of NULL for source sub-rect means the entire
 // texture is used.)
 //
@@ -191,23 +191,23 @@ HRESULT WINAPI
 // that value to D3D as the rhw field of a TLVERTEX. If the value for w is
 // zero, then it use 1 as the rhw.
 //
-// Parameters: 
+// Parameters:
 //      pd3dTexture - a pointer to the surface containing the texture
 //      pd3dDevice  - a pointer to the d3d device to render to. It is
 //                    assumed that render states are set up. (See
 //                    D3DXPrepareDeviceForSprite)
 //      pMatrixTransform - 4x4 matrix that specifies the transformation
-//                    that will be applied to the default -.5 to +.5 
+//                    that will be applied to the default -.5 to +.5
 //                    rectangle.
 //      alpha       - alpha value to apply to sprite. 1.0 means totally
-//                    opaque; and 0.0 means totally transparent. 
+//                    opaque; and 0.0 means totally transparent.
 //                    WARNING: If you are using alpha, then you should render
 //                    from back to front in order to avoid rendering
-//                    artifacts.Furthermore, you should avoid scenarios where 
+//                    artifacts.Furthermore, you should avoid scenarios where
 //                    semi-transparent objects intersect.
 //      pSourceRect - a rect that indicates what portion of the source
 //                    source texture to use. If NULL is passed, then the
-//                    entire source is used. If the source texture was 
+//                    entire source is used. If the source texture was
 //                    created via D3DX, then the rect should be specified
 //                    in the coordinates of the original image (so that you
 //                    don't have to worry about stretching/scaling that D3DX
@@ -215,21 +215,21 @@ HRESULT WINAPI
 //                    3D Device.) Note that mirroring may be simply accomplished
 //                    by swapping the left/right or top/bottom fields of
 //                    this RECT.
-// 
+//
 //-------------------------------------------------------------------------
 
 #ifdef __cplusplus
-HRESULT WINAPI 
-    D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                            LPDIRECT3DDEVICE7     pd3dDevice, 
-                            const D3DXMATRIX      *pMatrixTransform, 
+HRESULT WINAPI
+    D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                            LPDIRECT3DDEVICE7     pd3dDevice,
+                            const D3DXMATRIX      *pMatrixTransform,
                             float                 alpha         = 1.0f,
                             const RECT            *pSourceRect  = NULL);
 #else
-HRESULT WINAPI 
-    D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                            LPDIRECT3DDEVICE7     pd3dDevice, 
-                            D3DXMATRIX            *pMatrixTransform, 
+HRESULT WINAPI
+    D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                            LPDIRECT3DDEVICE7     pd3dDevice,
+                            D3DXMATRIX            *pMatrixTransform,
                             float                 alpha,
                             RECT                  *pSourceRect);
 #endif
@@ -239,13 +239,13 @@ HRESULT WINAPI
 // creates a matrix corresponding to simple properties. This matrix is
 // set up to pass directly to D3DXTransformSprite.
 //
-// Parameters: 
+// Parameters:
 //      pMatrix     - a pointer to the result matrix
 //      prectDest   - a pointer to the target rectangle for the sprite
 //      angleRad    - angle of rotation around the 'center' of the rect
-//      pOffset     - offset from the center of the source rect to use as the 
+//      pOffset     - offset from the center of the source rect to use as the
 //                    center of rotation
-// 
+//
 //-------------------------------------------------------------------------
 
 #ifdef __cplusplus
@@ -268,7 +268,7 @@ void WINAPI
 // quad ABCD is broken into two triangles ABC and ACD which are rendered
 // via DrawPrim.
 //
-// Parameters: 
+// Parameters:
 //      pd3dTexture - a pointer to the surface containing the texture
 //      pd3dDevice  - a pointer to the d3d device to render to. It is
 //                    assumed that render states are set up. (See
@@ -279,14 +279,14 @@ void WINAPI
 //                    will take the reciprocal of that value to pass as
 //                    as the rhw (i.e. reciprocal homogenous w).
 //      alpha       - alpha value to apply to sprite. 1.0 means totally
-//                    opaque; and 0.0 means totally transparent. 
+//                    opaque; and 0.0 means totally transparent.
 //                    WARNING: If you are using alpha, then you should render
 //                    from back to front in order to avoid rendering
-//                    artifacts.Furthermore, you should avoid scenarios where 
+//                    artifacts.Furthermore, you should avoid scenarios where
 //                    semi-transparent objects intersect.
 //      pSourceRect - a rect that indicates what portion of the source
 //                    source texture to use. If NULL is passed, then the
-//                    entire source is used. If the source texture was 
+//                    entire source is used. If the source texture was
 //                    created via D3DX, then the rect should be specified
 //                    in the coordinates of the original image (so that you
 //                    don't have to worry about stretching/scaling that D3DX
@@ -297,17 +297,17 @@ void WINAPI
 //-------------------------------------------------------------------------
 
 #ifdef __cplusplus
-HRESULT WINAPI 
-    D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                     LPDIRECT3DDEVICE7     pd3dDevice, 
-                     const D3DXVECTOR4     quad[4], 
+HRESULT WINAPI
+    D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                     LPDIRECT3DDEVICE7     pd3dDevice,
+                     const D3DXVECTOR4     quad[4],
                      float                 alpha         = 1.0f,
                      const RECT            *pSourceRect  = NULL);
 #else
-HRESULT WINAPI 
-    D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7  pd3dTexture, 
-                     LPDIRECT3DDEVICE7     pd3dDevice, 
-                     D3DXVECTOR4           quad[4], 
+HRESULT WINAPI
+    D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7  pd3dTexture,
+                     LPDIRECT3DDEVICE7     pd3dDevice,
+                     D3DXVECTOR4           quad[4],
                      float                 alpha,
                      RECT                  *pSourceRect);
 #endif
diff --git a/src/dep/include/DXSDK/include/ddraw.h b/src/dep/include/DXSDK/include/ddraw.h
index e66314b..806301b 100644
--- a/src/dep/include/DXSDK/include/ddraw.h
+++ b/src/dep/include/DXSDK/include/ddraw.h
@@ -2264,7 +2264,7 @@ typedef struct _DDSURFACEDESC2
     union
     {
         DWORD           dwBackBufferCount;      // number of back buffers requested
-        DWORD           dwDepth;                // the depth if this is a volume texture 
+        DWORD           dwDepth;                // the depth if this is a volume texture
     } DUMMYUNIONNAMEN(5);
     union
     {
@@ -2887,7 +2887,7 @@ typedef struct _DDCOLORCONTROL
 #define DDSCAPS2_NPATCHES                       0x02000000L
 
 /*
- * This bit is reserved for internal use 
+ * This bit is reserved for internal use
  */
 #define DDSCAPS2_RESERVED3                      0x04000000L
 
@@ -2939,12 +2939,12 @@ typedef struct _DDCOLORCONTROL
 #define DDSCAPS3_MULTISAMPLE_QUALITY_SHIFT      5
 
 /*
- * This bit is reserved for internal use 
+ * This bit is reserved for internal use
  */
 #define DDSCAPS3_RESERVED1                      0x00000100L
 
 /*
- * This bit is reserved for internal use 
+ * This bit is reserved for internal use
  */
 #define DDSCAPS3_RESERVED2                      0x00000200L
 
@@ -4408,7 +4408,7 @@ typedef struct _DDCOLORCONTROL
  * that moves surface contents from an offscreen back buffer to the primary
  * surface). The driver is not allowed to "queue"  more than three such blts.
  * The "end" of the presentation blt is indicated, since the
- * blt may be clipped, in which case the runtime will call the driver with 
+ * blt may be clipped, in which case the runtime will call the driver with
  * several blts. All blts (even if not clipped) are tagged with DDBLT_PRESENTATION
  * and the last (even if not clipped) additionally with DDBLT_LAST_PRESENTATION.
  * Thus the true rule is that the driver must not schedule a DDBLT_PRESENTATION
@@ -4422,12 +4422,12 @@ typedef struct _DDCOLORCONTROL
  * When excessive queueing occurs, applications become unusable because the application
  * visibly lags user input, and such problems make windowed interactive applications impossible.
  * Some drivers may not have sufficient knowledge of their hardware's FIFO to know
- * when a certain blt has been retired. Such drivers should code cautiously, and 
+ * when a certain blt has been retired. Such drivers should code cautiously, and
  * simply not allow any frames to be queued at all. DDBLT_LAST_PRESENTATION should cause
  * such drivers to return DDERR_WASSTILLDRAWING until the accelerator is completely
  * finished- exactly as if the application had called Lock on the source surface
- * before calling Blt. 
- * In other words, the driver is allowed and encouraged to 
+ * before calling Blt.
+ * In other words, the driver is allowed and encouraged to
  * generate as much latency as it can, but never more than 3 frames worth.
  * Implementation detail: Drivers should count blts against the SOURCE surface, not
  * against the primary surface. This enables multiple parallel windowed application
@@ -4435,7 +4435,7 @@ typedef struct _DDCOLORCONTROL
  * This flag is passed only to DX8 or higher drivers.
  *
  * APPLICATIONS DO NOT SET THESE FLAGS. THEY ARE SET BY THE DIRECTDRAW RUNTIME.
- * 
+ *
  */
 #define DDBLT_PRESENTATION                      0x10000000l
 #define DDBLT_LAST_PRESENTATION                 0x20000000l
@@ -4474,7 +4474,7 @@ typedef struct _DDCOLORCONTROL
  * NOTE: APPLICATIONS SHOULD NOT SET THIS FLAG. THIS FLAG IS INTENDED
  * FOR USE BY THE DIRECT3D RUNTIME. Use IDirect3DSwapChain9::Present
  * and specify D3DPRESENT_LINEAR_CONTENT in order to use this functionality.
- */ 
+ */
 #define DDBLT_EXTENDED_LINEAR_CONTENT           0x00000004l
 
 
diff --git a/src/dep/include/DXSDK/include/dinput.h b/src/dep/include/DXSDK/include/dinput.h
index 5aac256..5c97128 100644
--- a/src/dep/include/DXSDK/include/dinput.h
+++ b/src/dep/include/DXSDK/include/dinput.h
@@ -843,27 +843,27 @@ typedef const DICONFIGUREDEVICESPARAMS *LPCDICONFIGUREDEVICESPARAMS;
 
 typedef struct _DIDEVICEIMAGEINFOA {
     CHAR        tszImagePath[MAX_PATH];
-    DWORD       dwFlags; 
+    DWORD       dwFlags;
     // These are valid if DIDIFT_OVERLAY is present in dwFlags.
-    DWORD       dwViewID;      
-    RECT        rcOverlay;             
+    DWORD       dwViewID;
+    RECT        rcOverlay;
     DWORD       dwObjID;
     DWORD       dwcValidPts;
-    POINT       rgptCalloutLine[5];  
-    RECT        rcCalloutRect;  
-    DWORD       dwTextAlign;     
+    POINT       rgptCalloutLine[5];
+    RECT        rcCalloutRect;
+    DWORD       dwTextAlign;
 } DIDEVICEIMAGEINFOA, *LPDIDEVICEIMAGEINFOA;
 typedef struct _DIDEVICEIMAGEINFOW {
     WCHAR       tszImagePath[MAX_PATH];
-    DWORD       dwFlags; 
+    DWORD       dwFlags;
     // These are valid if DIDIFT_OVERLAY is present in dwFlags.
-    DWORD       dwViewID;      
-    RECT        rcOverlay;             
+    DWORD       dwViewID;
+    RECT        rcOverlay;
     DWORD       dwObjID;
     DWORD       dwcValidPts;
-    POINT       rgptCalloutLine[5];  
-    RECT        rcCalloutRect;  
-    DWORD       dwTextAlign;     
+    POINT       rgptCalloutLine[5];
+    RECT        rcCalloutRect;
+    DWORD       dwTextAlign;
 } DIDEVICEIMAGEINFOW, *LPDIDEVICEIMAGEINFOW;
 #ifdef UNICODE
 typedef DIDEVICEIMAGEINFOW DIDEVICEIMAGEINFO;
@@ -2761,8 +2761,8 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DI_TRUNCATED                    ((HRESULT)0x00000008L)
 
 /*
- *  The settings have been successfully applied but could not be 
- *  persisted. 
+ *  The settings have been successfully applied but could not be
+ *  persisted.
  */
 #define DI_SETTINGSNOTSAVED				((HRESULT)0x0000000BL)
 
@@ -2970,7 +2970,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 
 
 /*
- *  A mapper file function failed because reading or writing the user or IHV 
+ *  A mapper file function failed because reading or writing the user or IHV
  *  settings file failed.
  */
 #define DIERR_MAPFILEFAIL               0x8004020BL
@@ -3126,12 +3126,12 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DIKEYBOARD_MYCOMPUTER                   0x810004EB    /* My Computer */
 #define DIKEYBOARD_MAIL                         0x810004EC    /* Mail */
 #define DIKEYBOARD_MEDIASELECT                  0x810004ED    /* Media Select */
-  
+
 
 /*--- MOUSE
       Physical Mouse Device             ---*/
 
-#define DIMOUSE_XAXISAB                         (0x82000200 |DIMOFS_X ) /* X Axis-absolute: Some mice natively report absolute coordinates  */ 
+#define DIMOUSE_XAXISAB                         (0x82000200 |DIMOFS_X ) /* X Axis-absolute: Some mice natively report absolute coordinates  */
 #define DIMOUSE_YAXISAB                         (0x82000200 |DIMOFS_Y ) /* Y Axis-absolute: Some mice natively report absolute coordinates */
 #define DIMOUSE_XAXIS                           (0x82000300 |DIMOFS_X ) /* X Axis */
 #define DIMOUSE_YAXIS                           (0x82000300 |DIMOFS_Y ) /* Y Axis */
@@ -3254,7 +3254,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DIBUTTON_DRIVINGT_DEVICE                0x030044FE /* Show input device and controls */
 #define DIBUTTON_DRIVINGT_PAUSE                 0x030044FC /* Start / Pause / Restart game */
 
-/*--- Flight Simulator - Civilian 
+/*--- Flight Simulator - Civilian
       Plane control is the primary objective  ---*/
 #define DIVIRTUAL_FLYING_CIVILIAN               0x04000000
 #define DIAXIS_FLYINGC_BANK                     0x04008A01 /* Roll ship left / right */
@@ -3282,7 +3282,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DIBUTTON_FLYINGC_DEVICE                 0x040044FE /* Show input device and controls */
 #define DIBUTTON_FLYINGC_PAUSE                  0x040044FC /* Start / Pause / Restart game */
 
-/*--- Flight Simulator - Military 
+/*--- Flight Simulator - Military
       Aerial combat is the primary objective  ---*/
 #define DIVIRTUAL_FLYING_MILITARY               0x05000000
 #define DIAXIS_FLYINGM_BANK                     0x05008A01 /* Bank - Roll ship left / right */
@@ -3379,7 +3379,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DIBUTTON_SPACESIM_DEVICE                0x070044FE /* Show input device and controls */
 #define DIBUTTON_SPACESIM_PAUSE                 0x070044FC /* Start / Pause / Restart game */
 
-/*--- Fighting - First Person 
+/*--- Fighting - First Person
       Hand to Hand combat is primary objective  ---*/
 #define DIVIRTUAL_FIGHTING_HAND2HAND            0x08000000
 #define DIAXIS_FIGHTINGH_LATERAL                0x08008201 /* Sidestep left/right */
@@ -4243,42 +4243,42 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
 #define DIBUTTON_MECHA_PAUSE                    0x290044FC /* Start / Pause / Restart game */
 
 /*
- *  "ANY" semantics can be used as a last resort to get mappings for actions 
- *  that match nothing in the chosen virtual genre.  These semantics will be 
- *  mapped at a lower priority that virtual genre semantics.  Also, hardware 
- *  vendors will not be able to provide sensible mappings for these unless 
+ *  "ANY" semantics can be used as a last resort to get mappings for actions
+ *  that match nothing in the chosen virtual genre.  These semantics will be
+ *  mapped at a lower priority that virtual genre semantics.  Also, hardware
+ *  vendors will not be able to provide sensible mappings for these unless
  *  they provide application specific mappings.
  */
-#define DIAXIS_ANY_X_1                          0xFF00C201 
-#define DIAXIS_ANY_X_2                          0xFF00C202 
-#define DIAXIS_ANY_Y_1                          0xFF014201 
-#define DIAXIS_ANY_Y_2                          0xFF014202 
-#define DIAXIS_ANY_Z_1                          0xFF01C201 
-#define DIAXIS_ANY_Z_2                          0xFF01C202 
-#define DIAXIS_ANY_R_1                          0xFF024201 
-#define DIAXIS_ANY_R_2                          0xFF024202 
-#define DIAXIS_ANY_U_1                          0xFF02C201 
-#define DIAXIS_ANY_U_2                          0xFF02C202 
-#define DIAXIS_ANY_V_1                          0xFF034201 
-#define DIAXIS_ANY_V_2                          0xFF034202 
-#define DIAXIS_ANY_A_1                          0xFF03C201 
-#define DIAXIS_ANY_A_2                          0xFF03C202 
-#define DIAXIS_ANY_B_1                          0xFF044201 
-#define DIAXIS_ANY_B_2                          0xFF044202 
-#define DIAXIS_ANY_C_1                          0xFF04C201 
-#define DIAXIS_ANY_C_2                          0xFF04C202 
-#define DIAXIS_ANY_S_1                          0xFF054201 
-#define DIAXIS_ANY_S_2                          0xFF054202 
+#define DIAXIS_ANY_X_1                          0xFF00C201
+#define DIAXIS_ANY_X_2                          0xFF00C202
+#define DIAXIS_ANY_Y_1                          0xFF014201
+#define DIAXIS_ANY_Y_2                          0xFF014202
+#define DIAXIS_ANY_Z_1                          0xFF01C201
+#define DIAXIS_ANY_Z_2                          0xFF01C202
+#define DIAXIS_ANY_R_1                          0xFF024201
+#define DIAXIS_ANY_R_2                          0xFF024202
+#define DIAXIS_ANY_U_1                          0xFF02C201
+#define DIAXIS_ANY_U_2                          0xFF02C202
+#define DIAXIS_ANY_V_1                          0xFF034201
+#define DIAXIS_ANY_V_2                          0xFF034202
+#define DIAXIS_ANY_A_1                          0xFF03C201
+#define DIAXIS_ANY_A_2                          0xFF03C202
+#define DIAXIS_ANY_B_1                          0xFF044201
+#define DIAXIS_ANY_B_2                          0xFF044202
+#define DIAXIS_ANY_C_1                          0xFF04C201
+#define DIAXIS_ANY_C_2                          0xFF04C202
+#define DIAXIS_ANY_S_1                          0xFF054201
+#define DIAXIS_ANY_S_2                          0xFF054202
 
-#define DIAXIS_ANY_1                            0xFF004201 
-#define DIAXIS_ANY_2                            0xFF004202 
-#define DIAXIS_ANY_3                            0xFF004203 
-#define DIAXIS_ANY_4                            0xFF004204 
+#define DIAXIS_ANY_1                            0xFF004201
+#define DIAXIS_ANY_2                            0xFF004202
+#define DIAXIS_ANY_3                            0xFF004203
+#define DIAXIS_ANY_4                            0xFF004204
 
-#define DIPOV_ANY_1                             0xFF004601 
-#define DIPOV_ANY_2                             0xFF004602 
-#define DIPOV_ANY_3                             0xFF004603 
-#define DIPOV_ANY_4                             0xFF004604 
+#define DIPOV_ANY_1                             0xFF004601
+#define DIPOV_ANY_2                             0xFF004602
+#define DIPOV_ANY_3                             0xFF004603
+#define DIPOV_ANY_4                             0xFF004604
 
 #define DIBUTTON_ANY(instance)                  ( 0xFF004400 | instance )
 
@@ -4322,13 +4322,13 @@ WINMMAPI MMRESULT WINAPI joyConfigChanged( DWORD dwFlags );
 
 #ifndef DIJ_RINGZERO
 /*
- * Invoke the joystick control panel directly, using the passed window handle 
- * as the parent of the dialog.  This API is only supported for compatibility 
- * purposes; new applications should use the RunControlPanel method of a 
+ * Invoke the joystick control panel directly, using the passed window handle
+ * as the parent of the dialog.  This API is only supported for compatibility
+ * purposes; new applications should use the RunControlPanel method of a
  * device interface for a game controller.
  * The API is called by using the function pointer returned by
- * GetProcAddress( hCPL, TEXT("ShowJoyCPL") ) where hCPL is a HMODULE returned 
- * by LoadLibrary( TEXT("joy.cpl") ).  The typedef is provided to allow 
+ * GetProcAddress( hCPL, TEXT("ShowJoyCPL") ) where hCPL is a HMODULE returned
+ * by LoadLibrary( TEXT("joy.cpl") ).  The typedef is provided to allow
  * declaration and casting of an appropriately typed variable.
  */
 void WINAPI ShowJoyCPL( HWND hWnd );
diff --git a/src/dep/include/DXSDK/include/dinputd.h b/src/dep/include/DXSDK/include/dinputd.h
index f534353..db25749 100644
--- a/src/dep/include/DXSDK/include/dinputd.h
+++ b/src/dep/include/DXSDK/include/dinputd.h
@@ -699,19 +699,19 @@ typedef struct IDirectInputJoyConfig8 *LPDIRECTINPUTJOYCONFIG8;
 #define DIERR_DRIVERLAST                0x800403FFL
 
 /*
- *  Unless the specific driver has been precisely identified, no meaning 
- *  should be attributed to these values other than that the driver 
- *  originated the error.  However, to illustrate the types of error that 
- *  may be causing the failure, the PID force feedback driver distributed 
+ *  Unless the specific driver has been precisely identified, no meaning
+ *  should be attributed to these values other than that the driver
+ *  originated the error.  However, to illustrate the types of error that
+ *  may be causing the failure, the PID force feedback driver distributed
  *  with DirectX 7 could return the following errors:
  *
- *  DIERR_DRIVERFIRST + 1   
+ *  DIERR_DRIVERFIRST + 1
  *      The requested usage was not found.
- *  DIERR_DRIVERFIRST + 2   
+ *  DIERR_DRIVERFIRST + 2
  *      The parameter block couldn't be	downloaded to the device.
- *  DIERR_DRIVERFIRST + 3   
+ *  DIERR_DRIVERFIRST + 3
  *      PID initialization failed.
- *  DIERR_DRIVERFIRST + 4   
+ *  DIERR_DRIVERFIRST + 4
  *      The provided values couldn't be scaled.
  */
 
diff --git a/src/dep/include/DXSDK/include/dls1.h b/src/dep/include/DXSDK/include/dls1.h
index fc88a31..03a9ac9 100644
--- a/src/dep/include/DXSDK/include/dls1.h
+++ b/src/dep/include/DXSDK/include/dls1.h
@@ -31,7 +31,7 @@
 //               LIST [] 'ins ' [dlid,insh,RGNLIST,ARTLIST,INFOLIST]
 //
 // RGNLIST
-// LIST [] 'lrgn' 
+// LIST [] 'lrgn'
 //               LIST [] 'rgn '  [rgnh,wsmp,wlnk,ARTLIST]
 //               LIST [] 'rgn '  [rgnh,wsmp,wlnk,ARTLIST]
 //               LIST [] 'rgn '  [rgnh,wsmp,wlnk,ARTLIST]
@@ -43,7 +43,7 @@
 //         '3rd1' Possible 3rd party articulation structure 1
 //         '3rd2' Possible 3rd party articulation structure 2 .... and so on
 //
-// WAVEPOOL 
+// WAVEPOOL
 // ptbl [] [pool table]
 // LIST [] 'wvpl'
 //               [path],
@@ -55,7 +55,7 @@
 //               LIST [] 'wave' [dlid,RIFFWAVE]
 //
 // INFOLIST
-// LIST [] 'INFO' 
+// LIST [] 'INFO'
 //               'icmt' 'One of those crazy comments.'
 //               'icop' 'Copyright (C) 1996 Sonic Foundry'
 //
@@ -86,7 +86,7 @@
 #define FOURCC_VERS  mmioFOURCC('v','e','r','s')
 
 /*/////////////////////////////////////////////////////////////////////////
-// Articulation connection graph definitions 
+// Articulation connection graph definitions
 /////////////////////////////////////////////////////////////////////////*/
 
 /* Generic Sources */
@@ -140,7 +140,7 @@ typedef struct _DLSVERSION {
   DWORD    dwVersionMS;
   DWORD    dwVersionLS;
 }DLSVERSION, FAR *LPDLSVERSION;
-                   
+
 
 typedef struct _CONNECTION {
   USHORT   usSource;
@@ -223,7 +223,7 @@ typedef struct _WAVELINK { /* any paths or links are stored right after struct *
 
 #define POOL_CUE_NULL  0xffffffffl
 
-typedef struct _POOLCUE { 
+typedef struct _POOLCUE {
   ULONG    ulOffset;       /* Offset to the entry in the list */
 }POOLCUE, FAR *LPPOOLCUE;
 
diff --git a/src/dep/include/DXSDK/include/dls2.h b/src/dep/include/DXSDK/include/dls2.h
index 30cec23..9861a8d 100644
--- a/src/dep/include/DXSDK/include/dls2.h
+++ b/src/dep/include/DXSDK/include/dls2.h
@@ -1,50 +1,50 @@
 /*
- 
+
  	dls2.h
  	
  	Description:
- 
+
  	Interface defines and structures for the DLS2 extensions of DLS.
- 
- 
+
+
      Written by Microsoft 1998.  Released for public use.
- 
+
 */
- 
+
 #ifndef _INC_DLS2
 #define _INC_DLS2
- 
+
 /*
      FOURCC's used in the DLS2 file, in addition to DLS1 chunks
 */
- 
+
 #define FOURCC_RGN2  mmioFOURCC('r','g','n','2')
 #define FOURCC_LAR2  mmioFOURCC('l','a','r','2')
 #define FOURCC_ART2  mmioFOURCC('a','r','t','2')
 #define FOURCC_CDL   mmioFOURCC('c','d','l',' ')
 #define FOURCC_DLID	 mmioFOURCC('d','l','i','d')
- 
+
 /*
      Articulation connection graph definitions. These are in addition to
      the definitions in the DLS1 header.
 */
- 
+
 /* Generic Sources (in addition to DLS1 sources. */
 #define CONN_SRC_POLYPRESSURE		0x0007	/* Polyphonic Pressure */
 #define CONN_SRC_CHANNELPRESSURE		0x0008	/* Channel Pressure */
 #define CONN_SRC_VIBRATO			0x0009	/* Vibrato LFO */
 #define CONN_SRC_MONOPRESSURE       	0x000a  /* MIDI Mono pressure */
- 
- 
+
+
 /* Midi Controllers */
 #define CONN_SRC_CC91			0x00db	/* Reverb Send */
 #define CONN_SRC_CC93			0x00dd	/* Chorus Send */
- 
- 
+
+
 /* Generic Destinations */
 #define CONN_DST_GAIN			0x0001	/* Same as CONN_DST_ ATTENUATION, but more appropriate terminology. */
 #define CONN_DST_KEYNUMBER 0x0005  /* Key Number Generator */
- 
+
 /* Audio Channel Output Destinations */
 #define CONN_DST_LEFT			0x0010	/* Left Channel Send */
 #define CONN_DST_RIGHT			0x0011	/* Right Channel Send */
@@ -54,32 +54,32 @@
 #define CONN_DST_LFE_CHANNEL		0x0015	/* LFE Channel Send */
 #define CONN_DST_CHORUS			0x0080	/* Chorus Send */
 #define CONN_DST_REVERB			0x0081	/* Reverb Send */
- 
+
 /* Vibrato LFO Destinations */
 #define CONN_DST_VIB_FREQUENCY		0x0114	/* Vibrato Frequency */
 #define CONN_DST_VIB_STARTDELAY		0x0115	/* Vibrato Start Delay */
- 
+
 /* EG1 Destinations */
 #define CONN_DST_EG1_DELAYTIME		0x020B	/* EG1 Delay Time */
 #define CONN_DST_EG1_HOLDTIME		0x020C	/* EG1 Hold Time */
 #define CONN_DST_EG1_SHUTDOWNTIME		0x020D	/* EG1 Shutdown Time */
- 
- 
+
+
 /*	EG2 Destinations */
 #define CONN_DST_EG2_DELAYTIME		0x030F	/* EG2 Delay Time */
 #define CONN_DST_EG2_HOLDTIME		0x0310	/* EG2 Hold Time */
- 
- 
+
+
 /* Filter Destinations */
 #define CONN_DST_FILTER_CUTOFF		0x0500	/* Filter Cutoff Frequency */
 #define CONN_DST_FILTER_Q			0x0501	/* Filter Resonance */
- 
- 
+
+
 /* Transforms */
 #define CONN_TRN_CONVEX			0x0002	/* Convex Transform */
 #define CONN_TRN_SWITCH			0x0003	/* Switch Transform */
- 
- 
+
+
 /*	Conditional chunk operators */
  #define DLS_CDL_AND			0x0001	/* X = X & Y */
  #define DLS_CDL_OR			0x0002	/* X = X | Y */
@@ -99,7 +99,7 @@
  #define DLS_CDL_CONST		0x0010	/* 32-bit constant */
  #define DLS_CDL_QUERY		0x0011	/* 32-bit value returned from query */
  #define DLS_CDL_QUERYSUPPORTED	0x0012	/* Test to see if query is supported by synth */
- 
+
 /*
   Loop and release
 */
diff --git a/src/dep/include/DXSDK/include/dmdls.h b/src/dep/include/DXSDK/include/dmdls.h
index c507268..e910635 100644
--- a/src/dep/include/DXSDK/include/dmdls.h
+++ b/src/dep/include/DXSDK/include/dmdls.h
@@ -40,7 +40,7 @@ typedef struct _DMUS_DOWNLOADINFO
 #define DMUS_DOWNLOADINFO_WAVE              2
 #define DMUS_DOWNLOADINFO_INSTRUMENT2       3   /* New version for better DLS2 support. */
 
-/* Support for oneshot and streaming wave data 
+/* Support for oneshot and streaming wave data
  */
 #define DMUS_DOWNLOADINFO_WAVEARTICULATION  4   /* Wave articulation data */
 #define DMUS_DOWNLOADINFO_STREAMINGWAVE     5   /* One chunk of a streaming */
@@ -49,7 +49,7 @@ typedef struct _DMUS_DOWNLOADINFO
 #define DMUS_DEFAULT_SIZE_OFFSETTABLE   1
 
 /* Flags for DMUS_INSTRUMENT's ulFlags member */
- 
+
 #define DMUS_INSTRUMENT_GM_INSTRUMENT   (1 << 0)
 
 typedef struct _DMUS_OFFSETTABLE
@@ -60,11 +60,11 @@ typedef struct _DMUS_OFFSETTABLE
 typedef struct _DMUS_INSTRUMENT
 {
     ULONG           ulPatch;
-    ULONG           ulFirstRegionIdx;             
+    ULONG           ulFirstRegionIdx;
     ULONG           ulGlobalArtIdx;         /* If zero the instrument does not have an articulation */
     ULONG           ulFirstExtCkIdx;        /* If zero no 3rd party entenstion chunks associated with the instrument */
     ULONG           ulCopyrightIdx;         /* If zero no Copyright information associated with the instrument */
-    ULONG           ulFlags;                        
+    ULONG           ulFlags;
 } DMUS_INSTRUMENT;
 
 typedef struct _DMUS_REGION
@@ -138,14 +138,14 @@ typedef struct _DMUS_ARTICULATION2          /* Articulation chunk for DMUS_DOWNL
     ULONG           ulNextArtIdx;           /* Additional articulation chunks */
 } DMUS_ARTICULATION2;
 
-#define DMUS_MIN_DATA_SIZE 4       
+#define DMUS_MIN_DATA_SIZE 4
 /*  The actual number is determined by cbSize of struct _DMUS_EXTENSIONCHUNK */
 
 typedef struct _DMUS_EXTENSIONCHUNK
 {
     ULONG           cbSize;                      /*  Size of extension chunk  */
     ULONG           ulNextExtCkIdx;              /*  If zero no more 3rd party entenstion chunks */
-    FOURCC          ExtCkID;                                      
+    FOURCC          ExtCkID;
     BYTE            byExtCk[DMUS_MIN_DATA_SIZE]; /*  The actual number that follows is determined by cbSize */
 } DMUS_EXTENSIONCHUNK;
 
@@ -160,7 +160,7 @@ typedef struct _DMUS_COPYRIGHT
 typedef struct _DMUS_WAVEDATA
 {
     ULONG           cbSize;
-    BYTE            byData[DMUS_MIN_DATA_SIZE]; 
+    BYTE            byData[DMUS_MIN_DATA_SIZE];
 } DMUS_WAVEDATA;
 
 typedef struct _DMUS_WAVE
@@ -168,7 +168,7 @@ typedef struct _DMUS_WAVE
     ULONG           ulFirstExtCkIdx;    /* If zero no 3rd party entenstion chunks associated with the wave */
     ULONG           ulCopyrightIdx;     /* If zero no Copyright information associated with the wave */
     ULONG           ulWaveDataIdx;      /* Location of actual wave data. */
-    WAVEFORMATEX    WaveformatEx;       
+    WAVEFORMATEX    WaveformatEx;
 } DMUS_WAVE;
 
 typedef struct _DMUS_NOTERANGE *LPDMUS_NOTERANGE;
@@ -194,6 +194,6 @@ typedef struct _DMUS_WAVEDL
 }   DMUS_WAVEDL,
     *LPDMUS_WAVEDL;
 
-#endif 
+#endif
 
 
diff --git a/src/dep/include/DXSDK/include/dmerror.h b/src/dep/include/DXSDK/include/dmerror.h
index a0a61ff..fe4b8b7 100644
--- a/src/dep/include/DXSDK/include/dmerror.h
+++ b/src/dep/include/DXSDK/include/dmerror.h
@@ -16,7 +16,7 @@
 #define MAKE_HRESULT(sev,fac,code) \
     ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
 #endif
-    
+
 #define MAKE_DMHRESULTSUCCESS(code)     MAKE_HRESULT(0, FACILITY_DIRECTMUSIC, (DMUS_ERRBASE + (code)))
 #define MAKE_DMHRESULTERROR(code)       MAKE_HRESULT(1, FACILITY_DIRECTMUSIC, (DMUS_ERRBASE + (code)))
 
@@ -75,8 +75,8 @@
 
 /* DMUS_S_OVER_CHORD
  *
- * Returned from IDirectMusicPerformance::MusicToMIDI(), this indicates 
- * that no note has been calculated because the music value has the note 
+ * Returned from IDirectMusicPerformance::MusicToMIDI(), this indicates
+ * that no note has been calculated because the music value has the note
  * at a position higher than the top note of the chord. This applies only
  * to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates
  * that the caller should not do anything with the note. It is not meant
@@ -87,10 +87,10 @@
 /* DMUS_S_UP_OCTAVE
  *
  * Returned from IDirectMusicPerformance::MIDIToMusic(),  and
- * IDirectMusicPerformance::MusicToMIDI(), this indicates 
- * that the note conversion generated a note value that is below 0, 
+ * IDirectMusicPerformance::MusicToMIDI(), this indicates
+ * that the note conversion generated a note value that is below 0,
  * so it has been bumped up one or more octaves to be in the proper
- * MIDI range of 0 through 127. 
+ * MIDI range of 0 through 127.
  * Note that this is valid for MIDIToMusic() when using play modes
  * DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of
  * which store MIDI values in wMusicValue. With MusicToMIDI(), it is
@@ -102,10 +102,10 @@
 /* DMUS_S_DOWN_OCTAVE
  *
  * Returned from IDirectMusicPerformance::MIDIToMusic(),  and
- * IDirectMusicPerformance::MusicToMIDI(), this indicates 
- * that the note conversion generated a note value that is above 127, 
+ * IDirectMusicPerformance::MusicToMIDI(), this indicates
+ * that the note conversion generated a note value that is above 127,
  * so it has been bumped down one or more octaves to be in the proper
- * MIDI range of 0 through 127. 
+ * MIDI range of 0 through 127.
  * Note that this is valid for MIDIToMusic() when using play modes
  * DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of
  * which store MIDI values in wMusicValue. With MusicToMIDI(), it is
@@ -139,7 +139,7 @@
 
 /* DMUS_E_PORTS_OPEN
  *
- * The requested operation cannot be performed while there are 
+ * The requested operation cannot be performed while there are
  * instantiated ports in any process in the system.
  */
 #define DMUS_E_PORTS_OPEN               MAKE_DMHRESULTERROR(0x0102)
@@ -183,7 +183,7 @@
 
 /* DMUS_E_ALREADY_LOADED
  *
- * Second attempt to load a DLS collection that is currently open. 
+ * Second attempt to load a DLS collection that is currently open.
  */
 #define DMUS_E_ALREADY_LOADED           MAKE_DMHRESULTERROR(0x0111)
 
@@ -250,7 +250,7 @@
 /* DMUS_E_GET_UNSUPPORTED
  *
  * The specified property item may not be retrieved from the target object.
- */ 
+ */
 #define DMUS_E_GET_UNSUPPORTED          MAKE_DMHRESULTERROR(0x0124)
 
 /* DMUS_E_NOTMONO
@@ -285,7 +285,7 @@
 
 /* DMUS_E_NOTPCM
  *
- * Downoaded DLS wave is not in PCM format. 
+ * Downoaded DLS wave is not in PCM format.
 */
 #define DMUS_E_NOTPCM                   MAKE_DMHRESULTERROR(0x012A)
 
@@ -297,7 +297,7 @@
 
 /* DMUS_E_BADOFFSETTABLE
  *
- * Offset Table for download buffer has errors. 
+ * Offset Table for download buffer has errors.
  */
 #define DMUS_E_BADOFFSETTABLE           MAKE_DMHRESULTERROR(0x012C)
 
@@ -316,7 +316,7 @@
 
 /* DMUS_E_ALREADYOPEN
  *
- * An attempt was made to open the software synthesizer while it was already 
+ * An attempt was made to open the software synthesizer while it was already
  * open.
  * ASSERT?
  */
@@ -324,7 +324,7 @@
 
 /* DMUS_E_ALREADYCLOSE
  *
- * An attempt was made to close the software synthesizer while it was already 
+ * An attempt was made to close the software synthesizer while it was already
  * open.
  * ASSERT?
  */
@@ -332,7 +332,7 @@
 
 /* DMUS_E_SYNTHNOTCONFIGURED
  *
- * The operation could not be completed because the software synth has not 
+ * The operation could not be completed because the software synth has not
  * yet been fully configured.
  * ASSERT?
  */
@@ -353,7 +353,7 @@
 /* DMUS_E_DMUSIC_RELEASED
  *
  * The operation cannot be performed because the final instance of the
- * DirectMusic object was released. Ports cannot be used after final 
+ * DirectMusic object was released. Ports cannot be used after final
  * release of the DirectMusic object.
  */
 #define DMUS_E_DMUSIC_RELEASED          MAKE_DMHRESULTERROR(0x0134)
@@ -400,7 +400,7 @@
 
 /* DMUS_E_INVALIDBUFFER
  *
- * Invalid DirectSound buffer was handed to port. 
+ * Invalid DirectSound buffer was handed to port.
  */
 #define DMUS_E_INVALIDBUFFER            MAKE_DMHRESULTERROR(0x013B)
 
@@ -535,7 +535,7 @@
  * The track does not support clock time playback or getparam.
  */
 #define DMUS_E_TRACK_NO_CLOCKTIME_SUPPORT   MAKE_DMHRESULTERROR(0x0167)
- 
+
 /* DMUS_E_NO_MASTER_CLOCK
  *
  * There is no master clock in the performance. Be sure to call
@@ -642,8 +642,8 @@
 #define DMUS_E_CONNOT_CONVERT           DMUS_E_CANNOT_CONVERT
 
 /* DMUS_E_DESCEND_CHUNK_FAIL
- * 
- * DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file 
+ *
+ * DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file
  * was reached before the desired chunk was found.
  */
 #define DMUS_E_DESCEND_CHUNK_FAIL       MAKE_DMHRESULTERROR(0x0210)
@@ -778,23 +778,23 @@
 
 /* DMUS_E_AUDIOPATHS_NOT_VALID
  *
- * The Performance has set up some PChannels using the AssignPChannel command, which 
+ * The Performance has set up some PChannels using the AssignPChannel command, which
  * makes it not capable of supporting audio paths.
  */
 #define DMUS_E_AUDIOPATHS_NOT_VALID     MAKE_DMHRESULTERROR(0x0226)
 
 /* DMUS_E_AUDIOPATHS_IN_USE
  *
- * This is the inverse of the previous error. 
+ * This is the inverse of the previous error.
  * The Performance has set up some audio paths, which makes is incompatible
- * with the calls to allocate pchannels, etc. 
+ * with the calls to allocate pchannels, etc.
  */
 #define DMUS_E_AUDIOPATHS_IN_USE     MAKE_DMHRESULTERROR(0x0227)
 
 /* DMUS_E_NO_AUDIOPATH_CONFIG
  *
  * A segment was asked for its embedded audio path configuration,
- * but there isn't any. 
+ * but there isn't any.
  */
 #define DMUS_E_NO_AUDIOPATH_CONFIG     MAKE_DMHRESULTERROR(0x0228)
 
diff --git a/src/dep/include/DXSDK/include/dmksctrl.h b/src/dep/include/DXSDK/include/dmksctrl.h
index f53e714..ab7923c 100644
--- a/src/dep/include/DXSDK/include/dmksctrl.h
+++ b/src/dep/include/DXSDK/include/dmksctrl.h
@@ -39,8 +39,8 @@
     0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96
 #endif /* STATIC_IID_IKsControl */
 
-/* 
- * Warning: This will prevent the rest of ks.h from being pulled in if ks.h is 
+/*
+ * Warning: This will prevent the rest of ks.h from being pulled in if ks.h is
  * included after dmksctrl.h. Make sure you do not include both headers in
  * the same source file.
  */
diff --git a/src/dep/include/DXSDK/include/dmplugin.h b/src/dep/include/DXSDK/include/dmplugin.h
index 3f3e141..9df0036 100644
--- a/src/dep/include/DXSDK/include/dmplugin.h
+++ b/src/dep/include/DXSDK/include/dmplugin.h
@@ -35,7 +35,7 @@ interface IDirectMusicSegment8;
 interface IDirectMusicSegmentState;
 interface IDirectMusicSegmentState8;
 interface IDirectMusicGraph;
-#ifndef __cplusplus 
+#ifndef __cplusplus
 typedef interface IDirectMusicTrack IDirectMusicTrack;
 typedef interface IDirectMusicTool IDirectMusicTool;
 typedef interface IDirectMusicTool8 IDirectMusicTool8;
@@ -70,12 +70,12 @@ DECLARE_INTERFACE_(IDirectMusicTool, IUnknown)
     STDMETHOD(Init)                 (THIS_ IDirectMusicGraph* pGraph) PURE;
     STDMETHOD(GetMsgDeliveryType)   (THIS_ DWORD* pdwDeliveryType ) PURE;
     STDMETHOD(GetMediaTypeArraySize)(THIS_ DWORD* pdwNumElements ) PURE;
-    STDMETHOD(GetMediaTypes)        (THIS_ DWORD** padwMediaTypes, 
+    STDMETHOD(GetMediaTypes)        (THIS_ DWORD** padwMediaTypes,
                                            DWORD dwNumElements) PURE;
-    STDMETHOD(ProcessPMsg)          (THIS_ IDirectMusicPerformance* pPerf, 
+    STDMETHOD(ProcessPMsg)          (THIS_ IDirectMusicPerformance* pPerf,
                                            DMUS_PMSG* pPMSG) PURE;
-    STDMETHOD(Flush)                (THIS_ IDirectMusicPerformance* pPerf, 
-                                           DMUS_PMSG* pPMSG, 
+    STDMETHOD(Flush)                (THIS_ IDirectMusicPerformance* pPerf,
+                                           DMUS_PMSG* pPMSG,
                                            REFERENCE_TIME rtTime) PURE;
 };
 
@@ -94,18 +94,18 @@ DECLARE_INTERFACE_(IDirectMusicTool8, IDirectMusicTool)
     STDMETHOD(Init)                 (THIS_ IDirectMusicGraph* pGraph) PURE;
     STDMETHOD(GetMsgDeliveryType)   (THIS_ DWORD* pdwDeliveryType ) PURE;
     STDMETHOD(GetMediaTypeArraySize)(THIS_ DWORD* pdwNumElements ) PURE;
-    STDMETHOD(GetMediaTypes)        (THIS_ DWORD** padwMediaTypes, 
+    STDMETHOD(GetMediaTypes)        (THIS_ DWORD** padwMediaTypes,
                                            DWORD dwNumElements) PURE;
-    STDMETHOD(ProcessPMsg)          (THIS_ IDirectMusicPerformance* pPerf, 
+    STDMETHOD(ProcessPMsg)          (THIS_ IDirectMusicPerformance* pPerf,
                                            DMUS_PMSG* pPMSG) PURE;
-    STDMETHOD(Flush)                (THIS_ IDirectMusicPerformance* pPerf, 
-                                           DMUS_PMSG* pPMSG, 
+    STDMETHOD(Flush)                (THIS_ IDirectMusicPerformance* pPerf,
+                                           DMUS_PMSG* pPMSG,
                                            REFERENCE_TIME rtTime) PURE;
     /*  IDirectMusicTool8 */
     STDMETHOD(Clone)                (THIS_ IDirectMusicTool ** ppTool) PURE;
 };
 
- 
+
 /* The following flags are sent in the IDirectMusicTrack::Play() method */
 /* inside the dwFlags parameter */
 typedef enum enumDMUS_TRACKF_FLAGS
@@ -141,32 +141,32 @@ DECLARE_INTERFACE_(IDirectMusicTrack, IUnknown)
 
     /*  IDirectMusicTrack */
     STDMETHOD(Init)                   (THIS_ IDirectMusicSegment* pSegment) PURE;
-    STDMETHOD(InitPlay)               (THIS_ IDirectMusicSegmentState* pSegmentState, 
-                                             IDirectMusicPerformance* pPerformance, 
-                                             void** ppStateData, 
+    STDMETHOD(InitPlay)               (THIS_ IDirectMusicSegmentState* pSegmentState,
+                                             IDirectMusicPerformance* pPerformance,
+                                             void** ppStateData,
                                              DWORD dwVirtualTrackID,
                                              DWORD dwFlags) PURE;
     STDMETHOD(EndPlay)                (THIS_ void* pStateData) PURE;
-    STDMETHOD(Play)                   (THIS_ void* pStateData, 
-                                             MUSIC_TIME mtStart, 
-                                             MUSIC_TIME mtEnd, 
-                                             MUSIC_TIME mtOffset, 
-                                             DWORD dwFlags, 
-                                             IDirectMusicPerformance* pPerf, 
-                                             IDirectMusicSegmentState* pSegSt, 
+    STDMETHOD(Play)                   (THIS_ void* pStateData,
+                                             MUSIC_TIME mtStart,
+                                             MUSIC_TIME mtEnd,
+                                             MUSIC_TIME mtOffset,
+                                             DWORD dwFlags,
+                                             IDirectMusicPerformance* pPerf,
+                                             IDirectMusicSegmentState* pSegSt,
                                              DWORD dwVirtualID) PURE;
-    STDMETHOD(GetParam)               (THIS_ REFGUID rguidType, 
-                                             MUSIC_TIME mtTime, 
-                                             MUSIC_TIME* pmtNext, 
-                                             void* pParam) PURE; 
-    STDMETHOD(SetParam)               (THIS_ REFGUID rguidType, 
-                                             MUSIC_TIME mtTime, 
+    STDMETHOD(GetParam)               (THIS_ REFGUID rguidType,
+                                             MUSIC_TIME mtTime,
+                                             MUSIC_TIME* pmtNext,
+                                             void* pParam) PURE;
+    STDMETHOD(SetParam)               (THIS_ REFGUID rguidType,
+                                             MUSIC_TIME mtTime,
                                              void* pParam) PURE;
     STDMETHOD(IsParamSupported)       (THIS_ REFGUID rguidType) PURE;
     STDMETHOD(AddNotificationType)    (THIS_ REFGUID rguidNotificationType) PURE;
     STDMETHOD(RemoveNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
-    STDMETHOD(Clone)                  (THIS_ MUSIC_TIME mtStart, 
-                                             MUSIC_TIME mtEnd, 
+    STDMETHOD(Clone)                  (THIS_ MUSIC_TIME mtStart,
+                                             MUSIC_TIME mtEnd,
                                              IDirectMusicTrack** ppTrack) PURE;
 };
 
@@ -183,50 +183,50 @@ DECLARE_INTERFACE_(IDirectMusicTrack8, IDirectMusicTrack)
 
     /*  IDirectMusicTrack */
     STDMETHOD(Init)                   (THIS_ IDirectMusicSegment* pSegment) PURE;
-    STDMETHOD(InitPlay)               (THIS_ IDirectMusicSegmentState* pSegmentState, 
-                                             IDirectMusicPerformance* pPerformance, 
-                                             void** ppStateData, 
+    STDMETHOD(InitPlay)               (THIS_ IDirectMusicSegmentState* pSegmentState,
+                                             IDirectMusicPerformance* pPerformance,
+                                             void** ppStateData,
                                              DWORD dwVirtualTrackID,
                                              DWORD dwFlags) PURE;
     STDMETHOD(EndPlay)                (THIS_ void* pStateData) PURE;
-    STDMETHOD(Play)                   (THIS_ void* pStateData, 
-                                             MUSIC_TIME mtStart, 
-                                             MUSIC_TIME mtEnd, 
-                                             MUSIC_TIME mtOffset, 
-                                             DWORD dwFlags, 
-                                             IDirectMusicPerformance* pPerf, 
-                                             IDirectMusicSegmentState* pSegSt, 
+    STDMETHOD(Play)                   (THIS_ void* pStateData,
+                                             MUSIC_TIME mtStart,
+                                             MUSIC_TIME mtEnd,
+                                             MUSIC_TIME mtOffset,
+                                             DWORD dwFlags,
+                                             IDirectMusicPerformance* pPerf,
+                                             IDirectMusicSegmentState* pSegSt,
                                              DWORD dwVirtualID) PURE;
-    STDMETHOD(GetParam)               (THIS_ REFGUID rguidType, 
-                                             MUSIC_TIME mtTime, 
-                                             MUSIC_TIME* pmtNext, 
-                                             void* pParam) PURE; 
-    STDMETHOD(SetParam)               (THIS_ REFGUID rguidType, 
-                                             MUSIC_TIME mtTime, 
+    STDMETHOD(GetParam)               (THIS_ REFGUID rguidType,
+                                             MUSIC_TIME mtTime,
+                                             MUSIC_TIME* pmtNext,
+                                             void* pParam) PURE;
+    STDMETHOD(SetParam)               (THIS_ REFGUID rguidType,
+                                             MUSIC_TIME mtTime,
                                              void* pParam) PURE;
     STDMETHOD(IsParamSupported)       (THIS_ REFGUID rguidType) PURE;
     STDMETHOD(AddNotificationType)    (THIS_ REFGUID rguidNotificationType) PURE;
     STDMETHOD(RemoveNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
-    STDMETHOD(Clone)                  (THIS_ MUSIC_TIME mtStart, 
-                                             MUSIC_TIME mtEnd, 
+    STDMETHOD(Clone)                  (THIS_ MUSIC_TIME mtStart,
+                                             MUSIC_TIME mtEnd,
                                              IDirectMusicTrack** ppTrack) PURE;
     /* IDirectMusicTrack8 */
-    STDMETHOD(PlayEx)                 (THIS_ void* pStateData, 
-                                             REFERENCE_TIME rtStart, 
-                                             REFERENCE_TIME rtEnd, 
-                                             REFERENCE_TIME rtOffset, 
-                                             DWORD dwFlags, 
-                                             IDirectMusicPerformance* pPerf, 
-                                             IDirectMusicSegmentState* pSegSt, 
-                                             DWORD dwVirtualID) PURE; 
+    STDMETHOD(PlayEx)                 (THIS_ void* pStateData,
+                                             REFERENCE_TIME rtStart,
+                                             REFERENCE_TIME rtEnd,
+                                             REFERENCE_TIME rtOffset,
+                                             DWORD dwFlags,
+                                             IDirectMusicPerformance* pPerf,
+                                             IDirectMusicSegmentState* pSegSt,
+                                             DWORD dwVirtualID) PURE;
     STDMETHOD(GetParamEx)             (THIS_ REFGUID rguidType,         /* Command type. */
                                              REFERENCE_TIME rtTime,     /* Time, in ref time if dwFlags == DMUS_TRACK_PARAMF_CLOCK. Otherwise, music time. */
                                              REFERENCE_TIME* prtNext,   /* Time of next parameter, relative to rtTime, in music or clock time units. */
                                              void* pParam,              /* Pointer to the parameter data. */
                                              void * pStateData,         /* State data for track instance. */
                                              DWORD dwFlags) PURE;       /* Control flags. */
-    STDMETHOD(SetParamEx)             (THIS_ REFGUID rguidType, 
-                                             REFERENCE_TIME rtTime, 
+    STDMETHOD(SetParamEx)             (THIS_ REFGUID rguidType,
+                                             REFERENCE_TIME rtTime,
                                              void* pParam,              /* Pointer to the parameter data. */
                                              void * pStateData,         /* State data for track instance. */
                                              DWORD dwFlags) PURE;       /* Control flags. */
diff --git a/src/dep/include/DXSDK/include/dmusbuff.h b/src/dep/include/DXSDK/include/dmusbuff.h
index 5488453..12432ff 100644
--- a/src/dep/include/DXSDK/include/dmusbuff.h
+++ b/src/dep/include/DXSDK/include/dmusbuff.h
@@ -16,8 +16,8 @@
  * Immediately following the header is the event data. The header+data
  * size is rounded to the nearest quadword (8 bytes).
  */
- 
-#include <pshpack4.h>                       /* Do not pad at end - that's where the data is */ 
+
+#include <pshpack4.h>                       /* Do not pad at end - that's where the data is */
 typedef struct _DMUS_EVENTHEADER *LPDMUS_EVENTHEADER;
 typedef struct _DMUS_EVENTHEADER
 {
@@ -31,7 +31,7 @@ typedef struct _DMUS_EVENTHEADER
 #define DMUS_EVENT_STRUCTURED   0x00000001  /* Unstructured data (SysEx, etc.) */
 
 /* The number of bytes to allocate for an event with 'cb' data bytes.
- */ 
+ */
 #define QWORD_ALIGN(x) (((x) + 7) & ~7)
 #define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb)
 
diff --git a/src/dep/include/DXSDK/include/dmusics.h b/src/dep/include/DXSDK/include/dmusics.h
index 8f1e45d..9c345ea 100644
--- a/src/dep/include/DXSDK/include/dmusics.h
+++ b/src/dep/include/DXSDK/include/dmusics.h
@@ -18,7 +18,7 @@
 interface IDirectMusicSynth;
 interface IDirectMusicSynthSink;
 
-#ifndef __cplusplus 
+#ifndef __cplusplus
 typedef interface IDirectMusicSynth IDirectMusicSynth;
 typedef interface IDirectMusicSynthSink IDirectMusicSynthSink;
 #endif
@@ -30,7 +30,7 @@ typedef struct _DMUS_VOICE_STATE
 {
     BOOL                bExists;
     SAMPLE_POSITION     spPosition;
-} DMUS_VOICE_STATE; 
+} DMUS_VOICE_STATE;
 
 #endif /* _DMUS_VOICE_STATE_DEFINED */
 
@@ -53,14 +53,14 @@ DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown)
     STDMETHOD(Open)                 (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE;
     STDMETHOD(Close)                (THIS) PURE;
     STDMETHOD(SetNumChannelGroups)  (THIS_ DWORD dwGroups) PURE;
-    STDMETHOD(Download)             (THIS_ LPHANDLE phDownload, 
-                                           LPVOID pvData, 
+    STDMETHOD(Download)             (THIS_ LPHANDLE phDownload,
+                                           LPVOID pvData,
                                            LPBOOL pbFree ) PURE;
-    STDMETHOD(Unload)               (THIS_ HANDLE hDownload, 
-                                           HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), 
-                                           HANDLE hUserData ) PURE; 
-    STDMETHOD(PlayBuffer)           (THIS_ REFERENCE_TIME rt, 
-                                           LPBYTE pbBuffer, 
+    STDMETHOD(Unload)               (THIS_ HANDLE hDownload,
+                                           HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
+                                           HANDLE hUserData ) PURE;
+    STDMETHOD(PlayBuffer)           (THIS_ REFERENCE_TIME rt,
+                                           LPBYTE pbBuffer,
                                            DWORD cbBuffer) PURE;
     STDMETHOD(GetRunningStats)      (THIS_ LPDMUS_SYNTHSTATS pStats) PURE;
     STDMETHOD(GetPortCaps)          (THIS_ LPDMUS_PORTCAPS pCaps) PURE;
@@ -68,8 +68,8 @@ DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown)
     STDMETHOD(GetLatencyClock)      (THIS_ IReferenceClock **ppClock) PURE;
     STDMETHOD(Activate)             (THIS_ BOOL fEnable) PURE;
     STDMETHOD(SetSynthSink)         (THIS_ IDirectMusicSynthSink *pSynthSink) PURE;
-    STDMETHOD(Render)               (THIS_ short *pBuffer, 
-                                           DWORD dwLength, 
+    STDMETHOD(Render)               (THIS_ short *pBuffer,
+                                           DWORD dwLength,
                                            LONGLONG llPosition) PURE;
     STDMETHOD(SetChannelPriority)   (THIS_ DWORD dwChannelGroup,
                                            DWORD dwChannel,
@@ -96,14 +96,14 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
     STDMETHOD(Open)                 (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE;
     STDMETHOD(Close)                (THIS) PURE;
     STDMETHOD(SetNumChannelGroups)  (THIS_ DWORD dwGroups) PURE;
-    STDMETHOD(Download)             (THIS_ LPHANDLE phDownload, 
-                                           LPVOID pvData, 
+    STDMETHOD(Download)             (THIS_ LPHANDLE phDownload,
+                                           LPVOID pvData,
                                            LPBOOL pbFree ) PURE;
-    STDMETHOD(Unload)               (THIS_ HANDLE hDownload, 
-                                           HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), 
-                                           HANDLE hUserData ) PURE; 
-    STDMETHOD(PlayBuffer)           (THIS_ REFERENCE_TIME rt, 
-                                           LPBYTE pbBuffer, 
+    STDMETHOD(Unload)               (THIS_ HANDLE hDownload,
+                                           HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
+                                           HANDLE hUserData ) PURE;
+    STDMETHOD(PlayBuffer)           (THIS_ REFERENCE_TIME rt,
+                                           LPBYTE pbBuffer,
                                            DWORD cbBuffer) PURE;
     STDMETHOD(GetRunningStats)      (THIS_ LPDMUS_SYNTHSTATS pStats) PURE;
     STDMETHOD(GetPortCaps)          (THIS_ LPDMUS_PORTCAPS pCaps) PURE;
@@ -111,8 +111,8 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
     STDMETHOD(GetLatencyClock)      (THIS_ IReferenceClock **ppClock) PURE;
     STDMETHOD(Activate)             (THIS_ BOOL fEnable) PURE;
     STDMETHOD(SetSynthSink)         (THIS_ IDirectMusicSynthSink *pSynthSink) PURE;
-    STDMETHOD(Render)               (THIS_ short *pBuffer, 
-                                           DWORD dwLength, 
+    STDMETHOD(Render)               (THIS_ short *pBuffer,
+                                           DWORD dwLength,
                                            LONGLONG llPosition) PURE;
     STDMETHOD(SetChannelPriority)   (THIS_ DWORD dwChannelGroup,
                                            DWORD dwChannel,
@@ -125,21 +125,21 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
     STDMETHOD(GetAppend)            (THIS_ DWORD* pdwAppend) PURE;
 
 	/* IDirectMusicSynth8 */
-    STDMETHOD(PlayVoice)            (THIS_ REFERENCE_TIME rt, 
-										   DWORD dwVoiceId, 
-										   DWORD dwChannelGroup, 
-										   DWORD dwChannel, 
-										   DWORD dwDLId, 
+    STDMETHOD(PlayVoice)            (THIS_ REFERENCE_TIME rt,
+										   DWORD dwVoiceId,
+										   DWORD dwChannelGroup,
+										   DWORD dwChannel,
+										   DWORD dwDLId,
 										   long	 prPitch,			/* PREL not defined here */
 										   long  vrVolume,          /* VREL not defined here */
                                            SAMPLE_TIME stVoiceStart,
                                            SAMPLE_TIME stLoopStart,
                                            SAMPLE_TIME stLoopEnd) PURE;
 
-    STDMETHOD(StopVoice)            (THIS_ REFERENCE_TIME rt, 
+    STDMETHOD(StopVoice)            (THIS_ REFERENCE_TIME rt,
 										   DWORD dwVoiceId ) PURE;
 
-    STDMETHOD(GetVoiceState)        (THIS_ DWORD dwVoice[], 
+    STDMETHOD(GetVoiceState)        (THIS_ DWORD dwVoice[],
 										   DWORD cbVoice,
 										   DMUS_VOICE_STATE dwVoiceState[] ) PURE;
     STDMETHOD(Refresh)              (THIS_ DWORD dwDownloadID,
@@ -147,7 +147,7 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
     STDMETHOD(AssignChannelToBuses) (THIS_ DWORD dwChannelGroup,
                                            DWORD dwChannel,
                                            LPDWORD pdwBuses,
-                                           DWORD cBuses) PURE;                                           
+                                           DWORD cBuses) PURE;
 };
 
 #undef  INTERFACE
@@ -166,11 +166,11 @@ DECLARE_INTERFACE_(IDirectMusicSynthSink, IUnknown)
     STDMETHOD(Activate)             (THIS_ BOOL fEnable) PURE;
     STDMETHOD(SampleToRefTime)      (THIS_ LONGLONG llSampleTime,
                                            REFERENCE_TIME *prfTime) PURE;
-    STDMETHOD(RefTimeToSample)      (THIS_ REFERENCE_TIME rfTime, 
+    STDMETHOD(RefTimeToSample)      (THIS_ REFERENCE_TIME rfTime,
                                            LONGLONG *pllSampleTime) PURE;
     STDMETHOD(SetDirectSound)       (THIS_ LPDIRECTSOUND pDirectSound,
-                                           LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE;                                           
-    STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE;                                           
+                                           LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE;
+    STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE;
 };
 
 DEFINE_GUID(IID_IDirectMusicSynth, 0x9823661,  0x5c85, 0x11d2, 0xaf, 0xa6, 0x0, 0xaa, 0x0, 0x24, 0xd8, 0xb6);
@@ -188,6 +188,6 @@ DEFINE_GUID(GUID_DMUS_PROP_SetSynthSink,0x0a3a5ba5, 0x37b6, 0x11d2, 0xb9, 0xf9,
  * Item 0: A DWORD boolean indicating whether or not the sink requires an IDirectSound interface. The
  * default is FALSE if this property item is not implemented by the sink.
  */
-DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xbe208857, 0x8952, 0x11d2, 0xba, 0x1c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12); 
+DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xbe208857, 0x8952, 0x11d2, 0xba, 0x1c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12);
 
 #endif
diff --git a/src/dep/include/DXSDK/include/dpaddr.h b/src/dep/include/DXSDK/include/dpaddr.h
index 6e3fccf..e5460cb 100644
--- a/src/dep/include/DXSDK/include/dpaddr.h
+++ b/src/dep/include/DXSDK/include/dpaddr.h
@@ -221,9 +221,9 @@ typedef struct sockaddr SOCKADDR;
 
 
 /*
- * 
- * This function is no longer supported.  It is recommended that CoCreateInstance be used to create 
- * DirectPlay8 address objects. 
+ *
+ * This function is no longer supported.  It is recommended that CoCreateInstance be used to create
+ * DirectPlay8 address objects.
  *
  * HRESULT WINAPI DirectPlay8AddressCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
  *
diff --git a/src/dep/include/DXSDK/include/dplay.h b/src/dep/include/DXSDK/include/dplay.h
index d91c0a5..4145efc 100644
--- a/src/dep/include/DXSDK/include/dplay.h
+++ b/src/dep/include/DXSDK/include/dplay.h
@@ -63,7 +63,7 @@ DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20, 0x8923, 0x11d0, 0x9d, 0x97, 0x0, 0xa0,
 
 // GUID for IPX service provider
 // {685BC400-9D2C-11cf-A9CD-00AA006886E3}
-DEFINE_GUID(DPSPGUID_IPX, 
+DEFINE_GUID(DPSPGUID_IPX,
 0x685bc400, 0x9d2c, 0x11cf, 0xa9, 0xcd, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3);
 
 // GUID for TCP/IP service provider
@@ -149,16 +149,16 @@ typedef struct
     DWORD dwSize;               // Size of structure, in bytes
     DWORD dwFlags;              // DPCAPS_xxx flags
     DWORD dwMaxBufferSize;      // Maximum message size, in bytes,  for this service provider
-    DWORD dwMaxQueueSize;       // Obsolete. 
+    DWORD dwMaxQueueSize;       // Obsolete.
     DWORD dwMaxPlayers;         // Maximum players/groups (local + remote)
-    DWORD dwHundredBaud;        // Bandwidth in 100 bits per second units; 
+    DWORD dwHundredBaud;        // Bandwidth in 100 bits per second units;
                                 // i.e. 24 is 2400, 96 is 9600, etc.
     DWORD dwLatency;            // Estimated latency; 0 = unknown
     DWORD dwMaxLocalPlayers;    // Maximum # of locally created players allowed
     DWORD dwHeaderLength;       // Maximum header length, in bytes, on messages
                                 // added by the service provider
     DWORD dwTimeout;            // Service provider's suggested timeout value
-                                // This is how long DirectPlay will wait for 
+                                // This is how long DirectPlay will wait for
                                 // responses to system messages
 } DPCAPS, FAR *LPDPCAPS;
 
@@ -272,11 +272,11 @@ typedef DPSESSIONDESC2 * VOL LPDPSESSIONDESC2_V;
  * A constant pointer to DPSESSIONDESC2
  */
 typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
- 
+
 /*
  * Applications cannot create new players in this session.
  */
-#define DPSESSION_NEWPLAYERSDISABLED    0x00000001 
+#define DPSESSION_NEWPLAYERSDISABLED    0x00000001
 
 /*
  * If the DirectPlay object that created the session, the host,
@@ -287,8 +287,8 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
 #define DPSESSION_MIGRATEHOST           0x00000004
 
 /*
- * This flag tells DirectPlay not to set the idPlayerTo and idPlayerFrom 
- * fields in player messages.  This cuts two DWORD's off the message 
+ * This flag tells DirectPlay not to set the idPlayerTo and idPlayerFrom
+ * fields in player messages.  This cuts two DWORD's off the message
  * overhead.
  */
 #define DPSESSION_NOMESSAGEID           0x00000008
@@ -302,7 +302,7 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
 #define DPSESSION_JOINDISABLED          0x00000020
 
 /*
- * This flag tells DirectPlay to detect when remote players 
+ * This flag tells DirectPlay to detect when remote players
  * exit abnormally (e.g. their computer or modem gets unplugged)
  */
 #define DPSESSION_KEEPALIVE             0x00000040
@@ -337,7 +337,7 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
 
 /*
  * This flag tells DirectPlay to only download information about the
- * DPPLAYER_SERVERPLAYER.  
+ * DPPLAYER_SERVERPLAYER.
  */
 #define DPSESSION_CLIENTSERVER			0x00001000
 
@@ -377,13 +377,13 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
  * on old broken behavior.
  */
 #define DPSESSION_NOSESSIONDESCMESSAGES		0x00020000
- 
+
 /*
  * DPNAME
  * Used to hold the name of a DirectPlay entity
  * like a player or a group
  */
-typedef struct 
+typedef struct
 {
     DWORD   dwSize;             // Size of structure
     DWORD   dwFlags;            // Not used. Must be zero.
@@ -410,7 +410,7 @@ typedef const DPNAME FAR *LPCDPNAME;
  * DPCREDENTIALS
  * Used to hold the user name and password of a DirectPlay user
  */
-typedef struct 
+typedef struct
 {
     DWORD dwSize;               // Size of structure
     DWORD dwFlags;              // Not used. Must be zero.
@@ -418,17 +418,17 @@ typedef struct
     {                           // User name of the account
         LPWSTR  lpszUsername;   // Unicode
         LPSTR   lpszUsernameA;  // ANSI
-    };    
+    };
     union
     {                           // Password of the account
         LPWSTR  lpszPassword;   // Unicode
         LPSTR   lpszPasswordA;  // ANSI
-    };    
+    };
     union
     {                           // Domain name of the account
         LPWSTR  lpszDomain;     // Unicode
         LPSTR   lpszDomainA;    // ANSI
-    };    
+    };
 } DPCREDENTIALS, FAR *LPDPCREDENTIALS;
 
 typedef const DPCREDENTIALS FAR *LPCDPCREDENTIALS;
@@ -438,7 +438,7 @@ typedef const DPCREDENTIALS FAR *LPCDPCREDENTIALS;
  * Used to describe the security properties of a DirectPlay
  * session instance
  */
-typedef struct 
+typedef struct
 {
     DWORD dwSize;                   // Size of structure
     DWORD dwFlags;                  // Not used. Must be zero.
@@ -462,7 +462,7 @@ typedef const DPSECURITYDESC FAR *LPCDPSECURITYDESC;
  * DPACCOUNTDESC
  * Used to describe a user membership account
  */
-typedef struct 
+typedef struct
 {
     DWORD dwSize;                   // Size of structure
     DWORD dwFlags;                  // Not used. Must be zero.
@@ -515,14 +515,14 @@ typedef struct
     {                          // Message string
         LPWSTR  lpszMessage;   // Unicode
         LPSTR   lpszMessageA;  // ANSI
-    };    
+    };
 } DPCHAT, FAR * LPDPCHAT;
 
 /*
  * SGBUFFER
  * Scatter Gather Buffer used for SendEx
  */
-typedef struct 
+typedef struct
 {
 	UINT         len;       // length of buffer data
 	PUCHAR	     pData;		// pointer to buffer data
@@ -546,10 +546,10 @@ typedef BOOL (FAR PASCAL * LPDPENUMSESSIONSCALLBACK2)(
 
 /*
  * This flag is set on the EnumSessions callback dwFlags parameter when
- * the time out has occurred. There will be no session data for this 
- * callback. If *lpdwTimeOut is set to a non-zero value and the 
- * EnumSessionsCallback function returns TRUE then EnumSessions will 
- * continue waiting until the next timeout occurs. Timeouts are in 
+ * the time out has occurred. There will be no session data for this
+ * callback. If *lpdwTimeOut is set to a non-zero value and the
+ * EnumSessionsCallback function returns TRUE then EnumSessions will
+ * continue waiting until the next timeout occurs. Timeouts are in
  * milliseconds.
  */
 #define DPESC_TIMEDOUT          0x00000001
@@ -588,7 +588,7 @@ typedef BOOL (FAR PASCAL * LPDPENUMDPCALLBACK)(
 typedef BOOL (FAR PASCAL * LPDPENUMDPCALLBACKA)(
     LPGUID      lpguidSP,
     LPSTR       lpSPName,
-    DWORD       dwMajorVersion,     
+    DWORD       dwMajorVersion,
     DWORD       dwMinorVersion,
     LPVOID      lpContext);
 
@@ -1151,7 +1151,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 #define DPENUMPLAYERS_GROUP         0x00000020
 
 /*
- * Enumerate players or groups in another session 
+ * Enumerate players or groups in another session
  * (must supply lpguidInstance)
  */
 #define DPENUMPLAYERS_SESSION       0x00000080
@@ -1252,7 +1252,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 /*
  * Enumerate sessions which can be joined
  */
-#define DPENUMSESSIONS_AVAILABLE    0x00000001 
+#define DPENUMSESSIONS_AVAILABLE    0x00000001
 
 /*
  * Enumerate all sessions even if they can't be joined.
@@ -1269,7 +1269,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  * Stop an asynchronous enum sessions
  */
  #define DPENUMSESSIONS_STOPASYNC	0x00000020
- 
+
 /*
  * Enumerate sessions even if they require a password
  */
@@ -1291,13 +1291,13 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  * The latency returned should be for guaranteed message sending.
  * Default is non-guaranteed messaging.
  */
-#define DPGETCAPS_GUARANTEED        0x00000001 
+#define DPGETCAPS_GUARANTEED        0x00000001
+
 
- 
 /****************************************************************************
  *
  * GetGroupData, GetPlayerData API flags
- * Remote and local Group/Player data is maintained separately. 
+ * Remote and local Group/Player data is maintained separately.
  * Default is DPGET_REMOTE.
  *
  ****************************************************************************/
@@ -1309,7 +1309,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 #define DPGET_REMOTE                0x00000000
 	
 /*
- * Get the local data (set by this DirectPlay object 
+ * Get the local data (set by this DirectPlay object
  * using DPSET_LOCAL)
  */
 #define DPGET_LOCAL                 0x00000001
@@ -1351,7 +1351,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 #define DPLCONNECTION_CREATESESSION					DPOPEN_CREATE
 
 /*
- * This application should join the session described by 
+ * This application should join the session described by
  * the DPSESIONDESC structure with the lpAddress data
  */
 #define DPLCONNECTION_JOINSESSION					DPOPEN_JOIN
@@ -1369,7 +1369,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 #define DPRECEIVE_ALL               0x00000001
 
 /*
- * Get the first message in the queue directed to a specific player 
+ * Get the first message in the queue directed to a specific player
  */
 #define DPRECEIVE_TOPLAYER          0x00000002
 
@@ -1436,7 +1436,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
 #define DPSEND_ASYNC				0x00000200
 
 /*
- * When an message is completed, don't tell me. 
+ * When an message is completed, don't tell me.
  * by default the application is notified with a system message.
  */
 #define DPSEND_NOSENDCOMPLETEMSG    0x00000400
@@ -1457,7 +1457,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  *
  ****************************************************************************/
 
-/* 
+/*
  * Propagate the data to all players in the session
  */
 #define DPSET_REMOTE                0x00000000
@@ -1480,7 +1480,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  *
  ****************************************************************************/
 
-/* 
+/*
  * Get Send Queue - requires Service Provider Support
  */
 #define DPMESSAGEQUEUE_SEND        	0x00000001
@@ -1497,7 +1497,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  *
  ****************************************************************************/
 
- 
+
 /*
  * Start an asynchronous connect which returns status codes
  */
@@ -1508,7 +1508,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  *
  * DirectPlay system messages and message data structures
  *
- * All system message come 'From' player DPID_SYSMSG.  To determine what type 
+ * All system message come 'From' player DPID_SYSMSG.  To determine what type
  * of message it is, cast the lpData from Receive to DPMSG_GENERIC and check
  * the dwType member against one of the following DPSYS_xxx constants. Once
  * a match is found, cast the lpData to the corresponding of the DPMSG_xxx
@@ -1521,25 +1521,25 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  * Use DPMSG_CREATEPLAYERORGROUP.  Check dwPlayerType to see if it
  * is a player or a group.
  */
-#define DPSYS_CREATEPLAYERORGROUP   0x0003  
+#define DPSYS_CREATEPLAYERORGROUP   0x0003
 
 /*
  * A player has been deleted from the session
  * Use DPMSG_DESTROYPLAYERORGROUP
  */
-#define DPSYS_DESTROYPLAYERORGROUP  0x0005  
+#define DPSYS_DESTROYPLAYERORGROUP  0x0005
 
 /*
  * A player has been added to a group
  * Use DPMSG_ADDPLAYERTOGROUP
  */
-#define DPSYS_ADDPLAYERTOGROUP      0x0007  
+#define DPSYS_ADDPLAYERTOGROUP      0x0007
 
 /*
  * A player has been removed from a group
  * Use DPMSG_DELETEPLAYERFROMGROUP
  */
-#define DPSYS_DELETEPLAYERFROMGROUP 0x0021  
+#define DPSYS_DELETEPLAYERFROMGROUP 0x0021
 
 /*
  * This DirectPlay object lost its connection with all the
@@ -1581,7 +1581,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
  * A group has been added to a group
  * Use DPMSG_ADDGROUPTOGROUP
  */
-#define DPSYS_ADDGROUPTOGROUP      	0x0105  
+#define DPSYS_ADDGROUPTOGROUP      	0x0105
 
 /*
  * A group has been removed from a group
@@ -1776,7 +1776,7 @@ typedef DPMSG_SESSIONLOST   FAR *LPDPMSG_SESSIONLOST;
  * DPMSG_SECUREMESSAGE
  * System message generated when a player requests a secure send
  */
-typedef struct 
+typedef struct
 {
     DWORD		dwType;         // Message Type
     DWORD		dwFlags;        // Signed/Encrypted
@@ -1787,7 +1787,7 @@ typedef struct
 
 /*
  * DPMSG_STARTSESSION
- * System message containing all information required to 
+ * System message containing all information required to
  * start a new session
  */
 typedef struct
@@ -1882,7 +1882,7 @@ typedef struct
 #define DPERR_UNAVAILABLE               MAKE_DPHRESULT( 250 )
 #define DPERR_UNSUPPORTED               E_NOTIMPL
 #define DPERR_BUSY                      MAKE_DPHRESULT( 270 )
-#define DPERR_USERCANCEL                MAKE_DPHRESULT( 280 ) 
+#define DPERR_USERCANCEL                MAKE_DPHRESULT( 280 )
 #define DPERR_NOINTERFACE               E_NOINTERFACE
 #define DPERR_CANNOTCREATESERVER        MAKE_DPHRESULT( 290 )
 #define DPERR_PLAYERLOST                MAKE_DPHRESULT( 300 )
@@ -1999,16 +1999,16 @@ typedef BOOL (PASCAL *LPDPENUMPLAYERSCALLBACK)(
 typedef struct
 {
     DWORD   dwSize;
-    GUID    guidSession;                  
-    DWORD_PTR dwSession;                    
-    DWORD   dwMaxPlayers;                 
-    DWORD   dwCurrentPlayers;             
-    DWORD   dwFlags;                      
+    GUID    guidSession;
+    DWORD_PTR dwSession;
+    DWORD   dwMaxPlayers;
+    DWORD   dwCurrentPlayers;
+    DWORD   dwFlags;
     char    szSessionName[DPSESSIONNAMELEN];
     char    szUserField[DPUSERRESERVED];
-    DWORD_PTR   dwReserved1;                  
-    char    szPassword[DPPASSWORDLEN];    
-    DWORD_PTR   dwReserved2;                  
+    DWORD_PTR   dwReserved1;
+    char    szPassword[DPPASSWORDLEN];
+    DWORD_PTR   dwReserved2;
     DWORD_PTR   dwUser1;
     DWORD_PTR   dwUser2;
     DWORD_PTR   dwUser3;
@@ -2137,7 +2137,7 @@ DEFINE_GUID(IID_IDirectPlay, 0x5454e9a0, 0xdb65, 0x11ce, 0x92, 0x1c, 0x00, 0xaa,
 #define IDirectPlay_AddRef(p)                       (p)->AddRef()
 #define IDirectPlay_Release(p)                      (p)->Release()
 
-#endif // IDirectPlay interface macros 
+#endif // IDirectPlay interface macros
 
 #ifdef __cplusplus
 };
diff --git a/src/dep/include/DXSDK/include/dplay8.h b/src/dep/include/DXSDK/include/dplay8.h
index c6799a9..c859f53 100644
--- a/src/dep/include/DXSDK/include/dplay8.h
+++ b/src/dep/include/DXSDK/include/dplay8.h
@@ -43,11 +43,11 @@ DEFINE_GUID(CLSID_DirectPlay8Peer,
 // CLSIDs added for DirectX 9
 
 // {FC47060E-6153-4b34-B975-8E4121EB7F3C}
-DEFINE_GUID(CLSID_DirectPlay8ThreadPool, 
+DEFINE_GUID(CLSID_DirectPlay8ThreadPool,
 0xfc47060e, 0x6153, 0x4b34, 0xb9, 0x75, 0x8e, 0x41, 0x21, 0xeb, 0x7f, 0x3c);
 
 // {E4C1D9A2-CBF7-48bd-9A69-34A55E0D8941}
-DEFINE_GUID(CLSID_DirectPlay8NATResolver, 
+DEFINE_GUID(CLSID_DirectPlay8NATResolver,
 0xe4c1d9a2, 0xcbf7, 0x48bd, 0x9a, 0x69, 0x34, 0xa5, 0x5e, 0xd, 0x89, 0x41);
 
 /****************************************************************************
@@ -75,11 +75,11 @@ DEFINE_GUID(IID_IDirectPlay8Peer,
 // IIDs added for DirectX 9
 
 // {0D22EE73-4A46-4a0d-89B2-045B4D666425}
-DEFINE_GUID(IID_IDirectPlay8ThreadPool, 
+DEFINE_GUID(IID_IDirectPlay8ThreadPool,
 0xd22ee73, 0x4a46, 0x4a0d, 0x89, 0xb2, 0x4, 0x5b, 0x4d, 0x66, 0x64, 0x25);
 
 // {A9E213F2-9A60-486f-BF3B-53408B6D1CBB}
-DEFINE_GUID(IID_IDirectPlay8NATResolver, 
+DEFINE_GUID(IID_IDirectPlay8NATResolver,
 0xa9e213f2, 0x9a60, 0x486f, 0xbf, 0x3b, 0x53, 0x40, 0x8b, 0x6d, 0x1c, 0xbb);
 
 /****************************************************************************
@@ -113,7 +113,7 @@ DEFINE_GUID(CLSID_DP8SP_TCPIP,
 
 
 // {995513AF-3027-4b9a-956E-C772B3F78006}
-DEFINE_GUID(CLSID_DP8SP_BLUETOOTH, 
+DEFINE_GUID(CLSID_DP8SP_BLUETOOTH,
 0x995513af, 0x3027, 0x4b9a, 0x95, 0x6e, 0xc7, 0x72, 0xb3, 0xf7, 0x80, 0x6);
 
 
@@ -932,11 +932,11 @@ typedef	struct	_DPNMSG_NAT_RESOLVER_QUERY
 
 
 /*
- * This function is no longer supported.  It is recommended that CoCreateInstance be used to create 
+ * This function is no longer supported.  It is recommended that CoCreateInstance be used to create
  * DirectPlay8 objects.
  *
  * extern HRESULT WINAPI DirectPlay8Create( const CLSID * pcIID, void **ppvInterface, IUnknown *pUnknown );
- * 
+ *
  */
 
 
diff --git a/src/dep/include/DXSDK/include/dplobby.h b/src/dep/include/DXSDK/include/dplobby.h
index c91d323..c72907e 100644
--- a/src/dep/include/DXSDK/include/dplobby.h
+++ b/src/dep/include/DXSDK/include/dplobby.h
@@ -420,19 +420,19 @@ DECLARE_INTERFACE_( IDirectPlayLobby3, IDirectPlayLobby )
 /*
  *  Applications registered with this flag want voice to automatically
  *  be enabled for their application.  All players will be launched into
- *  an 'n'-way voice conference when the application is started.  The 
- *  user will be able to enable this flag for existing non-voice 
+ *  an 'n'-way voice conference when the application is started.  The
+ *  user will be able to enable this flag for existing non-voice
  *  directplay applications.
  */
-#define DPLAPP_AUTOVOICE				0x00000001 
+#define DPLAPP_AUTOVOICE				0x00000001
 
 /*
  * Applications that do their own voice conferencing should register with
- * this flag to avoid allowing the user to enable other voice chat 
+ * this flag to avoid allowing the user to enable other voice chat
  * capabilites during the same session.  This is to avoid users forcing
  * the DPLAPP_AUTOVOICE flag for the application.
  */
-#define DPLAPP_SELFVOICE				0x00000002 
+#define DPLAPP_SELFVOICE				0x00000002
 
 /****************************************************************************
  *
@@ -486,7 +486,7 @@ typedef struct _DPLMSG_SETPROPERTY
 
 /*
  *  DPLMSG_SETPROPERTYRESPONSE
- *  Standard message returned by a lobby to confirm a 
+ *  Standard message returned by a lobby to confirm a
  *  DPLMSG_SETPROPERTY message.
  */
 typedef struct _DPLMSG_SETPROPERTYRESPONSE
@@ -613,11 +613,11 @@ typedef struct _DPLMSG_NEWSESSIONHOST
  *
  * Request whether the lobby supports standard.  Lobby with respond with either
  * TRUE or FALSE or may not respond at all.
- * 
+ *
  * Property data is a single BOOL with TRUE or FALSE
  */
 // {762CCDA1-D916-11d0-BA39-00C04FD7ED67}
-DEFINE_GUID(DPLPROPERTY_MessagesSupported, 
+DEFINE_GUID(DPLPROPERTY_MessagesSupported,
 0x762ccda1, 0xd916, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
 
 /*
@@ -629,7 +629,7 @@ DEFINE_GUID(DPLPROPERTY_MessagesSupported,
  * Property data is a single GUID.
  */
 // {F56920A0-D218-11d0-BA39-00C04FD7ED67}
-DEFINE_GUID(DPLPROPERTY_LobbyGuid, 
+DEFINE_GUID(DPLPROPERTY_LobbyGuid,
 0xf56920a0, 0xd218, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
 
 /*
@@ -641,7 +641,7 @@ DEFINE_GUID(DPLPROPERTY_LobbyGuid,
  * Property data is the DPLDATA_PLAYERDATA structure
  */
 // {B4319322-D20D-11d0-BA39-00C04FD7ED67}
-DEFINE_GUID(DPLPROPERTY_PlayerGuid, 
+DEFINE_GUID(DPLPROPERTY_PlayerGuid,
 0xb4319322, 0xd20d, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
 
 /*
@@ -659,13 +659,13 @@ typedef struct _DPLDATA_PLAYERGUID
 /*
  * DPLPROPERTY_PlayerScore
  *
- * Used to send an array of long integers to the lobby indicating the 
+ * Used to send an array of long integers to the lobby indicating the
  * score of a player.
  *
  * Property data is the DPLDATA_PLAYERSCORE structure.
  */
 // {48784000-D219-11d0-BA39-00C04FD7ED67}
-DEFINE_GUID(DPLPROPERTY_PlayerScore, 
+DEFINE_GUID(DPLPROPERTY_PlayerScore,
 0x48784000, 0xd219, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
 
 /*
@@ -715,7 +715,7 @@ typedef DPADDRESS FAR *LPDPADDRESS;
  */
 
 // {1318F560-912C-11d0-9DAA-00A0C90A43CB}
-DEFINE_GUID(DPAID_TotalSize, 
+DEFINE_GUID(DPAID_TotalSize,
 0x1318f560, 0x912c, 0x11d0, 0x9d, 0xaa, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
 
 /*
@@ -726,7 +726,7 @@ DEFINE_GUID(DPAID_TotalSize,
  */
 
 // {07D916C0-E0AF-11cf-9C4E-00A0C905425E}
-DEFINE_GUID(DPAID_ServiceProvider, 
+DEFINE_GUID(DPAID_ServiceProvider,
 0x7d916c0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 /*
@@ -737,7 +737,7 @@ DEFINE_GUID(DPAID_ServiceProvider,
  */
 
 // {59B95640-9667-11d0-A77D-0000F803ABFC}
-DEFINE_GUID(DPAID_LobbyProvider, 
+DEFINE_GUID(DPAID_LobbyProvider,
 0x59b95640, 0x9667, 0x11d0, 0xa7, 0x7d, 0x0, 0x0, 0xf8, 0x3, 0xab, 0xfc);
 
 /*
@@ -748,11 +748,11 @@ DEFINE_GUID(DPAID_LobbyProvider,
  */
 
 // {78EC89A0-E0AF-11cf-9C4E-00A0C905425E}
-DEFINE_GUID(DPAID_Phone, 
+DEFINE_GUID(DPAID_Phone,
 0x78ec89a0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 // {BA5A7A70-9DBF-11d0-9CC1-00A0C905425E}
-DEFINE_GUID(DPAID_PhoneW, 
+DEFINE_GUID(DPAID_PhoneW,
 0xba5a7a70, 0x9dbf, 0x11d0, 0x9c, 0xc1, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 /*
@@ -763,11 +763,11 @@ DEFINE_GUID(DPAID_PhoneW,
  */
 
 // {F6DCC200-A2FE-11d0-9C4F-00A0C905425E}
-DEFINE_GUID(DPAID_Modem, 
+DEFINE_GUID(DPAID_Modem,
 0xf6dcc200, 0xa2fe, 0x11d0, 0x9c, 0x4f, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 // {01FD92E0-A2FF-11d0-9C4F-00A0C905425E}
-DEFINE_GUID(DPAID_ModemW, 
+DEFINE_GUID(DPAID_ModemW,
 0x1fd92e0, 0xa2ff, 0x11d0, 0x9c, 0x4f, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 /*
@@ -778,11 +778,11 @@ DEFINE_GUID(DPAID_ModemW,
  */
 
 // {C4A54DA0-E0AF-11cf-9C4E-00A0C905425E}
-DEFINE_GUID(DPAID_INet, 
+DEFINE_GUID(DPAID_INet,
 0xc4a54da0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 // {E63232A0-9DBF-11d0-9CC1-00A0C905425E}
-DEFINE_GUID(DPAID_INetW, 
+DEFINE_GUID(DPAID_INetW,
 0xe63232a0, 0x9dbf, 0x11d0, 0x9c, 0xc1, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 /*
@@ -791,9 +791,9 @@ DEFINE_GUID(DPAID_INetW,
  * Chunk is the port number used for creating the apps TCP and UDP sockets.
  * WORD value (i.e. 47624).
  */
- 
+
 // {E4524541-8EA5-11d1-8A96-006097B01411}
-DEFINE_GUID(DPAID_INetPort, 
+DEFINE_GUID(DPAID_INetPort,
 0xe4524541, 0x8ea5, 0x11d1, 0x8a, 0x96, 0x0, 0x60, 0x97, 0xb0, 0x14, 0x11);
 
 #ifdef BIGMESSAGEDEFENSE
@@ -831,7 +831,7 @@ typedef DPCOMPORTADDRESS FAR *LPDPCOMPORTADDRESS;
  */
 
 // {F2F0CE00-E0AF-11cf-9C4E-00A0C905425E}
-DEFINE_GUID(DPAID_ComPort, 
+DEFINE_GUID(DPAID_ComPort,
 0xf2f0ce00, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
 
 /****************************************************************************
diff --git a/src/dep/include/DXSDK/include/dplobby8.h b/src/dep/include/DXSDK/include/dplobby8.h
index e63a5aa..e09dda9 100644
--- a/src/dep/include/DXSDK/include/dplobby8.h
+++ b/src/dep/include/DXSDK/include/dplobby8.h
@@ -23,11 +23,11 @@ extern "C" {
  ****************************************************************************/
 
 // {667955AD-6B3B-43ca-B949-BC69B5BAFF7F}
-DEFINE_GUID(CLSID_DirectPlay8LobbiedApplication, 
+DEFINE_GUID(CLSID_DirectPlay8LobbiedApplication,
 0x667955ad, 0x6b3b, 0x43ca, 0xb9, 0x49, 0xbc, 0x69, 0xb5, 0xba, 0xff, 0x7f);
 
 // {3B2B6775-70B6-45af-8DEA-A209C69559F3}
-DEFINE_GUID(CLSID_DirectPlay8LobbyClient, 
+DEFINE_GUID(CLSID_DirectPlay8LobbyClient,
 0x3b2b6775, 0x70b6, 0x45af, 0x8d, 0xea, 0xa2, 0x9, 0xc6, 0x95, 0x59, 0xf3);
 
 /****************************************************************************
@@ -46,7 +46,7 @@ DEFINE_GUID(IID_IDirectPlay8LobbyClient,
 
 /****************************************************************************
  *
- * DirectPlay8Lobby Interface Pointer 
+ * DirectPlay8Lobby Interface Pointer
  *
  ****************************************************************************/
 
@@ -77,7 +77,7 @@ typedef struct IDirectPlay8LobbyClient		    *PDIRECTPLAY8LOBBYCLIENT;
 //
 #define DPLHANDLE_ALLCONNECTIONS			0xFFFFFFFF
 
-// 
+//
 // The associated game session has suceeded in connecting / hosting
 //
 #define	DPLSESSION_CONNECTED				0x0001
@@ -92,12 +92,12 @@ typedef struct IDirectPlay8LobbyClient		    *PDIRECTPLAY8LOBBYCLIENT;
 #define	DPLSESSION_DISCONNECTED				0x0003
 
 //
-// The associated game session has terminated 
+// The associated game session has terminated
 //
 #define	DPLSESSION_TERMINATED				0x0004
 
-// 
-// The associated game session's host has migrated 
+//
+// The associated game session's host has migrated
 //
 #define DPLSESSION_HOSTMIGRATED				0x0005
 
@@ -120,10 +120,10 @@ typedef struct IDirectPlay8LobbyClient		    *PDIRECTPLAY8LOBBYCLIENT;
 
 //
 // Launch a new instance of the application to connect to
-// 
+//
 #define	DPLCONNECT_LAUNCHNEW				0x0001
 
-// 
+//
 // Launch a new instance of the application if one is not waiting
 //
 #define	DPLCONNECT_LAUNCHNOTFOUND			0x0002
@@ -133,7 +133,7 @@ typedef struct IDirectPlay8LobbyClient		    *PDIRECTPLAY8LOBBYCLIENT;
 //
 #define DPLCONNECTSETTINGS_HOST             0x0001
 
-// 
+//
 // Disable parameter validation
 //
 #define DPLINITIALIZE_DISABLEPARAMVAL		0x0001
@@ -144,14 +144,14 @@ typedef struct IDirectPlay8LobbyClient		    *PDIRECTPLAY8LOBBYCLIENT;
  *
  ****************************************************************************/
 
-// 
+//
 // Information on a registered game
 //
 typedef struct _DPL_APPLICATION_INFO {
 	GUID	guidApplication;            // GUID of the application
 	PWSTR	pwszApplicationName;        // Name of the application
 	DWORD	dwNumRunning;               // # of instances of this application running
-	DWORD	dwNumWaiting;               // # of instances of this application waiting 
+	DWORD	dwNumWaiting;               // # of instances of this application waiting
 	DWORD	dwFlags;                    // Flags
 } DPL_APPLICATION_INFO,  *PDPL_APPLICATION_INFO;
 
@@ -208,7 +208,7 @@ typedef struct  _DPL_PROGRAM_DESC {
  ****************************************************************************/
 
 //
-// A connection was established 
+// A connection was established
 // (DPL_MSGID_CONNECT)
 //
 typedef struct _DPL_MESSAGE_CONNECT
@@ -221,7 +221,7 @@ typedef struct _DPL_MESSAGE_CONNECT
 	PVOID						pvConnectionContext;        // Context value for this connection (user set)
 } DPL_MESSAGE_CONNECT, *PDPL_MESSAGE_CONNECT;
 
-// 
+//
 // Connection settings have been updated
 // (DPL_MSGID_CONNECTION_SETTINGS)
 //
@@ -254,7 +254,7 @@ typedef struct _DPL_MESSAGE_RECEIVE
 	DWORD		dwSize;                                     // Size of this structure
 	DPNHANDLE	hSender;                                    // Handle of the connection that is from
 	BYTE		*pBuffer;                                   // Contents of the message
-	DWORD		dwBufferSize;                               // Size of the message context 
+	DWORD		dwBufferSize;                               // Size of the message context
 	PVOID		pvConnectionContext;                        // Context value for this connection
 } DPL_MESSAGE_RECEIVE, *PDPL_MESSAGE_RECEIVE;
 
@@ -275,10 +275,10 @@ typedef struct _DPL_MESSAGE_SESSION_STATUS
  * DirectPlay8Lobby Create
  *
  ****************************************************************************/
- 
+
 /*
- * This function is no longer supported.  It is recommended that CoCreateInstance be used to create 
- * DirectPlay8 lobby objects. 
+ * This function is no longer supported.  It is recommended that CoCreateInstance be used to create
+ * DirectPlay8 lobby objects.
  *
  * extern HRESULT WINAPI DirectPlay8LobbyCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
  *
diff --git a/src/dep/include/DXSDK/include/dpnathlp.h b/src/dep/include/DXSDK/include/dpnathlp.h
index 720e43a..17f88bb 100644
--- a/src/dep/include/DXSDK/include/dpnathlp.h
+++ b/src/dep/include/DXSDK/include/dpnathlp.h
@@ -61,7 +61,7 @@ DEFINE_GUID(CLSID_DirectPlayNATHelpPAST,
  ****************************************************************************/
 
 // {154940B6-2278-4a2f-9101-9BA9F431F603}
-DEFINE_GUID(IID_IDirectPlayNATHelp, 
+DEFINE_GUID(IID_IDirectPlayNATHelp,
 0x154940b6, 0x2278, 0x4a2f, 0x91, 0x1, 0x9b, 0xa9, 0xf4, 0x31, 0xf6, 0x3);
 
 /****************************************************************************
@@ -160,7 +160,7 @@ typedef DWORD_PTR	DPNHHANDLE,	* PDPNHHANDLE;
  * DirectPlay NAT Helper structures
  *
  ****************************************************************************/
- 
+
 typedef struct _DPNHCAPS
 {
 	DWORD	dwSize;							// size of this structure, must be filled in prior to calling GetCaps
@@ -179,7 +179,7 @@ typedef struct _DPNHCAPS
  ****************************************************************************/
 
 #define DPNHADDRESSTYPE_TCP				0x01	// the mappings are for TCP ports instead of UDP
-#define DPNHADDRESSTYPE_FIXEDPORTS		0x02	// the mappings are for ports which are the same on the Internet gateway 
+#define DPNHADDRESSTYPE_FIXEDPORTS		0x02	// the mappings are for ports which are the same on the Internet gateway
 #define DPNHADDRESSTYPE_SHAREDPORTS		0x04	// the mappings are for shared UDP fixed ports
 #define DPNHADDRESSTYPE_LOCALFIREWALL	0x08	// the addresses are opened on a local firewall
 #define DPNHADDRESSTYPE_GATEWAY			0x10	// the addresses are registered with an Internet gateway
diff --git a/src/dep/include/DXSDK/include/dsetup.h b/src/dep/include/DXSDK/include/dsetup.h
index 58f79fb..88319e2 100644
--- a/src/dep/include/DXSDK/include/dsetup.h
+++ b/src/dep/include/DXSDK/include/dsetup.h
@@ -90,7 +90,7 @@ typedef struct _DSETUP_CB_PROGRESS
     DWORD dwOverallProgress;
 } DSETUP_CB_PROGRESS;
 
- 
+
 enum _DSETUP_CB_PROGRESS_PHASE
 {
     DSETUP_INITIALIZING,
diff --git a/src/dep/include/DXSDK/include/dvoice.h b/src/dep/include/DXSDK/include/dvoice.h
index 000ac51..09400c5 100644
--- a/src/dep/include/DXSDK/include/dvoice.h
+++ b/src/dep/include/DXSDK/include/dvoice.h
@@ -28,15 +28,15 @@ extern "C" {
 
 
 // {B9F3EB85-B781-4ac1-8D90-93A05EE37D7D}
-DEFINE_GUID(CLSID_DirectPlayVoiceClient, 
+DEFINE_GUID(CLSID_DirectPlayVoiceClient,
 0xb9f3eb85, 0xb781, 0x4ac1, 0x8d, 0x90, 0x93, 0xa0, 0x5e, 0xe3, 0x7d, 0x7d);
 
 // {D3F5B8E6-9B78-4a4c-94EA-CA2397B663D3}
-DEFINE_GUID(CLSID_DirectPlayVoiceServer, 
+DEFINE_GUID(CLSID_DirectPlayVoiceServer,
 0xd3f5b8e6, 0x9b78, 0x4a4c, 0x94, 0xea, 0xca, 0x23, 0x97, 0xb6, 0x63, 0xd3);
 
 // {0F0F094B-B01C-4091-A14D-DD0CD807711A}
-DEFINE_GUID(CLSID_DirectPlayVoiceTest, 
+DEFINE_GUID(CLSID_DirectPlayVoiceTest,
 0xf0f094b, 0xb01c, 0x4091, 0xa1, 0x4d, 0xdd, 0xc, 0xd8, 0x7, 0x71, 0x1a);
 
 /****************************************************************************
@@ -47,11 +47,11 @@ DEFINE_GUID(CLSID_DirectPlayVoiceTest,
 
 
 // {1DFDC8EA-BCF7-41d6-B295-AB64B3B23306}
-DEFINE_GUID(IID_IDirectPlayVoiceClient, 
+DEFINE_GUID(IID_IDirectPlayVoiceClient,
 0x1dfdc8ea, 0xbcf7, 0x41d6, 0xb2, 0x95, 0xab, 0x64, 0xb3, 0xb2, 0x33, 0x6);
 
 // {FAA1C173-0468-43b6-8A2A-EA8A4F2076C9}
-DEFINE_GUID(IID_IDirectPlayVoiceServer, 
+DEFINE_GUID(IID_IDirectPlayVoiceServer,
 0xfaa1c173, 0x468, 0x43b6, 0x8a, 0x2a, 0xea, 0x8a, 0x4f, 0x20, 0x76, 0xc9);
 
 // {D26AF734-208B-41da-8224-E0CE79810BE1}
@@ -77,7 +77,7 @@ DEFINE_GUID(DPVCTGUID_GSM,
 0x24768c60, 0x5a0d, 0x11d3, 0x9b, 0xe4, 0x52, 0x54, 0x0, 0xd9, 0x85, 0xe7);
 
 // MS-PCM 64 kbit/s
-// 
+//
 // {8DE12FD4-7CB3-48ce-A7E8-9C47A22E8AC5}
 DEFINE_GUID(DPVCTGUID_NONE,
 0x8de12fd4, 0x7cb3, 0x48ce, 0xa7, 0xe8, 0x9c, 0x47, 0xa2, 0x2e, 0x8a, 0xc5);
@@ -181,7 +181,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 #define DVBUFFERAGGRESSIVENESS_MAX          0x00000064
 #define DVBUFFERAGGRESSIVENESS_DEFAULT      0x00000000
 
-// 
+//
 // Buffer Quality Value Ranges
 //
 #define DVBUFFERQUALITY_MIN                 0x00000001
@@ -205,7 +205,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVID_REMAINING          0xFFFFFFFF
 
-// 
+//
 // Input level range
 //
 #define DVINPUTLEVEL_MIN                    0x00000000
@@ -231,7 +231,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 #define DVTHRESHOLD_MAX                   0x00000063	// 99 decimal
 
 //
-// Threshold field is not used 
+// Threshold field is not used
 //
 #define DVTHRESHOLD_UNUSED                0xFFFFFFFE
 
@@ -250,7 +250,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
  ****************************************************************************/
 
 
-// 
+//
 // Enable automatic adjustment of the recording volume
 //
 #define DVCLIENTCONFIG_AUTORECORDVOLUME     0x00000008
@@ -260,37 +260,37 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVCLIENTCONFIG_AUTOVOICEACTIVATED   0x00000020
 
-// 
+//
 // Enable echo suppression
 //
 #define DVCLIENTCONFIG_ECHOSUPPRESSION      0x08000000
 
-// 
+//
 // Voice Activation manual mode
 //
 #define DVCLIENTCONFIG_MANUALVOICEACTIVATED 0x00000004
 
-// 
+//
 // Only playback voices that have buffers created for them
 //
 #define DVCLIENTCONFIG_MUTEGLOBAL           0x00000010
 
-// 
+//
 // Mute the playback
 //
 #define DVCLIENTCONFIG_PLAYBACKMUTE         0x00000002
 
 //
-// Mute the recording 
+// Mute the recording
 //
 #define DVCLIENTCONFIG_RECORDMUTE           0x00000001
 
-// 
+//
 // Complete the operation before returning
 //
 #define DVFLAGS_SYNC                        0x00000001
 
-// 
+//
 // Just check to see if wizard has been run, and if so what it's results were
 //
 #define DVFLAGS_QUERYONLY                   0x00000002
@@ -300,7 +300,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVFLAGS_NOHOSTMIGRATE               0x00000008
 
-// 
+//
 // Allow the back button to be enabled in the wizard
 //
 #define DVFLAGS_ALLOWBACK                   0x00000010
@@ -310,13 +310,13 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVSESSION_NOHOSTMIGRATION           0x00000001
 
-// 
+//
 // Server controlled targetting
 //
 #define DVSESSION_SERVERCONTROLTARGET       0x00000002
 
 //
-// Use DirectSound Normal Mode instead of priority 
+// Use DirectSound Normal Mode instead of priority
 //
 #define DVSOUNDCONFIG_NORMALMODE            0x00000001
 
@@ -325,29 +325,29 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVSOUNDCONFIG_AUTOSELECT            0x00000002
 
-// 
+//
 // Run in half duplex mode
 //
 #define DVSOUNDCONFIG_HALFDUPLEX            0x00000004
 
-// 
+//
 // No volume controls are available for the recording device
 //
 #define DVSOUNDCONFIG_NORECVOLAVAILABLE     0x00000010
 
-// 
+//
 // Disable capture sharing
 //
 #define DVSOUNDCONFIG_NOFOCUS               0x20000000
 
-// 
+//
 // Set system conversion quality to high
 //
 #define DVSOUNDCONFIG_SETCONVERSIONQUALITY	0x00000008
 
 //
 // Enable strict focus mode
-// 
+//
 #define DVSOUNDCONFIG_STRICTFOCUS           0x40000000
 
 //
@@ -355,7 +355,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
 //
 #define DVPLAYERCAPS_HALFDUPLEX             0x00000001
 
-// 
+//
 // Specifies that player is the local player
 //
 #define DVPLAYERCAPS_LOCAL                  0x00000002
@@ -385,7 +385,7 @@ typedef struct
 {
     DWORD   dwSize;                 // Size of this structure
     DWORD   dwFlags;                // Flags for client config (DVCLIENTCONFIG_...)
-    LONG    lRecordVolume;          // Recording volume 
+    LONG    lRecordVolume;          // Recording volume
     LONG    lPlaybackVolume;        // Playback volume
     DWORD   dwThreshold;          // Voice Activation Threshold
     DWORD   dwBufferQuality;        // Buffer quality
@@ -421,7 +421,7 @@ typedef struct
     DWORD   dwBufferAggressiveness; // Buffer aggresiveness
 } DVSESSIONDESC, *LPDVSESSIONDESC, *PDVSESSIONDESC;
 
-// 
+//
 // DirectPlayVoice Client Sound Device Configuration
 // (Connect / GetSoundDeviceConfig)
 //
@@ -458,7 +458,7 @@ typedef struct
 //
 // A new player has entered the voice session
 // (DVMSGID_CREATEVOICEPLAYER)
-// 
+//
 typedef struct
 {
     DWORD   dwSize;                         // Size of this structure
@@ -488,9 +488,9 @@ typedef struct
     HRESULT hrResult;                       // Result of the Disconnect() call
 } DVMSG_DISCONNECTRESULT, *LPDVMSG_DISCONNECTRESULT, *PDVMSG_DISCONNECTRESULT;
 
-// 
+//
 // The voice session host has migrated.
-// (DVMSGID_HOSTMIGRATED) 
+// (DVMSGID_HOSTMIGRATED)
 //
 typedef struct
 {
@@ -548,14 +548,14 @@ typedef struct
     PVOID	pvPlayerContext;                // Context value for the player
 } DVMSG_PLAYEROUTPUTLEVEL, *LPDVMSG_PLAYEROUTPUTLEVEL, *PDVMSG_PLAYEROUTPUTLEVEL;
 
-// 
+//
 // An audio stream from the specified player has started playing back on the local client.
 // (DVMSGID_PLAYERVOICESTART).
 //
 typedef struct
 {
     DWORD   dwSize;                         // Size of this structure
-    DVID    dvidSourcePlayerID;             // DVID of the Player 
+    DVID    dvidSourcePlayerID;             // DVID of the Player
     PVOID	pvPlayerContext;                // Context value for this player
 } DVMSG_PLAYERVOICESTART, *LPDVMSG_PLAYERVOICESTART, *PDVMSG_PLAYERVOICESTART;
 
@@ -570,7 +570,7 @@ typedef struct
     PVOID	pvPlayerContext;                // Context value for this player
 } DVMSG_PLAYERVOICESTOP, *LPDVMSG_PLAYERVOICESTOP, *PDVMSG_PLAYERVOICESTOP;
 
-// 
+//
 // Transmission has started on the local machine
 // (DVMSGID_RECORDSTART)
 //
@@ -581,10 +581,10 @@ typedef struct
     PVOID	pvLocalPlayerContext;           // Context value for the local player
 } DVMSG_RECORDSTART, *LPDVMSG_RECORDSTART, *PDVMSG_RECORDSTART;
 
-// 
+//
 // Transmission has stopped on the local machine
 // (DVMSGID_RECORDSTOP)
-// 
+//
 typedef struct
 {
     DWORD   dwSize;                         // Size of this structure
@@ -592,7 +592,7 @@ typedef struct
     PVOID	pvLocalPlayerContext;           // Context value for the local player
 } DVMSG_RECORDSTOP, *LPDVMSG_RECORDSTOP, *PDVMSG_RECORDSTOP;
 
-// 
+//
 // The voice session has been lost
 // (DVMSGID_SESSIONLOST)
 //
@@ -609,7 +609,7 @@ typedef struct
 typedef struct
 {
     DWORD   dwSize;                         // Size of this structure
-    DWORD   dwNumTargets;                   // # of targets 
+    DWORD   dwNumTargets;                   // # of targets
     PDVID   pdvidTargets;                   // An array of DVIDs specifying the current targets
 } DVMSG_SETTARGETS, *LPDVMSG_SETTARGETS, *PDVMSG_SETTARGETS;
 
@@ -621,11 +621,11 @@ typedef struct
  ****************************************************************************/
 
 /*
- * 
- * This function is no longer supported.  It is recommended that CoCreateInstance be used to create 
- * DirectPlay voice objects.  
  *
- * extern HRESULT WINAPI DirectPlayVoiceCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown); 
+ * This function is no longer supported.  It is recommended that CoCreateInstance be used to create
+ * DirectPlay voice objects.
+ *
+ * extern HRESULT WINAPI DirectPlayVoiceCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
  *
  */
 
diff --git a/src/dep/include/DXSDK/include/dxdiag.h b/src/dep/include/DXSDK/include/dxdiag.h
index 602c88f..20918d0 100644
--- a/src/dep/include/DXSDK/include/dxdiag.h
+++ b/src/dep/include/DXSDK/include/dxdiag.h
@@ -77,13 +77,13 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
 
 typedef struct _DXDIAG_INIT_PARAMS
 {
-    DWORD   dwSize;                 // Size of this structure. 
-    DWORD   dwDxDiagHeaderVersion;  // Pass in DXDIAG_DX9_SDK_VERSION.  This verifies 
+    DWORD   dwSize;                 // Size of this structure.
+    DWORD   dwDxDiagHeaderVersion;  // Pass in DXDIAG_DX9_SDK_VERSION.  This verifies
                                     // the header and dll are correctly matched.
-    BOOL    bAllowWHQLChecks;       // If true, allow dxdiag to check if drivers are 
-                                    // digital signed as logo'd by WHQL which may 
+    BOOL    bAllowWHQLChecks;       // If true, allow dxdiag to check if drivers are
+                                    // digital signed as logo'd by WHQL which may
                                     // connect via internet to update WHQL certificates.
-    VOID*   pReserved;              // Reserved. Must be NULL. 
+    VOID*   pReserved;              // Reserved. Must be NULL.
 } DXDIAG_INIT_PARAMS;
 
 
@@ -104,9 +104,9 @@ DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
     STDMETHOD(QueryInterface)               (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
     STDMETHOD_(ULONG,AddRef)                (THIS) PURE;
     STDMETHOD_(ULONG,Release)               (THIS) PURE;
-    
+
     /*** IDxDiagProvider methods ***/
-    STDMETHOD(Initialize)                   (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; 
+    STDMETHOD(Initialize)                   (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
     STDMETHOD(GetRootContainer)             (THIS_ IDxDiagContainer **ppInstance) PURE;
 };
 
@@ -122,11 +122,11 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
     STDMETHOD(QueryInterface)               (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
     STDMETHOD_(ULONG,AddRef)                (THIS) PURE;
     STDMETHOD_(ULONG,Release)               (THIS) PURE;
-    
+
     /*** IDxDiagContainer methods ***/
     STDMETHOD(GetNumberOfChildContainers)   (THIS_ DWORD *pdwCount) PURE;
     STDMETHOD(EnumChildContainerNames)      (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE;
-    STDMETHOD(GetChildContainer)            (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;  
+    STDMETHOD(GetChildContainer)            (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;
     STDMETHOD(GetNumberOfProps)             (THIS_ DWORD *pdwCount) PURE;
     STDMETHOD(EnumPropNames)                (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE;
     STDMETHOD(GetProp)                      (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE;
diff --git a/src/dep/include/DXSDK/include/dxerr8.h b/src/dep/include/DXSDK/include/dxerr8.h
index 4f4d848..32b6797 100644
--- a/src/dep/include/DXSDK/include/dxerr8.h
+++ b/src/dep/include/DXSDK/include/dxerr8.h
@@ -15,13 +15,13 @@ extern "C" {
 
 //
 //  DXGetErrorString8
-//  
-//  Desc:  Converts a DirectX HRESULT to a string 
+//
+//  Desc:  Converts a DirectX HRESULT to a string
 //
 //  Args:  HRESULT hr   Can be any error code from
 //                      D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
 //
-//  Return: Converted string 
+//  Return: Converted string
 //
 const char*  WINAPI DXGetErrorString8A(HRESULT hr);
 const WCHAR* WINAPI DXGetErrorString8W(HRESULT hr);
@@ -30,12 +30,12 @@ const WCHAR* WINAPI DXGetErrorString8W(HRESULT hr);
 #define DXGetErrorString8 DXGetErrorString8W
 #else
 #define DXGetErrorString8 DXGetErrorString8A
-#endif 
+#endif
 
 
 //
 //  DXGetErrorDescription8
-//  
+//
 //  Desc:  Returns a string description of a DirectX HRESULT
 //
 //  Args:  HRESULT hr   Can be any error code from
@@ -50,7 +50,7 @@ const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr);
     #define DXGetErrorDescription8 DXGetErrorDescription8W
 #else
     #define DXGetErrorDescription8 DXGetErrorDescription8A
-#endif 
+#endif
 
 
 //
@@ -58,15 +58,15 @@ const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr);
 //
 //  Desc:  Outputs a formatted error message to the debug stream
 //
-//  Args:  CHAR* strFile   The current file, typically passed in using the 
+//  Args:  CHAR* strFile   The current file, typically passed in using the
 //                         __FILE__ macro.
-//         DWORD dwLine    The current line number, typically passed in using the 
+//         DWORD dwLine    The current line number, typically passed in using the
 //                         __LINE__ macro.
 //         HRESULT hr      An HRESULT that will be traced to the debug stream.
 //         CHAR* strMsg    A string that will be traced to the debug stream (may be NULL)
 //         BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
 //
-//  Return: The hr that was passed in.  
+//  Return: The hr that was passed in.
 //
 HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox );
 HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox );
@@ -75,7 +75,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
 #define DXTrace DXTraceW
 #else
 #define DXTrace DXTraceA
-#endif 
+#endif
 
 
 //
diff --git a/src/dep/include/DXSDK/include/dxerr9.h b/src/dep/include/DXSDK/include/dxerr9.h
index baf6968..e6a8ede 100644
--- a/src/dep/include/DXSDK/include/dxerr9.h
+++ b/src/dep/include/DXSDK/include/dxerr9.h
@@ -15,13 +15,13 @@ extern "C" {
 
 //
 //  DXGetErrorString9
-//  
-//  Desc:  Converts a DirectX 9 or earlier HRESULT to a string 
+//
+//  Desc:  Converts a DirectX 9 or earlier HRESULT to a string
 //
 //  Args:  HRESULT hr   Can be any error code from
 //                      D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
 //
-//  Return: Converted string 
+//  Return: Converted string
 //
 const char*  WINAPI DXGetErrorString9A(HRESULT hr);
 const WCHAR* WINAPI DXGetErrorString9W(HRESULT hr);
@@ -30,16 +30,16 @@ const WCHAR* WINAPI DXGetErrorString9W(HRESULT hr);
 #define DXGetErrorString9 DXGetErrorString9W
 #else
 #define DXGetErrorString9 DXGetErrorString9A
-#endif 
+#endif
 
 
 //
 //  DXGetErrorDescription9
-//  
+//
 //  Desc:  Returns a string description of a DirectX 9 or earlier HRESULT
 //
 //  Args:  HRESULT hr   Can be any error code from
-//                      D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW 
+//                      D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
 //
 //  Return: String description
 //
@@ -50,7 +50,7 @@ const WCHAR* WINAPI DXGetErrorDescription9W(HRESULT hr);
     #define DXGetErrorDescription9 DXGetErrorDescription9W
 #else
     #define DXGetErrorDescription9 DXGetErrorDescription9A
-#endif 
+#endif
 
 
 //
@@ -58,15 +58,15 @@ const WCHAR* WINAPI DXGetErrorDescription9W(HRESULT hr);
 //
 //  Desc:  Outputs a formatted error message to the debug stream
 //
-//  Args:  CHAR* strFile   The current file, typically passed in using the 
+//  Args:  CHAR* strFile   The current file, typically passed in using the
 //                         __FILE__ macro.
-//         DWORD dwLine    The current line number, typically passed in using the 
+//         DWORD dwLine    The current line number, typically passed in using the
 //                         __LINE__ macro.
 //         HRESULT hr      An HRESULT that will be traced to the debug stream.
 //         CHAR* strMsg    A string that will be traced to the debug stream (may be NULL)
 //         BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
 //
-//  Return: The hr that was passed in.  
+//  Return: The hr that was passed in.
 //
 HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox );
 HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox );
@@ -75,7 +75,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
 #define DXTrace DXTraceW
 #else
 #define DXTrace DXTraceA
-#endif 
+#endif
 
 
 //
diff --git a/src/dep/include/DXSDK/include/dxsdkver.h b/src/dep/include/DXSDK/include/dxsdkver.h
index cda0ce6..ff5b84b 100644
--- a/src/dep/include/DXSDK/include/dxsdkver.h
+++ b/src/dep/include/DXSDK/include/dxsdkver.h
@@ -9,10 +9,10 @@
 #ifndef _DXSDKVER_H_
 #define _DXSDKVER_H_
 
-#define _DXSDK_PRODUCT_MAJOR  9     
-#define _DXSDK_PRODUCT_MINOR  12        
-#define _DXSDK_BUILD_MAJOR    589        
-#define _DXSDK_BUILD_MINOR    0000        
+#define _DXSDK_PRODUCT_MAJOR  9
+#define _DXSDK_PRODUCT_MINOR  12
+#define _DXSDK_BUILD_MAJOR    589
+#define _DXSDK_BUILD_MINOR    0000
 
 #endif // _DXSDKVER_H_
 
diff --git a/src/dep/include/DXSDK/include/dxtrans.h b/src/dep/include/DXSDK/include/dxtrans.h
index 8df2ff7..a2f2d8c 100644
--- a/src/dep/include/DXSDK/include/dxtrans.h
+++ b/src/dep/include/DXSDK/include/dxtrans.h
@@ -8,8 +8,8 @@
 /* Compiler settings for dxtrans.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -40,7 +40,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IDXBaseObject_FWD_DEFINED__
 #define __IDXBaseObject_FWD_DEFINED__
@@ -265,13 +265,13 @@ typedef struct DXTFilter DXTFilter;
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 void * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free( void * ); 
+void __RPC_USER MIDL_user_free( void * );
 
 /* interface __MIDL_itf_dxtrans_0000 */
-/* [local] */ 
+/* [local] */
 
 #include <servprov.h>
 #include <ddraw.h>
@@ -369,57 +369,57 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0000_v0_0_s_ifspec;
 #define __IDXBaseObject_INTERFACE_DEFINED__
 
 /* interface IDXBaseObject */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXBaseObject;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("17B59B2B-9CC8-11d1-9053-00C04FD9189D")
     IDXBaseObject : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetGenerationId( 
+        virtual HRESULT STDMETHODCALLTYPE GetGenerationId(
             /* [out] */ ULONG *pID) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE IncrementGenerationId( 
+
+        virtual HRESULT STDMETHODCALLTYPE IncrementGenerationId(
             /* [in] */ BOOL bRefresh) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetObjectSize( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetObjectSize(
             /* [out] */ ULONG *pcbSize) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXBaseObjectVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXBaseObject * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXBaseObject * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXBaseObject * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )(
             IDXBaseObject * This,
             /* [out] */ ULONG *pID);
-        
-        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )(
             IDXBaseObject * This,
             /* [in] */ BOOL bRefresh);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )(
             IDXBaseObject * This,
             /* [out] */ ULONG *pcbSize);
-        
+
         END_INTERFACE
     } IDXBaseObjectVtbl;
 
@@ -428,7 +428,7 @@ EXTERN_C const IID IID_IDXBaseObject;
         CONST_VTBL struct IDXBaseObjectVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -459,7 +459,7 @@ EXTERN_C const IID IID_IDXBaseObject;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXBaseObject_GetGenerationId_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXBaseObject_GetGenerationId_Proxy(
     IDXBaseObject * This,
     /* [out] */ ULONG *pID);
 
@@ -471,7 +471,7 @@ void __RPC_STUB IDXBaseObject_GetGenerationId_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXBaseObject_IncrementGenerationId_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXBaseObject_IncrementGenerationId_Proxy(
     IDXBaseObject * This,
     /* [in] */ BOOL bRefresh);
 
@@ -483,7 +483,7 @@ void __RPC_STUB IDXBaseObject_IncrementGenerationId_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXBaseObject_GetObjectSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXBaseObject_GetObjectSize_Proxy(
     IDXBaseObject * This,
     /* [out] */ ULONG *pcbSize);
 
@@ -500,9 +500,9 @@ void __RPC_STUB IDXBaseObject_GetObjectSize_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0260 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DXBNDID
     {	DXB_X	= 0,
 	DXB_Y	= 1,
@@ -510,7 +510,7 @@ enum DXBNDID
 	DXB_T	= 3
     } 	DXBNDID;
 
-typedef 
+typedef
 enum DXBNDTYPE
     {	DXBT_DISCRETE	= 0,
 	DXBT_DISCRETE64	= DXBT_DISCRETE + 1,
@@ -591,23 +591,23 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0260_v0_0_s_ifspec;
 #define __IDXTransformFactory_INTERFACE_DEFINED__
 
 /* interface IDXTransformFactory */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTransformFactory;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("6A950B2B-A971-11d1-81C8-0000F87557DB")
     IDXTransformFactory : public IServiceProvider
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetService( 
+        virtual HRESULT STDMETHODCALLTYPE SetService(
             /* [in] */ REFGUID guidService,
             /* [in] */ IUnknown *pUnkService,
             /* [in] */ BOOL bWeakReference) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateTransform( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateTransform(
             /* [size_is][in] */ IUnknown **punkInputs,
             /* [in] */ ULONG ulNumInputs,
             /* [size_is][in] */ IUnknown **punkOutputs,
@@ -617,8 +617,8 @@ EXTERN_C const IID IID_IDXTransformFactory;
             /* [in] */ REFCLSID TransCLSID,
             /* [in] */ REFIID TransIID,
             /* [iid_is][out] */ void **ppTransform) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InitializeTransform( 
+
+        virtual HRESULT STDMETHODCALLTYPE InitializeTransform(
             /* [in] */ IDXTransform *pTransform,
             /* [size_is][in] */ IUnknown **punkInputs,
             /* [in] */ ULONG ulNumInputs,
@@ -626,39 +626,39 @@ EXTERN_C const IID IID_IDXTransformFactory;
             /* [in] */ ULONG ulNumOutputs,
             /* [in] */ IPropertyBag *pInitProps,
             /* [in] */ IErrorLog *pErrLog) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTransformFactoryVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTransformFactory * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTransformFactory * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTransformFactory * This);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *QueryService )( 
+
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *QueryService )(
             IDXTransformFactory * This,
             /* [in] */ REFGUID guidService,
             /* [in] */ REFIID riid,
             /* [out] */ void **ppvObject);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetService )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetService )(
             IDXTransformFactory * This,
             /* [in] */ REFGUID guidService,
             /* [in] */ IUnknown *pUnkService,
             /* [in] */ BOOL bWeakReference);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateTransform )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateTransform )(
             IDXTransformFactory * This,
             /* [size_is][in] */ IUnknown **punkInputs,
             /* [in] */ ULONG ulNumInputs,
@@ -669,8 +669,8 @@ EXTERN_C const IID IID_IDXTransformFactory;
             /* [in] */ REFCLSID TransCLSID,
             /* [in] */ REFIID TransIID,
             /* [iid_is][out] */ void **ppTransform);
-        
-        HRESULT ( STDMETHODCALLTYPE *InitializeTransform )( 
+
+        HRESULT ( STDMETHODCALLTYPE *InitializeTransform )(
             IDXTransformFactory * This,
             /* [in] */ IDXTransform *pTransform,
             /* [size_is][in] */ IUnknown **punkInputs,
@@ -679,7 +679,7 @@ EXTERN_C const IID IID_IDXTransformFactory;
             /* [in] */ ULONG ulNumOutputs,
             /* [in] */ IPropertyBag *pInitProps,
             /* [in] */ IErrorLog *pErrLog);
-        
+
         END_INTERFACE
     } IDXTransformFactoryVtbl;
 
@@ -688,7 +688,7 @@ EXTERN_C const IID IID_IDXTransformFactory;
         CONST_VTBL struct IDXTransformFactoryVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -723,7 +723,7 @@ EXTERN_C const IID IID_IDXTransformFactory;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTransformFactory_SetService_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransformFactory_SetService_Proxy(
     IDXTransformFactory * This,
     /* [in] */ REFGUID guidService,
     /* [in] */ IUnknown *pUnkService,
@@ -737,7 +737,7 @@ void __RPC_STUB IDXTransformFactory_SetService_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransformFactory_CreateTransform_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransformFactory_CreateTransform_Proxy(
     IDXTransformFactory * This,
     /* [size_is][in] */ IUnknown **punkInputs,
     /* [in] */ ULONG ulNumInputs,
@@ -757,7 +757,7 @@ void __RPC_STUB IDXTransformFactory_CreateTransform_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransformFactory_InitializeTransform_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransformFactory_InitializeTransform_Proxy(
     IDXTransformFactory * This,
     /* [in] */ IDXTransform *pTransform,
     /* [size_is][in] */ IUnknown **punkInputs,
@@ -780,9 +780,9 @@ void __RPC_STUB IDXTransformFactory_InitializeTransform_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0261 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DXTMISCFLAGS
     {	DXTMF_BLEND_WITH_OUTPUT	= 1L << 0,
 	DXTMF_DITHER_OUTPUT	= 1L << 1,
@@ -797,7 +797,7 @@ enum DXTMISCFLAGS
 	DXTMF_OPAQUE_RESULT	= 1L << 28
     } 	DXTMISCFLAGS;
 
-typedef 
+typedef
 enum DXINOUTINFOFLAGS
     {	DXINOUTF_OPTIONAL	= 1L << 0
     } 	DXINOUTINFOFLAGS;
@@ -811,129 +811,129 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0261_v0_0_s_ifspec;
 #define __IDXTransform_INTERFACE_DEFINED__
 
 /* interface IDXTransform */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTransform;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("30A5FB78-E11F-11d1-9064-00C04FD9189D")
     IDXTransform : public IDXBaseObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE Setup( 
+        virtual HRESULT STDMETHODCALLTYPE Setup(
             /* [size_is][in] */ IUnknown *const *punkInputs,
             /* [in] */ ULONG ulNumInputs,
             /* [size_is][in] */ IUnknown *const *punkOutputs,
             /* [in] */ ULONG ulNumOutputs,
             /* [in] */ DWORD dwFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE Execute( 
+
+        virtual HRESULT STDMETHODCALLTYPE Execute(
             /* [in] */ const GUID *pRequestID,
             /* [in] */ const DXBNDS *pClipBnds,
             /* [in] */ const DXVEC *pPlacement) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE MapBoundsIn2Out( 
+
+        virtual HRESULT STDMETHODCALLTYPE MapBoundsIn2Out(
             /* [in] */ const DXBNDS *pInBounds,
             /* [in] */ ULONG ulNumInBnds,
             /* [in] */ ULONG ulOutIndex,
             /* [out] */ DXBNDS *pOutBounds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE MapBoundsOut2In( 
+
+        virtual HRESULT STDMETHODCALLTYPE MapBoundsOut2In(
             /* [in] */ ULONG ulOutIndex,
             /* [in] */ const DXBNDS *pOutBounds,
             /* [in] */ ULONG ulInIndex,
             /* [out] */ DXBNDS *pInBounds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetMiscFlags( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetMiscFlags(
             /* [in] */ DWORD dwMiscFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetMiscFlags( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetMiscFlags(
             /* [out] */ DWORD *pdwMiscFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetInOutInfo( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetInOutInfo(
             /* [in] */ BOOL bIsOutput,
             /* [in] */ ULONG ulIndex,
             /* [out] */ DWORD *pdwFlags,
             /* [size_is][out] */ GUID *pIDs,
             /* [out][in] */ ULONG *pcIDs,
             /* [out] */ IUnknown **ppUnkCurrentObject) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetQuality( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetQuality(
             /* [in] */ float fQuality) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetQuality( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetQuality(
             /* [out] */ float *fQuality) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTransformVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTransform * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTransform * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTransform * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )(
             IDXTransform * This,
             /* [out] */ ULONG *pID);
-        
-        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )(
             IDXTransform * This,
             /* [in] */ BOOL bRefresh);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )(
             IDXTransform * This,
             /* [out] */ ULONG *pcbSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *Setup )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Setup )(
             IDXTransform * This,
             /* [size_is][in] */ IUnknown *const *punkInputs,
             /* [in] */ ULONG ulNumInputs,
             /* [size_is][in] */ IUnknown *const *punkOutputs,
             /* [in] */ ULONG ulNumOutputs,
             /* [in] */ DWORD dwFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *Execute )( 
+
+        HRESULT ( STDMETHODCALLTYPE *Execute )(
             IDXTransform * This,
             /* [in] */ const GUID *pRequestID,
             /* [in] */ const DXBNDS *pClipBnds,
             /* [in] */ const DXVEC *pPlacement);
-        
-        HRESULT ( STDMETHODCALLTYPE *MapBoundsIn2Out )( 
+
+        HRESULT ( STDMETHODCALLTYPE *MapBoundsIn2Out )(
             IDXTransform * This,
             /* [in] */ const DXBNDS *pInBounds,
             /* [in] */ ULONG ulNumInBnds,
             /* [in] */ ULONG ulOutIndex,
             /* [out] */ DXBNDS *pOutBounds);
-        
-        HRESULT ( STDMETHODCALLTYPE *MapBoundsOut2In )( 
+
+        HRESULT ( STDMETHODCALLTYPE *MapBoundsOut2In )(
             IDXTransform * This,
             /* [in] */ ULONG ulOutIndex,
             /* [in] */ const DXBNDS *pOutBounds,
             /* [in] */ ULONG ulInIndex,
             /* [out] */ DXBNDS *pInBounds);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetMiscFlags )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetMiscFlags )(
             IDXTransform * This,
             /* [in] */ DWORD dwMiscFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetMiscFlags )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetMiscFlags )(
             IDXTransform * This,
             /* [out] */ DWORD *pdwMiscFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetInOutInfo )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetInOutInfo )(
             IDXTransform * This,
             /* [in] */ BOOL bIsOutput,
             /* [in] */ ULONG ulIndex,
@@ -941,15 +941,15 @@ EXTERN_C const IID IID_IDXTransform;
             /* [size_is][out] */ GUID *pIDs,
             /* [out][in] */ ULONG *pcIDs,
             /* [out] */ IUnknown **ppUnkCurrentObject);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetQuality )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetQuality )(
             IDXTransform * This,
             /* [in] */ float fQuality);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetQuality )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetQuality )(
             IDXTransform * This,
             /* [out] */ float *fQuality);
-        
+
         END_INTERFACE
     } IDXTransformVtbl;
 
@@ -958,7 +958,7 @@ EXTERN_C const IID IID_IDXTransform;
         CONST_VTBL struct IDXTransformVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1017,7 +1017,7 @@ EXTERN_C const IID IID_IDXTransform;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_Setup_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_Setup_Proxy(
     IDXTransform * This,
     /* [size_is][in] */ IUnknown *const *punkInputs,
     /* [in] */ ULONG ulNumInputs,
@@ -1033,7 +1033,7 @@ void __RPC_STUB IDXTransform_Setup_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_Execute_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_Execute_Proxy(
     IDXTransform * This,
     /* [in] */ const GUID *pRequestID,
     /* [in] */ const DXBNDS *pClipBnds,
@@ -1047,7 +1047,7 @@ void __RPC_STUB IDXTransform_Execute_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_MapBoundsIn2Out_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_MapBoundsIn2Out_Proxy(
     IDXTransform * This,
     /* [in] */ const DXBNDS *pInBounds,
     /* [in] */ ULONG ulNumInBnds,
@@ -1062,7 +1062,7 @@ void __RPC_STUB IDXTransform_MapBoundsIn2Out_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_MapBoundsOut2In_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_MapBoundsOut2In_Proxy(
     IDXTransform * This,
     /* [in] */ ULONG ulOutIndex,
     /* [in] */ const DXBNDS *pOutBounds,
@@ -1077,7 +1077,7 @@ void __RPC_STUB IDXTransform_MapBoundsOut2In_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_SetMiscFlags_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_SetMiscFlags_Proxy(
     IDXTransform * This,
     /* [in] */ DWORD dwMiscFlags);
 
@@ -1089,7 +1089,7 @@ void __RPC_STUB IDXTransform_SetMiscFlags_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_GetMiscFlags_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_GetMiscFlags_Proxy(
     IDXTransform * This,
     /* [out] */ DWORD *pdwMiscFlags);
 
@@ -1101,7 +1101,7 @@ void __RPC_STUB IDXTransform_GetMiscFlags_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_GetInOutInfo_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_GetInOutInfo_Proxy(
     IDXTransform * This,
     /* [in] */ BOOL bIsOutput,
     /* [in] */ ULONG ulIndex,
@@ -1118,7 +1118,7 @@ void __RPC_STUB IDXTransform_GetInOutInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_SetQuality_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_SetQuality_Proxy(
     IDXTransform * This,
     /* [in] */ float fQuality);
 
@@ -1130,7 +1130,7 @@ void __RPC_STUB IDXTransform_SetQuality_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTransform_GetQuality_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTransform_GetQuality_Proxy(
     IDXTransform * This,
     /* [out] */ float *fQuality);
 
@@ -1150,47 +1150,47 @@ void __RPC_STUB IDXTransform_GetQuality_Stub(
 #define __IDXSurfacePick_INTERFACE_DEFINED__
 
 /* interface IDXSurfacePick */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXSurfacePick;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("30A5FB79-E11F-11d1-9064-00C04FD9189D")
     IDXSurfacePick : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE PointPick( 
+        virtual HRESULT STDMETHODCALLTYPE PointPick(
             /* [in] */ const DXVEC *pPoint,
             /* [out] */ ULONG *pulInputSurfaceIndex,
             /* [out] */ DXVEC *pInputPoint) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXSurfacePickVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXSurfacePick * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXSurfacePick * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXSurfacePick * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *PointPick )( 
+
+        HRESULT ( STDMETHODCALLTYPE *PointPick )(
             IDXSurfacePick * This,
             /* [in] */ const DXVEC *pPoint,
             /* [out] */ ULONG *pulInputSurfaceIndex,
             /* [out] */ DXVEC *pInputPoint);
-        
+
         END_INTERFACE
     } IDXSurfacePickVtbl;
 
@@ -1199,7 +1199,7 @@ EXTERN_C const IID IID_IDXSurfacePick;
         CONST_VTBL struct IDXSurfacePickVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1224,7 +1224,7 @@ EXTERN_C const IID IID_IDXSurfacePick;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfacePick_PointPick_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfacePick_PointPick_Proxy(
     IDXSurfacePick * This,
     /* [in] */ const DXVEC *pPoint,
     /* [out] */ ULONG *pulInputSurfaceIndex,
@@ -1246,43 +1246,43 @@ void __RPC_STUB IDXSurfacePick_PointPick_Stub(
 #define __IDXTBindHost_INTERFACE_DEFINED__
 
 /* interface IDXTBindHost */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTBindHost;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("D26BCE55-E9DC-11d1-9066-00C04FD9189D")
     IDXTBindHost : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetBindHost( 
+        virtual HRESULT STDMETHODCALLTYPE SetBindHost(
             /* [in] */ IBindHost *pBindHost) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTBindHostVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTBindHost * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTBindHost * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTBindHost * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetBindHost )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetBindHost )(
             IDXTBindHost * This,
             /* [in] */ IBindHost *pBindHost);
-        
+
         END_INTERFACE
     } IDXTBindHostVtbl;
 
@@ -1291,7 +1291,7 @@ EXTERN_C const IID IID_IDXTBindHost;
         CONST_VTBL struct IDXTBindHostVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1316,7 +1316,7 @@ EXTERN_C const IID IID_IDXTBindHost;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTBindHost_SetBindHost_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTBindHost_SetBindHost_Proxy(
     IDXTBindHost * This,
     /* [in] */ IBindHost *pBindHost);
 
@@ -1333,15 +1333,15 @@ void __RPC_STUB IDXTBindHost_SetBindHost_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0264 */
-/* [local] */ 
+/* [local] */
 
-typedef void __stdcall __stdcall DXTASKPROC( 
+typedef void __stdcall __stdcall DXTASKPROC(
     void *pTaskData,
     BOOL *pbContinueProcessing);
 
 typedef DXTASKPROC *PFNDXTASKPROC;
 
-typedef void __stdcall __stdcall DXAPCPROC( 
+typedef void __stdcall __stdcall DXAPCPROC(
     DWORD dwData);
 
 typedef DXAPCPROC *PFNDXAPCPROC;
@@ -1375,106 +1375,106 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0264_v0_0_s_ifspec;
 #define __IDXTaskManager_INTERFACE_DEFINED__
 
 /* interface IDXTaskManager */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTaskManager;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("254DBBC1-F922-11d0-883A-3C8B00C10000")
     IDXTaskManager : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE QueryNumProcessors( 
+        virtual HRESULT STDMETHODCALLTYPE QueryNumProcessors(
             /* [out] */ ULONG *pulNumProc) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetThreadPoolSize( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetThreadPoolSize(
             /* [in] */ ULONG ulNumThreads) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetThreadPoolSize( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetThreadPoolSize(
             /* [out] */ ULONG *pulNumThreads) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetConcurrencyLimit( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetConcurrencyLimit(
             /* [in] */ ULONG ulNumThreads) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetConcurrencyLimit( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetConcurrencyLimit(
             /* [out] */ ULONG *pulNumThreads) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ScheduleTasks( 
+
+        virtual HRESULT STDMETHODCALLTYPE ScheduleTasks(
             /* [in] */ DXTMTASKINFO TaskInfo[  ],
             /* [in] */ HANDLE Events[  ],
             /* [out] */ DWORD TaskIDs[  ],
             /* [in] */ ULONG ulNumTasks,
             /* [in] */ ULONG ulWaitPeriod) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TerminateTasks( 
+
+        virtual HRESULT STDMETHODCALLTYPE TerminateTasks(
             /* [in] */ DWORD TaskIDs[  ],
             /* [in] */ ULONG ulCount,
             /* [in] */ ULONG ulTimeOut) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE TerminateRequest( 
+
+        virtual HRESULT STDMETHODCALLTYPE TerminateRequest(
             /* [in] */ REFIID RequestID,
             /* [in] */ ULONG ulTimeOut) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTaskManagerVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTaskManager * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTaskManager * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTaskManager * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryNumProcessors )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryNumProcessors )(
             IDXTaskManager * This,
             /* [out] */ ULONG *pulNumProc);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetThreadPoolSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetThreadPoolSize )(
             IDXTaskManager * This,
             /* [in] */ ULONG ulNumThreads);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetThreadPoolSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetThreadPoolSize )(
             IDXTaskManager * This,
             /* [out] */ ULONG *pulNumThreads);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetConcurrencyLimit )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetConcurrencyLimit )(
             IDXTaskManager * This,
             /* [in] */ ULONG ulNumThreads);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetConcurrencyLimit )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetConcurrencyLimit )(
             IDXTaskManager * This,
             /* [out] */ ULONG *pulNumThreads);
-        
-        HRESULT ( STDMETHODCALLTYPE *ScheduleTasks )( 
+
+        HRESULT ( STDMETHODCALLTYPE *ScheduleTasks )(
             IDXTaskManager * This,
             /* [in] */ DXTMTASKINFO TaskInfo[  ],
             /* [in] */ HANDLE Events[  ],
             /* [out] */ DWORD TaskIDs[  ],
             /* [in] */ ULONG ulNumTasks,
             /* [in] */ ULONG ulWaitPeriod);
-        
-        HRESULT ( STDMETHODCALLTYPE *TerminateTasks )( 
+
+        HRESULT ( STDMETHODCALLTYPE *TerminateTasks )(
             IDXTaskManager * This,
             /* [in] */ DWORD TaskIDs[  ],
             /* [in] */ ULONG ulCount,
             /* [in] */ ULONG ulTimeOut);
-        
-        HRESULT ( STDMETHODCALLTYPE *TerminateRequest )( 
+
+        HRESULT ( STDMETHODCALLTYPE *TerminateRequest )(
             IDXTaskManager * This,
             /* [in] */ REFIID RequestID,
             /* [in] */ ULONG ulTimeOut);
-        
+
         END_INTERFACE
     } IDXTaskManagerVtbl;
 
@@ -1483,7 +1483,7 @@ EXTERN_C const IID IID_IDXTaskManager;
         CONST_VTBL struct IDXTaskManagerVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1529,7 +1529,7 @@ EXTERN_C const IID IID_IDXTaskManager;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_QueryNumProcessors_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_QueryNumProcessors_Proxy(
     IDXTaskManager * This,
     /* [out] */ ULONG *pulNumProc);
 
@@ -1541,7 +1541,7 @@ void __RPC_STUB IDXTaskManager_QueryNumProcessors_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_SetThreadPoolSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_SetThreadPoolSize_Proxy(
     IDXTaskManager * This,
     /* [in] */ ULONG ulNumThreads);
 
@@ -1553,7 +1553,7 @@ void __RPC_STUB IDXTaskManager_SetThreadPoolSize_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_GetThreadPoolSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_GetThreadPoolSize_Proxy(
     IDXTaskManager * This,
     /* [out] */ ULONG *pulNumThreads);
 
@@ -1565,7 +1565,7 @@ void __RPC_STUB IDXTaskManager_GetThreadPoolSize_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_SetConcurrencyLimit_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_SetConcurrencyLimit_Proxy(
     IDXTaskManager * This,
     /* [in] */ ULONG ulNumThreads);
 
@@ -1577,7 +1577,7 @@ void __RPC_STUB IDXTaskManager_SetConcurrencyLimit_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_GetConcurrencyLimit_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_GetConcurrencyLimit_Proxy(
     IDXTaskManager * This,
     /* [out] */ ULONG *pulNumThreads);
 
@@ -1589,7 +1589,7 @@ void __RPC_STUB IDXTaskManager_GetConcurrencyLimit_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_ScheduleTasks_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_ScheduleTasks_Proxy(
     IDXTaskManager * This,
     /* [in] */ DXTMTASKINFO TaskInfo[  ],
     /* [in] */ HANDLE Events[  ],
@@ -1605,7 +1605,7 @@ void __RPC_STUB IDXTaskManager_ScheduleTasks_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_TerminateTasks_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_TerminateTasks_Proxy(
     IDXTaskManager * This,
     /* [in] */ DWORD TaskIDs[  ],
     /* [in] */ ULONG ulCount,
@@ -1619,7 +1619,7 @@ void __RPC_STUB IDXTaskManager_TerminateTasks_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTaskManager_TerminateRequest_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTaskManager_TerminateRequest_Proxy(
     IDXTaskManager * This,
     /* [in] */ REFIID RequestID,
     /* [in] */ ULONG ulTimeOut);
@@ -1637,7 +1637,7 @@ void __RPC_STUB IDXTaskManager_TerminateRequest_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0265 */
-/* [local] */ 
+/* [local] */
 
 #ifdef __cplusplus
 /////////////////////////////////////////////////////
@@ -1725,7 +1725,7 @@ typedef struct DXPMSAMPLE
     } 	DXPMSAMPLE;
 
 #endif // !__cplusplus
-typedef 
+typedef
 enum DXRUNTYPE
     {	DXRUNTYPE_CLEAR	= 0,
 	DXRUNTYPE_OPAQUE	= 1,
@@ -1748,13 +1748,13 @@ typedef struct DXRUNINFO
     ULONG   Type  : 2;   // Type
     ULONG   Count : 30;  // Number of samples in run
 } DXRUNINFO;
-typedef 
+typedef
 enum DXSFCREATE
     {	DXSF_FORMAT_IS_CLSID	= 1L << 0,
 	DXSF_NO_LAZY_DDRAW_LOCK	= 1L << 1
     } 	DXSFCREATE;
 
-typedef 
+typedef
 enum DXBLTOPTIONS
     {	DXBOF_DO_OVER	= 1L << 0,
 	DXBOF_DITHER	= 1L << 1
@@ -1769,18 +1769,18 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0265_v0_0_s_ifspec;
 #define __IDXSurfaceFactory_INTERFACE_DEFINED__
 
 /* interface IDXSurfaceFactory */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXSurfaceFactory;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("144946F5-C4D4-11d1-81D1-0000F87557DB")
     IDXSurfaceFactory : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE CreateSurface( 
+        virtual HRESULT STDMETHODCALLTYPE CreateSurface(
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
@@ -1789,72 +1789,72 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
             /* [in] */ IUnknown *punkOuter,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateFromDDSurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateFromDDSurface(
             /* [in] */ IUnknown *pDDrawSurface,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ DWORD dwFlags,
             /* [in] */ IUnknown *punkOuter,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LoadImage( 
+
+        virtual HRESULT STDMETHODCALLTYPE LoadImage(
             /* [in] */ const LPWSTR pszFileName,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LoadImageFromStream( 
+
+        virtual HRESULT STDMETHODCALLTYPE LoadImageFromStream(
             /* [in] */ IStream *pStream,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CopySurfaceToNewFormat( 
+
+        virtual HRESULT STDMETHODCALLTYPE CopySurfaceToNewFormat(
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pDestFormatID,
             /* [out] */ IDXSurface **ppNewSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE CreateD3DRMTexture( 
+
+        virtual HRESULT STDMETHODCALLTYPE CreateD3DRMTexture(
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ IUnknown *pD3DRM3,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppTexture3) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE BitBlt( 
+
+        virtual HRESULT STDMETHODCALLTYPE BitBlt(
             /* [in] */ IDXSurface *pDest,
             /* [in] */ const DXVEC *pPlacement,
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ const DXBNDS *pClipBounds,
             /* [in] */ DWORD dwFlags) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXSurfaceFactoryVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXSurfaceFactory * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXSurfaceFactory * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXSurfaceFactory * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateSurface )(
             IDXSurfaceFactory * This,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
@@ -1864,8 +1864,8 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
             /* [in] */ IUnknown *punkOuter,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateFromDDSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateFromDDSurface )(
             IDXSurfaceFactory * This,
             /* [in] */ IUnknown *pDDrawSurface,
             /* [in] */ const GUID *pFormatID,
@@ -1873,8 +1873,8 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
             /* [in] */ IUnknown *punkOuter,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *LoadImage )( 
+
+        HRESULT ( STDMETHODCALLTYPE *LoadImage )(
             IDXSurfaceFactory * This,
             /* [in] */ const LPWSTR pszFileName,
             /* [in] */ IUnknown *pDirectDraw,
@@ -1882,8 +1882,8 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
             /* [in] */ const GUID *pFormatID,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *LoadImageFromStream )( 
+
+        HRESULT ( STDMETHODCALLTYPE *LoadImageFromStream )(
             IDXSurfaceFactory * This,
             /* [in] */ IStream *pStream,
             /* [in] */ IUnknown *pDirectDraw,
@@ -1891,31 +1891,31 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
             /* [in] */ const GUID *pFormatID,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppDXSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *CopySurfaceToNewFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CopySurfaceToNewFormat )(
             IDXSurfaceFactory * This,
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pDestFormatID,
             /* [out] */ IDXSurface **ppNewSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *CreateD3DRMTexture )( 
+
+        HRESULT ( STDMETHODCALLTYPE *CreateD3DRMTexture )(
             IDXSurfaceFactory * This,
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ IUnknown *pD3DRM3,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppTexture3);
-        
-        HRESULT ( STDMETHODCALLTYPE *BitBlt )( 
+
+        HRESULT ( STDMETHODCALLTYPE *BitBlt )(
             IDXSurfaceFactory * This,
             /* [in] */ IDXSurface *pDest,
             /* [in] */ const DXVEC *pPlacement,
             /* [in] */ IDXSurface *pSrc,
             /* [in] */ const DXBNDS *pClipBounds,
             /* [in] */ DWORD dwFlags);
-        
+
         END_INTERFACE
     } IDXSurfaceFactoryVtbl;
 
@@ -1924,7 +1924,7 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
         CONST_VTBL struct IDXSurfaceFactoryVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -1967,7 +1967,7 @@ EXTERN_C const IID IID_IDXSurfaceFactory;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateSurface_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IUnknown *pDirectDraw,
     /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
@@ -1986,7 +1986,7 @@ void __RPC_STUB IDXSurfaceFactory_CreateSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateFromDDSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateFromDDSurface_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IUnknown *pDDrawSurface,
     /* [in] */ const GUID *pFormatID,
@@ -2003,7 +2003,7 @@ void __RPC_STUB IDXSurfaceFactory_CreateFromDDSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_LoadImage_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_LoadImage_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ const LPWSTR pszFileName,
     /* [in] */ IUnknown *pDirectDraw,
@@ -2020,7 +2020,7 @@ void __RPC_STUB IDXSurfaceFactory_LoadImage_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_LoadImageFromStream_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_LoadImageFromStream_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IStream *pStream,
     /* [in] */ IUnknown *pDirectDraw,
@@ -2037,7 +2037,7 @@ void __RPC_STUB IDXSurfaceFactory_LoadImageFromStream_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CopySurfaceToNewFormat_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CopySurfaceToNewFormat_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IDXSurface *pSrc,
     /* [in] */ IUnknown *pDirectDraw,
@@ -2053,7 +2053,7 @@ void __RPC_STUB IDXSurfaceFactory_CopySurfaceToNewFormat_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateD3DRMTexture_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_CreateD3DRMTexture_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IDXSurface *pSrc,
     /* [in] */ IUnknown *pDirectDraw,
@@ -2069,7 +2069,7 @@ void __RPC_STUB IDXSurfaceFactory_CreateD3DRMTexture_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_BitBlt_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceFactory_BitBlt_Proxy(
     IDXSurfaceFactory * This,
     /* [in] */ IDXSurface *pDest,
     /* [in] */ const DXVEC *pPlacement,
@@ -2090,9 +2090,9 @@ void __RPC_STUB IDXSurfaceFactory_BitBlt_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0266 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DXSURFMODCOMPOP
     {	DXSURFMOD_COMP_OVER	= 0,
 	DXSURFMOD_COMP_ALPHA_MASK	= 1,
@@ -2108,135 +2108,135 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0266_v0_0_s_ifspec;
 #define __IDXSurfaceModifier_INTERFACE_DEFINED__
 
 /* interface IDXSurfaceModifier */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXSurfaceModifier;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9EA3B637-C37D-11d1-905E-00C04FD9189D")
     IDXSurfaceModifier : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetFillColor( 
+        virtual HRESULT STDMETHODCALLTYPE SetFillColor(
             /* [in] */ DXSAMPLE Color) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetFillColor( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetFillColor(
             /* [out] */ DXSAMPLE *pColor) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetBounds( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetBounds(
             /* [in] */ const DXBNDS *pBounds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetBackground( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetBackground(
             /* [in] */ IDXSurface *pSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetBackground( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetBackground(
             /* [out] */ IDXSurface **ppSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetCompositeOperation( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetCompositeOperation(
             /* [in] */ DXSURFMODCOMPOP CompOp) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetCompositeOperation( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetCompositeOperation(
             /* [out] */ DXSURFMODCOMPOP *pCompOp) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetForeground( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetForeground(
             /* [in] */ IDXSurface *pSurface,
             /* [in] */ BOOL bTile,
             /* [in] */ const POINT *pOrigin) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetForeground( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetForeground(
             /* [out] */ IDXSurface **ppSurface,
             /* [out] */ BOOL *pbTile,
             /* [out] */ POINT *pOrigin) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetOpacity( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetOpacity(
             /* [in] */ float Opacity) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetOpacity( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetOpacity(
             /* [out] */ float *pOpacity) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetLookup( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetLookup(
             /* [in] */ IDXLookupTable *pLookupTable) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetLookup( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetLookup(
             /* [out] */ IDXLookupTable **ppLookupTable) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXSurfaceModifierVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXSurfaceModifier * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXSurfaceModifier * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXSurfaceModifier * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetFillColor )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetFillColor )(
             IDXSurfaceModifier * This,
             /* [in] */ DXSAMPLE Color);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetFillColor )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetFillColor )(
             IDXSurfaceModifier * This,
             /* [out] */ DXSAMPLE *pColor);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetBounds )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetBounds )(
             IDXSurfaceModifier * This,
             /* [in] */ const DXBNDS *pBounds);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetBackground )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetBackground )(
             IDXSurfaceModifier * This,
             /* [in] */ IDXSurface *pSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetBackground )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetBackground )(
             IDXSurfaceModifier * This,
             /* [out] */ IDXSurface **ppSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetCompositeOperation )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetCompositeOperation )(
             IDXSurfaceModifier * This,
             /* [in] */ DXSURFMODCOMPOP CompOp);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetCompositeOperation )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetCompositeOperation )(
             IDXSurfaceModifier * This,
             /* [out] */ DXSURFMODCOMPOP *pCompOp);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetForeground )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetForeground )(
             IDXSurfaceModifier * This,
             /* [in] */ IDXSurface *pSurface,
             /* [in] */ BOOL bTile,
             /* [in] */ const POINT *pOrigin);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetForeground )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetForeground )(
             IDXSurfaceModifier * This,
             /* [out] */ IDXSurface **ppSurface,
             /* [out] */ BOOL *pbTile,
             /* [out] */ POINT *pOrigin);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetOpacity )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetOpacity )(
             IDXSurfaceModifier * This,
             /* [in] */ float Opacity);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetOpacity )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetOpacity )(
             IDXSurfaceModifier * This,
             /* [out] */ float *pOpacity);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetLookup )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetLookup )(
             IDXSurfaceModifier * This,
             /* [in] */ IDXLookupTable *pLookupTable);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetLookup )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetLookup )(
             IDXSurfaceModifier * This,
             /* [out] */ IDXLookupTable **ppLookupTable);
-        
+
         END_INTERFACE
     } IDXSurfaceModifierVtbl;
 
@@ -2245,7 +2245,7 @@ EXTERN_C const IID IID_IDXSurfaceModifier;
         CONST_VTBL struct IDXSurfaceModifierVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -2306,7 +2306,7 @@ EXTERN_C const IID IID_IDXSurfaceModifier;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetFillColor_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetFillColor_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ DXSAMPLE Color);
 
@@ -2318,7 +2318,7 @@ void __RPC_STUB IDXSurfaceModifier_SetFillColor_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetFillColor_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetFillColor_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ DXSAMPLE *pColor);
 
@@ -2330,7 +2330,7 @@ void __RPC_STUB IDXSurfaceModifier_GetFillColor_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetBounds_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetBounds_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ const DXBNDS *pBounds);
 
@@ -2342,7 +2342,7 @@ void __RPC_STUB IDXSurfaceModifier_SetBounds_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetBackground_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetBackground_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ IDXSurface *pSurface);
 
@@ -2354,7 +2354,7 @@ void __RPC_STUB IDXSurfaceModifier_SetBackground_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetBackground_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetBackground_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ IDXSurface **ppSurface);
 
@@ -2366,7 +2366,7 @@ void __RPC_STUB IDXSurfaceModifier_GetBackground_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetCompositeOperation_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetCompositeOperation_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ DXSURFMODCOMPOP CompOp);
 
@@ -2378,7 +2378,7 @@ void __RPC_STUB IDXSurfaceModifier_SetCompositeOperation_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetCompositeOperation_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetCompositeOperation_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ DXSURFMODCOMPOP *pCompOp);
 
@@ -2390,7 +2390,7 @@ void __RPC_STUB IDXSurfaceModifier_GetCompositeOperation_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetForeground_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetForeground_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ IDXSurface *pSurface,
     /* [in] */ BOOL bTile,
@@ -2404,7 +2404,7 @@ void __RPC_STUB IDXSurfaceModifier_SetForeground_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetForeground_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetForeground_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ IDXSurface **ppSurface,
     /* [out] */ BOOL *pbTile,
@@ -2418,7 +2418,7 @@ void __RPC_STUB IDXSurfaceModifier_GetForeground_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetOpacity_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetOpacity_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ float Opacity);
 
@@ -2430,7 +2430,7 @@ void __RPC_STUB IDXSurfaceModifier_SetOpacity_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetOpacity_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetOpacity_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ float *pOpacity);
 
@@ -2442,7 +2442,7 @@ void __RPC_STUB IDXSurfaceModifier_GetOpacity_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetLookup_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_SetLookup_Proxy(
     IDXSurfaceModifier * This,
     /* [in] */ IDXLookupTable *pLookupTable);
 
@@ -2454,7 +2454,7 @@ void __RPC_STUB IDXSurfaceModifier_SetLookup_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetLookup_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceModifier_GetLookup_Proxy(
     IDXSurfaceModifier * This,
     /* [out] */ IDXLookupTable **ppLookupTable);
 
@@ -2471,9 +2471,9 @@ void __RPC_STUB IDXSurfaceModifier_GetLookup_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0267 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DXSAMPLEFORMATENUM
     {	DXPF_FLAGSMASK	= 0xffff0000,
 	DXPF_NONPREMULT	= 0x10000,
@@ -2502,7 +2502,7 @@ enum DXSAMPLEFORMATENUM
 	DXPF_RGB8_CK	= DXPF_RGB8 | DXPF_TRANSPARENCY
     } 	DXSAMPLEFORMATENUM;
 
-typedef 
+typedef
 enum DXLOCKSURF
     {	DXLOCKF_READ	= 0,
 	DXLOCKF_READWRITE	= 1 << 0,
@@ -2512,7 +2512,7 @@ enum DXLOCKSURF
 	DXLOCKF_VALIDFLAGS	= DXLOCKF_READWRITE | DXLOCKF_EXISTINGINFOONLY | DXLOCKF_WANTRUNINFO | DXLOCKF_NONPREMULT
     } 	DXLOCKSURF;
 
-typedef 
+typedef
 enum DXSURFSTATUS
     {	DXSURF_TRANSIENT	= 1 << 0,
 	DXSURF_READONLY	= 1 << 1,
@@ -2528,109 +2528,109 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0267_v0_0_s_ifspec;
 #define __IDXSurface_INTERFACE_DEFINED__
 
 /* interface IDXSurface */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXSurface;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B39FD73F-E139-11d1-9065-00C04FD9189D")
     IDXSurface : public IDXBaseObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetPixelFormat( 
+        virtual HRESULT STDMETHODCALLTYPE GetPixelFormat(
             /* [out] */ GUID *pFormatID,
             /* [out] */ DXSAMPLEFORMATENUM *pSampleFormatEnum) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetBounds( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetBounds(
             /* [out] */ DXBNDS *pBounds) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetStatusFlags( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetStatusFlags(
             /* [out] */ DWORD *pdwStatusFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetStatusFlags( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetStatusFlags(
             /* [in] */ DWORD dwStatusFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LockSurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE LockSurface(
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ ULONG ulTimeOut,
             /* [in] */ DWORD dwFlags,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppPointer,
             /* [out] */ ULONG *pulGenerationId) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetDirectDrawSurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetDirectDrawSurface(
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppSurface) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetColorKey( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetColorKey(
             DXSAMPLE *pColorKey) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetColorKey( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetColorKey(
             DXSAMPLE ColorKey) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE LockSurfaceDC( 
+
+        virtual HRESULT STDMETHODCALLTYPE LockSurfaceDC(
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ ULONG ulTimeOut,
             /* [in] */ DWORD dwFlags,
             /* [out] */ IDXDCLock **ppDCLock) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE SetAppData( 
+
+        virtual HRESULT STDMETHODCALLTYPE SetAppData(
             DWORD_PTR dwAppData) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetAppData( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetAppData(
             DWORD_PTR *pdwAppData) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXSurfaceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXSurface * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXSurface * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXSurface * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )(
             IDXSurface * This,
             /* [out] */ ULONG *pID);
-        
-        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )(
             IDXSurface * This,
             /* [in] */ BOOL bRefresh);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )(
             IDXSurface * This,
             /* [out] */ ULONG *pcbSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetPixelFormat )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetPixelFormat )(
             IDXSurface * This,
             /* [out] */ GUID *pFormatID,
             /* [out] */ DXSAMPLEFORMATENUM *pSampleFormatEnum);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetBounds )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetBounds )(
             IDXSurface * This,
             /* [out] */ DXBNDS *pBounds);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetStatusFlags )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetStatusFlags )(
             IDXSurface * This,
             /* [out] */ DWORD *pdwStatusFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetStatusFlags )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetStatusFlags )(
             IDXSurface * This,
             /* [in] */ DWORD dwStatusFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *LockSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *LockSurface )(
             IDXSurface * This,
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ ULONG ulTimeOut,
@@ -2638,35 +2638,35 @@ EXTERN_C const IID IID_IDXSurface;
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppPointer,
             /* [out] */ ULONG *pulGenerationId);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetDirectDrawSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetDirectDrawSurface )(
             IDXSurface * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppSurface);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetColorKey )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetColorKey )(
             IDXSurface * This,
             DXSAMPLE *pColorKey);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetColorKey )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetColorKey )(
             IDXSurface * This,
             DXSAMPLE ColorKey);
-        
-        HRESULT ( STDMETHODCALLTYPE *LockSurfaceDC )( 
+
+        HRESULT ( STDMETHODCALLTYPE *LockSurfaceDC )(
             IDXSurface * This,
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ ULONG ulTimeOut,
             /* [in] */ DWORD dwFlags,
             /* [out] */ IDXDCLock **ppDCLock);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetAppData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetAppData )(
             IDXSurface * This,
             DWORD_PTR dwAppData);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetAppData )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetAppData )(
             IDXSurface * This,
             DWORD_PTR *pdwAppData);
-        
+
         END_INTERFACE
     } IDXSurfaceVtbl;
 
@@ -2675,7 +2675,7 @@ EXTERN_C const IID IID_IDXSurface;
         CONST_VTBL struct IDXSurfaceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -2740,7 +2740,7 @@ EXTERN_C const IID IID_IDXSurface;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetPixelFormat_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetPixelFormat_Proxy(
     IDXSurface * This,
     /* [out] */ GUID *pFormatID,
     /* [out] */ DXSAMPLEFORMATENUM *pSampleFormatEnum);
@@ -2753,7 +2753,7 @@ void __RPC_STUB IDXSurface_GetPixelFormat_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetBounds_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetBounds_Proxy(
     IDXSurface * This,
     /* [out] */ DXBNDS *pBounds);
 
@@ -2765,7 +2765,7 @@ void __RPC_STUB IDXSurface_GetBounds_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetStatusFlags_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetStatusFlags_Proxy(
     IDXSurface * This,
     /* [out] */ DWORD *pdwStatusFlags);
 
@@ -2777,7 +2777,7 @@ void __RPC_STUB IDXSurface_GetStatusFlags_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_SetStatusFlags_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_SetStatusFlags_Proxy(
     IDXSurface * This,
     /* [in] */ DWORD dwStatusFlags);
 
@@ -2789,7 +2789,7 @@ void __RPC_STUB IDXSurface_SetStatusFlags_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_LockSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_LockSurface_Proxy(
     IDXSurface * This,
     /* [in] */ const DXBNDS *pBounds,
     /* [in] */ ULONG ulTimeOut,
@@ -2806,7 +2806,7 @@ void __RPC_STUB IDXSurface_LockSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetDirectDrawSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetDirectDrawSurface_Proxy(
     IDXSurface * This,
     /* [in] */ REFIID riid,
     /* [iid_is][out] */ void **ppSurface);
@@ -2819,7 +2819,7 @@ void __RPC_STUB IDXSurface_GetDirectDrawSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetColorKey_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetColorKey_Proxy(
     IDXSurface * This,
     DXSAMPLE *pColorKey);
 
@@ -2831,7 +2831,7 @@ void __RPC_STUB IDXSurface_GetColorKey_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_SetColorKey_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_SetColorKey_Proxy(
     IDXSurface * This,
     DXSAMPLE ColorKey);
 
@@ -2843,7 +2843,7 @@ void __RPC_STUB IDXSurface_SetColorKey_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_LockSurfaceDC_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_LockSurfaceDC_Proxy(
     IDXSurface * This,
     /* [in] */ const DXBNDS *pBounds,
     /* [in] */ ULONG ulTimeOut,
@@ -2858,7 +2858,7 @@ void __RPC_STUB IDXSurface_LockSurfaceDC_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_SetAppData_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_SetAppData_Proxy(
     IDXSurface * This,
     DWORD_PTR dwAppData);
 
@@ -2870,7 +2870,7 @@ void __RPC_STUB IDXSurface_SetAppData_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXSurface_GetAppData_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurface_GetAppData_Proxy(
     IDXSurface * This,
     DWORD_PTR *pdwAppData);
 
@@ -2890,51 +2890,51 @@ void __RPC_STUB IDXSurface_GetAppData_Stub(
 #define __IDXSurfaceInit_INTERFACE_DEFINED__
 
 /* interface IDXSurfaceInit */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXSurfaceInit;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9EA3B639-C37D-11d1-905E-00C04FD9189D")
     IDXSurfaceInit : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE InitSurface( 
+        virtual HRESULT STDMETHODCALLTYPE InitSurface(
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ DWORD dwFlags) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXSurfaceInitVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXSurfaceInit * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXSurfaceInit * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXSurfaceInit * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *InitSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *InitSurface )(
             IDXSurfaceInit * This,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ DWORD dwFlags);
-        
+
         END_INTERFACE
     } IDXSurfaceInitVtbl;
 
@@ -2943,7 +2943,7 @@ EXTERN_C const IID IID_IDXSurfaceInit;
         CONST_VTBL struct IDXSurfaceInitVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -2968,7 +2968,7 @@ EXTERN_C const IID IID_IDXSurfaceInit;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXSurfaceInit_InitSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXSurfaceInit_InitSurface_Proxy(
     IDXSurfaceInit * This,
     /* [in] */ IUnknown *pDirectDraw,
     /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
@@ -2992,62 +2992,62 @@ void __RPC_STUB IDXSurfaceInit_InitSurface_Stub(
 #define __IDXARGBSurfaceInit_INTERFACE_DEFINED__
 
 /* interface IDXARGBSurfaceInit */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXARGBSurfaceInit;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9EA3B63A-C37D-11d1-905E-00C04FD9189D")
     IDXARGBSurfaceInit : public IDXSurfaceInit
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE InitFromDDSurface( 
+        virtual HRESULT STDMETHODCALLTYPE InitFromDDSurface(
             /* [in] */ IUnknown *pDDrawSurface,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ DWORD dwFlags) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE InitFromRawSurface( 
+
+        virtual HRESULT STDMETHODCALLTYPE InitFromRawSurface(
             /* [in] */ IDXRawSurface *pRawSurface) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXARGBSurfaceInitVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXARGBSurfaceInit * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXARGBSurfaceInit * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXARGBSurfaceInit * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *InitSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *InitSurface )(
             IDXARGBSurfaceInit * This,
             /* [in] */ IUnknown *pDirectDraw,
             /* [in] */ const DDSURFACEDESC *pDDSurfaceDesc,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ const DXBNDS *pBounds,
             /* [in] */ DWORD dwFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *InitFromDDSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *InitFromDDSurface )(
             IDXARGBSurfaceInit * This,
             /* [in] */ IUnknown *pDDrawSurface,
             /* [in] */ const GUID *pFormatID,
             /* [in] */ DWORD dwFlags);
-        
-        HRESULT ( STDMETHODCALLTYPE *InitFromRawSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *InitFromRawSurface )(
             IDXARGBSurfaceInit * This,
             /* [in] */ IDXRawSurface *pRawSurface);
-        
+
         END_INTERFACE
     } IDXARGBSurfaceInitVtbl;
 
@@ -3056,7 +3056,7 @@ EXTERN_C const IID IID_IDXARGBSurfaceInit;
         CONST_VTBL struct IDXARGBSurfaceInitVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3088,7 +3088,7 @@ EXTERN_C const IID IID_IDXARGBSurfaceInit;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXARGBSurfaceInit_InitFromDDSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXARGBSurfaceInit_InitFromDDSurface_Proxy(
     IDXARGBSurfaceInit * This,
     /* [in] */ IUnknown *pDDrawSurface,
     /* [in] */ const GUID *pFormatID,
@@ -3102,7 +3102,7 @@ void __RPC_STUB IDXARGBSurfaceInit_InitFromDDSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXARGBSurfaceInit_InitFromRawSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXARGBSurfaceInit_InitFromRawSurface_Proxy(
     IDXARGBSurfaceInit * This,
     /* [in] */ IDXRawSurface *pRawSurface);
 
@@ -3119,7 +3119,7 @@ void __RPC_STUB IDXARGBSurfaceInit_InitFromRawSurface_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0270 */
-/* [local] */ 
+/* [local] */
 
 typedef struct tagDXNATIVETYPEINFO
     {
@@ -3152,113 +3152,113 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0270_v0_0_s_ifspec;
 #define __IDXARGBReadPtr_INTERFACE_DEFINED__
 
 /* interface IDXARGBReadPtr */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXARGBReadPtr;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("EAAAC2D6-C290-11d1-905D-00C04FD9189D")
     IDXARGBReadPtr : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetSurface( 
+        virtual HRESULT STDMETHODCALLTYPE GetSurface(
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppSurface) = 0;
-        
-        virtual DXSAMPLEFORMATENUM STDMETHODCALLTYPE GetNativeType( 
+
+        virtual DXSAMPLEFORMATENUM STDMETHODCALLTYPE GetNativeType(
             /* [out] */ DXNATIVETYPEINFO *pInfo) = 0;
-        
-        virtual void STDMETHODCALLTYPE Move( 
+
+        virtual void STDMETHODCALLTYPE Move(
             /* [in] */ long cSamples) = 0;
-        
-        virtual void STDMETHODCALLTYPE MoveToRow( 
+
+        virtual void STDMETHODCALLTYPE MoveToRow(
             /* [in] */ ULONG y) = 0;
-        
-        virtual void STDMETHODCALLTYPE MoveToXY( 
+
+        virtual void STDMETHODCALLTYPE MoveToXY(
             /* [in] */ ULONG x,
             /* [in] */ ULONG y) = 0;
-        
-        virtual ULONG STDMETHODCALLTYPE MoveAndGetRunInfo( 
+
+        virtual ULONG STDMETHODCALLTYPE MoveAndGetRunInfo(
             /* [in] */ ULONG Row,
             /* [out] */ const DXRUNINFO **ppInfo) = 0;
-        
-        virtual DXSAMPLE *STDMETHODCALLTYPE Unpack( 
+
+        virtual DXSAMPLE *STDMETHODCALLTYPE Unpack(
             /* [in] */ DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove) = 0;
-        
-        virtual DXPMSAMPLE *STDMETHODCALLTYPE UnpackPremult( 
+
+        virtual DXPMSAMPLE *STDMETHODCALLTYPE UnpackPremult(
             /* [in] */ DXPMSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove) = 0;
-        
-        virtual void STDMETHODCALLTYPE UnpackRect( 
+
+        virtual void STDMETHODCALLTYPE UnpackRect(
             /* [in] */ const DXPACKEDRECTDESC *pRectDesc) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXARGBReadPtrVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXARGBReadPtr * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXARGBReadPtr * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXARGBReadPtr * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetSurface )(
             IDXARGBReadPtr * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppSurface);
-        
-        DXSAMPLEFORMATENUM ( STDMETHODCALLTYPE *GetNativeType )( 
+
+        DXSAMPLEFORMATENUM ( STDMETHODCALLTYPE *GetNativeType )(
             IDXARGBReadPtr * This,
             /* [out] */ DXNATIVETYPEINFO *pInfo);
-        
-        void ( STDMETHODCALLTYPE *Move )( 
+
+        void ( STDMETHODCALLTYPE *Move )(
             IDXARGBReadPtr * This,
             /* [in] */ long cSamples);
-        
-        void ( STDMETHODCALLTYPE *MoveToRow )( 
+
+        void ( STDMETHODCALLTYPE *MoveToRow )(
             IDXARGBReadPtr * This,
             /* [in] */ ULONG y);
-        
-        void ( STDMETHODCALLTYPE *MoveToXY )( 
+
+        void ( STDMETHODCALLTYPE *MoveToXY )(
             IDXARGBReadPtr * This,
             /* [in] */ ULONG x,
             /* [in] */ ULONG y);
-        
-        ULONG ( STDMETHODCALLTYPE *MoveAndGetRunInfo )( 
+
+        ULONG ( STDMETHODCALLTYPE *MoveAndGetRunInfo )(
             IDXARGBReadPtr * This,
             /* [in] */ ULONG Row,
             /* [out] */ const DXRUNINFO **ppInfo);
-        
-        DXSAMPLE *( STDMETHODCALLTYPE *Unpack )( 
+
+        DXSAMPLE *( STDMETHODCALLTYPE *Unpack )(
             IDXARGBReadPtr * This,
             /* [in] */ DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove);
-        
-        DXPMSAMPLE *( STDMETHODCALLTYPE *UnpackPremult )( 
+
+        DXPMSAMPLE *( STDMETHODCALLTYPE *UnpackPremult )(
             IDXARGBReadPtr * This,
             /* [in] */ DXPMSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove);
-        
-        void ( STDMETHODCALLTYPE *UnpackRect )( 
+
+        void ( STDMETHODCALLTYPE *UnpackRect )(
             IDXARGBReadPtr * This,
             /* [in] */ const DXPACKEDRECTDESC *pRectDesc);
-        
+
         END_INTERFACE
     } IDXARGBReadPtrVtbl;
 
@@ -3267,7 +3267,7 @@ EXTERN_C const IID IID_IDXARGBReadPtr;
         CONST_VTBL struct IDXARGBReadPtrVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3316,7 +3316,7 @@ EXTERN_C const IID IID_IDXARGBReadPtr;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXARGBReadPtr_GetSurface_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXARGBReadPtr_GetSurface_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ REFIID riid,
     /* [iid_is][out] */ void **ppSurface);
@@ -3329,7 +3329,7 @@ void __RPC_STUB IDXARGBReadPtr_GetSurface_Stub(
     DWORD *_pdwStubPhase);
 
 
-DXSAMPLEFORMATENUM STDMETHODCALLTYPE IDXARGBReadPtr_GetNativeType_Proxy( 
+DXSAMPLEFORMATENUM STDMETHODCALLTYPE IDXARGBReadPtr_GetNativeType_Proxy(
     IDXARGBReadPtr * This,
     /* [out] */ DXNATIVETYPEINFO *pInfo);
 
@@ -3341,7 +3341,7 @@ void __RPC_STUB IDXARGBReadPtr_GetNativeType_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadPtr_Move_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadPtr_Move_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ long cSamples);
 
@@ -3353,7 +3353,7 @@ void __RPC_STUB IDXARGBReadPtr_Move_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadPtr_MoveToRow_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadPtr_MoveToRow_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ ULONG y);
 
@@ -3365,7 +3365,7 @@ void __RPC_STUB IDXARGBReadPtr_MoveToRow_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadPtr_MoveToXY_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadPtr_MoveToXY_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ ULONG x,
     /* [in] */ ULONG y);
@@ -3378,7 +3378,7 @@ void __RPC_STUB IDXARGBReadPtr_MoveToXY_Stub(
     DWORD *_pdwStubPhase);
 
 
-ULONG STDMETHODCALLTYPE IDXARGBReadPtr_MoveAndGetRunInfo_Proxy( 
+ULONG STDMETHODCALLTYPE IDXARGBReadPtr_MoveAndGetRunInfo_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ ULONG Row,
     /* [out] */ const DXRUNINFO **ppInfo);
@@ -3391,7 +3391,7 @@ void __RPC_STUB IDXARGBReadPtr_MoveAndGetRunInfo_Stub(
     DWORD *_pdwStubPhase);
 
 
-DXSAMPLE *STDMETHODCALLTYPE IDXARGBReadPtr_Unpack_Proxy( 
+DXSAMPLE *STDMETHODCALLTYPE IDXARGBReadPtr_Unpack_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ DXSAMPLE *pSamples,
     /* [in] */ ULONG cSamples,
@@ -3405,7 +3405,7 @@ void __RPC_STUB IDXARGBReadPtr_Unpack_Stub(
     DWORD *_pdwStubPhase);
 
 
-DXPMSAMPLE *STDMETHODCALLTYPE IDXARGBReadPtr_UnpackPremult_Proxy( 
+DXPMSAMPLE *STDMETHODCALLTYPE IDXARGBReadPtr_UnpackPremult_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ DXPMSAMPLE *pSamples,
     /* [in] */ ULONG cSamples,
@@ -3419,7 +3419,7 @@ void __RPC_STUB IDXARGBReadPtr_UnpackPremult_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadPtr_UnpackRect_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadPtr_UnpackRect_Proxy(
     IDXARGBReadPtr * This,
     /* [in] */ const DXPACKEDRECTDESC *pRectDesc);
 
@@ -3439,174 +3439,174 @@ void __RPC_STUB IDXARGBReadPtr_UnpackRect_Stub(
 #define __IDXARGBReadWritePtr_INTERFACE_DEFINED__
 
 /* interface IDXARGBReadWritePtr */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXARGBReadWritePtr;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("EAAAC2D7-C290-11d1-905D-00C04FD9189D")
     IDXARGBReadWritePtr : public IDXARGBReadPtr
     {
     public:
-        virtual void STDMETHODCALLTYPE PackAndMove( 
+        virtual void STDMETHODCALLTYPE PackAndMove(
             /* [in] */ const DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples) = 0;
-        
-        virtual void STDMETHODCALLTYPE PackPremultAndMove( 
+
+        virtual void STDMETHODCALLTYPE PackPremultAndMove(
             /* [in] */ const DXPMSAMPLE *pSamples,
             /* [in] */ ULONG cSamples) = 0;
-        
-        virtual void STDMETHODCALLTYPE PackRect( 
+
+        virtual void STDMETHODCALLTYPE PackRect(
             /* [in] */ const DXPACKEDRECTDESC *pRectDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE CopyAndMoveBoth( 
+
+        virtual void STDMETHODCALLTYPE CopyAndMoveBoth(
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ IDXARGBReadPtr *pSrc,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bIsOpaque) = 0;
-        
-        virtual void STDMETHODCALLTYPE CopyRect( 
+
+        virtual void STDMETHODCALLTYPE CopyRect(
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ const RECT *pDestRect,
             /* [in] */ IDXARGBReadPtr *pSrc,
             /* [in] */ const POINT *pSrcOrigin,
             /* [in] */ BOOL bIsOpaque) = 0;
-        
-        virtual void STDMETHODCALLTYPE FillAndMove( 
+
+        virtual void STDMETHODCALLTYPE FillAndMove(
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ DXPMSAMPLE SampVal,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bDoOver) = 0;
-        
-        virtual void STDMETHODCALLTYPE FillRect( 
+
+        virtual void STDMETHODCALLTYPE FillRect(
             /* [in] */ const RECT *pRect,
             /* [in] */ DXPMSAMPLE SampVal,
             /* [in] */ BOOL bDoOver) = 0;
-        
-        virtual void STDMETHODCALLTYPE OverSample( 
+
+        virtual void STDMETHODCALLTYPE OverSample(
             /* [in] */ const DXOVERSAMPLEDESC *pOverDesc) = 0;
-        
-        virtual void STDMETHODCALLTYPE OverArrayAndMove( 
+
+        virtual void STDMETHODCALLTYPE OverArrayAndMove(
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ const DXPMSAMPLE *pSrc,
             /* [in] */ ULONG cSamples) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXARGBReadWritePtrVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXARGBReadWritePtr * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXARGBReadWritePtr * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXARGBReadWritePtr * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSurface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetSurface )(
             IDXARGBReadWritePtr * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppSurface);
-        
-        DXSAMPLEFORMATENUM ( STDMETHODCALLTYPE *GetNativeType )( 
+
+        DXSAMPLEFORMATENUM ( STDMETHODCALLTYPE *GetNativeType )(
             IDXARGBReadWritePtr * This,
             /* [out] */ DXNATIVETYPEINFO *pInfo);
-        
-        void ( STDMETHODCALLTYPE *Move )( 
+
+        void ( STDMETHODCALLTYPE *Move )(
             IDXARGBReadWritePtr * This,
             /* [in] */ long cSamples);
-        
-        void ( STDMETHODCALLTYPE *MoveToRow )( 
+
+        void ( STDMETHODCALLTYPE *MoveToRow )(
             IDXARGBReadWritePtr * This,
             /* [in] */ ULONG y);
-        
-        void ( STDMETHODCALLTYPE *MoveToXY )( 
+
+        void ( STDMETHODCALLTYPE *MoveToXY )(
             IDXARGBReadWritePtr * This,
             /* [in] */ ULONG x,
             /* [in] */ ULONG y);
-        
-        ULONG ( STDMETHODCALLTYPE *MoveAndGetRunInfo )( 
+
+        ULONG ( STDMETHODCALLTYPE *MoveAndGetRunInfo )(
             IDXARGBReadWritePtr * This,
             /* [in] */ ULONG Row,
             /* [out] */ const DXRUNINFO **ppInfo);
-        
-        DXSAMPLE *( STDMETHODCALLTYPE *Unpack )( 
+
+        DXSAMPLE *( STDMETHODCALLTYPE *Unpack )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove);
-        
-        DXPMSAMPLE *( STDMETHODCALLTYPE *UnpackPremult )( 
+
+        DXPMSAMPLE *( STDMETHODCALLTYPE *UnpackPremult )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXPMSAMPLE *pSamples,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bMove);
-        
-        void ( STDMETHODCALLTYPE *UnpackRect )( 
+
+        void ( STDMETHODCALLTYPE *UnpackRect )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const DXPACKEDRECTDESC *pRectDesc);
-        
-        void ( STDMETHODCALLTYPE *PackAndMove )( 
+
+        void ( STDMETHODCALLTYPE *PackAndMove )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples);
-        
-        void ( STDMETHODCALLTYPE *PackPremultAndMove )( 
+
+        void ( STDMETHODCALLTYPE *PackPremultAndMove )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const DXPMSAMPLE *pSamples,
             /* [in] */ ULONG cSamples);
-        
-        void ( STDMETHODCALLTYPE *PackRect )( 
+
+        void ( STDMETHODCALLTYPE *PackRect )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const DXPACKEDRECTDESC *pRectDesc);
-        
-        void ( STDMETHODCALLTYPE *CopyAndMoveBoth )( 
+
+        void ( STDMETHODCALLTYPE *CopyAndMoveBoth )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ IDXARGBReadPtr *pSrc,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bIsOpaque);
-        
-        void ( STDMETHODCALLTYPE *CopyRect )( 
+
+        void ( STDMETHODCALLTYPE *CopyRect )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ const RECT *pDestRect,
             /* [in] */ IDXARGBReadPtr *pSrc,
             /* [in] */ const POINT *pSrcOrigin,
             /* [in] */ BOOL bIsOpaque);
-        
-        void ( STDMETHODCALLTYPE *FillAndMove )( 
+
+        void ( STDMETHODCALLTYPE *FillAndMove )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ DXPMSAMPLE SampVal,
             /* [in] */ ULONG cSamples,
             /* [in] */ BOOL bDoOver);
-        
-        void ( STDMETHODCALLTYPE *FillRect )( 
+
+        void ( STDMETHODCALLTYPE *FillRect )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const RECT *pRect,
             /* [in] */ DXPMSAMPLE SampVal,
             /* [in] */ BOOL bDoOver);
-        
-        void ( STDMETHODCALLTYPE *OverSample )( 
+
+        void ( STDMETHODCALLTYPE *OverSample )(
             IDXARGBReadWritePtr * This,
             /* [in] */ const DXOVERSAMPLEDESC *pOverDesc);
-        
-        void ( STDMETHODCALLTYPE *OverArrayAndMove )( 
+
+        void ( STDMETHODCALLTYPE *OverArrayAndMove )(
             IDXARGBReadWritePtr * This,
             /* [in] */ DXBASESAMPLE *pScratchBuffer,
             /* [in] */ const DXPMSAMPLE *pSrc,
             /* [in] */ ULONG cSamples);
-        
+
         END_INTERFACE
     } IDXARGBReadWritePtrVtbl;
 
@@ -3615,7 +3615,7 @@ EXTERN_C const IID IID_IDXARGBReadWritePtr;
         CONST_VTBL struct IDXARGBReadWritePtrVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3692,7 +3692,7 @@ EXTERN_C const IID IID_IDXARGBReadWritePtr;
 
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackAndMove_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackAndMove_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ const DXSAMPLE *pSamples,
     /* [in] */ ULONG cSamples);
@@ -3705,7 +3705,7 @@ void __RPC_STUB IDXARGBReadWritePtr_PackAndMove_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackPremultAndMove_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackPremultAndMove_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ const DXPMSAMPLE *pSamples,
     /* [in] */ ULONG cSamples);
@@ -3718,7 +3718,7 @@ void __RPC_STUB IDXARGBReadWritePtr_PackPremultAndMove_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackRect_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_PackRect_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ const DXPACKEDRECTDESC *pRectDesc);
 
@@ -3730,7 +3730,7 @@ void __RPC_STUB IDXARGBReadWritePtr_PackRect_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_CopyAndMoveBoth_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_CopyAndMoveBoth_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ DXBASESAMPLE *pScratchBuffer,
     /* [in] */ IDXARGBReadPtr *pSrc,
@@ -3745,7 +3745,7 @@ void __RPC_STUB IDXARGBReadWritePtr_CopyAndMoveBoth_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_CopyRect_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_CopyRect_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ DXBASESAMPLE *pScratchBuffer,
     /* [in] */ const RECT *pDestRect,
@@ -3761,7 +3761,7 @@ void __RPC_STUB IDXARGBReadWritePtr_CopyRect_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_FillAndMove_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_FillAndMove_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ DXBASESAMPLE *pScratchBuffer,
     /* [in] */ DXPMSAMPLE SampVal,
@@ -3776,7 +3776,7 @@ void __RPC_STUB IDXARGBReadWritePtr_FillAndMove_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_FillRect_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_FillRect_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ const RECT *pRect,
     /* [in] */ DXPMSAMPLE SampVal,
@@ -3790,7 +3790,7 @@ void __RPC_STUB IDXARGBReadWritePtr_FillRect_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_OverSample_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_OverSample_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ const DXOVERSAMPLEDESC *pOverDesc);
 
@@ -3802,7 +3802,7 @@ void __RPC_STUB IDXARGBReadWritePtr_OverSample_Stub(
     DWORD *_pdwStubPhase);
 
 
-void STDMETHODCALLTYPE IDXARGBReadWritePtr_OverArrayAndMove_Proxy( 
+void STDMETHODCALLTYPE IDXARGBReadWritePtr_OverArrayAndMove_Proxy(
     IDXARGBReadWritePtr * This,
     /* [in] */ DXBASESAMPLE *pScratchBuffer,
     /* [in] */ const DXPMSAMPLE *pSrc,
@@ -3824,41 +3824,41 @@ void __RPC_STUB IDXARGBReadWritePtr_OverArrayAndMove_Stub(
 #define __IDXDCLock_INTERFACE_DEFINED__
 
 /* interface IDXDCLock */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXDCLock;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("0F619456-CF39-11d1-905E-00C04FD9189D")
     IDXDCLock : public IUnknown
     {
     public:
         virtual HDC STDMETHODCALLTYPE GetDC( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXDCLockVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXDCLock * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXDCLock * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXDCLock * This);
-        
-        HDC ( STDMETHODCALLTYPE *GetDC )( 
+
+        HDC ( STDMETHODCALLTYPE *GetDC )(
             IDXDCLock * This);
-        
+
         END_INTERFACE
     } IDXDCLockVtbl;
 
@@ -3867,7 +3867,7 @@ EXTERN_C const IID IID_IDXDCLock;
         CONST_VTBL struct IDXDCLockVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3892,7 +3892,7 @@ EXTERN_C const IID IID_IDXDCLock;
 
 
 
-HDC STDMETHODCALLTYPE IDXDCLock_GetDC_Proxy( 
+HDC STDMETHODCALLTYPE IDXDCLock_GetDC_Proxy(
     IDXDCLock * This);
 
 
@@ -3911,45 +3911,45 @@ void __RPC_STUB IDXDCLock_GetDC_Stub(
 #define __IDXTScaleOutput_INTERFACE_DEFINED__
 
 /* interface IDXTScaleOutput */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTScaleOutput;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B2024B50-EE77-11d1-9066-00C04FD9189D")
     IDXTScaleOutput : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetOutputSize( 
+        virtual HRESULT STDMETHODCALLTYPE SetOutputSize(
             /* [in] */ const SIZE OutSize,
             /* [in] */ BOOL bMaintainAspect) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTScaleOutputVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTScaleOutput * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTScaleOutput * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTScaleOutput * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetOutputSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetOutputSize )(
             IDXTScaleOutput * This,
             /* [in] */ const SIZE OutSize,
             /* [in] */ BOOL bMaintainAspect);
-        
+
         END_INTERFACE
     } IDXTScaleOutputVtbl;
 
@@ -3958,7 +3958,7 @@ EXTERN_C const IID IID_IDXTScaleOutput;
         CONST_VTBL struct IDXTScaleOutputVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -3983,7 +3983,7 @@ EXTERN_C const IID IID_IDXTScaleOutput;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTScaleOutput_SetOutputSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTScaleOutput_SetOutputSize_Proxy(
     IDXTScaleOutput * This,
     /* [in] */ const SIZE OutSize,
     /* [in] */ BOOL bMaintainAspect);
@@ -4004,59 +4004,59 @@ void __RPC_STUB IDXTScaleOutput_SetOutputSize_Stub(
 #define __IDXGradient_INTERFACE_DEFINED__
 
 /* interface IDXGradient */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXGradient;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B2024B51-EE77-11d1-9066-00C04FD9189D")
     IDXGradient : public IDXTScaleOutput
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetGradient( 
+        virtual HRESULT STDMETHODCALLTYPE SetGradient(
             DXSAMPLE StartColor,
             DXSAMPLE EndColor,
             BOOL bHorizontal) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetOutputSize( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetOutputSize(
             /* [out] */ SIZE *pOutSize) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXGradientVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXGradient * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXGradient * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXGradient * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetOutputSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetOutputSize )(
             IDXGradient * This,
             /* [in] */ const SIZE OutSize,
             /* [in] */ BOOL bMaintainAspect);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetGradient )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetGradient )(
             IDXGradient * This,
             DXSAMPLE StartColor,
             DXSAMPLE EndColor,
             BOOL bHorizontal);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetOutputSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetOutputSize )(
             IDXGradient * This,
             /* [out] */ SIZE *pOutSize);
-        
+
         END_INTERFACE
     } IDXGradientVtbl;
 
@@ -4065,7 +4065,7 @@ EXTERN_C const IID IID_IDXGradient;
         CONST_VTBL struct IDXGradientVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4097,7 +4097,7 @@ EXTERN_C const IID IID_IDXGradient;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXGradient_SetGradient_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXGradient_SetGradient_Proxy(
     IDXGradient * This,
     DXSAMPLE StartColor,
     DXSAMPLE EndColor,
@@ -4111,7 +4111,7 @@ void __RPC_STUB IDXGradient_SetGradient_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXGradient_GetOutputSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXGradient_GetOutputSize_Proxy(
     IDXGradient * This,
     /* [out] */ SIZE *pOutSize);
 
@@ -4131,61 +4131,61 @@ void __RPC_STUB IDXGradient_GetOutputSize_Stub(
 #define __IDXTScale_INTERFACE_DEFINED__
 
 /* interface IDXTScale */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXTScale;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("B39FD742-E139-11d1-9065-00C04FD9189D")
     IDXTScale : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetScales( 
+        virtual HRESULT STDMETHODCALLTYPE SetScales(
             /* [in] */ float Scales[ 2 ]) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetScales( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetScales(
             /* [out] */ float Scales[ 2 ]) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ScaleFitToSize( 
+
+        virtual HRESULT STDMETHODCALLTYPE ScaleFitToSize(
             /* [out][in] */ DXBNDS *pClipBounds,
             /* [in] */ SIZE FitToSize,
             /* [in] */ BOOL bMaintainAspect) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXTScaleVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXTScale * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXTScale * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXTScale * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetScales )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetScales )(
             IDXTScale * This,
             /* [in] */ float Scales[ 2 ]);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetScales )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetScales )(
             IDXTScale * This,
             /* [out] */ float Scales[ 2 ]);
-        
-        HRESULT ( STDMETHODCALLTYPE *ScaleFitToSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *ScaleFitToSize )(
             IDXTScale * This,
             /* [out][in] */ DXBNDS *pClipBounds,
             /* [in] */ SIZE FitToSize,
             /* [in] */ BOOL bMaintainAspect);
-        
+
         END_INTERFACE
     } IDXTScaleVtbl;
 
@@ -4194,7 +4194,7 @@ EXTERN_C const IID IID_IDXTScale;
         CONST_VTBL struct IDXTScaleVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4225,7 +4225,7 @@ EXTERN_C const IID IID_IDXTScale;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXTScale_SetScales_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTScale_SetScales_Proxy(
     IDXTScale * This,
     /* [in] */ float Scales[ 2 ]);
 
@@ -4237,7 +4237,7 @@ void __RPC_STUB IDXTScale_SetScales_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTScale_GetScales_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTScale_GetScales_Proxy(
     IDXTScale * This,
     /* [out] */ float Scales[ 2 ]);
 
@@ -4249,7 +4249,7 @@ void __RPC_STUB IDXTScale_GetScales_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXTScale_ScaleFitToSize_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXTScale_ScaleFitToSize_Proxy(
     IDXTScale * This,
     /* [out][in] */ DXBNDS *pClipBounds,
     /* [in] */ SIZE FitToSize,
@@ -4268,9 +4268,9 @@ void __RPC_STUB IDXTScale_ScaleFitToSize_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0276 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DISPIDDXEFFECT
     {	DISPID_DXECAPABILITIES	= 10000,
 	DISPID_DXEPROGRESS	= DISPID_DXECAPABILITIES + 1,
@@ -4279,7 +4279,7 @@ enum DISPIDDXEFFECT
 	DISPID_DXE_NEXT_ID	= DISPID_DXEDURATION + 1
     } 	DISPIDDXBOUNDEDEFFECT;
 
-typedef 
+typedef
 enum DXEFFECTTYPE
     {	DXTET_PERIODIC	= 1 << 0,
 	DXTET_MORPH	= 1 << 1
@@ -4294,73 +4294,73 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0276_v0_0_s_ifspec;
 #define __IDXEffect_INTERFACE_DEFINED__
 
 /* interface IDXEffect */
-/* [dual][unique][helpstring][uuid][object] */ 
+/* [dual][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXEffect;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("E31FB81B-1335-11d1-8189-0000F87557DB")
     IDXEffect : public IDispatch
     {
     public:
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Capabilities( 
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Capabilities(
             /* [retval][out] */ long *pVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Progress( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Progress(
             /* [retval][out] */ float *pVal) = 0;
-        
-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Progress( 
+
+        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Progress(
             /* [in] */ float newVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_StepResolution( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_StepResolution(
             /* [retval][out] */ float *pVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Duration( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Duration(
             /* [retval][out] */ float *pVal) = 0;
-        
-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Duration( 
+
+        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Duration(
             /* [in] */ float newVal) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXEffectVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXEffect * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXEffect * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXEffect * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )(
             IDXEffect * This,
             /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )(
             IDXEffect * This,
             /* [in] */ UINT iTInfo,
             /* [in] */ LCID lcid,
             /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )(
             IDXEffect * This,
             /* [in] */ REFIID riid,
             /* [size_is][in] */ LPOLESTR *rgszNames,
             /* [in] */ UINT cNames,
             /* [in] */ LCID lcid,
             /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
+
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )(
             IDXEffect * This,
             /* [in] */ DISPID dispIdMember,
             /* [in] */ REFIID riid,
@@ -4370,31 +4370,31 @@ EXTERN_C const IID IID_IDXEffect;
             /* [out] */ VARIANT *pVarResult,
             /* [out] */ EXCEPINFO *pExcepInfo,
             /* [out] */ UINT *puArgErr);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Capabilities )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Capabilities )(
             IDXEffect * This,
             /* [retval][out] */ long *pVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Progress )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Progress )(
             IDXEffect * This,
             /* [retval][out] */ float *pVal);
-        
-        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Progress )( 
+
+        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Progress )(
             IDXEffect * This,
             /* [in] */ float newVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_StepResolution )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_StepResolution )(
             IDXEffect * This,
             /* [retval][out] */ float *pVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Duration )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Duration )(
             IDXEffect * This,
             /* [retval][out] */ float *pVal);
-        
-        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Duration )( 
+
+        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Duration )(
             IDXEffect * This,
             /* [in] */ float newVal);
-        
+
         END_INTERFACE
     } IDXEffectVtbl;
 
@@ -4403,7 +4403,7 @@ EXTERN_C const IID IID_IDXEffect;
         CONST_VTBL struct IDXEffectVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4456,7 +4456,7 @@ EXTERN_C const IID IID_IDXEffect;
 
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Capabilities_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Capabilities_Proxy(
     IDXEffect * This,
     /* [retval][out] */ long *pVal);
 
@@ -4468,7 +4468,7 @@ void __RPC_STUB IDXEffect_get_Capabilities_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Progress_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Progress_Proxy(
     IDXEffect * This,
     /* [retval][out] */ float *pVal);
 
@@ -4480,7 +4480,7 @@ void __RPC_STUB IDXEffect_get_Progress_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propput] */ HRESULT STDMETHODCALLTYPE IDXEffect_put_Progress_Proxy( 
+/* [id][propput] */ HRESULT STDMETHODCALLTYPE IDXEffect_put_Progress_Proxy(
     IDXEffect * This,
     /* [in] */ float newVal);
 
@@ -4492,7 +4492,7 @@ void __RPC_STUB IDXEffect_put_Progress_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_StepResolution_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_StepResolution_Proxy(
     IDXEffect * This,
     /* [retval][out] */ float *pVal);
 
@@ -4504,7 +4504,7 @@ void __RPC_STUB IDXEffect_get_StepResolution_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Duration_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE IDXEffect_get_Duration_Proxy(
     IDXEffect * This,
     /* [retval][out] */ float *pVal);
 
@@ -4516,7 +4516,7 @@ void __RPC_STUB IDXEffect_get_Duration_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propput] */ HRESULT STDMETHODCALLTYPE IDXEffect_put_Duration_Proxy( 
+/* [id][propput] */ HRESULT STDMETHODCALLTYPE IDXEffect_put_Duration_Proxy(
     IDXEffect * This,
     /* [in] */ float newVal);
 
@@ -4536,86 +4536,86 @@ void __RPC_STUB IDXEffect_put_Duration_Stub(
 #define __IDXLookupTable_INTERFACE_DEFINED__
 
 /* interface IDXLookupTable */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXLookupTable;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("01BAFC7F-9E63-11d1-9053-00C04FD9189D")
     IDXLookupTable : public IDXBaseObject
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetTables( 
+        virtual HRESULT STDMETHODCALLTYPE GetTables(
             /* [out] */ BYTE RedLUT[ 256 ],
             /* [out] */ BYTE GreenLUT[ 256 ],
             /* [out] */ BYTE BlueLUT[ 256 ],
             /* [out] */ BYTE AlphaLUT[ 256 ]) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE IsChannelIdentity( 
+
+        virtual HRESULT STDMETHODCALLTYPE IsChannelIdentity(
             /* [out] */ DXBASESAMPLE *pSampleBools) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE GetIndexValues( 
+
+        virtual HRESULT STDMETHODCALLTYPE GetIndexValues(
             /* [in] */ ULONG Index,
             /* [out] */ DXBASESAMPLE *pSample) = 0;
-        
-        virtual HRESULT STDMETHODCALLTYPE ApplyTables( 
+
+        virtual HRESULT STDMETHODCALLTYPE ApplyTables(
             /* [out][in] */ DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXLookupTableVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXLookupTable * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXLookupTable * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXLookupTable * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetGenerationId )(
             IDXLookupTable * This,
             /* [out] */ ULONG *pID);
-        
-        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )( 
+
+        HRESULT ( STDMETHODCALLTYPE *IncrementGenerationId )(
             IDXLookupTable * This,
             /* [in] */ BOOL bRefresh);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetObjectSize )(
             IDXLookupTable * This,
             /* [out] */ ULONG *pcbSize);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTables )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetTables )(
             IDXLookupTable * This,
             /* [out] */ BYTE RedLUT[ 256 ],
             /* [out] */ BYTE GreenLUT[ 256 ],
             /* [out] */ BYTE BlueLUT[ 256 ],
             /* [out] */ BYTE AlphaLUT[ 256 ]);
-        
-        HRESULT ( STDMETHODCALLTYPE *IsChannelIdentity )( 
+
+        HRESULT ( STDMETHODCALLTYPE *IsChannelIdentity )(
             IDXLookupTable * This,
             /* [out] */ DXBASESAMPLE *pSampleBools);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIndexValues )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetIndexValues )(
             IDXLookupTable * This,
             /* [in] */ ULONG Index,
             /* [out] */ DXBASESAMPLE *pSample);
-        
-        HRESULT ( STDMETHODCALLTYPE *ApplyTables )( 
+
+        HRESULT ( STDMETHODCALLTYPE *ApplyTables )(
             IDXLookupTable * This,
             /* [out][in] */ DXSAMPLE *pSamples,
             /* [in] */ ULONG cSamples);
-        
+
         END_INTERFACE
     } IDXLookupTableVtbl;
 
@@ -4624,7 +4624,7 @@ EXTERN_C const IID IID_IDXLookupTable;
         CONST_VTBL struct IDXLookupTableVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4668,7 +4668,7 @@ EXTERN_C const IID IID_IDXLookupTable;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXLookupTable_GetTables_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXLookupTable_GetTables_Proxy(
     IDXLookupTable * This,
     /* [out] */ BYTE RedLUT[ 256 ],
     /* [out] */ BYTE GreenLUT[ 256 ],
@@ -4683,7 +4683,7 @@ void __RPC_STUB IDXLookupTable_GetTables_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXLookupTable_IsChannelIdentity_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXLookupTable_IsChannelIdentity_Proxy(
     IDXLookupTable * This,
     /* [out] */ DXBASESAMPLE *pSampleBools);
 
@@ -4695,7 +4695,7 @@ void __RPC_STUB IDXLookupTable_IsChannelIdentity_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXLookupTable_GetIndexValues_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXLookupTable_GetIndexValues_Proxy(
     IDXLookupTable * This,
     /* [in] */ ULONG Index,
     /* [out] */ DXBASESAMPLE *pSample);
@@ -4708,7 +4708,7 @@ void __RPC_STUB IDXLookupTable_GetIndexValues_Stub(
     DWORD *_pdwStubPhase);
 
 
-HRESULT STDMETHODCALLTYPE IDXLookupTable_ApplyTables_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXLookupTable_ApplyTables_Proxy(
     IDXLookupTable * This,
     /* [out][in] */ DXSAMPLE *pSamples,
     /* [in] */ ULONG cSamples);
@@ -4726,7 +4726,7 @@ void __RPC_STUB IDXLookupTable_ApplyTables_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0278 */
-/* [local] */ 
+/* [local] */
 
 typedef struct DXRAWSURFACEINFO
     {
@@ -4749,43 +4749,43 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0278_v0_0_s_ifspec;
 #define __IDXRawSurface_INTERFACE_DEFINED__
 
 /* interface IDXRawSurface */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IDXRawSurface;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("09756C8A-D96A-11d1-9062-00C04FD9189D")
     IDXRawSurface : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE GetSurfaceInfo( 
+        virtual HRESULT STDMETHODCALLTYPE GetSurfaceInfo(
             DXRAWSURFACEINFO *pSurfaceInfo) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IDXRawSurfaceVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IDXRawSurface * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IDXRawSurface * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IDXRawSurface * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetSurfaceInfo )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetSurfaceInfo )(
             IDXRawSurface * This,
             DXRAWSURFACEINFO *pSurfaceInfo);
-        
+
         END_INTERFACE
     } IDXRawSurfaceVtbl;
 
@@ -4794,7 +4794,7 @@ EXTERN_C const IID IID_IDXRawSurface;
         CONST_VTBL struct IDXRawSurfaceVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4819,7 +4819,7 @@ EXTERN_C const IID IID_IDXRawSurface;
 
 
 
-HRESULT STDMETHODCALLTYPE IDXRawSurface_GetSurfaceInfo_Proxy( 
+HRESULT STDMETHODCALLTYPE IDXRawSurface_GetSurfaceInfo_Proxy(
     IDXRawSurface * This,
     DXRAWSURFACEINFO *pSurfaceInfo);
 
@@ -4839,43 +4839,43 @@ void __RPC_STUB IDXRawSurface_GetSurfaceInfo_Stub(
 #define __IHTMLDXTransform_INTERFACE_DEFINED__
 
 /* interface IHTMLDXTransform */
-/* [local][unique][helpstring][uuid][object] */ 
+/* [local][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IHTMLDXTransform;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("30E2AB7D-4FDD-4159-B7EA-DC722BF4ADE5")
     IHTMLDXTransform : public IUnknown
     {
     public:
-        virtual HRESULT STDMETHODCALLTYPE SetHostUrl( 
+        virtual HRESULT STDMETHODCALLTYPE SetHostUrl(
             BSTR bstrHostUrl) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IHTMLDXTransformVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IHTMLDXTransform * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IHTMLDXTransform * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IHTMLDXTransform * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *SetHostUrl )( 
+
+        HRESULT ( STDMETHODCALLTYPE *SetHostUrl )(
             IHTMLDXTransform * This,
             BSTR bstrHostUrl);
-        
+
         END_INTERFACE
     } IHTMLDXTransformVtbl;
 
@@ -4884,7 +4884,7 @@ EXTERN_C const IID IID_IHTMLDXTransform;
         CONST_VTBL struct IHTMLDXTransformVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -4909,7 +4909,7 @@ EXTERN_C const IID IID_IHTMLDXTransform;
 
 
 
-HRESULT STDMETHODCALLTYPE IHTMLDXTransform_SetHostUrl_Proxy( 
+HRESULT STDMETHODCALLTYPE IHTMLDXTransform_SetHostUrl_Proxy(
     IHTMLDXTransform * This,
     BSTR bstrHostUrl);
 
@@ -4926,9 +4926,9 @@ void __RPC_STUB IHTMLDXTransform_SetHostUrl_Stub(
 
 
 /* interface __MIDL_itf_dxtrans_0280 */
-/* [local] */ 
+/* [local] */
 
-typedef 
+typedef
 enum DXTFILTER_STATUS
     {	DXTFILTER_STATUS_Stopped	= 0,
 	DXTFILTER_STATUS_Applied	= DXTFILTER_STATUS_Stopped + 1,
@@ -4936,7 +4936,7 @@ enum DXTFILTER_STATUS
 	DXTFILTER_STATUS_MAX	= DXTFILTER_STATUS_Playing + 1
     } 	DXTFILTER_STATUS;
 
-typedef 
+typedef
 enum DXTFILTER_DISPID
     {	DISPID_DXTFilter_Percent	= 1,
 	DISPID_DXTFilter_Duration	= DISPID_DXTFilter_Percent + 1,
@@ -4957,83 +4957,83 @@ extern RPC_IF_HANDLE __MIDL_itf_dxtrans_0280_v0_0_s_ifspec;
 #define __ICSSFilterDispatch_INTERFACE_DEFINED__
 
 /* interface ICSSFilterDispatch */
-/* [dual][unique][helpstring][uuid][object] */ 
+/* [dual][unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_ICSSFilterDispatch;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("9519152B-9484-4A6C-B6A7-4F25E92D6C6B")
     ICSSFilterDispatch : public IDispatch
     {
     public:
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Percent( 
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Percent(
             /* [retval][out] */ float *pVal) = 0;
-        
-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Percent( 
+
+        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Percent(
             /* [in] */ float newVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Duration( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Duration(
             /* [retval][out] */ float *pVal) = 0;
-        
-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Duration( 
+
+        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Duration(
             /* [in] */ float newVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Enabled( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Enabled(
             /* [retval][out] */ VARIANT_BOOL *pfVal) = 0;
-        
-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Enabled( 
+
+        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_Enabled(
             /* [in] */ VARIANT_BOOL fVal) = 0;
-        
-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Status( 
+
+        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_Status(
             /* [retval][out] */ DXTFILTER_STATUS *peVal) = 0;
-        
+
         virtual /* [id] */ HRESULT STDMETHODCALLTYPE Apply( void) = 0;
-        
-        virtual /* [id] */ HRESULT STDMETHODCALLTYPE Play( 
+
+        virtual /* [id] */ HRESULT STDMETHODCALLTYPE Play(
             /* [optional][in] */ VARIANT varDuration) = 0;
-        
+
         virtual /* [id] */ HRESULT STDMETHODCALLTYPE Stop( void) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct ICSSFilterDispatchVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             ICSSFilterDispatch * This,
             /* [in] */ REFIID riid,
             /* [iid_is][out] */ void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             ICSSFilterDispatch * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             ICSSFilterDispatch * This);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )(
             ICSSFilterDispatch * This,
             /* [out] */ UINT *pctinfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )(
             ICSSFilterDispatch * This,
             /* [in] */ UINT iTInfo,
             /* [in] */ LCID lcid,
             /* [out] */ ITypeInfo **ppTInfo);
-        
-        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
+
+        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )(
             ICSSFilterDispatch * This,
             /* [in] */ REFIID riid,
             /* [size_is][in] */ LPOLESTR *rgszNames,
             /* [in] */ UINT cNames,
             /* [in] */ LCID lcid,
             /* [size_is][out] */ DISPID *rgDispId);
-        
-        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
+
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )(
             ICSSFilterDispatch * This,
             /* [in] */ DISPID dispIdMember,
             /* [in] */ REFIID riid,
@@ -5043,45 +5043,45 @@ EXTERN_C const IID IID_ICSSFilterDispatch;
             /* [out] */ VARIANT *pVarResult,
             /* [out] */ EXCEPINFO *pExcepInfo,
             /* [out] */ UINT *puArgErr);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Percent )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Percent )(
             ICSSFilterDispatch * This,
             /* [retval][out] */ float *pVal);
-        
-        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Percent )( 
+
+        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Percent )(
             ICSSFilterDispatch * This,
             /* [in] */ float newVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Duration )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Duration )(
             ICSSFilterDispatch * This,
             /* [retval][out] */ float *pVal);
-        
-        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Duration )( 
+
+        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Duration )(
             ICSSFilterDispatch * This,
             /* [in] */ float newVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Enabled )(
             ICSSFilterDispatch * This,
             /* [retval][out] */ VARIANT_BOOL *pfVal);
-        
-        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )( 
+
+        /* [id][propput] */ HRESULT ( STDMETHODCALLTYPE *put_Enabled )(
             ICSSFilterDispatch * This,
             /* [in] */ VARIANT_BOOL fVal);
-        
-        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Status )( 
+
+        /* [id][propget] */ HRESULT ( STDMETHODCALLTYPE *get_Status )(
             ICSSFilterDispatch * This,
             /* [retval][out] */ DXTFILTER_STATUS *peVal);
-        
-        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Apply )( 
+
+        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Apply )(
             ICSSFilterDispatch * This);
-        
-        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Play )( 
+
+        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Play )(
             ICSSFilterDispatch * This,
             /* [optional][in] */ VARIANT varDuration);
-        
-        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Stop )( 
+
+        /* [id] */ HRESULT ( STDMETHODCALLTYPE *Stop )(
             ICSSFilterDispatch * This);
-        
+
         END_INTERFACE
     } ICSSFilterDispatchVtbl;
 
@@ -5090,7 +5090,7 @@ EXTERN_C const IID IID_ICSSFilterDispatch;
         CONST_VTBL struct ICSSFilterDispatchVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
@@ -5155,7 +5155,7 @@ EXTERN_C const IID IID_ICSSFilterDispatch;
 
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Percent_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Percent_Proxy(
     ICSSFilterDispatch * This,
     /* [retval][out] */ float *pVal);
 
@@ -5167,7 +5167,7 @@ void __RPC_STUB ICSSFilterDispatch_get_Percent_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Percent_Proxy( 
+/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Percent_Proxy(
     ICSSFilterDispatch * This,
     /* [in] */ float newVal);
 
@@ -5179,7 +5179,7 @@ void __RPC_STUB ICSSFilterDispatch_put_Percent_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Duration_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Duration_Proxy(
     ICSSFilterDispatch * This,
     /* [retval][out] */ float *pVal);
 
@@ -5191,7 +5191,7 @@ void __RPC_STUB ICSSFilterDispatch_get_Duration_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Duration_Proxy( 
+/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Duration_Proxy(
     ICSSFilterDispatch * This,
     /* [in] */ float newVal);
 
@@ -5203,7 +5203,7 @@ void __RPC_STUB ICSSFilterDispatch_put_Duration_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Enabled_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Enabled_Proxy(
     ICSSFilterDispatch * This,
     /* [retval][out] */ VARIANT_BOOL *pfVal);
 
@@ -5215,7 +5215,7 @@ void __RPC_STUB ICSSFilterDispatch_get_Enabled_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Enabled_Proxy( 
+/* [id][propput] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_put_Enabled_Proxy(
     ICSSFilterDispatch * This,
     /* [in] */ VARIANT_BOOL fVal);
 
@@ -5227,7 +5227,7 @@ void __RPC_STUB ICSSFilterDispatch_put_Enabled_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Status_Proxy( 
+/* [id][propget] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_get_Status_Proxy(
     ICSSFilterDispatch * This,
     /* [retval][out] */ DXTFILTER_STATUS *peVal);
 
@@ -5239,7 +5239,7 @@ void __RPC_STUB ICSSFilterDispatch_get_Status_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Apply_Proxy( 
+/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Apply_Proxy(
     ICSSFilterDispatch * This);
 
 
@@ -5250,7 +5250,7 @@ void __RPC_STUB ICSSFilterDispatch_Apply_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Play_Proxy( 
+/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Play_Proxy(
     ICSSFilterDispatch * This,
     /* [optional][in] */ VARIANT varDuration);
 
@@ -5262,7 +5262,7 @@ void __RPC_STUB ICSSFilterDispatch_Play_Stub(
     DWORD *_pdwStubPhase);
 
 
-/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Stop_Proxy( 
+/* [id] */ HRESULT STDMETHODCALLTYPE ICSSFilterDispatch_Stop_Proxy(
     ICSSFilterDispatch * This);
 
 
@@ -5282,7 +5282,7 @@ void __RPC_STUB ICSSFilterDispatch_Stop_Stub(
 #define __DXTRANSLib_LIBRARY_DEFINED__
 
 /* library DXTRANSLib */
-/* [helpstring][version][uuid] */ 
+/* [helpstring][version][uuid] */
 
 
 EXTERN_C const IID LIBID_DXTRANSLib;
@@ -5346,10 +5346,10 @@ DXTFilter;
 
 /* Additional Prototypes for ALL interfaces */
 
-unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * ); 
-unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * ); 
-unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); 
-void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * ); 
+unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * );
+unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * );
+unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * );
+void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * );
 
 /* end of Additional Prototypes */
 
diff --git a/src/dep/include/DXSDK/include/gameux.h b/src/dep/include/DXSDK/include/gameux.h
index 2e28a5f..fbd0758 100644
--- a/src/dep/include/DXSDK/include/gameux.h
+++ b/src/dep/include/DXSDK/include/gameux.h
@@ -7,8 +7,8 @@
 /* Compiler settings for gameux.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
     protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -46,7 +46,7 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IGameExplorer_FWD_DEFINED__
 #define __IGameExplorer_FWD_DEFINED__
@@ -73,18 +73,18 @@ typedef struct GameExplorer GameExplorer;
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 /* interface __MIDL_itf_gameux_0000_0000 */
-/* [local] */ 
+/* [local] */
 
 #define ID_GDF_XML __GDF_XML
 #define ID_GDF_THUMBNAIL __GDF_THUMBNAIL
 #define ID_ICON_ICO __ICON_ICO
 #define ID_GDF_XML_STR L"__GDF_XML"
 #define ID_GDF_THUMBNAIL_STR L"__GDF_THUMBNAIL"
-typedef /* [v1_enum] */ 
+typedef /* [v1_enum] */
 enum GAME_INSTALL_SCOPE
     {	GIS_NOT_INSTALLED	= 1,
 	GIS_CURRENT_USER	= 2,
@@ -100,73 +100,73 @@ extern RPC_IF_HANDLE __MIDL_itf_gameux_0000_0000_v0_0_s_ifspec;
 #define __IGameExplorer_INTERFACE_DEFINED__
 
 /* interface IGameExplorer */
-/* [unique][helpstring][uuid][object] */ 
+/* [unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IGameExplorer;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("E7B2FB72-D728-49B3-A5F2-18EBF5F1349E")
     IGameExplorer : public IUnknown
     {
     public:
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE AddGame( 
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE AddGame(
             /* [in] */ __RPC__in BSTR bstrGDFBinaryPath,
             /* [in] */ __RPC__in BSTR bstrGameInstallDirectory,
             /* [in] */ GAME_INSTALL_SCOPE installScope,
             /* [out][in] */ __RPC__inout GUID *pguidInstanceID) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGame( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGame(
             /* [in] */ GUID guidInstanceID) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UpdateGame( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UpdateGame(
             /* [in] */ GUID guidInstanceID) = 0;
-        
-        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VerifyAccess( 
+
+        virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VerifyAccess(
             /* [in] */ __RPC__in BSTR bstrGDFBinaryPath,
             /* [out] */ __RPC__out BOOL *pfHasAccess) = 0;
-        
+
     };
-    
+
 #else 	/* C style interface */
 
     typedef struct IGameExplorerVtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IGameExplorer * This,
             /* [in] */ __RPC__in REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IGameExplorer * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IGameExplorer * This);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *AddGame )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *AddGame )(
             IGameExplorer * This,
             /* [in] */ __RPC__in BSTR bstrGDFBinaryPath,
             /* [in] */ __RPC__in BSTR bstrGameInstallDirectory,
             /* [in] */ GAME_INSTALL_SCOPE installScope,
             /* [out][in] */ __RPC__inout GUID *pguidInstanceID);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGame )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGame )(
             IGameExplorer * This,
             /* [in] */ GUID guidInstanceID);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UpdateGame )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UpdateGame )(
             IGameExplorer * This,
             /* [in] */ GUID guidInstanceID);
-        
-        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VerifyAccess )( 
+
+        /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VerifyAccess )(
             IGameExplorer * This,
             /* [in] */ __RPC__in BSTR bstrGDFBinaryPath,
             /* [out] */ __RPC__out BOOL *pfHasAccess);
-        
+
         END_INTERFACE
     } IGameExplorerVtbl;
 
@@ -175,32 +175,32 @@ EXTERN_C const IID IID_IGameExplorer;
         CONST_VTBL struct IGameExplorerVtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
 #define IGameExplorer_QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
 #define IGameExplorer_AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+    ( (This)->lpVtbl -> AddRef(This) )
 
 #define IGameExplorer_Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #define IGameExplorer_AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID)	\
-    ( (This)->lpVtbl -> AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID) ) 
+    ( (This)->lpVtbl -> AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID) )
 
 #define IGameExplorer_RemoveGame(This,guidInstanceID)	\
-    ( (This)->lpVtbl -> RemoveGame(This,guidInstanceID) ) 
+    ( (This)->lpVtbl -> RemoveGame(This,guidInstanceID) )
 
 #define IGameExplorer_UpdateGame(This,guidInstanceID)	\
-    ( (This)->lpVtbl -> UpdateGame(This,guidInstanceID) ) 
+    ( (This)->lpVtbl -> UpdateGame(This,guidInstanceID) )
 
 #define IGameExplorer_VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess)	\
-    ( (This)->lpVtbl -> VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess) ) 
+    ( (This)->lpVtbl -> VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess) )
 
 #endif /* COBJMACROS */
 
@@ -218,7 +218,7 @@ EXTERN_C const IID IID_IGameExplorer;
 #define __gameuxLib_LIBRARY_DEFINED__
 
 /* library gameuxLib */
-/* [helpstring][version][uuid] */ 
+/* [helpstring][version][uuid] */
 
 
 EXTERN_C const IID LIBID_gameuxLib;
@@ -234,10 +234,10 @@ GameExplorer;
 
 /* Additional Prototypes for ALL interfaces */
 
-unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); 
-unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); 
-unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); 
-void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); 
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * );
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * );
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * );
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * );
 
 /* end of Additional Prototypes */
 
diff --git a/src/dep/include/DXSDK/include/multimon.h b/src/dep/include/DXSDK/include/multimon.h
index 88e2862..62f6b6d 100644
--- a/src/dep/include/DXSDK/include/multimon.h
+++ b/src/dep/include/DXSDK/include/multimon.h
@@ -10,7 +10,7 @@
 //
 // Exactly one source must include this with COMPILE_MULTIMON_STUBS defined.
 //
-// Copyright (c) Microsoft Corporation. All rights reserved. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
 //
 //=============================================================================
 
@@ -166,11 +166,11 @@ BOOL     g_fMultimonPlatformNT = FALSE;
 #endif
 
 BOOL IsPlatformNT()
-{ 
+{
     OSVERSIONINFOA osvi = {0};
     osvi.dwOSVersionInfoSize = sizeof(osvi);
     GetVersionExA((OSVERSIONINFOA*)&osvi);
-    return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);    
+    return (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId);
 }
 
 BOOL InitMultipleMonitorStubs(void)
@@ -191,7 +191,7 @@ BOOL InitMultipleMonitorStubs(void)
         (*(FARPROC*)&g_pfnEnumDisplayMonitors = GetProcAddress(hUser32,"EnumDisplayMonitors")) != NULL &&
 #ifdef UNICODE
         (*(FARPROC*)&g_pfnEnumDisplayDevices  = GetProcAddress(hUser32,"EnumDisplayDevicesW")) != NULL &&
-        (*(FARPROC*)&g_pfnGetMonitorInfo      = g_fMultimonPlatformNT ? GetProcAddress(hUser32,"GetMonitorInfoW") : 
+        (*(FARPROC*)&g_pfnGetMonitorInfo      = g_fMultimonPlatformNT ? GetProcAddress(hUser32,"GetMonitorInfoW") :
                                                 GetProcAddress(hUser32,"GetMonitorInfoA")) != NULL
 #else
         (*(FARPROC*)&g_pfnGetMonitorInfo      = GetProcAddress(hUser32,"GetMonitorInfoA")) != NULL &&
@@ -320,7 +320,7 @@ xGetMonitorInfo(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
         BOOL f = g_pfnGetMonitorInfo(hMonitor, lpMonitorInfo);
 #ifdef UNICODE
         if (f && !g_fMultimonPlatformNT && (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEX)))
-        { 
+        {
             MultiByteToWideChar(CP_ACP, 0,
                 (LPSTR)((MONITORINFOEX*)lpMonitorInfo)->szDevice, -1,
                 ((MONITORINFOEX*)lpMonitorInfo)->szDevice, (sizeof(((MONITORINFOEX*)lpMonitorInfo)->szDevice)/sizeof(TCHAR)));
diff --git a/src/dep/include/DXSDK/include/rmxfguid.h b/src/dep/include/DXSDK/include/rmxfguid.h
index d3326cc..ff8961e 100644
--- a/src/dep/include/DXSDK/include/rmxfguid.h
+++ b/src/dep/include/DXSDK/include/rmxfguid.h
@@ -208,15 +208,15 @@ DEFINE_GUID(TID_D3DRMExternalVisual,
 0x98116AA0, 0xBDBA, 0x11d1, 0x82, 0xC0, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x71);
 
 /* {7F0F21E0-BFE1-11d1-82C0-00A0C9697271} */
-DEFINE_GUID(TID_D3DRMStringProperty, 
+DEFINE_GUID(TID_D3DRMStringProperty,
 0x7f0f21e0, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71);
 
 /* {7F0F21E1-BFE1-11d1-82C0-00A0C9697271} */
-DEFINE_GUID(TID_D3DRMPropertyBag, 
+DEFINE_GUID(TID_D3DRMPropertyBag,
 0x7f0f21e1, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71);
 
 // {7F5D5EA0-D53A-11d1-82C0-00A0C9697271}
-DEFINE_GUID(TID_D3DRMRightHanded, 
+DEFINE_GUID(TID_D3DRMRightHanded,
 0x7f5d5ea0, 0xd53a, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71);
 
 #endif /* __RMXFGUID_H_ */
diff --git a/src/dep/include/DXSDK/include/rmxftmpl.h b/src/dep/include/DXSDK/include/rmxftmpl.h
index e0018d0..dad1171 100644
--- a/src/dep/include/DXSDK/include/rmxftmpl.h
+++ b/src/dep/include/DXSDK/include/rmxftmpl.h
@@ -4,333 +4,333 @@
 #define _RMXFTMPL_H_
 
 unsigned char D3DRM_XTEMPLATES[] = {
-	0x78, 0x6f, 0x66, 0x20, 0x30, 0x33, 0x30, 0x32, 0x62, 
-	0x69, 0x6e, 0x20, 0x30, 0x30, 0x36, 0x34, 0x1f, 0, 0x1, 
-	0, 0x6, 0, 0, 0, 0x48, 0x65, 0x61, 0x64, 0x65, 
-	0x72, 0xa, 0, 0x5, 0, 0x43, 0xab, 0x82, 0x3d, 0xda, 
-	0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 
-	0x33, 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x6d, 
-	0x61, 0x6a, 0x6f, 0x72, 0x14, 0, 0x28, 0, 0x1, 0, 
-	0x5, 0, 0, 0, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x14, 
-	0, 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x66, 
-	0x6c, 0x61, 0x67, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, 
-	0x6f, 0x72, 0xa, 0, 0x5, 0, 0x5e, 0xab, 0x82, 0x3d, 
-	0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 
-	0xe4, 0x33, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 0, 
-	0x78, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 
-	0, 0x79, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 
-	0, 0, 0x7a, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 
-	0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, 
-	0x73, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x44, 0x3f, 0xf2, 
-	0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 
-	0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 
-	0, 0x75, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 
-	0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 
-	0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, 
-	0x78, 0x34, 0x78, 0x34, 0xa, 0, 0x5, 0, 0x45, 0x3f, 
-	0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 
-	0x33, 0x35, 0x94, 0xa3, 0x34, 0, 0x2a, 0, 0x1, 0, 
-	0x6, 0, 0, 0, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 
-	0xe, 0, 0x3, 0, 0x10, 0, 0, 0, 0xf, 0, 
-	0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, 
-	0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 
-	0x41, 0xa, 0, 0x5, 0, 0xe0, 0x44, 0xff, 0x35, 0x7c, 
-	0x6c, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 
-	0xa3, 0x2a, 0, 0x1, 0, 0x3, 0, 0, 0, 0x72, 
-	0x65, 0x64, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, 
-	0, 0, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x14, 0, 0x2a, 
-	0, 0x1, 0, 0x4, 0, 0, 0, 0x62, 0x6c, 0x75, 
-	0x65, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, 0, 
-	0, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x14, 0, 0xb, 0, 
-	0x1f, 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, 
-	0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0xa, 0, 0x5, 0, 
-	0x81, 0x6e, 0xe1, 0xd3, 0x35, 0x78, 0xcf, 0x11, 0x8f, 0x52, 
-	0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, 
-	0x3, 0, 0, 0, 0x72, 0x65, 0x64, 0x14, 0, 0x2a, 
-	0, 0x1, 0, 0x5, 0, 0, 0, 0x67, 0x72, 0x65, 
-	0x65, 0x6e, 0x14, 0, 0x2a, 0, 0x1, 0, 0x4, 0, 
-	0, 0, 0x62, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, 0, 
-	0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x49, 0x6e, 
-	0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 
-	0xa, 0, 0x5, 0, 0x20, 0xb8, 0x30, 0x16, 0x42, 0x78, 
-	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 
-	0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x69, 0x6e, 
-	0x64, 0x65, 0x78, 0x14, 0, 0x1, 0, 0x9, 0, 0, 
-	0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, 
-	0x1, 0, 0xa, 0, 0, 0, 0x69, 0x6e, 0x64, 0x65, 
-	0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0xb, 0, 
-	0x1f, 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, 
-	0x6f, 0x6c, 0x65, 0x61, 0x6e, 0xa, 0, 0x5, 0, 0xa0, 
-	0xa6, 0x7d, 0x53, 0x37, 0xca, 0xd0, 0x11, 0x94, 0x1c, 0, 
-	0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, 0, 0x9, 
-	0, 0, 0, 0x74, 0x72, 0x75, 0x65, 0x66, 0x61, 0x6c, 
-	0x73, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 
-	0x9, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 
-	0x6e, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x63, 0xae, 0x85, 
-	0x48, 0xe8, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 
-	0x35, 0x94, 0xa3, 0x1, 0, 0x7, 0, 0, 0, 0x42, 
-	0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, 
-	0, 0, 0x75, 0x14, 0, 0x1, 0, 0x7, 0, 0, 
-	0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 
-	0x1, 0, 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, 
-	0, 0x1, 0, 0xc, 0, 0, 0, 0x4d, 0x61, 0x74, 
-	0x65, 0x72, 0x69, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0xa, 
-	0, 0x5, 0, 0x60, 0xae, 0x85, 0x48, 0xe8, 0x78, 0xcf, 
-	0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, 
-	0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 
-	0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, 0x75, 0x14, 
-	0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, 
-	0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, 
-	0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0xf, 
-	0, 0, 0, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 
-	0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0xa, 0, 
-	0x5, 0, 0xe1, 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, 
-	0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x31, 0, 
-	0x1, 0, 0x8, 0, 0, 0, 0x66, 0x69, 0x6c, 0x65, 
-	0x6e, 0x61, 0x6d, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0x8, 0, 0, 0, 0x4d, 0x61, 0x74, 0x65, 
-	0x72, 0x69, 0x61, 0x6c, 0xa, 0, 0x5, 0, 0x4d, 0xab, 
-	0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 
-	0xaf, 0x71, 0xe4, 0x33, 0x1, 0, 0x9, 0, 0, 0, 
-	0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, 0x1, 
-	0, 0x9, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x43, 
-	0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x2a, 0, 0x1, 0, 
-	0x5, 0, 0, 0, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x14, 
-	0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6c, 
-	0x6f, 0x72, 0x52, 0x47, 0x42, 0x1, 0, 0xd, 0, 0, 
-	0, 0x73, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x43, 
-	0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x1, 0, 0x8, 0, 
-	0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 
-	0x1, 0, 0xd, 0, 0, 0, 0x65, 0x6d, 0x69, 0x73, 
-	0x73, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, 
-	0, 0xe, 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 
-	0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x8, 0, 0, 
-	0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, 0xa, 
-	0, 0x5, 0, 0x5f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 
-	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, 
-	0, 0x1, 0, 0x12, 0, 0, 0, 0x6e, 0x46, 0x61, 
-	0x63, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 
-	0x64, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, 
-	0, 0x1, 0, 0x11, 0, 0, 0, 0x66, 0x61, 0x63, 
-	0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, 
-	0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, 0, 0x12, 0, 
-	0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x56, 0x65, 0x72, 
-	0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 
-	0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 
-	0xd, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 
-	0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x73, 0xa, 0, 0x5, 
-	0, 0xc0, 0xc5, 0x1e, 0xed, 0xa8, 0xc0, 0xd0, 0x11, 0x94, 
-	0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, 
-	0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 
-	0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 
-	0x14, 0, 0x34, 0, 0x1, 0, 0x9, 0, 0, 0, 
-	0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x32, 0x64, 0x1, 
-	0, 0xe, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x57, 
-	0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0xe, 
-	0, 0x1, 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, 
-	0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 
-	0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0x11, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 
-	0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, 
-	0x72, 0x64, 0x73, 0xa, 0, 0x5, 0, 0x40, 0x3f, 0xf2, 
-	0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 
-	0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xe, 0, 0, 
-	0, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 
-	0x6f, 0x6f, 0x72, 0x64, 0x73, 0x14, 0, 0x34, 0, 0x1, 
-	0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, 
-	0x73, 0x32, 0x64, 0x1, 0, 0xd, 0, 0, 0, 0x74, 
-	0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, 0x72, 
-	0x64, 0x73, 0xe, 0, 0x1, 0, 0xe, 0, 0, 0, 
-	0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 
-	0x6f, 0x72, 0x64, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 
-	0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x4d, 0x65, 
-	0x73, 0x68, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 
-	0x4c, 0x69, 0x73, 0x74, 0xa, 0, 0x5, 0, 0x42, 0x3f, 
-	0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 
-	0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, 0, 
-	0, 0, 0x6e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 
-	0x6c, 0x73, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, 0, 
-	0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x64, 
-	0x65, 0x78, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, 0, 
-	0x1, 0, 0xb, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xe, 0, 0x1, 
-	0, 0xc, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 
-	0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xf, 0, 0x14, 
-	0, 0xe, 0, 0x1, 0, 0x8, 0, 0, 0, 0x4d, 
-	0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0xf, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x4d, 
-	0x65, 0x73, 0x68, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 
-	0xa, 0, 0x5, 0, 0x43, 0x3f, 0xf2, 0xf6, 0x86, 0x76, 
-	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 
-	0x29, 0, 0x1, 0, 0x8, 0, 0, 0, 0x6e, 0x4e, 
-	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, 
-	0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, 
-	0x6f, 0x72, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x6f, 
-	0x72, 0x6d, 0x61, 0x6c, 0x73, 0xe, 0, 0x1, 0, 0x8, 
-	0, 0, 0, 0x6e, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 
-	0x73, 0xf, 0, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, 
-	0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x4e, 0x6f, 
-	0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x1, 
-	0, 0x8, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 
-	0x61, 0x63, 0x65, 0x1, 0, 0xb, 0, 0, 0, 0x66, 
-	0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 
-	0xe, 0, 0x1, 0, 0xc, 0, 0, 0, 0x6e, 0x46, 
-	0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 
-	0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 
-	0x10, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x56, 0x65, 
-	0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 
-	0xa, 0, 0x5, 0, 0x21, 0xb8, 0x30, 0x16, 0x42, 0x78, 
-	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 
-	0x29, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, 0x56, 
-	0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 
-	0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0xc, 0, 0, 
-	0, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, 
-	0x6c, 0x6f, 0x72, 0x1, 0, 0xc, 0, 0, 0, 0x76, 
-	0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 
-	0x73, 0xe, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, 
-	0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 
-	0x72, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0x4, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 
-	0xa, 0, 0x5, 0, 0x44, 0xab, 0x82, 0x3d, 0xda, 0x62, 
-	0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 
-	0x29, 0, 0x1, 0, 0x9, 0, 0, 0, 0x6e, 0x56, 
-	0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, 
-	0, 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 
-	0x74, 0x6f, 0x72, 0x1, 0, 0x8, 0, 0, 0, 0x76, 
-	0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, 
-	0, 0x9, 0, 0, 0, 0x6e, 0x56, 0x65, 0x72, 0x74, 
-	0x69, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0x29, 0, 
-	0x1, 0, 0x6, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 
-	0x65, 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0x8, 0, 
-	0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, 
-	0x1, 0, 0x5, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 
-	0x73, 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x6e, 
-	0x46, 0x61, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xe, 
-	0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0x14, 0, 0, 0, 0x46, 
-	0x72, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 
-	0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, 0xa, 
-	0, 0x5, 0, 0x41, 0x3f, 0xf2, 0xf6, 0x86, 0x76, 0xcf, 
-	0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, 
-	0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, 
-	0x78, 0x34, 0x78, 0x34, 0x1, 0, 0xb, 0, 0, 0, 
-	0x66, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x72, 0x69, 
-	0x78, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x5, 
-	0, 0, 0, 0x46, 0x72, 0x61, 0x6d, 0x65, 0xa, 0, 
-	0x5, 0, 0x46, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, 
-	0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, 0, 
-	0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 0, 
-	0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, 0x46, 0x6c, 
-	0x6f, 0x61, 0x74, 0x4b, 0x65, 0x79, 0x73, 0xa, 0, 0x5, 
-	0, 0xa9, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, 0x8f, 
-	0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 
-	0, 0x7, 0, 0, 0, 0x6e, 0x56, 0x61, 0x6c, 0x75, 
-	0x65, 0x73, 0x14, 0, 0x34, 0, 0x2a, 0, 0x1, 0, 
-	0x6, 0, 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 
-	0xe, 0, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x56, 
-	0x61, 0x6c, 0x75, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, 
-	0x69, 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 
-	0x65, 0x79, 0x73, 0xa, 0, 0x5, 0, 0x80, 0xb1, 0x6, 
-	0xf4, 0x3b, 0x7b, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 
-	0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x4, 0, 0, 
-	0, 0x74, 0x69, 0x6d, 0x65, 0x14, 0, 0x1, 0, 0x9, 
-	0, 0, 0, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, 
-	0x79, 0x73, 0x1, 0, 0x6, 0, 0, 0, 0x74, 0x66, 
-	0x6b, 0x65, 0x79, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0xc, 0, 0, 0, 0x41, 0x6e, 0x69, 0x6d, 
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0xa, 0, 
-	0x5, 0, 0xa8, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, 
-	0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 
-	0x1, 0, 0x7, 0, 0, 0, 0x6b, 0x65, 0x79, 0x54, 
-	0x79, 0x70, 0x65, 0x14, 0, 0x29, 0, 0x1, 0, 0x5, 
-	0, 0, 0, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x14, 0, 
-	0x34, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, 0x69, 
-	0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, 
-	0x79, 0x73, 0x1, 0, 0x4, 0, 0, 0, 0x6b, 0x65, 
-	0x79, 0x73, 0xe, 0, 0x1, 0, 0x5, 0, 0, 0, 
-	0x6e, 0x4b, 0x65, 0x79, 0x73, 0xf, 0, 0x14, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x41, 
-	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0xa, 0, 0x5, 0, 0xc0, 
-	0x56, 0xbf, 0xe2, 0xf, 0x84, 0xcf, 0x11, 0x8f, 0x52, 0, 
-	0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, 
-	0, 0, 0, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6c, 0x6f, 
-	0x73, 0x65, 0x64, 0x14, 0, 0x29, 0, 0x1, 0, 0xf, 
-	0, 0, 0, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
-	0x6e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x14, 0, 
-	0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, 
-	0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xa, 
-	0, 0x5, 0, 0x4f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 
-	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, 
-	0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x41, 
-	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 
-	0x74, 0xa, 0, 0x5, 0, 0x50, 0xab, 0x82, 0x3d, 0xda, 
-	0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 
-	0x33, 0xe, 0, 0x1, 0, 0x9, 0, 0, 0, 0x41, 
-	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xf, 0, 
-	0xb, 0, 0x1f, 0, 0x1, 0, 0xa, 0, 0, 0, 
-	0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 
-	0xa, 0, 0x5, 0, 0xa0, 0xee, 0x23, 0x3a, 0xb1, 0x94, 
-	0xd0, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 
-	0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x42, 0x49, 
-	0x4e, 0x41, 0x52, 0x59, 0xf, 0, 0xb, 0, 0x1f, 0, 
-	0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, 0x6c, 0xa, 
-	0, 0x5, 0, 0xa1, 0xee, 0x23, 0x3a, 0xb1, 0x94, 0xd0, 
-	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, 
-	0, 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, 
-	0x6c, 0x73, 0x14, 0, 0x34, 0, 0x31, 0, 0x1, 0, 
-	0x4, 0, 0, 0, 0x75, 0x72, 0x6c, 0x73, 0xe, 0, 
-	0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, 0x6c, 
-	0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 
-	0, 0xf, 0, 0, 0, 0x50, 0x72, 0x6f, 0x67, 0x72, 
-	0x65, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x68, 
-	0xa, 0, 0x5, 0, 0x60, 0xc3, 0x63, 0x8a, 0x7d, 0x99, 
-	0xd0, 0x11, 0x94, 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, 
-	0xe, 0, 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, 
-	0x6c, 0x13, 0, 0x1, 0, 0xa, 0, 0, 0, 0x49, 
-	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0xf, 
-	0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x4, 0, 0, 
-	0, 0x47, 0x75, 0x69, 0x64, 0xa, 0, 0x5, 0, 0xe0, 
-	0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, 
-	0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x5, 
-	0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x31, 0x14, 0, 
-	0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x64, 0x61, 
-	0x74, 0x61, 0x32, 0x14, 0, 0x28, 0, 0x1, 0, 0x5, 
-	0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x33, 0x14, 0, 
-	0x34, 0, 0x2d, 0, 0x1, 0, 0x5, 0, 0, 0, 
-	0x64, 0x61, 0x74, 0x61, 0x34, 0xe, 0, 0x3, 0, 0x8, 
-	0, 0, 0, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 
-	0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, 0x72, 
-	0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-	0x79, 0xa, 0, 0x5, 0, 0xe0, 0x21, 0xf, 0x7f, 0xe1, 
-	0xbf, 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 
-	0x71, 0x31, 0, 0x1, 0, 0x3, 0, 0, 0, 0x6b, 
-	0x65, 0x79, 0x14, 0, 0x31, 0, 0x1, 0, 0x5, 0, 
-	0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, 
-	0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x50, 
-	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x61, 0x67, 
-	0xa, 0, 0x5, 0, 0xe1, 0x21, 0xf, 0x7f, 0xe1, 0xbf, 
-	0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, 
-	0xe, 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, 
-	0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-	0x74, 0x79, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 
-	0xe, 0, 0, 0, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 
-	0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0xa, 0, 
-	0x5, 0, 0xa0, 0x6a, 0x11, 0x98, 0xba, 0xbd, 0xd1, 0x11, 
-	0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x1, 0, 
-	0x4, 0, 0, 0, 0x47, 0x75, 0x69, 0x64, 0x1, 0, 
-	0x12, 0, 0, 0, 0x67, 0x75, 0x69, 0x64, 0x45, 0x78, 
-	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, 
-	0x61, 0x6c, 0x14, 0, 0xe, 0, 0x12, 0, 0x12, 0, 
-	0x12, 0, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 
-	0xb, 0, 0, 0, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, 
-	0x61, 0x6e, 0x64, 0x65, 0x64, 0xa, 0, 0x5, 0, 0xa0, 
-	0x5e, 0x5d, 0x7f, 0x3a, 0xd5, 0xd1, 0x11, 0x82, 0xc0, 0, 
-	0xa0, 0xc9, 0x69, 0x72, 0x71, 0x29, 0, 0x1, 0, 0xc, 
-	0, 0, 0, 0x62, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, 
+	0x78, 0x6f, 0x66, 0x20, 0x30, 0x33, 0x30, 0x32, 0x62,
+	0x69, 0x6e, 0x20, 0x30, 0x30, 0x36, 0x34, 0x1f, 0, 0x1,
+	0, 0x6, 0, 0, 0, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0xa, 0, 0x5, 0, 0x43, 0xab, 0x82, 0x3d, 0xda,
+	0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4,
+	0x33, 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x6d,
+	0x61, 0x6a, 0x6f, 0x72, 0x14, 0, 0x28, 0, 0x1, 0,
+	0x5, 0, 0, 0, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x14,
+	0, 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x66,
+	0x6c, 0x61, 0x67, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0xa, 0, 0x5, 0, 0x5e, 0xab, 0x82, 0x3d,
+	0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71,
+	0xe4, 0x33, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 0,
+	0x78, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 0,
+	0, 0x79, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0,
+	0, 0, 0x7a, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1,
+	0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64,
+	0x73, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x44, 0x3f, 0xf2,
+	0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33,
+	0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, 0x1, 0, 0,
+	0, 0x75, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0,
+	0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1,
+	0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69,
+	0x78, 0x34, 0x78, 0x34, 0xa, 0, 0x5, 0, 0x45, 0x3f,
+	0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40,
+	0x33, 0x35, 0x94, 0xa3, 0x34, 0, 0x2a, 0, 0x1, 0,
+	0x6, 0, 0, 0, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78,
+	0xe, 0, 0x3, 0, 0x10, 0, 0, 0, 0xf, 0,
+	0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0,
+	0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42,
+	0x41, 0xa, 0, 0x5, 0, 0xe0, 0x44, 0xff, 0x35, 0x7c,
+	0x6c, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94,
+	0xa3, 0x2a, 0, 0x1, 0, 0x3, 0, 0, 0, 0x72,
+	0x65, 0x64, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0,
+	0, 0, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x14, 0, 0x2a,
+	0, 0x1, 0, 0x4, 0, 0, 0, 0x62, 0x6c, 0x75,
+	0x65, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, 0,
+	0, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x14, 0, 0xb, 0,
+	0x1f, 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f,
+	0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0xa, 0, 0x5, 0,
+	0x81, 0x6e, 0xe1, 0xd3, 0x35, 0x78, 0xcf, 0x11, 0x8f, 0x52,
+	0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0,
+	0x3, 0, 0, 0, 0x72, 0x65, 0x64, 0x14, 0, 0x2a,
+	0, 0x1, 0, 0x5, 0, 0, 0, 0x67, 0x72, 0x65,
+	0x65, 0x6e, 0x14, 0, 0x2a, 0, 0x1, 0, 0x4, 0,
+	0, 0, 0x62, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, 0,
+	0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
+	0xa, 0, 0x5, 0, 0x20, 0xb8, 0x30, 0x16, 0x42, 0x78,
+	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3,
+	0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x69, 0x6e,
+	0x64, 0x65, 0x78, 0x14, 0, 0x1, 0, 0x9, 0, 0,
+	0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41,
+	0x1, 0, 0xa, 0, 0, 0, 0x69, 0x6e, 0x64, 0x65,
+	0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0xb, 0,
+	0x1f, 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f,
+	0x6f, 0x6c, 0x65, 0x61, 0x6e, 0xa, 0, 0x5, 0, 0xa0,
+	0xa6, 0x7d, 0x53, 0x37, 0xca, 0xd0, 0x11, 0x94, 0x1c, 0,
+	0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, 0, 0x9,
+	0, 0, 0, 0x74, 0x72, 0x75, 0x65, 0x66, 0x61, 0x6c,
+	0x73, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0,
+	0x9, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61,
+	0x6e, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x63, 0xae, 0x85,
+	0x48, 0xe8, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33,
+	0x35, 0x94, 0xa3, 0x1, 0, 0x7, 0, 0, 0, 0x42,
+	0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0,
+	0, 0, 0x75, 0x14, 0, 0x1, 0, 0x7, 0, 0,
+	0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0,
+	0x1, 0, 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f,
+	0, 0x1, 0, 0xc, 0, 0, 0, 0x4d, 0x61, 0x74,
+	0x65, 0x72, 0x69, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0xa,
+	0, 0x5, 0, 0x60, 0xae, 0x85, 0x48, 0xe8, 0x78, 0xcf,
+	0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1,
+	0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65,
+	0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, 0x75, 0x14,
+	0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f,
+	0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0,
+	0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0xf,
+	0, 0, 0, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65,
+	0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0xa, 0,
+	0x5, 0, 0xe1, 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11,
+	0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x31, 0,
+	0x1, 0, 0x8, 0, 0, 0, 0x66, 0x69, 0x6c, 0x65,
+	0x6e, 0x61, 0x6d, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0x8, 0, 0, 0, 0x4d, 0x61, 0x74, 0x65,
+	0x72, 0x69, 0x61, 0x6c, 0xa, 0, 0x5, 0, 0x4d, 0xab,
+	0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20,
+	0xaf, 0x71, 0xe4, 0x33, 0x1, 0, 0x9, 0, 0, 0,
+	0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, 0x1,
+	0, 0x9, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x43,
+	0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x2a, 0, 0x1, 0,
+	0x5, 0, 0, 0, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x14,
+	0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6c,
+	0x6f, 0x72, 0x52, 0x47, 0x42, 0x1, 0, 0xd, 0, 0,
+	0, 0x73, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x43,
+	0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x1, 0, 0x8, 0,
+	0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42,
+	0x1, 0, 0xd, 0, 0, 0, 0x65, 0x6d, 0x69, 0x73,
+	0x73, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14,
+	0, 0xe, 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf,
+	0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x8, 0, 0,
+	0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, 0xa,
+	0, 0x5, 0, 0x5f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf,
+	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29,
+	0, 0x1, 0, 0x12, 0, 0, 0, 0x6e, 0x46, 0x61,
+	0x63, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e,
+	0x64, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29,
+	0, 0x1, 0, 0x11, 0, 0, 0, 0x66, 0x61, 0x63,
+	0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64,
+	0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, 0, 0x12, 0,
+	0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x56, 0x65, 0x72,
+	0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73,
+	0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0,
+	0xd, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61,
+	0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x73, 0xa, 0, 0x5,
+	0, 0xc0, 0xc5, 0x1e, 0xed, 0xa8, 0xc0, 0xd0, 0x11, 0x94,
+	0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1,
+	0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65,
+	0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x14, 0, 0x34, 0, 0x1, 0, 0x9, 0, 0, 0,
+	0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x32, 0x64, 0x1,
+	0, 0xe, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x57,
+	0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0xe,
+	0, 0x1, 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61,
+	0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0x11, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68,
+	0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f,
+	0x72, 0x64, 0x73, 0xa, 0, 0x5, 0, 0x40, 0x3f, 0xf2,
+	0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33,
+	0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xe, 0, 0,
+	0, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43,
+	0x6f, 0x6f, 0x72, 0x64, 0x73, 0x14, 0, 0x34, 0, 0x1,
+	0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64,
+	0x73, 0x32, 0x64, 0x1, 0, 0xd, 0, 0, 0, 0x74,
+	0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, 0x72,
+	0x64, 0x73, 0xe, 0, 0x1, 0, 0xe, 0, 0, 0,
+	0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f,
+	0x6f, 0x72, 0x64, 0x73, 0xf, 0, 0x14, 0, 0xb, 0,
+	0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x4d, 0x65,
+	0x73, 0x68, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
+	0x4c, 0x69, 0x73, 0x74, 0xa, 0, 0x5, 0, 0x42, 0x3f,
+	0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40,
+	0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, 0,
+	0, 0, 0x6e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61,
+	0x6c, 0x73, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, 0,
+	0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x64,
+	0x65, 0x78, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, 0,
+	0x1, 0, 0xb, 0, 0, 0, 0x66, 0x61, 0x63, 0x65,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xe, 0, 0x1,
+	0, 0xc, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xf, 0, 0x14,
+	0, 0xe, 0, 0x1, 0, 0x8, 0, 0, 0, 0x4d,
+	0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0xf, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x4d,
+	0x65, 0x73, 0x68, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73,
+	0xa, 0, 0x5, 0, 0x43, 0x3f, 0xf2, 0xf6, 0x86, 0x76,
+	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3,
+	0x29, 0, 0x1, 0, 0x8, 0, 0, 0, 0x6e, 0x4e,
+	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0,
+	0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x6f,
+	0x72, 0x6d, 0x61, 0x6c, 0x73, 0xe, 0, 0x1, 0, 0x8,
+	0, 0, 0, 0x6e, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c,
+	0x73, 0xf, 0, 0x14, 0, 0x29, 0, 0x1, 0, 0xc,
+	0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x4e, 0x6f,
+	0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x1,
+	0, 0x8, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46,
+	0x61, 0x63, 0x65, 0x1, 0, 0xb, 0, 0, 0, 0x66,
+	0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73,
+	0xe, 0, 0x1, 0, 0xc, 0, 0, 0, 0x6e, 0x46,
+	0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73,
+	0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0,
+	0x10, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x56, 0x65,
+	0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x73,
+	0xa, 0, 0x5, 0, 0x21, 0xb8, 0x30, 0x16, 0x42, 0x78,
+	0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3,
+	0x29, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, 0x56,
+	0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
+	0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0xc, 0, 0,
+	0, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f,
+	0x6c, 0x6f, 0x72, 0x1, 0, 0xc, 0, 0, 0, 0x76,
+	0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
+	0x73, 0xe, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e,
+	0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f,
+	0x72, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0x4, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68,
+	0xa, 0, 0x5, 0, 0x44, 0xab, 0x82, 0x3d, 0xda, 0x62,
+	0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33,
+	0x29, 0, 0x1, 0, 0x9, 0, 0, 0, 0x6e, 0x56,
+	0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34,
+	0, 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x1, 0, 0x8, 0, 0, 0, 0x76,
+	0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1,
+	0, 0x9, 0, 0, 0, 0x6e, 0x56, 0x65, 0x72, 0x74,
+	0x69, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0x29, 0,
+	0x1, 0, 0x6, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63,
+	0x65, 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0x8, 0,
+	0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65,
+	0x1, 0, 0x5, 0, 0, 0, 0x66, 0x61, 0x63, 0x65,
+	0x73, 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x6e,
+	0x46, 0x61, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xe,
+	0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0x14, 0, 0, 0, 0x46,
+	0x72, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66,
+	0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, 0xa,
+	0, 0x5, 0, 0x41, 0x3f, 0xf2, 0xf6, 0x86, 0x76, 0xcf,
+	0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1,
+	0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69,
+	0x78, 0x34, 0x78, 0x34, 0x1, 0, 0xb, 0, 0, 0,
+	0x66, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x72, 0x69,
+	0x78, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x5,
+	0, 0, 0, 0x46, 0x72, 0x61, 0x6d, 0x65, 0xa, 0,
+	0x5, 0, 0x46, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11,
+	0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, 0,
+	0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 0,
+	0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, 0x46, 0x6c,
+	0x6f, 0x61, 0x74, 0x4b, 0x65, 0x79, 0x73, 0xa, 0, 0x5,
+	0, 0xa9, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, 0x8f,
+	0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1,
+	0, 0x7, 0, 0, 0, 0x6e, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x73, 0x14, 0, 0x34, 0, 0x2a, 0, 0x1, 0,
+	0x6, 0, 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0xe, 0, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54,
+	0x69, 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b,
+	0x65, 0x79, 0x73, 0xa, 0, 0x5, 0, 0x80, 0xb1, 0x6,
+	0xf4, 0x3b, 0x7b, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33,
+	0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x4, 0, 0,
+	0, 0x74, 0x69, 0x6d, 0x65, 0x14, 0, 0x1, 0, 0x9,
+	0, 0, 0, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65,
+	0x79, 0x73, 0x1, 0, 0x6, 0, 0, 0, 0x74, 0x66,
+	0x6b, 0x65, 0x79, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0xc, 0, 0, 0, 0x41, 0x6e, 0x69, 0x6d,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0xa, 0,
+	0x5, 0, 0xa8, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11,
+	0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0,
+	0x1, 0, 0x7, 0, 0, 0, 0x6b, 0x65, 0x79, 0x54,
+	0x79, 0x70, 0x65, 0x14, 0, 0x29, 0, 0x1, 0, 0x5,
+	0, 0, 0, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x14, 0,
+	0x34, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, 0x69,
+	0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65,
+	0x79, 0x73, 0x1, 0, 0x4, 0, 0, 0, 0x6b, 0x65,
+	0x79, 0x73, 0xe, 0, 0x1, 0, 0x5, 0, 0, 0,
+	0x6e, 0x4b, 0x65, 0x79, 0x73, 0xf, 0, 0x14, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x41,
+	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0xa, 0, 0x5, 0, 0xc0,
+	0x56, 0xbf, 0xe2, 0xf, 0x84, 0xcf, 0x11, 0x8f, 0x52, 0,
+	0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa,
+	0, 0, 0, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6c, 0x6f,
+	0x73, 0x65, 0x64, 0x14, 0, 0x29, 0, 0x1, 0, 0xf,
+	0, 0, 0, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x14, 0,
+	0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0,
+	0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xa,
+	0, 0x5, 0, 0x4f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf,
+	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe,
+	0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x41,
+	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65,
+	0x74, 0xa, 0, 0x5, 0, 0x50, 0xab, 0x82, 0x3d, 0xda,
+	0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4,
+	0x33, 0xe, 0, 0x1, 0, 0x9, 0, 0, 0, 0x41,
+	0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xf, 0,
+	0xb, 0, 0x1f, 0, 0x1, 0, 0xa, 0, 0, 0,
+	0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0xa, 0, 0x5, 0, 0xa0, 0xee, 0x23, 0x3a, 0xb1, 0x94,
+	0xd0, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33,
+	0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x42, 0x49,
+	0x4e, 0x41, 0x52, 0x59, 0xf, 0, 0xb, 0, 0x1f, 0,
+	0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, 0x6c, 0xa,
+	0, 0x5, 0, 0xa1, 0xee, 0x23, 0x3a, 0xb1, 0x94, 0xd0,
+	0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29,
+	0, 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72,
+	0x6c, 0x73, 0x14, 0, 0x34, 0, 0x31, 0, 0x1, 0,
+	0x4, 0, 0, 0, 0x75, 0x72, 0x6c, 0x73, 0xe, 0,
+	0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, 0x6c,
+	0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1,
+	0, 0xf, 0, 0, 0, 0x50, 0x72, 0x6f, 0x67, 0x72,
+	0x65, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x68,
+	0xa, 0, 0x5, 0, 0x60, 0xc3, 0x63, 0x8a, 0x7d, 0x99,
+	0xd0, 0x11, 0x94, 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b,
+	0xe, 0, 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72,
+	0x6c, 0x13, 0, 0x1, 0, 0xa, 0, 0, 0, 0x49,
+	0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0xf,
+	0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x4, 0, 0,
+	0, 0x47, 0x75, 0x69, 0x64, 0xa, 0, 0x5, 0, 0xe0,
+	0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0,
+	0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x5,
+	0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x31, 0x14, 0,
+	0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x64, 0x61,
+	0x74, 0x61, 0x32, 0x14, 0, 0x28, 0, 0x1, 0, 0x5,
+	0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x33, 0x14, 0,
+	0x34, 0, 0x2d, 0, 0x1, 0, 0x5, 0, 0, 0,
+	0x64, 0x61, 0x74, 0x61, 0x34, 0xe, 0, 0x3, 0, 0x8,
+	0, 0, 0, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f,
+	0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, 0x72,
+	0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+	0x79, 0xa, 0, 0x5, 0, 0xe0, 0x21, 0xf, 0x7f, 0xe1,
+	0xbf, 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72,
+	0x71, 0x31, 0, 0x1, 0, 0x3, 0, 0, 0, 0x6b,
+	0x65, 0x79, 0x14, 0, 0x31, 0, 0x1, 0, 0x5, 0,
+	0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x14, 0, 0xb,
+	0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x50,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x61, 0x67,
+	0xa, 0, 0x5, 0, 0xe1, 0x21, 0xf, 0x7f, 0xe1, 0xbf,
+	0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71,
+	0xe, 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x74, 0x79, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0,
+	0xe, 0, 0, 0, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e,
+	0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0xa, 0,
+	0x5, 0, 0xa0, 0x6a, 0x11, 0x98, 0xba, 0xbd, 0xd1, 0x11,
+	0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x1, 0,
+	0x4, 0, 0, 0, 0x47, 0x75, 0x69, 0x64, 0x1, 0,
+	0x12, 0, 0, 0, 0x67, 0x75, 0x69, 0x64, 0x45, 0x78,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75,
+	0x61, 0x6c, 0x14, 0, 0xe, 0, 0x12, 0, 0x12, 0,
+	0x12, 0, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0,
+	0xb, 0, 0, 0, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48,
+	0x61, 0x6e, 0x64, 0x65, 0x64, 0xa, 0, 0x5, 0, 0xa0,
+	0x5e, 0x5d, 0x7f, 0x3a, 0xd5, 0xd1, 0x11, 0x82, 0xc0, 0,
+	0xa0, 0xc9, 0x69, 0x72, 0x71, 0x29, 0, 0x1, 0, 0xc,
+	0, 0, 0, 0x62, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48,
 	0x61, 0x6e, 0x64, 0x65, 0x64, 0x14, 0, 0xb, 0
 };
 
diff --git a/src/dep/include/DXSDK/include/rpcsal.h b/src/dep/include/DXSDK/include/rpcsal.h
index 996bd33..58286e5 100644
--- a/src/dep/include/DXSDK/include/rpcsal.h
+++ b/src/dep/include/DXSDK/include/rpcsal.h
@@ -12,31 +12,31 @@
 // Introduction
 //
 // rpcsal.h provides a set of annotations to describe how RPC functions use their
-// parameters - the assumptions it makes about them, adn the guarantees it makes 
+// parameters - the assumptions it makes about them, adn the guarantees it makes
 // upon finishing.  These annotations are similar to those found in specstrings.h,
 // but are designed to be used by the MIDL compiler when it generates annotations
 // enabled header files.
 //
 // IDL authors do not need to annotate their functions declarations.  The MIDL compiler
-// will interpret the IDL directives and use one of the annotations contained 
-// in this header.  This documentation is intended to help those trying to  understand 
+// will interpret the IDL directives and use one of the annotations contained
+// in this header.  This documentation is intended to help those trying to  understand
 // the MIDL-generated header files or those who maintain their own copies of these files.
 //
 // -------------------------------------------------------------------------------
 // Differences between rpcsal.h and specstrings.h
-// 
+//
 // There are a few important differences between the annotations found in rpcsal.h and
 // those in specstrings.h:
-// 
-// 1. [in] parameters are not marked as read-only.  They may be used for scratch space 
+//
+// 1. [in] parameters are not marked as read-only.  They may be used for scratch space
 // at the server and changes will not affect the client.
 // 2. String versions of each macro alleviates the need for a special type definition
 //
 // -------------------------------------------------------------------------------
 // Interpreting RPC Annotations
 //
-// These annotations are interpreted precisely in the same way as those in specstrings.h.  
-// Please refer to that header for information related to general usage in annotations. 
+// These annotations are interpreted precisely in the same way as those in specstrings.h.
+// Please refer to that header for information related to general usage in annotations.
 //
 // To construct an RPC annotation, concatenate the appropriate value from each category
 // along with a leading __RPC_.  A typical annotation looks like "__RPC__in_string".
@@ -116,17 +116,17 @@
 //
 // 1. Specifying two buffer annotations on a single parameter results in unspecified behavior
 //    (e.g. __RPC__in_bcount(5) __RPC__out_bcount(6)
-// 
-// 2. The size of the buffer and the amount that has been initialized are separate concepts.  
-//    Specify the size using _ecount or _bcount.  Specify the amount that is initialized using 
-//    _full, _part, or _string.  As a special case, a single element buffer does not need 
+//
+// 2. The size of the buffer and the amount that has been initialized are separate concepts.
+//    Specify the size using _ecount or _bcount.  Specify the amount that is initialized using
+//    _full, _part, or _string.  As a special case, a single element buffer does not need
 //    _ecount, _bcount, _full, or _part
-// 
-// 3. The count may be less than the total size of the buffer in which case it describes the 
-//    accessible portion. 
-// 
+//
+// 3. The count may be less than the total size of the buffer in which case it describes the
+//    accessible portion.
+//
 // 4. "__RPC__opt" and "__RPC_deref" are not valid annotations.
-// 
+//
 // 5. The placement of _opt when using _deref is important:
 //      __RPC__deref_opt_...      : Input may be NULL
 //      __RPC__deref_..._opt      : Output may be NULL
@@ -167,10 +167,10 @@ extern "C" {
 #define __RPC__in_ecount_part_opt(size, length)     __RPC__in_ecount_part(size, length) __pre __exceptthat __maybenull
 
 
-#define __RPC__deref_in                             __RPC__in __deref __notnull 
+#define __RPC__deref_in                             __RPC__in __deref __notnull
 #define __RPC__deref_in_string                      __RPC__in   __pre __deref __nullterminated
 #define __RPC__deref_in_opt                         __RPC__deref_in __deref __exceptthat __maybenull
-#define __RPC__deref_opt_in                         __RPC__in __exceptthat __maybenull 
+#define __RPC__deref_opt_in                         __RPC__in __exceptthat __maybenull
 #define __RPC__deref_opt_in_opt                     __RPC__deref_opt_in  __pre __deref __exceptthat __maybenull
 #define __RPC__deref_in_ecount(size)                __RPC__in __pre __deref __elem_readableTo(size)
 #define __RPC__deref_in_ecount_part(size, length)   __RPC__deref_in_ecount(size)  __pre __deref __elem_readableTo(length)
@@ -191,7 +191,7 @@ extern "C" {
 #define __RPC__out_ecount_full(size)                __RPC__out_ecount_part(size, size)
 #define __RPC__out_ecount_full_string(size)         __RPC__out_ecount_full(size) __post  __nullterminated
 
-// [in,out] 
+// [in,out]
 #define __RPC__inout                                __inout
 #define __RPC__inout_string                         __RPC__inout  __pre __nullterminated __post __nullterminated
 #define __RPC__inout_ecount(size)                   __inout_ecount(size)
@@ -199,13 +199,13 @@ extern "C" {
 #define __RPC__inout_ecount_full(size)              __RPC__inout_ecount_part(size, size)
 #define __RPC__inout_ecount_full_string(size)       __RPC__inout_ecount_full(size) __pre __nullterminated __post __nullterminated
 
-// [in,unique] 
+// [in,unique]
 #define __RPC__in_opt                               __RPC__in __pre __exceptthat __maybenull
 #define __RPC__in_opt_string                        __RPC__in_opt   __pre __nullterminated
 #define __RPC__in_ecount_opt(size)                  __RPC__in_ecount(size) __pre __exceptthat __maybenull
 #define __RPC__in_ecount_opt_string(size)           __RPC__in_ecount_opt(size) __pre __nullterminated
 
-// [in,out,unique] 
+// [in,out,unique]
 #define __RPC__inout_opt                            __inout_opt
 #define __RPC__inout_ecount_opt(size)               __inout_ecount_opt(size)
 #define __RPC__inout_ecount_part_opt(size, length) __inout_ecount_part_opt(size, length)
@@ -224,11 +224,11 @@ extern "C" {
 #define __RPC__deref_out_ecount_full(size)          __RPC__deref_out_ecount_part(size,size)
 #define __RPC__deref_out_ecount_full_string(size)   __RPC__deref_out_ecount_full(size) __post __deref __nullterminated
 
-// [in,out] **, second pointer decoration. 
+// [in,out] **, second pointer decoration.
 #define __RPC__deref_inout                          __deref_inout
 #define __RPC__deref_inout_string                   __RPC__deref_inout __pre __deref __nullterminated __post __deref __nullterminated
 #define __RPC__deref_inout_opt                      __deref_inout_opt
-#define __RPC__deref_inout_opt_string               __RPC__deref_inout_opt __deref __nullterminated 
+#define __RPC__deref_inout_opt_string               __RPC__deref_inout_opt __deref __nullterminated
 #define __RPC__deref_inout_ecount_opt(size)         __deref_inout_ecount_opt(size)
 #define __RPC__deref_inout_ecount_part_opt(size, length) __deref_inout_ecount_part_opt(size , length)
 #define __RPC__deref_inout_ecount_full_opt(size)    __RPC__deref_inout_ecount_part_opt(size, size)
@@ -239,7 +239,7 @@ extern "C" {
 
 // #define __RPC_out_opt    out_opt is not allowed in rpc
 
-// [in,out,unique] 
+// [in,out,unique]
 #define __RPC__deref_opt_inout                          __deref_opt_inout
 #define __RPC__deref_opt_inout_ecount(size)             __deref_opt_inout_ecount(size)
 #define __RPC__deref_opt_inout_string                   __RPC__deref_opt_inout __pre __deref __nullterminated __post __deref __nullterminated
@@ -248,21 +248,21 @@ extern "C" {
 #define __RPC__deref_opt_inout_ecount_full_string(size)  __RPC__deref_opt_inout_ecount_full(size) __pre __deref __nullterminated __post __deref __nullterminated
 
 
-// We don't need to specify __pre __deref __exceptthat __maybenull : this is default behavior. While this might not hold in SAL 1.1 syntax, SAL team 
-// believes it's OK. We can revisit if SAL 1.1 can survive. 
-#define __RPC__deref_out_ecount_opt(size)               __RPC__out_ecount(size) __post __deref __exceptthat __maybenull __pre __deref __null 
+// We don't need to specify __pre __deref __exceptthat __maybenull : this is default behavior. While this might not hold in SAL 1.1 syntax, SAL team
+// believes it's OK. We can revisit if SAL 1.1 can survive.
+#define __RPC__deref_out_ecount_opt(size)               __RPC__out_ecount(size) __post __deref __exceptthat __maybenull __pre __deref __null
 #define __RPC__deref_out_ecount_part_opt(size, length)  __RPC__deref_out_ecount_part(size, length) __post __deref __exceptthat __maybenull __pre __deref __null
 #define __RPC__deref_out_ecount_full_opt(size)          __RPC__deref_out_ecount_part_opt(size, size) __pre __deref __null
 #define __RPC__deref_out_ecount_full_opt_string(size)   __RPC__deref_out_ecount_part_opt(size, size) __post __deref __nullterminated __pre __deref __null
 
 #define __RPC__deref_opt_inout_opt                      __deref_opt_inout_opt
 #define __RPC__deref_opt_inout_opt_string               __RPC__deref_opt_inout_opt __pre __deref __nullterminated  __post __deref __nullterminated
-#define __RPC__deref_opt_inout_ecount_opt(size)         __deref_opt_inout_ecount_opt(size)  
+#define __RPC__deref_opt_inout_ecount_opt(size)         __deref_opt_inout_ecount_opt(size)
 #define __RPC__deref_opt_inout_ecount_part_opt(size, length) __deref_opt_inout_ecount_part_opt(size, length)
 #define __RPC__deref_opt_inout_ecount_full_opt(size)    __RPC__deref_opt_inout_ecount_part_opt(size, size)
 #define __RPC__deref_opt_inout_ecount_full_opt_string(size)  __RPC__deref_opt_inout_ecount_full_opt(size) __pre __deref __nullterminated __post __deref __nullterminated
 
-#define __RPC_full_pointer                              __maybenull 
+#define __RPC_full_pointer                              __maybenull
 #define __RPC_unique_pointer                            __maybenull
 #define __RPC_ref_pointer                               __notnull
 #define __RPC_string                                    __nullterminated
@@ -271,12 +271,12 @@ extern "C" {
 
 #define RPC_range(min,max)
 
-#define __RPC__in           
+#define __RPC__in
 #define __RPC__in_string
 #define __RPC__in_opt_string
 #define __RPC__deref_opt_in_opt
 #define __RPC__opt_in_opt_string
-#define __RPC__in_ecount(size) 
+#define __RPC__in_ecount(size)
 #define __RPC__in_ecount_full(size)
 #define __RPC__in_ecount_full_string(size)
 #define __RPC__in_ecount_part(size, length)
@@ -285,97 +285,97 @@ extern "C" {
 #define __RPC__inout_ecount_full_opt_string(size)
 #define __RPC__in_ecount_part_opt(size, length)
 
-#define __RPC__deref_in 
+#define __RPC__deref_in
 #define __RPC__deref_in_string
 #define __RPC__deref_opt_in
 #define __RPC__deref_in_opt
-#define __RPC__deref_in_ecount(size) 
-#define __RPC__deref_in_ecount_part(size, length) 
-#define __RPC__deref_in_ecount_full(size) 
+#define __RPC__deref_in_ecount(size)
+#define __RPC__deref_in_ecount_part(size, length)
+#define __RPC__deref_in_ecount_full(size)
 #define __RPC__deref_in_ecount_full_opt(size)
 #define __RPC__deref_in_ecount_full_string(size)
 #define __RPC__deref_in_ecount_full_opt_string(size)
-#define __RPC__deref_in_ecount_opt(size) 
+#define __RPC__deref_in_ecount_opt(size)
 #define __RPC__deref_in_ecount_opt_string(size)
-#define __RPC__deref_in_ecount_part_opt(size, length) 
+#define __RPC__deref_in_ecount_part_opt(size, length)
 
 // [out]
-#define __RPC__out     
-#define __RPC__out_ecount(size) 
-#define __RPC__out_ecount_part(size, length) 
+#define __RPC__out
+#define __RPC__out_ecount(size)
+#define __RPC__out_ecount_part(size, length)
 #define __RPC__out_ecount_full(size)
 #define __RPC__out_ecount_full_string(size)
 
-// [in,out] 
-#define __RPC__inout                                   
+// [in,out]
+#define __RPC__inout
 #define __RPC__inout_string
 #define __RPC__opt_inout
-#define __RPC__inout_ecount(size)                     
-#define __RPC__inout_ecount_part(size, length)    
-#define __RPC__inout_ecount_full(size)          
-#define __RPC__inout_ecount_full_string(size)          
+#define __RPC__inout_ecount(size)
+#define __RPC__inout_ecount_part(size, length)
+#define __RPC__inout_ecount_full(size)
+#define __RPC__inout_ecount_full_string(size)
 
-// [in,unique] 
-#define __RPC__in_opt       
-#define __RPC__in_ecount_opt(size)   
+// [in,unique]
+#define __RPC__in_opt
+#define __RPC__in_ecount_opt(size)
 
 
-// [in,out,unique] 
-#define __RPC__inout_opt    
-#define __RPC__inout_ecount_opt(size)  
-#define __RPC__inout_ecount_part_opt(size, length) 
-#define __RPC__inout_ecount_full_opt(size)     
+// [in,out,unique]
+#define __RPC__inout_opt
+#define __RPC__inout_ecount_opt(size)
+#define __RPC__inout_ecount_part_opt(size, length)
+#define __RPC__inout_ecount_full_opt(size)
 #define __RPC__inout_ecount_full_string(size)
 
 // [out] **
-#define __RPC__deref_out   
+#define __RPC__deref_out
 #define __RPC__deref_out_string
-#define __RPC__deref_out_opt 
+#define __RPC__deref_out_opt
 #define __RPC__deref_out_opt_string
-#define __RPC__deref_out_ecount(size) 
-#define __RPC__deref_out_ecount_part(size, length) 
-#define __RPC__deref_out_ecount_full(size)  
+#define __RPC__deref_out_ecount(size)
+#define __RPC__deref_out_ecount_part(size, length)
+#define __RPC__deref_out_ecount_full(size)
 #define __RPC__deref_out_ecount_full_string(size)
 
 
-// [in,out] **, second pointer decoration. 
-#define __RPC__deref_inout    
+// [in,out] **, second pointer decoration.
+#define __RPC__deref_inout
 #define __RPC__deref_inout_string
-#define __RPC__deref_inout_opt 
+#define __RPC__deref_inout_opt
 #define __RPC__deref_inout_opt_string
 #define __RPC__deref_inout_ecount_full(size)
 #define __RPC__deref_inout_ecount_full_string(size)
-#define __RPC__deref_inout_ecount_opt(size) 
-#define __RPC__deref_inout_ecount_part_opt(size, length) 
-#define __RPC__deref_inout_ecount_full_opt(size) 
-#define __RPC__deref_inout_ecount_full_opt_string(size) 
+#define __RPC__deref_inout_ecount_opt(size)
+#define __RPC__deref_inout_ecount_part_opt(size, length)
+#define __RPC__deref_inout_ecount_full_opt(size)
+#define __RPC__deref_inout_ecount_full_opt_string(size)
 
 // #define __RPC_out_opt    out_opt is not allowed in rpc
 
-// [in,out,unique] 
-#define __RPC__deref_opt_inout  
+// [in,out,unique]
+#define __RPC__deref_opt_inout
 #define __RPC__deref_opt_inout_string
-#define __RPC__deref_opt_inout_ecount(size)     
-#define __RPC__deref_opt_inout_ecount_part(size, length) 
-#define __RPC__deref_opt_inout_ecount_full(size) 
+#define __RPC__deref_opt_inout_ecount(size)
+#define __RPC__deref_opt_inout_ecount_part(size, length)
+#define __RPC__deref_opt_inout_ecount_full(size)
 #define __RPC__deref_opt_inout_ecount_full_string(size)
 
-#define __RPC__deref_out_ecount_opt(size) 
-#define __RPC__deref_out_ecount_part_opt(size, length) 
-#define __RPC__deref_out_ecount_full_opt(size) 
+#define __RPC__deref_out_ecount_opt(size)
+#define __RPC__deref_out_ecount_part_opt(size, length)
+#define __RPC__deref_out_ecount_full_opt(size)
 #define __RPC__deref_out_ecount_full_opt_string(size)
 
-#define __RPC__deref_opt_inout_opt      
+#define __RPC__deref_opt_inout_opt
 #define __RPC__deref_opt_inout_opt_string
-#define __RPC__deref_opt_inout_ecount_opt(size)   
-#define __RPC__deref_opt_inout_ecount_part_opt(size, length) 
-#define __RPC__deref_opt_inout_ecount_full_opt(size) 
-#define __RPC__deref_opt_inout_ecount_full_opt_string(size) 
+#define __RPC__deref_opt_inout_ecount_opt(size)
+#define __RPC__deref_opt_inout_ecount_part_opt(size, length)
+#define __RPC__deref_opt_inout_ecount_full_opt(size)
+#define __RPC__deref_opt_inout_ecount_full_opt_string(size)
 
-#define __RPC_full_pointer  
+#define __RPC_full_pointer
 #define __RPC_unique_pointer
 #define __RPC_ref_pointer
-#define __RPC_string                               
+#define __RPC_string
 
 
 #endif
diff --git a/src/dep/include/DXSDK/include/xact3d.h b/src/dep/include/DXSDK/include/xact3d.h
index bfd2142..499de84 100644
--- a/src/dep/include/DXSDK/include/xact3d.h
+++ b/src/dep/include/DXSDK/include/xact3d.h
@@ -166,7 +166,7 @@
             if (pEmitter->pLFECurve == NULL) {
                 pEmitter->pLFECurve = &DefaultCurve;
             }
-    
+
             X3DAudioCalculate(X3DInstance, pListener, pEmitter, X3DAUDIO_CALCULATE_MATRIX | X3DAUDIO_CALCULATE_DOPPLER | X3DAUDIO_CALCULATE_EMITTER_ANGLE, pDSPSettings);
         }
 
diff --git a/src/dep/include/irrklang/ik_ISoundMixedOutputReceiver.h b/src/dep/include/irrklang/ik_ISoundMixedOutputReceiver.h
index 9d4a93f..fcc354e 100644
--- a/src/dep/include/irrklang/ik_ISoundMixedOutputReceiver.h
+++ b/src/dep/include/irrklang/ik_ISoundMixedOutputReceiver.h
@@ -14,25 +14,25 @@ namespace irrklang
 
 
 //! Interface to be implemented by the user, which recieves the mixed output when it it played by the sound engine.
-/** This can be used to store the sound output as .wav file or for creating a Oscillograph or similar. 
+/** This can be used to store the sound output as .wav file or for creating a Oscillograph or similar.
  Simply implement your own class derived from ISoundMixedOutputReceiver and use ISoundEngine::setMixedDataOutputReceiver
  to let the audio driver know about it. */
 class ISoundMixedOutputReceiver
 {
 public:
-    
+
 	//! destructor
 	virtual ~ISoundMixedOutputReceiver() {};
 
-	//! Called when a chunk of sound has been mixed and is about to be played. 
-	/** Note: This is called from the playing thread of the sound library, so you need to 
+	//! Called when a chunk of sound has been mixed and is about to be played.
+	/** Note: This is called from the playing thread of the sound library, so you need to
 	make everything you are doing in this method thread safe. Additionally, it would
 	be a good idea to do nothing complicated in your implementation and return as fast as possible,
 	otherwise sound output may be stuttering.
 	\param data representing the sound frames which just have been mixed. Sound data always
-	consists of two interleaved sound channels at 16bit per frame. 
-	 \param byteCount Amount of bytes of the data 
-	 \param playbackrate The playback rate at samples per second (usually something like 44000). 
+	consists of two interleaved sound channels at 16bit per frame.
+	 \param byteCount Amount of bytes of the data
+	 \param playbackrate The playback rate at samples per second (usually something like 44000).
 	 This value will not change and always be the same for an instance of an ISoundEngine. */
 	virtual void OnAudioDataReady(const void* data, int byteCount, int playbackrate) = 0;
 
diff --git a/src/dep/include/irrklang/ik_ISoundSource.h b/src/dep/include/irrklang/ik_ISoundSource.h
index 511c9a6..cb2ff46 100644
--- a/src/dep/include/irrklang/ik_ISoundSource.h
+++ b/src/dep/include/irrklang/ik_ISoundSource.h
@@ -27,7 +27,7 @@ namespace irrklang
 
 		//! Sets the stream mode which should be used for a sound played from this source.
 		/** Note that if this is set to ESM_NO_STREAMING, the engine still might decide
-		to stream the sound if it is too big. The threashold for this can be 
+		to stream the sound if it is too big. The threashold for this can be
 		adjusted using ISoundSource::setForcedStreamingThreshold(). */
 		virtual void setStreamMode(E_STREAM_MODE mode) = 0;
 
@@ -45,7 +45,7 @@ namespace irrklang
 		virtual ik_u32 getPlayLength() = 0;
 
 		//! Returns informations about the sound source: channel count (mono/stereo), frame count, sample rate, etc.
-		/** \return Returns the structure filled with 0 or negative values if not known for this sound for example because 
+		/** \return Returns the structure filled with 0 or negative values if not known for this sound for example because
 		because the file could not be opened or similar.
 		Note: If the sound never has been played before, the sound engine will have to open
 		the file and try to get the play lenght from there, so this call could take a bit depending
@@ -55,23 +55,23 @@ namespace irrklang
 		//! Returns if sounds played from this source will support seeking via ISound::setPlayPosition().
 		/* If a sound is seekable depends on the file type and the audio format. For example MOD files
 		cannot be seeked currently.
-		\return Returns true of the sound source supports setPlayPosition() and false if not. 
+		\return Returns true of the sound source supports setPlayPosition() and false if not.
 		Note: If the sound never has been played before, the sound engine will have to open
 		the file and try to get the information from there, so this call could take a bit depending
 		on the type of file. */
 		virtual bool getIsSeekingSupported() = 0;
 
 		//! Sets the default volume for a sound played from this source.
-		/** The default value of this is 1.0f. 
+		/** The default value of this is 1.0f.
 		Note that the default volume is being multiplied with the master volume
-		of ISoundEngine, change this via ISoundEngine::setSoundVolume(). 
+		of ISoundEngine, change this via ISoundEngine::setSoundVolume().
 		//! \param volume 0 (silent) to 1.0f (full volume). Default value is 1.0f. */
 		virtual void setDefaultVolume(ik_f32 volume=1.0f) = 0;
 
 		//! Returns the default volume for a sound played from this source.
 		/** You can influence this default volume value using setDefaultVolume().
 		Note that the default volume is being multiplied with the master volume
-		of ISoundEngine, change this via ISoundEngine::setSoundVolume(). 
+		of ISoundEngine, change this via ISoundEngine::setSoundVolume().
 		//! \return 0 (silent) to 1.0f (full volume). Default value is 1.0f. */
 		virtual ik_f32 getDefaultVolume() = 0;
 
@@ -103,7 +103,7 @@ namespace irrklang
 		minimal distance (using for example setDefaultMinDistance()) to influence this.
 		See ISound::setMaxDistance() for details about what the max distance is.
 		This method only influences the initial distance value of sounds. For changing the
-		distance while the sound is played, use ISound::setMinDistance() 
+		distance while the sound is played, use ISound::setMinDistance()
 		and ISound::setMaxDistance().
 		\param maxDistance Default maximal distance for 3D sounds from this source. Set it to a negative
 		value to let sounds of this source use the engine level default max distance, which
@@ -136,15 +136,15 @@ namespace irrklang
 		//! Sets the threshold size where irrKlang decides to force streaming a file independent of the user specified setting.
 		/** When specifying ESM_NO_STREAMING for playing back a sound file, irrKlang will
 		ignore this setting if the file is bigger than this threshold and stream the file
-		anyway. Please note that if an audio format loader is not able to return the 
-		size of a sound source and returns -1 as length, this will be ignored as well 
+		anyway. Please note that if an audio format loader is not able to return the
+		size of a sound source and returns -1 as length, this will be ignored as well
 		and streaming has to be forced.
-		\param threshold: New threshold. The value is specified in uncompressed bytes and its default value is 
+		\param threshold: New threshold. The value is specified in uncompressed bytes and its default value is
 		about one Megabyte. Set to 0 or a negative value to disable stream forcing. */
 		virtual void setForcedStreamingThreshold(ik_s32 thresholdBytes) = 0;
 
 		//! Returns the threshold size where irrKlang decides to force streaming a file independent of the user specified setting.
-		/**  The value is specified in uncompressed bytes and its default value is 
+		/**  The value is specified in uncompressed bytes and its default value is
 		about one Megabyte. See setForcedStreamingThreshold() for details. */
 		virtual ik_s32 getForcedStreamingThreshold() = 0;
 
@@ -153,7 +153,7 @@ namespace irrklang
 		exact format can be retrieved using getAudioFormat(). Use getAudioFormat().getSampleDataSize()
 		for getting the amount of bytes. The returned pointer will only be valid as long as the sound
 		source exists.
-		This function will only return a pointer to the data if the 
+		This function will only return a pointer to the data if the
 		audio file is not streamed, namely ESM_NO_STREAMING. Otherwise this function will return 0.
 		Note: If the sound never has been played before, the sound engine will have to open
 		the file and decode audio data from there, so this call could take a bit depending
diff --git a/src/dep/include/irrlicht/SSkinMeshBuffer.h b/src/dep/include/irrlicht/SSkinMeshBuffer.h
index 849236a..34653ab 100644
--- a/src/dep/include/irrlicht/SSkinMeshBuffer.h
+++ b/src/dep/include/irrlicht/SSkinMeshBuffer.h
@@ -19,7 +19,7 @@ namespace scene
 struct SSkinMeshBuffer : public IMeshBuffer
 {
 	//! Default constructor
-	SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) : 
+	SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) :
 		ChangedID_Vertex(1),ChangedID_Index(1),MappingHint_Vertex(EHM_NEVER),
 		MappingHint_Index(EHM_NEVER),VertexType(vt),BoundingBoxNeedsRecalculated(true)
 	{
diff --git a/src/dep/include/zthread/AtomicCount.h b/src/dep/include/zthread/AtomicCount.h
index ea042a7..38e67dc 100644
--- a/src/dep/include/zthread/AtomicCount.h
+++ b/src/dep/include/zthread/AtomicCount.h
@@ -33,7 +33,7 @@ namespace ZThread {
   /**
    * @class AtomicCount
    * @author Eric Crahen <http://www.code-foo.com>
-   * @date <2003-07-16T09:41:55-0400> 
+   * @date <2003-07-16T09:41:55-0400>
    * @version 2.3.0
    *
    * This class provides an interface to a small integer whose value can be
@@ -42,33 +42,33 @@ namespace ZThread {
    * counts.
    */
   class ZTHREAD_API AtomicCount : public NonCopyable {
-  
+
     void* _value;
-  
+
   public:
-  
+
     //! Create a new AtomicCount, initialized to a value of 1
     AtomicCount();
 
     //! Destroy a new AtomicCount
     ~AtomicCount();
-  
+
     //! Postfix decrement and return the current value
     size_t operator--(int);
-  
+
     //! Postfix increment and return the current value
-    size_t operator++(int);  
+    size_t operator++(int);
 
     //! Prefix decrement and return the current value
     size_t operator--();
-  
+
     //! Prefix increment and return the current value
-    size_t operator++();  
+    size_t operator++();
 
 
   }; /* AtomicCount */
 
-  
+
 } // namespace ZThread
 
 #endif // __ZTATOMICCOUNT_H__
diff --git a/src/dep/include/zthread/Barrier.h b/src/dep/include/zthread/Barrier.h
index 6aaafa9..ec0d9fc 100644
--- a/src/dep/include/zthread/Barrier.h
+++ b/src/dep/include/zthread/Barrier.h
@@ -33,25 +33,25 @@ namespace ZThread {
   /**
    * @class Barrier
    * @author Eric Crahen <http://www.code-foo.com>
-   * @date <2003-07-16T09:54:01-0400> 
+   * @date <2003-07-16T09:54:01-0400>
    * @version 2.2.1
    *
-   * A Barrier is a Waitable object that serves as synchronization points for 
+   * A Barrier is a Waitable object that serves as synchronization points for
    * a set of threads. A Barrier is constructed for a fixed number (<i>N</i>) of threads.
    * Threads attempting to wait() on a Barrier (<i> 1 - N</i>) will block until the <i>N</i>th
    * thread arrives. The <i>N</i>th thread will awaken all the the others.
-   * 
+   *
    * An optional Runnable command may be associated with the Barrier. This will be run()
    * when the <i>N</i>th thread arrives and Barrier is not broken.
    *
    * <b>Error Checking</b>
    *
-   * A Barrier uses an all-or-nothing. All threads involved must successfully 
-   * meet at Barrier. If any one of those threads leaves before all the threads 
-   * have (as the result of an error or exception) then all threads present at 
+   * A Barrier uses an all-or-nothing. All threads involved must successfully
+   * meet at Barrier. If any one of those threads leaves before all the threads
+   * have (as the result of an error or exception) then all threads present at
    * the Barrier will throw BrokenBarrier_Exception.
    *
-   * A broken Barrier will cause all threads attempting to wait() on it to 
+   * A broken Barrier will cause all threads attempting to wait() on it to
    * throw a BrokenBarrier_Exception.
    *
    * A Barrier will remain 'broken', until it is manually reset().
@@ -77,7 +77,7 @@ namespace ZThread {
     public:
 
     //! Create a Barrier
-    Barrier() 
+    Barrier()
       : _broken(false), _haveTask(false), _count(Count), _generation(0), _arrived(_lock), _task(0) { }
 
     /**
@@ -86,8 +86,8 @@ namespace ZThread {
      *
      * @param task Task to associate with this Barrier
      */
-    Barrier(const Task& task) 
-      : _broken(false), _haveTask(true), _count(Count), _generation(0), _arrived(_lock), 
+    Barrier(const Task& task)
+      : _broken(false), _haveTask(true), _count(Count), _generation(0), _arrived(_lock),
       _task(task) { }
 
     //! Destroy this Barrier
@@ -97,7 +97,7 @@ namespace ZThread {
      * Enter barrier and wait for the other threads to arrive. This can block for an indefinite
      * amount of time.
      *
-     * @exception BrokenBarrier_Exception thrown when any thread has left a wait on this 
+     * @exception BrokenBarrier_Exception thrown when any thread has left a wait on this
      *            Barrier as a result of an error.
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending a wait
@@ -111,13 +111,13 @@ namespace ZThread {
     virtual void wait() {
 
       Guard<LockType> g(_lock);
-    
-      if(_broken) 
+
+      if(_broken)
         throw BrokenBarrier_Exception();
 
       // Break the barrier if an arriving thread is interrupted
       if(Thread::interrupted()) {
-      
+
         // Release the other waiter, propagate the exception
         _arrived.broadcast();
         _broken = true;
@@ -125,14 +125,14 @@ namespace ZThread {
         throw Interrupted_Exception();
 
       }
-    
+
       if(--_count == 0) {
-      
-        // Wake the other threads if this was the last  
+
+        // Wake the other threads if this was the last
         // arriving thread
         _arrived.broadcast();
-      
-        // Try to run the associated task, if it throws then 
+
+        // Try to run the associated task, if it throws then
         // break the barrier and propagate the exception
         try {
 
@@ -159,8 +159,8 @@ namespace ZThread {
 
         } catch(Interrupted_Exception&) {
 
-          // Its possible for a thread to be interrupted before the 
-          // last thread arrives. If the interrupted thread hasn't 
+          // Its possible for a thread to be interrupted before the
+          // last thread arrives. If the interrupted thread hasn't
           // resumed, then just propagate the interruption
 
           if(myGeneration != _generation)
@@ -175,13 +175,13 @@ namespace ZThread {
           throw;
 
         }
-      
+
         // If the thread woke because it was notified by the thread
         // that broke the barrier, throw.
-        if(_broken) 
+        if(_broken)
           throw BrokenBarrier_Exception();
-   
-      } 
+
+      }
 
     }
 
@@ -190,14 +190,14 @@ namespace ZThread {
      * amount of time specified with the timeout parameter. The barrier will not break
      * if a thread leaves this function due to a timeout.
      *
-     * @param timeout maximum amount of time, in milliseconds, to wait before  
+     * @param timeout maximum amount of time, in milliseconds, to wait before
      *
-     * @return 
-     *   - <em>true</em> if the set of tasks being wait for complete before 
+     * @return
+     *   - <em>true</em> if the set of tasks being wait for complete before
      *                   <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> otherwise.
      *
-     * @exception BrokenBarrier_Exception thrown when any thread has left a wait on this 
+     * @exception BrokenBarrier_Exception thrown when any thread has left a wait on this
      *            Barrier as a result of an error.
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending a wait
@@ -211,13 +211,13 @@ namespace ZThread {
     virtual bool wait(unsigned long timeout) {
 
       Guard<LockType> g(_lock);
-    
-      if(_broken) 
+
+      if(_broken)
         throw BrokenBarrier_Exception();
 
       // Break the barrier if an arriving thread is interrupted
       if(Thread::interrupted()) {
-      
+
         // Release the other waiter, propagate the exception
         _arrived.broadcast();
         _broken = true;
@@ -226,14 +226,14 @@ namespace ZThread {
 
       }
 
-    
+
       if(--_count == 0) {
-      
-        // Wake the other threads if this was the last  
+
+        // Wake the other threads if this was the last
         // arriving thread
         _arrived.broadcast();
-      
-        // Try to run the associated task, if it throws then 
+
+        // Try to run the associated task, if it throws then
         // break the barrier and propagate the exception
         try {
 
@@ -261,8 +261,8 @@ namespace ZThread {
 
         } catch(Interrupted_Exception&) {
 
-          // Its possible for a thread to be interrupted before the 
-          // last thread arrives. If the interrupted thread hasn't 
+          // Its possible for a thread to be interrupted before the
+          // last thread arrives. If the interrupted thread hasn't
           // resumed, then just propagate the interruption
 
           if(myGeneration != _generation)
@@ -277,13 +277,13 @@ namespace ZThread {
           throw;
 
         }
-      
+
         // If the thread woke because it was notified by the thread
         // that broke the barrier, throw.
-        if(_broken) 
+        if(_broken)
           throw BrokenBarrier_Exception();
-   
-      } 
+
+      }
 
       return true;
 
@@ -293,12 +293,12 @@ namespace ZThread {
      * Break the Barrier ending the wait for any threads that were waiting on
      * the barrier.
      *
-     * @post the Barrier is broken, all waiting threads will throw the 
+     * @post the Barrier is broken, all waiting threads will throw the
      *       BrokenBarrier_Exception
      */
     void shatter() {
-     
-      Guard<LockType> g(_lock);   
+
+      Guard<LockType> g(_lock);
 
       _broken = true;
       _arrived.broadcast();
@@ -306,23 +306,23 @@ namespace ZThread {
     }
 
     /**
-     * Reset the Barrier. 
+     * Reset the Barrier.
      *
      * @post the Barrier is no longer Broken and can be used again.
      */
     void reset() {
-     
-      Guard<LockType> g(_lock);   
+
+      Guard<LockType> g(_lock);
 
       _broken = false;
       _generation++;
       _count = Count;
-      
+
     }
 
   };
 
-  
+
 } // namespace ZThread
 
 #endif // __ZTBARRIER_H__
diff --git a/src/dep/include/zthread/BiasedReadWriteLock.h b/src/dep/include/zthread/BiasedReadWriteLock.h
index b1de742..1fcff74 100644
--- a/src/dep/include/zthread/BiasedReadWriteLock.h
+++ b/src/dep/include/zthread/BiasedReadWriteLock.h
@@ -36,21 +36,21 @@ namespace ZThread {
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T10:22:34-0400>
    * @version 2.2.7
-   *  
-   * A BiasedReadWriteLock has a bias toward writers. It will prefer read-write access over 
+   *
+   * A BiasedReadWriteLock has a bias toward writers. It will prefer read-write access over
    * read-only access when many threads are contending for access to either Lockable this
    * ReadWriteLock provides.
    *
-   * @see ReadWriteLock 
+   * @see ReadWriteLock
    */
   class BiasedReadWriteLock : public ReadWriteLock {
 
     FastMutex _lock;
     Condition _condRead;
     Condition _condWrite;
-  
+
     volatile int _activeWriters;
-    volatile int _activeReaders; 
+    volatile int _activeReaders;
 
     volatile int _waitingReaders;
     volatile int _waitingWriters;
@@ -70,7 +70,7 @@ namespace ZThread {
         _rwlock.beforeRead();
       }
 
-      virtual bool tryAcquire(unsigned long timeout) {            
+      virtual bool tryAcquire(unsigned long timeout) {
         return _rwlock.beforeReadAttempt(timeout);
       }
 
@@ -96,7 +96,7 @@ namespace ZThread {
         _rwlock.beforeWrite();
       }
 
-      virtual bool tryAcquire(unsigned long timeout) {            
+      virtual bool tryAcquire(unsigned long timeout) {
         return _rwlock.beforeWriteAttempt(timeout);
       }
 
@@ -113,18 +113,18 @@ namespace ZThread {
     WriteLock _wlock;
 
   public:
-  
+
     /**
      * Create a BiasedReadWriteLock
      *
-     * @exception Initialization_Exception thrown if resources could not be 
+     * @exception Initialization_Exception thrown if resources could not be
      *            allocated for this object.
      */
     BiasedReadWriteLock() : _condRead(_lock), _condWrite(_lock), _rlock(*this), _wlock(*this) {
 
       _activeWriters = 0;
       _activeReaders = 0;
- 
+
       _waitingReaders = 0;
       _waitingWriters = 0;
 
@@ -143,64 +143,64 @@ namespace ZThread {
      */
     virtual Lockable& getWriteLock() { return _wlock; }
 
-  
+
   protected:
 
     void beforeRead() {
-    
-      Guard<FastMutex> guard(_lock); 
-    
-      ++_waitingReaders;  
-    
+
+      Guard<FastMutex> guard(_lock);
+
+      ++_waitingReaders;
+
       while(!allowReader()) {
-      
+
         try {
-        
+
           // wait
           _condRead.wait();
-        
+
         } catch(...) {
-        
-          --_waitingReaders;        
+
+          --_waitingReaders;
           throw;
 
         }
-      
+
       }
-    
+
       --_waitingReaders;
       ++_activeReaders;
-    
+
     }
 
     bool beforeReadAttempt(unsigned long timeout) {
-      
-      Guard<FastMutex> guard(_lock); 
+
+      Guard<FastMutex> guard(_lock);
       bool result = false;
 
-      ++_waitingReaders;  
+      ++_waitingReaders;
 
       while(!allowReader()) {
-        
+
         try {
-          
+
           result = _condRead.wait(timeout);
-          
+
         } catch(...) {
-          
-          --_waitingReaders;          
+
+          --_waitingReaders;
           throw;
 
         }
 
       }
-      
+
       --_waitingReaders;
       ++_activeReaders;
 
       return result;
-    }   
-  
+    }
+
 
     void afterRead() {
 
@@ -210,7 +210,7 @@ namespace ZThread {
       {
 
         Guard<FastMutex> guard(_lock);
-      
+
         --_activeReaders;
 
         wakeReader = (_waitingReaders > 0);
@@ -220,62 +220,62 @@ namespace ZThread {
 
       if(wakeWriter)
         _condWrite.signal();
-    
+
       else if(wakeReader)
         _condRead.signal();
 
     }
 
     void beforeWrite() {
-    
+
       Guard<FastMutex> guard(_lock);
-  
+
       ++_waitingWriters;
 
       while(!allowWriter()) {
-        
+
         try {
 
           _condWrite.wait();
-          
+
         } catch(...) {
 
           --_waitingWriters;
           throw;
 
         }
-        
+
       }
-      
+
       --_waitingWriters;
-      ++_activeWriters;    
+      ++_activeWriters;
 
     }
 
     bool beforeWriteAttempt(unsigned long timeout) {
-  
+
       Guard<FastMutex> guard(_lock);
       bool result = false;
 
       ++_waitingWriters;
 
       while(!allowWriter()) {
-        
+
         try {
 
           result = _condWrite.wait(timeout);
-          
+
         } catch(...) {
 
           --_waitingWriters;
           throw;
         }
-        
+
       }
-      
+
       --_waitingWriters;
       ++_activeWriters;
-      
+
       return result;
 
     }
@@ -288,9 +288,9 @@ namespace ZThread {
       {
 
         Guard<FastMutex> guard(_lock);
-      
+
         --_activeWriters;
-      
+
         wakeReader = (_waitingReaders > 0);
         wakeWriter = (_waitingWriters > 0);
 
@@ -298,14 +298,14 @@ namespace ZThread {
 
       if(wakeWriter)
         _condWrite.signal();
-    
+
       else if(wakeReader)
         _condRead.signal();
-   
+
     }
 
     bool allowReader() {
-      return (_activeWriters == 0);   
+      return (_activeWriters == 0);
     }
 
     bool allowWriter() {
diff --git a/src/dep/include/zthread/BlockingQueue.h b/src/dep/include/zthread/BlockingQueue.h
index e384893..8d5976a 100644
--- a/src/dep/include/zthread/BlockingQueue.h
+++ b/src/dep/include/zthread/BlockingQueue.h
@@ -30,14 +30,14 @@
 #include <deque>
 
 namespace ZThread {
- 
+
   /**
    * @class BlockingQueue
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T12:01:43-0400>
    * @version 2.3.0
    *
-   * Like a LockedQueue, a BlockingQueue is a Queue implementation that provides 
+   * Like a LockedQueue, a BlockingQueue is a Queue implementation that provides
    * serialized access to the items added to it. It differs by causing threads
    * accessing the next() methods to block until a value becomes available.
    */
@@ -70,12 +70,12 @@ namespace ZThread {
       virtual void add(const T& item) {
 
         Guard<LockType> g(_lock);
-    
+
         if(_canceled)
           throw Cancellation_Exception();
-        
+
         _queue.push_back(item);
-        
+
         _notEmpty.signal();
 
       }
@@ -88,17 +88,17 @@ namespace ZThread {
         try {
 
           Guard<LockType> g(_lock, timeout);
-      
+
           if(_canceled)
             throw Cancellation_Exception();
-      
+
           _queue.push_back(item);
 
           _notEmpty.signal();
 
         } catch(Timeout_Exception&) { return false; }
- 
-        return true;    
+
+        return true;
 
       }
 
@@ -106,7 +106,7 @@ namespace ZThread {
        * Get a value from this Queue. The calling thread may block indefinitely.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        *
        * @exception Interrupted_Exception thrown if the calling thread is interrupted
@@ -126,10 +126,10 @@ namespace ZThread {
 
         if( _queue.size() == 0 )
           throw Cancellation_Exception();
-        
+
         T item = _queue.front();
         _queue.pop_front();
-    
+
         return item;
 
       }
@@ -142,7 +142,7 @@ namespace ZThread {
        *        the calling thread.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Timeout_Exception thrown if the timeout expires before a value
        *            can be retrieved.
@@ -165,10 +165,10 @@ namespace ZThread {
 
         if(_queue.size() == 0 )
           throw Cancellation_Exception();
-  
+
         T item = _queue.front();
         _queue.pop_front();
-    
+
         return item;
 
       }
@@ -177,7 +177,7 @@ namespace ZThread {
       /**
        * @see Queue::cancel()
        *
-       * @post If threads are blocked on one of the next() functions then 
+       * @post If threads are blocked on one of the next() functions then
        *       they will be awakened with a Cancellation_Exception.
        */
       virtual void cancel() {
@@ -197,7 +197,7 @@ namespace ZThread {
         // Faster check since the queue will not become un-canceled
         if(_canceled)
           return true;
-        
+
         Guard<LockType> g(_lock);
 
         return _canceled;
diff --git a/src/dep/include/zthread/BoundedQueue.h b/src/dep/include/zthread/BoundedQueue.h
index 31b1b91..5e2f27b 100644
--- a/src/dep/include/zthread/BoundedQueue.h
+++ b/src/dep/include/zthread/BoundedQueue.h
@@ -41,10 +41,10 @@ namespace ZThread {
    * A BoundedQueue provides serialized access to a set of values. It differs from other
    * Queues by adding a maximum capacity, giving it the following properties:
    *
-   * - Threads calling the empty() methods will be blocked until the BoundedQueue becomes empty. 
+   * - Threads calling the empty() methods will be blocked until the BoundedQueue becomes empty.
    * - Threads calling the next() methods will be blocked until the BoundedQueue has a value to
-   *   return. 
-   * - Threads calling the add() methods will be blocked until the number of values in the 
+   *   return.
+   * - Threads calling the add() methods will be blocked until the number of values in the
    *   Queue drops below the maximum capacity.
    *
    * @see Queue
@@ -76,36 +76,36 @@ namespace ZThread {
       public:
 
       /**
-       * Create a BoundedQueue with the given capacity. 
-       * 
+       * Create a BoundedQueue with the given capacity.
+       *
        * @param capacity maximum number of values to allow in the Queue at
        *        at any time
        */
       BoundedQueue(size_t capacity)
-        : _notFull(_lock), _notEmpty(_lock), _isEmpty(_lock), 
+        : _notFull(_lock), _notEmpty(_lock), _isEmpty(_lock),
           _capacity(capacity), _canceled(false) {}
-  
+
       //! Destroy this Queue
       virtual ~BoundedQueue() { }
-    
+
       /**
-       * Get the maximum capacity of this Queue. 
+       * Get the maximum capacity of this Queue.
        *
        * @return <i>size_t</i> maximum capacity
        */
-      size_t capacity() { 
-        return _capacity; 
+      size_t capacity() {
+        return _capacity;
       }
 
       /**
-       * Add a value to this Queue. 
+       * Add a value to this Queue.
        *
-       * If the number of values in the queue matches the value returned by <i>capacity</i>() 
-       * then the calling thread will be blocked until at least one value is removed from 
+       * If the number of values in the queue matches the value returned by <i>capacity</i>()
+       * then the calling thread will be blocked until at least one value is removed from
        * the Queue.
        *
        * @param item value to be added to the Queue
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Interrupted_Exception thrown if the thread was interrupted while waiting
        *            to add a value
@@ -116,35 +116,35 @@ namespace ZThread {
        * @see Queue::add(const T& item)
        */
       virtual void add(const T& item) {
-        
+
         Guard<LockType> g(_lock);
-        
-        // Wait for the capacity of the Queue to drop 
+
+        // Wait for the capacity of the Queue to drop
         while ((_queue.size() == _capacity) && !_canceled)
           _notFull.wait();
-      
+
         if(_canceled)
           throw Cancellation_Exception();
 
         _queue.push_back(item);
         _notEmpty.signal(); // Wake any waiters
-      
-    
+
+
       }
-    
+
       /**
-       * Add a value to this Queue. 
+       * Add a value to this Queue.
        *
-       * If the number of values in the queue matches the value returned by <i>capacity</i>() 
-       * then the calling thread will be blocked until at least one value is removed from 
+       * If the number of values in the queue matches the value returned by <i>capacity</i>()
+       * then the calling thread will be blocked until at least one value is removed from
        * the Queue.
        *
        * @param item value to be added to the Queue
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
-       * @return 
-       *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i> 
+       * @return
+       *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i>
        *     milliseconds elapse.
        *   - <em>false</em> otherwise.
        *
@@ -158,24 +158,24 @@ namespace ZThread {
        * @see Queue::add(const T& item, unsigned long timeout)
        */
       virtual bool add(const T& item, unsigned long timeout) {
-    
+
         try {
 
           Guard<LockType> g(_lock, timeout);
-      
-          // Wait for the capacity of the Queue to drop 
+
+          // Wait for the capacity of the Queue to drop
           while ((_queue.size() == _capacity) && !_canceled)
             if(!_notFull.wait(timeout))
               return false;
-      
+
           if(_canceled)
             throw Cancellation_Exception();
-      
+
           _queue.push_back(item);
           _notEmpty.signal(); // Wake any waiters
-      
+
         } catch(Timeout_Exception&) { return false; }
-    
+
         return true;
 
       }
@@ -183,11 +183,11 @@ namespace ZThread {
       /**
        * Retrieve and remove a value from this Queue.
        *
-       * If invoked when there are no values present to return then the calling thread 
+       * If invoked when there are no values present to return then the calling thread
        * will be blocked until a value arrives in the Queue.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Interrupted_Exception thrown if the thread was interrupted while waiting
        *            to retrieve a value
@@ -196,18 +196,18 @@ namespace ZThread {
        * @post The value returned will have been removed from the Queue.
        */
       virtual T next() {
-    
+
         Guard<LockType> g(_lock);
-      
+
         while ( _queue.size() == 0 && !_canceled)
           _notEmpty.wait();
-    
+
         if( _queue.size() == 0) // Queue canceled
-          throw Cancellation_Exception();  
+          throw Cancellation_Exception();
 
         T item = _queue.front();
         _queue.pop_front();
-      
+
         _notFull.signal(); // Wake any thread trying to add
 
         if(_queue.size() == 0) // Wake empty waiters
@@ -220,14 +220,14 @@ namespace ZThread {
       /**
        * Retrieve and remove a value from this Queue.
        *
-       * If invoked when there are no values present to return then the calling thread 
+       * If invoked when there are no values present to return then the calling thread
        * will be blocked until a value arrives in the Queue.
        *
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Timeout_Exception thrown if the timeout expires before a value
        *            can be retrieved.
@@ -236,9 +236,9 @@ namespace ZThread {
        * @post The value returned will have been removed from the Queue.
        */
       virtual T next(unsigned long timeout) {
-      
+
         Guard<LockType> g(_lock, timeout);
-    
+
         // Wait for items to be added
         while (_queue.size() == 0 && !_canceled) {
           if(!_notEmpty.wait(timeout))
@@ -246,7 +246,7 @@ namespace ZThread {
         }
 
         if(_queue.size() == 0)  // Queue canceled
-          throw Cancellation_Exception();  
+          throw Cancellation_Exception();
 
         T item = _queue.front();
         _queue.pop_front();
@@ -255,21 +255,21 @@ namespace ZThread {
 
         if(_queue.size() == 0) // Wake empty() waiters
           _isEmpty.broadcast();
-    
+
         return item;
-    
+
       }
 
       /**
-       * Cancel this queue. 
-       * 
+       * Cancel this queue.
+       *
        * @post Any threads blocked by an add() function will throw a Cancellation_Exception.
        * @post Any threads blocked by a next() function will throw a Cancellation_Exception.
-       * 
+       *
        * @see Queue::cancel()
        */
       virtual void cancel() {
-    
+
         Guard<LockType> g(_lock);
 
         _canceled = true;
@@ -285,7 +285,7 @@ namespace ZThread {
         // Faster check since the Queue will not become un-canceled
         if(_canceled)
           return true;
-    
+
         Guard<LockType> g(_lock);
 
         return _canceled;
@@ -296,7 +296,7 @@ namespace ZThread {
        * @see Queue::size()
        */
       virtual size_t size() {
-  
+
         Guard<LockType> g(_lock);
         return _queue.size();
 
@@ -315,10 +315,10 @@ namespace ZThread {
       /**
        * Test whether any values are available in this Queue.
        *
-       * The calling thread is blocked until there are no values present 
+       * The calling thread is blocked until there are no values present
        * in the Queue.
-       * 
-       * @return 
+       *
+       * @return
        *  - <em>true</em> if there are no values available.
        *  - <em>false</em> if there <i>are</i> values available.
        *
@@ -330,7 +330,7 @@ namespace ZThread {
 
         while(_queue.size() > 0) // Wait for an empty signal
           _isEmpty.wait();
-    
+
         return true;
 
 
@@ -340,13 +340,13 @@ namespace ZThread {
       /**
        * Test whether any values are available in this Queue.
        *
-       * The calling thread is blocked until there are no values present 
+       * The calling thread is blocked until there are no values present
        * in the Queue.
-       * 
+       *
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
-       * @return 
+       * @return
        *  - <em>true</em> if there are no values available.
        *  - <em>false</em> if there <i>are</i> values available.
        *
@@ -361,7 +361,7 @@ namespace ZThread {
 
         while(_queue.size() > 0) // Wait for an empty signal
           _isEmpty.wait(timeout);
-    
+
         return true;
 
       }
diff --git a/src/dep/include/zthread/Cancelable.h b/src/dep/include/zthread/Cancelable.h
index 9151ec8..8d1cae5 100644
--- a/src/dep/include/zthread/Cancelable.h
+++ b/src/dep/include/zthread/Cancelable.h
@@ -36,20 +36,20 @@ namespace ZThread {
    *
    * The Cancelable interface defines a common method of adding general <i>disable-and-exit</i>
    * semantics to some object. By cancel()ing a Cancelable object, a request is
-   * made to disable that object. 
+   * made to disable that object.
    *
    * <b>Disabling</b>
    *
    * A cancel()ed object may not necessarily abort it work immediately. Often, it much more
-   * elegant for a cancel()ed object to complete handling whatever responsibilities have 
-   * been assigned to it, but it will <i>not</i> take on any new responsibility. 
+   * elegant for a cancel()ed object to complete handling whatever responsibilities have
+   * been assigned to it, but it will <i>not</i> take on any new responsibility.
    *
    * <b>Exiting</b>
    *
    * A cancel()ed should complete its responsibilities as soon as possible.
    * Canceling is not only a request to stop taking on new responsibility, and to
-   * complete its current responsibility. Its also a request to complete dealing with its 
-   * current responsibilities, quickly when possible. 
+   * complete its current responsibility. Its also a request to complete dealing with its
+   * current responsibilities, quickly when possible.
    */
   class Cancelable {
   public:
@@ -58,21 +58,21 @@ namespace ZThread {
     virtual ~Cancelable() {}
 
     /**
-     * Canceling a Cancelable object makes a request to disable that object. 
-     * This entails refusing to take on any new responsibility, and completing 
+     * Canceling a Cancelable object makes a request to disable that object.
+     * This entails refusing to take on any new responsibility, and completing
      * its current responsibilities quickly.
      *
      * Canceling an object more than once has no effect.
-     * 
-     * @post The Cancelable object will have permanently transitioned to a 
-     *       disabled state; it will now refuse to accept new responsibility. 
+     *
+     * @post The Cancelable object will have permanently transitioned to a
+     *       disabled state; it will now refuse to accept new responsibility.
      */
     virtual void cancel() = 0;
 
     /**
      * Determine if a Cancelable object has been canceled.
      *
-     * @return 
+     * @return
      *   - <em>true</em> if cancel() was called prior to this function.
      *   - <em>false</em> otherwise.
      */
diff --git a/src/dep/include/zthread/ClassLockable.h b/src/dep/include/zthread/ClassLockable.h
index a10fb49..7c1eb0b 100644
--- a/src/dep/include/zthread/ClassLockable.h
+++ b/src/dep/include/zthread/ClassLockable.h
@@ -26,7 +26,7 @@
 #include "zthread/CountedPtr.h"
 #include "zthread/Mutex.h"
 
-namespace ZThread { 
+namespace ZThread {
 
   /**
    * @class ClassLockable
@@ -43,25 +43,25 @@ namespace ZThread {
     static CountedPtr<LockType> _instance;
     CountedPtr<LockType> _lock;
 
-    public:  
-  
+    public:
+
     //! Create a ClassLockable
-    ClassLockable() 
-      : _lock(_instance) {} 
-  
+    ClassLockable()
+      : _lock(_instance) {}
+
     //! acquire() the ClassLockable
-    virtual void acquire() { 
-      _lock->acquire(); 
+    virtual void acquire() {
+      _lock->acquire();
     }
 
     //! tryAcquire() the ClassLockable
     virtual bool tryAcquire(unsigned long timeout) {
-      return _lock->tryAcquire(timeout); 
+      return _lock->tryAcquire(timeout);
     }
 
     //! release() the ClassLockable
     virtual void release() {
-      _lock->release(); 
+      _lock->release();
     }
 
   };
diff --git a/src/dep/include/zthread/ConcurrentExecutor.h b/src/dep/include/zthread/ConcurrentExecutor.h
index 199fe30..ccfd4a7 100644
--- a/src/dep/include/zthread/ConcurrentExecutor.h
+++ b/src/dep/include/zthread/ConcurrentExecutor.h
@@ -35,7 +35,7 @@ namespace ZThread {
    * @version 2.3.0
    *
    * A ConcurrentExecutor spawns a single thread to service a series of Tasks.
-   * 
+   *
    * @see PoolExecutor.
    */
   class ConcurrentExecutor : public Executor {
@@ -43,20 +43,20 @@ namespace ZThread {
     PoolExecutor _executor;
 
   public:
-    
+
     //! Create a ConcurrentExecutor
-    ConcurrentExecutor(); 
+    ConcurrentExecutor();
 
     /**
      * Interrupting a ConcurrentExecutor will cause the thread running the tasks to be
-     * be interrupted once during the execution of each task that has been submitted 
+     * be interrupted once during the execution of each task that has been submitted
      * at the time this function is called.
-     *  
-     * Tasks that are submitted after this function is called will 
+     *
+     * Tasks that are submitted after this function is called will
      * not be interrupt()ed; unless this function is invoked again().
      *
      * @code
-     * 
+     *
      * void aFunction() {
      *
      *   ConcurrentExecutor executor;
@@ -65,60 +65,60 @@ namespace ZThread {
      *   for(size_t n = 0; n < p; n++)
      *     executor.execute(new aRunnable);
      *
-     *   // Tasks [m, p) may be interrupted, where m is the first task that has 
-     *   // not completed at the time the interrupt() is invoked. 
+     *   // Tasks [m, p) may be interrupted, where m is the first task that has
+     *   // not completed at the time the interrupt() is invoked.
      *   executor.interrupt();
      *
      *   // Submit (q - p) Tasks
      *   for(size_t n = p; n < q; n++)
      *     executor.execute(new Chore);
-     * 
-     *   // Tasks [p, q) are not interrupted 
+     *
+     *   // Tasks [p, q) are not interrupted
      *
      * }
      *
      * @endcode
      */
     virtual void interrupt();
-    
+
     /**
-     * Submit a Task to this Executor. This will not block the current thread 
-     * for very long. The task will be enqueued internally and eventually run 
-     * in the context of the single thread driving all the Tasks submitted to this 
+     * Submit a Task to this Executor. This will not block the current thread
+     * for very long. The task will be enqueued internally and eventually run
+     * in the context of the single thread driving all the Tasks submitted to this
      * Executor.
-     * 
+     *
      * @exception Cancellation_Exception thrown if this Executor has been canceled.
      * The Task being submitted will not be executed by this Executor.
      *
-     * @exception Synchronization_Exception thrown only in the event of an error 
+     * @exception Synchronization_Exception thrown only in the event of an error
      * in the implementation of the library.
      *
      * @see Executor::execute(const Task&)
      */
     virtual void execute(const Task&);
-    
+
     /**
      * @see Cancelable::cancel()
      */
     virtual void cancel();
-    
+
     /**
      * @see Cancelable::isCanceled()
      */
     virtual bool isCanceled();
-    
+
     /**
      * @see PoolExecutor::wait()
      */
     virtual void wait();
-    
+
     /**
      * @see PoolExecutor::wait(unsigned long timeout)
      */
     virtual bool wait(unsigned long timeout);
-    
+
   }; /* ConcurrentExecutor */
-  
+
 } // namespace ZThread
 
 #endif // __ZTCONCURRENTEXECUTOR_H__
diff --git a/src/dep/include/zthread/Condition.h b/src/dep/include/zthread/Condition.h
index eba9361..60f4b54 100644
--- a/src/dep/include/zthread/Condition.h
+++ b/src/dep/include/zthread/Condition.h
@@ -28,7 +28,7 @@
 #include "zthread/Waitable.h"
 
 namespace ZThread {
-  
+
   class FifoConditionImpl;
 
   /**
@@ -37,13 +37,13 @@ namespace ZThread {
    * @date <2003-07-16T14:38:59-0400>
    * @version 2.2.1
    *
-   * A Condition is a Waitable object used to block a thread until a particular 
-   * condition is met. A Condition object is always used in conjunction with Lockable 
+   * A Condition is a Waitable object used to block a thread until a particular
+   * condition is met. A Condition object is always used in conjunction with Lockable
    * object. This object should be a FastMutex, Mutex, PriorityMutex or PriorityInheritanceMutex.
    *
-   * Condition objects are reminiscent of POSIX condition variables in several ways but 
-   * are slightly different. 
-   * 
+   * Condition objects are reminiscent of POSIX condition variables in several ways but
+   * are slightly different.
+   *
    * A Condition is <i>not</i> subject to spurious wakeup.
    *
    * Like all Waitable objects, Conditions are sensitive to Thread::interupt() which can
@@ -52,10 +52,10 @@ namespace ZThread {
    * @see Thread::interupt()
    *
    * Before a wait() is performed on a Condition, the associated Lockable object should
-   * have been acquire()ed. When the wait() begins, that Lockable object is release()d 
-   * (wait() will atomically begin the wait and unlock the Lockable). 
+   * have been acquire()ed. When the wait() begins, that Lockable object is release()d
+   * (wait() will atomically begin the wait and unlock the Lockable).
    *
-   * A thread blocked by wait() will remain so until an exception occurs, or until 
+   * A thread blocked by wait() will remain so until an exception occurs, or until
    * the thread awakened by a signal() or broadcast(). When the thread resumes execution,
    * the associated Lockable is acquire()d before wait() returns.
    *
@@ -66,33 +66,33 @@ namespace ZThread {
   class ZTHREAD_API Condition : public Waitable, private NonCopyable {
 
     FifoConditionImpl* _impl;
-  
+
   public:
-  
+
     /**
      * Create a Condition associated with the given Lockable object.
      *
      * @param l Lockable object to associate with this Condition object.
      */
-    Condition(Lockable& l); 
+    Condition(Lockable& l);
 
     //! Destroy Condition object
     virtual ~Condition();
-  
+
     /**
      * Wake <em>one</em> thread waiting on this Condition.
      *
-     * The associated Lockable need not have been acquire when this function is 
+     * The associated Lockable need not have been acquire when this function is
      * invoked.
      *
      * @post a waiting thread, if any exists, will be awakened.
      */
-    void signal(); 
+    void signal();
 
     /**
      * Wake <em>all</em> threads wait()ing on this Condition.
      *
-     * The associated Lockable need not have been acquire when this function is 
+     * The associated Lockable need not have been acquire when this function is
      * invoked.
      *
      * @post all wait()ing threads, if any exist, will be awakened.
@@ -108,16 +108,16 @@ namespace ZThread {
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
      *
-     * @pre The thread calling this method must have first acquired the associated 
-     *      Lockable object. 
+     * @pre The thread calling this method must have first acquired the associated
+     *      Lockable object.
      *
-     * @post A thread that has resumed execution without exception (because of a signal(), 
-     *       broadcast() or exception) will have acquire()d the associated Lockable object 
+     * @post A thread that has resumed execution without exception (because of a signal(),
+     *       broadcast() or exception) will have acquire()d the associated Lockable object
      *       before returning from a wait().
      *
      * @see Waitable::wait()
      */
-    virtual void wait(); 
+    virtual void wait();
 
     /**
      * Wait for this Condition, blocking the calling thread until a signal or broadcast
@@ -127,28 +127,28 @@ namespace ZThread {
      *
      * @param timeout maximum amount of time (milliseconds) this method could block
      *
-     * @return 
-     *   - <em>true</em> if the Condition receives a signal or broadcast before 
+     * @return
+     *   - <em>true</em> if the Condition receives a signal or broadcast before
      *                   <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> otherwise.
-     *   
+     *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
      *
-     * @pre The thread calling this method must have first acquired the associated 
-     *      Lockable object. 
+     * @pre The thread calling this method must have first acquired the associated
+     *      Lockable object.
      *
-     * @post A thread that has resumed execution without exception (because of a signal(), 
-     *       broadcast() or exception) will have acquire()d the associated Lockable object 
+     * @post A thread that has resumed execution without exception (because of a signal(),
+     *       broadcast() or exception) will have acquire()d the associated Lockable object
      *       before returning from a wait().
      *
      * @see Waitable::wait(unsigned long timeout)
      */
     virtual bool wait(unsigned long timeout);
 
-  
+
   };
-  
+
 } // namespace ZThread
 
 #endif // __ZTCONDITION_H__
diff --git a/src/dep/include/zthread/Config.h b/src/dep/include/zthread/Config.h
index 21e08bf..ee03c83 100644
--- a/src/dep/include/zthread/Config.h
+++ b/src/dep/include/zthread/Config.h
@@ -25,7 +25,7 @@
 
 // =====================================================================================
 // The following section describes the symbols the configure program will define.
-// If you are not using configure (autoconf), then you make want to set these by 
+// If you are not using configure (autoconf), then you make want to set these by
 // uncommenting them here, or whatever other means you'd like.
 // =====================================================================================
 
@@ -75,7 +75,7 @@
 // Uncomment to select the vannila dual mutex implementation of FastRecursiveLock
 // #define ZTHREAD_DUAL_LOCKS 1
 
-// Uncomment to select a POSIX implementation of FastRecursiveLock that does not 
+// Uncomment to select a POSIX implementation of FastRecursiveLock that does not
 // spin, but instead sleeps on a condition variable.
 // #define ZTHREAD_CONDITION_LOCKS 1
 
@@ -92,7 +92,7 @@
 // The following section will attempt to guess the best configuration for your system
 // ===================================================================================
 
-// Select an implementation by checking out the environment, first looking for 
+// Select an implementation by checking out the environment, first looking for
 // compilers, then by looking for other definitions that could be present
 
 #if !defined(ZT_POSIX) && !defined(ZT_WIN9X) && !defined(ZT_WIN32) && !defined(ZT_MACOS)
@@ -116,7 +116,7 @@
 #  define ZT_POSIX
 
 // Check for definitions from well known headers
-#elif defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) 
+#elif defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE)
 
 #  define ZT_POSIX
 
@@ -148,8 +148,8 @@
 
 #endif
 
-// Windows users will get a static build by default, unless they 
-// define either ZTHREAD_IMPORTS or ZTHREAD_EXPORTS. Client code 
+// Windows users will get a static build by default, unless they
+// define either ZTHREAD_IMPORTS or ZTHREAD_EXPORTS. Client code
 // of a dll version of this library should define the first flag;
 // To build the dll version of this library, define the second.
 
@@ -157,29 +157,29 @@
 #  error "Import and export declarations are not valid"
 #else
 
-#  if defined(ZTHREAD_IMPORTS) 
+#  if defined(ZTHREAD_IMPORTS)
 #    define ZTHREAD_API __declspec(dllimport)
-#  elif defined(ZTHREAD_EXPORTS) 
+#  elif defined(ZTHREAD_EXPORTS)
 #    define ZTHREAD_API __declspec(dllexport)
 #  else
-#    define ZTHREAD_API 
+#    define ZTHREAD_API
 #  endif
 
 #endif
 
-// Once the API decorator is configured, create a macro for 
-// explicit template instantiation (whose need can hopefully 
+// Once the API decorator is configured, create a macro for
+// explicit template instantiation (whose need can hopefully
 // be removed from the library)
 
 #if defined(ZTHREAD_EXPORTS)
-#  define EXPLICIT_TEMPLATE(X) template class __declspec( dllexport ) X; 
+#  define EXPLICIT_TEMPLATE(X) template class __declspec( dllexport ) X;
 #elif defined(ZTHREAD_IMPORTS)
-#  define EXPLICIT_TEMPLATE(X) template class __declspec( dllimport ) X; 
+#  define EXPLICIT_TEMPLATE(X) template class __declspec( dllimport ) X;
 #else
 #  define EXPLICIT_TEMPLATE(X)
 #endif
 
-// Give libc a hint, should be defined by the user - but people tend 
+// Give libc a hint, should be defined by the user - but people tend
 // to forget.
 
 #if !defined(REENTRANT)
@@ -192,7 +192,7 @@
 
 #if defined(_MSC_VER)
 #  pragma warning(disable:4275)
-#  pragma warning(disable:4290) 
+#  pragma warning(disable:4290)
 #  pragma warning(disable:4786)
 #  pragma warning(disable:4251)
 #  pragma warning(disable:4355)
@@ -202,16 +202,16 @@
 #if \
 (defined(ZT_POSIX) && defined(ZT_WIN32)) \
  || (defined(ZT_POSIX) && defined(ZT_WIN9X)) \
-    || (defined(ZT_WIN32) && defined(ZT_WIN9X)) 
+    || (defined(ZT_WIN32) && defined(ZT_WIN9X))
 
 #  error "Only one implementation should be selected!"
 
 #endif
 
 #if defined(ZTHREAD_NOINLINE)
-#  define ZTHREAD_INLINE 
+#  define ZTHREAD_INLINE
 #else
-#  define ZTHREAD_INLINE inline 
+#  define ZTHREAD_INLINE inline
 #endif
 
 #endif // __ZTCONFIG_H__
diff --git a/src/dep/include/zthread/CountedPtr.h b/src/dep/include/zthread/CountedPtr.h
index a4dcc6e..11058a1 100644
--- a/src/dep/include/zthread/CountedPtr.h
+++ b/src/dep/include/zthread/CountedPtr.h
@@ -36,7 +36,7 @@
 #endif
 
 namespace ZThread {
-  
+
   /**
    * @class CountedPtr
    *
@@ -100,41 +100,41 @@ namespace ZThread {
       ~CountedPtr() {
 
         if(_count && --(*_count) == 0) {
-   
-          if(_instance) 
+
+          if(_instance)
             delete _instance;
 
           delete _count;
-      
+
         }
 
       }
-  
+
 
 #if !defined(__MWERKS__)
 #if !defined(_MSC_VER) || (_MSC_VER > 1200)
 
       const CountedPtr& operator=(const CountedPtr& ptr) {
-    
+
         typedef CountedPtr<T, CountT> ThisT;
 
         ThisT(ptr).swap(*this);
         return *this;
 
-      } 
+      }
 
 #endif
 #endif
 
       template <typename U, typename V>
       const CountedPtr& operator=(const CountedPtr<U, V>& ptr) {
-    
+
         typedef CountedPtr<T, CountT> ThisT;
 
         ThisT(ptr).swap(*this);
         return *this;
 
-      } 
+      }
 
       void reset() {
 
@@ -155,7 +155,7 @@ namespace ZThread {
 
 #endif
 #endif
-	  
+	
       template <typename U, typename V>
       void swap(CountedPtr<U, V>& ptr) {
 
@@ -221,7 +221,7 @@ namespace ZThread {
         assert(_instance != 0);
         return _instance;
       }
- 
+
       bool operator!() const {
         return _instance == 0;
       }
@@ -229,25 +229,25 @@ namespace ZThread {
       operator bool() const {
         return _instance != 0;
       }
-      
+
     }; /* CountedPtr */
 
-  template<typename U, typename V, typename X, typename Y> 
+  template<typename U, typename V, typename X, typename Y>
     inline bool operator<(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
     return lhs.less(rhs);
   }
 
-  template<typename U, typename V, typename X, typename Y> 
+  template<typename U, typename V, typename X, typename Y>
     inline bool operator==(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
     return lhs.equal(rhs.get);
   }
 
-  template<typename U, typename V, typename X, typename Y> 
+  template<typename U, typename V, typename X, typename Y>
     inline bool operator!=(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
     return !(lhs.equal(rhs.get));
   }
 
-  template<typename U, typename V, typename X, typename Y> 
+  template<typename U, typename V, typename X, typename Y>
     inline void swap(CountedPtr<U, V> const &lhs, CountedPtr<X, Y> const &rhs) {
     lhs.swap(rhs);
   }
@@ -260,17 +260,17 @@ namespace ZThread {
     return lhs.less(rhs);
   }
 
-  template<typename U, typename V> 
+  template<typename U, typename V>
     inline bool operator==(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
     return lhs.equal(rhs.get);
   }
 
-  template<typename U, typename V> 
+  template<typename U, typename V>
     inline bool operator!=(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
     return !(lhs.equal(rhs.get));
   }
 
-  template<typename U, typename V> 
+  template<typename U, typename V>
     inline void swap(CountedPtr<U, V> const &lhs, CountedPtr<U, V> const &rhs) {
     lhs.swap(rhs);
   }
@@ -283,7 +283,7 @@ namespace ZThread {
 #ifdef _MSC_VER
 # pragma warning(pop)
 # pragma warning(pop)
-#endif    
+#endif
 
 
 #endif // __ZTCOUNTEDPTR_H__
diff --git a/src/dep/include/zthread/CountingSemaphore.h b/src/dep/include/zthread/CountingSemaphore.h
index f580a65..ea23300 100644
--- a/src/dep/include/zthread/CountingSemaphore.h
+++ b/src/dep/include/zthread/CountingSemaphore.h
@@ -27,17 +27,17 @@
 #include "zthread/NonCopyable.h"
 
 namespace ZThread {
-  
+
   class FifoSemaphoreImpl;
-  
+
   /**
    * @class CountingSemaphore
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T15:26:18-0400>
    * @version 2.2.1
    *
-   * A CountingSemaphore is an owner-less Lockable object. 
-   * 
+   * A CountingSemaphore is an owner-less Lockable object.
+   *
    * It differs from a normal Semaphore in that there is no upper bound on the count
    * and it will not throw an exception because a maximum value has been exceeded.
    *
@@ -46,17 +46,17 @@ namespace ZThread {
    * Threads blocked on a CountingSemaphore are resumed in FIFO order.
    */
   class ZTHREAD_API CountingSemaphore : public Lockable, private NonCopyable {
-  
-    FifoSemaphoreImpl* _impl;  
+
+    FifoSemaphoreImpl* _impl;
 
   public:
 
     /**
-     * Create a new CountingSemaphore. 
+     * Create a new CountingSemaphore.
      *
      * @param count - initial count
      */
-    CountingSemaphore(int initialCount = 0); 
+    CountingSemaphore(int initialCount = 0);
 
     //! Destroy the CountingSemaphore
     virtual ~CountingSemaphore();
@@ -65,8 +65,8 @@ namespace ZThread {
      * <i>Provided to reflect the traditional Semaphore semantics</i>
      *
      * @see acquire()
-     */ 
-    void wait(); 
+     */
+    void wait();
 
 
     /**
@@ -74,51 +74,51 @@ namespace ZThread {
      *
      * @see tryAcquire(unsigned long timeout)
      */
-    bool tryWait(unsigned long timeout); 
+    bool tryWait(unsigned long timeout);
 
     /**
      * <i>Provided to reflect the traditional Semaphore semantics</i>
      *
      * @see release()
      */
-    void post(); 
+    void post();
+
 
-  
     /**
-     * Get the current count of the semaphore. 
+     * Get the current count of the semaphore.
      *
      * This value may change immediately after this function returns to the calling thread.
      *
      * @return <em>int</em> count
      */
-    virtual int count(); 
-  
+    virtual int count();
+
     /**
-     * Decrement the count, blocking that calling thread if the count becomes 0 or 
-     * less than 0. The calling thread will remain blocked until the count is 
+     * Decrement the count, blocking that calling thread if the count becomes 0 or
+     * less than 0. The calling thread will remain blocked until the count is
      * raised above 0, an exception is thrown or the given amount of time expires.
-     * 
+     *
      * @param timeout maximum amount of time (milliseconds) this method could block
-     * 
-     * @return 
+     *
+     * @return
      *   - <em>true</em> if the Semaphore was acquired before <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> otherwise.
      *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
-     * 
+     *
      * @see Lockable::tryAcquire(unsigned long timeout)
      */
     virtual bool tryAcquire(unsigned long timeout);
 
     /**
-     * Decrement the count, blocking that calling thread if the count becomes 0 or 
-     * less than 0. The calling thread will remain blocked until the count is 
+     * Decrement the count, blocking that calling thread if the count becomes 0 or
+     * less than 0. The calling thread will remain blocked until the count is
      * raised above 0 or if an exception is thrown.
-     * 
+     *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
-     * 
+     *
      * @see Lockable::acquire()
      */
     virtual void acquire();
@@ -129,8 +129,8 @@ namespace ZThread {
      * @see Lockable::release()
      */
     virtual void release();
-  
-  }; 
+
+  };
 
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/Exceptions.h b/src/dep/include/zthread/Exceptions.h
index b720793..7a387fe 100644
--- a/src/dep/include/zthread/Exceptions.h
+++ b/src/dep/include/zthread/Exceptions.h
@@ -27,8 +27,8 @@
 #include "zthread/Config.h"
 #include <string>
 
-namespace ZThread { 
-  
+namespace ZThread {
+
 /**
  * @class Synchronization_Exception
  *
@@ -43,11 +43,11 @@ class Synchronization_Exception {
   static void * operator new[](size_t size);
 
   std::string _msg;
-  
+
 public:
-  
+
   /**
-   * Create a new exception with a default error message 'Synchronization 
+   * Create a new exception with a default error message 'Synchronization
    * Exception'
    */
   Synchronization_Exception() : _msg("Synchronization exception") { }
@@ -67,9 +67,9 @@ public:
   const char* what() const {
     return _msg.c_str();
   }
-  
+
 };
-  
+
 
 /**
  * @class Interrupted_Exception
@@ -88,9 +88,9 @@ class Interrupted_Exception : public Synchronization_Exception {
   Interrupted_Exception(const char* msg) : Synchronization_Exception(msg) { }
 
 };
-  
- 
-  
+
+
+
 /**
  * @class Deadlock_Exception
  *
@@ -106,8 +106,8 @@ class Deadlock_Exception : public Synchronization_Exception {
   Deadlock_Exception(const char* msg) : Synchronization_Exception(msg) { }
 
 };
-  
-  
+
+
 /**
  * @class InvalidOp_Exception
  *
@@ -123,16 +123,16 @@ class InvalidOp_Exception : public Synchronization_Exception {
 
 };
 
-  
-  
+
+
 /**
  * @class Initialization_Exception
  *
- * Thrown when the system has no more resources to create new 
+ * Thrown when the system has no more resources to create new
  * synchronization controls
  */
 class Initialization_Exception : public Synchronization_Exception {
-  
+
   public:
 
   //! Create a new exception
@@ -141,24 +141,24 @@ class Initialization_Exception : public Synchronization_Exception {
   Initialization_Exception(const char*msg) : Synchronization_Exception(msg) { }
 
 };
-  
+
 /**
  * @class Cancellation_Exception
  *
- * Cancellation_Exceptions are thrown by 'Canceled' objects. 
+ * Cancellation_Exceptions are thrown by 'Canceled' objects.
  * @see Cancelable
  */
 class Cancellation_Exception : public Synchronization_Exception {
 
   public:
-  
+
   //! Create a new Cancelltion_Exception
   Cancellation_Exception()  : Synchronization_Exception("Canceled") { }
   //! Create a new Cancelltion_Exception
   Cancellation_Exception(const char*msg) : Synchronization_Exception(msg) { }
-  
+
 };
-  
+
 
 /**
  * @class Timeout_Exception
@@ -171,20 +171,20 @@ class Timeout_Exception : public Synchronization_Exception {
 
   //! Create a new Timeout_Exception
   Timeout_Exception() : Synchronization_Exception("Timeout") { }
-  //! Create a new 
+  //! Create a new
   Timeout_Exception(const char*msg) : Synchronization_Exception(msg) { }
-  
+
 };
 
 /**
  * @class NoSuchElement_Exception
- * 
- * The last operation that was attempted on a Queue could not find 
+ *
+ * The last operation that was attempted on a Queue could not find
  * the item that was indicated (during that last Queue method invocation)
  */
 class NoSuchElement_Exception {
  public:
-  
+
   //! Create a new exception
   NoSuchElement_Exception() {}
 
@@ -193,7 +193,7 @@ class NoSuchElement_Exception {
 /**
  * @class InvalidTask_Exception
  *
- * Thrown when a task is not valid (e.g. null or start()ing a thread with 
+ * Thrown when a task is not valid (e.g. null or start()ing a thread with
  * no overriden run() method)
  */
 class InvalidTask_Exception : public InvalidOp_Exception {
@@ -201,7 +201,7 @@ class InvalidTask_Exception : public InvalidOp_Exception {
 
   //! Create a new exception
   InvalidTask_Exception() : InvalidOp_Exception("Invalid task") {}
-  
+
 };
 
 /**
@@ -221,7 +221,7 @@ class BrokenBarrier_Exception : public Synchronization_Exception {
   BrokenBarrier_Exception(const char* msg) : Synchronization_Exception(msg) { }
 
 };
-  
+
 /**
  * @class Future_Exception
  *
diff --git a/src/dep/include/zthread/Executor.h b/src/dep/include/zthread/Executor.h
index 833d0d4..1c6a81a 100644
--- a/src/dep/include/zthread/Executor.h
+++ b/src/dep/include/zthread/Executor.h
@@ -28,7 +28,7 @@
 
 namespace ZThread {
 
- 
+
   /**
    * @class Executor
    *
@@ -41,27 +41,27 @@ namespace ZThread {
    * be found in the proceedings of the 2002 VikingPLOP conference.
    *
    * <b>Executing</b>
-   * 
+   *
    * - <em>execute</em>()ing task with an Executor will submit the task, scheduling
    *   it for execution at some future time depending on the Executor being used.
    *
    * <b>Disabling</b>
    *
-   * - <em>cancel</em>()ing an Executor will cause it to stop accepting 
-   *   new tasks. 
+   * - <em>cancel</em>()ing an Executor will cause it to stop accepting
+   *   new tasks.
    *
    * <b>Interrupting</b>
    *
-   * - <em>interrupt</em>()ing an Executor will cause the any thread running 
-   *   a task which was submitted prior to the invocation of this function to 
+   * - <em>interrupt</em>()ing an Executor will cause the any thread running
+   *   a task which was submitted prior to the invocation of this function to
    *   be interrupted during the execution of that task.
    *
    * <b>Waiting</b>
    *
-   * - <em>wait</em>()ing on a PoolExecutor will block the calling thread 
+   * - <em>wait</em>()ing on a PoolExecutor will block the calling thread
    *   until all tasks that were submitted prior to the invocation of this function
    *   have completed.
-   * 
+   *
    * @see Cancelable
    * @see Waitable
    */
@@ -69,15 +69,15 @@ namespace ZThread {
   public:
 
     /**
-     * If supported by the Executor, interrupt all tasks submitted prior to 
+     * If supported by the Executor, interrupt all tasks submitted prior to
      * the invocation of this function.
-     */    
+     */
     virtual void interrupt() = 0;
 
     /**
-     * Submit a task to this Executor. 
+     * Submit a task to this Executor.
      *
-     * @param task Task to be run by a thread managed by this executor 
+     * @param task Task to be run by a thread managed by this executor
      *
      * @pre  The Executor should have been canceled prior to this invocation.
      * @post The submitted task will be run at some point in the future by this Executor.
@@ -86,7 +86,7 @@ namespace ZThread {
      *            the invocation of this function.
      */
     virtual void execute(const Task& task) = 0;
-  
+
   };
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/FairReadWriteLock.h b/src/dep/include/zthread/FairReadWriteLock.h
index 8f183b6..908f663 100644
--- a/src/dep/include/zthread/FairReadWriteLock.h
+++ b/src/dep/include/zthread/FairReadWriteLock.h
@@ -36,18 +36,18 @@ namespace ZThread {
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T10:26:25-0400>
    * @version 2.2.7
-   *  
-   * A FairReadWriteLock maintains a balance between the order read-only access 
+   *
+   * A FairReadWriteLock maintains a balance between the order read-only access
    * and read-write access is allowed. Threads contending for the pair of Lockable
    * objects this ReadWriteLock provides will gain access to the locks in FIFO order.
    *
-   * @see ReadWriteLock 
+   * @see ReadWriteLock
    */
   class FairReadWriteLock : public ReadWriteLock {
 
     Mutex _lock;
     Condition _cond;
-  
+
     volatile int _readers;
 
     //! @class ReadLock
@@ -64,16 +64,16 @@ namespace ZThread {
       virtual void acquire() {
 
         Guard<Mutex> g(_rwlock._lock);
-        ++_rwlock._readers; 
+        ++_rwlock._readers;
 
       }
 
       virtual bool tryAcquire(unsigned long timeout) {
-      
+
         if(!_rwlock._lock.tryAcquire(timeout))
           return false;
 
-        ++_rwlock._readers; 
+        ++_rwlock._readers;
         _rwlock._lock.release();
 
         return true;
@@ -82,7 +82,7 @@ namespace ZThread {
       virtual void release() {
 
         Guard<Mutex> g(_rwlock._lock);
-        --_rwlock._readers; 
+        --_rwlock._readers;
 
         if(_rwlock._readers == 0)
           _rwlock._cond.signal();
@@ -121,7 +121,7 @@ namespace ZThread {
       }
 
       virtual bool tryAcquire(unsigned long timeout) {
-      
+
         if(!_rwlock._lock.tryAcquire(timeout))
           return false;
 
@@ -154,11 +154,11 @@ namespace ZThread {
     WriteLock _wlock;
 
   public:
-  
+
     /**
      * Create a BiasedReadWriteLock
      *
-     * @exception Initialization_Exception thrown if resources could not be 
+     * @exception Initialization_Exception thrown if resources could not be
      *            allocated for this object.
      */
     FairReadWriteLock() : _cond(_lock), _readers(0), _rlock(*this), _wlock(*this) {}
@@ -175,7 +175,7 @@ namespace ZThread {
      * @see ReadWriteLock::getWriteLock()
      */
     virtual Lockable& getWriteLock() { return _wlock; }
-  
+
   };
 
 }; // __ZTFAIRREADWRITELOCK_H__
diff --git a/src/dep/include/zthread/FastMutex.h b/src/dep/include/zthread/FastMutex.h
index 1812c3e..819108b 100644
--- a/src/dep/include/zthread/FastMutex.h
+++ b/src/dep/include/zthread/FastMutex.h
@@ -38,10 +38,10 @@ namespace ZThread {
    *
    * A FastMutex is a small fast implementation of a non-recursive, mutually exclusive
    * Lockable object. This implementation is a bit faster than the other Mutex classes
-   * as it involved the least overhead. However, this slight increase in speed is 
-   * gained by sacrificing the robustness provided by the other classes. 
+   * as it involved the least overhead. However, this slight increase in speed is
+   * gained by sacrificing the robustness provided by the other classes.
    *
-   * A FastMutex has the useful property of not being interruptable; that is to say  
+   * A FastMutex has the useful property of not being interruptable; that is to say
    * that acquire() and tryAcquire() will not throw Interrupted_Exceptions.
    *
    * @see Mutex
@@ -53,49 +53,49 @@ namespace ZThread {
    * <b>Error Checking</b>
    *
    * No error checking is performed, this means there is the potential for deadlock.
-   */ 
+   */
   class ZTHREAD_API FastMutex : public Lockable, private NonCopyable {
-    
+
     FastLock* _lock;
 
   public:
-  
+
     //! Create a FastMutex
     FastMutex();
-  
+
     //! Destroy a FastMutex
     virtual ~FastMutex();
-  
+
     /**
-     * Acquire exclusive access to the mutex. The calling thread will block until the 
+     * Acquire exclusive access to the mutex. The calling thread will block until the
      * lock can be acquired. No safety or state checks are performed.
-     * 
+     *
      * @pre The calling thread should <i>not</i> have previously acquired this lock.
-     *      Deadlock will result if the same thread attempts to acquire the mutex more 
-     *      than once. 
+     *      Deadlock will result if the same thread attempts to acquire the mutex more
+     *      than once.
      *
      * @post The calling thread obtains the lock successfully if no exception is thrown.
      * @exception Interrupted_Exception never thrown
      */
     virtual void acquire();
-  
+
     /**
      * Release exclusive access. No safety or state checks are performed.
-     * 
+     *
      * @pre the caller should have previously acquired this lock
      */
     virtual void release();
-  
+
     /**
-     * Try to acquire exclusive access to the mutex. The calling thread will block until the 
+     * Try to acquire exclusive access to the mutex. The calling thread will block until the
      * lock can be acquired. No safety or state checks are performed.
-     * 
+     *
      * @pre The calling thread should <i>not</i> have previously acquired this lock.
-     *      Deadlock will result if the same thread attempts to acquire the mutex more 
-     *      than once. 
+     *      Deadlock will result if the same thread attempts to acquire the mutex more
+     *      than once.
      *
      * @param timeout unused
-     * @return 
+     * @return
      * - <em>true</em> if the lock was acquired
      * - <em>false</em> if the lock was acquired
      *
@@ -103,7 +103,7 @@ namespace ZThread {
      * @exception Interrupted_Exception never thrown
      */
     virtual bool tryAcquire(unsigned long timeout);
-  
+
   }; /* FastMutex */
 
 };
diff --git a/src/dep/include/zthread/FastRecursiveMutex.h b/src/dep/include/zthread/FastRecursiveMutex.h
index a30f4b5..5a3322e 100644
--- a/src/dep/include/zthread/FastRecursiveMutex.h
+++ b/src/dep/include/zthread/FastRecursiveMutex.h
@@ -39,10 +39,10 @@ namespace ZThread {
    *
    * A FastRecursiveMutex is a small fast implementation of a recursive, mutally exclusive
    * Lockable object. This implementation is a bit faster than the other Mutex classes
-   * as it involved the least overhead. However, this slight increase in speed is 
-   * gained by sacrificing the robustness provided by the other classes. 
+   * as it involved the least overhead. However, this slight increase in speed is
+   * gained by sacrificing the robustness provided by the other classes.
    *
-   * A FastRecursiveMutex has the useful property of not being interruptable; that is to say  
+   * A FastRecursiveMutex has the useful property of not being interruptable; that is to say
    * that acquire() and tryAcquire() will not throw Interrupted_Exceptions.
    *
    * @see RecursiveMutex
@@ -54,13 +54,13 @@ namespace ZThread {
    * <b>Error Checking</b>
    *
    * No error checking is performed, this means there is the potential for deadlock.
-   */ 
+   */
   class ZTHREAD_API FastRecursiveMutex : public Lockable, private NonCopyable {
-    
+
     FastRecursiveLock* _lock;
 
   public:
-  
+
     //! Create a new FastRecursiveMutex
     FastRecursiveMutex();
 
@@ -68,7 +68,7 @@ namespace ZThread {
     virtual ~FastRecursiveMutex();
 
     /**
-     * Acquire exclusive access to the mutex. The calling thread will block until the 
+     * Acquire exclusive access to the mutex. The calling thread will block until the
      * lock can be acquired. No safety or state checks are performed. The calling thread
      * may acquire the mutex nore than once.
      *
@@ -76,21 +76,21 @@ namespace ZThread {
      * @exception Interrupted_Exception never thrown
      */
     virtual void acquire();
-  
+
     /**
      * Release access. No safety or state checks are performed.
-     * 
+     *
      * @pre the caller should have previously acquired this lock at least once.
      */
     virtual void release();
-  
+
     /**
-     * Try to acquire exclusive access to the mutex. The calling thread will block until the 
+     * Try to acquire exclusive access to the mutex. The calling thread will block until the
      * lock can be acquired. No safety or state checks are performed. The calling thread
      * may acquire the mutex more than once.
      *
      * @param timeout unused
-     * @return 
+     * @return
      * - <em>true</em> if the lock was acquired
      * - <em>false</em> if the lock was acquired
      *
@@ -98,8 +98,8 @@ namespace ZThread {
      * @exception Interrupted_Exception never thrown
      */
     virtual bool tryAcquire(unsigned long timeout);
-  
-  }; 
+
+  };
 
 } // namespace ZThread
 
diff --git a/src/dep/include/zthread/Guard.h b/src/dep/include/zthread/Guard.h
index 04f265c..af414f2 100644
--- a/src/dep/include/zthread/Guard.h
+++ b/src/dep/include/zthread/Guard.h
@@ -26,15 +26,15 @@
 #include "zthread/NonCopyable.h"
 #include "zthread/Exceptions.h"
 
-namespace ZThread { 
+namespace ZThread {
 
-// 
-// GuardLockingPolicyContract { 
 //
-// createScope(lock_type&)  
-// bool createScope(lock_type&, unsigned long)  
-// destroyScope(lock_type&)  
-// 
+// GuardLockingPolicyContract {
+//
+// createScope(lock_type&)
+// bool createScope(lock_type&, unsigned long)
+// destroyScope(lock_type&)
+//
 // }
 //
 
@@ -59,12 +59,12 @@ class LockHolder {
 
   template <class T>
   LockHolder(T& t) : _lock(extract(t)._lock), _enabled(true) { }
-  
+
   LockHolder(LockHolder& holder) : _lock(holder._lock), _enabled(true) { }
 
   LockHolder(LockType& lock) : _lock(lock), _enabled(true) { }
 
-  void disable() { 
+  void disable() {
     _enabled = false;
   }
 
@@ -78,7 +78,7 @@ class LockHolder {
 
  protected:
 
-  template <class T>  
+  template <class T>
   static LockHolder& extract(T& t) {
     // Design and Evolution of C++, page 328
     return (LockHolder&)(t);
@@ -117,7 +117,7 @@ class CompoundScope {
         return false;
 
       }
-       
+
     return true;
 
   }
@@ -154,7 +154,7 @@ class LockedScope {
    * @param lock2 LockType1& is the LockHolder that wants to share
   template <class LockType1, class LockType2>
   static void shareScope(LockHolder<LockType1>& l1, LockHolder<LockType2>& l2) {
-    
+
     l2.getLock().acquire();
 
   }
@@ -207,7 +207,7 @@ class LockedScope {
  *
  * Locking policy for Lockable objects. This policy release()s a Lockable
  * when the protection scope is created, and it acquire()s a Lockable
- * when the scope is destroyed. 
+ * when the scope is destroyed.
  */
 class UnlockedScope {
  public:
@@ -251,7 +251,7 @@ class UnlockedScope {
   }
 
 };
- 
+
 
 
 /**
@@ -277,7 +277,7 @@ class TimedLockedScope {
 
     if(!l2.getLock().tryAcquire(TimeOut))
       throw Timeout_Exception();
-       
+
   }
 
   template <class LockType>
@@ -338,29 +338,29 @@ class OverlappedScope {
  * @version 2.2.0
  *
  * Scoped locking utility. This template class can be given a Lockable
- * synchronization object and can 'Guard' or serialize access to 
+ * synchronization object and can 'Guard' or serialize access to
  * that method.
- *  
- * For instance, consider a case in which a class or program have a  
- * Mutex object associated with it. Access can be serialized with a 
+ *
+ * For instance, consider a case in which a class or program have a
+ * Mutex object associated with it. Access can be serialized with a
  * Guard as shown below.
  *
  * @code
  *
  * Mutex _mtx;
  * void guarded() {
- * 
+ *
  *    Guard<Mutex> g(_mtx);
  *
  * }
  *
  * @endcode
  *
- * The Guard will lock the synchronization object when it is created and 
- * automatically unlock it when it goes out of scope. This eliminates 
+ * The Guard will lock the synchronization object when it is created and
+ * automatically unlock it when it goes out of scope. This eliminates
  * common mistakes like forgetting to unlock your mutex.
  *
- * An alternative to the above example would be 
+ * An alternative to the above example would be
  *
  * @code
  *
@@ -385,15 +385,15 @@ class Guard : private LockHolder<LockType>, private NonCopyable {
   friend class LockHolder<LockType>;
 
 public:
-  
+
   /**
    * Create a Guard that enforces a the effective protection scope
-   * throughout the lifetime of the Guard object or until the protection 
+   * throughout the lifetime of the Guard object or until the protection
    * scope is modified by another Guard.
    *
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
-   * @post the protection scope may be ended prematurely 
+   * @post the protection scope may be ended prematurely
    */
   Guard(LockType& lock) : LockHolder<LockType>(lock) {
 
@@ -403,12 +403,12 @@ public:
 
   /**
    * Create a Guard that enforces a the effective protection scope
-   * throughout the lifetime of the Guard object or until the protection 
+   * throughout the lifetime of the Guard object or until the protection
    * scope is modified by another Guard.
    *
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
-   * @post the protection scope may be ended prematurely 
+   * @post the protection scope may be ended prematurely
    */
   Guard(LockType& lock, unsigned long timeout) : LockHolder<LockType>(lock) {
 
@@ -419,31 +419,31 @@ public:
 
   /**
    * Create a Guard that shares the effective protection scope
-   * from the given Guard to this Guard. 
+   * from the given Guard to this Guard.
    *
-   * @param g Guard<U, V> guard that is currently enabled 
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param g Guard<U, V> guard that is currently enabled
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
    */
   template <class U, class V>
   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
 
     LockingPolicy::shareScope(*this, extract(g));
-    
+
   }
 
   /**
    * Create a Guard that shares the effective protection scope
-   * from the given Guard to this Guard. 
+   * from the given Guard to this Guard.
    *
-   * @param g Guard guard that is currently enabled 
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param g Guard guard that is currently enabled
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
    */
   Guard(Guard& g) : LockHolder<LockType>(g) {
 
     LockingPolicy::shareScope(*this, g);
-    
+
   }
 
 
@@ -451,8 +451,8 @@ public:
    * Create a Guard that transfers the effective protection scope
    * from the given Guard to this Guard.
    *
-   * @param g Guard<U, V> guard that is currently enabled 
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param g Guard<U, V> guard that is currently enabled
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
    */
   template <class U, class V>
@@ -467,8 +467,8 @@ public:
    * Create a Guard that transfers the effective protection scope
    * from the given Guard to this Guard.
    *
-   * @param g Guard guard that is currently enabled 
-   * @param lock LockType the lock this Guard will use to enforce its 
+   * @param g Guard guard that is currently enabled
+   * @param lock LockType the lock this Guard will use to enforce its
    * protection scope.
    */
   Guard(Guard& g, LockType& lock) : LockHolder<LockType>(lock) {
@@ -476,7 +476,7 @@ public:
     LockingPolicy::transferScope(*this, g);
 
   }
-  
+
 
   /**
    * Unlock a given Lockable object with the destruction of this Guard
@@ -488,14 +488,14 @@ public:
 
 template <class LockType, class LockingPolicy>
 Guard<LockType, LockingPolicy>::~Guard() throw() {
-    
+
   try {
-    
+
     if(!this->isDisabled())
       LockingPolicy::destroyScope(*this);
-    
-  } catch (...) { /* ignore */ }  
-  
+
+  } catch (...) { /* ignore */ }
+
 }
 
 
diff --git a/src/dep/include/zthread/GuardedClass.h b/src/dep/include/zthread/GuardedClass.h
index 4ef3879..1a8ac19 100644
--- a/src/dep/include/zthread/GuardedClass.h
+++ b/src/dep/include/zthread/GuardedClass.h
@@ -34,25 +34,25 @@ namespace ZThread {
    * @date <2003-07-20T20:17:34-0400>
    * @version 2.3.0
    *
-   * A simple wrapper template that uses Guard's to provide 
+   * A simple wrapper template that uses Guard's to provide
    * serialized access to an objects member functions.
    */
   template <class T, class LockType = Mutex>
     class GuardedClass {
-      
+
       LockType _lock;
       T* _ptr;
-      
+
       class TransferedScope {
       public:
-        
+
         template <class LockType1, class LockType2>
           static void shareScope(LockHolder<LockType1>& l1,
                                  LockHolder<LockType2>& l2) {
           l1.disable();
           l2.getLock().acquire();
         }
-        
+
         template <class LockType1>
           static void createScope(LockHolder<LockType1>& l) {
           // Don't acquire the lock when scope the Guard is created
@@ -82,9 +82,9 @@ namespace ZThread {
 
       GuardedClass();
       GuardedClass& operator=(const GuardedClass&);
-      
+
       public:
-      
+
       GuardedClass(T* ptr) : _ptr(ptr) {}
       ~GuardedClass() {
         if(_ptr)
@@ -95,9 +95,9 @@ namespace ZThread {
         Proxy p(_lock, _ptr);
         return p;
       }
-      
+
     };
-  
+
 } // namespace ZThread
 
 #endif // __ZTGUARDEDCLASS_H__
diff --git a/src/dep/include/zthread/Lockable.h b/src/dep/include/zthread/Lockable.h
index 32f7eed..a663498 100644
--- a/src/dep/include/zthread/Lockable.h
+++ b/src/dep/include/zthread/Lockable.h
@@ -25,7 +25,7 @@
 
 #include "zthread/Exceptions.h"
 
-namespace ZThread { 
+namespace ZThread {
 
   /**
    * @class Lockable
@@ -33,18 +33,18 @@ namespace ZThread {
    * @date <2003-07-16T10:33:32-0400>
    * @version 2.3.0
    *
-   * The Lockable interface defines a common method of adding general <i>acquire-release</i> 
-   * semantics to an object. An <i>acquire-release</i> protocol does not necessarily imply 
-   * exclusive access. 
+   * The Lockable interface defines a common method of adding general <i>acquire-release</i>
+   * semantics to an object. An <i>acquire-release</i> protocol does not necessarily imply
+   * exclusive access.
    */
   class Lockable {
-  public:  
-  
+  public:
+
     //! Destroy a Lockable object.
     virtual ~Lockable() {}
 
-    /** 
-     * Acquire the Lockable object. 
+    /**
+     * Acquire the Lockable object.
      *
      * This method may or may not block the caller for an indefinite amount
      * of time. Those details are defined by specializations of this class.
@@ -52,40 +52,40 @@ namespace ZThread {
      * @exception Interrupted_Exception thrown if the calling thread is interrupted before
      *            the operation completes.
      *
-     * @post The Lockable is acquired only if no exception was thrown. 
+     * @post The Lockable is acquired only if no exception was thrown.
      */
     virtual void acquire() = 0;
 
-    /** 
-     * Attempt to acquire the Lockable object. 
+    /**
+     * Attempt to acquire the Lockable object.
      *
      * This method may or may not block the caller for a definite amount
      * of time. Those details are defined by specializations of this class;
-     * however, this method includes a timeout value that can be used to 
-     * limit the maximum amount of time that a specialization <i>could</i> block. 
+     * however, this method includes a timeout value that can be used to
+     * limit the maximum amount of time that a specialization <i>could</i> block.
      *
      * @param timeout - maximum amount of time (milliseconds) this method could block
      *
-     * @return 
-     *   - <em>true</em>  if the operation completes and the Lockable is acquired before 
-     *     the timeout expires. 
+     * @return
+     *   - <em>true</em>  if the operation completes and the Lockable is acquired before
+     *     the timeout expires.
      *   - <em>false</em> if the operation times out before the Lockable can be acquired.
-     * 
+     *
      * @exception Interrupted_Exception thrown if the calling thread is interrupted before
      *            the operation completes.
      *
-     * @post The Lockable is acquired only if no exception was thrown. 
+     * @post The Lockable is acquired only if no exception was thrown.
      */
     virtual bool tryAcquire(unsigned long timeout) = 0;
-  
-    /** 
+
+    /**
      * Release the Lockable object.
      *
      * This method may or may not block the caller for an indefinite amount
      * of time. Those details are defined by specializations of this class.
      *
-     * @post The Lockable is released only if no exception was thrown. 
-     */    
+     * @post The Lockable is released only if no exception was thrown.
+     */
     virtual void release() = 0;
 
   };
diff --git a/src/dep/include/zthread/LockedQueue.h b/src/dep/include/zthread/LockedQueue.h
index 3d42f65..dd62229 100644
--- a/src/dep/include/zthread/LockedQueue.h
+++ b/src/dep/include/zthread/LockedQueue.h
@@ -36,7 +36,7 @@ namespace ZThread {
    * @date <2003-07-16T11:42:33-0400>
    * @version 2.3.0
    *
-   * A LockedQueue is the simple Queue implementation that provides 
+   * A LockedQueue is the simple Queue implementation that provides
    * serialized access to the values added to it.
    */
   template <class T, class LockType, typename StorageType=std::deque<T> >
@@ -65,7 +65,7 @@ namespace ZThread {
       virtual void add(const T& item) {
 
         Guard<LockType> g(_lock);
-    
+
         if(_canceled)
           throw Cancellation_Exception();
 
@@ -77,18 +77,18 @@ namespace ZThread {
        * @see Queue::add(const T& item, unsigned long timeout)
        */
       virtual bool add(const T& item, unsigned long timeout) {
-      
+
         try {
 
           Guard<LockType> g(_lock, timeout);
-      
+
           if(_canceled)
             throw Cancellation_Exception();
-      
+
           _queue.push_back(item);
 
         } catch(Timeout_Exception&) { return false; }
- 
+
         return true;
 
       }
@@ -97,23 +97,23 @@ namespace ZThread {
        * @see Queue::next()
        */
       virtual T next() {
-    
+
         Guard<LockType> g(_lock);
 
         if(_queue.size() == 0 && _canceled)
           throw Cancellation_Exception();
-    
+
         if(_queue.size() == 0)
           throw NoSuchElement_Exception();
 
         T item = _queue.front();
         _queue.pop_front();
-    
+
         return item;
 
       }
 
-      
+
       /**
        * @see Queue::next(unsigned long timeout)
        */
@@ -123,15 +123,15 @@ namespace ZThread {
 
         if(_queue.size() == 0 && _canceled)
           throw Cancellation_Exception();
-    
+
         if(_queue.size() == 0)
           throw NoSuchElement_Exception();
 
         T item = _queue.front();
         _queue.pop_front();
-      
+
         return item;
-      
+
       }
 
 
@@ -139,7 +139,7 @@ namespace ZThread {
        * @see Queue::cancel()
        */
       virtual void cancel() {
- 
+
         Guard<LockType> g(_lock);
 
         _canceled = true;
@@ -150,11 +150,11 @@ namespace ZThread {
        * @see Queue::isCanceled()
        */
       virtual bool isCanceled() {
-    
+
         // Faster check since the queue will not become un-canceled
         if(_canceled)
           return true;
-      
+
         Guard<LockType> g(_lock);
 
         return _canceled;
diff --git a/src/dep/include/zthread/MonitoredQueue.h b/src/dep/include/zthread/MonitoredQueue.h
index 07613aa..87ee1b1 100644
--- a/src/dep/include/zthread/MonitoredQueue.h
+++ b/src/dep/include/zthread/MonitoredQueue.h
@@ -37,12 +37,12 @@ namespace ZThread {
    * @date <2003-07-16T20:23:28-0400>
    * @version 2.3.0
    *
-   * A MonitoredQueue is a Queue implementation that provides  serialized access to the 
-   * items added to it. 
+   * A MonitoredQueue is a Queue implementation that provides  serialized access to the
+   * items added to it.
    *
-   * - Threads calling the empty() methods will be blocked until the BoundedQueue becomes empty. 
+   * - Threads calling the empty() methods will be blocked until the BoundedQueue becomes empty.
    * - Threads calling the next() methods will be blocked until the BoundedQueue has a value to
-   *   return. 
+   *   return.
    *
    * @see Queue
    */
@@ -67,17 +67,17 @@ namespace ZThread {
       public:
 
       //! Create a new MonitoredQueue
-      MonitoredQueue() 
+      MonitoredQueue()
         : _notEmpty(_lock), _isEmpty(_lock), _canceled(false) {}
 
       //! Destroy a MonitoredQueue, delete remaining items
       virtual ~MonitoredQueue() { }
 
       /**
-       * Add a value to this Queue. 
+       * Add a value to this Queue.
        *
        * @param item value to be added to the Queue
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Interrupted_Exception thrown if the thread was interrupted while waiting
        *            to add a value
@@ -90,7 +90,7 @@ namespace ZThread {
       virtual void add(const T& item) {
 
         Guard<LockType> g(_lock);
-    
+
         // Allow no further additions in the canceled state
         if(_canceled)
           throw Cancellation_Exception();
@@ -102,14 +102,14 @@ namespace ZThread {
       }
 
       /**
-       * Add a value to this Queue. 
+       * Add a value to this Queue.
        *
        * @param item value to be added to the Queue
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
-       * @return 
-       *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i> 
+       * @return
+       *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i>
        *     milliseconds elapse.
        *   - <em>false</em> otherwise.
        *
@@ -123,32 +123,32 @@ namespace ZThread {
        * @see Queue::add(const T& item, unsigned long timeout)
        */
       virtual bool add(const T& item, unsigned long timeout) {
-  
+
         try {
 
           Guard<LockType> g(_lock, timeout);
-      
+
           if(_canceled)
             throw Cancellation_Exception();
-      
+
           _queue.push_back(item);
 
           _notEmpty.signal();
 
         } catch(Timeout_Exception&) { return false; }
- 
-        return true;    
+
+        return true;
 
       }
 
       /**
        * Retrieve and remove a value from this Queue.
        *
-       * If invoked when there are no values present to return then the calling thread 
+       * If invoked when there are no values present to return then the calling thread
        * will be blocked until a value arrives in the Queue.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Interrupted_Exception thrown if the thread was interrupted while waiting
        *            to retrieve a value
@@ -157,15 +157,15 @@ namespace ZThread {
        * @post The value returned will have been removed from the Queue.
        */
       virtual T next() {
-      
+
         Guard<LockType> g(_lock);
-      
-        while (_queue.size() == 0 && !_canceled) 
+
+        while (_queue.size() == 0 && !_canceled)
           _notEmpty.wait();
-    
+
         if(_queue.size() == 0) // Queue canceled
-          throw Cancellation_Exception();  
-      
+          throw Cancellation_Exception();
+
         T item = _queue.front();
         _queue.pop_front();
 
@@ -179,14 +179,14 @@ namespace ZThread {
       /**
        * Retrieve and remove a value from this Queue.
        *
-       * If invoked when there are no values present to return then the calling thread 
+       * If invoked when there are no values present to return then the calling thread
        * will be blocked until a value arrives in the Queue.
        *
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
        * @return <em>T</em> next available value
-       * 
+       *
        * @exception Cancellation_Exception thrown if this Queue has been canceled.
        * @exception Timeout_Exception thrown if the timeout expires before a value
        *            can be retrieved.
@@ -195,16 +195,16 @@ namespace ZThread {
        * @post The value returned will have been removed from the Queue.
        */
       virtual T next(unsigned long timeout) {
-  
+
         Guard<LockType> g(_lock, timeout);
-      
+
         while(_queue.size() == 0 && !_canceled) {
           if(!_notEmpty.wait(timeout))
             throw Timeout_Exception();
         }
 
         if( _queue.size() == 0) // Queue canceled
-          throw Cancellation_Exception();  
+          throw Cancellation_Exception();
 
         T item = _queue.front();
         _queue.pop_front();
@@ -218,10 +218,10 @@ namespace ZThread {
 
 
       /**
-       * Cancel this queue. 
-       * 
+       * Cancel this queue.
+       *
        * @post Any threads blocked by a next() function will throw a Cancellation_Exception.
-       * 
+       *
        * @see Queue::cancel()
        */
       virtual void cancel() {
@@ -237,11 +237,11 @@ namespace ZThread {
        * @see Queue::isCanceled()
        */
       virtual bool isCanceled() {
-  
+
         // Faster check since the queue will not become un-canceled
         if(_canceled)
           return true;
-    
+
         Guard<LockType> g(_lock);
 
         return _canceled;
@@ -272,10 +272,10 @@ namespace ZThread {
       /**
        * Test whether any values are available in this Queue.
        *
-       * The calling thread is blocked until there are no values present 
+       * The calling thread is blocked until there are no values present
        * in the Queue.
-       * 
-       * @return 
+       *
+       * @return
        *  - <em>true</em> if there are no values available.
        *  - <em>false</em> if there <i>are</i> values available.
        *
@@ -287,7 +287,7 @@ namespace ZThread {
 
         while(_queue.size() > 0) // Wait for an empty signal
           _isEmpty.wait();
-    
+
         return true;
 
       }
@@ -295,13 +295,13 @@ namespace ZThread {
       /**
        * Test whether any values are available in this Queue.
        *
-       * The calling thread is blocked until there are no values present 
+       * The calling thread is blocked until there are no values present
        * in the Queue.
-       * 
+       *
        * @param timeout maximum amount of time (milliseconds) this method may block
        *        the calling thread.
        *
-       * @return 
+       * @return
        *  - <em>true</em> if there are no values available.
        *  - <em>false</em> if there <i>are</i> values available.
        *
@@ -311,12 +311,12 @@ namespace ZThread {
        * @see Queue::empty()
        */
       virtual bool empty(unsigned long timeout) {
-  
+
         Guard<LockType> g(_lock, timeout);
 
         while(_queue.size() > 0) // Wait for an empty signal
           _isEmpty.wait(timeout);
-    
+
         return true;
 
       }
diff --git a/src/dep/include/zthread/Mutex.h b/src/dep/include/zthread/Mutex.h
index 1b521b1..6c2c6bd 100644
--- a/src/dep/include/zthread/Mutex.h
+++ b/src/dep/include/zthread/Mutex.h
@@ -26,8 +26,8 @@
 #include "zthread/Lockable.h"
 #include "zthread/NonCopyable.h"
 
-namespace ZThread { 
-  
+namespace ZThread {
+
   class FifoMutexImpl;
 
   /**
@@ -39,7 +39,7 @@ namespace ZThread {
    * A Mutex is used to provide serialized (one thread at a time) access to some portion
    * of code. This is accomplished by attempting to acquire the Mutex before entering that
    * piece of code, and by releasing the Mutex when leaving that region. It is a non-reentrant,
-   * MUTual EXclusion Lockable object. 
+   * MUTual EXclusion Lockable object.
    *
    * @see Guard
    *
@@ -49,26 +49,26 @@ namespace ZThread {
    *
    * <b>Error Checking</b>
    *
-   * A Mutex will throw a Deadlock_Exception if an attempt to acquire a Mutex more 
+   * A Mutex will throw a Deadlock_Exception if an attempt to acquire a Mutex more
    * than once is made from the context of the same thread.
    *
-   * A Mutex will throw an InvalidOp_Exception if an attempt to release a Mutex is 
+   * A Mutex will throw an InvalidOp_Exception if an attempt to release a Mutex is
    * made from the context of a thread that does not currently own that Mutex.
    */
   class ZTHREAD_API Mutex : public Lockable, private NonCopyable {
-  
+
     FifoMutexImpl* _impl;
-  
+
   public:
 
     //! Create a new Mutex.
-    Mutex(); 
+    Mutex();
 
     //! Destroy this Mutex.
     virtual ~Mutex();
-  
+
     /**
-     * Acquire a Mutex, possibly blocking until either the current owner of the 
+     * Acquire a Mutex, possibly blocking until either the current owner of the
      * Mutex releases it or until an exception is thrown.
      *
      * Only one thread may acquire() the Mutex at any given time.
@@ -88,14 +88,14 @@ namespace ZThread {
     virtual void acquire();
 
     /**
-     * Acquire a Mutex, possibly blocking until the current owner of the 
+     * Acquire a Mutex, possibly blocking until the current owner of the
      * Mutex releases it, until an exception is thrown or until the given amount
      * of time expires.
      *
      * Only one thread may acquire the Mutex at any given time.
      *
      * @param timeout maximum amount of time (milliseconds) this method could block
-     * @return 
+     * @return
      * - <em>true</em> if the lock was acquired
      * - <em>false</em> if the lock was acquired
      *
@@ -112,7 +112,7 @@ namespace ZThread {
      * @see Lockable::tryAcquire(unsigned long timeout)
      */
     virtual bool tryAcquire(unsigned long timeout);
-  
+
     /**
      * Release a Mutex allowing another thread to acquire it.
      *
@@ -126,7 +126,7 @@ namespace ZThread {
      * @see Lockable::release()
      */
     virtual void release();
-  
+
   };
 
 
diff --git a/src/dep/include/zthread/PoolExecutor.h b/src/dep/include/zthread/PoolExecutor.h
index 82f5c4f..03df37d 100644
--- a/src/dep/include/zthread/PoolExecutor.h
+++ b/src/dep/include/zthread/PoolExecutor.h
@@ -28,7 +28,7 @@
 #include "zthread/Thread.h"
 
 namespace ZThread {
-  
+
   namespace { class ExecutorImpl; }
 
   /**
@@ -38,33 +38,33 @@ namespace ZThread {
    * @date <2003-07-16T22:41:07-0400>
    * @version 2.3.0
    *
-   * A PoolExecutor spawns a set of threads that are used to run tasks 
+   * A PoolExecutor spawns a set of threads that are used to run tasks
    * that are submitted in parallel. A PoolExecutor supports the following
    * optional operations,
    *
-   * - <em>cancel</em>()ing a PoolExecutor will cause it to stop accepting 
-   *   new tasks. 
+   * - <em>cancel</em>()ing a PoolExecutor will cause it to stop accepting
+   *   new tasks.
    *
-   * - <em>interrupt</em>()ing a PoolExecutor will cause the any thread running 
-   *   a task which was submitted prior to the invocation of this function to 
+   * - <em>interrupt</em>()ing a PoolExecutor will cause the any thread running
+   *   a task which was submitted prior to the invocation of this function to
    *   be interrupted during the execution of that task.
    *
-   * - <em>wait</em>()ing on a PoolExecutor will block the calling thread 
+   * - <em>wait</em>()ing on a PoolExecutor will block the calling thread
    *   until all tasks that were submitted prior to the invocation of this function
    *   have completed.
-   * 
+   *
    * @see Executor.
    */
   class PoolExecutor : public Executor {
 
-    //! Reference to the internal implementation 
+    //! Reference to the internal implementation
     CountedPtr< ExecutorImpl > _impl;
-    
+
     //! Cancellation task
     Task _shutdown;
 
   public:
-    
+
     /**
      * Create a PoolExecutor
      *
@@ -77,19 +77,19 @@ namespace ZThread {
 
     /**
      * Invoking this function causes each task that had been submitted prior to
-     * this function to be interrupted. Tasks submitted after the invocation of 
+     * this function to be interrupted. Tasks submitted after the invocation of
      * this function are unaffected.
      *
      * @post Any task submitted prior to the invocation of this function will be
-     *       run in the context of an interrupted thread. 
-     * @post Any thread already executing a task which was submitted prior to the 
-     *       invocation of this function will be interrupted.        
+     *       run in the context of an interrupted thread.
+     * @post Any thread already executing a task which was submitted prior to the
+     *       invocation of this function will be interrupted.
      */
     virtual void interrupt();
 
     /**
      * Alter the number of threads being used to execute submitted tasks.
-     * 
+     *
      * @param n number of worker threads.
      *
      * @pre  <i>n</i> must be greater than 0.
@@ -99,21 +99,21 @@ namespace ZThread {
      *            <i>n</i> is less than 1.
      */
     void size(size_t n);
-        
+
     /**
      * Get the current number of threads being used to execute submitted tasks.
      *
      * @return n number of worker threads.
      */
     size_t size();
-    
+
     /**
-     * Submit a task to this Executor. 
+     * Submit a task to this Executor.
      *
      * This will not block the calling thread very long. The submitted task will
      * be executed at some later point by another thread.
-     * 
-     * @param task Task to be run by a thread managed by this executor 
+     *
+     * @param task Task to be run by a thread managed by this executor
      *
      * @pre  The Executor should have been canceled prior to this invocation.
      * @post The submitted task will be run at some point in the future by this Executor.
@@ -135,7 +135,7 @@ namespace ZThread {
      * @see Cancelable::isCanceled()
      */
     virtual bool isCanceled();
- 
+
     /**
      * Block the calling thread until all tasks submitted prior to this invocation
      * complete.
@@ -151,21 +151,21 @@ namespace ZThread {
      * Block the calling thread until all tasks submitted prior to this invocation
      * complete or until the calling thread is interrupted.
      *
-     * @param timeout maximum amount of time, in milliseconds, to wait for the 
+     * @param timeout maximum amount of time, in milliseconds, to wait for the
      *                currently submitted set of Tasks to complete.
      *
      * @exception Interrupted_Exception thrown if the calling thread is interrupted
      *            before the set of tasks being wait for can complete.
      *
-     * @return 
-     *   - <em>true</em> if the set of tasks being wait for complete before 
+     * @return
+     *   - <em>true</em> if the set of tasks being wait for complete before
      *                   <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> otherwise.
      *
      * @see Waitable::wait(unsigned long timeout)
      */
     virtual bool wait(unsigned long timeout);
-      
+
   }; /* PoolExecutor */
 
 
diff --git a/src/dep/include/zthread/PriorityCondition.h b/src/dep/include/zthread/PriorityCondition.h
index 1fd86c4..a85a000 100644
--- a/src/dep/include/zthread/PriorityCondition.h
+++ b/src/dep/include/zthread/PriorityCondition.h
@@ -28,7 +28,7 @@
 #include "zthread/Waitable.h"
 
 namespace ZThread {
-  
+
   class PriorityConditionImpl;
 
   /**
@@ -49,9 +49,9 @@ namespace ZThread {
   class ZTHREAD_API PriorityCondition : public Waitable, private NonCopyable {
 
     PriorityConditionImpl* _impl;
-  
+
   public:
-  
+
     /**
      * @see Condition::Condition(Lockable& l)
      */
@@ -61,7 +61,7 @@ namespace ZThread {
      * @see Condition::~Condition()
      */
     ~PriorityCondition();
-  
+
     /**
      * @see Condition::signal()
      */
@@ -81,9 +81,9 @@ namespace ZThread {
      * @see Condition::wait(unsigned long timeout)
      */
     virtual bool wait(unsigned long timeout);
-  
+
   };
-  
+
 } // namespace ZThread
 
 #endif // __ZTPRIORITYCONDITION_H__
diff --git a/src/dep/include/zthread/PriorityInheritanceMutex.h b/src/dep/include/zthread/PriorityInheritanceMutex.h
index 1a5f5bf..81c6109 100644
--- a/src/dep/include/zthread/PriorityInheritanceMutex.h
+++ b/src/dep/include/zthread/PriorityInheritanceMutex.h
@@ -26,8 +26,8 @@
 #include "zthread/Lockable.h"
 #include "zthread/NonCopyable.h"
 
-namespace ZThread { 
-  
+namespace ZThread {
+
   class PriorityInheritanceMutexImpl;
 
   /**
@@ -37,27 +37,27 @@ namespace ZThread {
    * @date <2003-07-16T19:37:36-0400>
    * @version 2.2.1
    *
-   * A PriorityInheritanceMutex is similar to a PriorityMutex, it is a non-reentrant, 
-   * priority sensitive MUTual EXclusion Lockable object. It differs only in its 
+   * A PriorityInheritanceMutex is similar to a PriorityMutex, it is a non-reentrant,
+   * priority sensitive MUTual EXclusion Lockable object. It differs only in its
    * scheduling policy.
    *
    * @see PriorityMutex
    *
    * <b>Scheduling</b>
    *
-   * Threads competing to acquire() a PriorityInheritanceMutex are granted access in 
+   * Threads competing to acquire() a PriorityInheritanceMutex are granted access in
    * order of priority. Threads with a higher priority will be given access first.
    *
-   * When a higher priority thread tries to acquire() a PriorityInheritanceMutex and is 
+   * When a higher priority thread tries to acquire() a PriorityInheritanceMutex and is
    * about to be blocked by a lower priority thread that has already acquire()d it, the
-   * lower priority thread will temporarily have its effective priority raised to that 
-   * of the higher priority thread until it release()s the mutex; at which point its 
-   * previous priority will be restored. 
+   * lower priority thread will temporarily have its effective priority raised to that
+   * of the higher priority thread until it release()s the mutex; at which point its
+   * previous priority will be restored.
    */
   class ZTHREAD_API PriorityInheritanceMutex : public Lockable, private NonCopyable {
-  
+
     PriorityInheritanceMutexImpl* _impl;
-  
+
   public:
 
     /**
@@ -69,23 +69,23 @@ namespace ZThread {
      * @see Mutex::~Mutex()
      */
     virtual ~PriorityInheritanceMutex();
-  
+
     /**
      * @see Mutex::acquire()
      */
-    virtual void acquire(); 
+    virtual void acquire();
 
     /**
      * @see Mutex::tryAcquire(unsigned long timeout)
      */
-    virtual bool tryAcquire(unsigned long timeout); 
-  
+    virtual bool tryAcquire(unsigned long timeout);
+
     /**
      * @see Mutex::release()
      */
     virtual void release();
-  
-  }; 
+
+  };
 
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/PriorityMutex.h b/src/dep/include/zthread/PriorityMutex.h
index 477c8d9..b127976 100644
--- a/src/dep/include/zthread/PriorityMutex.h
+++ b/src/dep/include/zthread/PriorityMutex.h
@@ -26,8 +26,8 @@
 #include "zthread/Lockable.h"
 #include "zthread/NonCopyable.h"
 
-namespace ZThread { 
-  
+namespace ZThread {
+
   class PriorityMutexImpl;
 
   /**
@@ -36,9 +36,9 @@ namespace ZThread {
    * @date <2003-07-16T17:35:46-0400>
    * @version 2.2.1
    *
-   * A PriorityMutex is similar to a Mutex, with exception that a PriorityMutex 
-   * has a difference scheduling policy. It is a non-reentrant, priority sensitive 
-   * MUTual EXclusion Lockable object. 
+   * A PriorityMutex is similar to a Mutex, with exception that a PriorityMutex
+   * has a difference scheduling policy. It is a non-reentrant, priority sensitive
+   * MUTual EXclusion Lockable object.
    *
    * @see Mutex
    *
@@ -48,9 +48,9 @@ namespace ZThread {
    * with a higher priority will be given access first.
    */
   class ZTHREAD_API PriorityMutex : public Lockable, private NonCopyable {
-  
+
     PriorityMutexImpl* _impl;
-  
+
   public:
 
     /**
@@ -62,23 +62,23 @@ namespace ZThread {
      * @see Mutex::~Mutex()
      */
     virtual ~PriorityMutex();
-  
+
     /**
      * @see Mutex::acquire()
      */
-    virtual void acquire(); 
+    virtual void acquire();
 
     /**
      * @see Mutex::tryAcquire(unsigned long timeout)
      */
-    virtual bool tryAcquire(unsigned long timeout); 
-  
+    virtual bool tryAcquire(unsigned long timeout);
+
     /**
      * @see Mutex::release()
      */
     virtual void release();
-  
-  }; 
+
+  };
 
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/PrioritySemaphore.h b/src/dep/include/zthread/PrioritySemaphore.h
index 54ef2c4..887691f 100644
--- a/src/dep/include/zthread/PrioritySemaphore.h
+++ b/src/dep/include/zthread/PrioritySemaphore.h
@@ -28,16 +28,16 @@
 #include "zthread/NonCopyable.h"
 
 namespace ZThread {
-  
+
   class PrioritySemaphoreImpl;
- 
+
   /**
    * @class PrioritySemaphore
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T15:36:07-0400>
    * @version 2.2.1
    *
-   * A PrioritySemaphore operates in the same way as a Semaphore. Its an owner-less 
+   * A PrioritySemaphore operates in the same way as a Semaphore. Its an owner-less
    * Lockable object that is sensitive to priority.
    *
    * <b>Scheduling</b>
@@ -47,17 +47,17 @@ namespace ZThread {
    *
    * <b>Error Checking</b>
    *
-   * An attempt to increase a PrioritySemaphore beyond its maximum value will result in 
+   * An attempt to increase a PrioritySemaphore beyond its maximum value will result in
    * an InvalidOp_Exception.
    *
    * @see Semaphore
    */
   class ZTHREAD_API PrioritySemaphore : public Lockable, private NonCopyable {
-  
+
     PrioritySemaphoreImpl* _impl;
-  
+
   public:
-  
+
     /**
      * @see Semaphore::Semaphore(int count, unsigned int maxCount)
      */
@@ -70,19 +70,19 @@ namespace ZThread {
 
     /**
      * @see Semaphore::wait()
-     */ 
+     */
     void wait();
 
     /**
      * @see Semaphore::tryWait(unsigned long)
-     */ 
+     */
     bool tryWait(unsigned long);
 
     /**
      * @see Semaphore::post()
      */
     void post();
-  
+
     /**
      * @see Semaphore::count()
      */
@@ -102,8 +102,8 @@ namespace ZThread {
      * @see Semaphore::release()
      */
     virtual void release();
-      
-  }; 
+
+  };
 
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/Queue.h b/src/dep/include/zthread/Queue.h
index 98b83a1..11a8433 100644
--- a/src/dep/include/zthread/Queue.h
+++ b/src/dep/include/zthread/Queue.h
@@ -35,7 +35,7 @@ namespace ZThread {
    * @version 2.3.0
    *
    * A Queue defines an interface for a value-oriented collection objects (similar to
-   * STL collections). 
+   * STL collections).
    */
   template <typename T>
     class Queue : public Cancelable, private NonCopyable {
@@ -48,7 +48,7 @@ namespace ZThread {
      * Add an object to this Queue.
      *
      * @param item value to be added to the Queue
-     * 
+     *
      * @exception Cancellation_Exception thrown if this Queue has been canceled.
      *
      * @pre  The Queue should not have been canceled prior to the invocation of this function.
@@ -63,8 +63,8 @@ namespace ZThread {
      * @param timeout maximum amount of time (milliseconds) this method may block
      *        the calling thread.
      *
-     * @return 
-     *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i> 
+     * @return
+     *   - <em>true</em> if a copy of <i>item</i> can be added before <i>timeout</i>
      *     milliseconds elapse.
      *   - <em>false</em> otherwise.
      *
@@ -79,7 +79,7 @@ namespace ZThread {
      * Retrieve and remove a value from this Queue.
      *
      * @return <em>T</em> next available value
-     * 
+     *
      * @exception Cancellation_Exception thrown if this Queue has been canceled.
      *
      * @pre  The Queue should not have been canceled prior to the invocation of this function.
@@ -94,7 +94,7 @@ namespace ZThread {
      *        the calling thread.
      *
      * @return <em>T</em> next available value
-     * 
+     *
      * @exception Cancellation_Exception thrown if this Queue has been canceled.
      * @exception Timeout_Exception thrown if the timeout expires before a value
      *            can be retrieved.
@@ -110,28 +110,28 @@ namespace ZThread {
      * the next() methods.
      *
      * Canceling a Queue more than once has no effect.
-     * 
-     * @post The next() methods will continue to return objects until 
-     *       the Queue has been emptied. 
+     *
+     * @post The next() methods will continue to return objects until
+     *       the Queue has been emptied.
      * @post Once emptied, the next() methods will throw a Cancellation_Exception.
      * @post The add() methods will throw a Cancellation_Exceptions from this point on.
      */
     virtual void cancel() = 0;
 
     /**
-     * Count the values present in this Queue. 
+     * Count the values present in this Queue.
      *
-     * @return <em>size_t</em> number of elements available in the Queue. 
+     * @return <em>size_t</em> number of elements available in the Queue.
      */
     virtual size_t size() = 0;
 
     /**
-     * Count the values present in this Queue. 
+     * Count the values present in this Queue.
      *
      * @param timeout maximum amount of time (milliseconds) this method may block
      *        the calling thread.
      *
-     * @return <em>size_t</em> number of elements available in the Queue. 
+     * @return <em>size_t</em> number of elements available in the Queue.
      *
      * @exception Timeout_Exception thrown if <i>timeout</i> milliseconds
      *            expire before a value becomes available
@@ -141,7 +141,7 @@ namespace ZThread {
     /**
      * Test whether any values are available in this Queue.
      *
-     * @return 
+     * @return
      *  - <em>true</em> if there are no values available.
      *  - <em>false</em> if there <i>are</i> values available.
      */
@@ -163,7 +163,7 @@ namespace ZThread {
      * @param timeout maximum amount of time (milliseconds) this method may block
      *        the calling thread.
      *
-     * @return 
+     * @return
      *  - <em>true</em> if there are no values available.
      *  - <em>false</em> if there <i>are</i> values available.
      *
diff --git a/src/dep/include/zthread/ReadWriteLock.h b/src/dep/include/zthread/ReadWriteLock.h
index e01643f..38b429b 100644
--- a/src/dep/include/zthread/ReadWriteLock.h
+++ b/src/dep/include/zthread/ReadWriteLock.h
@@ -27,10 +27,10 @@
 #include "zthread/NonCopyable.h"
 
 namespace ZThread {
-  
+
   /**
    * @class ReadWriteLock
-   * 
+   *
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T10:17:31-0400>
    * @version 2.2.7
@@ -40,21 +40,21 @@ namespace ZThread {
    *
    * @see BiasedReadWriteLock
    * @see FairReadWriteLock
-   */  
+   */
   class ReadWriteLock : public NonCopyable {
   public:
 
     /**
      * Create a ReadWriteLock
      *
-     * @exception Initialization_Exception thrown if resources could not be 
+     * @exception Initialization_Exception thrown if resources could not be
      *            allocated for this object.
      */
     ReadWriteLock() {}
-  
+
     //! Destroy this ReadWriteLock
-    virtual ~ReadWriteLock() {} 
-  
+    virtual ~ReadWriteLock() {}
+
     /**
      * Get a reference to the read-only Lockable.
      *
@@ -71,7 +71,7 @@ namespace ZThread {
      */
     virtual Lockable& getWriteLock() = 0;
 
-      
+
   }; /* ReadWriteLock */
 
 
diff --git a/src/dep/include/zthread/RecursiveMutex.h b/src/dep/include/zthread/RecursiveMutex.h
index 7dda9c5..25df448 100644
--- a/src/dep/include/zthread/RecursiveMutex.h
+++ b/src/dep/include/zthread/RecursiveMutex.h
@@ -26,8 +26,8 @@
 #include "zthread/Lockable.h"
 #include "zthread/NonCopyable.h"
 
-namespace ZThread { 
-  
+namespace ZThread {
+
   class RecursiveMutexImpl;
 
   /**
@@ -37,9 +37,9 @@ namespace ZThread {
    * @date <2003-07-16T17:51:33-0400>
    * @version 2.2.1
    *
-   * A RecursiveMutex is a recursive, MUTual EXclusion Lockable object. It is  
-   * recursive because it can be acquire()d and release()d more than once 
-   * by the same thread, instead of causing a Deadlock_Exception. 
+   * A RecursiveMutex is a recursive, MUTual EXclusion Lockable object. It is
+   * recursive because it can be acquire()d and release()d more than once
+   * by the same thread, instead of causing a Deadlock_Exception.
    *
    * @see Mutex
    * @see Guard
@@ -50,15 +50,15 @@ namespace ZThread {
    *
    * <b>Error Checking</b>
    *
-   * A Mutex will throw an InvalidOp_Exception if an attempt to release() a Mutex is 
+   * A Mutex will throw an InvalidOp_Exception if an attempt to release() a Mutex is
    * made from the context of a thread that does not currently own that Mutex.
    */
   class ZTHREAD_API RecursiveMutex : public Lockable, private NonCopyable {
-  
+
     RecursiveMutexImpl* _impl;
-  
+
   public:
-  
+
     //! Create a new RecursiveMutex.
     RecursiveMutex();
 
@@ -66,10 +66,10 @@ namespace ZThread {
     virtual ~RecursiveMutex();
 
     /**
-     * Acquire a RecursiveMutex, possibly blocking until the the current owner of the 
+     * Acquire a RecursiveMutex, possibly blocking until the the current owner of the
      * releases it or until an exception is thrown.
      *
-     * Only one thread may acquire the RecursiveMutex at any given time. 
+     * Only one thread may acquire the RecursiveMutex at any given time.
      * The same thread may acquire a RecursiveMutex multiple times.
      *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
@@ -80,18 +80,18 @@ namespace ZThread {
      *
      * @see Lockable::acquire()
      */
-    virtual void acquire(); 
+    virtual void acquire();
 
     /**
-     * Acquire a RecursiveMutex, possibly blocking until the the current owner 
+     * Acquire a RecursiveMutex, possibly blocking until the the current owner
      * releases it, until an exception is thrown or until the given amount
      * of time expires.
      *
-     * Only one thread may acquire the RecursiveMutex at any given time. 
+     * Only one thread may acquire the RecursiveMutex at any given time.
      * The same thread may acquire a RecursiveMutex multiple times.
      *
      * @param timeout maximum amount of time (milliseconds) this method could block
-     * @return 
+     * @return
      * - <em>true</em> if the lock was acquired
      * - <em>false</em> if the lock was acquired
      *
@@ -108,16 +108,16 @@ namespace ZThread {
 
     /**
      * Release exclusive access. No safety or state checks are performed.
-     * 
-     * @pre This should not be called more times than the acquire() method was 
+     *
+     * @pre This should not be called more times than the acquire() method was
      *      called.
      *
      * @see Lockable::release()
      */
     virtual void release();
-   
-  }; 
-  
+
+  };
+
 } // namespace ZThread
 
 #endif // __ZTRECURSIVEMUTEX_H__
diff --git a/src/dep/include/zthread/Runnable.h b/src/dep/include/zthread/Runnable.h
index 9862853..bfe8d03 100644
--- a/src/dep/include/zthread/Runnable.h
+++ b/src/dep/include/zthread/Runnable.h
@@ -30,7 +30,7 @@ namespace ZThread {
 
   /**
    * @class Runnable
-   * 
+   *
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T17:45:35-0400>
    * @version 2.2.11
@@ -51,7 +51,7 @@ namespace ZThread {
     virtual void run() = 0;
 
   };
- 
+
 
 }
 
diff --git a/src/dep/include/zthread/Semaphore.h b/src/dep/include/zthread/Semaphore.h
index 2a9e4d0..b01c778 100644
--- a/src/dep/include/zthread/Semaphore.h
+++ b/src/dep/include/zthread/Semaphore.h
@@ -27,16 +27,16 @@
 #include "zthread/NonCopyable.h"
 
 namespace ZThread {
-  
+
   class FifoSemaphoreImpl;
- 
+
   /**
    * @class Semaphore
    * @author Eric Crahen <http://www.code-foo.com>
    * @date <2003-07-16T15:28:01-0400>
    * @version 2.2.1
    *
-   * A Semaphore is an owner-less Lockable object. Its probably best described as 
+   * A Semaphore is an owner-less Lockable object. Its probably best described as
    * a set of 'permits'. A Semaphore is initialized with an initial count and
    * a maximum count, these would correspond to the number of 'permits' currently
    * available and the number of' permits' in total.
@@ -44,28 +44,28 @@ namespace ZThread {
    * - Acquiring the Semaphore means taking a permit, but if there are none
    *   (the count is 0) the Semaphore will block the calling thread.
    *
-   * - Releasing the Semaphore means returning a permit, unblocking a thread 
+   * - Releasing the Semaphore means returning a permit, unblocking a thread
    *   waiting for one.
    *
-   * A Semaphore with an initial value of 1 and maximum value of 1 will act as 
+   * A Semaphore with an initial value of 1 and maximum value of 1 will act as
    * a Mutex.
    *
    * Threads blocked on a Semaphore are resumed in FIFO order.
    *
    */
   class ZTHREAD_API Semaphore : public Lockable, private NonCopyable {
-  
+
     FifoSemaphoreImpl* _impl;
-  
+
   public:
-  
+
     /**
-     * Create a new Semaphore. 
+     * Create a new Semaphore.
      *
      * @param count initial count
      * @param maxCount maximum count
      */
-    Semaphore(int count = 1, unsigned int maxCount = 1); 
+    Semaphore(int count = 1, unsigned int maxCount = 1);
 
     //! Destroy the Semaphore
     virtual ~Semaphore();
@@ -74,8 +74,8 @@ namespace ZThread {
      * <i>Provided to reflect the traditional Semaphore semantics</i>
      *
      * @see acquire()
-     */ 
-    void wait(); 
+     */
+    void wait();
 
 
     /**
@@ -83,52 +83,52 @@ namespace ZThread {
      *
      * @see tryAcquire(unsigned long timeout)
      */
-    bool tryWait(unsigned long timeout); 
+    bool tryWait(unsigned long timeout);
 
     /**
      * <i>Provided to reflect the traditional Semaphore semantics</i>
      *
      * @see release()
      */
-    void post(); 
+    void post();
+
 
-  
     /**
-     * Get the current count of the semaphore. 
+     * Get the current count of the semaphore.
      *
      * This value may change immediately after this function returns to the calling thread.
      *
      * @return <em>int</em> count
      */
-    virtual int count(); 
+    virtual int count();
 
     /**
-     * Decrement the count, blocking that calling thread if the count becomes 0 or 
-     * less than 0. The calling thread will remain blocked until the count is 
+     * Decrement the count, blocking that calling thread if the count becomes 0 or
+     * less than 0. The calling thread will remain blocked until the count is
      * raised above 0, an exception is thrown or the given amount of time expires.
-     * 
+     *
      * @param timeout maximum amount of time (milliseconds) this method could block
-     * 
-     * @return 
+     *
+     * @return
      *   - <em>true</em> if the Semaphore was acquired before <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> otherwise.
      *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
-     * 
+     *
      * @see Lockable::tryAcquire(unsigned long timeout)
      */
-    virtual bool tryAcquire(unsigned long timeout); 
- 
+    virtual bool tryAcquire(unsigned long timeout);
+
 
     /**
-     * Decrement the count, blocking that calling thread if the count becomes 0 or 
-     * less than 0. The calling thread will remain blocked until the count is 
+     * Decrement the count, blocking that calling thread if the count becomes 0 or
+     * less than 0. The calling thread will remain blocked until the count is
      * raised above 0 or if an exception is thrown.
-     * 
+     *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
      *            A thread may be interrupted at any time, prematurely ending any wait.
-     * 
+     *
      * @see Lockable::acquire()
      */
     virtual void acquire();
@@ -137,12 +137,12 @@ namespace ZThread {
      * Increment the count, unblocking one thread if count is positive.
      *
      * @exception InvalidOp_Exception thrown if the maximum count would be exceeded.
-     * 
+     *
      * @see Lockable::release()
      */
     virtual void release();
-  
-  }; 
+
+  };
 
 
 } // namespace ZThread
diff --git a/src/dep/include/zthread/Singleton.h b/src/dep/include/zthread/Singleton.h
index b66c9d0..b8f0d1e 100644
--- a/src/dep/include/zthread/Singleton.h
+++ b/src/dep/include/zthread/Singleton.h
@@ -32,7 +32,7 @@ namespace ZThread {
 //
 // This policy controls how an object is instantiated
 // as well as how and when its destroyed. Phoenix-style
-// singletons are not supported easily with type of policy, 
+// singletons are not supported easily with type of policy,
 // this is intentional since I do not believe that is in
 // the true spirit of a singleton.
 //
@@ -46,9 +46,9 @@ namespace ZThread {
  * @class LocalStaticInstantiation
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T17:57:45-0400>
- * @version 2.2.0 
+ * @version 2.2.0
  *
- * The LocalStaticInstantiation policy allows the creation 
+ * The LocalStaticInstantiation policy allows the creation
  * and lifetime of an instance of a particular type
  * to be managed using static local values. This will
  * abide by the standard C++ rules for static objects
@@ -61,12 +61,12 @@ protected:
    * Create an instance of an object, using a local static. The
    * object will be destroyed by the system.
    *
-   * @param ptr reference to location to receive the address 
+   * @param ptr reference to location to receive the address
    * of the allocated object
    */
   template <class T>
   static void create(T*& ptr) {
-    
+
     static T instance;
     ptr = &instance;
 
@@ -91,9 +91,9 @@ class StaticInstantiationHelper {
  * @class StaticInstantiation
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T17:57:45-0400>
- * @version 2.2.0 
+ * @version 2.2.0
  *
- * The StaticInstantiation policy allows the creation 
+ * The StaticInstantiation policy allows the creation
  * and lifetime of an instance of a particular type
  * to be managed using static instantiation. This will
  * abide by the standard C++ rules for static objects
@@ -105,7 +105,7 @@ protected:
   /**
    * Create an instance of an object using by simply allocating it statically.
    *
-   * @param ptr reference to location to receive the address 
+   * @param ptr reference to location to receive the address
    * of the allocated object
    */
   template <class T>
@@ -118,32 +118,32 @@ protected:
 //! SingletonDestroyer
 template <class T>
 class Destroyer {
-  
+
   T* doomed;
-  
+
  public:
-  
+
   Destroyer(T* q) : doomed(q) {
     assert(doomed);
   }
-  
+
   ~Destroyer();
 
 };
 
 template <class T>
 Destroyer<T>::~Destroyer() {
-  
+
   try {
-    
+
     if(doomed)
       delete doomed;
-    
+
   } catch(...) { }
-  
+
   doomed = 0;
-  
-}   
+
+}
 
 
 /**
@@ -152,10 +152,10 @@ Destroyer<T>::~Destroyer() {
  * @date <2003-07-16T17:57:45-0400>
  * @version 2.2.0
  *
- * The LazyInstantiation policy allows the creation 
+ * The LazyInstantiation policy allows the creation
  * and lifetime of an instance of a particular type
  * to be managed using dynamic allocation and a singleton
- * destroyer. This will abide by the standard C++ rules 
+ * destroyer. This will abide by the standard C++ rules
  * for static objects lifetimes.
  */
 class LazyInstantiation {
@@ -166,33 +166,33 @@ protected:
    * destroyed when an associated Destroyer object (allocated
    * statically) goes out of scope.
    *
-   * @param ptr reference to location to receive the address 
+   * @param ptr reference to location to receive the address
    * of the allocated object
    */
   template <class T>
   static void create(T*& ptr) {
-  
+
     ptr = new T;
     static Destroyer<T> destroyer(ptr);
-  
+
   }
 
 };
 
-  
+
 /**
  * @class Singleton
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T17:57:45-0400>
- * @version 2.2.0 
+ * @version 2.2.0
  *
  * Based on the work of John Vlissidles in his book 'Pattern Hatching'
  * an article by Douglas Schmidtt on double-checked locking and policy
  * templates described by Andrei Alexandrescu.
  *
- * This is a thread safe wrapper for creating Singleton classes. The 
+ * This is a thread safe wrapper for creating Singleton classes. The
  * synchronization method and instantiation methods can be changed
- * easily by specifying different policy implementations as the 
+ * easily by specifying different policy implementations as the
  * templates parameters.
  *
  * @code
@@ -200,7 +200,7 @@ protected:
  * // Most common Singleton
  * Singletion<LonesomeType>
  *
- * // Singleton that uses static storage 
+ * // Singleton that uses static storage
  * Singletion<LonesomeType, StaticInstantiation>
  *
  * // Single-threaded singleton that uses static storage (Meyers-like)
@@ -213,9 +213,9 @@ class Singleton : private InstantiationPolicy, private NonCopyable {
 public:
 
   /**
-   * Provide access to the single instance through double-checked locking 
+   * Provide access to the single instance through double-checked locking
    *
-   * @return T* single instance 
+   * @return T* single instance
    */
   static T* instance();
 
@@ -226,19 +226,19 @@ T* Singleton<T, InstantiationPolicy, LockType>::instance() {
 
     // Uses local static storage to avoid static construction
     // sequence issues. (regaring when the lock is created)
-    static T* ptr = 0;    
+    static T* ptr = 0;
     static LockType lock;
 
     if(!ptr) {
 
       Guard<LockType, LockedScope> g(lock);
-      if(!ptr)        
+      if(!ptr)
         InstantiationPolicy::create(ptr);
 
     }
-    
+
     return const_cast<T*>(ptr);
-    
+
   }
 
 
diff --git a/src/dep/include/zthread/SynchronousExecutor.h b/src/dep/include/zthread/SynchronousExecutor.h
index b6dbbef..bc9de27 100644
--- a/src/dep/include/zthread/SynchronousExecutor.h
+++ b/src/dep/include/zthread/SynchronousExecutor.h
@@ -37,14 +37,14 @@ namespace ZThread {
    * @date <2003-07-16T22:33:51-0400>
    * @version 2.3.0
    *
-   * A SynchronousExecutor is an Executor which runs tasks using the thread that 
+   * A SynchronousExecutor is an Executor which runs tasks using the thread that
    * submits the task. It runs tasks serially, one at a time, in the order they
    * were submitted to the executor.
    *
    * @see Executor.
    */
   class SynchronousExecutor : public Executor {
-    
+
     //! Serialize access
     Mutex _lock;
 
@@ -65,10 +65,10 @@ namespace ZThread {
     virtual void interrupt();
 
     /**
-     * Submit a task to this Executor, blocking the calling thread until the 
-     * task is executed. 
+     * Submit a task to this Executor, blocking the calling thread until the
+     * task is executed.
      *
-     * @param task Task to be run by a thread managed by this executor 
+     * @param task Task to be run by a thread managed by this executor
      *
      * @pre  The Executor should have been canceled prior to this invocation.
      * @post The submitted task will be run at some point in the future by this Executor.
@@ -84,12 +84,12 @@ namespace ZThread {
      * @see Cancelable::cancel()
      */
     virtual void cancel();
-  
+
     /**
      * @see Cancelable::cancel()
      */
     virtual bool isCanceled();
- 
+
     /**
      * Block the calling thread until all tasks submitted prior to this invocation
      * complete.
@@ -105,14 +105,14 @@ namespace ZThread {
      * Block the calling thread until all tasks submitted prior to this invocation
      * complete or until the calling thread is interrupted.
      *
-     * @param timeout - maximum amount of time, in milliseconds, to wait for the 
+     * @param timeout - maximum amount of time, in milliseconds, to wait for the
      * currently submitted set of Tasks to complete.
      *
      * @exception Interrupted_Exception thrown if the calling thread is interrupted
      *            before the set of tasks being wait for can complete.
      *
-     * @return 
-     *   - <em>true</em> if the set of tasks being wait for complete before 
+     * @return
+     *   - <em>true</em> if the set of tasks being wait for complete before
      *                   <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> othewise.
      */
diff --git a/src/dep/include/zthread/Task.h b/src/dep/include/zthread/Task.h
index 6503be6..495c8bc 100644
--- a/src/dep/include/zthread/Task.h
+++ b/src/dep/include/zthread/Task.h
@@ -27,9 +27,9 @@
 #include "zthread/Runnable.h"
 
 namespace ZThread {
-  
+
   class ThreadImpl;
-  
+
   /**
    * @class Task
    *
@@ -37,9 +37,9 @@ namespace ZThread {
    * @date <2003-07-20T05:22:38-0400>
    * @version 2.3.0
    *
-   * A Task provides a CountedPtr wrapper for Runnable objects. 
-   * This wrapper enables an implicit conversion from a 
-   * <i>Runnable*</i> to a <i>Task</i> adding some syntactic sugar 
+   * A Task provides a CountedPtr wrapper for Runnable objects.
+   * This wrapper enables an implicit conversion from a
+   * <i>Runnable*</i> to a <i>Task</i> adding some syntactic sugar
    * to the interface.
    */
   class ZTHREAD_API Task : public CountedPtr<Runnable, AtomicCount> {
@@ -47,29 +47,29 @@ namespace ZThread {
 
 
 #if !defined(_MSC_VER) || (_MSC_VER > 1200)
-	  
+	
     Task(Runnable* raw)
-      : CountedPtr<Runnable, AtomicCount>(raw) { } 
+      : CountedPtr<Runnable, AtomicCount>(raw) { }
 
 #endif
-    
+
     template <typename U>
       Task(U* raw)
-      : CountedPtr<Runnable, AtomicCount>(raw) { } 
-    
-    Task(const CountedPtr<Runnable, AtomicCount>& ptr) 
-      : CountedPtr<Runnable, AtomicCount>(ptr) { } 
-    
+      : CountedPtr<Runnable, AtomicCount>(raw) { }
+
+    Task(const CountedPtr<Runnable, AtomicCount>& ptr)
+      : CountedPtr<Runnable, AtomicCount>(ptr) { }
+
     template <typename U, typename V>
-      Task(const CountedPtr<U, V>& ptr) 
-      : CountedPtr<Runnable, AtomicCount>(ptr) { } 
-    
+      Task(const CountedPtr<U, V>& ptr)
+      : CountedPtr<Runnable, AtomicCount>(ptr) { }
+
     void operator()() {
       (*this)->run();
     }
-    
+
   }; /* Task */
-  
+
 } // namespace ZThread
 
 #endif // __ZTTASK_H__
diff --git a/src/dep/include/zthread/Thread.h b/src/dep/include/zthread/Thread.h
index e1700c7..23ecd1a 100644
--- a/src/dep/include/zthread/Thread.h
+++ b/src/dep/include/zthread/Thread.h
@@ -30,9 +30,9 @@
 #include "zthread/Waitable.h"
 
 namespace ZThread {
-  
+
   class ThreadImpl;
-  
+
   /**
    * @class Thread
    * @author Eric Crahen <http://www.code-foo.com>
@@ -50,8 +50,8 @@ namespace ZThread {
    *
    * <h2><a name="ex1">Launching a task</a></h2>
    *
-   * A thread is started simply by constructing a thread object and giving 
-   * it a task to perform. The thread will continue to run its task, even 
+   * A thread is started simply by constructing a thread object and giving
+   * it a task to perform. The thread will continue to run its task, even
    * after the Thread object used to launch the thread has gone out of scope.
    *
    * @code
@@ -74,12 +74,12 @@ namespace ZThread {
    * int main() {
    *
    *   try {
-   *     
+   *
    *     // Implictly constructs a Task
    *     Thread t(new aRunnable);
    *
-   *   } catch(Synchronization_Exception& e) { 
-   *     std::cerr << e.what() << std::endl; 
+   *   } catch(Synchronization_Exception& e) {
+   *     std::cerr << e.what() << std::endl;
    *   }
    *
    *   std::cout << "Hello from the main thread" << std::endl;
@@ -121,13 +121,13 @@ namespace ZThread {
    * int main() {
    *
    *   try {
-   *     
+   *
    *     // Implictly constructs a Task
    *     Thread t(new aRunnable);
    *     t.wait();
    *
-   *   } catch(Synchronization_Exception& e) { 
-   *     std::cerr << e.what() << std::endl; 
+   *   } catch(Synchronization_Exception& e) {
+   *     std::cerr << e.what() << std::endl;
    *   }
    *
    *   std::cout << "Hello from the main thread" << std::endl;
@@ -169,7 +169,7 @@ namespace ZThread {
    * int main() {
    *
    *   try {
-   *     
+   *
    *     // Explictly constructs a Task
    *     Task task(new aRunnable);
    *
@@ -177,8 +177,8 @@ namespace ZThread {
    *     Thread t1(task);
    *     Thread t2(task);
    *
-   *   } catch(Synchronization_Exception& e) { 
-   *     std::cerr << e.what() << std::endl; 
+   *   } catch(Synchronization_Exception& e) {
+   *     std::cerr << e.what() << std::endl;
    *   }
    *
    *   std::cout << "Hello from the main thread" << std::endl;
@@ -195,7 +195,7 @@ namespace ZThread {
    *
    * @endcode
    */
-  class ZTHREAD_API Thread 
+  class ZTHREAD_API Thread
     : public Cancelable, public Waitable, public NonCopyable {
 
     //! Delegate
@@ -212,7 +212,7 @@ namespace ZThread {
     /**
      * Create a Thread that spawns a new thread to run the given task.
      *
-     * @param task Task to be run by a thread managed by this executor 
+     * @param task Task to be run by a thread managed by this executor
      * @param autoCancel flag to requestion automatic cancellation
      *
      * @post if the <i>autoCancel</i> flag was true, this thread will
@@ -241,17 +241,17 @@ namespace ZThread {
      * @exception Interrupted_Exception thrown if the joining thread has been interrupt()ed
      */
     void wait();
- 
+
     /**
      * Wait for the thread represented by this object to complete its task.
      * The calling thread is blocked until the thread represented by this
      * object exits, or until the timeout expires.
      *
-     * @param timeout maximum amount of time (milliseconds) this method 
+     * @param timeout maximum amount of time (milliseconds) this method
      *        could block the calling thread.
      *
-     * @return 
-     *   - <em>true</em> if the thread task complete before <i>timeout</i> 
+     * @return
+     *   - <em>true</em> if the thread task complete before <i>timeout</i>
      *     milliseconds elapse.
      *   - <em>false</em> othewise.
      *
@@ -260,10 +260,10 @@ namespace ZThread {
      * @exception Interrupted_Exception thrown if the joining thread has been interrupt()ed
      */
     bool wait(unsigned long timeout);
- 
+
     /**
      * Change the priority of this Thread. This will change the actual
-     * priority of the thread when the OS supports it. 
+     * priority of the thread when the OS supports it.
      *
      * If there is no real priority support, it's simulated.
      *
@@ -280,18 +280,18 @@ namespace ZThread {
 
     /**
      * Interrupts this thread, setting the <i>interrupted</i> status of the thread.
-     * This status is cleared by one of three methods. 
+     * This status is cleared by one of three methods.
      *
      * If this thread is blocked when this method is called, the thread will
      * abort that blocking operation with an Interrupted_Exception.
      *
      *  - The first is by attempting an operation on a synchronization object that
-     *    would normally block the calling thread; Instead of blocking the calling 
+     *    would normally block the calling thread; Instead of blocking the calling
      *    the calling thread, the function that would normally block will thrown an
      *    Interrupted_Exception and clear the <i>interrupted</i> status of the thread.
      *
      *  - The second is by calling Thread::interrupted().
-     * 
+     *
      *  - The third is by calling Thread::canceled().
      *
      * Threads already blocked by an operation on a synchronization object will abort
@@ -300,7 +300,7 @@ namespace ZThread {
      *
      * Interrupting a thread that is no longer running will have no effect.
      *
-     * @return 
+     * @return
      *   - <em>true</em> if the thread was interrupted while not blocked by a wait
      *     on a synchronization object.
      *   - <em>false</em> othewise.
@@ -311,11 +311,11 @@ namespace ZThread {
      * Tests whether the current Thread has been interrupt()ed, clearing
      * its interruption status.
      *
-     * @return 
+     * @return
      *   - <em>true</em> if the Thread was interrupted.
      *   - <em>false</em> otherwise.
      *
-     * @post The <i>interrupted</i> status of the current thread will be cleared, 
+     * @post The <i>interrupted</i> status of the current thread will be cleared,
      *       allowing it to perform a blocking operation on a synchronization
      *       object without throwing an exception.
      */
@@ -333,16 +333,16 @@ namespace ZThread {
      * Tests whether this thread has been canceled. If called from the context
      * of this thread, the interrupted status is cleared.
      *
-     * @return 
+     * @return
      *   - <em>true</em> if the Thread was canceled.
      *   - <em>false</em> otherwise.
-     * 
+     *
      * @see Cancelable::isCanceled()
      */
     virtual bool isCanceled();
 
     /**
-     * Interrupt and cancel this thread in a single operation. The thread will 
+     * Interrupt and cancel this thread in a single operation. The thread will
      * return <em>true</em> whenever its cancelation status is tested in the future.
      *
      * @exception InvalidOp_Exception thrown if a thread attempts to cancel itself
diff --git a/src/dep/include/zthread/ThreadLocal.h b/src/dep/include/zthread/ThreadLocal.h
index bb83a0f..7cccab4 100644
--- a/src/dep/include/zthread/ThreadLocal.h
+++ b/src/dep/include/zthread/ThreadLocal.h
@@ -34,30 +34,30 @@ namespace ZThread {
    * @date <2003-07-27T11:18:21-0400>
    * @version 2.3.0
    *
-   * Provides access to store and retrieve value types to and from a thread local 
+   * Provides access to store and retrieve value types to and from a thread local
    * storage context. A thread local storage context consists of the calling thread
    * a specific ThreadLocal object. Since this context is specific to each thread
-   * whenever a value is stored in a ThreadLocal that is accessible from multiple 
-   * threads, it can only be retrieved by the thread that stored it. 
+   * whenever a value is stored in a ThreadLocal that is accessible from multiple
+   * threads, it can only be retrieved by the thread that stored it.
    *
    * The first time a thread accesses the value associated with a thread local storage
-   * context, a value is created. That value is either an initial value (determined by 
+   * context, a value is created. That value is either an initial value (determined by
    * InitialValueT) or an inherited value (determined by ChildValueT).
    *
    * - If a threads parent had no value associated with a ThreadLocal when the thread was created,
    *   then the InitialValueT functor is used to create an initial value.
    *
-   * - If a threads parent did have a value associated with a ThreadLocal when the thread was 
+   * - If a threads parent did have a value associated with a ThreadLocal when the thread was
    *   created, then the childValueT functor is used to create an initial value.
    *
    * Not all ThreadLocal's support the inheritance of values from parent threads. The default
    * behavoir is to create values through the InitialValueT functor for all thread when
-   * they first access a thread local storage context. 
-   * 
+   * they first access a thread local storage context.
+   *
    * - Inheritance is enabled automatically when a user supplies a ChildValueT functor other
    *   than the default one supplied.
    *
-   * - Inheritance can be controlled explicitly by the user through a third functor, 
+   * - Inheritance can be controlled explicitly by the user through a third functor,
    *   InheritableValueT.
    *
    * <h2>Examples</h2>
@@ -68,9 +68,9 @@ namespace ZThread {
    *
    * <h2><a name="ex1">Default initial value</a></h2>
    * A ThreadLocal that does not inherit, and uses the default value
-   * for an int as its initial value. 
+   * for an int as its initial value.
    *
-   * @code 
+   * @code
    *
    * #include "zthread/ThreadLocal.h"
    * #include "zthread/Thread.h"
@@ -82,7 +82,7 @@ namespace ZThread {
    *   ThreadLocal<int> localValue;
    * public:
    *   void run() {
-   *     std::cout << localValue.get() << std::endl; 
+   *     std::cout << localValue.get() << std::endl;
    *   }
    * };
    *
@@ -110,7 +110,7 @@ namespace ZThread {
    * <h2><a name="ex2">User-specified initial value</a></h2>
    * A ThreadLocal that does not inherit, and uses a custom initial value.
    *
-   * @code 
+   * @code
    *
    * #include "zthread/ThreadLocal.h"
    * #include "zthread/Thread.h"
@@ -119,10 +119,10 @@ namespace ZThread {
    * using namespace ZThread;
    *
    * struct anInitialValueFn {
-   *   int operator()() { 
+   *   int operator()() {
    *     static int next = 100;
    *     int val = next; next += 100;
-   *     return val; 
+   *     return val;
    *   }
    * };
    *
@@ -130,7 +130,7 @@ namespace ZThread {
    *   ThreadLocal<int, anInitialValueFn> localValue;
    * public:
    *   void run() {
-   *     std::cout << localValue.get() << std::endl; 
+   *     std::cout << localValue.get() << std::endl;
    *   }
    * };
    *
@@ -156,10 +156,10 @@ namespace ZThread {
    * @endcode
    *
    * <h2><a name="ex3">User-specified inherited value</a></h2>
-   * A ThreadLocal that does inherit and modify child values. 
+   * A ThreadLocal that does inherit and modify child values.
    * (The default initial value functor is used)
    *
-   * @code 
+   * @code
    *
    * #include "zthread/ThreadLocal.h"
    * #include "zthread/Thread.h"
@@ -168,18 +168,18 @@ namespace ZThread {
    * using namespace ZThread;
    *
    * struct anInheritedValueFn {
-   *   int operator()(int val) { 
-   *     return val + 100; 
+   *   int operator()(int val) {
+   *     return val + 100;
    *   }
    * };
    *
-   * // This Runnable associates no ThreadLocal value in the main thread; so 
+   * // This Runnable associates no ThreadLocal value in the main thread; so
    * // none of the child threads have anything to inherit.
    * class aRunnable : public Runnable {
    *   ThreadLocal<int, ThreadLocalImpl::InitialValueFn<int>, anInheritedValueFn> localValue;
    * public:
    *   void run() {
-   *     std::cout << localValue.get() << std::endl; 
+   *     std::cout << localValue.get() << std::endl;
    *   }
    * };
    *
@@ -188,11 +188,11 @@ namespace ZThread {
    * class anotherRunnable : public Runnable {
    *   ThreadLocal<int, ThreadLocalImpl::InitialValueFn<int>, anInheritedValueFn> localValue;
    * public:
-   *   anotherRunnable() { 
+   *   anotherRunnable() {
    *     localValue.set(100);
    *   }
    *   void run() {
-   *     std::cout << localValue.get() << std::endl; 
+   *     std::cout << localValue.get() << std::endl;
    *   }
    * };
    *
@@ -238,7 +238,7 @@ namespace ZThread {
    *
    * <code>
    * // required operator
-   * T operator() 
+   * T operator()
    *
    * // supported expression
    * InitialValueT()()
@@ -249,12 +249,12 @@ namespace ZThread {
    *
    * This template parameter should indicate the functor used to set
    * the value that will be inherited by thread whose parent have associated
-   * a value with the ThreadLocal's context at the time they are created. 
+   * a value with the ThreadLocal's context at the time they are created.
    * It should support the following operator:
    *
    * <code>
    * // required operator
-   * T operator(const T& parentValue) 
+   * T operator(const T& parentValue)
    *
    * // supported expression
    * ChildValueT()(parentValue)
@@ -270,7 +270,7 @@ namespace ZThread {
    *
    * <code>
    * // required operator
-   * bool operator(const T& childValueFunctor) 
+   * bool operator(const T& childValueFunctor)
    *
    * // supported expression
    * InheritableValueT()( ChildValueT() )
@@ -278,9 +278,9 @@ namespace ZThread {
    *
    */
   template <
-    typename T, 
+    typename T,
     typename InitialValueT      = ThreadLocalImpl::InitialValueFn<T>,
-    typename ChildValueT        = ThreadLocalImpl::UniqueChildValueFn, 
+    typename ChildValueT        = ThreadLocalImpl::UniqueChildValueFn,
     typename InheritableValueT  = ThreadLocalImpl::InheritableValueFn
     >
     class ThreadLocal : private ThreadLocalImpl {
@@ -288,39 +288,39 @@ namespace ZThread {
       typedef ThreadLocalImpl::ValuePtr ValuePtr;
 
       class Value : public ThreadLocalImpl::Value {
-        
+
         T value;
-        
+
       public:
-        
+
         Value() : value( InitialValueT()() ) { }
-        
+
         Value(const Value& v) : value( ChildValueT()(v.value) ) { }
-        
-        virtual ~Value() { } 
-        
+
+        virtual ~Value() { }
+
         operator T() { return value; }
-        
+
         const Value& operator=(const T& v) { value = v; }
-        
+
         virtual bool isInheritable() const {
           return InheritableValueT()( ChildValueT() );
         }
-        
+
         virtual ValuePtr clone() const {
           return ValuePtr( new Value(*this) );
         }
-        
+
       };
-      
+
       static ValuePtr createValue() {
         return ValuePtr( new Value );
       }
-      
+
     public:
 
     /**
-     * Get the value associated with the context (this ThreadLocal and 
+     * Get the value associated with the context (this ThreadLocal and
      * the calling thread) of the invoker. If no value is currently
      * associated, then an intial value is created and associated; that value
      * is returned.
@@ -329,14 +329,14 @@ namespace ZThread {
      *
      * @post  If no value has been associated with the invoking context
      *        then an inital value will be associated. That value is
-     *        created by the <em>InitialValueT</em> functor.   
+     *        created by the <em>InitialValueT</em> functor.
      */
-    T get() const { 
+    T get() const {
       return (T)reinterpret_cast<Value&>( *value(&createValue) );
     }
-  
+
     /**
-     * Replace the value associated with the context (this ThreadLocal and 
+     * Replace the value associated with the context (this ThreadLocal and
      * the calling thread) of the invoker. If no value is currently
      * associated, then an intial value is first created and subsequently
      * replaced by the new value.
@@ -345,18 +345,18 @@ namespace ZThread {
      *
      * @post  If no value has been associated with the invoking context
      *        then an inital value will first be associated. That value is
-     *        created by the <em>InitialValueT</em> functor and then 
-     *        replaced with the new value.   
+     *        created by the <em>InitialValueT</em> functor and then
+     *        replaced with the new value.
      */
     void set(T v) const {
       reinterpret_cast<Value&>( *value(&createValue) ) = v;
     }
 
     /**
-     * Remove any value current associated with this ThreadLocal. 
-     * 
-     * @post Upon thier next invocation the get() and set() functions will behave as 
-     *       if no value has been associated with this ThreadLocal and an 
+     * Remove any value current associated with this ThreadLocal.
+     *
+     * @post Upon thier next invocation the get() and set() functions will behave as
+     *       if no value has been associated with this ThreadLocal and an
      *       initial value will be generated.
      */
     void clear() const {
@@ -364,10 +364,10 @@ namespace ZThread {
     }
 
     /**
-     * Remove any value current associated with <em>any</em> ThreadLocal. 
-     * 
-     * @post Upon thier next invocation the get() and set() functions will behave as 
-     *       if no value has been associated with <em>any</em> ThreadLocal and new 
+     * Remove any value current associated with <em>any</em> ThreadLocal.
+     *
+     * @post Upon thier next invocation the get() and set() functions will behave as
+     *       if no value has been associated with <em>any</em> ThreadLocal and new
      *       initial values will be generated.
      */
     static void clearAll() {
diff --git a/src/dep/include/zthread/ThreadLocalImpl.h b/src/dep/include/zthread/ThreadLocalImpl.h
index 3b4046f..be000df 100644
--- a/src/dep/include/zthread/ThreadLocalImpl.h
+++ b/src/dep/include/zthread/ThreadLocalImpl.h
@@ -35,7 +35,7 @@ namespace ZThread {
    *
    * @see ThreadLocal
    */
-  class ZTHREAD_API ThreadLocalImpl : private NonCopyable {   
+  class ZTHREAD_API ThreadLocalImpl : private NonCopyable {
   public:
 
     class Value;
@@ -52,17 +52,17 @@ namespace ZThread {
 
     //! Create a ThreadLocalImpl
     ThreadLocalImpl();
-  
+
     //! Destroy a ThreadLocalImpl
     ~ThreadLocalImpl();
-  
+
     /**
      * @class InitialValueFn
      */
     template <typename T>
-    struct InitialValueFn {      
+    struct InitialValueFn {
       T operator()() { return T(); }
-    }; 
+    };
 
     /**
      * @class ChildValueFn
@@ -71,18 +71,18 @@ namespace ZThread {
       template <typename T>
       T operator()(const T& value) { return T(value); }
     };
- 
+
     /**
      * @class UniqueChildValueFn
      */
     struct UniqueChildValueFn : public ChildValueFn { };
-    
+
     /**
      * @class InheritableValueFn
      */
     struct InheritableValueFn {
 
-      template <typename T>    
+      template <typename T>
       bool operator()(const T&) { return true; }
 
       bool operator()(const UniqueChildValueFn&) { return false; }
diff --git a/src/dep/include/zthread/ThreadedExecutor.h b/src/dep/include/zthread/ThreadedExecutor.h
index 9bc29b3..469a112 100644
--- a/src/dep/include/zthread/ThreadedExecutor.h
+++ b/src/dep/include/zthread/ThreadedExecutor.h
@@ -40,21 +40,21 @@ namespace ZThread {
    * A ThreadedExecutor spawns a new thread to execute each task submitted.
    * A ThreadedExecutor supports the following optional operations,
    *
-   * - <em>cancel</em>()ing a ThreadedExecutor will cause it to stop accepting 
-   *   new tasks. 
+   * - <em>cancel</em>()ing a ThreadedExecutor will cause it to stop accepting
+   *   new tasks.
    *
-   * - <em>interrupt</em>()ing a ThreadedExecutor will cause the any thread running 
-   *   a task which was submitted prior to the invocation of this function to 
+   * - <em>interrupt</em>()ing a ThreadedExecutor will cause the any thread running
+   *   a task which was submitted prior to the invocation of this function to
    *   be interrupted during the execution of that task.
    *
-   * - <em>wait</em>()ing on a ThreadedExecutor will block the calling thread 
+   * - <em>wait</em>()ing on a ThreadedExecutor will block the calling thread
    *   until all tasks that were submitted prior to the invocation of this function
    *   have completed.
-   * 
+   *
    * @see Executor.
    */
   class ThreadedExecutor : public Executor {
-  
+
     CountedPtr< ExecutorImpl > _impl;
 
   public:
@@ -68,16 +68,16 @@ namespace ZThread {
     /**
      * Interrupting a ThreadedExecutor will cause an interrupt() to be sent
      * to every Task that has been submitted at the time this function is
-     * called. Tasks that are submitted after this function is called will 
+     * called. Tasks that are submitted after this function is called will
      * not be interrupt()ed; unless this function is invoked again().
      */
     virtual void interrupt();
-    
+
     /**
-     * Submit a task to this Executor. This will not block the current thread 
+     * Submit a task to this Executor. This will not block the current thread
      * for very long. A new thread will be created and the task will be run()
      * within the context of that new thread.
-     * 
+     *
      * @exception Cancellation_Exception thrown if this Executor has been canceled.
      * The Task being submitted will not be executed by this Executor.
      *
@@ -89,12 +89,12 @@ namespace ZThread {
      * @see Cancelable::cancel()
      */
     virtual void cancel();
-  
+
     /**
      * @see Cancelable::isCanceled()
      */
     virtual bool isCanceled();
- 
+
     /**
      * Waiting on a ThreadedExecutor will block the current thread until all
      * tasks submitted to the Executor up until the time this function was called
@@ -112,15 +112,15 @@ namespace ZThread {
     virtual void wait();
 
     /**
-     * Operates the same as ThreadedExecutor::wait() but with a timeout. 
+     * Operates the same as ThreadedExecutor::wait() but with a timeout.
      *
-     * @param timeout maximum amount of time, in milliseconds, to wait for the 
+     * @param timeout maximum amount of time, in milliseconds, to wait for the
      *                currently submitted set of Tasks to complete.
      *
      * @exception Interrupted_Exception thrown if the calling thread is interrupt()ed
      *            while waiting for the current set of Tasks to complete.
      *
-     * @return 
+     * @return
      *   - <em>true</em> if the set of tasks running at the time this function is invoked complete
      *     before <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> othewise.
diff --git a/src/dep/include/zthread/Waitable.h b/src/dep/include/zthread/Waitable.h
index 3d925f2..1726037 100644
--- a/src/dep/include/zthread/Waitable.h
+++ b/src/dep/include/zthread/Waitable.h
@@ -25,7 +25,7 @@
 
 #include "zthread/Exceptions.h"
 
-namespace ZThread { 
+namespace ZThread {
 
   /**
    * @class Waitable
@@ -35,21 +35,21 @@ namespace ZThread {
    * @version 2.3.0
    *
    * The Waitable interface defines a common method of adding generic <i>wait</i> semantics
-   * to a class. 
+   * to a class.
    *
    * <b>Waiting</b>
    *
    * An object implementing the Waitable interface externalizes a mechanism for testing
-   * some internal condition. Another object may <i>wait()</i>s for a Waitable object; 
-   * in doing so, it wait()s for that condition to become true by blocking the caller 
+   * some internal condition. Another object may <i>wait()</i>s for a Waitable object;
+   * in doing so, it wait()s for that condition to become true by blocking the caller
    * while the condition is false.
    *
    * For example, a Condition is Waitable object that extends <i>wait</i> semantics
-   * so that wait()ing means a thread is blocked until some external stimulus 
-   * specifically performs an operation on the Condition to make its internal condition true. 
+   * so that wait()ing means a thread is blocked until some external stimulus
+   * specifically performs an operation on the Condition to make its internal condition true.
    * (serialization aside)
    *
-   * A Barrier extends <i>wait</i> semantics so that wait()ing mean waiting for other 
+   * A Barrier extends <i>wait</i> semantics so that wait()ing mean waiting for other
    * waiters, and may include automatically resetting the condition once a wait is complete.
    *
    * @see Condition
@@ -57,9 +57,9 @@ namespace ZThread {
    * @see Executor
    */
   class Waitable {
-  public:  
-  
-    //! Destroy a Waitable object.  
+  public:
+
+    //! Destroy a Waitable object.
     virtual ~Waitable() {}
 
     /**
@@ -78,14 +78,14 @@ namespace ZThread {
      *
      * @param timeout maximum amount of time, in milliseconds, to spend waiting.
      *
-     * @return 
-     *   - <em>true</em> if the set of tasks being wait for complete before 
+     * @return
+     *   - <em>true</em> if the set of tasks being wait for complete before
      *                   <i>timeout</i> milliseconds elapse.
      *   - <em>false</em> othewise.
      */
     virtual bool wait(unsigned long timeout) = 0;
 
-  
+
   }; /* Waitable */
 
 
diff --git a/src/dep/src/StormLib/SCommon.cpp b/src/dep/src/StormLib/SCommon.cpp
index 7936a90..45e3321 100644
--- a/src/dep/src/StormLib/SCommon.cpp
+++ b/src/dep/src/StormLib/SCommon.cpp
@@ -29,7 +29,7 @@ USHORT  wPlatform = 0;                  // File platform
 //-----------------------------------------------------------------------------
 // Compression types
 
-// 
+//
 // Data compressions
 //
 // Can be combination of MPQ_COMPRESSION_PKWARE, MPQ_COMPRESSION_BZIP2
@@ -264,16 +264,16 @@ DWORD DetectFileSeed2(DWORD * pdwBlock, UINT nDwords, ...)
     DWORD saveSeed1;
     DWORD dwTemp;
     DWORD i, j;
-    
+
     // We need at least two DWORDS to detect the seed
     if(nDwords < 0x02 || nDwords > 0x10)
         return 0;
-    
+
     va_start(argList, nDwords);
     for(i = 0; i < nDwords; i++)
         dwDecrypted[i] = va_arg(argList, DWORD);
     va_end(argList);
-    
+
     dwTemp = (*pdwBlock ^ dwDecrypted[0]) - 0xEEEEEEEE;
     for(i = 0; i < 0x100; i++)      // Try all 255 possibilities
     {
@@ -430,7 +430,7 @@ TMPQHash * GetHashEntry(TMPQArchive * ha, const char * szFileName)
     // If filename is given by index, we have to search all hash entries for the right index.
     if(dwIndex <= ha->pHeader->dwBlockTableSize)
     {
-        // Pass all the hash entries and find the one with proper block index 
+        // Pass all the hash entries and find the one with proper block index
         for(pHash = ha->pHashTable; pHash < pHashEnd; pHash++)
         {
             if(pHash->dwBlockIndex == dwIndex)
@@ -444,7 +444,7 @@ TMPQHash * GetHashEntry(TMPQArchive * ha, const char * szFileName)
     dwName1 = DecryptName1(szFileName);
     dwName2 = DecryptName2(szFileName);
     pHash   = pHash0 = ha->pHashTable + dwIndex;
-    
+
     // Look for hash index
     while(pHash->dwBlockIndex != HASH_ENTRY_FREE)
     {
@@ -564,7 +564,7 @@ BOOL IsValidMpqHandle(TMPQArchive * ha)
         return FALSE;
     if(ha->pHeader == NULL || IsBadReadPtr(ha->pHeader, sizeof(TMPQHeader)))
         return FALSE;
-    
+
     return (ha->pHeader->dwID == ID_MPQ);
 }
 
@@ -599,7 +599,7 @@ int AddInternalFile(TMPQArchive * ha, const char * szFileName)
             // locale set by the user.
             pHash->lcLocale = LANG_NEUTRAL;
 
-            // Fill the block table            
+            // Fill the block table
             pBlockEnd = ha->pBlockTable + ha->pHeader->dwBlockTableSize;
             pBlockEx = ha->pExtBlockTable;
             for(pBlock = ha->pBlockTable; pBlock < pBlockEnd; pBlock++, pBlockEx++)
@@ -613,7 +613,7 @@ int AddInternalFile(TMPQArchive * ha, const char * szFileName)
 
             // If the block is out of the available entries, return error
             if(pBlock >= (ha->pBlockTable + ha->pHeader->dwHashTableSize))
-                return ERROR_DISK_FULL;    
+                return ERROR_DISK_FULL;
 
             // If we had to add the file at the end, increment the block table
             if(bFoundFreeEntry == FALSE)
@@ -674,7 +674,7 @@ int AddFileToArchive(
     {
         if(nFileType == SFILE_TYPE_DATA)
             nCmpFirst = nCmpNext = nDataCmp;
-    
+
         if(nFileType == SFILE_TYPE_WAVE)
         {
             nCmpNext  = uWaveCmpType[dwQuality];
@@ -882,7 +882,7 @@ int AddFileToArchive(
 
         memset(hf->pdwBlockPos, 0, dwBlockPosLen);
         hf->pdwBlockPos[0] = dwBlockPosLen;
-        
+
         // Write the block positions. Only swap the first item, rest is zeros.
         BSWAP_ARRAY32_UNSIGNED(hf->pdwBlockPos, 1);
         WriteFile(ha->hFile, hf->pdwBlockPos, dwBlockPosLen, &dwTransferred, NULL);
@@ -899,7 +899,7 @@ int AddFileToArchive(
     {
         crc32_context crc32_ctx;
         md5_context md5_ctx;
-        DWORD nBlock;       
+        DWORD nBlock;
 
         // Initialize CRC32 and MD5 processing
         CRC32_Init(&crc32_ctx);
@@ -960,7 +960,7 @@ int AddFileToArchive(
                 EncryptMPQBlock((DWORD *)pbToWrite, dwOutLength, hf->dwSeed1 + nBlock);
                 BSWAP_ARRAY32_UNSIGNED((DWORD *)pbToWrite, dwOutLength / sizeof(DWORD));
             }
-            
+
             // Write the block
             WriteFile(ha->hFile, pbToWrite, dwOutLength, &dwTransferred, NULL);
             if(dwTransferred != dwOutLength)
@@ -989,10 +989,10 @@ int AddFileToArchive(
         // If file is encrypted, block positions are also encrypted
         if(dwFlags & MPQ_FILE_ENCRYPTED)
             EncryptMPQBlock(hf->pdwBlockPos, dwBlockPosLen, hf->dwSeed1 - 1);
-        
+
         // Set the position back to the block table
         SetFilePointer(ha->hFile, hf->RawFilePos.LowPart, &hf->RawFilePos.HighPart, FILE_BEGIN);
-        
+
         // Write block positions to the archive
         BSWAP_ARRAY32_UNSIGNED(hf->pdwBlockPos, hf->nBlocks);
         WriteFile(ha->hFile, hf->pdwBlockPos, dwBlockPosLen, &dwTransferred, NULL);
@@ -1128,7 +1128,7 @@ int SaveMPQTables(TMPQArchive * ha)
 
         // Encrypt the block table and write it to the file
         EncryptBlockTable((DWORD *)pbBuffer, (BYTE *)"(block table)", dwBytes >> 2);
-        
+
         // Convert to little endian for file save
         BSWAP_ARRAY32_UNSIGNED((DWORD *)pbBuffer, dwBytes / sizeof(DWORD));
         WriteFile(ha->hFile, pbBuffer, dwBytes, &dwWritten, NULL);
diff --git a/src/dep/src/StormLib/SCompression.cpp b/src/dep/src/StormLib/SCompression.cpp
index 06321a2..ca1253f 100644
--- a/src/dep/src/StormLib/SCompression.cpp
+++ b/src/dep/src/StormLib/SCompression.cpp
@@ -2,7 +2,7 @@
 /* SCompression.cpp                       Copyright (c) Ladislav Zezula 2003 */
 /*---------------------------------------------------------------------------*/
 /* This module serves as a bridge between StormLib code and (de)compression  */
-/* functions. All (de)compression calls go (and should only go) through this */   
+/* functions. All (de)compression calls go (and should only go) through this */
 /* module. No system headers should be included in this module to prevent    */
 /* compile-time problems.                                                    */
 /*---------------------------------------------------------------------------*/
@@ -19,7 +19,7 @@
 #include <string.h>
 
 // Include functions from Pkware Data Compression Library
-#include "pklib/pklib.h"              
+#include "pklib/pklib.h"
 
 // Include functions from zlib
 #ifndef __SYS_ZLIB
@@ -29,10 +29,10 @@
 #endif
 
 // Include functions from Huffmann compression
-#include "huffman/huff.h"  
+#include "huffman/huff.h"
 
 // Include functions from WAVe compression
-#include "wave/wave.h"  
+#include "wave/wave.h"
 
 // Include functions from BZip2 compression library
 #ifndef __SYS_BZLIB
@@ -57,7 +57,7 @@ typedef struct
 
 // Table of compression functions
 typedef int (*COMPRESS)(char *, int *, char *, int, int *, int);
-typedef struct  
+typedef struct
 {
     unsigned long dwMask;               // Compression mask
     COMPRESS Compress;                  // Compression function
@@ -81,7 +81,7 @@ typedef struct
 // Function loads data from the input buffer. Used by Pklib's "implode"
 // and "explode" function as user-defined callback
 // Returns number of bytes loaded
-//    
+//
 //   char * buf          - Pointer to a buffer where to store loaded data
 //   unsigned int * size - Max. number of bytes to read
 //   void * param        - Custom pointer, parameter of implode/explode
@@ -95,7 +95,7 @@ static unsigned int ReadInputData(char * buf, unsigned int * size, void * param)
     // Check the case when not enough data available
     if(nToRead > nMaxAvail)
         nToRead = nMaxAvail;
-    
+
     // Load data and increment offsets
     memcpy(buf, pInfo->pInBuff + pInfo->nInPos, nToRead);
     pInfo->nInPos += nToRead;
@@ -105,7 +105,7 @@ static unsigned int ReadInputData(char * buf, unsigned int * size, void * param)
 
 // Function for store output data. Used by Pklib's "implode" and "explode"
 // as user-defined callback
-//    
+//
 //   char * buf          - Pointer to data to be written
 //   unsigned int * size - Number of bytes to write
 //   void * param        - Custom pointer, parameter of implode/explode
@@ -270,7 +270,7 @@ int Compress_zlib(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer, int
     {
         // Call zlib to compress the data
         nResult = deflate(&z, Z_FINISH);
-        
+
         if(nResult == Z_OK || nResult == Z_STREAM_END)
             *pdwOutLength = z.total_out;
 
@@ -357,7 +357,7 @@ int Decompress_pklib(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer,
 
     // Do the decompression
     explode(ReadInputData, WriteOutputData, work_buf, &Info);
-    
+
     // Fix: If PKLIB is unable to decompress the data, they are uncompressed
     if(Info.nOutPos == 0)
     {
@@ -436,8 +436,8 @@ int Decompress_bzip2(char * pbOutBuffer, int * pdwOutLength, char * pbInBuffer,
         while(nResult != BZ_STREAM_END)
         {
             nResult = BZ2_bzDecompress(&strm);
-            
-            // If any error there, break the loop 
+
+            // If any error there, break the loop
             if(nResult < BZ_OK)
                 break;
         }
@@ -496,7 +496,7 @@ int WINAPI SCompCompress(char * pbCompressed, int * pdwOutLength, char * pbUncom
     int dwInSize  = dwInLength;
     int dwEntries = (sizeof(cmp_table) / sizeof(TCompressTable));
     int nResult = 1;
-    int i;       
+    int i;
 
     // Check for valid parameters
     if(!pdwOutLength || *pdwOutLength < dwInLength || !pbCompressed || !pbUncompressed)
@@ -532,7 +532,7 @@ int WINAPI SCompCompress(char * pbCompressed, int * pdwOutLength, char * pbUncom
     {
         if(uCompressions2 & cmp_table[i].dwMask)
         {
-            // Set the right output buffer 
+            // Set the right output buffer
             dwCompressCount--;
             pbOutput = (dwCompressCount & 1) ? pbTempBuff : pbCompressed;
 
@@ -620,7 +620,7 @@ int WINAPI SCompDecompress(char * pbOutBuffer, int * pdwOutLength, char * pbInBu
     int      dwCount = 0;                 // Counter for every use
     int      dwEntries = (sizeof(dcmp_table) / sizeof(TDecompressTable));
     int      nResult = 1;
-    int      i;       
+    int      i;
 
     // If the input length is the same as output, do nothing.
     if(dwInLength == dwOutLength)
@@ -632,11 +632,11 @@ int WINAPI SCompDecompress(char * pbOutBuffer, int * pdwOutLength, char * pbInBu
         *pdwOutLength = dwInLength;
         return 1;
     }
-    
+
     // Get applied compression types and decrement data length
-    fDecompressions1 = fDecompressions2 = (unsigned char)*pbInBuffer++;              
+    fDecompressions1 = fDecompressions2 = (unsigned char)*pbInBuffer++;
     dwInLength--;
-    
+
     // Search decompression table type and get all types of compression
     for(i = 0; i < dwEntries; i++)
     {
@@ -690,13 +690,13 @@ int WINAPI SCompDecompress(char * pbOutBuffer, int * pdwOutLength, char * pbInBu
     {
         if(pbWorkBuff != pbOutBuffer)
             memcpy(pbOutBuffer, pbInBuffer, dwOutLength);
-        
+
     }
 
     // Delete temporary buffer, if necessary
     if(pbTempBuff != NULL)
         FREEMEM(pbTempBuff);
-    
+
     *pdwOutLength = dwOutLength;
     return nResult;
 }
diff --git a/src/dep/src/StormLib/SFileCompactArchive.cpp b/src/dep/src/StormLib/SFileCompactArchive.cpp
index 546a9e7..7589ff8 100644
--- a/src/dep/src/StormLib/SFileCompactArchive.cpp
+++ b/src/dep/src/StormLib/SFileCompactArchive.cpp
@@ -142,7 +142,7 @@ static int CheckIfAllFilesKnown(TMPQArchive * ha, const char * szListFile, DWORD
                     SFileCloseFile(hFile);
                 }
 
-                // If the file is encrypted, we have to check 
+                // If the file is encrypted, we have to check
                 // If we can apply the file decryption seed
                 if(dwFlags & MPQ_FILE_ENCRYPTED && dwSeed == 0)
                 {
@@ -267,7 +267,7 @@ static int CopyMpqFileBlocks(
                 DecryptMPQBlock(pdwBlockPos, dwBytes, dwSeed1 - 1);
                 if(pdwBlockPos[0] != dwBytes)
                     nError = ERROR_FILE_CORRUPT;
-            
+
                 memcpy(pdwBlockPos2, pdwBlockPos, dwBytes);
                 EncryptMPQBlock(pdwBlockPos2, dwBytes, dwSeed2 - 1);
             }
@@ -313,7 +313,7 @@ static int CopyMpqFileBlocks(
             }
 
             // If necessary, re-encrypt the block
-            // Note: Recompression is not necessary here. Unlike encryption, 
+            // Note: Recompression is not necessary here. Unlike encryption,
             // the compression does not depend on the position of the file in MPQ.
             if((pBlock->dwFlags & MPQ_FILE_ENCRYPTED) && dwSeed1 != dwSeed2)
             {
@@ -580,7 +580,7 @@ BOOL WINAPI SFileCompactArchive(HANDLE hMPQ, const char * szListFile, BOOL /* bR
             TempPos.LowPart = pBlock->dwFilePos;
             if(TempPos.QuadPart < FirstFilePos.QuadPart)
                 FirstFilePos = TempPos;
-        
+
             pBlockEx++;
             pBlock++;
         }
diff --git a/src/dep/src/StormLib/SFileCreateArchiveEx.cpp b/src/dep/src/StormLib/SFileCreateArchiveEx.cpp
index c1c8022..7cae6e8 100644
--- a/src/dep/src/StormLib/SFileCreateArchiveEx.cpp
+++ b/src/dep/src/StormLib/SFileCreateArchiveEx.cpp
@@ -19,8 +19,8 @@
 
 //-----------------------------------------------------------------------------
 // Local tables
-                        
-static DWORD PowersOfTwo[] = 
+
+static DWORD PowersOfTwo[] =
 {
                0x0000002, 0x0000004, 0x0000008,
     0x0000010, 0x0000020, 0x0000040, 0x0000080,
@@ -240,7 +240,7 @@ static int RecryptFileData(
 //   MPQ_CREATE_ARCHIVE_V1 - Creates MPQ archive version 1
 //   MPQ_CREATE_ARCHIVE_V2 - Creates MPQ archive version 2
 //   MPQ_CREATE_ATTRIBUTES - Will also add (attributes) file with the CRCs
-//   
+//
 // dwHashTableSize - Size of the hash table (only if creating a new archive).
 //        Must be between 2^4 (= 16) and 2^18 (= 262 144)
 //
@@ -285,7 +285,7 @@ BOOL WINAPI SFileCreateArchiveEx(const char * szMpqName, DWORD dwCreationDisposi
         // the file exist, but it is not a MPQ archive.
         if(SFileOpenArchiveEx(szMpqName, 0, 0, phMPQ, GENERIC_READ | GENERIC_WRITE))
             return TRUE;
-        
+
         // If the caller required to open the existing archive,
         // and the file is not MPQ archive, return error
         if(dwCreationDisposition == OPEN_EXISTING)
@@ -312,7 +312,7 @@ BOOL WINAPI SFileCreateArchiveEx(const char * szMpqName, DWORD dwCreationDisposi
         dwHashTableSize = HASH_TABLE_SIZE_MIN;
     if(dwHashTableSize > HASH_TABLE_SIZE_MAX)
         dwHashTableSize = HASH_TABLE_SIZE_MAX;
-    
+
     // Round the hash table size up to the nearest power of two
     for(nIndex = 0; PowersOfTwo[nIndex] != 0; nIndex++)
     {
@@ -442,7 +442,7 @@ BOOL WINAPI SFileCreateArchiveEx(const char * szMpqName, DWORD dwCreationDisposi
         BSWAP_TMPQHEADER(ha->pHeader);
         WriteFile(ha->hFile, ha->pHeader, dwHeaderSize, &dwTransferred, NULL);
         BSWAP_TMPQHEADER(ha->pHeader);
-        
+
         if(dwTransferred != ha->pHeader->dwHeaderSize)
             nError = ERROR_DISK_FULL;
 
@@ -477,7 +477,7 @@ BOOL WINAPI SFileCreateArchiveEx(const char * szMpqName, DWORD dwCreationDisposi
         SetLastError(nError);
         ha = NULL;
     }
-    
+
     // Return the values
     *phMPQ = (HANDLE)ha;
     return (nError == ERROR_SUCCESS);
@@ -557,7 +557,7 @@ BOOL WINAPI SFileAddFileEx(HANDLE hMPQ, const char * szFileName, const char * sz
         SetLastError(nError);
     return (nError == ERROR_SUCCESS);
 }
-                                                                                                                                 
+
 // Adds a data file into the archive
 BOOL WINAPI SFileAddFile(HANDLE hMPQ, const char * szFileName, const char * szArchivedName, DWORD dwFlags)
 {
@@ -575,7 +575,7 @@ BOOL WINAPI SFileAddWave(HANDLE hMPQ, const char * szFileName, const char * szAr
 //
 // This function removes a file from the archive. The file content
 // remains there, only the entries in the hash table and in the block
-// table are updated. 
+// table are updated.
 
 BOOL WINAPI SFileRemoveFile(HANDLE hMPQ, const char * szFileName, DWORD dwSearchScope)
 {
diff --git a/src/dep/src/StormLib/SFileFindFile.cpp b/src/dep/src/StormLib/SFileFindFile.cpp
index 8fb4f83..320b0af 100644
--- a/src/dep/src/StormLib/SFileFindFile.cpp
+++ b/src/dep/src/StormLib/SFileFindFile.cpp
@@ -67,7 +67,7 @@ BOOL CheckWildCard(const char * szString, const char * szWildCard)
                 // The next N characters must not agree
                 nMustNotMatch |= 0x70000000;
                 break;
-            
+
             case '?':  // Means "One or no character"
                 while(*szWildCard == '?')
                 {
@@ -111,7 +111,7 @@ BOOL CheckWildCard(const char * szString, const char * szWildCard)
                 {
                     if((nResult = _strnicmp(szString, szWildCard, nMustMatch)) == 0)
                         break;
-                    
+
                     szString++;
                     nMustNotMatch--;
                 }
@@ -234,7 +234,7 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMPQ, const char * szMask, SFILE_FIND_DA
     {
         if(!IsValidMpqHandle(ha))
             nError = ERROR_INVALID_PARAMETER;
-       
+
         if(szMask == NULL || lpFindFileData == NULL)
             nError = ERROR_INVALID_PARAMETER;
 
@@ -272,7 +272,7 @@ HANDLE WINAPI SFileFindFirstFile(HANDLE hMPQ, const char * szMask, SFILE_FIND_DA
         FreeMPQSearch(hs);
         SetLastError(nError);
     }
-    
+
     // Return the result value
     return (HANDLE)hs;
 }
diff --git a/src/dep/src/StormLib/SFileOpenArchive.cpp b/src/dep/src/StormLib/SFileOpenArchive.cpp
index 4282fb2..0c6f3b3 100644
--- a/src/dep/src/StormLib/SFileOpenArchive.cpp
+++ b/src/dep/src/StormLib/SFileOpenArchive.cpp
@@ -73,7 +73,7 @@ static int RelocateMpqTablePositions(TMPQArchive * ha)
     TempSize.QuadPart = ha->ExtBlockTablePos.QuadPart + (pHeader->dwBlockTableSize * sizeof(TMPQBlockEx));
     if(TempSize.QuadPart > ha->MpqSize.QuadPart)
         ha->MpqSize = TempSize;
-    
+
     // MPQ size does not include the bytes before MPQ header
     ha->MpqSize.QuadPart -= ha->MpqPos.QuadPart;
     return ERROR_SUCCESS;
@@ -121,7 +121,7 @@ BOOL SFileOpenArchiveEx(
     DWORD dwBlockTableSize = 0;         // Block table size.
     DWORD dwTransferred;                // Number of bytes read
     DWORD dwBytes = 0;                  // Number of bytes to read
-    int nError = ERROR_SUCCESS;   
+    int nError = ERROR_SUCCESS;
 
     // Check the right parameters
     if(nError == ERROR_SUCCESS)
@@ -141,7 +141,7 @@ BOOL SFileOpenArchiveEx(
         if(hFile == INVALID_HANDLE_VALUE)
             nError = GetLastError();
     }
-    
+
     // Allocate the MPQhandle
     if(nError == ERROR_SUCCESS)
     {
@@ -244,8 +244,8 @@ BOOL SFileOpenArchiveEx(
 				//
 				// Note: the "dwArchiveSize" member in the MPQ header is ignored by Storm.dll
 				// and can contain garbage value ("w3xmaster" protector)
-				// 
-                
+				//
+
                 nError = ERROR_NOT_SUPPORTED;
                 break;
             }
@@ -292,7 +292,7 @@ BOOL SFileOpenArchiveEx(
         // I have found a MPQ which has the block table larger than
         // the hash table. We should avoid buffer overruns caused by that.
         //
-        
+
         if(ha->pHeader->dwBlockTableSize > ha->pHeader->dwHashTableSize)
             ha->pHeader->dwBlockTableSize = ha->pHeader->dwHashTableSize;
         dwBlockTableSize   = ha->pHeader->dwHashTableSize;
@@ -329,11 +329,11 @@ BOOL SFileOpenArchiveEx(
 
         //
         // Check hash table if is correctly decrypted
-        // 
+        //
         // Ladik: Some MPQ protectors corrupt the hash table by rewriting part of it.
         // To be able to open these, we will not check the entire hash table,
         // but will check it at the moment of file opening.
-        // 
+        //
     }
 
     // Now, read the block table
@@ -348,7 +348,7 @@ BOOL SFileOpenArchiveEx(
 
         // I have found a MPQ which claimed 0x200 entries in the block table,
         // but the file was cut and there was only 0x1A0 entries.
-        // We will handle this case properly, even if that means 
+        // We will handle this case properly, even if that means
         // omiting another integrity check of the MPQ
         if(dwTransferred < dwBytes)
             dwBytes = dwTransferred;
@@ -444,7 +444,7 @@ BOOL SFileOpenArchiveEx(
         }
     }
 
-    // If the caller didn't specified otherwise, 
+    // If the caller didn't specified otherwise,
     // include the internal listfile to the TMPQArchive structure
     if(nError == ERROR_SUCCESS)
     {
@@ -459,7 +459,7 @@ BOOL SFileOpenArchiveEx(
         }
     }
 
-    // If the caller didn't specified otherwise, 
+    // If the caller didn't specified otherwise,
     // load the "(attributes)" file
     if(nError == ERROR_SUCCESS && (dwFlags & MPQ_OPEN_NO_ATTRIBUTES) == 0)
     {
@@ -503,7 +503,7 @@ BOOL WINAPI SFileOpenArchive(const char * szMpqName, DWORD dwPriority, DWORD dwF
 BOOL WINAPI SFileFlushArchive(HANDLE hMpq)
 {
     TMPQArchive * ha = (TMPQArchive *)hMpq;
-    
+
     // Do nothing if 'hMpq' is bad parameter
     if(!IsValidMpqHandle(ha))
     {
@@ -531,7 +531,7 @@ BOOL WINAPI SFileFlushArchive(HANDLE hMpq)
 BOOL WINAPI SFileCloseArchive(HANDLE hMPQ)
 {
     TMPQArchive * ha = (TMPQArchive *)hMPQ;
-    
+
     // Flush all unsaved data to the storage
     if(!SFileFlushArchive(hMPQ))
         return FALSE;
diff --git a/src/dep/src/StormLib/SFileOpenFileEx.cpp b/src/dep/src/StormLib/SFileOpenFileEx.cpp
index 3317455..0c99189 100644
--- a/src/dep/src/StormLib/SFileOpenFileEx.cpp
+++ b/src/dep/src/StormLib/SFileOpenFileEx.cpp
@@ -24,7 +24,7 @@ static BOOL OpenLocalFile(const char * szFileName, HANDLE * phFile)
     if(hFile != INVALID_HANDLE_VALUE)
     {
         // Allocate and initialize file handle
-        size_t nHandleSize = sizeof(TMPQFile) + strlen(szFileName); 
+        size_t nHandleSize = sizeof(TMPQFile) + strlen(szFileName);
         if((hf = (TMPQFile *)ALLOCMEM(char, nHandleSize)) != NULL)
         {
             memset(hf, 0, nHandleSize);
@@ -60,7 +60,7 @@ void FreeMPQFile(TMPQFile *& hf)
 /*****************************************************************************/
 
 //-----------------------------------------------------------------------------
-// SFileEnumLocales enums all locale versions within MPQ. 
+// SFileEnumLocales enums all locale versions within MPQ.
 // Functions fills all available language identifiers on a file into the buffer
 // pointed by plcLocales. There must be enough entries to copy the localed,
 // otherwise the function returns ERROR_INSUFFICIENT_BUFFER.
@@ -259,7 +259,7 @@ BOOL WINAPI SFileOpenFileEx(HANDLE hMPQ, const char * szFileName, DWORD dwSearch
     size_t nHandleSize = 0;             // Memory space necessary to allocate TMPQHandle
     int nError = ERROR_SUCCESS;
 
-#ifdef _DEBUG    
+#ifdef _DEBUG
     // Due to increasing numbers of files in MPQs, I had to change the behavior
     // of opening by file index. Now, the SFILE_OPEN_BY_INDEX value of dwSearchScope
     // must be entered. This check will allow to find code places that are incompatible
@@ -361,13 +361,13 @@ BOOL WINAPI SFileOpenFileEx(HANDLE hMPQ, const char * szFileName, DWORD dwSearch
         hf->pBlock   = pBlock;
         hf->nBlocks  = (hf->pBlock->dwFSize + ha->dwBlockSize - 1) / ha->dwBlockSize;
         hf->pHash    = pHash;
-        
+
         hf->MpqFilePos.HighPart = pBlockEx->wFilePosHigh;
         hf->MpqFilePos.LowPart  = pBlock->dwFilePos;
         hf->RawFilePos.QuadPart = hf->MpqFilePos.QuadPart + ha->MpqPos.QuadPart;
 
         hf->dwHashIndex  = dwHashIndex;
-        hf->dwBlockIndex = dwBlockIndex; 
+        hf->dwBlockIndex = dwBlockIndex;
 
         // Allocate buffers for decompression.
         if(hf->pBlock->dwFlags & MPQ_FILE_COMPRESSED)
@@ -377,11 +377,11 @@ BOOL WINAPI SFileOpenFileEx(HANDLE hMPQ, const char * szFileName, DWORD dwSearch
             // As for newer MPQs, there may be one additional entry in the block table
             // (if the MPQ_FILE_HAS_EXTRA flag is set).
             // Allocate the buffer to include this DWORD as well
-            
+
             if((hf->pdwBlockPos = ALLOCMEM(DWORD, hf->nBlocks + 2)) == NULL)
                 nError = ERROR_NOT_ENOUGH_MEMORY;
         }
-        
+
         // Decrypt file seed. Cannot be used if the file is given by index
         if(dwSearchScope != SFILE_OPEN_BY_INDEX)
         {
@@ -436,7 +436,7 @@ BOOL WINAPI SFileOpenFileEx(HANDLE hMPQ, const char * szFileName, DWORD dwSearch
 BOOL WINAPI SFileCloseFile(HANDLE hFile)
 {
     TMPQFile * hf = (TMPQFile *)hFile;
-    
+
     if(!IsValidFileHandle(hf))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
diff --git a/src/dep/src/StormLib/SFileReadFile.cpp b/src/dep/src/StormLib/SFileReadFile.cpp
index 4d95400..d77469c 100644
--- a/src/dep/src/StormLib/SFileReadFile.cpp
+++ b/src/dep/src/StormLib/SFileReadFile.cpp
@@ -255,7 +255,7 @@ static DWORD WINAPI ReadMPQBlocks(TMPQFile * hf, DWORD dwBlockPos, BYTE * buffer
 // (e.g. the "dwToRead + dwFilePos" is not greater than the file size)
 static DWORD WINAPI ReadMPQFileSingleUnit(TMPQFile * hf, DWORD dwFilePos, BYTE * pbBuffer, DWORD dwToRead)
 {
-    TMPQArchive * ha = hf->ha; 
+    TMPQArchive * ha = hf->ha;
     DWORD dwBytesRead = 0;
 
     // If the file is really compressed, decompress it.
@@ -320,7 +320,7 @@ static DWORD WINAPI ReadMPQFileSingleUnit(TMPQFile * hf, DWORD dwFilePos, BYTE *
         // Move file pointer to the dwFilePos of the file, added by PeakGao, 2008.10.28
         RawFilePos.QuadPart += dwFilePos;
         SetFilePointer(ha->hFile, RawFilePos.LowPart, &RawFilePos.HighPart, FILE_BEGIN);
- 
+
         // Read the uncompressed file data
         ReadFile(ha->hFile, pbBuffer, dwToRead, &dwBytesRead, NULL);
     }
@@ -334,7 +334,7 @@ static DWORD WINAPI ReadMPQFileSingleUnit(TMPQFile * hf, DWORD dwFilePos, BYTE *
 
 static DWORD WINAPI ReadMPQFile(TMPQFile * hf, DWORD dwFilePos, BYTE * pbBuffer, DWORD dwToRead)
 {
-    TMPQArchive * ha = hf->ha; 
+    TMPQArchive * ha = hf->ha;
     TMPQBlock * pBlock = hf->pBlock; // Pointer to file block
     DWORD dwBytesRead = 0;           // Number of bytes read from the file
     DWORD dwBlockPos;                // Position in the file aligned to the whole blocks
@@ -382,7 +382,7 @@ static DWORD WINAPI ReadMPQFile(TMPQFile * hf, DWORD dwFilePos, BYTE * pbBuffer,
 
         // Copy data from block buffer into target buffer
         memcpy(pbBuffer, ha->pbBlockBuffer + ha->dwBuffPos, dwToCopy);
-    
+
         // Update pointers
         dwToRead      -= dwToCopy;
         dwBytesRead   += dwToCopy;
@@ -397,7 +397,7 @@ static DWORD WINAPI ReadMPQFile(TMPQFile * hf, DWORD dwFilePos, BYTE * pbBuffer,
 
     // Load the whole ("middle") blocks only if there are more or equal one block
     if(dwToRead > ha->dwBlockSize)
-    {                                           
+    {
         DWORD dwBlockBytes = dwToRead & ~(ha->dwBlockSize - 1);
 
         dwLoaded = ReadMPQBlocks(hf, dwBlockPos, pbBuffer, dwBlockBytes);
@@ -442,7 +442,7 @@ static DWORD WINAPI ReadMPQFile(TMPQFile * hf, DWORD dwFilePos, BYTE * pbBuffer,
         dwBytesRead  += dwToCopy;
         ha->dwBuffPos = dwToCopy;
     }
-    
+
     // Return what we've read
     return dwBytesRead;
 }
@@ -478,7 +478,7 @@ BOOL WINAPI SFileReadFile(HANDLE hFile, VOID * lpBuffer, DWORD dwToRead, DWORD *
             SetLastError(ERROR_HANDLE_EOF);
             return FALSE;
         }
-        
+
         if(pdwRead != NULL)
             *pdwRead = dwTransferred;
         return TRUE;
@@ -519,7 +519,7 @@ BOOL WINAPI SFileReadFile(HANDLE hFile, VOID * lpBuffer, DWORD dwToRead, DWORD *
 DWORD WINAPI SFileGetFilePos(HANDLE hFile, DWORD * pdwFilePosHigh)
 {
     TMPQFile * hf = (TMPQFile *)hFile;
-    
+
     if(pdwFilePosHigh != NULL)
         *pdwFilePosHigh = 0;
 
@@ -545,7 +545,7 @@ DWORD WINAPI SFileGetFilePos(HANDLE hFile, DWORD * pdwFilePosHigh)
 DWORD WINAPI SFileGetFileSize(HANDLE hFile, DWORD * pdwFileSizeHigh)
 {
     TMPQFile * hf = (TMPQFile *)hFile;
-    
+
     if(pdwFileSizeHigh != NULL)
         *pdwFileSizeHigh = 0;
 
@@ -623,7 +623,7 @@ DWORD WINAPI SFileSetFilePointer(HANDLE hFile, LONG lFilePos, LONG * pdwFilePosH
 //-----------------------------------------------------------------------------
 // Tries to retrieve the file name
 
-static TID2Ext id2ext[] = 
+static TID2Ext id2ext[] =
 {
     {0x1A51504D, "mpq"},                // MPQ archive header ID ('MPQ\x1A')
     {0x46464952, "wav"},                // WAVE header 'RIFF'
@@ -643,7 +643,7 @@ static TID2Ext id2ext[] =
     {0x43424457, "dbc"},                // ??? .dbc
     {0x47585053, "bls"},                // WoW pixel shaders
     {0xE0FFD8FF, "jpg"},                // JPEG image
-    {0, NULL}                           // Terminator 
+    {0, NULL}                           // Terminator
 };
 
 BOOL WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
@@ -665,7 +665,7 @@ BOOL WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
         if(hf == NULL || szFileName == NULL)
             nError = ERROR_INVALID_PARAMETER;
     }
-    
+
     // If the file name is already filled, return it.
     if(nError == ERROR_SUCCESS && *hf->szFileName != 0)
     {
@@ -684,7 +684,7 @@ BOOL WINAPI SFileGetFileName(HANDLE hFile, char * szFileName)
     if(nError == ERROR_SUCCESS)
     {
         dwFirstBytes[0] = dwFirstBytes[1] = 0;
-        dwFilePos = SFileSetFilePointer(hf, 0, NULL, FILE_CURRENT);   
+        dwFilePos = SFileSetFilePointer(hf, 0, NULL, FILE_CURRENT);
         SFileReadFile(hFile, &dwFirstBytes, sizeof(dwFirstBytes), NULL);
         BSWAP_ARRAY32_UNSIGNED(dwFirstBytes, sizeof(dwFirstBytes) / sizeof(DWORD));
         SFileSetFilePointer(hf, dwFilePos, NULL, FILE_BEGIN);
diff --git a/src/dep/src/StormLib/SListFile.cpp b/src/dep/src/StormLib/SListFile.cpp
index 40e331e..3341ccd 100644
--- a/src/dep/src/StormLib/SListFile.cpp
+++ b/src/dep/src/StormLib/SListFile.cpp
@@ -67,7 +67,7 @@ static size_t ReadLine(TListFileCache * pCache, char * szLine, int nMaxChars)
 {
     char * szLineBegin = szLine;
     char * szLineEnd = szLine + nMaxChars - 1;
-    
+
 __BeginLoading:
 
     // Skip newlines, spaces, tabs and another non-printable stuff
@@ -357,8 +357,8 @@ int SListFileSaveToMpq(TMPQArchive * ha)
             szBuffer[nLength + 0] = 0x0D;
             szBuffer[nLength + 1] = 0x0A;
             WriteFile(hFile, szBuffer, (DWORD)(nLength + 2), &dwTransferred, NULL);
-        }                     
-        
+        }
+
         // Add the listfile into the archive.
         SFileSetLocale(LANG_NEUTRAL);
         nError = AddFileToArchive(ha,
@@ -384,7 +384,7 @@ int SListFileSaveToMpq(TMPQArchive * ha)
 // File functions
 
 // Adds a listfile into the MPQ archive.
-// Note that the function does not remove the 
+// Note that the function does not remove the
 int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile)
 {
     TListFileCache * pCache = NULL;
@@ -413,7 +413,7 @@ int WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile)
 
     if(nError == ERROR_SUCCESS)
     {
-        dwCacheSize = 
+        dwCacheSize =
         dwFileSize = SFileGetFileSize(hListFile, NULL);
 
         // Try to allocate memory for the complete file. If it fails,
@@ -496,7 +496,7 @@ HANDLE SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char *
 
     if(nError == ERROR_SUCCESS)
     {
-        dwCacheSize = 
+        dwCacheSize =
         dwFileSize = SFileGetFileSize(hListFile, NULL);
 
         // Try to allocate memory for the complete file. If it fails,
@@ -546,7 +546,7 @@ HANDLE SListFileFindFirstFile(HANDLE hMpq, const char * szListFile, const char *
 
             // If some mask entered, check it
             if(CheckWildCard(lpFindFileData->cFileName, pCache->szMask))
-                break;                
+                break;
         }
     }
 
diff --git a/src/dep/src/StormLib/StormLib.h b/src/dep/src/StormLib/StormLib.h
index 849018e..9b70bce 100644
--- a/src/dep/src/StormLib/StormLib.h
+++ b/src/dep/src/StormLib/StormLib.h
@@ -67,7 +67,7 @@
 //
 // The library type is encoded in the library name as the following
 // StormLibXYZ.lib
-// 
+//
 //  X - D for Debug version, R for Release version
 //  Y - A for ANSI version, U for Unicode version (Unicode version does not exist yet)
 //  Z - S for static C library, D for multithreaded DLL C-library
@@ -75,15 +75,15 @@
 
 // #if defined(_MSC_VER) && !defined (__STORMLIB_SELF__)
 //   #ifdef _DEBUG                                 // DEBUG VERSIONS
-//     #ifdef _DLL                               
+//     #ifdef _DLL
 //       #pragma comment(lib, "StormLibDAD.lib")   // Debug Ansi Dynamic version
-//     #else        
+//     #else
 //       #pragma comment(lib, "StormLibDAS.lib")   // Debug Ansi Static version
 //     #endif
 //   #else                                         // RELEASE VERSIONS
 //     #ifdef _DLL
 //       #pragma comment(lib, "StormLibRAD.lib")   // Release Ansi Dynamic version
-//     #else        
+//     #else
 //       #pragma comment(lib, "StormLibRAS.lib")   // Release Ansi Static version
 //     #endif
 //   #endif
@@ -123,7 +123,7 @@
 #define MPQ_FILE_IMPLODE         0x00000100 // Implode method (By PKWARE Data Compression Library)
 #define MPQ_FILE_COMPRESS        0x00000200 // Compress methods (My various methods)
 #define MPQ_FILE_COMPRESSED      0x0000FF00 // File is compressed
-#define MPQ_FILE_ENCRYPTED       0x00010000 // Indicates whether file is encrypted 
+#define MPQ_FILE_ENCRYPTED       0x00010000 // Indicates whether file is encrypted
 #define MPQ_FILE_FIXSEED         0x00020000 // File decrypt seed has to be fixed
 #define MPQ_FILE_SINGLE_UNIT     0x01000000 // File is stored as a single unit, rather than split into sectors (Thx, Quantam)
 #define MPQ_FILE_DUMMY_FILE      0x02000000 // The file is only 1 byte long and its name is a hash
@@ -146,8 +146,8 @@
 #define MPQ_COMPRESSION_ZLIB        0x02    // ZLIB compression
 #define MPQ_COMPRESSION_PKWARE      0x08    // PKWARE DCL compression
 #define MPQ_COMPRESSION_BZIP2       0x10    // BZIP2 compression
-#define MPQ_COMPRESSION_WAVE_MONO   0x40    // 
-#define MPQ_COMPRESSION_WAVE_STEREO 0x80    // 
+#define MPQ_COMPRESSION_WAVE_MONO   0x40    //
+#define MPQ_COMPRESSION_WAVE_STEREO 0x80    //
 
 
 // Constants for SFileAddWave
@@ -182,7 +182,7 @@
 #define CCB_COPYING_NON_MPQ_DATA     3      // Copying non-MPQ data: No params used
 #define CCB_COMPACTING_FILES         4      // Compacting archive (dwParam1 = current, dwParam2 = total)
 #define CCB_CLOSING_ARCHIVE          5      // Closing archive: No params used
-                                      
+
 #define LISTFILE_NAME     "(listfile)"      // Name of internal listfile
 #define SIGNATURE_NAME   "(signature)"      // Name of internal signature
 #define ATTRIBUTES_NAME "(attributes)"      // Name of internal attributes file
@@ -190,7 +190,7 @@
 #define STORMLIB_VERSION      (0x0619)      // Current version of StormLib
 
 #define MPQ_FORMAT_VERSION_1        0       // Up to The Burning Crusade
-#define MPQ_FORMAT_VERSION_2        1       // The Burning Crusade and newer 
+#define MPQ_FORMAT_VERSION_2        1       // The Burning Crusade and newer
 
 // Flags for SFileOpenArchiveEx
 #define MPQ_OPEN_NO_LISTFILE    0x00000001  // Don't add the internal listfile
@@ -238,10 +238,10 @@ struct TMPQShunt
 struct TMPQHeader
 {
     // The ID_MPQ ('MPQ\x1A') signature
-    DWORD dwID;                         
+    DWORD dwID;
 
     // Size of the archive header
-    DWORD dwHeaderSize;                   
+    DWORD dwHeaderSize;
 
     // Size of MPQ archive
     // This field is deprecated in the Burning Crusade MoPaQ format, and the size of the archive
@@ -260,14 +260,14 @@ struct TMPQHeader
 
     // Offset to the beginning of the hash table, relative to the beginning of the archive.
     DWORD dwHashTablePos;
-    
+
     // Offset to the beginning of the block table, relative to the beginning of the archive.
     DWORD dwBlockTablePos;
-    
+
     // Number of entries in the hash table. Must be a power of two, and must be less than 2^16 for
     // the original MoPaQ format, or less than 2^20 for the Burning Crusade format.
     DWORD dwHashTableSize;
-    
+
     // Number of entries in the block table
     DWORD dwBlockTableSize;
 };
@@ -292,7 +292,7 @@ struct TMPQHash
 {
     // The hash of the file path, using method A.
     DWORD dwName1;
-    
+
     // The hash of the file path, using method B.
     DWORD dwName2;
 
@@ -328,16 +328,16 @@ struct TMPQBlock
 {
     // Offset of the beginning of the block, relative to the beginning of the archive.
     DWORD dwFilePos;
-    
+
     // Compressed file size
     DWORD dwCSize;
-    
+
     // Only valid if the block is a file; otherwise meaningless, and should be 0.
     // If the file is compressed, this is the size of the uncompressed file data.
-    DWORD dwFSize;                      
-    
+    DWORD dwFSize;
+
     // Flags for the file. See MPQ_FILE_XXXX constants
-    DWORD dwFlags;                      
+    DWORD dwFlags;
 };
 
 
@@ -358,7 +358,7 @@ struct TFileNode
                                         // There can be more files that have the same name.
                                         // (e.g. multiple language files). We don't want to
                                         // have an entry for each of them, so the entries will be referenced.
-                                        // When a number of node references reaches zero, 
+                                        // When a number of node references reaches zero,
                                         // the node will be deleted
 
     size_t nLength;                     // File name length
@@ -430,7 +430,7 @@ struct TMPQArchive
     TMPQHash    * pHashTable;           // Hash table
     TMPQBlock   * pBlockTable;          // Block table
     TMPQBlockEx * pExtBlockTable;       // Extended block table
-    
+
     TMPQShunt     Shunt;                // MPQ shunt. Valid only when ID_MPQ_SHUNT has been found
     TMPQHeader2   Header;               // MPQ header
 
@@ -577,8 +577,8 @@ int   WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile);
 
 // Archive creating and editing
 BOOL  WINAPI SFileCreateArchiveEx(const char * szMpqName, DWORD dwCreationDisposition, DWORD dwHashTableSize, HANDLE * phMpq);
-BOOL  WINAPI SFileAddFile(HANDLE hMpq, const char * szFileName, const char * szArchivedName, DWORD dwFlags); 
-BOOL  WINAPI SFileAddWave(HANDLE hMpq, const char * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality); 
+BOOL  WINAPI SFileAddFile(HANDLE hMpq, const char * szFileName, const char * szArchivedName, DWORD dwFlags);
+BOOL  WINAPI SFileAddWave(HANDLE hMpq, const char * szFileName, const char * szArchivedName, DWORD dwFlags, DWORD dwQuality);
 BOOL  WINAPI SFileRemoveFile(HANDLE hMpq, const char * szFileName, DWORD dwSearchScope = SFILE_OPEN_BY_INDEX);
 BOOL  WINAPI SFileRenameFile(HANDLE hMpq, const char * szOldFileName, const char * szNewFileName);
 BOOL  WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale);
diff --git a/src/dep/src/StormLib/StormPort.h b/src/dep/src/StormLib/StormPort.h
index 8ee6ff8..271c5a4 100644
--- a/src/dep/src/StormLib/StormPort.h
+++ b/src/dep/src/StormLib/StormPort.h
@@ -35,9 +35,9 @@
   #define _CRT_NON_CONFORMING_SWPRINTFS
   #endif
 
-  #include <assert.h>      
-  #include <stdio.h>      
-  #include <windows.h>      
+  #include <assert.h>
+  #include <stdio.h>
+  #include <windows.h>
   #define PLATFORM_LITTLE_ENDIAN  1
 
   #ifdef WIN64
@@ -50,12 +50,12 @@
 
 #endif
 
-// Defines for Mac Carbon 
+// Defines for Mac Carbon
 #if !defined(PLATFORM_DEFINED) && defined(__APPLE__)  // Mac Carbon API
 
   // Macintosh using Carbon
   #include <Carbon/Carbon.h> // Mac OS X
-  
+
   #define    PKEXPORT
   #define    __SYS_ZLIB
   #define    __SYS_BZLIB
@@ -66,13 +66,13 @@
   #else
     #define PLATFORM_LITTLE_ENDIAN  1       // Apple is now making Macs with Intel CPUs
   #endif
-  
+
   #ifdef __LP64__
     #define PLATFORM_64BIT
   #else
     #define PLATFORM_32BIT
   #endif
-  
+
   #define PLATFORM_DEFINED                  // The platform is known now
 
 #endif
@@ -128,11 +128,11 @@
   typedef LONG         * PLONG;
   typedef DWORD        * LPDWORD;
   typedef BYTE         * LPBYTE;
-  
+
   typedef struct _FILETIME
-  { 
-      DWORD dwLowDateTime; 
-      DWORD dwHighDateTime; 
+  {
+      DWORD dwLowDateTime;
+      DWORD dwHighDateTime;
   }
   FILETIME, *PFILETIME;
 
@@ -154,7 +154,7 @@
     LONGLONG QuadPart;
   }
   LARGE_INTEGER, *PLARGE_INTEGER;
-  
+
   // Some Windows-specific defines
   #ifndef MAX_PATH
     #define MAX_PATH 1024
@@ -169,21 +169,21 @@
   #endif
 
   #define VOID     void
-  #define WINAPI 
+  #define WINAPI
 
   #define FILE_BEGIN    SEEK_SET
   #define FILE_CURRENT  SEEK_CUR
   #define FILE_END      SEEK_END
-  
+
   #define CREATE_NEW    1
   #define CREATE_ALWAYS 2
   #define OPEN_EXISTING 3
   #define OPEN_ALWAYS   4
-  
+
   #define FILE_SHARE_READ 0x00000001L
   #define GENERIC_WRITE   0x40000000
   #define GENERIC_READ    0x80000000
-  
+
   #define ERROR_SUCCESS                     0
   #define ERROR_INVALID_FUNCTION            1
   #define ERROR_FILE_NOT_FOUND              2
@@ -204,14 +204,14 @@
   #define ERROR_PARAMETER_QUOTA_EXCEEDED 1283
   #define ERROR_FILE_CORRUPT             1392
   #define ERROR_INSUFFICIENT_BUFFER      4999
-  
+
   #define INVALID_HANDLE_VALUE ((HANDLE) -1)
-  
+
   #define _stricmp strcasecmp
   #define _strnicmp strncasecmp
-  
+
   extern int globalerr;
-  
+
   void  SetLastError(int err);
   int   GetLastError();
   char *ErrString(int err);
diff --git a/src/dep/src/StormLib/StormPortLinux.cpp b/src/dep/src/StormLib/StormPortLinux.cpp
index 3a7c565..24f3ea3 100644
--- a/src/dep/src/StormLib/StormPortLinux.cpp
+++ b/src/dep/src/StormLib/StormPortLinux.cpp
@@ -2,7 +2,7 @@
 *
 * Description:  implementation for StormLib - linux port
 *       intended to be used in GLdiablo
-*       
+*
 *   ---->   StormLib was originally developed for Windows by
 *       Ladislav Zezula (www.zezula.net), and he did
 *       a _great_ job! Thanks Ladislav!
@@ -17,9 +17,9 @@
 *
 * Author: Marko Friedemann <marko.friedemann@bmx-chemnitz.de>
 * Created at: Mon Jan 29 19:01:37 CEST 2001
-* Computer: whiplash.flachland-chemnitz.de 
+* Computer: whiplash.flachland-chemnitz.de
 * System: Linux 2.4.0 on i686
-*    
+*
 * Copyright (c) 2001 BMX-Chemnitz.DE All rights reserved.
 *
 ********************************************************************/
@@ -99,15 +99,15 @@ DWORD GetFileSize(HANDLE hFile, DWORD *ulOffSetHigh)
 {
     // Fix by Taiche : removed the hFile == NULL test because the CreateFile function above
     // can return a HANDLE equal to 0 WHICH IS A LEGAL VALUE and does not mean the handle is NULL.
-    if (hFile == INVALID_HANDLE_VALUE) 
+    if (hFile == INVALID_HANDLE_VALUE)
     {
         return 0xffffffff;
     }
 
     struct stat64 fileinfo;
     fstat64((intptr_t)hFile, &fileinfo);
-    
-    // Fix by Ladik: If "ulOffSetHigh" is not NULL, it needs to be set 
+
+    // Fix by Ladik: If "ulOffSetHigh" is not NULL, it needs to be set
     // to higher 32 bits of a file size.
     // TODO: Could some Linux programmer verify this ?
     if(ulOffSetHigh != NULL)
diff --git a/src/dep/src/StormLib/StormPortMac.cpp b/src/dep/src/StormLib/StormPortMac.cpp
index 4c35594..a83539d 100644
--- a/src/dep/src/StormLib/StormPortMac.cpp
+++ b/src/dep/src/StormLib/StormPortMac.cpp
@@ -343,9 +343,9 @@ BOOL MoveFile(const char * lpFromFileName, const char * lpToFileName)
 	
 	// Convert CFString to Unicode and rename the file
 	UniChar unicodeFileName[256];
-	CFStringGetCharacters(newFileNameCFString, CFRangeMake(0, CFStringGetLength(newFileNameCFString)), 
+	CFStringGetCharacters(newFileNameCFString, CFRangeMake(0, CFStringGetLength(newFileNameCFString)),
 						  unicodeFileName);
-	theErr = FSRenameUnicode(&toFileRef, CFStringGetLength(newFileNameCFString), unicodeFileName, 
+	theErr = FSRenameUnicode(&toFileRef, CFStringGetLength(newFileNameCFString), unicodeFileName,
 							 kTextEncodingUnknown, NULL);
 	if (theErr != noErr)
 	{
@@ -412,9 +412,9 @@ HANDLE CreateFile(	const char *sFileName,			/* file name */
 		CFStringRef filePathCFString = CFStringCreateWithCString(NULL, sFileName, kCFStringEncodingUTF8);
 		CFURLRef fileURL = CFURLCreateWithFileSystemPath(NULL, filePathCFString, kCFURLPOSIXPathStyle, FALSE);
 		CFStringRef fileNameCFString = CFURLCopyLastPathComponent(fileURL);
-		CFStringGetCharacters(fileNameCFString, CFRangeMake(0, CFStringGetLength(fileNameCFString)), 
+		CFStringGetCharacters(fileNameCFString, CFRangeMake(0, CFStringGetLength(fileNameCFString)),
 							  unicodeFileName);
-		theErr = FSCreateFileUnicode(&theParentRef, CFStringGetLength(fileNameCFString), unicodeFileName, 
+		theErr = FSCreateFileUnicode(&theParentRef, CFStringGetLength(fileNameCFString), unicodeFileName,
 									 kFSCatInfoNone, NULL, &theFileRef, NULL);
 		CFRelease(fileNameCFString);
 		CFRelease(filePathCFString);
@@ -688,7 +688,7 @@ BOOL IsBadReadPtr(const void * ptr, int size)
 	return FALSE;
 }
 
-// Returns attributes of a file. Actually, it doesn't, it just checks if 
+// Returns attributes of a file. Actually, it doesn't, it just checks if
 // the file exists, since that's all StormLib uses it for
 DWORD GetFileAttributes(const char * szFileName)
 {
diff --git a/src/dep/src/StormLib/bzip2/bzlib.h b/src/dep/src/StormLib/bzip2/bzlib.h
index c5b75d6..719c2a1 100644
--- a/src/dep/src/StormLib/bzip2/bzlib.h
+++ b/src/dep/src/StormLib/bzip2/bzlib.h
@@ -11,7 +11,7 @@
    bzip2/libbzip2 version 1.0.5 of 10 December 2007
    Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
 
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the
    README file.
 
    This program is released under the terms of the license contained
@@ -45,7 +45,7 @@ extern "C" {
 #define BZ_OUTBUFF_FULL      (-8)
 #define BZ_CONFIG_ERROR      (-9)
 
-typedef 
+typedef
    struct {
       char *next_in;
       unsigned int avail_in;
@@ -62,7 +62,7 @@ typedef
       void *(*bzalloc)(void *,int,int);
       void (*bzfree)(void *,void *);
       void *opaque;
-   } 
+   }
    bz_stream;
 
 
@@ -97,34 +97,34 @@ typedef
 
 /*-- Core (low-level) library functions --*/
 
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
+BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
+      bz_stream* strm,
+      int        blockSize100k,
+      int        verbosity,
+      int        workFactor
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
+BZ_EXTERN int BZ_API(BZ2_bzCompress) (
+      bz_stream* strm,
+      int action
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
+BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
+      bz_stream* strm
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
+BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
+      bz_stream *strm,
+      int       verbosity,
       int       small
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
+BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
+      bz_stream* strm
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
+BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
+      bz_stream *strm
    );
 
 
@@ -136,64 +136,64 @@ BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
 
 typedef void BZFILE;
 
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   verbosity,
       int   small,
-      void* unused,    
-      int   nUnused 
+      void* unused,
+      int   nUnused
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
+BZ_EXTERN void BZ_API(BZ2_bzReadClose) (
+      int*    bzerror,
+      BZFILE* b
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
+BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) (
+      int*    bzerror,
+      BZFILE* b,
+      void**  unused,
+      int*    nUnused
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+BZ_EXTERN int BZ_API(BZ2_bzRead) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
+BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) (
+      int*  bzerror,
+      FILE* f,
+      int   blockSize100k,
+      int   verbosity,
+      int   workFactor
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+BZ_EXTERN void BZ_API(BZ2_bzWrite) (
+      int*    bzerror,
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in,
+      unsigned int* nbytes_out
    );
 
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
+BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
+      int*          bzerror,
+      BZFILE*       b,
+      int           abandon,
+      unsigned int* nbytes_in_lo32,
+      unsigned int* nbytes_in_hi32,
+      unsigned int* nbytes_out_lo32,
       unsigned int* nbytes_out_hi32
    );
 #endif
@@ -201,23 +201,23 @@ BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
 
 /*-- Utility functions --*/
 
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) (
+      char*         dest,
       unsigned int* destLen,
-      char*         source, 
+      char*         source,
       unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
+      int           blockSize100k,
+      int           verbosity,
+      int           workFactor
    );
 
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
+BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
+      char*         dest,
       unsigned int* destLen,
-      char*         source, 
+      char*         source,
       unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
+      int           small,
+      int           verbosity
    );
 
 
@@ -244,17 +244,17 @@ BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
       int        fd,
       const char *mode
    );
-         
+
 BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
+      BZFILE* b,
+      void* buf,
+      int len
    );
 
 BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
+      BZFILE* b,
+      void*   buf,
+      int     len
    );
 
 BZ_EXTERN int BZ_API(BZ2_bzflush) (
@@ -266,7 +266,7 @@ BZ_EXTERN void BZ_API(BZ2_bzclose) (
    );
 
 BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
+      BZFILE *b,
       int    *errnum
    );
 #endif
diff --git a/src/dep/src/StormLib/bzip2/bzlib_private.h b/src/dep/src/StormLib/bzip2/bzlib_private.h
index 2342787..9a40348 100644
--- a/src/dep/src/StormLib/bzip2/bzlib_private.h
+++ b/src/dep/src/StormLib/bzip2/bzlib_private.h
@@ -11,7 +11,7 @@
    bzip2/libbzip2 version 1.0.5 of 10 December 2007
    Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
 
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+   Please read the WARNING, DISCLAIMER and PATENTS sections in the
    README file.
 
    This program is released under the terms of the license contained
@@ -51,7 +51,7 @@ typedef unsigned short  UInt16;
 
 #ifndef __GNUC__
 #define __inline__  /* */
-#endif 
+#endif
 
 #ifndef BZ_NO_STDIO
 
@@ -109,7 +109,7 @@ extern void bz_internal_error ( int errcode );
 #define BZ_HDR_Z 0x5a   /* 'Z' */
 #define BZ_HDR_h 0x68   /* 'h' */
 #define BZ_HDR_0 0x30   /* '0' */
-  
+
 /*-- Constants for the back end. --*/
 
 #define BZ_MAX_ALPHA_SIZE 258
@@ -269,19 +269,19 @@ typedef
 
 /*-- externs for compression. --*/
 
-extern void 
+extern void
 BZ2_blockSort ( EState* );
 
-extern void 
+extern void
 BZ2_compressBlock ( EState*, Bool );
 
-extern void 
+extern void
 BZ2_bsInitWrite ( EState* );
 
-extern void 
+extern void
 BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
 
-extern void 
+extern void
 BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
 
 
@@ -425,7 +425,7 @@ typedef
       Int32    save_N;
       Int32    save_curr;
       Int32    save_zt;
-      Int32    save_zn; 
+      Int32    save_zn;
       Int32    save_zvec;
       Int32    save_zj;
       Int32    save_gSel;
@@ -481,13 +481,13 @@ typedef
 
 /*-- externs for decompression. --*/
 
-extern Int32 
+extern Int32
 BZ2_indexIntoF ( Int32, Int32* );
 
-extern Int32 
+extern Int32
 BZ2_decompress ( DState* );
 
-extern void 
+extern void
 BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
                            Int32,  Int32, Int32 );
 
diff --git a/src/dep/src/StormLib/huffman/huff.cpp b/src/dep/src/StormLib/huffman/huff.cpp
index 91dcf78..4b4b08a 100644
--- a/src/dep/src/StormLib/huffman/huff.cpp
+++ b/src/dep/src/StormLib/huffman/huff.cpp
@@ -14,10 +14,10 @@
 /* 19.11.03  1.01  Dan  Big endian handling                                  */
 /* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
 /*****************************************************************************/
- 
+
 #include <assert.h>
 #include <string.h>
- 
+
 #include "huff.h"
 
 // Special for Mac - we have to know if normal pointer greater or less
@@ -29,10 +29,10 @@ static long mul = 1;
 #define PTR_INVALID(ptr)         (((LONG_PTR)(ptr) * mul) < 0)
 #define PTR_INVALID_OR_NULL(ptr) (((LONG_PTR)(ptr) * mul) <= 0)
 
- 
+
 //-----------------------------------------------------------------------------
 // Methods of the THTreeItem struct
- 
+
 // 1501DB70
 THTreeItem * THTreeItem::Call1501DB70(THTreeItem * pLast)
 {
@@ -40,83 +40,83 @@ THTreeItem * THTreeItem::Call1501DB70(THTreeItem * pLast)
         pLast = this + 1;
     return pLast;
 }
- 
+
 // Gets previous Huffman tree item (?)
 THTreeItem * THTreeItem::GetPrevItem(LONG_PTR value)
 {
     if(PTR_INVALID(prev))
         return PTR_NOT(prev);
- 
+
     if(value == -1 || PTR_INVALID(value))
         value = (long)(this - next->prev);
     return prev + value;
- 
+
 // OLD VERSION
 //  if(PTR_INT(value) < 0)
 //      value = PTR_INT((item - item->next->prev));
 //  return (THTreeItem *)((char *)prev + value);
 }
- 
+
 // 1500F5E0
 void THTreeItem::ClearItemLinks()
 {
     next = prev = NULL;
 }
- 
+
 // 1500BC90
 void THTreeItem::RemoveItem()
 {
     THTreeItem * pTemp;                // EDX
- 
+
     if(next != NULL)
     {
         pTemp = prev;
-       
+
         if(PTR_INVALID_OR_NULL(pTemp))
             pTemp = PTR_NOT(pTemp);
         else
             pTemp += (this - next->prev);
- 
+
         pTemp->next = next;
         next->prev  = prev;
         next = prev = NULL;
     }
 }
- 
+
 /*
 // OLD VERSION : Removes item from the tree (?)
 static void RemoveItem(THTreeItem * item)
 {
     THTreeItem * next = item->next;     // ESI
     THTreeItem * prev = item->prev;     // EDX
- 
+
     if(next == NULL)
         return;
- 
+
     if(PTR_INT(prev) < 0)
         prev = PTR_NOT(prev);
     else
         // ??? usually item == next->prev, so what is it ?
         prev = (THTreeItem *)((unsigned char *)prev + (unsigned long)((unsigned char *)item - (unsigned char *)(next->prev)));
- 
+
     // Remove HTree item from the chain
     prev->next = next;                  // Sets the 'first' pointer
     next->prev = item->prev;
- 
+
     // Invalidate pointers
     item->next = NULL;
     item->prev = NULL;
 }
 */
- 
+
 //-----------------------------------------------------------------------------
 // TOutputStream functions
- 
+
 void TOutputStream::PutBits(unsigned long dwBuff, unsigned int nPutBits)
 {
     dwBitBuff |= (dwBuff << nBits);
     nBits     += nPutBits;
- 
+
     // Flush completed bytes
     while(nBits >= 8)
     {
@@ -125,12 +125,12 @@ void TOutputStream::PutBits(unsigned long dwBuff, unsigned int nPutBits)
             *pbOutPos++ = (unsigned char)dwBitBuff;
             dwOutSize--;
         }
- 
+
         dwBitBuff >>= 8;
         nBits      -= 8;
     }
 }
- 
+
 //-----------------------------------------------------------------------------
 // TInputStream functions
 
@@ -153,8 +153,8 @@ unsigned long TInputStream::GetBit()
     BitCount--;
 
     return dwOneBit;
-}   
- 
+}
+
 // Gets 7 bits from the stream. DOES NOT remove the bits from input stream
 unsigned long TInputStream::Get7Bits()
 {
@@ -172,7 +172,7 @@ unsigned long TInputStream::Get7Bits()
     // Return the first available 7 bits. DO NOT remove them from the input stream
     return (BitBuffer & 0x7F);
 }
- 
+
 // Gets the whole byte from the input stream.
 unsigned long TInputStream::Get8Bits()
 {
@@ -215,7 +215,7 @@ void TInputStream::SkipBits(unsigned int dwBitsToSkip)
 
 //-----------------------------------------------------------------------------
 // Functions for huffmann tree items
- 
+
 // Inserts item into the tree (?)
 static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long where, THTreeItem * item2)
 {
@@ -223,7 +223,7 @@ static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long w
     THTreeItem * prev = item->prev;     // ESI - prev to the first item
     THTreeItem * prev2;                 // Pointer to previous item
     LONG_PTR next2;                     // Pointer to the next item
-   
+
     // The same code like in RemoveItem(item);
     if(next != 0)                       // If the first item already has next one
     {
@@ -231,20 +231,20 @@ static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long w
             prev = PTR_NOT(prev);
         else
             prev += (item - next->prev);
- 
+
         // 150083C1
         // Remove the item from the tree
         prev->next = next;
         next->prev = prev;
- 
+
         // Invalidate 'prev' and 'next' pointer
         item->next = 0;
         item->prev = 0;
     }
- 
+
     if(item2 == NULL)                   // EDX - If the second item is not entered,
         item2 = PTR_PTR(&itemPtr[1]);   // take the first tree item
- 
+
     switch(where)
     {
         case SWITCH_ITEMS :             // Switch the two items
@@ -253,68 +253,68 @@ static void InsertItem(THTreeItem ** itemPtr, THTreeItem * item, unsigned long w
             item2->next->prev = item;
             item2->next = item;         // Set the first item
             return;
-       
+
         case INSERT_ITEM:               // Insert as the last item
             item->next = item2;         // Set next item (or pointer to pointer to first item)
             item->prev = item2->prev;   // Set prev item (or last item in the tree)
- 
+
             next2 = PTR_INT(itemPtr[0]);// Usually NULL
             prev2 = item2->prev;        // Prev item to the second (or last tree item)
-           
+
             if(PTR_INVALID(prev2))
             {
                 prev2 = PTR_NOT(prev);
- 
+
                 prev2->next = item;
                 item2->prev = item;     // Next after last item
                 return;
             }
- 
+
             if(PTR_INVALID(next2))
                 next2 = (long)(item2 - item2->next->prev);
 //              next2 = (THTreeItem *)(unsigned long)((unsigned char *)item2 - (unsigned char *)(item2->next->prev));
- 
+
 //          prev2 = (THTreeItem *)((char *)prev2 + (unsigned long)next2);// ???
             prev2 += next2;
             prev2->next = item;
             item2->prev = item;         // Set the next/last item
             return;
- 
+
         default:
             return;
     }
 }
- 
+
 //-----------------------------------------------------------------------------
 // THuffmannTree class functions
- 
+
 THuffmannTree::THuffmannTree()
 {
     // We have to check if the "this" pointer is less than zero
     if((LONG_PTR)this < 0)
         mul = -1;
 }
- 
+
 void THuffmannTree::InitTree(bool bCompression)
 {
     THTreeItem * pItem;
     unsigned int nCount;
- 
+
     // Clear links for all the items in the tree
     for(pItem = items0008, nCount = 0x203; nCount != 0; pItem++, nCount--)
         pItem->ClearItemLinks();
- 
+
     pItem3050 = NULL;
     pItem3054 = PTR_PTR(&pItem3054);
     pItem3058 = PTR_NOT(pItem3054);
-   
+
     pItem305C = NULL;
     pFirst    = PTR_PTR(&pFirst);
     pLast     = PTR_NOT(pFirst);
- 
+
     offs0004  = 1;
     nItems    = 0;
- 
+
     // Clear all TQDecompress items. Do this only if preparing for decompression
     if(bCompression == false)
     {
@@ -322,7 +322,7 @@ void THuffmannTree::InitTree(bool bCompression)
             qd3474[nCount].offs00 = 0;
     }
 }
- 
+
 // Builds Huffman tree. Called with the first 8 bits loaded from input stream
 void THuffmannTree::BuildTree(unsigned int nCmpType)
 {
@@ -331,55 +331,55 @@ void THuffmannTree::BuildTree(unsigned int nCmpType)
     unsigned char * byteArray;          // [ESP+1C] - Pointer to unsigned char in Table1502A630
     THTreeItem    * child1;
     unsigned long   i;                  // egcs in linux doesn't like multiple for loops without an explicit i
- 
+
     // Loop while pointer has a valid value
     while(PTR_VALID(pLast))             // ESI - Last entry
     {
         THTreeItem * temp;              // EAX
- 
+
         if(pLast->next != NULL)         // ESI->next
             pLast->RemoveItem();
                                         // EDI = &offs3054
         pItem3058   = PTR_PTR(&pItem3054);// [EDI+4]
         pLast->prev = pItem3058;  // EAX
- 
+
         temp = PTR_PTR(&pItem3054)->GetPrevItem(PTR_INT(&pItem3050));
- 
+
         temp->next = pLast;
         pItem3054  = pLast;
     }
- 
+
     // Clear all pointers in HTree item array
     memset(items306C, 0, sizeof(items306C));
- 
+
     maxByte = 0;                        // Greatest character found init to zero.
     itemPtr = (THTreeItem **)&items306C; // Pointer to current entry in HTree item pointer array
- 
+
     // Ensure we have low 8 bits only
     nCmpType &= 0xFF;
     byteArray  = Table1502A630 + nCmpType * 258; // EDI also
- 
+
     for(i = 0; i < 0x100; i++, itemPtr++)
     {
         THTreeItem * item   = pItem3058;    // Item to be created
         THTreeItem * pItem3 = pItem3058;
         unsigned char         oneByte = byteArray[i];
- 
+
         // Skip all the bytes which are zero.
         if(byteArray[i] == 0)
             continue;
- 
+
         // If not valid pointer, take the first available item in the array
         if(PTR_INVALID_OR_NULL(item))
             item = &items0008[nItems++];
- 
+
         // Insert this item as the top of the tree
         InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
- 
+
         item->parent    = NULL;                 // Invalidate child and parent
         item->child     = NULL;
         *itemPtr        = item;                 // Store pointer into pointer array
- 
+
         item->dcmpByte  = i;                    // Store counter
         item->byteValue = oneByte;              // Store byte value
         if(oneByte >= maxByte)
@@ -387,7 +387,7 @@ void THuffmannTree::BuildTree(unsigned int nCmpType)
             maxByte = oneByte;
             continue;
         }
- 
+
         // Find the first item which has byte value greater than current one byte
         if(PTR_VALID(pItem3 = pLast))           // EDI - Pointer to the last item
         {
@@ -404,35 +404,35 @@ void THuffmannTree::BuildTree(unsigned int nCmpType)
             }
         }
         pItem3 = NULL;
- 
+
         // 15006B09
         _15006B09:
         if(item->next != NULL)
             item->RemoveItem();
- 
+
         // 15006B15
         if(pItem3 == NULL)
             pItem3 = PTR_PTR(&pFirst);
- 
+
         // 15006B1F
         item->next = pItem3->next;
         item->prev = pItem3->next->prev;
         pItem3->next->prev = item;
         pItem3->next = item;
     }
- 
+
     // 15006B4A
     for(; i < 0x102; i++)
     {
         THTreeItem ** itemPtr = &items306C[i];  // EDI
- 
+
         // 15006B59
         THTreeItem * item = pItem3058;          // ESI
         if(PTR_INVALID_OR_NULL(item))
             item = &items0008[nItems++];
- 
+
         InsertItem(&pItem305C, item, INSERT_ITEM, NULL);
- 
+
         // 15006B89
         item->dcmpByte   = i;
         item->byteValue  = 1;
@@ -440,42 +440,42 @@ void THuffmannTree::BuildTree(unsigned int nCmpType)
         item->child      = NULL;
         *itemPtr++ = item;
     }
- 
+
     // 15006BAA
     if(PTR_VALID(child1 = pLast))                   // EDI - last item (first child to item
     {
         THTreeItem * child2;                        // EBP
         THTreeItem * item;                          // ESI
- 
+
         // 15006BB8
         while(PTR_VALID(child2 = child1->prev))
         {
             if(PTR_INVALID_OR_NULL(item = pItem3058))
                 item = &items0008[nItems++];
- 
+
             // 15006BE3
             InsertItem(&pItem305C, item, SWITCH_ITEMS, NULL);
- 
+
             // 15006BF3
             item->parent = NULL;
             item->child  = NULL;
- 
+
             //EDX = child2->byteValue + child1->byteValue;
             //EAX = child1->byteValue;
             //ECX = maxByte;                        // The greatest character (0xFF usually)
- 
+
             item->byteValue = child1->byteValue + child2->byteValue; // 0x02
             item->child     = child1;                                // Prev item in the
             child1->parent  = item;
             child2->parent  = item;
- 
+
             // EAX = item->byteValue;
             if(item->byteValue >= maxByte)
                 maxByte = item->byteValue;
             else
             {
                 THTreeItem * pItem2 = child2->prev;   // EDI
- 
+
                 // 15006C2D
                 while(PTR_VALID(pItem2))
                 {
@@ -484,22 +484,22 @@ void THuffmannTree::BuildTree(unsigned int nCmpType)
                     pItem2 = pItem2->prev;
                 }
                 pItem2 = NULL;
- 
+
                 _15006C3B:
                 if(item->next != 0)
                 {
                     THTreeItem * temp4 = item->GetPrevItem(-1);
-                                                                   
+
                     temp4->next      = item->next;                 // The first item changed
                     item->next->prev = item->prev;                 // First->prev changed to negative value
                     item->next = NULL;
                     item->prev = NULL;
                 }
- 
+
                 // 15006C62
                 if(pItem2 == NULL)
                     pItem2 = PTR_PTR(&pFirst);
- 
+
                 item->next = pItem2->next;                           // Set item with 0x100 byte value
                 item->prev = pItem2->next->prev;                     // Set item with 0x17 byte value
                 pItem2->next->prev = item;                           // Changed prev of item with
@@ -521,48 +521,48 @@ void THuffmannTree::ModifyTree(unsigned long dwIndex)
     THTreeItem * pItem1 = pItem3058;                              // ESI
     THTreeItem * pSaveLast = (PTR_INT(pLast) <= 0) ? NULL : pLast;  // EBX
     THTreeItem * temp;                                              // EAX
- 
+
     // Prepare the first item to insert to the tree
     if(PTR_INT(pItem1) <= 0)
         pItem1 = &items0008[nItems++];
- 
+
     // If item has any next item, remove it from the chain
     if(pItem1->next != NULL)
     {
         THTreeItem * temp = pItem1->GetPrevItem(-1);                  // EAX
- 
+
         temp->next = pItem1->next;
         pItem1->next->prev = pItem1->prev;
         pItem1->next = NULL;
         pItem1->prev = NULL;
     }
- 
+
     pItem1->next = PTR_PTR(&pFirst);
     pItem1->prev = pLast;
     temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
- 
+
     // 150068E9
     temp->next = pItem1;
     pLast  = pItem1;
- 
+
     pItem1->parent = NULL;
     pItem1->child  = NULL;
- 
+
     // 150068F6
     pItem1->dcmpByte  = pSaveLast->dcmpByte;   // Copy item index
     pItem1->byteValue = pSaveLast->byteValue;  // Copy item byte value
     pItem1->parent    = pSaveLast;             // Set parent to last item
     items306C[pSaveLast->dcmpByte] = pItem1;  // Insert item into item pointer array
- 
+
     // Prepare the second item to insert into the tree
     if(PTR_INT((pItem1 = pItem3058)) <= 0)
         pItem1 = &items0008[nItems++];
- 
+
     // 1500692E
     if(pItem1->next != NULL)
     {
         temp = pItem1->GetPrevItem(-1);   // EAX
- 
+
         temp->next = pItem1->next;
         pItem1->next->prev = pItem1->prev;
         pItem1->next = NULL;
@@ -572,11 +572,11 @@ void THuffmannTree::ModifyTree(unsigned long dwIndex)
     pItem1->next = PTR_PTR(&pFirst);
     pItem1->prev = pLast;
     temp = pItem1->next->GetPrevItem(PTR_INT(pItem305C));
- 
+
     // 15006968
     temp->next = pItem1;
     pLast      = pItem1;
- 
+
     // 1500696E
     pItem1->child     = NULL;
     pItem1->dcmpByte  = dwIndex;
@@ -584,45 +584,45 @@ void THuffmannTree::ModifyTree(unsigned long dwIndex)
     pItem1->parent    = pSaveLast;
     pSaveLast->child   = pItem1;
     items306C[dwIndex] = pItem1;
- 
+
     do
     {
         THTreeItem  * pItem2 = pItem1;
         THTreeItem  * pItem3;
         unsigned long byteValue;
- 
+
         // 15006993
         byteValue = ++pItem1->byteValue;
- 
+
         // Pass through all previous which have its value greater than byteValue
         while(PTR_INT((pItem3 = pItem2->prev)) > 0)  // EBX
         {
             if(pItem3->byteValue >= byteValue)
                 goto _150069AE;
- 
+
             pItem2 = pItem2->prev;
         }
         // 150069AC
         pItem3 = NULL;
- 
+
         _150069AE:
         if(pItem2 == pItem1)
             continue;
- 
+
         // 150069B2
         // Switch pItem2 with item
         InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
         InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
- 
+
         // 150069D0
         // Switch parents of pItem1 and pItem2
         temp = pItem2->parent->child;
         if(pItem1 == pItem1->parent->child)
             pItem1->parent->child = pItem2;
- 
+
         if(pItem2 == temp)
             pItem2->parent->child = pItem1;
- 
+
         // 150069ED
         // Switch parents of pItem1 and pItem3
         temp = pItem1->parent;
@@ -632,7 +632,7 @@ void THuffmannTree::ModifyTree(unsigned long dwIndex)
     }
     while(PTR_INT((pItem1 = pItem1->parent)) > 0);
 }
- 
+
 void THuffmannTree::UninitTree()
 {
     while(PTR_INT(pLast) > 0)
@@ -640,11 +640,11 @@ void THuffmannTree::UninitTree()
         pItem = pItem305C->Call1501DB70(pLast);
         pItem->RemoveItem();
     }
- 
+
     for(pItem = pFirst; PTR_INT(pItem3058) > 0; pItem = pItem3058)
         pItem->RemoveItem();
     PTR_PTR(&pItem3054)->RemoveItem();
- 
+
     for(pItem = items0008 + 0x203, nCount = 0x203; nCount != 0; nCount--)
     {
         pItem--;
@@ -653,7 +653,7 @@ void THuffmannTree::UninitTree()
     }
 }
 */
- 
+
 THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
 {
     THTreeItem * pItem1 = pItem3058;    // EDX
@@ -661,7 +661,7 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
     THTreeItem * pNext;
     THTreeItem * pPrev;
     THTreeItem ** ppItem;
- 
+
     if(PTR_INVALID_OR_NULL(pItem1) || (pItem2 = pItem1) == NULL)
     {
         if((pItem2 = &items0008[nItems++]) != NULL)
@@ -671,7 +671,7 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
     }
     else
         pItem1 = pItem2;
- 
+
     pNext = pItem1->next;
     if(pNext != NULL)
     {
@@ -680,23 +680,23 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
             pPrev = PTR_NOT(pPrev);
         else
             pPrev += (pItem1 - pItem1->next->prev);
- 
+
         pPrev->next = pNext;
         pNext->prev = pPrev;
         pItem1->next = NULL;
         pItem1->prev = NULL;
     }
- 
+
     ppItem = &pFirst;       // esi
     if(nValue > 1)
     {
         // ecx = pFirst->next;
         pItem1->next = *ppItem;
         pItem1->prev = (*ppItem)->prev;
- 
+
         (*ppItem)->prev = pItem2;
         *ppItem = pItem1;
- 
+
         pItem2->parent = NULL;
         pItem2->child  = NULL;
     }
@@ -711,7 +711,7 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
             pPrev = PTR_NOT(pPrev);
             pPrev->next = pItem1;
             pPrev->prev = pItem2;
- 
+
             pItem2->parent = NULL;
             pItem2->child  = NULL;
         }
@@ -721,7 +721,7 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
                 pPrev += (THTreeItem *)ppItem - (*ppItem)->prev;
             else
                 pPrev += PTR_INT(pItem305C);
- 
+
             pPrev->next    = pItem1;
             ppItem[1]      = pItem2;
             pItem2->parent = NULL;
@@ -730,18 +730,18 @@ THTreeItem * THuffmannTree::Call1500E740(unsigned int nValue)
     }
     return pItem2;
 }
- 
+
 void THuffmannTree::Call1500E820(THTreeItem * pItem)
 {
     THTreeItem * pItem1;                // edi
     THTreeItem * pItem2 = NULL;         // eax
     THTreeItem * pItem3;                // edx
     THTreeItem * pPrev;                 // ebx
- 
+
     for(; pItem != NULL; pItem = pItem->parent)
     {
         pItem->byteValue++;
-       
+
         for(pItem1 = pItem; ; pItem1 = pPrev)
         {
             pPrev = pItem1->prev;
@@ -750,14 +750,14 @@ void THuffmannTree::Call1500E820(THTreeItem * pItem)
                 pPrev = NULL;
                 break;
             }
- 
+
             if(pPrev->byteValue >= pItem->byteValue)
                 break;
         }
- 
+
         if(pItem1 == pItem)
             continue;
- 
+
         if(pItem1->next != NULL)
         {
             pItem2 = pItem1->GetPrevItem(-1);
@@ -766,7 +766,7 @@ void THuffmannTree::Call1500E820(THTreeItem * pItem)
             pItem1->next = NULL;
             pItem1->prev = NULL;
         }
- 
+
         pItem2 = pItem->next;
         pItem1->next = pItem2;
         pItem1->prev = pItem2->prev;
@@ -780,30 +780,30 @@ void THuffmannTree::Call1500E820(THTreeItem * pItem)
             pItem->next = NULL;
             pItem->prev = NULL;
         }
- 
+
         if(pPrev == NULL)
             pPrev = PTR_PTR(&pFirst);
- 
+
         pItem2       = pPrev->next;
         pItem->next  = pItem2;
         pItem->prev  = pItem2->prev;
         pItem2->prev = pItem;
         pPrev->next  = pItem;
- 
+
         pItem3 = pItem1->parent->child;
         pItem2 = pItem->parent;
         if(pItem2->child == pItem)
             pItem2->child = pItem1;
         if(pItem3 == pItem1)
             pItem1->parent->child = pItem;
- 
+
         pItem2 = pItem->parent;
         pItem->parent  = pItem1->parent;
         pItem1->parent = pItem2;
         offs0004++;
     }
 }
- 
+
 // 1500E920
 unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType)
 {
@@ -814,14 +814,14 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
     unsigned long dwBitBuff;
     unsigned int  nBits;
     unsigned int  nBit;
- 
+
     BuildTree(nCmpType);
     bIsCmp0 = (nCmpType == 0);
- 
+
     // Store the compression type into output buffer
     os->dwBitBuff |= (nCmpType << os->nBits);
     os->nBits     += 8;
- 
+
     // Flush completed bytes
     while(os->nBits >= 8)
     {
@@ -830,22 +830,22 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
             *os->pbOutPos++ = (unsigned char)os->dwBitBuff;
             os->dwOutSize--;
         }
- 
+
         os->dwBitBuff >>= 8;
         os->nBits      -= 8;
     }
- 
+
     for(; nInLength != 0; nInLength--)
     {
         unsigned char bOneByte = *pbInBuffer++;
- 
+
         if((pItem1 = items306C[bOneByte]) == NULL)
         {
             pItem2    = items306C[0x101];  // ecx
             pItem3    = pItem2->parent;    // eax
             dwBitBuff = 0;
             nBits     = 0;
- 
+
             for(; pItem3 != NULL; pItem3 = pItem3->parent)
             {
                 nBit      = (pItem3->child != pItem2) ? 1 : 0;
@@ -854,11 +854,11 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
                 pItem2  = pItem3;
             }
             os->PutBits(dwBitBuff, nBits);
- 
+
             // Store the loaded byte into output stream
             os->dwBitBuff |= (bOneByte << os->nBits);
             os->nBits     += 8;
- 
+
             // Flush the whole byte(s)
             while(os->nBits >= 8)
             {
@@ -870,34 +870,34 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
                 os->dwBitBuff >>= 8;
                 os->nBits -= 8;
             }
- 
+
             pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
             pItem2 = Call1500E740(1);
             pItem2->dcmpByte  = pItem1->dcmpByte;
             pItem2->byteValue = pItem1->byteValue;
             pItem2->parent    = pItem1;
             items306C[pItem2->dcmpByte] = pItem2;
- 
+
             pItem2 = Call1500E740(1);
             pItem2->dcmpByte  = bOneByte;
             pItem2->byteValue = 0;
             pItem2->parent    = pItem1;
             items306C[pItem2->dcmpByte] = pItem2;
             pItem1->child = pItem2;
- 
+
             Call1500E820(pItem2);
- 
+
             if(bIsCmp0 != 0)
             {
                 Call1500E820(items306C[bOneByte]);
                 continue;
             }
- 
+
             for(pItem1 = items306C[bOneByte]; pItem1 != NULL; pItem1 = pItem1->parent)
             {
                 pItem1->byteValue++;
                 pItem2 = pItem1;
- 
+
                 for(;;)
                 {
                     pItem3 = pItem2->prev;
@@ -910,19 +910,19 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
                         break;
                     pItem2 = pItem3;
                 }
- 
+
                 if(pItem2 != pItem1)
                 {
                     InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
                     InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
- 
+
                     pItem3 = pItem2->parent->child;
                     if(pItem1->parent->child == pItem1)
                         pItem1->parent->child = pItem2;
- 
+
                     if(pItem3 == pItem2)
                         pItem2->parent->child = pItem1;
- 
+
                     pTemp = pItem1->parent;
                     pItem1->parent = pItem2->parent;
                     pItem2->parent = pTemp;
@@ -944,13 +944,13 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
             }
             os->PutBits(dwBitBuff, nBits);
         }
- 
+
 // 1500EB98
         if(bIsCmp0 != 0)
             Call1500E820(items306C[bOneByte]);  // 1500EB9D
 // 1500EBAF
     } // for(; nInLength != 0; nInLength--)
- 
+
 // 1500EBB8
     pItem1 = items306C[0x100];
     dwBitBuff = 0;
@@ -962,10 +962,10 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
         nBits++;
         pItem1    = pItem2;
     }
- 
+
 // 1500EBE6
     os->PutBits(dwBitBuff, nBits);
- 
+
 // 1500EBEF
     // Flush the remaining bits
     while(os->nBits != 0)
@@ -978,10 +978,10 @@ unsigned int THuffmannTree::DoCompression(TOutputStream * os, unsigned char * pb
         os->dwBitBuff >>= 8;
         os->nBits -= ((os->nBits > 8) ? 8 : os->nBits);
     }
- 
+
     return (unsigned int)(os->pbOutPos - os->pbOutBuffer);
 }
- 
+
 // Decompression using Huffman tree (1500E450)
 unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is)
 {
@@ -994,29 +994,29 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
     unsigned int n8Bits;                // 8 bits loaded from input stream
     unsigned int n7Bits;                // 7 bits loaded from input stream
     bool bHasQdEntry;
-   
+
     // Test the output length. Must not be NULL.
     if(dwOutLength == 0)
         return 0;
- 
+
     // Get the compression type from the input stream
     n8Bits = is->Get8Bits();
- 
+
     // Build the Huffman tree
-    BuildTree(n8Bits);    
+    BuildTree(n8Bits);
     bIsCmp0 = (n8Bits == 0) ? 1 : 0;
- 
+
     for(;;)
     {
         n7Bits = is->Get7Bits();            // Get 7 bits from input stream
- 
+
         // Try to use quick decompression. Check TQDecompress array for corresponding item.
         // If found, ise the result byte instead.
         qd = &qd3474[n7Bits];
- 
+
         // If there is a quick-pass possible (ebx)
         bHasQdEntry = (qd->offs00 >= offs0004) ? true : false;
- 
+
         // If we can use quick decompress, use it.
         if(bHasQdEntry)
         {
@@ -1034,21 +1034,21 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
             pItem1 = pFirst->next->prev;
             if(PTR_INVALID_OR_NULL(pItem1))
                 pItem1 = NULL;
-_1500E549:           
+_1500E549:
             nBitCount = 0;
             pItem2 = NULL;
- 
+
             do
             {
                 pItem1 = pItem1->child;     // Move down by one level
                 if(is->GetBit())            // If current bit is set, move to previous
                     pItem1 = pItem1->prev;
- 
+
                 if(++nBitCount == 7)        // If we are at 7th bit, save current HTree item.
                     pItem2 = pItem1;
             }
             while(pItem1->child != NULL);   // Walk until tree has no deeper level
- 
+
             if(bHasQdEntry == false)
             {
                 if(nBitCount > 7)
@@ -1061,7 +1061,7 @@ _1500E549:
                 {
                     unsigned long nIndex = n7Bits & (0xFFFFFFFF >> (32 - nBitCount));
                     unsigned long nAdd   = (1 << nBitCount);
-                   
+
                     for(qd = &qd3474[nIndex]; nIndex <= 0x7F; nIndex += nAdd, qd += nAdd)
                     {
                         qd->offs00   = offs0004;
@@ -1072,46 +1072,46 @@ _1500E549:
             }
             nDcmpByte = pItem1->dcmpByte;
         }
- 
+
         if(nDcmpByte == 0x101)          // Huffman tree needs to be modified
         {
             n8Bits = is->Get8Bits();
             pItem1 = (PTR_INVALID_OR_NULL(pLast)) ? NULL : pLast;
- 
+
             pItem2 = Call1500E740(1);
             pItem2->parent    = pItem1;
             pItem2->dcmpByte  = pItem1->dcmpByte;
             pItem2->byteValue = pItem1->byteValue;
             items306C[pItem2->dcmpByte] = pItem2;
- 
+
             pItem2 = Call1500E740(1);
             pItem2->parent    = pItem1;
             pItem2->dcmpByte  = n8Bits;
             pItem2->byteValue = 0;
             items306C[pItem2->dcmpByte] = pItem2;
- 
+
             pItem1->child = pItem2;
             Call1500E820(pItem2);
             if(bIsCmp0 == 0)
                 Call1500E820(items306C[n8Bits]);
- 
+
             nDcmpByte = n8Bits;
         }
- 
+
         if(nDcmpByte == 0x100)
             break;
- 
+
         *pbOutPos++ = (unsigned char)nDcmpByte;
         if(--dwOutLength == 0)
             break;
- 
+
         if(bIsCmp0)
             Call1500E820(items306C[nDcmpByte]);
     }
- 
+
     return (unsigned int)(pbOutPos - pbOutBuffer);
 }
- 
+
 /* OLD VERSION
 unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is)
 {
@@ -1124,38 +1124,38 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
     THTreeItem  * temp;                 // For every use
     unsigned long dcmpByte = 0;         // Decompressed byte value
     bool          bFlag = 0;
-   
+
     // Test the output length. Must not be NULL.
     if(dwOutLength == 0)
         return 0;
- 
+
     // If too few bits in input bit buffer, we have to load next 16 bits
     is->EnsureHasMoreThan8Bits();
- 
+
     // Get 8 bits from input stream
     oneByte = is->Get8Bits();
- 
+
     // Build the Huffman tree
-    BuildTree(oneByte);    
- 
+    BuildTree(oneByte);
+
     bIsCmp0 = (oneByte == 0) ? 1 : 0;
     outPtr  = pbOutBuffer;              // Copy pointer to output data
- 
+
     for(;;)
     {
         TQDecompress * qd;              // For quick decompress
         unsigned long sevenBits = is->Get7Bits();// 7 bits from input stream
- 
+
         // Try to use quick decompression. Check TQDecompress array for corresponding item.
         // If found, ise the result byte instead.
         qd = &qd3474[sevenBits];
- 
+
         // If there is a quick-pass possible
         hasQDEntry = (qd->offs00 == offs0004) ? 1 : 0;
- 
+
         // Start passing the Huffman tree. Set item to tree root item
         pItem1 = pFirst;
- 
+
         // If we can use quick decompress, use it.
         bFlag = 1;
         if(hasQDEntry == 1)
@@ -1182,22 +1182,22 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
             if(PTR_INT(pItem1) <= 0)
                 pItem1 = NULL;
         }
- 
+
         if(bFlag == 1)
         {
             // Walk through Huffman Tree
             bitCount = 0;               // Clear bit counter
             do
             {
-                pItem1 = pItem1->child;    
+                pItem1 = pItem1->child;
                 if(is->GetBit() != 0)   // If current bit is set, move to previous
                     pItem1 = pItem1->prev;  // item in current level
- 
+
                 if(++bitCount == 7)     // If we are at 7th bit, store current HTree item.
                     itemAt7 = pItem1;   // Store Huffman tree item
             }
             while(pItem1->child != NULL); // Walk until tree has no deeper level
- 
+
             // If quick decompress entry is not filled yet, fill it.
             if(hasQDEntry == 0)
             {
@@ -1208,19 +1208,19 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
                     qd->item     = itemAt7;    // Store item at 7th bit
                 }
                 // If we passed less than 7 bits, fill entry and bit count multipliers
-                else                   
+                else
                 {
                     unsigned long index = sevenBits & (0xFFFFFFFF >> (32 - bitCount)); // Index for quick-decompress entry
                     unsigned long addIndex = (1 << bitCount);                          // Add value for index
- 
+
                     qd = &qd3474[index];
- 
+
                     do
                     {
                         qd->offs00   = offs0004;
                         qd->bitCount = bitCount;
                         qd->dcmpByte = pItem1->dcmpByte;
- 
+
                         index += addIndex;
                         qd    += addIndex;
                     }
@@ -1229,21 +1229,21 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
             }
             dcmpByte = pItem1->dcmpByte;
         }
- 
+
         if(dcmpByte == 0x101)        // Huffman tree needs to be modified
         {
             // Check if there is enough bits in the buffer
             is->EnsureHasMoreThan8Bits();
- 
+
             // Get 8 bits from the buffer
             oneByte = is->Get8Bits();
- 
+
             // Modify Huffman tree
             ModifyTree(oneByte);
- 
+
             // Get lastly added tree item
             pItem1 = items306C[oneByte];
- 
+
             if(bIsCmp0 == 0 && pItem1 != NULL)
             {
                 // 15006F15
@@ -1252,32 +1252,32 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
                     THTreeItem * pItem2 = pItem1;
                     THTreeItem * pItem3;
                     unsigned long byteValue;
- 
+
                     byteValue = ++pItem1->byteValue;
- 
+
                     while(PTR_INT((pItem3 = pItem2->prev)) > 0)
                     {
                         if(pItem3->byteValue >= byteValue)
                             goto _15006F30;
- 
+
                         pItem2 = pItem2->prev;
                     }
                     pItem3 = NULL;
- 
+
                     _15006F30:
                     if(pItem2 == pItem1)
                         continue;
- 
+
                     InsertItem(&pItem305C, pItem2, SWITCH_ITEMS, pItem1);
                     InsertItem(&pItem305C, pItem1, SWITCH_ITEMS, pItem3);
- 
+
                     temp = pItem2->parent->child;
                     if(pItem1 == pItem1->parent->child)
                         pItem1->parent->child = pItem2;
- 
+
                     if(pItem2 == temp)
                         pItem2->parent->child = pItem1;
- 
+
                     // Switch parents of pItem1 and pItem3
                     temp = pItem1->parent;
                     pItem1->parent = pItem2->parent;
@@ -1288,7 +1288,7 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
             }
             dcmpByte = oneByte;
         }
- 
+
         if(dcmpByte != 0x100)        // Not at the end of data ?
         {
             *outPtr++ = (unsigned char)dcmpByte;
@@ -1296,7 +1296,7 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
             {
                 if(bIsCmp0 != 0)
                     Call1500E820(items306C[pItem1->byteValue]);
-            }                   
+            }
             else
                 break;
         }
@@ -1306,7 +1306,7 @@ unsigned int THuffmannTree::DoDecompression(unsigned char * pbOutBuffer, unsigne
     return (unsigned long)(outPtr - pbOutBuffer);
 }
 */
- 
+
 // Table for (de)compression. Every compression type has 258 entries
 unsigned char THuffmannTree::Table1502A630[] =
 {
@@ -1328,7 +1328,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
     0x00, 0x00,
-   
+
     // Data for compression type 0x01
     0x54, 0x16, 0x16, 0x0D, 0x0C, 0x08, 0x06, 0x05, 0x06, 0x05, 0x06, 0x03, 0x04, 0x04, 0x03, 0x05,
     0x0E, 0x0B, 0x14, 0x13, 0x13, 0x09, 0x0B, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x02, 0x02, 0x02,
@@ -1347,7 +1347,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x06, 0x4B,
     0x00, 0x00,
-   
+
     // Data for compression type 0x02
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x27, 0x00, 0x00, 0x23, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1366,7 +1366,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
-   
+
     // Data for compression type 0x03
     0xFF, 0x0B, 0x07, 0x05, 0x0B, 0x02, 0x02, 0x02, 0x06, 0x02, 0x02, 0x01, 0x04, 0x02, 0x01, 0x03,
     0x09, 0x01, 0x01, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01,
@@ -1385,7 +1385,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01,
     0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x11,
     0x00, 0x00,
-   
+
     // Data for compression type 0x04
     0xFF, 0xFB, 0x98, 0x9A, 0x84, 0x85, 0x63, 0x64, 0x3E, 0x3E, 0x22, 0x22, 0x13, 0x13, 0x18, 0x17,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1404,7 +1404,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
-   
+
     // Data for compression type 0x05
     0xFF, 0xF1, 0x9D, 0x9E, 0x9A, 0x9B, 0x9A, 0x97, 0x93, 0x93, 0x8C, 0x8E, 0x86, 0x88, 0x80, 0x82,
     0x7C, 0x7C, 0x72, 0x73, 0x69, 0x6B, 0x5F, 0x60, 0x55, 0x56, 0x4A, 0x4B, 0x40, 0x41, 0x37, 0x37,
@@ -1423,7 +1423,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
-   
+
     // Data for compression type 0x06
     0xC3, 0xCB, 0xF5, 0x41, 0xFF, 0x7B, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1442,7 +1442,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
-   
+
     // Data for compression type 0x07
     0xC3, 0xD9, 0xEF, 0x3D, 0xF9, 0x7C, 0xE9, 0x1E, 0xFD, 0xAB, 0xF1, 0x2C, 0xFC, 0x5B, 0xFE, 0x17,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1461,7 +1461,7 @@ unsigned char THuffmannTree::Table1502A630[] =
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00,
-   
+
     // Data for compression type 0x08
     0xBA, 0xC5, 0xDA, 0x33, 0xE3, 0x6D, 0xD8, 0x18, 0xE5, 0x94, 0xDA, 0x23, 0xDF, 0x4A, 0xD1, 0x10,
     0xEE, 0xAF, 0xE4, 0x2C, 0xEA, 0x5A, 0xDE, 0x15, 0xF4, 0x87, 0xE9, 0x21, 0xF6, 0x43, 0xFC, 0x12,
diff --git a/src/dep/src/StormLib/huffman/huff.h b/src/dep/src/StormLib/huffman/huff.h
index a133424..a21ad28 100644
--- a/src/dep/src/StormLib/huffman/huff.h
+++ b/src/dep/src/StormLib/huffman/huff.h
@@ -9,68 +9,68 @@
 /* 03.05.03  2.00  Lad  Added compression                                    */
 /* 08.12.03  2.01  Dan  High-memory handling (> 0x80000000)                  */
 /*****************************************************************************/
- 
+
 #ifndef __HUFFMAN_H__
 #define __HUFFMAN_H__
 
 #include "../StormPort.h"
- 
+
 //-----------------------------------------------------------------------------
 // Defines
- 
-#define INSERT_ITEM    1                   
+
+#define INSERT_ITEM    1
 #define SWITCH_ITEMS   2                    // Switch the item1 and item2
- 
+
 #define PTR_NOT(ptr)  (THTreeItem *)(~(DWORD_PTR)(ptr))
 #define PTR_PTR(ptr)  ((THTreeItem *)(ptr))
 #define PTR_INT(ptr)  (INT_PTR)(ptr)
- 
+
 #ifndef NULL
 #define NULL 0
 #endif
- 
+
 //-----------------------------------------------------------------------------
 // Structures and classes
- 
+
 // Input stream for Huffmann decompression
 class TInputStream
 {
     public:
- 
+
     unsigned long GetBit();
     unsigned long Get7Bits();
     unsigned long Get8Bits();
     void SkipBits(unsigned int BitCount);
- 
+
     unsigned char * pbInBuffer;         // 00 - Input data
     unsigned long   BitBuffer;          // 04 - Input bit buffer
     unsigned int    BitCount;           // 08 - Number of bits remaining in 'dwBitBuff'
 };
- 
+
 // Output stream for Huffmann compression
 class TOutputStream
 {
     public:
- 
+
     void PutBits(unsigned long dwBuff, unsigned int nPutBits);
- 
+
     unsigned char * pbOutBuffer;        // 00 : Output buffer
     unsigned long   dwOutSize;          // 04 : Size of output buffer
     unsigned char * pbOutPos;           // 08 : Current output position
     unsigned long   dwBitBuff;          // 0C : Bit buffer
     unsigned long   nBits;              // 10 : Number of bits in the bit buffer
 };
- 
+
 // Huffmann tree item (?)
 struct THTreeItem
 {
     public:
-    
+
     THTreeItem * Call1501DB70(THTreeItem * pLast);
     THTreeItem * GetPrevItem(LONG_PTR value);
     void         ClearItemLinks();
     void         RemoveItem();
- 
+
     THTreeItem  * next;                 // 00 - Pointer to next THTreeItem
     THTreeItem  * prev;                 // 04 - Pointer to prev THTreeItem (< 0 if none)
     unsigned long dcmpByte;             // 08 - Index of this item in item pointer array, decompressed byte value
@@ -79,7 +79,7 @@ struct THTreeItem
     THTreeItem  * child;                // 14 - Pointer to child  THTreeItem
     int           addressMultiplier;    // -1 if object on negative address (>0x80000000), +1 if positive
 };
- 
+
 // Structure used for quick decompress. The 'bitCount' contains number of bits
 // and byte value contains result decompressed byte value.
 // After each walk through Huffman tree are filled all entries which are
@@ -97,47 +97,47 @@ struct TQDecompress
         THTreeItem  * pItem;            // 08 - THTreeItem (if number of bits is greater than 7
     };
 };
- 
+
 // Structure for Huffman tree (Size 0x3674 bytes). Because I'm not expert
 // for the decompression, I do not know actually if the class is really a Hufmann
 // tree. If someone knows the decompression details, please let me know
 class THuffmannTree
 {
     public:
-    
+
     THuffmannTree();
     void  InitTree(bool bCompression);
     void  BuildTree(unsigned int nCmpType);
 //  void  ModifyTree(unsigned long dwIndex);
 //  void  UninitTree();
- 
+
 //  void  Call15007010(Bit32 dwInLength, THTreeItem * item);
     THTreeItem * Call1500E740(unsigned int nValue);
     void         Call1500E820(THTreeItem * pItem);
     unsigned int DoCompression(TOutputStream * os, unsigned char * pbInBuffer, int nInLength, int nCmpType);
     unsigned int DoDecompression(unsigned char * pbOutBuffer, unsigned int dwOutLength, TInputStream * is);
- 
+
     unsigned long bIsCmp0;              // 0000 - 1 if compression type 0
     unsigned long offs0004;             // 0004 - Some flag
     THTreeItem    items0008[0x203];     // 0008 - HTree items
- 
+
     //- Sometimes used as HTree item -----------
     THTreeItem  * pItem3050;            // 3050 - Always NULL (?)
     THTreeItem  * pItem3054;            // 3054 - Pointer to Huffman tree item
     THTreeItem  * pItem3058;            // 3058 - Pointer to Huffman tree item (< 0 if invalid)
- 
+
     //- Sometimes used as HTree item -----------
     THTreeItem  * pItem305C;            // 305C - Usually NULL
     THTreeItem  * pFirst;               // 3060 - Pointer to top (first) Huffman tree item
     THTreeItem  * pLast;                // 3064 - Pointer to bottom (last) Huffman tree item (< 0 if invalid)
     unsigned long nItems;               // 3068 - Number of used HTree items
- 
+
     //-------------------------------------------
     THTreeItem * items306C[0x102];      // 306C - THTreeItem pointer array
     TQDecompress qd3474[0x80];          // 3474 - Array for quick decompression
     int          addressMultiplier;     // -1 if object on negative address (>0x80000000), +1 if positive
- 
+
     static unsigned char Table1502A630[];// Some table
 };
- 
+
 #endif // __HUFFMAN_H__
diff --git a/src/dep/src/StormLib/pklib/pklib.h b/src/dep/src/StormLib/pklib/pklib.h
index 8e58fc7..9e4b6c8 100644
--- a/src/dep/src/StormLib/pklib/pklib.h
+++ b/src/dep/src/StormLib/pklib/pklib.h
@@ -30,7 +30,7 @@
 
 #ifndef PKEXPORT
 #ifdef WIN32
-#define PKEXPORT  __cdecl               // Use for normal __cdecl calling 
+#define PKEXPORT  __cdecl               // Use for normal __cdecl calling
 #else
 #define PKEXPORT
 #endif
@@ -44,8 +44,8 @@
 // Compression structure
 typedef struct
 {
-    unsigned int   offs0000;            // 0000 : 
-    unsigned int   out_bytes;           // 0004 : # bytes available in out_buff            
+    unsigned int   offs0000;            // 0000 :
+    unsigned int   out_bytes;           // 0004 : # bytes available in out_buff
     unsigned int   out_bits;            // 0008 : # of bits available in the last out byte
     unsigned int   dsize_bits;          // 000C : Dict size : 4=0x400, 5=0x800, 6=0x1000
     unsigned int   dsize_mask;          // 0010 : Dict size : 0x0F=0x400, 0x1F=0x800, 0x3F=0x1000
@@ -53,23 +53,23 @@ typedef struct
     unsigned int   dsize_bytes;         // 0018 : Dictionary size in bytes
     unsigned char  dist_bits[0x40];     // 001C : Distance bits
     unsigned char  dist_codes[0x40];    // 005C : Distance codes
-    unsigned char  nChBits[0x306];      // 009C : 
-    unsigned short nChCodes[0x306];     // 03A2 : 
-    unsigned short offs09AE;            // 09AE : 
+    unsigned char  nChBits[0x306];      // 009C :
+    unsigned short nChCodes[0x306];     // 03A2 :
+    unsigned short offs09AE;            // 09AE :
 
     void         * param;               // 09B0 : User parameter
     unsigned int (*read_buf)(char *buf, unsigned int *size, void *param);  // 9B4
     void         (*write_buf)(char *buf, unsigned int *size, void *param); // 9B8
 
     unsigned short offs09BC[0x204];     // 09BC :
-    unsigned long  offs0DC4;            // 0DC4 : 
+    unsigned long  offs0DC4;            // 0DC4 :
     unsigned short offs0DC8[0x900];     // 0DC8 :
-    unsigned short offs1FC8;            // 1FC8 : 
+    unsigned short offs1FC8;            // 1FC8 :
     char           out_buff[0x802];     // 1FCA : Output (compressed) data
     unsigned char  work_buff[0x2204];   // 27CC : Work buffer
                                         //  + DICT_OFFSET  => Dictionary
                                         //  + UNCMP_OFFSET => Uncompressed data
-    unsigned short offs49D0[0x2000];    // 49D0 : 
+    unsigned short offs49D0[0x2000];    // 49D0 :
 } TCmpStruct;
 
 #define CMP_BUFFER_SIZE  sizeof(TCmpStruct) // Size of compression buffer
@@ -95,15 +95,15 @@ typedef struct
     unsigned char in_buff[0x800];       // 2234 - Buffer for data to be decompressed
     unsigned char position1[0x100];     // 2A34 - Positions in buffers
     unsigned char position2[0x100];     // 2B34 - Positions in buffers
-    unsigned char offs2C34[0x100];      // 2C34 - Buffer for 
-    unsigned char offs2D34[0x100];      // 2D34 - Buffer for 
-    unsigned char offs2E34[0x80];       // 2EB4 - Buffer for 
-    unsigned char offs2EB4[0x100];      // 2EB4 - Buffer for 
-    unsigned char ChBitsAsc[0x100];     // 2FB4 - Buffer for 
+    unsigned char offs2C34[0x100];      // 2C34 - Buffer for
+    unsigned char offs2D34[0x100];      // 2D34 - Buffer for
+    unsigned char offs2E34[0x80];       // 2EB4 - Buffer for
+    unsigned char offs2EB4[0x100];      // 2EB4 - Buffer for
+    unsigned char ChBitsAsc[0x100];     // 2FB4 - Buffer for
     unsigned char DistBits[0x40];       // 30B4 - Numbers of bytes to skip copied block length
     unsigned char LenBits[0x10];        // 30F4 - Numbers of bits for skip copied block length
     unsigned char ExLenBits[0x10];      // 3104 - Number of valid bits for copied block
-    unsigned short LenBase[0x10];       // 3114 - Buffer for 
+    unsigned short LenBase[0x10];       // 3114 - Buffer for
 } TDcmpStruct;
 
 #define EXP_BUFFER_SIZE    sizeof(TDcmpStruct)  // Size of decompress buffer
diff --git a/src/dep/src/StormLib/wave/wave.cpp b/src/dep/src/StormLib/wave/wave.cpp
index 936525f..74ab1cd 100644
--- a/src/dep/src/StormLib/wave/wave.cpp
+++ b/src/dep/src/StormLib/wave/wave.cpp
@@ -35,8 +35,8 @@ static long Table1503F120[] =
 {
     0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000006,
     0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
-    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,  
-    0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008  
+    0xFFFFFFFF, 0x00000001, 0xFFFFFFFF, 0x00000005, 0xFFFFFFFF, 0x00000003, 0xFFFFFFFF, 0x00000007,
+    0xFFFFFFFF, 0x00000002, 0xFFFFFFFF, 0x00000004, 0xFFFFFFFF, 0x00000006, 0xFFFFFFFF, 0x00000008
 };
 
 static long Table1503F1A0[] =
@@ -112,10 +112,10 @@ int CompressWave(unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffe
 
     nLength = (nLength / 2) - (int)(out.pb - pbOutBuffer);
     nLength = (nLength < 0) ? 0 : nLength;
-    
+
     nIndex  = nChannels - 1;            // edi
     nWordsRemains = dwInLength / 2;     // eax
-    
+
     // ebx - nChannels
     // ecx - pwOutPos
     for(int chnl = nChannels; chnl < nWordsRemains; chnl++)
@@ -184,7 +184,7 @@ int CompressWave(unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffe
                 }
                 if(dwBit == dwStopBit)
                     break;
-               
+
                 nTableValue >>= 1;
             }
 
@@ -205,7 +205,7 @@ int CompressWave(unsigned char * pbOutBuffer, int dwOutLength, short * pwInBuffe
             SInt32Array2[nIndex]  = nValue;
             *out.pb++ = (unsigned char)(dwBitBuff | ebx);
             nTableValue = Table1503F120[dwBitBuff & 0x1F];
-            SInt32Array1[nIndex]  = SInt32Array1[nIndex] + nTableValue; 
+            SInt32Array1[nIndex]  = SInt32Array1[nIndex] + nTableValue;
             if(SInt32Array1[nIndex] < 0)
                 SInt32Array1[nIndex] = 0;
             else if(SInt32Array1[nIndex] > 0x58)
@@ -280,7 +280,7 @@ int DecompressWave(unsigned char * pbOutBuffer, int dwOutLength, unsigned char *
                     SInt32Array1[nIndex] += 8;
                     if(SInt32Array1[nIndex] > 0x58)
                         SInt32Array1[nIndex] = 0x58;
-                    
+
                     if(nChannels == 2)
                         nIndex = (nIndex == 0) ? 1 : 0;
                     break;
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.cpp
index 1b1d0d5..82befed 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.cpp
@@ -209,7 +209,7 @@ void CSceneNodeAnimatorCameraFPS::animateNode(ISceneNode* node, u32 timeMs)
 		{
 			if(ESNAT_COLLISION_RESPONSE == (*it)->getType())
 			{
-				ISceneNodeAnimatorCollisionResponse * collisionResponse = 
+				ISceneNodeAnimatorCollisionResponse * collisionResponse =
 					static_cast<ISceneNodeAnimatorCollisionResponse *>(*it);
 
 				if(!collisionResponse->isFalling())
@@ -303,7 +303,7 @@ void CSceneNodeAnimatorCameraFPS::setVerticalMovement(bool allow)
 
 ISceneNodeAnimator* CSceneNodeAnimatorCameraFPS::createClone(ISceneNode* node, ISceneManager* newManager)
 {
-	CSceneNodeAnimatorCameraFPS * newAnimator = 
+	CSceneNodeAnimatorCameraFPS * newAnimator =
 		new CSceneNodeAnimatorCameraFPS(CursorControl,	RotateSpeed, MoveSpeed, JumpSpeed,
 											0, 0, NoVerticalMovement);
 	newAnimator->setKeyMap(KeyMap);
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.h b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.h
index c4bc8e7..5ab78ac 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.h
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraFPS.h
@@ -21,12 +21,12 @@ namespace scene
 {
 
 	//! Special scene node animator for FPS cameras
-	class CSceneNodeAnimatorCameraFPS : public ISceneNodeAnimatorCameraFPS 
+	class CSceneNodeAnimatorCameraFPS : public ISceneNodeAnimatorCameraFPS
 	{
 	public:
 
 		//! Constructor
-		CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl, 
+		CSceneNodeAnimatorCameraFPS(gui::ICursorControl* cursorControl,
 			f32 rotateSpeed = 100.0f, f32 moveSpeed = .5f, f32 jumpSpeed=0.f,
 			SKeyMap* keyMapArray=0, u32 keyMapSize=0, bool noVerticalMovement=false);
 			
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraMaya.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraMaya.cpp
index 27fe15d..aa469f8 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCameraMaya.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCameraMaya.cpp
@@ -41,7 +41,7 @@ CSceneNodeAnimatorCameraMaya::~CSceneNodeAnimatorCameraMaya()
 
 
 //! It is possible to send mouse and key events to the camera. Most cameras
-//! may ignore this input, but camera scene nodes which are created for 
+//! may ignore this input, but camera scene nodes which are created for
 //! example with scene::ISceneManager::addMayaCameraSceneNode or
 //! scene::ISceneManager::addMeshViewerCameraSceneNode, may want to get this input
 //! for changing their position, look at target or whatever.
@@ -157,13 +157,13 @@ void CSceneNodeAnimatorCameraMaya::animateNode(ISceneNode *node, u32 timeMs)
 		}
 		else
 		{
-			translate +=  tvectX * (TranslateStart.X - MousePos.X)*TranslateSpeed + 
+			translate +=  tvectX * (TranslateStart.X - MousePos.X)*TranslateSpeed +
 			              tvectY * (TranslateStart.Y - MousePos.Y)*TranslateSpeed;
 		}
 	}
 	else if (Translating)
 	{
-		translate += tvectX * (TranslateStart.X - MousePos.X)*TranslateSpeed + 
+		translate += tvectX * (TranslateStart.X - MousePos.X)*TranslateSpeed +
 		             tvectY * (TranslateStart.Y - MousePos.Y)*TranslateSpeed;
 		OldTarget = translate;
 		Translating = false;
@@ -275,7 +275,7 @@ f32 CSceneNodeAnimatorCameraMaya::getZoomSpeed() const
 
 ISceneNodeAnimator* CSceneNodeAnimatorCameraMaya::createClone(ISceneNode* node, ISceneManager* newManager)
 {
-	CSceneNodeAnimatorCameraMaya * newAnimator = 
+	CSceneNodeAnimatorCameraMaya * newAnimator =
 		new CSceneNodeAnimatorCameraMaya(CursorControl, RotateSpeed, ZoomSpeed, TranslateSpeed);
 	return newAnimator;
 }
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
index 7603252..5aad546 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorCollisionResponse.cpp
@@ -233,7 +233,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorCollisionResponse::createClone(ISceneNode*
 {
 	if (!newManager) newManager = SceneManager;
 
-	CSceneNodeAnimatorCollisionResponse * newAnimator = 
+	CSceneNodeAnimatorCollisionResponse * newAnimator =
 		new CSceneNodeAnimatorCollisionResponse(newManager, World, Object, Radius, (Gravity * 1000.0f), Translation,
 													SlidingSpeed);
 
diff --git a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
index b13c743..63aeb38 100644
--- a/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
+++ b/src/dep/src/irrlicht/CSceneNodeAnimatorFollowSpline.cpp
@@ -120,7 +120,7 @@ void CSceneNodeAnimatorFollowSpline::deserializeAttributes(io::IAttributes* in,
 
 ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node, ISceneManager* newManager)
 {
-	CSceneNodeAnimatorFollowSpline * newAnimator = 
+	CSceneNodeAnimatorFollowSpline * newAnimator =
 		new CSceneNodeAnimatorFollowSpline(StartTime, Points, Speed, Tightness);
 
 	return newAnimator;
diff --git a/src/dep/src/irrlicht/glext.h b/src/dep/src/irrlicht/glext.h
index 4255fa8..5ff1c8c 100644
--- a/src/dep/src/irrlicht/glext.h
+++ b/src/dep/src/irrlicht/glext.h
@@ -7,7 +7,7 @@ extern "C" {
 
 /*
 ** Copyright (c) 2007 The Khronos Group Inc.
-** 
+**
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
 ** "Materials"), to deal in the Materials without restriction, including
@@ -15,10 +15,10 @@ extern "C" {
 ** distribute, sublicense, and/or sell copies of the Materials, and to
 ** permit persons to whom the Materials are furnished to do so, subject to
 ** the following conditions:
-** 
+**
 ** The above copyright notice and this permission notice shall be included
 ** in all copies or substantial portions of the Materials.
-** 
+**
 ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/src/dep/src/irrlicht/glxext.h b/src/dep/src/irrlicht/glxext.h
index 536fb25..19a343a 100644
--- a/src/dep/src/irrlicht/glxext.h
+++ b/src/dep/src/irrlicht/glxext.h
@@ -7,7 +7,7 @@ extern "C" {
 
 /*
 ** Copyright (c) 2007 The Khronos Group Inc.
-** 
+**
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
 ** "Materials"), to deal in the Materials without restriction, including
@@ -15,10 +15,10 @@ extern "C" {
 ** distribute, sublicense, and/or sell copies of the Materials, and to
 ** permit persons to whom the Materials are furnished to do so, subject to
 ** the following conditions:
-** 
+**
 ** The above copyright notice and this permission notice shall be included
 ** in all copies or substantial portions of the Materials.
-** 
+**
 ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/src/dep/src/irrlicht/libpng/projects/cbuilder5/libpng.cpp b/src/dep/src/irrlicht/libpng/projects/cbuilder5/libpng.cpp
index 97865f5..563e2e4 100644
--- a/src/dep/src/irrlicht/libpng/projects/cbuilder5/libpng.cpp
+++ b/src/dep/src/irrlicht/libpng/projects/cbuilder5/libpng.cpp
@@ -26,4 +26,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
     return 1;
 }
 //---------------------------------------------------------------------------
- 
\ No newline at end of file
diff --git a/src/dep/src/irrlicht/wglext.h b/src/dep/src/irrlicht/wglext.h
index 0286a91..54a34b3 100644
--- a/src/dep/src/irrlicht/wglext.h
+++ b/src/dep/src/irrlicht/wglext.h
@@ -7,7 +7,7 @@ extern "C" {
 
 /*
 ** Copyright (c) 2007 The Khronos Group Inc.
-** 
+**
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
 ** "Materials"), to deal in the Materials without restriction, including
@@ -15,10 +15,10 @@ extern "C" {
 ** distribute, sublicense, and/or sell copies of the Materials, and to
 ** permit persons to whom the Materials are furnished to do so, subject to
 ** the following conditions:
-** 
+**
 ** The above copyright notice and this permission notice shall be included
 ** in all copies or substantial portions of the Materials.
-** 
+**
 ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/src/dep/src/zthread/ConditionImpl.h b/src/dep/src/zthread/ConditionImpl.h
index 6a450cc..12375e5 100644
--- a/src/dep/src/zthread/ConditionImpl.h
+++ b/src/dep/src/zthread/ConditionImpl.h
@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
- 
+
 #ifndef __ZTCONDITIONIMPL_H__
 #define __ZTCONDITIONIMPL_H__
 
@@ -39,16 +39,16 @@ namespace ZThread {
  *
  * The ConditionImpl template allows how waiter lists are sorted
  * to be parameteized
- */ 
-template <typename List> 
+ */
+template <typename List>
 class ConditionImpl {
-  
+
   //! Waiters currently blocked
   List _waiters;
 
   //! Serialize access to this object
   FastLock _lock;
-  
+
   //! External lock
   Lockable& _predicateLock;
 
@@ -80,7 +80,7 @@ class ConditionImpl {
 };
 
 
-template <typename List> 
+template <typename List>
 ConditionImpl<List>::~ConditionImpl() {
 
 #ifndef NDEBUG
@@ -89,7 +89,7 @@ ConditionImpl<List>::~ConditionImpl() {
     if(_waiters.size() != 0) {
 
       ZTDEBUG("** You are destroying a condition variable which still has waiting threads. **\n");
-      assert(0); 
+      assert(0);
 
     }
 
@@ -101,14 +101,14 @@ ConditionImpl<List>::~ConditionImpl() {
 /**
  * Signal the condition variable, waking one thread if any.
  */
-template <typename List> 
+template <typename List>
 void ConditionImpl<List>::signal() {
 
     Guard<FastLock> g1(_lock);
 
     // Try to find a waiter with a backoff & retry scheme
     for(;;) {
-    
+
       // Go through the list, attempt to notify() a waiter.
       for(typename List::iterator i = _waiters.begin(); i != _waiters.end();) {
 
@@ -117,28 +117,28 @@ void ConditionImpl<List>::signal() {
         Monitor& m = impl->getMonitor();
 
         if(m.tryAcquire()) {
-        
+
           // Notify the monitor & remove from the waiter list so time isn't
           // wasted checking it again.
           i = _waiters.erase(i);
-        
-          // If notify() is not sucessful, it is because the wait() has already 
+
+          // If notify() is not sucessful, it is because the wait() has already
           // been ended (killed/interrupted/notify'd)
           bool woke = m.notify();
-        
+
           m.release();
-        
+
           // Once notify() succeeds, return
-          if(woke) 
+          if(woke)
             return;
-        
+
         } else ++i;
-      
+
       }
-    
+
       if(_waiters.empty())
         return;
-    
+
       { // Backoff and try again
 
         Guard<FastLock, UnlockedScope> g2(g1);
@@ -154,14 +154,14 @@ void ConditionImpl<List>::signal() {
  * Broadcast to the condition variable, waking all threads waiting at the time of
  * the broadcast.
  */
-template <typename List> 
+template <typename List>
 void ConditionImpl<List>::broadcast() {
 
     Guard<FastLock> g1(_lock);
 
     // Try to find a waiter with a backoff & retry scheme
     for(;;) {
-    
+
       // Go through the list, attempt to notify() a waiter.
       for(typename List::iterator i = _waiters.begin(); i != _waiters.end();) {
 
@@ -170,21 +170,21 @@ void ConditionImpl<List>::broadcast() {
         Monitor& m = impl->getMonitor();
 
         if(m.tryAcquire()) {
-        
+
           // Notify the monitor & remove from the waiter list so time isn't
           // wasted checking it again.
           i = _waiters.erase(i);
-        
+
           // Try to wake the waiter, it doesn't matter if this is successful
-          // or not (only fails when the monitor is already going to stop waiting). 
+          // or not (only fails when the monitor is already going to stop waiting).
           m.notify();
-        
+
           m.release();
-        
+
         } else ++i;
-      
+
       }
-    
+
       if(_waiters.empty())
         return;
 
@@ -199,16 +199,16 @@ void ConditionImpl<List>::broadcast() {
 
   }
 
-/** 
+/**
  * Cause the currently executing thread to block until this ConditionImpl has
  * been signaled, the threads state changes.
  *
- * @param predicate Lockable& 
+ * @param predicate Lockable&
  *
  * @exception Interrupted_Exception thrown when the caller status is interrupted
  * @exception Synchronization_Exception thrown if there is some other error.
  */
-template <typename List> 
+template <typename List>
 void ConditionImpl<List>::wait() {
 
     // Get the monitor for the current thread
@@ -220,13 +220,13 @@ void ConditionImpl<List>::wait() {
     {
 
       Guard<FastLock> g1(_lock);
-    
-      // Release the _predicateLock 
+
+      // Release the _predicateLock
       _predicateLock.release();
-    
+
       // Stuff the waiter into the list
       _waiters.insert(self);
-    
+
       // Move to the monitor's lock
       m.acquire();
 
@@ -234,12 +234,12 @@ void ConditionImpl<List>::wait() {
 
         Guard<FastLock, UnlockedScope> g2(g1);
         state = m.wait();
-    
+
       }
 
       // Move back to the Condition's lock
       m.release();
-    
+
       // Remove from waiter list, regarless of weather release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -247,7 +247,7 @@ void ConditionImpl<List>::wait() {
       typename List::iterator i = std::find(_waiters.begin(), _waiters.end(), self);
       if(i != _waiters.end())
         _waiters.erase(i);
-    
+
     }
 
     // Defer interruption until the external lock is acquire()d
@@ -265,16 +265,16 @@ void ConditionImpl<List>::wait() {
     }
 
     switch(state) {
-    
+
       case Monitor::SIGNALED:
         break;
-      
+
       case Monitor::INTERRUPTED:
         throw Interrupted_Exception();
-      
+
       default:
         throw Synchronization_Exception();
-    }   
+    }
 
   }
 
@@ -283,7 +283,7 @@ void ConditionImpl<List>::wait() {
  * Cause the currently executing thread to block until this ConditionImpl has
  * been signaled, or the timeout expires or the threads state changes.
  *
- * @param _predicateLock Lockable& 
+ * @param _predicateLock Lockable&
  * @param timeout maximum milliseconds to block.
  *
  * @return bool
@@ -291,9 +291,9 @@ void ConditionImpl<List>::wait() {
  * @exception Interrupted_Exception thrown when the caller status is interrupted
  * @exception Synchronization_Exception thrown if there is some other error.
  */
-template <typename List> 
+template <typename List>
 bool ConditionImpl<List>::wait(unsigned long timeout) {
-  
+
     // Get the monitor for the current thread
     ThreadImpl* self = ThreadImpl::current();
     Monitor& m = self->getMonitor();
@@ -303,18 +303,18 @@ bool ConditionImpl<List>::wait(unsigned long timeout) {
     {
 
       Guard<FastLock> g1(_lock);
-    
-      // Release the _predicateLock 
+
+      // Release the _predicateLock
       _predicateLock.release();
-    
+
       // Stuff the waiter into the list
       _waiters.insert(self);
-    
+
       state = Monitor::TIMEDOUT;
-    
+
       // Don't bother waiting if the timeout is 0
       if(timeout) {
-    
+
         m.acquire();
 
         {
@@ -325,9 +325,9 @@ bool ConditionImpl<List>::wait(unsigned long timeout) {
         }
 
         m.release();
-      
+
       }
-    
+
       // Remove from waiter list, regarless of weather release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -335,7 +335,7 @@ bool ConditionImpl<List>::wait(unsigned long timeout) {
       typename List::iterator i = std::find(_waiters.begin(), _waiters.end(), self);
       if(i != _waiters.end())
         _waiters.erase(i);
-    
+
     }
 
 
@@ -354,19 +354,19 @@ bool ConditionImpl<List>::wait(unsigned long timeout) {
     }
 
     switch(state) {
-    
+
       case Monitor::SIGNALED:
         break;
-      
+
       case Monitor::INTERRUPTED:
         throw Interrupted_Exception();
-      
+
       case Monitor::TIMEDOUT:
         return false;
 
       default:
         throw Synchronization_Exception();
-    }   
+    }
 
     return true;
 
diff --git a/src/dep/src/zthread/Debug.h b/src/dep/src/zthread/Debug.h
index 484b37f..1762de2 100644
--- a/src/dep/src/zthread/Debug.h
+++ b/src/dep/src/zthread/Debug.h
@@ -26,7 +26,7 @@
 #  include <stdio.h>
 #  define ZTDEBUG printf
 #else
-#  define ZTDEBUG(x) 
+#  define ZTDEBUG(x)
 #endif
 
 #endif
diff --git a/src/dep/src/zthread/DeferredInterruptionScope.h b/src/dep/src/zthread/DeferredInterruptionScope.h
index 041d1e4..5205c80 100644
--- a/src/dep/src/zthread/DeferredInterruptionScope.h
+++ b/src/dep/src/zthread/DeferredInterruptionScope.h
@@ -34,14 +34,14 @@ namespace ZThread {
  * @date <2003-07-16T19:45:18-0400>
  * @version 2.3.0
  *
- * Locking policy for a Guard that will defer any state reported 
- * for the reported Status of a thread except SIGNALED until the 
+ * Locking policy for a Guard that will defer any state reported
+ * for the reported Status of a thread except SIGNALED until the
  * scope has ended. This allows a Guard to be used to create an
- * uninterruptible region in code. 
+ * uninterruptible region in code.
  */
 class DeferredInterruptionScope {
  public:
-  
+
   template <class LockType>
   static void createScope(LockHolder<LockType>& l) {
 
diff --git a/src/dep/src/zthread/FastRecursiveLock.h b/src/dep/src/zthread/FastRecursiveLock.h
index 0a36f62..96b66eb 100644
--- a/src/dep/src/zthread/FastRecursiveLock.h
+++ b/src/dep/src/zthread/FastRecursiveLock.h
@@ -33,11 +33,11 @@
 // Select the correct FastRecusriveLock implementation based on
 // what the compilation environment has defined
 
-#if defined(ZTHREAD_DUAL_LOCKS) 
+#if defined(ZTHREAD_DUAL_LOCKS)
 #  include "vanilla/DualMutexRecursiveLock.h"
 #else
 
-#  ifndef ZT_VANILLA 
+#  ifndef ZT_VANILLA
 
 #  if defined(ZT_POSIX)
 
@@ -50,7 +50,7 @@
 #      include "linux/FastRecursiveLock.h"
 #    elif defined(HAVE_MUTEXATTR_SETTYPE)
 #      include "solaris/FastRecursiveLock.h"
-#    elif defined(ZTHREAD_CONDITION_LOCKS) 
+#    elif defined(ZTHREAD_CONDITION_LOCKS)
 #      include "posix/ConditionRecursiveLock.h"
 #    endif
 
diff --git a/src/dep/src/zthread/IntrusivePtr.h b/src/dep/src/zthread/IntrusivePtr.h
index 47d5afb..189ebaf 100644
--- a/src/dep/src/zthread/IntrusivePtr.h
+++ b/src/dep/src/zthread/IntrusivePtr.h
@@ -35,16 +35,16 @@ namespace ZThread {
  * @version 2.2.0
  *
  * This template creates an intrusively reference counted object
- * an IntrusivePtr starts out with a 1 count, which is updated as references are 
- * added and removed. When the reference count drops to 0, the 
- * IntrusivePtr will delete itself. 
+ * an IntrusivePtr starts out with a 1 count, which is updated as references are
+ * added and removed. When the reference count drops to 0, the
+ * IntrusivePtr will delete itself.
  */
 template <typename T, class LockType>
 class IntrusivePtr : NonCopyable {
-  
+
   //! Intrusive reference count
   size_t _count;
-  
+
   //! Synchornization object
   LockType _lock;
 
@@ -54,7 +54,7 @@ public:
    * Create an IntrusivePtr with a count.
    */
   IntrusivePtr(size_t InitialCount=1) : _count(InitialCount) { }
-  
+
   /**
    * Destroy an IntrusivePtr
    */
@@ -67,7 +67,7 @@ public:
   void addReference() {
 
     Guard<LockType, LockedScope> g(_lock);
-    _count++;  
+    _count++;
 
   }
 
diff --git a/src/dep/src/zthread/Monitor.h b/src/dep/src/zthread/Monitor.h
index 6f9492f..1170982 100644
--- a/src/dep/src/zthread/Monitor.h
+++ b/src/dep/src/zthread/Monitor.h
@@ -29,7 +29,7 @@
 #  error "Reserved symbol defined"
 #endif
 
-// Include the dependencies for a Montior 
+// Include the dependencies for a Montior
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
diff --git a/src/dep/src/zthread/MutexImpl.h b/src/dep/src/zthread/MutexImpl.h
index 212e567..a6fca86 100644
--- a/src/dep/src/zthread/MutexImpl.h
+++ b/src/dep/src/zthread/MutexImpl.h
@@ -58,14 +58,14 @@ protected:
  * @version 2.2.11
  * @class MutexImpl
  *
- * The MutexImpl template allows how waiter lists are sorted, and 
+ * The MutexImpl template allows how waiter lists are sorted, and
  * what actions are taken when a thread interacts with the mutex
  * to be parametized.
  */
-template <typename List, typename Behavior> 
+template <typename List, typename Behavior>
 class MutexImpl : Behavior {
 
-  //! List of Events that are waiting for notification 
+  //! List of Events that are waiting for notification
   List _waiters;
 
   //! Serialize access to this Mutex
@@ -75,7 +75,7 @@ class MutexImpl : Behavior {
   volatile ThreadImpl* _owner;
 
  public:
-  
+
 
   /**
    * Create a new MutexImpl
@@ -84,11 +84,11 @@ class MutexImpl : Behavior {
    * properly allocated
    */
   MutexImpl() : _owner(0) { }
-  
+
   ~MutexImpl();
 
   void acquire();
-  
+
   void release();
 
   bool tryAcquire(unsigned long timeout);
@@ -98,20 +98,20 @@ class MutexImpl : Behavior {
   /**
    * Destroy this MutexImpl and release its resources
    */
-template<typename List, typename Behavior> 
+template<typename List, typename Behavior>
 MutexImpl<List, Behavior>::~MutexImpl() {
 
 #ifndef NDEBUG
 
     // It is an error to destroy a mutex that has not been released
-    if(_owner != 0) { 
+    if(_owner != 0) {
 
       ZTDEBUG("** You are destroying a mutex which was never released. **\n");
       assert(0); // Destroyed mutex while in use
 
     }
 
-    if(_waiters.size() > 0) { 
+    if(_waiters.size() > 0) {
 
       ZTDEBUG("** You are destroying a mutex which is blocking %d threads. **\n", _waiters.size());
       assert(0); // Destroyed mutex while in use
@@ -125,7 +125,7 @@ MutexImpl<List, Behavior>::~MutexImpl() {
 
   /**
    * Acquire a lock on the mutex. If this operation succeeds the calling
-   * thread holds an exclusive lock on this mutex, otherwise it is blocked 
+   * thread holds an exclusive lock on this mutex, otherwise it is blocked
    * until the lock can be acquired.
    *
    * @exception Deadlock_Exception thrown when the caller attempts to acquire() more
@@ -133,7 +133,7 @@ MutexImpl<List, Behavior>::~MutexImpl() {
    * @exception Interrupted_Exception thrown when the caller status is interrupted
    * @exception Synchronization_Exception thrown if there is some other error.
    */
-template<typename List, typename Behavior> 
+template<typename List, typename Behavior>
 void MutexImpl<List, Behavior>::acquire() {
 
     ThreadImpl* self = ThreadImpl::current();
@@ -142,41 +142,41 @@ void MutexImpl<List, Behavior>::acquire() {
     Monitor::STATE state;
 
     Guard<FastLock> g1(_lock);
-   
-    // Deadlock will occur if the current thread is the owner 
+
+    // Deadlock will occur if the current thread is the owner
     // and there is no entry count.
-    if(_owner == self) 
+    if(_owner == self)
       throw Deadlock_Exception();
-    
+
     // Acquire the lock if it is free and there are no waiting threads
     if(_owner == 0 && _waiters.empty()) {
 
       _owner = self;
 
       this->ownerAcquired(self);
-      
+
     }
 
     // Otherwise, wait for a signal from a thread releasing its
     // ownership of the lock
-    else { 
-        
+    else {
+
       _waiters.insert(self);
       m.acquire();
 
       this->waiterArrived(self);
 
-      {        
-      
+      {
+
         Guard<FastLock, UnlockedScope> g2(g1);
         state = m.wait();
-      
+
       }
 
       this->waiterDeparted(self);
 
       m.release();
-        
+
       // Remove from waiter list, regardless of wether release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -185,26 +185,26 @@ void MutexImpl<List, Behavior>::acquire() {
       if(i != _waiters.end())
         _waiters.erase(i);
 
-      // If awoke due to a notify(), take ownership. 
+      // If awoke due to a notify(), take ownership.
       switch(state) {
         case Monitor::SIGNALED:
 
           assert(_owner == 0);
-          _owner = self;    
+          _owner = self;
 
           this->ownerAcquired(self);
 
           break;
-        
+
         case Monitor::INTERRUPTED:
           throw Interrupted_Exception();
-        
+
         default:
           throw Synchronization_Exception();
-      } 
-    
+      }
+
     }
-  
+
   }
 
 
@@ -218,17 +218,17 @@ void MutexImpl<List, Behavior>::acquire() {
    * @exception Interrupted_Exception thrown when the caller status is interrupted
    * @exception Synchronization_Exception thrown if there is some other error.
    */
-template<typename List, typename Behavior> 
+template<typename List, typename Behavior>
 bool MutexImpl<List, Behavior>::tryAcquire(unsigned long timeout) {
-  
+
     ThreadImpl* self = ThreadImpl::current();
     Monitor& m = self->getMonitor();
 
     Guard<FastLock> g1(_lock);
-   
-    // Deadlock will occur if the current thread is the owner 
+
+    // Deadlock will occur if the current thread is the owner
     // and there is no entry count.
-    if(_owner == self) 
+    if(_owner == self)
       throw Deadlock_Exception();
 
     // Acquire the lock if it is free and there are no waiting threads
@@ -237,38 +237,38 @@ bool MutexImpl<List, Behavior>::tryAcquire(unsigned long timeout) {
       _owner = self;
 
       this->ownerAcquired(self);
-      
+
     }
 
     // Otherwise, wait for a signal from a thread releasing its
     // ownership of the lock
     else {
-        
+
       _waiters.insert(self);
-    
+
       Monitor::STATE state = Monitor::TIMEDOUT;
-    
+
       // Don't bother waiting if the timeout is 0
       if(timeout) {
-      
+
         m.acquire();
 
         this->waiterArrived(self);
-      
+
         {
-        
+
           Guard<FastLock, UnlockedScope> g2(g1);
           state = m.wait(timeout);
-        
+
         }
 
         this->waiterDeparted(self);
-      
+
         m.release();
-        
+
       }
-    
-    
+
+
       // Remove from waiter list, regarless of weather release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -276,50 +276,50 @@ bool MutexImpl<List, Behavior>::tryAcquire(unsigned long timeout) {
       typename List::iterator i = std::find(_waiters.begin(), _waiters.end(), self);
       if(i != _waiters.end())
         _waiters.erase(i);
-    
-      // If awoke due to a notify(), take ownership. 
+
+      // If awoke due to a notify(), take ownership.
       switch(state) {
         case Monitor::SIGNALED:
-        
+
           assert(0 == _owner);
           _owner = self;
 
           this->ownerAcquired(self);
-        
+
           break;
-        
+
         case Monitor::INTERRUPTED:
           throw Interrupted_Exception();
-        
+
         case Monitor::TIMEDOUT:
           return false;
-        
+
         default:
           throw Synchronization_Exception();
-      } 
-    
+      }
+
     }
-  
+
     return true;
-  
+
   }
 
   /**
    * Release a lock on the mutex. If this operation succeeds the calling
-   * thread no longer holds an exclusive lock on this mutex. If there are 
-   * waiting threads, one will be selected, assigned ownership and specifically 
+   * thread no longer holds an exclusive lock on this mutex. If there are
+   * waiting threads, one will be selected, assigned ownership and specifically
    * awakened.
    *
-   * @exception InvalidOp_Exception - thrown if an attempt is made to 
+   * @exception InvalidOp_Exception - thrown if an attempt is made to
    * release a mutex not owned by the calling thread.
    */
-template<typename List, typename Behavior> 
+template<typename List, typename Behavior>
 void MutexImpl<List, Behavior>::release() {
 
     ThreadImpl* impl = ThreadImpl::current();
 
     Guard<FastLock> g1(_lock);
-  
+
     // Make sure the operation is valid
     if(_owner != impl)
       throw InvalidOp_Exception();
@@ -327,45 +327,45 @@ void MutexImpl<List, Behavior>::release() {
     _owner = 0;
 
     this->ownerReleased(impl);
-  
+
     // Try to find a waiter with a backoff & retry scheme
     for(;;) {
-    
+
       // Go through the list, attempt to notify() a waiter.
       for(typename List::iterator i = _waiters.begin(); i != _waiters.end();) {
-      
+
         // Try the monitor lock, if it cant be locked skip to the next waiter
         impl = *i;
         Monitor& m = impl->getMonitor();
 
         if(m.tryAcquire()) {
-  
-          // If notify() is not sucessful, it is because the wait() has already 
+
+          // If notify() is not sucessful, it is because the wait() has already
           // been ended (killed/interrupted/notify'd)
           bool woke = m.notify();
-          
+
           m.release();
-        
+
           // Once notify() succeeds, return
           if(woke)
             return;
-        
+
         } else ++i;
-      
+
       }
-    
+
       if(_waiters.empty())
         return;
 
       { // Backoff and try again
-      
+
         Guard<FastLock, UnlockedScope> g2(g1);
         ThreadImpl::yield();
 
       }
 
     }
-  
+
   }
 
 } // namespace ZThread
diff --git a/src/dep/src/zthread/RecursiveMutexImpl.h b/src/dep/src/zthread/RecursiveMutexImpl.h
index 9e1ae05..1e47713 100644
--- a/src/dep/src/zthread/RecursiveMutexImpl.h
+++ b/src/dep/src/zthread/RecursiveMutexImpl.h
@@ -39,14 +39,14 @@ namespace ZThread {
    * @date <2003-07-16T19:58:26-0400>
    * @version 2.1.6
    *
-   * This synchronization object provides serialized access 
-   * through an acquire/release protocol. 
+   * This synchronization object provides serialized access
+   * through an acquire/release protocol.
    */
   class ZTHREAD_API RecursiveMutexImpl {
-  
-    typedef std::vector<Monitor*> List;  
 
-    //! List of Events that are waiting for notification 
+    typedef std::vector<Monitor*> List;
+
+    //! List of Events that are waiting for notification
     List _waiters;
 
     //! Serialize access to this Mutex
@@ -55,24 +55,24 @@ namespace ZThread {
     //! Current owning Event object
     Monitor* _owner;
 
-    //! Entry count 
+    //! Entry count
     size_t _count;
 
   public:
-   
-    RecursiveMutexImpl(); 
+
+    RecursiveMutexImpl();
 
     virtual ~RecursiveMutexImpl();
-  
+
     void acquire();
-  
+
     bool tryAcquire(unsigned long);
-  
-    void release(); 
+
+    void release();
 
   }; /* RecursiveMutexImpl */
 
 
-}; 
+};
 
 #endif
diff --git a/src/dep/src/zthread/Scheduling.h b/src/dep/src/zthread/Scheduling.h
index b12f7ff..0006134 100644
--- a/src/dep/src/zthread/Scheduling.h
+++ b/src/dep/src/zthread/Scheduling.h
@@ -52,7 +52,7 @@ namespace ZThread {
    * @struct priority_order
    */
   struct priority_order : public std::binary_function<ThreadImpl*, ThreadImpl*, bool> {
-   
+
     std::less<const ThreadImpl*> id;
 
     bool operator()(const ThreadImpl* t0, const ThreadImpl* t1) const {
@@ -66,7 +66,7 @@ namespace ZThread {
       return id(t0, t1);
 
     }
-  
+
   };
 
 
@@ -76,15 +76,15 @@ namespace ZThread {
    * @version 2.2.0
    * @class priority_list
    */
-  class priority_list : public std::deque<ThreadImpl*> { 
+  class priority_list : public std::deque<ThreadImpl*> {
 
     priority_order comp;
 
   public:
 
-    void insert(const value_type& val) { 
+    void insert(const value_type& val) {
 
-      push_back(val); 
+      push_back(val);
       std::sort(begin(), end(), comp);
 
     }
diff --git a/src/dep/src/zthread/SemaphoreImpl.h b/src/dep/src/zthread/SemaphoreImpl.h
index 1f19128..746af9a 100644
--- a/src/dep/src/zthread/SemaphoreImpl.h
+++ b/src/dep/src/zthread/SemaphoreImpl.h
@@ -44,7 +44,7 @@ namespace ZThread {
    * The SemaphoreImpl template allows how waiter lists are sorted
    * to be parameteized
    */
-  template <typename List> 
+  template <typename List>
     class SemaphoreImpl {
 
     //! List of waiting events
@@ -58,7 +58,7 @@ namespace ZThread {
 
     //! Maximum count if any
     volatile int _maxCount;
-  
+
     //! Flag for bounded or unbounded count
     volatile bool _checked;
 
@@ -66,41 +66,41 @@ namespace ZThread {
     volatile int _entryCount;
 
     public:
-   
- 
+
+
     /**
-     * Create a new SemaphoreImpl. Initialzes one pthreads mutex for 
+     * Create a new SemaphoreImpl. Initialzes one pthreads mutex for
      * internal use.
      *
      * @exception Initialization_Exception thrown if resources could not be
      * properly allocated
      */
-    SemaphoreImpl(int count, unsigned int maxCount, bool checked) 
+    SemaphoreImpl(int count, unsigned int maxCount, bool checked)
       : _count(count), _maxCount(maxCount), _checked(checked), _entryCount(0) { }
 
 
     ~SemaphoreImpl();
 
     void acquire();
-  
+
     void release();
 
     bool tryAcquire(unsigned long timeout);
- 
+
     int count();
 
-  }; 
+  };
 
 
   /**
-   * Destroy this SemaphoreImpl and release its resources. 
+   * Destroy this SemaphoreImpl and release its resources.
    */
-  template <typename List> 
+  template <typename List>
     SemaphoreImpl<List>::~SemaphoreImpl() {
 
 #ifndef NDEBUG
 
-    if(_waiters.size() > 0) { 
+    if(_waiters.size() > 0) {
 
       ZTDEBUG("** You are destroying a semaphore which is blocking %d threads. **\n", _waiters.size());
       assert(0); // Destroyed semaphore while in use
@@ -117,21 +117,21 @@ namespace ZThread {
    *
    * @return int
    */
-  template <typename List> 
+  template <typename List>
     int SemaphoreImpl<List>::count() {
 
     Guard<FastLock> g(_lock);
     return _count;
-  
+
   }
 
   /**
    * Decrement the count, blocking when that count becomes 0 or less.
-   * 
+   *
    * @exception Interrupted_Exception thrown when the caller status is interrupted
    * @exception Synchronization_Exception thrown if there is some other error.
    */
-  template <typename List> 
+  template <typename List>
     void SemaphoreImpl<List>::acquire() {
 
     // Get the monitor for the current thread
@@ -155,14 +155,14 @@ namespace ZThread {
       m.acquire();
 
       {
-      
+
         Guard<FastLock, UnlockedScope> g2(g1);
         state = m.wait();
-      
+
       }
 
       m.release();
-        
+
       // Remove from waiter list, regarless of weather release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -170,38 +170,38 @@ namespace ZThread {
       typename List::iterator i = std::find(_waiters.begin(), _waiters.end(), self);
       if(i != _waiters.end())
         _waiters.erase(i);
-    
+
       --_entryCount;
 
       switch(state) {
         // If awoke due to a notify(), update the count
         case Monitor::SIGNALED:
-            
-          _count--;           
+
+          _count--;
           break;
-           
+
         case Monitor::INTERRUPTED:
           throw Interrupted_Exception();
-            
+
         default:
           throw Synchronization_Exception();
-      } 
-    
+      }
+
     }
 
   }
 
   /**
    * Decrement the count, blocking when it that count is 0 or less. If the timeout
-   * expires before the count is raise above 0, the thread will stop blocking 
+   * expires before the count is raise above 0, the thread will stop blocking
    * and return.
-   * 
+   *
    * @exception Interrupted_Exception thrown when the caller status is interrupted
    * @exception Synchronization_Exception thrown if there is some other error.
    */
-  template <typename List> 
+  template <typename List>
     bool SemaphoreImpl<List>::tryAcquire(unsigned long timeout) {
- 
+
     // Get the monitor for the current thread
     ThreadImpl* self = ThreadImpl::current();
     Monitor& m = self->getMonitor();
@@ -214,7 +214,7 @@ namespace ZThread {
 
     // Otherwise, wait() for the lock by placing the waiter in the list
     else {
-    
+
       ++_entryCount;
       _waiters.push_back(self);
 
@@ -222,20 +222,20 @@ namespace ZThread {
 
       // Don't bother waiting if the timeout is 0
       if(timeout) {
-        
+
         m.acquire();
 
         {
-        
+
           Guard<FastLock, UnlockedScope> g2(g1);
           state = m.wait(timeout);
-        
+
         }
 
         m.release();
-        
+
       }
-        
+
       // Remove from waiter list, regarless of weather release() is called or
       // not. The monitor is sticky, so its possible a state 'stuck' from a
       // previous operation and will leave the wait() w/o release() having
@@ -243,26 +243,26 @@ namespace ZThread {
       typename List::iterator i = std::find(_waiters.begin(), _waiters.end(), self);
       if(i != _waiters.end())
         _waiters.erase(i);
-    
+
       --_entryCount;
 
       switch(state) {
         // If awoke due to a notify(), update the count
         case Monitor::SIGNALED:
-            
-          _count--;           
+
+          _count--;
           break;
-           
+
         case Monitor::INTERRUPTED:
           throw Interrupted_Exception();
-            
+
         case Monitor::TIMEDOUT:
           return false;
 
         default:
           throw Synchronization_Exception();
-      } 
-    
+      }
+
     }
 
     return true;
@@ -272,18 +272,18 @@ namespace ZThread {
   /**
    * Increment the count and release a waiter if there are any. If the semaphore
    * is checked, then an exception will be raised if the maximum count is about to
-   * be exceeded. 
+   * be exceeded.
    *
    * @exception InvalidOp_Exception thrown if the maximum count is exceeded while
    * the checked flag is set.
    */
-  template <typename List> 
+  template <typename List>
     void SemaphoreImpl<List>::release()  {
 
     Guard<FastLock> g1(_lock);
 
     // Make sure the operation is valid
-    if(_checked && _count == _maxCount) 
+    if(_checked && _count == _maxCount)
       throw InvalidOp_Exception();
 
     // Increment the count
@@ -291,7 +291,7 @@ namespace ZThread {
 
     // Try to find a waiter with a backoff & retry scheme
     for(;;) {
-    
+
       // Go through the list, attempt to notify() a waiter.
       for(typename List::iterator i = _waiters.begin(); i != _waiters.end();) {
 
@@ -300,43 +300,43 @@ namespace ZThread {
         Monitor& m = impl->getMonitor();
 
         if(m.tryAcquire()) {
-        
+
           // Notify the monitor & remove from the waiter list so time isn't
           // wasted checking it again.
           i = _waiters.erase(i);
-        
-          // If notify() is not sucessful, it is because the wait() has already 
+
+          // If notify() is not sucessful, it is because the wait() has already
           // been ended (killed/interrupted/notify'd)
           bool woke = m.notify();
-        
+
           m.release();
-        
+
           // Once notify() succeeds, return
-          if(woke) 
+          if(woke)
             return;
-        
+
         } else ++i;
-      
+
       }
-    
+
       if(_waiters.empty())
         return;
-    
+
       { // Backoff and try again
-      
+
         Guard<FastLock, UnlockedScope> g2(g1);
         ThreadImpl::yield();
 
       }
 
     }
-  
+
   }
 
-  class FifoSemaphoreImpl : public SemaphoreImpl<fifo_list> { 
+  class FifoSemaphoreImpl : public SemaphoreImpl<fifo_list> {
   public:
 
-    FifoSemaphoreImpl(int count, unsigned int maxCount, bool checked) 
+    FifoSemaphoreImpl(int count, unsigned int maxCount, bool checked)
       /* throw(Synchronization_Exception) */
       : SemaphoreImpl<fifo_list>(count, maxCount, checked) { }
 
diff --git a/src/dep/src/zthread/State.h b/src/dep/src/zthread/State.h
index 85279f4..96697c9 100644
--- a/src/dep/src/zthread/State.h
+++ b/src/dep/src/zthread/State.h
@@ -26,7 +26,7 @@
 namespace ZThread {
 
 /**
- * @class State 
+ * @class State
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T20:04:01-0400>
  * @version 2.2.1
@@ -52,7 +52,7 @@ class State {
   }
 
   /**
-   * Test for the JOINED state. A task has completed and 
+   * Test for the JOINED state. A task has completed and
    * the thread is join()ed.
    *
    * @return bool
diff --git a/src/dep/src/zthread/Status.h b/src/dep/src/zthread/Status.h
index bc1db99..6f92d62 100644
--- a/src/dep/src/zthread/Status.h
+++ b/src/dep/src/zthread/Status.h
@@ -37,22 +37,22 @@ namespace ZThread {
   class Status {
   public:
     //! Aggregate of pending status changes
-    volatile unsigned short _pending; 
- 
-    //! Interest mask  
+    volatile unsigned short _pending;
+
+    //! Interest mask
     volatile unsigned short _mask;
 
   public:
- 
+
     //! State for the monitor
     typedef enum {
-    
+
       // Default
       INVALID      = 0x00,
 
       // Valid states
       SIGNALED     = 0x01,
-      INTERRUPTED  = 0x02, 
+      INTERRUPTED  = 0x02,
       TIMEDOUT     = 0x04,
       CANCELED     = 0x08,
 
@@ -62,10 +62,10 @@ namespace ZThread {
     } STATE;
 
     Status() : _pending(INVALID), _mask(ANYTHING) { }
-  
+
     /**
      * Set the mask for the STATE's that next() will report.
-     * STATE's not covered by the interest mask can still be 
+     * STATE's not covered by the interest mask can still be
      * set, they just aren't reported until the mask is changed
      * to cover that STATE.
      *
@@ -87,19 +87,19 @@ namespace ZThread {
      *
      * @param unsigned short
      * @pre accessed ONLY by the owning thread.
-     */      
+     */
     bool pending(unsigned short mask) {
- 
+
       assert(mask != INVALID);
       return ((_pending & _mask) & mask) != INVALID;
 
     }
 
     /**
-     * Check the state without the interest mask. 
+     * Check the state without the interest mask.
      *
-     * @param state 
-     * @return true if the flag is set 
+     * @param state
+     * @return true if the flag is set
      * @pre access must be serial
      */
     bool examine(STATE state) {
@@ -113,12 +113,12 @@ namespace ZThread {
      * @pre access must be serial
      */
     void push(STATE interest) {
-      _pending |= interest;  
+      _pending |= interest;
     }
 
     /**
      * Clear the flags from the current state
-     * 
+     *
      * @param interest - the flags to clear from the current state.
      * @pre access must be serial
      */
@@ -129,16 +129,16 @@ namespace ZThread {
       assert(interest != CANCELED);
 
       _pending &= ~interest;
-    
+
     }
 
     /**
      * Get the next state from set that has accumulated. The order STATES are
-     * reported in is SIGNALED, TIMEOUT, or INTERRUPTED. Setting the 
-     * intrest mask allows certain state to be selectively ignored for 
+     * reported in is SIGNALED, TIMEOUT, or INTERRUPTED. Setting the
+     * intrest mask allows certain state to be selectively ignored for
      * a time - but not lost. The states will become visible again as soon
-     * as the interest mask is changed appropriately. The interest mask is 
-     * generally used to create uninterruptable waits (waiting for threads 
+     * as the interest mask is changed appropriately. The interest mask is
+     * generally used to create uninterruptable waits (waiting for threads
      * to start, reacquiring a conditions predicate lock, etc)
      *
      * @return STATE
@@ -147,29 +147,29 @@ namespace ZThread {
     STATE next() {
 
       STATE state = INVALID;
-    
+
       if(((_pending & _mask) & SIGNALED) != 0) {
-      
+
         // Absorb the timeout if it happens when a signal
         // is available at the same time
         _pending &= ~(SIGNALED|TIMEDOUT);
         state = SIGNALED;
-      
+
       } else if(((_pending & _mask) & TIMEDOUT) != 0) {
 
         _pending &= ~TIMEDOUT;
         state = TIMEDOUT;
 
       } else if(((_pending & _mask) & INTERRUPTED) != 0) {
-      
+
         _pending &= ~INTERRUPTED;
         state = INTERRUPTED;
-      
-      } 
-      
+
+      }
+
       assert(state != INVALID);
       return state;
-    
+
     }
 
   };
diff --git a/src/dep/src/zthread/ThreadImpl.h b/src/dep/src/zthread/ThreadImpl.h
index ae2c8f2..f464242 100644
--- a/src/dep/src/zthread/ThreadImpl.h
+++ b/src/dep/src/zthread/ThreadImpl.h
@@ -53,7 +53,7 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps {
 
   //! The Monitor for controlling this thread
   Monitor _monitor;
-  
+
   //! Current state for the thread
   State _state;
 
@@ -61,11 +61,11 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps {
   List _joiners;
 
  public:
-  
+
   typedef std::map<const ThreadLocalImpl*, ThreadLocalImpl::ValuePtr > ThreadLocalMap;
 
  private:
-  
+
   ThreadLocalMap _tls;
 
   //! Cached thread priority
@@ -73,7 +73,7 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps {
 
   //! Request cancel() when main() goes out of scope
   bool _autoCancel;
-  
+
   void start(const Task& task);
 
  public:
@@ -82,7 +82,7 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps {
 
   ThreadImpl(const Task&, bool);
 
-  ~ThreadImpl();  
+  ~ThreadImpl();
 
   Monitor& getMonitor();
 
@@ -99,24 +99,24 @@ class ThreadImpl : public IntrusivePtr<ThreadImpl, FastLock>, public ThreadOps {
   //  ThreadLocalMap& getThreadLocalMap();
   ThreadLocalMap& getThreadLocalMap() { return _tls; }
 
-  bool join(unsigned long); 
-  
+  bool join(unsigned long);
+
   void setPriority(Priority);
 
   bool isActive();
 
   bool isReference();
 
-  static void sleep(unsigned long); 
+  static void sleep(unsigned long);
 
   static void yield();
-  
+
   static ThreadImpl* current();
 
   static void dispatch(ThreadImpl*, ThreadImpl*, Task);
 
 };
 
-} // namespace ZThread 
+} // namespace ZThread
 
 #endif // __ZTTHREADIMPL_H__
diff --git a/src/dep/src/zthread/ThreadOps.h b/src/dep/src/zthread/ThreadOps.h
index eef9f3c..d873715 100644
--- a/src/dep/src/zthread/ThreadOps.h
+++ b/src/dep/src/zthread/ThreadOps.h
@@ -39,9 +39,9 @@
 #elif defined(ZT_WIN32) || defined(ZT_WIN9X)
 
 // Visual C provides the _beginthreadex function, other compilers
-// might not have this if they don't use Microsoft's C runtime. 
-// _beginthreadex is similar to in effect defining REENTRANT on a 
-// POSIX system. CreateThreadEx doesn't use reentrant parts of the  
+// might not have this if they don't use Microsoft's C runtime.
+// _beginthreadex is similar to in effect defining REENTRANT on a
+// POSIX system. CreateThreadEx doesn't use reentrant parts of the
 // Microsfot C runtime, but if your not using that runtime, no problem.
 
 #  if !defined(HAVE_BEGINTHREADEX)
diff --git a/src/dep/src/zthread/ThreadQueue.h b/src/dep/src/zthread/ThreadQueue.h
index 044f826..72049fd 100644
--- a/src/dep/src/zthread/ThreadQueue.h
+++ b/src/dep/src/zthread/ThreadQueue.h
@@ -31,7 +31,7 @@
 namespace ZThread {
 
   class ThreadImpl;
-  
+
   /**
    * @class ThreadQueue
    * @version 2.3.0
@@ -41,7 +41,7 @@ namespace ZThread {
    * A ThreadQueue accumulates references to user and reference threads.
    * These are threads that are running outside the scope of the Thread
    * object that created them. ZThreads doesn't have a central manager for
-   * all threads (partly why I renamed the ThreadManager to someting more 
+   * all threads (partly why I renamed the ThreadManager to someting more
    * appropriate). Instead, ZThreads will discover threads it did not create
    * and create a reference thread that allows ZThreads to interact with it.
    * Non user threads that are created by the user never have to touch the
@@ -56,19 +56,19 @@ namespace ZThread {
     ThreadList _pendingThreads;
     ThreadList _referenceThreads;
     ThreadList _userThreads;
-    
+
     //! Shutdown handlers
     TaskList   _shutdownTasks;
 
     //! Serilize access to the thread list
     FastLock _lock;
-    
+
     //! Reference thread waiting to cleanup any user & reference threads
     ThreadImpl* _waiter;
 
   public:
 
-    ThreadQueue(); 
+    ThreadQueue();
 
     /**
      * The thread destroys a ThreadQueue will be a reference thread,
@@ -84,16 +84,16 @@ namespace ZThread {
      *
      * User-threads are known to be executing thier tasks and will be cancel()ed
      * as the ThreadQueue is destroyed when main() goes out of scope. This sends
-     * a request to the task to complete soon. Once the task exits, the thread is 
+     * a request to the task to complete soon. Once the task exits, the thread is
      * transitioned to pending-thread status.
      */
     void insertUserThread(ThreadImpl*);
 
     /**
-     * Insert a pending-thread into the queue. 
-     * 
-     * Pending-threads are known to have completed thier tasks and thier 
-     * resources are reclaimed (lazily) as more threads are started or as the  
+     * Insert a pending-thread into the queue.
+     *
+     * Pending-threads are known to have completed thier tasks and thier
+     * resources are reclaimed (lazily) as more threads are started or as the
      * ThreadQueue is destroyed.
      */
     void insertPendingThread(ThreadImpl*);
@@ -106,8 +106,8 @@ namespace ZThread {
     void insertReferenceThread(ThreadImpl*);
 
     /**
-     * Insert a task to be run before threads are joined. 
-     * Any items inserted after the ThreadQueue desctructor has begun to 
+     * Insert a task to be run before threads are joined.
+     * Any items inserted after the ThreadQueue desctructor has begun to
      * execute will be run() immediately.
      */
     void insertShutdownTask(Task&);
@@ -126,7 +126,7 @@ namespace ZThread {
     void pollReferenceThreads();
 
   };
-  
+
 
 } // namespace ZThread
 
diff --git a/src/dep/src/zthread/TimeStrategy.h b/src/dep/src/zthread/TimeStrategy.h
index 0b9ad1e..249d8ab 100644
--- a/src/dep/src/zthread/TimeStrategy.h
+++ b/src/dep/src/zthread/TimeStrategy.h
@@ -65,7 +65,7 @@
 #  include "macos/UpTimeStrategy.h"
 
 #elif defined(HAVE_PERFORMANCECOUNTER)
-              
+
 #  include "win32/PerformanceCounterStrategy.h"
 
 #elif defined(HAVE_FTIME)
diff --git a/src/dep/src/zthread/config.h b/src/dep/src/zthread/config.h
index f2eff48..46b9ea2 100644
--- a/src/dep/src/zthread/config.h
+++ b/src/dep/src/zthread/config.h
@@ -23,22 +23,22 @@
 #define HAVE_MEMORY_H 1
 
 /* defined when pthreads is available */
-#define HAVE_POSIX_THREADS 
+#define HAVE_POSIX_THREADS
 
 /* Defined if pthread_keycreate() is available */
 /* #undef HAVE_PTHREADKEYCREATE */
 
 /* Defined if pthread_key_create() is available */
-#define HAVE_PTHREADKEY_CREATE 
+#define HAVE_PTHREADKEY_CREATE
 
 /* Defined if pthread_yield() is available */
-#define HAVE_PTHREAD_YIELD 
+#define HAVE_PTHREAD_YIELD
 
 /* Defined if -lrt is needed for RT scheduling */
-#define HAVE_SCHED_RT 
+#define HAVE_SCHED_RT
 
 /* Defined if sched_yield() is available */
-#define HAVE_SCHED_YIELD 
+#define HAVE_SCHED_YIELD
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
diff --git a/src/dep/src/zthread/linux/AtomicFastLock.h b/src/dep/src/zthread/linux/AtomicFastLock.h
index b9aa1ba..a416fef 100644
--- a/src/dep/src/zthread/linux/AtomicFastLock.h
+++ b/src/dep/src/zthread/linux/AtomicFastLock.h
@@ -44,31 +44,31 @@ namespace ZThread {
  * This implementation of a FastLock uses the atomic operations that
  * linux provides with its kernel sources. This demonstrates how to implement
  * a spinlock with a decrement and test primative.
- */ 
+ */
 class FastLock : private NonCopyable {
-  
+
   atomic_t _value;
-  
+
 #if !defined(NDEBUG)
   pthread_t _owner;
 #endif
 
 public:
-  
+
   inline FastLock() {
-  
+
     atomic_t tmp =  ATOMIC_INIT(1);
     _value = tmp;
 
   }
-  
+
   inline ~FastLock() {
 
     assert(atomic_read(&_value) == 1);
     assert(_owner == 0);
 
   }
-  
+
   inline void acquire() {
 
     while(!atomic_dec_and_test(&_value)) {
@@ -77,14 +77,14 @@ public:
       ThreadOps::yield();
 
     }
-        
+
 #if !defined(NDEBUG)
     _owner = pthread_self();
 #endif
   }
 
   inline void release() {
-    
+
 #if !defined(NDEBUG)
     assert(pthread_equal(_owner, pthread_self()) != 0);
 #endif
@@ -93,9 +93,9 @@ public:
     _owner = 0;
 
   }
-  
+
   inline bool tryAcquire(unsigned long timeout=0) {
-    
+
     bool wasLocked = atomic_dec_and_test(&_value);
     if(!wasLocked)
       atomic_inc(&_value);
@@ -106,9 +106,9 @@ public:
 #endif
 
     return wasLocked;
-    
+
   }
-  
+
 }; /* FastLock */
 
 
diff --git a/src/dep/src/zthread/linux/FastRecursiveLock.h b/src/dep/src/zthread/linux/FastRecursiveLock.h
index d253652..a9a74d2 100644
--- a/src/dep/src/zthread/linux/FastRecursiveLock.h
+++ b/src/dep/src/zthread/linux/FastRecursiveLock.h
@@ -36,45 +36,45 @@ namespace ZThread {
  * @version 2.2.0
  *
  * This implementation of a FastRecursiveLock uses the recursive mutex
- * that linux pthreads provides.  
- */ 
+ * that linux pthreads provides.
+ */
 class FastRecursiveLock : private NonCopyable {
-    
+
   pthread_mutex_t _mtx;
-  
+
 public:
-  
+
   inline FastRecursiveLock() {
-    
+
     static const pthread_mutexattr_t attr = { PTHREAD_MUTEX_RECURSIVE_NP };
     pthread_mutex_init(&_mtx, &attr);
 
   }
-  
+
   inline ~FastRecursiveLock() {
 
     pthread_mutex_destroy(&_mtx);
 
   }
-  
+
   inline void acquire() {
-    
+
     pthread_mutex_lock(&_mtx);
 
   }
 
   inline void release() {
-    
+
     pthread_mutex_unlock(&_mtx);
-    
+
   }
-  
+
   inline bool tryAcquire(unsigned long timeout=0) {
 
     return (pthread_mutex_trylock(&_mtx) == 0);
 
   }
-  
+
 }; /* FastRecursiveLock */
 
 
diff --git a/src/dep/src/zthread/macos/FastLock.h b/src/dep/src/zthread/macos/FastLock.h
index bae5c48..0bd40e1 100644
--- a/src/dep/src/zthread/macos/FastLock.h
+++ b/src/dep/src/zthread/macos/FastLock.h
@@ -39,48 +39,48 @@ namespace ZThread {
  * @date <2003-07-16T23:25:31-0400>
  * @version 2.1.6
  *
- */ 
+ */
 class FastLock : private NonCopyable {
-    
+
   MPCriticalRegionID _mtx;
 
  public:
-  
+
   /**
    * Create a new FastLock. No safety or state checks are performed.
    *
    * @exception Initialization_Exception - not thrown
    */
   inline FastLock() {
-    
+
     // Apple TN1071
     static bool init = MPLibraryIsLoaded();
-    
+
     if(!init || MPCreateCriticalRegion(&_mtx) != noErr) {
       assert(0);
       throw Initialization_Exception();
     }
 
   }
-  
+
   /**
    * Destroy a FastLock. No safety or state checks are performed.
    */
   inline ~FastLock() throw () {
 
     OSStatus status = MPDeleteCriticalRegion(_mtx);
-    if(status != noErr) 
+    if(status != noErr)
       assert(false);
 
   }
-  
+
   /**
    * Acquire an exclusive lock. No safety or state checks are performed.
    *
    * @exception Synchronization_Exception - not thrown
    */
   inline void acquire() {
-    
+
     if(MPEnterCriticalRegion(_mtx, kDurationForever) != noErr)
       throw Synchronization_Exception();
 
@@ -96,38 +96,38 @@ class FastLock : private NonCopyable {
    */
   inline bool tryAcquire(unsigned long timeout=0) {
 
-    OSStatus status = 
+    OSStatus status =
       MPEnterCriticalRegion(_mtx, kDurationMillisecond * timeout);
 
     switch(status) {
       case kMPTimeoutErr:
         return false;
-        
+
       case noErr:
         return true;
-        
-    } 
-    
+
+    }
+
     assert(0);
     throw Synchronization_Exception();
 
   }
-  
+
   /**
    * Release an exclusive lock. No safety or state checks are performed.
-   * The caller should have already acquired the lock, and release it 
+   * The caller should have already acquired the lock, and release it
    * only once.
-   * 
+   *
    * @exception Synchronization_Exception - not thrown
    */
   inline void release() {
-    
+
     if(MPExitCriticalRegion(_mtx) != noErr)
       throw Synchronization_Exception();
 
   }
-  
-  
+
+
 }; /* FastLock */
 
 
diff --git a/src/dep/src/zthread/macos/Monitor.h b/src/dep/src/zthread/macos/Monitor.h
index f4312d7..9fa3c9a 100644
--- a/src/dep/src/zthread/macos/Monitor.h
+++ b/src/dep/src/zthread/macos/Monitor.h
@@ -49,40 +49,40 @@ class Monitor : public Status, private NonCopyable {
   MPTaskID _owner;
 
   //! Waiting flag, to avoid uneccessary signals
-  volatile bool _waiting; 
+  volatile bool _waiting;
 
   //! Waiting flag, to avoid too many signals
-  volatile bool _pending; 
+  volatile bool _pending;
 
   //! State of the monitor
   volatile int _state;
-  
+
  public:
-  
+
   //! Create a new monitor.
   Monitor();
 
   //! Destroy the monitor.
   ~Monitor() throw();
 
-  //! Acquire the external lock for this monitor. 
+  //! Acquire the external lock for this monitor.
   inline void acquire() {
     _lock.acquire();
   }
 
-  //! Try to acquire the external lock for this monitor. 
+  //! Try to acquire the external lock for this monitor.
   inline bool tryAcquire() {
     return _lock.tryAcquire();
   }
 
-  //! Release the external lock for this monitor. 
+  //! Release the external lock for this monitor.
   inline void release() {
     _lock.release();
   }
-  
+
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * Blocks for an indefinent amount of time. 
+   * Blocks for an indefinent amount of time.
    *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or SIGNALED if the wait was ended by a notify()
@@ -95,11 +95,11 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * May blocks for an indefinent amount of time. 
+   * May blocks for an indefinent amount of time.
    *
    * @param timeout - maximum time to block (milliseconds) or 0 to
    * block indefinently
-   * 
+   *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or TIMEDOUT if the maximum wait time expired.
    *         or SIGNALED if the wait was ended by a notify()
@@ -119,9 +119,9 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Notify this monitor. If there is a thread blocked on this monitor object
-   * it will be signaled and released. If there is no waiter, a flag is set and 
-   * the next attempt to wait() will return SIGNALED w/o blocking, if no other 
-   * flag is set. 
+   * it will be signaled and released. If there is no waiter, a flag is set and
+   * the next attempt to wait() will return SIGNALED w/o blocking, if no other
+   * flag is set.
    *
    * @return false if the thread was previously INTERRUPTED.
    */
diff --git a/src/dep/src/zthread/macos/TSS.h b/src/dep/src/zthread/macos/TSS.h
index 3f9805d..1be90c5 100644
--- a/src/dep/src/zthread/macos/TSS.h
+++ b/src/dep/src/zthread/macos/TSS.h
@@ -38,7 +38,7 @@ namespace ZThread {
    * @date <2003-07-27T14:19:10-0400>
    * @version 2.1.6
    *
-   * An abstraction for dealing with POSIX thread specific storage (tss). 
+   * An abstraction for dealing with POSIX thread specific storage (tss).
    * Provides get/set and creation/destruction.
    */
   template <typename T>
@@ -49,13 +49,13 @@ namespace ZThread {
     public:
 
     /**
-     * Create a new object for accessing tss. 
+     * Create a new object for accessing tss.
      */
     TSS() {
 
       // Apple TN1071
       static bool init = MPLibraryIsLoaded();
-    
+
       if(!init || MPAllocateTaskStorageIndex(&_key) != noErr) {
         assert(0);
         throw Initialization_Exception();
@@ -64,17 +64,17 @@ namespace ZThread {
     }
 
     /**
-     * Destroy the underlying supoprt for accessing tss with this 
+     * Destroy the underlying supoprt for accessing tss with this
      * object.
      */
     ~TSS() {
-  
+
       OSStatus status = MPDeallocateTaskStorageIndex(_key);
-      if(status != noErr) 
+      if(status != noErr)
         assert(0);
 
     }
- 
+
     /**
      * Get the value stored in tss.
      *
@@ -85,8 +85,8 @@ namespace ZThread {
     T get() const {
       return reinterpret_cast<T>(MPGetTaskStorageValue(_key));
     }
-  
- 
+
+
     /**
      * Store a value in tss.
      *
@@ -99,18 +99,18 @@ namespace ZThread {
 
       T oldValue = get();
 
-      OSStatus status = 
+      OSStatus status =
         MPSetTaskStorageValue(_key, reinterpret_cast<TaskStorageValue>(value));
-    
+
       if(status != noErr) {
         assert(0);
         throw Synchronization_Exception();
       }
 
       return oldValue;
-    
+
     }
-   
+
   };
 
 }
diff --git a/src/dep/src/zthread/macos/ThreadOps.h b/src/dep/src/zthread/macos/ThreadOps.h
index c100fcf..5c4eb04 100644
--- a/src/dep/src/zthread/macos/ThreadOps.h
+++ b/src/dep/src/zthread/macos/ThreadOps.h
@@ -33,14 +33,14 @@
 namespace ZThread {
 
 class Runnable;
- 
+
 /**
  * @class ThreadOps
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T23:26:01-0400>
  * @version 2.2.0
  *
- * This class is an abstraction used to perform various operations on a 
+ * This class is an abstraction used to perform various operations on a
  * native POSIX thread.
  */
 class ThreadOps {
@@ -55,10 +55,10 @@ class ThreadOps {
 
 public:
 
-  const static ThreadOps INVALID; 
+  const static ThreadOps INVALID;
 
   /**
-   * Create a new ThreadOps to manipulate a native thread. 
+   * Create a new ThreadOps to manipulate a native thread.
    */
   ThreadOps();
 
@@ -84,20 +84,20 @@ public:
   }
 
   /**
-   * Activating an instance of ThreadOps will map it onto the currently  
+   * Activating an instance of ThreadOps will map it onto the currently
    * executing thread.
-   */ 
+   */
   static void activate(ThreadOps* ops) {
 
     assert(ops);
     assert(ops->_tid == 0);
 
     ops->_tid = MPCurrentTaskID();
-    
+
   }
 
   /**
-   * Test if this object represents the currently executing 
+   * Test if this object represents the currently executing
    * native thread.
    *
    * @return bool true if successful
@@ -119,7 +119,7 @@ public:
   static bool join(ThreadOps*);
 
   /**
-   * Force the current native thread to yield, letting the scheduler 
+   * Force the current native thread to yield, letting the scheduler
    * give the CPU time to another thread.
    *
    * @return bool true if successful, false if the operation can't
@@ -128,7 +128,7 @@ public:
   static bool yield();
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param PRIORITY requested priority
@@ -137,7 +137,7 @@ public:
   static bool setPriority(ThreadOps*, Priority);
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param Thread::PRIORITY& current priority
diff --git a/src/dep/src/zthread/macos/UpTimeStrategy.h b/src/dep/src/zthread/macos/UpTimeStrategy.h
index f2056e1..0f7962d 100644
--- a/src/dep/src/zthread/macos/UpTimeStrategy.h
+++ b/src/dep/src/zthread/macos/UpTimeStrategy.h
@@ -40,7 +40,7 @@ class TimeStrategy {
   unsigned long _s;
 
  public:
-  
+
   TimeStrategy() {
 
     // Get the absolute time in milliseconds relative to the program startup
@@ -53,12 +53,12 @@ class TimeStrategy {
     _ms = now % 1000;
 
   }
-  
+
   inline unsigned long seconds() const {
     return _s;
   }
 
-  inline unsigned long milliseconds() const {  
+  inline unsigned long milliseconds() const {
     return _ms;
   }
 
diff --git a/src/dep/src/zthread/posix/ConditionRecursiveLock.h b/src/dep/src/zthread/posix/ConditionRecursiveLock.h
index a46ed35..2be55c1 100644
--- a/src/dep/src/zthread/posix/ConditionRecursiveLock.h
+++ b/src/dep/src/zthread/posix/ConditionRecursiveLock.h
@@ -38,13 +38,13 @@ namespace ZThread {
  * @version 2.2.0
  *
  * This is an implementation of a FastRecursiveLock for any vannila
- * POSIX system. It is based on a condition variable and a mutex; 
+ * POSIX system. It is based on a condition variable and a mutex;
  * because of this it is important to not that its waiting properties
  * are not the same as other mutex implementations that generally
  * based on spin locks. Under high contention, this implementation may
  * be preferable to a spin lock, although refactoring the design of
  * code that puts a mutex under alot of preasure may be worth investigating.
- */ 
+ */
 class FastRecursiveLock : private NonCopyable {
 
   //! Serialize state
@@ -62,25 +62,25 @@ class FastRecursiveLock : private NonCopyable {
 public:
 
   inline FastRecursiveLock() : _owner(0), _count(0) {
-    
+
     pthread_mutex_init(&_mtx, 0);
     if(pthread_cond_init(&_cond, 0) != 0) {
       assert(0);
     }
 
   }
-  
+
   inline ~FastRecursiveLock() {
 
     pthread_mutex_destroy(&_mtx);
     if(pthread_cond_destroy(&_cond) != 0) {
-      assert(0); 
+      assert(0);
     }
-    
+
   }
-  
+
   inline void acquire() {
-    
+
     pthread_t self = pthread_self();
     pthread_mutex_lock(&_mtx);
 
@@ -91,14 +91,14 @@ public:
       do { // ignore signals
         status = pthread_cond_wait(&_cond, &_mtx);
       } while(status == EINTR && _owner == 0);
-      
+
     }
-    
+
     _owner = self;
     _count++;
 
     pthread_mutex_unlock(&_mtx);
- 
+
   }
 
   inline bool tryAcquire(unsigned long timeout=0) {
@@ -109,10 +109,10 @@ public:
     // If the caller owns the lock, or there is no owner update the count
     bool success = (_owner == 0 || pthread_equal(_owner, self));
     if(success) {
-      
+
       _owner = self;
       _count++;
-      
+
     }
 
     pthread_mutex_unlock(&_mtx);
@@ -122,7 +122,7 @@ public:
   }
 
   inline void release() {
-    
+
     assert(pthread_equal(_owner, pthread_self()));
 
     pthread_mutex_lock(&_mtx);
@@ -134,13 +134,13 @@ public:
     }
 
     pthread_mutex_unlock(&_mtx);
-    
+
   }
-  
-  
+
+
 }; /* FastRecursiveLock */
 
 
-} // namespace ZThread 
+} // namespace ZThread
 
 #endif
diff --git a/src/dep/src/zthread/posix/FastLock.h b/src/dep/src/zthread/posix/FastLock.h
index 89907fd..30d1a82 100644
--- a/src/dep/src/zthread/posix/FastLock.h
+++ b/src/dep/src/zthread/posix/FastLock.h
@@ -39,16 +39,16 @@ namespace ZThread {
  *
  * This is the smallest and fastest synchronization object in the library.
  * It is an implementation of fast mutex, an all or nothing exclusive
- * lock. It should be used only where you need speed and are willing 
+ * lock. It should be used only where you need speed and are willing
  * to sacrifice all the state & safety checking provided by the framework
  * for speed.
- */ 
+ */
 class FastLock : private NonCopyable {
-    
+
   pthread_mutex_t _mtx;
 
  public:
-  
+
   /**
    * Create a new FastLock. No safety or state checks are performed.
    *
@@ -60,7 +60,7 @@ class FastLock : private NonCopyable {
       throw Initialization_Exception();
 
   }
-  
+
   /**
    * Destroy a FastLock. No safety or state checks are performed.
    */
@@ -71,14 +71,14 @@ class FastLock : private NonCopyable {
     }
 
   }
-  
+
   /**
    * Acquire an exclusive lock. No safety or state checks are performed.
    *
    * @exception Synchronization_Exception - not thrown
    */
   inline void acquire() {
-    
+
     if(pthread_mutex_lock(&_mtx) != 0)
       throw Synchronization_Exception();
 
@@ -97,22 +97,22 @@ class FastLock : private NonCopyable {
     return (pthread_mutex_trylock(&_mtx) == 0);
 
   }
-  
+
   /**
    * Release an exclusive lock. No safety or state checks are performed.
-   * The caller should have already acquired the lock, and release it 
+   * The caller should have already acquired the lock, and release it
    * only once.
-   * 
+   *
    * @exception Synchronization_Exception - not thrown
    */
   inline void release() {
-    
+
     if(pthread_mutex_unlock(&_mtx) != 0)
       throw Synchronization_Exception();
 
   }
-  
-  
+
+
 }; /* FastLock */
 
 
diff --git a/src/dep/src/zthread/posix/FtimeStrategy.h b/src/dep/src/zthread/posix/FtimeStrategy.h
index 3197475..e692142 100644
--- a/src/dep/src/zthread/posix/FtimeStrategy.h
+++ b/src/dep/src/zthread/posix/FtimeStrategy.h
@@ -55,8 +55,8 @@ public:
     return _value.time;
   }
 
-  inline unsigned long milliseconds() const {  
-    return _value.millitm;    
+  inline unsigned long milliseconds() const {
+    return _value.millitm;
   }
 
   unsigned long seconds(unsigned long s) {
diff --git a/src/dep/src/zthread/posix/Monitor.h b/src/dep/src/zthread/posix/Monitor.h
index 945c879..fe6c8b5 100644
--- a/src/dep/src/zthread/posix/Monitor.h
+++ b/src/dep/src/zthread/posix/Monitor.h
@@ -50,7 +50,7 @@ class Monitor : public Status, private NonCopyable {
   pthread_t _owner;
 
   //! Waiting flag, to avoid uneccessary signals
-  volatile bool _waiting; 
+  volatile bool _waiting;
 
  public:
 
@@ -62,12 +62,12 @@ class Monitor : public Status, private NonCopyable {
   //! Destroy the monitor.
   ~Monitor();
 
-  //! Acquire the lock for this monitor. 
+  //! Acquire the lock for this monitor.
   inline void acquire() {
     _lock.acquire();
   }
 
-  //! Acquire the lock for this monitor. 
+  //! Acquire the lock for this monitor.
   inline bool tryAcquire() {
     return _lock.tryAcquire();
   }
@@ -79,7 +79,7 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * Blocks for an indefinent amount of time. 
+   * Blocks for an indefinent amount of time.
    *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or SIGNALED if the wait was ended by a notify()
@@ -92,11 +92,11 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * May blocks for an indefinent amount of time. 
+   * May blocks for an indefinent amount of time.
    *
    * @param timeout - maximum time to block (milliseconds) or 0 to
    * block indefinently
-   * 
+   *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or TIMEDOUT if the maximum wait time expired.
    *         or SIGNALED if the wait was ended by a notify()
@@ -116,9 +116,9 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Notify this monitor. If there is a thread blocked on this monitor object
-   * it will be signaled and released. If there is no waiter, a flag is set and 
-   * the next attempt to wait() will return SIGNALED w/o blocking, if no other 
-   * flag is set. 
+   * it will be signaled and released. If there is no waiter, a flag is set and
+   * the next attempt to wait() will return SIGNALED w/o blocking, if no other
+   * flag is set.
    *
    * @return false if the thread was previously INTERRUPTED.
    */
diff --git a/src/dep/src/zthread/posix/PriorityOps.h b/src/dep/src/zthread/posix/PriorityOps.h
index 92da66a..3a7f822 100644
--- a/src/dep/src/zthread/posix/PriorityOps.h
+++ b/src/dep/src/zthread/posix/PriorityOps.h
@@ -34,15 +34,15 @@ namespace ZThread {
  * @date <2003-07-16T23:30:00-0400>
  * @version 2.2.0
  *
- * This class is an abstraction used to perform various operations on a 
+ * This class is an abstraction used to perform various operations on a
  * native POSIX thread.
  */
 class PriorityOps {
-  
+
 
 public:
 
-  
+
 };
 
 
diff --git a/src/dep/src/zthread/posix/TSS.h b/src/dep/src/zthread/posix/TSS.h
index 931ff34..c9c9c0e 100644
--- a/src/dep/src/zthread/posix/TSS.h
+++ b/src/dep/src/zthread/posix/TSS.h
@@ -35,18 +35,18 @@ namespace ZThread {
    * @date <2003-07-27T14:18:37-0400>
    * @version 2.3.0
    *
-   * An abstraction for dealing with POSIX thread specific storage (tss). 
+   * An abstraction for dealing with POSIX thread specific storage (tss).
    * Provides get/set and creation/destruction.
    */
   template <typename T>
     class TSS : private NonCopyable {
-  
+
     pthread_key_t _key;
 
     public:
 
     /**
-     * Create a new object for accessing tss. 
+     * Create a new object for accessing tss.
      */
     TSS() {
 
@@ -57,15 +57,15 @@ namespace ZThread {
     }
 
     /**
-     * Destroy the underlying supoprt for accessing tss with this 
+     * Destroy the underlying supoprt for accessing tss with this
      * object.
      */
     ~TSS() {
-  
+
       pthread_key_delete(_key);
-    
+
     }
- 
+
     /**
      * Get the value stored in tss.
      *
@@ -76,8 +76,8 @@ namespace ZThread {
     T get() const {
       return reinterpret_cast<T>(pthread_getspecific(_key));
     }
-  
- 
+
+
     /**
      * Store a value in tss.
      *
@@ -90,11 +90,11 @@ namespace ZThread {
 
       T oldValue = get();
       pthread_setspecific(_key, value);
-    
+
       return oldValue;
-    
+
     }
-   
+
   };
 
 }
diff --git a/src/dep/src/zthread/posix/ThreadOps.h b/src/dep/src/zthread/posix/ThreadOps.h
index be754c2..8fef43b 100644
--- a/src/dep/src/zthread/posix/ThreadOps.h
+++ b/src/dep/src/zthread/posix/ThreadOps.h
@@ -31,7 +31,7 @@
 namespace ZThread {
 
 class Runnable;
- 
+
 //! Dispatch function for native pthreads required extern C
 //! linkage.
 extern "C" void* _dispatch(void*);
@@ -42,7 +42,7 @@ extern "C" void* _dispatch(void*);
  * @date <2003-07-16T23:30:25-0400>
  * @version 2.2.8
  *
- * This class is an abstraction used to perform various operations on a 
+ * This class is an abstraction used to perform various operations on a
  * native POSIX thread.
  */
 class ThreadOps {
@@ -54,10 +54,10 @@ class ThreadOps {
 
 public:
 
-  const static ThreadOps INVALID; 
+  const static ThreadOps INVALID;
 
   /**
-   * Create a new ThreadOps to manipulate a native thread. 
+   * Create a new ThreadOps to manipulate a native thread.
    */
   ThreadOps() : _tid(0) { }
 
@@ -66,26 +66,26 @@ public:
     return pthread_equal(_tid, ops._tid);
   }
 
-  
+
   static ThreadOps self() {
     return ThreadOps(pthread_self());
   }
 
   /**
-   * Activating an instance of ThreadOps will map it onto the currently  
+   * Activating an instance of ThreadOps will map it onto the currently
    * executing thread.
-   */ 
+   */
   static void activate(ThreadOps* ops) {
 
     assert(ops);
     assert(ops->_tid == 0);
 
     ops->_tid = pthread_self();
-    
+
   }
 
   /**
-   * Test if this object represents the currently executing 
+   * Test if this object represents the currently executing
    * native thread.
    *
    * @return bool true if successful
@@ -107,7 +107,7 @@ public:
   static bool join(ThreadOps*);
 
   /**
-   * Force the current native thread to yield, letting the scheduler 
+   * Force the current native thread to yield, letting the scheduler
    * give the CPU time to another thread.
    *
    * @return bool true if successful, false if the operation can't
@@ -116,7 +116,7 @@ public:
   static bool yield();
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param PRIORITY requested priority
@@ -125,7 +125,7 @@ public:
   static bool setPriority(ThreadOps*, Priority);
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param Thread::PRIORITY& current priority
diff --git a/src/dep/src/zthread/solaris/FastRecursiveLock.h b/src/dep/src/zthread/solaris/FastRecursiveLock.h
index 956e1db..2de0f8c 100644
--- a/src/dep/src/zthread/solaris/FastRecursiveLock.h
+++ b/src/dep/src/zthread/solaris/FastRecursiveLock.h
@@ -35,13 +35,13 @@ namespace ZThread {
  * @date <2003-07-16T23:31:23-0400>
  * @version 2.2.0
  *
- * This FastRecursiveLock implementation uses pthreads mutex attribute 
- * functions to create a recursive lock. This implementation is not 
- * specific to solaris and will work on any system that supports 
- * pthread_mutexattr_settype().  
- */ 
+ * This FastRecursiveLock implementation uses pthreads mutex attribute
+ * functions to create a recursive lock. This implementation is not
+ * specific to solaris and will work on any system that supports
+ * pthread_mutexattr_settype().
+ */
 class FastRecursiveLock : private NonCopyable {
-    
+
   pthread_mutex_t _mtx;
 
   /**
@@ -50,7 +50,7 @@ class FastRecursiveLock : private NonCopyable {
    * Utility class to maintain the attribute as long as it is needed.
    */
   class Attribute {
-    
+
     pthread_mutexattr_t _attr;
 
   public:
@@ -60,13 +60,13 @@ class FastRecursiveLock : private NonCopyable {
       if(pthread_mutexattr_init(&_attr) != 0) {
         assert(0);
       }
-      
+
       if(pthread_mutexattr_settype(&_attr, PTHREAD_MUTEX_RECURSIVE) != 0) {
         assert(0);
       }
 
     }
-    
+
     ~Attribute() {
 
       if(pthread_mutexattr_destroy(&_attr) != 0) {
@@ -84,36 +84,36 @@ class FastRecursiveLock : private NonCopyable {
 public:
 
   inline FastRecursiveLock() {
-    
+
     static Attribute attr;
     pthread_mutex_init(&_mtx, (pthread_mutexattr_t*)attr);
 
   }
-  
+
   inline ~FastRecursiveLock() {
 
     pthread_mutex_destroy(&_mtx);
 
   }
-  
+
   inline void acquire() {
-    
+
     pthread_mutex_lock(&_mtx);
 
   }
 
   inline void release() {
-    
+
     pthread_mutex_unlock(&_mtx);
-    
+
   }
-  
+
   inline bool tryAcquire(unsigned long timeout=0) {
 
     return (pthread_mutex_trylock(&_mtx) == 0);
 
   }
-  
+
 }; /* FastRecursiveLock */
 
 
diff --git a/src/dep/src/zthread/vanilla/DualMutexRecursiveLock.h b/src/dep/src/zthread/vanilla/DualMutexRecursiveLock.h
index ddce7a3..6321413 100644
--- a/src/dep/src/zthread/vanilla/DualMutexRecursiveLock.h
+++ b/src/dep/src/zthread/vanilla/DualMutexRecursiveLock.h
@@ -38,11 +38,11 @@ namespace ZThread {
  *
  * This is a vanilla FastRecursiveLock implementation for a
  * system that doesn't provide recurisve locks. This implementation
- * is based on using a pair of mutexes, because of this, it performs 
+ * is based on using a pair of mutexes, because of this, it performs
  * roughly the same as a spin lock would.
- */ 
+ */
 class FastRecursiveLock : private NonCopyable {
-    
+
   //! Lock for blocking
   FastLock _blockingLock;
 
@@ -58,14 +58,14 @@ class FastRecursiveLock : private NonCopyable {
  public:
 
   inline FastRecursiveLock() : _owner(ThreadOps::INVALID), _count(0) { }
-  
+
   inline ~FastRecursiveLock() {
 
     assert(_owner == ThreadOps::INVALID);
     assert(_count == 0);
 
   }
-  
+
   void acquire() {
 
     ThreadOps self(ThreadOps::self());
@@ -73,7 +73,7 @@ class FastRecursiveLock : private NonCopyable {
     // Try to lock the blocking mutex first
     bool wasLocked = _blockingLock.tryAcquire();
     if(!wasLocked) {
-    
+
       // Otherwise, grab the lock for the state
       _stateLock.acquire();
 
@@ -82,30 +82,30 @@ class FastRecursiveLock : private NonCopyable {
         _count++;
 
       _stateLock.release();
-      
+
       if(wasLocked)
         return;
 
       // Try to be cooperative
       ThreadOps::yield();
       _blockingLock.acquire();
-      
+
     }
 
-    // Serialze access to the state 
+    // Serialze access to the state
     _stateLock.acquire();
-    
-    // Take ownership    
+
+    // Take ownership
     assert(_owner == ThreadOps::INVALID || _owner == self);
 
     _owner = self;
     _count++;
-      
+
     _stateLock.release();
 
   }
-  
-  
+
+
   bool tryAcquire(unsigned long timeout = 0) {
 
     ThreadOps self(ThreadOps::self());
@@ -113,7 +113,7 @@ class FastRecursiveLock : private NonCopyable {
     // Try to lock the blocking mutex first
     bool wasLocked = _blockingLock.tryAcquire();
     if(!wasLocked) {
-    
+
       // Otherwise, grab the lock for the state
       _stateLock.acquire();
 
@@ -122,52 +122,52 @@ class FastRecursiveLock : private NonCopyable {
         _count++;
 
       _stateLock.release();
-      
+
       return wasLocked;
-      
+
     }
 
-    // Serialze access to the state 
+    // Serialze access to the state
     _stateLock.acquire();
-    
-    // Take ownership    
+
+    // Take ownership
     assert(_owner == ThreadOps::INVALID || _owner == self);
 
     _owner = self;
     _count++;
-      
+
     _stateLock.release();
-    
+
     return true;
 
   }
 
-    
+
   void release() {
 
-    // Assume that release is only used by the owning thread, as it 
+    // Assume that release is only used by the owning thread, as it
     // should be.
     assert(_count != 0);
     assert(_owner == ThreadOps::self());
-    
+
     _stateLock.acquire();
-    
+
     // If the lock was owned and the count has reached 0, give up
     // ownership and release the blocking lock
     if(--_count == 0) {
-      
+
       _owner = ThreadOps::INVALID;
       _blockingLock.release();
-      
+
     }
-    
+
     _stateLock.release();
 
   }
-  
+
 
 }; /* FastRecursiveLock */
 
-} // namespace ZThread 
+} // namespace ZThread
 
 #endif
diff --git a/src/dep/src/zthread/vanilla/SimpleRecursiveLock.h b/src/dep/src/zthread/vanilla/SimpleRecursiveLock.h
index f4f3092..6adf415 100644
--- a/src/dep/src/zthread/vanilla/SimpleRecursiveLock.h
+++ b/src/dep/src/zthread/vanilla/SimpleRecursiveLock.h
@@ -37,49 +37,49 @@ namespace ZThread {
  * @version 2.2.8
  *
  * This implementation of a FastRecursiveLock uses the which ever FastLock
- * that is selected to create a recursive spin lock. 
- */ 
+ * that is selected to create a recursive spin lock.
+ */
 class FastRecursiveLock : private NonCopyable {
-  
+
   FastLock _lock;
 
   ThreadOps _owner;
 
   volatile unsigned int _count;
-  
+
 public:
-  
+
   inline FastRecursiveLock() : _owner(ThreadOps::INVALID), _count(0) {}
-  
+
   inline ~FastRecursiveLock() {
 
     assert(_owner == ThreadOps::INVALID);
     assert(_count == 0);
 
   }
-  
+
   inline void acquire() {
 
     ThreadOps self(ThreadOps::self());
     bool wasLocked = false;
 
     do {
-      
+
       _lock.acquire();
-      
+
       // If there is no owner, or the owner is the caller
       // update the count
       if(_owner == ThreadOps::INVALID || _owner == self) {
 
         _owner = self;
         _count++;
-        
+
         wasLocked = true;
-  
+
       }
 
       _lock.release();
-      
+
     } while(!wasLocked);
 
     assert(_owner == ThreadOps::self());
@@ -96,32 +96,32 @@ public:
       _owner = ThreadOps::INVALID;
 
     _lock.release();
-    
+
   }
-  
+
   inline bool tryAcquire(unsigned long timeout=0) {
 
     ThreadOps self(ThreadOps::self());
     bool wasLocked = false;
 
     _lock.acquire();
-    
+
     if(_owner == ThreadOps::INVALID || _owner == self) {
-    
+
       _owner = self;
       _count++;
-      
+
       wasLocked = true;
 
     }
-    
+
     _lock.release();
 
     assert(!wasLocked || _owner == ThreadOps::self());
-    return wasLocked;    
-    
+    return wasLocked;
+
   }
-  
+
 }; /* FastRecursiveLock */
 
 
diff --git a/src/dep/src/zthread/win32/AtomicFastLock.h b/src/dep/src/zthread/win32/AtomicFastLock.h
index a714c03..8d09f13 100644
--- a/src/dep/src/zthread/win32/AtomicFastLock.h
+++ b/src/dep/src/zthread/win32/AtomicFastLock.h
@@ -39,17 +39,17 @@ namespace ZThread {
  *
  * This is the smallest and fastest synchronization object in the library.
  * It is an implementation of fast mutex, an all or nothing exclusive
- * lock. It should be used only where you need speed and are willing 
+ * lock. It should be used only where you need speed and are willing
  * to sacrifice all the state & safety checking provided by the framework
  * for speed.
  *
  * The current Platform SDK defines:
  *
  *   LONG InterlockedExchange(LPLONG, LONG)
- *   LONG InterlockedCompareExchange(LPLONG, LONG, LONG, LONG) 
+ *   LONG InterlockedCompareExchange(LPLONG, LONG, LONG, LONG)
  *
  * If your compiler complains about LPLONG not being implicitly casted to
- * a PVOID, then you should get the SDK update from microsoft or use the 
+ * a PVOID, then you should get the SDK update from microsoft or use the
  * WIN9X implementation of this class.
  *
  * ----
@@ -57,21 +57,21 @@ namespace ZThread {
  * don't all support the CMPXCHG function, and so Windows 95 an earlier dont support
  * InterlockedCompareExchange. For this, you should use the win9x implementation
  * of this class
- */ 
+ */
 class FastLock : private NonCopyable {
 
 #pragma pack(push, 8)
   LONG volatile _lock;
 #pragma pack(pop)
-  
+
   public:
-  
+
   /**
    * Create a new FastLock
    */
   inline FastLock() : _lock(0) { }
 
-  
+
   /**
    * Destroy FastLock
    */
@@ -79,9 +79,9 @@ class FastLock : private NonCopyable {
 
   /**
    * Lock the fast Lock, no error check.
-   * 
+   *
    * @exception None
-   */ 
+   */
   inline void acquire() {
 
     while (::InterlockedCompareExchange(const_cast<LPLONG>(&_lock), 1, 0) != 0)
@@ -89,18 +89,18 @@ class FastLock : private NonCopyable {
 
   }
 
-  
+
   /**
    * Release the fast Lock, no error check.
-   * 
+   *
    * @exception None
-   */ 
+   */
   inline void release() {
 
     ::InterlockedExchange(const_cast<LPLONG>(&_lock), (LONG)0);
 
   }
-    
+
   /**
    * Try to acquire an exclusive lock. No safety or state checks are performed.
    * This function returns immediately regardless of the value of the timeout
@@ -110,11 +110,11 @@ class FastLock : private NonCopyable {
    * @exception Synchronization_Exception - not thrown
    */
  inline bool tryAcquire(unsigned long timeout=0) {
- 
+
    return ::InterlockedCompareExchange(const_cast<LPLONG>(&_lock), 1, 0) == 0;
 
  }
-  
+
 }; /* FastLock */
 
 
diff --git a/src/dep/src/zthread/win32/AtomicFastRecursiveLock.h b/src/dep/src/zthread/win32/AtomicFastRecursiveLock.h
index c6a61b0..a4dc375 100644
--- a/src/dep/src/zthread/win32/AtomicFastRecursiveLock.h
+++ b/src/dep/src/zthread/win32/AtomicFastRecursiveLock.h
@@ -37,36 +37,36 @@ namespace ZThread {
  * @date <2003-07-16T23:32:34-0400>
  * @version 2.1.6
  *
- * This is the smaller and faster implementation of a RecursiveLock. 
+ * This is the smaller and faster implementation of a RecursiveLock.
  * A single thread can acquire the mutex any number of times, but it
  * must perform a release for each acquire(). Other threads are blocked
  * until a thread has released all of its locks on the mutex.
- * 
- * This particular implementation performs fewer safety checks. Like 
- * the FastLock implementation, any waiting caused by an acquire() request 
+ *
+ * This particular implementation performs fewer safety checks. Like
+ * the FastLock implementation, any waiting caused by an acquire() request
  * is not interruptable. This is so that the mutex can have the fastest
  * response time for a time critical application while still having a good
  * degree of reliability.
  *
- * TryEnterCriticalSection() does not work at all on some systems, so its 
+ * TryEnterCriticalSection() does not work at all on some systems, so its
  * not used.
  *
  *
  * The current Platform SDK defines:
  *
  *   LONG InterlockedExchange(LPLONG, LONG)
- *   LONG InterlockedCompareExchange(LPLONG, LONG, LONG, LONG) 
+ *   LONG InterlockedCompareExchange(LPLONG, LONG, LONG, LONG)
  *
  * If your compiler complains about LPLONG not being implicitly casted to
- * a PVOID, then you should get the SDK update from microsoft or use the 
+ * a PVOID, then you should get the SDK update from microsoft or use the
  * WIN9X implementation of this class.
  *
  * ----
  * Because Windows 95 and earlier can run on processors prior to the 486, they
  * don't all support the CMPXCHG function, and so Windows 95 an earlier dont support
- * InterlockedCompareExchange. If you define ZT_WIN9X, you'll get a version of the 
+ * InterlockedCompareExchange. If you define ZT_WIN9X, you'll get a version of the
  * FastLock that uses the XCHG instruction
- */ 
+ */
 class FastRecursiveLock : private NonCopyable {
 
 // Add def for mingw32 or other non-ms compiler to align on 64-bit
@@ -75,15 +75,15 @@ class FastRecursiveLock : private NonCopyable {
   LONG volatile _lock;
 #pragma pack(pop)
   LONG _count;
-  
+
   public:
-  
+
   /**
    * Create a new FastRecursiveLock
    */
   inline FastRecursiveLock() : _lock(0), _count(0) { }
 
-  
+
   /**
    * Destroy FastLock
    */
@@ -93,9 +93,9 @@ class FastRecursiveLock : private NonCopyable {
 
   /**
    * Lock the fast Lock, no error check.
-   * 
+   *
    * @exception None
-   */ 
+   */
   inline void acquire() {
 
     DWORD id = ::GetCurrentThreadId();
@@ -110,24 +110,24 @@ class FastRecursiveLock : private NonCopyable {
       ::Sleep(0);
 
     } while(1);
-        
+
     _count++;
 
   }
 
-  
+
   /**
    * Release the fast Lock, no error check.
-   * 
+   *
    * @exception None
-   */ 
+   */
   inline void release() {
 
     if(--_count == 0)
       ::InterlockedExchange(const_cast<LPLONG>(&_lock), 0);
 
   }
-    
+
   /**
    * Try to acquire an exclusive lock. No safety or state checks are performed.
    * This function returns immediately regardless of the value of the timeout
@@ -137,20 +137,20 @@ class FastRecursiveLock : private NonCopyable {
    * @exception Synchronization_Exception - not thrown
    */
   inline bool tryAcquire(unsigned long timeout=0) {
-    
+
     DWORD id = ::GetCurrentThreadId();
     DWORD owner = (DWORD)::InterlockedCompareExchange(const_cast<LPLONG>(&_lock), id, 0);
-    
+
     if(owner == 0 || owner == id) {
       _count++;
       return true;
     }
-    
+
     return false;
-    
+
   }
-  
-  
+
+
 }; /* FastRecursiveLock */
 
 
diff --git a/src/dep/src/zthread/win32/FastLock.h b/src/dep/src/zthread/win32/FastLock.h
index 2e9fe82..3b212e1 100644
--- a/src/dep/src/zthread/win32/FastLock.h
+++ b/src/dep/src/zthread/win32/FastLock.h
@@ -39,10 +39,10 @@ namespace ZThread {
    * @version 2.2.11
    *
    * This FastLock implementation is based on a Win32 Mutex
-   * object. This will perform better under high contention, 
+   * object. This will perform better under high contention,
    * but will not be as fast as the spin lock under reasonable
    * circumstances.
-   */ 
+   */
   class FastLock : private NonCopyable {
 
     HANDLE _hMutex;
@@ -51,11 +51,11 @@ namespace ZThread {
 #endif
 
   public:
-  
+
     /**
      * Create a new FastLock
      */
-    FastLock() { 
+    FastLock() {
 
 #ifndef NDEBUG
       _locked = false;
@@ -68,11 +68,11 @@ namespace ZThread {
 
     }
 
-  
+
     ~FastLock() {
       ::CloseHandle(_hMutex);
     }
-  
+
   void acquire() {
 
     if(::WaitForSingleObject(_hMutex, INFINITE) != WAIT_OBJECT_0) {
@@ -113,7 +113,7 @@ namespace ZThread {
 
     switch(::WaitForSingleObject(_hMutex, timeout)) {
       case WAIT_OBJECT_0:
-      
+
 #ifndef NDEBUG
 
         // Simulate deadlock to provide consistent behavior. This
@@ -122,7 +122,7 @@ namespace ZThread {
 
         while(_locked)
           ThreadOps::yield();
-      
+
         _locked = true;
 
 #endif
diff --git a/src/dep/src/zthread/win32/FastRecursiveLock.h b/src/dep/src/zthread/win32/FastRecursiveLock.h
index e1a6e7c..de556ac 100644
--- a/src/dep/src/zthread/win32/FastRecursiveLock.h
+++ b/src/dep/src/zthread/win32/FastRecursiveLock.h
@@ -39,21 +39,21 @@ namespace ZThread {
  * @version 2.2.11
  *
  * This FastRecursiveLock implementation is based on a Win32 Mutex
- * object. This will perform better under high contention, 
+ * object. This will perform better under high contention,
  * but will not be as fast as the spin lock under reasonable
  * circumstances.
- */ 
+ */
 class FastRecursiveLock : private NonCopyable {
 
   HANDLE _hMutex;
   volatile unsigned int _count;
 
   public:
-  
+
   /**
    * Create a new FastRecursiveLock
    */
-  FastRecursiveLock() : _count(0) { 
+  FastRecursiveLock() : _count(0) {
 
     _hMutex = ::CreateMutex(0, 0, 0);
     assert(_hMutex != NULL);
@@ -62,12 +62,12 @@ class FastRecursiveLock : private NonCopyable {
 
   }
 
-  
+
   ~FastRecursiveLock() {
     ::CloseHandle(_hMutex);
   }
 
-  
+
   void acquire() {
 
     if(::WaitForSingleObject(_hMutex, INFINITE) != WAIT_OBJECT_0) {
diff --git a/src/dep/src/zthread/win32/Monitor.h b/src/dep/src/zthread/win32/Monitor.h
index d25fdd8..eca637d 100644
--- a/src/dep/src/zthread/win32/Monitor.h
+++ b/src/dep/src/zthread/win32/Monitor.h
@@ -49,37 +49,37 @@ class Monitor : public Status, private NonCopyable {
   DWORD _owner;
 
   //! Waiting flag, to avoid uneccessary signals
-  volatile bool _waiting; 
+  volatile bool _waiting;
 
   //! State of the monitor
   volatile int _state;
 
  public:
-  
+
   //! Create a new monitor.
   Monitor();
 
   //! Destroy the monitor.
   ~Monitor();
 
-  //! Acquire the external lock for this monitor. 
+  //! Acquire the external lock for this monitor.
   inline void acquire() {
     _lock.acquire();
   }
 
-  //! Try to acquire the external lock for this monitor. 
+  //! Try to acquire the external lock for this monitor.
   inline bool tryAcquire() {
     return _lock.tryAcquire();
   }
 
-  //! Release the external lock for this monitor. 
+  //! Release the external lock for this monitor.
   inline void release() {
     _lock.release();
   }
-  
+
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * Blocks for an indefinent amount of time. 
+   * Blocks for an indefinent amount of time.
    *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or SIGNALED if the wait was ended by a notify()
@@ -92,11 +92,11 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Wait for a state change and atomically unlock the external lock.
-   * May blocks for an indefinent amount of time. 
+   * May blocks for an indefinent amount of time.
    *
    * @param timeout - maximum time to block (milliseconds) or 0 to
    * block indefinently
-   * 
+   *
    * @return INTERRUPTED if the wait was ended by a interrupt()
    *         or TIMEDOUT if the maximum wait time expired.
    *         or SIGNALED if the wait was ended by a notify()
@@ -116,9 +116,9 @@ class Monitor : public Status, private NonCopyable {
 
   /**
    * Notify this monitor. If there is a thread blocked on this monitor object
-   * it will be signaled and released. If there is no waiter, a flag is set and 
-   * the next attempt to wait() will return SIGNALED w/o blocking, if no other 
-   * flag is set. 
+   * it will be signaled and released. If there is no waiter, a flag is set and
+   * the next attempt to wait() will return SIGNALED w/o blocking, if no other
+   * flag is set.
    *
    * @return false if the thread was previously INTERRUPTED.
    */
diff --git a/src/dep/src/zthread/win32/PerformanceCounterStrategy.h b/src/dep/src/zthread/win32/PerformanceCounterStrategy.h
index 95b5268..4c657af 100644
--- a/src/dep/src/zthread/win32/PerformanceCounterStrategy.h
+++ b/src/dep/src/zthread/win32/PerformanceCounterStrategy.h
@@ -31,19 +31,19 @@ namespace ZThread {
 /**
  * @class PerformanceCounterStrategy
  *
- * Implement a strategy for time operatons based on 
- * Windows QueryPerformanceXXX() functions. 
+ * Implement a strategy for time operatons based on
+ * Windows QueryPerformanceXXX() functions.
  * This only (erroneously) considers the lower 32 bits.
  */
 class TimeStrategy {
 
   unsigned long _secs;
   unsigned long _millis;
-    
+
 public:
 
   TimeStrategy() {
-    
+
     // Keep track of the relative time the program started
     static LARGE_INTEGER i;
     static BOOL valid(::QueryPerformanceCounter(&i));
@@ -52,22 +52,22 @@ public:
 
     LARGE_INTEGER j;
     ::QueryPerformanceCounter(&j);
-  
+
     j.LowPart -= i.LowPart;
     j.LowPart /= frequency();
 
-    // Mask off the high bits        
+    // Mask off the high bits
     _millis = (unsigned long)j.LowPart / 1000;
     _secs   = (unsigned long)j.LowPart - _millis;
 
   }
-  
+
   unsigned long seconds() const {
     return _secs;
   }
 
-  unsigned long milliseconds() const {  
-    return _millis;    
+  unsigned long milliseconds() const {
+    return _millis;
   }
 
   unsigned long seconds(unsigned long s) {
diff --git a/src/dep/src/zthread/win32/TSS.h b/src/dep/src/zthread/win32/TSS.h
index 2400830..d1307a5 100644
--- a/src/dep/src/zthread/win32/TSS.h
+++ b/src/dep/src/zthread/win32/TSS.h
@@ -33,12 +33,12 @@ namespace ZThread {
    * @date <2003-07-27T14:18:43-0400>
    * @version 2.3.0
    *
-   * An abstraction for dealing with WIN32 thread specific storage (tss). 
+   * An abstraction for dealing with WIN32 thread specific storage (tss).
    * Provides get/set and creation/destruction.
    */
   template <typename T>
     class TSS {
-  
+
     DWORD _key;
     bool _valid;
 
@@ -55,16 +55,16 @@ namespace ZThread {
     }
 
     /**
-     * Destroy the underlying supoprt for accessing tss with this 
+     * Destroy the underlying supoprt for accessing tss with this
      * object.
      */
     virtual ~TSS() {
-  
-      if(_valid) 
+
+      if(_valid)
         ::TlsFree(_key);
-   
+
     }
- 
+
     /**
      * Get the value stored in tss.
      *
@@ -97,8 +97,8 @@ namespace ZThread {
       return oldValue;
 
     }
- 
- 
+
+
   };
 
 }
diff --git a/src/dep/src/zthread/win32/ThreadOps.h b/src/dep/src/zthread/win32/ThreadOps.h
index 4a3eeac..1b3a0bf 100644
--- a/src/dep/src/zthread/win32/ThreadOps.h
+++ b/src/dep/src/zthread/win32/ThreadOps.h
@@ -37,7 +37,7 @@ class Runnable;
  * @date <2003-07-16T23:33:59-0400>
  * @version 2.2.8
  *
- * This class is an abstraction used to perform various operations on a 
+ * This class is an abstraction used to perform various operations on a
  * native WIN32 thread.
  */
 class ThreadOps {
@@ -53,11 +53,11 @@ class ThreadOps {
 
  public:
 
-  const static ThreadOps INVALID; 
+  const static ThreadOps INVALID;
 
   /**
-   * Create a new ThreadOps to represent a native thread. 
-   */  
+   * Create a new ThreadOps to represent a native thread.
+   */
   ThreadOps() : _tid(0), _hThread(NULL) {}
 
 
@@ -65,7 +65,7 @@ class ThreadOps {
     return _tid == ops._tid;
   }
 
-  
+
   static ThreadOps self() {
     return ThreadOps(::GetCurrentThreadId());
   }
@@ -73,7 +73,7 @@ class ThreadOps {
   /**
    * Update the native tid for this thread so it matches the current
    * thread.
-   */ 
+   */
   static void activate(ThreadOps* ops) {
 
     assert(ops);
@@ -84,7 +84,7 @@ class ThreadOps {
   }
 
   /**
-   * Test if this object representative of the currently executing 
+   * Test if this object representative of the currently executing
    * native thread.
    *
    * @return bool true if successful
@@ -105,7 +105,7 @@ class ThreadOps {
   static bool join(ThreadOps*);
 
   /**
-   * Force the current native thread to yield, letting the scheduler 
+   * Force the current native thread to yield, letting the scheduler
    * give the CPU time to another thread.
    *
    * @return bool true if successful
@@ -113,7 +113,7 @@ class ThreadOps {
   static bool yield();
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param PRIORITY requested priority
@@ -122,7 +122,7 @@ class ThreadOps {
   static bool setPriority(ThreadOps*, Priority);
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param Thread::PRIORITY& current priority
diff --git a/src/dep/src/zthread/win9x/AtomicFastLock.h b/src/dep/src/zthread/win9x/AtomicFastLock.h
index 5b50a9c..7723b70 100644
--- a/src/dep/src/zthread/win9x/AtomicFastLock.h
+++ b/src/dep/src/zthread/win9x/AtomicFastLock.h
@@ -48,22 +48,22 @@ namespace ZThread {
  * This is asm inlined for microsoft visual c, it needs to be changed in order to
  * compile with gcc, or another win32 compiler - but more likely than not you'll
  * be using the Win32 version on those compilers and this won't be a problem.
- */ 
+ */
 class FastLock : private NonCopyable {
 
 // Add def for mingw32 or other non-ms compiler to align on 32-bit boundary
 #pragma pack(push, 4)
   unsigned char volatile _lock;
 #pragma pack(pop)
-  
+
   public:
-  
+
   /**
    * Create a new FastLock
    */
   inline FastLock() : _lock(0) { }
 
-  
+
   inline ~FastLock() {
     assert(_lock == 0);
   }
@@ -77,7 +77,7 @@ class FastLock : private NonCopyable {
 
       mov  al, 1
       mov  esi, dw
-      xchg [esi], al       
+      xchg [esi], al
       and  al,al
       jz   spin_locked
     }
@@ -95,15 +95,15 @@ class FastLock : private NonCopyable {
 
     DWORD dw = (DWORD)&_lock;
 
-    _asm { 
+    _asm {
       mov  al, 0
       mov  esi, dw
-      xchg [esi], al       
+      xchg [esi], al
     }
 
 
   }
-    
+
  inline bool tryAcquire(unsigned long timeout=0) {
 
     volatile DWORD dw = (DWORD)&_lock;
@@ -113,16 +113,16 @@ class FastLock : private NonCopyable {
 
       mov  al, 1
       mov  esi, dw
-      xchg [esi], al       
+      xchg [esi], al
       and  al,al
       mov  esi, result
-      xchg [esi], al       
+      xchg [esi], al
     }
 
     return result == 0;
 
  }
-  
+
 }; /* Fast Lock */
 
 } // namespace ZThread
diff --git a/src/shared/ADTFile.cpp b/src/shared/ADTFile.cpp
index dbbb409..86e456f 100644
--- a/src/shared/ADTFile.cpp
+++ b/src/shared/ADTFile.cpp
@@ -24,8 +24,8 @@ void MCAL_decompress(uint8 *inbuf, uint8 *outbuf)
         * if set we are in fill mode else we are in copy mode
         * take the 7 lesser bits of the first byte as a count indicator
         o fill mode: read the next byte an fill it by count in resulting alpha map
-        o copy mode: read the next count bytes and copy them in the resulting alpha map 
-        * if the alpha map is complete we are done otherwise start at 1. again 
+        o copy mode: read the next count bytes and copy them in the resulting alpha map
+        * if the alpha map is complete we are done otherwise start at 1. again
     */
     // 21-10-2008 by Flow
     uint32 offI = 0; //offset IN buffer
@@ -71,9 +71,9 @@ bool ADTFile::Load(std::string fn)
     catch (...)
     {
         printf("ADTFile::Load() Exception\n");
-        return false;                
+        return false;
     }
-    
+
 }
 
 bool ADTFile::LoadMem(ByteBuffer& buf)
@@ -87,7 +87,7 @@ bool ADTFile::LoadMem(ByteBuffer& buf)
 
     while(buf.rpos() < buf.size())
     {
-        buf.read(fourcc,4); flipcc(fourcc); 
+        buf.read(fourcc,4); flipcc(fourcc);
         buf.read((uint8*)&size,4);
         DEBUG(printf("ADT: reading '%s' size %u\n",fourcc,size));
 
@@ -224,7 +224,7 @@ bool ADTFile::LoadMem(ByteBuffer& buf)
             bool mcal_compressed = false;
             while(buf.rpos()<endpos)
             {
-                buf.read(mfcc,4); flipcc(mfcc); 
+                buf.read(mfcc,4); flipcc(mfcc);
                 buf.read((uint8*)&msize,4);
 
                 DEBUG(printf("ADT:MCNK[%u]: reading '%s' size %u\n",mcnkid,mfcc,msize));
@@ -358,7 +358,7 @@ bool ADTFile::LoadMem(ByteBuffer& buf)
                         printf("Error loading ADT file (chunk %u error).\n",mcnkid);
                         return false;
                     }
-                        
+
                     buf.rpos(buf.rpos()+msize);
                 }
 
diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index 7f3fcb8..5ea407e 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -81,13 +81,13 @@ void AuthCrypt::EncryptSend_12340(uint8 *data, size_t len)
 void AuthCrypt::Init_8606(BigNumber *K)
 {
     uint8 *key = new uint8[SHA_DIGEST_LENGTH];
-    
+
     uint8 recvSeed[SEED_KEY_SIZE] = { 0x38, 0xA7, 0x83, 0x15, 0xF8, 0x92, 0x25, 0x30, 0x71, 0x98, 0x67, 0xB1, 0x8C, 0x4, 0xE2, 0xAA };
     HmacHash recvHash(SEED_KEY_SIZE, (uint8*)recvSeed);
     recvHash.UpdateBigNumber(K);
     recvHash.Finalize();
     memcpy(key, recvHash.GetDigest(), SHA_DIGEST_LENGTH);
-    
+
     _key.resize(SHA_DIGEST_LENGTH);
     std::copy(key, key + SHA_DIGEST_LENGTH, _key.begin());
     delete[] key;
@@ -101,17 +101,17 @@ void AuthCrypt::Init_8606(BigNumber *K)
 void AuthCrypt::Init_6005(BigNumber *K)
 {
     _send_i = _send_j = _recv_i = _recv_j = 0;
-    
+
     SetKey_6005(K->AsByteArray(),40);
     _initialized = true;
-  
+
 }
 
 void AuthCrypt::DecryptRecv_6005(uint8 *data, size_t len)
 {
     if (!_initialized)
         return;
-    
+
     if (len < CRYPTED_RECV_LEN_6005)
         return;
 
@@ -123,16 +123,16 @@ void AuthCrypt::DecryptRecv_6005(uint8 *data, size_t len)
         _recv_j = data[t];
         data[t] = x;
 
-        
+
     }
-  
+
 }
 
 void AuthCrypt::EncryptSend_6005(uint8 *data, size_t len)
 {
     if (!_initialized)
         return;
-    if (len < CRYPTED_SEND_LEN_6005) 
+    if (len < CRYPTED_SEND_LEN_6005)
         return;
 
     for (size_t t = 0; t < CRYPTED_SEND_LEN_6005; t++)
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index 75f1e75..0a4bc5c 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -41,7 +41,7 @@ class AuthCrypt
 
         //2.4.3
         void Init_8606(BigNumber *K);
-        
+
         //1.12.X
         void Init_6005(BigNumber *K);
         void SetKey_6005(uint8 *, size_t);
@@ -59,7 +59,7 @@ class AuthCrypt
         //3.3.5
         SARC4 _decrypt;
         SARC4 _encrypt;
-        
+
         //1.12.2
         std::vector<uint8> _key;
         uint8 _send_i, _send_j, _recv_i, _recv_j;
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index d168bf8..4560009 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index f161e4f..8da19e3 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/shared/Auth/MD5Hash.h b/src/shared/Auth/MD5Hash.h
index da8395d..3afbc41 100644
--- a/src/shared/Auth/MD5Hash.h
+++ b/src/shared/Auth/MD5Hash.h
@@ -14,7 +14,7 @@ public:
         memset(_digest,0,MD5_DIGEST_LENGTH);
     }
 
-    
+
     void Update(uint8 *buf,uint32 len)
     {
         md5_append(&_state,buf,len);
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index 99b00bd..606da4b 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index 787eea1..20f3ea0 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index 2017b30..fffc84e 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -309,7 +309,7 @@ class ByteBuffer
                 guid >>= 8;
             }
         }
-        
+
         void put(size_t pos, const uint8 *src, size_t cnt)
         {
             memcpy(&_storage[pos], src, cnt);
@@ -378,7 +378,7 @@ class ByteBuffer
             printf("\n");
 
         }
-        
+
         void print(void)
         {
             uint32 line = 1;
diff --git a/src/shared/DBCFieldData.h b/src/shared/DBCFieldData.h
index 5da19de..456233f 100644
--- a/src/shared/DBCFieldData.h
+++ b/src/shared/DBCFieldData.h
@@ -140,7 +140,7 @@ enum ChrRacesEnum
     CHRRACES_NAME_GENERAL, // always the english(?) name (without spaces). used in texture names etc.
     CHRRACES_UNK_9,
     CHRRACES_UNK_10,
-	// the following 8 fields contain either 0 or the race name, depending on the locale. 
+	// the following 8 fields contain either 0 or the race name, depending on the locale.
     CHRRACES_NAME1, // english
     CHRRACES_NAME2, // <need info here>
     CHRRACES_NAME3, // <need info here>
@@ -155,7 +155,7 @@ enum ChrRacesEnum
     CHRRACES_UNK_21,
     CHARRACES_END
 };
-                                     
+
 static const char *ChrRacesFormat = "ixxxiisixxxsxxssssssssssssssssxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxi";
 
 static const char *ChrRacesFieldNames[] =
@@ -204,7 +204,7 @@ enum MapEnum
     MAP_END = 75
 };
 
-static const char *MapFieldNames[] = 
+static const char *MapFieldNames[] =
 {
     "","name_general","","","name","name","name","name","name","name",
     "name","name","","","","","","","","",
@@ -217,7 +217,7 @@ static const char *MapFieldNames[] =
     ""
 };
 
-static const char *MapFormat = 
+static const char *MapFormat =
 {
     "isxxssssss"
     "ssxxxxxxxx"
@@ -269,8 +269,8 @@ enum ItemDisplayInfoEnum
     ITEMDISPLAYINFO_NAME_R = 4, // (internal name?)
     ITEMDISPLAYINFO_ICON = 5, // icon filename
     ITEMDISPLAYINFO_GEOSET_1 = 6, // Geoset, which M2 submeshes this item will cover when equipped, depeding on type
-    ITEMDISPLAYINFO_GEOSET_2 = 7, 
-    ITEMDISPLAYINFO_GEOSET_3 = 8, 
+    ITEMDISPLAYINFO_GEOSET_2 = 7,
+    ITEMDISPLAYINFO_GEOSET_3 = 8,
     ITEMDISPLAYINFO_GEOSET_4 = 9, // some flag? 0, 1 or 2.
     ITEMDISPLAYINFO_FLAG1 = 10, // some flag? mostly 0, sometimes other values (for ex. polearms have 4081 ?!)
     ITEMDISPLAYINFO_ITEMGROUPSOUND = 11, // these is NOT the inventorytype...
@@ -334,7 +334,7 @@ enum CreatureDisplayInfoEnum
     CREATUREDISPLAYINFO_OPACITY = 5, // 0 = 100% tansparent, 255 = 100% solid
     CREATUREDISPLAYINFO_NAME1 = 6, // next 3 fields are some names, not always present
     CREATUREDISPLAYINFO_NAME2 = 7,
-    CREATUREDISPLAYINFO_NAME3 = 8, 
+    CREATUREDISPLAYINFO_NAME3 = 8,
     CREATUREDISPLAYINFO_NPCSOUNDS = 11, // id from NPCSounds
     CREATUREDISPLAYINFO_END = 21
 };
@@ -379,7 +379,7 @@ enum CharSectionsEnum
     CHARSECTIONS_TYPE = 3, // 0=base skin, 1=face, 2=facial traits, 3=hair, 4=underwear
     CHARSECTIONS_SECTION = 4, // depends, see table below
     CHARSECTIONS_COLOR = 5, // skin/hair color
-    CHARSECTIONS_TEXTURE1 = 6, 
+    CHARSECTIONS_TEXTURE1 = 6,
     CHARSECTIONS_TEXTURE2 = 7,
     CHARSECTIONS_TEXTURE3 = 8,
     CHARSECTIONS_IS_SPECIAL_NPC = 9, // 0=player, 1=special npc
@@ -429,7 +429,7 @@ static const char *GameObjectDisplayInfoFormat = {
 
 enum ChrBaseInfoEnum
 {
-    CBI_RACE = 0, 
+    CBI_RACE = 0,
     CBI_CLASS = 1,
     CBI_END = 2
 };
diff --git a/src/shared/DebugStuff.h b/src/shared/DebugStuff.h
index 41fb5d3..d1cd1c8 100644
--- a/src/shared/DebugStuff.h
+++ b/src/shared/DebugStuff.h
@@ -6,7 +6,7 @@
     #define DEBUG(code) code;
     #define DEBUG_APPENDIX " - DEBUG"
     #define CODEDEB(code) fprintf(stderr,"[[ %s ]]\n",#code); code;
-#else 
+#else
     #define DEBUG(code) /* code */
     #define DEBUG_APPENDIX
     #define CODEDEB(code) (code;)
diff --git a/src/shared/MPQHelper.cpp b/src/shared/MPQHelper.cpp
index cee8d9e..8130373 100644
--- a/src/shared/MPQHelper.cpp
+++ b/src/shared/MPQHelper.cpp
@@ -30,7 +30,7 @@ void MPQHelper::Init()
     _patches.push_front(dir+"terrain"+ext);
     _patches.push_front(dir+"texture"+ext);
     _patches.push_front(dir+"wmo"+ext);
-    
+
     // order goes from last opened to first opened file
     // ok maybe this is a bit too much but should work fine :)
     _patches.push_front(dir+"common"+ext);
diff --git a/src/shared/MPQLocale.cpp b/src/shared/MPQLocale.cpp
index 46b4392..fddb26c 100644
--- a/src/shared/MPQLocale.cpp
+++ b/src/shared/MPQLocale.cpp
@@ -29,7 +29,7 @@ void SetLocale(const char *loc)
         char *buf = new char[fs];
         fh.read((char*)buf,fs);
         fh.close();
-        
+
         for(uint32 i=0; i<fs; i++)
         {
             if(buf[i]=='\n')
diff --git a/src/shared/MapTile.cpp b/src/shared/MapTile.cpp
index 36ca29c..7f9ed70 100644
--- a/src/shared/MapTile.cpp
+++ b/src/shared/MapTile.cpp
@@ -91,7 +91,7 @@ void MapTile::ImportFromADT(ADTFile *adt)
         d.model = fname;
         // this .mdx -> .m2 transformation is annoying >.< - replace "mdx" and end of string with "m2"
         // d.model = d.model.substr(0, d.model.length() - 3) + "m2";
-        // 3.1.3 - no more .mdx in ADT 
+        // 3.1.3 - no more .mdx in ADT
         d.scale = mddf.scale / 1024.0f;
         if(d.scale < 0.00001f)
             d.scale = 1;
diff --git a/src/shared/MemoryDataHolder.cpp b/src/shared/MemoryDataHolder.cpp
index 29e135f..029798e 100644
--- a/src/shared/MemoryDataHolder.cpp
+++ b/src/shared/MemoryDataHolder.cpp
@@ -18,11 +18,11 @@ namespace MemoryDataHolder
     TypeStorage<DataLoaderRunnable> loaders;
     TypeStorage<uint32> refs;
     bool alwaysSingleThreaded = false;
-    
+
     bool loadFromMPQ = false;
     MPQHelper mpq;
 
-    
+
     void Init(void)
     {
         if(!executor)
@@ -37,7 +37,7 @@ namespace MemoryDataHolder
         executor->interrupt(); // interrupt all working threads
         // executor will delete itself automatically
     }
-    
+
     void SetThreadCount(uint32 t)
     {
         // 0 threads used means we use no threading at all
@@ -54,14 +54,14 @@ namespace MemoryDataHolder
             executor->size(t);
         }
     }
-     
+
     void SetUseMPQ(std::string loc)
     {
         loadFromMPQ=true;
         SetLocale(loc.c_str());
         mpq.Init();
     }
-    
+
     void MakeMapFilename(char* fn, uint32 mid, std::string mname, uint32 x, uint32 y)
     {
         if(loadFromMPQ)
@@ -85,7 +85,7 @@ namespace MemoryDataHolder
             NormalizeFilename(fname);
             sprintf(fn,"./data/textures/%s",fname.c_str());
         }
-    }    
+    }
     void MakeModelFilename(char* fn, std::string fname)
     {
         if(fname.find(".mdx")!=std::string::npos)
@@ -99,7 +99,7 @@ namespace MemoryDataHolder
             NormalizeFilename(_PathToFileName(fname));
             sprintf(fn,"./data/model/%s",fname.c_str());
         }
-    }  
+    }
     void MakeWMOFilename(char* fn, std::string fname)
     {
         if(loadFromMPQ)
@@ -109,7 +109,7 @@ namespace MemoryDataHolder
             NormalizeFilename(_PathToFileName(fname));
             sprintf(fn,"./data/wmos/%s",fname.c_str());
         }
-    }  
+    }
 
     bool FileExists(std::string fname)
     {
@@ -118,10 +118,10 @@ namespace MemoryDataHolder
             return mpq.FileExists(fname.c_str());
         else
             return GetFileSize(fname.c_str());
-      
+
     }
-    
-    
+
+
     class DataLoaderRunnable : public ZThread::Runnable
     {
     public:
@@ -140,7 +140,7 @@ namespace MemoryDataHolder
         }
         // the threaded part
         void run()
-        { 
+        {
             memblock *mb = new memblock();
             if(loadFromMPQ)
             {
@@ -166,9 +166,9 @@ namespace MemoryDataHolder
                     return;
                 }
 
-                mb->size=bb.size(); 
+                mb->size=bb.size();
                 mb->alloc(mb->size);
-                
+
                 memcpy((char*)mb->ptr,(char*)bb.contents(),bb.size());
                 {
                     ZThread::Guard<ZThread::FastMutex> g(_mut);
@@ -176,7 +176,7 @@ namespace MemoryDataHolder
                     _loaders->Unlink(_name); // must be unlinked after the file is fully loaded, but before the callbacks are processed!
                 }
                 DEBUG(logdev("DataLoaderRunnable: Done with '%s' (%s)", _name.c_str(), FilesizeFormat(mb->size).c_str()));
-                DoCallbacks(_name, MDH_FILE_OK | MDH_FILE_JUST_LOADED);              
+                DoCallbacks(_name, MDH_FILE_OK | MDH_FILE_JUST_LOADED);
             }
             else
             {
@@ -263,7 +263,7 @@ namespace MemoryDataHolder
        ZThread::FastMutex _mut;
        TypeStorage<memblock> *_storage;
        TypeStorage<DataLoaderRunnable> *_loaders;
-       
+
     };
 
 
@@ -338,7 +338,7 @@ namespace MemoryDataHolder
                 }
             }
             else // if a loader is already existing, add callbacks to that loader.
-            {  
+            {
                 ldr->AddCallback(func,ptr,cond);
                 mutex.release();
             }
diff --git a/src/shared/Network/Thread.cpp b/src/shared/Network/Thread.cpp
index dbde865..625004e 100644
--- a/src/shared/Network/Thread.cpp
+++ b/src/shared/Network/Thread.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // UQ1: warning C4311: 'type cast' : pointer truncation
 #pragma warning(disable:4311)
 
-#endif  
+#endif
 
 Thread::Thread(bool release)
 :m_thread(0)
diff --git a/src/shared/WDTFile.cpp b/src/shared/WDTFile.cpp
index 8b0f35d..e333ac2 100644
--- a/src/shared/WDTFile.cpp
+++ b/src/shared/WDTFile.cpp
@@ -37,7 +37,7 @@ bool WDTFile::LoadMem(ByteBuffer& buf)
 
     while(buf.rpos() < buf.size())
     {
-        buf.read(fourcc,4); flipcc(fourcc); 
+        buf.read(fourcc,4); flipcc(fourcc);
         buf >> size;
 
         if(!strcmp((char*)fourcc,"MVER"))
@@ -58,7 +58,7 @@ bool WDTFile::LoadMem(ByteBuffer& buf)
             {
                 DEBUG(printf("WDTFile::LoadMem() abort load, MWMO block isnt empty\n"));
                 break;
-            }  
+            }
         }
         else if(!strcmp((char*)fourcc,"MODF"))
         {
diff --git a/src/shared/Widen.h b/src/shared/Widen.h
index ef96fb1..7bd5560 100644
--- a/src/shared/Widen.h
+++ b/src/shared/Widen.h
@@ -40,6 +40,6 @@ public:
         pCType_->widen(pSrcBeg, pSrcBeg + srcLen, &tmp[0]);
         return std::basic_string<E, T, A>(&tmp[0], srcLen);
     }
-}; 
+};
 
 #endif
diff --git a/src/shared/ZCompressor.h b/src/shared/ZCompressor.h
index a6117fa..c8890c7 100644
--- a/src/shared/ZCompressor.h
+++ b/src/shared/ZCompressor.h
@@ -25,7 +25,7 @@ protected:
 
 
 
-        
+
 
 
 };
diff --git a/src/shared/dbcfile.cpp b/src/shared/dbcfile.cpp
index 6d35a04..d2fba88 100644
--- a/src/shared/dbcfile.cpp
+++ b/src/shared/dbcfile.cpp
@@ -66,7 +66,7 @@ bool DBCFile::openmem(ByteBuffer bb)
 	}
     uint32 hdr;
     bb >> hdr;
-    
+
     if(memcmp(&hdr,"WDBC",4)) // check if its a valid dbc file
     {
         printf("not a valid WDB File??\n");
diff --git a/src/shared/dbcfile.h b/src/shared/dbcfile.h
index 636541b..fbc8887 100644
--- a/src/shared/dbcfile.h
+++ b/src/shared/dbcfile.h
@@ -79,12 +79,12 @@ public:
 	class Iterator
 	{
 	public:
-		Iterator(DBCFile &file, unsigned char *offset): 
+		Iterator(DBCFile &file, unsigned char *offset):
 			record(file, offset) {}
 		/// Advance (prefix only)
-		Iterator & operator++() { 
+		Iterator & operator++() {
 			record.offset += record.file.recordSize;
-			return *this; 
+			return *this;
 		}	
 		/// Return address of current instance
 		Record const & operator*() const { return record; }
diff --git a/src/tools/stuffextract/StuffExtract.cpp b/src/tools/stuffextract/StuffExtract.cpp
index 0911266..dd7a022 100644
--- a/src/tools/stuffextract/StuffExtract.cpp
+++ b/src/tools/stuffextract/StuffExtract.cpp
@@ -325,7 +325,7 @@ bool ConvertDBC(void)
         if (doModels && classmask[id]) // skip nonplayable races
         {
             // corpse models
-            
+
             modelNames.insert(NameAndAlt("World\\Generic\\PassiveDoodads\\DeathSkeletons\\" + racemap[id] + "MaleDeathSkeleton.m2"));
             modelNames.insert(NameAndAlt("World\\Generic\\PassiveDoodads\\DeathSkeletons\\" + racemap[id] + "FemaleDeathSkeleton.m2"));
         }