Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIN64: Use correct IReferenceClock definition from <strmif.h> (PR #1250)

This commit is contained in:
Kelvin Lee 2023-12-28 09:14:10 +11:00 committed by GitHub
parent 6a9f2ee5f9
commit abab213e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/SoundCore.cpp
View File

@ -646,7 +646,8 @@ void SoundCore_SetErrorMax(const int nErrorMax)
//=============================================================================
static DWORD g_dwAdviseToken;
// Use DWORD_PTR according to IReferenceClock from <strmif.h>.
static DWORD_PTR g_pdwAdviseCookie = 0; // Not really used as pointer.
static IReferenceClock *g_pRefClock = NULL;
static HANDLE g_hSemaphore = NULL;
static bool g_bRefClockTimerActive = false;
@ -713,7 +714,9 @@ void SysClk_StartTimerUsec(DWORD dwUsecPeriod)
return;
}
if (g_pRefClock->AdvisePeriodic(rtNow, rtPeriod, g_hSemaphore, &g_dwAdviseToken) != S_OK)
// IReferenceClock from <strmif.h> (origin <axcore.idl>) is "oddly" defined to use HSEMAPHORE.
static_assert(sizeof(HSEMAPHORE) == sizeof(HANDLE), "must be same size");
if (g_pRefClock->AdvisePeriodic(rtNow, rtPeriod, (HSEMAPHORE)g_hSemaphore, &g_pdwAdviseCookie) != S_OK)
{
fprintf(stderr, "Error creating timer\n");
_ASSERT(0);
@ -729,7 +732,7 @@ void SysClk_StopTimer()
if(!g_bRefClockTimerActive)
return;
if (g_pRefClock->Unadvise(g_dwAdviseToken) != S_OK)
if (g_pRefClock->Unadvise(g_pdwAdviseCookie) != S_OK)
{
fprintf(stderr, "Error deleting timer\n");
_ASSERT(0);
@ -737,4 +740,4 @@ void SysClk_StopTimer()
}
g_bRefClockTimerActive = false;
}
}

5
source/StdAfx.h
View File

@ -3,6 +3,11 @@
#include <tchar.h>
#include <crtdbg.h>
// <strmif.h> has the correct IReferenceClock definition that works for both x86 and x64,
// whereas the alternative definition in <dsound.h> is incorrect for x64. (out of
// maintenance perhaps)
// <strmif.h> *must* be included before <dsound.h> for x64 to work.
#include <strmif.h>
#include <dsound.h>
#include <dshow.h>