From d0afe724d1f5ca3e0a46e75849450a934ffa5ef2 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 5 Dec 2018 13:22:56 +0000 Subject: [llvm-rc] Support not expressions. Patch by Jacek Caban! Differential Revision: https://reviews.llvm.org/D55242 llvm-svn: 348363 --- llvm/tools/llvm-rc/ResourceFileWriter.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'llvm/tools/llvm-rc/ResourceFileWriter.cpp') diff --git a/llvm/tools/llvm-rc/ResourceFileWriter.cpp b/llvm/tools/llvm-rc/ResourceFileWriter.cpp index e69d4793dd1..7fe95669083 100644 --- a/llvm/tools/llvm-rc/ResourceFileWriter.cpp +++ b/llvm/tools/llvm-rc/ResourceFileWriter.cpp @@ -987,7 +987,8 @@ Error ResourceFileWriter::writeSingleDialogControl(const Control &Ctl, padStream(sizeof(uint32_t)); auto TypeInfo = Control::SupportedCtls.lookup(Ctl.Type); - uint32_t CtlStyle = TypeInfo.Style | Ctl.Style.getValueOr(0); + IntWithNotMask CtlStyle(TypeInfo.Style); + CtlStyle |= Ctl.Style.getValueOr(RCInt(0)); uint32_t CtlExtStyle = Ctl.ExtStyle.getValueOr(0); // DIALOG(EX) item header prefix. @@ -995,7 +996,7 @@ Error ResourceFileWriter::writeSingleDialogControl(const Control &Ctl, struct { ulittle32_t Style; ulittle32_t ExtStyle; - } Prefix{ulittle32_t(CtlStyle), ulittle32_t(CtlExtStyle)}; + } Prefix{ulittle32_t(CtlStyle.getValue()), ulittle32_t(CtlExtStyle)}; writeObject(Prefix); } else { struct { @@ -1003,7 +1004,7 @@ Error ResourceFileWriter::writeSingleDialogControl(const Control &Ctl, ulittle32_t ExtStyle; ulittle32_t Style; } Prefix{ulittle32_t(Ctl.HelpID.getValueOr(0)), ulittle32_t(CtlExtStyle), - ulittle32_t(CtlStyle)}; + ulittle32_t(CtlStyle.getValue())}; writeObject(Prefix); } -- cgit v1.2.3