Skip to content

Commit 2a9c91c

Browse files
committed
Fix MinGW C++ UUID
1 parent e02d407 commit 2a9c91c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ifeq ($(DETECTED_OS),Windows)
6565
LIB_DYN_OUT := $(WEBUI_OUT_LIB_NAME).dll
6666
LWS2_OPT := -lws2_32 -lole32
6767
WIN32_WV2_OBJ := win32_wv2.o
68-
CPP_FLAGS := -lstdc++
68+
CPP_FLAGS := -lstdc++ -luuid
6969
CIVETWEB_DEFINE_FLAGS += -DMUST_IMPLEMENT_CLOCK_GETTIME
7070
CXX ?= g++
7171
else ifeq ($(DETECTED_OS),Darwin)

src/webview/win32_wv2.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class WebView2Instance {
101101
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override {
102102
if (!ppvObject) return E_POINTER;
103103
*ppvObject = nullptr;
104-
if (riid == IID_IUnknown || riid == __uuidof(ICoreWebView2DocumentTitleChangedEventHandler)) {
104+
if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ICoreWebView2DocumentTitleChangedEventHandler)) {
105105
*ppvObject = static_cast<ICoreWebView2DocumentTitleChangedEventHandler*>(this);
106106
AddRef();
107107
return S_OK;
@@ -181,7 +181,7 @@ class WebView2Instance {
181181
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override {
182182
if (!ppvObject) return E_POINTER;
183183
*ppvObject = nullptr;
184-
if (riid == IID_IUnknown || riid == __uuidof(ICoreWebView2CreateCoreWebView2ControllerCompletedHandler)) {
184+
if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ICoreWebView2CreateCoreWebView2ControllerCompletedHandler)) {
185185
*ppvObject = static_cast<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler*>(this);
186186
AddRef();
187187
return S_OK;
@@ -258,7 +258,7 @@ class WebView2Instance {
258258
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override {
259259
if (!ppvObject) return E_POINTER;
260260
*ppvObject = nullptr;
261-
if (riid == IID_IUnknown || riid == __uuidof(ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler)) {
261+
if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler)) {
262262
*ppvObject = static_cast<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler*>(this);
263263
AddRef();
264264
return S_OK;

0 commit comments

Comments
 (0)