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

Cleaning up failed experiments

Browse Source
This commit is contained in:
MusicalProgrammer
2020-03-07 18:32:54 -05:00
parent 94b787804d
commit bf0115f2ad
4 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
IEBrowser.cpp
View File

@@ -9,10 +9,9 @@
#include "Globals.h" #include "Globals.h"
#include "ax.h" #include "ax.h"
//#include "IEDispatcher.h"
void IEBrowser::Boop(char* test) void IEBrowser::Boop(char* test)
{ {
// External functions may end up here in the future
} }
IEBrowser::IEBrowser(HWND attachHWnd) { IEBrowser::IEBrowser(HWND attachHWnd) {
@@ -26,7 +25,6 @@ IEBrowser::IEBrowser(HWND attachHWnd) {
} }
} }
hwnd = attachHWnd; hwnd = attachHWnd;
spDocument = 0;
webBrowser = 0; webBrowser = 0;
SendMessage(hwnd,AX_INPLACE,1,0); SendMessage(hwnd,AX_INPLACE,1,0);
SendMessage(hwnd,AX_QUERYINTERFACE,(WPARAM)&IID_IWebBrowser2,(LPARAM)&webBrowser); SendMessage(hwnd,AX_QUERYINTERFACE,(WPARAM)&IID_IWebBrowser2,(LPARAM)&webBrowser);
@@ -39,23 +37,6 @@ IEBrowser::~IEBrowser(void) {
} }
} }
// Something goes here
int IEBrowser::setExternal(IDispatch** ext)
{
std::cout << &m_IEDispatcher;
IInternetHostSecurityManager* spSecMan;
spDocument2->QueryInterface(IID_IInternetHostSecurityManager,
(void **) &spSecMan);
// TODO: hr needs to say: 'S_OK'
//spSecMan->QueryCustomPolicy
HRESULT hr = spSecMan->ProcessUrlAction(URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY,
NULL, 0, NULL, 0, 0, PUAF_WARN_IF_DENIED);
(*ext) = &m_IEDispatcher;
return 1;
}
bool IEBrowser::navigateSyncURL(wchar_t* url) bool IEBrowser::navigateSyncURL(wchar_t* url)
{ {
MSG messages; MSG messages;

8
IEBrowser.h
View File

@@ -14,12 +14,4 @@ class IEBrowser {
private: private:
IWebBrowser2* webBrowser; IWebBrowser2* webBrowser;
HWND hwnd; HWND hwnd;
IDispatch* spDocument;
IHTMLDocument* spDocument2;
IDocHostUIHandler* m_spHandler;
IDispatch* m_spExternal;
IDispatch* m_newExternal;
IEDispatcher m_IEDispatcher;
IOleClientSite* m_spDefaultDocHostUIHandler;
int setExternal(IDispatch** ext);
}; };

18
ax.cpp
View File

@@ -362,7 +362,6 @@ void AX :: Init(char* cls)
AdviseToken = 0; AdviseToken = 0;
memset(DAdviseToken,0,sizeof(DAdviseToken)); memset(DAdviseToken,0,sizeof(DAdviseToken));
Site.ax = this; Site.ax = this;
m_externalDisp = 0;
} }
AX :: AX(char* cls) AX :: AX(char* cls)
@@ -370,17 +369,6 @@ AX :: AX(char* cls)
Init(cls); Init(cls);
} }
void AX :: SetExternalDispatch(IDispatch* externalDisp)
{
m_externalDisp = externalDisp;
}
IDispatch* AX :: GetExternalDispatch()
{
return m_externalDisp;
}
void AX :: Clean() void AX :: Clean()
{ {
if (Site.InPlace == true) if (Site.InPlace == true)
@@ -641,12 +629,6 @@ LRESULT CALLBACK AXWndProc(HWND hh,UINT mm,WPARAM ww,LPARAM ll)
return true; return true;
} }
if (mm == AX_SETEXTERNALDISP)
{
AX* ax = (AX*)GetWindowLong(hh,GWL_USERDATA);
ax->SetExternalDispatch((IDispatch*)ll);
}
if (mm == AX_GETAXINTERFACE) if (mm == AX_GETAXINTERFACE)
{ {
AX* ax = (AX*)GetWindowLong(hh,GWL_USERDATA); AX* ax = (AX*)GetWindowLong(hh,GWL_USERDATA);

6
ax.h
View File

@@ -10,8 +10,6 @@
#define AX_DISCONNECTOBJECT (WM_USER + 5) #define AX_DISCONNECTOBJECT (WM_USER + 5)
#define AX_SETDATAADVISE (WM_USER + 6) #define AX_SETDATAADVISE (WM_USER + 6)
#define AX_DOVERB (WM_USER + 7) #define AX_DOVERB (WM_USER + 7)
#define AX_SETEXTERNALDISP (WM_USER + 8)
// Registration function // Registration function
ATOM AXRegister(); ATOM AXRegister();
@@ -187,12 +185,8 @@ class AX
bool AddMenu; bool AddMenu;
DWORD AdviseToken; DWORD AdviseToken;
DWORD DAdviseToken[100]; DWORD DAdviseToken[100];
void SetExternalDispatch(IDispatch* externalDisp);
IDispatch* GetExternalDispatch();
private: private:
IDispatch* m_externalDisp;
CLSID clsid; CLSID clsid;