Added correct IDs for the docked bars. This fixes all known crashes with MSVC2010 builds.

Patch by heksesang

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2267 10f7b99b-c216-0410-bff0-8a66a9350fd8

7 files changed, 15 insertions, 9 deletions

diff --git a/src/apps/mplayerc/ChangeLog b/src/apps/mplayerc/ChangeLog
index 075e5c632..620d88f9e 100644
--- a/src/apps/mplayerc/ChangeLog
+++ b/src/apps/mplayerc/ChangeLog
@@ -79,18 +79,23 @@ v1.x.x.x - unreleased
  FIXED  : Name of MPC-HC in title bar (Bug #2826963)

  FIXED  : Web interface status.html not showing status/media state when Status bar is turned off (Bug #2025675)

  FIXED  : Ticket #12, crash/hang after standby, hibernate, UAC or CTRL+ALT+DEL

+ FIXED  : Ticket #74, [MP4] AAC sound stops playing

  FIXED  : Ticket #116, issue some MPEG(mono) audio playback

+ FIXED  : Ticket #120, Inner PCM inside QT .mov is supported now

  FIXED  : Ticket #150, issue with playback AMR sound

  FIXED  : Ticket #161 and #414, "no audio capture device"

  FIXED  : Ticket #163, Crash with RealMedia

- FIXED  : Ticket #237: DVB channels are all saved as number 0 when tuning

+ FIXED  : Ticket #237, DVB channels are all saved as number 0 when tuning

+ FIXED  : Ticket #242, No PCM sowt audio in MOV

  FIXED  : Ticket #258, speaker configuration (>Audio Switcher) isn't stored

  FIXED  : Ticket #282, Auto-zoom function problem

  FIXED  : Ticket #295, SSA/ASS and other save subtitle formats problem

  FIXED  : Ticket #300, Regression when hiding Caption and Menubar

+ FIXED  : Ticket #333, Missing tracks when playing a TS file

  FIXED  : Ticket #363, #563, Can't open some mp3

  FIXED  : Ticket #455, Bug with PGS subtitles

  FIXED  : Ticket #456, Problem with auto-loading subtitles fixed

+ FIXED  : Ticket #465, MPEG/TS splitter can't recognize some video track

  FIXED  : Ticket #477, Internal audio switcher

  FIXED  : Ticket #489, MPC-HC API improvements

  FIXED  : Ticket #502, Problem with D3D9Ex

@@ -137,6 +142,7 @@ v1.x.x.x - unreleased
  FIXED  : Logical/numeric sorting in Playlist, "Play next in the folder"

  FIXED  : OSD on open BD

  FIXED  : MPEGSplitter - could not read some MPEG files

+ FIXED  : Crashes with MSVC2010 builds

 

 

 v1.3.1249.0 - 26 august 2009

@@ -218,7 +224,7 @@ v1.2.908.0 - 30.November 2008
  FIXED  : Crash with CoreAVC when changing "preferred decoder" setting during playback

  FIXED  : Missing checkmarks on "tearing test" and "display stats" options (bug #2010857)

  FIXED  : Save image/thumbnail not working with EVR (bug #2010681)

- FIXED  : Workaround to prevent GraphEdit crash when MpcVideoDec.ax was registered (when opening menu "Graph/Insert filter/Direct show filters")

+ FIXED  : Workaround to prevent GraphEdit crash when MPCVideoDec.ax was registered (when opening menu "Graph/Insert filter/Direct show filters")

  FIXED  : Fix rare seeking issue with VobSubs in VSFilter

  FIXED  : Subtitle style not save in settings.

  FIXED  : random freeze when using mpc-hc, vsfilter and Haali renderer at the same time

diff --git a/src/apps/mplayerc/EditListEditor.cpp b/src/apps/mplayerc/EditListEditor.cpp
index 28d035513..ae4074c9e 100644
--- a/src/apps/mplayerc/EditListEditor.cpp
+++ b/src/apps/mplayerc/EditListEditor.cpp
@@ -104,7 +104,7 @@ END_MESSAGE_MAP()
 

 BOOL CEditListEditor::Create(CWnd* pParentWnd)

 {

-	if(!CSizingControlBarG::Create(_T("Edit list editor"), pParentWnd, 0))

+	if(!CSizingControlBarG::Create(_T("Edit list editor"), pParentWnd, ID_VIEW_EDITLISTEDITOR))

 		return FALSE;

 

 	m_stUsers.Create (_T("User :"), WS_VISIBLE|WS_CHILD, CRect (5,5,100,21), this, 0);

diff --git a/src/apps/mplayerc/PlayerCaptureBar.cpp b/src/apps/mplayerc/PlayerCaptureBar.cpp
index b4520c432..be5c1feab 100644
--- a/src/apps/mplayerc/PlayerCaptureBar.cpp
+++ b/src/apps/mplayerc/PlayerCaptureBar.cpp
@@ -40,7 +40,7 @@ CPlayerCaptureBar::~CPlayerCaptureBar()
 

 BOOL CPlayerCaptureBar::Create(CWnd* pParentWnd)

 {

-	if(!baseCPlayerCaptureBar::Create(_T("Capture Settings"), pParentWnd, 0))

+	if(!baseCPlayerCaptureBar::Create(_T("Capture Settings"), pParentWnd, ID_VIEW_CAPTURE))

 		return FALSE;

 

 	m_capdlg.Create(this);

diff --git a/src/apps/mplayerc/PlayerNavigationBar.cpp b/src/apps/mplayerc/PlayerNavigationBar.cpp
index a7cd20814..811f9f945 100644
--- a/src/apps/mplayerc/PlayerNavigationBar.cpp
+++ b/src/apps/mplayerc/PlayerNavigationBar.cpp
@@ -40,7 +40,7 @@ CPlayerNavigationBar::~CPlayerNavigationBar()
 

 BOOL CPlayerNavigationBar::Create(CWnd* pParentWnd)

 {

-	if(!baseCPlayerNavigationBar::Create(_T("Navigation bar"), pParentWnd, 0))

+	if(!baseCPlayerNavigationBar::Create(_T("Navigation bar"), pParentWnd, ID_VIEW_NAVIGATION))

 		return FALSE;

 

 	m_pParent = pParentWnd;

diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp
index dd71c57da..a1163499c 100644
--- a/src/apps/mplayerc/PlayerPlaylistBar.cpp
+++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp
@@ -47,7 +47,7 @@ CPlayerPlaylistBar::~CPlayerPlaylistBar()
 

 BOOL CPlayerPlaylistBar::Create(CWnd* pParentWnd)

 {

-	if(!CSizingControlBarG::Create(_T("Playlist"), pParentWnd, 0))

+	if(!CSizingControlBarG::Create(_T("Playlist"), pParentWnd, ID_VIEW_PLAYLIST))

 		return FALSE;

 

 	m_list.CreateEx(

@@ -891,7 +891,7 @@ void CPlayerPlaylistBar::OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult)
 	}

 	else if(CDDS_ITEMPOSTPAINT == pLVCD->nmcd.dwDrawStage)

 	{

-        int nItem = static_cast<int>(pLVCD->nmcd.dwItemSpec);

+		int nItem = static_cast<int>(pLVCD->nmcd.dwItemSpec);

 

 		if(m_list.GetItemState(pLVCD->nmcd.dwItemSpec, LVIS_SELECTED))

 		{

diff --git a/src/apps/mplayerc/PlayerShaderEditorBar.cpp b/src/apps/mplayerc/PlayerShaderEditorBar.cpp
index 84b6742e4..a29aceefa 100644
--- a/src/apps/mplayerc/PlayerShaderEditorBar.cpp
+++ b/src/apps/mplayerc/PlayerShaderEditorBar.cpp
@@ -38,7 +38,7 @@ CPlayerShaderEditorBar::~CPlayerShaderEditorBar()
 

 BOOL CPlayerShaderEditorBar::Create(CWnd* pParentWnd)

 {

-	if(!__super::Create(ResStr(IDS_AG_SHADER_EDITOR), pParentWnd, 0))

+	if(!__super::Create(ResStr(IDS_AG_SHADER_EDITOR), pParentWnd, ID_VIEW_SHADEREDITOR))

 		return FALSE;

 

 	m_dlg.Create(this);

diff --git a/src/apps/mplayerc/PlayerSubresyncBar.cpp b/src/apps/mplayerc/PlayerSubresyncBar.cpp
index e54f0fdb6..e46470af7 100644
--- a/src/apps/mplayerc/PlayerSubresyncBar.cpp
+++ b/src/apps/mplayerc/PlayerSubresyncBar.cpp
@@ -43,7 +43,7 @@ CPlayerSubresyncBar::~CPlayerSubresyncBar()
 

 BOOL CPlayerSubresyncBar::Create(CWnd* pParentWnd, CCritSec* pSubLock)

 {

-	if(!CSizingControlBarG::Create(_T("Subresync"), pParentWnd, 0))

+	if(!CSizingControlBarG::Create(_T("Subresync"), pParentWnd, ID_VIEW_SUBRESYNC))

 		return FALSE;

 

 	m_pSubLock = pSubLock;