From 8817712cc34d280113e7824d46fb62cd1b2c85ba Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Fri, 3 Nov 2023 16:36:27 -0700 Subject: [PATCH] Fixed stack clobbering in VS2003 compiler --- Blocks3D VS2003.vcproj | 20 +---- Blocks3D.vcproj | 24 ------ src/include/Properties/BoolProperty.h | 12 --- src/include/Properties/Property.h | 30 ------- src/source/DataModelV2/GuiRootInstance.cpp | 92 +++++++++++----------- src/source/Properties/BoolProperty.cpp | 5 -- src/source/Properties/Property.cpp | 7 -- 7 files changed, 47 insertions(+), 143 deletions(-) delete mode 100644 src/include/Properties/BoolProperty.h delete mode 100644 src/include/Properties/Property.h delete mode 100644 src/source/Properties/BoolProperty.cpp delete mode 100644 src/source/Properties/Property.cpp diff --git a/Blocks3D VS2003.vcproj b/Blocks3D VS2003.vcproj index 5575d76..836cb0b 100644 --- a/Blocks3D VS2003.vcproj +++ b/Blocks3D VS2003.vcproj @@ -21,7 +21,7 @@ CharacterSet="2"> - - - - - - - - - - - - - - - - - - @@ -960,18 +948,6 @@ - - - - - - diff --git a/src/include/Properties/BoolProperty.h b/src/include/Properties/BoolProperty.h deleted file mode 100644 index ef541ec..0000000 --- a/src/include/Properties/BoolProperty.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "Property.h" -class BoolProperty : public Property -{ -public: - BoolProperty(std::string name, bool& value, Instance& owner) - { - Property(name, value, owner); - } - ~BoolProperty(void); - PROPGRIDITEM getPropGridItem(); -}; diff --git a/src/include/Properties/Property.h b/src/include/Properties/Property.h deleted file mode 100644 index 2a3a0d9..0000000 --- a/src/include/Properties/Property.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once -#include "DataModelV2/Instance.h" -#include -class Instance; - -template -class Property -{ -public: - Property(std::string name, T& value, Instance& owner) - { - _value = value; - _owner = owner; - } - ~Property(void); - const T getValue() - { - return _value; - } - const void setValue(T val) - { - _value = val; - } - virtual PROPGRIDITEM getPropGridItem(); - void setProperty(LPPROPGRIDITEM item); -protected: - Instance* _owner; - std::string _name; - T* _value; -}; diff --git a/src/source/DataModelV2/GuiRootInstance.cpp b/src/source/DataModelV2/GuiRootInstance.cpp index d4a79a5..99f85b7 100644 --- a/src/source/DataModelV2/GuiRootInstance.cpp +++ b/src/source/DataModelV2/GuiRootInstance.cpp @@ -280,13 +280,13 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) button->setButtonListener(menuListener); ImageButtonInstance* instance = new ToggleImageButtonInstance( - Texture::fromFile(GetFileInPath("/content/images/Run.png")), - Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")), + Texture::fromFile(&GetFileInPath("/content/images/Run.png")), + Texture::fromFile(&GetFileInPath("/content/images/Run_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/Run_dn.png")), NULL, - Texture::fromFile(GetFileInPath("/content/images/Stop.png")), - Texture::fromFile(GetFileInPath("/content/images/Stop_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/Stop_dn.png")) + Texture::fromFile(&GetFileInPath("/content/images/Stop.png")), + Texture::fromFile(&GetFileInPath("/content/images/Stop_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/Stop_dn.png")) ); instance->setButtonListener(menuListener); instance->name = "go"; @@ -296,17 +296,17 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/ArrowTool.png")), - Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/ArrowTool_dn.png")), - Texture::fromFile(GetFileInPath("/content/images/ArrowTool_ds.png"))); + Texture::fromFile(&GetFileInPath("/content/images/ArrowTool.png")), + Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_dn.png")), + Texture::fromFile(&GetFileInPath("/content/images/ArrowTool_ds.png"))); instance->size = Vector2(50,50); instance->position = Vector2(15, 90); instance->setParent(this); instance->name = "Cursor"; instance->setButtonListener(msl); - instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png"))); + instance = makeImageButton(Texture::fromFile(&GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(&GetFileInPath("/content/images/ScaleTool_ds.png"))); instance->size = Vector2(40,40); instance->position = Vector2(0, 140); instance->setParent(this); @@ -315,10 +315,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")), - Texture::fromFile(GetFileInPath("/content/images/MoveTool_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/MoveTool_dn.png")), - Texture::fromFile(GetFileInPath("/content/images/MoveTool_ds.png"))); + Texture::fromFile(&GetFileInPath("/content/images/MoveTool.png")), + Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/MoveTool_dn.png")), + Texture::fromFile(&GetFileInPath("/content/images/MoveTool_ds.png"))); instance->size = Vector2(40,40); instance->position = Vector2(40, 140); instance->setParent(this); @@ -326,10 +326,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(msl); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/SelectionRotate.png")), - Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate.png")), + Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ovr.png")), NULL, - Texture::fromFile(GetFileInPath("/content/images/SelectionRotate_ds.png"))); + Texture::fromFile(&GetFileInPath("/content/images/SelectionRotate_ds.png"))); instance->size = Vector2(30,30); instance->position = Vector2(10, 175); instance->setParent(this); @@ -337,10 +337,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(rbl); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/SelectionTilt.png")), - Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt.png")), + Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ovr.png")), NULL, - Texture::fromFile(GetFileInPath("/content/images/SelectionTilt_ds.png"))); + Texture::fromFile(&GetFileInPath("/content/images/SelectionTilt_ds.png"))); instance->size = Vector2(30,30); instance->position = Vector2(40, 175); instance->setParent(this); @@ -349,10 +349,10 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/Delete.png")), - Texture::fromFile(GetFileInPath("/content/images/Delete_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/Delete_dn.png")), - Texture::fromFile(GetFileInPath("/content/images/Delete_ds.png"))); + Texture::fromFile(&GetFileInPath("/content/images/Delete.png")), + Texture::fromFile(&GetFileInPath("/content/images/Delete_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/Delete_dn.png")), + Texture::fromFile(&GetFileInPath("/content/images/Delete_ds.png"))); instance->size = Vector2(40,46); instance->position = Vector2(20, 284); instance->setParent(this); @@ -360,9 +360,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(delet); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraZoomIn_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomIn_dn.png"))); instance->size = Vector2(34,25); instance->floatBottom = true; instance->floatRight = true; @@ -372,9 +372,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraZoomOut_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraZoomOut_dn.png"))); instance->size = Vector2(34,26); instance->floatBottom = true; instance->floatRight = true; @@ -384,9 +384,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraPanLeft_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraPanLeft_dn.png"))); instance->size = Vector2(34,34); instance->floatBottom = true; instance->floatRight = true; @@ -396,9 +396,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraPanRight.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraPanRight_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraPanRight_dn.png"))); instance->size = Vector2(34,34); instance->floatBottom = true; instance->floatRight = true; @@ -408,9 +408,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraCenter.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraCenter_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraCenter_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraCenter.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraCenter_dn.png"))); instance->size = Vector2(34,20); instance->floatBottom = true; instance->floatRight = true; @@ -420,9 +420,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraTiltUp_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltUp_dn.png"))); instance->size = Vector2(24,24); instance->floatBottom = true; instance->floatRight = true; @@ -432,9 +432,9 @@ GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) instance->setButtonListener(cam); instance = makeImageButton( - Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_ovr.png")), - Texture::fromFile(GetFileInPath("/content/images/CameraTiltDown_dn.png"))); + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_ovr.png")), + Texture::fromFile(&GetFileInPath("/content/images/CameraTiltDown_dn.png"))); instance->size = Vector2(24,24); instance->floatBottom = true; instance->floatRight = true; diff --git a/src/source/Properties/BoolProperty.cpp b/src/source/Properties/BoolProperty.cpp deleted file mode 100644 index 744db4b..0000000 --- a/src/source/Properties/BoolProperty.cpp +++ /dev/null @@ -1,5 +0,0 @@ -//#include "Properties/BoolProperty.h" -//PROPGRIDITEM BoolProperty::getPropGridItem() -//{ - //return PROPGRIDITEM(); -//} \ No newline at end of file diff --git a/src/source/Properties/Property.cpp b/src/source/Properties/Property.cpp deleted file mode 100644 index 3221ffb..0000000 --- a/src/source/Properties/Property.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Properties/Property.h" - -template -void Property::setProperty(LPPROPGRIDITEM item) -{ - _owner->propertiesChanged(); -} \ No newline at end of file