Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 457728 - icon decoder wince fixes. patch by blassey, r=stuart/dougt

Browse Source
This commit is contained in:
Doug Turner 2008-09-29 11:06:09 -07:00
parent 6d43487af3
commit aabf3a10dd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libpr0n/decoders/Makefile.in
View File

@ -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)

4
modules/libpr0n/decoders/icon/Makefile.in
View File

@ -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

2
modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
View File

@ -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