Dmitry Timoshkov : oleaut32: Recognize icon and cursor in the being loaded data.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c1136218e23d0fd480f5c5bf0e5f302b98b2430e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1136218e23d0fd480f5c5bf0e...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Thu May 31 17:32:54 2012 +0900

oleaut32: Recognize icon and cursor in the being loaded data.

---

 dlls/oleaut32/olepicture.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index beb1477..0e3fd21 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -1402,6 +1402,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm)
               !memcmp(&(header[0]), "BM",       2) ||   /* BMP header */
               !memcmp(&(header[0]), "\xff\xd8", 2) ||   /* JPEG header */
               (header[0] == EMR_HEADER)            ||   /* EMF header */
+              (header[0] == 0x10000)               ||   /* icon: idReserved 0, idType 1 */
+              (header[0] == 0x20000)               ||   /* cursor: idReserved 0, idType 2 */
               (header[1] > statstg.cbSize.QuadPart)||   /* invalid size */
               (header[1]==0)
           ) {/* Found start of bitmap data */