From ba2cd4d5a3123b155a5587b59bb1c2776a244bfc Mon Sep 17 00:00:00 2001 From: cast1e Date: Mon, 14 Oct 2024 15:20:18 +0800 Subject: [PATCH] core update --- wallitor-core/dllmain.cpp | 8 +++- wallitor-core/playerInstance.cpp | 64 ++++++++++---------------------- wallitor-core/playerInstance.h | 3 +- 3 files changed, 27 insertions(+), 48 deletions(-) diff --git a/wallitor-core/dllmain.cpp b/wallitor-core/dllmain.cpp index 8f2ce33..b5c53bb 100644 --- a/wallitor-core/dllmain.cpp +++ b/wallitor-core/dllmain.cpp @@ -20,12 +20,16 @@ BOOL APIENTRY DllMain( HMODULE hModule, playerInstance* player_instance = NULL; - extern "C" __declspec(dllexport) BOOL init(const char* ffpath,const char* videoPath, BOOL mute) { + extern "C" __declspec(dllexport) void init(const char* ffpath,const char* videoPath, BOOL mute) { player_instance = new playerInstance(conFig(ffpath, videoPath, mute)); - return player_instance->generate(); + player_instance->generate(); } extern "C" __declspec(dllexport) void destroy() { player_instance->exit(); delete player_instance; } + + extern "C" __declspec(dllexport) BOOL set_wallpaper(const char* window_title) { + return set_as_wallpaper(window_title); + } diff --git a/wallitor-core/playerInstance.cpp b/wallitor-core/playerInstance.cpp index e0d31c5..e421cc3 100644 --- a/wallitor-core/playerInstance.cpp +++ b/wallitor-core/playerInstance.cpp @@ -1,7 +1,5 @@ #include "pch.h" #include "playerInstance.h" -#include -#include playerInstance::playerInstance(const conFig& config) { this->config = config; @@ -18,33 +16,6 @@ static BOOL CALLBACK EnumWindowsProc(_In_ HWND hwnd, _In_ LPARAM Lparam) { return TRUE; } -HWND findWindowTimeOut(const wchar_t* name, int timeoutMillis) { - auto start = std::chrono::steady_clock::now(); - HWND hwnd = nullptr; - - while (true) { - // 使用 FindWindowW 查找窗口 - hwnd = FindWindowW(name, 0); - - // 如果找到窗口，则返回 - if (hwnd != nullptr) { - return hwnd; - } - - // 计算当前经过的时间 - auto now = std::chrono::steady_clock::now(); - int elapsedMillis = std::chrono::duration_cast(now - start).count(); - - // 如果超时，则返回 nullptr - if (elapsedMillis > timeoutMillis) { - return nullptr; - } - - // 等待一段时间（例如100毫秒）再尝试查找 - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - } -} - BOOL playerInstance::showWindow(LPCWSTR lpParameter) { if (this->hFfplay != NULL) { DWORD dwPID = 0; @@ -54,20 +25,14 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { system(strCmd); } STARTUPINFO si{ 0 }; - //si.dwFlags = STARTF_USESHOWWINDOW; - //si.wShowWindow = SW_HIDE; + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_HIDE; PROCESS_INFORMATION pi{ 0 }; if (CreateProcess(this->config.ffpath.c_str(), (LPWSTR)lpParameter, 0, 0, 0, CREATE_NO_WINDOW, 0, 0, &si, &pi)) { - //Sleep(600);//等待视频播放器启动完成 - //HWND hProgman = FindWindow(L"Progman", 0);// 找到PI窗口 - HWND hProgman = findWindowTimeOut(L"Progman",2000); - std::this_thread::sleep_for(std::chrono::milliseconds(300)); - if (hProgman == nullptr) return FALSE; - SendMessageTimeout(hProgman, 0x052c, 0, 0, 0, 300, 0);// 给它发特殊消息 - //this->hFfplay = FindWindowW(L"SDL_app", 0);// 找到视频窗口 - this->hFfplay = findWindowTimeOut(L"SDL_app", 2000); - std::this_thread::sleep_for(std::chrono::milliseconds(300)); - if (this->hFfplay == nullptr) return FALSE; + Sleep(600);//等待视频播放器启动完成 + HWND hProgman = FindWindow(L"Progman", 0);// 找到PI窗口 + SendMessageTimeout(hProgman, 0x052c, 0, 0, 0, 100, 0);// 给它发特殊消息 + this->hFfplay = FindWindowW(L"SDL_app", 0);// 找到视频窗口 SetParent(hFfplay, hProgman);// 将视频窗口设苦为PM的子窗口 int systemWidth = GetSystemMetrics(0); int systemHeight = GetSystemMetrics(1); @@ -84,8 +49,6 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { MoveWindow(hFfplay, 0, x, cRct.right - cRct.left, cRct.bottom - cRct.top, 0); }*/ EnumWindows(EnumWindowsProc, 0);// 找到第二个workerw窗口并隐藏它 - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); return TRUE; } CloseHandle(pi.hProcess); @@ -93,7 +56,7 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { return FALSE; } -BOOL playerInstance::generate() { +void playerInstance::generate() { std::wstring fcmd = L" \""; fcmd += this->config.videoPath + L"\""; fcmd += L" -noborder -loop 0"; @@ -101,7 +64,7 @@ BOOL playerInstance::generate() { fcmd += L" -an"; } fcmd += L" -fs"; - return this->showWindow(fcmd.c_str()); + this->showWindow(fcmd.c_str()); } void playerInstance::exit() { @@ -112,4 +75,15 @@ void playerInstance::exit() { sprintf_s(strCmd, "taskkill /pid %d -f", dwPID); system(strCmd); } +} + +BOOL set_as_wallpaper(const char* window_title) { + HWND hProgman = FindWindow(L"Progman", 0);// 找到PI窗口 + SendMessageTimeout(hProgman, 0x052c, 0, 0, 0, 100, 0);// 给它发特殊消息 + std::string tmp = window_title; + HWND player = FindWindowW(0, std::wstring(tmp.begin(), tmp.end()).c_str());// 找到视频窗口 + if (player == NULL) return FALSE; + SetParent(player, hProgman);// 将视频窗口设苦为PM的子窗口 + EnumWindows(EnumWindowsProc, 0);// 找到第二个workerw窗口并隐藏它 + return TRUE; } \ No newline at end of file diff --git a/wallitor-core/playerInstance.h b/wallitor-core/playerInstance.h index 2809f97..5595f96 100644 --- a/wallitor-core/playerInstance.h +++ b/wallitor-core/playerInstance.h @@ -9,7 +9,8 @@ private: public: playerInstance(const conFig& config); BOOL showWindow(LPCWSTR lpParameter); - BOOL generate(); + void generate(); void exit(); }; +BOOL set_as_wallpaper(const char* window_title); \ No newline at end of file