Diff for /np2/win9x/dialog/d_sound.cpp between versions 1.21 and 1.25

version 1.21, 2007/11/11 07:11:28 version 1.25, 2011/03/07 09:54:11
Line 1 Line 1
 #include        "compiler.h"  /**
 #include        <commctrl.h>   * @file        d_sound.cpp
 #include        <prsht.h>   * @brief       Sound configure dialog procedure
 #include        "strres.h"   *
 #include        "resource.h"   * @author      $Author$
 #include        "np2.h"   * @date        $Date$
 #include        "oemtext.h"   */
 #include        "dosio.h"  
 #include        "joymng.h"  #include "compiler.h"
 #include        "sysmng.h"  #include <commctrl.h>
 #include        "menu.h"  #include <prsht.h>
 #include        "np2class.h"  #include "strres.h"
 #include        "dialog.h"  #include "resource.h"
 #include        "dialogs.h"  #include "np2.h"
 #include        "pccore.h"  #include "oemtext.h"
 #include        "iocore.h"  #include "dosio.h"
 #include        "sound.h"  #include "joymng.h"
 #include        "fmboard.h"  #include "sysmng.h"
 #include        "s98.h"  #include "menu.h"
 #include        "dipswbmp.h"  #include "np2class.h"
   #include "dialog.h"
   #include "dialogs.h"
   #include "pccore.h"
   #include "iocore.h"
   #include "sound.h"
   #include "fmboard.h"
   #include "s98.h"
   #include "dipswbmp.h"
   
   #if !defined(__GNUC__)
   #pragma comment(lib, "comctl32.lib")
   #endif  // !defined(__GNUC__)
   
 static const CBPARAM cpIO26[] =  static const CBPARAM cpIO26[] =
 {  {
Line 48  static const CBPARAM cpInt86[] = Line 59  static const CBPARAM cpInt86[] =
         {MAKEINTRESOURCE(IDS_INT6),             0x04},          {MAKEINTRESOURCE(IDS_INT6),             0x04},
 };  };
   
 static const TCHAR *sndinterrupt[4] =  
                                                 {str_int0, str_int4, str_int5, str_int6};  
   
 static const CBPARAM cpAddr[] =  static const CBPARAM cpAddr[] =
 {  {
         {MAKEINTRESOURCE(IDS_C8000),            0x00},          {MAKEINTRESOURCE(IDS_C8000),            0x00},
Line 72  static const CBPARAM cpID[] = Line 80  static const CBPARAM cpID[] =
         {MAKEINTRESOURCE(IDS_7X),       0x00},          {MAKEINTRESOURCE(IDS_7X),       0x00},
 };  };
   
 static const TCHAR str_sndopt[] = _T("Sound board option");  
   
   
 typedef struct {  typedef struct {
         UINT16  res;          UINT16  res;
Line 919  static LRESULT CALLBACK PAD1optDlgProc(H Line 925  static LRESULT CALLBACK PAD1optDlgProc(H
   
 // ----  // ----
   
 void dialog_sndopt(HWND hWnd) {  void dialog_sndopt(HWND hWnd)
   {
         HINSTANCE               hinst;          HINSTANCE               hInstance;
         PROPSHEETPAGE   psp;          PROPSHEETPAGE   psp;
         PROPSHEETHEADER psh;          PROPSHEETHEADER psh;
         HPROPSHEETPAGE  hpsp[6];          HPROPSHEETPAGE  hpsp[6];
           TCHAR                   szTitle[128];
   
         hinst = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);          hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
   
         ZeroMemory(&psp, sizeof(psp));          ZeroMemory(&psp, sizeof(psp));
         psp.dwSize = sizeof(PROPSHEETPAGE);          psp.dwSize = sizeof(PROPSHEETPAGE);
         psp.dwFlags = PSP_DEFAULT;          psp.dwFlags = PSP_DEFAULT;
         psp.hInstance = hinst;          psp.hInstance = hInstance;
   
         psp.pszTemplate = MAKEINTRESOURCE(IDD_SNDMIX);          psp.pszTemplate = MAKEINTRESOURCE(IDD_SNDMIX);
         psp.pfnDlgProc = (DLGPROC)SndmixDlgProc;          psp.pfnDlgProc = (DLGPROC)SndmixDlgProc;
Line 957  void dialog_sndopt(HWND hWnd) { Line 964  void dialog_sndopt(HWND hWnd) {
         psp.pfnDlgProc = (DLGPROC)PAD1optDlgProc;          psp.pfnDlgProc = (DLGPROC)PAD1optDlgProc;
         hpsp[5] = CreatePropertySheetPage(&psp);          hpsp[5] = CreatePropertySheetPage(&psp);
   
           loadstringresource(IDS_SOUNDOPTION, szTitle, NELEMENTS(szTitle));
   
         ZeroMemory(&psh, sizeof(psh));          ZeroMemory(&psh, sizeof(psh));
         psh.dwSize = sizeof(PROPSHEETHEADER);          psh.dwSize = sizeof(PROPSHEETHEADER);
         psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEHICON | PSH_USECALLBACK;          psh.dwFlags = PSH_NOAPPLYNOW | PSH_USEHICON | PSH_USECALLBACK;
         psh.hwndParent = hWnd;          psh.hwndParent = hWnd;
         psh.hInstance = hinst;          psh.hInstance = hInstance;
         psh.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_ICON2));          psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
         psh.nPages = 6;          psh.nPages = 6;
         psh.phpage = hpsp;          psh.phpage = hpsp;
         psh.pszCaption = str_sndopt;          psh.pszCaption = szTitle;
         psh.pfnCallback = np2class_propetysheet;          psh.pfnCallback = np2class_propetysheet;
         PropertySheet(&psh);          PropertySheet(&psh);
         InvalidateRect(hWnd, NULL, TRUE);          InvalidateRect(hWnd, NULL, TRUE);

Removed from v.1.21  
changed lines
  Added in v.1.25


RetroPC.NET-CVS <cvs@retropc.net>