Rebase against aaddf1365a3371263827206eedf1464a83562c00.

[msi-Fix_Stack_Alignment]
Removed patch to fix stack alignment in CUSTOMPROC_wrapper function (accepted
upstream).

[ntdll-FSCTL_PIPE_LISTEN]
Removed patch to avoid updating iosb.Status after FSCTL_PIPE_LISTEN call
(accepted upstream).

[user32-FlashWindowEx]
Removed patch to avoid dereferencing NULL pointer in a trace (accepted
upstream).

[windowscodecs-PNG_Fixes]
Removed patch to fix a copy/paste mistake (accepted upstream).

[winex11-Desktop_Resolution]
Removed patch to allow 320x240 as supported resolution in desktop mode
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-04-08 01:43:22 +02:00
parent e8ef34b3a1
commit 57dde8e88f
14 changed files with 122 additions and 640 deletions

View File

@@ -1,25 +0,0 @@
From 976652bfa10c79b935b7061243b1561d6dc0e605 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 6 Apr 2016 17:50:48 +0800
Subject: windowscodecs: Fix a copy/paste mistake.
---
dlls/windowscodecs/pngformat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
index 4f5cb94..cd9165b 100644
--- a/dlls/windowscodecs/pngformat.c
+++ b/dlls/windowscodecs/pngformat.c
@@ -532,7 +532,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p
}
This->end_info = ppng_create_info_struct(This->png_ptr);
- if (!This->info_ptr)
+ if (!This->end_info)
{
ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL);
This->png_ptr = NULL;
--
2.7.1