more cleanups and fix (nw)

src/emu/input.cpp

@@ -859,6 +859,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite
 			break;
 
 		default:
+			item = NULL;
 			assert(false);
 	}
 

src/osd/modules/debugger/debugint.cpp

@@ -17,7 +17,6 @@
 #include "debug/debugvw.h"
 #include "debug/dvdisasm.h"
 #include "debug/dvmemory.h"
-#include "debug/dvstate.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
 
@@ -151,10 +150,8 @@ class DView_edit
 	DISABLE_COPYING(DView_edit);
 
 public:
-	DView_edit()
-	{ }
-	~DView_edit()
-	{ }
+	DView_edit(): active(0), container(NULL) { }
+	~DView_edit() { }
 	int                 active;
 	render_container *  container;
 	std::string         str;
@@ -1131,7 +1128,6 @@ static void render_editor(DView_edit *editor)
 	x1 += UI_BOX_LR_BORDER;
 	x2 -= UI_BOX_LR_BORDER;
 	y1 += UI_BOX_TB_BORDER;
-	y2 -= UI_BOX_TB_BORDER;
 
 	/* draw the text within it */
 	editor->container->manager().machine().ui().draw_text_full(editor->container, editor->str.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE,

src/osd/modules/debugger/debugwin.cpp

@@ -22,11 +22,9 @@
 #include "win/uimetrics.h"
 
 #include "emu.h"
-#include "uiinput.h"
 #include "debugger.h"
 
 #include "window.h"
-#include "winmain.h"
 #include "../../windows/input.h"
 
 

src/osd/modules/debugger/win/consolewininfo.cpp

@@ -9,7 +9,6 @@
 #include "consolewininfo.h"
 
 #include "debugviewinfo.h"
-#include "disasmviewinfo.h"
 #include "uimetrics.h"
 
 #include "debug/debugcon.h"
@@ -84,7 +83,7 @@ consolewin_info::consolewin_info(debugger_windows_interface &debugger) :
 	set_cpu(*debug_cpu_get_visible_cpu(machine()));
 
 	// mark the edit box as the default focus and set it
-	set_default_focus();
+	editwin_info::set_default_focus();
 	return;
 
 cleanup:

src/osd/modules/debugger/win/debugviewinfo.cpp

@@ -315,7 +315,7 @@ void debugview_info::draw_contents(HDC windc)
 		// loop twice; once to fill the background and once to draw the text
 		for (int iter = 0; iter < 2; iter++)
 		{
-			COLORREF fgcolor = RGB(0x00,0x00,0x00);
+			COLORREF fgcolor;
 			COLORREF bgcolor = RGB(0xff,0xff,0xff);
 			HBRUSH bgbrush = NULL;
 			int last_attrib = -1;

src/osd/modules/debugger/win/debugwininfo.cpp

@@ -11,9 +11,6 @@
 #include "debugviewinfo.h"
 
 #include "debug/debugcpu.h"
-#include "imagedev/cassette.h"
-
-#include "strconv.h"
 #include "window.h"
 #include "winutf8.h"
 

src/osd/modules/debugger/win/disasmwininfo.cpp

@@ -11,11 +11,6 @@
 #include "debugviewinfo.h"
 #include "disasmviewinfo.h"
 #include "uimetrics.h"
-
-#include "debugger.h"
-#include "debug/debugcon.h"
-#include "debug/debugcpu.h"
-
 #include "winutf8.h"
 
 
@@ -38,14 +33,14 @@ disasmwin_info::disasmwin_info(debugger_windows_interface &debugger) :
 	update_caption();
 
 	// recompute the children once to get the maxwidth
-	recompute_children();
+	disasmwin_info::recompute_children();
 
 	// position the window and recompute children again
 	SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW);
-	recompute_children();
+	disasmwin_info::recompute_children();
 
 	// mark the edit box as the default focus and set it
-	set_default_focus();
+	editwin_info::set_default_focus();
 }
 
 

src/osd/modules/debugger/win/logwininfo.cpp

@@ -38,7 +38,7 @@ logwin_info::logwin_info(debugger_windows_interface &debugger) :
 	SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW);
 
 	// recompute the children
-	recompute_children();
+	debugwin_info::recompute_children();
 }
 
 

src/osd/modules/debugger/win/memorywininfo.cpp

@@ -59,14 +59,14 @@ memorywin_info::memorywin_info(debugger_windows_interface &debugger) :
 	update_caption();
 
 	// recompute the children once to get the maxwidth
-	recompute_children();
+	memorywin_info::recompute_children();
 
 	// position the window and recompute children again
 	SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW);
-	recompute_children();
+	memorywin_info::recompute_children();
 
 	// mark the edit box as the default focus and set it
-	set_default_focus();
+	editwin_info::set_default_focus();
 }
 
 

src/osd/modules/debugger/win/pointswininfo.cpp

@@ -46,7 +46,7 @@ pointswin_info::pointswin_info(debugger_windows_interface &debugger) :
 	SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW);
 
 	// recompute the children
-	recompute_children();
+	debugwin_info::recompute_children();
 }
 
 

src/osd/modules/debugger/win/uimetrics.cpp

@@ -31,7 +31,6 @@ ui_metrics::ui_metrics(osd_options const &options) :
 		m_debug_font = CreateFont(-MulDiv((size <= 0) ? 9 : size, GetDeviceCaps(temp_dc, LOGPIXELSY), 72), 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE,
 					ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FIXED_PITCH, t_face);
 		osd_free(t_face);
-		t_face = NULL;
 
 		if (m_debug_font == NULL)
 			fatalerror("Unable to create debugger font\n");

src/osd/modules/font/font_none.cpp

@@ -21,7 +21,6 @@ public:
 	virtual bool open(const char *font_path, const char *name, int &height);
 	virtual void close();
 	virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs);
-private:
 };
 
 bool osd_font_none::open(const char *font_path, const char *_name, int &height)

src/osd/modules/font/font_windows.cpp

@@ -34,8 +34,9 @@
 //-------------------------------------------------
 
 class osd_font_windows : public osd_font
-{
+{	
 public:
+	osd_font_windows(): m_font(NULL) { }
 	virtual ~osd_font_windows() { }
 
 	virtual bool open(const char *font_path, const char *name, int &height);

src/osd/modules/midi/none.cpp

@@ -41,9 +41,6 @@ public:
 	virtual bool poll();
 	virtual int read(UINT8 *pOut);
 	virtual void write(UINT8 data);
-
-private:
-	//int dummy;
 };
 
 osd_midi_device *none_module::create_midi_device()

src/osd/modules/midi/portmidi.cpp

@@ -44,8 +44,9 @@ static const int RX_EVENT_BUF_SIZE = 512;
 #define MIDI_EOX    0xf7
 
 class osd_midi_device_pm : public osd_midi_device
-{
+{	
 public:
+	osd_midi_device_pm(): pmStream(NULL), xmit_cnt(0), last_status(0), rx_sysex(false) { }
 	virtual ~osd_midi_device_pm() { }
 	virtual bool open_input(const char *devname);
 	virtual bool open_output(const char *devname);
@@ -208,7 +209,6 @@ bool osd_midi_device_pm::open_output(const char *devname)
 	{
 		return false;
 	}
-	return false;
 }
 
 void osd_midi_device_pm::close()

src/osd/modules/netdev/pcap.cpp

@@ -168,7 +168,7 @@ netdev_pcap::netdev_pcap(const char *name, class device_network_interface *ifdev
 		m_p = NULL;
 		return;
 	}
-	set_mac(get_mac());
+	netdev_pcap::set_mac(get_mac());
 
 #ifdef SDLMAME_MACOSX
 	m_ctx.head = 0;
@@ -206,7 +206,7 @@ int netdev_pcap::send(UINT8 *buf, int len)
 	ret = pcap_sendpacket_dl(m_p, buf, len);
 	printf("sent packet length %d, returned %d\n", len, ret);
 	return ret ? len : 0;
-	return (!pcap_sendpacket_dl(m_p, buf, len))?len:0;
+	//return (!pcap_sendpacket_dl(m_p, buf, len))?len:0;
 }
 
 int netdev_pcap::recv_dev(UINT8 **buf)

src/osd/modules/render/d3d/d3d9intf.cpp

@@ -18,7 +18,6 @@
 
 // MAMEOS headers
 #include "d3dintf.h"
-#include "winmain.h"
 
 
 
@@ -83,7 +82,6 @@ base *drawd3d9_init(void)
 	{
 		osd_printf_verbose("Direct3D: Unable to find Direct3DCreate9\n");
 		FreeLibrary(dllhandle);
-		dllhandle = NULL;
 		return NULL;
 	}
 
@@ -93,7 +91,6 @@ base *drawd3d9_init(void)
 	{
 		osd_printf_verbose("Direct3D: Error attempting to initialize Direct3D9\n");
 		FreeLibrary(dllhandle);
-		dllhandle = NULL;
 		return NULL;
 	}
 

src/osd/modules/render/d3d/d3dhlsl.cpp

@@ -29,7 +29,6 @@
 #include "render.h"
 #include "ui/ui.h"
 #include "rendutil.h"
-#include "options.h"
 #include "emuopts.h"
 #include "aviio.h"
 #include "png.h"
@@ -39,7 +38,6 @@
 #include "d3dintf.h"
 #include "winmain.h"
 #include "window.h"
-#include "config.h"
 #include "d3dcomm.h"
 #include "modules/render/drawd3d.h"
 #include "strconv.h"
@@ -178,7 +176,14 @@ static direct3dx9_loadeffect_ptr g_load_effect = NULL;
 //  shader manager constructor
 //============================================================
 
-shaders::shaders()
+shaders::shaders(): 
+	d3dintf(NULL), machine(NULL), d3d(NULL), num_screens(0), curr_screen(0), curr_frame(0), write_ini(false), read_ini(false), hlsl_prescale_x(0), hlsl_prescale_y(0), bloom_count(0), 
+	vecbuf_type(), vecbuf_index(0), vecbuf_count(0), avi_output_file(NULL), avi_frame(0), avi_copy_surface(NULL), avi_copy_texture(NULL), avi_final_target(NULL), avi_final_texture(NULL),
+	black_surface(NULL), black_texture(NULL), render_snap(false), snap_rendered(false), snap_copy_target(NULL), snap_copy_texture(NULL), snap_target(NULL), snap_texture(NULL), 
+	snap_width(0), snap_height(0), lines_pending(false), backbuffer(NULL), curr_effect(NULL), default_effect(NULL), prescale_effect(NULL), post_effect(NULL), distortion_effect(NULL),
+	focus_effect(NULL), phosphor_effect(NULL), deconverge_effect(NULL), color_effect(NULL), yiq_encode_effect(NULL), yiq_decode_effect(NULL), bloom_effect(NULL), 
+	downsample_effect(NULL), vector_effect(NULL), fsfx_vertices(NULL), curr_texture(NULL), curr_render_target(NULL), curr_poly(NULL)
+
 {
 	master_enable = false;
 	vector_enable = true;
@@ -3435,7 +3440,7 @@ static file_error open_next(d3d::renderer *d3d, emu_file &file, const char *temp
 			// find length of the device name
 			int end1 = snapstr.find("/", pos + 3);
 			int end2 = snapstr.find("%", pos + 3);
-			int end = -1;
+			int end;
 
 			if ((end1 != -1) && (end2 != -1))
 			{

src/osd/modules/render/d3d/d3dhlsl.h

@@ -20,6 +20,8 @@
 //  TYPE DEFINITIONS
 //============================================================
 
+struct slider_state;
+
 namespace d3d
 {
 class effect;

src/osd/modules/render/drawd3d.cpp

@@ -27,19 +27,15 @@
 // MAME headers
 #include "emu.h"
 #include "render.h"
-#include "ui/ui.h"
+
 #include "rendutil.h"
-#include "options.h"
 #include "emuopts.h"
 #include "aviio.h"
-#include "png.h"
 
 // MAMEOS headers
 #include "modules/render/d3d/d3dintf.h"
 #include "winmain.h"
 #include "window.h"
-#include "config.h"
-#include "strconv.h"
 #include "modules/render/d3d/d3dcomm.h"
 #include "drawd3d.h"
 
@@ -616,19 +612,11 @@ texture_info *texture_manager::find_texinfo(const render_texinfo *texinfo, UINT3
 }
 
 renderer::renderer(osd_window *window)
-	: osd_renderer(window, FLAG_NONE)
+	: osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(NULL), m_gamma_supported(0), m_pixformat(), 
+	m_vertexbuf(NULL), m_lockedbuf(NULL), m_numverts(0), m_vectorbatch(NULL), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0), 
+	m_screen_format(), m_last_texture(NULL), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0),
+	m_last_wrap(), m_last_modmode(0), m_hlsl_buf(NULL), m_shaders(NULL), m_texture_manager(NULL), m_line_count(0)
 {
-	m_device = NULL;
-	m_restarting = false;
-	m_shaders = NULL;
-	m_numverts = 0;
-	m_numpolys = 0;
-	m_vertexbuf = NULL;
-	m_lockedbuf = NULL;
-	m_vectorbatch = NULL;
-	m_last_texture = NULL;
-	m_hlsl_buf = NULL;
-	m_texture_manager = NULL;
 }
 
 int renderer::initialize()

src/osd/modules/render/drawdd.cpp

@@ -17,13 +17,11 @@
 #include "emu.h"
 #include "render.h"
 #include "rendutil.h"
-#include "options.h"
 #include "rendersw.inc"
 
 // MAMEOS headers
 #include "winmain.h"
 #include "window.h"
-#include "config.h"
 
 
 
@@ -40,7 +38,10 @@ class renderer_dd : public osd_renderer
 {
 public:
 	renderer_dd(osd_window *window)
-	: osd_renderer(window, FLAG_NONE),
+	: osd_renderer(window, FLAG_NONE), 
+		width(0), 
+		height(0), 
+		refresh(0),
 		//adapter(0),
 		adapter_ptr(NULL),
 		clearouter(0),

src/osd/modules/render/drawnone.cpp

@@ -32,8 +32,6 @@ public:
 	virtual void record() { };
 	virtual void toggle_fsfx() { };
 	virtual void destroy();
-
-private:
 };
 
 //============================================================

src/osd/modules/render/drawogl.cpp

@@ -19,7 +19,6 @@
 // MAME headers
 #include "osdcomm.h"
 #include "emu.h"
-#include "options.h"
 #include "emuopts.h"
 
 #ifndef OSD_WINDOWS

src/osd/modules/sound/direct_sound.cpp

@@ -174,7 +174,7 @@ private:
 				memcpy(m_bytes2, (UINT8 const *)data + m_locked1, bytes - m_locked1);
 			}
 
-			result = unlock();
+			unlock();
 			return DS_OK;
 		}
 		HRESULT clear()
@@ -189,7 +189,7 @@ private:
 			assert(0U == m_locked2);
 			memset(m_bytes1, 0, m_locked1);
 
-			result = unlock();
+			unlock();
 			return DS_OK;
 		}
 

src/osd/modules/sync/work_osd.cpp

@@ -444,12 +444,12 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
 		osd_work_item *item;
 
 		// first allocate a new work item; try the free list first
-		INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
+		INT32 myslot = osd_scalable_lock_acquire(queue->lock);
 		do
 		{
 			item = (osd_work_item *)queue->free;
 		} while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item);
-		osd_scalable_lock_release(queue->lock, lockslot);
+		osd_scalable_lock_release(queue->lock, myslot);
 
 		// if nothing, allocate something new
 		if (item == NULL)

src/osd/strconv.cpp

@@ -13,7 +13,6 @@
 
 // MAMEOS headers
 #include "strconv.h"
-#include "unicode.h"
 
 #if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
 //============================================================

src/osd/windows/input.cpp

@@ -122,7 +122,7 @@ class device_info
 {
 public:
 	device_info(running_machine &machine)
-		: m_machine(machine) { }
+		: head(NULL), next(NULL), name(NULL), poll(NULL), device(NULL), m_machine(machine) { }
 
 	running_machine &machine() const { return m_machine; }
 

src/osd/windows/output.cpp

@@ -12,7 +12,6 @@
 
 // MAME headers
 #include "emu.h"
-#include "osdepend.h"
 #include "winmain.h"
 // MAMEOS headers
 #include "output.h"

src/osd/windows/video.cpp

@@ -13,11 +13,7 @@
 // MAME headers
 #include "emu.h"
 #include "emuopts.h"
-#include "osdepend.h"
-#include "video/vector.h"
 #include "render.h"
-#include "rendutil.h"
-#include "ui/ui.h"
 #include "uiinput.h"
 
 // MAMEOS headers
@@ -26,7 +22,6 @@
 #include "window.h"
 #include "input.h"
 #include "strconv.h"
-#include "config.h"
 
 //============================================================
 //  CONSTANTS
@@ -113,7 +108,7 @@ void windows_osd_interface::video_exit()
 win_monitor_info::win_monitor_info(const HMONITOR handle, const char *monitor_device, float aspect)
 	: osd_monitor_info(&m_handle, monitor_device, aspect), m_handle(handle)
 {
-	refresh();
+	win_monitor_info::refresh();
 }
 
 win_monitor_info::~win_monitor_info()

src/osd/windows/winclip.cpp

@@ -76,7 +76,7 @@ static char *convert_ansi(LPCVOID data)
 
 char *osd_get_clipboard_text(void)
 {
-	char *result = NULL;
+	char *result;
 
 	// try to access unicode text
 	result = get_clipboard_text_by_format(CF_UNICODETEXT, convert_wide);

src/osd/windows/window.cpp

@@ -23,7 +23,6 @@
 
 // MAME headers
 #include "emu.h"
-#include "emuopts.h"
 #include "uiinput.h"
 
 // MAMEOS headers
@@ -31,8 +30,6 @@
 #include "window.h"
 #include "video.h"
 #include "input.h"
-#include "strconv.h"
-#include "config.h"
 #include "winutf8.h"
 
 #include "winutil.h"
@@ -617,7 +614,7 @@ void winwindow_update_cursor_state(running_machine &machine)
 		RECT bounds;
 
 		// hide cursor
-		while (ShowCursor(FALSE) >= -1) ;
+		while (ShowCursor(FALSE) >= -1) { };
 		ShowCursor(TRUE);
 
 		// store the cursor position
@@ -632,7 +629,7 @@ void winwindow_update_cursor_state(running_machine &machine)
 	else
 	{
 		// show cursor
-		while (ShowCursor(TRUE) < 1) ;
+		while (ShowCursor(TRUE) < 1) { };
 		ShowCursor(FALSE);
 
 		// allow cursor to move freely

src/osd/windows/winfile.cpp

@@ -20,7 +20,6 @@
 // MAMEOS headers
 #include "strconv.h"
 #include "winutil.h"
-#include "winutf8.h"
 
 #include "winfile.h"
 
@@ -187,10 +186,8 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 length,
 			break;
 		case WINFILE_SOCKET:
 			return win_read_socket(file, buffer, offset, length, actual);
-			break;
 		case WINFILE_PTTY:
 			return win_read_ptty(file, buffer, offset, length, actual);
-			break;
 
 	}
 	return FILERR_NONE;
@@ -226,10 +223,8 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l
 			break;
 		case WINFILE_SOCKET:
 			return win_write_socket(file, buffer, offset, length, actual);
-			break;
 		case WINFILE_PTTY:
 			return win_write_ptty(file, buffer, offset, length, actual);
-			break;
 
 	}
 	return FILERR_NONE;
@@ -274,10 +269,8 @@ file_error osd_truncate(osd_file *file, UINT64 offset)
 			break;
 		case WINFILE_SOCKET:
 			return FILERR_FAILURE;
-			break;
 		case WINFILE_PTTY:
 			return FILERR_FAILURE;
-			break;
 
 	}
 	return FILERR_NONE;

src/osd/windows/winmain.cpp

@@ -29,11 +29,6 @@
 #include "winmain.h"
 #include "window.h"
 #include "video.h"
-#include "input.h"
-#include "output.h"
-#include "config.h"
-#include "osdepend.h"
-#include "strconv.h"
 #include "winutf8.h"
 #include "winutil.h"
 #include "debugger.h"
@@ -417,7 +412,7 @@ int main(int argc, char *argv[])
 
 
 	// parse config and cmdline options
-	DWORD result = 0;
+	DWORD result;
 	{
 		windows_options options;
 		windows_osd_interface osd(options);
@@ -1354,7 +1349,8 @@ FPTR symbol_manager::get_text_section_base()
 //-------------------------------------------------
 
 sampling_profiler::sampling_profiler(UINT32 max_seconds, UINT8 stack_depth = 0)
-	: m_thread(NULL),
+	:   m_target_thread(NULL), 
+		m_thread(NULL),
 		m_thread_id(0),
 		m_thread_exit(false),
 		m_stack_depth(stack_depth),

src/osd/windows/winsocket.cpp

@@ -16,11 +16,6 @@
 // MAME headers
 #include "osdcore.h"
 
-// MAMEOS headers
-#include "strconv.h"
-#include "winutil.h"
-#include "winutf8.h"
-
 #include "winfile.h"
 
 const char *winfile_socket_identifier  = "socket.";

src/osd/windows/winutf8.cpp

@@ -235,7 +235,7 @@ HWND win_create_window_ex_utf8(DWORD exstyle, const char* classname, const char*
 								int x, int y, int width, int height, HWND parent, HMENU menu,
 								HINSTANCE instance, void* param)
 {
-	TCHAR* t_classname = NULL;
+	TCHAR* t_classname;
 	TCHAR* t_windowname = NULL;
 	HWND result = 0;
 

src/osd/windows/winutil.cpp

@@ -12,7 +12,6 @@
 
 // MAMEOS headers
 #include "winutil.h"
-#include "strconv.h"
 
 //============================================================
 //  win_error_to_file_error