From 16152ede3522ec54490150d4f4ce70329d6d858e Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 4 Dec 2021 11:36:51 -0300 Subject: [PATCH 1/4] One more build script fix --- .ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build.sh b/.ci/build.sh index 7cd0984fa..8f56b3128 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -214,7 +214,7 @@ else esac # Establish general and architecture-specific dependencies. - pkgs="cmake git tar xz-utils dpkg-dev rpm" + pkgs="cmake pkg-config git tar xz-utils dpkg-dev rpm" if [ "$(dpkg --print-architecture)" = "$arch_deb" ] then pkgs="$pkgs build-essential" From 95bc3203117eb8427abb86f28934ce0b3299597d Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 3 Feb 2022 19:23:35 -0300 Subject: [PATCH 2/4] Jenkins: Add GitHub links to Discord notification --- .ci/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 55f1311d7..003dfd451 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -271,7 +271,8 @@ pipeline { result: currentBuild.currentResult, description: "**Status:** ${result}\n\u2060", /* word joiner character forces a blank line */ enableArtifactsList: false, - showChangeset: true + showChangeset: true, + scmWebUrl: "https://github.com/86Box/86Box/commit/%s" /* Notify IRC, which needs a node for whatever reason. */ node { From ba340d454e9f66e59fd903d82b53eeb738069994 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Thu, 3 Feb 2022 19:24:50 -0300 Subject: [PATCH 3/4] snd_ac97_codec: Fix initialization of a couple registers --- src/sound/snd_ac97_codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sound/snd_ac97_codec.c b/src/sound/snd_ac97_codec.c index a868b2acd..2023e8411 100644 --- a/src/sound/snd_ac97_codec.c +++ b/src/sound/snd_ac97_codec.c @@ -467,9 +467,9 @@ ac97_codec_reset(void *priv) dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808; if (dev->misc_flags & AC97_AUXIN) dev->regs[0x14 >> 1] = AC97_MUTE | 0x0808; - dev->regs[0x1c] = AC97_MUTE; /* record gain */ + dev->regs[0x1c >> 1] = AC97_MUTE; /* record gain */ if (dev->reset_flags & AC97_MICPCM) - dev->regs[0x1e] = AC97_MUTE; /* mic record gain */ + dev->regs[0x1e >> 1] = AC97_MUTE; /* mic record gain */ if (dev->misc_flags & AC97_LDAC) dev->regs[0x36 >> 1] = AC97_MUTE_L; if (dev->misc_flags & AC97_CDAC) From ec00dc978cded4a166394a7830e86442c1a56ac7 Mon Sep 17 00:00:00 2001 From: OBattler Date: Fri, 4 Feb 2022 13:34:05 +0100 Subject: [PATCH 4/4] File dialogs now pause the emulate machine. --- src/win/win_dialog.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/win/win_dialog.c b/src/win/win_dialog.c index c7d07955d..9ae3edb1a 100644 --- a/src/win/win_dialog.c +++ b/src/win/win_dialog.c @@ -161,6 +161,7 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save) OPENFILENAME ofn; BOOL r; /* DWORD err; */ + int old_dopause; /* Initialize OPENFILENAME */ ZeroMemory(&ofn, sizeof(ofn)); @@ -187,10 +188,13 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, WCHAR *title, int save) ofn.lpstrTitle = title; /* Display the Open dialog box. */ + old_dopause = dopause; + plat_pause(1); if (save) r = GetSaveFileName(&ofn); else r = GetOpenFileName(&ofn); + plat_pause(old_dopause); plat_chdir(usr_path);