ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take control of win7 jumplist 

Register snes9x in OpenWithProgid for all supported extensions
Sync win7 jumplist with recent roms list
This commit is contained in:
OV2 2010-10-16 20:15:59 +02:00
parent 3a3245bc48
commit 872c1d8fb6
5 changed files with 348 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
win32/rsrc/snes9x.rc
View File

@ -740,7 +740,7 @@ BEGIN
BLOCK "080904b0"
BEGIN
VALUE "CompanyName", "http://www.snes9x.com"
VALUE "FileDescription", "Snes9XW"
VALUE "FileDescription", "Snes9X"
VALUE "FileVersion", "1.52"
VALUE "InternalName", "Snes9X"
VALUE "LegalCopyright", "Copyright 1996-2010"

427
win32/snes9xw.vcproj
View File

@ -1813,13 +1813,6 @@
<File
RelativePath="..\debug.cpp"
>
<FileConfiguration
Name="Debug+ASM|x64"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\debug.h"
@ -4387,188 +4380,6 @@
RelativePath=".\AVIOutput.h"
>
</File>
<File
RelativePath=".\CDirect3D.cpp"
>
</File>
<File
RelativePath=".\CDirect3D.h"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\CDirectDraw.cpp"
>
</File>
<File
RelativePath=".\CDirectDraw.h"
>
</File>
<File
RelativePath=".\CDirectSound.cpp"
>
</File>
<File
RelativePath=".\CDirectSound.h"
>
</File>
<File
RelativePath=".\CFMOD.cpp"
>
</File>
<File
RelativePath=".\CFMOD.h"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\CFMODEx.cpp"
>
</File>
<File
RelativePath=".\CFMODEx.h"
>
</File>
<File
RelativePath=".\COpenGL.cpp"
>
</File>
<File
RelativePath=".\COpenGL.h"
>
</File>
<File
RelativePath=".\CXAudio2.cpp"
>
</File>
<File
RelativePath=".\CXAudio2.h"
>
</File>
<File
RelativePath=".\InputCustom.cpp"
>
@ -4577,14 +4388,6 @@
RelativePath=".\InputCustom.h"
>
</File>
<File
RelativePath=".\IS9xDisplayOutput.h"
>
</File>
<File
RelativePath=".\IS9xSoundOutput.h"
>
</File>
<File
RelativePath=".\render.cpp"
>
@ -4593,22 +4396,6 @@
RelativePath=".\render.h"
>
</File>
<File
RelativePath=".\snes_ntsc.c"
>
</File>
<File
RelativePath=".\snes_ntsc.h"
>
</File>
<File
RelativePath=".\snes_ntsc_config.h"
>
</File>
<File
RelativePath=".\snes_ntsc_impl.h"
>
</File>
<File
RelativePath=".\wconfig.cpp"
>
@ -4645,6 +4432,204 @@
RelativePath=".\wsnes9x.h"
>
</File>
<Filter
Name="SoundDriver"
>
<File
RelativePath=".\CDirectSound.cpp"
>
</File>
<File
RelativePath=".\CDirectSound.h"
>
</File>
<File
RelativePath=".\CFMOD.cpp"
>
</File>
<File
RelativePath=".\CFMOD.h"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\CFMODEx.cpp"
>
</File>
<File
RelativePath=".\CFMODEx.h"
>
</File>
<File
RelativePath=".\CXAudio2.cpp"
>
</File>
<File
RelativePath=".\CXAudio2.h"
>
</File>
<File
RelativePath=".\IS9xSoundOutput.h"
>
</File>
</Filter>
<Filter
Name="VideoDriver"
>
<File
RelativePath=".\CDirect3D.cpp"
>
</File>
<File
RelativePath=".\CDirect3D.h"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release+ASM|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Unicode|x64"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\CDirectDraw.cpp"
>
</File>
<File
RelativePath=".\CDirectDraw.h"
>
</File>
<File
RelativePath=".\COpenGL.cpp"
>
</File>
<File
RelativePath=".\COpenGL.h"
>
</File>
<File
RelativePath=".\IS9xDisplayOutput.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="i386"
@ -6975,6 +6960,22 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\snes_ntsc.c"
>
</File>
<File
RelativePath=".\snes_ntsc.h"
>
</File>
<File
RelativePath=".\snes_ntsc_config.h"
>
</File>
<File
RelativePath=".\snes_ntsc_impl.h"
>
</File>
</Filter>
<File
RelativePath=".\snes9x.cfg"

2
win32/wconfig.cpp
View File

@ -358,7 +358,7 @@ const char* WinParseCommandLineAndLoadConfigFile (char *line)
static char *parameters [MAX_PARAMETERS];
int count = 0;
parameters [count++] = "Snes9XW";
parameters [count++] = "Snes9X";
while (count < MAX_PARAMETERS && *p)
{

133
win32/wsnes9x.cpp
View File

@ -194,6 +194,7 @@
#include <shlobj.h>
#include <objidl.h>
#include <Shobjidl.h>
#include "wsnes9x.h"
#include "win32_sound.h"
@ -284,6 +285,11 @@ INT_PTR CALLBACK test(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
#define WM_CUSTKEYDOWN (WM_USER+50)
#define WM_CUSTKEYUP (WM_USER+51)
#ifdef UNICODE
#define S9XW_SHARD_PATH SHARD_PATHW
#else
#define S9XW_SHARD_PATH SHARD_PATHA
#endif
/*****************************************************************************/
/* Global variables */
@ -2602,7 +2608,6 @@ BOOL WinInit( HINSTANCE hInstance)
return FALSE;
GUI.hDC = GetDC (GUI.hWnd);
LoadExts();
GUI.GunSight = LoadCursor (hInstance, MAKEINTRESOURCE (IDC_CURSOR_SCOPE));
GUI.Arrow = LoadCursor (NULL, IDC_ARROW);
GUI.Accelerators = LoadAccelerators (hInstance, MAKEINTRESOURCE (IDR_SNES9X_ACCELERATORS));
@ -3190,6 +3195,8 @@ int WINAPI WinMain(
DWORD wSoundTimerRes;
LoadExts();
WinRegisterConfigItems ();
ConfigFile::SetAlphaSort(false);
@ -4010,6 +4017,58 @@ void S9xRemoveFromRecentGames (int i)
}
}
HRESULT Win7_JLSetRecentGames(ICustomDestinationList *pcdl, IObjectArray *poaRemoved, UINT maxSlots)
{
IObjectCollection *poc;
HRESULT hr = CoCreateInstance
(CLSID_EnumerableObjectCollection,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&poc));
if (SUCCEEDED(hr)) {
UINT max_list = MIN(maxSlots,GUI.MaxRecentGames);
for (UINT i = 0; i < max_list && *GUI.RecentGames[i]; i++) {
IShellItem *psi;
if(SUCCEEDED(SHCreateItemFromParsingName(GUI.RecentGames[i],NULL,IID_PPV_ARGS(&psi)))) {
hr = poc->AddObject(psi);
psi->Release();
}
}
IObjectArray *poa;
hr = poc->QueryInterface(IID_PPV_ARGS(&poa));
if (SUCCEEDED(hr)) {
hr = pcdl->AppendCategory(TEXT("ROMs"), poa);
poa->Release();
}
poc->Release();
}
return hr;
}
void Win7_CreateJumpList()
{
ICustomDestinationList *pcdl;
HRESULT hr = CoCreateInstance(
CLSID_DestinationList,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&pcdl));
if (SUCCEEDED(hr)) {
UINT maxSlots;
IObjectArray *poaRemoved;
hr = pcdl->BeginList(&maxSlots, IID_PPV_ARGS(&poaRemoved));
if (SUCCEEDED(hr)) {
hr = Win7_JLSetRecentGames(pcdl, poaRemoved,maxSlots);
if (SUCCEEDED(hr)) {
hr = pcdl->CommitList();
}
poaRemoved->Release();
}
pcdl->Release();
}
}
void S9xSetRecentGames ()
{
HMENU file = GetSubMenu (GUI.hMenu, 0);
@ -4063,6 +4122,7 @@ void S9xSetRecentGames ()
InsertMenuItem (recent, 0xFF00 + i, FALSE, &mii);
}
Win7_CreateJumpList();
}
}
}
@ -6503,6 +6563,75 @@ void SetInfoDlgColor(unsigned char r, unsigned char g, unsigned char b)
GUI.InfoColor=RGB(r,g,b);
}
#define SNES9XWPROGID TEXT("Snes9x.Win32")
#define SNES9XWPROGIDDESC TEXT("Snes9x ROM")
#define REGCREATEKEY(key,subkey) \
if(regResult=RegCreateKeyEx(key, subkey,\
0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE , NULL , &hKey, NULL ) != ERROR_SUCCESS){\
return false;\
}
#define REGSETVALUE(key,name,type,data,size) \
if(regResult=RegSetValueEx(key, name, NULL, type, (BYTE *)data, size) != ERROR_SUCCESS){\
RegCloseKey(hKey);\
return false;\
}
bool RegisterProgid() {
LONG regResult;
TCHAR szRegKey[PATH_MAX];
TCHAR szExeName[PATH_MAX];
HKEY hKey;
szRegKey[PATH_MAX-1]=TEXT('\0');
GetModuleFileName(NULL, szExeName, PATH_MAX);
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("Software\\Classes\\%s"),SNES9XWPROGID);
REGCREATEKEY(HKEY_CURRENT_USER, szRegKey)
int test = lstrlen(SNES9XWPROGIDDESC) + 1;
REGSETVALUE(hKey,NULL,REG_SZ,SNES9XWPROGIDDESC,22)
RegCloseKey(hKey);
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("Software\\Classes\\%s\\DefaultIcon"),SNES9XWPROGID);
REGCREATEKEY(HKEY_CURRENT_USER,szRegKey)
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("%s,0"),szExeName);
REGSETVALUE(hKey,NULL,REG_SZ,szRegKey,(lstrlen(szRegKey) + 1) * sizeof(TCHAR))
RegCloseKey(hKey);
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("Software\\Classes\\%s\\shell"),SNES9XWPROGID);
REGCREATEKEY(HKEY_CURRENT_USER,szRegKey)
REGSETVALUE(hKey,NULL,REG_SZ,TEXT("open"),5 * sizeof(TCHAR))
RegCloseKey(hKey);
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("Software\\Classes\\%s\\shell\\open\\command"),SNES9XWPROGID);
REGCREATEKEY(HKEY_CURRENT_USER,szRegKey)
_stprintf_s(szRegKey,PATH_MAX-1,TEXT("\"%s\" \"%%L\""),szExeName);
REGSETVALUE(hKey,NULL,REG_SZ,szRegKey,(lstrlen(szRegKey) + 1) * sizeof(TCHAR))
RegCloseKey(hKey);
return true;
}
bool RegisterExt(TCHAR *ext) {
LONG regResult;
TCHAR szRegKey[PATH_MAX];
HKEY hKey;
_stprintf(szRegKey,TEXT("Software\\Classes\\.%s\\OpenWithProgids"),ext);
REGCREATEKEY(HKEY_CURRENT_USER,szRegKey)
REGSETVALUE(hKey,SNES9XWPROGID,REG_NONE,NULL,NULL)
RegCloseKey(hKey);
return true;
}
void RegisterExts(void) {
ExtList *curr=valid_ext;
while(curr->next!=NULL) {
RegisterExt(curr->extension);
curr=curr->next;
}
}
void ClearExts(void)
{
ExtList* temp;
@ -6578,6 +6707,8 @@ void LoadExts(void)
curr=valid_ext;
valid_ext=valid_ext->next;
delete curr;
RegisterProgid();
RegisterExts();
}
void MakeExtFile(void)

1
win32/wsnes9x.h
View File

@ -208,7 +208,6 @@
#define COUNT(a) (sizeof (a) / sizeof (a[0]))
#define GUI_VERSION 1008
extern unsigned char* SoundBuffer;
#define MAX_RECENT_GAMES_LIST_SIZE 32
#define MAX_RECENT_HOSTS_LIST_SIZE 16