From c081ded2be124e0aca8c95a8f1dffe5053fd0b01 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 9 Apr 2017 05:24:24 +0200 Subject: [PATCH] Added patch to add missing initialization in create_glyphrunanalysis. --- ...ssing-max-bitmap-size-initialization.patch | 26 +++++++++++++++++++ patches/patchinstall.sh | 16 ++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 patches/dwrite-Missing_Initialization/0001-dwrite-Added-missing-max-bitmap-size-initialization.patch diff --git a/patches/dwrite-Missing_Initialization/0001-dwrite-Added-missing-max-bitmap-size-initialization.patch b/patches/dwrite-Missing_Initialization/0001-dwrite-Added-missing-max-bitmap-size-initialization.patch new file mode 100644 index 00000000..37d7ffa2 --- /dev/null +++ b/patches/dwrite-Missing_Initialization/0001-dwrite-Added-missing-max-bitmap-size-initialization.patch @@ -0,0 +1,26 @@ +From cc25929d3a152ee70f0f779091d82da88010f2ae Mon Sep 17 00:00:00 2001 +From: Nikolay Sivov +Date: Mon, 3 Apr 2017 08:14:08 +0300 +Subject: dwrite: Added missing max bitmap size initialization. + +Signed-off-by: Nikolay Sivov +Signed-off-by: Alexandre Julliard +--- + dlls/dwrite/font.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c +index e89d0a825a..4e35ceab2e 100644 +--- a/dlls/dwrite/font.c ++++ b/dlls/dwrite/font.c +@@ -5203,6 +5203,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit + + analysis->flags = 0; + analysis->bitmap = NULL; ++ analysis->max_glyph_bitmap_size = 0; + analysis->ppdip = desc->ppdip; + analysis->origin.x = desc->origin_x * desc->ppdip; + analysis->origin.y = desc->origin_y * desc->ppdip; +-- +2.11.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5d19a867..17adc974 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -147,6 +147,7 @@ patch_enable_all () enable_dsound_EAX="$1" enable_dsound_Fast_Mixer="$1" enable_dsound_Revert_Cleanup="$1" + enable_dwrite_Missing_Initialization="$1" enable_dxdiagn_Display_Information="$1" enable_dxdiagn_Enumerate_DirectSound="$1" enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1" @@ -671,6 +672,9 @@ patch_enable () dsound-Revert_Cleanup) enable_dsound_Revert_Cleanup="$2" ;; + dwrite-Missing_Initialization) + enable_dwrite_Missing_Initialization="$2" + ;; dxdiagn-Display_Information) enable_dxdiagn_Display_Information="$2" ;; @@ -3941,6 +3945,18 @@ if test "$enable_dsound_EAX" -eq 1; then ) >> "$patchlist" fi +# Patchset dwrite-Missing_Initialization +# | +# | Modified files: +# | * dlls/dwrite/font.c +# | +if test "$enable_dwrite_Missing_Initialization" -eq 1; then + patch_apply dwrite-Missing_Initialization/0001-dwrite-Added-missing-max-bitmap-size-initialization.patch + ( + printf '%s\n' '+ { "Nikolay Sivov", "dwrite: Added missing max bitmap size initialization.", 1 },'; + ) >> "$patchlist" +fi + # Patchset dxdiagn-Display_Information # | # | This patchset fixes the following Wine bugs: