summaryrefslogtreecommitdiffstats
path: root/src/skel/win/win.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/skel/win/win.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 86b0b214..01e56701 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -914,14 +914,14 @@ void WaitForState(FILTER_STATE State)
*/
void HandleGraphEvent(void)
{
- LONG evCode, evParam1, evParam2;
+ LONG evCode;
+ LONG_PTR evParam1, evParam2;
HRESULT hr=S_OK;
ASSERT(pME != nil);
// Process all queued events
- while (SUCCEEDED(pME->GetEvent(&evCode, (LONG_PTR *)&evParam1,
- (LONG_PTR *)&evParam2, 0)))
+ while (SUCCEEDED(pME->GetEvent(&evCode, &evParam1, &evParam2, 0)))
{
// Free memory associated with callback, since we're not using it
hr = pME->FreeEventParams(evCode, evParam1, evParam2);
@@ -2275,7 +2275,7 @@ WinMain(HINSTANCE instance,
case GS_START_UP:
{
#ifdef NO_MOVIES
- gGameState = GS_INIT_ONCE;
+ gGameState = gbNoMovies ? GS_INIT_ONCE : GS_INIT_LOGO_MPEG;
#else
gGameState = GS_INIT_LOGO_MPEG;
#endif
@@ -2314,8 +2314,11 @@ WinMain(HINSTANCE instance,
case GS_INIT_INTRO_MPEG:
{
-#ifndef NO_MOVIES
+#ifdef NO_MOVIES
+ if (!gbNoMovies)
+#endif
CloseClip();
+#ifndef FIX_BUGS
CoUninitialize();
#endif
@@ -2351,8 +2354,11 @@ WinMain(HINSTANCE instance,
case GS_INIT_ONCE:
{
-#ifndef NO_MOVIES
+#ifdef NO_MOVIES
+ if (!gbNoMovies)
+#endif
CloseClip();
+#ifndef FIX_BUGS
CoUninitialize();
#endif