diff --git a/resource/Cxbx.rc b/resource/Cxbx.rc index 5f6af33b0..614d33f54 100644 --- a/resource/Cxbx.rc +++ b/resource/Cxbx.rc @@ -55,7 +55,24 @@ BEGIN IDD_LOGGING_CFG, DIALOG BEGIN - BOTTOMMARGIN, 322 + VERTGUIDE, 12 + VERTGUIDE, 66 + VERTGUIDE, 121 + VERTGUIDE, 178 + VERTGUIDE, 234 + VERTGUIDE, 246 + BOTTOMMARGIN, 347 + HORZGUIDE, 54 + HORZGUIDE, 69 + HORZGUIDE, 84 + HORZGUIDE, 99 + HORZGUIDE, 114 + HORZGUIDE, 126 + HORZGUIDE, 140 + HORZGUIDE, 155 + HORZGUIDE, 168 + HORZGUIDE, 182 + HORZGUIDE, 195 END END #endif // APSTUDIO_INVOKED @@ -378,81 +395,85 @@ BEGIN PUSHBUTTON "Reset",IDC_EE_RESET,13,251,40,14,BS_FLAT END -IDD_LOGGING_CFG DIALOGEX 0, 0, 259, 350 +IDD_LOGGING_CFG DIALOGEX 0, 0, 258, 355 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Cxbx-Reloaded : Logging Configuration" FONT 8, "Verdana", 0, 0, 0x1 BEGIN COMBOBOX IDC_EVENT_LV,57,9,50,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Event Level",IDC_STATIC,10,11,40,10,0,WS_EX_RIGHT - GROUPBOX "Emulator Event",IDC_CXBXR_EVENTS,13,25,235,182,WS_GROUP,WS_EX_CLIENTEDGE + GROUPBOX "Emulator Event",IDC_CXBXR_EVENTS,12,26,234,186,WS_GROUP,WS_EX_CLIENTEDGE CONTROL "Enable all",IDC_LOG_ENABLE_GENERAL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,19,39,47,10 CONTROL "Disable all",IDC_LOG_DISABLE_GENERAL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,71,39,50,10 CONTROL "Custom",IDC_LOG_CUSTOM_GENERAL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,134,39,41,10 CONTROL "CXBXR",IDC_LOG_CXBXR,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,27,54,39,10 CONTROL "XBE",IDC_LOG_XBE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,92,54,29,10 - CONTROL "INIT",IDC_LOG_INIT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,145,54,30,10 + CONTROL "INIT",IDC_LOG_INIT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,148,54,30,10 CONTROL "VMEM",IDC_LOG_VMEM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,199,54,35,10 CONTROL "PMEM",IDC_LOG_PMEM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,32,69,34,10 CONTROL "GUI",IDC_LOG_GUI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,92,69,29,10 - CONTROL "EEPR",IDC_LOG_EEPR,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,142,69,33,10 + CONTROL "EEPR",IDC_LOG_EEPR,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,145,69,33,10 CONTROL "RSA",IDC_LOG_RSA,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,204,69,30,10 CONTROL "POOLMEM",IDC_LOG_POOLMEM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,18,84,48,10 CONTROL "D3D8",IDC_LOG_D3D8,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,87,84,34,10 - CONTROL "D3DST",IDC_LOG_D3DST,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,136,84,39,10 + CONTROL "D3DST",IDC_LOG_D3DST,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,139,84,39,10 CONTROL "D3DCVT",IDC_LOG_D3DCVT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,190,84,44,10 CONTROL "DSOUND",IDC_LOG_DSOUND,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,21,99,45,10 - CONTROL "XAPI",IDC_LOG_XAPI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,89,99,32,10 - CONTROL "XACT",IDC_LOG_XACT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,141,99,34,10 - CONTROL "XGRP",IDC_LOG_XGRP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,99,34,10 - CONTROL "XONLINE",IDC_LOG_XONLINE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,21,114,45,10 - CONTROL "FS",IDC_LOG_FS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,97,114,24,10 - CONTROL "PSHB",IDC_LOG_PSHB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,141,114,34,10 - CONTROL "PXSH",IDC_LOG_PXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,114,34,10 - CONTROL "VTXSH",IDC_LOG_VTXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,28,129,38,10 - CONTROL "VTXB",IDC_LOG_VTXB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,87,129,34,10 - CONTROL "DINP",IDC_LOG_DINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,142,129,33,10 - CONTROL "XINP",IDC_LOG_XINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,202,129,32,10 - CONTROL "SDL",IDC_LOG_SDL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,33,144,33,10 - CONTROL "FILE",IDC_LOG_FILE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,144,30,10 - CONTROL "X86",IDC_LOG_X86,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,146,144,29,10 - CONTROL "HLE",IDC_LOG_HLE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,206,144,28,10 - CONTROL "NET",IDC_LOG_NET,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,37,159,29,10 - CONTROL "MCPX",IDC_LOG_MCPX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,86,159,35,10 - CONTROL "NV2A",IDC_LOG_NV2A,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,141,159,34,10 - CONTROL "SMC",IDC_LOG_SMC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,203,159,31,10 - CONTROL "OHCI",IDC_LOG_OHCI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,32,174,34,10 - CONTROL "USB",IDC_LOG_USB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,174,30,10 - CONTROL "HUB",IDC_LOG_HUB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,145,174,30,10 - CONTROL "XIDCTRL",IDC_LOG_XIDCTRL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,188,174,46,10 - CONTROL "ADM",IDC_LOG_ADM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,35,189,31,10 - CONTROL "INPSYS",IDC_LOG_INPSYS,"Button",BS_AUTOCHECKBOX|BS_LEFTTEXT|WS_TABSTOP,80,189,41,10 - GROUPBOX "Kernel Event",IDC_KERNEL_EVENTS,13,212,235,110,WS_GROUP,WS_EX_CLIENTEDGE - CONTROL "Enable all",IDC_LOG_ENABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,19,226,47,10 - CONTROL "Disable all",IDC_LOG_DISABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,71,226,50,10 - CONTROL "Custom",IDC_LOG_CUSTOM_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,134,226,41,10 - CONTROL "KRNL",IDC_LOG_KRNL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,33,241,33,10 - CONTROL "LOG",IDC_LOG_LOG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,241,30,10 - CONTROL "XBOX",IDC_LOG_XBOX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,140,241,35,10 - CONTROL "XBDM",IDC_LOG_XBDM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,199,241,35,10 - CONTROL "AV",IDC_LOG_AV,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,41,256,25,10 - CONTROL "DBG",IDC_LOG_DBG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,90,256,31,10 - CONTROL "EX",IDC_LOG_EX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,150,256,25,10 - CONTROL "FSC",IDC_LOG_FSC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,205,256,29,10 - CONTROL "HAL",IDC_LOG_HAL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,37,271,29,10 - CONTROL "IO",IDC_LOG_IO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,97,271,24,10 - CONTROL "KD",IDC_LOG_KD,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,271,26,10 - CONTROL "KE",IDC_LOG_KE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,209,271,25,10 - CONTROL "KI",IDC_LOG_KI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,43,286,23,10 - CONTROL "MM",IDC_LOG_MM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,95,286,26,10 - CONTROL "NT",IDC_LOG_NT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,150,286,25,10 - CONTROL "OB",IDC_LOG_OB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,208,286,26,10 - CONTROL "PS",IDC_LOG_PS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,41,302,25,10 - CONTROL "RTL",IDC_LOG_RTL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,93,302,28,10 - CONTROL "XC",IDC_LOG_XC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,302,26,10 - CONTROL "XE",IDC_LOG_XE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,209,302,25,10 - PUSHBUTTON "Cancel",IDC_LOG_CANCEL,161,327,40,14,BS_FLAT - PUSHBUTTON "Accept",IDC_LOG_ACCEPT,208,327,40,14,BS_FLAT + CONTROL "DSBUFFER",IDC_LOG_DSBUFFER,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,71,99,50,10 + CONTROL "DSSTREAM",IDC_LOG_DSSTREAM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,125,99,53,10 + CONTROL "DS3DCALC",IDC_LOG_DS3DCALC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,181,99,53,10 + CONTROL "XMO",IDC_LOG_XMO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,35,114,31,10 + CONTROL "XAPI",IDC_LOG_XAPI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,89,114,32,10 + CONTROL "XACT",IDC_LOG_XACT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,114,34,10 + CONTROL "XGRP",IDC_LOG_XGRP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,114,34,10 + CONTROL "XONLINE",IDC_LOG_XONLINE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,21,126,45,10 + CONTROL "FS",IDC_LOG_FS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,97,126,24,10 + CONTROL "PSHB",IDC_LOG_PSHB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,126,34,10 + CONTROL "PXSH",IDC_LOG_PXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,126,34,10 + CONTROL "VTXSH",IDC_LOG_VTXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,28,140,38,10 + CONTROL "VTXB",IDC_LOG_VTXB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,87,140,34,10 + CONTROL "DINP",IDC_LOG_DINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,145,140,33,10 + CONTROL "XINP",IDC_LOG_XINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,202,140,32,10 + CONTROL "SDL",IDC_LOG_SDL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,33,155,33,10 + CONTROL "FILE",IDC_LOG_FILE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,155,30,10 + CONTROL "X86",IDC_LOG_X86,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,155,29,10 + CONTROL "HLE",IDC_LOG_HLE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,206,155,28,10 + CONTROL "NET",IDC_LOG_NET,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,37,168,29,10 + CONTROL "MCPX",IDC_LOG_MCPX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,86,168,35,10 + CONTROL "NV2A",IDC_LOG_NV2A,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,168,34,10 + CONTROL "SMC",IDC_LOG_SMC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,203,168,31,10 + CONTROL "OHCI",IDC_LOG_OHCI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,32,182,34,10 + CONTROL "USB",IDC_LOG_USB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,182,30,10 + CONTROL "HUB",IDC_LOG_HUB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,148,182,30,10 + CONTROL "XIDCTRL",IDC_LOG_XIDCTRL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,188,182,46,10 + CONTROL "ADM",IDC_LOG_ADM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,35,195,31,10 + CONTROL "INPSYS",IDC_LOG_INPSYS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,80,195,41,10 + GROUPBOX "Kernel Event",IDC_KERNEL_EVENTS,12,218,234,110,WS_GROUP,WS_EX_CLIENTEDGE + CONTROL "Enable all",IDC_LOG_ENABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,19,232,47,10 + CONTROL "Disable all",IDC_LOG_DISABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,71,232,50,10 + CONTROL "Custom",IDC_LOG_CUSTOM_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,134,232,41,10 + CONTROL "KRNL",IDC_LOG_KRNL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,33,247,33,10 + CONTROL "LOG",IDC_LOG_LOG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,247,30,10 + CONTROL "XBOX",IDC_LOG_XBOX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,141,247,35,10 + CONTROL "XBDM",IDC_LOG_XBDM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,199,247,35,10 + CONTROL "AV",IDC_LOG_AV,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,41,262,25,10 + CONTROL "DBG",IDC_LOG_DBG,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,90,262,31,10 + CONTROL "EX",IDC_LOG_EX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,150,262,25,10 + CONTROL "FSC",IDC_LOG_FSC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,205,262,29,10 + CONTROL "HAL",IDC_LOG_HAL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,37,277,29,10 + CONTROL "IO",IDC_LOG_IO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,97,277,24,10 + CONTROL "KD",IDC_LOG_KD,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,277,26,10 + CONTROL "KE",IDC_LOG_KE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,209,277,25,10 + CONTROL "KI",IDC_LOG_KI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,43,292,23,10 + CONTROL "MM",IDC_LOG_MM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,95,292,26,10 + CONTROL "NT",IDC_LOG_NT,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,150,292,25,10 + CONTROL "OB",IDC_LOG_OB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,208,292,26,10 + CONTROL "PS",IDC_LOG_PS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,41,308,25,10 + CONTROL "RTL",IDC_LOG_RTL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,93,308,28,10 + CONTROL "XC",IDC_LOG_XC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,308,26,10 + CONTROL "XE",IDC_LOG_XE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,209,308,25,10 + PUSHBUTTON "Cancel",IDC_LOG_CANCEL,161,333,40,14,BS_FLAT + PUSHBUTTON "Accept",IDC_LOG_ACCEPT,206,333,40,14,BS_FLAT END diff --git a/src/common/Logging.cpp b/src/common/Logging.cpp index 45d5fa624..fd5649a03 100644 --- a/src/common/Logging.cpp +++ b/src/common/Logging.cpp @@ -75,6 +75,10 @@ const char* g_EnumModules2String[to_underlying(CXBXR_MODULE::MAX)] = { "XIDCTRL ", "ADM ", "INPSYS ", + "DSBUFFER", + "DSSTREAM", + "DS3DCALC", + "XMO ", "KRNL ", "LOG ", "XBOX ", diff --git a/src/common/Logging.h b/src/common/Logging.h index a21a46498..a4bbcd21b 100644 --- a/src/common/Logging.h +++ b/src/common/Logging.h @@ -83,6 +83,10 @@ typedef enum class _CXBXR_MODULE: unsigned int { XIDCTRL, ADM, INPSYS, + DSBUFFER, + DSSTREAM, + DS3DCALC, + XMO, // kernel KRNL, LOG, diff --git a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp index 2d281ee85..76d405783 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSound3DCalculator.cpp @@ -25,7 +25,7 @@ // * All rights reserved // * // ****************************************************************** -#define LOG_PREFIX CXBXR_MODULE::DSOUND +#define LOG_PREFIX CXBXR_MODULE::DS3DCALC // prevent name collisions namespace xboxkrnl { diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp index c7e3c8bb2..59046fb21 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundBuffer.cpp @@ -26,7 +26,7 @@ // * All rights reserved // * // ****************************************************************** -#define LOG_PREFIX CXBXR_MODULE::DSOUND +#define LOG_PREFIX CXBXR_MODULE::DSBUFFER // prevent name collisions namespace xboxkrnl { diff --git a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp index 9db03e5c7..d05166128 100644 --- a/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp +++ b/src/core/hle/DSOUND/DirectSound/DirectSoundStream.cpp @@ -26,7 +26,7 @@ // * All rights reserved // * // ****************************************************************** -#define LOG_PREFIX CXBXR_MODULE::DSOUND +#define LOG_PREFIX CXBXR_MODULE::DSSTREAM // prevent name collisions namespace xboxkrnl { diff --git a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp index bf19fb6f0..1c3616dba 100644 --- a/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp +++ b/src/core/hle/DSOUND/DirectSound/XFileMediaObject.cpp @@ -25,7 +25,7 @@ // * All rights reserved // * // ****************************************************************** -#define LOG_PREFIX CXBXR_MODULE::DSOUND +#define LOG_PREFIX CXBXR_MODULE::XMO // prevent name collisions namespace xboxkrnl { diff --git a/src/gui/DlgLoggingConfig.cpp b/src/gui/DlgLoggingConfig.cpp index 8219586ea..c136c6433 100644 --- a/src/gui/DlgLoggingConfig.cpp +++ b/src/gui/DlgLoggingConfig.cpp @@ -74,6 +74,10 @@ static int g_DlgIndexes[] = { IDC_LOG_XIDCTRL, IDC_LOG_ADM, IDC_LOG_INPSYS, + IDC_LOG_DSBUFFER, + IDC_LOG_DSSTREAM, + IDC_LOG_DS3DCALC, + IDC_LOG_XMO, // Kernel IDC_LOG_KRNL, IDC_LOG_LOG, @@ -324,63 +328,67 @@ INT_PTR CALLBACK DlgLogConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM } break; - case IDC_LOG_CXBXR: + case IDC_LOG_CXBXR: case IDC_LOG_XBE: - case IDC_LOG_INIT: - case IDC_LOG_VMEM: - case IDC_LOG_PMEM: - case IDC_LOG_GUI: - case IDC_LOG_EEPR: - case IDC_LOG_RSA: - case IDC_LOG_POOLMEM: - case IDC_LOG_D3D8: - case IDC_LOG_D3DST: - case IDC_LOG_D3DCVT: - case IDC_LOG_DSOUND: - case IDC_LOG_XAPI: - case IDC_LOG_XACT: - case IDC_LOG_XGRP: - case IDC_LOG_XONLINE: - case IDC_LOG_FS: - case IDC_LOG_PSHB: - case IDC_LOG_PXSH: - case IDC_LOG_VTXSH: - case IDC_LOG_VTXB: - case IDC_LOG_DINP: + case IDC_LOG_INIT: + case IDC_LOG_VMEM: + case IDC_LOG_PMEM: + case IDC_LOG_GUI: + case IDC_LOG_EEPR: + case IDC_LOG_RSA: + case IDC_LOG_POOLMEM: + case IDC_LOG_D3D8: + case IDC_LOG_D3DST: + case IDC_LOG_D3DCVT: + case IDC_LOG_DSOUND: + case IDC_LOG_DSBUFFER: + case IDC_LOG_DSSTREAM: + case IDC_LOG_DS3DCALC: + case IDC_LOG_XMO: + case IDC_LOG_XAPI: + case IDC_LOG_XACT: + case IDC_LOG_XGRP: + case IDC_LOG_XONLINE: + case IDC_LOG_FS: + case IDC_LOG_PSHB: + case IDC_LOG_PXSH: + case IDC_LOG_VTXSH: + case IDC_LOG_VTXB: + case IDC_LOG_DINP: case IDC_LOG_XINP: case IDC_LOG_SDL: - case IDC_LOG_FILE: - case IDC_LOG_X86: - case IDC_LOG_HLE: - case IDC_LOG_NET: - case IDC_LOG_MCPX: - case IDC_LOG_NV2A: - case IDC_LOG_SMC: - case IDC_LOG_OHCI: - case IDC_LOG_USB: - case IDC_LOG_HUB: - case IDC_LOG_XIDCTRL: + case IDC_LOG_FILE: + case IDC_LOG_X86: + case IDC_LOG_HLE: + case IDC_LOG_NET: + case IDC_LOG_MCPX: + case IDC_LOG_NV2A: + case IDC_LOG_SMC: + case IDC_LOG_OHCI: + case IDC_LOG_USB: + case IDC_LOG_HUB: + case IDC_LOG_XIDCTRL: case IDC_LOG_ADM: case IDC_LOG_INPSYS: - case IDC_LOG_KRNL: - case IDC_LOG_LOG: - case IDC_LOG_XBOX: - case IDC_LOG_XBDM: - case IDC_LOG_AV: - case IDC_LOG_DBG: - case IDC_LOG_EX: - case IDC_LOG_FSC: - case IDC_LOG_HAL: - case IDC_LOG_IO: - case IDC_LOG_KD: - case IDC_LOG_KE: - case IDC_LOG_KI: - case IDC_LOG_MM: - case IDC_LOG_NT: - case IDC_LOG_OB: - case IDC_LOG_PS: - case IDC_LOG_RTL: - case IDC_LOG_XC: + case IDC_LOG_KRNL: + case IDC_LOG_LOG: + case IDC_LOG_XBOX: + case IDC_LOG_XBDM: + case IDC_LOG_AV: + case IDC_LOG_DBG: + case IDC_LOG_EX: + case IDC_LOG_FSC: + case IDC_LOG_HAL: + case IDC_LOG_IO: + case IDC_LOG_KD: + case IDC_LOG_KE: + case IDC_LOG_KI: + case IDC_LOG_MM: + case IDC_LOG_NT: + case IDC_LOG_OB: + case IDC_LOG_PS: + case IDC_LOG_RTL: + case IDC_LOG_XC: case IDC_LOG_XE: if (HIWORD(wParam) == BN_CLICKED) { g_bHasChanges = true; diff --git a/src/gui/ResCxbx.h b/src/gui/ResCxbx.h index 7d0f1a894..916a3c96d 100644 --- a/src/gui/ResCxbx.h +++ b/src/gui/ResCxbx.h @@ -87,6 +87,10 @@ #define IDC_LOG_XC 955 #define IDC_LOG_XE 956 #define IDC_LOG_INPSYS 957 +#define IDC_LOG_DSBUFFER 958 +#define IDC_LOG_DSSTREAM 959 +#define IDC_LOG_DS3DCALC 960 +#define IDC_LOG_XMO 961 #define IDC_SET_MOTOR 999 #define IDC_SET_X 1000 #define IDC_SET_Y 1001