Public-Mirror/LunaTranslator
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaTranslator.git synced 2024-12-27 15:44:12 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-11-15 03:30:21 +08:00
parent d81aa161e4
commit b63d00ebff
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/winsharedutils/CMakeLists.txt
View File

@ -14,7 +14,7 @@ add_library(winsharedutils MODULE mp3enc.cpp webview2_extra.cpp AreoAcrylic.cpp
applicationloopbackaudio/runer.cpp applicationloopbackaudio/LoopbackCapture.cpp applicationloopbackaudio/runer.cpp applicationloopbackaudio/LoopbackCapture.cpp
SimpleBrowser.cpp MWebBrowser.cpp icon.cpp ${versioninfo}) SimpleBrowser.cpp MWebBrowser.cpp icon.cpp ${versioninfo})
target_precompile_headers(winsharedutils REUSE_FROM pch) target_precompile_headers(winsharedutils REUSE_FROM pch)
target_link_libraries(winsharedutils tinymp3 Shcore rapidfuzz wil webview2 Mfplat mfuuid Mmdevapi ${YY_Thunks_for_WinXP}) target_link_libraries(winsharedutils tinymp3 rapidfuzz wil webview2 Mfplat mfuuid Mmdevapi ${YY_Thunks_for_WinXP})
target_link_options(winsharedutils PRIVATE "/DELAYLOAD:Mmdevapi.dll") target_link_options(winsharedutils PRIVATE "/DELAYLOAD:Mmdevapi.dll")
target_link_options(winsharedutils PRIVATE "/DELAYLOAD:Mfplat.dll") target_link_options(winsharedutils PRIVATE "/DELAYLOAD:Mfplat.dll")
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)

25
cpp/winsharedutils/webview2_extra.cpp
View File

@ -11,8 +11,10 @@ using namespace Microsoft::WRL;
if (FAILED((x))) \ if (FAILED((x))) \
return x; return x;
#endif
DECLARE_API void set_transparent_background(void *m_host) DECLARE_API void set_transparent_background(void *m_host)
{ {
#ifndef WINXP
COREWEBVIEW2_COLOR color; COREWEBVIEW2_COLOR color;
ZeroMemory(&color, sizeof(color)); ZeroMemory(&color, sizeof(color));
wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host)); wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host));
@ -22,10 +24,12 @@ DECLARE_API void set_transparent_background(void *m_host)
{ {
coreWebView2->put_DefaultBackgroundColor(color); coreWebView2->put_DefaultBackgroundColor(color);
} }
#endif
} }
DECLARE_API void put_PreferredColorScheme(void *m_host, COREWEBVIEW2_PREFERRED_COLOR_SCHEME scheme) DECLARE_API void put_PreferredColorScheme(void *m_host, COREWEBVIEW2_PREFERRED_COLOR_SCHEME scheme)
{ {
#ifndef WINXP
wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host)); wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host));
wil::com_ptr<ICoreWebView2> coreWebView2; wil::com_ptr<ICoreWebView2> coreWebView2;
[&]() [&]()
@ -40,9 +44,11 @@ DECLARE_API void put_PreferredColorScheme(void *m_host, COREWEBVIEW2_PREFERRED_C
} }
return S_OK; return S_OK;
}(); }();
#endif
} }
DECLARE_API void *add_ZoomFactorChanged(void *m_host, void (*signal)(double)) DECLARE_API void *add_ZoomFactorChanged(void *m_host, void (*signal)(double))
{ {
#ifndef WINXP
EventRegistrationToken *m_zoomFactorChangedToken = new EventRegistrationToken; EventRegistrationToken *m_zoomFactorChangedToken = new EventRegistrationToken;
// Register a handler for the ZoomFactorChanged event. // Register a handler for the ZoomFactorChanged event.
// This handler just announces the new level of zoom on the window's title bar. // This handler just announces the new level of zoom on the window's title bar.
@ -61,26 +67,38 @@ DECLARE_API void *add_ZoomFactorChanged(void *m_host, void (*signal)(double))
.Get(), .Get(),
m_zoomFactorChangedToken); m_zoomFactorChangedToken);
return m_zoomFactorChangedToken; return m_zoomFactorChangedToken;
#else
return NULL;
#endif
} }
DECLARE_API void remove_ZoomFactorChanged(void *m_host, void *m_zoomFactorChangedToken) DECLARE_API void remove_ZoomFactorChanged(void *m_host, void *m_zoomFactorChangedToken)
{ {
#ifndef WINXP
auto token = reinterpret_cast<EventRegistrationToken *>(m_zoomFactorChangedToken); auto token = reinterpret_cast<EventRegistrationToken *>(m_zoomFactorChangedToken);
reinterpret_cast<ICoreWebView2Controller *>(m_host)->remove_ZoomFactorChanged(*token); reinterpret_cast<ICoreWebView2Controller *>(m_host)->remove_ZoomFactorChanged(*token);
delete token; delete token;
#endif
} }
DECLARE_API double get_ZoomFactor(void *m_host) DECLARE_API double get_ZoomFactor(void *m_host)
{ {
#ifndef WINXP
double zoomFactor; double zoomFactor;
reinterpret_cast<ICoreWebView2Controller *>(m_host)->get_ZoomFactor(&zoomFactor); reinterpret_cast<ICoreWebView2Controller *>(m_host)->get_ZoomFactor(&zoomFactor);
return zoomFactor; return zoomFactor;
#else
return 1;
#endif
} }
DECLARE_API void put_ZoomFactor(void *m_host, double zoomFactor) DECLARE_API void put_ZoomFactor(void *m_host, double zoomFactor)
{ {
#ifndef WINXP
reinterpret_cast<ICoreWebView2Controller *>(m_host)->put_ZoomFactor(zoomFactor); reinterpret_cast<ICoreWebView2Controller *>(m_host)->put_ZoomFactor(zoomFactor);
#endif
} }
// https://github.com/MicrosoftEdge/WebView2Feedback/blob/main/specs/WebMessageObjects.md // https://github.com/MicrosoftEdge/WebView2Feedback/blob/main/specs/WebMessageObjects.md
DECLARE_API void remove_WebMessageReceived(void *m_host, void *m_webMessageReceivedToken) DECLARE_API void remove_WebMessageReceived(void *m_host, void *m_webMessageReceivedToken)
{ {
#ifndef WINXP
auto token = reinterpret_cast<EventRegistrationToken *>(m_webMessageReceivedToken); auto token = reinterpret_cast<EventRegistrationToken *>(m_webMessageReceivedToken);
wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host)); wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host));
wil::com_ptr<ICoreWebView2> m_webView; wil::com_ptr<ICoreWebView2> m_webView;
@ -91,10 +109,12 @@ DECLARE_API void remove_WebMessageReceived(void *m_host, void *m_webMessageRecei
return S_OK; return S_OK;
}(); }();
delete token; delete token;
#endif
} }
DECLARE_API void *add_WebMessageReceived(void *m_host, void (*callback)(const wchar_t *)) DECLARE_API void *add_WebMessageReceived(void *m_host, void (*callback)(const wchar_t *))
{ {
#ifndef WINXP
wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host)); wil::com_ptr<ICoreWebView2Controller> m_controller(reinterpret_cast<ICoreWebView2Controller *>(m_host));
wil::com_ptr<ICoreWebView2Controller4> coreWebView4 = wil::com_ptr<ICoreWebView2Controller4> coreWebView4 =
m_controller.try_query<ICoreWebView2Controller4>(); m_controller.try_query<ICoreWebView2Controller4>();
@ -159,6 +179,7 @@ DECLARE_API void *add_WebMessageReceived(void *m_host, void (*callback)(const wc
return S_OK; return S_OK;
}(); }();
return m_webMessageReceivedToken; return m_webMessageReceivedToken;
#else
return NULL;
#endif
} }
#endif