mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 457728 - icon decoder wince fixes. patch by blassey, r=stuart/dougt
This commit is contained in:
parent
0f4f007281
commit
921312204b
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user