diff options
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/windows/d3d8intf.c | 10 | ||||
| -rw-r--r-- | src/osd/windows/d3d9intf.c | 10 | ||||
| -rw-r--r-- | src/osd/windows/drawd3d.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/input.c | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/osd/windows/d3d8intf.c b/src/osd/windows/d3d8intf.c index 4b702b33339..99e7f2cd942 100644 --- a/src/osd/windows/d3d8intf.c +++ b/src/osd/windows/d3d8intf.c @@ -231,7 +231,7 @@ static ULONG d3d_release(d3d *d3dptr) } -static d3d_interface d3d8_interface = +static const d3d_interface d3d8_interface = { d3d_check_device_format, d3d_check_device_type, @@ -406,7 +406,7 @@ static HRESULT device_test_cooperative_level(d3d_device *dev) } -static d3d_device_interface d3d8_device_interface = +static const d3d_device_interface d3d8_device_interface = { device_begin_scene, device_clear, @@ -458,7 +458,7 @@ static HRESULT surface_unlock_rect(d3d_surface *surf) } -static d3d_surface_interface d3d8_surface_interface = +static const d3d_surface_interface d3d8_surface_interface = { surface_lock_rect, surface_release, @@ -499,7 +499,7 @@ static HRESULT texture_unlock_rect(d3d_texture *tex, UINT level) } -static d3d_texture_interface d3d8_texture_interface = +static const d3d_texture_interface d3d8_texture_interface = { texture_get_surface_level, texture_lock_rect, @@ -534,7 +534,7 @@ static HRESULT vertex_buffer_unlock(d3d_vertex_buffer *vbuf) } -static d3d_vertex_buffer_interface d3d8_vertex_buffer_interface = +static const d3d_vertex_buffer_interface d3d8_vertex_buffer_interface = { vertex_buffer_lock, vertex_buffer_release, diff --git a/src/osd/windows/d3d9intf.c b/src/osd/windows/d3d9intf.c index 8884fdeae86..e23d83ac135 100644 --- a/src/osd/windows/d3d9intf.c +++ b/src/osd/windows/d3d9intf.c @@ -229,7 +229,7 @@ static ULONG d3d_release(d3d *d3dptr) } -static d3d_interface d3d9_interface = +static const d3d_interface d3d9_interface = { d3d_check_device_format, d3d_check_device_type, @@ -439,7 +439,7 @@ static HRESULT device_test_cooperative_level(d3d_device *dev) } -static d3d_device_interface d3d9_device_interface = +static const d3d_device_interface d3d9_device_interface = { device_begin_scene, device_clear, @@ -491,7 +491,7 @@ static HRESULT surface_unlock_rect(d3d_surface *surf) } -static d3d_surface_interface d3d9_surface_interface = +static const d3d_surface_interface d3d9_surface_interface = { surface_lock_rect, surface_release, @@ -532,7 +532,7 @@ static HRESULT texture_unlock_rect(d3d_texture *tex, UINT level) } -static d3d_texture_interface d3d9_texture_interface = +static const d3d_texture_interface d3d9_texture_interface = { texture_get_surface_level, texture_lock_rect, @@ -567,7 +567,7 @@ static HRESULT vertex_buffer_unlock(d3d_vertex_buffer *vbuf) } -static d3d_vertex_buffer_interface d3d9_vertex_buffer_interface = +static const d3d_vertex_buffer_interface d3d9_vertex_buffer_interface = { vertex_buffer_lock, vertex_buffer_release, diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c index b082c54a43c..40d8752dcb4 100644 --- a/src/osd/windows/drawd3d.c +++ b/src/osd/windows/drawd3d.c @@ -733,7 +733,7 @@ try_again: d3d->presentation.MultiSampleType = D3DMULTISAMPLE_NONE; d3d->presentation.SwapEffect = D3DSWAPEFFECT_DISCARD; d3d->presentation.hDeviceWindow = window->hwnd; - d3d->presentation.Windowed = (!video_config.switchres || !window->fullscreen) || HAS_WINDOW_MENU; + d3d->presentation.Windowed = !window->fullscreen || HAS_WINDOW_MENU; d3d->presentation.EnableAutoDepthStencil = FALSE; d3d->presentation.AutoDepthStencilFormat = D3DFMT_D16; d3d->presentation.Flags = 0; diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index 42a23c713bf..abbdfe7336f 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -212,7 +212,7 @@ static device_info * lightgun_list; static device_info * joystick_list; // default axis names -static const TCHAR *default_axis_name[] = +static const TCHAR *const default_axis_name[] = { TEXT("X"), TEXT("Y"), TEXT("Z"), TEXT("RX"), TEXT("RY"), TEXT("RZ"), TEXT("SL1"), TEXT("SL2") @@ -914,7 +914,7 @@ static void win32_init(running_machine *machine) // allocate two lightgun devices for (gunnum = 0; gunnum < 2; gunnum++) { - static const TCHAR *gun_names[] = { TEXT("Shared Axis Gun 1"), TEXT("Shared Axis Gun 2") }; + static const TCHAR *const gun_names[] = { TEXT("Shared Axis Gun 1"), TEXT("Shared Axis Gun 2") }; device_info *devinfo; int axisnum, butnum; @@ -1735,8 +1735,8 @@ static void rawinput_device_release(device_info *devinfo) static TCHAR *rawinput_device_improve_name(TCHAR *name) { - static const TCHAR *usbbasepath = TEXT("SYSTEM\\CurrentControlSet\\Enum\\USB"); - static const TCHAR *basepath = TEXT("SYSTEM\\CurrentControlSet\\Enum\\"); + static const TCHAR usbbasepath[] = TEXT("SYSTEM\\CurrentControlSet\\Enum\\USB"); + static const TCHAR basepath[] = TEXT("SYSTEM\\CurrentControlSet\\Enum\\"); TCHAR *regstring = NULL; TCHAR *parentid = NULL; TCHAR *regpath = NULL; |
