single instance & bug fixes

wallitor-core/conFig.cpp

@@ -1,22 +0,0 @@
-#include "pch.h"
-#include "conFig.h"
-
-conFig::conFig(const char* ffpath,const char* videoPath, BOOL mute) {
-	std::string tmp =ffpath;
-	this->ffpath = std::wstring(tmp.begin(), tmp.end());
-	tmp = videoPath;
-	this->videoPath = std::wstring(tmp.begin(), tmp.end());
-	this->mute = mute;
-}
-
-conFig::conFig(const conFig& config) {
-	this->ffpath = config.ffpath;
-	this->mute = config.mute;
-	this->videoPath = config.videoPath;
-}
-
-conFig::conFig() {
-	this->ffpath = L"";
-	this->mute = TRUE;
-	this->videoPath = L"";
-}

wallitor-core/conFig.h

@@ -1,13 +0,0 @@
-#pragma once
-#include <string>
-class conFig
-{
-public:
-	std::wstring ffpath;
-	std::wstring videoPath;
-	BOOL mute;
-	conFig(const char* ffpath, const char* videoPath,BOOL mute);
-	conFig(const conFig& config);
-	conFig();
-};
-

wallitor-core/dllmain.cpp

@@ -18,18 +18,6 @@ BOOL APIENTRY DllMain( HMODULE hModule,
     return TRUE;
 }
 
-playerInstance* player_instance = NULL;
-
- extern "C" __declspec(dllexport) void init(const char* ffpath,const char* videoPath, BOOL mute) {
-     player_instance = new playerInstance(conFig(ffpath, videoPath, mute));
-     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);
  }

wallitor-core/playerInstance.cpp

@@ -1,11 +1,6 @@
 #include "pch.h"
 #include "playerInstance.h"
 
-playerInstance::playerInstance(const conFig& config) {
-	this->config = config;
-	this->hFfplay = NULL;
-}
-
 HWND hWorkerw = NULL;
 
 static BOOL CALLBACK EnumWindowsProc(_In_ HWND hwnd, _In_ LPARAM Lparam) {
@@ -17,67 +12,6 @@ static BOOL CALLBACK EnumWindowsProc(_In_ HWND hwnd, _In_ LPARAM Lparam) {
 	return TRUE;
 }
 
-BOOL playerInstance::showWindow(LPCWSTR lpParameter) {
-	if (this->hFfplay != NULL) {
-		DWORD dwPID = 0;
-		GetWindowThreadProcessId(hFfplay, &dwPID);
-		char strCmd[MAX_PATH] = { 0 };
-		sprintf_s(strCmd, "taskkill /pid %d -f", dwPID);
-		system(strCmd);
-	}
-	STARTUPINFO si{ 0 };
-	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窗口
-		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);
-		RECT cRct;
-		GetWindowRect(hFfplay, &cRct);
-		//if (horw) {
-			int width = cRct.right - cRct.left;
-			int x = (systemWidth - width) / 2;
-			MoveWindow(hFfplay, 0, 0, systemWidth, systemHeight, 1);
-		/* }
-		else {
-			int height = cRct.bottom - cRct.top;
-			int x = (sheight - height) / 2;
-			MoveWindow(hFfplay, 0, x, cRct.right - cRct.left, cRct.bottom - cRct.top, 0);
-		}*/
-		EnumWindows(EnumWindowsProc, 0);// 找到第二个workerw窗口并隐藏它
-		return TRUE;
-	}
-	CloseHandle(pi.hProcess);
-	CloseHandle(pi.hThread);
-	return FALSE;
-}
-
-void playerInstance::generate() {
-	std::wstring fcmd = L" \"";
-	fcmd += this->config.videoPath + L"\"";
-	fcmd += L" -noborder -loop 0";
-	if (this->config.mute) {
-		fcmd += L" -an";
-	}
-	fcmd += L" -fs";
-	this->showWindow(fcmd.c_str());
-}
-
-void playerInstance::exit() {
-	if (this->hFfplay != NULL) {
-		DWORD dwPID = 0;
-		GetWindowThreadProcessId(this->hFfplay, &dwPID);
-		char strCmd[MAX_PATH] = { 0 };
-		sprintf_s(strCmd, "taskkill /pid %d -f", dwPID);
-		system(strCmd);
-	}
-}
-
 BOOL try_find_worker(HWND hProgman,HWND hPlayer) {
 	HWND hWorkerW = FindWindowEx(hProgman, 0, L"WorkerW", 0);
 	if (hWorkerW != NULL) {
@@ -87,10 +21,9 @@ BOOL try_find_worker(HWND hProgman,HWND hPlayer) {
 	else return FALSE;
 }
 
-BOOL shell_in_progman(HWND hProgman) {
+HWND shell_in_progman(HWND hProgman) {
 	HWND hShell = FindWindowEx(hProgman, 0, L"SHELLDLL_DefView", 0);
-	if (hShell) return TRUE;
-	else return FALSE;
+	return hShell;
 }
 
 BOOL set_as_wallpaper(const char* window_title) {
@@ -99,8 +32,15 @@ BOOL set_as_wallpaper(const char* window_title) {
 	std::string tmp = window_title;
 	HWND hPlayer = FindWindowW(0, std::wstring(tmp.begin(), tmp.end()).c_str());// 找到视频窗口
 	if (hPlayer == NULL) return FALSE;
-	if (shell_in_progman(hProgman)) {
-		return try_find_worker(hProgman, hPlayer);
+	HWND hDefView = shell_in_progman(hProgman);
+	if (hDefView!=NULL) {
+		if (try_find_worker(hProgman, hPlayer)) {
+			ShowWindow(hDefView, SW_HIDE);
+			Sleep(0);
+			ShowWindow(hDefView, SW_SHOWNORMAL);
+			return TRUE;
+		}
+		else return FALSE;
 	}
 	else {
 		SetParent(hPlayer, hProgman);// 将视频窗口设苦为PM的子窗口

wallitor-core/playerInstance.h

@@ -1,17 +1,5 @@
 #pragma once
 #include <string>
-#include "conFig.h"
-class playerInstance
-{
-private:
-	HWND hFfplay;
-	conFig config;
-public:
-	playerInstance(const conFig& config);
-	BOOL showWindow(LPCWSTR lpParameter);
-	void generate();
-	void exit();
-};
 
 BOOL set_as_wallpaper(const char* window_title);
 BOOL detectWindowMaximized();

wallitor-core/wallitor-core.vcxproj

@@ -142,13 +142,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="conFig.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="playerInstance.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="conFig.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

wallitor-core/wallitor-core.vcxproj.filters

@@ -24,9 +24,6 @@
     <ClInclude Include="playerInstance.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="conFig.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -38,8 +35,5 @@
     <ClCompile Include="playerInstance.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="conFig.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>