Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

add sndvol32 to the build system and reformat the code

Browse source 
svn path=/trunk/; revision=18102
This commit is contained in:
Thomas Bluemel 2005-09-26 19:15:27 +00:00
parent 469b041e51
commit d286c03c70
7 changed files with 816 additions and 528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/subsys/system/directory.xml
View file

@ -55,6 +55,9 @@
<directory name="sm">
<xi:include href="sm/sm.xml" />
</directory>
<directory name="sndvol32">
<xi:include href="sndvol32/sndvol32.xml" />
</directory>
<directory name="taskmgr">
<xi:include href="taskmgr/taskmgr.xml" />
</directory>

2
reactos/subsys/system/sndvol32/En.rc
View file

@ -13,7 +13,7 @@ BEGIN
BEGIN
MENUITEM "&Help Topics", IDC_HELP_TOPICS
MENUITEM SEPARATOR
MENUITEM "&About ...", IDC_ABOUT
MENUITEM "&About Volume Control", IDC_ABOUT
END
END

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

@ -0,0 +1,129 @@
/*
* ReactOS Sound Volume Control
* Copyright (C) 2004-2005 Thomas Weidenmueller
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Sound Volume Control
* FILE: subsys/system/sndvol32/misc.c
* PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
*/
#include <sndvol32.h>
static INT
LengthOfStrResource(IN HINSTANCE hInst,
IN UINT uID)
{
HRSRC hrSrc;
HGLOBAL hRes;
LPWSTR lpName, lpStr;
if (hInst == NULL)
{
return -1;
}
/* There are always blocks of 16 strings */
lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
/* Find the string table block */
if ((hrSrc = FindResourceW(hInst,
lpName,
(LPWSTR)RT_STRING)) &&
(hRes = LoadResource(hInst,
hrSrc)) &&
(lpStr = LockResource(hRes)))
{
UINT x;
/* Find the string we're looking for */
uID &= 0xF; /* position in the block, same as % 16 */
for (x = 0; x < uID; x++)
{
lpStr += (*lpStr) + 1;
}
/* Found the string */
return (int)(*lpStr);
}
return -1;
}
INT
AllocAndLoadString(OUT LPWSTR *lpTarget,
IN HINSTANCE hInst,
IN UINT uID)
{
INT ln;
ln = LengthOfStrResource(hInst,
uID);
if (ln++ > 0)
{
(*lpTarget) = (LPWSTR)LocalAlloc(LMEM_FIXED,
ln * sizeof(WCHAR));
if ((*lpTarget) != NULL)
{
INT Ret;
if (!(Ret = LoadStringW(hInst,
uID,
*lpTarget,
ln)))
{
LocalFree((HLOCAL)(*lpTarget));
}
return Ret;
}
}
return 0;
}
DWORD
LoadAndFormatString(IN HINSTANCE hInstance,
IN UINT uID,
OUT LPWSTR *lpTarget,
...)
{
DWORD Ret = 0;
LPWSTR lpFormat;
va_list lArgs;
if (AllocAndLoadString(&lpFormat,
hInstance,
uID) > 0)
{
va_start(lArgs, lpTarget);
/* let's use FormatMessage to format it because it has the ability to
allocate memory automatically */
Ret = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
lpFormat,
0,
0,
(LPWSTR)lpTarget,
0,
&lArgs);
va_end(lArgs);
LocalFree((HLOCAL)lpFormat);
}
return Ret;
}

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

@ -1,6 +1,6 @@
/*
* ReactOS Sound Volume Control
* Copyright (C) 2004 Thomas Weidenmueller
* Copyright (C) 2004-2005 Thomas Weidenmueller
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -25,7 +25,7 @@
* FILE: subsys/system/sndvol32/mixer.c
* PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
*/
#include "sndvol32.h"
#include <sndvol32.h>
#define NO_MIXER_SELECTED (~0)
@ -39,22 +39,30 @@ ClearMixerCache(PSND_MIXER Mixer)
{
if (Line->Controls != NULL)
{
HeapFree(GetProcessHeap(), 0, Line->Controls);
HeapFree(GetProcessHeap(),
0,
Line->Controls);
}
for (Con = Line->Connections; Con != NULL; Con = NextCon)
{
if (Con->Controls != NULL)
{
HeapFree(GetProcessHeap(), 0, Con->Controls);
HeapFree(GetProcessHeap(),
0,
Con->Controls);
}
NextCon = Con->Next;
HeapFree(GetProcessHeap(), 0, Con);
HeapFree(GetProcessHeap(),
0,
Con);
}
NextLine = Line->Next;
HeapFree(GetProcessHeap(), 0, Line);
HeapFree(GetProcessHeap(),
0,
Line);
}
Mixer->Lines = NULL;
}
@ -62,7 +70,9 @@ ClearMixerCache(PSND_MIXER Mixer)
PSND_MIXER
SndMixerCreate(HWND hWndNotification)
{
PSND_MIXER Mixer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER));
PSND_MIXER Mixer = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
sizeof(SND_MIXER));
if (Mixer != NULL)
{
Mixer->hWndNotification = hWndNotification;
@ -83,7 +93,9 @@ VOID
SndMixerDestroy(PSND_MIXER Mixer)
{
SndMixerClose(Mixer);
HeapFree(GetProcessHeap(), 0, Mixer);
HeapFree(GetProcessHeap(),
0,
Mixer);
}
VOID
@ -98,11 +110,15 @@ SndMixerClose(PSND_MIXER Mixer)
}
static BOOL
SndMixerQueryControls(PSND_MIXER Mixer, LPMIXERLINE LineInfo, LPMIXERCONTROL *Controls)
SndMixerQueryControls(PSND_MIXER Mixer,
LPMIXERLINE LineInfo,
LPMIXERCONTROL *Controls)
{
if (LineInfo->cControls > 0)
{
*Controls = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, LineInfo->cControls * sizeof(MIXERCONTROL));
*Controls = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
LineInfo->cControls * sizeof(MIXERCONTROL));
if (*Controls != NULL)
{
MIXERLINECONTROLS LineControls;
@ -119,25 +135,29 @@ SndMixerQueryControls(PSND_MIXER Mixer, LPMIXERLINE LineInfo, LPMIXERCONTROL *Co
(*Controls)[j].cbStruct = sizeof(MIXERCONTROL);
}
if(mixerGetLineControls((HMIXEROBJ)Mixer->hmx, &LineControls, MIXER_GETLINECONTROLSF_ALL) == MMSYSERR_NOERROR)
if (mixerGetLineControls((HMIXEROBJ)Mixer->hmx,
&LineControls,
MIXER_GETLINECONTROLSF_ALL) == MMSYSERR_NOERROR)
{
for (j = 0; j < LineInfo->cControls; j++)
{
DBG("Line control: %ws", (*Controls)[j].szName);
DPRINT("Line control: %ws", (*Controls)[j].szName);
}
return TRUE;
}
else
{
HeapFree(GetProcessHeap(), 0, *Controls);
HeapFree(GetProcessHeap(),
0,
*Controls);
*Controls = NULL;
DBG("Failed to get line controls!\n");
DPRINT("Failed to get line controls!\n");
}
}
else
{
DBG("Failed to allocate memory for %d line controls!\n", LineInfo->cControls);
DPRINT("Failed to allocate memory for %d line controls!\n", LineInfo->cControls);
}
return FALSE;
@ -149,7 +169,8 @@ SndMixerQueryControls(PSND_MIXER Mixer, LPMIXERLINE LineInfo, LPMIXERCONTROL *Co
}
static BOOL
SndMixerQueryConnections(PSND_MIXER Mixer, PSND_MIXER_DESTINATION Line)
SndMixerQueryConnections(PSND_MIXER Mixer,
PSND_MIXER_DESTINATION Line)
{
UINT i;
MIXERLINE LineInfo;
@ -160,19 +181,25 @@ SndMixerQueryConnections(PSND_MIXER Mixer, PSND_MIXER_DESTINATION Line)
for (i = Line->Info.cConnections; i > 0; i--)
{
LineInfo.dwSource = i - 1;
if(mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, &LineInfo, MIXER_GETLINEINFOF_SOURCE) == MMSYSERR_NOERROR)
if (mixerGetLineInfo((HMIXEROBJ)Mixer->hmx,
&LineInfo,
MIXER_GETLINEINFOF_SOURCE) == MMSYSERR_NOERROR)
{
LPMIXERCONTROL Controls;
PSND_MIXER_CONNECTION Con;
if(!SndMixerQueryControls(Mixer, &LineInfo, &Controls))
if (!SndMixerQueryControls(Mixer,
&LineInfo,
&Controls))
{
DBG("Failed to query connection controls\n");
DPRINT("Failed to query connection controls\n");
Ret = FALSE;
break;
}
Con = HeapAlloc(GetProcessHeap(), 0, sizeof(SND_MIXER_CONNECTION));
Con = HeapAlloc(GetProcessHeap(),
0,
sizeof(SND_MIXER_CONNECTION));
if (Con != NULL)
{
Con->Info = LineInfo;
@ -182,12 +209,14 @@ SndMixerQueryConnections(PSND_MIXER Mixer, PSND_MIXER_DESTINATION Line)
}
else
{
HeapFree(GetProcessHeap(), 0, Controls);
HeapFree(GetProcessHeap(),
0,
Controls);
}
}
else
{
DBG("Failed to get connection information!\n");
DPRINT("Failed to get connection information!\n");
Ret = FALSE;
break;
}
@ -206,22 +235,28 @@ SndMixerQueryDestinations(PSND_MIXER Mixer)
{
PSND_MIXER_DESTINATION Line;
Line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SND_MIXER_DESTINATION));
Line = HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
sizeof(SND_MIXER_DESTINATION));
if (Line != NULL)
{
Line->Info.cbStruct = sizeof(Line->Info);
Line->Info.dwDestination = i - 1;
if(mixerGetLineInfo((HMIXEROBJ)Mixer->hmx, &Line->Info, MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR)
if (mixerGetLineInfo((HMIXEROBJ)Mixer->hmx,
&Line->Info,
MIXER_GETLINEINFOF_DESTINATION) == MMSYSERR_NOERROR)
{
if (!SndMixerQueryConnections(Mixer, Line))
{
DBG("Failed to query mixer connections!\n");
DPRINT("Failed to query mixer connections!\n");
Ret = FALSE;
break;
}
if(!SndMixerQueryControls(Mixer, &Line->Info, &Line->Controls))
if (!SndMixerQueryControls(Mixer,
&Line->Info,
&Line->Controls))
{
DBG("Failed to query mixer controls!\n");
DPRINT("Failed to query mixer controls!\n");
Ret = FALSE;
break;
}
@ -231,15 +266,17 @@ SndMixerQueryDestinations(PSND_MIXER Mixer)
}
else
{
DBG("Failed to get line information for id %d!\n", i);
HeapFree(GetProcessHeap(), 0, Line);
DPRINT("Failed to get line information for id %d!\n", i);
HeapFree(GetProcessHeap(),
0,
Line);
Ret = FALSE;
break;
}
}
else
{
DBG("Allocation of SND_MIXER_DEST structure for id %d failed!\n", i);
DPRINT("Allocation of SND_MIXER_DEST structure for id %d failed!\n", i);
Ret = FALSE;
break;
}
@ -249,7 +286,8 @@ SndMixerQueryDestinations(PSND_MIXER Mixer)
}
BOOL
SndMixerSelect(PSND_MIXER Mixer, UINT MixerId)
SndMixerSelect(PSND_MIXER Mixer,
UINT MixerId)
{
if (MixerId >= Mixer->MixersCount)
{
@ -258,11 +296,25 @@ SndMixerSelect(PSND_MIXER Mixer, UINT MixerId)
SndMixerClose(Mixer);
if(mixerOpen(&Mixer->hmx, MixerId, (DWORD_PTR)Mixer->hWndNotification, 0, CALLBACK_WINDOW | MIXER_OBJECTF_MIXER) == MMSYSERR_NOERROR ||
mixerOpen(&Mixer->hmx, MixerId, (DWORD_PTR)Mixer->hWndNotification, 0, CALLBACK_WINDOW) == MMSYSERR_NOERROR ||
mixerOpen(&Mixer->hmx, MixerId, 0, 0, 0) == MMSYSERR_NOERROR)
if (mixerOpen(&Mixer->hmx,
MixerId,
(DWORD_PTR)Mixer->hWndNotification,
0,
CALLBACK_WINDOW | MIXER_OBJECTF_MIXER) == MMSYSERR_NOERROR ||
mixerOpen(&Mixer->hmx,
MixerId,
(DWORD_PTR)Mixer->hWndNotification,
0,
CALLBACK_WINDOW) == MMSYSERR_NOERROR ||
mixerOpen(&Mixer->hmx,
MixerId,
0,
0,
0) == MMSYSERR_NOERROR)
{
if(mixerGetDevCaps(MixerId, &Mixer->Caps, sizeof(Mixer->Caps)) == MMSYSERR_NOERROR)
if (mixerGetDevCaps(MixerId,
&Mixer->Caps,
sizeof(Mixer->Caps)) == MMSYSERR_NOERROR)
{
BOOL Ret = FALSE;
@ -297,7 +349,9 @@ SndMixerGetSelection(PSND_MIXER Mixer)
}
INT
SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize)
SndMixerGetProductName(PSND_MIXER Mixer,
LPTSTR lpBuffer,
UINT uSize)
{
if (Mixer->hmx)
{
@ -318,7 +372,9 @@ SndMixerGetProductName(PSND_MIXER Mixer, LPTSTR lpBuffer, UINT uSize)
}
BOOL
SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Context)
SndMixerEnumProducts(PSND_MIXER Mixer,
PFNSNDMIXENUMPRODUCTS EnumProc,
PVOID Context)
{
MIXERCAPS Caps;
HMIXER hMixer;
@ -327,11 +383,20 @@ SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Con
for (i = 0; i < Mixer->MixersCount; i++)
{
if(mixerOpen(&hMixer, i, 0, 0, 0) == MMSYSERR_NOERROR)
if (mixerOpen(&hMixer,
i,
0,
0,
0) == MMSYSERR_NOERROR)
{
if(mixerGetDevCaps(i, &Caps, sizeof(Caps)) == MMSYSERR_NOERROR)
if (mixerGetDevCaps(i,
&Caps,
sizeof(Caps)) == MMSYSERR_NOERROR)
{
if(!EnumProc(Mixer, i, Caps.szPname, Context))
if (!EnumProc(Mixer,
i,
Caps.szPname,
Context))
{
mixerClose(hMixer);
Ret = FALSE;
@ -340,7 +405,7 @@ SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOID Con
}
else
{
DBG("Failed to get device capabilities for mixer id %d!\n", i);
DPRINT("Failed to get device capabilities for mixer id %d!\n", i);
}
mixerClose(hMixer);
}
@ -356,7 +421,9 @@ SndMixerGetDestinationCount(PSND_MIXER Mixer)
}
BOOL
SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context)
SndMixerEnumLines(PSND_MIXER Mixer,
PFNSNDMIXENUMLINES EnumProc,
PVOID Context)
{
if (Mixer->hmx)
{
@ -364,7 +431,9 @@ SndMixerEnumLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context)
for (Line = Mixer->Lines; Line != NULL; Line = Line->Next)
{
if(!EnumProc(Mixer, &Line->Info, Context))
if (!EnumProc(Mixer,
&Line->Info,
Context))
{
return FALSE;
}

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

@ -1,6 +1,6 @@
/*
* ReactOS Sound Volume Control
* Copyright (C) 2004 Thomas Weidenmueller
* Copyright (C) 2004-2005 Thomas Weidenmueller
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -25,7 +25,7 @@
* FILE: subsys/system/sndvol32/sndvol32.c
* PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
*/
#include "sndvol32.h"
#include <sndvol32.h>
HINSTANCE hAppInstance;
ATOM MainWindowClass;
@ -54,20 +54,32 @@ typedef struct _PREFERENCES_FILL_DEVICES
} PREFERENCES_FILL_DEVICES, *PPREFERENCES_FILL_DEVICES;
static BOOL CALLBACK
FillDeviceComboBox(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context)
FillDeviceComboBox(PSND_MIXER Mixer,
UINT Id,
LPCTSTR ProductName,
PVOID Context)
{
LRESULT lres;
PPREFERENCES_FILL_DEVICES FillContext = (PPREFERENCES_FILL_DEVICES)Context;
lres = SendMessage(FillContext->hComboBox, CB_ADDSTRING, 0, (LPARAM)ProductName);
lres = SendMessage(FillContext->hComboBox,
CB_ADDSTRING,
0,
(LPARAM)ProductName);
if (lres != CB_ERR)
{
/* save the index so we don't screw stuff when the combobox is sorted... */
SendMessage(FillContext->hComboBox, CB_SETITEMDATA, (WPARAM)lres, Id);
SendMessage(FillContext->hComboBox,
CB_SETITEMDATA,
(WPARAM)lres,
Id);
if (Id == FillContext->Selected)
{
SendMessage(FillContext->hComboBox, CB_SETCURSEL, (WPARAM)lres, 0);
SendMessage(FillContext->hComboBox,
CB_SETCURSEL,
(WPARAM)lres,
0);
}
}
@ -75,7 +87,10 @@ FillDeviceComboBox(PSND_MIXER Mixer, UINT Id, LPCTSTR ProductName, PVOID Context
}
static INT_PTR CALLBACK
DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
DlgPreferencesProc(HWND hwndDlg,
UINT uMsg,
WPARAM wParam,
LPARAM lParam)
{
PPREFERENCES_CONTEXT Context;
@ -88,7 +103,8 @@ DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case IDOK:
case IDCANCEL:
{
EndDialog(hwndDlg, LOWORD(wParam));
EndDialog(hwndDlg,
LOWORD(wParam));
break;
}
}
@ -97,13 +113,13 @@ DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case MM_MIXM_LINE_CHANGE:
{
DBG("MM_MIXM_LINE_CHANGE\n");
DPRINT("MM_MIXM_LINE_CHANGE\n");
break;
}
case MM_MIXM_CONTROL_CHANGE:
{
DBG("MM_MIXM_CONTROL_CHANGE\n");
DPRINT("MM_MIXM_CONTROL_CHANGE\n");
break;
}
@ -111,13 +127,16 @@ DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
PREFERENCES_FILL_DEVICES FillDevContext;
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam);
SetWindowLongPtr(hwndDlg,
DWLP_USER,
(LONG_PTR)lParam);
Context = (PPREFERENCES_CONTEXT)((LONG_PTR)lParam);
Context->hwndDlg = hwndDlg;
Context->Mixer = SndMixerCreate(hwndDlg);
FillDevContext.PrefContext = Context;
FillDevContext.hComboBox = GetDlgItem(hwndDlg, IDC_MIXERDEVICE);
FillDevContext.hComboBox = GetDlgItem(hwndDlg,
IDC_MIXERDEVICE);
FillDevContext.Selected = SndMixerGetSelection(Context->Mixer);
SndMixerEnumProducts(Context->Mixer,
FillDeviceComboBox,
@ -127,7 +146,8 @@ DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_DESTROY:
{
Context = GetDialogData(hwndDlg, PREFERENCES_CONTEXT);
Context = GetDialogData(hwndDlg,
PREFERENCES_CONTEXT);
if (Context->Mixer != NULL)
{
SndMixerDestroy(Context->Mixer);
@ -137,7 +157,8 @@ DlgPreferencesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
{
EndDialog(hwndDlg, IDCANCEL);
EndDialog(hwndDlg,
IDCANCEL);
break;
}
}
@ -161,7 +182,10 @@ RebuildMixerWindowControls(PMIXER_WINDOW MixerWindow)
}
LRESULT CALLBACK
MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
MainWindowProc(HWND hwnd,
UINT uMsg,
WPARAM wParam,
LPARAM lParam)
{
PMIXER_WINDOW MixerWindow;
LRESULT Result = 0;
@ -170,7 +194,8 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
case WM_COMMAND:
{
MixerWindow = GetWindowData(hwnd, MIXER_WINDOW);
MixerWindow = GetWindowData(hwnd,
MIXER_WINDOW);
switch (LOWORD(wParam))
{
@ -203,23 +228,27 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case MM_MIXM_LINE_CHANGE:
{
DBG("MM_MIXM_LINE_CHANGE\n");
DPRINT("MM_MIXM_LINE_CHANGE\n");
break;
}
case MM_MIXM_CONTROL_CHANGE:
{
DBG("MM_MIXM_CONTROL_CHANGE\n");
DPRINT("MM_MIXM_CONTROL_CHANGE\n");
break;
}
case WM_CREATE:
{
MixerWindow = ((LPCREATESTRUCT)lParam)->lpCreateParams;
SetWindowLongPtr(hwnd, GWL_USERDATA, (LONG_PTR)MixerWindow);
SetWindowLongPtr(hwnd,
GWL_USERDATA,
(LONG_PTR)MixerWindow);
MixerWindow->hWnd = hwnd;
MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
NULL, hwnd, 0);
NULL,
hwnd,
0);
if (MixerWindow->hStatusBar != NULL)
{
MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd);
@ -227,14 +256,19 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TCHAR szProduct[MAXPNAMELEN];
if(SndMixerGetProductName(MixerWindow->Mixer, szProduct, sizeof(szProduct) / sizeof(szProduct[0])) > 0)
if (SndMixerGetProductName(MixerWindow->Mixer,
szProduct,
sizeof(szProduct) / sizeof(szProduct[0])) > 0)
{
SendMessage(MixerWindow->hStatusBar, WM_SETTEXT, 0, (LPARAM)szProduct);
SendMessage(MixerWindow->hStatusBar,
WM_SETTEXT,
0,
(LPARAM)szProduct);
}
if (!RebuildMixerWindowControls(MixerWindow))
{
DBG("Rebuilding mixer window controls failed!\n");
DPRINT("Rebuilding mixer window controls failed!\n");
SndMixerDestroy(MixerWindow->Mixer);
Result = -1;
}
@ -246,7 +280,7 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
}
else
{
DBG("Failed to create status window!\n");
DPRINT("Failed to create status window!\n");
Result = -1;
}
break;
@ -254,7 +288,8 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_DESTROY:
{
MixerWindow = GetWindowData(hwnd, MIXER_WINDOW);
MixerWindow = GetWindowData(hwnd,
MIXER_WINDOW);
if (MixerWindow->Mixer != NULL)
{
SndMixerDestroy(MixerWindow->Mixer);
@ -270,7 +305,11 @@ MainWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
{
Result = DefWindowProc(hwnd, uMsg, wParam, lParam);
Result = DefWindowProc(hwnd,
uMsg,
wParam,
lParam);
break;
}
}
@ -288,8 +327,10 @@ RegisterApplicationClasses(VOID)
wc.cbClsExtra = 0;
wc.cbWndExtra = sizeof(PMIXER_WINDOW);
wc.hInstance = hAppInstance;
wc.hIcon = LoadIcon(hAppInstance, MAKEINTRESOURCE(IDI_MAINAPP));
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hIcon = LoadIcon(hAppInstance,
MAKEINTRESOURCE(IDI_MAINAPP));
wc.hCursor = LoadCursor(NULL,
IDC_ARROW);
wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
wc.lpszMenuName = NULL;
wc.lpszClassName = SZ_APP_CLASS;
@ -302,7 +343,8 @@ RegisterApplicationClasses(VOID)
static VOID
UnregisterApplicationClasses(VOID)
{
UnregisterClass(SZ_APP_CLASS, hAppInstance);
UnregisterClass(SZ_APP_CLASS,
hAppInstance);
}
static HWND
@ -311,14 +353,16 @@ CreateApplicationWindow(VOID)
LPTSTR lpAppTitle;
HWND hWnd;
PMIXER_WINDOW MixerWindow = HeapAlloc(hAppHeap, 0, sizeof(MIXER_WINDOW));
PMIXER_WINDOW MixerWindow = HeapAlloc(hAppHeap,
0,
sizeof(MIXER_WINDOW));
if (MixerWindow == NULL)
{
return NULL;
}
/* load the application title */
if(RosAllocAndLoadString(&lpAppTitle,
if (AllocAndLoadString(&lpAppTitle,
hAppInstance,
IDS_SNDVOL32) == 0)
{
@ -333,7 +377,8 @@ CreateApplicationWindow(VOID)
WS_DLGFRAME | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL,
LoadMenu(hAppInstance, MAKEINTRESOURCE(IDM_MAINMENU)),
LoadMenu(hAppInstance,
MAKEINTRESOURCE(IDM_MAINMENU)),
hAppInstance,
MixerWindow);
}
@ -346,10 +391,13 @@ CreateApplicationWindow(VOID)
*/
hWnd = NULL;
RosAllocAndLoadString(&lpErrMessage,
AllocAndLoadString(&lpErrMessage,
hAppInstance,
IDS_NOMIXERDEVICES);
MessageBox(NULL, lpErrMessage, lpAppTitle, MB_ICONINFORMATION);
MessageBox(NULL,
lpErrMessage,
lpAppTitle,
MB_ICONINFORMATION);
LocalFree(lpErrMessage);
}
@ -360,7 +408,9 @@ CreateApplicationWindow(VOID)
if (hWnd == NULL)
{
HeapFree(hAppHeap, 0, MixerWindow);
HeapFree(hAppHeap,
0,
MixerWindow);
}
return hWnd;
@ -381,18 +431,21 @@ WinMain(HINSTANCE hInstance,
if (!RegisterApplicationClasses())
{
DBG("Failed to register application classes (LastError: %d)!\n", GetLastError());
DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError());
return 1;
}
hMainWnd = CreateApplicationWindow();
if (hMainWnd == NULL)
{
DBG("Failed to creat application window (LastError: %d)!\n", GetLastError());
DPRINT("Failed to creat application window (LastError: %d)!\n", GetLastError());
return 1;
}
while(GetMessage(&Msg, NULL, 0, 0))
while (GetMessage(&Msg,
NULL,
0,
0))
{
TranslateMessage(&Msg);
DispatchMessage(&Msg);

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

@ -28,7 +28,8 @@ extern HANDLE hAppHeap;
#define SZ_APP_CLASS TEXT("Volume Control")
#define DBG DbgPrint("SNDVOL32: %s:%i: ", __FILE__, __LINE__); DbgPrint
ULONG DbgPrint(PCH , ...);
#define DPRINT DbgPrint("SNDVOL32: %s:%i: ", __FILE__, __LINE__); DbgPrint
/*
@ -74,4 +75,18 @@ BOOL SndMixerEnumProducts(PSND_MIXER Mixer, PFNSNDMIXENUMPRODUCTS EnumProc, PVOI
INT SndMixerGetDestinationCount(PSND_MIXER Mixer);
BOOL SndMixerEnumDestinationLines(PSND_MIXER Mixer, PFNSNDMIXENUMLINES EnumProc, PVOID Context);
/*
* MISC
*/
INT
AllocAndLoadString(OUT LPWSTR *lpTarget,
IN HINSTANCE hInst,
IN UINT uID);
DWORD
LoadAndFormatString(IN HINSTANCE hInstance,
IN UINT uID,
OUT LPWSTR *lpTarget,
...);
#endif /* __SNDVOL32_H */

19
reactos/subsys/system/sndvol32/sndvol32.xml Normal file
View file

@ -0,0 +1,19 @@
<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe">
<include base="ReactOS">include/wine</include>
<include base="sndvol32">.</include>
<define name="__USE_W32API" />
<define name="UNICODE" />
<define name="_UNICODE" />
<define name="_WIN32_WINNT">0x6501</define>
<library>ntdll</library>
<library>user32</library>
<library>gdi32</library>
<library>kernel32</library>
<library>comctl32</library>
<library>shell32</library>
<library>winmm</library>
<pch>sndvol32.h</pch>
<file>misc.c</file>
<file>mixer.c</file>
<file>sndvol32.c</file>
</module>