GUI: squashed a few new bugs

Author: Robbbert

src/osd/winui/hbmameui.rc

@@ -570,14 +570,15 @@ STYLE WS_CHILD | WS_CAPTION
 CAPTION "Audit"
 FONT 8, "Tahoma"
 BEGIN
-	ICON            IDI_PR_AUDIT,IDC_STATIC,20,10,20,20
-	LTEXT           "Title\nDirectory\nExtra",IDC_PROP_TITLE,52,9,161,25,SS_NOPREFIX
-	LTEXT           "ROM check:",IDC_STATIC,10,40,50,8
-	LTEXT           "Checking...",IDC_PROP_ROMS,66,40,139,8
-	LTEXT           "Sample check:",IDC_STATIC,10,52,50,8
-	LTEXT           "Checking...",IDC_PROP_SAMPLES,66,52,139,8
-	GROUPBOX        "Details",IDC_STATIC,4,64,211,171
-	EDITTEXT        IDC_AUDIT_DETAILS_PROP0,10,74,199,155,ES_MULTILINE |ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL |NOT WS_TABSTOP
+    LTEXT           "Title\nDirectory\nExtra",IDC_PROP_TITLE,52,9,161,25,SS_NOPREFIX
+    LTEXT           "ROM Check:",IDC_STATIC,10,40,50,8
+    LTEXT           "Checking...",IDC_PROP_ROMS,66,40,139,8
+    LTEXT           "Sample Check:",IDC_STATIC,10,52,50,8
+    LTEXT           "Checking...",IDC_PROP_SAMPLES,66,52,139,8
+    GROUPBOX        "ROM Details",IDC_STATIC,4,64,212,104
+    EDITTEXT        IDC_AUDIT_DETAILS_PROP0,10,74,200,88,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP
+    GROUPBOX        "Sample Details",IDC_STATIC,4,172,212,104
+    EDITTEXT        IDC_AUDIT_DETAILS_PROP1,10,182,200,88,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP
 END
 
 IDD_PROP_DISPLAY DIALOGEX 0, 0, 220, 240

src/osd/winui/mui_audit.cpp

@@ -186,7 +186,7 @@ int MameUIVerifyRomSet(int game, bool choice)
 }
 
 // Verifies the Sample set while calling SetSampleAuditResults
-int MameUIVerifySampleSet(int game, int box)
+int MameUIVerifySampleSet(int game)
 {
 	driver_enumerator enumerator(MameUIGlobal(), driver_list::driver(game));
 	enumerator.next();
@@ -206,15 +206,15 @@ int MameUIVerifySampleSet(int game, int box)
 
 	// output the summary of the audit
 	if (!summary_string.empty())
-		DetailsPrintf(box, "%s", summary_string.c_str());
+		DetailsPrintf(1, "%s", summary_string.c_str());
 
 	SetSampleAuditResults(game, summary);
 	return summary;
 }
 
 static DWORD WINAPI AuditThreadProc(LPVOID hDlg)
 {
-	char s[80] { };
+	char s[80]{};
 
 	while (!bCancel)
 	{
@@ -329,7 +329,7 @@ INT_PTR CALLBACK GameAuditDialogProc(HWND hDlg,UINT Msg,WPARAM wParam,LPARAM lPa
 
 			if (DriverUsesSamples(rom_index))
 			{
-				iStatus = MameUIVerifySampleSet(rom_index, 0);
+				iStatus = MameUIVerifySampleSet(rom_index);
 				lpStatus = StatusString(iStatus);
 			}
 			else
@@ -348,7 +348,7 @@ INT_PTR CALLBACK GameAuditDialogProc(HWND hDlg,UINT Msg,WPARAM wParam,LPARAM lPa
 static void ProcessNextRom()
 {
 	int retval = 0;
-	TCHAR buffer[20] { };
+	TCHAR buffer[20]{};
 
 	retval = MameUIVerifyRomSet(rom_index, 1);
 	switch (retval)
@@ -386,9 +386,9 @@ static void ProcessNextRom()
 static void ProcessNextSample()
 {
 	int retval = 0;
-	TCHAR buffer[20] { };
+	TCHAR buffer[20]{};
 
-	retval = MameUIVerifySampleSet(sample_index, 1);
+	retval = MameUIVerifySampleSet(sample_index);
 
 	switch (retval)
 	{
@@ -429,33 +429,27 @@ static void ProcessNextSample()
 
 static void CLIB_DECL DetailsPrintf(int box, const char *fmt, ...)
 {
-	//RS 20030613 Different Ids for Property Page and Dialog
-	// so see which one's currently instantiated
-	HWND hEdit = 0;
-	if (box == 0)
+	// This does the audit boxes for all systems and for an individual game.
+	// See if it's all systems
+	HWND hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS);
+	// if not open, try individual game
+	if (!hEdit)
 	{
-		hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS);
+		// if this system has separate boxes for samples, try that
+		// otherwise all errors go into the roms box
+		if (box)
+			hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS_PROP1);
 		if (!hEdit)
 			hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS_PROP0);
 	}
-	else
-	if (box == 1)
-	{
-		hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS);
-		if (!hEdit)
-			hEdit = GetDlgItem(hAudit, IDC_AUDIT_DETAILS_PROP1);
-	}
 
+	// Still nothing? Most likely doing an F5 audit, which has no boxes.
 	if (!hEdit)
-	{
-		// Auditing via F5 - no window to display the results
-		//printf("audit detailsprintfsprintf() can't find any audit control\n");
 		return;
-	}
 
 	va_list marker;
 	va_start(marker, fmt);
-	char s[8000] { };
+	char s[8000]{};
 	vsnprintf(s, sizeof(s), fmt, marker);
 	va_end(marker);
 

src/osd/winui/mui_audit.h

@@ -11,7 +11,7 @@ void InitGameAudit(int gameIndex);
 INT_PTR CALLBACK GameAuditDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
 
 int MameUIVerifyRomSet(int game, bool choice);
-int MameUIVerifySampleSet(int game, int);
+int MameUIVerifySampleSet(int game);
 
 const char * GetAuditString(int audit_result);
 BOOL IsAuditResultKnown(int audit_result);