summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules')
-rw-r--r--src/osd/modules/debugger/debugwin.c14
-rw-r--r--src/osd/modules/debugger/osx/debugcommandhistory.h6
-rw-r--r--src/osd/modules/debugger/osx/debugconsole.h12
-rw-r--r--src/osd/modules/debugger/osx/debugview.h20
-rw-r--r--src/osd/modules/debugger/osx/debugwindowhandler.h10
-rw-r--r--src/osd/modules/debugger/osx/deviceinfoviewer.h2
-rw-r--r--src/osd/modules/debugger/osx/devicesviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/disassemblyviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/errorlogviewer.h2
-rw-r--r--src/osd/modules/debugger/osx/memoryviewer.h4
-rw-r--r--src/osd/modules/debugger/osx/pointsviewer.h2
-rw-r--r--src/osd/modules/debugger/win/consolewininfo.c6
-rw-r--r--src/osd/modules/debugger/win/consolewininfo.h4
-rw-r--r--src/osd/modules/debugger/win/debugbaseinfo.c2
-rw-r--r--src/osd/modules/debugger/win/debugbaseinfo.h10
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.c39
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.h14
-rw-r--r--src/osd/modules/debugger/win/debugwin.h2
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.c22
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.h30
-rw-r--r--src/osd/modules/debugger/win/disasmbasewininfo.c2
-rw-r--r--src/osd/modules/debugger/win/disasmbasewininfo.h2
-rw-r--r--src/osd/modules/debugger/win/disasmviewinfo.c4
-rw-r--r--src/osd/modules/debugger/win/disasmviewinfo.h2
-rw-r--r--src/osd/modules/debugger/win/disasmwininfo.c2
-rw-r--r--src/osd/modules/debugger/win/disasmwininfo.h4
-rw-r--r--src/osd/modules/debugger/win/editwininfo.c6
-rw-r--r--src/osd/modules/debugger/win/editwininfo.h22
-rw-r--r--src/osd/modules/debugger/win/logwininfo.c2
-rw-r--r--src/osd/modules/debugger/win/logwininfo.h2
-rw-r--r--src/osd/modules/debugger/win/memoryviewinfo.c2
-rw-r--r--src/osd/modules/debugger/win/memoryviewinfo.h2
-rw-r--r--src/osd/modules/debugger/win/memorywininfo.c2
-rw-r--r--src/osd/modules/debugger/win/memorywininfo.h4
-rw-r--r--src/osd/modules/debugger/win/pointswininfo.c2
-rw-r--r--src/osd/modules/debugger/win/pointswininfo.h2
-rw-r--r--src/osd/modules/debugger/win/uimetrics.c2
-rw-r--r--src/osd/modules/debugger/win/uimetrics.h2
-rw-r--r--src/osd/modules/netdev/pcap.c13
39 files changed, 143 insertions, 145 deletions
diff --git a/src/osd/modules/debugger/debugwin.c b/src/osd/modules/debugger/debugwin.c
index 448f35b122c..1ae50bc3c8d 100644
--- a/src/osd/modules/debugger/debugwin.c
+++ b/src/osd/modules/debugger/debugwin.c
@@ -73,11 +73,11 @@ protected:
private:
template <typename T> T *create_window();
- running_machine *m_machine;
- auto_pointer<ui_metrics> m_metrics;
- bool m_waiting_for_debugger;
- simple_list<debugwin_info> m_window_list;
- consolewin_info *m_main_console;
+ running_machine *m_machine;
+ auto_pointer<ui_metrics> m_metrics;
+ bool m_waiting_for_debugger;
+ simple_list<debugwin_info> m_window_list;
+ consolewin_info *m_main_console;
};
@@ -207,9 +207,9 @@ bool debugger_windows::seq_pressed() const
int const vkey = wininput_vkey_for_mame_code(code);
bool const pressed = (vkey != 0) && ((GetAsyncKeyState(vkey) & 0x8000) != 0);
- if (first) // if this is the first in the sequence, result is set equal
+ if (first) // if this is the first in the sequence, result is set equal
result = pressed ^ invert;
- else if (result) // further values are ANDed
+ else if (result) // further values are ANDed
result = result && (pressed ^ invert);
// no longer first, and clear the invert flag
diff --git a/src/osd/modules/debugger/osx/debugcommandhistory.h b/src/osd/modules/debugger/osx/debugcommandhistory.h
index 1e77b1f6cfb..02256690ea7 100644
--- a/src/osd/modules/debugger/osx/debugcommandhistory.h
+++ b/src/osd/modules/debugger/osx/debugcommandhistory.h
@@ -16,9 +16,9 @@
@interface MAMEDebugCommandHistory : NSObject
{
- NSInteger length, position;
- NSString *current;
- NSMutableArray *history;
+ NSInteger length, position;
+ NSString *current;
+ NSMutableArray *history;
}
+ (NSInteger)defaultLength;
diff --git a/src/osd/modules/debugger/osx/debugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h
index 4cae426ce9e..87554b4dd6a 100644
--- a/src/osd/modules/debugger/osx/debugconsole.h
+++ b/src/osd/modules/debugger/osx/debugconsole.h
@@ -22,13 +22,13 @@
@interface MAMEDebugConsole : MAMEDebugWindowHandler <NSTextFieldDelegate, NSSplitViewDelegate>
{
- MAMEDebugCommandHistory *history;
- NSMutableArray *auxiliaryWindows;
+ MAMEDebugCommandHistory *history;
+ NSMutableArray *auxiliaryWindows;
- MAMERegistersView *regView;
- MAMEDisassemblyView *dasmView;
- MAMEDebugView *consoleView;
- NSTextField *commandField;
+ MAMERegistersView *regView;
+ MAMEDisassemblyView *dasmView;
+ MAMEDebugView *consoleView;
+ NSTextField *commandField;
}
- (id)initWithMachine:(running_machine &)m;
diff --git a/src/osd/modules/debugger/osx/debugview.h b/src/osd/modules/debugger/osx/debugview.h
index b76e4633f38..d45d6a6e045 100644
--- a/src/osd/modules/debugger/osx/debugview.h
+++ b/src/osd/modules/debugger/osx/debugview.h
@@ -19,19 +19,19 @@
@interface MAMEDebugView : NSView
{
- int type;
- running_machine *machine;
- debug_view *view;
- BOOL wholeLineScroll;
+ int type;
+ running_machine *machine;
+ debug_view *view;
+ BOOL wholeLineScroll;
- INT32 totalWidth, totalHeight, originTop;
+ INT32 totalWidth, totalHeight, originTop;
- NSFont *font;
- CGFloat fontWidth, fontHeight, fontAscent;
+ NSFont *font;
+ CGFloat fontWidth, fontHeight, fontAscent;
- NSTextStorage *text;
- NSTextContainer *textContainer;
- NSLayoutManager *layoutManager;
+ NSTextStorage *text;
+ NSTextContainer *textContainer;
+ NSLayoutManager *layoutManager;
}
+ (NSFont *)defaultFont;
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h
index 2764dc4046c..f720da4f6ef 100644
--- a/src/osd/modules/debugger/osx/debugwindowhandler.h
+++ b/src/osd/modules/debugger/osx/debugwindowhandler.h
@@ -28,8 +28,8 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEDebugWindowHandler : NSObject <NSWindowDelegate>
{
- NSWindow *window;
- running_machine *machine;
+ NSWindow *window;
+ running_machine *machine;
}
+ (void)addCommonActionItems:(NSMenu *)menu;
@@ -64,7 +64,7 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEAuxiliaryDebugWindowHandler : MAMEDebugWindowHandler
{
- MAMEDebugConsole *console;
+ MAMEDebugConsole *console;
}
+ (void)cascadeWindow:(NSWindow *)window;
@@ -86,8 +86,8 @@ extern NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification;
@interface MAMEExpressionAuxiliaryDebugWindowHandler : MAMEAuxiliaryDebugWindowHandler <NSTextFieldDelegate>
{
- MAMEDebugCommandHistory *history;
- NSTextField *expressionField;
+ MAMEDebugCommandHistory *history;
+ NSTextField *expressionField;
}
- (id)initWithMachine:(running_machine &)m title:(NSString *)t console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.h b/src/osd/modules/debugger/osx/deviceinfoviewer.h
index 41243a954de..7b9975d0e73 100644
--- a/src/osd/modules/debugger/osx/deviceinfoviewer.h
+++ b/src/osd/modules/debugger/osx/deviceinfoviewer.h
@@ -22,7 +22,7 @@
@interface MAMEDeviceInfoViewer : MAMEAuxiliaryDebugWindowHandler
{
- device_t *device;
+ device_t *device;
}
- (id)initWithDevice:(device_t &)d machine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/devicesviewer.h b/src/osd/modules/debugger/osx/devicesviewer.h
index 24a2a2dc415..11408b43b01 100644
--- a/src/osd/modules/debugger/osx/devicesviewer.h
+++ b/src/osd/modules/debugger/osx/devicesviewer.h
@@ -22,8 +22,8 @@
@interface MAMEDevicesViewer : MAMEAuxiliaryDebugWindowHandler <NSOutlineViewDataSource>
{
- MAMEDeviceWrapper *root;
- NSOutlineView *devicesView;
+ MAMEDeviceWrapper *root;
+ NSOutlineView *devicesView;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h
index 732975c5ddd..d9899457abb 100644
--- a/src/osd/modules/debugger/osx/disassemblyviewer.h
+++ b/src/osd/modules/debugger/osx/disassemblyviewer.h
@@ -22,8 +22,8 @@
@interface MAMEDisassemblyViewer : MAMEExpressionAuxiliaryDebugWindowHandler
{
- MAMEDisassemblyView *dasmView;
- NSPopUpButton *subviewButton;
+ MAMEDisassemblyView *dasmView;
+ NSPopUpButton *subviewButton;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h
index 22538f81307..610c4f609ae 100644
--- a/src/osd/modules/debugger/osx/errorlogviewer.h
+++ b/src/osd/modules/debugger/osx/errorlogviewer.h
@@ -22,7 +22,7 @@
@interface MAMEErrorLogViewer : MAMEAuxiliaryDebugWindowHandler
{
- MAMEErrorLogView *logView;
+ MAMEErrorLogView *logView;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/memoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h
index 63c9d4eea2b..03fc65571cd 100644
--- a/src/osd/modules/debugger/osx/memoryviewer.h
+++ b/src/osd/modules/debugger/osx/memoryviewer.h
@@ -22,8 +22,8 @@
@interface MAMEMemoryViewer : MAMEExpressionAuxiliaryDebugWindowHandler
{
- MAMEMemoryView *memoryView;
- NSPopUpButton *subviewButton;
+ MAMEMemoryView *memoryView;
+ NSPopUpButton *subviewButton;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/osx/pointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h
index 3943f6b486f..ad9ef0f62fd 100644
--- a/src/osd/modules/debugger/osx/pointsviewer.h
+++ b/src/osd/modules/debugger/osx/pointsviewer.h
@@ -22,7 +22,7 @@
@interface MAMEPointsViewer : MAMEAuxiliaryDebugWindowHandler
{
- NSTabView *tabs;
+ NSTabView *tabs;
}
- (id)initWithMachine:(running_machine &)m console:(MAMEDebugConsole *)c;
diff --git a/src/osd/modules/debugger/win/consolewininfo.c b/src/osd/modules/debugger/win/consolewininfo.c
index 771f2d604ce..e24271a6f50 100644
--- a/src/osd/modules/debugger/win/consolewininfo.c
+++ b/src/osd/modules/debugger/win/consolewininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// consolewininfo.c - Win32 debug window handling
+// consolewininfo.c - Win32 debug window handling
//
//============================================================
@@ -304,9 +304,9 @@ bool consolewin_info::handle_command(WPARAM wparam, LPARAM lparam)
void consolewin_info::process_string(char const *string)
{
- if (string[0] == 0) // an empty string is a single step
+ if (string[0] == 0) // an empty string is a single step
debug_cpu_get_visible_cpu(machine())->debug()->single_step();
- else // otherwise, just process the command
+ else // otherwise, just process the command
debug_console_execute_command(machine(), string, 1);
// clear the edit text box
diff --git a/src/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h
index 08790fb66b3..b74a189657d 100644
--- a/src/osd/modules/debugger/win/consolewininfo.h
+++ b/src/osd/modules/debugger/win/consolewininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// consolewininfo.h - Win32 debug window handling
+// consolewininfo.h - Win32 debug window handling
//
//============================================================
@@ -47,7 +47,7 @@ private:
static void add_filter_entry(astring &dest, char const *description, char const *extensions);
static void copy_extension_list(astring &dest, char const *extensions);
- HMENU m_devices_menu;
+ HMENU m_devices_menu;
};
#endif
diff --git a/src/osd/modules/debugger/win/debugbaseinfo.c b/src/osd/modules/debugger/win/debugbaseinfo.c
index 34451875063..66824b9f029 100644
--- a/src/osd/modules/debugger/win/debugbaseinfo.c
+++ b/src/osd/modules/debugger/win/debugbaseinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugbaseinfo.c - Win32 debug window handling
+// debugbaseinfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/debugbaseinfo.h b/src/osd/modules/debugger/win/debugbaseinfo.h
index 9aee28b49ef..749e432a6bc 100644
--- a/src/osd/modules/debugger/win/debugbaseinfo.h
+++ b/src/osd/modules/debugger/win/debugbaseinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugbaseinfo.h - Win32 debug window handling
+// debugbaseinfo.h - Win32 debug window handling
//
//============================================================
@@ -30,10 +30,10 @@ protected:
static void smart_show_window(HWND wnd, bool show);
private:
- debugger_windows_interface &m_debugger;
- running_machine &m_machine;
- ui_metrics const &m_metrics;
- bool const &m_waiting_for_debugger;
+ debugger_windows_interface &m_debugger;
+ running_machine &m_machine;
+ ui_metrics const &m_metrics;
+ bool const &m_waiting_for_debugger;
};
diff --git a/src/osd/modules/debugger/win/debugviewinfo.c b/src/osd/modules/debugger/win/debugviewinfo.c
index 883a12dac11..f3c12a09f2e 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.c
+++ b/src/osd/modules/debugger/win/debugviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugview.c - Win32 debug window handling
+// debugview.c - Win32 debug window handling
//
//============================================================
@@ -17,20 +17,20 @@
// debugger view styles
-#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN
-#define DEBUG_VIEW_STYLE_EX 0
+#define DEBUG_VIEW_STYLE WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN
+#define DEBUG_VIEW_STYLE_EX 0
// combo box styles
-#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL
-#define COMBO_BOX_STYLE_EX 0
+#define COMBO_BOX_STYLE WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL
+#define COMBO_BOX_STYLE_EX 0
// horizontal scroll bar styles
-#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ
-#define HSCROLL_STYLE_EX 0
+#define HSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_HORZ
+#define HSCROLL_STYLE_EX 0
// vertical scroll bar styles
-#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT
-#define VSCROLL_STYLE_EX 0
+#define VSCROLL_STYLE WS_CHILD | WS_VISIBLE | SBS_VERT
+#define VSCROLL_STYLE_EX 0
bool debugview_info::s_window_class_registered = false;
@@ -310,7 +310,6 @@ void debugview_info::draw_contents(HDC windc)
// iterate over rows and columns
for (UINT32 row = 0; row < visarea.y; row++)
{
-
// loop twice; once to fill the background and once to draw the text
for (int iter = 0; iter < 2; iter++)
{
@@ -789,16 +788,16 @@ void debugview_info::register_window_class()
WNDCLASS wc = { 0 };
// initialize the description of the window class
- wc.lpszClassName = TEXT("MAMEDebugView");
- wc.hInstance = GetModuleHandle(NULL);
- wc.lpfnWndProc = &debugview_info::static_view_proc;
- wc.hCursor = LoadCursor(NULL, IDC_ARROW);
- wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
- wc.lpszMenuName = NULL;
- wc.hbrBackground = NULL;
- wc.style = 0;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 0;
+ wc.lpszClassName = TEXT("MAMEDebugView");
+ wc.hInstance = GetModuleHandle(NULL);
+ wc.lpfnWndProc = &debugview_info::static_view_proc;
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
+ wc.lpszMenuName = NULL;
+ wc.hbrBackground = NULL;
+ wc.style = 0;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
// register the class; fail if we can't
if (!RegisterClass(&wc))
diff --git a/src/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h
index d804554778a..ec4eedf2e69 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.h
+++ b/src/osd/modules/debugger/win/debugviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugviewinfo.h - Win32 debug window handling
+// debugviewinfo.h - Win32 debug window handling
//
//============================================================
@@ -65,13 +65,13 @@ private:
static void register_window_class();
- debugwin_info &m_owner;
- debug_view *m_view;
- HWND m_wnd;
- HWND m_hscroll;
- HWND m_vscroll;
+ debugwin_info &m_owner;
+ debug_view *m_view;
+ HWND m_wnd;
+ HWND m_hscroll;
+ HWND m_vscroll;
- static bool s_window_class_registered;
+ static bool s_window_class_registered;
};
#endif
diff --git a/src/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h
index 6971e7f93c0..bedf2b36d43 100644
--- a/src/osd/modules/debugger/win/debugwin.h
+++ b/src/osd/modules/debugger/win/debugwin.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwin.h - Win32 debug window handling
+// debugwin.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/debugwininfo.c b/src/osd/modules/debugger/win/debugwininfo.c
index f900715a015..1a3258c1cab 100644
--- a/src/osd/modules/debugger/win/debugwininfo.c
+++ b/src/osd/modules/debugger/win/debugwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwininfo.c - Win32 debug window handling
+// debugwininfo.c - Win32 debug window handling
//
//============================================================
@@ -579,16 +579,16 @@ void debugwin_info::register_window_class()
WNDCLASS wc = { 0 };
// initialize the description of the window class
- wc.lpszClassName = TEXT("MAMEDebugWindow");
- wc.hInstance = GetModuleHandle(NULL);
- wc.lpfnWndProc = &debugwin_info::static_window_proc;
- wc.hCursor = LoadCursor(NULL, IDC_ARROW);
- wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
- wc.lpszMenuName = NULL;
- wc.hbrBackground = NULL;
- wc.style = 0;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = 0;
+ wc.lpszClassName = TEXT("MAMEDebugWindow");
+ wc.hInstance = GetModuleHandle(NULL);
+ wc.lpfnWndProc = &debugwin_info::static_window_proc;
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2));
+ wc.lpszMenuName = NULL;
+ wc.hbrBackground = NULL;
+ wc.style = 0;
+ wc.cbClsExtra = 0;
+ wc.cbWndExtra = 0;
// register the class; fail if we can't
if (!RegisterClass(&wc))
diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h
index 9ae4ad34aca..51acc70018f 100644
--- a/src/osd/modules/debugger/win/debugwininfo.h
+++ b/src/osd/modules/debugger/win/debugwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// debugwininfo.h - Win32 debug window handling
+// debugwininfo.h - Win32 debug window handling
//
//============================================================
@@ -54,11 +54,11 @@ public:
virtual bool handle_key(WPARAM wparam, LPARAM lparam);
protected:
- static DWORD const DEBUG_WINDOW_STYLE = (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX);
- static DWORD const DEBUG_WINDOW_STYLE_EX = 0;
+ static DWORD const DEBUG_WINDOW_STYLE = (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & (~WS_MINIMIZEBOX & ~WS_MAXIMIZEBOX);
+ static DWORD const DEBUG_WINDOW_STYLE_EX = 0;
- static int const MAX_VIEWS = 4;
- static int const EDGE_WIDTH = 3;
+ static int const MAX_VIEWS = 4;
+ static int const EDGE_WIDTH = 3;
enum
{
@@ -98,7 +98,7 @@ protected:
ID_SHOW_BREAKPOINTS,
ID_SHOW_WATCHPOINTS,
- ID_DEVICE_OPTIONS // always keep this at the end
+ ID_DEVICE_OPTIONS // always keep this at the end
};
bool is_main_console() const { return m_is_main_console; }
@@ -115,7 +115,7 @@ protected:
void draw_border(HDC dc, RECT &bounds);
void draw_border(HDC dc, HWND child);
- auto_pointer<debugview_info> m_views[MAX_VIEWS];
+ auto_pointer<debugview_info> m_views[MAX_VIEWS];
private:
LRESULT window_proc(UINT message, WPARAM wparam, LPARAM lparam);
@@ -126,18 +126,18 @@ private:
static void register_window_class();
- bool const m_is_main_console;
+ bool const m_is_main_console;
- debugwin_info *m_next;
- HWND m_wnd;
- WNDPROC const m_handler;
+ debugwin_info *m_next;
+ HWND m_wnd;
+ WNDPROC const m_handler;
- UINT32 m_minwidth, m_maxwidth;
- UINT32 m_minheight, m_maxheight;
+ UINT32 m_minwidth, m_maxwidth;
+ UINT32 m_minheight, m_maxheight;
- UINT16 m_ignore_char_lparam;
+ UINT16 m_ignore_char_lparam;
- static bool s_window_class_registered;
+ static bool s_window_class_registered;
};
#endif
diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.c b/src/osd/modules/debugger/win/disasmbasewininfo.c
index 886ccc56f24..c1b9ef5759e 100644
--- a/src/osd/modules/debugger/win/disasmbasewininfo.c
+++ b/src/osd/modules/debugger/win/disasmbasewininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmbasewininfo.c - Win32 debug window handling
+// disasmbasewininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h
index a74b5196b44..085ec351c98 100644
--- a/src/osd/modules/debugger/win/disasmbasewininfo.h
+++ b/src/osd/modules/debugger/win/disasmbasewininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmbasewininfo.h - Win32 debug window handling
+// disasmbasewininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmviewinfo.c b/src/osd/modules/debugger/win/disasmviewinfo.c
index 98ff1188188..28069c9c89f 100644
--- a/src/osd/modules/debugger/win/disasmviewinfo.c
+++ b/src/osd/modules/debugger/win/disasmviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmviewinfo.c - Win32 debug window handling
+// disasmviewinfo.c - Win32 debug window handling
//
//============================================================
@@ -41,4 +41,4 @@ void disasmview_info::set_expression(char const *string)
void disasmview_info::set_right_column(disasm_right_column contents)
{
view<debug_view_disasm>()->set_right_column(contents);
-} \ No newline at end of file
+}
diff --git a/src/osd/modules/debugger/win/disasmviewinfo.h b/src/osd/modules/debugger/win/disasmviewinfo.h
index bfd8e73cd95..011748517c0 100644
--- a/src/osd/modules/debugger/win/disasmviewinfo.h
+++ b/src/osd/modules/debugger/win/disasmviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmviewinfo.h - Win32 debug window handling
+// disasmviewinfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmwininfo.c b/src/osd/modules/debugger/win/disasmwininfo.c
index 9f2db09919c..9c6c02e23eb 100644
--- a/src/osd/modules/debugger/win/disasmwininfo.c
+++ b/src/osd/modules/debugger/win/disasmwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmwininfo.c - Win32 debug window handling
+// disasmwininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h
index 7817aa9f456..e55b74ba3c1 100644
--- a/src/osd/modules/debugger/win/disasmwininfo.h
+++ b/src/osd/modules/debugger/win/disasmwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// disasmwininfo.h - Win32 debug window handling
+// disasmwininfo.h - Win32 debug window handling
//
//============================================================
@@ -30,7 +30,7 @@ private:
void update_caption();
- HWND m_combownd;
+ HWND m_combownd;
};
#endif
diff --git a/src/osd/modules/debugger/win/editwininfo.c b/src/osd/modules/debugger/win/editwininfo.c
index f9dfdb053e1..f89c766ebd4 100644
--- a/src/osd/modules/debugger/win/editwininfo.c
+++ b/src/osd/modules/debugger/win/editwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// editwininfo.c - Win32 debug window handling
+// editwininfo.c - Win32 debug window handling
//
//============================================================
@@ -15,8 +15,8 @@
// edit box styles
-#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL
-#define EDIT_BOX_STYLE_EX 0
+#define EDIT_BOX_STYLE WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL
+#define EDIT_BOX_STYLE_EX 0
editwin_info::editwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler) :
diff --git a/src/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h
index b89a710781a..ff5e20f03ec 100644
--- a/src/osd/modules/debugger/win/editwininfo.h
+++ b/src/osd/modules/debugger/win/editwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// editwininfo.h - Win32 debug window handling
+// editwininfo.h - Win32 debug window handling
//
//============================================================
@@ -25,8 +25,8 @@ public:
virtual bool set_default_focus();
protected:
- static DWORD const COMBO_BOX_STYLE = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
- static DWORD const COMBO_BOX_STYLE_EX = 0;
+ static DWORD const COMBO_BOX_STYLE = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL;
+ static DWORD const COMBO_BOX_STYLE_EX = 0;
void set_editwnd_bounds(RECT const &bounds);
void set_editwnd_text(char const *text);
@@ -42,15 +42,15 @@ private:
static LRESULT CALLBACK static_edit_proc(HWND wnd, UINT message, WPARAM wparam, LPARAM lparam);
- static int const MAX_EDIT_STRING = 256;
- static int const HISTORY_LENGTH = 20;
+ static int const MAX_EDIT_STRING = 256;
+ static int const HISTORY_LENGTH = 20;
- HWND m_editwnd;
- astring m_edit_defstr;
- WNDPROC m_original_editproc;
- TCHAR m_history[HISTORY_LENGTH][MAX_EDIT_STRING];
- int m_history_count;
- int m_last_history;
+ HWND m_editwnd;
+ astring m_edit_defstr;
+ WNDPROC m_original_editproc;
+ TCHAR m_history[HISTORY_LENGTH][MAX_EDIT_STRING];
+ int m_history_count;
+ int m_last_history;
};
#endif
diff --git a/src/osd/modules/debugger/win/logwininfo.c b/src/osd/modules/debugger/win/logwininfo.c
index 2f2b06c349d..32e31bd48c8 100644
--- a/src/osd/modules/debugger/win/logwininfo.c
+++ b/src/osd/modules/debugger/win/logwininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// logwininfo.c - Win32 debug window handling
+// logwininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/logwininfo.h b/src/osd/modules/debugger/win/logwininfo.h
index f26a557b2cb..45c41447491 100644
--- a/src/osd/modules/debugger/win/logwininfo.h
+++ b/src/osd/modules/debugger/win/logwininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// logwininfo.h - Win32 debug window handling
+// logwininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memoryviewinfo.c b/src/osd/modules/debugger/win/memoryviewinfo.c
index 4c5bdc44c7e..644b429e0d9 100644
--- a/src/osd/modules/debugger/win/memoryviewinfo.c
+++ b/src/osd/modules/debugger/win/memoryviewinfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memoryviewinfo.c - Win32 debug window handling
+// memoryviewinfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memoryviewinfo.h b/src/osd/modules/debugger/win/memoryviewinfo.h
index 1951473d68b..8089d050a4e 100644
--- a/src/osd/modules/debugger/win/memoryviewinfo.h
+++ b/src/osd/modules/debugger/win/memoryviewinfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memoryviewinfo.h - Win32 debug window handling
+// memoryviewinfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memorywininfo.c b/src/osd/modules/debugger/win/memorywininfo.c
index 19a4b121de9..8de8749de7b 100644
--- a/src/osd/modules/debugger/win/memorywininfo.c
+++ b/src/osd/modules/debugger/win/memorywininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memorywininfo.c - Win32 debug window handling
+// memorywininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/memorywininfo.h b/src/osd/modules/debugger/win/memorywininfo.h
index a6e71f8fdcd..a52315829b8 100644
--- a/src/osd/modules/debugger/win/memorywininfo.h
+++ b/src/osd/modules/debugger/win/memorywininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// memorywininfo.h - Win32 debug window handling
+// memorywininfo.h - Win32 debug window handling
//
//============================================================
@@ -33,7 +33,7 @@ private:
void update_caption();
- HWND m_combownd;
+ HWND m_combownd;
};
#endif
diff --git a/src/osd/modules/debugger/win/pointswininfo.c b/src/osd/modules/debugger/win/pointswininfo.c
index a958a285046..87c981ef557 100644
--- a/src/osd/modules/debugger/win/pointswininfo.c
+++ b/src/osd/modules/debugger/win/pointswininfo.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// pointswininfo.c - Win32 debug window handling
+// pointswininfo.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h
index e04a467bb0a..a6c944bc160 100644
--- a/src/osd/modules/debugger/win/pointswininfo.h
+++ b/src/osd/modules/debugger/win/pointswininfo.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// pointswininfo.h - Win32 debug window handling
+// pointswininfo.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/uimetrics.c b/src/osd/modules/debugger/win/uimetrics.c
index f61b90275da..7532518f489 100644
--- a/src/osd/modules/debugger/win/uimetrics.c
+++ b/src/osd/modules/debugger/win/uimetrics.c
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// uimetrics.c - Win32 debug window handling
+// uimetrics.c - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/debugger/win/uimetrics.h b/src/osd/modules/debugger/win/uimetrics.h
index 54db03c1be4..d8f46c8cc68 100644
--- a/src/osd/modules/debugger/win/uimetrics.h
+++ b/src/osd/modules/debugger/win/uimetrics.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles, Vas Crabb
//============================================================
//
-// uimetrics.h - Win32 debug window handling
+// uimetrics.h - Win32 debug window handling
//
//============================================================
diff --git a/src/osd/modules/netdev/pcap.c b/src/osd/modules/netdev/pcap.c
index 7c475c62ee3..756a51f39b8 100644
--- a/src/osd/modules/netdev/pcap.c
+++ b/src/osd/modules/netdev/pcap.c
@@ -15,8 +15,8 @@
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
-#define LIB_NAME L"wpcap.dll"
-#define LIB_ERROR_STR "Unable to load winpcap: %lx\n"
+#define LIB_NAME L"wpcap.dll"
+#define LIB_ERROR_STR "Unable to load winpcap: %lx\n"
typedef DWORD except_type;
#else
@@ -28,11 +28,11 @@ typedef DWORD except_type;
#endif
#ifdef SDLMAME_MACOSX
-#define LIB_NAME "libpcap.dylib"
+#define LIB_NAME "libpcap.dylib"
#else
-#define LIB_NAME "libpcap.so"
+#define LIB_NAME "libpcap.so"
#endif
-#define LIB_ERROR_STR "Unable to load pcap: %s\n"
+#define LIB_ERROR_STR "Unable to load pcap: %s\n"
typedef void *HMODULE;
typedef const char *except_type;
@@ -178,7 +178,7 @@ void netdev_pcap::set_mac(const char *mac)
sprintf(filter, "not ether src %.2X:%.2X:%.2X:%.2X:%.2X:%.2X and (ether dst %.2X:%.2X:%.2X:%.2X:%.2X:%.2X or ether multicast or ether broadcast or ether dst 09:00:07:ff:ff:ff)", (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5], (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5]);
#else
sprintf(filter, "ether dst %.2X:%.2X:%.2X:%.2X:%.2X:%.2X or ether multicast or ether broadcast", (unsigned char)mac[0], (unsigned char)mac[1], (unsigned char)mac[2],(unsigned char)mac[3], (unsigned char)mac[4], (unsigned char)mac[5]);
-#endif
+#endif
if(pcap_compile_dl(m_p, &fp, filter, 1, 0) == -1) {
logerror("Error with pcap_compile\n");
}
@@ -300,4 +300,3 @@ void pcap_module::exit()
MODULE_DEFINITION(NETDEV_PCAP, pcap_module)
-