app/src/main/assets/calculators/TRUELCD.KMI

@@ -1,31 +0,0 @@
-Color  0 161 173 130
-Color  1 159 166 128
-Color  2 154 160 124
-Color  3 148 155 119
-Color  4 143 149 115
-Color  5 137 143 110
-Color  6 132 137 106
-Color  8 126 132 102
-Color  9 121 126  98
-Color 10 115 120  93
-Color 11 110 114  89
-Color 12 104 109  83
-Color 13  99 103  79
-Color 14  93  97  74
-Color 15  88  91  70
-Color 16  82  86  65
-Color 17  77  80  61
-Color 18  71  74  57
-Color 19  66  68  53
-Color 20  60  63  48
-Color 21  55  57  44
-Color 22  49  51  39
-Color 23  44  46  35
-Color 24  38  41  31
-Color 25  33  35  27
-Color 26  27  29  22
-Color 27  22  23  18
-Color 28  13  16  18
-Color 29   9  11  12
-Color 30   4   5   6
-Color 31   0   0   0

app/src/main/assets/calculators/Wombat3 48GX.kml

@@ -10,7 +10,7 @@ Global
 	Hardware "Yorke"
 	Model    "G"
 	Rom      "ROM.48G"
-	Patch    "beep.48"
+	Patch    "BEEP.48"
 	Bitmap   "Wombat3 48GX.bmp"
 	Debug    0
 End

app/src/main/assets/calculators/Wombat3 48SX.kml

@@ -10,7 +10,7 @@ Global
 	Hardware "Yorke"
 	Model    "S"
 	Rom      "ROM.48S"
-	Patch    "beep.48"
+	Patch    "BEEP.48"
 	Bitmap   "Wombat3 48SX.bmp"
 	Debug    0
 End

app/src/main/assets/calculators/real49g-s.kml

@@ -13,7 +13,7 @@ Global
 	Title  "Eric's Real 49G (Small)"
 	Author "Eric Rechlin"
 	Model  "X"
-	Rom    "rom.49g"
+	Rom    "ROM.49G"
 	Bitmap "real49g-s.bmp"
 	#Icon   "49g.ico"
 	Debug  0

app/src/main/cpp/win32-layer.c

@@ -845,6 +845,7 @@ BOOL StretchBlt(HDC hdcDest, int xDest, int yDest, int wDest, int hDest, HDC hdc
 
         int sourceBytes = (hBitmap->bitmapInfoHeader->biBitCount >> 3);
         float sourceStride = sourceWidth * sourceBytes;
+        sourceStride = (float)(4 * ((sourceWidth * hBitmap->bitmapInfoHeader->biBitCount + 31) / 32));
         float destinationStride = androidBitmapInfo.stride; // Destination always 4 bytes RGBA
         //LOGD("StretchBlt(%08x, x:%d, y:%d, w:%d, h:%d, %08x, x:%d, y:%d, w:%d, h:%d) -> sourceBytes: %d", hdcDest->hdcCompatible, xDest, yDest, wDest, hDest, hdcSrc, xSrc, ySrc, wSrc, hSrc, sourceBytes);