/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Sound Volume Control
- * FILE: subsys/system/sndvol32/sndvol32.c
+ * FILE: base/applications/sndvol32/sndvol32.c
* PROGRAMMERS: Thomas Weidenmueller <w3seek@reactos.com>
*/
PPREFERENCES_CONTEXT PrefContext = (PPREFERENCES_CONTEXT)Context;
UNREFERENCED_PARAMETER(Mixer);
- UNREFERENCED_PARAMETER(DisplayControls);
+ UNREFERENCED_PARAMETER(DisplayControls);
switch (Line->dwComponentType)
{
UINT i;
UNREFERENCED_PARAMETER(Mixer);
- UNREFERENCED_PARAMETER(LineID);
+ UNREFERENCED_PARAMETER(LineID);
if (Line->cControls != 0)
{
(LONG_PTR)lParam);
Context = (PPREFERENCES_CONTEXT)((LONG_PTR)lParam);
Context->hwndDlg = hwndDlg;
- Context->Mixer = SndMixerCreate(hwndDlg);
+ Context->Mixer = SndMixerCreate(hwndDlg, Context->MixerWindow->MixerId);
Context->Selected = (UINT)-1;
FillDevContext.PrefContext = Context;
{
UINT ControlCount = 0, Index;
LPMIXERCONTROL Control = NULL;
- MIXERCONTROLDETAILS_UNSIGNED uDetails;
+ PMIXERCONTROLDETAILS_UNSIGNED puDetails = NULL;
MIXERCONTROLDETAILS_BOOLEAN bDetails;
PSET_VOLUME_CONTEXT Context = (PSET_VOLUME_CONTEXT)Ctx;
return FALSE;
}
+ puDetails = HeapAlloc(GetProcessHeap(), 0, Line->cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED));
+ if (puDetails == NULL)
+ return FALSE;
+
/* now go through all controls and compare control ids */
- for(Index = 0; Index < ControlCount; Index++)
+ for (Index = 0; Index < ControlCount; Index++)
{
if (Context->bVertical)
{
if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER)
{
- /* FIXME: give me granularity */
- DWORD Step = 0x10000 / 5;
+ DWORD LineOffset, volumePosition, balancePosition;
+ DWORD volumeStep, balanceStep;
- /* set up details */
- uDetails.dwValue = 0x10000 - Step * Context->SliderPos;
+ LineOffset = Context->SliderPos;
+
+ volumePosition = (DWORD)SendDlgItemMessage(Preferences.MixerWindow->hWnd, LineOffset * IDC_LINE_SLIDER_VERT, TBM_GETPOS, 0, 0);
+ volumeStep = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN);
+
+ if (Line->cChannels == 1)
+ {
+ /* set up details */
+ puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+ }
+ else if (Line->cChannels == 2)
+ {
+ balancePosition = (DWORD)SendDlgItemMessage(Preferences.MixerWindow->hWnd, LineOffset * IDC_LINE_SLIDER_HORZ, TBM_GETPOS, 0, 0);
+ if (balancePosition == BALANCE_CENTER)
+ {
+ puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+ puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+ }
+ else if (balancePosition == BALANCE_LEFT)
+ {
+ puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+ puDetails[1].dwValue = Control[Index].Bounds.dwMinimum;
+ }
+ else if (balancePosition == BALANCE_RIGHT)
+ {
+ puDetails[0].dwValue = Control[Index].Bounds.dwMinimum;
+ puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+ }
+ else if (balancePosition < BALANCE_CENTER) // Left
+ {
+ puDetails[0].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+
+ balanceStep = (puDetails[0].dwValue - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2);
+
+ puDetails[1].dwValue = (balancePosition * balanceStep) + Control[Index].Bounds.dwMinimum;
+ }
+ else if (balancePosition > BALANCE_CENTER) // Right
+ {
+ puDetails[1].dwValue = ((VOLUME_MAX - volumePosition) * volumeStep) + Control[Index].Bounds.dwMinimum;
+
+ balanceStep = (puDetails[1].dwValue - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2);
+
+ puDetails[0].dwValue = ((BALANCE_RIGHT - balancePosition) * balanceStep) + Control[Index].Bounds.dwMinimum;
+ }
+ }
+ else
+ {
+ SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)puDetails);
+
+ /* FIXME */
+ }
/* set volume */
- SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&uDetails);
+ SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)puDetails);
/* done */
break;
bDetails.fValue = Context->SliderPos;
/* set volume */
- SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&bDetails);
+ SndMixerSetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&bDetails);
/* done */
break;
}
}
- else
- {
- /* FIXME: implement left - right channel switch support */
- assert(0);
- }
}
+ if (puDetails != NULL)
+ HeapFree(GetProcessHeap(), 0, puDetails);
+
/* free controls */
HeapFree(GetProcessHeap(), 0, Control);
CALLBACK
MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Context)
{
+ PMIXERCONTROLDETAILS_UNSIGNED pVolumeDetails = NULL;
UINT ControlCount = 0, Index;
LPMIXERCONTROL Control = NULL;
return FALSE;
}
+ pVolumeDetails = HeapAlloc(GetProcessHeap(),
+ 0,
+ Line->cChannels * sizeof(MIXERCONTROLDETAILS_UNSIGNED));
+ if (pVolumeDetails == NULL)
+ goto done;
+
/* now go through all controls and compare control ids */
- for(Index = 0; Index < ControlCount; Index++)
+ for (Index = 0; Index < ControlCount; Index++)
{
if (Control[Index].dwControlID == PtrToUlong(Context))
{
MIXERCONTROLDETAILS_BOOLEAN Details;
/* get volume control details */
- if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1)
+ if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&Details) != -1)
{
/* update dialog control */
UpdateDialogLineSwitchControl(&Preferences, Line, Details.fValue);
}
else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER)
{
- MIXERCONTROLDETAILS_UNSIGNED Details;
-
/* get volume control details */
- if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&Details) != -1)
+ if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1)
{
/* update dialog control */
- DWORD Position;
- DWORD Step = 0x10000 / 5;
+ DWORD volumePosition, volumeStep, maxVolume, i;
+ DWORD balancePosition, balanceStep;
+
+ volumeStep = (Control[Index].Bounds.dwMaximum - Control[Index].Bounds.dwMinimum) / (VOLUME_MAX - VOLUME_MIN);
+
+ maxVolume = 0;
+ for (i = 0; i < Line->cChannels; i++)
+ {
+ if (pVolumeDetails[i].dwValue > maxVolume)
+ maxVolume = pVolumeDetails[i].dwValue;
+ }
- /* FIXME: give me granularity */
- Position = 5 - (Details.dwValue / Step);
+ volumePosition = (maxVolume - Control[Index].Bounds.dwMinimum) / volumeStep;
- /* update volume control slider */
- UpdateDialogLineSliderControl(&Preferences, Line, Control[Index].dwControlID, IDC_LINE_SLIDER_VERT, Position);
+ if (Line->cChannels == 1)
+ {
+ balancePosition = BALANCE_CENTER;
+ }
+ else if (Line->cChannels == 2)
+ {
+ if (pVolumeDetails[0].dwValue == pVolumeDetails[1].dwValue)
+ {
+ balancePosition = BALANCE_CENTER;
+ }
+ else if (pVolumeDetails[0].dwValue == Control[Index].Bounds.dwMinimum)
+ {
+ balancePosition = BALANCE_RIGHT;
+ }
+ else if (pVolumeDetails[1].dwValue == Control[Index].Bounds.dwMinimum)
+ {
+ balancePosition = BALANCE_LEFT;
+ }
+ else
+ {
+ balanceStep = (maxVolume - Control[Index].Bounds.dwMinimum) / (BALANCE_STEPS / 2);
+
+ if (pVolumeDetails[0].dwValue < pVolumeDetails[1].dwValue)
+ {
+ balancePosition = (pVolumeDetails[0].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep;
+ balancePosition = BALANCE_RIGHT - balancePosition;
+ }
+ else if (pVolumeDetails[1].dwValue < pVolumeDetails[0].dwValue)
+ {
+ balancePosition = (pVolumeDetails[1].dwValue - Control[Index].Bounds.dwMinimum) / balanceStep;
+ balancePosition = BALANCE_LEFT + balancePosition;
+ }
+ }
+ }
+
+ /* Update the volume control slider */
+ UpdateDialogLineSliderControl(&Preferences, Line, IDC_LINE_SLIDER_VERT, VOLUME_MAX - volumePosition);
+
+ /* Update the balance control slider */
+ UpdateDialogLineSliderControl(&Preferences, Line, IDC_LINE_SLIDER_HORZ, balancePosition);
}
}
break;
}
}
+done:
+ /* Free the volume details */
+ if (pVolumeDetails)
+ HeapFree(GetProcessHeap(), 0, pVolumeDetails);
+
/* free controls */
HeapFree(GetProcessHeap(), 0, Control);
-
/* done */
return TRUE;
}
TCHAR szProduct[MAXPNAMELEN];
/* get mixer product name */
- if (SndMixerGetProductName(MixerWindow->Mixer,
+ if (SndMixerGetProductName(Pref.Mixer,
szProduct,
sizeof(szProduct) / sizeof(szProduct[0])) == -1)
{
}
/* destroy old status bar */
- DestroyWindow(MixerWindow->hStatusBar);
+ if (MixerWindow->Mode == NORMAL_MODE)
+ DestroyWindow(MixerWindow->hStatusBar);
/* update details */
Preferences.SelectedLine = Pref.SelectedLine;
RebuildMixerWindowControls(&Preferences);
/* create status window */
- MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
- NULL,
- hwnd,
- 0);
-
- /* set status bar */
- if (MixerWindow->hStatusBar)
+ if (MixerWindow->Mode == NORMAL_MODE)
{
- SendMessage(MixerWindow->hStatusBar,
- WM_SETTEXT,
- 0,
- (LPARAM)szProduct);
+ MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
+ NULL,
+ hwnd,
+ 0);
+ if (MixerWindow->hStatusBar)
+ {
+ /* Set status bar */
+ SendMessage(MixerWindow->hStatusBar,
+ WM_SETTEXT,
+ 0,
+ (LPARAM)szProduct);
+ }
}
}
break;
/* check if the message is from the line switch */
if (HIWORD(wParam) == BN_CLICKED && (CtrlID % IDC_LINE_SWITCH == 0))
{
- /* compute line offset */
- LineOffset = CtrlID / IDC_LINE_SWITCH;
+ /* compute line offset */
+ LineOffset = CtrlID / IDC_LINE_SWITCH;
/* compute window id of line name static control */
CtrlID = LineOffset * IDC_LINE_NAME;
- /* get line name */
- if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
- {
- /* setup context */
- Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
- Context.bVertical = FALSE;
- Context.bSwitch = TRUE;
-
- /* set volume */
- SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
- }
+ /* get line name */
+ if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
+ {
+ /* setup context */
+ Context.SliderPos = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0);
+ Context.bVertical = FALSE;
+ Context.bSwitch = TRUE;
+
+ /* set volume */
+ SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
+ }
}
}
}
case WM_VSCROLL:
- {
- if (LOWORD(wParam) == TB_THUMBTRACK)
+ switch (LOWORD(wParam))
{
- /* get dialog item ctrl */
- CtrlID = GetDlgCtrlID((HWND)lParam);
+ case TB_THUMBTRACK:
+ /* get dialog item ctrl */
+ CtrlID = GetDlgCtrlID((HWND)lParam);
- /* get line index */
- LineOffset = CtrlID / IDC_LINE_SLIDER_VERT;
+ /* get line index */
+ LineOffset = CtrlID / IDC_LINE_SLIDER_VERT;
- /* compute window id of line name static control */
- CtrlID = LineOffset * IDC_LINE_NAME;
+ /* compute window id of line name static control */
+ CtrlID = LineOffset * IDC_LINE_NAME;
- /* get line name */
- if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
- {
- /* setup context */
- Context.SliderPos = HIWORD(wParam);
- Context.bVertical = TRUE;
- Context.bSwitch = FALSE;
+ /* get line name */
+ if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
+ {
+ /* setup context */
+ Context.SliderPos = LineOffset;
+ Context.bVertical = TRUE;
+ Context.bSwitch = FALSE;
- /* set volume */
- SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
- }
+ /* set volume */
+ SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
+ }
+ break;
+
+ case TB_ENDTRACK:
+ MixerWindow = GetWindowData(hwnd,
+ MIXER_WINDOW);
+
+ /* get dialog item ctrl */
+ CtrlID = GetDlgCtrlID((HWND)lParam);
+
+ /* get line index */
+ LineOffset = CtrlID / IDC_LINE_SLIDER_VERT;
+
+ if (LineOffset == 1 && MixerWindow->Mixer->MixerId == 0)
+ PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ASYNC | SND_ALIAS_ID);
+ break;
+
+ default:
+ break;
}
+ break;
+
+ case WM_HSCROLL:
+ switch (LOWORD(wParam))
+ {
+ case TB_THUMBTRACK:
+ /* get dialog item ctrl */
+ CtrlID = GetDlgCtrlID((HWND)lParam);
+
+ /* get line index */
+ LineOffset = CtrlID / IDC_LINE_SLIDER_HORZ;
+
+ /* compute window id of line name static control */
+ CtrlID = LineOffset * IDC_LINE_NAME;
+
+ /* get line name */
+ if (GetDlgItemTextW(hwnd, CtrlID, Context.LineName, MIXER_LONG_NAME_CHARS) != 0)
+ {
+ /* setup context */
+ Context.SliderPos = LineOffset;
+ Context.bVertical = TRUE;
+ Context.bSwitch = FALSE;
+
+ /* set volume */
+ SndMixerEnumConnections(Preferences.MixerWindow->Mixer, Preferences.SelectedLine, SetVolumeCallback, (LPVOID)&Context);
+ }
+ break;
+
+ case TB_ENDTRACK:
+ MixerWindow = GetWindowData(hwnd,
+ MIXER_WINDOW);
+
+ /* get dialog item ctrl */
+ CtrlID = GetDlgCtrlID((HWND)lParam);
+ /* get line index */
+ LineOffset = CtrlID / IDC_LINE_SLIDER_HORZ;
+
+ if (LineOffset == 1 && MixerWindow->Mixer->MixerId == 0)
+ PlaySound((LPCTSTR)SND_ALIAS_SYSTEMDEFAULT, NULL, SND_ASYNC | SND_ALIAS_ID);
+ break;
+
+ default:
+ break;
+ }
break;
- }
case WM_CREATE:
GWL_USERDATA,
(LONG_PTR)MixerWindow);
MixerWindow->hWnd = hwnd;
- MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd);
+ MixerWindow->Mixer = SndMixerCreate(MixerWindow->hWnd, MixerWindow->MixerId);
if (MixerWindow->Mixer != NULL)
{
TCHAR szProduct[MAXPNAMELEN];
}
- /* initialize perferences */
+ /* initialize preferences */
ZeroMemory(&Preferences, sizeof(Preferences));
/* store mixer */
}
/* create status window */
- MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
- NULL,
- hwnd,
- 0);
- if (MixerWindow->hStatusBar)
+ if (MixerWindow->Mode == NORMAL_MODE)
{
- SendMessage(MixerWindow->hStatusBar,
- WM_SETTEXT,
- 0,
- (LPARAM)szProduct);
+ MixerWindow->hStatusBar = CreateStatusWindow(WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS,
+ NULL,
+ hwnd,
+ 0);
+ if (MixerWindow->hStatusBar)
+ {
+ SendMessage(MixerWindow->hStatusBar,
+ WM_SETTEXT,
+ 0,
+ (LPARAM)szProduct);
+ }
}
+
+ /* Disable the 'Advanced Controls' menu item */
+ EnableMenuItem(GetMenu(hwnd), IDC_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED);
}
break;
}
{
MixerWindow = GetWindowData(hwnd,
MIXER_WINDOW);
- if (MixerWindow->Mixer != NULL)
+ if (MixerWindow != NULL)
{
- SndMixerDestroy(MixerWindow->Mixer);
+ if (MixerWindow->Mixer != NULL)
+ {
+ SndMixerDestroy(MixerWindow->Mixer);
+ }
+ if (MixerWindow->hFont)
+ DeleteObject(MixerWindow->hFont);
+ HeapFree(hAppHeap, 0, MixerWindow);
}
break;
}
}
static HWND
-CreateApplicationWindow(VOID)
+CreateApplicationWindow(
+ WINDOW_MODE WindowMode,
+ UINT MixerId)
{
HWND hWnd;
return NULL;
}
+ MixerWindow->Mode = WindowMode;
+ MixerWindow->MixerId = MixerId;
+
if (mixerGetNumDevs() > 0)
{
hWnd = CreateWindowEx(WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT,
return hWnd;
}
+static
+BOOL
+HandleCommandLine(LPTSTR cmdline,
+ PWINDOW_MODE pMode,
+ PUINT pMixerId)
+{
+ TCHAR option;
+
+ *pMixerId = 0;
+ *pMode = SMALL_MODE;
+
+ while (*cmdline == _T(' ') || *cmdline == _T('-') || *cmdline == _T('/'))
+ {
+ if (*cmdline++ == _T(' '))
+ continue;
+
+ option = *cmdline;
+ if (option)
+ cmdline++;
+ while (*cmdline == _T(' '))
+ cmdline++;
+
+ switch (option)
+ {
+ case 'd': /* Device */
+ case 'D':
+ break;
+
+ case 'n': /* Normal size */
+ case 'N':
+ *pMode = NORMAL_MODE;
+ break;
+
+ case 's': /* Small size */
+ case 'S':
+ *pMode = SMALL_MODE;
+ break;
+
+ case 't': /* Tray size */
+ case 'T':
+ *pMode = TRAY_MODE;
+ break;
+
+ case 'p': /* Play mode */
+ case 'P':
+ *pMixerId = 0;
+ break;
+
+ case 'r': /* Record mode */
+ case 'R':
+ *pMixerId = 1;
+ break;
+
+ default:
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
int WINAPI
_tWinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
MSG Msg;
int Ret = 1;
INITCOMMONCONTROLSEX Controls;
+ WINDOW_MODE WindowMode = SMALL_MODE;
+ UINT MixerId = 0;
UNREFERENCED_PARAMETER(hPrevInstance);
- UNREFERENCED_PARAMETER(lpszCmdLine);
- UNREFERENCED_PARAMETER(nCmdShow);
+ UNREFERENCED_PARAMETER(nCmdShow);
hAppInstance = hInstance;
hAppHeap = GetProcessHeap();
+ HandleCommandLine(lpszCmdLine, &WindowMode, &MixerId);
+
if (InitAppConfig())
{
/* load the application title */
InitCommonControlsEx(&Controls);
- if (RegisterApplicationClasses())
+ if (WindowMode == TRAY_MODE)
+ {
+ DialogBoxParam(hAppInstance,
+ MAKEINTRESOURCE(IDD_TRAY_MASTER),
+ NULL,
+ TrayDlgProc,
+ 0);
+ }
+ else
{
- hMainWnd = CreateApplicationWindow();
- if (hMainWnd != NULL)
+ if (RegisterApplicationClasses())
{
- BOOL bRet;
- while ((bRet =GetMessage(&Msg,
- NULL,
- 0,
- 0)) != 0)
+ hMainWnd = CreateApplicationWindow(WindowMode, MixerId);
+ if (hMainWnd != NULL)
{
- if (bRet != -1)
+ BOOL bRet;
+ while ((bRet =GetMessage(&Msg,
+ NULL,
+ 0,
+ 0)) != 0)
{
- TranslateMessage(&Msg);
- DispatchMessage(&Msg);
+ if (bRet != -1)
+ {
+ TranslateMessage(&Msg);
+ DispatchMessage(&Msg);
+ }
}
+
+ DestroyWindow(hMainWnd);
+ Ret = 0;
+ }
+ else
+ {
+ DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError());
}
- DestroyWindow(hMainWnd);
- Ret = 0;
+ UnregisterApplicationClasses();
}
else
{
- DPRINT("Failed to create application window (LastError: %d)!\n", GetLastError());
+ DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError());
}
-
- UnregisterApplicationClasses();
- }
- else
- {
- DPRINT("Failed to register application classes (LastError: %d)!\n", GetLastError());
}
if (lpAppTitle != NULL)
projects / reactos.git / blobdiff