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

Timestamp:

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

Author:

sandervl

Message:

update with latest wine code

File:

• trunk/tools/wrc/genres.c (modified) (7 diffs)

trunk/tools/wrc/genres.c

@@ -19 +19 @@
 #include "genres.h"
 #include "utils.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
@@ -416 +418 @@
                 restag = put_res_header(res, WRC_RT_DIALOG, NULL, name, dlg->memopt, &(dlg->lvc));
 
-                put_dword(res, dlg->style);
-                put_dword(res, dlg->gotexstyle ? dlg->exstyle : 0);
+                put_dword(res, dlg->style->or_mask);
+                put_dword(res, dlg->gotexstyle ? dlg->exstyle->or_mask : 0);
                 tag_nctrl = res->size;
                 put_word(res, 0);               /* Number of controls */
@@ -446 +448 @@
                 {
                         /* FIXME: what is default control style? */
-                        put_dword(res, ctrl->gotstyle ? ctrl->style : WS_CHILD);
-                        put_dword(res, ctrl->gotexstyle ? ctrl->exstyle : 0);
+                        put_dword(res, ctrl->gotstyle ? ctrl->style->or_mask: WS_CHILD);
+                        put_dword(res, ctrl->gotexstyle ? ctrl->exstyle->or_mask : 0);
                         put_word(res, ctrl->x);
                         put_word(res, ctrl->y);
@@ -482 +484 @@
                 restag = put_res_header(res, WRC_RT_DIALOG, NULL, name, dlg->memopt, NULL);
 
-                put_dword(res, dlg->gotstyle ? dlg->style : WS_POPUPWINDOW);
+                put_dword(res, dlg->gotstyle ? dlg->style->or_mask : WS_POPUPWINDOW);
                 tag_nctrl = res->size;
                 put_byte(res, 0);               /* Number of controls */
@@ -514 +516 @@
                         put_word(res, ctrl->height);
                         put_word(res, ctrl->id);
-                        put_dword(res, ctrl->gotstyle ? ctrl->style : WS_CHILD);
+                        put_dword(res, ctrl->gotstyle ? ctrl->style->or_mask: WS_CHILD);
                         if(ctrl->ctlclass)
                         {
@@ -584 +586 @@
                 put_word(res, 0xffff);          /* DlgVer */
                 put_dword(res, dlgex->gothelpid ? dlgex->helpid : 0);
-                put_dword(res, dlgex->gotexstyle ? dlgex->exstyle : 0);
-                put_dword(res, dlgex->gotstyle ? dlgex->style : WS_POPUPWINDOW);
+                put_dword(res, dlgex->gotexstyle ? dlgex->exstyle->or_mask : 0);
+                put_dword(res, dlgex->gotstyle ? dlgex->style->or_mask : WS_POPUPWINDOW);
                 tag_nctrl = res->size;
                 put_word(res, 0);               /* Number of controls */
@@ -620 +622 @@
                 {
                         put_dword(res, ctrl->gothelpid ? ctrl->helpid : 0);
-                        put_dword(res, ctrl->gotexstyle ? ctrl->exstyle : 0);
+                        put_dword(res, ctrl->gotexstyle ? ctrl->exstyle->or_mask : 0);
                         /* FIXME: what is default control style? */
-                        put_dword(res, ctrl->gotstyle ? ctrl->style : WS_CHILD | WS_VISIBLE);
+                        put_dword(res, ctrl->gotstyle ? ctrl->style->or_mask : WS_CHILD | WS_VISIBLE);
                         put_word(res, ctrl->x);
                         put_word(res, ctrl->y);