reccmp-decomplint fixes

Author: madebr

GolDP/src/goldevicelist.cpp

@@ -25,13 +25,6 @@ typedef unsigned int uintptr_t;
 // GLOBAL: GOLDP 0x10063550
 GolDeviceList* GolDeviceList::s_DialogDeviceList;
 
-// FUNCTION: GOLDP 0x10026100
-GolDeviceList::GolDeviceList()
-{
-	m_countDrivers = 0;
-	m_drivers = NULL;
-}
-
 // FUNCTION: GOLDP 0x10013820
 void GolDeviceList::DetectDevices()
 {
@@ -190,47 +183,6 @@ GolDeviceList::GolD3DDeviceInfo* GolDeviceList::SelectDevice(
 	return device;
 }
 
-// FUNCTION: GOLDP 0x10013ff0
-void GolDeviceList::UpdateDialog(HWND p_hWnd)
-{
-	SendDlgItemMessageA(p_hWnd, IDC_DRIVERS_COMBOBOX, CB_RESETCONTENT, 0, 0);
-	SendDlgItemMessageA(p_hWnd, IDC_DEVICES_COMBOBOX, CB_RESETCONTENT, 0, 0);
-
-	for (LegoU32 driverIndex = 0; driverIndex < m_countDrivers; driverIndex++) {
-		LegoU32 comboBoxIndex = SendDlgItemMessageA(
-			p_hWnd,
-			IDC_DRIVERS_COMBOBOX,
-			CB_ADDSTRING,
-			0,
-			reinterpret_cast<LPARAM>(m_drivers[driverIndex].m_name)
-		);
-		SendDlgItemMessageA(
-			p_hWnd,
-			IDC_DRIVERS_COMBOBOX,
-			CB_SETITEMDATA,
-			comboBoxIndex,
-			reinterpret_cast<LPARAM>(&m_drivers[driverIndex])
-		);
-		if (driverIndex == m_driverIndex) {
-			SendDlgItemMessageA(p_hWnd, IDC_DRIVERS_COMBOBOX, CB_SETCURSEL, comboBoxIndex, 0);
-		}
-	}
-
-	for (LegoU32 deviceIndex = 0; deviceIndex < m_drivers[m_driverIndex].m_countDevices; deviceIndex++) {
-		GolD3DDeviceInfo* device = &m_drivers[m_driverIndex].m_devices[deviceIndex];
-		LegoU32 comboBoxIndex = SendDlgItemMessageA(
-			p_hWnd,
-			IDC_DEVICES_COMBOBOX,
-			CB_ADDSTRING,
-			0,
-			reinterpret_cast<LPARAM>(device->m_description)
-		);
-		if (deviceIndex == m_driverIndex) { // FIXME: should compare against m_deviceIndex
-			SendDlgItemMessageA(p_hWnd, IDC_DEVICES_COMBOBOX, CB_SETCURSEL, comboBoxIndex, 0);
-		}
-	}
-}
-
 // FUNCTION: GOLDP 0x10013ca0
 GolDeviceList::GolD3DDeviceInfo* GolDeviceList::FindMatchingDevice(
 	LegoU32 p_flags,
@@ -333,6 +285,47 @@ GolDeviceList::GolD3DDeviceInfo* GolDeviceList::FindMatchingDevice(
 	return NULL;
 }
 
+// FUNCTION: GOLDP 0x10013ff0
+void GolDeviceList::UpdateDialog(HWND p_hWnd)
+{
+	SendDlgItemMessageA(p_hWnd, IDC_DRIVERS_COMBOBOX, CB_RESETCONTENT, 0, 0);
+	SendDlgItemMessageA(p_hWnd, IDC_DEVICES_COMBOBOX, CB_RESETCONTENT, 0, 0);
+
+	for (LegoU32 driverIndex = 0; driverIndex < m_countDrivers; driverIndex++) {
+		LegoU32 comboBoxIndex = SendDlgItemMessageA(
+			p_hWnd,
+			IDC_DRIVERS_COMBOBOX,
+			CB_ADDSTRING,
+			0,
+			reinterpret_cast<LPARAM>(m_drivers[driverIndex].m_name)
+		);
+		SendDlgItemMessageA(
+			p_hWnd,
+			IDC_DRIVERS_COMBOBOX,
+			CB_SETITEMDATA,
+			comboBoxIndex,
+			reinterpret_cast<LPARAM>(&m_drivers[driverIndex])
+		);
+		if (driverIndex == m_driverIndex) {
+			SendDlgItemMessageA(p_hWnd, IDC_DRIVERS_COMBOBOX, CB_SETCURSEL, comboBoxIndex, 0);
+		}
+	}
+
+	for (LegoU32 deviceIndex = 0; deviceIndex < m_drivers[m_driverIndex].m_countDevices; deviceIndex++) {
+		GolD3DDeviceInfo* device = &m_drivers[m_driverIndex].m_devices[deviceIndex];
+		LegoU32 comboBoxIndex = SendDlgItemMessageA(
+			p_hWnd,
+			IDC_DEVICES_COMBOBOX,
+			CB_ADDSTRING,
+			0,
+			reinterpret_cast<LPARAM>(device->m_description)
+		);
+		if (deviceIndex == m_driverIndex) { // FIXME: should compare against m_deviceIndex
+			SendDlgItemMessageA(p_hWnd, IDC_DEVICES_COMBOBOX, CB_SETCURSEL, comboBoxIndex, 0);
+		}
+	}
+}
+
 // FUNCTION: GOLDP 0x10014110
 BOOL GolDeviceList::CountDirectDrawDriversCallback(GUID* p_guid, LPSTR p_name, LPSTR p_description, LPVOID p_context)
 {
@@ -557,3 +550,10 @@ int GolDeviceList::SelectDeviceDlgProc(HWND p_hWnd, UINT p_uMsg, WPARAM p_wParam
 	}
 	return 0;
 }
+
+// FUNCTION: GOLDP 0x10026100
+GolDeviceList::GolDeviceList()
+{
+	m_countDrivers = 0;
+	m_drivers = NULL;
+}