CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed exception

Browse Source
This commit is contained in:
Vulpovile
2020-03-13 10:42:30 -07:00
parent cee1b1308c
commit 3f4963795c
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Application.cpp
View File

@@ -134,7 +134,7 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti
_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance); _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
webBrowser = new IEBrowser(_hwndToolbox); webBrowser = new IEBrowser(_hwndToolbox);
SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)webBrowser); SetWindowLongPtr(_hwndToolbox,GWL_USERDATA+1,(LONG)webBrowser);
//webBrowser->navigateSyncURL(L"http://androdome.com/res/ClientToolbox.php"); //webBrowser->navigateSyncURL(L"http://androdome.com/res/ClientToolbox.php");
//navigateToolbox(GetFileInPath("/content/page/controller.html")); //navigateToolbox(GetFileInPath("/content/page/controller.html"));
navigateToolbox(GetFileInPath("/content/page/surface.html")); navigateToolbox(GetFileInPath("/content/page/surface.html"));

1
DataModelInstance.cpp
View File

@@ -452,6 +452,7 @@ bool DataModelInstance::load(const char* filename, bool clearObjects)
std::stringstream msg; std::stringstream msg;
msg << "Failed to load file:" << std::endl << filename << std::endl << strerror(errno); msg << "Failed to load file:" << std::endl << filename << std::endl << strerror(errno);
MessageBoxStr(msg.str()); MessageBoxStr(msg.str());
return false;
} }
} }

1
PartInstance.cpp
View File

@@ -1082,6 +1082,7 @@ static TCHAR* enumStr(int shape)
case Enum::Shape::Cylinder: case Enum::Shape::Cylinder:
return "Cylinder"; return "Cylinder";
} }
return "Block";
} }
void PartInstance::PropUpdate(LPPROPGRIDITEM &item) void PartInstance::PropUpdate(LPPROPGRIDITEM &item)

2
ax.cpp
View File

@@ -505,7 +505,7 @@ HRESULT _stdcall AXClientSite :: Invoke(
EXCEPINFO FAR* pExcepInfo, EXCEPINFO FAR* pExcepInfo,
unsigned int FAR* puArgErr) unsigned int FAR* puArgErr)
{ {
IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA); IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA+1);
return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
//return S_OK; //return S_OK;