Skip to content

Commit

Permalink
Files for 267
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbbert committed Jun 27, 2024
1 parent db68acc commit f1fe0dd
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 40 deletions.
3 changes: 2 additions & 1 deletion docs/release/build/make64.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off
set MINGW64=c:\Mingw\11-2-0\mingw64
rem set MINGW64=c:\Mingw\11-2-0\mingw64
set MINGW64=c:\Mingw\13-2\mingw64
set minpath=%MINGW64%\bin
set oldpath=%Path%
set Path=%minpath%;%oldpath%
Expand Down
2 changes: 1 addition & 1 deletion docs/release/build/uprel.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\goto end
git fetch upstream
git merge upstream/release0266
git merge upstream/release0267
git checkout master
:end
pause
13 changes: 13 additions & 0 deletions docs/release/scripts/src/3rdparty.lua
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ project "softfloat3"
MAME_DIR .. "3rdparty/softfloat3/source",
MAME_DIR .. "3rdparty/softfloat3/source/include",
MAME_DIR .. "3rdparty/softfloat3/source/8086",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext"
}

configuration { "gmake or ninja" }
Expand Down Expand Up @@ -313,6 +314,11 @@ end
"SOFTFLOAT_FAST_INT64"
}

if _OPTIONS["BIGENDIAN"]~="1" then
defines {
"LITTLEENDIAN=1"
}
end
files {
MAME_DIR .. "3rdparty/softfloat3/source/s_eq128.c",
MAME_DIR .. "3rdparty/softfloat3/source/s_le128.c",
Expand Down Expand Up @@ -615,6 +621,13 @@ end
MAME_DIR .. "3rdparty/softfloat3/source/f128M_eq_signaling.c",
MAME_DIR .. "3rdparty/softfloat3/source/f128M_le_quiet.c",
MAME_DIR .. "3rdparty/softfloat3/source/f128M_lt_quiet.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/f2xm1.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fpatan.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fprem.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fsincos.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fyl2x.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/poly.c",
MAME_DIR .. "3rdparty/softfloat3/bochs_ext/extF80_scale.c",
}


Expand Down
42 changes: 15 additions & 27 deletions docs/release/src/devices/imagedev/floppy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include "util/ioprocsfilter.h"
#include "util/zippath.h"

#include <algorithm>

/*
Debugging flags. Set to 0 or 1.
*/
Expand Down Expand Up @@ -1081,25 +1083,6 @@ uint32_t floppy_image_device::hash32(uint32_t a) const
return a;
}

int floppy_image_device::find_index(uint32_t position, const std::vector<uint32_t> &buf)const
{
int spos = (buf.size() >> 1)-1;
int step;
for(step=1; step<buf.size()+1; step<<=1) { }
step >>= 1;

for(;;) {
if(spos >= int(buf.size()) || (spos > 0 && (buf[spos] & floppy_image::TIME_MASK) > position)) {
spos -= step;
step >>= 1;
} else if(spos < 0 || (spos < int(buf.size())-1 && (buf[spos+1] & floppy_image::TIME_MASK) <= position)) {
spos += step;
step >>= 1;
} else
return spos;
}
}

uint32_t floppy_image_device::find_position(attotime &base, const attotime &when)
{
base = m_revolution_start_time;
Expand Down Expand Up @@ -1170,16 +1153,18 @@ void floppy_image_device::cache_fill(const attotime &when)
attotime base;
uint32_t position = find_position(base, when);

int index = find_index(position, buf);
auto it = std::upper_bound(
buf.begin(), buf.end(), position,
[](uint32_t a, uint32_t b) {
return a < (b & floppy_image::TIME_MASK);
}
);

int index = int(it - buf.begin()) - 1;

if(index == -1) {
// I suspect this should be an abort(), to check...
m_cache_start_time = attotime::zero;
m_cache_end_time = attotime::never;
m_cache_index = 0;
m_cache_entry = buf[0];
cache_weakness_setup();
return;
base -= m_rev_time;
index = buf.size() - 1;
}

for(;;) {
Expand Down Expand Up @@ -1654,6 +1639,9 @@ void floppy_sound_device::step(int zone)
}
}
}

// Start the new seek sound from the beginning.
m_seek_samplepos = 0;
}

// Changing the pitch does not always sound convincing
Expand Down
17 changes: 10 additions & 7 deletions docs/release/src/osd/windows/window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@

namespace {

// If legacy mouse to pointer event translation is enabled, translated
// WM_POINTER* events have pointer ID zero. Assume this will never be
// seen for "real" pointer events.
constexpr WORD MOUSE_POINTER_ID = 0;

constexpr unsigned get_pointer_buttons(WPARAM wparam)
{
return
Expand Down Expand Up @@ -2253,9 +2258,8 @@ std::vector<win_window_info::win_pointer_info>::iterator win_window_info::find_p

std::vector<win_window_info::win_pointer_info>::iterator win_window_info::map_mouse_pointer()
{
WORD const ptrid(~WORD(0));
auto found(std::lower_bound(m_active_pointers.begin(), m_active_pointers.end(), ptrid, &win_pointer_info::compare));
if ((m_active_pointers.end() != found) && (found->ptrid == ptrid))
auto found(std::lower_bound(m_active_pointers.begin(), m_active_pointers.end(), MOUSE_POINTER_ID, &win_pointer_info::compare));
if ((m_active_pointers.end() != found) && (found->ptrid == MOUSE_POINTER_ID))
return found;

if ((sizeof(m_next_pointer) * 8) <= m_next_pointer)
Expand Down Expand Up @@ -2285,7 +2289,7 @@ std::vector<win_window_info::win_pointer_info>::iterator win_window_info::map_mo

found = m_active_pointers.emplace(
found,
win_pointer_info(ptrid, PT_MOUSE, m_next_pointer, devpos->second));
win_pointer_info(MOUSE_POINTER_ID, PT_MOUSE, m_next_pointer, devpos->second));
m_pointer_mask |= decltype(m_pointer_mask)(1) << m_next_pointer;
do
{
Expand All @@ -2304,9 +2308,8 @@ std::vector<win_window_info::win_pointer_info>::iterator win_window_info::map_mo

std::vector<win_window_info::win_pointer_info>::iterator win_window_info::find_mouse_pointer()
{
WORD const ptrid(~WORD(0));
auto const found(std::lower_bound(m_active_pointers.begin(), m_active_pointers.end(), ptrid, &win_pointer_info::compare));
if ((m_active_pointers.end() != found) && (found->ptrid == ptrid))
auto const found(std::lower_bound(m_active_pointers.begin(), m_active_pointers.end(), MOUSE_POINTER_ID, &win_pointer_info::compare));
if ((m_active_pointers.end() != found) && (found->ptrid == MOUSE_POINTER_ID))
return found;
else
return m_active_pointers.end();
Expand Down
12 changes: 12 additions & 0 deletions docs/release/src/osd/windows/winmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "winutil.h"
#include "winfile.h"
#include "modules/diagnostics/diagnostics_module.h"
#include "modules/lib/osdlib.h"
#include "modules/monitor/monitor_common.h"

// standard C headers
Expand Down Expand Up @@ -172,6 +173,17 @@ int main(int argc, char *argv[])
if (!isatty(fileno(stderr)))
setvbuf(stderr, (char *) nullptr, _IOFBF, 64);

{
// Disable legacy mouse to pointer event translation - it's broken:
// * No WM_POINTERLEAVE event when mouse pointer moves directly to an
// overlapping window from the same process.
// * Still receive occasional WM_MOUSEMOVE events.
OSD_DYNAMIC_API(user32, "User32.dll", "User32.dll");
OSD_DYNAMIC_API_FN(user32, BOOL, WINAPI, EnableMouseInPointer, BOOL);
if (OSD_DYNAMIC_API_TEST(EnableMouseInPointer))
OSD_DYNAMIC_CALL(EnableMouseInPointer, FALSE);
}

// initialize common controls
InitCommonControls();

Expand Down
2 changes: 1 addition & 1 deletion docs/release/src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
***************************************************************************/

#define BARE_BUILD_VERSION "0.266.0"
#define BARE_BUILD_VERSION "0.267.0"

extern const char bare_build_version[];
extern const char build_version[];
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1578,7 +1578,7 @@ endif

ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.266.x"' > $@
@echo '#define BARE_BUILD_VERSION "0.267.0"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
Expand All @@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.266.x" > $@
@echo #define BARE_BUILD_VERSION "0.267.0" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@
Expand Down
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
***************************************************************************/

#define BARE_BUILD_VERSION "0.266.x"
#define BARE_BUILD_VERSION "0.267.0"

extern const char bare_build_version[];
extern const char build_version[];
Expand Down

0 comments on commit f1fe0dd

Please sign in to comment.