From 4bb2098fe178b17163004dc92f888bd2641ff43e Mon Sep 17 00:00:00 2001 From: scottbeebiwan <38970930+scottbeebiwan@users.noreply.github.com> Date: Sat, 7 Jul 2018 12:11:45 -0700 Subject: [PATCH 1/9] ignore desktop.ini --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8de655f..6c0f1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ log.txt G3DTest.suo G3DTest.suo stderr.txt +desktop.ini From 4401fb8773458008fd3cfa443a9c3d6854ad969f Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sat, 7 Jul 2018 12:39:31 -0700 Subject: [PATCH 2/9] Thing that sorta kinda works --- IEDispatcher.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/IEDispatcher.h b/IEDispatcher.h index 72c7349..c3dfb77 100644 --- a/IEDispatcher.h +++ b/IEDispatcher.h @@ -6,6 +6,13 @@ class IEDispatcher : public IDispatch public: IEDispatcher(void); ~IEDispatcher(void); - HRESULT IEDispatcher::QueryInterface(); - HRESULT IEDispatcher::QueryInterface(const IID &riid, void **ppvObject); + HRESULT STDMETHODCALLTYPE IEDispatcher::QueryInterface(const IID &riid, void **ppvObject); + ULONG STDMETHODCALLTYPE IEDispatcher::AddRef(); + ULONG STDMETHODCALLTYPE IEDispatcher::Release(); + HRESULT STDMETHODCALLTYPE IEDispatcher::GetTypeInfoCount(UINT *pctinfo); + HRESULT STDMETHODCALLTYPE IEDispatcher::GetTypeInfo(UINT, LCID, ITypeInfo **); + HRESULT STDMETHODCALLTYPE IEDispatcher::GetIDsOfNames(const IID &, LPOLESTR *, UINT, LCID, DISPID *); + HRESULT STDMETHODCALLTYPE IEDispatcher::Invoke(DISPID, const IID &, LCID, WORD, DISPPARAMS *, VARIANT *, EXCEPINFO *, UINT *); + + }; From bbab248209a562eb84a3d691b8c8dd3c9cfa1a92 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sat, 7 Jul 2018 12:41:08 -0700 Subject: [PATCH 3/9] l i n k e r e r r o r s --- IEDispatcher.h | 1 - main.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/IEDispatcher.h b/IEDispatcher.h index c3dfb77..9cc1e41 100644 --- a/IEDispatcher.h +++ b/IEDispatcher.h @@ -14,5 +14,4 @@ public: HRESULT STDMETHODCALLTYPE IEDispatcher::GetIDsOfNames(const IID &, LPOLESTR *, UINT, LCID, DISPID *); HRESULT STDMETHODCALLTYPE IEDispatcher::Invoke(DISPID, const IID &, LCID, WORD, DISPPARAMS *, VARIANT *, EXCEPINFO *, UINT *); - }; diff --git a/main.cpp b/main.cpp index 9d753fa..ae5545f 100644 --- a/main.cpp +++ b/main.cpp @@ -1594,7 +1594,7 @@ int main(int argc, char** argv) { try{ hresult = OleInitialize(NULL); hresult = CoCreateInstance(CLSID_G3d, NULL, CLSCTX_SERVER, IID_IUnknown, (void **)&punk); - hresult = punk->QueryInterface(IID_IDispatch, &pdisp); + hresult = punk->QueryInterface(IID_IDispatch, (void **)&pdisp); if (!AXRegister()) return 0; @@ -1634,7 +1634,7 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - MessageBox(NULL, "Failed to create HWND",placeholderName+" Crash", MB_OK); + MessageBox(NULL, "Failed to create HWND","HyperCube Crash", MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); From e7ea4c4b729b06f142129f7a6c1738ce651f9b3e Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sat, 7 Jul 2018 12:46:28 -0700 Subject: [PATCH 4/9] It compiles :+1: --- IEDispatcher.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/IEDispatcher.cpp b/IEDispatcher.cpp index bb2069c..10330f6 100644 --- a/IEDispatcher.cpp +++ b/IEDispatcher.cpp @@ -7,3 +7,34 @@ IEDispatcher::IEDispatcher(void) IEDispatcher::~IEDispatcher(void) { } + +HRESULT STDMETHODCALLTYPE IEDispatcher::QueryInterface(const IID &riid, void **ppvObject) +{ + return NULL; +} +ULONG STDMETHODCALLTYPE IEDispatcher::AddRef() +{ + return NULL; +} +ULONG STDMETHODCALLTYPE IEDispatcher::Release() +{ + return NULL; +} +HRESULT STDMETHODCALLTYPE IEDispatcher::GetTypeInfoCount(UINT *pctinfo) +{ + return NULL; +} +HRESULT STDMETHODCALLTYPE IEDispatcher::GetTypeInfo(UINT, LCID, ITypeInfo **) +{ + return NULL; +} +HRESULT STDMETHODCALLTYPE IEDispatcher::GetIDsOfNames(const IID &, LPOLESTR *, UINT, LCID, DISPID *) +{ + return NULL; +} +HRESULT STDMETHODCALLTYPE IEDispatcher::Invoke(DISPID, const IID &, LCID, WORD, DISPPARAMS *, VARIANT *, EXCEPINFO *, UINT *) + +{ + return NULL; +} + \ No newline at end of file From 0417060c1b16f490111d1ef7a10c1f11ddc9d50a Mon Sep 17 00:00:00 2001 From: scottbeebiwan <38970930+scottbeebiwan@users.noreply.github.com> Date: Sat, 7 Jul 2018 12:50:05 -0700 Subject: [PATCH 5/9] *someone somehow undid commit 341866b god dman it* --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index ae5545f..03d9604 100644 --- a/main.cpp +++ b/main.cpp @@ -1634,7 +1634,7 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - MessageBox(NULL, "Failed to create HWND","HyperCube Crash", MB_OK); + MessageBox(NULL, "Failed to create HWND",placeholderName+" Crash", MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); From 89d2d0b981a1400447d432ddb38ff7fe84b5b7ca Mon Sep 17 00:00:00 2001 From: scottbeebiwan <38970930+scottbeebiwan@users.noreply.github.com> Date: Sat, 7 Jul 2018 12:53:50 -0700 Subject: [PATCH 6/9] did you know im fucking stupid --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 03d9604..aed855b 100644 --- a/main.cpp +++ b/main.cpp @@ -1634,7 +1634,7 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - MessageBox(NULL, "Failed to create HWND",placeholderName+" Crash", MB_OK); + MessageBox(NULL, "Failed to create HWND",(PlaceholderName+" Crash").c_str(), MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); From 95d041bf5e7e23d97f3da69ea07a8fc86626f5ff Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sat, 7 Jul 2018 12:54:27 -0700 Subject: [PATCH 7/9] Fixed string --- main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 03d9604..7c54637 100644 --- a/main.cpp +++ b/main.cpp @@ -1634,7 +1634,8 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - MessageBox(NULL, "Failed to create HWND",placeholderName+" Crash", MB_OK); + std::string val = PlaceholderName + " Crash"; + MessageBox(NULL, "Failed to create HWND", val.c_str() , MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); From c00e52a9e228a6ca307a40965db6f67098d67755 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sat, 7 Jul 2018 12:57:00 -0700 Subject: [PATCH 8/9] Fixed message --- main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 5f6f082..7c54637 100644 --- a/main.cpp +++ b/main.cpp @@ -1634,7 +1634,8 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - MessageBox(NULL, "Failed to create HWND", PlaceholderName + " Crash", MB_OK); + std::string val = PlaceholderName + " Crash"; + MessageBox(NULL, "Failed to create HWND", val.c_str() , MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); From db4c46cf20d280b99ab13d892c809de8108d4862 Mon Sep 17 00:00:00 2001 From: scottbeebiwan <38970930+scottbeebiwan@users.noreply.github.com> Date: Sat, 7 Jul 2018 13:09:20 -0700 Subject: [PATCH 9/9] WHAT ARE YOU DOING IM TAKING A PIIIIISSS IM AN ENEMY YOUR SUPPOSED TO JUMP AT ME MOTHERFOCKUR --- main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 7c54637..d6c4073 100644 --- a/main.cpp +++ b/main.cpp @@ -1634,8 +1634,7 @@ int main(int argc, char** argv) { if(hwndMain == NULL) { - std::string val = PlaceholderName + " Crash"; - MessageBox(NULL, "Failed to create HWND", val.c_str() , MB_OK); + MessageBox(NULL, "Failed to create HWND", (PlaceholderName + " Crash").c_str() , MB_OK); return 0; } SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE));