Build fixes and minor corrections.

diff --git a/d3d.py b/d3d.py
index d370ad07ff00c2028d0b761a073c0661411a20e1..f587fc532dd3203a8c58747609f8ab934851d763 100644 (file)
--- a/d3d.py
+++ b/d3d.py
@@ -503,6 +503,14 @@ if __name__ == '__main__':
     print
     print '''
 
+#ifndef DDBLT_EXTENDED_FLAGS
+#define DDBLT_EXTENDED_FLAGS 0x40000000l
+#endif
+
+#ifndef DDBLT_EXTENDED_LINEAR_CONTENT
+#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004l
+#endif
+
 #ifndef D3DLIGHT_PARALLELPOINT
 #define D3DLIGHT_PARALLELPOINT (D3DLIGHTTYPE)4
 #endif

diff --git a/ddraw.py b/ddraw.py
index 277eb7aad0c4b191661983b632a320bcf1341a1b..8ac08a85685e6e77f7623b45c849199c74ea98a1 100644 (file)
--- a/ddraw.py
+++ b/ddraw.py
@@ -1288,7 +1288,7 @@ IDirectDraw.methods += [
     Method(DDRESULT, "FlipToGDISurface", []),
     Method(DDRESULT, "GetCaps", [Out(LPDDCAPS, "lpDDDriverCaps"), Out(LPDDCAPS, "lpDDHELCaps")]),
     Method(DDRESULT, "GetDisplayMode", [Out(LPDDSURFACEDESC, "lpDDSurfaceDesc")]),
-    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), (LPDWORD, "lpCodes")]),
+    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), Out(LPDWORD, "lpCodes")]),
     Method(DDRESULT, "GetGDISurface", [Out(Pointer(LPDIRECTDRAWSURFACE), "lplpGDIDDSSurface")]),
     Method(DDRESULT, "GetMonitorFrequency", [Out(LPDWORD, "lpdwFrequency")]),
     Method(DDRESULT, "GetScanLine", [Out(LPDWORD, "lpdwScanLine")]),
@@ -1311,7 +1311,7 @@ IDirectDraw2.methods += [
     Method(DDRESULT, "FlipToGDISurface", []),
     Method(DDRESULT, "GetCaps", [Out(LPDDCAPS, "lpDDDriverCaps"), Out(LPDDCAPS, "lpDDHELCaps")]),
     Method(DDRESULT, "GetDisplayMode", [Out(LPDDSURFACEDESC, "lpDDSurfaceDesc")]),
-    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), (LPDWORD, "lpCodes")]),
+    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), Out(LPDWORD, "lpCodes")]),
     Method(DDRESULT, "GetGDISurface", [Out(Pointer(LPDIRECTDRAWSURFACE), "lplpGDIDDSSurface")]),
     Method(DDRESULT, "GetMonitorFrequency", [Out(LPDWORD, "lpdwFrequency")]),
     Method(DDRESULT, "GetScanLine", [Out(LPDWORD, "lpdwScanLine")]),
@@ -1335,7 +1335,7 @@ IDirectDraw4.methods += [
     Method(DDRESULT, "FlipToGDISurface", []),
     Method(DDRESULT, "GetCaps", [Out(LPDDCAPS, "lpDDDriverCaps"), Out(LPDDCAPS, "lpDDHELCaps")]),
     Method(DDRESULT, "GetDisplayMode", [Out(LPDDSURFACEDESC2, "lpDDSurfaceDesc")]),
-    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), (LPDWORD, "lpCodes")]),
+    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), Out(LPDWORD, "lpCodes")]),
     Method(DDRESULT, "GetGDISurface", [Out(Pointer(LPDIRECTDRAWSURFACE4), "lplpGDIDDSSurface")]),
     Method(DDRESULT, "GetMonitorFrequency", [Out(LPDWORD, "lpdwFrequency")]),
     Method(DDRESULT, "GetScanLine", [Out(LPDWORD, "lpdwScanLine")]),
@@ -1349,7 +1349,7 @@ IDirectDraw4.methods += [
     Method(DDRESULT, "GetSurfaceFromDC", [(HDC, "hdc"), Out(Pointer(LPDIRECTDRAWSURFACE4), "lpDDSurface")]),
     Method(DDRESULT, "RestoreAllSurfaces", []),
     Method(DDRESULT, "TestCooperativeLevel", []),
-    Method(DDRESULT, "GetDeviceIdentifier", [(LPDDDEVICEIDENTIFIER, "lpDDDI"), (DirectDrawGetDeviceIdentifierFlags, "dwFlags")]),
+    Method(DDRESULT, "GetDeviceIdentifier", [Out(LPDDDEVICEIDENTIFIER, "lpDDDI"), (DirectDrawGetDeviceIdentifierFlags, "dwFlags")]),
 ]
 
 IDirectDraw7.methods += [
@@ -1363,7 +1363,7 @@ IDirectDraw7.methods += [
     Method(DDRESULT, "FlipToGDISurface", []),
     Method(DDRESULT, "GetCaps", [Out(LPDDCAPS, "lpDDDriverCaps"), Out(LPDDCAPS, "lpDDHELCaps")]),
     Method(DDRESULT, "GetDisplayMode", [Out(LPDDSURFACEDESC2, "lpDDSurfaceDesc")]),
-    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), (LPDWORD, "lpCodes")]),
+    Method(DDRESULT, "GetFourCCCodes", [Out(LPDWORD, "lpNumCodes"), Out(LPDWORD, "lpCodes")]),
     Method(DDRESULT, "GetGDISurface", [Out(Pointer(LPDIRECTDRAWSURFACE7), "lplpGDIDDSSurface")]),
     Method(DDRESULT, "GetMonitorFrequency", [Out(LPDWORD, "lpdwFrequency")]),
     Method(DDRESULT, "GetScanLine", [Out(LPDWORD, "lpdwScanLine")]),
@@ -1377,14 +1377,14 @@ IDirectDraw7.methods += [
     Method(DDRESULT, "GetSurfaceFromDC", [(HDC, "hdc"), Out(Pointer(LPDIRECTDRAWSURFACE7), "lpDDSurface")]),
     Method(DDRESULT, "RestoreAllSurfaces", []),
     Method(DDRESULT, "TestCooperativeLevel", []),
-    Method(DDRESULT, "GetDeviceIdentifier", [(LPDDDEVICEIDENTIFIER2, "lpDDDI"), (DirectDrawGetDeviceIdentifierFlags, "dwFlags")]),
+    Method(DDRESULT, "GetDeviceIdentifier", [Out(LPDDDEVICEIDENTIFIER2, "lpDDDI"), (DirectDrawGetDeviceIdentifierFlags, "dwFlags")]),
     Method(DDRESULT, "StartModeTest", [(LPSIZE, "lpModesToTest"), (DWORD, "dwNumEntries"), (DirectDrawStartModeTestFlags, "dwFlags")]),
     Method(DDRESULT, "EvaluateMode", [(DirectDrawEvaluateModeFlags, "dwFlags"), Out(Pointer(DWORD), "pSecondsUntilTimeout")]),
 ]
 
 IDirectDrawPalette.methods += [
     Method(DDRESULT, "GetCaps", [Out(Pointer(DirectDrawPaletteCapsFlags), "lpdwCaps")]),
-    Method(DDRESULT, "GetEntries", [(DWORD, "dwFlags"), (DWORD, "dwBase"), (DWORD, "dwNumEntries"), (LPPALETTEENTRY, "lpEntries")]),
+    Method(DDRESULT, "GetEntries", [(DWORD, "dwFlags"), (DWORD, "dwBase"), (DWORD, "dwNumEntries"), Out(LPPALETTEENTRY, "lpEntries")]),
     Method(DDRESULT, "Initialize", [(LPDIRECTDRAW, "lpDD"), (DWORD, "dwFlags"), (LPPALETTEENTRY, "lpDDColorTable")]),
     Method(DDRESULT, "SetEntries", [(DWORD, "dwFlags"), (DWORD, "dwStartingEntry"), (DWORD, "dwCount"), (LPPALETTEENTRY, "lpEntries")]),
 ]
@@ -1614,7 +1614,7 @@ IDirectDrawColorControl.methods += [
 ]
 
 IDirectDrawGammaControl.methods += [
-    Method(DDRESULT, "GetGammaRamp", [(DWORD, "dwFlags"), (LPDDGAMMARAMP, "lpRampData")]),
+    Method(DDRESULT, "GetGammaRamp", [(DWORD, "dwFlags"), Out(LPDDGAMMARAMP, "lpRampData")]),
     Method(DDRESULT, "SetGammaRamp", [(DirectDrawSetGammaRampFlags, "dwFlags"), (LPDDGAMMARAMP, "lpRampData")]),
 ]
 

diff --git a/trace.py b/trace.py
index 368462a917579a90c16989fef5a84dff0c6aa159..164c9777b073f68f2db7c37d993fe824d2646d10 100644 (file)
--- a/trace.py
+++ b/trace.py
@@ -238,7 +238,9 @@ class Wrapper(stdapi.Visitor):
         pass
 
     def visit_pointer(self, pointer, instance):
+        print "    if (%s) {" % instance
         self.visit(pointer.type, "*" + instance)
+        print "    }"
 
     def visit_handle(self, handle, instance):
         self.visit(handle.type, instance)
@@ -252,8 +254,9 @@ class Wrapper(stdapi.Visitor):
     def visit_interface(self, interface, instance):
         assert instance.startswith('*')
         instance = instance[1:]
-        print "    if (%s)" % instance
+        print "    if (%s) {" % instance
         print "        %s = new %s(%s);" % (instance, interface_wrap_name(interface), instance)
+        print "    }"
 
 
 class Unwrapper(Wrapper):
@@ -261,8 +264,9 @@ class Unwrapper(Wrapper):
     def visit_interface(self, interface, instance):
         assert instance.startswith('*')
         instance = instance[1:]
-        print "    if (%s)" % instance
+        print "    if (%s) {" % instance
         print "        %s = static_cast<%s *>(%s)->m_pInstance;" % (instance, interface_wrap_name(interface), instance)
+        print "    }"
 
 
 wrap_instance = Wrapper().visit