Changeset 3426 for trunk/tools/wrc/dumpres.c

Timestamp:

Apr 19, 2000, 4:46:07 PM (25 years ago)

Author:

sandervl

Message:

update with latest wine code

File:

• trunk/tools/wrc/dumpres.c (modified) (4 diffs)

trunk/tools/wrc/dumpres.c

@@ -8 +8 @@
 #include "config.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -498 +499 @@
         printf("\tx, y, w, h: %d, %d, %d, %d\n", ctrl->x, ctrl->y, ctrl->width, ctrl->height);
         if(ctrl->gotstyle)
-                printf("\tStyle: %08lx\n", ctrl->style);
+        {
+                assert(ctrl->style != NULL);
+                assert(ctrl->style->and_mask == 0);
+                printf("\tStyle: %08lx\n", ctrl->style->or_mask);
+        }
         if(ctrl->gotexstyle)
-                printf("\tExStyle: %08lx\n", ctrl->exstyle);
+        {
+                assert(ctrl->exstyle != NULL);
+                assert(ctrl->exstyle->and_mask == 0);
+                printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask);
+        }
         if(ctrl->gothelpid)
                 printf("\tHelpid: %ld\n", ctrl->helpid);
@@ -530 +539 @@
         printf("x, y, w, h: %d, %d, %d, %d\n", dlg->x, dlg->y, dlg->width, dlg->height);
         if(dlg->gotstyle)
-                printf("Style: %08lx\n", dlg->style);
+        {
+                assert(dlg->style != NULL);
+                assert(dlg->style->and_mask == 0);
+                printf("Style: %08lx\n", dlg->style->or_mask);
+                
+        }
         if(dlg->gotexstyle)
-                printf("ExStyle: %08lx\n", dlg->exstyle);
+        {
+                assert(dlg->exstyle != NULL);
+                assert(dlg->exstyle->and_mask == 0);
+                printf("ExStyle: %08lx\n", dlg->exstyle->or_mask);
+        }
         printf("Menu: %s\n", get_nameid_str(dlg->menu));
         printf("Class: %s\n", get_nameid_str(dlg->dlgclass));
@@ -571 +589 @@
         printf("x, y, w, h: %d, %d, %d, %d\n", dlgex->x, dlgex->y, dlgex->width, dlgex->height);
         if(dlgex->gotstyle)
-                printf("Style: %08lx\n", dlgex->style);
+        {
+                assert(dlgex->style != NULL);
+                assert(dlgex->style->and_mask == 0);
+                printf("Style: %08lx\n", dlgex->style->or_mask);
+        }
         if(dlgex->gotexstyle)
-                printf("ExStyle: %08lx\n", dlgex->exstyle);
+        {
+                assert(dlgex->exstyle != NULL);
+                assert(dlgex->exstyle->and_mask == 0);
+                printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask);
+        }
         if(dlgex->gothelpid)
                 printf("Helpid: %ld\n", dlgex->helpid);