[greatlrd] 37481: Cleanup lite for the dump functions for dumping internal value in ddraw.dll and add some new dumping function have been add.

Author: greatlrd
Date: Thu Nov 20 06:25:27 2008
New Revision: 37481
URL: http://svn.reactos.org/svn/reactos?rev=37481&view=rev
Log:
Cleanup lite for the dump functions for dumping internal value in ddraw.dll and add some
new dumping function have been add.
Modified:
    branches/reactx/rostests/apitests/ddrawapi/testlist.c
    branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c
Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa…
==============================================================================
--- branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] (original)
+++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Thu Nov 20 06:25:27
2008
@@ -5,10 +5,25 @@
 #define MIX_BOTH_CAPS(a,b)  (  (a + b - (a & b))  )
+/* Simple position the dump output bit better */
+#define MY_MAX_SPACE_LEN 70
+
+#define MY_POS1_SPACE_LEN  30
+#define MY_POS2_SPACE_LEN 0
+char space_buffer[MY_MAX_SPACE_LEN+1];
+
+#define MY_DUMP_STR(buffer,mStr,str,lpStr) sprintf(buffer,"%s%s%s%s%s",
mStr,&space_buffer[ MY_POS1_SPACE_LEN + strlen(mStr) ], str,lpStr, &space_buffer[
MY_POS2_SPACE_LEN + (strlen(lpStr) + strlen(str))  ]);
+
+/* DirectDraw dump*/
 void dump_DDRAWI_DIRECTDRAW_INT(char *str, LPDDRAWI_DIRECTDRAW_INT lpDraw_int, DWORD
offset);
 void dump_DDRAWI_DIRECTDRAW_LCL(char *str, LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl, DWORD
offset);
 void dump_DDRAWI_DIRECTDRAW_GBL(char *str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD
offset);
-
+void dump_DDRAWI_DDRAWSURFACE_LCL(char *str, LPDDRAWI_DDRAWSURFACE_LCL lpDdrawSurface,
DWORD offset);
+
+/* DirectDraw Surface dump*/
+void dump_DDRAWI_DDRAWSURFACE_INT(char *str, LPDDRAWI_DDRAWSURFACE_INT lpDdrawSurface,
DWORD offset);
+
+/* DirectDraw misc dump*/
 void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset);
 void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset);
 void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset);
@@ -47,10 +62,21 @@
     if (lpDraw_int == NULL)
         return ;
-    printf("%08lx LPVOID                                  %slpVtbl
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl)+offset, str,
lpDraw_int->lpVtbl);
-    printf("%08lx DWORD                                   %s->lpLcl
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl) + offset, str,
lpDraw_int->lpLcl );
-    printf("%08lx DWORD                                   %s->lpLink
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink) + offset, str,
lpDraw_int->lpLink );
-    printf("%08lx DWORD                                   %s->dwIntRefCnt
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt) + offset, str,
lpDraw_int->dwIntRefCnt );
+    RtlFillMemory(space_buffer,MY_MAX_SPACE_LEN,32);
+    space_buffer[MY_MAX_SPACE_LEN] = 0;
+
+
+    MY_DUMP_STR(buffer,"LPVOID\0",str,"lpVtbl\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT,
lpVtbl)+offset, buffer, lpDraw_int->lpVtbl);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"lpLcl\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl) +
offset, buffer, lpDraw_int->lpLcl );
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"lpLink\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink) +
offset, buffer, lpDraw_int->lpLink );
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwIntRefCnt\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT,
dwIntRefCnt) + offset, buffer, lpDraw_int->dwIntRefCnt );
     printf("\n");
     sprintf(buffer,"%slpLcl->",str);
@@ -67,36 +93,96 @@
     if (lpDraw_lcl == NULL)
         return ;
-    printf("%08lx DWORD                                   %slpDDMore
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore)+offset, str,
lpDraw_lcl->lpDDMore);
-    printf("%08lx LPDDRAWI_DIRECTDRAW_GBL                 %slpGbl
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl)+offset, str,
lpDraw_lcl->lpGbl);
-    printf("%08lx DWORD                                   %sdwUnused0
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0)+offset, str,
lpDraw_lcl->dwUnused0);
-    printf("%08lx DWORD                                   %sdwLocalFlags
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags)+offset, str,
lpDraw_lcl->dwLocalFlags);
-    printf("%08lx DWORD                                   %sdwLocalRefCnt
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt)+offset, str,
lpDraw_lcl->dwLocalRefCnt);
-    printf("%08lx DWORD                                   %sdwProcessId
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId)+offset, str,
lpDraw_lcl->dwProcessId);
-    printf("%08lx PVOID                                   %spUnkOuter
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter)+offset, str,
lpDraw_lcl->pUnkOuter);
-    printf("%08lx DWORD                                   %sdwObsolete1
: 0x%08lx\n",  FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1)+offset, str,
lpDraw_lcl->dwObsolete1);
-    printf("%08lx ULONG_PTR                               %shWnd
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd)+offset, str,
(PVOID)lpDraw_lcl->hWnd);
-    printf("%08lx ULONG_PTR                               %shDC
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC)+offset, str, (PVOID)
lpDraw_lcl->hDC);
-    printf("%08lx DWORD                                   %sdwErrorMode
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode)+offset, str,
lpDraw_lcl->dwErrorMode);
-    printf("%08lx LPDDRAWI_DDRAWSURFACE_INT               %slpPrimary
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary)+offset, str,
lpDraw_lcl->lpPrimary);
-    printf("%08lx LPDDRAWI_DDRAWSURFACE_INT               %slpCB
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB)+offset, str,
lpDraw_lcl->lpCB);
-    printf("%08lx DWORD                                   %sdwPreferredMode
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode)+offset, str,
lpDraw_lcl->dwPreferredMode);
-    printf("%08lx HINSTANCE                               %shD3DInstance
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance)+offset, str,
lpDraw_lcl->hD3DInstance);
-    printf("%08lx PVOID                                   %spD3DIUnknown
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown)+offset, str, (PVOID)
lpDraw_lcl->pD3DIUnknown);
-    printf("%08lx LPDDHAL_CALLBACKS                       %slpDDCB
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB)+offset, str,
lpDraw_lcl->lpDDCB);
-    printf("%08lx ULONG_PTR                               %shDDVxd
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd)+offset, str, (PVOID)
lpDraw_lcl->hDDVxd);
-    printf("%08lx DWORD                                   %sdwAppHackFlags
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags)+offset, str,
lpDraw_lcl->dwAppHackFlags);
-    printf("%08lx ULONG_PTR                               %shFocusWnd
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd)+offset, str, (PVOID)
lpDraw_lcl->hFocusWnd);
-    printf("%08lx DWORD                                   %sdwHotTracking
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking)+offset, str,
lpDraw_lcl->dwHotTracking);
-    printf("%08lx DWORD                                   %sdwIMEState
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState)+offset, str,
lpDraw_lcl->dwIMEState);
-    printf("%08lx ULONG_PTR                               %shWndPopup
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup)+offset, str, (PVOID)
lpDraw_lcl->hWndPopup);
-    printf("%08lx ULONG_PTR                               %shDD
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD)+offset, str, (PVOID)
lpDraw_lcl->hDD);
-    printf("%08lx ULONG_PTR                               %shGammaCalibrator
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator)+offset, str,
(PVOID) lpDraw_lcl->hGammaCalibrator);
-    printf("%08lx LPDDGAMMACALIBRATORPROC                 %slpGammaCalibrator
: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator)+offset, str,
lpDraw_lcl->lpGammaCalibrator);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"lpDDMore\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpDDMore)+offset, buffer, lpDraw_lcl->lpDDMore);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_GBL\0",str,"lpGbl\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpGbl)+offset, buffer, lpDraw_lcl->lpGbl);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused0\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwUnused0)+offset, buffer, lpDraw_lcl->dwUnused0);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalFlags\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwLocalFlags)+offset, buffer, lpDraw_lcl->dwLocalFlags);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalRefCnt\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwLocalRefCnt)+offset, buffer, lpDraw_lcl->dwLocalRefCnt);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwProcessId\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwProcessId)+offset, buffer, lpDraw_lcl->dwProcessId);
+
+    MY_DUMP_STR(buffer,"PVOID\0",str,"pUnkOuter\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
pUnkOuter)+offset, buffer, lpDraw_lcl->pUnkOuter);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwObsolete1\0");
+    printf("%08lx %s: 0x%08lx\n",  FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwObsolete1)+offset, buffer, lpDraw_lcl->dwObsolete1);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hWnd\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hWnd)+offset, buffer, (PVOID)lpDraw_lcl->hWnd);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDC\0");
+    printf("%08lx %shDC: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hDC)+offset, str, (PVOID) lpDraw_lcl->hDC);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwErrorMode\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwErrorMode)+offset, buffer, lpDraw_lcl->dwErrorMode);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpPrimary\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpPrimary)+offset, buffer, lpDraw_lcl->lpPrimary);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpCB\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpCB)+offset, buffer, lpDraw_lcl->lpCB);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwPreferredMode\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwPreferredMode)+offset, buffer, lpDraw_lcl->dwPreferredMode);
+
+
+
+
+    MY_DUMP_STR(buffer,"HINSTANCE\0",str,"hD3DInstance\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hD3DInstance)+offset, buffer, lpDraw_lcl->hD3DInstance);
+
+    MY_DUMP_STR(buffer,"PVOID\0",str,"pD3DIUnknown\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
pD3DIUnknown)+offset, buffer, (PVOID) lpDraw_lcl->pD3DIUnknown);
+
+    MY_DUMP_STR(buffer,"LPDDHAL_CALLBACKS\0",str,"lpDDCB\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpDDCB)+offset, buffer, lpDraw_lcl->lpDDCB);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDDVxd\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hDDVxd)+offset, buffer, (PVOID) lpDraw_lcl->hDDVxd);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAppHackFlags\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwAppHackFlags)+offset, buffer, lpDraw_lcl->dwAppHackFlags);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hFocusWnd\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hFocusWnd)+offset, buffer, (PVOID) lpDraw_lcl->hFocusWnd);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwHotTracking\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwHotTracking)+offset, buffer, lpDraw_lcl->dwHotTracking);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwIMEState\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
dwIMEState)+offset, buffer, lpDraw_lcl->dwIMEState);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hWndPopu\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hWndPopup)+offset, buffer, (PVOID) lpDraw_lcl->hWndPopup);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDD\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hDD)+offset, buffer, (PVOID) lpDraw_lcl->hDD);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hGammaCalibrator\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
hGammaCalibrator)+offset, buffer, (PVOID) lpDraw_lcl->hGammaCalibrator);
+
+
MY_DUMP_STR(buffer,"LPDDGAMMACALIBRATORPROC\0",str,"lpGammaCalibrator\0");
+    printf("%08lx %s: 0x%p \n",    FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL,
lpGammaCalibrator)+offset, buffer, lpDraw_lcl->lpGammaCalibrator);
+
+
     printf("\n");
     sprintf(buffer,"%slpGbl->",str);
     dump_DDRAWI_DIRECTDRAW_GBL(buffer, lpDraw_lcl->lpGbl, 0);
+    sprintf(buffer,"%slpPrimary->",str);
+    dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDraw_lcl->lpPrimary, 0);
+    sprintf(buffer,"%slpCB->",str);
+    dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDraw_lcl->lpCB, 0);
 }
 void dump_DDRAWI_DIRECTDRAW_GBL(char * str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD
offset)
@@ -105,108 +191,283 @@
     if (lpDraw_gbl == NULL)
         return ;
-    printf("%08lx DWORD                                   %sdwRefCnt
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwRefCnt) + offset, str,
lpDraw_gbl->dwRefCnt);
-    printf("%08lx DWORD                                   %sdwFlags
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwFlags) + offset, str,
lpDraw_gbl->dwFlags);
-    printf("%08lx FLATPTR                                 %sfpPrimaryOrig
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, fpPrimaryOrig) + offset, str,
(LPVOID)lpDraw_gbl->fpPrimaryOrig);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwRefCnt\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwRefCnt) + offset, buffer, lpDraw_gbl->dwRefCnt);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwFlags)
+ offset, buffer, lpDraw_gbl->dwFlags);
+
+    MY_DUMP_STR(buffer,"FLATPTR\0",str,"fpPrimaryOrig\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
fpPrimaryOrig) + offset, buffer, (LPVOID)lpDraw_gbl->fpPrimaryOrig);
     sprintf(buffer,"%sddCaps.",str);
     dump_DDCORECAPS(buffer, &lpDraw_gbl->ddCaps,
FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddCaps) + offset );
-    printf("%08lx DWORD                                   %sdwInternal1
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwInternal1) + offset, str,
lpDraw_gbl->dwInternal1);
-    printf("%08lx DWORD                                   %sdwUnused1[0]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[0]) + offset, str,
lpDraw_gbl->dwUnused1[0]);
-    printf("%08lx DWORD                                   %sdwUnused1[1]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[1]) + offset, str,
lpDraw_gbl->dwUnused1[1]);
-    printf("%08lx DWORD                                   %sdwUnused1[2]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[2]) + offset, str,
lpDraw_gbl->dwUnused1[2]);
-    printf("%08lx DWORD                                   %sdwUnused1[3]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[3]) + offset, str,
lpDraw_gbl->dwUnused1[3]);
-    printf("%08lx DWORD                                   %sdwUnused1[4]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[4]) + offset, str,
lpDraw_gbl->dwUnused1[4]);
-    printf("%08lx DWORD                                   %sdwUnused1[5]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[5]) + offset, str,
lpDraw_gbl->dwUnused1[5]);
-    printf("%08lx DWORD                                   %sdwUnused1[6]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[6]) + offset, str,
lpDraw_gbl->dwUnused1[6]);
-    printf("%08lx DWORD                                   %sdwUnused1[7]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[7]) + offset, str,
lpDraw_gbl->dwUnused1[7]);
-    printf("%08lx DWORD                                   %sdwUnused1[8]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[8]) + offset, str,
lpDraw_gbl->dwUnused1[8]);
-    printf("%08lx LPDDHAL_CALLBACKS                       %slpDDCBtmp
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDCBtmp) + offset, str,
lpDraw_gbl->lpDDCBtmp);
-    printf("%08lx LPDDRAWI_DDRAWSURFACE_INT               %sdsList
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dsList) + offset, str,
lpDraw_gbl->dsList);
-    printf("%08lx LPDDRAWI_DDRAWPALETTE_INT               %spalList
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, palList) + offset, str,
lpDraw_gbl->palList);
-    printf("%08lx LPDDRAWI_DDRAWCLIPPER_INT               %sclipperList
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, clipperList) + offset, str,
lpDraw_gbl->clipperList);
-    printf("%08lx LPDDRAWI_DIRECTDRAW_GBL                 %slp16DD
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lp16DD) + offset, str,
lpDraw_gbl->lp16DD);
-    printf("%08lx DWORD                                   %sdwMaxOverlays
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMaxOverlays) + offset, str,
lpDraw_gbl->dwMaxOverlays);
-    printf("%08lx DWORD                                   %sdwCurrOverlays
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwCurrOverlays) + offset, str,
lpDraw_gbl->dwCurrOverlays);
-    printf("%08lx DWORD                                   %sdwMonitorFrequency
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMonitorFrequency) + offset, str,
lpDraw_gbl->dwMonitorFrequency);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwInternal1\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwInternal1) + offset, buffer, lpDraw_gbl->dwInternal1);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[0]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[0]) + offset, buffer, lpDraw_gbl->dwUnused1[0]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[1]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[1]) + offset, buffer, lpDraw_gbl->dwUnused1[1]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[2]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[2]) + offset, buffer, lpDraw_gbl->dwUnused1[2]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[3]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[3]) + offset, buffer, lpDraw_gbl->dwUnused1[3]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[4]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[4]) + offset, buffer, lpDraw_gbl->dwUnused1[4]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[5]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[5]) + offset, buffer, lpDraw_gbl->dwUnused1[5]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[6]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[6]) + offset, buffer, lpDraw_gbl->dwUnused1[6]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[7]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[7]) + offset, buffer, lpDraw_gbl->dwUnused1[7]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[8]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused1[8]) + offset, buffer, lpDraw_gbl->dwUnused1[8]);
+
+    MY_DUMP_STR(buffer,"LPDDHAL_CALLBACKS\0",str,"lpDDCBtmp[8]\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDCBtmp)
+ offset, buffer, lpDraw_gbl->lpDDCBtmp);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"dsList\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dsList) +
offset, buffer, lpDraw_gbl->dsList);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWPALETTE_INT\0",str,"palList\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, palList) +
offset, buffer, lpDraw_gbl->palList);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWCLIPPER_INT\0",str,"clipperList\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
clipperList) + offset, buffer, lpDraw_gbl->clipperList);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_GBL\0",str,"lp16DD\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lp16DD) +
offset, buffer, lpDraw_gbl->lp16DD);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxOverlays\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwMaxOverlays) + offset, buffer, lpDraw_gbl->dwMaxOverlays);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrOverlays\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwCurrOverlays) + offset, buffer, lpDraw_gbl->dwCurrOverlays);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMonitorFrequency\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwMonitorFrequency) + offset, buffer, lpDraw_gbl->dwMonitorFrequency);
     sprintf(buffer,"%sddHELCaps.",str);
     dump_DDCORECAPS(buffer, &lpDraw_gbl->ddHELCaps,
FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddHELCaps) + offset );
-    printf("%08lx DWORD                                   %sdwUnused2[0]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[0]) + offset, str,
lpDraw_gbl->dwUnused2[0]);
-    printf("%08lx DWORD                                   %sdwUnused2[1]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[1]) + offset, str,
lpDraw_gbl->dwUnused2[1]);
-    printf("%08lx DWORD                                   %sdwUnused2[2]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[2]) + offset, str,
lpDraw_gbl->dwUnused2[2]);
-    printf("%08lx DWORD                                   %sdwUnused2[3]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[3]) + offset, str,
lpDraw_gbl->dwUnused2[3]);
-    printf("%08lx DWORD                                   %sdwUnused2[4]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[4]) + offset, str,
lpDraw_gbl->dwUnused2[4]);
-    printf("%08lx DWORD                                   %sdwUnused2[5]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[5]) + offset, str,
lpDraw_gbl->dwUnused2[5]);
-    printf("%08lx DWORD                                   %sdwUnused2[6]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[6]) + offset, str,
lpDraw_gbl->dwUnused2[6]);
-    printf("%08lx DWORD                                   %sdwUnused2[7]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[7]) + offset, str,
lpDraw_gbl->dwUnused2[7]);
-    printf("%08lx DWORD                                   %sdwUnused2[8]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[8]) + offset, str,
lpDraw_gbl->dwUnused2[8]);
-    printf("%08lx DWORD                                   %sdwUnused2[9]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[9]) + offset, str,
lpDraw_gbl->dwUnused2[9]);
-    printf("%08lx DWORD                                   %sdwUnused2[10]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[10]) + offset, str,
lpDraw_gbl->dwUnused2[10]);
-    printf("%08lx DWORD                                   %sdwUnused2[11]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[11]) + offset, str,
lpDraw_gbl->dwUnused2[11]);
-    printf("%08lx DWORD                                   %sdwUnused2[12]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[12]) + offset, str,
lpDraw_gbl->dwUnused2[12]);
-    printf("%08lx DWORD                                   %sdwUnused2[13]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[13]) + offset, str,
lpDraw_gbl->dwUnused2[13]);
-    printf("%08lx DWORD                                   %sdwUnused2[14]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[14]) + offset, str,
lpDraw_gbl->dwUnused2[14]);
-    printf("%08lx DWORD                                   %sdwUnused2[15]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[15]) + offset, str,
lpDraw_gbl->dwUnused2[15]);
-    printf("%08lx DWORD                                   %sdwUnused2[16]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[16]) + offset, str,
lpDraw_gbl->dwUnused2[16]);
-    printf("%08lx DWORD                                   %sdwUnused2[17]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[17]) + offset, str,
lpDraw_gbl->dwUnused2[17]);
-    printf("%08lx DWORD                                   %sdwUnused2[18]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[18]) + offset, str,
lpDraw_gbl->dwUnused2[18]);
-    printf("%08lx DWORD                                   %sdwUnused2[19]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[19]) + offset, str,
lpDraw_gbl->dwUnused2[19]);
-    printf("%08lx DWORD                                   %sdwUnused2[20]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[20]) + offset, str,
lpDraw_gbl->dwUnused2[20]);
-    printf("%08lx DWORD                                   %sdwUnused2[21]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[21]) + offset, str,
lpDraw_gbl->dwUnused2[21]);
-    printf("%08lx DWORD                                   %sdwUnused2[22]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[22]) + offset, str,
lpDraw_gbl->dwUnused2[22]);
-    printf("%08lx DWORD                                   %sdwUnused2[23]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[23]) + offset, str,
lpDraw_gbl->dwUnused2[23]);
-    printf("%08lx DWORD                                   %sdwUnused2[24]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[24]) + offset, str,
lpDraw_gbl->dwUnused2[24]);
-    printf("%08lx DWORD                                   %sdwUnused2[25]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[25]) + offset, str,
lpDraw_gbl->dwUnused2[25]);
-    printf("%08lx DWORD                                   %sdwUnused2[26]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[26]) + offset, str,
lpDraw_gbl->dwUnused2[26]);
-    printf("%08lx DWORD                                   %sdwUnused2[27]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[27]) + offset, str,
lpDraw_gbl->dwUnused2[27]);
-    printf("%08lx DWORD                                   %sdwUnused2[28]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[28]) + offset, str,
lpDraw_gbl->dwUnused2[28]);
-    printf("%08lx DWORD                                   %sdwUnused2[29]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[29]) + offset, str,
lpDraw_gbl->dwUnused2[29]);
-    printf("%08lx DWORD                                   %sdwUnused2[30]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[30]) + offset, str,
lpDraw_gbl->dwUnused2[30]);
-    printf("%08lx DWORD                                   %sdwUnused2[31]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[31]) + offset, str,
lpDraw_gbl->dwUnused2[31]);
-    printf("%08lx DWORD                                   %sdwUnused2[32]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[32]) + offset, str,
lpDraw_gbl->dwUnused2[32]);
-    printf("%08lx DWORD                                   %sdwUnused2[33]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[33]) + offset, str,
lpDraw_gbl->dwUnused2[33]);
-    printf("%08lx DWORD                                   %sdwUnused2[34]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[34]) + offset, str,
lpDraw_gbl->dwUnused2[34]);
-    printf("%08lx DWORD                                   %sdwUnused2[35]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[35]) + offset, str,
lpDraw_gbl->dwUnused2[35]);
-    printf("%08lx DWORD                                   %sdwUnused2[36]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[36]) + offset, str,
lpDraw_gbl->dwUnused2[36]);
-    printf("%08lx DWORD                                   %sdwUnused2[37]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[37]) + offset, str,
lpDraw_gbl->dwUnused2[37]);
-    printf("%08lx DWORD                                   %sdwUnused2[38]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[38]) + offset, str,
lpDraw_gbl->dwUnused2[38]);
-    printf("%08lx DWORD                                   %sdwUnused2[39]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[39]) + offset, str,
lpDraw_gbl->dwUnused2[39]);
-    printf("%08lx DWORD                                   %sdwUnused2[40]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[40]) + offset, str,
lpDraw_gbl->dwUnused2[40]);
-    printf("%08lx DWORD                                   %sdwUnused2[41]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[41]) + offset, str,
lpDraw_gbl->dwUnused2[41]);
-    printf("%08lx DWORD                                   %sdwUnused2[42]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[42]) + offset, str,
lpDraw_gbl->dwUnused2[42]);
-    printf("%08lx DWORD                                   %sdwUnused2[43]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[43]) + offset, str,
lpDraw_gbl->dwUnused2[43]);
-    printf("%08lx DWORD                                   %sdwUnused2[44]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[44]) + offset, str,
lpDraw_gbl->dwUnused2[44]);
-    printf("%08lx DWORD                                   %sdwUnused2[45]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[45]) + offset, str,
lpDraw_gbl->dwUnused2[45]);
-    printf("%08lx DWORD                                   %sdwUnused2[46]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[46]) + offset, str,
lpDraw_gbl->dwUnused2[46]);
-    printf("%08lx DWORD                                   %sdwUnused2[47]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[47]) + offset, str,
lpDraw_gbl->dwUnused2[47]);
-    printf("%08lx DWORD                                   %sdwUnused2[48]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[48]) + offset, str,
lpDraw_gbl->dwUnused2[48]);
-    printf("%08lx DWORD                                   %sdwUnused2[49]
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[49]) + offset, str,
lpDraw_gbl->dwUnused2[49]);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x00]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[0]) + offset, buffer, lpDraw_gbl->dwUnused2[0]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x01]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[1]) + offset, buffer, lpDraw_gbl->dwUnused2[1]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x02]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[2]) + offset, buffer, lpDraw_gbl->dwUnused2[2]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x03]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[3]) + offset, buffer, lpDraw_gbl->dwUnused2[3]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x04]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[4]) + offset, buffer, lpDraw_gbl->dwUnused2[4]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x05]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[5]) + offset, buffer, lpDraw_gbl->dwUnused2[5]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x06]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[6]) + offset, buffer, lpDraw_gbl->dwUnused2[6]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x07]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[7]) + offset, buffer, lpDraw_gbl->dwUnused2[7]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x08]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[8]) + offset, buffer, lpDraw_gbl->dwUnused2[8]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x09]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[9]) + offset, buffer, lpDraw_gbl->dwUnused2[9]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0A]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[10]) + offset, buffer, lpDraw_gbl->dwUnused2[10]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0B]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[11]) + offset, buffer, lpDraw_gbl->dwUnused2[11]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0C]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[12]) + offset, buffer, lpDraw_gbl->dwUnused2[12]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0D]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[13]) + offset, buffer, lpDraw_gbl->dwUnused2[13]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0E]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[14]) + offset, buffer, lpDraw_gbl->dwUnused2[14]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0F]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[15]) + offset, buffer, lpDraw_gbl->dwUnused2[15]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x10]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[16]) + offset, buffer, lpDraw_gbl->dwUnused2[16]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x11]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[17]) + offset, buffer, lpDraw_gbl->dwUnused2[17]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x12]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[18]) + offset, buffer, lpDraw_gbl->dwUnused2[18]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x13]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[19]) + offset, buffer, lpDraw_gbl->dwUnused2[19]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x14]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[20]) + offset, buffer, lpDraw_gbl->dwUnused2[20]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x15]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[21]) + offset, buffer, lpDraw_gbl->dwUnused2[21]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x16]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[22]) + offset, buffer, lpDraw_gbl->dwUnused2[22]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x17]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[23]) + offset, buffer, lpDraw_gbl->dwUnused2[23]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x18]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[24]) + offset, buffer, lpDraw_gbl->dwUnused2[24]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x19]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[25]) + offset, buffer, lpDraw_gbl->dwUnused2[25]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1A]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[26]) + offset, buffer, lpDraw_gbl->dwUnused2[26]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1B]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[27]) + offset, buffer, lpDraw_gbl->dwUnused2[27]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1C]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[28]) + offset, buffer, lpDraw_gbl->dwUnused2[28]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1D]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[29]) + offset, buffer, lpDraw_gbl->dwUnused2[29]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1E]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[30]) + offset, buffer, lpDraw_gbl->dwUnused2[30]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1F]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[31]) + offset, buffer, lpDraw_gbl->dwUnused2[31]);
+
+
+
+
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x20]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[32]) + offset, buffer, lpDraw_gbl->dwUnused2[32]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x21]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[33]) + offset, buffer, lpDraw_gbl->dwUnused2[33]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x22]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[34]) + offset, buffer, lpDraw_gbl->dwUnused2[34]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x23]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[35]) + offset, buffer, lpDraw_gbl->dwUnused2[35]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x24]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[36]) + offset, buffer, lpDraw_gbl->dwUnused2[36]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x25]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[37]) + offset, buffer, lpDraw_gbl->dwUnused2[37]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x26]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[38]) + offset, buffer, lpDraw_gbl->dwUnused2[38]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x27]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[39]) + offset, buffer, lpDraw_gbl->dwUnused2[39]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x28]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[40]) + offset, buffer, lpDraw_gbl->dwUnused2[40]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x29]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[41]) + offset, buffer, lpDraw_gbl->dwUnused2[41]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2A]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[42]) + offset, buffer, lpDraw_gbl->dwUnused2[42]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2B]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[43]) + offset, buffer, lpDraw_gbl->dwUnused2[43]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2C]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[44]) + offset, buffer, lpDraw_gbl->dwUnused2[44]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2D]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[45]) + offset, buffer, lpDraw_gbl->dwUnused2[45]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2E]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[46]) + offset, buffer, lpDraw_gbl->dwUnused2[46]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2F]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[47]) + offset, buffer, lpDraw_gbl->dwUnused2[47]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x30]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[46]) + offset, buffer, lpDraw_gbl->dwUnused2[48]);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x31]\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwUnused2[47]) + offset, buffer, lpDraw_gbl->dwUnused2[49]);
+
+
     //printf("%08lx DDCOLORKEY                    lpGbl->ddckCKDestOverlay
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKDestOverlay) + offset, str,
lpDraw_gbl->ddckCKDestOverlay);
     //printf("%08lx DDCOLORKEY                    lpGbl->ddckCKSrcOverlay
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKSrcOverlay) + offset, str,
lpDraw_gbl->ddckCKSrcOverlay);
     sprintf(buffer,"%svmiData.",str);
     dump_VIDMEMINFO(buffer, &lpDraw_gbl->vmiData,
FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, vmiData) + offset);
-    printf("%08lx LPVOID                                  %slpDriverHandle
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDriverHandle) + offset, str,
lpDraw_gbl->lpDriverHandle);
-    printf("%08lx LPDDRAWI_DIRECTDRAW_LCL                 %slpExclusiveOwner
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpExclusiveOwner) + offset, str,
lpDraw_gbl->lpExclusiveOwner);
-    printf("%08lx DWORD                                   %sdwModeIndex
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndex) + offset, str,
lpDraw_gbl->dwModeIndex);
-    printf("%08lx DWORD                                   %sdwModeIndexOrig
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndexOrig) + offset, str,
lpDraw_gbl->dwModeIndexOrig);
-    printf("%08lx DWORD                                   %sdwNumFourCC
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumFourCC) + offset, str,
lpDraw_gbl->dwNumFourCC);
-    printf("%08lx LPDWORD                                 %slpdwFourCC
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, str,
lpDraw_gbl->lpdwFourCC);
-    printf("%08lx DWORD                                   %sdwNumModes
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumModes) + offset, str,
lpDraw_gbl->dwNumModes);
-    printf("%08lx LPDDHALMODEI                            %slpModeInfo
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpModeInfo) + offset, str,
lpDraw_gbl->lpModeInfo);
+    MY_DUMP_STR(buffer,"LPVOID\0",str,"lpDriverHandle\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
lpDriverHandle) + offset, buffer, lpDraw_gbl->lpDriverHandle);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_LCL\0",str,"lpExclusiveOwner\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
lpExclusiveOwner) + offset, buffer, lpDraw_gbl->lpExclusiveOwner);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeIndex\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwModeIndex) + offset, buffer, lpDraw_gbl->dwModeIndex);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeIndexOrig\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwModeIndexOrig) + offset, buffer, lpDraw_gbl->dwModeIndexOrig);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumFourCC\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwNumFourCC) + offset, buffer, lpDraw_gbl->dwNumFourCC);
+
+
+    MY_DUMP_STR(buffer,"LPDWORD\0",str,"lpdwFourCC\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC)
+ offset, buffer, lpDraw_gbl->lpdwFourCC);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumModes\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwNumModes) + offset, buffer, lpDraw_gbl->dwNumModes);
+
+    MY_DUMP_STR(buffer,"LPDDHALMODEINFO\0",str,"lpModeInfo\0");
+    printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpModeInfo)
+ offset, buffer, lpDraw_gbl->lpModeInfo);
     //printf("%08lx PROCESS_LIST                            lpGbl->plProcessList
: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, plProcessList) + offset, str,
lpDraw_gbl->plProcessList);
-    printf("%08lx DWORD                                   %sdwSurfaceLockCount
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwSurfaceLockCount) + offset, str,
lpDraw_gbl->dwSurfaceLockCount);
-    printf("%08lx DWORD                                   %sdwAliasedLockCnt
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwAliasedLockCnt) + offset, str,
lpDraw_gbl->dwAliasedLockCnt);
-    printf("%08lx DWORD                                   %sdwReserved3
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved3) + offset, str,
lpDraw_gbl->dwReserved3);
-    printf("%08lx ULONG_PTR                               %shDD
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDD) + offset, str,
lpDraw_gbl->hDD);
-    printf("%08lx char                                    %scObsolete
: %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cObsolete[0]) + offset, str,
lpDraw_gbl->cObsolete);
-    printf("%08lx DWORD                                   %sdwReserved1
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved1)+ offset, str,
lpDraw_gbl->dwReserved1);
-    printf("%08lx DWORD                                   %sdwReserved2
: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved2)+ offset, str,
lpDraw_gbl->dwReserved2);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSurfaceLockCount\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwSurfaceLockCount) + offset, buffer, lpDraw_gbl->dwSurfaceLockCount);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAliasedLockCnt\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwAliasedLockCnt) + offset, buffer, lpDraw_gbl->dwAliasedLockCnt);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved3\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwReserved3) + offset, buffer, lpDraw_gbl->dwReserved3);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDD\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDD) +
offset, buffer, lpDraw_gbl->hDD);
+
+    MY_DUMP_STR(buffer,"char\0",str,"cObsolete\0");
+    printf("%08lx %s: %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cObsolete[0])
+ offset, buffer, lpDraw_gbl->cObsolete);
+
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved1\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwReserved1)+ offset, buffer, lpDraw_gbl->dwReserved1);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved2\0");
+    printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL,
dwReserved2)+ offset, buffer, lpDraw_gbl->dwReserved2);
     sprintf(buffer,"%sdbnOverlayRoot.",str);
     dump_DBLNODE(buffer, &lpDraw_gbl->dbnOverlayRoot,
FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dbnOverlayRoot)+ offset);
@@ -266,122 +527,345 @@
 void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset)
 {
-
+    char buffer[2048];
     if (lpDblnode == NULL)
         return ;
-    printf("%08lx struct _DBLNODE *                         %snext      :
0x%p\n", FIELD_OFFSET(DBLNODE, next)+offset, str, lpDblnode->next);
-    printf("%08lx struct _DBLNODE *                         %sprev      :
0x%p\n", FIELD_OFFSET(DBLNODE, prev)+offset, str, lpDblnode->prev);
-    printf("%08lx struct LPDDRAWI_DDRAWSURFACE_LCL          %sobject    :
0x%p\n", FIELD_OFFSET(DBLNODE, object)+offset, str, lpDblnode->object);
-    printf("%08lx struct LPDDRAWI_DDRAWSURFACE_INT          %sobject_int :
0x%p\n", FIELD_OFFSET(DBLNODE, object_int)+offset, str, lpDblnode->object_int);
+    MY_DUMP_STR(buffer,"struct _DBLNODE *\0",str,"next\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, next)+offset, buffer,
lpDblnode->next);
+
+    MY_DUMP_STR(buffer,"struct _DBLNODE *\0",str,"prev\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, prev)+offset, buffer,
lpDblnode->prev);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_LCL\0",str,"object\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, object)+offset, buffer,
lpDblnode->object);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"object_int\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, object_int)+offset,
buffer, lpDblnode->object_int);
+
+    printf("\n");
+    sprintf(buffer,"%sobject_int->",str);
+    dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDblnode->object_int, 0);
 }
 void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset)
 {
-
+    char buffer[2048];
     if (lpDdcorecaps == NULL)
         return ;
     int c;
-    printf("%08lx DWORD                         %sdwSize
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSize)+offset, str, lpDdcorecaps->dwSize);
-    printf("%08lx DWORD                         %sdwCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps)+offset, str, lpDdcorecaps->dwCaps);
-    printf("%08lx DWORD                         %sdwCaps2
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps2)+offset, str,
lpDdcorecaps->dwCaps2);
-    printf("%08lx DWORD                         %sdwCKeyCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCKeyCaps)+offset, str,
lpDdcorecaps->dwCKeyCaps);
-    printf("%08lx DWORD                         %sdwFXCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXCaps)+offset, str,
lpDdcorecaps->dwFXCaps);
-    printf("%08lx DWORD                         %sdwFXAlphaCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXAlphaCaps)+offset, str,
lpDdcorecaps->dwFXAlphaCaps);
-    printf("%08lx DWORD                         %sdwPalCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwPalCaps)+offset, str,
lpDdcorecaps->dwPalCaps);
-    printf("%08lx DWORD                         %sdwSVCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVCaps)+offset, str,
lpDdcorecaps->dwSVCaps);
-    printf("%08lx DWORD                         %sdwAlphaBltConstBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltConstBitDepths)+offset, str,
lpDdcorecaps->dwAlphaBltConstBitDepths);
-    printf("%08lx DWORD                         %sdwAlphaBltPixelBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltPixelBitDepths)+offset, str,
lpDdcorecaps->dwAlphaBltPixelBitDepths);
-    printf("%08lx DWORD                         %sdwAlphaBltSurfaceBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltSurfaceBitDepths)+offset, str,
lpDdcorecaps->dwAlphaBltSurfaceBitDepths);
-    printf("%08lx DWORD                         %sdwAlphaOverlayConstBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayConstBitDepths)+offset, str,
lpDdcorecaps->dwAlphaOverlayConstBitDepths);
-    printf("%08lx DWORD                         %sdwAlphaOverlayPixelBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayPixelBitDepths)+offset, str,
lpDdcorecaps->dwAlphaOverlayPixelBitDepths);
-    printf("%08lx DWORD                         %sdwAlphaOverlaySurfaceBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlaySurfaceBitDepths)+offset, str,
lpDdcorecaps->dwAlphaOverlaySurfaceBitDepths);
-    printf("%08lx DWORD                         %sdwZBufferBitDepths
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str,
lpDdcorecaps->dwZBufferBitDepths);
-    printf("%08lx DWORD                         %sdwVidMemTotal
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemTotal)+offset, str,
lpDdcorecaps->dwVidMemTotal);
-    printf("%08lx DWORD                         %sdwVidMemFree
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemFree)+offset, str,
lpDdcorecaps->dwVidMemFree);
-    printf("%08lx DWORD                         %sdwMaxVisibleOverlays
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVisibleOverlays)+offset, str,
lpDdcorecaps->dwMaxVisibleOverlays);
-    printf("%08lx DWORD                         %sdwCurrVisibleOverlays
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVisibleOverlays)+offset, str,
lpDdcorecaps->dwCurrVisibleOverlays);
-    printf("%08lx DWORD                         %sdwNumFourCCCodes
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwNumFourCCCodes)+offset, str,
lpDdcorecaps->dwNumFourCCCodes);
-    printf("%08lx DWORD                         %sdwAlignBoundarySrc
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundarySrc)+offset, str,
lpDdcorecaps->dwAlignBoundarySrc);
-    printf("%08lx DWORD                         %sdwAlignSizeSrc
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeSrc)+offset, str,
lpDdcorecaps->dwAlignSizeSrc);
-    printf("%08lx DWORD                         %sdwAlignBoundaryDest
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundaryDest)+offset, str,
lpDdcorecaps->dwAlignBoundaryDest);
-    printf("%08lx DWORD                         %sdwAlignSizeDest
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeDest)+offset, str,
lpDdcorecaps->dwAlignSizeDest);
-    printf("%08lx DWORD                         %sdwAlignStrideAlign
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignStrideAlign)+offset, str,
lpDdcorecaps->dwAlignStrideAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSize\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSize)+offset,
buffer, lpDdcorecaps->dwSize);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps)+offset,
buffer, lpDdcorecaps->dwCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCaps2\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps2)+offset,
buffer, lpDdcorecaps->dwCaps2);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCKeyCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCKeyCaps)+offset,
buffer, lpDdcorecaps->dwCKeyCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwFXCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXCaps)+offset,
buffer, lpDdcorecaps->dwFXCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwFXAlphaCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwFXAlphaCaps)+offset, buffer, lpDdcorecaps->dwFXAlphaCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwPalCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwPalCaps)+offset,
buffer, lpDdcorecaps->dwPalCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVCaps)+offset,
buffer, lpDdcorecaps->dwSVCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltConstBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaBltConstBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltConstBitDepths);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltPixelBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaBltPixelBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltPixelBitDepths);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltSurfaceBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaBltSurfaceBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltSurfaceBitDepths);
+
+
MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlayConstBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaOverlayConstBitDepths)+offset, buffer,
lpDdcorecaps->dwAlphaOverlayConstBitDepths);
+
+
MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlayPixelBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaOverlayPixelBitDepths)+offset, buffer,
lpDdcorecaps->dwAlphaOverlayPixelBitDepths);
+
+
MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlaySurfaceBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlphaOverlaySurfaceBitDepths)+offset, buffer,
lpDdcorecaps->dwAlphaOverlaySurfaceBitDepths);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwZBufferBitDepths\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwZBufferBitDepths)+offset, buffer, lpDdcorecaps->dwZBufferBitDepths);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwVidMemTotal\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwVidMemTotal)+offset, buffer, lpDdcorecaps->dwVidMemTotal);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwVidMemFree\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwVidMemFree)+offset, buffer, lpDdcorecaps->dwVidMemFree);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxVisibleOverlays\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMaxVisibleOverlays)+offset, buffer, lpDdcorecaps->dwMaxVisibleOverlays);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrVisibleOverlays\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwCurrVisibleOverlays)+offset, buffer, lpDdcorecaps->dwCurrVisibleOverlays);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumFourCCCodes\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwNumFourCCCodes)+offset, buffer, lpDdcorecaps->dwNumFourCCCodes);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignBoundarySrc\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlignBoundarySrc)+offset, buffer, lpDdcorecaps->dwAlignBoundarySrc);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignSizeSrc\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlignSizeSrc)+offset, buffer, lpDdcorecaps->dwAlignSizeSrc);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignBoundaryDest\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlignBoundaryDest)+offset, buffer, lpDdcorecaps->dwAlignBoundaryDest);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignSizeDest\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlignSizeDest)+offset, buffer, lpDdcorecaps->dwAlignSizeDest);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignStrideAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwAlignStrideAlign)+offset, buffer, lpDdcorecaps->dwAlignStrideAlign);
     for (c=0;c<DD_ROP_SPACE;c++)
     {
         printf("%08lx DWORD                         %sdwRops[0x%02x]
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwRops[c])+offset, str, c,
lpDdcorecaps->dwRops[c]);
     }
-    printf("%08lx DWORD                         %sddsCaps.dwCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, ddsCaps)+offset, str,
lpDdcorecaps->ddsCaps.dwCaps);
-    printf("%08lx DWORD                         %sdwMinOverlayStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinOverlayStretch)+offset, str,
lpDdcorecaps->dwMinOverlayStretch);
-    printf("%08lx DWORD                         %sdwMaxOverlayStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxOverlayStretch)+offset, str,
lpDdcorecaps->dwMaxOverlayStretch);
-    printf("%08lx DWORD                         %sdwMinLiveVideoStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinLiveVideoStretch)+offset, str,
lpDdcorecaps->dwMinLiveVideoStretch);
-    printf("%08lx DWORD                         %sdwMaxLiveVideoStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxLiveVideoStretch)+offset, str,
lpDdcorecaps->dwMaxLiveVideoStretch);
-    printf("%08lx DWORD                         %sdwMinHwCodecStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinHwCodecStretch)+offset, str,
lpDdcorecaps->dwMinHwCodecStretch);
-    printf("%08lx DWORD                         %sdwMaxHwCodecStretch
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxHwCodecStretch)+offset, str,
lpDdcorecaps->dwMaxHwCodecStretch);
-    printf("%08lx DWORD                         %sdwReserved1
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved1)+offset, str,
lpDdcorecaps->dwReserved1);
-    printf("%08lx DWORD                         %sdwReserved2
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved2)+offset, str,
lpDdcorecaps->dwReserved2);
-    printf("%08lx DWORD                         %sdwReserved3
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved3)+offset, str,
lpDdcorecaps->dwReserved3);
-    printf("%08lx DWORD                         %sdwSVBCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCaps)+offset, str,
lpDdcorecaps->dwSVBCaps);
-    printf("%08lx DWORD                         %sdwSVBCKeyCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCKeyCaps)+offset, str,
lpDdcorecaps->dwSVBCKeyCaps);
-    printf("%08lx DWORD                         %sdwSVBFXCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBFXCaps)+offset, str,
lpDdcorecaps->dwSVBFXCaps);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"ddsCaps.dwCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, ddsCaps)+offset,
buffer, lpDdcorecaps->ddsCaps.dwCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinOverlayStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMinOverlayStretch)+offset, buffer, lpDdcorecaps->dwMinOverlayStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxOverlayStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMaxOverlayStretch)+offset, buffer, lpDdcorecaps->dwMaxOverlayStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinLiveVideoStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMinLiveVideoStretch)+offset, buffer, lpDdcorecaps->dwMinLiveVideoStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxLiveVideoStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMaxLiveVideoStretch)+offset, buffer, lpDdcorecaps->dwMaxLiveVideoStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinHwCodecStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMinHwCodecStretch)+offset, buffer, lpDdcorecaps->dwMinHwCodecStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxHwCodecStretch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMaxHwCodecStretch)+offset, buffer, lpDdcorecaps->dwMaxHwCodecStretch);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved1\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved1)+offset,
buffer, lpDdcorecaps->dwReserved1);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved2\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved2)+offset,
buffer, lpDdcorecaps->dwReserved2);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved3\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved3)+offset,
buffer, lpDdcorecaps->dwReserved3);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCaps)+offset,
buffer, lpDdcorecaps->dwSVBCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCKeyCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwSVBCKeyCaps)+offset, buffer, lpDdcorecaps->dwSVBCKeyCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBFXCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBFXCaps)+offset,
buffer, lpDdcorecaps->dwSVBFXCaps);
     for (c=0;c<DD_ROP_SPACE;c++)
     {
         printf("%08lx DWORD                         %sdwSVBRops[0x%02x]
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBRops[c])+offset, str, c,
lpDdcorecaps->dwSVBRops[c]);
     }
-    printf("%08lx DWORD                         %sdwVSBCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCaps)+offset, str,
lpDdcorecaps->dwVSBCaps);
-    printf("%08lx DWORD                         %sdwVSBCKeyCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCKeyCaps)+offset, str,
lpDdcorecaps->dwVSBCKeyCaps);
-    printf("%08lx DWORD                         %sdwVSBFXCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBFXCaps)+offset, str,
lpDdcorecaps->dwVSBFXCaps);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCaps)+offset,
buffer, lpDdcorecaps->dwVSBCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBCKeyCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwVSBCKeyCaps)+offset, buffer, lpDdcorecaps->dwVSBCKeyCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBFXCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBFXCaps)+offset,
buffer, lpDdcorecaps->dwVSBFXCaps);
     for (c=0;c<DD_ROP_SPACE;c++)
     {
         printf("%08lx DWORD                         %sdwVSBRops[0x%02x]
: 0x%08lx\n",  FIELD_OFFSET(DDCORECAPS, dwVSBRops[c])+offset, str, c,
lpDdcorecaps->dwVSBRops[c]);
     }
-    printf("%08lx DWORD                         %sdwSSBCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCaps)+offset, str,
lpDdcorecaps->dwSSBCaps);
-    printf("%08lx DWORD                         %sdwSSBCKeyCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCKeyCaps)+offset, str,
lpDdcorecaps->dwSSBCKeyCaps);
-    printf("%08lx DWORD                         %sdwSSBFXCaps
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBFXCaps)+offset, str,
lpDdcorecaps->dwSSBFXCaps);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCaps)+offset,
buffer, lpDdcorecaps->dwSSBCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBCKeyCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwSSBCKeyCaps)+offset, buffer, lpDdcorecaps->dwSSBCKeyCaps);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBFXCaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBFXCaps)+offset,
buffer, lpDdcorecaps->dwSSBFXCaps);
     for (c=0;c<DD_ROP_SPACE;c++)
     {
         printf("%08lx DWORD                         %sdwSSBRops[0x%02x]
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBRops[c])+offset, str, c,
lpDdcorecaps->dwSSBRops[c]);
     }
-    printf("%08lx DWORD                         %sdwMaxVideoPorts
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVideoPorts)+offset, str,
lpDdcorecaps->dwMaxVideoPorts);
-    printf("%08lx DWORD                         %sdwCurrVideoPorts
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVideoPorts)+offset, str,
lpDdcorecaps->dwCurrVideoPorts);
-    printf("%08lx DWORD                         %sdwSVBCaps2
: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str,
lpDdcorecaps->dwSVBCaps2);
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxVideoPorts\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwMaxVideoPorts)+offset, buffer, lpDdcorecaps->dwMaxVideoPorts);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrVideoPorts\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwCurrVideoPorts)+offset, buffer, lpDdcorecaps->dwCurrVideoPorts);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCaps2\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS,
dwZBufferBitDepths)+offset, buffer, lpDdcorecaps->dwSVBCaps2);
 }
 void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset)
 {
-
+    char buffer[2048];
     if (lpVidmeminfo == NULL)
         return ;
-    printf("%08lx FLATPTR                       %sfpPrimary                :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str,
lpVidmeminfo->fpPrimary);
-    printf("%08lx DWORD                         %sdwFlags                  :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwFlags)+offset, str, lpVidmeminfo->dwFlags);
-    printf("%08lx DWORD                         %sdwDisplayWidth           :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str,
lpVidmeminfo->dwDisplayWidth);
-    printf("%08lx DWORD                         %sdwDisplayHeight          :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayHeight)+offset, str,
lpVidmeminfo->dwDisplayHeight);
-    printf("%08lx LONG                          %slDisplayPitch            :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, lDisplayPitch)+offset, str,
lpVidmeminfo->lDisplayPitch);
+    MY_DUMP_STR(buffer,"FLATPTR\0",str,"fpPrimary\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset,
buffer, lpVidmeminfo->fpPrimary);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwFlags)+offset,
buffer, lpVidmeminfo->dwFlags);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwDisplayWidth\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset,
buffer, lpVidmeminfo->dwDisplayWidth);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwDisplayHeight\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwDisplayHeight)+offset, buffer, lpVidmeminfo->dwDisplayHeight);
+
+    MY_DUMP_STR(buffer,"LONG\0",str,"lDisplayPitch\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
lDisplayPitch)+offset, buffer, lpVidmeminfo->lDisplayPitch);
     //printf("%08lx DDPIXELFORMAT                       %sddpfDisplay          :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, ddpfDisplay)+offset, str,
lpVidmeminfo->ddpfDisplay);
-    printf("%08lx DWORD                         %sdwOffscreenAlign         :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOffscreenAlign)+offset, str,
lpVidmeminfo->dwOffscreenAlign);
-    printf("%08lx DWORD                         %sdwOverlayAlign           :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOverlayAlign)+offset, str,
lpVidmeminfo->dwOverlayAlign);
-    printf("%08lx DWORD                         %sdwTextureAlign           :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwTextureAlign)+offset, str,
lpVidmeminfo->dwTextureAlign);
-    printf("%08lx DWORD                         %sdwZBufferAlign           :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwZBufferAlign)+offset, str,
lpVidmeminfo->dwZBufferAlign);
-    printf("%08lx DWORD                         %sdwAlphaAlign             :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayWidth)+offset, str,
lpVidmeminfo->dwAlphaAlign);
-    printf("%08lx DWORD                         %sdwNumHeaps               :
0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwNumHeaps)+offset, str,
lpVidmeminfo->dwNumHeaps);
-    printf("%08lx LPVIDMEM                      %spvmList                  :
0x%p\n", FIELD_OFFSET(VIDMEMINFO, pvmList)+offset, str, lpVidmeminfo->pvmList);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwOffscreenAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwOffscreenAlign)+offset, buffer, lpVidmeminfo->dwOffscreenAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwOverlayAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwOverlayAlign)+offset, buffer, lpVidmeminfo->dwOverlayAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwTextureAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwTextureAlign)+offset, buffer, lpVidmeminfo->dwTextureAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwZBufferAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwZBufferAlign)+offset, buffer, lpVidmeminfo->dwZBufferAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaAlign\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO,
dwDisplayWidth)+offset, buffer, lpVidmeminfo->dwAlphaAlign);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumHeaps\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwNumHeaps)+offset,
buffer, lpVidmeminfo->dwNumHeaps);
+
+    MY_DUMP_STR(buffer,"LPVIDMEM\0",str,"pvmList\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(VIDMEMINFO, pvmList)+offset,
buffer, lpVidmeminfo->pvmList);
 }
-
-
-
+/* Surface dump */
+
+void dump_DDRAWI_DDRAWSURFACE_INT(char *str, LPDDRAWI_DDRAWSURFACE_INT lpDdrawSurface,
DWORD offset)
+{
+    char buffer[2048];
+    if (lpDdrawSurface == NULL)
+        return ;
+
+    MY_DUMP_STR(buffer,"LPVOID\0",str,"lpVtbl\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT,
lpVtbl)+offset, buffer, lpDdrawSurface->lpVtbl);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_LCL\0",str,"lpLcl\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT,
lpLcl)+offset, buffer, lpDdrawSurface->lpLcl);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpLink\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT,
lpLink)+offset, str, lpDdrawSurface->lpLink);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwIntRefCnt\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT,
dwIntRefCnt)+offset, str, lpDdrawSurface->dwIntRefCnt);
+
+    printf("\n");
+    sprintf(buffer,"%slpLcl->",str);
+    dump_DDRAWI_DDRAWSURFACE_LCL(buffer, lpDdrawSurface->lpLcl, 0);
+
+    sprintf(buffer,"%slpLcl->lpLink",str);
+    dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDdrawSurface->lpLink, 0);
+}
+
+void dump_DDRAWI_DDRAWSURFACE_LCL(char *str, LPDDRAWI_DDRAWSURFACE_LCL lpDdrawSurface,
DWORD offset)
+{
+
+    char buffer[2048];
+    if (lpDdrawSurface == NULL)
+        return ;
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_MORE\0",str,"lpSurfMore\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpSurfMore)+offset, buffer, lpDdrawSurface->lpSurfMore);
+
+    MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_GBL\0",str,"lpGbl\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpGbl)+offset, buffer, lpDdrawSurface->lpGbl);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDDSurface\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
hDDSurface)+offset, buffer, lpDdrawSurface->hDDSurface);
+
+    MY_DUMP_STR(buffer,"LPATTACHLIST\0",str,"lpAttachList\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpAttachList)+offset, buffer, lpDdrawSurface->lpAttachList);
+
+    MY_DUMP_STR(buffer,"LPATTACHLIST\0",str,"lpAttachListFrom\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpAttachListFrom)+offset, buffer, lpDdrawSurface->lpAttachListFrom);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalRefCnt\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwLocalRefCnt)+offset, buffer, lpDdrawSurface->dwLocalRefCnt);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwProcessId\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwProcessId)+offset, buffer, lpDdrawSurface->dwProcessId);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwFlags)+offset, buffer, lpDdrawSurface->dwFlags);
+    //printf("%08lx DDSCAPS                     %sddsCaps                 :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddsCaps)+offset, str,
lpDdrawSurface->ddsCaps);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWPALETTE_INT\0",str,"lpDDPalette\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpDDPalette)+offset, buffer, lpDdrawSurface->lpDDPalette);
+    /* note slpDDClipper have union to LPDDRAWI_DDRAWCLIPPER_INT, we need figout how to
detect which are set */
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWCLIPPER_LCL\0",str,"lpDDClipper\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpDDClipper)+offset, buffer, lpDdrawSurface->lpDDClipper);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeCreatedIn\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwModeCreatedIn)+offset, buffer, lpDdrawSurface->dwModeCreatedIn);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwBackBufferCount\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwBackBufferCount)+offset, buffer, lpDdrawSurface->dwBackBufferCount);
+
+    // printf("%08lx DDCOLORKEY                         %sddckCKDestBlt         :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKDestBlt)+offset, str,
lpDdrawSurface->ddckCKDestBlt);
+    // printf("%08lx DDCOLORKEY                         %sddckCKSrcBlt       :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKSrcBlt)+offset, str,
lpDdrawSurface->ddckCKSrcBlt);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDC\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
hDC)+offset, buffer, lpDdrawSurface->hDC);
+
+    MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"dwReserved1\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwReserved1)+offset, buffer, lpDdrawSurface->dwReserved1);
+
+
+    //printf("%08lx DDCOLORKEY                         %sddckCKSrcOverlay       :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKSrcOverlay)+offset, str,
lpDdrawSurface->ddckCKSrcOverlay);
+    //printf("%08lx DDCOLORKEY                         %sddckCKDestOverlay       :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKDestOverlay)+offset, str,
lpDdrawSurface->ddckCKDestOverlay);
+
+
MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpSurfaceOverlaying\0");
+    printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lpSurfaceOverlaying)+offset, buffer, lpDdrawSurface->lpSurfaceOverlaying);
+
+   // printf("%08lx DBLNODE                        %sdbnOverlayNode          :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dbnOverlayNode)+offset, str,
lpDdrawSurface->dbnOverlayNode);
+    //printf("%08lx RECT                        %srcOverlaySrc          :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, rcOverlaySrc)+offset, str,
lpDdrawSurface->rcOverlaySrc);
+   // printf("%08lx RECT                        %srcOverlayDest          :
0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, rcOverlayDest)+offset, str,
lpDdrawSurface->rcOverlayDest);
+
+    MY_DUMP_STR(buffer,"DWORD\0",str,"dwClrXparent\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
dwClrXparent)+offset, buffer, lpDdrawSurface->dwClrXparent);
+
+    MY_DUMP_STR(buffer,"LONG\0",str,"lOverlayX\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lOverlayX)+offset, buffer, lpDdrawSurface->lOverlayX);
+
+    MY_DUMP_STR(buffer,"LONG\0",str,"lOverlayY\0");
+    printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL,
lOverlayY)+offset, buffer, lpDdrawSurface->lOverlayY);
+}
Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa…
==============================================================================
--- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c
[iso-8859-1] (original)
+++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c
[iso-8859-1] Thu Nov 20 06:25:27 2008
@@ -451,7 +451,7 @@
 #if DUMP_ON
     if (pIntDirectDraw7 != NULL)
     {
-        dump_DDRAWI_DIRECTDRAW_INT("PDraw->", pIntDirectDraw7, 0);
+        dump_DDRAWI_DIRECTDRAW_INT("PDraw->\0", pIntDirectDraw7, 0);
     }
 #endif