Commit: 740abc7706761ab0ea92a2954c0f4adddb245151 - PeerCastIM (git)

FLVなど sext styp のついた配信のリレーができない問題を修正するパッチ

Commit MetaInfo

• Revision: 740abc7706761ab0ea92a2954c0f4adddb245151 (tree)
• Time: 2010-10-23 00:45:34
• Author: eru <eru01@user...>
• Commiter: eru

Log Message

Jumplistへの対応（の下準備）

Change Summary

• modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
• modified: PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
• modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
• modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

Incremental Difference

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
@@ -82,6 +82,8 @@ ThreadInfo trafficDlgThread;
 HWND trafficDlg = NULL;
 FileStream fs;
 
+bool jumpListEnabled = false; // jumplist flag (only for win7 or later)
+
 // プロトタイプ宣言
 void createGUI(HWND);
 LRESULT CALLBACK TrafficDlgProc(HWND, UINT, WPARAM, LPARAM);
@@ -283,14 +285,27 @@ int WinMainDummy(HINSTANCE hInstance,
 	WIN32_FIND_DATA fd; //JP-EX
 	HANDLE hFind; //JP-EX
 
-	OSVERSIONINFO osInfo; //JP-EX
-	osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); //JP-EX
-	GetVersionEx(&osInfo);
+	OSVERSIONINFOEX osInfo; //JP-EX
+	osInfo.dwOSVersionInfoSize = sizeof(osInfo); //JP-EX
+	GetVersionEx(reinterpret_cast<LPOSVERSIONINFO>(&osInfo));
 	if (osInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
 		winDistinctionNT = true;
 	else
 		winDistinctionNT = false;
 
+	// for Windows7 or later
+	if ((osInfo.wProductType == VER_NT_WORKSTATION
+		&& osInfo.dwMajorVersion == 6
+		&& osInfo.dwMinorVersion == 1)
+		||
+		(osInfo.dwMajorVersion == 6
+		&& osInfo.dwMinorVersion > 1)
+		||
+		osInfo.dwMajorVersion > 6)
+	{
+		jumpListEnabled = true;
+	}
+
 	// off by default now
 	showGUI = false;
 

--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
@@ -56,6 +56,8 @@ bool shownChannels=false;
 WINDOWPLACEMENT winPlace;
 bool guiFlg = false;
 
+extern bool jumpListEnabled;
+
 using namespace Gdiplus;
 
 #include <comdef.h>
@@ -1534,6 +1536,11 @@ void WmCreateProc(HWND hwnd){
 	img_broad_ok = ::new Image(bstr);
 	bstr = L"ST_BROAD_FULL.bmp";
 	img_broad_full = ::new Image(bstr);
+
+	// jumplist
+	if (jumpListEnabled)
+	{
+	}
 }
 
 void WmPaintProc(HWND hwnd){

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.cpp
@@ -82,6 +82,8 @@ ThreadInfo trafficDlgThread;
 HWND trafficDlg = NULL;
 FileStream fs;
 
+bool jumpListEnabled = false; // jumplist flag (only for win7 or later)
+
 // プロトタイプ宣言
 void createGUI(HWND);
 LRESULT CALLBACK TrafficDlgProc(HWND, UINT, WPARAM, LPARAM);
@@ -283,14 +285,27 @@ int WinMainDummy(HINSTANCE hInstance,
 	WIN32_FIND_DATA fd; //JP-EX
 	HANDLE hFind; //JP-EX
 
-	OSVERSIONINFO osInfo; //JP-EX
-	osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); //JP-EX
-	GetVersionEx(&osInfo);
+	OSVERSIONINFOEX osInfo; //JP-EX
+	osInfo.dwOSVersionInfoSize = sizeof(osInfo); //JP-EX
+	GetVersionEx(reinterpret_cast<LPOSVERSIONINFO>(&osInfo));
 	if (osInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
 		winDistinctionNT = true;
 	else
 		winDistinctionNT = false;
 
+	// for Windows7 or later
+	if ((osInfo.wProductType == VER_NT_WORKSTATION
+		&& osInfo.dwMajorVersion == 6
+		&& osInfo.dwMinorVersion == 1)
+		||
+		(osInfo.dwMajorVersion == 6
+		&& osInfo.dwMinorVersion > 1)
+		||
+		osInfo.dwMajorVersion > 6)
+	{
+		jumpListEnabled = true;
+	}
+
 	// off by default now
 	showGUI = false;
 

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp
@@ -56,6 +56,8 @@ bool shownChannels=false;
 WINDOWPLACEMENT winPlace;
 bool guiFlg = false;
 
+extern bool jumpListEnabled;
+
 using namespace Gdiplus;
 
 #include <comdef.h>
@@ -1534,6 +1536,11 @@ void WmCreateProc(HWND hwnd){
 	img_broad_ok = ::new Image(bstr);
 	bstr = L"ST_BROAD_FULL.bmp";
 	img_broad_full = ::new Image(bstr);
+
+	// jumplist
+	if (jumpListEnabled)
+	{
+	}
 }
 
 void WmPaintProc(HWND hwnd){