Fix ModeInfo PixelClock calculation

diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index 028c24d5dc2c136c2b3a0ffba20a5860d414c08c..31a6fcdb8c8faa95964a1f4d409e3ebc8f95e3e3 100644 (file)
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -105,6 +105,9 @@ static CRITICAL_SECTION render_cs;
 #define PICASSO_STATE_SETDAC 8
 #define PICASSO_STATE_SETSWITCH 16
 
+#define HOR_BLANK 8
+#define VER_BLANK 8
+
 #if defined(X86_MSVC_ASSEMBLY)
 #define SWAPSPEEDUP
 #endif
@@ -2186,15 +2189,15 @@ static void FillBoardInfo(TrapContext *ctx, uaecptr amigamemptr, struct LibResol
        trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_Height, height);
        trap_put_byte(ctx, amigamemptr + PSSO_ModeInfo_Depth, depth);
        trap_put_byte(ctx, amigamemptr + PSSO_ModeInfo_Flags, 0);
-       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorTotal, width + 8);
-       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorBlankSize, 8);
+       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorTotal, width + HOR_BLANK);
+       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorBlankSize, HOR_BLANK);
        trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorSyncStart, 2);
        trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_HorSyncSize, 2);
        trap_put_byte(ctx, amigamemptr + PSSO_ModeInfo_HorSyncSkew, 0);
        trap_put_byte(ctx, amigamemptr + PSSO_ModeInfo_HorEnableSkew, 0);
 
-       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerTotal, height + 8);
-       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerBlankSize, 8);
+       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerTotal, height + VER_BLANK);
+       trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerBlankSize, VER_BLANK);
        trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerSyncStart, 2);
        trap_put_word(ctx, amigamemptr + PSSO_ModeInfo_VerSyncSize, 2);
 
@@ -2203,7 +2206,7 @@ static void FillBoardInfo(TrapContext *ctx, uaecptr amigamemptr, struct LibResol
 
        int freq = currprefs.gfx_apmode[GF_RTG].gfx_refreshrate;
        trap_put_long(ctx, amigamemptr + PSSO_ModeInfo_PixelClock,
-               width * height * (freq ? abs(freq) : default_freq));
+               (width + HOR_BLANK ) * (height + VER_BLANK) * (freq ? abs(freq) : default_freq));
 }
 
 struct modeids {