Merge branch 'master' into d3dretrace

Conflicts:
	retrace.py

diff --cc CMakeLists.txt
Simple merge

diff --cc retrace.hpp
Simple merge

diff --cc retrace.py
index 15cdaf5038e328d05e8646c564670d9ffe8c13fa,1203a0992e4cebde23706c2fc5a90190d420986d..d6e838755c39a02cd6f517af2866f9d0736c6074
--- 1/retrace.py
--- 2/retrace.py
+++ b/retrace.py
@@@ -218,30 -212,8 +218,32 @@@ class Retracer
              print '    (void)call;'
              return
  
 +        self.deserializeArgs(function)
 +        
 +        self.invokeFunction(function)
 +
 +        self.swizzleValues(function)
 +
 +    def retraceInterfaceMethodBody(self, interface, method):
 +        if not method.sideeffects:
 +            print '    (void)call;'
 +            return
 +
 +        self.deserializeThisPointer(interface)
 +
 +        self.deserializeArgs(method)
 +        
 +        self.invokeInterfaceMethod(interface, method)
 +
 +        self.swizzleValues(method)
 +
 +    def deserializeThisPointer(self, interface):
 +        print '    %s *_this;' % (interface.name,)
 +        # FIXME
 +
 +    def deserializeArgs(self, function):
+         print '    retrace::ScopedAllocator _allocator;'
+         print '    (void)_allocator;'
          success = True
          for arg in function.args:
              arg_type = ConstRemover().visit(arg.type)