Hello community, here is the log from the commit of package fox16 for openSUSE:Factory checked in at 2016-11-16 13:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fox16 (Old) and /work/SRC/openSUSE:Factory/.fox16.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fox16" Changes: -------- --- /work/SRC/openSUSE:Factory/fox16/fox16.changes 2014-12-16 14:49:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fox16.new/fox16.changes 2016-11-16 13:33:09.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Oct 22 09:44:43 UTC 2016 - [email protected] + +- update to 1.6.52: + + Small fixes for 64-bit casts in dctest.cpp (compiler warning issues). + + JPEG image I/O color spaces handled better. + + FXApp input callback message ID for SEL_IO_EXCEPT was wrong. + + Change in how FXStat determines if a file is an executable (Windows). + +------------------------------------------------------------------- Old: ---- fox-1.6.50.tar.gz New: ---- fox-1.6.52.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.8G2lry/_old 2016-11-16 13:33:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8G2lry/_new 2016-11-16 13:33:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fox16 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,14 @@ Name: fox16 %define lname libFOX-1_6-0 -Version: 1.6.50 +Version: 1.6.52 Release: 0 Summary: Shared Libraries for the FOX Toolkit License: LGPL-2.1+ Group: Development/Languages/C and C++ Url: http://www.fox-toolkit.org/ -Source: ftp://ftp.fox-toolkit.org/pub/fox-%version.tar.gz +Source0: http://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz Source1: calculator.png Source2: pathfinder.png Source3: adie.png ++++++ fox-1.6.50.tar.gz -> fox-1.6.52.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/Makefile.am new/fox-1.6.52/Makefile.am --- old/fox-1.6.50/Makefile.am 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/Makefile.am 2016-06-16 06:21:03.000000000 +0200 @@ -24,7 +24,7 @@ cp -r $(distdir)/doc/* /net/linky/mnt/html drop: dist-all - cp $(distdir).tar.gz /net/webby/ftp/pub - cp $(distdir).zip /net/webby/ftp/pub + cp $(distdir).tar.gz /home/site/ftp/pub + cp $(distdir).zip /home/site/ftp/pub diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/Makefile.in new/fox-1.6.52/Makefile.in --- old/fox-1.6.50/Makefile.in 2014-05-14 06:33:38.000000000 +0200 +++ new/fox-1.6.52/Makefile.in 2016-06-16 06:21:10.000000000 +0200 @@ -873,8 +873,8 @@ cp -r $(distdir)/doc/* /net/linky/mnt/html drop: dist-all - cp $(distdir).tar.gz /net/webby/ftp/pub - cp $(distdir).zip /net/webby/ftp/pub + cp $(distdir).tar.gz /home/site/ftp/pub + cp $(distdir).zip /home/site/ftp/pub # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/chart/Makefile.am new/fox-1.6.52/chart/Makefile.am --- old/fox-1.6.50/chart/Makefile.am 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/chart/Makefile.am 2016-03-15 14:26:37.000000000 +0100 @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libCHART-1.6.la -libCHART_1_6_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) +libCHART_1_6_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(top_builddir)/src/libFOX-1.6.la libCHART_1_6_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/chart/Makefile.in new/fox-1.6.52/chart/Makefile.in --- old/fox-1.6.50/chart/Makefile.in 2014-05-14 06:33:35.000000000 +0200 +++ new/fox-1.6.52/chart/Makefile.in 2016-06-16 06:16:11.000000000 +0200 @@ -95,7 +95,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libCHART_1_6_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libFOX-1.6.la am_libCHART_1_6_la_OBJECTS = FXChart.lo libCHART_1_6_la_OBJECTS = $(am_libCHART_1_6_la_OBJECTS) libCHART_1_6_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -278,7 +279,7 @@ SUFFIXES = .gif .bmp LDADD = libCHART-1.6.la $(top_builddir)/src/libFOX-1.6.la -lm lib_LTLIBRARIES = libCHART-1.6.la -libCHART_1_6_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) +libCHART_1_6_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(top_builddir)/src/libFOX-1.6.la libCHART_1_6_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/configure new/fox-1.6.52/configure --- old/fox-1.6.50/configure 2014-05-14 06:33:43.000000000 +0200 +++ new/fox-1.6.52/configure 2016-06-16 06:16:14.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for fox 1.6.50. +# Generated by GNU Autoconf 2.68 for fox 1.6.52. # # Report bugs to <[email protected]>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='fox' PACKAGE_TARNAME='fox' -PACKAGE_VERSION='1.6.50' -PACKAGE_STRING='fox 1.6.50' +PACKAGE_VERSION='1.6.52' +PACKAGE_STRING='fox 1.6.52' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1334,7 +1334,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fox 1.6.50 to adapt to many kinds of systems. +\`configure' configures fox 1.6.52 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fox 1.6.50:";; + short | recursive ) echo "Configuration of fox 1.6.52:";; esac cat <<\_ACEOF @@ -1532,7 +1532,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fox configure 1.6.50 +fox configure 1.6.52 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2253,7 +2253,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fox $as_me 1.6.50, which was +It was created by fox $as_me 1.6.52, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3072,7 +3072,7 @@ # Define the identity of the package. PACKAGE='fox' - VERSION='1.6.50' + VERSION='1.6.52' cat >>confdefs.h <<_ACEOF @@ -3116,7 +3116,7 @@ # Set version FOX_MAJOR_VERSION=1 FOX_MINOR_VERSION=6 -FOX_PATCH_LEVEL=50 +FOX_PATCH_LEVEL=52 # Binaries compiled with this patchlevel of FOX will need at least # version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion @@ -17968,7 +17968,7 @@ $as_echo "$with_xft" >&6; } if test "x$with_xft" != "xno"; then XFTCFLAGS="-I/usr/include/freetype2" -XFTLIBS="-lfreetype -lXft" +XFTLIBS="-lfreetype -lfontconfig -lXft" saved_cppflags="${CXXFLAGS}" CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H=1 $XFTCFLAGS" X_BASE_LIBS="${X_BASE_LIBS} $XFTLIBS" @@ -18787,7 +18787,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fox $as_me 1.6.50, which was +This file was extended by fox $as_me 1.6.52, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18844,7 +18844,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fox config.status 1.6.50 +fox config.status 1.6.52 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/configure.ac new/fox-1.6.52/configure.ac --- old/fox-1.6.50/configure.ac 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/configure.ac 2016-06-16 06:16:00.000000000 +0200 @@ -1,7 +1,7 @@ # Version of the code m4_define([fox_major], [1]) m4_define([fox_minor], [6]) -m4_define([fox_level], [50]) +m4_define([fox_level], [52]) m4_define([fox_version],[fox_major.fox_minor.fox_level]) # Init @@ -190,7 +190,7 @@ AC_MSG_RESULT([$with_xft]) if test "x$with_xft" != "xno"; then XFTCFLAGS="-I/usr/include/freetype2" -XFTLIBS="-lfreetype -lXft" +XFTLIBS="-lfreetype -lfontconfig -lXft" saved_cppflags="${CXXFLAGS}" CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H=1 $XFTCFLAGS" X_BASE_LIBS="${X_BASE_LIBS} $XFTLIBS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/include/FXApp.h new/fox-1.6.52/include/FXApp.h --- old/fox-1.6.50/include/FXApp.h 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/include/FXApp.h 2016-06-16 06:16:00.000000000 +0200 @@ -366,7 +366,7 @@ static void imcreatecallback(void*,FXApp*,void*); static void imdestroycallback(void*,FXApp*,void*); #else - static FXival CALLBACK wndproc(FXID hwnd,FXuint iMsg,FXuval wParam,FXival lParam); + static FXival CALLBACK wndproc(FXID hwnd,FXuint iMsg,FXuval wParam,FXival lParam); protected: virtual FXival dispatchEvent(FXID hwnd,FXuint iMsg,FXuval wParam,FXival lParam); #endif @@ -515,12 +515,12 @@ * of the message handler. If a chore with the same target and message * already exists, it will be rescheduled. */ - void addChore(FXObject* tgt,FXSelector sel,void *ptr=NULL); + void* addChore(FXObject* tgt,FXSelector sel,void *ptr=NULL); /** * Remove idle processing message identified by tgt and sel. */ - void removeChore(FXObject* tgt,FXSelector sel); + void* removeChore(FXObject* tgt,FXSelector sel); /** * Return TRUE if given chore has been set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/include/fxdefs.h new/fox-1.6.52/include/fxdefs.h --- old/fox-1.6.50/include/fxdefs.h 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/include/fxdefs.h 2016-06-16 06:16:00.000000000 +0200 @@ -131,13 +131,6 @@ #endif -// Disable some warnings in VC++ -#ifdef _MSC_VER -#pragma warning(disable: 4251) -#pragma warning(disable: 4231) -#pragma warning(disable: 4244) -#endif - // Checking printf and scanf format strings #if defined(_CC_GNU_) || defined(__GNUG__) || defined(__GNUC__) #define FX_PRINTF(fmt,arg) __attribute__((format(printf,fmt,arg))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/include/fxver.h new/fox-1.6.52/include/fxver.h --- old/fox-1.6.50/include/fxver.h 2014-05-14 06:34:14.000000000 +0200 +++ new/fox-1.6.52/include/fxver.h 2016-06-16 06:16:25.000000000 +0200 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 50 +#define FOX_LEVEL 52 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/FXApp.cpp new/fox-1.6.52/src/FXApp.cpp --- old/fox-1.6.50/src/FXApp.cpp 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/src/FXApp.cpp 2016-06-16 06:16:00.000000000 +0200 @@ -1511,10 +1511,11 @@ // Add chore to the END of the list -void FXApp::addChore(FXObject* tgt,FXSelector sel,void *ptr){ +void* FXApp::addChore(FXObject* tgt,FXSelector sel,void *ptr){ + register void* result=NULL; register FXChore *c,**cc; for(cc=&chores; (c=*cc)!=NULL; cc=&c->next){ - if(c->target==tgt && c->message==sel){ *cc=c->next; goto a; } + if(c->target==tgt && c->message==sel){ *cc=c->next; result=c->data; goto a; } } if(chorerecs){ c=chorerecs; @@ -1529,18 +1530,21 @@ for(cc=&chores; *cc; cc=&(*cc)->next); c->next=NULL; *cc=c; + return result; } // Remove chore identified by tgt and sel from the list -void FXApp::removeChore(FXObject* tgt,FXSelector sel){ +void* FXApp::removeChore(FXObject* tgt,FXSelector sel){ + register void* result=NULL; register FXChore *c,**cc; for(cc=&chores; (c=*cc)!=NULL; cc=&c->next){ if(c->target==tgt && c->message==sel){ - *cc=c->next; c->next=chorerecs; chorerecs=c; + *cc=c->next; result=c->data; c->next=chorerecs; chorerecs=c; break; } } + return result; } @@ -2008,7 +2012,7 @@ if(in.write.target && in.write.target->tryHandle(this,FXSEL(SEL_IO_WRITE,in.write.message),(void*)(FXival)fff)) refresh(); } if(FD_ISSET(fff,&exceptfds)){ - if(in.excpt.target && in.excpt.target->tryHandle(this,FXSEL(SEL_IO_EXCEPT,in.read.message),(void*)(FXival)fff)) refresh(); + if(in.excpt.target && in.excpt.target->tryHandle(this,FXSEL(SEL_IO_EXCEPT,in.excpt.message),(void*)(FXival)fff)) refresh(); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/FXOptionMenu.cpp new/fox-1.6.52/src/FXOptionMenu.cpp --- old/fox-1.6.50/src/FXOptionMenu.cpp 2014-05-14 06:32:40.000000000 +0200 +++ new/fox-1.6.52/src/FXOptionMenu.cpp 2016-06-16 06:16:00.000000000 +0200 @@ -669,6 +669,7 @@ if(win){ setText(current->getText()); setIcon(current->getIcon()); + setTextColor(current->getTextColor()); } else{ setText(FXString::null); @@ -709,6 +710,7 @@ if(win){ setText(win->getText()); setIcon(win->getIcon()); + setTextColor(win->getTextColor()); } current=win; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/FXString.cpp new/fox-1.6.52/src/FXString.cpp --- old/fox-1.6.50/src/FXString.cpp 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.52/src/FXString.cpp 2016-06-16 06:16:00.000000000 +0200 @@ -2335,31 +2335,48 @@ return store; } +#ifdef WIN32 +#ifndef va_copy +#define va_copy(arg,list) ((arg)=(list)) +#endif +#endif // Print formatted string a-la vprintf FXString& FXString::vformat(const FXchar* fmt,va_list args){ - register FXint len=0; + FXint result=0; if(fmt && *fmt){ - register FXint n=strlen(fmt); // Result is longer than format string -#if defined(WIN32) || defined(HAVE_VSNPRINTF) -// va_list a; -// n+=128; // Add a bit of slop -//x: length(n); -// va_copy(a,args); -// len=vsnprintf(str,n+1,fmt,a); -// if(len<0){ n<<=1; goto x; } // Some implementations return -1 if not enough room -// if(n<len){ n=len; goto x; } // Others return how much space would be needed - n+=1024; // Add a lot of slop - length(n); // Some implementations return -1 if not enough room - len=vsnprintf(str,n+1,fmt,args); // Others return how much space would be needed +#if (_MSC_VER > 1300) // Have _vscprintf() + va_list ag; + va_copy(ag,args); + result=_vscprintf(fmt,ag); + va_end(ag); + length(result); + vsnprintf(str,length()+1,fmt,args); +#elif defined(HAVE_VSNPRINTF) // Have vsnprintf() +#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) + va_list ag; + va_copy(ag,args); + result=vsnprintf(str,length(),fmt,ag); + va_end(ag); + if(length()<=result){ + length(result); + result=vsnprintf(str,length()+1,fmt,args); + } #else - n+=1024; // Add a lot of slop - length(n); - len=vsprintf(str,fmt,args); + va_list ag; +x: va_copy(ag,args); + result=vsnprintf(str,length()+1,fmt,a); + va_end(ag); + if(result<0){ length(FXMAX(64,length()*2)); goto x; } + if(length()<result){ length(result); goto x; } +#endif +#else // No vsnprintf() + length(strlen(fmt)+1024); + result=vsprintf(str,fmt,args); + FXASSERT(0<=result && result<=length()); #endif - FXASSERT(0<=len && len<=n); } - length(len); + length(result); return *this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/fxjpegio.cpp new/fox-1.6.52/src/fxjpegio.cpp --- old/fox-1.6.50/src/fxjpegio.cpp 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.52/src/fxjpegio.cpp 2016-03-15 14:26:37.000000000 +0100 @@ -218,8 +218,21 @@ // read the header from the jpg; jpeg_read_header(&srcinfo,TRUE); - // make sure the output is RGB - srcinfo.out_color_space=JCS_RGB; + // output format supported by libjpeg-9a + switch (srcinfo.jpeg_color_space) { + case JCS_GRAYSCALE: // 1 + case JCS_RGB: // 2 + case JCS_YCbCr: // 3 + srcinfo.out_color_space=JCS_RGB; + break; + case JCS_CMYK: // 4 + case JCS_YCCK: // 5 + // jpeglib can't convert to rgb + srcinfo.out_color_space=JCS_CMYK; + break; + default: + return false; + } jpeg_start_decompress(&srcinfo); @@ -243,20 +256,48 @@ // Read the jpeg data pp=data; + int color = srcinfo.out_color_space; while(srcinfo.output_scanline<srcinfo.output_height){ jpeg_read_scanlines(&srcinfo,buffer,1); qq=buffer[0]; - for(FXint i=0; i<width; i++,pp++){ - ((FXuchar*)pp)[0]=*qq++; - ((FXuchar*)pp)[1]=*qq++; - ((FXuchar*)pp)[2]=*qq++; - ((FXuchar*)pp)[3]=255; +// for(FXint i=0; i<width; i++,pp++){ +// ((FXuchar*)pp)[0]=*qq++; +// ((FXuchar*)pp)[1]=*qq++; +// ((FXuchar*)pp)[2]=*qq++; +// ((FXuchar*)pp)[3]=255; +// } + if(color==JCS_RGB){ + for(FXint i=0; i<width; i++,pp++){ + ((FXuchar*)pp)[0]=*qq++; + ((FXuchar*)pp)[1]=*qq++; + ((FXuchar*)pp)[2]=*qq++; + ((FXuchar*)pp)[3]=255; + } + } + else{ + for(FXint i=0; i<width; i++,pp++){ + if(qq[3]==255){ + // No black + ((FXuchar*)pp)[0] = qq[0]; + ((FXuchar*)pp)[1] = qq[1]; + ((FXuchar*)pp)[2] = qq[2]; + } + else{ + // Approximated CMYK -> RGB + ((FXuchar*)pp)[0]=qq[0] * qq[3] / 255; + ((FXuchar*)pp)[1]=qq[1] * qq[3] / 255; + ((FXuchar*)pp)[2]=qq[2] * qq[3] / 255; + } + ((FXuchar*)pp)[3]=255; + qq+=4; + } } } // Clean up jpeg_finish_decompress(&srcinfo); jpeg_destroy_decompress(&srcinfo); + FXFREE(&buffer[0]); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/fxpriv.cpp new/fox-1.6.52/src/fxpriv.cpp --- old/fox-1.6.50/src/fxpriv.cpp 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.52/src/fxpriv.cpp 2016-06-16 06:16:00.000000000 +0200 @@ -605,7 +605,7 @@ static BOOL WINAPI MyGetMonitorInfo(HANDLE monitor,MYMONITORINFO* minfo){ HINSTANCE hUser32; PFNGETMONITORINFO gmi; - if((hUser32=GetModuleHandleA("USER32")) && (gmi=(PFNGETMONITORINFO)GetProcAddress(hUser32,"GetMonitorInfoA"))){ + if((hUser32=GetModuleHandleA("USER32"))!=NULL && (gmi=(PFNGETMONITORINFO)GetProcAddress(hUser32,"GetMonitorInfoA"))!=NULL){ fxGetMonitorInfo=gmi; return fxGetMonitorInfo(monitor,minfo); } @@ -617,7 +617,7 @@ static HANDLE WINAPI MyMonitorFromRect(RECT* rect,DWORD flags){ HINSTANCE hUser32; PFNMONITORFROMRECT mfr; - if((hUser32=GetModuleHandleA("USER32")) && (mfr=(PFNMONITORFROMRECT)GetProcAddress(hUser32,"MonitorFromRect"))){ + if((hUser32=GetModuleHandleA("USER32"))!=NULL && (mfr=(PFNMONITORFROMRECT)GetProcAddress(hUser32,"MonitorFromRect"))!=NULL){ fxMonitorFromRect=mfr; return fxMonitorFromRect(rect,flags); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/version.rc new/fox-1.6.52/src/version.rc --- old/fox-1.6.50/src/version.rc 2014-05-14 06:34:14.000000000 +0200 +++ new/fox-1.6.52/src/version.rc 2016-06-16 06:16:25.000000000 +0200 @@ -1,22 +1,33 @@ -1 VERSIONINFO -FILEVERSION 1,6,50,0 -FILEFLAGSMASK 0x3fL +#include <windows.h> +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,6,52,0 +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG -FILEFLAGS 0x1L +FILEFLAGS VS_FF_DEBUG #else -FILEFLAGS 0x0L +FILEFLAGS 0 #endif -FILEOS 0x4L -FILETYPE 0x2L -FILESUBTYPE 0x0L +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN +VALUE "CompanyName", "Jeroen van der Zijp\0" VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,50.0\0" -VALUE "LegalCopyright", "GNU Library General Public License\0" +VALUE "FileVersion", "1.6.52.0\0" +VALUE "InternalName", "FOXDLL-1.@FOX_MINOR_VERSION\0" +VALUE "LegalCopyright", "GNU Lesser General Public License Version 2.1 and License Addendum\0" +VALUE "OriginalFilename", "FOXDLL-1.@FOX_MINOR_VERSION.dll\0" +VALUE "ProductName", "FOX GUI Library\0" +VALUE "ProductVersion", "1.6.52.0\0" END END +BLOCK "VarFileInfo" +BEGIN +VALUE "Translation", 0x409, 1200 +END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/src/version.rc.in new/fox-1.6.52/src/version.rc.in --- old/fox-1.6.50/src/version.rc.in 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.52/src/version.rc.in 2016-06-16 06:16:00.000000000 +0200 @@ -1,22 +1,33 @@ -1 VERSIONINFO +#include <windows.h> +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +VS_VERSION_INFO VERSIONINFO FILEVERSION @FOX_MAJOR_VERSION@,@FOX_MINOR_VERSION@,@FOX_PATCH_LEVEL@,0 -FILEFLAGSMASK 0x3fL +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG -FILEFLAGS 0x1L +FILEFLAGS VS_FF_DEBUG #else -FILEFLAGS 0x0L +FILEFLAGS 0 #endif -FILEOS 0x4L -FILETYPE 0x2L -FILESUBTYPE 0x0L +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE 0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN +VALUE "CompanyName", "Jeroen van der Zijp\0" VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "@FOX_MAJOR_VERSION@,@FOX_MINOR_VERSION@,@[email protected]\0" -VALUE "LegalCopyright", "GNU Library General Public License\0" +VALUE "FileVersion", "@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@.@[email protected]\0" +VALUE "InternalName", "FOXDLL-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION\0" +VALUE "LegalCopyright", "GNU Lesser General Public License Version 2.1 and License Addendum\0" +VALUE "OriginalFilename", "FOXDLL-@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION.dll\0" +VALUE "ProductName", "FOX GUI Library\0" +VALUE "ProductVersion", "@FOX_MAJOR_VERSION@.@FOX_MINOR_VERSION@.@[email protected]\0" END END +BLOCK "VarFileInfo" +BEGIN +VALUE "Translation", 0x409, 1200 +END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fox-1.6.50/tests/dctest.cpp new/fox-1.6.52/tests/dctest.cpp --- old/fox-1.6.50/tests/dctest.cpp 2014-05-14 06:32:41.000000000 +0200 +++ new/fox-1.6.52/tests/dctest.cpp 2016-03-15 14:26:37.000000000 +0100 @@ -1067,7 +1067,7 @@ // Update Erase Color long DCTestWindow::onUpdEraseColor(FXObject* sender,FXSelector,void*){ - sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuint)erasecolor); + sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuval)erasecolor); return 1; } @@ -1084,7 +1084,7 @@ // Update Foreground Color long DCTestWindow::onUpdForeColor(FXObject* sender,FXSelector,void*){ - sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuint)forecolor); + sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuval)forecolor); return 1; } @@ -1100,7 +1100,7 @@ // Update Back Color long DCTestWindow::onUpdBackColor(FXObject* sender,FXSelector,void*){ - sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuint)backcolor); + sender->handle(this,FXSEL(SEL_COMMAND,ID_SETVALUE),(void*)(FXuval)backcolor); return 1; }
