Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 07:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved error handling

Browse source 
svn path=/trunk/; revision=18134
This commit is contained in:
Thomas Bluemel 2005-09-28 13:00:05 +00:00
parent afb1aa2562
commit e8285addc9
4 changed files with 68 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/sndvol32/misc.c
View file

@ -15,8 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* VMware is a registered trademark of VMware, Inc.
*/
/* $Id$
*

2
reactos/subsys/system/sndvol32/mixer.c
View file

@ -15,8 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* VMware is a registered trademark of VMware, Inc.
*/
/* $Id$
*

129
reactos/subsys/system/sndvol32/sndvol32.c
View file

@ -15,8 +15,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* VMware is a registered trademark of VMware, Inc.
*/
/* $Id$
*
@ -115,8 +113,6 @@ PrefDlgAddLine(PSND_MIXER Mixer,
{
PrefContext->SelectedLine = Line->dwLineID;
}
DPRINT("!%ws cControls: %d\n", Line->szName, Line->cControls);
}
else
goto AddToOthersLines;
@ -132,7 +128,6 @@ PrefDlgAddLine(PSND_MIXER Mixer,
{
PrefContext->SelectedLine = Line->dwLineID;
}
DPRINT("!%ws cControls: %d\n", Line->szName, Line->cControls);
}
else
goto AddToOthersLines;
@ -550,7 +545,7 @@ DeleteMixerWindowControls(PMIXER_WINDOW MixerWindow)
{
}
BOOL
static BOOL
RebuildMixerWindowControls(PMIXER_WINDOW MixerWindow)
{
DeleteMixerWindowControls(MixerWindow);
@ -558,7 +553,7 @@ RebuildMixerWindowControls(PMIXER_WINDOW MixerWindow)
return TRUE;
}
LRESULT CALLBACK
static LRESULT CALLBACK
MainWindowProc(HWND hwnd,
UINT uMsg,
WPARAM wParam,
@ -658,6 +653,7 @@ MainWindowProc(HWND hwnd,
{
DPRINT("Rebuilding mixer window controls failed!\n");
SndMixerDestroy(MixerWindow->Mixer);
MixerWindow->Mixer = NULL;
Result = -1;
}
}
@ -770,14 +766,16 @@ CreateApplicationWindow(VOID)
*/
hWnd = NULL;
AllocAndLoadString(&lpErrMessage,
hAppInstance,
IDS_NOMIXERDEVICES);
MessageBox(NULL,
lpErrMessage,
lpAppTitle,
MB_ICONINFORMATION);
LocalFree(lpErrMessage);
if (AllocAndLoadString(&lpErrMessage,
hAppInstance,
IDS_NOMIXERDEVICES))
{
MessageBox(NULL,
lpErrMessage,
lpAppTitle,
MB_ICONINFORMATION);
LocalFree(lpErrMessage);
}
}
if (hWnd == NULL)
@ -797,59 +795,68 @@ WinMain(HINSTANCE hInstance,
int nCmdShow)
{
MSG Msg;
int Ret = 1;
hAppInstance = hInstance;
hAppHeap = GetProcessHeap();
if (!InitAppConfig())
if (InitAppConfig())
{
/* load the application title */
if (!AllocAndLoadString(&lpAppTitle,
hAppInstance,
IDS_SNDVOL32))
{
lpAppTitle = NULL;
}
InitCommonControls();
if (RegisterApplicationClasses())
{
hMainWnd = CreateApplicationWindow();
if (hMainWnd != NULL)
{
BOOL bRet;
while ((bRet =GetMessage(&Msg,
NULL,
0,
0)) != 0)
{
if (bRet != -1)
{
TranslateMessage(&Msg);
DispatchMessage(&Msg);
}
}
DestroyWindow(hMainWnd);
Ret = 0;
}
else
{
DPRINT("Failed to creat application window (LastError: %d)!\n", GetLastError());
}
UnregisterApplicationClasses();
}
else
{
DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError());
}
if (lpAppTitle != NULL)
{
LocalFree(lpAppTitle);
}
CloseAppConfig();
}
else
{
DPRINT("Unable to open the Volume Control registry key!\n");
return 1;
}
/* load the application title */
if (AllocAndLoadString(&lpAppTitle,
hAppInstance,
IDS_SNDVOL32) == 0)
{
lpAppTitle = NULL;
}
InitCommonControls();
if (!RegisterApplicationClasses())
{
DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError());
return 1;
}
hMainWnd = CreateApplicationWindow();
if (hMainWnd == NULL)
{
DPRINT("Failed to creat application window (LastError: %d)!\n", GetLastError());
return 1;
}
while (GetMessage(&Msg,
NULL,
0,
0))
{
TranslateMessage(&Msg);
DispatchMessage(&Msg);
}
DestroyWindow(hMainWnd);
UnregisterApplicationClasses();
if (lpAppTitle != NULL)
{
LocalFree(lpAppTitle);
}
CloseAppConfig();
return 0;
return Ret;
}

4
reactos/subsys/system/sndvol32/sndvol32.h
View file

@ -18,10 +18,6 @@ typedef struct _MIXER_WINDOW
UINT SelectedLine;
} MIXER_WINDOW, *PMIXER_WINDOW;
LRESULT CALLBACK MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL RebuildMixerWindowControls(PMIXER_WINDOW MixerWindow);
extern HINSTANCE hAppInstance;
extern ATOM MainWindowClass;
extern HWND hMainWnd;