Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MPLAY32] Remove szPrevFile and related code without removing the part that invokes the file open dialog if playback is started when no media file is opened. By Ricardo Hanke. CORE-8477

Browse source 
svn path=/trunk/; revision=66687
This commit is contained in:
Amine Khaldi 2015-03-14 12:05:49 +00:00
parent 5828eec88b
commit 6b8bf7348d
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/base/applications/mplay32/mplay32.c
View file

@ -18,7 +18,6 @@ HWND hToolBar = NULL;
HMENU hMainMenu = NULL;
TCHAR szAppTitle[256] = _T("");
TCHAR szPrevFile[MAX_PATH] = _T("");
TCHAR szDefaultFilter[MAX_PATH] = _T("");
TCHAR *szFilter = NULL;
@ -429,7 +428,6 @@ OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName)
MaxFilePos = mciStatus.dwReturn;
wDeviceId = mciOpen.wDeviceID;
StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName);
EnableMenuItems(hwnd);
@ -689,27 +687,14 @@ static VOID
OpenMediaFile(HWND hwnd, LPTSTR lpFileName)
{
MCIERROR mciError;
TCHAR szLocalFileName[MAX_PATH];
if (lpFileName == NULL)
{
if (szPrevFile[0] == _T('\0'))
return;
StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile);
}
else
{
StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName);
}
if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES)
if (GetFileAttributes(lpFileName) == INVALID_FILE_ATTRIBUTES)
return;
if (wDeviceId)
CloseMediaFile(hwnd);
mciError = OpenMciDevice(hwnd, NULL, szLocalFileName);
mciError = OpenMciDevice(hwnd, NULL, lpFileName);
if (mciError != 0)
{
ShowMCIError(hwnd, mciError);
@ -1103,10 +1088,7 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
}
else
{
if (szPrevFile[0] == _T('\0'))
OpenFileDialog(hwnd);
else
OpenMediaFile(hwnd, NULL);
OpenFileDialog(hwnd);
}
break;
}
@ -1137,7 +1119,6 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
return 0;
case IDM_CLOSE_FILE:
szPrevFile[0] = _T('\0');
CloseMediaFile(hwnd);
break;