[DXDIAG] Add a GUID field to DXDIAG_DISPLAY, and give it to DirectDrawCreate

Currently, this GUID is always NULL.

Author: hpoussin

base/applications/dxdiag/d3dtest.c

@@ -13,11 +13,11 @@
 #define WIDTH   800
 #define HEIGHT  600
 
-BOOL D3D7Test(HWND hWnd);
-BOOL D3D8Test(HWND hWnd);
-BOOL D3D9Test(HWND hWnd);
+BOOL D3D7Test(GUID *lpDevice, HWND hWnd);
+BOOL D3D8Test(GUID *lpDevice, HWND hWnd);
+BOOL D3D9Test(GUID *lpDevice, HWND hWnd);
 
-BOOL StartD3DTest(HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr)
+BOOL StartD3DTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr)
 {
     WCHAR szTestDescriptionRaw[256];
     WCHAR szTestDescription[256];
@@ -39,13 +39,13 @@ BOOL StartD3DTest(HWND hWnd, HINSTANCE hInstance, WCHAR* pszCaption, INT TestNr)
 
     switch(TestNr){
         case 7:
-            Result = D3D7Test(hWnd);
+            Result = D3D7Test(lpDevice, hWnd);
             break;
         case 8:
-            Result = D3D8Test(hWnd);
+            Result = D3D8Test(lpDevice, hWnd);
             break;
         case 9:
-            Result = D3D9Test(hWnd);
+            Result = D3D9Test(lpDevice, hWnd);
             break;
         default:
             Result = FALSE;
@@ -70,7 +70,7 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP
     return DefWindowProc(hWnd, msg, wParam, lParam);
 }
 
-VOID D3DTests()
+VOID D3DTests(GUID *lpDevice)
 {
     WNDCLASSEX winClass;
     HWND hWnd;
@@ -116,9 +116,9 @@ VOID D3DTests()
     if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
         goto cleanup;
 
-    StartD3DTest(hWnd, hInstance, szCaption, 7);
-    StartD3DTest(hWnd, hInstance, szCaption, 8);
-    StartD3DTest(hWnd, hInstance, szCaption, 9);
+    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 7);
+    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 8);
+    StartD3DTest(lpDevice, hWnd, hInstance, szCaption, 9);
 
 cleanup:
     DestroyWindow(hWnd);

base/applications/dxdiag/d3dtest7.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D7Test(HWND hWnd)
+BOOL D3D7Test(GUID *lpDevice, HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/d3dtest8.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D8Test(HWND hWnd)
+BOOL D3D8Test(GUID *lpDevice, HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/d3dtest9.c

@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-BOOL D3D9Test(HWND hWnd)
+BOOL D3D9Test(GUID *lpDevice, HWND hWnd)
 {
     return FALSE;
 }

base/applications/dxdiag/ddtest.c

@@ -8,8 +8,8 @@
 
 #include "precomp.h"
 
-BOOL DDPrimarySurfaceTest(HWND hWnd);
-BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen);
+BOOL DDPrimarySurfaceTest(GUID *lpDevice, HWND hWnd);
+BOOL DDOffscreenBufferTest(GUID *lpDevice, HWND hWnd, BOOL Fullscreen);
 VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface);
 VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD);
 
@@ -21,7 +21,7 @@ VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE l
 #define DD_SQUARE_STEP 2
 
 
-BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr)
+BOOL StartDDTest(GUID *lpDevice, HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT resResult, INT TestNr)
 {
     WCHAR szTestDescription[256];
     WCHAR szCaption[256];
@@ -41,13 +41,13 @@ BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT res
 
     switch(TestNr){
         case 1:
-            Result = DDPrimarySurfaceTest(hWnd);
+            Result = DDPrimarySurfaceTest(lpDevice, hWnd);
             break;
         case 2:
-            Result = DDOffscreenBufferTest(hWnd, FALSE);
+            Result = DDOffscreenBufferTest(lpDevice, hWnd, FALSE);
             break;
         case 3:
-            Result = DDOffscreenBufferTest(hWnd, TRUE);
+            Result = DDOffscreenBufferTest(lpDevice, hWnd, TRUE);
             break;
         default:
             Result = FALSE;
@@ -67,7 +67,7 @@ BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT res
     return FALSE;
 }
 
-VOID DDTests()
+VOID DDTests(GUID *lpDevice)
 {
     WNDCLASSEX winClass;
     HWND hWnd;
@@ -105,23 +105,23 @@ VOID DDTests()
     if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
         return;
 
-    StartDDTest(hWnd, hInstance, IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
-    StartDDTest(hWnd, hInstance, IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT, 2);
-    StartDDTest(hWnd, hInstance, IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT, 3);
+    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDPRIMARY_DESCRIPTION, IDS_DDPRIMARY_RESULT, 1);
+    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDOFFSCREEN_DESCRIPTION, IDS_DDOFFSCREEN_RESULT, 2);
+    StartDDTest(lpDevice, hWnd, hInstance, IDS_DDFULLSCREEN_DESCRIPTION, IDS_DDFULLSCREEN_RESULT, 3);
 
     DestroyWindow(hWnd);
     UnregisterClass(winClass.lpszClassName, hInstance);
 }
 
-BOOL DDPrimarySurfaceTest(HWND hWnd){
+BOOL DDPrimarySurfaceTest(GUID *lpDevice, HWND hWnd){
     UINT TimerID;
     MSG msg;
 
     LPDIRECTDRAW lpDD = NULL;
     LPDIRECTDRAWSURFACE lpDDSurface = NULL;
     DDSURFACEDESC DDSurfaceDesc;
 
-    if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
+    if(DirectDrawCreate(lpDevice, &lpDD, NULL) != DD_OK)
         return FALSE;
 
     if(lpDD->lpVtbl->SetCooperativeLevel(lpDD, hWnd, DDSCL_NORMAL) != DD_OK)
@@ -197,7 +197,7 @@ VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface)
 }
 
 
-BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
+BOOL DDOffscreenBufferTest(GUID *lpDevice, HWND hWnd, BOOL Fullscreen){
     UINT_PTR TimerID, TimerIDUpdate;
     LPDIRECTDRAW lpDD;
     LPDIRECTDRAWSURFACE lpDDPrimarySurface;
@@ -210,7 +210,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
     POINT wndPoint;
     INT posX = 0, posY = 10, xGain = DD_SQUARE_STEP, yGain = DD_SQUARE_STEP;
 
-    if(DirectDrawCreate(NULL, &lpDD, NULL) != DD_OK)
+    if(DirectDrawCreate(lpDevice, &lpDD, NULL) != DD_OK)
         return FALSE;
 
     ZeroMemory(&DDSurfaceDesc, sizeof(DDSurfaceDesc));

base/applications/dxdiag/display.c

@@ -389,9 +389,9 @@ DisplayPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                     GetWindowRect(hMainDialog, &rect);
                     /* FIXME log result errors */
                     if (IDC_BUTTON_TESTDD == LOWORD(wParam))
-                        DDTests();
+                        DDTests(&pDisplay->guid);
                     else if (IDC_BUTTON_TEST3D == LOWORD(wParam))
-                        D3DTests();
+                        D3DTests(&pDisplay->guid);
                     SetWindowPos(hMainDialog, NULL, rect.left, rect.top, rect.right, rect.bottom, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
                     break;
             }

base/applications/dxdiag/precomp.h

@@ -29,6 +29,7 @@
 typedef struct
 {
     HWND hDisplayWnd;
+    GUID guid;
 } DXDIAG_DISPLAY, *PDXDIAG_DISPLAY;
 
 typedef struct
@@ -58,10 +59,10 @@ INT_PTR CALLBACK NetworkPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 /* DirectDraw tests */
-VOID DDTests(VOID);
+VOID DDTests(GUID *lpDevice);
 
 /* Direct3D tests */
-VOID D3DTests(VOID);
+VOID D3DTests(GUID *lpDevice);
 
 /* DirectSound initialization */
 void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext);