From d22a78b69f9dd04ce99e2959f0a11b449f20e174 Mon Sep 17 00:00:00 2001
From: Mat Berchtold <unknown>
Date: Mon, 27 Mar 2023 12:21:59 +1100
Subject: Bug [#1923]. Remove dependence on MSIMG32.DLL on Win32 by replacing
 AlphaBlend by GdiAlphaBlend.

---
 doc/ScintillaHistory.html | 13 +++++++++++++
 win32/PlatWin.cxx         |  6 +++---
 win32/Scintilla.vcxproj   |  2 +-
 win32/makefile            |  2 +-
 win32/scintilla.mak       |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1d9222cea..57bdd6902 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -579,6 +579,19 @@
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla535.zip">Release 5.3.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2023.
+	</li>
+	<li>
+	On Win32 remove dependence on MSIMG32.DLL  by replacing AlphaBlend
+	by GdiAlphaBlend.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1923/">Bug #1923</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla534.zip">Release 5.3.4</a>
     </h3>
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index dbb929620..7fd6eea36 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -963,7 +963,7 @@ void SurfaceGDI::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke
 				section.SetSymmetric(x, corner - x, valOutline);
 			}
 
-			AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+			GdiAlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
 		}
 	} else {
 		BrushColour(fillStroke.stroke.colour);
@@ -1002,7 +1002,7 @@ void SurfaceGDI::GradientRectangle(PRectangle rc, const std::vector<ColourStop>
 			}
 		}
 
-		AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+		GdiAlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
 	}
 }
 
@@ -1019,7 +1019,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig
 		DIBSection section(hdc, size);
 		if (section) {
 			RGBAImage::BGRAFromRGBA(section.Bytes(), pixelsImage, static_cast<size_t>(width) * height);
-			AlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
+			GdiAlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
 				static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), section.DC(),
 				0, 0, width, height, mergeAlpha);
 		}
diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index 130a76ea6..9976fd72f 100644
--- a/win32/Scintilla.vcxproj
+++ b/win32/Scintilla.vcxproj
@@ -94,7 +94,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/win32/makefile b/win32/makefile
index 4899c7ab0..e2cd4ce50 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -45,7 +45,7 @@ vpath %.h ../src ../include
 vpath %.cxx ../src
 
 LDFLAGS=-shared -static -mwindows
-LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW)
+LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 $(LIBSMINGW)
 
 INCLUDES=-I ../include -I ../src
 
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index 19c50ac94..7e510aeaf 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -42,7 +42,7 @@ CXXNDEBUG=-O2 -MT -DNDEBUG -GL
 NAME=-Fo
 LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) $(CETCOMPAT)
 LDDEBUG=
-LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib
+LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib
 NOLOGO=-nologo
 
 !IFDEF QUIET
-- 
cgit v1.2.3