From aabf3a10dd88f2cdcc91f6f8410c7a26f1178753 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@meer.net>
Date: Mon, 29 Sep 2008 11:06:09 -0700
Subject: [PATCH] Bug 457728 - icon decoder wince fixes.  patch by blassey,
 r=stuart/dougt

---
 modules/libpr0n/decoders/Makefile.in                | 2 +-
 modules/libpr0n/decoders/icon/Makefile.in           | 4 ++--
 modules/libpr0n/decoders/icon/win/nsIconChannel.cpp | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/libpr0n/decoders/Makefile.in b/modules/libpr0n/decoders/Makefile.in
index 0eac15209105..9afe760597f8 100644
--- a/modules/libpr0n/decoders/Makefile.in
+++ b/modules/libpr0n/decoders/Makefile.in
@@ -49,7 +49,7 @@ endif
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = icon/qt icon
 endif
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
 DIRS = icon/win icon
 endif
 ifeq ($(OS_ARCH),OS2)
diff --git a/modules/libpr0n/decoders/icon/Makefile.in b/modules/libpr0n/decoders/icon/Makefile.in
index 7a2e3d634ada..8b010b91eeb2 100644
--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@@ -63,7 +63,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS)
 PLATFORM = qt
 endif
 
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
 EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
 endif
@@ -124,7 +124,7 @@ endif
 
 LOCAL_INCLUDES	= -I$(srcdir)/$(PLATFORM)
 
-ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
 OS_LIBS		+= $(call EXPAND_LIBNAME,shell32 gdi32 comctl32)
 endif
 
diff --git a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
index 04196d3da755..69aa74b3d84e 100644
--- a/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
+++ b/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
@@ -308,9 +308,11 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
   if (!fileExists)
    infoFlags |= SHGFI_USEFILEATTRIBUTES;
 
+#ifndef WINCE
   if (desiredImageSize > 16)
     infoFlags |= SHGFI_SHELLICONSIZE;
   else
+#endif
     infoFlags |= SHGFI_SMALLICON;
 
   // if we have a content type... then use it! but for existing files, we want