diff --git a/Voice2/Voice2BuddyMFC/Voice2BuddyMFCDlg.cpp b/Voice2/Voice2BuddyMFC/Voice2BuddyMFCDlg.cpp
index 39be0020..9763bee1 100644
--- a/Voice2/Voice2BuddyMFC/Voice2BuddyMFCDlg.cpp
+++ b/Voice2/Voice2BuddyMFC/Voice2BuddyMFCDlg.cpp
@@ -313,7 +313,7 @@ LRESULT CVoice2BuddyMFCDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 			{
 				// Show the login dialog
 				CLoginDlg aDlg;
-				int result = aDlg.DoModal();
+				INT_PTR result = aDlg.DoModal();
 				if (result == IDCANCEL)
 					PostQuitMessage(0);
 				else
diff --git a/Voice2/winerrordxgi.h b/Voice2/winerrordxgi.h
index 00ae71eb..60c52a2c 100644
--- a/Voice2/winerrordxgi.h
+++ b/Voice2/winerrordxgi.h
@@ -89,20 +89,94 @@
 #define BOOL int
 #define UINT unsigned int
 
-#include <dxgitype.h> // June 2010 inclusion
+#define __dxgicommon_h__
+#define __dxgitype_h__
+#include <dxgiformat.h>
 
-typedef struct DXGI_JPEG_AC_HUFFMAN_TABLE {
-	BYTE CodeCounts[16];
-	BYTE CodeValues[162];
-} DXGI_JPEG_AC_HUFFMAN_TABLE;
+typedef struct DXGI_SAMPLE_DESC
+{
+    UINT Count;
+    UINT Quality;
+} DXGI_SAMPLE_DESC;
+
+typedef struct DXGI_RATIONAL
+{
+    UINT Numerator;
+    UINT Denominator;
+} DXGI_RATIONAL;
+
+typedef struct DXGI_RGB
+{
+    float Red;
+    float Green;
+    float Blue;
+} DXGI_RGB;
+
+typedef struct DXGI_GAMMA_CONTROL
+{
+    DXGI_RGB Scale;
+    DXGI_RGB Offset;
+    DXGI_RGB GammaCurve[1025];
+} DXGI_GAMMA_CONTROL;
+
+typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES
+{
+    BOOL ScaleAndOffsetSupported;
+    float MaxConvertedValue;
+    float MinConvertedValue;
+    UINT NumGammaControlPoints;
+    float ControlPointPositions[1025];
+} DXGI_GAMMA_CONTROL_CAPABILITIES;
+
+typedef enum DXGI_MODE_SCANLINE_ORDER
+{
+    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0,
+    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1,
+    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2,
+    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3
+} DXGI_MODE_SCANLINE_ORDER;
 
-typedef struct DXGI_JPEG_DC_HUFFMAN_TABLE {
-	BYTE CodeCounts[12];
-	BYTE CodeValues[12];
+typedef enum DXGI_MODE_SCALING
+{
+    DXGI_MODE_SCALING_UNSPECIFIED = 0,
+    DXGI_MODE_SCALING_CENTERED = 1,
+    DXGI_MODE_SCALING_STRETCHED = 2
+} DXGI_MODE_SCALING;
+
+typedef enum DXGI_MODE_ROTATION
+{
+    DXGI_MODE_ROTATION_UNSPECIFIED = 0,
+    DXGI_MODE_ROTATION_IDENTITY = 1,
+    DXGI_MODE_ROTATION_ROTATE90 = 2,
+    DXGI_MODE_ROTATION_ROTATE180 = 3,
+    DXGI_MODE_ROTATION_ROTATE270 = 4
+} DXGI_MODE_ROTATION;
+
+typedef struct DXGI_MODE_DESC
+{
+    UINT Width;
+    UINT Height;
+    DXGI_RATIONAL RefreshRate;
+    DXGI_FORMAT Format;
+    DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
+    DXGI_MODE_SCALING Scaling;
+} DXGI_MODE_DESC;
+
+typedef struct DXGI_JPEG_DC_HUFFMAN_TABLE
+{
+    BYTE CodeCounts[12];
+    BYTE CodeValues[12];
 } DXGI_JPEG_DC_HUFFMAN_TABLE;
 
-typedef struct DXGI_JPEG_QUANTIZATION_TABLE {
-	BYTE Elements[64];
+typedef struct DXGI_JPEG_AC_HUFFMAN_TABLE
+{
+    BYTE CodeCounts[16];
+    BYTE CodeValues[162];
+} DXGI_JPEG_AC_HUFFMAN_TABLE;
+
+typedef struct DXGI_JPEG_QUANTIZATION_TABLE
+{
+    BYTE Elements[64];
 } DXGI_JPEG_QUANTIZATION_TABLE;
 
 // Undefine precedent macros (keep compatibility with windef.h)