From 78c0815c4118fe24ab78cce2dc48a6232dcd824a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Jun 2012 20:55:18 +0000 Subject: - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/acc.cpp | 12 +- plugins/AssocMgr/assoclist.c | 42 +- plugins/AssocMgr/dde.c | 16 +- plugins/AssocMgr/main.c | 8 +- plugins/AssocMgr/reg.c | 166 +++--- plugins/AssocMgr/test.c | 92 +-- plugins/AssocMgr/utils.c | 16 +- plugins/Boltun/boltun.cpp | 10 +- plugins/Boltun/config.cpp | 2 +- plugins/BossKeyPlus/BossKey.cpp | 4 +- plugins/BuddyExpectator/options.cpp | 2 +- plugins/CSList/strpos.h | 2 +- plugins/Chat/richutil.c | 4 +- plugins/Clist_nicer/CLUIFrames/cluiframes.cpp | 4 +- plugins/Clist_nicer/CLUIFrames/framesmenu.cpp | 2 +- plugins/Clist_nicer/INCLUDE/rowheight_funcs.h | 4 +- plugins/Clist_nicer/SRC/CLCButton.cpp | 10 +- plugins/Clist_nicer/SRC/Docking.cpp | 2 +- plugins/Clist_nicer/SRC/alphablend.cpp | 2 +- plugins/Clist_nicer/SRC/clcitems.cpp | 14 +- plugins/Clist_nicer/SRC/clcopts.cpp | 20 +- plugins/Clist_nicer/SRC/clcpaint.cpp | 34 +- plugins/Clist_nicer/SRC/clcutils.cpp | 10 +- plugins/Clist_nicer/SRC/clistevents.cpp | 2 +- plugins/Clist_nicer/SRC/clistmenus.cpp | 2 +- plugins/Clist_nicer/SRC/clistmod.cpp | 2 +- plugins/Clist_nicer/SRC/clistopts.cpp | 2 +- plugins/Clist_nicer/SRC/clistsettings.cpp | 2 +- plugins/Clist_nicer/SRC/clui.cpp | 4 +- plugins/Clist_nicer/SRC/cluiopts.cpp | 8 +- plugins/Clist_nicer/SRC/cluiservices.cpp | 6 +- plugins/Clist_nicer/SRC/contact.cpp | 8 +- plugins/Clist_nicer/SRC/extBackg.cpp | 62 +- plugins/Clist_nicer/SRC/init.cpp | 6 +- plugins/Clist_nicer/SRC/rowheight_funcs.cpp | 4 +- plugins/Clist_nicer/SRC/statusbar.cpp | 6 +- plugins/Clist_nicer/SRC/statusfloater.cpp | 42 +- plugins/Clist_nicer/SRC/viewmodes.cpp | 20 +- plugins/Clist_nicer/coolsb/coolsblib.cpp | 94 +-- plugins/Clist_nicer/coolsb/coolscroll.cpp | 38 +- plugins/ContactsPlus/contacts.vcxproj | 2 + plugins/ContactsPlus/send.cpp | 2 +- plugins/ContactsPlus/utils.cpp | 6 +- plugins/CountryFlags/countrylistext.c | 4 +- plugins/CountryFlags/extraimg.c | 14 +- plugins/CountryFlags/huffman.c | 48 +- plugins/CountryFlags/icons.c | 2 +- plugins/CountryFlags/ip2country.c | 22 +- plugins/CountryFlags/main.c | 6 +- plugins/CountryFlags/utils.c | 10 +- plugins/CryptoPP/GPGw/gpg.c | 26 +- plugins/CryptoPP/GPGw/main.c | 40 +- plugins/CryptoPP/GPGw/pipeexec.c | 12 +- plugins/CryptoPP/GPGw/tools.c | 2 +- plugins/CryptoPP/PGPw/main.cpp | 6 +- plugins/CryptoPP/base16.cpp | 4 +- plugins/CryptoPP/base64.cpp | 2 +- plugins/CryptoPP/commonheaders.cpp | 14 +- plugins/CryptoPP/cpp_cntx.cpp | 38 +- plugins/CryptoPP/cpp_gpgw.cpp | 30 +- plugins/CryptoPP/cpp_keys.cpp | 18 +- plugins/CryptoPP/cpp_misc.cpp | 24 +- plugins/CryptoPP/cpp_pgpw.cpp | 34 +- plugins/CryptoPP/cpp_rsam.cpp | 152 ++--- plugins/CryptoPP/cpp_rsau.cpp | 22 +- plugins/CryptoPP/cpp_rsau.h | 10 +- plugins/CryptoPP/cpp_svcs.cpp | 28 +- plugins/CryptoPP/crypto/crc.cpp | 2 +- plugins/CryptoPP/crypto/des.cpp | 4 +- plugins/CryptoPP/crypto/gzip.cpp | 4 +- plugins/CryptoPP/crypto/mars.cpp | 2 +- plugins/CryptoPP/crypto/osrng.cpp | 2 +- plugins/CryptoPP/main.cpp | 2 +- plugins/Db3x/dbcache.c | 2 +- plugins/Db3x/dbcontacts.c | 2 +- plugins/Db3x/dbevents.c | 12 +- plugins/Db3x/dbsettings.c | 12 +- plugins/Db3x_mmap/dbcache.c | 2 +- plugins/Db3x_mmap/dbcontacts.c | 2 +- plugins/Db3x_mmap/dbevents.c | 12 +- plugins/Db3x_mmap/dbsettings.c | 10 +- plugins/Db_autobackups/backup.c | 8 +- plugins/Db_autobackups/options.c | 6 +- plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp | 6 +- plugins/Dbx_mmap_SA/Dbtool/contactchain.cpp | 4 +- plugins/Dbx_mmap_SA/Dbtool/disk.cpp | 6 +- plugins/Dbx_mmap_SA/Dbtool/encryption.cpp | 10 +- plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp | 12 +- plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp | 4 +- plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp | 4 +- plugins/Dbx_mmap_SA/Dbtool/langpack.cpp | 18 +- plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp | 6 +- plugins/Dbx_mmap_SA/Dbtool/progress.cpp | 6 +- plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp | 12 +- plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp | 8 +- plugins/Dbx_mmap_SA/Dbtool/user.cpp | 4 +- plugins/Dbx_mmap_SA/Dbtool/wizard.cpp | 10 +- plugins/Dbx_mmap_SA/Dbtool/worker.cpp | 2 +- plugins/Dbx_mmap_SA/Import_SA/encryption.c | 12 +- plugins/Dbx_mmap_SA/Import_SA/mirabilis.c | 34 +- plugins/Dbx_mmap_SA/Import_SA/miranda.c | 4 +- plugins/Dbx_mmap_SA/Import_SA/mirandahistory.c | 4 +- plugins/Dbx_mmap_SA/dbcache.c | 2 +- plugins/Dbx_mmap_SA/dbcontacts.c | 2 +- plugins/Dbx_mmap_SA/dbevents.c | 12 +- plugins/Dbx_mmap_SA/dbsettings.c | 14 +- plugins/Dbx_mmap_SA/dialogs.c | 28 +- plugins/Dbx_mmap_SA/security.c | 22 +- plugins/Dbx_tree/sigslot.h | 56 +- plugins/ExternalAPI/m_assocmgr.h | 4 +- plugins/ExternalAPI/m_flags.h | 4 +- plugins/ExternalAPI/m_help.h | 2 +- plugins/ExternalAPI/m_mails.h | 2 +- plugins/FavContacts/src/main.cpp | 4 +- plugins/FingerPrintModPlus/src/fingerprint.cpp | 64 +-- plugins/FingerPrintModPlus/src/utilities.cpp | 26 +- plugins/FlashAvatars/TigerHash.cpp | 2 +- plugins/FlashAvatars/cflash.cpp | 37 +- plugins/FlashAvatars/stdafx.h | 5 +- plugins/FloatingContacts/bitmap_funcs.cpp | 105 ++-- plugins/FloatingContacts/bitmap_funcs.h | 2 +- plugins/FloatingContacts/filedrop.cpp | 52 +- plugins/FloatingContacts/filedrop.h | 2 +- plugins/FloatingContacts/main.cpp | 629 ++++++++++----------- plugins/FloatingContacts/options.cpp | 70 +-- plugins/FloatingContacts/thumbs.cpp | 170 +++--- plugins/FreeImage/Miranda/main.cpp | 24 +- .../FreeImage/Source/FreeImage/BitmapAccess.cpp | 32 +- plugins/FreeImage/Source/FreeImage/Conversion.cpp | 14 +- .../Source/FreeImage/Conversion16_555.cpp | 2 +- .../Source/FreeImage/Conversion16_565.cpp | 2 +- .../FreeImage/Source/FreeImage/Conversion24.cpp | 4 +- .../FreeImage/Source/FreeImage/Conversion32.cpp | 4 +- plugins/FreeImage/Source/FreeImage/Conversion4.cpp | 6 +- plugins/FreeImage/Source/FreeImage/Conversion8.cpp | 8 +- .../FreeImage/Source/FreeImage/ConversionFloat.cpp | 8 +- .../FreeImage/Source/FreeImage/ConversionRGB16.cpp | 8 +- .../FreeImage/Source/FreeImage/ConversionRGBF.cpp | 8 +- .../FreeImage/Source/FreeImage/ConversionType.cpp | 10 +- .../Source/FreeImage/ConversionUINT16.cpp | 8 +- plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp | 18 +- plugins/FreeImage/Source/FreeImage/Halftoning.cpp | 4 +- plugins/FreeImage/Source/FreeImage/J2KHelper.cpp | 8 +- plugins/FreeImage/Source/FreeImage/MultiPage.cpp | 10 +- plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp | 4 +- plugins/FreeImage/Source/FreeImage/PSDParser.cpp | 24 +- plugins/FreeImage/Source/FreeImage/PixelAccess.cpp | 24 +- plugins/FreeImage/Source/FreeImage/Plugin.cpp | 2 +- plugins/FreeImage/Source/FreeImage/PluginBMP.cpp | 24 +- plugins/FreeImage/Source/FreeImage/PluginCUT.cpp | 2 +- plugins/FreeImage/Source/FreeImage/PluginDDS.cpp | 2 +- plugins/FreeImage/Source/FreeImage/PluginEXR.cpp | 44 +- plugins/FreeImage/Source/FreeImage/PluginG3.cpp | 4 +- plugins/FreeImage/Source/FreeImage/PluginGIF.cpp | 304 +++++----- plugins/FreeImage/Source/FreeImage/PluginHDR.cpp | 42 +- plugins/FreeImage/Source/FreeImage/PluginICO.cpp | 26 +- plugins/FreeImage/Source/FreeImage/PluginIFF.cpp | 8 +- plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp | 10 +- plugins/FreeImage/Source/FreeImage/PluginJP2.cpp | 10 +- plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp | 36 +- plugins/FreeImage/Source/FreeImage/PluginPCD.cpp | 4 +- plugins/FreeImage/Source/FreeImage/PluginPCX.cpp | 16 +- plugins/FreeImage/Source/FreeImage/PluginPFM.cpp | 20 +- plugins/FreeImage/Source/FreeImage/PluginPICT.cpp | 2 +- plugins/FreeImage/Source/FreeImage/PluginPNG.cpp | 14 +- plugins/FreeImage/Source/FreeImage/PluginPNM.cpp | 14 +- plugins/FreeImage/Source/FreeImage/PluginRAS.cpp | 4 +- plugins/FreeImage/Source/FreeImage/PluginRAW.cpp | 14 +- plugins/FreeImage/Source/FreeImage/PluginSGI.cpp | 6 +- plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp | 8 +- plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp | 68 +-- plugins/FreeImage/Source/FreeImage/PluginXBM.cpp | 32 +- plugins/FreeImage/Source/FreeImage/PluginXPM.cpp | 64 +-- plugins/FreeImage/Source/FreeImage/ToneMapping.cpp | 6 +- plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp | 6 +- .../FreeImage/Source/FreeImage/tmoColorConvert.cpp | 6 +- plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp | 4 +- plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp | 44 +- .../FreeImage/Source/FreeImage/tmoReinhard05.cpp | 14 +- .../Source/FreeImageToolkit/BSplineRotate.cpp | 20 +- .../FreeImage/Source/FreeImageToolkit/Channels.cpp | 42 +- .../Source/FreeImageToolkit/ClassicRotate.cpp | 36 +- .../FreeImage/Source/FreeImageToolkit/Colors.cpp | 16 +- .../Source/FreeImageToolkit/CopyPaste.cpp | 44 +- .../FreeImage/Source/FreeImageToolkit/Display.cpp | 10 +- .../Source/FreeImageToolkit/JPEGTransform.cpp | 14 +- .../FreeImageToolkit/MultigridPoissonSolver.cpp | 22 +- .../FreeImage/Source/FreeImageToolkit/Rescale.cpp | 24 +- .../FreeImage/Source/FreeImageToolkit/Resize.cpp | 10 +- plugins/FreeImage/Source/LibPNG/pngrutil.c | 2 +- plugins/FreeImage/Source/LibTIFF/tif_color.c | 6 +- plugins/FreeImage/Source/LibTIFF/tif_dir.c | 12 +- plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c | 2 +- plugins/FreeImage/Source/LibTIFF/tif_dirread.c | 30 +- plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c | 22 +- plugins/FreeImage/Source/LibTIFF/tif_extension.c | 6 +- plugins/FreeImage/Source/LibTIFF/tif_fax3.c | 6 +- plugins/FreeImage/Source/LibTIFF/tif_fax3.h | 2 +- plugins/FreeImage/Source/LibTIFF/tif_getimage.c | 40 +- plugins/FreeImage/Source/LibTIFF/tif_jpeg.c | 54 +- plugins/FreeImage/Source/LibTIFF/tif_luv.c | 4 +- plugins/FreeImage/Source/LibTIFF/tif_lzw.c | 6 +- plugins/FreeImage/Source/LibTIFF/tif_packbits.c | 4 +- plugins/FreeImage/Source/LibTIFF/tif_predict.c | 10 +- plugins/FreeImage/Source/LibTIFF/tif_read.c | 4 +- plugins/FreeImage/Source/LibTIFF/tif_thunder.c | 2 +- plugins/FreeImage/Source/LibTIFF/tif_unix.c | 4 +- plugins/FreeImage/Source/LibTIFF/tif_win32.c | 4 +- plugins/FreeImage/Source/LibTIFF/tif_write.c | 8 +- plugins/FreeImage/Source/LibTIFF/tif_zip.c | 6 +- plugins/FreeImage/Source/Metadata/Exif.cpp | 26 +- plugins/FreeImage/Source/Metadata/FreeImageTag.cpp | 14 +- plugins/FreeImage/Source/Metadata/IPTC.cpp | 6 +- .../FreeImage/Source/Metadata/TagConversion.cpp | 6 +- plugins/FreeImage/Source/Metadata/TagLib.cpp | 6 +- plugins/FreeImage/Source/Metadata/XTIFF.cpp | 16 +- plugins/FreeImage/Source/Utilities.h | 2 +- plugins/FreeImage/Source/Zlib/zutil.h | 2 +- plugins/HistoryLinkListPlus/linklist.c | 2 +- plugins/HistoryLinkListPlus/linklist_dlg.c | 4 +- plugins/HistoryLinkListPlus/linklist_fct.c | 28 +- plugins/HistorySweeperLight/historysweeperlight.h | 4 +- plugins/IEView/HTMLBuilder.cpp | 2 +- plugins/IEView/Options.cpp | 2 +- plugins/IEView/SRMMHTMLBuilder.cpp | 2 +- plugins/IEView/TabSRMMHTMLBuilder.cpp | 2 +- plugins/Import/mirabilis.c | 34 +- plugins/Import/mirandahistory.c | 4 +- plugins/JSON/Source/JSONChildren.h | 4 +- plugins/JSON/Source/JSONDebug.h | 4 +- plugins/JSON/Source/JSONIterators.cpp | 12 +- plugins/JSON/Source/JSONMemory.h | 6 +- plugins/JSON/Source/JSONNode.cpp | 28 +- plugins/JSON/Source/JSONNode.h | 12 +- plugins/JSON/Source/JSONNode_Mutex.cpp | 8 +- plugins/JSON/Source/JSONWorker.cpp | 44 +- plugins/JSON/Source/JSONWriter.cpp | 4 +- plugins/JSON/Source/JSON_Base64.cpp | 12 +- plugins/JSON/Source/NumberToString.h | 2 +- plugins/JSON/Source/internalJSONNode.cpp | 22 +- plugins/JSON/Source/internalJSONNode.h | 6 +- plugins/JSON/miminterface.cpp | 4 +- plugins/KeyboardNotify/EnumProc.cpp | 2 +- plugins/KeyboardNotify/flash.cpp | 2 +- plugins/KeyboardNotify/ignore.cpp | 2 +- plugins/KeyboardNotify/keyboard.cpp | 2 + plugins/KeyboardNotify/main.cpp | 25 +- plugins/KeyboardNotify/options.cpp | 6 +- plugins/KeyboardNotify/protolist.h | 2 +- plugins/KeyboardNotify/trigger.cpp | 2 +- plugins/LangMan/langpack.c | 52 +- plugins/LangMan/options.c | 40 +- plugins/LangMan/utils.c | 2 +- plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp | 2 +- .../players/foo_mlt/foobar2000/SDK/cfg_var.cpp | 2 +- .../foo_mlt/foobar2000/SDK/config_object.cpp | 2 +- .../players/foo_mlt/foobar2000/SDK/filesystem.cpp | 4 +- .../foo_mlt/foobar2000/SDK/filesystem_helper.h | 2 +- .../players/foo_mlt/foobar2000/SDK/input.cpp | 2 +- .../foo_mlt/foobar2000/SDK/metadb_handle_list.cpp | 2 +- .../foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp | 2 +- .../foo_mlt/foobar2000/helpers/ProfileCache.h | 2 +- .../foo_mlt/foobar2000/helpers/ThreadUtils.h | 10 +- .../foo_mlt/foobar2000/helpers/cue_creator.cpp | 2 +- .../foobar2000/helpers/file_info_const_impl.cpp | 6 +- .../foo_mlt/foobar2000/helpers/filetimetools.cpp | 2 +- .../foo_mlt/foobar2000/helpers/listview_helper.cpp | 2 +- .../foobar2000/helpers/text_file_loader.cpp | 2 +- .../foo_mlt/foobar2000/helpers/wildcard.cpp | 2 +- .../players/foo_mlt/foobar2000/shared/shared.h | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/array.h | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/avltree.h | 6 +- plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp | 6 +- plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp | 2 +- .../ListeningTo/players/foo_mlt/pfc/iterators.h | 4 +- plugins/ListeningTo/players/foo_mlt/pfc/other.cpp | 4 +- .../ListeningTo/players/foo_mlt/pfc/pathUtils.cpp | 2 +- .../ListeningTo/players/foo_mlt/pfc/primitives.h | 8 +- plugins/ListeningTo/players/foo_mlt/pfc/string.cpp | 20 +- plugins/ListeningTo/players/foo_mlt/pfc/string.h | 8 +- .../ListeningTo/players/foo_mlt/pfc/stringNew.cpp | 4 +- .../ListeningTo/players/foo_mlt/pfc/stringNew.h | 2 +- .../players/foo_mlt/pfc/string_conv.cpp | 2 +- plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp | 10 +- plugins/ListeningTo/players/winamp_mlt/wa_ipc.h | 6 +- plugins/MenuItemEx/main.c | 44 +- plugins/MetaContacts/addto.c | 6 +- plugins/MetaContacts/edit.c | 6 +- plugins/MetaContacts/meta_api.c | 10 +- plugins/MetaContacts/meta_main.c | 4 +- plugins/MetaContacts/meta_menu.c | 20 +- plugins/MetaContacts/meta_options.c | 12 +- plugins/MetaContacts/meta_services.c | 112 ++-- plugins/MetaContacts/meta_utils.c | 112 ++-- plugins/MirOTR/MirOTR/dbfilter.cpp | 20 +- plugins/MirOTR/MirOTR/entities.cpp | 4 +- plugins/MirOTR/MirOTR/options.cpp | 2 +- plugins/MirOTR/MirOTR/otr.cpp | 4 +- plugins/MirOTR/MirOTR/svcs_menu.cpp | 12 +- plugins/MirOTR/MirOTR/svcs_proto.cpp | 14 +- plugins/MirOTR/MirOTR/svcs_srmm.cpp | 8 +- plugins/MirOTR/MirOTR/utils.cpp | 2 +- plugins/MirOTR/ekhtml/include/ekhtml_private.h | 4 +- plugins/MirOTR/ekhtml/src/ekhtml.c | 16 +- plugins/MirOTR/ekhtml/src/ekhtml_comment.c | 12 +- plugins/MirOTR/ekhtml/src/ekhtml_endtag.c | 10 +- plugins/MirOTR/ekhtml/src/ekhtml_mktables.c | 8 +- plugins/MirOTR/ekhtml/src/ekhtml_special.c | 6 +- plugins/MirOTR/ekhtml/src/ekhtml_starttag.c | 30 +- plugins/MirOTR/ekhtml/testsuite/tester.c | 6 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/arcfour.c | 6 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/blowfish.c | 18 +- .../MirOTR/libgcrypt-1.4.6/cipher/camellia-glue.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/cast5.c | 14 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/cipher.c | 6 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/des.c | 6 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/dsa.c | 24 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/ecc.c | 4 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/elgamal.c | 46 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/md4.c | 16 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c | 16 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/primegen.c | 30 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/pubkey.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/rijndael.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/rmd160.c | 16 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/rsa.c | 8 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/seed.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c | 4 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/tiger.c | 16 +- plugins/MirOTR/libgcrypt-1.4.6/cipher/twofish.c | 6 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-add.c | 32 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-bit.c | 22 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-cmp.c | 10 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-div.c | 46 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-inline.h | 28 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-internal.h | 24 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-inv.c | 38 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-mpow.c | 24 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-mul.c | 32 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-pow.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpi-scan.c | 32 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpicoder.c | 8 +- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpih-div.c | 76 +-- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpih-mul.c | 86 +-- plugins/MirOTR/libgcrypt-1.4.6/mpi/mpiutil.c | 14 +- .../MirOTR/libgcrypt-1.4.6/random/random-csprng.c | 8 +- plugins/MirOTR/libgcrypt-1.4.6/random/rndegd.c | 28 +- plugins/MirOTR/libgcrypt-1.4.6/random/rndlinux.c | 18 +- plugins/MirOTR/libgcrypt-1.4.6/random/rndunix.c | 56 +- plugins/MirOTR/libgcrypt-1.4.6/src/gcrypt.h | 2 +- plugins/MirOTR/libgcrypt-1.4.6/src/gcryptrnd.c | 2 +- plugins/MirOTR/libgcrypt-1.4.6/src/global.c | 10 +- plugins/MirOTR/libgcrypt-1.4.6/src/misc.c | 2 +- .../MirOTR/libgcrypt-1.4.6/src/missing-string.c | 4 +- plugins/MirOTR/libgcrypt-1.4.6/src/sexp.c | 32 +- plugins/MirOTR/libgcrypt-1.4.6/src/stdmem.c | 2 +- plugins/MirOTR/libgpg-error-1.9/src/w32-gettext.c | 2 +- plugins/MirOTR/libotr-3.2.0/src/proto.c | 8 +- plugins/MirOTR/libotr-3.2.0/toolkit/aes.c | 60 +- plugins/ModernOpt/mopt_ignore.cpp | 2 +- plugins/Modernb/MString.cpp | 2 +- plugins/Modernb/_disabled_src/groups.c | 2 +- plugins/Modernb/hdr/MString.h | 136 ++--- plugins/Modernb/modern_clc.cpp | 52 +- plugins/Modernb/modern_clcidents.cpp | 12 +- plugins/Modernb/modern_clcitems.cpp | 16 +- plugins/Modernb/modern_clcopts.cpp | 48 +- plugins/Modernb/modern_clcpaint.cpp | 176 +++--- plugins/Modernb/modern_clcutils.cpp | 28 +- plugins/Modernb/modern_clistevents.cpp | 4 +- plugins/Modernb/modern_clistmod.cpp | 2 +- plugins/Modernb/modern_clistopts.cpp | 14 +- plugins/Modernb/modern_clistsettings.cpp | 10 +- plugins/Modernb/modern_clisttray.cpp | 4 +- plugins/Modernb/modern_clui.cpp | 28 +- plugins/Modernb/modern_cluiframes.cpp | 86 +-- plugins/Modernb/modern_contact.cpp | 4 +- plugins/Modernb/modern_docking.cpp | 12 +- plugins/Modernb/modern_extraimage.cpp | 2 +- plugins/Modernb/modern_popup.cpp | 2 +- plugins/Modernb/modern_rowheight_funcs.cpp | 2 +- plugins/Modernb/modern_rowtemplateopt.cpp | 4 +- plugins/Modernb/modern_skineditor.cpp | 4 +- plugins/Modernb/modern_skinengine.cpp | 10 +- plugins/Modernb/modern_skinopt.cpp | 6 +- plugins/Modernb/modern_skinselector.cpp | 48 +- plugins/Modernb/modern_statusbar.cpp | 2 +- plugins/Modernb/modern_tbbutton.cpp | 8 +- plugins/Modernb/modern_toolbar.cpp | 6 +- plugins/Modernb/modern_viewmodebar.cpp | 24 +- plugins/Mwclist/BkgrCfg.c | 12 +- plugins/Mwclist/CLUIFrames/cluiframes.c | 44 +- plugins/Mwclist/CLUIFrames/extraimage.c | 4 +- plugins/Mwclist/CLUIFrames/statusbar.c | 4 +- plugins/Mwclist/clc.c | 10 +- plugins/Mwclist/clcidents.c | 18 +- plugins/Mwclist/clcitems.c | 40 +- plugins/Mwclist/clcopts.c | 28 +- plugins/Mwclist/clcpaint.c | 6 +- plugins/Mwclist/clcutils.c | 6 +- plugins/Mwclist/clistopts.c | 14 +- plugins/Mwclist/clistsettings.c | 14 +- plugins/Mwclist/clui.c | 8 +- plugins/Mwclist/cluiopts.c | 18 +- plugins/Mwclist/contact.c | 10 +- plugins/Mwclist/init.c | 2 +- plugins/NewXstatusNotify/indsnd.cpp | 2 +- plugins/NewXstatusNotify/main.cpp | 2 +- plugins/NewXstatusNotify/utils.cpp | 2 +- plugins/NewsAggregstor/NewsAggregator_10.vcxproj | 1 + plugins/NewsAggregstor/Src/Entities.cpp | 4 +- plugins/NewsAggregstor/Src/Options.cpp | 2 +- plugins/NewsAggregstor/Src/Services.cpp | 6 +- plugins/NewsAggregstor/Src/Utils.cpp | 6 +- plugins/Nudge/main.cpp | 18 +- plugins/Nudge/nudge.cpp | 4 +- plugins/Nudge/options.cpp | 2 +- plugins/Nudge/shake.cpp | 6 +- plugins/PackUpdater/Src/Notifications.cpp | 10 +- plugins/PackUpdater/Src/Utils.cpp | 6 +- plugins/Popup/src/common.h | 4 +- plugins/Popup/src/config.cpp | 2 +- plugins/Popup/src/formula.cpp | 6 +- plugins/Popup/src/formula.h | 4 +- plugins/Popup/src/icons.cpp | 2 +- plugins/Popup/src/main.cpp | 8 +- plugins/Popup/src/notifications.cpp | 2 +- plugins/Popup/src/opt_adv.cpp | 12 +- plugins/Popup/src/opt_contacts.cpp | 2 +- plugins/Popup/src/opt_gen.cpp | 6 +- plugins/Popup/src/opt_skins.cpp | 12 +- plugins/Popup/src/popup_wnd2.cpp | 10 +- plugins/Popup/src/services.cpp | 4 +- plugins/Popup/src/skin.cpp | 2 +- plugins/QuickMessages/Utils.c | 26 +- plugins/QuickMessages/main.c | 28 +- plugins/QuickMessages/options.c | 92 +-- plugins/QuickReplies/common.h | 8 +- plugins/QuickReplies/events.cpp | 6 +- plugins/QuickReplies/options.cpp | 32 +- plugins/Quotes/CurrencyConverter.cpp | 6 +- plugins/Quotes/Forex.cpp | 10 +- plugins/Quotes/HTTPSession.cpp | 10 +- plugins/Quotes/IHTMLEngine.h | 2 +- plugins/Quotes/IHTMLParser.h | 8 +- plugins/Quotes/IQuotesProvider.h | 4 +- plugins/Quotes/IXMLEngine.h | 8 +- plugins/Quotes/IconLib.cpp | 2 +- plugins/Quotes/ImportExport.cpp | 10 +- plugins/Quotes/IsWithinAccuracy.h | 2 +- plugins/Quotes/Locale.cpp | 4 +- plugins/Quotes/ModuleInfo.cpp | 12 +- plugins/Quotes/QuoteChart.cpp | 2 +- plugins/Quotes/QuoteInfoDlg.cpp | 4 +- plugins/Quotes/QuotesProviderFinance.cpp | 6 +- plugins/Quotes/QuotesProviderGoogle.cpp | 26 +- plugins/Quotes/QuotesProviderGoogleFinance.cpp | 8 +- plugins/Quotes/QuotesProviderVisitor.h | 4 +- plugins/Quotes/QuotesProviderYahoo.cpp | 12 +- plugins/Quotes/QuotesProviders.cpp | 2 +- plugins/Quotes/SettingsDlg.cpp | 14 +- plugins/Quotes/XMLEngineMI.cpp | 2 +- plugins/RecentContacts/RecentContacts.cpp | 4 +- plugins/SRMM/richutil.c | 2 +- plugins/SRMM/statusicon.c | 10 +- plugins/Scriver/chat/clist.c | 2 +- plugins/Scriver/chat/colorchooser.c | 2 +- plugins/Scriver/chat/options.c | 18 +- plugins/Scriver/chat/tools.c | 2 +- plugins/Scriver/msglog.c | 2 +- plugins/Scriver/msgwindow.c | 2 +- plugins/Scriver/richutil.c | 2 +- plugins/Scriver/statusicon.c | 10 +- plugins/SecureIM/commonheaders.cpp | 10 +- plugins/SecureIM/crypt_check.cpp | 78 +-- plugins/SecureIM/crypt_dll.cpp | 20 +- plugins/SecureIM/crypt_icons.cpp | 32 +- plugins/SecureIM/crypt_lists.cpp | 46 +- plugins/SecureIM/crypt_metacontacts.cpp | 6 +- plugins/SecureIM/crypt_misc.cpp | 16 +- plugins/SecureIM/crypt_popups.cpp | 4 +- plugins/SecureIM/loadicons.cpp | 2 +- plugins/SecureIM/main.cpp | 14 +- plugins/SecureIM/mmi.cpp | 8 +- plugins/SecureIM/options.cpp | 156 ++--- plugins/SecureIM/splitmsg.cpp | 14 +- plugins/SecureIM/svcs_clist.cpp | 42 +- plugins/SecureIM/svcs_menu.cpp | 12 +- plugins/SecureIM/svcs_popup.cpp | 4 +- plugins/SecureIM/svcs_proto.cpp | 194 +++---- plugins/SecureIM/svcs_rsa.cpp | 22 +- plugins/SecureIM/svcs_srmm.cpp | 6 +- plugins/SeenPlugin/file.c | 6 +- plugins/SeenPlugin/main.c | 4 +- plugins/SeenPlugin/menu.c | 4 +- plugins/SeenPlugin/missed.c | 8 +- plugins/SeenPlugin/options.c | 16 +- plugins/SeenPlugin/userinfo.c | 4 +- plugins/SeenPlugin/utils.c | 92 +-- plugins/Sessions/Src/Main.cpp | 24 +- plugins/Sessions/Src/Options.cpp | 20 +- plugins/Sessions/Src/Utils.cpp | 34 +- plugins/SmileyAdd/smileyroutines.cpp | 2 +- plugins/SpellChecker/autoreplace.cpp | 4 +- plugins/SpellChecker/spellchecker.cpp | 4 +- .../AdvancedAutoAway/advancedautoaway.cpp | 4 +- .../StatusPlugins/AdvancedAutoAway/msgoptions.cpp | 4 +- .../StatusPlugins/KeepStatus/action_keepstatus.cpp | 4 +- plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 4 +- plugins/StatusPlugins/commonstatus.cpp | 2 +- plugins/StatusPlugins/confirmdialog.cpp | 4 +- plugins/StopSpamPlus/src/events.cpp | 16 +- plugins/StopSpamPlus/src/opt_proto.cpp | 2 +- plugins/Svc_crshdmp/utils.cpp | 2 +- plugins/Svc_dbepp/exportimport.cpp | 8 +- plugins/Svc_dbepp/main.cpp | 2 +- plugins/Svc_dbepp/main_window.cpp | 2 +- plugins/Svc_vi/utils.cpp | 6 +- plugins/TabSRMM/chat/clist.cpp | 2 +- plugins/TabSRMM/chat/muchighlight.cpp | 24 +- plugins/TabSRMM/chat/options.cpp | 4 +- plugins/TabSRMM/chat/services.cpp | 2 +- plugins/TabSRMM/chat/tools.cpp | 14 +- plugins/TabSRMM/chat/window.cpp | 28 +- plugins/TabSRMM/include/msgs.h | 2 +- plugins/TabSRMM/include/themes.h | 2 +- plugins/TabSRMM/src/buttonsbar.cpp | 4 +- plugins/TabSRMM/src/contactcache.cpp | 2 +- plugins/TabSRMM/src/container.cpp | 10 +- plugins/TabSRMM/src/containeroptions.cpp | 6 +- plugins/TabSRMM/src/controls.cpp | 8 +- plugins/TabSRMM/src/eventpopups.cpp | 12 +- plugins/TabSRMM/src/generic_msghandlers.cpp | 32 +- plugins/TabSRMM/src/globals.cpp | 8 +- plugins/TabSRMM/src/hotkeyhandler.cpp | 4 +- plugins/TabSRMM/src/infopanel.cpp | 58 +- plugins/TabSRMM/src/mim.cpp | 10 +- plugins/TabSRMM/src/msgdialog.cpp | 34 +- plugins/TabSRMM/src/msgdlgutils.cpp | 18 +- plugins/TabSRMM/src/msglog.cpp | 2 +- plugins/TabSRMM/src/msgoptions.cpp | 10 +- plugins/TabSRMM/src/msgs.cpp | 8 +- plugins/TabSRMM/src/selectcontainer.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 42 +- plugins/TabSRMM/src/sendqueue.cpp | 2 +- plugins/TabSRMM/src/sidebar.cpp | 36 +- plugins/TabSRMM/src/tabctrl.cpp | 4 +- plugins/TabSRMM/src/taskbar.cpp | 14 +- plugins/TabSRMM/src/themeio.cpp | 2 +- plugins/TabSRMM/src/themes.cpp | 24 +- plugins/TabSRMM/src/userprefs.cpp | 6 +- plugins/TabSRMM/src/utils.cpp | 22 +- plugins/TabSRMM/tabmodplus/modplus.cpp | 2 +- plugins/TabSRMM/tabsrmm_10.vcxproj | 22 +- plugins/TabSRMM/tabsrmm_10.vcxproj.filters | 12 - plugins/TipperYM/options.cpp | 2 +- plugins/TooltipNotify/src/TooltipNotify.cpp | 6 +- plugins/TooltipNotify/src/TooltipNotify.h | 2 +- plugins/TooltipNotify/src/Utils.cpp | 9 +- plugins/TooltipNotify/src/Utils.h | 2 +- plugins/TooltipNotify/src/stdafx.h | 2 +- plugins/TranslitSwitcher/Src/Layoutproc.cpp | 2 +- plugins/Updater/allocations.h | 6 +- plugins/Updater/bzip2-1.0.3/bzlib.c | 2 +- plugins/Updater/bzip2-1.0.3/dlltest.c | 20 +- plugins/Updater/conf_comp_dialog.cpp | 6 +- plugins/Updater/conf_dialog.cpp | 16 +- plugins/Updater/extern.cpp | 10 +- plugins/Updater/options.cpp | 14 +- plugins/Updater/scan.cpp | 6 +- plugins/Updater/services.cpp | 14 +- plugins/Updater/socket.cpp | 2 +- plugins/Updater/updater_10.vcxproj | 1 - plugins/Updater/updater_10.vcxproj.filters | 3 - plugins/Updater/utils.cpp | 4 +- plugins/Updater/xmldata.cpp | 14 +- plugins/Updater/zbin/minizip/minizip.c | 8 +- plugins/Updater/zbin/minizip/unzip.c | 2 +- plugins/Updater/zbin/minizip/zip.c | 6 +- plugins/UserInfoEx/Flags/svc_countrylistext.cpp | 8 +- plugins/UserInfoEx/Flags/svc_flags.cpp | 44 +- plugins/UserInfoEx/Flags/svc_flagsicons.cpp | 8 +- plugins/UserInfoEx/UInfoEx_10.vcxproj | 6 + plugins/UserInfoEx/classMAnnivDate.cpp | 4 +- plugins/UserInfoEx/commonheaders.cpp | 6 +- plugins/UserInfoEx/ctrl_tzcombo.h | 2 +- plugins/UserInfoEx/dlg_anniversarylist.cpp | 10 +- .../UserInfoEx/ex_import/classExImContactBase.cpp | 10 +- .../UserInfoEx/ex_import/classExImContactXML.cpp | 10 +- plugins/UserInfoEx/mir_db.cpp | 6 +- plugins/UserInfoEx/mir_menuitems.cpp | 8 +- plugins/UserInfoEx/psp_options.cpp | 2 +- plugins/UserInfoEx/psp_profile.cpp | 2 +- plugins/UserInfoEx/svc_constants.h | 2 +- plugins/UserInfoEx/svc_email.cpp | 2 +- plugins/Utils/mir_buffer.h | 2 +- plugins/Variables/contact.cpp | 2 +- plugins/YAMN/account.cpp | 2 +- plugins/YAMN/browser/mailbrowser.cpp | 54 +- plugins/YAMN/filter/Base/maindll.cpp | 14 +- plugins/YAMN/filter/Simple/maindll.cpp | 12 +- plugins/YAMN/mails/decode.cpp | 10 +- plugins/YAMN/mails/mime.cpp | 14 +- plugins/YAMN/main.cpp | 4 +- plugins/YAMN/proto/pop3/pop3.cpp | 2 +- plugins/YAMN/proto/pop3/pop3comm.cpp | 6 +- plugins/YAMN/services.cpp | 8 +- plugins/YAPP/message_pump.cpp | 4 +- plugins/YAPP/options.cpp | 6 +- plugins/YAPP/popwin.cpp | 8 +- plugins/YAPP/services.cpp | 12 +- plugins/ZeroNotification/main.c | 8 +- plugins/Zlib/zutil.h | 2 +- plugins/mTextControl/src/FormattedTextDraw.cpp | 8 +- plugins/mTextControl/src/dataobject.cpp | 4 +- protocols/AimOscar/connection.cpp | 50 +- protocols/AimOscar/conv.cpp | 12 +- protocols/AimOscar/links.cpp | 2 +- protocols/AimOscar/server.cpp | 10 +- protocols/AimOscar/services.cpp | 2 +- protocols/AimOscar/theme.cpp | 4 +- protocols/AimOscar/ui.cpp | 12 +- protocols/AimOscar/utility.cpp | 2 +- protocols/FacebookRM/chat.cpp | 2 +- protocols/FacebookRM/contacts.cpp | 18 +- protocols/FacebookRM/dialogs.cpp | 6 +- protocols/FacebookRM/messages.cpp | 6 +- protocols/FacebookRM/process.cpp | 4 +- protocols/FacebookRM/proto.cpp | 8 +- protocols/FacebookRM/theme.cpp | 4 +- protocols/GTalkExt/db.cpp | 2 +- protocols/GTalkExt/notifications.cpp | 2 +- protocols/Gadu-Gadu/core.c | 52 +- protocols/Gadu-Gadu/dialogs.c | 6 +- protocols/Gadu-Gadu/filetransfer.c | 22 +- protocols/Gadu-Gadu/groupchat.c | 24 +- protocols/Gadu-Gadu/import.c | 6 +- protocols/Gadu-Gadu/oauth.c | 12 +- protocols/Gadu-Gadu/ownerinfo.c | 4 +- protocols/Gadu-Gadu/services.c | 24 +- protocols/Gadu-Gadu/token.c | 2 +- protocols/Gadu-Gadu/userutils.c | 16 +- protocols/IRCG/MString.cpp | 2 +- protocols/IRCG/MString.h | 136 ++--- protocols/IRCG/commandmonitor.cpp | 12 +- protocols/IRCG/input.cpp | 4 +- protocols/IRCG/irclib.cpp | 30 +- protocols/IRCG/options.cpp | 16 +- protocols/IRCG/output.cpp | 2 +- protocols/IRCG/tools.cpp | 8 +- protocols/IRCG/userinfo.cpp | 2 +- protocols/IRCG/windows.cpp | 6 +- protocols/IcqOscarJ/chan_05ping.cpp | 2 +- protocols/IcqOscarJ/changeinfo/dlgproc.cpp | 4 +- protocols/IcqOscarJ/changeinfo/editstring.cpp | 20 +- protocols/IcqOscarJ/changeinfo/upload.cpp | 2 +- protocols/IcqOscarJ/i18n.cpp | 4 +- protocols/IcqOscarJ/icq_direct.cpp | 2 +- protocols/IcqOscarJ/icq_popups.cpp | 2 +- protocols/JabberG/MString.cpp | 2 +- protocols/JabberG/MString.h | 136 ++--- protocols/JabberG/jabber_adhoc.cpp | 2 +- protocols/JabberG/jabber_captcha.cpp | 8 +- protocols/JabberG/jabber_events.cpp | 2 +- protocols/JabberG/jabber_iq_handlers.cpp | 30 +- protocols/JabberG/jabber_iqid.cpp | 2 +- protocols/JabberG/jabber_iqid_muc.cpp | 2 +- protocols/JabberG/jabber_list.cpp | 4 +- protocols/JabberG/jabber_opt.cpp | 2 +- protocols/JabberG/jabber_privacy.cpp | 2 +- protocols/JabberG/jabber_proto.cpp | 6 +- protocols/JabberG/jabber_proxy.cpp | 16 +- protocols/JabberG/jabber_search.h | 4 +- protocols/JabberG/jabber_svc.cpp | 2 +- protocols/JabberG/jabber_thread.cpp | 2 +- protocols/JabberG/jabber_vcard.cpp | 4 +- protocols/JabberG/jabber_xstatus.cpp | 6 +- protocols/MRA/Mra.cpp | 2 +- protocols/MRA/MraAdvancedSearch.cpp | 2 +- protocols/MRA/MraAntiSpam.cpp | 4 +- protocols/MRA/MraAvatars.cpp | 2 +- protocols/MRA/MraFilesQueue.cpp | 4 +- protocols/MRA/MraFilesQueue_mod.cpp | 4 +- protocols/MRA/MraMRIMProxy.cpp | 2 +- protocols/MRA/MraPopUp.cpp | 2 +- protocols/MRA/MraSelectEMail.cpp | 2 +- protocols/MRA/Mra_functions.cpp | 10 +- protocols/MRA/Mra_options.cpp | 4 +- protocols/MRA/Mra_proto.cpp | 12 +- protocols/MRA/Sdk/Base64.h | 8 +- protocols/MSN/des.c | 18 +- protocols/MSN/msn_commands.cpp | 2 +- protocols/MSN/msn_threads.cpp | 2 +- protocols/Omegle/chat.cpp | 2 +- protocols/Omegle/dialogs.cpp | 2 +- protocols/Omegle/proto.cpp | 4 +- protocols/Omegle/theme.cpp | 4 +- protocols/Weather/weather.h | 2 + protocols/Weather/weather_conv.cpp | 2 +- protocols/Yahoo/avatar.cpp | 12 +- protocols/Yahoo/file_transfer.cpp | 6 +- protocols/Yahoo/im.cpp | 12 +- protocols/Yahoo/libyahoo2/libyahoo2.c | 228 ++++---- protocols/Yahoo/libyahoo2/yahoo_httplib.c | 32 +- protocols/Yahoo/libyahoo2/yahoo_list.c | 8 +- protocols/Yahoo/options.cpp | 2 +- protocols/Yahoo/proto.cpp | 14 +- protocols/Yahoo/services.cpp | 4 +- protocols/Yahoo/util.cpp | 4 +- protocols/Yahoo/yahoo.cpp | 10 +- src/core/miranda.cpp | 2 +- src/modules/database/dbini.cpp | 6 +- src/modules/findadd/findadd.cpp | 2 +- src/modules/xml/xmlParser.cpp | 10 +- 714 files changed, 5612 insertions(+), 5645 deletions(-) diff --git a/plugins/AVS/acc.cpp b/plugins/AVS/acc.cpp index f62009b43d..a804a09600 100644 --- a/plugins/AVS/acc.cpp +++ b/plugins/AVS/acc.cpp @@ -288,11 +288,11 @@ void AnimatedGifMountFrame(ACCData* data, int page) RGBQUAD *pal = fei->FI_GetPalette(dib); bool have_transparent = false; int transparent_color = -1; - if( fei->FI_IsTransparent(dib) ) { + if ( fei->FI_IsTransparent(dib) ) { int count = fei->FI_GetTransparencyCount(dib); BYTE *table = fei->FI_GetTransparencyTable(dib); - for( int i = 0; i < count; i++ ) { - if( table[i] == 0 ) { + for ( int i = 0; i < count; i++ ) { + if ( table[i] == 0 ) { have_transparent = true; transparent_color = i; break; @@ -301,11 +301,11 @@ void AnimatedGifMountFrame(ACCData* data, int page) } //copy page data into logical buffer, with full alpha opaqueness - for( int y = 0; y < data->ag.frame.height; y++ ) { + for ( int y = 0; y < data->ag.frame.height; y++ ) { RGBQUAD *scanline = (RGBQUAD *)fei->FI_GetScanLine(data->ag.dib, data->ag.logicalHeight - (y + data->ag.frame.top) - 1) + data->ag.frame.left; BYTE *pageline = fei->FI_GetScanLine(dib, data->ag.frame.height - y - 1); - for( int x = 0; x < data->ag.frame.width; x++ ) { - if( !have_transparent || *pageline != transparent_color ) { + for ( int x = 0; x < data->ag.frame.width; x++ ) { + if ( !have_transparent || *pageline != transparent_color ) { *scanline = pal[*pageline]; scanline->rgbReserved = 255; } diff --git a/plugins/AssocMgr/assoclist.c b/plugins/AssocMgr/assoclist.c index 206f2cdd6d..26a72a43da 100644 --- a/plugins/AssocMgr/assoclist.c +++ b/plugins/AssocMgr/assoclist.c @@ -95,7 +95,7 @@ void CleanupAssocEnabledSettings(void) for(i = 0;ipszClassName, pszRunCmd); mir_free(pszRunCmd); /* does NULL check */ /* file ext */ - if(!fIsUrl) + if (!fIsUrl) fSuccess = IsRegFileExt(assoc->pszFileExt, assoc->pszClassName); return fSuccess; @@ -312,10 +312,10 @@ static BOOL EnsureAssocRegistered(const ASSOCDATA *assoc) if(pszRunCmd!= NULL) { fSuccess = TRUE; /* tentatively */ /* do not overwrite user customized settings */ - if(!IsRegClass(assoc->pszClassName, pszRunCmd)) { + if (!IsRegClass(assoc->pszClassName, pszRunCmd)) { /* class icon */ - if(!assoc->nIconResID && fIsUrl) pszIconLoc = MakeIconLocation(NULL, 0); /* miranda logo */ - else if(!assoc->nIconResID) pszIconLoc = MakeIconLocation(hInst, IDI_MIRANDAFILE); /* generic file */ + if (!assoc->nIconResID && fIsUrl) pszIconLoc = MakeIconLocation(NULL, 0); /* miranda logo */ + else if (!assoc->nIconResID) pszIconLoc = MakeIconLocation(hInst, IDI_MIRANDAFILE); /* generic file */ else pszIconLoc = MakeIconLocation(assoc->hInstance, assoc->nIconResID); /* register class */ if(fUseMainCmdLine) pszDdeCmd = NULL; @@ -362,7 +362,7 @@ static BOOL UnregisterAssoc(const ASSOCDATA *assoc) mir_free(pszRunCmd); /* does NULL check */ /* file type */ - if(!fIsUrl) { + if (!fIsUrl) { /* file extension */ RemoveRegFileExt(assoc->pszFileExt, assoc->pszClassName); /* mime type */ @@ -473,7 +473,7 @@ static BOOL RemoveAssocItem_Worker(const char *pszClassName) mir_free(assoc->pszMimeType); /* does NULL check */ /* resize storage array */ - if((index+1)= 32) + if ((int)ShellExecute(NULL, NULL, pszParam, NULL, NULL, SW_SHOWNORMAL) >= 32) *res = 0; /* success */ return TRUE; } @@ -621,7 +621,7 @@ INT_PTR InvokeFileHandler(const TCHAR *pszFileName) /* class name */ pszClassName = MakeFileClassName(pszFileExt); if(pszClassName!= NULL) - if(!InvokeHandler_Worker(pszClassName, pszFileName, &res)) { + if (!InvokeHandler_Worker(pszClassName, pszFileName, &res)) { /* correct registry on error (no longer in list) */ RemoveRegFileExt(pszFileExt, pszClassName); RemoveRegClass(pszClassName); @@ -647,7 +647,7 @@ INT_PTR InvokeUrlHandler(const TCHAR *pszUrl) /* class name */ pszClassName = MakeUrlClassName(pszProtoPrefix); if(pszClassName!= NULL) - if(!InvokeHandler_Worker(pszClassName, pszUrl, &res)) + if (!InvokeHandler_Worker(pszClassName, pszUrl, &res)) /* correct registry on error (no longer in list) */ RemoveRegClass(pszClassName); mir_free(pszClassName); /* does NULL check */ @@ -662,9 +662,9 @@ INT_PTR InvokeUrlHandler(const TCHAR *pszUrl) static int CALLBACK ListViewSortDesc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { int cmp; - if(((ASSOCDATA*)lParam1)->pszFileExt!= NULL && ((ASSOCDATA*)lParam2)->pszFileExt!= NULL) + if (((ASSOCDATA*)lParam1)->pszFileExt!= NULL && ((ASSOCDATA*)lParam2)->pszFileExt!= NULL) cmp = CompareStringA((LCID)lParamSort, 0, ((ASSOCDATA*)lParam1)->pszFileExt, -1, ((ASSOCDATA*)lParam2)->pszFileExt, -1); - else if(((ASSOCDATA*)lParam1)->pszFileExt == ((ASSOCDATA*)lParam2)->pszFileExt) /* both NULL */ + else if (((ASSOCDATA*)lParam1)->pszFileExt == ((ASSOCDATA*)lParam2)->pszFileExt) /* both NULL */ cmp = CompareStringA((LCID)lParamSort, 0, ((ASSOCDATA*)lParam1)->pszClassName, -1, ((ASSOCDATA*)lParam2)->pszClassName, -1); else /* different types, incomparable */ cmp = (((ASSOCDATA*)lParam1)->pszFileExt == NULL)?CSTR_LESS_THAN:CSTR_GREATER_THAN; @@ -821,7 +821,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara HTHEME hTheme; hTheme = pfnGetWindowTheme((HWND)lParam); if(hTheme!= NULL) - if(!pfnGetThemeColor(hTheme, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, &clr)) { + if (!pfnGetThemeColor(hTheme, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, &clr)) { SetBkMode((HDC)wParam, TRANSPARENT); SetTextColor((HDC)wParam, clr); } @@ -877,7 +877,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, lvi.iItem, LVNI_ABOVE); if(lvi.iItem!= -1) if(ListView_GetItem(nmhdr->hwndFrom, &lvi)) - if((ASSOCDATA*)lvi.lParam == NULL) /* groups */ + if ((ASSOCDATA*)lvi.lParam == NULL) /* groups */ lvi.iItem = -1; if(lvi.iItem == -1) { SetWindowLong(hwndDlg, DWLP_MSGRESULT, TRUE); /* eat it */ @@ -893,7 +893,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara lvi.iItem-= ListView_GetCountPerPage(nmhdr->hwndFrom); if(lvi.iItem>= 0) if(ListView_GetItem(nmhdr->hwndFrom, &lvi)) - if((ASSOCDATA*)lvi.lParam == NULL) /* groups */ + if ((ASSOCDATA*)lvi.lParam == NULL) /* groups */ lvi.iItem = -1; if(lvi.iItem<0) { ListView_SetItemState(nmhdr->hwndFrom, 0, LVIS_SELECTED|LVIS_FOCUSED, LVIS_SELECTED|LVIS_FOCUSED); diff --git a/plugins/AssocMgr/dde.c b/plugins/AssocMgr/dde.c index 7be9f1fbcf..0804be855c 100644 --- a/plugins/AssocMgr/dde.c +++ b/plugins/AssocMgr/dde.c @@ -90,7 +90,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM { ATOM hSzApp,hSzTopic; hSzApp=LOWORD(lParam); /* no UnpackDDElParam() here */ hSzTopic=HIWORD(lParam); - if((hSzApp==GlobalFindAtom(DDEAPP) && hSzTopic==GlobalFindAtom(DDETOPIC)) || !hSzApp) { + if ((hSzApp==GlobalFindAtom(DDEAPP) && hSzTopic==GlobalFindAtom(DDETOPIC)) || !hSzApp) { hSzApp=GlobalAddAtom(DDEAPP); hSzTopic=GlobalAddAtom(DDETOPIC); if(hSzApp && hSzTopic) @@ -119,11 +119,11 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM if(pszArg!=NULL) { /* we are inside miranda here, we make it async so the shell does * not timeout regardless what the plugins try to do. */ - if(!lstrcmpi(pszAction,_T("file"))) + if (!lstrcmpi(pszAction,_T("file"))) ack.fAck=(short)(CallFunctionAsync(FileActionAsync,pszArg)!=0); - else if(!lstrcmpi(pszAction,_T("url"))) + else if (!lstrcmpi(pszAction,_T("url"))) ack.fAck=(short)(CallFunctionAsync(UrlActionAsync,pszArg)!=0); - if(!ack.fAck) mir_free(pszArg); /* otherwise freed by asyncproc */ + if (!ack.fAck) mir_free(pszArg); /* otherwise freed by asyncproc */ } GlobalUnlock(hCommand); } @@ -131,7 +131,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM } #endif lParam=ReuseDDElParam(lParam,msg,WM_DDE_ACK,*(PUINT)&ack,(UINT)hCommand); - if(!PostMessage((HWND)wParam,WM_DDE_ACK,(WPARAM)hwnd,lParam)) { + if (!PostMessage((HWND)wParam,WM_DDE_ACK,(WPARAM)hwnd,lParam)) { GlobalFree(hCommand); FreeDDElParam(WM_DDE_ACK,lParam); } @@ -151,7 +151,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM ZeroMemory(&ack,sizeof(ack)); if(UnpackDDElParam(msg,lParam,NULL,(PUINT)&hSzItem)) { lParam=ReuseDDElParam(lParam,msg,WM_DDE_ACK,*(PUINT)&ack,(UINT)hSzItem); - if(!PostMessage((HWND)wParam,WM_DDE_ACK,(WPARAM)hwnd,lParam)) { + if (!PostMessage((HWND)wParam,WM_DDE_ACK,(WPARAM)hwnd,lParam)) { if(hSzItem) GlobalDeleteAtom(hSzItem); FreeDDElParam(WM_DDE_ACK,lParam); } @@ -170,7 +170,7 @@ static HANDLE StartupMainProcess(TCHAR *pszDatabasePath) STARTUPINFO si; /* we are inside RunDll32 here */ - if(!GetModuleFileName(hInst,szPath,SIZEOF(szPath))) return NULL; + if (!GetModuleFileName(hInst,szPath,SIZEOF(szPath))) return NULL; p=_tcsrchr(szPath,_T('\\')); if(p!=NULL) { *p=0; p=_tcsrchr(szPath,_T('\\')); } if(p==NULL) return NULL; @@ -178,7 +178,7 @@ static HANDLE StartupMainProcess(TCHAR *pszDatabasePath) /* inherit startup data from RunDll32 process */ GetStartupInfo(&si); - if(!CreateProcess(szPath,pszDatabasePath,NULL,NULL,TRUE,GetPriorityClass(GetCurrentProcess()),NULL,NULL,&si,&pi)) + if (!CreateProcess(szPath,pszDatabasePath,NULL,NULL,TRUE,GetPriorityClass(GetCurrentProcess()),NULL,NULL,&si,&pi)) return NULL; CloseHandle(pi.hThread); return pi.hProcess; diff --git a/plugins/AssocMgr/main.c b/plugins/AssocMgr/main.c index 60d6a8b5a0..55c93fa40d 100644 --- a/plugins/AssocMgr/main.c +++ b/plugins/AssocMgr/main.c @@ -72,7 +72,7 @@ static void InstallFile(const TCHAR *pszFileName,const TCHAR *pszDestSubDir) TCHAR szFileFrom[MAX_PATH+1],szFileTo[MAX_PATH+1],*p; HANDLE hFile; - if(!GetModuleFileName(hInst,szFileFrom,SIZEOF(szFileFrom)-lstrlen(pszFileName))) + if (!GetModuleFileName(hInst,szFileFrom,SIZEOF(szFileFrom)-lstrlen(pszFileName))) return; p=_tcsrchr(szFileFrom,_T('\\')); if(p!=NULL) *(++p)=0; @@ -82,7 +82,7 @@ static void InstallFile(const TCHAR *pszFileName,const TCHAR *pszDestSubDir) if(hFile==INVALID_HANDLE_VALUE) return; CloseHandle(hFile); - if(!GetModuleFileNameWorkaround(NULL,szFileTo,SIZEOF(szFileTo)-lstrlen(pszDestSubDir)-lstrlen(pszFileName))) + if (!GetModuleFileNameWorkaround(NULL,szFileTo,SIZEOF(szFileTo)-lstrlen(pszDestSubDir)-lstrlen(pszFileName))) return; p=_tcsrchr(szFileTo,_T('\\')); if(p!=NULL) *(++p)=0; @@ -90,7 +90,7 @@ static void InstallFile(const TCHAR *pszFileName,const TCHAR *pszDestSubDir) CreateDirectory(szFileTo,NULL); lstrcat(szFileTo,pszFileName); /* buffer safe */ - if(!MoveFile(szFileFrom,szFileTo) && GetLastError()==ERROR_ALREADY_EXISTS) { + if (!MoveFile(szFileFrom,szFileTo) && GetLastError()==ERROR_ALREADY_EXISTS) { DeleteFile(szFileTo); MoveFile(szFileFrom,szFileTo); } @@ -147,7 +147,7 @@ __declspec(dllexport) int Load(PLUGINLINK *link) return 1; } - if(!ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) return 1; /* dbx3x v0.5.1.0 */ + if (!ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) return 1; /* dbx3x v0.5.1.0 */ if(mir_getMMI(&mmi)) return 1; if(mir_getUTFI(&utfi)) return 1; InitAssocList(); diff --git a/plugins/AssocMgr/reg.c b/plugins/AssocMgr/reg.c index a4fadd2ef4..09b58a1462 100644 --- a/plugins/AssocMgr/reg.c +++ b/plugins/AssocMgr/reg.c @@ -128,10 +128,10 @@ TCHAR *MakeRunCommand(BOOL fMirExe,BOOL fFixedDbProfile) TCHAR szExe[MAX_PATH],*pszFmt,*pszRunCmd=NULL; char szDbFile[MAX_PATH]; int cch; - if(!fFixedDbProfile || !CallService(MS_DB_GETPROFILENAME,SIZEOF(szDbFile),(LPARAM)szDbFile)) + if (!fFixedDbProfile || !CallService(MS_DB_GETPROFILENAME,SIZEOF(szDbFile),(LPARAM)szDbFile)) if(GetModuleFileNameWorkaround(fMirExe?NULL:hInst,szExe,SIZEOF(szExe))) { /* db file */ - if(!fFixedDbProfile) + if (!fFixedDbProfile) lstrcpyA(szDbFile,"%1"); /* buffer safe */ /* size */ cch=lstrlen(szExe)+lstrlenA(szDbFile); @@ -171,7 +171,7 @@ static BOOL IsValidRunCommand(const TCHAR *pszRunCmd) pargs=_tcschr(&buf[1],_T('\"')); if(pargs!=NULL) *(pargs++)=0; pexe=&buf[1]; - if(*pargs==_T(' ')) ++pargs; + if (*pargs==_T(' ')) ++pargs; } else { pargs=_tcschr(buf,_T(' ')); if(pargs!=NULL) *pargs=0; @@ -179,7 +179,7 @@ static BOOL IsValidRunCommand(const TCHAR *pszRunCmd) } if(SearchPath(NULL,pexe,_T(".exe"),SIZEOF(szFullExe),szFullExe,&pszFilePart)) { if(pszFilePart!=NULL) - if(!lstrcmpi(pszFilePart,_T("rundll32.exe")) || !lstrcmpi(pszFilePart,_T("rundll.exe"))) { + if (!lstrcmpi(pszFilePart,_T("rundll32.exe")) || !lstrcmpi(pszFilePart,_T("rundll.exe"))) { /* split into dll path and arguments */ if(pargs[0]==_T('\"')) { ++pargs; @@ -201,7 +201,7 @@ TCHAR *MakeIconLocation(HMODULE hModule,WORD nIconResID) { TCHAR szModule[MAX_PATH],*pszIconLoc=NULL; int cch; - if((cch=GetModuleFileNameWorkaround(hModule,szModule,SIZEOF(szModule)))!=0) { + if ((cch=GetModuleFileNameWorkaround(hModule,szModule,SIZEOF(szModule)))!=0) { pszIconLoc=(TCHAR*)mir_alloc((cch+=8)*sizeof(TCHAR)); if(pszIconLoc!=NULL) wsprintf(pszIconLoc,_T("%s,%i"),szModule,-(int)nIconResID); /* id may be 0, buffer safe */ @@ -231,13 +231,13 @@ static LONG DeleteRegSubTree(HKEY hKey,const TCHAR *pszSubKey) DWORD nMaxSubKeyLen,cchSubKey; TCHAR *pszSubKeyBuf; HKEY hSubKey; - if((res=RegOpenKeyEx(hKey,pszSubKey,0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS|DELETE,&hSubKey))==ERROR_SUCCESS) { - if((res=RegQueryInfoKey(hSubKey,NULL,NULL,NULL,NULL,&nMaxSubKeyLen,NULL,NULL,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { + if ((res=RegOpenKeyEx(hKey,pszSubKey,0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS|DELETE,&hSubKey))==ERROR_SUCCESS) { + if ((res=RegQueryInfoKey(hSubKey,NULL,NULL,NULL,NULL,&nMaxSubKeyLen,NULL,NULL,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { pszSubKeyBuf=(TCHAR*)mir_alloc((nMaxSubKeyLen+1)*sizeof(TCHAR)); if(pszSubKeyBuf==NULL) res=ERROR_NOT_ENOUGH_MEMORY; while(!res) { cchSubKey=nMaxSubKeyLen+1; - if((res=RegEnumKeyEx(hSubKey,0,pszSubKeyBuf,&cchSubKey,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) + if ((res=RegEnumKeyEx(hSubKey,0,pszSubKeyBuf,&cchSubKey,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) res=DeleteRegSubTree(hSubKey,pszSubKeyBuf); /* recursion */ } mir_free(pszSubKeyBuf); /* does NULL check */ @@ -245,7 +245,7 @@ static LONG DeleteRegSubTree(HKEY hKey,const TCHAR *pszSubKey) } RegCloseKey(hSubKey); } - if(!res) res=RegDeleteKey(hKey,pszSubKey); + if (!res) res=RegDeleteKey(hKey,pszSubKey); return res; } @@ -255,7 +255,7 @@ static LONG SetRegSubKeyStrDefValue(HKEY hMainKey,const TCHAR *pszSubKey,const T HKEY hSubKey; LONG res; res=RegCreateKeyEx(hMainKey,pszSubKey,0,NULL,0,KEY_SET_VALUE|KEY_QUERY_VALUE,NULL,&hSubKey,NULL); - if(!res) { + if (!res) { res=RegSetValueEx(hSubKey,NULL,0,REG_SZ,(BYTE*)pszVal,(lstrlen(pszVal)+1)*sizeof(TCHAR)); RegCloseKey(hSubKey); } @@ -282,11 +282,11 @@ static TCHAR *GetRegStrValue(HKEY hKey,const TCHAR *pszValName) TCHAR *pszVal,*pszVal2; DWORD dwSize,dwType; /* get size */ - if(!RegQueryValueEx(hKey,pszValName,NULL,NULL,NULL,&dwSize) && dwSize>sizeof(TCHAR)) { + if (!RegQueryValueEx(hKey,pszValName,NULL,NULL,NULL,&dwSize) && dwSize>sizeof(TCHAR)) { pszVal=(TCHAR*)mir_alloc(dwSize+sizeof(TCHAR)); if(pszVal!=NULL) { /* get value */ - if(!RegQueryValueEx(hKey,pszValName,NULL,&dwType,(BYTE*)pszVal,&dwSize)) { + if (!RegQueryValueEx(hKey,pszValName,NULL,&dwType,(BYTE*)pszVal,&dwSize)) { pszVal[dwSize/sizeof(TCHAR)]=0; if(dwType==REG_EXPAND_SZ) { dwSize=MAX_PATH; @@ -363,7 +363,7 @@ static BOOL ReadDbBackupData(const char *pszSetting,DWORD *pdwType,BYTE **ppData dbcgs.szModule="AssocMgr"; dbcgs.szSetting=pszSetting; dbcgs.pValue=&dbv; - if(!CallService(MS_DB_CONTACT_GETSETTING,0,(LPARAM)&dbcgs)) { + if (!CallService(MS_DB_CONTACT_GETSETTING,0,(LPARAM)&dbcgs)) { if(dbv.type==DBVT_BLOB && dbv.cpbVal>=sizeof(DWORD)) { *pdwType=*(DWORD*)dbv.pbVal; *ppData=dbv.pbVal; @@ -391,8 +391,8 @@ static void BackupRegTree_Worker(HKEY hKey,const char *pszSubKey,struct BackupRe char *pszName; register TCHAR *ptszName; DWORD nDbPrefixLen; - if((res=RegOpenKeyExA(hKey,pszSubKey,0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,&hKey))==ERROR_SUCCESS) { - if((res=RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,&nMaxSubKeyLen,NULL,NULL,&nMaxValNameLen,&nMaxValSize,NULL,NULL))==ERROR_SUCCESS) { + if ((res=RegOpenKeyExA(hKey,pszSubKey,0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,&hKey))==ERROR_SUCCESS) { + if ((res=RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,&nMaxSubKeyLen,NULL,NULL,&nMaxValNameLen,&nMaxValSize,NULL,NULL))==ERROR_SUCCESS) { if(nMaxSubKeyLen>nMaxValNameLen) nMaxValNameLen=nMaxSubKeyLen; /* prepare buffer */ nDbPrefixLen=(DWORD)lstrlenA(*param->ppszDbPrefix)+lstrlenA(pszSubKey)+1; @@ -413,16 +413,16 @@ static void BackupRegTree_Worker(HKEY hKey,const char *pszSubKey,struct BackupRe while(!res) { cchName=nMaxValNameLen+1; cbData=nMaxValSize; - if((res=RegEnumValueA(hKey,index++,pszName,&cchName,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { + if ((res=RegEnumValueA(hKey,index++,pszName,&cchName,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { (*param->ppszDbPrefix)[nDbPrefixLen]=0; lstrcatA(*param->ppszDbPrefix,pszName); /* buffer safe */ ptszName=a2t(pszName); if(ptszName!=NULL) { - if(!RegQueryValueEx(hKey,ptszName,NULL,&dwType,pData,&cbData)) { + if (!RegQueryValueEx(hKey,ptszName,NULL,&dwType,pData,&cbData)) { #ifdef _UNICODE WriteDbBackupData(*param->ppszDbPrefix,dwType,pData,cbData); #else - if(!(dwType®F_ANSI)) /* sanity check, never happens */ + if (!(dwType®F_ANSI)) /* sanity check, never happens */ WriteDbBackupData(*param->ppszDbPrefix,dwType®F_ANSI,pData,cbData); #endif } @@ -439,7 +439,7 @@ static void BackupRegTree_Worker(HKEY hKey,const char *pszSubKey,struct BackupRe index=0; while(!res) { cchName=nMaxSubKeyLen+1; - if((res=RegEnumKeyExA(hKey,index++,pszName,&cchName,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { + if ((res=RegEnumKeyExA(hKey,index++,pszName,&cchName,NULL,NULL,NULL,NULL))==ERROR_SUCCESS) { (*param->ppszDbPrefix)[nDbPrefixLen]=0; BackupRegTree_Worker(hKey,pszName,param); /* recursion */ } @@ -498,13 +498,13 @@ static LONG RestoreRegTree(HKEY hKey,const char *pszSubKey,const char *pszDbPref *(pslash++)=0; hSubKey=hKey; if(pslash!=pkeys+1) - if((res=RegCreateKeyExA(hKey,pkeys,0,NULL,0,KEY_SET_VALUE,NULL,&hSubKey,NULL))!=ERROR_SUCCESS) + if ((res=RegCreateKeyExA(hKey,pkeys,0,NULL,0,KEY_SET_VALUE,NULL,&hSubKey,NULL))!=ERROR_SUCCESS) break; pszValName=pslash; /* read data */ if(ReadDbBackupData(ppszSettings[i],&dwType,&pData,&cbData)) { /* set value */ - if(!(dwType®F_ANSI)) { + if (!(dwType®F_ANSI)) { pwszValName=a2u(pszValName,FALSE); if(pwszValName!=NULL) res=RegSetValueExW(hSubKey,pwszValName,0,dwType,pData,cbData); else res=ERROR_NOT_ENOUGH_MEMORY; @@ -568,7 +568,7 @@ void CleanupRegTreeBackupSettings(void) --j; /* reiterate current index */ } /* no longer registered? */ - if(!IsRegisteredAssocItem(pszClassName)) { + if (!IsRegisteredAssocItem(pszClassName)) { if(IsFileClassName(pszClassName,&pszFileExt)) RemoveRegFileExt(pszFileExt,pszClassName); else RemoveRegClass(pszClassName); @@ -596,7 +596,7 @@ static BOOL Opera6_GetIniFilePath(TCHAR *szIniFile) /* Info: http://opera-info.de/forum/thread.php?threadid=2905 */ /* app path */ - if(!RegOpenKeyExA(HKEY_LOCAL_MACHINE,"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Netscape.exe",0,KEY_QUERY_VALUE,&hExeKey)) { + if (!RegOpenKeyExA(HKEY_LOCAL_MACHINE,"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Netscape.exe",0,KEY_QUERY_VALUE,&hExeKey)) { /* exe name */ p=GetRegStrValue(hExeKey,NULL); if(p!=NULL && _tcsstr(p,_T("Opera.exe"))!=NULL) { @@ -690,11 +690,11 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const return FALSE; } /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_CREATE_SUB_KEY,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_CREATE_SUB_KEY,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* might be write protected by security settings */ /* class */ - if((res=RegCreateKeyExA(hRootKey,pszClassName,0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE|KEY_QUERY_VALUE,NULL,&hClassKey,NULL))==ERROR_SUCCESS) { + if ((res=RegCreateKeyExA(hRootKey,pszClassName,0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE|KEY_QUERY_VALUE,NULL,&hClassKey,NULL))==ERROR_SUCCESS) { /* backup class if shared */ if(fUrlProto) BackupRegTree(hRootKey,pszClassName,"bak_"); /* type description */ @@ -703,7 +703,7 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const /* default icon */ if(pszIconLoc!=NULL) SetRegSubKeyStrDefValue(hClassKey,_T("DefaultIcon"),pszIconLoc); /* url protocol */ - if(!fUrlProto) RegDeleteValue(hClassKey,_T("URL Protocol")); + if (!fUrlProto) RegDeleteValue(hClassKey,_T("URL Protocol")); else RegSetValueEx(hClassKey,_T("URL Protocol"),0,REG_SZ,NULL,0); /* moniker clsid */ RegDeleteKey(hClassKey,_T("CLSID")); @@ -711,7 +711,7 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const { DWORD dwFlags=0,dwSize=sizeof(dwFlags); RegQueryValueEx(hClassKey,_T("EditFlags"),NULL,NULL,(BYTE*)&dwFlags,&dwSize); if(fBrowserAutoOpen) dwFlags=(dwFlags&~FTA_AlwaysUnsafe)|FTA_OpenIsSafe; - if(!fUrlProto) dwFlags|=FTA_HasExtension; + if (!fUrlProto) dwFlags|=FTA_HasExtension; else dwFlags=(dwFlags&~FTA_HasExtension)|FTA_Show; /* show classes without extension */ RegSetValueEx(hClassKey,_T("EditFlags"),0,REG_DWORD,(BYTE*)&dwFlags,sizeof(dwFlags)); } @@ -720,11 +720,11 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const RegSetValueExA(hClassKey,"NeverShowExt",0,REG_SZ,NULL,0); } /* shell */ - if((res=RegCreateKeyEx(hClassKey,_T("shell"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hShellKey,NULL))==ERROR_SUCCESS) { + if ((res=RegCreateKeyEx(hClassKey,_T("shell"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hShellKey,NULL))==ERROR_SUCCESS) { /* default verb (when empty "open" is used) */ RegSetValueEx(hShellKey,NULL,0,REG_SZ,(BYTE*)_T("open"),5*sizeof(TCHAR)); /* verb */ - if((res=RegCreateKeyEx(hShellKey,_T("open"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE,NULL,&hVerbKey,NULL))==ERROR_SUCCESS) { + if ((res=RegCreateKeyEx(hShellKey,_T("open"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE,NULL,&hVerbKey,NULL))==ERROR_SUCCESS) { /* verb description */ if(pszVerbDesc==NULL) RegDeleteValue(hVerbKey,NULL); else RegSetValueEx(hVerbKey,NULL,0,REG_SZ,(BYTE*)pszVerbDesc,(lstrlen(pszVerbDesc)+1)*sizeof(TCHAR)); @@ -734,7 +734,7 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const SetRegSubKeyStrDefValue(hVerbKey,_T("command"),pszRunCmd); /* ddeexec */ if(pszDdeCmd!=NULL) { - if(!RegCreateKeyEx(hVerbKey,_T("ddeexec"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE,NULL,&hDdeKey,NULL)) { + if (!RegCreateKeyEx(hVerbKey,_T("ddeexec"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY|DELETE,NULL,&hDdeKey,NULL)) { /* command */ RegSetValueEx(hDdeKey,NULL,0,REG_SZ,(BYTE*)pszDdeCmd,(lstrlen(pszDdeCmd)+1)*sizeof(TCHAR)); /* application */ @@ -746,7 +746,7 @@ BOOL AddRegClass(const char *pszClassName,const TCHAR *pszTypeDescription,const RegCloseKey(hDdeKey); } } else { - if(!RegOpenKeyEx(hVerbKey,_T("ddeexec"),0,DELETE,&hDdeKey)) { + if (!RegOpenKeyEx(hVerbKey,_T("ddeexec"),0,DELETE,&hDdeKey)) { /* application */ RegDeleteKey(hDdeKey,_T("application")); /* topic */ @@ -782,7 +782,7 @@ BOOL RemoveRegClass(const char *pszClassName) TCHAR *ptszClassName,*ptszPrevRunCmd; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,DELETE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,DELETE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* class name */ @@ -793,14 +793,14 @@ BOOL RemoveRegClass(const char *pszClassName) mir_free(ptszClassName); /* does NULL check */ /* backup only saved/restored for fUrlProto */ - if(!res) { - if((res=RestoreRegTree(hRootKey,pszClassName,"bak_"))==ERROR_SUCCESS) + if (!res) { + if ((res=RestoreRegTree(hRootKey,pszClassName,"bak_"))==ERROR_SUCCESS) /* class */ - if(!RegOpenKeyExA(hRootKey,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { + if (!RegOpenKeyExA(hRootKey,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { /* shell */ - if(!RegOpenKeyEx(hClassKey,_T("shell"),0,KEY_QUERY_VALUE,&hShellKey)) { + if (!RegOpenKeyEx(hClassKey,_T("shell"),0,KEY_QUERY_VALUE,&hShellKey)) { /* verb */ - if(!RegOpenKeyEx(hShellKey,_T("open"),0,KEY_QUERY_VALUE,&hVerbKey)) { + if (!RegOpenKeyEx(hShellKey,_T("open"),0,KEY_QUERY_VALUE,&hVerbKey)) { /* command */ ptszPrevRunCmd=GetRegStrValue(hVerbKey,_T("command")); if(ptszPrevRunCmd!=NULL && !IsValidRunCommand(ptszPrevRunCmd)) @@ -836,13 +836,13 @@ BOOL IsRegClass(const char *pszClassName,const TCHAR *pszRunCmd) /* using the merged view classes key for reading */ /* class */ - if(!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { + if (!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { /* shell */ - if(!RegOpenKeyEx(hClassKey,_T("shell"),0,KEY_QUERY_VALUE,&hShellKey)) { + if (!RegOpenKeyEx(hClassKey,_T("shell"),0,KEY_QUERY_VALUE,&hShellKey)) { /* verb */ - if(!RegOpenKeyEx(hShellKey,_T("open"),0,KEY_QUERY_VALUE,&hVerbKey)) { + if (!RegOpenKeyEx(hShellKey,_T("open"),0,KEY_QUERY_VALUE,&hVerbKey)) { /* command */ - if(!RegOpenKeyEx(hVerbKey,_T("command"),0,KEY_QUERY_VALUE,&hCmdKey)) { + if (!RegOpenKeyEx(hVerbKey,_T("command"),0,KEY_QUERY_VALUE,&hCmdKey)) { /* it is enough to check if the command is right */ fSuccess=IsRegStrValue(hCmdKey,NULL,pszRunCmd); RegCloseKey(hCmdKey); @@ -870,9 +870,9 @@ HICON LoadRegClassSmallIcon(const char *pszClassName) /* using the merged view classes key for reading */ /* class */ - if(!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { + if (!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszClassName,0,KEY_QUERY_VALUE,&hClassKey)) { /* default icon */ - if(!RegOpenKeyEx(hClassKey,_T("DefaultIcon"),0,KEY_QUERY_VALUE,&hIconKey)) { + if (!RegOpenKeyEx(hClassKey,_T("DefaultIcon"),0,KEY_QUERY_VALUE,&hIconKey)) { /* extract icon */ pszIconLoc=GetRegStrValue(hIconKey,NULL); if(pszIconLoc!=NULL) { @@ -912,11 +912,11 @@ BOOL AddRegFileExt(const char *pszFileExt,const char *pszClassName,const char *p return FALSE; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_CREATE_SUB_KEY,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_CREATE_SUB_KEY,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* file ext */ - if(!RegCreateKeyExA(hRootKey,pszFileExt,0,NULL,0,KEY_SET_VALUE|KEY_QUERY_VALUE|KEY_CREATE_SUB_KEY,NULL,&hExtKey,NULL)) { + if (!RegCreateKeyExA(hRootKey,pszFileExt,0,NULL,0,KEY_SET_VALUE|KEY_QUERY_VALUE|KEY_CREATE_SUB_KEY,NULL,&hExtKey,NULL)) { TCHAR *pszPrevClass; /* backup previous app */ BackupRegTree(hRootKey,pszFileExt,"bak_"); @@ -925,7 +925,7 @@ BOOL AddRegFileExt(const char *pszFileExt,const char *pszClassName,const char *p /* open with progids */ pszPrevClass=GetRegStrValue(hExtKey,NULL); if(pszPrevClass!=NULL && !IsRegStrValueA(hExtKey,NULL,pszClassName)) - if(!RegCreateKeyEx(hExtKey,_T("OpenWithProgids"),0,NULL,0,KEY_SET_VALUE,NULL,&hOpenWithKey,NULL)) { + if (!RegCreateKeyEx(hExtKey,_T("OpenWithProgids"),0,NULL,0,KEY_SET_VALUE,NULL,&hOpenWithKey,NULL)) { /* previous class (backup) */ RegSetValueEx(hOpenWithKey,pszPrevClass,0,REG_NONE,NULL,0); RegCloseKey(hOpenWithKey); @@ -953,18 +953,18 @@ void RemoveRegFileExt(const char *pszFileExt,const char *pszClassName) BOOL fRestored=FALSE; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,DELETE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,DELETE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* file ext */ - if(!RegOpenKeyExA(hRootKey,pszFileExt,0,KEY_QUERY_VALUE|KEY_SET_VALUE|DELETE,&hExtKey)) { + if (!RegOpenKeyExA(hRootKey,pszFileExt,0,KEY_QUERY_VALUE|KEY_SET_VALUE|DELETE,&hExtKey)) { /* class name (the important part) */ - if(!RestoreRegTree(hRootKey,pszFileExt,"bak_")) { + if (!RestoreRegTree(hRootKey,pszFileExt,"bak_")) { pszPrevClassName=GetRegStrValue(hExtKey,NULL); if(pszPrevClassName!=NULL) { /* previous class name still exists? */ /* using the merged view classes key for reading */ - if(!RegOpenKeyEx(HKEY_CLASSES_ROOT,pszPrevClassName,0,KEY_QUERY_VALUE,&hSubKey)) { + if (!RegOpenKeyEx(HKEY_CLASSES_ROOT,pszPrevClassName,0,KEY_QUERY_VALUE,&hSubKey)) { fRestored=TRUE; RegCloseKey(hSubKey); } else RegDeleteValue(hExtKey,NULL); @@ -974,16 +974,16 @@ void RemoveRegFileExt(const char *pszFileExt,const char *pszClassName) if(pszPrevClassName==NULL) RegDeleteValue(hExtKey,NULL); /* open with progids (remove if empty) */ nOpenWithCount=0; - if(!RegOpenKeyEx(hExtKey,_T("OpenWithProgids"),0,KEY_SET_VALUE|KEY_QUERY_VALUE,&hSubKey)) { + if (!RegOpenKeyEx(hExtKey,_T("OpenWithProgids"),0,KEY_SET_VALUE|KEY_QUERY_VALUE,&hSubKey)) { /* remove current class (if set by another app) */ RegDeleteValueA(hSubKey,pszClassName); RegQueryInfoKey(hSubKey,NULL,NULL,NULL,NULL,NULL,NULL,NULL,&nOpenWithCount,NULL,NULL,NULL); RegCloseKey(hSubKey); } - if(!nOpenWithCount) RegDeleteKey(hExtKey,_T("OpenWithProgids")); /* delete if no values */ + if (!nOpenWithCount) RegDeleteKey(hExtKey,_T("OpenWithProgids")); /* delete if no values */ RegCloseKey(hExtKey); } else DeleteRegTreeBackup(pszFileExt,"bak_"); - if(!fRestored) RegDeleteKeyA(hRootKey,pszFileExt); /* try to remove it all */ + if (!fRestored) RegDeleteKeyA(hRootKey,pszFileExt); /* try to remove it all */ if(hRootKey!=HKEY_CLASSES_ROOT) RegCloseKey(hRootKey); @@ -1002,7 +1002,7 @@ BOOL IsRegFileExt(const char *pszFileExt,const char *pszClassName) /* using the merged view classes key for reading */ /* file ext */ - if(!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszFileExt,0,KEY_QUERY_VALUE,&hExtKey)) { + if (!RegOpenKeyExA(HKEY_CLASSES_ROOT,pszFileExt,0,KEY_QUERY_VALUE,&hExtKey)) { /* class name */ /* it is enough to check if the class is right */ fSuccess=IsRegStrValueA(hExtKey,NULL,pszClassName); @@ -1029,13 +1029,13 @@ BOOL AddRegMimeType(const char *pszMimeType,const char *pszFileExt,const TCHAR * return FALSE; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* database */ - if(!RegOpenKeyEx(hRootKey,_T("MIME\\Database\\Content Type"),0,KEY_CREATE_SUB_KEY,&hDbKey)) { + if (!RegOpenKeyEx(hRootKey,_T("MIME\\Database\\Content Type"),0,KEY_CREATE_SUB_KEY,&hDbKey)) { /* mime type */ - if(!RegCreateKeyExA(hDbKey,pszMimeType,0,NULL,0,KEY_QUERY_VALUE|KEY_SET_VALUE,NULL,&hTypeKey,NULL)) { + if (!RegCreateKeyExA(hDbKey,pszMimeType,0,NULL,0,KEY_QUERY_VALUE|KEY_SET_VALUE,NULL,&hTypeKey,NULL)) { /* file ext */ if(RegQueryValueExA(hTypeKey,"Extension",NULL,NULL,NULL,NULL)) /* only set if not present */ fSuccess=!RegSetValueExA(hTypeKey,"Extension",0,REG_SZ,(BYTE*)pszFileExt,lstrlenA(pszFileExt)+1); @@ -1057,13 +1057,13 @@ void RemoveRegMimeType(const char *pszMimeType,const char *pszFileExt) BOOL fDelete=TRUE; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* database */ - if(!RegOpenKeyEx(hRootKey,_T("MIME\\Database\\Content Type"),0,DELETE,&hDbKey)) { + if (!RegOpenKeyEx(hRootKey,_T("MIME\\Database\\Content Type"),0,DELETE,&hDbKey)) { /* mime type */ - if(!RegOpenKeyExA(hDbKey,pszMimeType,0,KEY_QUERY_VALUE,&hTypeKey)) { + if (!RegOpenKeyExA(hDbKey,pszMimeType,0,KEY_QUERY_VALUE,&hTypeKey)) { /* file ext */ fDelete=IsRegStrValueA(hTypeKey,_T("Extension"),pszFileExt); RegCloseKey(hTypeKey); @@ -1088,13 +1088,13 @@ void AddRegOpenWith(const TCHAR *pszAppFileName,BOOL fAllowOpenWith,const TCHAR HKEY hRootKey,hAppsKey,hExeKey,hShellKey,hVerbKey,hDdeKey; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* database */ - if(!RegCreateKeyEx(hRootKey,_T("Applications"),0,NULL,0,KEY_CREATE_SUB_KEY,NULL,&hAppsKey,NULL)) { + if (!RegCreateKeyEx(hRootKey,_T("Applications"),0,NULL,0,KEY_CREATE_SUB_KEY,NULL,&hAppsKey,NULL)) { /* filename */ - if(!RegCreateKeyEx(hAppsKey,pszAppFileName,0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hExeKey,NULL)) { + if (!RegCreateKeyEx(hAppsKey,pszAppFileName,0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hExeKey,NULL)) { /* appname */ RegSetValueEx(hExeKey,NULL,0,REG_SZ,(BYTE*)pszAppName,(lstrlen(pszAppName)+1)*sizeof(TCHAR)); /* no open-with flag */ @@ -1103,18 +1103,18 @@ void AddRegOpenWith(const TCHAR *pszAppFileName,BOOL fAllowOpenWith,const TCHAR /* default icon */ if(pszIconLoc!=NULL) SetRegSubKeyStrDefValue(hExeKey,_T("DefaultIcon"),pszIconLoc); /* shell */ - if(!RegCreateKeyEx(hExeKey,_T("shell"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hShellKey,NULL)) { + if (!RegCreateKeyEx(hExeKey,_T("shell"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hShellKey,NULL)) { /* default verb (when empty "open" is used) */ RegSetValueEx(hShellKey,NULL,0,REG_SZ,(BYTE*)_T("open"),5*sizeof(TCHAR)); /* verb */ - if(!RegCreateKeyEx(hShellKey,_T("open"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hVerbKey,NULL)) { + if (!RegCreateKeyEx(hShellKey,_T("open"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hVerbKey,NULL)) { /* friendly appname (mui string) */ RegSetValueEx(hVerbKey,_T("FriendlyAppName"),0,REG_SZ,(BYTE*)pszAppName,(lstrlen(pszAppName)+1)*sizeof(TCHAR)); /* command */ SetRegSubKeyStrDefValue(hVerbKey,_T("command"),pszRunCmd); /* ddeexec */ if(pszDdeCmd!=NULL) - if(!RegCreateKeyEx(hVerbKey,_T("ddeexec"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hDdeKey,NULL)) { + if (!RegCreateKeyEx(hVerbKey,_T("ddeexec"),0,NULL,0,KEY_SET_VALUE|KEY_CREATE_SUB_KEY,NULL,&hDdeKey,NULL)) { /* command */ RegSetValueEx(hDdeKey,NULL,0,REG_SZ,(BYTE*)pszDdeCmd,(lstrlen(pszDdeCmd)+1)*sizeof(TCHAR)); /* application */ @@ -1141,23 +1141,23 @@ void RemoveRegOpenWith(const TCHAR *pszAppFileName) HKEY hRootKey,hAppsKey,hExeKey,hShellKey,hVerbKey,hDdeKey; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* applications */ - if(!RegOpenKeyEx(hRootKey,_T("Applications"),0,DELETE,&hAppsKey)) { + if (!RegOpenKeyEx(hRootKey,_T("Applications"),0,DELETE,&hAppsKey)) { /* filename */ - if(!RegOpenKeyEx(hAppsKey,pszAppFileName,0,DELETE,&hExeKey)) { + if (!RegOpenKeyEx(hAppsKey,pszAppFileName,0,DELETE,&hExeKey)) { /* default icon */ RegDeleteKey(hExeKey,_T("DefaultIcon")); /* shell */ - if(!RegOpenKeyEx(hExeKey,_T("shell"),0,DELETE,&hShellKey)) { + if (!RegOpenKeyEx(hExeKey,_T("shell"),0,DELETE,&hShellKey)) { /* verb */ - if(!RegOpenKeyEx(hShellKey,_T("open"),0,DELETE,&hVerbKey)) { + if (!RegOpenKeyEx(hShellKey,_T("open"),0,DELETE,&hVerbKey)) { /* command */ RegDeleteKey(hVerbKey,_T("command")); /* ddeexec */ - if(!RegOpenKeyEx(hVerbKey,_T("ddeexec"),0,DELETE,&hDdeKey)) { + if (!RegOpenKeyEx(hVerbKey,_T("ddeexec"),0,DELETE,&hDdeKey)) { /* application */ RegDeleteKey(hDdeKey,_T("application")); /* topic */ @@ -1192,15 +1192,15 @@ void AddRegOpenWithExtEntry(const TCHAR *pszAppFileName,const char *pszFileExt,c HKEY hRootKey,hAppsKey,hExeKey,hTypesKey; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* applications */ - if(!RegOpenKeyEx(hRootKey,_T("Applications"),0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,&hAppsKey)) { + if (!RegOpenKeyEx(hRootKey,_T("Applications"),0,KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,&hAppsKey)) { /* filename */ - if(!RegOpenKeyEx(hAppsKey,pszAppFileName,0,KEY_CREATE_SUB_KEY,&hExeKey)) { + if (!RegOpenKeyEx(hAppsKey,pszAppFileName,0,KEY_CREATE_SUB_KEY,&hExeKey)) { /* supported types */ - if(!RegCreateKeyEx(hExeKey,_T("SupportedTypes"),0,NULL,0,KEY_SET_VALUE,NULL,&hTypesKey,NULL)) { + if (!RegCreateKeyEx(hExeKey,_T("SupportedTypes"),0,NULL,0,KEY_SET_VALUE,NULL,&hTypesKey,NULL)) { TCHAR *ptszFileExt; ptszFileExt=a2t(pszFileExt); if(ptszFileExt!=NULL) @@ -1222,15 +1222,15 @@ void RemoveRegOpenWithExtEntry(const TCHAR *pszAppFileName,const char *pszFileEx HKEY hRootKey,hAppsKey,hExeKey,hTypesKey; /* try to open interactive user's classes key */ - if(!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) + if (!IsWinVer2000Plus() || RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Classes"),0,KEY_QUERY_VALUE,&hRootKey)) hRootKey=HKEY_CLASSES_ROOT; /* applications */ - if(!RegOpenKeyEx(hRootKey,_T("Applications"),0,KEY_QUERY_VALUE,&hAppsKey)) { + if (!RegOpenKeyEx(hRootKey,_T("Applications"),0,KEY_QUERY_VALUE,&hAppsKey)) { /* filename */ - if(!RegOpenKeyEx(hAppsKey,pszAppFileName,0,KEY_QUERY_VALUE,&hExeKey)) { + if (!RegOpenKeyEx(hAppsKey,pszAppFileName,0,KEY_QUERY_VALUE,&hExeKey)) { /* supported types */ - if(!RegOpenKeyEx(hExeKey,_T("SupportedTypes"),0,KEY_SET_VALUE,&hTypesKey)) { + if (!RegOpenKeyEx(hExeKey,_T("SupportedTypes"),0,KEY_SET_VALUE,&hTypesKey)) { RegDeleteValueA(hTypesKey,pszFileExt); RegCloseKey(hTypesKey); } @@ -1255,7 +1255,7 @@ BOOL AddRegRunEntry(const TCHAR *pszAppName,const TCHAR *pszRunCmd) HKEY hRunKey; /* run */ - if(!RegCreateKeyEx(HKEY_CURRENT_USER,_T("Software\\Microsoft\\Windows\\CurrentVersion\\Run"),0,NULL,0,KEY_SET_VALUE,NULL,&hRunKey,NULL)) { + if (!RegCreateKeyEx(HKEY_CURRENT_USER,_T("Software\\Microsoft\\Windows\\CurrentVersion\\Run"),0,NULL,0,KEY_SET_VALUE,NULL,&hRunKey,NULL)) { /* appname */ fSuccess=!RegSetValueEx(hRunKey,pszAppName,0,REG_SZ,(BYTE*)pszRunCmd,(lstrlen(pszRunCmd)+1)*sizeof(TCHAR)); RegCloseKey(hRunKey); @@ -1270,7 +1270,7 @@ BOOL RemoveRegRunEntry(const TCHAR *pszAppName,const TCHAR *pszRunCmd) /* run */ res=RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Microsoft\\Windows\\CurrentVersion\\Run"),0,KEY_QUERY_VALUE|KEY_SET_VALUE,&hRunKey); - if(!res) { + if (!res) { /* appname */ if(IsRegStrValue(hRunKey,pszAppName,pszRunCmd)) res=RegDeleteValue(hRunKey,pszAppName); /* only remove if current */ @@ -1289,7 +1289,7 @@ BOOL IsRegRunEntry(const TCHAR *pszAppName,const TCHAR *pszRunCmd) HKEY hRunKey; /* Run */ - if(!RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Microsoft\\Windows\\CurrentVersion\\Run"),0,KEY_QUERY_VALUE,&hRunKey)) { + if (!RegOpenKeyEx(HKEY_CURRENT_USER,_T("Software\\Microsoft\\Windows\\CurrentVersion\\Run"),0,KEY_QUERY_VALUE,&hRunKey)) { /* appname */ fState=IsRegStrValue(hRunKey,pszAppName,pszRunCmd); RegCloseKey(hRunKey); diff --git a/plugins/AssocMgr/test.c b/plugins/AssocMgr/test.c index 0da578d4ec..73112af5a5 100644 --- a/plugins/AssocMgr/test.c +++ b/plugins/AssocMgr/test.c @@ -92,23 +92,23 @@ static int ServiceParseAimLink(WPARAM wParam,LPARAM lParam) /* skip leading prefix */ arg=strchr(arg,':'); if(arg==NULL) return 1; /* parse failed */ - for(++arg;*arg=='/';++arg); + for (++arg;*arg=='/';++arg); /* add user: aim:addbuddy?screenname=NICK&groupname=GROUP send message: aim:goim?screenname=NICK&message=MSG open chatroom: aim:gochat?roomname=ROOM&exchange=NUM */ /* add a contact to the list */ - if(!_strnicmp(arg,"addbuddy?",9)) { + if (!_strnicmp(arg,"addbuddy?",9)) { char *tok,*sn=NULL,*group=NULL; ADDCONTACTSTRUCT acs; PROTOSEARCHRESULT psr; - if(*(arg+=9)==0) return 1; /* parse failed */ + if (*(arg+=9)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"screenname=",11) && *(tok+11)!=0) + if (!_strnicmp(tok,"screenname=",11) && *(tok+11)!=0) sn=Netlib_UrlDecode(tok+11); - if(!_strnicmp(tok,"groupname=",10) && *(tok+10)!=0) + if (!_strnicmp(tok,"groupname=",10) && *(tok+10)!=0) group=Netlib_UrlDecode(tok+10); /* group is currently ignored */ tok=strtok(NULL,"&"); /* next token */ } @@ -125,15 +125,15 @@ static int ServiceParseAimLink(WPARAM wParam,LPARAM lParam) return 0; } /* send a message to a contact */ - else if(!_strnicmp(arg,"goim?",5)) { + else if (!_strnicmp(arg,"goim?",5)) { char *tok,*sn=NULL,*msg=NULL; HANDLE hContact; - if(*(arg+=5)==0) return 1; /* parse failed */ + if (*(arg+=5)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"screenname=",11) && *(tok+11)!=0) + if (!_strnicmp(tok,"screenname=",11) && *(tok+11)!=0) sn=Netlib_UrlDecode(tok+11); - if(!_strnicmp(tok,"message=",8) && *(tok+8)!=0) + if (!_strnicmp(tok,"message=",8) && *(tok+8)!=0) msg=Netlib_UrlDecode(tok+8); tok=strtok(NULL,"&"); /* next token */ } @@ -151,15 +151,15 @@ static int ServiceParseAimLink(WPARAM wParam,LPARAM lParam) return 0; } /* open a chatroom */ - else if(!_strnicmp(arg,"gochat?",7)) { + else if (!_strnicmp(arg,"gochat?",7)) { char *tok,*rm=NULL; int exchange=0; - if(*(arg+=7)==0) return 1; /* parse failed */ + if (*(arg+=7)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"roomname=",9) && *(tok+9)!=0) + if (!_strnicmp(tok,"roomname=",9) && *(tok+9)!=0) rm=Netlib_UrlDecode(tok+9); - if(!_strnicmp(tok,"exchange=",9)) + if (!_strnicmp(tok,"exchange=",9)) exchange=atoi(Netlib_UrlDecode(tok+9)); tok=strtok(NULL,"&"); /* next token */ } @@ -341,9 +341,9 @@ static int IcqOpenFile(WPARAM wParam,LPARAM lParam) if(IsEmpty(line)) continue; if(line[0]=='[') { ZeroMemory(&info,sizeof(info)); - if(!lstrcmpiA(line,"[ICQ Message User]")) + if (!lstrcmpiA(line,"[ICQ Message User]")) info.type=ICQFILE_MESSAGEUSER; - else if(!lstrcmpiA(line,"[ICQ User]")) + else if (!lstrcmpiA(line,"[ICQ User]")) info.type=ICQFILE_ADDUSER; continue; } @@ -351,11 +351,11 @@ static int IcqOpenFile(WPARAM wParam,LPARAM lParam) sep=strchr(line,'='); if(sep==NULL) { info.type=0; break; } /* format error */ *(sep++)='\0'; - if(!lstrcmpA("UIN",line)) lstrcpynA(info.uin,sep,sizeof(info.uin)); /* buffer safe */ - else if(!lstrcmpA("Email",line)) lstrcpynA(info.email,sep,sizeof(info.email)); /* buffer safe */ - else if(!lstrcmpA("NickName",line)) lstrcpynA(info.nick,sep,sizeof(info.nick)); /* buffer safe */ - else if(!lstrcmpA("FirstName",line)) lstrcpynA(info.firstName,sep,sizeof(info.firstName)); /* buffer safe */ - else if(!lstrcmpA("LastName",line)) lstrcpynA(info.lastName,sep,sizeof(info.lastName)); /* buffer safe */ + if (!lstrcmpA("UIN",line)) lstrcpynA(info.uin,sep,sizeof(info.uin)); /* buffer safe */ + else if (!lstrcmpA("Email",line)) lstrcpynA(info.email,sep,sizeof(info.email)); /* buffer safe */ + else if (!lstrcmpA("NickName",line)) lstrcpynA(info.nick,sep,sizeof(info.nick)); /* buffer safe */ + else if (!lstrcmpA("FirstName",line)) lstrcpynA(info.firstName,sep,sizeof(info.firstName)); /* buffer safe */ + else if (!lstrcmpA("LastName",line)) lstrcpynA(info.lastName,sep,sizeof(info.lastName)); /* buffer safe */ } fclose(fp); switch(info.type) { @@ -424,13 +424,13 @@ static int ServiceParseYmsgrLink(WPARAM wParam,LPARAM lParam) /* skip leading prefix */ arg=strchr(arg,':'); if(arg==NULL) return 1; /* parse failed */ - for(++arg;*arg=='/';++arg); + for (++arg;*arg=='/';++arg); /* add a contact to the list */ - if(!_strnicmp(arg,"addfriend?",10)) { + if (!_strnicmp(arg,"addfriend?",10)) { char *tok,*id=NULL; ADDCONTACTSTRUCT acs; PROTOSEARCHRESULT psr; - if(*(arg+=10)==0) return 1; /* parse failed */ + if (*(arg+=10)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ if(tok!=NULL) id=Netlib_UrlDecode(tok); if(id==NULL || *id==0) return 1; /* parse failed */ @@ -446,14 +446,14 @@ static int ServiceParseYmsgrLink(WPARAM wParam,LPARAM lParam) return 0; } /* send a message to a contact */ - else if(!_strnicmp(arg,"sendim?",7)) { + else if (!_strnicmp(arg,"sendim?",7)) { char *tok,*id=NULL,*msg=NULL; HANDLE hContact; - if(*(arg+=7)==0) return 1; /* parse failed */ + if (*(arg+=7)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ if(tok!=NULL) id=tok; while(tok!=NULL) { - if(!_strnicmp(tok,"m=",2) && *(tok+2)!=0) + if (!_strnicmp(tok,"m=",2) && *(tok+2)!=0) msg=Netlib_UrlDecode(tok+2); tok=strtok(NULL,"&"); /* next token */ } @@ -466,9 +466,9 @@ static int ServiceParseYmsgrLink(WPARAM wParam,LPARAM lParam) return 0; } /* open a chatroom */ - else if(!_strnicmp(arg,"chat?",5)) { + else if (!_strnicmp(arg,"chat?",5)) { char *tok,*rm=NULL; - if(*(arg+=5)==0) return 1; /* parse failed */ + if (*(arg+=5)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ if(tok!=NULL) rm=Netlib_UrlDecode(tok); if(rm==NULL) return 1; /* parse failed */ @@ -536,16 +536,16 @@ static int ServiceParseMsnimLink(WPARAM wParam,LPARAM lParam) /* skip leading prefix */ arg=strchr(arg,':'); if(arg==NULL) return 1; /* parse failed */ - for(++arg;*arg=='/';++arg); + for (++arg;*arg=='/';++arg); /* add a contact to the list */ - if(!_strnicmp(arg,"add?",4)) { + if (!_strnicmp(arg,"add?",4)) { char *tok,*email=NULL; ADDCONTACTSTRUCT acs; PROTOSEARCHRESULT psr; - if(*(arg+=4)==0) return 1; /* parse failed */ + if (*(arg+=4)==0) return 1; /* parse failed */ tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"contact=",8) && *(tok+11)!=0) + if (!_strnicmp(tok,"contact=",8) && *(tok+11)!=0) email=Netlib_UrlDecode(tok+11); tok=strtok(NULL,"&"); /* next token */ } @@ -564,14 +564,14 @@ static int ServiceParseMsnimLink(WPARAM wParam,LPARAM lParam) } /* send a message to a contact */ /* "voice" and "video" not yet implemented, perform same action as "chat" */ - else if(!_strnicmp(arg,"chat?",5) || !_strnicmp(arg,"voice?",6) || !_strnicmp(arg,"video?",6)) { + else if (!_strnicmp(arg,"chat?",5) || !_strnicmp(arg,"voice?",6) || !_strnicmp(arg,"video?",6)) { char *tok,*email=NULL; HANDLE hContact; - if(*(arg+=5)==0) return 1; /* parse failed */ - if(*arg=='?' && *(++arg)==0) return 1; /* for "voice?" and "video?" */ + if (*(arg+=5)==0) return 1; /* parse failed */ + if (*arg=='?' && *(++arg)==0) return 1; /* for "voice?" and "video?" */ tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"contact=",8) && *(tok+11)!=0) + if (!_strnicmp(tok,"contact=",8) && *(tok+11)!=0) email=Netlib_UrlDecode(tok+11); tok=strtok(NULL,"&"); /* next token */ } @@ -640,7 +640,7 @@ static int ServiceParseLink(WPARAM wParam,LPARAM lParam) /* skip leading prefix */ arg=strchr(arg,':'); if(arg==NULL) return 1; /* parse failed */ - for(++arg;*arg=='/';++arg); + for (++arg;*arg=='/';++arg); /* send a message to a contact */ { HANDLE hContact; if(ServiceExists(MS_MSG_SENDMESSAGE)) { @@ -705,7 +705,7 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) /* skip leading prefix */ arg=strchr(arg,':'); if(arg==NULL) return 1; /* parse failed */ - for(++arg;*arg=='/';++arg); + for (++arg;*arg=='/';++arg); /* complete specification: http://www.xmpp.org/extensions/xep-0147.html send message: xmpp:JID?message;subject=TEXT&body=TEXT @@ -716,9 +716,9 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) arg=strchr(jid=arg,'?'); if(arg==NULL) arg+=lstrlenA(arg); /* points to terminating nul */ else *(arg++)=0; - if(*jid==0) return 1; /* parse failed */ + if (*jid==0) return 1; /* parse failed */ /* send a message to a contact */ - else if(*arg==0 || (!_strnicmp(arg,"message",7) && (*(arg+7)==';' || *(arg+7)==0))) { + else if (*arg==0 || (!_strnicmp(arg,"message",7) && (*(arg+7)==';' || *(arg+7)==0))) { char *tok,*subj=NULL,*body=NULL; HANDLE hContact; char msg[1024]; @@ -726,9 +726,9 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) while(*arg==';') ++arg; tok=strtok(arg,"&"); /* first token */ while(tok!=NULL) { - if(!_strnicmp(tok,"subject=",8) && *(tok+8)!=0) + if (!_strnicmp(tok,"subject=",8) && *(tok+8)!=0) subj=Netlib_UrlDecode(tok+8); - if(!_strnicmp(tok,"body=",5) && *(tok+5)!=0) + if (!_strnicmp(tok,"body=",5) && *(tok+5)!=0) body=Netlib_UrlDecode(tok+5); tok=strtok(NULL,"&"); /* next token */ } @@ -744,7 +744,7 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) return 0; } /* add user to contact list */ - else if(!_strnicmp(arg,"roster",6) && (*(arg+6)==';' || *(arg+6)==0)) { + else if (!_strnicmp(arg,"roster",6) && (*(arg+6)==';' || *(arg+6)==0)) { ADDCONTACTSTRUCT acs; PROTOSEARCHRESULT psr; if(JabberHContactFromJID(jid)==NULL) { /* does not yet check if jid belongs to current user */ @@ -759,7 +759,7 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) return 0; } /* remove user from contact list */ - else if(!_strnicmp(arg,"remove",6) && (*(arg+6)==';' || *(arg+6)==0)) { + else if (!_strnicmp(arg,"remove",6) && (*(arg+6)==';' || *(arg+6)==0)) { HANDLE hContact; hContact=JabberHContactFromJID(jid); if(hContact==NULL) /* not yet implemented: show standard miranda dialog here */ @@ -767,12 +767,12 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) return 0; } /* add user subscription */ - else if(!_strnicmp(arg,"subscribe",9) && (*(arg+9)==';' || *(arg+9)==0)) { + else if (!_strnicmp(arg,"subscribe",9) && (*(arg+9)==';' || *(arg+9)==0)) { /* not yet implemented */ return 0; } /* remove user subscription */ - else if(!_strnicmp(arg,"unsubscribe",11) && (*(arg+11)==';' || *(arg+11)==0)) { + else if (!_strnicmp(arg,"unsubscribe",11) && (*(arg+11)==';' || *(arg+11)==0)) { /* not yet implemented */ return 0; } diff --git a/plugins/AssocMgr/utils.c b/plugins/AssocMgr/utils.c index d5ae8b7327..89e0867a59 100644 --- a/plugins/AssocMgr/utils.c +++ b/plugins/AssocMgr/utils.c @@ -41,7 +41,7 @@ WCHAR* a2u(const char *pszAnsi,BOOL fMirCp) if(pszAnsi==NULL) return NULL; codepage=fMirCp?CallService(MS_LANGPACK_GETCODEPAGE,0,0):CP_ACP; cch=MultiByteToWideChar(codepage,0,pszAnsi,-1,NULL,0); - if(!cch) return NULL; + if (!cch) return NULL; psz=(WCHAR*)mir_alloc(cch*sizeof(WCHAR)); if(psz!=NULL && !MultiByteToWideChar(codepage,0,pszAnsi,-1,psz,cch)) { @@ -62,11 +62,11 @@ char* u2a(const WCHAR *pszUnicode,BOOL fMirCp) codepage=fMirCp?CallService(MS_LANGPACK_GETCODEPAGE,0,0):CP_ACP; /* without WC_COMPOSITECHECK some characters might get out strange (see MS blog) */ cch=WideCharToMultiByte(codepage,flags=WC_COMPOSITECHECK,pszUnicode,-1,NULL,0,NULL,NULL); - if(!cch) cch=WideCharToMultiByte(codepage,flags=0,pszUnicode,-1,NULL,0,NULL,NULL); - if(!cch) return NULL; + if (!cch) cch=WideCharToMultiByte(codepage,flags=0,pszUnicode,-1,NULL,0,NULL,NULL); + if (!cch) return NULL; psz=(char*)mir_alloc(cch); - if(psz!=NULL && !WideCharToMultiByte(codepage,flags,pszUnicode,-1,psz,cch,NULL,NULL)){ + if(psz!=NULL && !WideCharToMultiByte(codepage,flags,pszUnicode,-1,psz,cch,NULL,NULL)) { mir_free(psz); return NULL; } @@ -89,7 +89,7 @@ TCHAR* s2t(const void *pszStr,DWORD fUnicode,BOOL fMirCp) void* t2s(const TCHAR *pszStr,DWORD fUnicode,BOOL fMirCp) { #if defined(_UNICODE) - if(!fUnicode) return (void*)u2a(pszStr,fMirCp); + if (!fUnicode) return (void*)u2a(pszStr,fMirCp); return (void*)mir_wstrdup(pszStr); #else if(fUnicode) return (void*)a2u(pszStr,fMirCp); @@ -109,7 +109,7 @@ struct EnumPrefixSettingsParams { static int EnumPrefixSettingsProc(const char *pszSetting,LPARAM lParam) { struct EnumPrefixSettingsParams *param=(struct EnumPrefixSettingsParams*)lParam; - if(!strncmp(pszSetting,param->pszPrefix,param->nPrefixLen)) { + if (!strncmp(pszSetting,param->pszPrefix,param->nPrefixLen)) { char **buf; /* resize storage array */ buf=mir_realloc(param->settings,(param->nSettingsCount+1)*sizeof(char*)); @@ -168,7 +168,7 @@ void ShowInfoMessage(BYTE flags,const char *pszTitle,const char *pszTextFmt,...) msn.szInfo=(char*)szText; msn.uTimeout=30000; /* max timeout */ msn.dwInfoFlags=flags; - if(!CallServiceSync(MS_CLIST_SYSTRAY_NOTIFY,0,(LPARAM)&msn)) + if (!CallServiceSync(MS_CLIST_SYSTRAY_NOTIFY,0,(LPARAM)&msn)) return; /* success */ } @@ -192,7 +192,7 @@ char* GetWinErrorDescription(DWORD dwLastError) { char *buf=NULL; DWORD flags=FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM; - if(!FormatMessageA(flags,NULL,dwLastError,LANGIDFROMLCID((LCID)CallService(MS_LANGPACK_GETLOCALE,0,0)),(char*)&buf,0,NULL)) + if (!FormatMessageA(flags,NULL,dwLastError,LANGIDFROMLCID((LCID)CallService(MS_LANGPACK_GETLOCALE,0,0)),(char*)&buf,0,NULL)) if(GetLastError()==ERROR_RESOURCE_LANG_NOT_FOUND) FormatMessageA(flags,NULL,dwLastError,0,(char*)&buf,0,NULL); return buf; diff --git a/plugins/Boltun/boltun.cpp b/plugins/Boltun/boltun.cpp index b63b082329..27169761eb 100644 --- a/plugins/Boltun/boltun.cpp +++ b/plugins/Boltun/boltun.cpp @@ -360,10 +360,10 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR Config.PauseDepends = IsDlgButtonChecked(hwndDlg, IDC_PAUSEDEPENDS) == BST_CHECKED ? TRUE : FALSE; Config.PauseRandom = IsDlgButtonChecked(hwndDlg, IDC_PAUSERANDOM) == BST_CHECKED ? TRUE : FALSE; Config.AnswerPauseTime = GetDlgItemInt(hwndDlg, IDC_WAITTIME, &bTranslated, FALSE); - if(!bTranslated) + if (!bTranslated) Config.AnswerPauseTime = 2; Config.AnswerThinkTime = GetDlgItemInt(hwndDlg, IDC_THINKTIME, &bTranslated, FALSE); - if(!bTranslated) + if (!bTranslated) Config.AnswerThinkTime = 4; TCHAR c[MAX_WARN_TEXT]; bTranslated = GetDlgItemText(hwndDlg, IDC_WARNTXT, c, MAX_WARN_TEXT); @@ -443,7 +443,7 @@ static INT_PTR CALLBACK EngineDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP ofn.nMaxFile = fileNameSize; ofn.Flags = OFN_FILEMUSTEXIST; ofn.lpstrInitialDir = path; - if(!GetOpenFileName(&ofn)) + if (!GetOpenFileName(&ofn)) { delete filename; delete[] filt; @@ -471,7 +471,7 @@ static INT_PTR CALLBACK EngineDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP const TCHAR *c = Config.MindFileName; int line; bTranslated = blInit = LoadMind(c, line); - if(!bTranslated) + if (!bTranslated) { TCHAR* message = new TCHAR[5000]; wsprintf(message, TranslateTS(FAILED_TO_LOAD_BASE), line, c); @@ -684,7 +684,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) } int line; blInit = LoadMind(Config.MindFileName, line); - if(!blInit) + if (!blInit) { TCHAR path[2000]; wsprintf(path, TranslateTS(FAILED_TO_LOAD_BASE), line, (const TCHAR*)Config.MindFileName); diff --git a/plugins/Boltun/config.cpp b/plugins/Boltun/config.cpp index a59fc89d56..4a88bf2df3 100644 --- a/plugins/Boltun/config.cpp +++ b/plugins/Boltun/config.cpp @@ -49,7 +49,7 @@ inline TCHAR* GetString(char* key, const TCHAR* def) { DBVARIANT dbv; TCHAR* val; - if(!DBGetContactSettingTString(NULL, BOLTUN_KEY, key, &dbv)) + if (!DBGetContactSettingTString(NULL, BOLTUN_KEY, key, &dbv)) { size_t len = wcslen(dbv.ptszVal) + 1; val = new TCHAR[len]; diff --git a/plugins/BossKeyPlus/BossKey.cpp b/plugins/BossKeyPlus/BossKey.cpp index a0c3e18cae..e7f6226b91 100644 --- a/plugins/BossKeyPlus/BossKey.cpp +++ b/plugins/BossKeyPlus/BossKey.cpp @@ -472,7 +472,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) if (g_wMask & OPT_REQPASS){ //password request DBVARIANT dbVar = {0}; - if(!DBGetContactSettingString(NULL,MOD_NAME,"password",&dbVar)) + if (!DBGetContactSettingString(NULL,MOD_NAME,"password",&dbVar)) { g_fPassRequested = true; @@ -715,7 +715,7 @@ static int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) { CustomButtonClickData *cbcd=(CustomButtonClickData *)lParam; - if(!strcmp(cbcd->pszModule, MOD_NAME)) + if (!strcmp(cbcd->pszModule, MOD_NAME)) BossKeyHideMiranda(0, 0); return 0; diff --git a/plugins/BuddyExpectator/options.cpp b/plugins/BuddyExpectator/options.cpp index d190cd5c29..84b9eef9e2 100644 --- a/plugins/BuddyExpectator/options.cpp +++ b/plugins/BuddyExpectator/options.cpp @@ -393,7 +393,7 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP } else { - if ((HIWORD(wParam) == BN_CLICKED) || (HIWORD(wParam) == CBN_SELCHANGE) || ((HIWORD(wParam) == EN_CHANGE) && !ChangeLock)){ + if ((HIWORD(wParam) == BN_CLICKED) || (HIWORD(wParam) == CBN_SELCHANGE) || ((HIWORD(wParam) == EN_CHANGE) && !ChangeLock)) { SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); } if (LOWORD(wParam) == IDC_COLORS_POPUP) diff --git a/plugins/CSList/strpos.h b/plugins/CSList/strpos.h index 14ea88a8f6..aaffa3988b 100644 --- a/plugins/CSList/strpos.h +++ b/plugins/CSList/strpos.h @@ -58,7 +58,7 @@ int strpos( STRING haystack, STRING needle ) pDest = (STRING) wcsstr( haystack, needle ); #endif /* UNICODE */ - if( pDest ) + if ( pDest ) position = pDest - haystack; else { diff --git a/plugins/Chat/richutil.c b/plugins/Chat/richutil.c index cba69fefe6..edb6bff003 100644 --- a/plugins/Chat/richutil.c +++ b/plugins/Chat/richutil.c @@ -219,7 +219,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ExcludeClipRect(hdc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); if(MyIsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL)) MyDrawThemeParentBackground(hwnd, hdc, &rcBorder); - if(!IsWindowEnabled(hwnd)) + if (!IsWindowEnabled(hwnd)) nState = ETS_DISABLED; else if(SendMessage(hwnd, EM_GETOPTIONS, 0, 0) & ECO_READONLY) nState = ETS_READONLY; @@ -269,7 +269,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM LRESULT ret = CallWindowProc(ru->origProc, hwnd, msg, wParam, lParam); if(IsWindow(hwnd)) { - if((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) + if ((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)ru->origProc); } EnterCriticalSection(&csRich); diff --git a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp index 8fc2427c06..79fa14dc85 100644 --- a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp @@ -1167,7 +1167,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam) int oldHeight = Frames[pos].height; retval = Frames[pos].height; Frames[pos].height = lParam; - if(!CLUIFramesFitInSize()) + if (!CLUIFramesFitInSize()) Frames[pos].height = retval; retval = Frames[pos].height; @@ -1180,7 +1180,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam) else { retval = Frames[pos].HeightWhenCollapsed; Frames[pos].HeightWhenCollapsed = lParam; - if(!CLUIFramesFitInSize()) + if (!CLUIFramesFitInSize()) Frames[pos].HeightWhenCollapsed = retval; retval = Frames[pos].HeightWhenCollapsed; } diff --git a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp index b2a30a2bf2..818f32ffd5 100644 --- a/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_nicer/CLUIFrames/framesmenu.cpp @@ -58,7 +58,7 @@ static INT_PTR AddContextFrameMenuItem(WPARAM wParam,LPARAM lParam) tmi.position=mi->position; tmi.pszName=mi->pszName; - if( mi->flags & CMIF_ROOTHANDLE ) + if ( mi->flags & CMIF_ROOTHANDLE ) tmi.root = mi->hParentMenu; { lpFrameMenuExecParam fmep; diff --git a/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h b/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h index 35fedd36fb..d3fb618d19 100644 --- a/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h +++ b/plugins/Clist_nicer/INCLUDE/rowheight_funcs.h @@ -30,7 +30,7 @@ public: height = dat->fontInfo[GetBasicFontID(contact)].fontHeight; - if(!dat->bisEmbedded) { + if (!dat->bisEmbedded) { if(contact->bSecondLine != MULTIROW_NEVER && contact->bSecondLine != MULTIROW_IFSPACE && contact->type == CLCIT_CONTACT) { if ((contact->bSecondLine == MULTIROW_ALWAYS || ((cfg::dat.dwFlags & CLUI_FRAME_SHOWSTATUSMSG && contact->bSecondLine == MULTIROW_IFNEEDED) && (contact->xStatus > 0 || cfg::eCache[contact->extraCacheEntry].bStatusMsgValid > STATUSMSG_XSTATUSID)))) height += (dat->fontInfo[FONTID_STATUS].fontHeight + cfg::dat.avatarPadding); @@ -42,7 +42,7 @@ public: } // Checkbox size - if((style&CLS_CHECKBOXES && contact->type==CLCIT_CONTACT) || + if ((style&CLS_CHECKBOXES && contact->type==CLCIT_CONTACT) || (style&CLS_GROUPCHECKBOXES && contact->type==CLCIT_GROUP) || (contact->type==CLCIT_INFO && contact->flags&CLCIIF_CHECKBOX)) { diff --git a/plugins/Clist_nicer/SRC/CLCButton.cpp b/plugins/Clist_nicer/SRC/CLCButton.cpp index 440178208a..3eedad8d28 100644 --- a/plugins/Clist_nicer/SRC/CLCButton.cpp +++ b/plugins/Clist_nicer/SRC/CLCButton.cpp @@ -240,7 +240,7 @@ static void PaintWorker(MButtonCtrl *ctl, HDC hdcPaint) DeleteObject(hbr); } } - if(!ctl->bSkinned && ctl->buttonItem == 0) { + if (!ctl->bSkinned && ctl->buttonItem == 0) { if (ctl->stateId == PBS_HOT || ctl->focus) { if (ctl->pbState) DrawEdge(hdcMem, &rc, EDGE_ETCHED, BF_RECT | BF_SOFT); @@ -328,7 +328,7 @@ static void PaintWorker(MButtonCtrl *ctl, HDC hdcPaint) CopyRect(&rcText, &rcClient); SetBkMode(hdcMem, TRANSPARENT); // XP w/themes doesn't used the glossy disabled text. Is it always using COLOR_GRAYTEXT? Seems so. - if(!ctl->bSkinned) + if (!ctl->bSkinned) SetTextColor(hdcMem, IsWindowEnabled(ctl->hwnd) || !ctl->hThemeButton ? GetSysColor(COLOR_BTNTEXT) : GetSysColor(COLOR_GRAYTEXT)); if (ctl->arrow) DrawState(hdcMem, NULL, NULL, (LPARAM) ctl->arrow, 0, rcClient.right - rcClient.left - 5 - g_cxsmIcon + (!ctl->hThemeButton && ctl->stateId == PBS_PRESSED ? 1 : 0), (rcClient.bottom - rcClient.top) / 2 - g_cysmIcon / 2 + (!ctl->hThemeButton && ctl->stateId == PBS_PRESSED ? 1 : 0), g_cxsmIcon, g_cysmIcon, IsWindowEnabled(ctl->hwnd) ? DST_ICON : DST_ICON | DSS_DISABLED); @@ -433,7 +433,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L bct->pbState = 1; InvalidateRect(bct->hwnd, NULL, TRUE); } - if(!bct->bSendOnDown) + if (!bct->bSendOnDown) SendMessage(GetParent(hwndDlg), WM_COMMAND, MAKELONG(GetDlgCtrlID(hwndDlg), BN_CLICKED), (LPARAM) hwndDlg); return 0; } @@ -469,7 +469,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L return (LRESULT)(bct->hIconPrivate ? bct->hIconPrivate : bct->hIcon); break; case BM_SETIMAGE: - if(!lParam) + if (!lParam) break; bct->hIml = 0; bct->iIcon = 0; @@ -668,7 +668,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L bct->stateId = PBS_NORMAL; InvalidateRect(bct->hwnd, NULL, TRUE); } - if(!bct->bSendOnDown) + if (!bct->bSendOnDown) SendMessage(GetParent(hwndDlg), WM_COMMAND, MAKELONG(GetDlgCtrlID(hwndDlg), BN_CLICKED), (LPARAM) hwndDlg); break; } diff --git a/plugins/Clist_nicer/SRC/Docking.cpp b/plugins/Clist_nicer/SRC/Docking.cpp index bb736880d2..b51d5237a1 100644 --- a/plugins/Clist_nicer/SRC/Docking.cpp +++ b/plugins/Clist_nicer/SRC/Docking.cpp @@ -152,7 +152,7 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) Docking_GetMonitorRectFromPoint(ptCursor, &rcMonitor); if ((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || (ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) { - if(!(GetWindowLong(msg->hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { + if (!(GetWindowLong(msg->hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { SendMessage(msg->hwnd, CLUIINTM_REDRAW, 0, 0); MessageBox(0, TranslateT("The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead."), TranslateT("Clist docking"), MB_OK); diff --git a/plugins/Clist_nicer/SRC/alphablend.cpp b/plugins/Clist_nicer/SRC/alphablend.cpp index b9fd07e904..f81c029bad 100644 --- a/plugins/Clist_nicer/SRC/alphablend.cpp +++ b/plugins/Clist_nicer/SRC/alphablend.cpp @@ -141,7 +141,7 @@ void DrawAlpha(HDC hdcwnd, PRECT rc, DWORD basecolor, int alpha, DWORD basecolor TRIVERTEX tvtx[2]; int orig = 1, dest = 0; - if(!(FLG_GRADIENT & GRADIENT_ACTIVE)) { + if (!(FLG_GRADIENT & GRADIENT_ACTIVE)) { tvtx[0].Red = tvtx[1].Red = (COLOR16)GetRValue(basecolor) << 8; tvtx[0].Blue = tvtx[1].Blue = (COLOR16)GetBValue(basecolor) << 8; tvtx[0].Green = tvtx[1].Green = (COLOR16)GetGValue(basecolor) << 8; diff --git a/plugins/Clist_nicer/SRC/clcitems.cpp b/plugins/Clist_nicer/SRC/clcitems.cpp index d62dd52db9..0f918be17e 100644 --- a/plugins/Clist_nicer/SRC/clcitems.cpp +++ b/plugins/Clist_nicer/SRC/clcitems.cpp @@ -252,7 +252,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat) } } pcli->pfnSortCLC(hwnd, dat, 0); - if(!dat->bisEmbedded) + if (!dat->bisEmbedded) FLT_SyncWithClist(); } @@ -280,16 +280,16 @@ BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto) if ( !result && lstrlen(dbv.ptszVal) > 1) cEntry->bStatusMsgValid = STATUSMSG_CLIST; else { - if(!szProto) + if (!szProto) szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); if(szProto) { if ( !result ) DBFreeVariant( &dbv ); - if( !( result = cfg::getTString(hContact, szProto, "YMsg", &dbv)) && lstrlen(dbv.ptszVal) > 1) + if ( !( result = cfg::getTString(hContact, szProto, "YMsg", &dbv)) && lstrlen(dbv.ptszVal) > 1) cEntry->bStatusMsgValid = STATUSMSG_YIM; else if ( !(result = cfg::getTString(hContact, szProto, "StatusDescr", &dbv)) && lstrlen(dbv.ptszVal) > 1) cEntry->bStatusMsgValid = STATUSMSG_GG; - else if( !(result = cfg::getTString(hContact, szProto, "XStatusMsg", &dbv)) && lstrlen(dbv.ptszVal) > 1) + else if ( !(result = cfg::getTString(hContact, szProto, "XStatusMsg", &dbv)) && lstrlen(dbv.ptszVal) > 1) cEntry->bStatusMsgValid = STATUSMSG_XSTATUS; } } @@ -319,7 +319,7 @@ BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto) cst.flags = CSSF_MASK_NAME | CSSF_DEFAULT_NAME | CSSF_TCHAR; cst.wParam = &xStatus2; cst.ptszName = xStatusName; - if(!CallService(szServiceName, (WPARAM)hContact, (LPARAM)&cst)) { + if (!CallService(szServiceName, (WPARAM)hContact, (LPARAM)&cst)) { TCHAR *szwXstatusName = TranslateTS(xStatusName); cEntry->statusMsg = (TCHAR *)realloc(cEntry->statusMsg, (lstrlen(szwXstatusName) + 2) * sizeof(TCHAR)); _tcsncpy(cEntry->statusMsg, szwXstatusName, lstrlen(szwXstatusName) + 1); @@ -615,7 +615,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); // check stickies first (priority), only if we really have stickies defined (CLVM_STICKY_CONTACTS is set). if(cfg::dat.bFilterEffective & CLVM_STICKY_CONTACTS) { - if((dwLocalMask = cfg::getDword(hContact, "CLVM", cfg::dat.current_viewmode, 0)) != 0) { + if ((dwLocalMask = cfg::getDword(hContact, "CLVM", cfg::dat.current_viewmode, 0)) != 0) { if(cfg::dat.bFilterEffective & CLVM_FILTER_STICKYSTATUS) { WORD wStatus = cfg::getWord(hContact, szProto, "Status", ID_STATUS_OFFLINE); return !((1 << (wStatus - ID_STATUS_OFFLINE)) & HIWORD(dwLocalMask)); @@ -629,7 +629,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc filterResult = strstr(cfg::dat.protoFilter, szTemp) ? 1 : 0; } if(cfg::dat.bFilterEffective & CLVM_FILTER_GROUPS) { - if(!cfg::getTString(hContact, "CList", "Group", &dbv)) { + if (!cfg::getTString(hContact, "CList", "Group", &dbv)) { _sntprintf(szGroupMask, safe_sizeof(szGroupMask), _T("%s|"), &dbv.ptszVal[1]); filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)); mir_free(dbv.ptszVal); diff --git a/plugins/Clist_nicer/SRC/clcopts.cpp b/plugins/Clist_nicer/SRC/clcopts.cpp index f942f833e4..aeb999bfa5 100644 --- a/plugins/Clist_nicer/SRC/clcopts.cpp +++ b/plugins/Clist_nicer/SRC/clcopts.cpp @@ -254,7 +254,7 @@ static int DSP_Read(DISPLAYPROFILESET *p) */ mir_snprintf(szKey, 256, "{dw_%u_%u}", p->uID, j); - if(!cfg::getString(NULL, DSP_PROFILES_MODULE, szKey, &dbv)) { + if (!cfg::getString(NULL, DSP_PROFILES_MODULE, szKey, &dbv)) { sscanf(dbv.pszVal, "%u,%u,%u,%u,%u", dp->dwFlags, dp->dwExtraImageMask, dp->avatarBorder, dp->clcExStyle, dp->clcOfflineModes); DBFreeVariant(&dbv); } @@ -266,7 +266,7 @@ static int DSP_Read(DISPLAYPROFILESET *p) */ _snprintf(szKey, 256, "{b_%u_%u}", p->uID, j); - if(!cfg::getString(NULL, DSP_PROFILES_MODULE, szKey, &dbv)) { + if (!cfg::getString(NULL, DSP_PROFILES_MODULE, szKey, &dbv)) { if(lstrlenA(dbv.pszVal) >= 16) { dp->exIconScale = (int)szBuf[i++]; dp->dualRowMode = szBuf[i++]; @@ -740,7 +740,7 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_CLISTAVATARS: - if((HWND)lParam != GetFocus()) + if ((HWND)lParam != GetFocus()) return 0; break; case IDC_SHOWLOCALTIME: @@ -992,7 +992,7 @@ static INT_PTR CALLBACK DlgProcXIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPA return 0; } case WM_NOTIFY: - if(((LPNMHDR) lParam)->idFrom == IDC_EXTRAORDER) { + if (((LPNMHDR) lParam)->idFrom == IDC_EXTRAORDER) { switch (((LPNMHDR)lParam)->code) { case TVN_BEGINDRAGA: case TVN_BEGINDRAGW: @@ -1034,7 +1034,7 @@ static INT_PTR CALLBACK DlgProcXIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPA case WM_MOUSEMOVE: { - if(!dragging) + if (!dragging) break; { TVHITTESTINFO hti; @@ -1063,7 +1063,7 @@ static INT_PTR CALLBACK DlgProcXIcons(HWND hwndDlg, UINT msg, WPARAM wParam, LPA break; case WM_LBUTTONUP: { - if(!dragging) break; + if (!dragging) break; TreeView_SetInsertMark(GetDlgItem(hwndDlg,IDC_EXTRAORDER),NULL,0); dragging=0; ReleaseCapture(); @@ -1254,7 +1254,7 @@ static INT_PTR CALLBACK DlgProcDspProfiles(HWND hwnd, UINT msg, WPARAM wParam, L } case PSM_CHANGED: // used so tabs dont have to call SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0); - if(!iInit) + if (!iInit) SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case WM_NOTIFY: @@ -1363,7 +1363,7 @@ static INT_PTR CALLBACK TabOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LP } case PSM_CHANGED: // used so tabs dont have to call SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0); - if(!iInit) + if (!iInit) SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case WM_NOTIFY: @@ -1528,7 +1528,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam int i; DWORD exStyle = cfg::getDword("CLC", "ExStyle", CLCDEFAULT_EXSTYLE); - if(!opt_clc_main_changed) + if (!opt_clc_main_changed) return TRUE; for (i = 0; i < sizeof(checkBoxToStyleEx) / sizeof(checkBoxToStyleEx[0]); i++) @@ -1665,7 +1665,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, case 0: switch (((LPNMHDR) lParam)->code) { case PSN_APPLY: - if(!opt_clc_bkg_changed) + if (!opt_clc_bkg_changed) return TRUE; cfg::writeByte("CLC", "UseBitmap", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); { diff --git a/plugins/Clist_nicer/SRC/clcpaint.cpp b/plugins/Clist_nicer/SRC/clcpaint.cpp index 866279ae59..0943c3d846 100644 --- a/plugins/Clist_nicer/SRC/clcpaint.cpp +++ b/plugins/Clist_nicer/SRC/clcpaint.cpp @@ -291,7 +291,7 @@ static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, struct ClcContact *contac BOOL fOverlay = (cfg::dat.dwFlags & CLUI_FRAME_OVERLAYICONS); contact->avatarLeft = -1; - if(!cfg::dat.bAvatarServiceAvail || dat->bisEmbedded) + if (!cfg::dat.bAvatarServiceAvail || dat->bisEmbedded) return 0; if(contact->ace != NULL && contact->ace->cbSize == sizeof(struct avatarCacheEntry)) { @@ -338,7 +338,7 @@ static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, struct ClcContact *contac newHeight = (float)(bmHeight * dScale) - skinMarginY; } topoffset = rowHeight > (int)newHeight ? (rowHeight - (int)newHeight) / 2 : 0; - if(!item->IGNORED) { + if (!item->IGNORED) { //topoffset += item->MARGIN_TOP; leftoffset = item->MARGIN_LEFT; } @@ -395,7 +395,7 @@ static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, struct ClcContact *contac SelectClipRgn(hdcMem, NULL); DeleteObject(rgn); - if(!item->IGNORED) { + if (!item->IGNORED) { RECT rcFrame; BOOL inClCPaint_save = g_inCLCpaint; HDC hdcTemp = 0, hdcSaved = 0; @@ -514,7 +514,7 @@ void __inline PaintItem(HDC hdcMem, struct ClcGroup *group, struct ClcContact *c bg_indent_l = cfg::dat.bApplyIndentToBg ? indent * dat->groupIndent : 0; } else if(type == CLCIT_GROUP && API::pfnSetLayout != NULL) { - if((contact->isRtl && cfg::dat.bGroupAlign == CLC_GROUPALIGN_AUTO) || cfg::dat.bGroupAlign == CLC_GROUPALIGN_RIGHT) { + if ((contact->isRtl && cfg::dat.bGroupAlign == CLC_GROUPALIGN_AUTO) || cfg::dat.bGroupAlign == CLC_GROUPALIGN_RIGHT) { g_RTL = TRUE; bg_indent_r = cfg::dat.bApplyIndentToBg ? indent * dat->groupIndent : 0; } @@ -614,12 +614,12 @@ set_bg_l: if (cstatus >= ID_STATUS_OFFLINE && cstatus <= ID_STATUS_OUTTOLUNCH) { BYTE perstatus_ignored; - if((flags & CONTACTF_IDLE) && !StatusItems[ID_EXTBKIDLE - ID_STATUS_OFFLINE].IGNORED) + if ((flags & CONTACTF_IDLE) && !StatusItems[ID_EXTBKIDLE - ID_STATUS_OFFLINE].IGNORED) sitem = &StatusItems[ID_EXTBKIDLE - ID_STATUS_OFFLINE]; else sitem = &StatusItems[cstatus - ID_STATUS_OFFLINE]; - if(!dat->bisEmbedded) { + if (!dat->bisEmbedded) { pp_item = cEntry->status_item ? cEntry->status_item : cEntry->proto_status_item; if (!(perstatus_ignored = sitem->IGNORED) && !(flags & CONTACTF_NOTONLIST)) @@ -627,11 +627,11 @@ set_bg_l: if(cfg::dat.bUsePerProto && pp_item && !pp_item->IGNORED) { sitem = pp_item; - if((perstatus_ignored || cfg::dat.bOverridePerStatusColors) && sitem->TEXTCOLOR != -1) + if ((perstatus_ignored || cfg::dat.bOverridePerStatusColors) && sitem->TEXTCOLOR != -1) SetTextColor(hdcMem, sitem->TEXTCOLOR); } } - else if(!sitem->IGNORED) + else if (!sitem->IGNORED) SetTextColor(hdcMem, sitem->TEXTCOLOR); sevencontact_pos = &StatusItems[ID_EXTBKEVEN_CNTCTPOS - ID_STATUS_OFFLINE]; @@ -885,7 +885,7 @@ set_bg_l: SetHotTrackColour(hdcMem,dat); if(ht->IGNORED == 0) SetTextColor(hdcMem, ht->TEXTCOLOR); - if(!g_hottrack_done) { + if (!g_hottrack_done) { if (ht->IGNORED == 0) { DrawAlpha(hdcMem, &rc, ht->COLOR, ht->ALPHA, ht->COLOR2, ht->COLOR2_TRANSPARENT, ht->GRADIENT, ht->CORNER, ht->BORDERSTYLE, ht->imageItem); @@ -974,9 +974,9 @@ bgskipped: int mode = ILD_NORMAL; pi_selectiveIcon = g_selectiveIcon && (type == CLCIT_CONTACT); - if((dwFlags & CLUI_FRAME_STATUSICONS && !pi_selectiveIcon) || type != CLCIT_CONTACT || (pi_selectiveIcon && !avatar_done)) { + if ((dwFlags & CLUI_FRAME_STATUSICONS && !pi_selectiveIcon) || type != CLCIT_CONTACT || (pi_selectiveIcon && !avatar_done)) { HIMAGELIST hImgList = 0; - if(!dat->bisEmbedded && type == CLCIT_CONTACT && cEntry && (dwFlags & CLUI_FRAME_USEXSTATUSASSTATUS) && cEntry->iExtraImage[EXTRA_ICON_ADV1] != 0xff) { + if (!dat->bisEmbedded && type == CLCIT_CONTACT && cEntry && (dwFlags & CLUI_FRAME_USEXSTATUSASSTATUS) && cEntry->iExtraImage[EXTRA_ICON_ADV1] != 0xff) { if(pcli->pfnIconFromStatusMode(contact->proto, contact->wStatus, contact->hContact) == iImage) { hImgList = dat->himlExtraColumns; iImage = cEntry->iExtraImage[EXTRA_ICON_ADV1]; @@ -1137,7 +1137,7 @@ text: } if (dat->exStyle & CLS_EX_LINEWITHGROUPS) { - if(!g_center) { + if (!g_center) { rc.top = y + ((rowHeight) >> 1); rc.bottom = rc.top + 2; rc.left = rightLineStart; rc.right = clRect->right - 1 - dat->extraColumnSpacing * dat->extraColumnsCount - dat->rightMargin; @@ -1163,7 +1163,7 @@ text: // avatar - if(!dat->bisEmbedded) { + if (!dat->bisEmbedded) { if(av_local_wanted && !avatar_done && pi_avatar) { if(av_rightwithnick) { RECT rcAvatar = rcContent; @@ -1180,7 +1180,7 @@ text: } // nickname - if(!twoRows) { + if (!twoRows) { if(dt_nickflags) DrawText(hdcMem, szText, -1, &rcContent, DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_WORD_ELLIPSIS | DT_SINGLELINE | dt_nickflags); else @@ -1273,7 +1273,7 @@ nodisplay: TCHAR *szText = NULL; BYTE smsgValid = cEntry->bStatusMsgValid; - if((dwFlags & CLUI_FRAME_SHOWSTATUSMSG && smsgValid > STATUSMSG_XSTATUSID) || smsgValid == STATUSMSG_XSTATUSNAME) + if ((dwFlags & CLUI_FRAME_SHOWSTATUSMSG && smsgValid > STATUSMSG_XSTATUSID) || smsgValid == STATUSMSG_XSTATUSNAME) szText = cEntry->statusMsg; else #if defined(_UNICODE) @@ -1285,7 +1285,7 @@ nodisplay: dt_2ndrowflags |= (DT_RTLREADING | DT_RIGHT); if(rightIcons == 0) { - if((rcContent.bottom - rcContent.top) >= (2 * statusFontHeight)) { + if ((rcContent.bottom - rcContent.top) >= (2 * statusFontHeight)) { dtFlags &= ~(DT_SINGLELINE | DT_BOTTOM | DT_NOCLIP); dtFlags |= DT_WORDBREAK; rcContent.bottom -= ((rcContent.bottom - rcContent.top) % statusFontHeight); @@ -1293,7 +1293,7 @@ nodisplay: DrawText(hdcMem, szText, -1, &rcContent, dtFlags | dt_2ndrowflags); } else { - if((rcContent.bottom - rcContent.top) < (2 * statusFontHeight) - 2) + if ((rcContent.bottom - rcContent.top) < (2 * statusFontHeight) - 2) DrawText(hdcMem, szText, -1, &rcContent, dtFlags | dt_2ndrowflags); else { DRAWTEXTPARAMS dtp = {0}; diff --git a/plugins/Clist_nicer/SRC/clcutils.cpp b/plugins/Clist_nicer/SRC/clcutils.cpp index bec62044e9..b158a4394b 100644 --- a/plugins/Clist_nicer/SRC/clcutils.cpp +++ b/plugins/Clist_nicer/SRC/clcutils.cpp @@ -142,7 +142,7 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct Clc for (i = 5; i >= 0; i--) { if (cfg::eCache[hitcontact->extraCacheEntry].iExtraImage[i] == 0xFF) continue; - if(!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask)) + if (!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask)) continue; images_present++; if (testx < right - (rightOffset - (cfg::dat.exIconScale + 2) * images_present) && testx > right - (rightOffset - (cfg::dat.exIconScale + 2) * images_present + (cfg::dat.exIconScale))) { @@ -240,7 +240,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcCont ; } - if(!dat->bisEmbedded) { + if (!dat->bisEmbedded) { if(hitcontact->type == CLCIT_CONTACT) { if(mirror_mode == 1 || (mirror_mode == 2 && cfg::eCache[hitcontact->extraCacheEntry].dwCFlags & ECF_RTLNICK)) return RTL_HitTest(hwnd, dat, testx, testy, hitcontact, flags, indent, hit); @@ -298,7 +298,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcCont for (i = 5; i >= 0; i--) { if (cfg::eCache[hitcontact->extraCacheEntry].iExtraImage[i] == 0xFF) continue; - if(!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask)) + if (!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask)) continue; images_present++; if (testx > (rightOffset - (cfg::dat.exIconScale + 2) * images_present) && testx < (rightOffset - (cfg::dat.exIconScale + 2) * images_present + (cfg::dat.exIconScale))) { @@ -389,7 +389,7 @@ void ScrollTo(HWND hwnd, struct ClcData *dat, int desty, int noSmooth) } dat->yScroll = desty; if (dat->backgroundBmpUse & CLBF_SCROLL || dat->hBmpBackground == NULL) { - if(!noSmooth) + if (!noSmooth) ScrollWindowEx(hwnd, 0, previousy - dat->yScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); else InvalidateRect(hwnd, NULL, FALSE); @@ -545,7 +545,7 @@ void BeginRenameSelection(HWND hwnd, struct ClcData *dat) #if defined(_UNICODE) dat->hwndRenameEdit = CreateWindowEx(0, _T("RichEdit20W"),contact->szText,WS_CHILD|WS_BORDER|ES_MULTILINE|ES_AUTOHSCROLL,x,y,clRect.right-x,h,hwnd,NULL,g_hInst,NULL); { - if((contact->type == CLCIT_CONTACT && cfg::eCache[contact->extraCacheEntry].dwCFlags & ECF_RTLNICK) || (contact->type == CLCIT_GROUP && contact->isRtl)) { + if ((contact->type == CLCIT_CONTACT && cfg::eCache[contact->extraCacheEntry].dwCFlags & ECF_RTLNICK) || (contact->type == CLCIT_GROUP && contact->isRtl)) { PARAFORMAT2 pf2; ZeroMemory((void *)&pf2, sizeof(pf2)); pf2.cbSize = sizeof(pf2); diff --git a/plugins/Clist_nicer/SRC/clistevents.cpp b/plugins/Clist_nicer/SRC/clistevents.cpp index 85b145f32a..953877c27d 100644 --- a/plugins/Clist_nicer/SRC/clistevents.cpp +++ b/plugins/Clist_nicer/SRC/clistevents.cpp @@ -75,7 +75,7 @@ void HideShowNotifyFrame() desired = dwVisible; if(desired) { - if(!dwVisible) + if (!dwVisible) CallService(MS_CLIST_FRAMES_SHFRAME, (WPARAM)hNotifyFrame, 0); } else { diff --git a/plugins/Clist_nicer/SRC/clistmenus.cpp b/plugins/Clist_nicer/SRC/clistmenus.cpp index 22b5b87df1..074bbcf355 100644 --- a/plugins/Clist_nicer/SRC/clistmenus.cpp +++ b/plugins/Clist_nicer/SRC/clistmenus.cpp @@ -306,7 +306,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA cfg::writeDword(hContact, "CList", "CLN_Flags", dwFlags); - if((iSel = SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_GETCURSEL, 0, 0)) != CB_ERR) { + if ((iSel = SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_GETCURSEL, 0, 0)) != CB_ERR) { if(iSel == 0) { DBDeleteContactSetting(hContact, "CList", "CLN_2ndline"); if(contact) diff --git a/plugins/Clist_nicer/SRC/clistmod.cpp b/plugins/Clist_nicer/SRC/clistmod.cpp index a691dc44d4..5e551d4b87 100644 --- a/plugins/Clist_nicer/SRC/clistmod.cpp +++ b/plugins/Clist_nicer/SRC/clistmod.cpp @@ -177,7 +177,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) /*if(rgn) { ptTest.x = j; ptTest.y = i; - if(!PtInRegion(rgn, ptTest.x, ptTest.y)) { + if (!PtInRegion(rgn, ptTest.x, ptTest.y)) { continue; } }*/ diff --git a/plugins/Clist_nicer/SRC/clistopts.cpp b/plugins/Clist_nicer/SRC/clistopts.cpp index 520c9ceb49..338886fce9 100644 --- a/plugins/Clist_nicer/SRC/clistopts.cpp +++ b/plugins/Clist_nicer/SRC/clistopts.cpp @@ -154,7 +154,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case 0: switch (((LPNMHDR) lParam)->code) { case PSN_APPLY: - if(!opt_gen_opts_changed) + if (!opt_gen_opts_changed) return TRUE; cfg::writeByte("CList", "HideOffline", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); diff --git a/plugins/Clist_nicer/SRC/clistsettings.cpp b/plugins/Clist_nicer/SRC/clistsettings.cpp index ce58e22b45..708abb0853 100644 --- a/plugins/Clist_nicer/SRC/clistsettings.cpp +++ b/plugins/Clist_nicer/SRC/clistsettings.cpp @@ -27,7 +27,7 @@ UNICODE done INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam) { - if(!cfg::shutDown) + if (!cfg::shutDown) return SendMessage(pcli->hwndContactTree, CLM_GETSTATUSMSG, wParam, lParam); return 0; } diff --git a/plugins/Clist_nicer/SRC/clui.cpp b/plugins/Clist_nicer/SRC/clui.cpp index 0a3d3133ed..fe76f3d8b7 100644 --- a/plugins/Clist_nicer/SRC/clui.cpp +++ b/plugins/Clist_nicer/SRC/clui.cpp @@ -1311,7 +1311,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l rcFrame.left += (cfg::dat.bCLeft - 1); rcFrame.right -= (cfg::dat.bCRight - 1); - //if(!g_CluiData.bSkinnedButtonMode) + //if (!g_CluiData.bSkinnedButtonMode) // rcFrame.bottom -= (g_CluiData.bottomOffset); rcFrame.bottom++; rcFrame.bottom -= cfg::dat.statusBarHeight; @@ -1408,7 +1408,7 @@ skipbg: } case WM_WINDOWPOSCHANGED: - if(!Docking_IsDocked(0, 0)) + if (!Docking_IsDocked(0, 0)) return(0); else break; diff --git a/plugins/Clist_nicer/SRC/cluiopts.cpp b/plugins/Clist_nicer/SRC/cluiopts.cpp index d77caadea4..79ad2efcb3 100644 --- a/plugins/Clist_nicer/SRC/cluiopts.cpp +++ b/plugins/Clist_nicer/SRC/cluiopts.cpp @@ -177,7 +177,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l BYTE windowStyle = (BYTE)SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_GETCURSEL, 0, 0); COLORREF clr_cluiframes; - if(!opt_clui_changed) + if (!opt_clui_changed) return TRUE; cfg::writeByte("CLUI", "FadeInOut", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); @@ -265,7 +265,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l cfg::dat.dwFlags = IsDlgButtonChecked(hwndDlg, IDC_ROUNDEDBORDER) ? cfg::dat.dwFlags | CLUI_FRAME_ROUNDEDFRAME : cfg::dat.dwFlags & ~CLUI_FRAME_ROUNDEDFRAME; cfg::writeByte("CLUI", "AutoSize", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); - if((cfg::dat.autosize = IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE) ? 1 : 0)) { + if ((cfg::dat.autosize = IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE) ? 1 : 0)) { SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0); SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0); } @@ -310,7 +310,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } } else { API::SetLayeredWindowAttributes(pcli->hwndContactList, RGB(0, 0, 0), (BYTE)255, LWA_ALPHA); - if(!cfg::dat.bLayeredHack) + if (!cfg::dat.bLayeredHack) SetWindowLong(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLong(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED); } @@ -383,7 +383,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case WM_NOTIFY: switch (((LPNMHDR) lParam)->code) { case PSN_APPLY: - if(!opt_sbar_changed) + if (!opt_sbar_changed) return TRUE; cfg::writeByte("CLUI", "ShowSBar", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); diff --git a/plugins/Clist_nicer/SRC/cluiservices.cpp b/plugins/Clist_nicer/SRC/cluiservices.cpp index d2c5c4d9fa..bacbdd3716 100644 --- a/plugins/Clist_nicer/SRC/cluiservices.cpp +++ b/plugins/Clist_nicer/SRC/cluiservices.cpp @@ -36,7 +36,7 @@ static INT_PTR GetClistVersion(WPARAM wParam, LPARAM lParam) static char g_szVersionString[256]; mir_snprintf(g_szVersionString, 256, "%s, %d.%d.%d.%d", pluginInfo.shortName, HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOBYTE(pluginInfo.version))); - if(!IsBadWritePtr((LPVOID)lParam, 4)) + if (!IsBadWritePtr((LPVOID)lParam, 4)) *((DWORD *)lParam) = pluginInfo.version; return (INT_PTR)g_szVersionString; @@ -199,7 +199,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto ) } caps2 = CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0); caps1 = CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); - if((caps1 & PF1_IM) && (caps2 & (PF2_LONGAWAY | PF2_SHORTAWAY))) { + if ((caps1 & PF1_IM) && (caps2 & (PF2_LONGAWAY | PF2_SHORTAWAY))) { onlineness = GetStatusOnlineness(status); if(onlineness > maxOnline) { maxStatus = status; @@ -243,7 +243,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto ) if (szStatus) { if(pcli->hwndContactList && IsWindow(GetDlgItem(pcli->hwndContactList, IDC_TBGLOBALSTATUS)) && IsWindow(GetDlgItem(pcli->hwndContactList, IDC_TBTOPSTATUS))) { SendMessage(GetDlgItem(pcli->hwndContactList, IDC_TBGLOBALSTATUS), WM_SETTEXT, 0, (LPARAM) szStatus); - if(!hIcon) { + if (!hIcon) { SendMessage(GetDlgItem(pcli->hwndContactList, IDC_TBGLOBALSTATUS), BM_SETIMLICON, (WPARAM) hCListImages, (LPARAM) iIcon); if(g_ButtonItems == NULL) SendMessage(GetDlgItem(pcli->hwndContactList, IDC_TBTOPSTATUS), BM_SETIMLICON, (WPARAM) hCListImages, (LPARAM) iIcon); diff --git a/plugins/Clist_nicer/SRC/contact.cpp b/plugins/Clist_nicer/SRC/contact.cpp index 34f15b3fb9..f553dd2e40 100644 --- a/plugins/Clist_nicer/SRC/contact.cpp +++ b/plugins/Clist_nicer/SRC/contact.cpp @@ -164,15 +164,15 @@ void LoadContactTree(void) pcli->pfnChangeContactIcon(hContact, IconFromStatusMode((char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0), status, hContact, NULL), 1); if(mc_disablehgh && !mc_hgh_removed) { - if(!DBGetContactSetting(hContact, "CList", "Group", &dbv)) { - if(!strcmp(dbv.pszVal, "MetaContacts Hidden Group")) + if (!DBGetContactSetting(hContact, "CList", "Group", &dbv)) { + if (!strcmp(dbv.pszVal, "MetaContacts Hidden Group")) DBDeleteContactSetting(hContact, "CList", "Group"); mir_free(dbv.pszVal); } } // build initial data for message frequency - if(!bMsgFrequency) + if (!bMsgFrequency) MF_CalcFrequency(hContact, 100, 0); hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0); @@ -231,7 +231,7 @@ int __forceinline INTSORT_CompareContacts(const struct ClcContact* c1, const str return 2 * (c2->flags & CONTACTF_STICKY) - 1; if(bywhat == SORTBY_PRIOCONTACTS) { - if((cfg::clcdat->exStyle & CLS_EX_DIVIDERONOFF) && ((c1->flags & CONTACTF_ONLINE) != (c2->flags & CONTACTF_ONLINE))) + if ((cfg::clcdat->exStyle & CLS_EX_DIVIDERONOFF) && ((c1->flags & CONTACTF_ONLINE) != (c2->flags & CONTACTF_ONLINE))) return 0; if ((c1->flags & CONTACTF_PRIORITY) != (c2->flags & CONTACTF_PRIORITY)) return 2 * (c2->flags & CONTACTF_PRIORITY) - 1; diff --git a/plugins/Clist_nicer/SRC/extBackg.cpp b/plugins/Clist_nicer/SRC/extBackg.cpp index 3b7d692c33..4851622bbe 100644 --- a/plugins/Clist_nicer/SRC/extBackg.cpp +++ b/plugins/Clist_nicer/SRC/extBackg.cpp @@ -261,7 +261,7 @@ StatusItems_t *GetProtocolStatusItem(const char *szProto) return NULL; for(i = ID_EXTBK_LAST_D - ID_STATUS_OFFLINE + 1; i <= ID_EXTBK_LAST - ID_STATUS_OFFLINE; i++) { - if(!strcmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, szProto)) + if (!strcmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, szProto)) return &StatusItems[i]; } return NULL; @@ -553,7 +553,7 @@ void extbk_export(char *file) mir_snprintf(szSection, 255, "Font%d", n); mir_snprintf(szKey, 255, "Font%dName", n); - if(!cfg::getString(NULL, "CLC", szKey, &dbv)) { + if (!cfg::getString(NULL, "CLC", szKey, &dbv)) { WritePrivateProfileStringA(szSection, "Name", dbv.pszVal, file); mir_free(dbv.pszVal); } @@ -598,7 +598,7 @@ void extbk_export(char *file) WritePrivateProfileStructA("Global", _tagSettings[i].szSetting, &data, _tagSettings[i].size, file); i++; } - if(!cfg::getString(NULL, "CLC", "BkBitmap", &dbv)) { + if (!cfg::getString(NULL, "CLC", "BkBitmap", &dbv)) { WritePrivateProfileStringA("Global", "BkBitmap", dbv.pszVal, file); DBFreeVariant(&dbv); } @@ -751,7 +751,7 @@ static void IMG_CreateItem(ImageItem *item, const char *fileName, HDC hdc) static void IMG_DeleteItem(ImageItem *item) { - if(!(item->dwFlags & IMAGE_GLYPH)) { + if (!(item->dwFlags & IMAGE_GLYPH)) { SelectObject(item->hdc, item->hbmOld); DeleteObject(item->hbm); DeleteDC(item->hdc); @@ -773,7 +773,7 @@ static void ReadItem(StatusItems_t *this_item, char *szItem, char *file) int i; for(i = 0; i <= ID_EXTBK_LAST - ID_STATUS_OFFLINE; i++) { - if(!_stricmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, buffer)) { + if (!_stricmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, buffer)) { defaults = &StatusItems[i]; break; } @@ -905,7 +905,7 @@ done_with_glyph: tmpItem.bStretch = IMAGE_STRETCH_H; tmpItem.hbm = 0; - if(!_stricmp(itemname, "$glyphs")) { + if (!_stricmp(itemname, "$glyphs")) { IMG_CreateItem(&tmpItem, szFinalName, hdc); if(tmpItem.hbm) { newItem = reinterpret_cast(malloc(sizeof(ImageItem))); @@ -916,7 +916,7 @@ done_with_glyph: goto imgread_done; } if(itemname[0] == '@') { - if(!(tmpItem.dwFlags & IMAGE_GLYPH)) + if (!(tmpItem.dwFlags & IMAGE_GLYPH)) IMG_CreateItem(&tmpItem, szFinalName, hdc); if(tmpItem.hbm || tmpItem.dwFlags & IMAGE_GLYPH) { ImageItem *pItem = g_ImageItems; @@ -940,10 +940,10 @@ done_with_glyph: for(n = 0;;n++) { mir_snprintf(szItemNr, 30, "Item%d", n); GetPrivateProfileStringA(itemname, szItemNr, "None", buffer, 500, szFileName); - if(!strcmp(buffer, "None")) + if (!strcmp(buffer, "None")) break; - if(!strcmp(buffer, "CLUI")) { - if(!(tmpItem.dwFlags & IMAGE_GLYPH)) + if (!strcmp(buffer, "CLUI")) { + if (!(tmpItem.dwFlags & IMAGE_GLYPH)) IMG_CreateItem(&tmpItem, szFinalName, hdc); if(tmpItem.hbm || tmpItem.dwFlags & IMAGE_GLYPH) { COLORREF clr; @@ -964,9 +964,9 @@ done_with_glyph: continue; } for(i = 0; i <= ID_EXTBK_LAST - ID_STATUS_OFFLINE; i++) { - if(!_stricmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, buffer)) { - if(!alloced) { - if(!(tmpItem.dwFlags & IMAGE_GLYPH)) + if (!_stricmp(StatusItems[i].szName[0] == '{' ? &StatusItems[i].szName[3] : StatusItems[i].szName, buffer)) { + if (!alloced) { + if (!(tmpItem.dwFlags & IMAGE_GLYPH)) IMG_CreateItem(&tmpItem, szFinalName, hdc); if(tmpItem.hbm || tmpItem.dwFlags & IMAGE_GLYPH) { newItem = reinterpret_cast(malloc(sizeof(ImageItem))); @@ -1051,11 +1051,11 @@ static void BTN_ReadItem(char *itemName, char *file) tmpItem.dwFlags |= GetPrivateProfileIntA(itemName, "toggle", 0, file) ? BUTTON_ISTOGGLE : 0; GetPrivateProfileStringA(itemName, "Pressed", "None", szBuffer, 1000, file); - if(!_stricmp(szBuffer, "default")) + if (!_stricmp(szBuffer, "default")) tmpItem.imgPressed = StatusItems[ID_EXTBKTBBUTTONSPRESSED - ID_STATUS_OFFLINE].imageItem; else { while(imgItem) { - if(!_stricmp(imgItem->szName, szBuffer)) { + if (!_stricmp(imgItem->szName, szBuffer)) { tmpItem.imgPressed = imgItem; break; } @@ -1065,11 +1065,11 @@ static void BTN_ReadItem(char *itemName, char *file) imgItem = g_ImageItems; GetPrivateProfileStringA(itemName, "Normal", "None", szBuffer, 1000, file); - if(!_stricmp(szBuffer, "default")) + if (!_stricmp(szBuffer, "default")) tmpItem.imgNormal = StatusItems[ID_EXTBKTBBUTTONSNPRESSED - ID_STATUS_OFFLINE].imageItem; else { while(imgItem) { - if(!_stricmp(imgItem->szName, szBuffer)) { + if (!_stricmp(imgItem->szName, szBuffer)) { tmpItem.imgNormal = imgItem; break; } @@ -1079,11 +1079,11 @@ static void BTN_ReadItem(char *itemName, char *file) imgItem = g_ImageItems; GetPrivateProfileStringA(itemName, "Hover", "None", szBuffer, 1000, file); - if(!_stricmp(szBuffer, "default")) + if (!_stricmp(szBuffer, "default")) tmpItem.imgHover = StatusItems[ID_EXTBKTBBUTTONMOUSEOVER - ID_STATUS_OFFLINE].imageItem; else { while(imgItem) { - if(!_stricmp(imgItem->szName, szBuffer)) { + if (!_stricmp(imgItem->szName, szBuffer)) { tmpItem.imgHover = imgItem; break; } @@ -1113,7 +1113,7 @@ static void BTN_ReadItem(char *itemName, char *file) tmpItem.uId = IDC_TBFIRSTUID - 1; GetPrivateProfileStringA(itemName, "Action", "Custom", szBuffer, 1000, file); - if(!_stricmp(szBuffer, "service")) { + if (!_stricmp(szBuffer, "service")) { tmpItem.szService[0] = 0; GetPrivateProfileStringA(itemName, "Service", "None", szBuffer, 1000, file); if(_stricmp(szBuffer, "None")) { @@ -1122,7 +1122,7 @@ static void BTN_ReadItem(char *itemName, char *file) tmpItem.uId = nextButtonID++; } } - else if(!_stricmp(szBuffer, "protoservice")) { + else if (!_stricmp(szBuffer, "protoservice")) { tmpItem.szService[0] = 0; GetPrivateProfileStringA(itemName, "Service", "None", szBuffer, 1000, file); if(_stricmp(szBuffer, "None")) { @@ -1131,7 +1131,7 @@ static void BTN_ReadItem(char *itemName, char *file) tmpItem.uId = nextButtonID++; } } - else if(!_stricmp(szBuffer, "database")) { + else if (!_stricmp(szBuffer, "database")) { int n; GetPrivateProfileStringA(itemName, "Module", "None", szBuffer, 1000, file); @@ -1192,7 +1192,7 @@ static void BTN_ReadItem(char *itemName, char *file) int i = 0; while(top_buttons[i].id) { - if(!_stricmp(top_buttons[i].szIcoLibIcon, szBuffer)) { + if (!_stricmp(top_buttons[i].szIcoLibIcon, szBuffer)) { tmpItem.uId = top_buttons[i].id; tmpItem.dwFlags |= BUTTON_ISINTERNAL; break; @@ -1273,7 +1273,7 @@ void IMG_LoadItems() DBFreeVariant(&dbv); - if(!PathFileExists(tszFileName)) + if (!PathFileExists(tszFileName)) return; IMG_DeleteItems(); @@ -1396,7 +1396,7 @@ void LoadPerContactSkins(TCHAR *tszFileName) break; } for(j = 0; j < i - 1; j++) { - if(!strcmp(szProto, items[j].szName) && !strcmp(UIN, items[j].szDBname) + if (!strcmp(szProto, items[j].szName) && !strcmp(UIN, items[j].szDBname) && lstrlenA(szProto) == lstrlenA(items[j].szName) && lstrlenA(UIN) == lstrlenA(items[j].szDBname)) { //_DebugPopup(hContact, "Found: %s, %s", szProto, UIN); @@ -1571,7 +1571,7 @@ static void ApplyCLUISkin() DBVARIANT dbv = {0}; TCHAR tszFinalName[MAX_PATH]; char szFinalName[MAX_PATH]; - if(!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { + if (!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { MY_pathToAbsolute(dbv.ptszVal, tszFinalName); #if defined(_UNICODE) WideCharToMultiByte(CP_ACP, 0, tszFinalName, MAX_PATH, szFinalName, MAX_PATH, 0, 0); @@ -1620,7 +1620,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_IGNORESELFORGROUPS, cfg::getByte("CLC", "IgnoreSelforGroups", 0) ? BST_CHECKED : BST_UNCHECKED); - if(!cfg::getString(NULL, "CLC", "ContactSkins", &dbv)) { + if (!cfg::getString(NULL, "CLC", "ContactSkins", &dbv)) { SetDlgItemTextA(hwndDlg, IDC_SKINFILE, dbv.pszVal); DBFreeVariant(&dbv); Utils::enableDlgControl(hwndDlg, IDC_RELOAD, TRUE); @@ -1628,7 +1628,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L else Utils::enableDlgControl(hwndDlg, IDC_RELOAD, FALSE); CheckDlgButton(hwndDlg, IDC_USESKIN, cfg::getByte("CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED); - if(!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { + if (!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.ptszVal); DBFreeVariant(&dbv); } @@ -1676,7 +1676,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L int skinChanged = 0; DBVARIANT dbv = {0}; - if(!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { + if (!cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { if(_tcscmp(dbv.ptszVal, final_path)) skinChanged = TRUE; DBFreeVariant(&dbv); @@ -1785,7 +1785,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara } case PSM_CHANGED: // used so tabs dont have to call SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0); - if(!iInit) + if (!iInit) SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case WM_COMMAND: @@ -1901,7 +1901,7 @@ int CoolSB_SetupScrollBar() !StatusItems[ID_EXTBKSCROLLBUTTONPRESSED - ID_STATUS_OFFLINE].IGNORED; - if(!StatusItems[ID_EXTBKSCROLLBACK - ID_STATUS_OFFLINE].imageItem || + if (!StatusItems[ID_EXTBKSCROLLBACK - ID_STATUS_OFFLINE].imageItem || !StatusItems[ID_EXTBKSCROLLBACKLOWER - ID_STATUS_OFFLINE].imageItem || !StatusItems[ID_EXTBKSCROLLTHUMB - ID_STATUS_OFFLINE].imageItem || !StatusItems[ID_EXTBKSCROLLTHUMBHOVER - ID_STATUS_OFFLINE].imageItem || diff --git a/plugins/Clist_nicer/SRC/init.cpp b/plugins/Clist_nicer/SRC/init.cpp index 59ada8931b..77d5ed123e 100644 --- a/plugins/Clist_nicer/SRC/init.cpp +++ b/plugins/Clist_nicer/SRC/init.cpp @@ -249,7 +249,7 @@ extern "C" int __declspec(dllexport) CListInitialise(PLUGINLINK * link) int iCount = CallService(MS_DB_CONTACT_GETCOUNT, 0, 0); iCount += 20; - if( iCount < 300 ) + if ( iCount < 300 ) iCount = 300; cfg::eCache = reinterpret_cast(malloc(sizeof(TExtraCache) * iCount)); @@ -301,7 +301,7 @@ extern "C" int __declspec(dllexport) CListInitialise(PLUGINLINK * link) if(cfg::dat.bFirstRun) cfg::writeByte("CLUI", "firstrun", 0); - if(!cfg::getString(NULL, "CLUI", "exIconOrder", &dbv)) { + if (!cfg::getString(NULL, "CLUI", "exIconOrder", &dbv)) { if(lstrlenA(dbv.pszVal) < EXICON_COUNT) { for(i = 1; i <= EXICON_COUNT; i++) cfg::dat.exIconOrder[i - 1] = i; @@ -349,7 +349,7 @@ LBL_Error: MessageBoxA( NULL, "This plugin requires Miranda IM 0.8.0.9 or later", "Fatal error", MB_OK ); return 1; } - if ( pcli->version < 6 ) // don't join it with the previous if() + if ( pcli->version < 6 ) // don't join it with the previous if () goto LBL_Error; pcli->pfnBuildGroupPopupMenu = BuildGroupPopupMenu; diff --git a/plugins/Clist_nicer/SRC/rowheight_funcs.cpp b/plugins/Clist_nicer/SRC/rowheight_funcs.cpp index bb06013fe0..3fe3c311a2 100644 --- a/plugins/Clist_nicer/SRC/rowheight_funcs.cpp +++ b/plugins/Clist_nicer/SRC/rowheight_funcs.cpp @@ -269,8 +269,8 @@ int RowHeight::getFloatingRowHeight(const ClcData *dat, HWND hwnd, ClcContact *c height = dat->fontInfo[GetBasicFontID(contact)].fontHeight; - if(!dat->bisEmbedded) { - if(!(dwFlags & FLT_SIMPLE)){ + if (!dat->bisEmbedded) { + if (!(dwFlags & FLT_SIMPLE)) { if(dwFlags & FLT_DUALROW) { height += (dat->fontInfo[FONTID_STATUS].fontHeight + cfg::dat.avatarPadding); } diff --git a/plugins/Clist_nicer/SRC/statusbar.cpp b/plugins/Clist_nicer/SRC/statusbar.cpp index 11308dac52..aba30d92a1 100644 --- a/plugins/Clist_nicer/SRC/statusbar.cpp +++ b/plugins/Clist_nicer/SRC/statusbar.cpp @@ -53,7 +53,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ptMouse = pt; if (tooltip_active){ KillTimer(hwnd, TIMERID_HOVER); - if(!NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0)) + if (!NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0)) CallService("mToolTip/HideTip", 0, 0); tooltip_active = FALSE; } @@ -77,7 +77,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: KillTimer(hwnd, TIMERID_HOVER); - if(!NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0)) + if (!NotifyEventHooks(hStatusBarHideToolTipEvent, 0, 0)) CallService("mToolTip/HideTip", 0, 0); tooltip_active = FALSE; break; @@ -113,7 +113,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM hOldFont = reinterpret_cast(SelectObject(hdcMem, GetStockObject(DEFAULT_GUI_FONT))); BitBlt(hdcMem, 0, 0, rcClient.right, rcClient.bottom, cfg::dat.hdcBg, pt.x, pt.y, SRCCOPY); item = &StatusItems[ID_EXTBKSTATUSBAR - ID_STATUS_OFFLINE]; - if(!item->IGNORED) { + if (!item->IGNORED) { RECT rc = rcClient; rc.left += item->MARGIN_LEFT; rc.right -= item->MARGIN_RIGHT; diff --git a/plugins/Clist_nicer/SRC/statusfloater.cpp b/plugins/Clist_nicer/SRC/statusfloater.cpp index acc3ba8dc0..06c088da45 100644 --- a/plugins/Clist_nicer/SRC/statusfloater.cpp +++ b/plugins/Clist_nicer/SRC/statusfloater.cpp @@ -163,22 +163,22 @@ void FLT_SnapToFloater(HWND hwnd) while(pCurrent) { GetWindowRect(pCurrent->hwnd, &rcWindow); //top - if((rcWindow.top - rcBase.bottom > -SNAP_FLT_TOLERANCE) && (rcWindow.top - rcBase.bottom < minTop)){ + if ((rcWindow.top - rcBase.bottom > -SNAP_FLT_TOLERANCE) && (rcWindow.top - rcBase.bottom < minTop)) { posTop = rcWindow.top; minTop = rcWindow.top - rcBase.bottom; } //bottom - if((rcBase.top - rcWindow.bottom > -SNAP_FLT_TOLERANCE) && (rcBase.top - rcWindow.bottom < minBottom)){ + if ((rcBase.top - rcWindow.bottom > -SNAP_FLT_TOLERANCE) && (rcBase.top - rcWindow.bottom < minBottom)) { posBottom = rcWindow.bottom; minBottom = rcBase.top - rcWindow.bottom; } //left - if((rcWindow.left - rcBase.right > -SNAP_FLT_TOLERANCE) && (rcWindow.left - rcBase.right < minLeft)){ + if ((rcWindow.left - rcBase.right > -SNAP_FLT_TOLERANCE) && (rcWindow.left - rcBase.right < minLeft)) { posLeft= rcWindow.left; minLeft = rcWindow.left - rcBase.right; } //right - if((rcBase.left - rcWindow.right > -SNAP_FLT_TOLERANCE) && (rcBase.left - rcWindow.right < minRight)){ + if ((rcBase.left - rcWindow.right > -SNAP_FLT_TOLERANCE) && (rcBase.left - rcWindow.right < minRight)) { posRight= rcWindow.right; minRight = rcBase.left - rcWindow.right; } @@ -315,7 +315,7 @@ INT_PTR CALLBACK DlgProcFloatingContacts(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_FLT_SIMPLELAYOUT: { - if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)){ + if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)) { int isSimple = IsDlgButtonChecked(hwndDlg, IDC_FLT_SIMPLELAYOUT); Utils::enableDlgControl(hwndDlg, IDC_FLT_AVATARS, !isSimple); Utils::enableDlgControl(hwndDlg, IDC_FLT_EXTRAICONS, !isSimple); @@ -325,7 +325,7 @@ INT_PTR CALLBACK DlgProcFloatingContacts(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_FLT_BORDER: { - if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)){ + if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)) { int isBorder = IsDlgButtonChecked(hwndDlg, IDC_FLT_BORDER); Utils::enableDlgControl(hwndDlg, IDC_FLT_BORDERCOLOUR, isBorder); } @@ -333,7 +333,7 @@ INT_PTR CALLBACK DlgProcFloatingContacts(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_FLT_ROUNDED: { - if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)){ + if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)) { int isRounded = IsDlgButtonChecked(hwndDlg, IDC_FLT_ROUNDED); Utils::enableDlgControl(hwndDlg, IDC_FLT_RADIUS, isRounded); Utils::enableDlgControl(hwndDlg, IDC_FLT_RADIUSSPIN, isRounded); @@ -342,7 +342,7 @@ INT_PTR CALLBACK DlgProcFloatingContacts(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_FLT_SHOWTOOLTIPS: { - if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)){ + if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED)) { int isTooltip = IsDlgButtonChecked(hwndDlg, IDC_FLT_SHOWTOOLTIPS); int isDefHoverTime = IsDlgButtonChecked(hwndDlg, IDC_FLT_DEFHOVERTIME); Utils::enableDlgControl(hwndDlg, IDC_FLT_DEFHOVERTIME, isTooltip); @@ -353,7 +353,7 @@ INT_PTR CALLBACK DlgProcFloatingContacts(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_FLT_DEFHOVERTIME: { - if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED) && IsDlgButtonChecked(hwndDlg, IDC_FLT_SHOWTOOLTIPS)){ + if (IsDlgButtonChecked(hwndDlg, IDC_FLT_ENABLED) && IsDlgButtonChecked(hwndDlg, IDC_FLT_SHOWTOOLTIPS)) { int isDefHoverTime = IsDlgButtonChecked(hwndDlg, IDC_FLT_DEFHOVERTIME); Utils::enableDlgControl(hwndDlg, IDC_FLT_HOVERTIME, !isDefHoverTime); Utils::enableDlgControl(hwndDlg, IDC_FLT_HOVERTIMESPIN, !isDefHoverTime); @@ -517,7 +517,7 @@ LRESULT CALLBACK StatusFloaterClassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR GetCursorPos(&ptMouse); GetWindowRect(hwnd, &rcWindow); rcWindow.right = rcWindow.left + 25; - if(!PtInRect(&rcWindow, ptMouse)) + if (!PtInRect(&rcWindow, ptMouse)) return SendMessage(hwnd, WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(ptMouse.x, ptMouse.y)); break; } @@ -631,12 +631,12 @@ LRESULT CALLBACK ContactFloaterClassProc(HWND hwnd, UINT msg, WPARAM wParam, LPA GetCursorPos(&ptMouse); GetWindowRect(hwnd, &rcWindow); rcWindow.right = rcWindow.left + 25; - if(!PtInRect(&rcWindow, ptMouse)) + if (!PtInRect(&rcWindow, ptMouse)) return SendMessage(hwnd, WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(ptMouse.x, ptMouse.y)); break; } case WM_MOUSEMOVE: - if( API::pfnTrackMouseEvent && !hover ) { + if ( API::pfnTrackMouseEvent && !hover ) { TRACKMOUSEEVENT tme; tme.cbSize = sizeof(TRACKMOUSEEVENT); tme.dwFlags = TME_HOVER | TME_LEAVE; @@ -664,7 +664,7 @@ LRESULT CALLBACK ContactFloaterClassProc(HWND hwnd, UINT msg, WPARAM wParam, LPA while(pCurrent->hwnd != hwnd) pCurrent = pCurrent->pNextFloater; - if(FindItem(pcli->hwndContactTree, cfg::clcdat, pCurrent->hContact, &contact, NULL, 0)){ + if(FindItem(pcli->hwndContactTree, cfg::clcdat, pCurrent->hContact, &contact, NULL, 0)) { g_floatoptions.trans = g_floatoptions.act_trans; FLT_Update(cfg::clcdat, contact); g_floatoptions.trans = oldTrans; @@ -818,7 +818,7 @@ void SFL_Update(HICON hIcon, int iIcon, HIMAGELIST hIml, const TCHAR *szText, BO sfl_statustext[99] = 0; } - if(!hIcon) { + if (!hIcon) { HICON p_hIcon; if(refresh) @@ -941,7 +941,7 @@ void FLT_SetSize(struct TExtraCache *centry, LONG width, LONG height) int flags = SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOACTIVATE; int iVis = pcli->pfnGetWindowVisibleState(pcli->hwndContactList, 0, 0); - if((g_floatoptions.dwFlags & FLT_AUTOHIDE) && (iVis == 2 || iVis == 4)) //2 = GWVS_VISIBLE, 4 = GWVS_PARTIALLY_COVERED + if ((g_floatoptions.dwFlags & FLT_AUTOHIDE) && (iVis == 2 || iVis == 4)) //2 = GWVS_VISIBLE, 4 = GWVS_PARTIALLY_COVERED flags = SWP_NOMOVE | SWP_NOACTIVATE; if(centry->floater) { @@ -1093,19 +1093,19 @@ void FLT_Update(struct ClcData *dat, struct ClcContact *contact) cfg::eCache[contact->extraCacheEntry].dwXMask = 0; } else{ - if(!(g_floatoptions.dwFlags & FLT_AVATARS)) { + if (!(g_floatoptions.dwFlags & FLT_AVATARS)) { contact->ace = 0; g_list_avatars = 0; } else g_list_avatars = 1; - if(!(g_floatoptions.dwFlags & FLT_DUALROW)) + if (!(g_floatoptions.dwFlags & FLT_DUALROW)) contact->bSecondLine = MULTIROW_NEVER; else contact->bSecondLine = MULTIROW_ALWAYS; - if(!(g_floatoptions.dwFlags & FLT_EXTRAICONS)) { + if (!(g_floatoptions.dwFlags & FLT_EXTRAICONS)) { cfg::dat.dwFlags &= ~(CLUI_SHOWCLIENTICONS | CLUI_SHOWVISI); cfg::eCache[contact->extraCacheEntry].dwXMask = 0; } @@ -1178,10 +1178,10 @@ void FLT_SyncWithClist() if(g_floatoptions.dwFlags & FLT_SYNCWITHCLIST){ while(pCurrent) { hwnd = pCurrent->hwnd; - if(hwnd && IsWindow(hwnd)){ + if(hwnd && IsWindow(hwnd)) { if(FindItem(pcli->hwndContactTree, cfg::clcdat, pCurrent->hContact, &contact, NULL, 0)) { FLT_Update(cfg::clcdat, contact); - if(((g_floatoptions.dwFlags & FLT_AUTOHIDE) && (iVis == 2 || iVis == 4)) || !(g_floatoptions.dwFlags & FLT_AUTOHIDE)) + if (((g_floatoptions.dwFlags & FLT_AUTOHIDE) && (iVis == 2 || iVis == 4)) || !(g_floatoptions.dwFlags & FLT_AUTOHIDE)) ShowWindow(hwnd, SW_SHOWNOACTIVATE); else ShowWindow(hwnd, SW_HIDE); @@ -1208,7 +1208,7 @@ void FLT_ShowHideAll(int showCmd) if(g_floatoptions.dwFlags & FLT_AUTOHIDE){ while(pCurrent) { hwnd = pCurrent->hwnd; - if(hwnd && IsWindow(hwnd)){ + if(hwnd && IsWindow(hwnd)) { if(showCmd == SW_SHOWNOACTIVATE && FindItem(pcli->hwndContactTree, cfg::clcdat, pCurrent->hContact, &contact, NULL, 0)) ShowWindow(hwnd, SW_SHOWNOACTIVATE); else if(showCmd != SW_SHOWNOACTIVATE) diff --git a/plugins/Clist_nicer/SRC/viewmodes.cpp b/plugins/Clist_nicer/SRC/viewmodes.cpp index ab51b0e121..a8d48f754e 100644 --- a/plugins/Clist_nicer/SRC/viewmodes.cpp +++ b/plugins/Clist_nicer/SRC/viewmodes.cpp @@ -498,7 +498,7 @@ void UpdateFilters() if(cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv_gf)) goto cleanup; mir_snprintf(szSetting, 128, "%c%s_OPT", 246, szBuf); - if((opt = cfg::getDword(NULL, CLVM_MODULE, szSetting, -1)) != -1) { + if ((opt = cfg::getDword(NULL, CLVM_MODULE, szSetting, -1)) != -1) { SendDlgItemMessage(clvmHwnd, IDC_AUTOCLEARSPIN, UDM_SETPOS, 0, MAKELONG(LOWORD(opt), 0)); } mir_snprintf(szSetting, 128, "%c%s_SM", 246, szBuf); @@ -555,7 +555,7 @@ void UpdateFilters() int i; for(i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { - if((1 << (i - ID_STATUS_OFFLINE)) & statusMask) + if ((1 << (i - ID_STATUS_OFFLINE)) & statusMask) ListView_SetCheckState(hwndList, i - ID_STATUS_OFFLINE, TRUE) else ListView_SetCheckState(hwndList, i - ID_STATUS_OFFLINE, FALSE); @@ -703,7 +703,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP mir_snprintf(szSetting, 256, "%c%s_SSM", 246, szBuf); DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); DBDeleteContactSetting(NULL, CLVM_MODULE, szBuf); - if(!strcmp(cfg::dat.current_viewmode, szBuf) && lstrlenA(szBuf) == lstrlenA(cfg::dat.current_viewmode)) { + if (!strcmp(cfg::dat.current_viewmode, szBuf) && lstrlenA(szBuf) == lstrlenA(cfg::dat.current_viewmode)) { cfg::dat.bFilterEffective = 0; pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); SetWindowTextA(hwndSelector, Translate("No view mode")); @@ -826,7 +826,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP break; hItem = (HANDLE)SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_HITTEST,(WPARAM)&hitFlags,MAKELPARAM(nm->pt.x,nm->pt.y)); if(hItem==NULL) break; - if(!(hitFlags&CLCHT_ONITEMEXTRA)) + if (!(hitFlags&CLCHT_ONITEMEXTRA)) break; iImage = SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0)); if(iImage == nullImage) @@ -1014,7 +1014,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; KillTimer(hwnd, wParam); - if(!cfg::dat.old_viewmode[0]) + if (!cfg::dat.old_viewmode[0]) SendMessage(hwnd, WM_COMMAND, IDC_RESETMODES, 0); else ApplyViewMode((const char *)cfg::dat.old_viewmode); @@ -1069,7 +1069,7 @@ clvm_reset_command: break; case IDC_CONFIGUREMODES: clvm_config_command: - if(!g_ViewModeOptDlg) + if (!g_ViewModeOptDlg) CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_OPT_VIEWMODES), 0, DlgProcViewModesSetup, 0); break; } @@ -1126,7 +1126,7 @@ void ApplyViewMode(const char *name) cfg::dat.bFilterEffective = 0; mir_snprintf(szSetting, 256, "%c%s_PF", 246, name); - if(!cfg::getString(NULL, CLVM_MODULE, szSetting, &dbv)) { + if (!cfg::getString(NULL, CLVM_MODULE, szSetting, &dbv)) { if(lstrlenA(dbv.pszVal) >= 2) { strncpy(cfg::dat.protoFilter, dbv.pszVal, sizeof(cfg::dat.protoFilter)); cfg::dat.protoFilter[sizeof(cfg::dat.protoFilter) - 1] = 0; @@ -1135,7 +1135,7 @@ void ApplyViewMode(const char *name) mir_free(dbv.pszVal); } mir_snprintf(szSetting, 256, "%c%s_GF", 246, name); - if(!cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv)) { + if (!cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv)) { if(lstrlen(dbv.ptszVal) >= 2) { _tcsncpy(cfg::dat.groupFilter, dbv.ptszVal, safe_sizeof(cfg::dat.groupFilter)); cfg::dat.groupFilter[safe_sizeof(cfg::dat.groupFilter) - 1] = 0; @@ -1155,7 +1155,7 @@ void ApplyViewMode(const char *name) /* mir_snprintf(szSetting, 256, "%c%s_VA", 246, name); - if(!DBGetContactSettingString(NULL, CLVM_MODULE, szSetting, &dbv)) { + if (!DBGetContactSettingString(NULL, CLVM_MODULE, szSetting, &dbv)) { strncpy(g_CluiData.varFilter, dbv.pszVal, sizeof(g_CluiData.varFilter)); g_CluiData.varFilter[sizeof(g_CluiData.varFilter) - 1] = 0; if(lstrlenA(g_CluiData.varFilter) > 10 && ServiceExists(MS_VARS_FORMATSTRING)) @@ -1174,7 +1174,7 @@ void ApplyViewMode(const char *name) if(szProto) { id = (char*) CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0); if(id) { - if(!DBGetContactSetting(hContact, szProto, id, &dbv)) { + if (!DBGetContactSetting(hContact, szProto, id, &dbv)) { if(dbv.type == DBVT_ASCIIZ) { mir_snprintf(UIN, 256, "<%s:%s>", szProto, dbv.pszVal); } diff --git a/plugins/Clist_nicer/coolsb/coolsblib.cpp b/plugins/Clist_nicer/coolsb/coolsblib.cpp index ac9ee2a360..b8c986b120 100644 --- a/plugins/Clist_nicer/coolsb/coolsblib.cpp +++ b/plugins/Clist_nicer/coolsb/coolsblib.cpp @@ -47,7 +47,7 @@ SCROLLBAR *GetScrollBarFromHwnd(HWND hwnd, UINT nBar) { SCROLLWND *sw = GetScrollWndFromHwnd(hwnd); - if(!sw) return 0; + if (!sw) return 0; if(nBar == SB_HORZ) return &sw->sbarHorz; @@ -285,10 +285,10 @@ BOOL WINAPI CoolSB_EnableScrollBar (HWND hwnd, int wSBflags, UINT wArrows) UINT oldstate; BOOL bFailed = FALSE; - if(!CoolSB_IsCoolScrollEnabled(hwnd)) + if (!CoolSB_IsCoolScrollEnabled(hwnd)) return EnableScrollBar(hwnd, wSBflags, wArrows); - if((wSBflags == SB_HORZ || wSBflags == SB_BOTH) && + if ((wSBflags == SB_HORZ || wSBflags == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { oldstate = sbar->fScrollFlags; @@ -301,7 +301,7 @@ BOOL WINAPI CoolSB_EnableScrollBar (HWND hwnd, int wSBflags, UINT wArrows) } - if((wSBflags == SB_VERT || wSBflags == SB_BOTH) && + if ((wSBflags == SB_VERT || wSBflags == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { oldstate = sbar->fScrollFlags; @@ -327,10 +327,10 @@ BOOL WINAPI CoolSB_GetScrollInfo (HWND hwnd, int fnBar, LPSCROLLINFO lpsi) SCROLLINFO *mysi; BOOL copied = FALSE; - if(!lpsi) + if (!lpsi) return FALSE; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, fnBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, fnBar))) { return GetScrollInfo(hwnd, fnBar, lpsi); } @@ -367,7 +367,7 @@ int WINAPI CoolSB_GetScrollPos (HWND hwnd, int nBar) { SCROLLINFO *mysi; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) return GetScrollPos(hwnd, nBar); return mysi->nPos; @@ -377,10 +377,10 @@ BOOL WINAPI CoolSB_GetScrollRange (HWND hwnd, int nBar, LPINT lpMinPos, LPINT lp { SCROLLINFO *mysi; - if(!lpMinPos || !lpMaxPos) + if (!lpMinPos || !lpMaxPos) return FALSE; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) return GetScrollRange(hwnd, nBar, lpMinPos, lpMaxPos); *lpMinPos = mysi->nMin; @@ -395,10 +395,10 @@ int WINAPI CoolSB_SetScrollInfo (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL f SCROLLBAR *sbar; BOOL fRecalcFrame = FALSE; - if(!lpsi) + if (!lpsi) return FALSE; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, fnBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, fnBar))) return SetScrollInfo(hwnd, fnBar, lpsi, fRedraw); //if(CoolSB_IsThumbTracking(hwnd)) @@ -426,9 +426,9 @@ int WINAPI CoolSB_SetScrollInfo (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL f sbar = GetScrollBarFromHwnd(hwnd, fnBar); - if((lpsi->fMask & SIF_DISABLENOSCROLL) || (sbar->fScrollFlags & CSBS_THUMBALWAYS)) + if ((lpsi->fMask & SIF_DISABLENOSCROLL) || (sbar->fScrollFlags & CSBS_THUMBALWAYS)) { - if(!sbar->fScrollVisible) + if (!sbar->fScrollVisible) { CoolSB_ShowScrollBar(hwnd, fnBar, TRUE); fRecalcFrame = TRUE; @@ -436,7 +436,7 @@ int WINAPI CoolSB_SetScrollInfo (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL f } else { - if( mysi->nPage > (UINT)mysi->nMax + if ( mysi->nPage > (UINT)mysi->nMax || mysi->nPage == (UINT)mysi->nMax && mysi->nMax == 0 || mysi->nMax <= mysi->nMin) { @@ -448,7 +448,7 @@ int WINAPI CoolSB_SetScrollInfo (HWND hwnd, int fnBar, LPSCROLLINFO lpsi, BOOL f } else { - if(!sbar->fScrollVisible) + if (!sbar->fScrollVisible) { CoolSB_ShowScrollBar(hwnd, fnBar, TRUE); fRecalcFrame = TRUE; @@ -470,7 +470,7 @@ int WINAPI CoolSB_SetScrollPos(HWND hwnd, int nBar, int nPos, BOOL fRedraw) SCROLLINFO *mysi; int oldpos; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) { return SetScrollPos(hwnd, nBar, nPos, fRedraw); } @@ -494,7 +494,7 @@ int WINAPI CoolSB_SetScrollRange (HWND hwnd, int nBar, int nMinPos, int nMaxPos, { SCROLLINFO *mysi; - if(!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) + if (!(mysi = GetScrollInfoFromHwnd(hwnd, nBar))) return SetScrollRange(hwnd, nBar, nMinPos, nMaxPos, fRedraw); if(CoolSB_IsThumbTracking(hwnd)) @@ -520,10 +520,10 @@ BOOL WINAPI CoolSB_ShowScrollBar (HWND hwnd, int wBar, BOOL fShow) BOOL bFailed = FALSE; DWORD dwStyle = GetWindowLong(hwnd, GWL_STYLE); - if(!CoolSB_IsCoolScrollEnabled(hwnd)) + if (!CoolSB_IsCoolScrollEnabled(hwnd)) return ShowScrollBar(hwnd, wBar, fShow); - if((wBar == SB_HORZ || wBar == SB_BOTH) && + if ((wBar == SB_HORZ || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { sbar->fScrollFlags = sbar->fScrollFlags & ~CSBS_VISIBLE; @@ -534,7 +534,7 @@ BOOL WINAPI CoolSB_ShowScrollBar (HWND hwnd, int wBar, BOOL fShow) else SetWindowLong(hwnd, GWL_STYLE, dwStyle & ~WS_HSCROLL); } - if((wBar == SB_VERT || wBar == SB_BOTH) && + if ((wBar == SB_VERT || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { sbar->fScrollFlags = sbar->fScrollFlags & ~CSBS_VISIBLE; @@ -572,7 +572,7 @@ HRESULT WINAPI UninitializeCoolSB(HWND hwnd) { int i = 0; SCROLLWND *sw = GetScrollWndFromHwnd(hwnd); - if(!sw) return E_FAIL; + if (!sw) return E_FAIL; //restore the window procedure with the original one SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)sw->oldproc); @@ -610,9 +610,9 @@ BOOL WINAPI CoolSB_InsertButton(HWND hwnd, int wSBflags, UINT nPos, SCROLLBUT *p SCROLLBUT *sbut; UINT i; - if(!psb) return FALSE; + if (!psb) return FALSE; - if(!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) + if (!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) return FALSE; //check that we havn't reached the maximum allowed buttons yet @@ -625,7 +625,7 @@ BOOL WINAPI CoolSB_InsertButton(HWND hwnd, int wSBflags, UINT nPos, SCROLLBUT *p sbut = &sbar->sbButtons[sbar->nButtons]; } //otherwise, need to make room - else if((int)nPos < 0 || (int)nPos > (UINT)sbar->nButtons) + else if ((int)nPos < 0 || (int)nPos > (UINT)sbar->nButtons) { return FALSE; } @@ -688,7 +688,7 @@ BOOL WINAPI CoolSB_InsertButton(HWND hwnd, int wSBflags, UINT nPos, SCROLLBUT *p We don't use the callback function anymore. The uButType member must now specify SBBT_OWNERDRAW, and a WM_NOTIFY will be sent when a button must be drawn - if((psb->fMask & SBBF_OWNERDRAW) && ((psb->uButType & SBBT_MASK) == SBBT_OWNERDRAW)) + if ((psb->fMask & SBBF_OWNERDRAW) && ((psb->uButType & SBBT_MASK) == SBBT_OWNERDRAW)) pDrawProc = psb->pDrawProc; else pDrawProc = 0;*/ @@ -698,7 +698,7 @@ BOOL WINAPI CoolSB_InsertButton(HWND hwnd, int wSBflags, UINT nPos, SCROLLBUT *p //MAKE SURE that any resizable buttons are only to the left / above //a scrollbar. We don't support resize operations to the right of a scrollbar - if((sbut->uButType & SBBM_RESIZABLE) && sbut->uPlacement == SBBP_RIGHT) + if ((sbut->uButType & SBBM_RESIZABLE) && sbut->uPlacement == SBBP_RIGHT) sbut->uButType &= ~SBBM_RESIZABLE; if(psb->fMask & SBBF_BUTMINMAX) @@ -739,10 +739,10 @@ BOOL WINAPI CoolSB_ModifyButton (HWND hwnd, int wSBflags, UINT uItem, BOOL fByCm SCROLLBAR *sbar; SCROLLBUT *sbut; - if(!psb) return FALSE; + if (!psb) return FALSE; //find if this window is CoolScroll enabled - if(!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) + if (!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) return FALSE; //find the button to modify, depending on if we @@ -750,7 +750,7 @@ BOOL WINAPI CoolSB_ModifyButton (HWND hwnd, int wSBflags, UINT uItem, BOOL fByCm if(fByCmd == FALSE) { //button from position - if((int)uItem < 0 || (int)uItem >= (UINT)sbar->nButtons) + if ((int)uItem < 0 || (int)uItem >= (UINT)sbar->nButtons) return FALSE; else sbut = &sbar->sbButtons[uItem]; @@ -758,7 +758,7 @@ BOOL WINAPI CoolSB_ModifyButton (HWND hwnd, int wSBflags, UINT uItem, BOOL fByCm else if(fByCmd == TRUE) { //button from command identifier - if(!(sbut = GetButtonFromId(sbar, uItem))) + if (!(sbut = GetButtonFromId(sbar, uItem))) return FALSE; } @@ -786,7 +786,7 @@ BOOL WINAPI CoolSB_RemoveButton(HWND hwnd, int wSBflags, UINT uItem, BOOL fByCmd SCROLLBAR *sbar; //find if this window is CoolScroll enabled - if(!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) + if (!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) return FALSE; //find the button to modify, depending on if we @@ -833,10 +833,10 @@ BOOL WINAPI CoolSB_GetButton(HWND hwnd, int wSBflags, UINT uItem, BOOL fByCmd, S SCROLLBAR *sbar; SCROLLBUT *sbut; - if(!psb) return FALSE; + if (!psb) return FALSE; //find if this window is CoolScroll enabled - if(!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) + if (!(sbar = GetScrollBarFromHwnd(hwnd, wSBflags))) return FALSE; //find the button to modify, depending on if we @@ -844,7 +844,7 @@ BOOL WINAPI CoolSB_GetButton(HWND hwnd, int wSBflags, UINT uItem, BOOL fByCmd, S if(fByCmd == FALSE) { //button from position - if((int)uItem < 0 || (int)uItem >= (UINT)sbar->nButtons) + if ((int)uItem < 0 || (int)uItem >= (UINT)sbar->nButtons) return FALSE; else sbut = &sbar->sbButtons[uItem]; @@ -852,7 +852,7 @@ BOOL WINAPI CoolSB_GetButton(HWND hwnd, int wSBflags, UINT uItem, BOOL fByCmd, S else if(fByCmd == TRUE) { //button from command identifier - if(!(sbut = GetButtonFromId(sbar, uItem))) + if (!(sbut = GetButtonFromId(sbar, uItem))) return FALSE; } @@ -887,17 +887,17 @@ BOOL WINAPI CoolSB_SetSize (HWND hwnd, int wBar, int nLength, int nWidth) if(nLength > 256 || nWidth > 256) return FALSE; - if(!GetScrollWndFromHwnd(hwnd)) + if (!GetScrollWndFromHwnd(hwnd)) return FALSE; - if((wBar == SB_HORZ || wBar == SB_BOTH) && + if ((wBar == SB_HORZ || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { sbar->nArrowLength = nLength; sbar->nArrowWidth = nWidth; } - if((wBar == SB_VERT || wBar == SB_BOTH) && + if ((wBar == SB_VERT || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { sbar->nArrowLength = nLength; @@ -919,16 +919,16 @@ BOOL WINAPI CoolSB_SetStyle(HWND hwnd, int wBar, UINT nStyle) { SCROLLBAR *sbar; - if(!GetScrollWndFromHwnd(hwnd)) + if (!GetScrollWndFromHwnd(hwnd)) return FALSE; - if((wBar == SB_HORZ || wBar == SB_BOTH) && + if ((wBar == SB_HORZ || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { sbar->fFlatScrollbar = nStyle; } - if((wBar == SB_VERT || wBar == SB_BOTH) && + if ((wBar == SB_VERT || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { sbar->fFlatScrollbar = nStyle; @@ -948,10 +948,10 @@ BOOL WINAPI CoolSB_SetThumbAlways(HWND hwnd, int wBar, BOOL fThumbAlways) { SCROLLBAR *sbar; - if(!GetScrollWndFromHwnd(hwnd)) + if (!GetScrollWndFromHwnd(hwnd)) return FALSE; - if((wBar == SB_HORZ || wBar == SB_BOTH) && + if ((wBar == SB_HORZ || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { if(fThumbAlways) @@ -960,7 +960,7 @@ BOOL WINAPI CoolSB_SetThumbAlways(HWND hwnd, int wBar, BOOL fThumbAlways) sbar->fScrollFlags &= ~CSBS_THUMBALWAYS; } - if((wBar == SB_VERT || wBar == SB_BOTH) && + if ((wBar == SB_VERT || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { if(fThumbAlways) @@ -981,19 +981,19 @@ BOOL WINAPI CoolSB_SetMinThumbSize(HWND hwnd, UINT wBar, UINT size) { SCROLLBAR *sbar; - if(!GetScrollWndFromHwnd(hwnd)) + if (!GetScrollWndFromHwnd(hwnd)) return FALSE; if(size == -1) size = CoolSB_GetDefaultMinThumbSize(); - if((wBar == SB_HORZ || wBar == SB_BOTH) && + if ((wBar == SB_HORZ || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_HORZ))) { sbar->nMinThumbSize = size; } - if((wBar == SB_VERT || wBar == SB_BOTH) && + if ((wBar == SB_VERT || wBar == SB_BOTH) && (sbar = GetScrollBarFromHwnd(hwnd, SB_VERT))) { sbar->nMinThumbSize = size; diff --git a/plugins/Clist_nicer/coolsb/coolscroll.cpp b/plugins/Clist_nicer/coolsb/coolscroll.cpp index 68fd144edb..ae31ec3e47 100644 --- a/plugins/Clist_nicer/coolsb/coolscroll.cpp +++ b/plugins/Clist_nicer/coolsb/coolscroll.cpp @@ -106,7 +106,7 @@ BOOL WINAPI CoolSB_IsThumbTracking(HWND hwnd) { SCROLLWND *sw; - if((sw = GetScrollWndFromHwnd(hwnd)) == NULL) + if ((sw = GetScrollWndFromHwnd(hwnd)) == NULL) return FALSE; else return sw->fThumbTracking; @@ -142,7 +142,7 @@ static void __stdcall RotateRect0(SCROLLBAR *sb, RECT *rect) // static BOOL IsScrollInfoActive(SCROLLINFO *si) { - if((si->nPage > (UINT)si->nMax + if ((si->nPage > (UINT)si->nMax || si->nMax <= si->nMin || si->nMax == 0)) return FALSE; else @@ -155,7 +155,7 @@ static BOOL IsScrollInfoActive(SCROLLINFO *si) static BOOL IsScrollbarActive(SCROLLBAR *sb) { SCROLLINFO *si = &sb->scrollInfo; - if(((sb->fScrollFlags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) || + if (((sb->fScrollFlags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH) || !(sb->fScrollFlags & CSBS_THUMBALWAYS) && !IsScrollInfoActive(si)) return FALSE; else @@ -832,7 +832,7 @@ static LRESULT NCDrawHScrollbar(SCROLLBAR *sb, HWND hwnd, HDC hdc, const RECT *r if(sb->fScrollFlags & ESB_DISABLE_RIGHT) uRightButFlags |= DFCS_INACTIVE; //if we need to grey the arrows because there is no data to scroll - if(!IsScrollInfoActive(si) && !(sb->fScrollFlags & CSBS_THUMBALWAYS)) + if (!IsScrollInfoActive(si) && !(sb->fScrollFlags & CSBS_THUMBALWAYS)) { uLeftButFlags |= DFCS_INACTIVE; uRightButFlags |= DFCS_INACTIVE; @@ -954,7 +954,7 @@ static LRESULT NCDrawHScrollbar(SCROLLBAR *sb, HWND hwnd, HDC hdc, const RECT *r //if we always show the thumb covering the whole scrollbar, //then draw it that way - if(!IsScrollInfoActive(si) && (sb->fScrollFlags & CSBS_THUMBALWAYS) + if (!IsScrollInfoActive(si) && (sb->fScrollFlags & CSBS_THUMBALWAYS) && ctrl.right - ctrl.left > sb->nMinThumbSize) { //leave a 1-pixel gap between the thumb + right button @@ -1342,7 +1342,7 @@ static LRESULT DrawHorzButtons(SCROLLBAR *sbar, HDC hdc, const RECT *rect, int l for(i = 0; i < sbar->nButtons; i++) { - if((leftright & SBBP_LEFT) && sbut[i].uPlacement == SBBP_LEFT) + if ((leftright & SBBP_LEFT) && sbut[i].uPlacement == SBBP_LEFT) { int butwidth = GetSingleButSize(sbar, &sbut[i]); SetRect(&ctrl, xposl, rect->top, xposl + butwidth, rect->bottom); @@ -1352,7 +1352,7 @@ static LRESULT DrawHorzButtons(SCROLLBAR *sbar, HDC hdc, const RECT *rect, int l xposl += butwidth; } - if((leftright & SBBP_RIGHT) && sbut[i].uPlacement == SBBP_RIGHT) + if ((leftright & SBBP_RIGHT) && sbut[i].uPlacement == SBBP_RIGHT) { int butwidth = GetSingleButSize(sbar, &sbut[i]); SetRect(&ctrl, xposr, rect->top, xposr + butwidth, rect->bottom); @@ -1603,7 +1603,7 @@ static LRESULT NCPaint(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam) CopyRect(&rect2, &rect); OffsetRect(&rect2, winrect.left, winrect.top); - if(!sw->fLeftScrollbar && parent.right == rect2.right+sw->cxRightEdge && parent.bottom == rect2.bottom+sw->cyBottomEdge + if (!sw->fLeftScrollbar && parent.right == rect2.right+sw->cxRightEdge && parent.bottom == rect2.bottom+sw->cyBottomEdge || sw->fLeftScrollbar && parent.left == rect2.left -sw->cxLeftEdge && parent.bottom == rect2.bottom+sw->cyBottomEdge) DrawFrameControl(hdc, &rect, DFC_SCROLL, sw->fLeftScrollbar ? DFCS_SCROLLSIZEGRIPRIGHT : DFCS_SCROLLSIZEGRIP ); else @@ -1770,7 +1770,7 @@ static UINT GetHorzButtonFromPt(SCROLLBAR *sb, RECT *rect, POINT pt, BOOL fRetur int butwidth; SCROLLBUT *sbut = sb->sbButtons; - if(!PtInRect(rect, pt)) + if (!PtInRect(rect, pt)) return -1; if(sb->fButVisibleAfter) @@ -2007,7 +2007,7 @@ static LRESULT NCLButtonDown(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lPa case HTSCROLL_THUMB: //if the scrollbar is disabled, then do no further processing - if(!IsScrollbarActive(sb)) + if (!IsScrollbarActive(sb)) return 0; GetRealScrollRect(sb, &rect); @@ -2056,7 +2056,7 @@ static LRESULT NCLButtonDown(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lPa target1: //if the scrollbar is disabled, then do no further processing - if(!IsScrollbarActive(sb)) + if (!IsScrollbarActive(sb)) break; //ajust the horizontal rectangle to NOT include @@ -2162,7 +2162,7 @@ static LRESULT LButtonUp(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam) SCROLLBUT *sbut = &sb->sbButtons[buttonIdx]; UINT cmdid = sbut->uCmdId; - if((sbut->uButType & SBBT_MASK) == SBBT_TOGGLEBUTTON) + if ((sbut->uButType & SBBT_MASK) == SBBT_TOGGLEBUTTON) sbut->uState ^= 1; //send a notify?? @@ -2274,7 +2274,7 @@ static LRESULT ThumbTrackHorz(SCROLLBAR *sbar, HWND hwnd, int x, int y) //if the mouse is not in a suitable distance of the scrollbar, //then "snap" the thumb back to its initial position #ifdef SNAP_THUMB_BACK - if(!PtInRect(&rc2, pt)) + if (!PtInRect(&rc2, pt)) { thumbpos = nThumbPos0; } @@ -2494,7 +2494,7 @@ static LRESULT MouseMove(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam) if(sbut->nSize < (int)sbut->nMinSize) sbut->nSize = sbut->nMinSize; - if((UINT)sbut->nSize > (UINT)sbut->nMaxSize) + if ((UINT)sbut->nSize > (UINT)sbut->nMaxSize) sbut->nSize = sbut->nMaxSize; GetScrollRect(sw, uCurrentScrollbar, hwnd, &rect2); @@ -2645,7 +2645,7 @@ static void ResizeButtonsToFit(SCROLLWND *sw, SCROLLBAR *sbar, HWND hwnd) if(sbut->nSize < (int)sbut->nMinSize) sbut->nSize = sbut->nMinSize; - if((UINT)sbut->nSize > (UINT)sbut->nMaxSize) + if ((UINT)sbut->nSize > (UINT)sbut->nMaxSize) sbut->nSize = sbut->nMaxSize; @@ -2713,7 +2713,7 @@ static LRESULT NCCalcSize(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam //if there is room, allocate some space for the horizontal scrollbar //NOTE: Change the ">" to a ">=" to make the horz bar totally fill the //window before disappearing - if((sb->fScrollFlags & CSBS_VISIBLE) && + if ((sb->fScrollFlags & CSBS_VISIBLE) && #ifdef COOLSB_FILLWINDOW rect->bottom - rect->top >= GetScrollMetric(sb, SM_CYHORZSB)) #else @@ -2729,7 +2729,7 @@ static LRESULT NCCalcSize(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam sb = &sw->sbarVert; //if there is room, allocate some space for the vertical scrollbar - if((sb->fScrollFlags & CSBS_VISIBLE) && + if ((sb->fScrollFlags & CSBS_VISIBLE) && rect->right - rect->left >= GetScrollMetric(sb, SM_CXVERTSB)) { if(sw->fLeftScrollbar) @@ -2822,7 +2822,7 @@ static LRESULT CoolSB_Timer(SCROLLWND *swnd, HWND hwnd, WPARAM wTimerId, LPARAM //then kill the timer.. GetCursorPos(&pt); - if(!PtInRect(&MouseOverRect, pt)) + if (!PtInRect(&MouseOverRect, pt)) { KillTimer(hwnd, uMouseOverId); uMouseOverId = 0; @@ -3020,7 +3020,7 @@ static LRESULT CoolSB_SetCursor(SCROLLWND *swnd, HWND hwnd, WPARAM wParam, LPARA } //set the cursor if one has been specified - if((id = GetButtonFromPt(sbar, &rect, pt, TRUE)) != -1) + if ((id = GetButtonFromPt(sbar, &rect, pt, TRUE)) != -1) { sbut = &sbar->sbButtons[id]; curTool = sbut->uCmdId; diff --git a/plugins/ContactsPlus/contacts.vcxproj b/plugins/ContactsPlus/contacts.vcxproj index 11c856d9e1..bd814a7095 100644 --- a/plugins/ContactsPlus/contacts.vcxproj +++ b/plugins/ContactsPlus/contacts.vcxproj @@ -156,6 +156,8 @@ WIN64;_DEBUG;_WINDOWS;_USRDLL;CONTACTS_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks false + Use + contacts.h _DEBUG;%(PreprocessorDefinitions) diff --git a/plugins/ContactsPlus/send.cpp b/plugins/ContactsPlus/send.cpp index 1382b627b5..cebc2cb00d 100644 --- a/plugins/ContactsPlus/send.cpp +++ b/plugins/ContactsPlus/send.cpp @@ -375,7 +375,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND: { - if(!lParam && CallService(MS_CLIST_MENUPROCESSCOMMAND,MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)wndData->hContact)) + if (!lParam && CallService(MS_CLIST_MENUPROCESSCOMMAND,MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)wndData->hContact)) break; switch(LOWORD(wParam)) diff --git a/plugins/ContactsPlus/utils.cpp b/plugins/ContactsPlus/utils.cpp index a86cdff85f..314e018a39 100644 --- a/plugins/ContactsPlus/utils.cpp +++ b/plugins/ContactsPlus/utils.cpp @@ -697,11 +697,11 @@ WCHAR *make_unicode_string(const unsigned char *utf8) c = utf8[index++]; while (c) { - if((c & 0x80) == 0) + if ((c & 0x80) == 0) { out[out_index++] = c; } - else if((c & 0xe0) == 0xe0) + else if ((c & 0xe0) == 0xe0) { out[out_index] = (c & 0x1F) << 12; c = utf8[index++]; @@ -780,7 +780,7 @@ static int utf8_decode(const unsigned char *from, char **to) } *to = (char*)malloc((chars + 1)*sizeof(unsigned char)); - if(*to == NULL) + if (*to == NULL) { // fprintf(stderr, "Out of memory processing string to local charset\n"); SAFE_FREE((void**)&unicode); diff --git a/plugins/CountryFlags/countrylistext.c b/plugins/CountryFlags/countrylistext.c index 50978fdb97..6f234c7533 100644 --- a/plugins/CountryFlags/countrylistext.c +++ b/plugins/CountryFlags/countrylistext.c @@ -278,14 +278,14 @@ static int ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam) int i; UNREFERENCED_PARAMETER(lParam); for(i=0; iszModule,"Flags")) { + if ((HANDLE)wParam==NULL) { + if (!lstrcmpA(dbcws->szModule,"Flags")) { /* Extra Image */ - if(!lstrcmpA(dbcws->szSetting,"ShowExtraImgFlag") || + if (!lstrcmpA(dbcws->szSetting,"ShowExtraImgFlag") || !lstrcmpA(dbcws->szSetting,"ExtraImgFlagColumn") || !lstrcmpA(dbcws->szSetting,"UseUnknownFlag") || !lstrcmpA(dbcws->szSetting,"UseIpToCountry")) if(ServiceExists(MS_CLIST_EXTRA_SET_ICON)) CallFunctionBuffered(UpdateExtraImages,0,FALSE,EXTRAIMAGE_REFRESHDELAY); /* Status Icon */ - if(!lstrcmpA(dbcws->szSetting,"ShowStatusIconFlag") || + if (!lstrcmpA(dbcws->szSetting,"ShowStatusIconFlag") || !lstrcmpA(dbcws->szSetting,"UseUnknownFlag") || !lstrcmpA(dbcws->szSetting,"UseIpToCountry")) if(ServiceExists(MS_MSG_ADDICON)) @@ -413,7 +413,7 @@ static int ExtraImgSettingChanged(WPARAM wParam,LPARAM lParam) } } /* user details update */ - else if(!lstrcmpA(dbcws->szSetting,"RealIP") || + else if (!lstrcmpA(dbcws->szSetting,"RealIP") || !lstrcmpA(dbcws->szSetting,"Country") || !lstrcmpA(dbcws->szSetting,"CompanyCountry")) { /* Extra Image */ diff --git a/plugins/CountryFlags/huffman.c b/plugins/CountryFlags/huffman.c index f05e82113e..b253f2d48f 100644 --- a/plugins/CountryFlags/huffman.c +++ b/plugins/CountryFlags/huffman.c @@ -124,7 +124,7 @@ static unsigned int _Huffman_ReadBit( huff_bitstream_t *stream ) /* Extract bit */ x = (*buf & (1<<(7-bit))) ? 1 : 0; bit = (bit+1) & 7; - if( !bit ) + if ( !bit ) { ++ buf; } @@ -179,13 +179,13 @@ static void _Huffman_WriteBits( huff_bitstream_t *stream, unsigned int x, /* Append bits */ mask = 1 << (bits-1); - for( count = 0; count < bits; ++ count ) + for ( count = 0; count < bits; ++ count ) { *buf = (unsigned char)((*buf & (0xff^(1<<(7-bit)))) + ((x & mask ? 1 : 0) << (7-bit))); x <<= 1; bit = (bit+1) & 7; - if( !bit ) + if ( !bit ) { ++ buf; } @@ -209,7 +209,7 @@ static void _Huffman_Hist( unsigned char *in, huff_sym_t *sym, int k; /* Clear/init histogram */ - for( k = 0; k < 256; ++ k ) + for ( k = 0; k < 256; ++ k ) { sym[k].Symbol = k; sym[k].Count = 0; @@ -218,7 +218,7 @@ static void _Huffman_Hist( unsigned char *in, huff_sym_t *sym, } /* Build histogram */ - for( k = size; k; -- k ) + for ( k = size; k; -- k ) { sym[*in ++].Count ++; } @@ -238,16 +238,16 @@ static void _Huffman_StoreTree( huff_encodenode_t *node, huff_sym_t *sym, unsigned int sym_idx; /* Is this a leaf node? */ - if( node->Symbol >= 0 ) + if ( node->Symbol >= 0 ) { /* Append symbol to tree description */ _Huffman_WriteBits( stream, 1, 1 ); _Huffman_WriteBits( stream, node->Symbol, 8 ); /* Find symbol index */ - for( sym_idx = 0; sym_idx < 256; ++ sym_idx ) + for ( sym_idx = 0; sym_idx < 256; ++ sym_idx ) { - if( sym[sym_idx].Symbol == node->Symbol ) break; + if ( sym[sym_idx].Symbol == node->Symbol ) break; } /* Store code info in symbol array */ @@ -282,9 +282,9 @@ static void _Huffman_MakeTree( huff_sym_t *sym, huff_bitstream_t *stream ) /* Initialize all leaf nodes */ num_symbols = 0; - for( k = 0; k < 256; ++ k ) + for ( k = 0; k < 256; ++ k ) { - if( sym[k].Count > 0 ) + if ( sym[k].Count > 0 ) { nodes[num_symbols].Symbol = sym[k].Symbol; nodes[num_symbols].Count = sym[k].Count; @@ -304,16 +304,16 @@ static void _Huffman_MakeTree( huff_sym_t *sym, huff_bitstream_t *stream ) /* Find the two lightest nodes */ node_1 = (huff_encodenode_t *) 0; node_2 = (huff_encodenode_t *) 0; - for( k = 0; k < next_idx; ++ k ) + for ( k = 0; k < next_idx; ++ k ) { - if( nodes[k].Count > 0 ) + if ( nodes[k].Count > 0 ) { - if( !node_1 || (nodes[k].Count <= node_1->Count) ) + if ( !node_1 || (nodes[k].Count <= node_1->Count) ) { node_2 = node_1; node_1 = &nodes[k]; } - else if( !node_2 || (nodes[k].Count <= node_2->Count) ) + else if ( !node_2 || (nodes[k].Count <= node_2->Count) ) { node_2 = &nodes[k]; } @@ -334,7 +334,7 @@ static void _Huffman_MakeTree( huff_sym_t *sym, huff_bitstream_t *stream ) /* Store the tree in the output stream, and in the sym[] array (the latter is used as a look-up-table for faster encoding) */ - if( root ) + if ( root ) { _Huffman_StoreTree( root, sym, stream, 0, 0 ); } @@ -367,7 +367,7 @@ static huff_decodenode_t * _Huffman_RecoverTree( huff_decodenode_t *nodes, this_node->ChildB = (huff_decodenode_t *) 0; /* Is this a leaf node? */ - if( _Huffman_ReadBit( stream ) ) + if ( _Huffman_ReadBit( stream ) ) { /* Get symbol from tree description and store in lead node */ this_node->Symbol = _Huffman_Read8Bits( stream ); @@ -409,7 +409,7 @@ int Huffman_Compress( unsigned char *in, unsigned char *out, unsigned int k, total_bytes, swaps, symbol; /* Do we have anything to compress? */ - if( insize < 1 ) return 0; + if ( insize < 1 ) return 0; /* Initialize bitstream */ _Huffman_InitBitstream( &stream, out ); @@ -424,9 +424,9 @@ int Huffman_Compress( unsigned char *in, unsigned char *out, do { swaps = 0; - for( k = 0; k < 255; ++ k ) + for ( k = 0; k < 255; ++ k ) { - if( sym[k].Symbol > sym[k+1].Symbol ) + if ( sym[k].Symbol > sym[k+1].Symbol ) { tmp = sym[k]; sym[k] = sym[k+1]; @@ -438,7 +438,7 @@ int Huffman_Compress( unsigned char *in, unsigned char *out, while( swaps ); /* Encode input stream */ - for( k = 0; k < insize; ++ k ) + for ( k = 0; k < insize; ++ k ) { symbol = in[k]; _Huffman_WriteBits( &stream, sym[symbol].Code, @@ -447,7 +447,7 @@ int Huffman_Compress( unsigned char *in, unsigned char *out, /* Calculate size of output data */ total_bytes = (int)(stream.BytePtr - out); - if( stream.BitPos > 0 ) + if ( stream.BitPos > 0 ) { ++ total_bytes; } @@ -476,7 +476,7 @@ void Huffman_Uncompress( unsigned char *in, unsigned char *out, unsigned char *buf; /* Do we have anything to decompress? */ - if( insize < 1 ) return; + if ( insize < 1 ) return; /* Initialize bitstream */ _Huffman_InitBitstream( &stream, in ); @@ -487,14 +487,14 @@ void Huffman_Uncompress( unsigned char *in, unsigned char *out, /* Decode input stream */ buf = out; - for( k = 0; k < outsize; ++ k ) + for ( k = 0; k < outsize; ++ k ) { /* Traverse tree until we find a matching leaf node */ node = root; while( node->Symbol < 0 ) { /* Get next node */ - if( _Huffman_ReadBit( &stream ) ) + if ( _Huffman_ReadBit( &stream ) ) node = node->ChildB; else node = node->ChildA; diff --git a/plugins/CountryFlags/icons.c b/plugins/CountryFlags/icons.c index 9611eb0b78..607308b57a 100644 --- a/plugins/CountryFlags/icons.c +++ b/plugins/CountryFlags/icons.c @@ -168,7 +168,7 @@ int FASTCALL CountryNumberToIndex(int countryNumber) static int ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam) { /* return handle */ - if((BOOL)lParam) { + if ((BOOL)lParam) { if(phIconHandles==NULL) return (int)(HANDLE)NULL; return (int)phIconHandles[CountryNumberToIndex((int)wParam)]; } diff --git a/plugins/CountryFlags/ip2country.c b/plugins/CountryFlags/ip2country.c index eae267aaa0..b892fabb83 100644 --- a/plugins/CountryFlags/ip2country.c +++ b/plugins/CountryFlags/ip2country.c @@ -211,34 +211,34 @@ static int EnumIpDataLines(const char *pszFileCSV,const char *pszFileOut) buf=strchr(pszCountry,'"'); *buf=pszTwo[2]='\0'; /* corrections */ - if(!lstrcmpi(pszCountry,"ANTARCTICA")) continue; - if(!lstrcmpi(pszCountry,"TIMOR-LESTE")) continue; - if(!lstrcmpi(pszCountry,"PALESTINIAN TERRITORY, OCCUPIED")) + if (!lstrcmpi(pszCountry,"ANTARCTICA")) continue; + if (!lstrcmpi(pszCountry,"TIMOR-LESTE")) continue; + if (!lstrcmpi(pszCountry,"PALESTINIAN TERRITORY, OCCUPIED")) lstrcpy(pszCountry,"ISRAEL"); - else if(!lstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS")) + else if (!lstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS")) lstrcpy(pszCountry,"UNITED STATES"); - else if(!lstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS")) + else if (!lstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS")) lstrcpy(pszCountry,"UNITED KINGDOM"); - else if(!lstrcmpi(pszTwo,"JE")) /* map error */ + else if (!lstrcmpi(pszTwo,"JE")) /* map error */ lstrcpy(pszCountry,"UNITED KINGDOM"); - else if(!lstrcmpi(pszTwo,"AX")) /* Еland Island belongs to Finland */ + else if (!lstrcmpi(pszTwo,"AX")) /* Еland Island belongs to Finland */ lstrcpy(pszCountry,"FINLAND"); - else if(!lstrcmpi(pszTwo,"ME")) + else if (!lstrcmpi(pszTwo,"ME")) lstrcpy(pszCountry,"MONTENEGRO"); - else if(!lstrcmpi(pszTwo,"RS") || !lstrcmpi(pszTwo,"CS")) + else if (!lstrcmpi(pszTwo,"RS") || !lstrcmpi(pszTwo,"CS")) lstrcpy(pszCountry,"SERBIA"); /* convert */ for(i=0;i=callList[i].uElapse) { + if ((uElapsed+USER_TIMER_MINIMUM)>=callList[i].uElapse) { /* call elapsed proc */ pfnBuffProc=callList[i].pfnBuffProc; lParam=callList[i].lParam; @@ -60,7 +60,7 @@ static void CALLBACK BufferedProcTimer(HWND hwnd,UINT msg,UINT idTimer,DWORD cur pszProcName=callList[i].pszProcName; #endif /* resize storage array */ - if((i+1)pszProcName=pszProcName; mir_snprintf(szDbgLine,sizeof(szDbgLine),"buffered queue: %s(0x%X)\n",pszProcName,lParam); /* all ascii */ OutputDebugStringA(szDbgLine); - if(!idBufferedTimer) { + if (!idBufferedTimer) { mir_snprintf(szDbgLine,sizeof(szDbgLine),"next buffered timeout: %ums\n",uElapse); /* all ascii */ OutputDebugStringA(szDbgLine); } diff --git a/plugins/CryptoPP/GPGw/gpg.c b/plugins/CryptoPP/GPGw/gpg.c index 354e455a94..8ec3a57b11 100644 --- a/plugins/CryptoPP/GPGw/gpg.c +++ b/plugins/CryptoPP/GPGw/gpg.c @@ -126,7 +126,7 @@ gpgResult gpgListPublicKeys(char *aresult) replace(commandline, txthome, gpgHomeDirectory); pxresult=pxExecute(commandline, "", &output, &exitcode); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) { free(output); return gpgExecuteFailed; @@ -153,7 +153,7 @@ gpgResult gpgListSecretKeys(char *aresult) replace(commandline, txthome, gpgHomeDirectory); pxresult=pxExecute(commandline, "", &output, &exitcode); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) { free(output); return gpgExecuteFailed; @@ -175,7 +175,7 @@ gpgResult gpgImportPublicKey(const char *akey) char *output; LogMessage(">>> ", "import public key", "\n"); - if(! writeToFile(filename, akey)) return gpgWriteToFileFailed; + if (! writeToFile(filename, akey)) return gpgWriteToFileFailed; output=(char *)malloc(1); strcpy(output, ""); @@ -186,7 +186,7 @@ gpgResult gpgImportPublicKey(const char *akey) remove(filename); free(output); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) return gpgExecuteFailed; return gpgSuccess; @@ -208,7 +208,7 @@ gpgResult gpgExportPublicKey(char *aresult, const char *auserid) replace(commandline, txthome, gpgHomeDirectory); pxresult=pxExecute(commandline, "", &output, &exitcode); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) { strcpy(aresult, ""); free(output); @@ -237,7 +237,7 @@ gpgResult gpgDetectUserID(char *aresult, const char *aciphertext) LogMessage(">>> ", "detect user id", "\n"); strcpy(aresult, ""); - if(! writeToFile(filename, aciphertext)) + if (! writeToFile(filename, aciphertext)) return gpgWriteToFileFailed; output=(char *)malloc(1); @@ -248,7 +248,7 @@ gpgResult gpgDetectUserID(char *aresult, const char *aciphertext) pxresult=pxExecute(commandline, "", &output, &exitcode); remove(filename); - if((pxresult!=pxSuccess)&&(pxresult!=pxSuccessExitCodeInvalid)) + if ((pxresult!=pxSuccess)&&(pxresult!=pxSuccessExitCodeInvalid)) { free(output); return gpgExecuteFailed; @@ -287,7 +287,7 @@ gpgResult gpgEncrypt(char *aresult, const char *auserid, const char *aplaintext) LogMessage(">>> ", "encrypt", "\n"); strcpy(aresult, ""); - if(! writeToFile(plainfile, aplaintext)) + if (! writeToFile(plainfile, aplaintext)) return gpgWriteToFileFailed; output=(char *)malloc(1); @@ -302,13 +302,13 @@ gpgResult gpgEncrypt(char *aresult, const char *auserid, const char *aplaintext) remove(plainfile); free(output); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) { remove(cipherfile); return gpgExecuteFailed; } - if(! readFromFile(aresult, cipherfile)) + if (! readFromFile(aresult, cipherfile)) { remove(cipherfile); return gpgReadFromFileFailed; @@ -332,7 +332,7 @@ gpgResult gpgDecrypt(char *aresult, const char *aciphertext, const char *apassph LogMessage(">>> ", "decrypt", "\n"); strcpy(aresult, ""); - if(! writeToFile(cipherfile, aciphertext)) + if (! writeToFile(cipherfile, aciphertext)) return gpgWriteToFileFailed; output=(char *)malloc(1); @@ -348,13 +348,13 @@ gpgResult gpgDecrypt(char *aresult, const char *aciphertext, const char *apassph remove(cipherfile); free(output); - if((pxresult!=pxSuccess)||(exitcode!=0)) + if ((pxresult!=pxSuccess)||(exitcode!=0)) { remove(plainfile); return gpgExecuteFailed; } - if(! readFromFile(aresult, plainfile)) + if (! readFromFile(aresult, plainfile)) { remove(plainfile); return gpgReadFromFileFailed; diff --git a/plugins/CryptoPP/GPGw/main.c b/plugins/CryptoPP/GPGw/main.c index 766d491704..fc23b24262 100644 --- a/plugins/CryptoPP/GPGw/main.c +++ b/plugins/CryptoPP/GPGw/main.c @@ -27,13 +27,13 @@ int __cdecl _gpg_done() int __cdecl _gpg_open_keyrings(LPSTR ExecPath, LPSTR HomePath) { - if( !ExecPath || (!*ExecPath && !ShowSelectExecDlg(ExecPath)) ) { + if ( !ExecPath || (!*ExecPath && !ShowSelectExecDlg(ExecPath)) ) { return 0; } - if( !HomePath || (!*HomePath && !ShowSelectHomeDlg(HomePath)) ) { + if ( !HomePath || (!*HomePath && !ShowSelectHomeDlg(HomePath)) ) { return 0; } - if( !existsFile(ExecPath) ) { + if ( !existsFile(ExecPath) ) { // ErrorMessage(txtwarning, txtinvalidexecutable, txtverifyoptions); return 0; } @@ -84,9 +84,9 @@ LPSTR __cdecl _gpg_get_passphrases() // encrypt for(i=0; i2 ) { + if ( b[i]>2 ) { x = b[i] ^ ( (i&0x7f) ^ 13); - if( x>2 ) b[i]=x; + if ( x>2 ) b[i]=x; } return b; @@ -97,16 +97,16 @@ void __cdecl _gpg_set_passphrases(LPCSTR buffer) { size_t i, l = strlen(buffer); char *t, *p, *b, x; - if( !l ) return; + if ( !l ) return; b = (char *) LocalAlloc(LPTR,l+1); strcpy(b, buffer); // decrypt for(i=0; i2 ) { + if ( b[i]>2 ) { x = b[i] ^ ( (i&0x7f) ^ 13); - if( x>2 ) b[i]=x; + if ( x>2 ) b[i]=x; } while(*b) { @@ -167,7 +167,7 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message) begin=strstr(message, txtbeginpgpmessage); end=strstr(message, txtendpgpmessage); - if((begin!=NULL)&&(end!=NULL)) + if ((begin!=NULL)&&(end!=NULL)) { strcpy(buffer, ""); strncat(buffer, begin, end-begin+strlen(txtendpgpmessage)); @@ -218,7 +218,7 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message) strcpy(buffer, plaintext); } - if( gpgresult==gpgSuccess && useridvalid==TRUE) + if ( gpgresult==gpgSuccess && useridvalid==TRUE) addPassphrase(keyuserid, passphrase); ZeroMemory(passphrase, sizeof(passphrase)); @@ -255,7 +255,7 @@ int __cdecl _gpg_select_keyid(HWND hdlg, LPSTR keyid) void noBackslash(LPSTR path) { LPSTR ptr; ptr = path + strlen(path) - 1; - if( *ptr=='\\' ) *ptr = '\0'; + if ( *ptr=='\\' ) *ptr = '\0'; } @@ -267,7 +267,7 @@ LPSTR GetRegValue(HKEY hKey , LPCSTR szPath, LPCSTR szName){ LPSTR ret=0; RegOpenKey(hKey,szPath,&hKey); - if( RegQueryValueEx(hKey,szName,NULL,&type,(LPBYTE)&buf,&len)==ERROR_SUCCESS ){ + if ( RegQueryValueEx(hKey,szName,NULL,&type,(LPBYTE)&buf,&len)==ERROR_SUCCESS ) { noBackslash((LPSTR)&buf); ret = (LPSTR)&buf; } @@ -280,7 +280,7 @@ LPSTR GetRegValue(HKEY hKey , LPCSTR szPath, LPCSTR szName){ LPSTR GetEnvValue(LPCSTR szName){ LPSTR ret=0; - if( GetEnvironmentVariable(szName, buf, MAX_PATH) > 0 ) { + if ( GetEnvironmentVariable(szName, buf, MAX_PATH) > 0 ) { noBackslash((LPSTR)&buf); ret = (LPSTR)&buf; } @@ -295,14 +295,14 @@ BOOL ShowSelectExecDlg(LPSTR path) ZeroMemory(&ofn,sizeof(ofn)); ofn.lpstrFile = GetRegValue(HKEY_CURRENT_USER,"Software\\GNU\\GnuPG","gpgProgram"); - if( ofn.lpstrFile && existsFile(ofn.lpstrFile) ) { + if ( ofn.lpstrFile && existsFile(ofn.lpstrFile) ) { strcpy(path, ofn.lpstrFile); return TRUE; } ofn.lpstrFile = GetRegValue(HKEY_LOCAL_MACHINE,"Software\\GNU\\GnuPG","Install Directory"); - if( ofn.lpstrFile ) { + if ( ofn.lpstrFile ) { strcat(ofn.lpstrFile,"\\gpg.exe"); - if( existsFile(ofn.lpstrFile) ) { + if ( existsFile(ofn.lpstrFile) ) { strcpy(path, ofn.lpstrFile); return TRUE; } @@ -327,19 +327,19 @@ BOOL ShowSelectHomeDlg(LPSTR path) OPENFILENAME ofn; ofn.lpstrFile = GetEnvValue("GNUPGHOME"); - if( ofn.lpstrFile && existsPath(ofn.lpstrFile) ) { + if ( ofn.lpstrFile && existsPath(ofn.lpstrFile) ) { strcpy(path, ofn.lpstrFile); return TRUE; } ofn.lpstrFile = GetRegValue(HKEY_CURRENT_USER,"Software\\GNU\\GnuPG","HomeDir"); - if( ofn.lpstrFile && existsPath(ofn.lpstrFile) ) { + if ( ofn.lpstrFile && existsPath(ofn.lpstrFile) ) { strcpy(path, ofn.lpstrFile); return TRUE; } ofn.lpstrFile = GetEnvValue("APPDATA"); - if( ofn.lpstrFile ) { + if ( ofn.lpstrFile ) { strcat(ofn.lpstrFile,"\\gnupg"); - if( existsPath(ofn.lpstrFile) ) { + if ( existsPath(ofn.lpstrFile) ) { strcpy(path, ofn.lpstrFile); return TRUE; } diff --git a/plugins/CryptoPP/GPGw/pipeexec.c b/plugins/CryptoPP/GPGw/pipeexec.c index 871dfbe3b4..ea54f85d1a 100644 --- a/plugins/CryptoPP/GPGw/pipeexec.c +++ b/plugins/CryptoPP/GPGw/pipeexec.c @@ -32,7 +32,7 @@ void storeOutput(HANDLE ahandle, char **aoutput) success=ReadFile(ahandle, readbuffer, sizeof(readbuffer), &transfered, NULL); - if((success)&&(transfered!=0)) + if ((success)&&(transfered!=0)) appendText(aoutput, readbuffer, transfered); } while(available>0); @@ -66,14 +66,14 @@ pxResult pxExecute(char *acommandline, char *ainput, char **aoutput, LPDWORD aex else securityattributes.lpSecurityDescriptor=NULL; success=CreatePipe(&newstdin, &writestdin ,&securityattributes ,0); - if(! success) + if (! success) { LogMessage("--- ", "create pipe failed", "\n"); return pxCreatePipeFailed; } success=CreatePipe(&readstdout, &newstdout, &securityattributes, 0); - if(! success) + if (! success) { LogMessage("--- ", "create pipe failed", "\n"); CloseHandle(newstdin); @@ -90,7 +90,7 @@ pxResult pxExecute(char *acommandline, char *ainput, char **aoutput, LPDWORD aex success=CreateProcess(NULL, acommandline, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &startupinfo, &processinformation); - if(! success) + if (! success) { LogMessage("--- ", "create process failed", "\n"); CloseHandle(newstdin); @@ -105,11 +105,11 @@ pxResult pxExecute(char *acommandline, char *ainput, char **aoutput, LPDWORD aex while(TRUE) { success=GetExitCodeProcess(processinformation.hProcess, aexitcode); - if((success)&&(*aexitcode!=STILL_ACTIVE)) break; + if ((success)&&(*aexitcode!=STILL_ACTIVE)) break; storeOutput(readstdout, aoutput); - if(*inputpos!='\0') size=1; + if (*inputpos!='\0') size=1; else size=0; success=WriteFile(writestdin, inputpos, size, &transfered, NULL); diff --git a/plugins/CryptoPP/GPGw/tools.c b/plugins/CryptoPP/GPGw/tools.c index ee7adde761..002f18824d 100644 --- a/plugins/CryptoPP/GPGw/tools.c +++ b/plugins/CryptoPP/GPGw/tools.c @@ -78,7 +78,7 @@ void appendText(char **abuffer, const char *atext, int atextsize) { int size; - if(*abuffer==NULL) size=0; + if (*abuffer==NULL) size=0; else size=strlen(*abuffer); size++; // abschliessende 0 if(atextsize==0) atextsize=strlen(atext); diff --git a/plugins/CryptoPP/PGPw/main.cpp b/plugins/CryptoPP/PGPw/main.cpp index 116615b839..8427046a16 100644 --- a/plugins/CryptoPP/PGPw/main.cpp +++ b/plugins/CryptoPP/PGPw/main.cpp @@ -45,7 +45,7 @@ void _pgp_memcpy(LPSTR dst, LPSTR src, UINT size) int __cdecl _pgp_init() { - if(!pgpErrMsg) + if (!pgpErrMsg) pgpErrMsg = (LPSTR) LocalAlloc(LPTR,pgpErrMsgLen); pgpVer = 0; @@ -172,7 +172,7 @@ LPSTR __cdecl _pgp_encrypt_keydb(LPCSTR szPlainMsg, PVOID pgpKeyID) DWORD dwEncMsgLen; ClearPGPError(); - if(!pgpKeyDB) + if (!pgpKeyDB) return 0; #if (PGP_WIN32 < 0x700) @@ -221,7 +221,7 @@ LPSTR __cdecl _pgp_decrypt_keydb(LPCSTR szEncMsg) DWORD dwPlainMsgLen; ClearPGPError(); - if(!pgpKeyDB) + if (!pgpKeyDB) return 0; int iTry = 0; diff --git a/plugins/CryptoPP/base16.cpp b/plugins/CryptoPP/base16.cpp index b8c813eff9..db838e498d 100644 --- a/plugins/CryptoPP/base16.cpp +++ b/plugins/CryptoPP/base16.cpp @@ -24,7 +24,7 @@ char *base16decode(const char *inBuffer, int *count) { BYTE *outBufferPtr = (BYTE *) outBuffer; bool big_endian = false; - if(*inBuffer == '0' && *(inBuffer+1) == 'x') { + if (*inBuffer == '0' && *(inBuffer+1) == 'x') { inBuffer += *count; big_endian = true; *count -= 2; @@ -39,7 +39,7 @@ char *base16decode(const char *inBuffer, int *count) { c0 = decode16(*inBuffer++); c1 = decode16(*inBuffer++); } - if((c0 | c1) == BERR) { + if ((c0 | c1) == BERR) { free(outBuffer); *count = 0; return(NULL); diff --git a/plugins/CryptoPP/base64.cpp b/plugins/CryptoPP/base64.cpp index f639799b92..70c3d672c7 100644 --- a/plugins/CryptoPP/base64.cpp +++ b/plugins/CryptoPP/base64.cpp @@ -75,7 +75,7 @@ char *base64decode(const char *inBuffer, int *count) { if(delta > 3) c3 = decode64(inBuffer[srcIndex++]); } - if((c0 | c1 | c2 | c3) == BERR) { + if ((c0 | c1 | c2 | c3) == BERR) { free(outBuffer); return(NULL); } diff --git a/plugins/CryptoPP/commonheaders.cpp b/plugins/CryptoPP/commonheaders.cpp index 4ba0c995fa..e518aecb11 100644 --- a/plugins/CryptoPP/commonheaders.cpp +++ b/plugins/CryptoPP/commonheaders.cpp @@ -51,13 +51,13 @@ BOOL ExtractFileFromResource( HANDLE FH, int ResType, int ResId, DWORD* Size ) RH = FindResource( g_hInst, MAKEINTRESOURCE( ResId ), MAKEINTRESOURCE( ResType ) ); - if( RH == NULL ) return FALSE; + if ( RH == NULL ) return FALSE; RP = (PBYTE) LoadResource( g_hInst, RH ); - if( RP == NULL ) return FALSE; + if ( RP == NULL ) return FALSE; s = SizeofResource( g_hInst, RH ); - if( !WriteFile( FH, RP, s, &x, NULL ) ) return FALSE; - if( x != s ) return FALSE; - if( Size ) *Size = s; + if ( !WriteFile( FH, RP, s, &x, NULL ) ) return FALSE; + if ( x != s ) return FALSE; + if ( Size ) *Size = s; return TRUE; } @@ -66,7 +66,7 @@ void ExtractFile( char *FileName, int ResType, int ResId ) { HANDLE FH; FH = CreateFile( FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); - if( FH == INVALID_HANDLE_VALUE ) return; + if ( FH == INVALID_HANDLE_VALUE ) return; if (!ExtractFileFromResource( FH, ResType, ResId, NULL )) MessageBoxA(0,"Can't extract","!!!",MB_OK); CloseHandle( FH ); } @@ -78,7 +78,7 @@ int rtrim(LPCSTR str) { while( len ) { char c = *ptr; - if( c != '\x20' && c != '\x09' && c != '\x0A' && c != '\x0D' ) { + if ( c != '\x20' && c != '\x09' && c != '\x0A' && c != '\x0D' ) { *(ptr+1) = '\0'; break; } diff --git a/plugins/CryptoPP/cpp_cntx.cpp b/plugins/CryptoPP/cpp_cntx.cpp index eba883755d..fe3d5c616f 100644 --- a/plugins/CryptoPP/cpp_cntx.cpp +++ b/plugins/CryptoPP/cpp_cntx.cpp @@ -11,14 +11,14 @@ unsigned __stdcall sttTimeoutThread(LPVOID); // get context data on context id pCNTX get_context_on_id(HANDLE context) { - if( !thread_timeout ) { + if ( !thread_timeout ) { unsigned int tID; thread_timeout = (HANDLE) _beginthreadex(NULL, 0, sttTimeoutThread, NULL, 0, &tID); } - if( context ) { + if ( context ) { pCNTX cntx = (pCNTX) context; - if( cntx->header == HEADER && cntx->footer == FOOTER ) + if ( cntx->header == HEADER && cntx->footer == FOOTER ) return cntx; #if defined(_DEBUG) || defined(NETLIB_LOG) else @@ -42,16 +42,16 @@ HANDLE __cdecl cpp_create_context(int mode) { EnterCriticalSection(&localContextMutex); - if( !CL.empty() ) { + if ( !CL.empty() ) { for(i=CL.begin(); i!=CL.end(); ++i) { // ищем пустой - if( (*i)->header==EMPTYH && (*i)->footer==EMPTYH ) { + if ( (*i)->header==EMPTYH && (*i)->footer==EMPTYH ) { cntx = (pCNTX) *i; break; } } } - if( !cntx ) { // не нашли - создаем новый + if ( !cntx ) { // не нашли - создаем новый cntx = (pCNTX) malloc(sizeof(CNTX)); CL.push_back(cntx); // добавили в конец списка } @@ -87,18 +87,18 @@ void __cdecl cpp_reset_context(HANDLE context) { // allocate pdata PBYTE cpp_alloc_pdata(pCNTX ptr) { - if( !ptr->pdata ) { - if( ptr->mode & MODE_PGP ) { + if ( !ptr->pdata ) { + if ( ptr->mode & MODE_PGP ) { ptr->pdata = (PBYTE) malloc(sizeof(PGPDATA)); memset(ptr->pdata,0,sizeof(PGPDATA)); } else - if( ptr->mode & MODE_GPG ) { + if ( ptr->mode & MODE_GPG ) { ptr->pdata = (PBYTE) malloc(sizeof(GPGDATA)); memset(ptr->pdata,0,sizeof(GPGDATA)); } else - if( ptr->mode & MODE_RSA ) { + if ( ptr->mode & MODE_RSA ) { rsa_alloc(ptr); } else { @@ -115,20 +115,20 @@ void cpp_free_keys(pCNTX ptr) { SAFE_FREE(ptr->tmp); cpp_alloc_pdata(ptr); - if( ptr->mode & MODE_PGP ) { + if ( ptr->mode & MODE_PGP ) { pPGPDATA p = (pPGPDATA) ptr->pdata; SAFE_FREE(p->pgpKeyID); SAFE_FREE(p->pgpKey); SAFE_FREE(ptr->pdata); } else - if( ptr->mode & MODE_GPG ) { + if ( ptr->mode & MODE_GPG ) { pGPGDATA p = (pGPGDATA) ptr->pdata; SAFE_FREE(p->gpgKeyID); SAFE_FREE(ptr->pdata); } else - if( ptr->mode & MODE_RSA ) { + if ( ptr->mode & MODE_RSA ) { rsa_free(ptr); SAFE_DELETE(ptr->pdata); } @@ -151,27 +151,27 @@ unsigned __stdcall sttTimeoutThread( LPVOID ) { list::iterator i; while(1) { Sleep( 1000 ); // раз в секунду - if( CL.empty() ) continue; + if ( CL.empty() ) continue; u_int time = gettime(); // пробегаем все контексты EnterCriticalSection(&localContextMutex); for(i=CL.begin(); i!=CL.end(); ++i) { pCNTX tmp = *i; - if( tmp->header!=HEADER || tmp->footer!=FOOTER ) continue; + if ( tmp->header!=HEADER || tmp->footer!=FOOTER ) continue; // пропускаем приватные ключи - if( tmp->mode&MODE_PRIV_KEY ) continue; + if ( tmp->mode&MODE_PRIV_KEY ) continue; else - if( tmp->deleted && tmp->deleted < time ) { + if ( tmp->deleted && tmp->deleted < time ) { // удалить помеченный для удаления контекст cpp_free_keys(tmp); tmp->deleted = 0; tmp->header = tmp->footer = EMPTYH; } else - if( tmp->mode&MODE_RSA && tmp->pdata ) { + if ( tmp->mode&MODE_RSA && tmp->pdata ) { // проверяем не протухло ли соединение pRSADATA p = (pRSADATA) tmp->pdata; - if( p->time && p->time < time ) { + if ( p->time && p->time < time ) { rsa_timeout((HANDLE)tmp,p); } } diff --git a/plugins/CryptoPP/cpp_gpgw.cpp b/plugins/CryptoPP/cpp_gpgw.cpp index f053ef8085..90fe8b3062 100644 --- a/plugins/CryptoPP/cpp_gpgw.cpp +++ b/plugins/CryptoPP/cpp_gpgw.cpp @@ -111,7 +111,7 @@ int load_gpg_mem(HMODULE mod) { int __cdecl gpg_init() { int r; char t[MAX_PATH]; - if( isVista ){ + if ( isVista ) { sprintf(t,"%s\\gnupgw.dll",TEMP); ExtractFile(t,666,1); hgpg = LoadLibraryA(t); @@ -122,13 +122,13 @@ int __cdecl gpg_init() hgpg = MemLoadLibrary( pRS_gpg ); } if (hgpg) { - if( isVista ) load_gpg_dll(hgpg); + if ( isVista ) load_gpg_dll(hgpg); else load_gpg_mem(hgpg); r = p_gpg_init(); if(r) { return r; } - if( isVista ){ + if ( isVista ) { FreeLibrary(hgpg); } else { @@ -149,7 +149,7 @@ int __cdecl gpg_done() int r = 0; if(hgpg) { r = p_gpg_done(); - if( isVista ){ + if ( isVista ) { FreeLibrary(hgpg); } else { @@ -201,7 +201,7 @@ LPSTR __cdecl gpg_encrypt(pCNTX ptr, LPCSTR szPlainMsg) LPSTR szEncMsg; szEncMsg = p_gpg_encrypt(szPlainMsg,(LPCSTR)p->gpgKeyID); - if(!szEncMsg) return 0; + if (!szEncMsg) return 0; ptr->tmp = (LPSTR) strdup(szEncMsg); LocalFree((LPVOID)szEncMsg); @@ -216,11 +216,11 @@ LPSTR __cdecl gpg_decrypt(pCNTX ptr, LPCSTR szEncMsg) SAFE_FREE(ptr->tmp); LPSTR szPlainMsg = p_gpg_decrypt(szEncMsg); -/* if(!szPlainMsg) { +/* if (!szPlainMsg) { ptr = get_context_on_id(hPGPPRIV); // find private pgp keys if(ptr && ptr->pgpKey) szPlainMsg = p_gpg_decrypt_key(szEncMsg,(LPCSTR)ptr->pgpKey); - if(!szPlainMsg) return NULL; + if (!szPlainMsg) return NULL; }*/ ptr->tmp = (LPSTR) strdup(szPlainMsg); @@ -232,13 +232,13 @@ LPSTR __cdecl gpg_decrypt(pCNTX ptr, LPCSTR szEncMsg) LPSTR __cdecl gpg_encode(HANDLE context, LPCSTR szPlainMsg) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return NULL; + pCNTX ptr = get_context_on_id(context); if (!ptr) return NULL; pGPGDATA p = (pGPGDATA) cpp_alloc_pdata(ptr); - if(!p->gpgKeyID) { ptr->error = ERROR_NO_GPG_KEY; return NULL; } + if (!p->gpgKeyID) { ptr->error = ERROR_NO_GPG_KEY; return NULL; } // utf8 message: encrypt. LPSTR szUtfMsg; - if( ptr->mode & MODE_GPG_ANSI ) { + if ( ptr->mode & MODE_GPG_ANSI ) { LPWSTR wszMsg = utf8decode(szPlainMsg); int wlen = wcslen(wszMsg)+1; szUtfMsg = (LPSTR) alloca(wlen); @@ -254,13 +254,13 @@ LPSTR __cdecl gpg_encode(HANDLE context, LPCSTR szPlainMsg) LPSTR __cdecl gpg_decode(HANDLE context, LPCSTR szEncMsg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; LPSTR szNewMsg = NULL; LPSTR szOldMsg = gpg_decrypt(ptr, szEncMsg); if(szOldMsg) { - if( !is_7bit_string(szOldMsg) && !is_utf8_string(szOldMsg) ) { + if ( !is_7bit_string(szOldMsg) && !is_utf8_string(szOldMsg) ) { int slen = strlen(szOldMsg)+1; LPWSTR wszMsg = (LPWSTR) alloca(slen*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szOldMsg, -1, wszMsg, slen*sizeof(WCHAR)); @@ -279,10 +279,10 @@ LPSTR __cdecl gpg_decode(HANDLE context, LPCSTR szEncMsg) int __cdecl gpg_set_key(HANDLE context, LPCSTR RemoteKey) { /* pCNTX ptr = get_context_on_id(context); - if(!ptr) return 0; + if (!ptr) return 0; ptr->error = ERROR_NONE; -// if(!p_gpg_check_key(RemoteKey)) return 0; +// if (!p_gpg_check_key(RemoteKey)) return 0; SAFE_FREE(ptr->pgpKey); ptr->pgpKey = (BYTE *) malloc(strlen(RemoteKey)+1); @@ -296,7 +296,7 @@ int __cdecl gpg_set_key(HANDLE context, LPCSTR RemoteKey) int __cdecl gpg_set_keyid(HANDLE context, LPCSTR RemoteKeyID) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pGPGDATA p = (pGPGDATA) cpp_alloc_pdata(ptr); ptr->error = ERROR_NONE; diff --git a/plugins/CryptoPP/cpp_keys.cpp b/plugins/CryptoPP/cpp_keys.cpp index 51ac7247b4..16e4e0d281 100644 --- a/plugins/CryptoPP/cpp_keys.cpp +++ b/plugins/CryptoPP/cpp_keys.cpp @@ -6,7 +6,7 @@ const unsigned char IV[] = "PSKhell@MIRANDA!"; // generate KeyA pair, return public key as ASCII LPSTR __cdecl cpp_init_keya(HANDLE context, int features) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return NULL; + pCNTX ptr = get_context_on_id(context); if (!ptr) return NULL; pSIMDATA p = (pSIMDATA) cpp_alloc_pdata(ptr); int send_features = FEATURES; @@ -70,19 +70,19 @@ LPSTR __cdecl cpp_init_keya(HANDLE context, int features) { // store KeyB int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pSIMDATA p = (pSIMDATA) cpp_alloc_pdata(ptr); int clen = rtrim(key); ptr->features = 0; LPSTR pub_binary; - if((clen==KEYSIZE*2) || (clen==(KEYSIZE+2)*2)) + if ((clen==KEYSIZE*2) || (clen==(KEYSIZE+2)*2)) pub_binary = base16decode(key,&clen); else pub_binary = base64decode(key,&clen); - if( !pub_binary || (clen!=KEYSIZE && clen!=KEYSIZE+2) ) { + if ( !pub_binary || (clen!=KEYSIZE && clen!=KEYSIZE+2) ) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("cpp_init_keyb: error bad_keyb"); #endif @@ -95,7 +95,7 @@ int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) { memcpy((PVOID)&ptr->features,(PVOID)(pub_binary+KEYSIZE),2); if(p->KeyP) { - if(!(ptr->features & FEATURES_PSK)) { // if NO PSK on other side + if (!(ptr->features & FEATURES_PSK)) { // if NO PSK on other side #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("cpp_init_keyb: error no_psk"); #endif @@ -141,11 +141,11 @@ int __cdecl cpp_init_keyb(HANDLE context, LPCSTR key) { // calculate secret key, return true or false int __cdecl cpp_calc_keyx(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pSIMDATA p = (pSIMDATA) cpp_alloc_pdata(ptr); - if(!p->KeyA) { ptr->error = ERROR_NO_KEYA; return 0; } - if(!p->KeyB) { ptr->error = ERROR_NO_KEYB; return 0; } + if (!p->KeyA) { ptr->error = ERROR_NO_KEYA; return 0; } + if (!p->KeyB) { ptr->error = ERROR_NO_KEYB; return 0; } ptr->error = ERROR_NONE; BYTE agreeVal[KEYSIZE]; @@ -178,7 +178,7 @@ int __cdecl cpp_calc_keyx(HANDLE context) { // create pre-shared key from password int __cdecl cpp_init_keyp(HANDLE context, LPCSTR password) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pSIMDATA p = (pSIMDATA) cpp_alloc_pdata(ptr); BYTE buffer[Tiger::DIGESTSIZE]; // buffer for hash diff --git a/plugins/CryptoPP/cpp_misc.cpp b/plugins/CryptoPP/cpp_misc.cpp index 526cebf6bc..5e5720df18 100644 --- a/plugins/CryptoPP/cpp_misc.cpp +++ b/plugins/CryptoPP/cpp_misc.cpp @@ -2,13 +2,13 @@ int __cdecl cpp_get_features(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; return ptr->features; } int __cdecl cpp_get_error(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; return ptr->error; } @@ -20,8 +20,8 @@ int __cdecl cpp_get_version(void) { BOOL cpp_get_simdata(HANDLE context, pCNTX *ptr, pSIMDATA *p) { *ptr = get_context_on_id(context); -// if(!*ptr || !(*ptr)->pdata || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; - if(!*ptr || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; +// if (!*ptr || !(*ptr)->pdata || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; + if (!*ptr || (*ptr)->mode&(MODE_PGP|MODE_GPG|MODE_RSA)) return FALSE; *p = (pSIMDATA) cpp_alloc_pdata(*ptr); return TRUE; } @@ -33,14 +33,14 @@ int __cdecl cpp_size_keyx(void) { void __cdecl cpp_get_keyx(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; memcpy(key,p->KeyX,Tiger::DIGESTSIZE); memcpy(key+Tiger::DIGESTSIZE,&ptr->features,2); } void __cdecl cpp_set_keyx(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; SAFE_FREE(p->PubA); SAFE_FREE(p->KeyA); SAFE_FREE(p->KeyB); @@ -52,7 +52,7 @@ void __cdecl cpp_set_keyx(HANDLE context, BYTE *key) { void __cdecl cpp_get_keyp(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; memcpy(key,p->KeyP,Tiger::DIGESTSIZE); } @@ -63,7 +63,7 @@ int __cdecl cpp_size_keyp(void) { void __cdecl cpp_set_keyp(HANDLE context, BYTE *key) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return; SAFE_FREE(p->KeyP); p->KeyP = (PBYTE) malloc(Tiger::DIGESTSIZE); memcpy(p->KeyP,key,Tiger::DIGESTSIZE); @@ -71,25 +71,25 @@ void __cdecl cpp_set_keyp(HANDLE context, BYTE *key) { int __cdecl cpp_keya(HANDLE context) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return 0; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; return p->KeyA!=NULL; } int __cdecl cpp_keyb(HANDLE context) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return 0; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; return p->KeyB!=NULL; } int __cdecl cpp_keyx(HANDLE context) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return 0; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; return p->KeyX!=NULL; } int __cdecl cpp_keyp(HANDLE context) { - pCNTX ptr; pSIMDATA p; if(!cpp_get_simdata(context,&ptr,&p)) return 0; + pCNTX ptr; pSIMDATA p; if (!cpp_get_simdata(context,&ptr,&p)) return 0; return p->KeyP!=NULL; } diff --git a/plugins/CryptoPP/cpp_pgpw.cpp b/plugins/CryptoPP/cpp_pgpw.cpp index 6d06ac0d7f..e8f9f98ab4 100644 --- a/plugins/CryptoPP/cpp_pgpw.cpp +++ b/plugins/CryptoPP/cpp_pgpw.cpp @@ -101,7 +101,7 @@ BOOL load_pgp_sdk(int type, int id) int r; char t[MAX_PATH]; pgpVer = 0; - if( isVista ){ + if ( isVista ) { sprintf(t,"%s\\pgpsdkw.dll",TEMP); ExtractFile(t,type,id); hpgpsdk = LoadLibraryA(t); @@ -112,14 +112,14 @@ BOOL load_pgp_sdk(int type, int id) hpgpsdk = MemLoadLibrary( pRS_pgp ); } if (hpgpsdk) { - if( isVista ) load_pgpsdk_dll(hpgpsdk); + if ( isVista ) load_pgpsdk_dll(hpgpsdk); else load_pgpsdk_mem(hpgpsdk); r = p_pgp_init(); if(r) { pgpVer = p_pgp_get_version(); return r; } - if( isVista ){ + if ( isVista ) { FreeLibrary(hpgpsdk); } else { @@ -136,7 +136,7 @@ int __cdecl pgp_init() { int r; - if( !hPGPPRIV ) { + if ( !hPGPPRIV ) { // create context for private pgp keys hPGPPRIV = (HANDLE) cpp_create_context(MODE_PGP|MODE_PRIV_KEY); pCNTX tmp = (pCNTX) hPGPPRIV; @@ -144,8 +144,8 @@ int __cdecl pgp_init() memset(tmp->pdata,0,sizeof(PGPDATA)); } - if( r = load_pgp_sdk(666,6) ) return r; - if( r = load_pgp_sdk(666,8) ) return r; + if ( r = load_pgp_sdk(666,6) ) return r; + if ( r = load_pgp_sdk(666,8) ) return r; hpgpsdk = 0; @@ -159,7 +159,7 @@ int __cdecl pgp_done() pgpVer = 0; if(hpgpsdk) { r = p_pgp_done(); - if( isVista ){ + if ( isVista ) { FreeLibrary(hpgpsdk); } else { @@ -208,7 +208,7 @@ LPSTR __cdecl pgp_encrypt(pCNTX ptr, LPCSTR szPlainMsg) szEncMsg = p_pgp_encrypt_key(szPlainMsg,(LPCSTR)p->pgpKey); else szEncMsg = p_pgp_encrypt_keydb(szPlainMsg,p->pgpKeyID); - if(!szEncMsg) return 0; + if (!szEncMsg) return 0; ptr->tmp = (LPSTR) strdup(szEncMsg); LocalFree((LPVOID)szEncMsg); @@ -223,14 +223,14 @@ LPSTR __cdecl pgp_decrypt(pCNTX ptr, LPCSTR szEncMsg) SAFE_FREE(ptr->tmp); LPSTR szPlainMsg = p_pgp_decrypt_keydb(szEncMsg); - if(!szPlainMsg) { + if (!szPlainMsg) { ptr = get_context_on_id(hPGPPRIV); // find private pgp keys if(ptr) { pPGPDATA p = (pPGPDATA) ptr->pdata; if(p->pgpKey) szPlainMsg = p_pgp_decrypt_key(szEncMsg,(LPCSTR)p->pgpKey); } - if(!szPlainMsg) return NULL; + if (!szPlainMsg) return NULL; } ptr->tmp = (LPSTR) strdup(szPlainMsg); @@ -242,9 +242,9 @@ LPSTR __cdecl pgp_decrypt(pCNTX ptr, LPCSTR szEncMsg) LPSTR __cdecl pgp_encode(HANDLE context, LPCSTR szPlainMsg) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return NULL; + pCNTX ptr = get_context_on_id(context); if (!ptr) return NULL; pPGPDATA p = (pPGPDATA) cpp_alloc_pdata(ptr); - if( !p->pgpKeyID && !p->pgpKey ) { ptr->error = ERROR_NO_PGP_KEY; return NULL; } + if ( !p->pgpKeyID && !p->pgpKey ) { ptr->error = ERROR_NO_PGP_KEY; return NULL; } // utf8 message: encrypt. return pgp_encrypt(ptr, szPlainMsg); @@ -254,13 +254,13 @@ LPSTR __cdecl pgp_encode(HANDLE context, LPCSTR szPlainMsg) LPSTR __cdecl pgp_decode(HANDLE context, LPCSTR szEncMsg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; LPSTR szNewMsg = NULL; LPSTR szOldMsg = pgp_decrypt(ptr, szEncMsg); if(szOldMsg) { - if( !is_7bit_string(szOldMsg) && !is_utf8_string(szOldMsg) ) { + if ( !is_7bit_string(szOldMsg) && !is_utf8_string(szOldMsg) ) { int slen = strlen(szOldMsg)+1; LPWSTR wszMsg = (LPWSTR) alloca(slen*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szOldMsg, -1, wszMsg, slen*sizeof(WCHAR)); @@ -284,11 +284,11 @@ int __cdecl pgp_set_priv_key(LPCSTR LocalKey) int __cdecl pgp_set_key(HANDLE context, LPCSTR RemoteKey) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pPGPDATA p = (pPGPDATA) cpp_alloc_pdata(ptr); ptr->error = ERROR_NONE; -// if(!p_pgp_check_key(RemoteKey)) return 0; +// if (!p_pgp_check_key(RemoteKey)) return 0; SAFE_FREE(p->pgpKey); p->pgpKey = (PBYTE) strdup(RemoteKey); @@ -299,7 +299,7 @@ int __cdecl pgp_set_key(HANDLE context, LPCSTR RemoteKey) int __cdecl pgp_set_keyid(HANDLE context, PVOID RemoteKeyID) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pPGPDATA p = (pPGPDATA) cpp_alloc_pdata(ptr); ptr->error = ERROR_NONE; diff --git a/plugins/CryptoPP/cpp_rsam.cpp b/plugins/CryptoPP/cpp_rsam.cpp index 2cdd77b6e1..a40c11f4b6 100644 --- a/plugins/CryptoPP/cpp_rsam.cpp +++ b/plugins/CryptoPP/cpp_rsam.cpp @@ -53,7 +53,7 @@ int __cdecl rsa_init(pRSA_EXPORT* e, pRSA_IMPORT i) { #endif *e = &exp; imp = i; - if( !hRSA4096 ) { + if ( !hRSA4096 ) { // create context for private rsa keys hRSA4096 = (HANDLE) cpp_create_context(MODE_RSA_4096|MODE_PRIV_KEY); pCNTX tmp = (pCNTX) hRSA4096; @@ -77,7 +77,7 @@ int __cdecl rsa_done(void) { pRSAPRIV rsa_gen_keys(HANDLE context) { - if( context!=hRSA4096 ) return 0; + if ( context!=hRSA4096 ) return 0; #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_gen_keys: %d", context); @@ -117,7 +117,7 @@ int __cdecl rsa_gen_keypair(short mode) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_gen_keypair: %d", mode); #endif - if( mode&MODE_RSA_4096 ) rsa_gen_keys(hRSA4096); // 4096 + if ( mode&MODE_RSA_4096 ) rsa_gen_keys(hRSA4096); // 4096 return 1; } @@ -130,8 +130,8 @@ int __cdecl rsa_get_keypair(short mode, PBYTE privKey, int* privKeyLen, PBYTE pu pCNTX ptr = get_context_on_id(hRSA4096); pRSAPRIV r = (pRSAPRIV) ptr->pdata; - *privKeyLen = r->priv_k.length(); if( privKey ) r->priv_k.copy((char*)privKey, *privKeyLen); - *pubKeyLen = r->pub_k.length(); if( pubKey ) r->pub_k.copy((char*)pubKey, *pubKeyLen); + *privKeyLen = r->priv_k.length(); if ( privKey ) r->priv_k.copy((char*)privKey, *privKeyLen); + *pubKeyLen = r->pub_k.length(); if ( pubKey ) r->pub_k.copy((char*)pubKey, *pubKeyLen); return 1; } @@ -144,8 +144,8 @@ int __cdecl rsa_get_keyhash(short mode, PBYTE privKey, int* privKeyLen, PBYTE pu pCNTX ptr = get_context_on_id(hRSA4096); pRSAPRIV r = (pRSAPRIV) ptr->pdata; - if( privKey ) { *privKeyLen = r->priv_s.length(); r->priv_s.copy((char*)privKey, *privKeyLen); } - if( pubKey ) { *pubKeyLen = r->pub_s.length(); r->pub_s.copy((char*)pubKey, *pubKeyLen); } + if ( privKey ) { *privKeyLen = r->priv_s.length(); r->priv_s.copy((char*)privKey, *privKeyLen); } + if ( pubKey ) { *pubKeyLen = r->pub_s.length(); r->pub_s.copy((char*)pubKey, *pubKeyLen); } return 1; } @@ -158,11 +158,11 @@ int __cdecl rsa_set_keypair(short mode, PBYTE privKey, int privKeyLen) { pCNTX ptr = get_context_on_id(hRSA4096); pRSAPRIV r = (pRSAPRIV) ptr->pdata; - if( privKey && privKeyLen ) { + if ( privKey && privKeyLen ) { string priv; priv.assign((char*)privKey, privKeyLen); - if( mode & MODE_RSA_BER ) { + if ( mode & MODE_RSA_BER ) { // old BER format StringStore s(priv); r->priv.BERDecode(s); @@ -190,10 +190,10 @@ int __cdecl rsa_get_pubkey(HANDLE context, PBYTE pubKey, int* pubKeyLen) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_get_pubkey: %s", pubKey); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); - *pubKeyLen = p->pub_k.length(); if( pubKey ) p->pub_k.copy((char*)pubKey, *pubKeyLen); + *pubKeyLen = p->pub_k.length(); if ( pubKey ) p->pub_k.copy((char*)pubKey, *pubKeyLen); return 1; } @@ -203,10 +203,10 @@ int __cdecl rsa_set_pubkey(HANDLE context, PBYTE pubKey, int pubKeyLen) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_set_pubkey: %s", pubKey); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); - if( pubKey && pubKeyLen ) { + if ( pubKey && pubKeyLen ) { string pub; pub.assign((char*)pubKey, pubKeyLen); init_pub(p,pub); @@ -226,7 +226,7 @@ void __cdecl rsa_set_timeout(int t) { int __cdecl rsa_get_state(HANDLE context) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); return p->state; @@ -241,7 +241,7 @@ int __cdecl rsa_get_hash(PBYTE pubKey, int pubKeyLen, PBYTE pubHash, int* pubHas sig = hash(pubKey, pubKeyLen); *pubHashLen = sig.length(); - if( pubHash ) sig.copy((char*)pubHash, *pubHashLen); + if ( pubHash ) sig.copy((char*)pubHash, *pubHashLen); return 1; } @@ -251,7 +251,7 @@ int __cdecl rsa_connect(HANDLE context) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_connect: %08x", context); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); if(p->state) return p->state; pRSAPRIV r = rsa_get_priv(ptr); @@ -273,11 +273,11 @@ int __cdecl rsa_disconnect(HANDLE context) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_disconnect: %08x", context); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; rsa_free( ptr ); // удалим трэд и очередь сообщений pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); - if( !p->state ) return 1; + if ( !p->state ) return 1; PBYTE buffer=(PBYTE) alloca(RAND_SIZE); GlobalRNG().GenerateBlock(buffer,RAND_SIZE); @@ -294,7 +294,7 @@ int __cdecl rsa_disabled(HANDLE context) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_disabled: %08x", context); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; rsa_free( ptr ); // удалим трэд и очередь сообщений pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); @@ -310,24 +310,24 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_recv: %s", msg); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); pRSAPRIV r = rsa_get_priv(ptr); rtrim(msg); string buf = base64decode(msg); - if( !buf.length() ) return 0; + if ( !buf.length() ) return 0; string data; int type; un_tlv(buf,type,data); - if( type==-1 ) return 0; + if ( type==-1 ) return 0; #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_recv: %02x %d", type, p->state); #endif - if( type>0x10 && type<0xE0 ) // проверим тип сообщения (когда соединение еще не установлено) - if( p->state==0 || p->state!=(type>>4) ) { // неверное состояние + if ( type>0x10 && type<0xE0 ) // проверим тип сообщения (когда соединение еще не установлено) + if ( p->state==0 || p->state!=(type>>4) ) { // неверное состояние // шлем перерывание сессии p->state=0; p->time=0; rsa_free( ptr ); // удалим трэд и очередь сообщений @@ -340,7 +340,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { case 0x00: // прерывание сессии по ошибке другой стороной { // если соединение установлено - ничего не делаем - if( p->state == 0 || p->state == 7 ) return 0; + if ( p->state == 0 || p->state == 7 ) return 0; // иначе сбрасываем текущее состояние p->state=0; p->time=0; imp->rsa_notify(context,-2); // сессия разорвана по ошибке другой стороной @@ -359,7 +359,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { case 0x0D: // запрос паблика case 0xD0: // ответ пабликом { - if( !p->event ) { + if ( !p->event ) { p->event = CreateEvent(NULL,FALSE,FALSE,NULL); unsigned int tID; p->thread = (HANDLE) _beginthreadex(NULL, 0, sttConnectThread, (PVOID)context, 0, &tID); @@ -376,7 +376,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { case 0x50: // получили криптотест, отправляем свой криптотест { string msg = decode_msg(p,data); - if( !msg.length() ) { + if ( !msg.length() ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; @@ -392,7 +392,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { case 0x60: // получили криптотест, сессия установлена { string msg = decode_msg(p,data); - if( !msg.length() ) { + if ( !msg.length() ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; @@ -406,7 +406,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { { SAFE_FREE(ptr->tmp); string msg = decode_msg(p,data); - if( msg.length() ) { + if ( msg.length() ) { ptr->tmp = (LPSTR) strdup(msg.c_str()); } else { @@ -419,7 +419,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { { SAFE_FREE(ptr->tmp); string msg = decode_rsa(p,r,data); - if( msg.length() ) { + if ( msg.length() ) { ptr->tmp = (LPSTR) strdup(msg.c_str()); } else { @@ -430,9 +430,9 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { case 0xF0: // разрыв соединения вручную { - if( p->state != 7 ) return 0; + if ( p->state != 7 ) return 0; string msg = decode_msg(p,data); - if( !msg.length() ) return 0; + if ( !msg.length() ) return 0; p->state=0; rsa_free( ptr ); // удалим трэд и очередь сообщений imp->rsa_notify(context,-4); // соединение разорвано вручную другой стороной @@ -447,7 +447,7 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { } - if( p->state != 0 && p->state != 7 ) + if ( p->state != 0 && p->state != 7 ) p->time = gettime() + timeout; return 0; @@ -455,14 +455,14 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) { int __cdecl rsa_send(HANDLE context, LPCSTR msg) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); if(p->state!=0 && p->state!=7) return 0; - if( p->state == 7 ) // сессия установлена, шифруем AES и отправляем + if ( p->state == 7 ) // сессия установлена, шифруем AES и отправляем inject_msg(context,0x70,encode_msg(1,p,string(msg))); else - if( p->state == 0 ) { // сессия установлена, отправляем RSA сообщение - if( !p->pub_k.length() ) return 0; + if ( p->state == 0 ) { // сессия установлена, отправляем RSA сообщение + if ( !p->pub_k.length() ) return 0; // есть паблик ключ - отправим сообщение pRSAPRIV r = rsa_get_priv(ptr); inject_msg(context,0xE0,encode_rsa(1,p,r,string(msg))); @@ -517,7 +517,7 @@ string decode_msg(pRSADATA p, string& msg) { cbcDecryptor.Put((PBYTE)ciphered.data(),ciphered.length()); cbcDecryptor.MessageEnd(); - if( sig == hash(zlib) ) { + if ( sig == hash(zlib) ) { unciphered = (t1==1) ? cpp_zlibd(zlib) : zlib; } } @@ -551,7 +551,7 @@ string decode_rsa(pRSADATA p, pRSAPRIV r, string& msg) { string unciphered,zlib; zlib = RSADecryptString(r->priv,ciphered); - if( zlib.length() && RSAVerifyString(p->pub,zlib,sig) ) { + if ( zlib.length() && RSAVerifyString(p->pub,zlib,sig) ) { unciphered = (t1==1) ? cpp_zlibd(zlib) : zlib; } return unciphered; @@ -598,7 +598,7 @@ void init_priv(pRSAPRIV r, string& priv) { } } - // if( !empty ); + // if ( !empty ); r->pub_k = tlv(1,n)+tlv(2,e); r->pub_s = hash(r->pub_k); @@ -625,7 +625,7 @@ void init_pub(pRSADATA p, string& pub) { } } - // if( !empty ); + // if ( !empty ); p->pub.Initialize(BinaryToInteger(n),BinaryToInteger(e)); } @@ -652,7 +652,7 @@ void rsa_timeout(HANDLE context, pRSADATA p) { int __cdecl rsa_encrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); if(p->state!=7) return 0; try { @@ -669,7 +669,7 @@ int __cdecl rsa_encrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { int __cdecl rsa_decrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); if(p->state!=7) return 0; try { @@ -689,13 +689,13 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_recv_thread: %s", msg.c_str()); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); pRSAPRIV r = rsa_get_priv(ptr); string data; int type; un_tlv(msg,type,data); - if( type==-1 ) return 0; + if ( type==-1 ) return 0; #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_recv_thread: %02x %d", type, p->state); @@ -709,7 +709,7 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { int features; string sha1,sha2; un_tlv(un_tlv(un_tlv(data,t[0],features),t[1],sha1),t[2],sha2); BOOL lr = (p->pub_s==sha1); BOOL ll = (r->pub_s==sha2); - switch( (lr<<4)|ll ){ + switch( (lr<<4)|ll ) { case 0x11: { // оба паблика совпали inject_msg(context,0x21,gen_aes_key_iv(ptr->mode,p,r)); p->state=5; @@ -734,13 +734,13 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { int features; string pub; un_tlv(un_tlv(data,t[0],features),t[1],pub); string sig = hash(pub); - if( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { + if ( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; } init_pub(p,pub); - if( p->state==0 ) { // timeout + if ( p->state==0 ) { // timeout // rsa_connect(context); return -1; } @@ -761,13 +761,13 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { int features; string pub; un_tlv(un_tlv(data,t[0],features),t[1],pub); string sig = hash(pub); - if( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { + if ( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; } init_pub(p,pub); - if( p->state==0 ) { // timeout + if ( p->state==0 ) { // timeout // rsa_connect(context); return -1; } @@ -781,13 +781,13 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { string pub; un_tlv(data,t[0],pub); string sig = hash(pub); - if( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { + if ( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; } init_pub(p,pub); - if( p->state==0 ) { // timeout + if ( p->state==0 ) { // timeout // rsa_connect(context); return -1; } @@ -800,7 +800,7 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { case 0x40: { string key = decode_rsa(p,r,data); - if( !key.length() ) { + if ( !key.length() ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; @@ -818,16 +818,16 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { { int features; string pub,sha; un_tlv(un_tlv(un_tlv(data,t[0],features),t[1],pub),t[2],sha); - if( p->pub_k!=pub ) { // пришел новый паблик + if ( p->pub_k!=pub ) { // пришел новый паблик string sig = hash(pub); - if( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { + if ( !imp->rsa_check_pub(context,(PBYTE)pub.data(),pub.length(),(PBYTE)sig.data(),sig.length()) ) { p->state=0; p->time=0; null_msg(context,0x00,-type); // сессия разорвана по ошибке return 0; } init_pub(p,pub); } - if( type == 0x0D ) { // нужно отправить мой паблик + if ( type == 0x0D ) { // нужно отправить мой паблик inject_msg(context,0xD0,tlv(0,features)+tlv(1,r->pub_k)+tlv(2,p->pub_s)); } p->state=0; p->time=0; @@ -835,7 +835,7 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) { } - if( p->state != 0 && p->state != 7 ) + if ( p->state != 0 && p->state != 7 ) p->time = gettime() + timeout; return 1; @@ -855,7 +855,7 @@ void rsa_alloc( pCNTX ptr ) { void rsa_free( pCNTX ptr ) { pRSADATA p = (pRSADATA) ptr->pdata; - if( p && p->event ) { + if ( p && p->event ) { p->thread_exit = 2; // отпускаем поток в свободное плавание SetEvent( p->event ); rsa_alloc(ptr); @@ -864,7 +864,7 @@ void rsa_free( pCNTX ptr ) { void rsa_free_thread( pRSADATA p ) { - if( p->event ) { + if ( p->event ) { p->thread_exit = 1; SetEvent( p->event ); // ждем завершения потока @@ -893,7 +893,7 @@ unsigned __stdcall sttConnectThread( LPVOID arg ) { HANDLE context = (HANDLE) arg; - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); while(1) { @@ -901,8 +901,8 @@ unsigned __stdcall sttConnectThread( LPVOID arg ) { Sent_NetLog("sttConnectThread: WaitForSingleObject"); #endif WaitForSingleObject(p->event, INFINITE); // dwMsec rc==WAIT_TIMEOUT - if( p->thread_exit == 1 ) return 0; - if( p->thread_exit == 2 ) { + if ( p->thread_exit == 1 ) return 0; + if ( p->thread_exit == 2 ) { // мы в свободном плавании - освободим память и завершим трэд CloseHandle( p->thread ); CloseHandle( p->event ); @@ -913,7 +913,7 @@ unsigned __stdcall sttConnectThread( LPVOID arg ) { // дождались сообщения в очереди while( !p->thread_exit && p->queue && !p->queue->empty() ) { // обработаем сообщения из очереди - if( rsa_recv_thread(context, p->queue->front()) == -1 ) { + if ( rsa_recv_thread(context, p->queue->front()) == -1 ) { // очистить очередь clear_queue(p); break; @@ -933,14 +933,14 @@ int __cdecl rsa_export_keypair(short mode, LPSTR privKey, LPSTR pubKey, LPSTR pa pCNTX ptr = get_context_on_id(hRSA4096); pRSAPRIV r = (pRSAPRIV) ptr->pdata; - if( pubKey ) { + if ( pubKey ) { string pub; pub = tlv(3,r->pub_k) + tlv(4,r->pub_s); pub = pub_beg + crlf + add_delim(base64encode(pub),crlf,65) + pub_end + crlf; strcpy(pubKey, pub.c_str()); } - if( privKey && passPhrase ) { + if ( privKey && passPhrase ) { string key = hash256(passPhrase); string iv = hash256(key); string priv = pad256(r->priv_k); @@ -976,7 +976,7 @@ int __cdecl rsa_import_keypair(short mode, LPSTR privKey, LPSTR passPhrase) { pCNTX ptr = get_context_on_id(hRSA4096); pRSAPRIV r = (pRSAPRIV) ptr->pdata; - if( !passPhrase ) return 0; + if ( !passPhrase ) return 0; string priv; u_int found; @@ -985,13 +985,13 @@ int __cdecl rsa_import_keypair(short mode, LPSTR privKey, LPSTR passPhrase) { del_delim(priv,crlf); found = priv.find(priv_beg); - if( found != string::npos ) { + if ( found != string::npos ) { priv = priv.substr(found+priv_beg.length()); found = priv.find(priv_end); - if( found != string::npos ) { + if ( found != string::npos ) { priv = base64decode(priv.substr(0,found)); TLV k(priv); - if( k.exist(1) && k.exist(2) && hash(k.get(1)) == k.get(2) ) { + if ( k.exist(1) && k.exist(2) && hash(k.get(1)) == k.get(2) ) { priv = k.get(1); string key = hash256(passPhrase); @@ -1025,10 +1025,10 @@ int __cdecl rsa_export_pubkey(HANDLE context, LPSTR pubKey) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_export_pubkey: %08x", context); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); - if( !p->pub_k.length() || !pubKey ) return 0; + if ( !p->pub_k.length() || !pubKey ) return 0; string pub; pub = tlv(3,p->pub_k) + tlv(4,p->pub_s); @@ -1043,10 +1043,10 @@ int __cdecl rsa_import_pubkey(HANDLE context, LPSTR pubKey) { #if defined(_DEBUG) || defined(NETLIB_LOG) Sent_NetLog("rsa_import_pubkey: %08x", context); #endif - pCNTX ptr = get_context_on_id(context); if(!ptr) return 0; + pCNTX ptr = get_context_on_id(context); if (!ptr) return 0; pRSADATA p = (pRSADATA) cpp_alloc_pdata(ptr); - if( !pubKey ) return 0; + if ( !pubKey ) return 0; string pub; u_int found; @@ -1055,13 +1055,13 @@ int __cdecl rsa_import_pubkey(HANDLE context, LPSTR pubKey) { del_delim(pub,crlf); found = pub.find(pub_beg); - if( found != string::npos ) { + if ( found != string::npos ) { pub = pub.substr(found+pub_beg.length()); found = pub.find(pub_end); - if( found != string::npos ) { + if ( found != string::npos ) { pub = base64decode(pub.substr(0,found)); TLV k(pub); - if( k.exist(3) && k.exist(4) && hash(k.get(3)) == k.get(4) ) { + if ( k.exist(3) && k.exist(4) && hash(k.get(3)) == k.get(4) ) { init_pub(p,k.get(3)); return 1; } diff --git a/plugins/CryptoPP/cpp_rsau.cpp b/plugins/CryptoPP/cpp_rsau.cpp index 6644e715fa..be8e499ed1 100644 --- a/plugins/CryptoPP/cpp_rsau.cpp +++ b/plugins/CryptoPP/cpp_rsau.cpp @@ -6,14 +6,14 @@ const string padding = "PADDING!PADDING!PADDING!PADDING!"; // 256 bit string pad256(string& str) { string out = str; int pad = out.length() % 32; - if( pad ) { // ­ ¤® ўла®ў­пвм ­  256 ЎЁв - if( pad>3 ) { + if ( pad ) { // ­ ¤® ўла®ў­пвм ­  256 ЎЁв + if ( pad>3 ) { out += tlv(0,padding.substr(0,32-3-pad)); } else { - if( pad==3 ) out += string("\0\0\0"); + if ( pad==3 ) out += string("\0\0\0"); else - if( pad==2 ) out += string("\0\0"); + if ( pad==2 ) out += string("\0\0"); else out += string("\0"); } } @@ -23,7 +23,7 @@ string pad256(string& str) { string& add_delim(string& str, const string& del, int len) { string val; - for( u_int i=0; i 3 ) { + if ( b.length() > 3 ) { t = 0; b.copy((char*)&t,3); u_int l = t>>8; t &= 0xFF; - if( b.length() >= 3+l ) { + if ( b.length() >= 3+l ) { v = b.substr(3,l); r = b.substr(3+l); } } - if( !v.length() ) { + if ( !v.length() ) { t = -1; } b = r; @@ -95,7 +95,7 @@ string& un_tlv(string& b, int& t, int& v) { int str2int(string& s) { int v = 0; - if( s.length()<=sizeof(int) ) + if ( s.length()<=sizeof(int) ) s.copy((char*)&v,s.length()); return v; } diff --git a/plugins/CryptoPP/cpp_rsau.h b/plugins/CryptoPP/cpp_rsau.h index adb017c18b..ae41e64def 100644 --- a/plugins/CryptoPP/cpp_rsau.h +++ b/plugins/CryptoPP/cpp_rsau.h @@ -12,7 +12,7 @@ public: string encode() { map::const_iterator i; string b; - for( i=data.begin(); i!=data.end(); ++i ) { + for ( i=data.begin(); i!=data.end(); ++i ) { b += tlv(i->first,i->second); } return b; @@ -23,7 +23,7 @@ public: string r = b; while( r.length() ) { t = un_tlv(r,v); - if( t==-1 ) { + if ( t==-1 ) { break; } data[t] = v; @@ -46,16 +46,16 @@ private: u_char un_tlv(string& b, string& v) { string r; v = r; u_int t = 0; - if( b.length() > 3 ) { + if ( b.length() > 3 ) { b.copy((char*)&t,3); u_int l = t>>8; t &= 0xFF; - if( b.length() >= 3+l ) { + if ( b.length() >= 3+l ) { v = b.substr(3,l); r = b.substr(3+l); } } - if( !v.length() ) { + if ( !v.length() ) { return -1; } b = r; diff --git a/plugins/CryptoPP/cpp_svcs.cpp b/plugins/CryptoPP/cpp_svcs.cpp index 50a3ee1a54..e03800648d 100644 --- a/plugins/CryptoPP/cpp_svcs.cpp +++ b/plugins/CryptoPP/cpp_svcs.cpp @@ -159,9 +159,9 @@ LPSTR __cdecl cpp_decrypt(pCNTX ptr, LPCSTR szEncMsg) { LPSTR __cdecl cpp_encodeA(HANDLE context, LPCSTR msg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } + if (!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } LPSTR szNewMsg = NULL; LPSTR szOldMsg = (LPSTR) msg; @@ -187,9 +187,9 @@ LPSTR __cdecl cpp_encodeA(HANDLE context, LPCSTR msg) { LPSTR __cdecl cpp_encodeU(HANDLE context, LPCSTR msg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } + if (!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } LPSTR szNewMsg = NULL; LPSTR szOldMsg = (LPSTR) msg; @@ -215,9 +215,9 @@ LPSTR __cdecl cpp_encodeU(HANDLE context, LPCSTR msg) { LPSTR __cdecl cpp_encodeW(HANDLE context, LPWSTR msg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } + if (!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } LPSTR szNewMsg = NULL; LPSTR szOldMsg = (LPSTR) msg; @@ -242,9 +242,9 @@ LPSTR __cdecl cpp_encodeW(HANDLE context, LPWSTR msg) { LPSTR __cdecl cpp_decode(HANDLE context, LPCSTR szEncMsg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } + if (!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } LPSTR szNewMsg = NULL; LPSTR szOldMsg = cpp_decrypt(ptr, szEncMsg); @@ -278,9 +278,9 @@ LPSTR __cdecl cpp_decode(HANDLE context, LPCSTR szEncMsg) { LPSTR __cdecl cpp_decodeU(HANDLE context, LPCSTR szEncMsg) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return NULL; + if (!ptr) return NULL; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } + if (!p->KeyX) { ptr->error = ERROR_NO_KEYX; return NULL; } LPSTR szNewMsg = NULL; LPSTR szOldMsg = cpp_decrypt(ptr, szEncMsg); @@ -307,9 +307,9 @@ LPSTR __cdecl cpp_decodeU(HANDLE context, LPCSTR szEncMsg) { int __cdecl cpp_encrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return 0; + if (!ptr) return 0; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) return 0; + if (!p->KeyX) return 0; try{ CBC_Mode::Encryption enc(p->KeyX,Tiger::DIGESTSIZE,IV); @@ -326,9 +326,9 @@ int __cdecl cpp_encrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { int __cdecl cpp_decrypt_file(HANDLE context,LPCSTR file_in,LPCSTR file_out) { pCNTX ptr = get_context_on_id(context); - if(!ptr) return 0; + if (!ptr) return 0; cpp_alloc_pdata(ptr); pSIMDATA p = (pSIMDATA) ptr->pdata; - if(!p->KeyX) return 0; + if (!p->KeyX) return 0; try{ CBC_Mode::Decryption dec(p->KeyX,Tiger::DIGESTSIZE,IV); diff --git a/plugins/CryptoPP/crypto/crc.cpp b/plugins/CryptoPP/crypto/crc.cpp index 3a2cb4fee3..a27f891ba4 100644 --- a/plugins/CryptoPP/crypto/crc.cpp +++ b/plugins/CryptoPP/crypto/crc.cpp @@ -126,7 +126,7 @@ void CRC32::Update(const byte *s, size_t n) { word32 crc = m_crc; - for(; !IsAligned(s) && n > 0; n--) + for (; !IsAligned(s) && n > 0; n--) crc = m_tab[CRC32_INDEX(crc) ^ *s++] ^ CRC32_SHIFTED(crc); while (n >= 4) diff --git a/plugins/CryptoPP/crypto/des.cpp b/plugins/CryptoPP/crypto/des.cpp index 5002f26588..69c4ba066d 100644 --- a/plugins/CryptoPP/crypto/des.cpp +++ b/plugins/CryptoPP/crypto/des.cpp @@ -292,9 +292,9 @@ void RawDES::RawSetKey(CipherDir dir, const byte *key) for (j=0; j<56; j++) /* rotate pc1 the right amount */ pcr[j] = pc1m[(l=j+totrot[i])<(j<28? 28 : 56) ? l: l-28]; /* rotate left and right halves independently */ - for (j=0; j<48; j++){ /* select bits individually */ + for (j=0; j<48; j++) { /* select bits individually */ /* check bit that goes to ks[j] */ - if (pcr[pc2[j]-1]){ + if (pcr[pc2[j]-1]) { /* mask it in if it's there */ l= j % 6; ks[j/6] |= bytebit[l] >> 2; diff --git a/plugins/CryptoPP/crypto/gzip.cpp b/plugins/CryptoPP/crypto/gzip.cpp index c9f75584de..3a52529dc6 100644 --- a/plugins/CryptoPP/crypto/gzip.cpp +++ b/plugins/CryptoPP/crypto/gzip.cpp @@ -65,12 +65,12 @@ void Gunzip::ProcessPrestreamHeader() if (flags & FILENAME) // skip filename do - if(!m_inQueue.Get(b)) throw HeaderErr(); + if (!m_inQueue.Get(b)) throw HeaderErr(); while (b); if (flags & COMMENTS) // skip comments do - if(!m_inQueue.Get(b)) throw HeaderErr(); + if (!m_inQueue.Get(b)) throw HeaderErr(); while (b); } diff --git a/plugins/CryptoPP/crypto/mars.cpp b/plugins/CryptoPP/crypto/mars.cpp index 74aad3a9b9..6e2fe9d94f 100644 --- a/plugins/CryptoPP/crypto/mars.cpp +++ b/plugins/CryptoPP/crypto/mars.cpp @@ -28,7 +28,7 @@ static word32 gen_mask(word32 x) m = (~x ^ (x >> 1)) & 0x7fffffff; m &= (m >> 1) & (m >> 2); m &= (m >> 3) & (m >> 6); - if(!m) + if (!m) return 0; m <<= 1; m |= (m << 1); m |= (m << 2); m |= (m << 4); diff --git a/plugins/CryptoPP/crypto/osrng.cpp b/plugins/CryptoPP/crypto/osrng.cpp index 6ad488c56f..ff7f034de7 100644 --- a/plugins/CryptoPP/crypto/osrng.cpp +++ b/plugins/CryptoPP/crypto/osrng.cpp @@ -47,7 +47,7 @@ OS_RNG_Err::OS_RNG_Err(const std::string &operation) MicrosoftCryptoProvider::MicrosoftCryptoProvider() { - if(!CryptAcquireContext(&m_hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContext(&m_hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) throw OS_RNG_Err("CryptAcquireContext"); } diff --git a/plugins/CryptoPP/main.cpp b/plugins/CryptoPP/main.cpp index 69f30cc1ff..042086d4b3 100644 --- a/plugins/CryptoPP/main.cpp +++ b/plugins/CryptoPP/main.cpp @@ -5,7 +5,7 @@ int hLangpack; // dllmain BOOL WINAPI DllMain(HINSTANCE hInst, DWORD dwReason, LPVOID) { g_hInst = hInst; - if( dwReason == DLL_PROCESS_ATTACH ) { + if ( dwReason == DLL_PROCESS_ATTACH ) { { char temp[MAX_PATH]; GetTempPath(sizeof(temp),temp); diff --git a/plugins/Db3x/dbcache.c b/plugins/Db3x/dbcache.c index 4cf338bfb9..9e8cbc7a76 100644 --- a/plugins/Db3x/dbcache.c +++ b/plugins/Db3x/dbcache.c @@ -186,7 +186,7 @@ static VOID CALLBACK DoBufferFlushTimerProc(HWND hwnd,UINT message,UINT_PTR idEv void DBFlush(int setting) { - if(!setting) { + if (!setting) { log0("nflush1"); if(safetyMode) FlushFileBuffers(hDbFile); log0("nflush2"); diff --git a/plugins/Db3x/dbcontacts.c b/plugins/Db3x/dbcontacts.c index eb5d13d52c..03f248457e 100644 --- a/plugins/Db3x/dbcontacts.c +++ b/plugins/Db3x/dbcontacts.c @@ -145,7 +145,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam) struct DBEvent *dbe; int index; - if((HANDLE)wParam==NULL) return 1; + if ((HANDLE)wParam==NULL) return 1; EnterCriticalSection(&csDbAccess); dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL); if(dbc->signature!=DBCONTACT_SIGNATURE) { diff --git a/plugins/Db3x/dbevents.c b/plugins/Db3x/dbevents.c index 39de07d187..aff845b76b 100644 --- a/plugins/Db3x/dbevents.c +++ b/plugins/Db3x/dbevents.c @@ -137,7 +137,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) // Loop through the chain, starting at the end ofsThis = dbc.ofsLastEvent; dbeTest = (struct DBEvent*)DBRead(ofsThis, sizeof(struct DBEvent), NULL); - for(;;) { + for (;;) { // If the new event's timesstamp is equal to or greater than the // current dbevent, it will be inserted after. If not, continue // with the previous dbevent in chain. @@ -161,7 +161,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) } } dbc.eventCount++; - if(!(dbe.flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe.flags&(DBEF_READ|DBEF_SENT))) { if(dbe.timestampofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -211,7 +211,7 @@ static INT_PTR DeleteEvent(WPARAM wParam,LPARAM lParam) } ofsThis=dbeNext->ofsNext; dbeNext=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbeNext->timestamp; break; @@ -331,7 +331,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) DBWrite(lParam,dbe,sizeof(struct DBEvent)); ret=(INT_PTR)dbe->flags; if(dbc.ofsFirstUnreadEvent==(DWORD)lParam) { - for(;;) { + for (;;) { if(dbe->ofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -339,7 +339,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) } ofsThis=dbe->ofsNext; dbe=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbe->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbe->timestamp; break; diff --git a/plugins/Db3x/dbsettings.c b/plugins/Db3x/dbsettings.c index 590eddc2e8..16bf2aa2bb 100644 --- a/plugins/Db3x/dbsettings.c +++ b/plugins/Db3x/dbsettings.c @@ -65,7 +65,7 @@ static DWORD GetSettingsGroupOfsByModuleNameOfs(struct DBContact *dbc,DWORD ofsC settingsGroupOfsCache[nextSGOCacheEntry].ofsContact=ofsContact; settingsGroupOfsCache[nextSGOCacheEntry].ofsModuleName=ofsModuleName; settingsGroupOfsCache[nextSGOCacheEntry].ofsSettingsGroup=ofsThis; - if(++nextSGOCacheEntry==SETTINGSGROUPOFSCOUNT) nextSGOCacheEntry=0; + if (++nextSGOCacheEntry==SETTINGSGROUPOFSCOUNT) nextSGOCacheEntry=0; return ofsThis; } ofsThis=dbcs->ofsNext; @@ -319,7 +319,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { dbcgs->pValue->cchVal--; - if(*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); CopyMemory(dbcgs->pValue->pszVal,pBlob+3,dbcgs->pValue->cchVal); dbcgs->pValue->pszVal[dbcgs->pValue->cchVal]=0; dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); @@ -333,7 +333,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING case DBVT_BLOB: NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { - if(*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); CopyMemory(dbcgs->pValue->pbVal,pBlob+3,dbcgs->pValue->cpbVal); } else { @@ -716,7 +716,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam) else bytesRequired=tmp.value.type; bytesRequired+=2+settingNameLen; bytesRequired+=ofsBlobPtr+1-(ofsSettingsGroup+offsetof(struct DBContactSettings,blob)); - if((DWORD)bytesRequired>dbcs.cbBlob) { + if ((DWORD)bytesRequired>dbcs.cbBlob) { //doesn't fit: move entire group struct DBContactSettings *dbcsPrev; DWORD ofsDbcsPrev,oldSize,ofsNew; @@ -843,7 +843,7 @@ static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam) MoveAlong(1+GetSettingValueLength(pBlob)); NeedBytes(1); } - if(!pBlob[0]) { //setting didn't exist + if (!pBlob[0]) { //setting didn't exist LeaveCriticalSection(&csDbAccess); return 1; } @@ -906,7 +906,7 @@ static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam) return -1; } dbces->ofsSettings=GetSettingsGroupOfsByModuleNameOfs(&dbc,ofsContact,ofsModuleName); - if(!dbces->ofsSettings) { + if (!dbces->ofsSettings) { LeaveCriticalSection(&csDbAccess); return -1; } diff --git a/plugins/Db3x_mmap/dbcache.c b/plugins/Db3x_mmap/dbcache.c index 8e177c6f6d..625d8aa775 100644 --- a/plugins/Db3x_mmap/dbcache.c +++ b/plugins/Db3x_mmap/dbcache.c @@ -144,7 +144,7 @@ static VOID CALLBACK DoBufferFlushTimerProc(HWND hwnd, UINT message, UINT_PTR id void DBFlush(int setting) { - if(!setting) { + if (!setting) { log0("nflush1"); if(safetyMode && pDbCache) { if (FlushViewOfFile(pDbCache, 0) == 0) { diff --git a/plugins/Db3x_mmap/dbcontacts.c b/plugins/Db3x_mmap/dbcontacts.c index 0803f1f746..51e533266d 100644 --- a/plugins/Db3x_mmap/dbcontacts.c +++ b/plugins/Db3x_mmap/dbcontacts.c @@ -153,7 +153,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam) struct DBEvent *dbe; int index; - if((HANDLE)wParam==NULL) return 1; + if ((HANDLE)wParam==NULL) return 1; EnterCriticalSection(&csDbAccess); dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL); if(dbc->signature!=DBCONTACT_SIGNATURE) { diff --git a/plugins/Db3x_mmap/dbevents.c b/plugins/Db3x_mmap/dbevents.c index 24c568f02d..5576455daf 100644 --- a/plugins/Db3x_mmap/dbevents.c +++ b/plugins/Db3x_mmap/dbevents.c @@ -135,7 +135,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) // Loop through the chain, starting at the end ofsThis = dbc.ofsLastEvent; dbeTest = (struct DBEvent*)DBRead(ofsThis, sizeof(struct DBEvent), NULL); - for(;;) { + for (;;) { // If the new event's timesstamp is equal to or greater than the // current dbevent, it will be inserted after. If not, continue // with the previous dbevent in chain. @@ -159,7 +159,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) } } dbc.eventCount++; - if(!(dbe.flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe.flags&(DBEF_READ|DBEF_SENT))) { if(dbe.timestampofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -217,7 +217,7 @@ static INT_PTR DeleteEvent(WPARAM wParam,LPARAM lParam) } ofsThis=dbeNext->ofsNext; dbeNext=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbeNext->timestamp; break; @@ -340,7 +340,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) DBWrite(lParam,dbe,sizeof(struct DBEvent)); ret=(int)dbe->flags; if(dbc.ofsFirstUnreadEvent==(DWORD)lParam) { - for(;;) { + for (;;) { if(dbe->ofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -348,7 +348,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) } ofsThis=dbe->ofsNext; dbe=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbe->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbe->timestamp; break; diff --git a/plugins/Db3x_mmap/dbsettings.c b/plugins/Db3x_mmap/dbsettings.c index 85b91b1b6c..ab306e8b48 100644 --- a/plugins/Db3x_mmap/dbsettings.c +++ b/plugins/Db3x_mmap/dbsettings.c @@ -323,7 +323,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { dbcgs->pValue->cchVal--; - if(*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); CopyMemory(dbcgs->pValue->pszVal,pBlob+3,dbcgs->pValue->cchVal); dbcgs->pValue->pszVal[dbcgs->pValue->cchVal]=0; dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); @@ -337,7 +337,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING case DBVT_BLOB: NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { - if(*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); CopyMemory(dbcgs->pValue->pbVal,pBlob+3,dbcgs->pValue->cpbVal); } else { @@ -733,7 +733,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam) else bytesRequired=tmp.value.type; bytesRequired+=2+settingNameLen; bytesRequired+=ofsBlobPtr+1-(ofsSettingsGroup+offsetof(struct DBContactSettings,blob)); - if((DWORD)bytesRequired>dbcs.cbBlob) { + if ((DWORD)bytesRequired>dbcs.cbBlob) { //doesn't fit: move entire group struct DBContactSettings *dbcsPrev; DWORD ofsDbcsPrev,ofsNew; @@ -863,7 +863,7 @@ static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam) MoveAlong(1+GetSettingValueLength(pBlob)); NeedBytes(1); } - if(!pBlob[0]) { //setting didn't exist + if (!pBlob[0]) { //setting didn't exist LeaveCriticalSection(&csDbAccess); return 1; } @@ -925,7 +925,7 @@ static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam) return -1; } dbces->ofsSettings=GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName); - if(!dbces->ofsSettings) { + if (!dbces->ofsSettings) { LeaveCriticalSection(&csDbAccess); return -1; } diff --git a/plugins/Db_autobackups/backup.c b/plugins/Db_autobackups/backup.c index 377a1fe539..3b0229ac56 100644 --- a/plugins/Db_autobackups/backup.c +++ b/plugins/Db_autobackups/backup.c @@ -98,7 +98,7 @@ int RotateBackups(HWND progress_dialog, DWORD start_time) i++; while(PeekMessage(&msg, progress_dialog, 0, 0, PM_REMOVE) != 0) { - if(!IsDialogMessage(progress_dialog, &msg)) + if (!IsDialogMessage(progress_dialog, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -154,10 +154,10 @@ int Backup(TCHAR* backup_filename) else lstrcpyn(dest_file, backup_filename, MAX_PATH); - if(!options.disable_popups) + if (!options.disable_popups) ShowPopup(dbname, TranslateT("Backup in Progress")); - if(!options.disable_progress) { + if (!options.disable_progress) { progress_dialog = CreateDialog(hInst, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, (DLGPROC)DlgProcProgress); SetDlgItemText(progress_dialog, IDC_PROGRESSMESSAGE, TranslateT("Rotating backup files...")); } @@ -175,7 +175,7 @@ int Backup(TCHAR* backup_filename) SendMessage(progress_dialog, PBM_SETPOS, (WPARAM)(int)(100), 0); UpdateWindow(progress_dialog); DBWriteContactSettingDword(0, "AutoBackups", "LastBackupTimestamp", (DWORD)time(0)); - if(!options.disable_popups) + if (!options.disable_popups) { dest_file_len = lstrlen(dest_file); if(dest_file_len > 50) diff --git a/plugins/Db_autobackups/options.c b/plugins/Db_autobackups/options.c index 51baa1b687..acb6072718 100644 --- a/plugins/Db_autobackups/options.c +++ b/plugins/Db_autobackups/options.c @@ -12,9 +12,9 @@ int LoadOptions(void) { options.period = (unsigned int)DBGetContactSettingWord(0, "AutoBackups", "Period", 1); options.period_type = (PeriodType)DBGetContactSettingByte(0, "AutoBackups", "PeriodType", (BYTE)PT_DAYS); - if(!ServiceExists(MS_FOLDERS_GET_PATH)) { + if (!ServiceExists(MS_FOLDERS_GET_PATH)) { - if(!DBGetContactSettingTString(0, "AutoBackups", "Folder", &dbv)) { + if (!DBGetContactSettingTString(0, "AutoBackups", "Folder", &dbv)) { tmp = Utils_ReplaceVarsT(dbv.ptszVal); if(_tcslen(tmp) >= 2 && tmp[1] == ':') @@ -244,7 +244,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP bi.lParam = 0; bi.iImage = 0; - if((pidl = SHBrowseForFolder(&bi)) != 0) { + if ((pidl = SHBrowseForFolder(&bi)) != 0) { SHGetPathFromIDList(pidl, folder_buff); SetDlgItemText(hwndDlg, IDC_ED_FOLDER, folder_buff); diff --git a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp b/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp index 26312ea5b0..5ec62707f1 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/aggressive.cpp @@ -31,7 +31,7 @@ int WorkAggressive(int firstTime) BYTE *buf; if(firstTime) { - if(!opts.bAggressive) return ERROR_NO_MORE_ITEMS; + if (!opts.bAggressive) return ERROR_NO_MORE_ITEMS; AddToStatus(STATUS_MESSAGE,TranslateT("Performing aggressive pass")); ofsCurrent=0; spaceProcessed=0; @@ -43,13 +43,13 @@ int WorkAggressive(int firstTime) blockBytes-=3; for(i=0;i= 100) break; - if(!FindNextFileA(hFile, &fd)) break; + if (!FindNextFileA(hFile, &fd)) break; } AddToStatus(STATUS_MESSAGE,TranslateT("%d crypto modules loaded"), ModulesCount); @@ -166,14 +166,14 @@ int CheckPassword(WORD checkWord, WORD cryptorUID, char * szDBName) { int i; int Found = 0; - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(cryptorUID == Modules[i]->cryptor->uid){ CryptoEngine = Modules[i]->cryptor; Found = 1; break; } } - if(!Found){ + if (!Found){ AddToStatus(STATUS_FATAL, TranslateT("Sorry, but your database encrypted with unknown module"), MB_OK); bCheckingPass = 0; return 0; @@ -277,7 +277,7 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) UINT uid = LOWORD(wParam); if(uid == IDOK){ - if(!GetWindowLongPtr(hDlg,GWLP_USERDATA)) + if (!GetWindowLongPtr(hDlg,GWLP_USERDATA)) { encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254); EndDialog(hDlg,IDOK); diff --git a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp index c48ab1b821..23dab85843 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp @@ -44,7 +44,7 @@ static void ConvertOldEvent( DBEvent*& dbei ) break; } } } else { - if( !is_utf8_string(( char* )dbei->blob) ) + if ( !is_utf8_string(( char* )dbei->blob) ) dbei->flags &= ~DBEF_UTF; } @@ -132,7 +132,7 @@ int WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) FinishUp(ofsDestPrevEvent,dbc); return ERROR_NO_MORE_ITEMS; } - if(!SignatureValid(ofsThisEvent,DBEVENT_SIGNATURE)) + if (!SignatureValid(ofsThisEvent,DBEVENT_SIGNATURE)) { DWORD ofsNew = 0; DWORD ofsTmp = dbc->ofsLastEvent; @@ -163,7 +163,7 @@ int WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) } if(firstTime) { - if(!(dbeOld.flags&DBEF_FIRST)) { + if (!(dbeOld.flags&DBEF_FIRST)) { AddToStatus(STATUS_WARNING,TranslateT("First event not marked as such: correcting")); dbeOld.flags|=DBEF_FIRST; } @@ -180,7 +180,7 @@ int WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) dbeOld.flags&=(DBEF_FIRST|DBEF_READ|DBEF_SENT|DBEF_RTL|DBEF_UTF); } - if(!(dbeOld.flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbeOld.flags&(DBEF_READ|DBEF_SENT))) { if(opts.bMarkRead) dbeOld.flags|=DBEF_READ; else if(ofsFirstUnread==0) { if(dbc->ofsFirstUnreadEvent!=ofsThisEvent || dbc->timestampFirstUnread!=dbeOld.timestamp) @@ -211,12 +211,12 @@ int WorkEventChain(DWORD ofsContact,DBContact *dbc,int firstTime) return ERROR_NO_MORE_ITEMS; } - if((dbeNew->ofsModuleName=ConvertModuleNameOfs(dbeOld.ofsModuleName))==0) { + if ((dbeNew->ofsModuleName=ConvertModuleNameOfs(dbeOld.ofsModuleName))==0) { ofsThisEvent=dbeOld.ofsNext; return ERROR_SUCCESS; } - if(!firstTime && dbeOld.ofsPrev!=ofsPrevEvent) + if (!firstTime && dbeOld.ofsPrev!=ofsPrevEvent) AddToStatus(STATUS_WARNING,TranslateT("Event not backlinked correctly: fixing")); dbeNew->flags=dbeOld.flags; diff --git a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp b/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp index b7a99a5189..2ed8b7183d 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/finaltasks.cpp @@ -72,7 +72,7 @@ int WorkFinalTasks(int firstTime) } MoveFile(opts.filename,opts.backupFilename) || AddToStatus(STATUS_WARNING,TranslateT("Unable to rename original file")); } - else if(!opts.bCheckOnly) DeleteFile(opts.filename) || AddToStatus(STATUS_WARNING,TranslateT("Unable to delete original file")); - if(!opts.bCheckOnly) MoveFile(opts.outputFilename,opts.filename) || AddToStatus(STATUS_WARNING,TranslateT("Unable to rename output file")); + else if (!opts.bCheckOnly) DeleteFile(opts.filename) || AddToStatus(STATUS_WARNING,TranslateT("Unable to delete original file")); + if (!opts.bCheckOnly) MoveFile(opts.outputFilename,opts.filename) || AddToStatus(STATUS_WARNING,TranslateT("Unable to rename output file")); return ERROR_NO_MORE_ITEMS; } diff --git a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp b/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp index a2f621df46..385d31cb92 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/initialchecks.cpp @@ -40,13 +40,13 @@ int WorkInitialChecks(int firstTime) } bEncrypted = false; if(memcmp(dbhdr.signature,&dbSignature,sizeof(dbhdr.signature))) { - if(memcmp(dbhdr.signature,&dbSignatureEncrypted,sizeof(dbhdr.signature))){ + if(memcmp(dbhdr.signature,&dbSignatureEncrypted,sizeof(dbhdr.signature))) { AddToStatus(STATUS_FATAL,TranslateT("Database signature is corrupted, automatic repair is impossible")); return ERROR_BAD_FORMAT; } AddToStatus(STATUS_SUCCESS,TranslateT("Database is Secured MMAP database")); InitSecurity(); - if(CheckPassword(dbhdr.checkWord, dbhdr.cryptorUID, (char*)Translate("your database"))){ + if(CheckPassword(dbhdr.checkWord, dbhdr.cryptorUID, (char*)Translate("your database"))) { AddToStatus(STATUS_SUCCESS,TranslateT("Secured MMAP: authorization successful")); bEncrypted = true; } diff --git a/plugins/Dbx_mmap_SA/Dbtool/langpack.cpp b/plugins/Dbx_mmap_SA/Dbtool/langpack.cpp index 85df5cdf22..af251fe2f2 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/langpack.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/langpack.cpp @@ -76,7 +76,7 @@ void ConvertBackslashes(char *str, UINT fileCp) char *pstr; for (pstr = str; *pstr; pstr = CharNextExA(fileCp, pstr, 0)) { - if( *pstr == '\\' ) + if ( *pstr == '\\' ) { switch( pstr[1] ) { @@ -215,11 +215,11 @@ static int LoadLangPack(const TCHAR *szLangPack) pszColon=strchr(line,':'); if(pszColon==NULL) {fclose(fp); return 3;} *pszColon=0; - if(!lstrcmpA(line,"Language")) {_snprintf(langPack.language,sizeof(langPack.language),"%s",pszColon+1); TrimString(langPack.language);} - else if(!lstrcmpA(line,"Last-Modified-Using")) {_snprintf(langPack.lastModifiedUsing,sizeof(langPack.lastModifiedUsing),"%s",pszColon+1); TrimString(langPack.lastModifiedUsing);} - else if(!lstrcmpA(line,"Authors")) {_snprintf(langPack.authors,sizeof(langPack.authors),"%s",pszColon+1); TrimString(langPack.authors);} - else if(!lstrcmpA(line,"Author-email")) {_snprintf(langPack.authorEmail,sizeof(langPack.authorEmail),"%s",pszColon+1); TrimString(langPack.authorEmail);} - else if(!lstrcmpA(line, "Locale")) { + if (!lstrcmpA(line,"Language")) {_snprintf(langPack.language,sizeof(langPack.language),"%s",pszColon+1); TrimString(langPack.language);} + else if (!lstrcmpA(line,"Last-Modified-Using")) {_snprintf(langPack.lastModifiedUsing,sizeof(langPack.lastModifiedUsing),"%s",pszColon+1); TrimString(langPack.lastModifiedUsing);} + else if (!lstrcmpA(line,"Authors")) {_snprintf(langPack.authors,sizeof(langPack.authors),"%s",pszColon+1); TrimString(langPack.authors);} + else if (!lstrcmpA(line,"Author-email")) {_snprintf(langPack.authorEmail,sizeof(langPack.authorEmail),"%s",pszColon+1); TrimString(langPack.authorEmail);} + else if (!lstrcmpA(line, "Locale")) { char szBuf[20], *stopped; TrimString(pszColon + 1); @@ -249,7 +249,7 @@ static int LoadLangPack(const TCHAR *szLangPack) pszLine = line+1; line[lstrlenA(line)-1]='\0'; TrimStringSimple(line); - if(++langPack.entryCount>entriesAlloced) { + if (++langPack.entryCount>entriesAlloced) { entriesAlloced+=128; langPack.entry=(struct LangPackEntry*)realloc(langPack.entry,sizeof(struct LangPackEntry)*entriesAlloced); } @@ -339,9 +339,9 @@ static BOOL CALLBACK TranslateDialogEnumProc(HWND hwnd,LPARAM lParam) int id = GetDlgCtrlID( hwnd ); GetClassName(hwnd,szClass,SIZEOF(szClass)); - if(!lstrcmpi(szClass,_T("static")) || !lstrcmpi(szClass,_T("hyperlink")) || !lstrcmpi(szClass,_T("button")) || !lstrcmpi(szClass,_T("MButtonClass"))) + if (!lstrcmpi(szClass,_T("static")) || !lstrcmpi(szClass,_T("hyperlink")) || !lstrcmpi(szClass,_T("button")) || !lstrcmpi(szClass,_T("MButtonClass"))) TranslateWindow(hwnd); - else if(!lstrcmpi(szClass,_T("edit"))) { + else if (!lstrcmpi(szClass,_T("edit"))) { if ( GetWindowLong(hwnd,GWL_STYLE)&ES_READONLY) TranslateWindow(hwnd); } diff --git a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp b/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp index 515ec9bfbd..a93f1720e6 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/modulechain.cpp @@ -48,7 +48,7 @@ int WorkModuleChain(int firstTime) phase++; return ERROR_SUCCESS; } - if(!SignatureValid(ofsCurrent,DBMODULENAME_SIGNATURE)) { + if (!SignatureValid(ofsCurrent,DBMODULENAME_SIGNATURE)) { AddToStatus(STATUS_ERROR,TranslateT("Module chain corrupted, further entries ignored")); phase++; return ERROR_SUCCESS; @@ -87,12 +87,12 @@ int WorkModuleChain(int firstTime) newModName=(DBModuleName*)_alloca(modChain[iCurrentModName].size); if(ReadSegment(modChain[iCurrentModName].ofsOld,newModName,modChain[iCurrentModName].size)!=ERROR_SUCCESS) return ERROR_NO_MORE_ITEMS; - if((modChain[iCurrentModName].ofsNew=WriteSegment(WSOFS_END,newModName,modChain[iCurrentModName].size))==WS_ERROR) + if ((modChain[iCurrentModName].ofsNew=WriteSegment(WSOFS_END,newModName,modChain[iCurrentModName].size))==WS_ERROR) return ERROR_HANDLE_DISK_FULL; { // check duplicated modulenames int i, n=0; for(i=iCurrentModName+1;iitemID==-1) break; + if ((int)dis->itemID==-1) break; SendMessage(dis->hwndItem,LB_GETTEXT,dis->itemID,(LPARAM)str); switch(dis->itemData&STATUS_CLASSMASK) { case STATUS_MESSAGE: @@ -175,7 +175,7 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa switch(LOWORD(wParam)) { case IDC_BACK: ResetEvent(hEventRun); - if(!IsWindowEnabled(GetDlgItem(GetParent(hdlg),IDOK))) { + if (!IsWindowEnabled(GetDlgItem(GetParent(hdlg),IDOK))) { if(MessageBox(hdlg,TranslateT("Processing has not yet completed, if you go back now then the changes that have currently been made will be rolled back and the original database will be restored. Do you still want to go back?"),TranslateT("Miranda Database Tool"),MB_YESNO)==IDYES) { manualAbort=2; SetEvent(hEventAbort); diff --git a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp b/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp index d8fa36ed75..08bbd35016 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp @@ -27,7 +27,7 @@ void GetProfileDirectory(TCHAR* szMirandaDir, TCHAR* szPath, int cbPath) GetPrivateProfileString(_T("Database"),_T("ProfileDir"),_T("./Profiles"),szProfileDir,SIZEOF(szProfileDir),szMirandaBootIni); ExpandEnvironmentStrings(szProfileDir,szExpandedProfileDir,SIZEOF(szExpandedProfileDir)); _tchdir(szMirandaDir); - if(!_tfullpath(szPath,szExpandedProfileDir,cbPath)) + if (!_tfullpath(szPath,szExpandedProfileDir,cbPath)) lstrcpyn(szPath,szMirandaDir,cbPath); if(szPath[lstrlen(szPath)-1]=='\\') szPath[lstrlen(szPath)-1] = 0; @@ -48,7 +48,7 @@ static int AddDatabaseToList(HWND hwndList, TCHAR* filename, TCHAR* dir) lvi.iSubItem=0; for(lvi.iItem=ListView_GetItemCount(hwndList)-1;lvi.iItem>=0;lvi.iItem--) { ListView_GetItem(hwndList,&lvi); - if( !_tcsicmp(( TCHAR* )lvi.lParam,filename)) return lvi.iItem; + if ( !_tcsicmp(( TCHAR* )lvi.lParam,filename)) return lvi.iItem; } hDbFile=CreateFile(filename,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,0,NULL); if ( hDbFile == INVALID_HANDLE_VALUE ) @@ -59,7 +59,7 @@ static int AddDatabaseToList(HWND hwndList, TCHAR* filename, TCHAR* dir) broken = (bytesReaddbhdr.ofsFileEnd) wasted+=totalSize-dbhdr.ofsFileEnd; @@ -166,7 +166,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa TCHAR *str2; GetModuleFileName(NULL,szMirandaPath,SIZEOF(szMirandaPath)); str2 = _tcsrchr(szMirandaPath,'\\'); - if( str2 != NULL ) + if ( str2 != NULL ) *str2=0; } { @@ -181,7 +181,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa GetProfileDirectory(szMirandaPath,szProfileDir,SIZEOF(szProfileDir)); // search in profile dir (using ini file) - if( lstrcmpi(szProfileDir,szMirandaProfiles) ) + if ( lstrcmpi(szProfileDir,szMirandaProfiles) ) FindAdd(hdlg, szProfileDir, _T("[ini]\\")); FindAdd(hdlg, szMirandaProfiles, _T("[prf]\\")); @@ -191,7 +191,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa // search in profile dir (using registry path + ini file) if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\miranda32.exe"),0,KEY_QUERY_VALUE,&hKey) == ERROR_SUCCESS) { if(RegQueryValueEx(hKey,_T("Path"),NULL,NULL,(PBYTE)szMirandaPath,&cbData) == ERROR_SUCCESS) { - if( lstrcmp(szProfileDir,szMirandaPath) ) { + if ( lstrcmp(szProfileDir,szMirandaPath) ) { GetProfileDirectory(szMirandaPath,szProfileDir,SIZEOF(szProfileDir)); FindAdd(hdlg, szProfileDir, _T("[reg]\\")); } diff --git a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp b/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp index 6c7b95febc..a6e7ecab3b 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/settingschain.cpp @@ -33,7 +33,7 @@ int WorkSettingsChain(DWORD ofsContact,DBContact *dbc,int firstTime) } if(ofsThisSettings==0) return ERROR_NO_MORE_ITEMS; - if(!SignatureValid(ofsThisSettings,DBCONTACTSETTINGS_SIGNATURE)) { + if (!SignatureValid(ofsThisSettings,DBCONTACTSETTINGS_SIGNATURE)) { AddToStatus(STATUS_ERROR,TranslateT("Settings chain corrupted, further entries ignored")); return ERROR_NO_MORE_ITEMS; } @@ -45,12 +45,12 @@ int WorkSettingsChain(DWORD ofsContact,DBContact *dbc,int firstTime) return ERROR_SUCCESS; } dbcsNew=(DBContactSettings*)_alloca(offsetof(DBContactSettings,blob)+dbcsOld.cbBlob); - if((ret=ReadSegment(ofsThisSettings,dbcsNew,offsetof(DBContactSettings,blob)+dbcsOld.cbBlob))!=ERROR_SUCCESS) { + if ((ret=ReadSegment(ofsThisSettings,dbcsNew,offsetof(DBContactSettings,blob)+dbcsOld.cbBlob))!=ERROR_SUCCESS) { if(ret!=ERROR_HANDLE_EOF) { //eof is OK because blank space at the end doesn't matter return ERROR_NO_MORE_ITEMS; } } - if((dbcsNew->ofsModuleName=ConvertModuleNameOfs(dbcsOld.ofsModuleName))==0) { + if ((dbcsNew->ofsModuleName=ConvertModuleNameOfs(dbcsOld.ofsModuleName))==0) { ofsThisSettings=dbcsOld.ofsNext; return ERROR_SUCCESS; } @@ -61,7 +61,7 @@ int WorkSettingsChain(DWORD ofsContact,DBContact *dbc,int firstTime) } dbcsNew->ofsNext=0; //TODO? validate all settings in blob/compact if necessary - if((ofsDestThis=WriteSegment(WSOFS_END,dbcsNew,offsetof(DBContactSettings,blob)+dbcsNew->cbBlob))==WS_ERROR) { + if ((ofsDestThis=WriteSegment(WSOFS_END,dbcsNew,offsetof(DBContactSettings,blob)+dbcsNew->cbBlob))==WS_ERROR) { return ERROR_HANDLE_DISK_FULL; } if(ofsDestPrevSettings) WriteSegment(ofsDestPrevSettings+offsetof(DBContactSettings,ofsNext),&ofsDestThis,sizeof(DWORD)); diff --git a/plugins/Dbx_mmap_SA/Dbtool/user.cpp b/plugins/Dbx_mmap_SA/Dbtool/user.cpp index 79f30eace7..9922f1630f 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/user.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/user.cpp @@ -31,7 +31,7 @@ int WorkUser(int firstTime) if(firstTime) { AddToStatus(STATUS_MESSAGE,TranslateT("Processing user data")); - if(!SignatureValid(dbhdr.ofsUser,DBCONTACT_SIGNATURE)) { + if (!SignatureValid(dbhdr.ofsUser,DBCONTACT_SIGNATURE)) { AddToStatus(STATUS_ERROR,TranslateT("User corrupted, this could cause major problems")); return ERROR_NO_MORE_ITEMS; } @@ -41,7 +41,7 @@ int WorkUser(int firstTime) AddToStatus(STATUS_WARNING,TranslateT("More than one user contact: keeping only first")); user.ofsNext=0; } - if((ofsUser=WriteSegment(WSOFS_END,&user,sizeof(DBContact)))==WS_ERROR) + if ((ofsUser=WriteSegment(WSOFS_END,&user,sizeof(DBContact)))==WS_ERROR) return ERROR_HANDLE_DISK_FULL; dbhdr.ofsUser=ofsUser; phase=0; diff --git a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp b/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp index 499b420dd9..ab3c46f360 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/wizard.cpp @@ -31,11 +31,11 @@ static BOOL CALLBACK MyControlsEnumChildren(HWND hwnd,LPARAM lParam) int makeBold=0; GetClassNameA(hwnd,szClass,sizeof(szClass)); - if(!strcmp(szClass,"Static")) { - if(((style&SS_TYPEMASK)==SS_LEFT || (style&SS_TYPEMASK)==SS_CENTER || (style&SS_TYPEMASK)==SS_RIGHT) && exstyle&WS_EX_CLIENTEDGE) + if (!strcmp(szClass,"Static")) { + if (((style&SS_TYPEMASK)==SS_LEFT || (style&SS_TYPEMASK)==SS_CENTER || (style&SS_TYPEMASK)==SS_RIGHT) && exstyle&WS_EX_CLIENTEDGE) makeBold=1; } - else if(!strcmp(szClass,"Button")) { + else if (!strcmp(szClass,"Button")) { if(exstyle&WS_EX_CLIENTEDGE) makeBold=1; } @@ -67,10 +67,10 @@ int DoMyControlProcessing(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam,INT *bReturn=(BOOL)GetStockObject(WHITE_BRUSH); return TRUE; } - if((GetWindowLongPtr((HWND)lParam,GWL_STYLE)&0xFFFF)==0) { + if ((GetWindowLongPtr((HWND)lParam,GWL_STYLE)&0xFFFF)==0) { TCHAR szText[256]; GetWindowText((HWND)lParam,szText,SIZEOF(szText)); - if(!_tcscmp(szText,_T("whiterect"))) { + if (!_tcscmp(szText,_T("whiterect"))) { SetTextColor((HDC)wParam,RGB(255,255,255)); SetBkColor((HDC)wParam,RGB(255,255,255)); SetBkMode((HDC)wParam,OPAQUE); diff --git a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp b/plugins/Dbx_mmap_SA/Dbtool/worker.cpp index 7f22539f8f..dd73c83947 100644 --- a/plugins/Dbx_mmap_SA/Dbtool/worker.cpp +++ b/plugins/Dbx_mmap_SA/Dbtool/worker.cpp @@ -59,7 +59,7 @@ void __cdecl WorkerThread(void *unused) ret=Workers[task](firstTime); firstTime=0; if(ret==ERROR_NO_MORE_ITEMS) { - if(++task==sizeof(Workers)/sizeof(Workers[0])) { + if (++task==sizeof(Workers)/sizeof(Workers[0])) { AddToStatus(STATUS_MESSAGE,TranslateT("Elapsed time: %d sec"), time(NULL)-ts); if(errorCount) AddToStatus(STATUS_SUCCESS,TranslateT("All tasks completed but with errors (%d)"),errorCount); diff --git a/plugins/Dbx_mmap_SA/Import_SA/encryption.c b/plugins/Dbx_mmap_SA/Import_SA/encryption.c index 6cb98d20c1..f261581041 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/encryption.c +++ b/plugins/Dbx_mmap_SA/Import_SA/encryption.c @@ -62,7 +62,7 @@ void InitSecurity() GetModuleFileName(NULL,szMirandaDir,SIZEOF(szMirandaDir)); str2 = _tcsrchr(szMirandaDir,'\\'); - if( str2 != NULL ) + if ( str2 != NULL ) *str2=0; _tchdir(szMirandaDir); } @@ -112,7 +112,7 @@ void InitSecurity() } } if(ModulesCount >= 100) break; - if(!FindNextFileA(hFile, &fd)) break; + if (!FindNextFileA(hFile, &fd)) break; } AddMessage(LPGEN("%d crypto modules loaded"), ModulesCount); @@ -173,14 +173,14 @@ int CheckPassword(WORD checkWord, WORD cryptorUID, TCHAR * szDBName) { int i; int Found = 0; - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(cryptorUID == Modules[i]->cryptor->uid){ CryptoEngine = Modules[i]->cryptor; Found = 1; break; } } - if(!Found){ + if (!Found){ AddMessage(LPGEN("Sorry, but your database encrypted with unknown module"), MB_OK); bCheckingPass = 0; return 0; @@ -245,7 +245,7 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_PASS)); SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_SETICON, 0, (LPARAM)hIcon); - if(!wrongPass) + if (!wrongPass) { mir_sntprintf(tszHeaderTxt, SIZEOF(tszHeaderTxt), _T("%s\n%s"), TranslateT("Please type in your password for"), lParam); SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), tszHeaderTxt); @@ -287,7 +287,7 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) UINT uid = LOWORD(wParam); if(uid == IDOK){ - if(!GetWindowLongPtr(hDlg,GWLP_USERDATA)) + if (!GetWindowLongPtr(hDlg,GWLP_USERDATA)) { encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254); EndDialog(hDlg,IDOK); diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.c b/plugins/Dbx_mmap_SA/Import_SA/mirabilis.c index 6d99757d4d..130843205e 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.c +++ b/plugins/Dbx_mmap_SA/Import_SA/mirabilis.c @@ -244,7 +244,7 @@ static int GetHighestIndexEntry(void) DWORD ofs; ofs=*(PDWORD)(pIdx+12); - for(;;) { + for (;;) { entry=(struct TIdxIndexEntry*)(pIdx+ofs); if(entry->entryIdLow==(DWORD)-2) return ((struct TIdxDatEntry*)entry)->entryId; if(entry->ofsHigher>=0xF0000000) ofs=entry->ofsInHere; @@ -256,7 +256,7 @@ static int GetIdDatOfs(DWORD id) { struct TIdxIndexEntry *entry; DWORD ofs = *(PDWORD)(pIdx+12); - for(;;) { + for (;;) { entry=(struct TIdxIndexEntry*)(pIdx+ofs); if(entry->entryIdLow==(DWORD)-2) { if(entry->entryIdHigh==id) return ((struct TIdxDatEntry*)entry)->datOfs; @@ -389,7 +389,7 @@ DWORD ReadPropertyBlock(DWORD dwOffset, char* SearchWord, int* nSearchResult) if ( SearchWord ) { // Is this the property we are searching for? - if(!lstrcmpA((char*)(pDat+nameOfs),SearchWord)){ + if (!lstrcmpA((char*)(pDat+nameOfs),SearchWord)) { *nSearchResult = 1; return dwOffset; } } @@ -485,10 +485,10 @@ DWORD FindMyDetails(void) DWORD dwOffset = GetIdDatOfs(1005); if (!dwOffset) return 0; - if(*(PDWORD)(pDat+dwOffset+0x08) != 1005) return 0; - if(*(PBYTE)(pDat+dwOffset+0x0C) != 0xE4) return 0; - if(*(int*)(pDat+dwOffset+0x1e) != 'USER') return 0; - if(*(PDWORD)(pDat+dwOffset+0x22) != 6) return 0; + if (*(PDWORD)(pDat+dwOffset+0x08) != 1005) return 0; + if (*(PBYTE)(pDat+dwOffset+0x0C) != 0xE4) return 0; + if (*(int*)(pDat+dwOffset+0x1e) != 'USER') return 0; + if (*(PDWORD)(pDat+dwOffset+0x22) != 6) return 0; return dwOffset; } @@ -527,7 +527,7 @@ DWORD FindGroupList(DWORD dwOffset) dwOffset += 0x04; // ++ UNKNOWN ++ dwPhoneEntries = *(PDWORD)(pDat+dwOffset); // Phonebook starts here dwOffset += 0x04; - for(n = 0;n 1) return 6 + (char*)(pDat + dwOffset); @@ -665,10 +665,10 @@ char* GetGroupName(DWORD dwGroupID) case DBV2000A: case DBV2000B: case DBV2001A: - for (n = 0; n < dwGroups; n++){ - if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupID", &nSearchResult)){ + for (n = 0; n < dwGroups; n++) { + if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupID", &nSearchResult)) { if (nSearchResult) { - if (dwGroupID == *(PDWORD)(pDat + tmpOfs + 1)){ + if (dwGroupID == *(PDWORD)(pDat + tmpOfs + 1)) { strGroupName = 3 + (char*)(pDat + ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)); if (nSearchResult) { if ((DWORD)*(strGroupName - 2) > 1) @@ -745,7 +745,7 @@ int ImportGroups() switch (nFormat) { case ENTRYV99A: case ENTRYV99B: - for (n = 0; n < dwGroups; n++){ + for (n = 0; n < dwGroups; n++) { if (*(PWORD)(pDat+dwOffset+4) > 1) { if ( CreateGroup(DBVT_ASCIIZ, (char*)(pDat + dwOffset) + 6, NULL )) nImported++; @@ -758,8 +758,8 @@ int ImportGroups() case ENTRYV2001A: case ENTRYV2001B: case ENTRYV2002A: - for (n = 0; n < dwGroups; n++){ - if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)){ + for (n = 0; n < dwGroups; n++) { + if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)) { if (nSearchResult) { if (CreateGroup( DBVT_ASCIIZ, (char*)(pDat + tmpOfs + 3), NULL )) nImported++; diff --git a/plugins/Dbx_mmap_SA/Import_SA/miranda.c b/plugins/Dbx_mmap_SA/Import_SA/miranda.c index 6812557533..69b348d192 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/miranda.c +++ b/plugins/Dbx_mmap_SA/Import_SA/miranda.c @@ -517,7 +517,7 @@ int CheckFileFormat(HANDLE hDbFile) bEncrypted = FALSE; if (memcmp(pdbHeader->signature, &dbSignature, sizeof(pdbHeader->signature))) { // Unsane: if not encrypted signature - if (memcmp(pdbHeader->signature, &dbSignatureEncrypted, sizeof(pdbHeader->signature))){ + if (memcmp(pdbHeader->signature, &dbSignatureEncrypted, sizeof(pdbHeader->signature))) { AddMessage( LPGEN("Signature mismatch" )); return DB_INVALID; } @@ -525,7 +525,7 @@ int CheckFileFormat(HANDLE hDbFile) // Unsane: check password InitSecurity(); tszDbName = _tcsrchr(importFile, _T('\\')) + 1; - if (CheckPassword(pdbHeader->checkWord, pdbHeader->cryptorUID, tszDbName)){ + if (CheckPassword(pdbHeader->checkWord, pdbHeader->cryptorUID, tszDbName)) { AddMessage(LPGEN("Secured MMAP: authorization successful")); bEncrypted = TRUE; } diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.c b/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.c index 232d295f8d..ba7a923df7 100644 --- a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.c +++ b/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.c @@ -92,7 +92,7 @@ static PBYTE ReadHistoryLines(FILE *fp,int *cbBlob) blob=(char*)realloc(blob,*cbBlob+1); lstrcpy(blob+ofs,str); } - if(*cbBlob) { + if (*cbBlob) { (*cbBlob)--; blob[*cbBlob-1]=0; } @@ -150,7 +150,7 @@ static void OldMirandaHistoryImport(HWND hdlgProgress) tmEventTime.tm_mon=atoi(timeofs+10)-1; tmEventTime.tm_year=atoi(timeofs+13)-1900; dbei.timestamp=mktime(&tmEventTime)+_timezone; - if(!(importOptions&historyTypeToOption[type])) continue; + if (!(importOptions&historyTypeToOption[type])) continue; hContact=HistoryImportFindContact(hdlgProgress,uin,importOptions&IOPT_ADDUNKNOWN); if(hContact==INVALID_HANDLE_VALUE) break; dbei.flags=issent(type)?DBEF_SENT:DBEF_READ; diff --git a/plugins/Dbx_mmap_SA/dbcache.c b/plugins/Dbx_mmap_SA/dbcache.c index 8e177c6f6d..625d8aa775 100644 --- a/plugins/Dbx_mmap_SA/dbcache.c +++ b/plugins/Dbx_mmap_SA/dbcache.c @@ -144,7 +144,7 @@ static VOID CALLBACK DoBufferFlushTimerProc(HWND hwnd, UINT message, UINT_PTR id void DBFlush(int setting) { - if(!setting) { + if (!setting) { log0("nflush1"); if(safetyMode && pDbCache) { if (FlushViewOfFile(pDbCache, 0) == 0) { diff --git a/plugins/Dbx_mmap_SA/dbcontacts.c b/plugins/Dbx_mmap_SA/dbcontacts.c index 0803f1f746..51e533266d 100644 --- a/plugins/Dbx_mmap_SA/dbcontacts.c +++ b/plugins/Dbx_mmap_SA/dbcontacts.c @@ -153,7 +153,7 @@ static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam) struct DBEvent *dbe; int index; - if((HANDLE)wParam==NULL) return 1; + if ((HANDLE)wParam==NULL) return 1; EnterCriticalSection(&csDbAccess); dbc=(struct DBContact*)DBRead(wParam,sizeof(struct DBContact),NULL); if(dbc->signature!=DBCONTACT_SIGNATURE) { diff --git a/plugins/Dbx_mmap_SA/dbevents.c b/plugins/Dbx_mmap_SA/dbevents.c index afc3838b6d..6ecde67a55 100644 --- a/plugins/Dbx_mmap_SA/dbevents.c +++ b/plugins/Dbx_mmap_SA/dbevents.c @@ -135,7 +135,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) // Loop through the chain, starting at the end ofsThis = dbc.ofsLastEvent; dbeTest = (struct DBEvent*)DBRead(ofsThis, sizeof(struct DBEvent), NULL); - for(;;) { + for (;;) { // If the new event's timesstamp is equal to or greater than the // current dbevent, it will be inserted after. If not, continue // with the previous dbevent in chain. @@ -159,7 +159,7 @@ static INT_PTR AddEvent(WPARAM wParam,LPARAM lParam) } } dbc.eventCount++; - if(!(dbe.flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe.flags&(DBEF_READ|DBEF_SENT))) { if(dbe.timestampofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -217,7 +217,7 @@ static INT_PTR DeleteEvent(WPARAM wParam,LPARAM lParam) } ofsThis=dbeNext->ofsNext; dbeNext=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbeNext->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbeNext->timestamp; break; @@ -390,7 +390,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) DBWrite(lParam,dbe,sizeof(struct DBEvent)); ret=(int)dbe->flags; if(dbc.ofsFirstUnreadEvent==(DWORD)lParam) { - for(;;) { + for (;;) { if(dbe->ofsNext==0) { dbc.ofsFirstUnreadEvent=0; dbc.timestampFirstUnread=0; @@ -398,7 +398,7 @@ static INT_PTR MarkEventRead(WPARAM wParam,LPARAM lParam) } ofsThis=dbe->ofsNext; dbe=(struct DBEvent*)DBRead(ofsThis,sizeof(struct DBEvent),NULL); - if(!(dbe->flags&(DBEF_READ|DBEF_SENT))) { + if (!(dbe->flags&(DBEF_READ|DBEF_SENT))) { dbc.ofsFirstUnreadEvent=ofsThis; dbc.timestampFirstUnread=dbe->timestamp; break; diff --git a/plugins/Dbx_mmap_SA/dbsettings.c b/plugins/Dbx_mmap_SA/dbsettings.c index bf876d0570..1d0fb69d62 100644 --- a/plugins/Dbx_mmap_SA/dbsettings.c +++ b/plugins/Dbx_mmap_SA/dbsettings.c @@ -327,7 +327,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { dbcgs->pValue->cchVal--; - if(*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cchVal) dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); DecodeCopyMemory(dbcgs->pValue->pszVal,pBlob+3,dbcgs->pValue->cchVal); dbcgs->pValue->pszVal[dbcgs->pValue->cchVal]=0; dbcgs->pValue->cchVal=*(PWORD)(pBlob+1); @@ -341,7 +341,7 @@ static __inline int GetContactSettingWorker(HANDLE hContact,DBCONTACTGETSETTING case DBVT_BLOB: NeedBytes(3+*(PWORD)(pBlob+1)); if(isStatic) { - if(*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); + if (*(PWORD)(pBlob+1)pValue->cpbVal) dbcgs->pValue->cpbVal=*(PWORD)(pBlob+1); DecodeCopyMemory(dbcgs->pValue->pbVal,pBlob+3,dbcgs->pValue->cpbVal); } else { @@ -749,7 +749,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam, LPARAM lParam) else bytesRequired=tmp.value.type; bytesRequired+=2+settingNameLen; bytesRequired+=ofsBlobPtr+1-(ofsSettingsGroup+offsetof(struct DBContactSettings,blob)); - if((DWORD)bytesRequired>dbcs.cbBlob) { + if ((DWORD)bytesRequired>dbcs.cbBlob) { //doesn't fit: move entire group struct DBContactSettings *dbcsPrev; DWORD ofsDbcsPrev,ofsNew; @@ -879,7 +879,7 @@ static INT_PTR DeleteContactSetting(WPARAM wParam, LPARAM lParam) MoveAlong(1+GetSettingValueLength(pBlob)); NeedBytes(1); } - if(!pBlob[0]) { //setting didn't exist + if (!pBlob[0]) { //setting didn't exist LeaveCriticalSection(&csDbAccess); return 1; } @@ -941,7 +941,7 @@ static INT_PTR EnumContactSettings(WPARAM wParam, LPARAM lParam) return -1; } dbces->ofsSettings=GetSettingsGroupOfsByModuleNameOfs(dbc,ofsModuleName); - if(!dbces->ofsSettings) { + if (!dbces->ofsSettings) { LeaveCriticalSection(&csDbAccess); return -1; } @@ -986,7 +986,7 @@ void EncodeContactSettings(HANDLE hContact) struct DBContactSettings * setting; DWORD offset; - if(!hContact) hContact = (HANDLE)dbHeader.ofsUser; + if (!hContact) hContact = (HANDLE)dbHeader.ofsUser; contact = (struct DBContact *)DBRead((DWORD)hContact, sizeof(struct DBContact), NULL); if(contact -> ofsFirstSettings){ setting = (struct DBContactSettings *)DBRead(contact -> ofsFirstSettings, sizeof(struct DBContactSettings), NULL); @@ -1059,7 +1059,7 @@ void DecodeContactSettings(HANDLE hContact) DWORD offset; - if(!hContact) hContact = (HANDLE)dbHeader.ofsUser; + if (!hContact) hContact = (HANDLE)dbHeader.ofsUser; contact = (struct DBContact *)DBRead((DWORD)hContact, sizeof(struct DBContact), NULL); if(contact -> ofsFirstSettings){ setting = (struct DBContactSettings *)DBRead(contact -> ofsFirstSettings, sizeof(struct DBContactSettings), NULL); diff --git a/plugins/Dbx_mmap_SA/dialogs.c b/plugins/Dbx_mmap_SA/dialogs.c index 48c13183f8..15405ff5ee 100644 --- a/plugins/Dbx_mmap_SA/dialogs.c +++ b/plugins/Dbx_mmap_SA/dialogs.c @@ -212,7 +212,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP uid = DBGetContactSettingWord(NULL, "SecureMMAP", "CryptoModule", 0); - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { char buf[100]; item.mask = LVIF_TEXT; @@ -262,7 +262,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if ( hdr && hdr->hdr.code == LVN_ITEMCHANGED && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1) ) { iIndex = hdr->iItem; if(hdr->uNewState & 0x2000){ - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(i != iIndex) ListView_SetCheckState(hwndList, i, 0); } SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -296,19 +296,19 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } if (((LPNMHDR)lParam)->code == PSN_APPLY ) { int alg = -1; - for(i = 0; i < ModulesCount; i++){ - if(ListView_GetCheckState(hwndList, i)){ + for(i = 0; i < ModulesCount; i++) { + if(ListView_GetCheckState(hwndList, i)) { alg = i; break; } } if(alg > -1){ - if(!bEncoding){ + if (!bEncoding){ DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", Modules[alg]->cryptor->uid); EncryptDB(); }else{ - if(Modules[alg]->cryptor->uid != DBGetContactSettingWord(NULL, "SecureMMAP", "CryptoModule", -1)){ + if(Modules[alg]->cryptor->uid != DBGetContactSettingWord(NULL, "SecureMMAP", "CryptoModule", -1)) { DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", Modules[alg]->cryptor->uid); RecryptDB(); } @@ -321,7 +321,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP uid = DBGetContactSettingWord(NULL, "SecureMMAP", "CryptoModule", 0); - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(uid == Modules[i]->cryptor->uid && bEncoding) ListView_SetCheckState(hwndList, i, 1); @@ -374,7 +374,7 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ICON2)); SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_SETICON, 0, (LPARAM)hIcon); - if(!wrongPass) + if (!wrongPass) { tszDbName = mir_a2t((char*)lParam); mir_sntprintf(tszHeaderTxt, SIZEOF(tszHeaderTxt), _T("%s\n%s"), TranslateT("Please type in your password for"), tszDbName); @@ -419,7 +419,7 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) UINT uid = LOWORD(wParam); if(uid == IDOK){ - if(!GetWindowLongPtr(hDlg,GWLP_USERDATA)) + if (!GetWindowLongPtr(hDlg,GWLP_USERDATA)) { encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254); EndDialog(hDlg,IDOK); @@ -485,7 +485,7 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) UINT uid = LOWORD(wParam); if(uid == IDOK){ - if(!GetWindowLongPtr(hDlg,GWLP_USERDATA)) + if (!GetWindowLongPtr(hDlg,GWLP_USERDATA)) { char pass1[255], pass2[255]; if(GetDlgItemTextA(hDlg, IDC_USERPASS1, pass1, 254) < 3){ @@ -496,7 +496,7 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) }else{ GetDlgItemTextA(hDlg, IDC_USERPASS2, pass2, 254); - if(!strcmp(pass1, pass2)){ + if (!strcmp(pass1, pass2)) { encryptKeyLength = strlen(pass1); strcpy(encryptKey, pass1); EndDialog(hDlg,IDOK); @@ -573,7 +573,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) if(uid == IDOK){ char pass1[255], pass2[255], oldpass[255]; GetDlgItemTextA(hDlg, IDC_OLDPASS, oldpass, 254); - if(strcmp(oldpass, encryptKey)){ + if(strcmp(oldpass, encryptKey)) { SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!")); SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0); break; @@ -584,7 +584,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) }else{ GetDlgItemTextA(hDlg, IDC_NEWPASS2, pass2, 254); - if(!strcmp(pass1, pass2)){ + if (!strcmp(pass1, pass2)) { strcpy(newPass, pass1); EndDialog(hDlg,IDOK); }else{ @@ -597,7 +597,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam) }else if(uid == IDREMOVE){ char oldpass[255]; GetDlgItemTextA(hDlg, IDC_OLDPASS, oldpass, 254); - if(strcmp(oldpass, encryptKey)){ + if(strcmp(oldpass, encryptKey)) { SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!")); SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0); break; diff --git a/plugins/Dbx_mmap_SA/security.c b/plugins/Dbx_mmap_SA/security.c index 92a82a4bfe..f4b9b06004 100644 --- a/plugins/Dbx_mmap_SA/security.c +++ b/plugins/Dbx_mmap_SA/security.c @@ -59,7 +59,7 @@ void InitSecurity() } } if(ModulesCount >= 100) break; - if(!FindNextFileA(hFile, &fd)) break; + if (!FindNextFileA(hFile, &fd)) break; } } @@ -78,7 +78,7 @@ void UnloadSecurity() void EncoderInit() { - if(!bEncoding) return; + if (!bEncoding) return; encryptKey[encryptKeyLength] = 0; key = CryptoEngine->GenerateKey(encryptKey); @@ -88,7 +88,7 @@ void EncodeCopyMemory(void * dst, void * src, size_t size ) { memcpy(dst, src, size); - if(!bEncoding) + if (!bEncoding) return; CryptoEngine->EncryptMem(dst, (int)size, key); @@ -98,7 +98,7 @@ void DecodeCopyMemory(void * dst, void * src, size_t size ) { memcpy(dst, src, size); - if(!bEncoding) + if (!bEncoding) return; CryptoEngine->DecryptMem(dst, (int)size, key); @@ -152,14 +152,14 @@ int CheckPassword(WORD checkWord, char * szDBName) { int i; int Found = 0; - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(dbHeader.cryptorUID == Modules[i]->cryptor->uid){ CryptoEngine = Modules[i]->cryptor; Found = 1; break; } } - if(!Found){ + if (!Found){ MessageBoxA(0, "Sorry, but your database encrypted with unknown module", "Error", MB_OK); bCheckingPass = 0; return 0; @@ -208,14 +208,14 @@ int SelectEncoder() } else{ int Found = 0; - for(i = 0; i < ModulesCount; i++){ + for(i = 0; i < ModulesCount; i++) { if(Modules[i]->cryptor->uid == uid){ CryptoEngine = Modules[i]->cryptor; Found = 1; break; } } - if(!Found){ + if (!Found){ MessageBox(0, TranslateT("Crypto module hasn't been chosen, using first one found"), TranslateT("Notice"), MB_OK); DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", Modules[0]->cryptor->uid); CryptoEngine = Modules[0]->cryptor; @@ -302,14 +302,14 @@ void EncryptDB() return; } - if(SelectEncoder()){ + if(SelectEncoder()) { return; } bEncProcess = 1; action = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_NEWPASS), NULL, (DLGPROC)DlgStdNewPass, (LPARAM)NULL); - if(action != IDOK || !strlen(encryptKey)){ + if(action != IDOK || !strlen(encryptKey)) { bEncProcess = 0; DBWriteContactSettingByte(NULL, "SecureMMAP", "CryptoModule", 0); return; @@ -336,7 +336,7 @@ void DecryptDB() char oldKey[255]; strcpy(oldKey, encryptKey); - if(!CheckPassword(dbHeader.checkWord, Translate("current database"))){strcpy(encryptKey, oldKey); encryptKeyLength = strlen(oldKey); return;} + if (!CheckPassword(dbHeader.checkWord, Translate("current database"))){strcpy(encryptKey, oldKey); encryptKeyLength = strlen(oldKey); return;} WritePlainHeader(); diff --git a/plugins/Dbx_tree/sigslot.h b/plugins/Dbx_tree/sigslot.h index cdf17f3303..1e67a152bf 100644 --- a/plugins/Dbx_tree/sigslot.h +++ b/plugins/Dbx_tree/sigslot.h @@ -139,7 +139,7 @@ namespace sigslot { { static bool isinitialised = false; - if(!isinitialised) + if (!isinitialised) { InitializeCriticalSection(get_critsec()); isinitialised = true; @@ -545,7 +545,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -568,7 +568,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -587,7 +587,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -637,7 +637,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -676,7 +676,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -699,7 +699,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -753,7 +753,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -792,7 +792,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -815,7 +815,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -868,7 +868,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -907,7 +907,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -930,7 +930,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -983,7 +983,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -1022,7 +1022,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; this->m_connected_slots.erase(it); @@ -1045,7 +1045,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -1100,7 +1100,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -1139,7 +1139,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -1162,7 +1162,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -1217,7 +1217,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -1256,7 +1256,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -1279,7 +1279,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -1334,7 +1334,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -1373,7 +1373,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -1396,7 +1396,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); @@ -1452,7 +1452,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == oldtarget) + if ((*it)->getdest() == oldtarget) { m_connected_slots.push_back((*it)->duplicate(newtarget)); } @@ -1491,7 +1491,7 @@ namespace sigslot { while(it != itEnd) { - if((*it)->getdest() == pclass) + if ((*it)->getdest() == pclass) { delete *it; m_connected_slots.erase(it); @@ -1514,7 +1514,7 @@ namespace sigslot { iterator itNext = it; ++itNext; - if((*it)->getdest() == pslot) + if ((*it)->getdest() == pslot) { delete *it; m_connected_slots.erase(it); diff --git a/plugins/ExternalAPI/m_assocmgr.h b/plugins/ExternalAPI/m_assocmgr.h index 4e15168643..4cb02bb74b 100644 --- a/plugins/ExternalAPI/m_assocmgr.h +++ b/plugins/ExternalAPI/m_assocmgr.h @@ -273,13 +273,13 @@ Returns 0 on success, nonzero otherwise. static __inline char *Netlib_UrlDecode(char *str) { char *psz=str; - for(;*psz;++psz) + for (;*psz;++psz) switch(*psz) { case '+': *psz=' '; break; case '%': - if(!psz[1] || !psz[2]) break; + if (!psz[1] || !psz[2]) break; MoveMemory(psz,&psz[1],2); psz[2]=0; *psz=(char)strtol(psz,NULL,16); diff --git a/plugins/ExternalAPI/m_flags.h b/plugins/ExternalAPI/m_flags.h index aafa2fb251..9760c1b419 100644 --- a/plugins/ExternalAPI/m_flags.h +++ b/plugins/ExternalAPI/m_flags.h @@ -47,11 +47,11 @@ Returns a icon handle (HICON) on success, NULL on error. #if !defined(FLAGS_NOHELPERFUNCTIONS) __inline static HICON LoadFlagIcon(int countryNumber) { - if(!ServiceExists(MS_FLAGS_LOADFLAGICON)) return NULL; + if (!ServiceExists(MS_FLAGS_LOADFLAGICON)) return NULL; return (HICON)CallService(MS_FLAGS_LOADFLAGICON,countryNumber,0); } __inline static HANDLE LoadFlagIconHandle(int countryNumber) { - if(!ServiceExists(MS_FLAGS_LOADFLAGICON)) return NULL; + if (!ServiceExists(MS_FLAGS_LOADFLAGICON)) return NULL; return (HICON)CallService(MS_FLAGS_LOADFLAGICON,countryNumber,1); } #endif diff --git a/plugins/ExternalAPI/m_help.h b/plugins/ExternalAPI/m_help.h index 04425a5e8d..fa7434695f 100644 --- a/plugins/ExternalAPI/m_help.h +++ b/plugins/ExternalAPI/m_help.h @@ -60,7 +60,7 @@ Returns 0 on success or nonzero on failure // only works for non-editable #if !defined(HELP_NOHELPERFUNCTIONS) __inline static int Help_SetContextState(HWND hwndCtl,DWORD flags) { - if(!ServiceExists(MS_HELP_SETCONTEXTSTATE)) return -1; + if (!ServiceExists(MS_HELP_SETCONTEXTSTATE)) return -1; return CallService(MS_HELP_SETCONTEXTSTATE,(WPARAM)hwndCtl,flags); } #endif diff --git a/plugins/ExternalAPI/m_mails.h b/plugins/ExternalAPI/m_mails.h index 06bd9dfd80..cb168e34e9 100644 --- a/plugins/ExternalAPI/m_mails.h +++ b/plugins/ExternalAPI/m_mails.h @@ -147,7 +147,7 @@ typedef struct CMimeMsgQueue void *PluginData; CMimeMsgQueue(): ID(NULL), Number(0), Flags(0), MailData(NULL), MsgWindow(NULL), PluginData(NULL), Next(NULL){} - ~CMimeMsgQueue(){} + ~CMimeMsgQueue() {} struct CMimeMsgQueue *Next; } YAMNMAIL,*HYAMNMAIL; diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 53e8875657..4f24c2e362 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -58,7 +58,7 @@ PLUGININFOEX pluginInfo = { HWND g_hwndMenuHost = NULL; static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -static BOOL CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); static void sttLoadOptions(); static void sttSaveOptions(); @@ -1224,7 +1224,7 @@ static void sttActivateOptionsPage(HWND hwnd, TCHAR *aSection, TCHAR *aPage) } } -static BOOL CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static bool bInitialized = false; static HANDLE hSelectedContact = 0; diff --git a/plugins/FingerPrintModPlus/src/fingerprint.cpp b/plugins/FingerPrintModPlus/src/fingerprint.cpp index 5e3e2ba619..8a729bad7c 100644 --- a/plugins/FingerPrintModPlus/src/fingerprint.cpp +++ b/plugins/FingerPrintModPlus/src/fingerprint.cpp @@ -208,7 +208,7 @@ extern "C" int __declspec(dllexport) Unload() */ void FASTCALL FreeIcon(HICON hIcon, BOOL mode) { - if(!mode) return; + if (!mode) return; if(mode > 0) CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, (WPARAM)0); else @@ -221,7 +221,7 @@ void FASTCALL FreeIcon(HICON hIcon, BOOL mode) */ void FASTCALL Prepare(KN_FP_MASK* mask) { - if(!mask->szMask) return; + if (!mask->szMask) return; size_t iMaskLen; LPTSTR pszNewMask; LPTSTR pszTranslatedMask; @@ -404,7 +404,7 @@ int OnPreShutdown(WPARAM wParam, LPARAM lParam) UnhookEvent(hPreShutdown); UnhookEvent(hIconsChanged); UnhookEvent(hOptInitialise); - if(!g_bExtraIcon_Register_ServiceExist) UninitFingerEvents(); + if (!g_bExtraIcon_Register_ServiceExist) UninitFingerEvents(); UnhookEvent(hFolderChanged); DestroyServiceFunction(compClientServA); DestroyServiceFunction(getClientIconA); @@ -513,7 +513,7 @@ int OnExtraImageApply(WPARAM wParam, LPARAM lParam) { DBVARIANT dbvMirVer = { 0 }; - if(!DBGetContactSettingTString(hContact, szProto, "MirVer", &dbvMirVer)) + if (!DBGetContactSettingTString(hContact, szProto, "MirVer", &dbvMirVer)) { ApplyFingerprintImage(hContact, dbvMirVer.ptszVal); DBFreeVariant(&dbvMirVer); @@ -532,7 +532,7 @@ int OnExtraImageApply(WPARAM wParam, LPARAM lParam) */ int OnContactSettingChanged(WPARAM wParam, LPARAM lParam) { - if((HANDLE)wParam == NULL) return 0; + if ((HANDLE)wParam == NULL) return 0; { DBCONTACTWRITESETTING* cws = (DBCONTACTWRITESETTING*)lParam; if(cws && cws->szSetting && !strcmp(cws->szSetting, "MirVer")) @@ -648,7 +648,7 @@ HICON FASTCALL LoadIconFromExternalFile(LPTSTR filename, int nLibrary, LPSTR Ico if(nLibrary == LIB_USE) { hIcon = ((HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)IconName)); - if(!hIcon) + if (!hIcon) { ExtractIconEx(destfile, -internalidx, NULL, &hIcon, 1); return hIcon; @@ -712,7 +712,7 @@ HICON FASTCALL LoadIconFromExternalFile(LPTSTR filename, int nLibrary, LPSTR Ico */ BOOL FASTCALL WildCompareA(LPSTR szName, LPSTR szMask) { - if(*szMask != '|') return WildCompareProcA(szName, szMask); + if (*szMask != '|') return WildCompareProcA(szName, szMask); { size_t s = 1, e = 1; // static char temp[100]; //lets made temp static local var - should be faster than dynamic @@ -768,7 +768,7 @@ BOOL FASTCALL WildCompareA(LPSTR szName, LPSTR szMask) */ BOOL FASTCALL WildCompareW(LPWSTR wszName, LPWSTR wszMask) { - if(*wszMask != L'|') return WildCompareProcW(wszName, wszMask); + if (*wszMask != L'|') return WildCompareProcW(wszName, wszMask); { size_t s = 1, e = 1; // static char temp[100]; //lets made temp static local var - should be faster than dynamic @@ -1003,21 +1003,21 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam) BOOL __inline WildCompareProcA(LPSTR szName, LPSTR szMask) { LPSTR szLast = NULL; - for(;; szMask++, szName++) + for (;; szMask++, szName++) { - if(*szMask != '?' && *szMask != *szName) break; - if(*szName == '\0') return ((BOOL)!*szMask); + if (*szMask != '?' && *szMask != *szName) break; + if (*szName == '\0') return ((BOOL)!*szMask); } - if(*szMask != '*') return FALSE; - for(;; szMask++, szName++) + if (*szMask != '*') return FALSE; + for (;; szMask++, szName++) { while(*szMask == '*') { szLast = szMask++; - if(*szMask == '\0') return ((BOOL)!*szMask); /* true */ + if (*szMask == '\0') return ((BOOL)!*szMask); /* true */ } - if(*szName == '\0') return ((BOOL)!*szMask); /* *mask == EOS */ - if(*szMask != '?' && *szMask != *szName && szLast != NULL) + if (*szName == '\0') return ((BOOL)!*szMask); /* *mask == EOS */ + if (*szMask != '?' && *szMask != *szName && szLast != NULL) { szName -= (size_t)(szMask - szLast) - 1; szMask = szLast; @@ -1028,21 +1028,21 @@ BOOL __inline WildCompareProcA(LPSTR szName, LPSTR szMask) BOOL __inline WildCompareProcW(LPWSTR wszName, LPWSTR wszMask) { LPWSTR wszLast = NULL; - for(;; wszMask++, wszName++) + for (;; wszMask++, wszName++) { - if(*wszMask != L'?' && *wszMask != *wszName) break; - if(*wszName == L'\0') return ((BOOL)!*wszMask); + if (*wszMask != L'?' && *wszMask != *wszName) break; + if (*wszName == L'\0') return ((BOOL)!*wszMask); } - if(*wszMask != L'*') return FALSE; - for(;; wszMask++, wszName++) + if (*wszMask != L'*') return FALSE; + for (;; wszMask++, wszName++) { while(*wszMask == L'*') { wszLast = wszMask++; - if(*wszMask == L'\0') return ((BOOL)!*wszMask); /* true */ + if (*wszMask == L'\0') return ((BOOL)!*wszMask); /* true */ } - if(*wszName == L'\0') return ((BOOL)!*wszMask); /* *mask == EOS */ - if(*wszMask != L'?' && *wszMask != *wszName && wszLast != NULL) + if (*wszName == L'\0') return ((BOOL)!*wszMask); /* *mask == EOS */ + if (*wszMask != L'?' && *wszMask != *wszName && wszLast != NULL) { wszName -= (size_t)(wszMask - wszLast) - 1; wszMask = wszLast; @@ -1098,7 +1098,7 @@ void FASTCALL GetIconsIndexesA(LPSTR szMirVer, short *base, short *overlay,short } i++; } - if(!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) + if (!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) { j = 0; while(j < DEFAULT_KN_FP_OVERLAYS_COUNT) @@ -1184,7 +1184,7 @@ void FASTCALL GetIconsIndexesW(LPWSTR wszMirVer, short *base, short *overlay,sho } i++; } - if(!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) + if (!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) { j = 0; while(j < DEFAULT_KN_FP_OVERLAYS_COUNT) @@ -1347,7 +1347,7 @@ INT_PTR ServiceSameClientsA(WPARAM wParam, LPARAM lParam) BOOL Result = FALSE; firstIndex = secondIndex = 0; - if(!szMirVerFirst || !szMirVerSecond) return (INT_PTR)NULL; //one of its is not null + if (!szMirVerFirst || !szMirVerSecond) return (INT_PTR)NULL; //one of its is not null { LPTSTR tszMirVerFirstUp, tszMirVerSecondUp; @@ -1467,7 +1467,7 @@ INT_PTR ServiceSameClientsW(WPARAM wParam, LPARAM lParam) BOOL Result = FALSE; firstIndex = secondIndex = 0; - if(!wszMirVerFirst || !wszMirVerSecond) return (INT_PTR)NULL; //one of its is not null + if (!wszMirVerFirst || !wszMirVerSecond) return (INT_PTR)NULL; //one of its is not null { LPWSTR wszMirVerFirstUp, wszMirVerSecondUp; @@ -1570,7 +1570,7 @@ BOOL FASTCALL checkHasAlfa(LPBYTE from, int width, int height) LPDWORD lim = pt + width * height; while(pt < lim) { - if(*pt & 0xFF000000) + if (*pt & 0xFF000000) return TRUE; pt++; } @@ -1737,7 +1737,7 @@ HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop) else top_d |= 0xFF000000; } - else if(!topHasAlpha) + else if (!topHasAlpha) top_d |= 0xFF000000; if(bottomMaskUsed) @@ -1747,7 +1747,7 @@ HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop) else bottom_d |= 0xFF000000; } - else if(!bottomHasAlpha) + else if (!bottomHasAlpha) bottom_d |= 0xFF000000; ((LPDWORD)db)[x] = blend(bottom_d, top_d); @@ -1769,7 +1769,7 @@ HICON FASTCALL CreateJoinedIcon(HICON hBottom, HICON hTop) DeleteObject(iciTop.hbmMask); } - if(!drawn) + if (!drawn) { DrawIconEx(tempDC, 0, 0, hBottom, 16, 16, 0, NULL, DI_NORMAL); DrawIconEx(tempDC, 0, 0, hTop, 16, 16, 0, NULL, DI_NORMAL); diff --git a/plugins/FingerPrintModPlus/src/utilities.cpp b/plugins/FingerPrintModPlus/src/utilities.cpp index 9998d056d1..35a5bf0647 100644 --- a/plugins/FingerPrintModPlus/src/utilities.cpp +++ b/plugins/FingerPrintModPlus/src/utilities.cpp @@ -118,7 +118,7 @@ LPSTR make_utf8_string(LPCWSTR unicode) LPSTR out; WORD c; - if(!unicode) return NULL; + if (!unicode) return NULL; /* first calculate the size of the target string */ c = (WORD)unicode[index++]; @@ -151,11 +151,11 @@ LPWSTR make_unicode_string_static(LPCSTR utf8, LPWSTR unicode, size_t unicode_le while(c) { if(out_index + 1 >= unicode_len) break; - if((c & 0x80) == 0) + if ((c & 0x80) == 0) { unicode[out_index++] = c; } - else if((c & 0xe0) == 0xe0) + else if ((c & 0xe0) == 0xe0) { unicode[out_index] = (c & 0x1F) << 12; c = (BYTE)utf8[index++]; @@ -182,17 +182,17 @@ LPWSTR make_unicode_string(LPCSTR utf8) LPWSTR out; BYTE c; - if(!utf8) return NULL; + if (!utf8) return NULL; /* first calculate the size of the target string */ c = (BYTE)utf8[index++]; while(c) { - if((c & 0x80) == 0) + if ((c & 0x80) == 0) { index += 0; } - else if((c & 0xe0) == 0xe0) + else if ((c & 0xe0) == 0xe0) { index += 2; } @@ -216,20 +216,20 @@ int UTF8_IsValid(LPCSTR pszInput) int nb, i; LPCSTR c = pszInput; - if(!pszInput) return 0; + if (!pszInput) return 0; for(c = pszInput; *c; c += (nb + 1)) { - if(!(*c & 0x80)) nb = 0; - else if((*c & 0xc0) == 0x80) return 0; - else if((*c & 0xe0) == 0xc0) nb = 1; - else if((*c & 0xf0) == 0xe0) nb = 2; + if (!(*c & 0x80)) nb = 0; + else if ((*c & 0xc0) == 0x80) return 0; + else if ((*c & 0xe0) == 0xc0) nb = 1; + else if ((*c & 0xf0) == 0xe0) nb = 2; else if ((*c & 0xf8) == 0xf0) nb = 3; else if ((*c & 0xfc) == 0xf8) nb = 4; else if ((*c & 0xfe) == 0xfc) nb = 5; for(i = 1; i <= nb; i++) // we this forward, do not cross end of string - if((*(c + i) & 0xc0) != 0x80) + if ((*(c + i) & 0xc0) != 0x80) return 0; } @@ -241,7 +241,7 @@ int utf8_decode_static(LPCSTR from, LPSTR to, int to_size) { int nResult = 0; // Validate the string - if(!UTF8_IsValid(from)) + if (!UTF8_IsValid(from)) return 0; // Use the native conversion routines when available diff --git a/plugins/FlashAvatars/TigerHash.cpp b/plugins/FlashAvatars/TigerHash.cpp index 5c680e5d8f..406676f0a5 100644 --- a/plugins/FlashAvatars/TigerHash.cpp +++ b/plugins/FlashAvatars/TigerHash.cpp @@ -166,7 +166,7 @@ void TigerHash::update(const void* data, size_t length) { pos += n; length -= n; - if((tmppos + n) == BLOCK_SIZE) { + if ((tmppos + n) == BLOCK_SIZE) { #ifdef TIGER_BIG_ENDIAN for(j=0; j 5) { + if (!url || recurse_count > 5) { return false; } @@ -204,7 +204,7 @@ static void __cdecl loadFlash_Thread(void *p) { fgd.cbSize = sizeof(FOLDERSGETDATA); fgd.nMaxPathSize = MAX_PATH; fgd.szPathT = path; - if(!hAvatarsFolder || CallService(MS_FOLDERS_GET_PATH, (WPARAM)hAvatarsFolder, (LPARAM)&fgd)) { + if (!hAvatarsFolder || CallService(MS_FOLDERS_GET_PATH, (WPARAM)hAvatarsFolder, (LPARAM)&fgd)) { if(ServiceExists(MS_UTILS_REPLACEVARS)) { TCHAR *tmpPath = Utils_ReplaceVarsT(_T("%miranda_avatarcache%")); mir_sntprintf(path, MAX_PATH, _T("%s\\%s"), tmpPath, _T("Flash")); @@ -305,7 +305,7 @@ static void prepareFlash(char* pProto, const char* pUrl, FLASHAVATAR& fa, IShock //loadFlash(new FlashPair(make_pair(fa, flash))); } -static int destroyAvatar(WPARAM wParam, LPARAM) +static INT_PTR destroyAvatar(WPARAM wParam, LPARAM) { flash_avatar_item key(((FLASHAVATAR*)wParam)->hContact, *(FLASHAVATAR*)wParam, NULL); @@ -324,7 +324,7 @@ static int destroyAvatar(WPARAM wParam, LPARAM) return 0; } -static int makeAvatar(WPARAM wParam, LPARAM) +static INT_PTR makeAvatar(WPARAM wParam, LPARAM) { debug("Searching for flash avatar...\n"); FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; @@ -348,7 +348,7 @@ static int makeAvatar(WPARAM wParam, LPARAM) } } - if(!avatarOK) return 0; + if (!avatarOK) return 0; debug("Avatar found...\n"); char* url = NULL; @@ -411,7 +411,7 @@ static int makeAvatar(WPARAM wParam, LPARAM) return 0; } -static int resizeAvatar(WPARAM wParam, LPARAM lParam) +static INT_PTR resizeAvatar(WPARAM wParam, LPARAM lParam) { FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; RECT rc = *((LPRECT)lParam); @@ -425,7 +425,7 @@ static int resizeAvatar(WPARAM wParam, LPARAM lParam) return 0; } -static int setPos(WPARAM wParam, LPARAM lParam) +static INT_PTR setPos(WPARAM wParam, LPARAM lParam) { FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; RECT rc = *((LPRECT)lParam); @@ -439,7 +439,7 @@ static int setPos(WPARAM wParam, LPARAM lParam) return 0; } -static int getInfo(WPARAM wParam, LPARAM) +static INT_PTR getInfo(WPARAM wParam, LPARAM) { FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; flash_avatar_item key(hFA->hContact, *hFA, NULL); @@ -455,7 +455,7 @@ static int getInfo(WPARAM wParam, LPARAM) return 0; } -static int setEmoFace(WPARAM wParam, LPARAM lParam) +static INT_PTR setEmoFace(WPARAM wParam, LPARAM lParam) { FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; flash_avatar_item key(hFA->hContact, *hFA, NULL); @@ -469,7 +469,7 @@ static int setEmoFace(WPARAM wParam, LPARAM lParam) return 0; } -static int setBkColor(WPARAM wParam, LPARAM lParam) +static INT_PTR setBkColor(WPARAM wParam, LPARAM lParam) { FLASHAVATAR* hFA = (FLASHAVATAR*)wParam; COLORREF clr = (COLORREF)lParam; @@ -543,7 +543,7 @@ static int eventAdded(WPARAM wParam, LPARAM lParam) //size_t aLen = strlen((char *)dbei.pBlob)+1; char* face = NULL; - if( (strstr((char*)dbei.pBlob, (char*)":-)") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)":-)") != NULL) || (strstr((char*)dbei.pBlob, (char*)":)") != NULL) || (strstr((char*)dbei.pBlob, (char*)";)") != NULL) || (strstr((char*)dbei.pBlob, (char*)";-)") != NULL) || @@ -553,24 +553,24 @@ static int eventAdded(WPARAM wParam, LPARAM lParam) (strstr((char*)dbei.pBlob, (char*)":-P") != NULL) || (strstr((char*)dbei.pBlob, (char*)"*Drink*") != NULL)) { face = AV_SMILE; } else - if( (strstr((char*)dbei.pBlob, (char*)":-(") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)":-(") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-$") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-!") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-X") != NULL)) { face = AV_SAD; } else - if( (strstr((char*)dbei.pBlob, (char*)"*JOKINGLY*") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)"*JOKINGLY*") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-D") != NULL)) { face = AV_LAUGH; } else - if( (strstr((char*)dbei.pBlob, (char*)":'(") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)":'(") != NULL) || (strstr((char*)dbei.pBlob, (char*)":'-(") != NULL)) { face = AV_CRY; } else - if( (strstr((char*)dbei.pBlob, (char*)">:o") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)">:o") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-@") != NULL) || (strstr((char*)dbei.pBlob, (char*)"*STOP*") != NULL) || (strstr((char*)dbei.pBlob, (char*)"]:->") != NULL) || (strstr((char*)dbei.pBlob, (char*)"@=") != NULL)) { face = AV_MAD; } else - if( (strstr((char*)dbei.pBlob, (char*)":-*") != NULL) || + if ( (strstr((char*)dbei.pBlob, (char*)":-*") != NULL) || (strstr((char*)dbei.pBlob, (char*)":-[") != NULL) || (strstr((char*)dbei.pBlob, (char*)"*KISSED*") != NULL) || (strstr((char*)dbei.pBlob, (char*)"*KISSING*") != NULL) || @@ -597,11 +597,14 @@ static int eventAdded(WPARAM wParam, LPARAM lParam) return 0; } +typedef BOOL (__stdcall *pfnAtlAxWinInit)( void ); static int systemModulesLoaded(WPARAM /*wParam*/, LPARAM /*lParam*/) { HMODULE hAtl = LoadLibrary(_T("atl")); - void* init = GetProcAddress(hAtl, "AtlAxWinInit"); _asm call init; + pfnAtlAxWinInit init = (pfnAtlAxWinInit)GetProcAddress(hAtl, "AtlAxWinInit"); + if (init) + init(); MyAtlAxAttachControl = (LPAtlAxAttachControl)GetProcAddress(hAtl, "AtlAxAttachControl"); hServices[0] = CreateServiceFunction(MS_FAVATAR_DESTROY, destroyAvatar); diff --git a/plugins/FlashAvatars/stdafx.h b/plugins/FlashAvatars/stdafx.h index 693caae144..6113744e85 100644 --- a/plugins/FlashAvatars/stdafx.h +++ b/plugins/FlashAvatars/stdafx.h @@ -15,7 +15,10 @@ # define _STLP_DEBUG 1 #endif -#define _USE_32BIT_TIME_T +#ifndef _WIN64 + #define _USE_32BIT_TIME_T +#endif + #define _STLP_DONT_USE_SHORT_STRING_OPTIM 1 // Uses small string buffer, so it saves memory for a lot of strings #define _STLP_USE_PTR_SPECIALIZATIONS 1 // Reduces some code bloat #define _STLP_USE_TEMPLATE_EXPRESSION 1 // Speeds up string concatenation diff --git a/plugins/FloatingContacts/bitmap_funcs.cpp b/plugins/FloatingContacts/bitmap_funcs.cpp index 3d92e7a9d8..a99b5c4afe 100644 --- a/plugins/FloatingContacts/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/bitmap_funcs.cpp @@ -97,16 +97,12 @@ void MyBitmap::setAlphaRect(int x1, int y1, int x2, int y2, BYTE level) GdiFlush(); for (int i = y1; i < y2; i++) - for (int j = x1; j < x2; j++) - { + for (int j = x1; j < x2; j++) { int idx = i * width + j; if (bits[idx] & 0xff000000) - { bits[idx] = rgba(getr(bits[idx])*level/255, getg(bits[idx])*level/255, getb(bits[idx])*level/255, geta(bits[idx])*level/255); - } else - { + else bits[idx] = rgba(getr(bits[idx])*level/255, getg(bits[idx])*level/255, getb(bits[idx])*level/255, level); - } } } @@ -125,8 +121,7 @@ void MyBitmap::makeOpaqueRect(int x1, int y1, int x2, int y2) GdiFlush(); for (int i = y1; i < y2; i++) - for (int j = x1; j < x2; j++) - { + for (int j = x1; j < x2; j++) { int idx = i * width + j; bits[idx] |= 0xff000000; } @@ -155,7 +150,7 @@ void MyBitmap::saveAlpha(int x, int y, int w, int h) { if (j+x < 0) continue; if (j+x >= width) break; - *p1++ = *p2++; + *p1++=*p2++; } } } @@ -636,8 +631,8 @@ void MyBitmap::DrawNoAlpha(MyBitmap *bmp, int x, int y, int w, int h) static __forceinline int ReadP(long *p, int w, int h, int x, int y, int k) { - if (x<0) x=0; else if (x>=w) x=w-1; - if (y<0) y=0; else if (y>=h) y=h-1; + if (x<0) x = 0; else if (x>=w) x = w-1; + if (y<0) y = 0; else if (y>=h) y = h-1; return p[(x+y*w)*4+k]; } @@ -682,9 +677,9 @@ void MyBitmap::Blur(int w, int h) dst = buf_dst; float mul = 1.f/((w*2+1)*(h*2+1)); - for (y=0;y>3):bx; - rx=(rx>3):rx; - gx=(gx>3):gx; + bx = (bx>3):bx; + rx = (rx>3):rx; + gx = (gx>3):gx; // reduce boldeness at white fonts } COLOR32 cl = row_dst[j]; @@ -898,24 +893,24 @@ void MyBitmap::DrawText(TCHAR *str, int x, int y, int blur, int strength) { COLOR32 rrx,grx,brx; COLOR32 rlx,glx,blx; - COLOR32 axx=geta(cl); - COLOR32 mmx=(bx+gx+rx)/3; - COLOR32 nx=mmx;;//pbGammaWeight[mx];// + COLOR32 axx = geta(cl); + COLOR32 mmx = (bx+gx+rx)/3; + COLOR32 nx = mmx;;//pbGammaWeight[mx];// { //Normalize components to alpha level - bx=(nx*(255-axx)+bx*axx)/255; - gx=(nx*(255-axx)+gx*axx)/255; - rx=(nx*(255-axx)+rx*axx)/255; - mx=(nx*(255-axx)+mmx*axx)/255; + bx = (nx*(255-axx)+bx*axx)/255; + gx = (nx*(255-axx)+gx*axx)/255; + rx = (nx*(255-axx)+rx*axx)/255; + mx = (nx*(255-axx)+mmx*axx)/255; } { blx = getb(cl); glx = getg(cl); rlx = getr(cl); - brx=(b-blx)*bx/255; - grx=(g-glx)*gx/255; - rrx=(r-rlx)*rx/255; + brx = (b-blx)*bx/255; + grx = (g-glx)*gx/255; + rrx = (r-rlx)*rx/255; row_dst[j] = rgba(rlx+rrx, glx+grx, blx+brx, mx+(255-mx)*axx/255); } } @@ -924,7 +919,7 @@ void MyBitmap::DrawText(TCHAR *str, int x, int y, int blur, int strength) } // based on code by Yuriy Zaporozhets from: -// http://www.codeproject.com/gdi/coolrgn.asp?df=100&forumid=739&exp=0&select=6341 +// http://www.codeproject.com/gdi/coolrgn.asp?df = 100&forumid = 739&exp = 0&select = 6341 // slightly modified to integrate with MyBitmap class. HRGN MyBitmap::buildOpaqueRgn(int level, bool opaque) { @@ -1008,7 +1003,7 @@ static int hex2dec(char hex) bool MyBitmap::loadFromFile_pixel(const char *fn, const char *fnAlpha) { allocate(1,1); - int r, g, b, a=255; + int r, g, b, a = 255; const char *p = fn + lstrlenA("pixel:"); r = (hex2dec(p[0]) << 4) + hex2dec(p[1]); g = (hex2dec(p[2]) << 4) + hex2dec(p[3]); @@ -1024,7 +1019,7 @@ bool MyBitmap::loadFromFile_gradient(const char *fn, const char *fnAlpha) if (*p == 'h') allocate(256,1); else allocate(1,256); - int r, g, b, a=255; + int r, g, b, a = 255; p += 2; r = (hex2dec(p[0]) << 4) + hex2dec(p[1]); @@ -1082,8 +1077,8 @@ bool MyBitmap::loadFromFile_png(const char *fn, const char *fnAlpha) if (!cbFileSize) return false; - BITMAPINFO *bi=(BITMAPINFO*)pDib; - BYTE *pt=(BYTE*)bi; + BITMAPINFO *bi = (BITMAPINFO*)pDib; + BYTE *pt = (BYTE*)bi; pt+=bi->bmiHeader.biSize; if (bi->bmiHeader.biBitCount != 32) @@ -1099,16 +1094,16 @@ bool MyBitmap::loadFromFile_png(const char *fn, const char *fnAlpha) } else { allocate(abs(bi->bmiHeader.biWidth), abs(bi->bmiHeader.biHeight)); - BYTE *p2=(BYTE *)pt; - for (int y=0; ybmiHeader.biHeight; ++y) + BYTE *p2 = (BYTE *)pt; + for (int y = 0; ybmiHeader.biHeight; ++y) { - BYTE *p1=(BYTE *)bits + (bi->bmiHeader.biHeight-y-1)*bi->bmiHeader.biWidth*4; - for (int x=0; xbmiHeader.biWidth; ++x) + BYTE *p1 = (BYTE *)bits + (bi->bmiHeader.biHeight-y-1)*bi->bmiHeader.biWidth*4; + for (int x = 0; xbmiHeader.biWidth; ++x) { - p1[0]= p2[0]; - p1[1]= p2[1]; - p1[2]= p2[2]; - p1[3]= p2[3]; + p1[0] = p2[0]; + p1[1] = p2[1]; + p1[2] = p2[2]; + p1[3] = p2[3]; p1 += 4; p2 += 4; } @@ -1138,7 +1133,7 @@ bool MyBitmap::loadFromFile_default(const char *fn, const char *fnAlpha) HDC dcTmp = CreateCompatibleDC(0); GetBitmapDimensionEx(hBmpLoaded, &sz); - HBITMAP hBmpDcSave = (HBITMAP)SelectObject(dcTmp, hBmpLoaded); + HBITMAP hBmpDcSave = (HBITMAP)SelectObject(dcTmp, hBmpLoaded); allocate(sz.cx, sz.cy); BitBlt(dcBmp, 0, 0, width, height, dcTmp, 0, 0, SRCCOPY); diff --git a/plugins/FloatingContacts/bitmap_funcs.h b/plugins/FloatingContacts/bitmap_funcs.h index b7f55a43d7..85bbee2004 100644 --- a/plugins/FloatingContacts/bitmap_funcs.h +++ b/plugins/FloatingContacts/bitmap_funcs.h @@ -94,7 +94,7 @@ public: void IncreaseAlpha(float q); void DrawIcon(HICON hic, int x, int y, int w = 0, int h = 0); - void DrawText(TCHAR *str, int x, int y, int blur=0, int strength = 0); + void DrawText(TCHAR *str, int x, int y, int blur = 0, int strength = 0); __forceinline COLOR32 *getBits() { return bits; } __forceinline COLOR32 *getRow(int row) { return bits + row * width; } diff --git a/plugins/FloatingContacts/filedrop.cpp b/plugins/FloatingContacts/filedrop.cpp index 09fe2dace2..caf87577c4 100644 --- a/plugins/FloatingContacts/filedrop.cpp +++ b/plugins/FloatingContacts/filedrop.cpp @@ -13,7 +13,7 @@ HRESULT STDMETHODCALLTYPE CDropTarget::QueryInterface(REFIID riid,LPVOID *ppvObj return S_OK; } - *ppvObj=NULL; + *ppvObj = NULL; return ( E_NOINTERFACE ); } @@ -35,7 +35,7 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragOver( DWORD fKeyState, POINTL pt, DWO { *pdwEffect = 0; - if( hwndCurDrag == NULL ) + if ( hwndCurDrag == NULL ) { *pdwEffect = DROPEFFECT_NONE; } @@ -49,17 +49,17 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragOver( DWORD fKeyState, POINTL pt, DWO HRESULT STDMETHODCALLTYPE CDropTarget::DragEnter( IDataObject *pData, DWORD fKeyState, POINTL pt, DWORD *pdwEffect) { - HWND hwnd = NULL; + HWND hwnd = NULL; POINT shortPt; - FORMATETC feFile = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - FORMATETC feText = { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + FORMATETC feFile = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + FORMATETC feText = { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; ThumbInfo *pThumb; if ( S_OK == pData->QueryGetData( &feFile ) || S_OK == pData->QueryGetData( &feText ) ) { - shortPt.x = pt.x; - shortPt.y = pt.y; + shortPt.x = pt.x; + shortPt.y = pt.y; hwnd = WindowFromPoint( shortPt ); @@ -91,19 +91,19 @@ HRESULT STDMETHODCALLTYPE CDropTarget::DragLeave( ) HRESULT STDMETHODCALLTYPE CDropTarget::Drop( IDataObject *pData,DWORD fKeyState,POINTL pt,DWORD *pdwEffect) { - FORMATETC fe = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + FORMATETC fe = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; STGMEDIUM stg; - HDROP hDrop = NULL; - ThumbInfo *pThumb = NULL; - char *pText = NULL; + HDROP hDrop = NULL; + ThumbInfo *pThumb = NULL; + char *pText = NULL; BOOL bFormatText = FALSE; *pdwEffect = DROPEFFECT_NONE; - if( hwndCurDrag == NULL ) return( S_OK ); + if ( hwndCurDrag == NULL ) return( S_OK ); - pThumb = (ThumbInfo*)GetWindowLong( hwndCurDrag, GWL_USERDATA ); + pThumb = (ThumbInfo*)GetWindowLong( hwndCurDrag, GWLP_USERDATA ); if ( pThumb == NULL ) return( S_OK ); if ( S_OK != pData->GetData( &fe,&stg ) ) @@ -124,7 +124,7 @@ HRESULT STDMETHODCALLTYPE CDropTarget::Drop( IDataObject *pData,DWORD fKeyState, if ( !bFormatText ) { - hDrop = (HDROP)stg.hGlobal; + hDrop = (HDROP)stg.hGlobal; if ( hDrop != NULL ) { @@ -142,7 +142,7 @@ HRESULT STDMETHODCALLTYPE CDropTarget::Drop( IDataObject *pData,DWORD fKeyState, } } - if( stg.pUnkForRelease != NULL ) + if ( stg.pUnkForRelease != NULL ) { stg.pUnkForRelease->Release( ); } @@ -161,12 +161,12 @@ HRESULT STDMETHODCALLTYPE CDropTarget::Drop( IDataObject *pData,DWORD fKeyState, BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) { - BOOL bSuccess = FALSE; - UINT nFilesCount = 0; - UINT iItem = 0; - char **ppFiles = NULL; - char **ppDroppedItems = NULL; - UINT nDroppedItemsCount = 0; + BOOL bSuccess = FALSE; + UINT nFilesCount = 0; + UINT iItem = 0; + char **ppFiles = NULL; + char **ppDroppedItems = NULL; + UINT nDroppedItemsCount = 0; char szFilename[ MAX_PATH ]; @@ -181,7 +181,7 @@ BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) ppDroppedItems[ nDroppedItemsCount ] = NULL; - for( iItem = 0; iItem < nDroppedItemsCount; ++iItem ) + for ( iItem = 0; iItem < nDroppedItemsCount; ++iItem ) { DragQueryFileA( hDrop, iItem, szFilename, sizeof( szFilename ) ); ppDroppedItems[ iItem ] = _strdup( szFilename ); @@ -203,14 +203,14 @@ BOOL OnDropFiles( HDROP hDrop, ThumbInfo *pThumb ) bSuccess = (BOOL)CallService( MS_CLIST_CONTACTFILESDROPPED, (WPARAM)pThumb->hContact, (LPARAM)ppFiles ); // Cleanup - for( iItem = 0; ppDroppedItems[ iItem ]; ++iItem ) + for ( iItem = 0; ppDroppedItems[ iItem ]; ++iItem ) { free( ppDroppedItems[ iItem ] ); } free( ppDroppedItems ); - for( iItem = 0; iItem < nFilesCount ; ++iItem ) + for ( iItem = 0; iItem < nFilesCount ; ++iItem ) { free( ppFiles[ iItem ] ); } @@ -324,7 +324,7 @@ static void ProcessDroppedItems( char **ppDroppedItems, int nCount, char **ppFil int i; int fileCount = 0; - for( i = 0; i < nCount; ++i ) + for ( i = 0; i < nCount; ++i ) { SaveFiles( ppDroppedItems[ i ], ppFiles, &fileCount ); } @@ -336,7 +336,7 @@ static int CountDroppedFiles( char **ppDroppedItems, int nCount ) int fileCount = 0; int i; - for( i = 0; i < nCount; ++i ) + for ( i = 0; i < nCount; ++i ) { fileCount += CountFiles( ppDroppedItems[ i ] ); } diff --git a/plugins/FloatingContacts/filedrop.h b/plugins/FloatingContacts/filedrop.h index ed03cdbf68..b5c7f803aa 100644 --- a/plugins/FloatingContacts/filedrop.h +++ b/plugins/FloatingContacts/filedrop.h @@ -1,7 +1,7 @@ /* This file is a modification of clcfiledrop.h originally written by Richard Hughes*/ -static HWND hwndCurDrag = NULL; +static HWND hwndCurDrag = NULL; class CDropTarget: public IDropTarget { diff --git a/plugins/FloatingContacts/main.cpp b/plugins/FloatingContacts/main.cpp index 3abca83658..8c572e210d 100644 --- a/plugins/FloatingContacts/main.cpp +++ b/plugins/FloatingContacts/main.cpp @@ -28,9 +28,9 @@ No warranty for any misbehaviour. //#define DB_POS_GETY(pos) HIWORD(pos) //#define DB_POS_MAKE_XY(x, y) MAKELONG(x, y) -BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); +BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND, COLORREF, BYTE, DWORD); BOOL (WINAPI *pUpdateLayeredWindow) - (HWND hwnd, HDC hdcDST, POINT *pptDst, SIZE *psize, HDC hdcSrc, POINT *pptSrc, + (HWND hwnd, HDC hdcDST, POINT *pptDst, SIZE *psize, HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, DWORD dwFlags); // Globals @@ -58,7 +58,7 @@ static int ClcStatusToPf2 ( int status ); static LRESULT __stdcall CommWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT __stdcall newMirandaWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static int OnContactDeleted ( WPARAM wParam,LPARAM lParam ); +static int OnContactDeleted ( WPARAM wParam, LPARAM lParam ); static int OnContactIconChanged ( WPARAM wParam, LPARAM lParam ); static int OnContactDrag ( WPARAM wParam, LPARAM lParam ); static int OnContactDrop ( WPARAM wParam, LPARAM lParam ); @@ -69,94 +69,93 @@ static int OnStatusModeChange ( WPARAM wParam, LPARAM lParam ); static int OnModulesLoded ( WPARAM wParam, LPARAM lParam ); static int OnPrebuildContactMenu ( WPARAM wParam, LPARAM lParam ); -static int OnContactMenu_Remove ( WPARAM wParam,LPARAM lParam ); -//static int OnContactMenu_HideAll ( WPARAM wParam,LPARAM lParam ); -static int OnMainMenu_HideAll ( WPARAM wParam,LPARAM lParam ); -static int OnHotKey_HideWhenCListShow( WPARAM wParam,LPARAM lParam ); +static INT_PTR OnContactMenu_Remove ( WPARAM wParam, LPARAM lParam ); +static INT_PTR OnMainMenu_HideAll ( WPARAM wParam, LPARAM lParam ); +static INT_PTR OnHotKey_HideWhenCListShow( WPARAM wParam, LPARAM lParam ); static VOID CALLBACK ToTopTimerProc ( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime); WNDPROC oldMirandaWndProc; -HINSTANCE hInst = NULL; -HMODULE hUserDll = NULL; -PLUGINLINK *pluginLink = NULL; -LIST_INTERFACE li = {0}; -HFONT hFont[FLT_FONTIDS] = {NULL}; -COLORREF tColor[FLT_FONTIDS] = {0}; -HIMAGELIST himl = NULL; -HANDLE hevContactIcon = NULL; -HANDLE hevContactDrop = NULL; -HANDLE hevContactDragStop = NULL; -HANDLE hevSkinIcons = NULL; -HANDLE hevContactDrag = NULL; -HANDLE hevContactSetting = NULL; -HANDLE hevContactDeleted = NULL; -HANDLE hevOptionsInit = NULL; -HANDLE hevStatusMode = NULL; -HANDLE hevModules = NULL; -HANDLE hevPrebuildMenu = NULL; -HANDLE hNewContact = NULL; - -HPEN hLTEdgesPen = NULL; -HPEN hRBEdgesPen = NULL; -HBRUSH hBkBrush = NULL; -DWORD bkColor = 0; -HBITMAP hBmpBackground = NULL; -WORD nBackgroundBmpUse = CLB_STRETCH; - -HWND hwndMiranda = NULL; -BOOL bVersionOK = FALSE; -BOOL bNT = FALSE; -BOOL bDockHorz = TRUE; -//UINT nStatus = 0; -HMENU hContactMenu = NULL; -HANDLE hMenuItemRemove = NULL; -HANDLE hMenuItemHideAll = NULL; -HANDLE hMainMenuItemHideAll = NULL; +HINSTANCE hInst = NULL; +HMODULE hUserDll = NULL; +PLUGINLINK *pluginLink = NULL; +LIST_INTERFACE li = {0}; +HFONT hFont[FLT_FONTIDS] = {NULL}; +COLORREF tColor[FLT_FONTIDS] = {0}; +HIMAGELIST himl = NULL; +HANDLE hevContactIcon = NULL; +HANDLE hevContactDrop = NULL; +HANDLE hevContactDragStop = NULL; +HANDLE hevSkinIcons = NULL; +HANDLE hevContactDrag = NULL; +HANDLE hevContactSetting = NULL; +HANDLE hevContactDeleted = NULL; +HANDLE hevOptionsInit = NULL; +HANDLE hevStatusMode = NULL; +HANDLE hevModules = NULL; +HANDLE hevPrebuildMenu = NULL; +HANDLE hNewContact = NULL; + +HPEN hLTEdgesPen = NULL; +HPEN hRBEdgesPen = NULL; +HBRUSH hBkBrush = NULL; +DWORD bkColor = 0; +HBITMAP hBmpBackground = NULL; +WORD nBackgroundBmpUse = CLB_STRETCH; + +HWND hwndMiranda = NULL; +BOOL bVersionOK = FALSE; +BOOL bNT = FALSE; +BOOL bDockHorz = TRUE; +//UINT nStatus = 0; +HMENU hContactMenu = NULL; +HANDLE hMenuItemRemove = NULL; +HANDLE hMenuItemHideAll = NULL; +HANDLE hMainMenuItemHideAll = NULL; RECT rcScreen; -DWORD dwOfflineModes = 0; -BOOL bEnableTip = FALSE; -UINT_PTR ToTopTimerID = 0; -BOOL bIsCListShow = TRUE; - -HANDLE hRemoveThumb = NULL; -HANDLE hMainHideAllThumbs = NULL; -HANDLE hHideWhenCListShow = NULL; +DWORD dwOfflineModes = 0; +BOOL bEnableTip = FALSE; +UINT_PTR ToTopTimerID = 0; +BOOL bIsCListShow = TRUE; + +HANDLE hRemoveThumb = NULL; +HANDLE hMainHideAllThumbs = NULL; +HANDLE hHideWhenCListShow = NULL; int hLangpack; //Options FCOptions fcOpt = {0}; -static void InitOptions(){ - fcOpt.thumbAlpha = 255; - fcOpt.bHideOffline = FALSE; - fcOpt.bHideAll = FALSE; - fcOpt.bHideWhenFullscreen = FALSE; - fcOpt.bMoveTogether = FALSE; - fcOpt.bFixedWidth = FALSE; - fcOpt.nThumbWidth = 0; - fcOpt.bShowTip = TRUE; - fcOpt.TimeIn = 0; - fcOpt.bToTop = TRUE; - fcOpt.ToTopTime = TOTOPTIME_DEF; - fcOpt.bHideWhenCListShow = FALSE; - fcOpt.bUseSingleClick = FALSE; - fcOpt.bShowIdle = TRUE; +static void InitOptions() { + fcOpt.thumbAlpha = 255; + fcOpt.bHideOffline = FALSE; + fcOpt.bHideAll = FALSE; + fcOpt.bHideWhenFullscreen = FALSE; + fcOpt.bMoveTogether = FALSE; + fcOpt.bFixedWidth = FALSE; + fcOpt.nThumbWidth = 0; + fcOpt.bShowTip = TRUE; + fcOpt.TimeIn = 0; + fcOpt.bToTop = TRUE; + fcOpt.ToTopTime = TOTOPTIME_DEF; + fcOpt.bHideWhenCListShow = FALSE; + fcOpt.bUseSingleClick = FALSE; + fcOpt.bShowIdle = TRUE; } -PLUGININFO pluginInfo ={ - sizeof(PLUGININFO), - __PLUGIN_NAME, - 0, - __DESC, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, +PLUGININFO pluginInfo = { + sizeof(PLUGININFO), + __PLUGIN_NAME, + 0, + __DESC, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, 0 }; @@ -170,29 +169,29 @@ extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void) return interfaces; } -PLUGININFOEX pluginInfoEx ={ - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - 0, - __DESC, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - 0, +PLUGININFOEX pluginInfoEx = { + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + 0, + __DESC, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + 0, MIID_FLTCONT }; -_inline unsigned int MakeVer(int a,int b,int c,int d) +_inline unsigned int MakeVer(int a, int b, int c, int d) { - return PLUGIN_MAKE_VERSION(a,b,c,d); + return PLUGIN_MAKE_VERSION(a, b, c, d); } extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if( mirandaVersion < MakeVer(MINIMAL_COREVERSION) ) return NULL; - pluginInfoEx.version=MakeVer(PRODUCT_VERSION); + if ( mirandaVersion < MakeVer(MINIMAL_COREVERSION) ) return NULL; + pluginInfoEx.version = MakeVer(PRODUCT_VERSION); return &pluginInfoEx; } @@ -219,8 +218,8 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo( DWORD mirandaVersion ) { - if( mirandaVersion < MakeVer(MINIMAL_COREVERSION) ) return NULL; - pluginInfo.version=MakeVer(PRODUCT_VERSION); + if ( mirandaVersion < MakeVer(MINIMAL_COREVERSION) ) return NULL; + pluginInfo.version = MakeVer(PRODUCT_VERSION); return &pluginInfo; } @@ -230,24 +229,23 @@ extern "C" int __declspec(dllexport) Load( PLUGINLINK *link ) { SetLastError( 0 ); InitOptions(); - pluginLink = link; + pluginLink = link; mir_getLI(&li); mir_getLP(&pluginInfoEx); - hevModules = HookEvent( ME_SYSTEM_MODULESLOADED, OnModulesLoded ); - bNT = GetOSPlatform(); + hevModules = HookEvent( ME_SYSTEM_MODULESLOADED, OnModulesLoded ); + bNT = GetOSPlatform(); - if (hUserDll = LoadLibrary(_T("user32.dll"))) - { - pSetLayeredWindowAttributes = - (BOOL (WINAPI *)(HWND,COLORREF,BYTE,DWORD)) + if (hUserDll = LoadLibrary(_T("user32.dll"))) { + pSetLayeredWindowAttributes = + (BOOL (WINAPI *)(HWND, COLORREF, BYTE, DWORD)) GetProcAddress(hUserDll, "SetLayeredWindowAttributes"); - pUpdateLayeredWindow = + pUpdateLayeredWindow = (BOOL (WINAPI *)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD)) GetProcAddress(hUserDll, "UpdateLayeredWindow"); - } else - { + } + else { pSetLayeredWindowAttributes = NULL; pUpdateLayeredWindow = NULL; } @@ -281,17 +279,14 @@ static void CleanUp() UnhookEvent( hevModules ); UnhookEvent( hevPrebuildMenu ); - if(hRemoveThumb) + if (hRemoveThumb) DestroyServiceFunction(hRemoveThumb); - if(hMainHideAllThumbs) + if (hMainHideAllThumbs) DestroyServiceFunction(hMainHideAllThumbs); - if(hHideWhenCListShow) + if (hHideWhenCListShow) DestroyServiceFunction(hHideWhenCListShow); -// while( pThumbsList != NULL ) -// RemoveThumb( pThumbsList ); - - if(ServiceExists(MS_HOTKEY_UNREGISTER)){ + if (ServiceExists(MS_HOTKEY_UNREGISTER)) { CallService(MS_HOTKEY_UNREGISTER, 0, (LPARAM)(sModule "/MainHideAllThumbs")); CallService(MS_HOTKEY_UNREGISTER, 0, (LPARAM)(sModule "/HideWhenCListShow")); } @@ -302,11 +297,10 @@ static void CleanUp() DeleteObject(hRBEdgesPen); if (NULL != hBmpBackground) DeleteObject(hBmpBackground); - if (NULL != hBkBrush) - { - SetClassLong((HWND)WND_CLASS, GCL_HBRBACKGROUND, (LONG)NULL); + if (NULL != hBkBrush) { + SetClassLong((HWND)WND_CLASS, GCLP_HBRBACKGROUND, (LONG)NULL); DeleteObject(hBkBrush); - hBkBrush=NULL; + hBkBrush = NULL; } for (nFontId = 0; nFontId < FLT_FONTIDS; nFontId++) @@ -318,9 +312,7 @@ static void CleanUp() FreeFileDropping(); if ( hUserDll != NULL ) - { FreeLibrary( hUserDll ); - } } @@ -329,24 +321,24 @@ static void CleanUp() // Hooked events static int OnModulesLoded( WPARAM wParam, LPARAM lParam ) { - hevContactIcon = HookEvent( ME_CLIST_CONTACTICONCHANGED, OnContactIconChanged ); - hevSkinIcons = HookEvent( ME_SKIN_ICONSCHANGED, OnSkinIconsChanged ); - hevContactDrag = HookEvent( ME_CLUI_CONTACTDRAGGING, OnContactDrag ); - hevContactDrop = HookEvent( ME_CLUI_CONTACTDROPPED, OnContactDrop ); - hevContactDragStop = HookEvent( ME_CLUI_CONTACTDRAGSTOP, OnContactDragStop ); - hevContactSetting = HookEvent( ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged ); - hevContactDeleted = HookEvent( ME_DB_CONTACT_DELETED, OnContactDeleted ); - hevOptionsInit = HookEvent( ME_OPT_INITIALISE, OnOptionsInitialize ); - hevStatusMode = HookEvent( ME_CLIST_STATUSMODECHANGE, OnStatusModeChange ); - hevPrebuildMenu = HookEvent( ME_CLIST_PREBUILDCONTACTMENU, OnPrebuildContactMenu ); - hwndMiranda = (HWND)CallService( MS_CLUI_GETHWND, 0, 0 ); - - oldMirandaWndProc = (WNDPROC)SetWindowLong( hwndMiranda, GWLP_WNDPROC, (LONG)newMirandaWndProc); + hevContactIcon = HookEvent( ME_CLIST_CONTACTICONCHANGED, OnContactIconChanged ); + hevSkinIcons = HookEvent( ME_SKIN_ICONSCHANGED, OnSkinIconsChanged ); + hevContactDrag = HookEvent( ME_CLUI_CONTACTDRAGGING, OnContactDrag ); + hevContactDrop = HookEvent( ME_CLUI_CONTACTDROPPED, OnContactDrop ); + hevContactDragStop = HookEvent( ME_CLUI_CONTACTDRAGSTOP, OnContactDragStop ); + hevContactSetting = HookEvent( ME_DB_CONTACT_SETTINGCHANGED, OnContactSettingChanged ); + hevContactDeleted = HookEvent( ME_DB_CONTACT_DELETED, OnContactDeleted ); + hevOptionsInit = HookEvent( ME_OPT_INITIALISE, OnOptionsInitialize ); + hevStatusMode = HookEvent( ME_CLIST_STATUSMODECHANGE, OnStatusModeChange ); + hevPrebuildMenu = HookEvent( ME_CLIST_PREBUILDCONTACTMENU, OnPrebuildContactMenu ); + hwndMiranda = (HWND)CallService( MS_CLUI_GETHWND, 0, 0 ); + + oldMirandaWndProc = (WNDPROC)SetWindowLong( hwndMiranda, GWLP_WNDPROC, (LONG)newMirandaWndProc); // No thumbs yet -// pThumbsList = NULL; +// pThumbsList = NULL; bEnableTip = ServiceExists("mToolTip/ShowTip"); RegisterWindowClass(); @@ -358,10 +350,10 @@ static int OnModulesLoded( WPARAM wParam, LPARAM lParam ) LoadContacts(); LoadMenus(); - if(fcOpt.bToTop){ + if (fcOpt.bToTop){ fcOpt.ToTopTime = (fcOpt.ToTopTime<1)?1:fcOpt.ToTopTime; fcOpt.ToTopTime = (fcOpt.ToTopTime>TOTOPTIME_MAX)?TOTOPTIME_MAX:fcOpt.ToTopTime; - ToTopTimerID=SetTimer(NULL, 0, fcOpt.ToTopTime*TOTOPTIME_P, ToTopTimerProc); + ToTopTimerID = SetTimer(NULL, 0, fcOpt.ToTopTime*TOTOPTIME_P, ToTopTimerProc); } return( 0 ); } @@ -369,8 +361,8 @@ static int OnModulesLoded( WPARAM wParam, LPARAM lParam ) static int OnContactDeleted( WPARAM wParam, LPARAM lParam ) { - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); if (!pThumb) return 0; pThumb->DeleteContactPos(); @@ -382,8 +374,8 @@ static int OnContactDeleted( WPARAM wParam, LPARAM lParam ) static int OnContactIconChanged( WPARAM wParam, LPARAM lParam ) { - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); if ( pThumb ) { @@ -398,21 +390,18 @@ static int OnContactIconChanged( WPARAM wParam, LPARAM lParam ) static int OnContactDrag( WPARAM wParam, LPARAM lParam ) { - ThumbInfo *pNewThumb = NULL; - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - TCHAR *ptName = (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, wParam, (LPARAM)GCDNF_TCHAR ); - int idStatus = ID_STATUS_OFFLINE; + ThumbInfo *pNewThumb = NULL; + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + TCHAR *ptName = (TCHAR*)CallService( MS_CLIST_GETCONTACTDISPLAYNAME, wParam, (LPARAM)GCDNF_TCHAR ); + int idStatus = ID_STATUS_OFFLINE; POINT pt; GetCursorPos(&pt); - if ( pThumb == NULL ) - { + if ( pThumb == NULL ) { idStatus = GetContactStatus( hContact ); - if ( !fcOpt.bHideAll && !HideOnFullScreen() && ( !fcOpt.bHideOffline || IsStatusVisible( idStatus ) ) && (!fcOpt.bHideWhenCListShow || !bIsCListShow) ) - { -// CreateThumbWnd( pName, hContact, LOWORD( lParam ), HIWORD( lParam ) ); + if ( !fcOpt.bHideAll && !HideOnFullScreen() && ( !fcOpt.bHideOffline || IsStatusVisible( idStatus ) ) && (!fcOpt.bHideWhenCListShow || !bIsCListShow)) { CreateThumbWnd( ptName, hContact, pt.x, pt.y ); pNewThumb = thumbList.FindThumbByContact( hContact ); ShowWindow( pNewThumb->hwnd, SW_SHOWNA ); @@ -422,10 +411,7 @@ static int OnContactDrag( WPARAM wParam, LPARAM lParam ) } } else if ( hContact == hNewContact ) - { -// PositionThumb( pThumb, (short)( LOWORD( lParam ) - 5 ), (short)( HIWORD( lParam ) - 5 ) ); pThumb->PositionThumb( (short)( pt.x - 5 ), (short)( pt.y - 5 ) ); - } return( hNewContact != NULL ? 1 : 0 ); } @@ -438,8 +424,8 @@ static int OnContactDrop( WPARAM wParam, LPARAM lParam ) RECT rcThumb; // RECT rcOverlap; - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); if ( ( hNewContact == hContact ) && ( pThumb != NULL ) ) { @@ -491,16 +477,16 @@ static int OnSkinIconsChanged( WPARAM wParam, LPARAM lParam ) static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) { - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - int idStatus = ID_STATUS_OFFLINE; - BOOL bRefresh = TRUE; + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + int idStatus = ID_STATUS_OFFLINE; + BOOL bRefresh = TRUE; DBCONTACTWRITESETTING* pdbcws = ( DBCONTACTWRITESETTING* )lParam; if ( hContact == NULL ) { - if(( 0 == stricmp( pdbcws->szModule, "CLC" ) ) || ( 0 == stricmp( pdbcws->szModule, sModule ) ) ){ + if (( 0 == stricmp( pdbcws->szModule, "CLC" ) ) || ( 0 == stricmp( pdbcws->szModule, sModule ) ) ) { LoadDBSettings(); ApplyOptionsChanges(); } @@ -511,7 +497,7 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) if ( pThumb == NULL ) return( 0 ); // Only on these 2 events we need to refresh - if( 0 == stricmp( pdbcws->szSetting, "Status" ) ) + if ( 0 == stricmp( pdbcws->szSetting, "Status" ) ) { idStatus = pdbcws->value.wVal; } @@ -588,26 +574,26 @@ static int OnPrebuildContactMenu( WPARAM wParam, LPARAM lParam ) static void LoadDBSettings() { - fcOpt.thumbAlpha = (BYTE)((double)DBGetContactSettingByte( NULL, sModule, "Opacity", 100 ) * 2.55 ); - fcOpt.bHideOffline = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideOffline", 0 ); - fcOpt.bHideAll = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideAll", 0 ); - fcOpt.bHideWhenFullscreen = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideWhenFullscreen", 0 ); - fcOpt.bMoveTogether = (BOOL)DBGetContactSettingByte( NULL, sModule, "MoveTogether", 0 ); - fcOpt.bFixedWidth = (BOOL)DBGetContactSettingByte( NULL, sModule, "FixedWidth", 0 ); - fcOpt.nThumbWidth = (DWORD)DBGetContactSettingDword( NULL, sModule, "Width", 0 ); - dwOfflineModes = DBGetContactSettingDword( NULL, "CLC","OfflineModes", CLCDEFAULT_OFFLINEMODES ); - fcOpt.bShowTip = (BOOL)DBGetContactSettingByte( NULL, sModule, "ShowTip", 1 ); - fcOpt.TimeIn = (WORD)DBGetContactSettingWord( NULL, sModule, "TimeIn", 0 ); - fcOpt.bToTop = (BOOL)DBGetContactSettingByte( NULL, sModule, "ToTop", 0 ); - fcOpt.ToTopTime = (WORD)DBGetContactSettingWord( NULL, sModule, "ToTopTime", TOTOPTIME_DEF ); - fcOpt.bHideWhenCListShow = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideWhenCListShow", 0 ); - fcOpt.bUseSingleClick = (BOOL)DBGetContactSettingByte( NULL, sModule, "UseSingleClick", 0 ); - fcOpt.bShowIdle = (BOOL)DBGetContactSettingByte( NULL, sModule, "ShowIdle", 0 ); - - if(DBGetContactSettingByte(NULL, "ModernData", "HideBehind", 0)) - bIsCListShow = (DBGetContactSettingByte(NULL, "ModernData", "BehindEdge", 0)==0); + fcOpt.thumbAlpha = (BYTE)((double)DBGetContactSettingByte( NULL, sModule, "Opacity", 100 ) * 2.55 ); + fcOpt.bHideOffline = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideOffline", 0 ); + fcOpt.bHideAll = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideAll", 0 ); + fcOpt.bHideWhenFullscreen = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideWhenFullscreen", 0 ); + fcOpt.bMoveTogether = (BOOL)DBGetContactSettingByte( NULL, sModule, "MoveTogether", 0 ); + fcOpt.bFixedWidth = (BOOL)DBGetContactSettingByte( NULL, sModule, "FixedWidth", 0 ); + fcOpt.nThumbWidth = (DWORD)DBGetContactSettingDword( NULL, sModule, "Width", 0 ); + dwOfflineModes = DBGetContactSettingDword( NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES ); + fcOpt.bShowTip = (BOOL)DBGetContactSettingByte( NULL, sModule, "ShowTip", 1 ); + fcOpt.TimeIn = (WORD)DBGetContactSettingWord( NULL, sModule, "TimeIn", 0 ); + fcOpt.bToTop = (BOOL)DBGetContactSettingByte( NULL, sModule, "ToTop", 0 ); + fcOpt.ToTopTime = (WORD)DBGetContactSettingWord( NULL, sModule, "ToTopTime", TOTOPTIME_DEF ); + fcOpt.bHideWhenCListShow = (BOOL)DBGetContactSettingByte( NULL, sModule, "HideWhenCListShow", 0 ); + fcOpt.bUseSingleClick = (BOOL)DBGetContactSettingByte( NULL, sModule, "UseSingleClick", 0 ); + fcOpt.bShowIdle = (BOOL)DBGetContactSettingByte( NULL, sModule, "ShowIdle", 0 ); + + if (DBGetContactSettingByte(NULL, "ModernData", "HideBehind", 0)) + bIsCListShow = (DBGetContactSettingByte(NULL, "ModernData", "BehindEdge", 0) == 0); else - bIsCListShow = (DBGetContactSettingByte(NULL,"CList","State",0)==2); + bIsCListShow = (DBGetContactSettingByte(NULL, "CList", "State", 0) == 2); } void SendMsgDialog( HWND hwnd, char *pText ) @@ -621,8 +607,8 @@ void SendMsgDialog( HWND hwnd, char *pText ) static void ShowContactMenu( HWND hwnd, POINT pt ) { - ThumbInfo *pThumb = thumbList.FindThumb( hwnd ); - int idCommand = 0; + ThumbInfo *pThumb = thumbList.FindThumb( hwnd ); + int idCommand = 0; if ( pThumb != NULL ) { @@ -631,7 +617,7 @@ static void ShowContactMenu( HWND hwnd, POINT pt ) if ( hContactMenu == NULL ) return; idCommand = TrackPopupMenu( hContactMenu, TPM_RIGHTALIGN | TPM_TOPALIGN | TPM_RETURNCMD, pt.x, pt.y, 0 , hwnd, NULL ); - CallService( MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM( idCommand ,MPCF_CONTACTMENU), (LPARAM)pThumb->hContact ); + CallService( MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM( idCommand , MPCF_CONTACTMENU), (LPARAM)pThumb->hContact ); } } @@ -640,8 +626,8 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, WPARAM wParam, LPARAM lParam ) { - LRESULT lResult = 0; - ThumbInfo *pThumb = thumbList.FindThumb( hwnd ); + LRESULT lResult = 0; + ThumbInfo *pThumb = thumbList.FindThumb( hwnd ); switch( uMsg ) { @@ -653,7 +639,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, if (pThumb) pThumb->ThumbDeselect( TRUE ); - ClientToScreen(hwnd,&pt); + ClientToScreen(hwnd, &pt); ShowContactMenu( hwnd, pt ); } @@ -661,7 +647,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, //#if 0 case WM_NCPAINT: - if(pThumb){ + if (pThumb){ HDC hdc = GetWindowDC( hwnd ); BitBlt(hdc, 0, 0, pThumb->bmpContent.getWidth(), pThumb->bmpContent.getHeight(), pThumb->bmpContent.getDC(), 0, 0, SRCCOPY); //RepaintWindow( hwnd, hdc ); @@ -671,7 +657,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, } case WM_PAINT: - if(pThumb){ + if (pThumb){ PAINTSTRUCT ps; HDC hdc = BeginPaint(hwnd, &ps); BitBlt(hdc, 0, 0, pThumb->bmpContent.getWidth(), pThumb->bmpContent.getHeight(), pThumb->bmpContent.getDC(), 0, 0, SRCCOPY); @@ -682,7 +668,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, case WM_PRINT: case WM_PRINTCLIENT: - if(pThumb){ + if (pThumb){ BitBlt((HDC)wParam, 0, 0, pThumb->bmpContent.getWidth(), pThumb->bmpContent.getHeight(), pThumb->bmpContent.getDC(), 0, 0, SRCCOPY); //RepaintWindow(hwnd, (HDC)wParam); break; @@ -690,11 +676,11 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, //#endif case WM_MEASUREITEM: - lResult = CallService( MS_CLIST_MENUMEASUREITEM,wParam,lParam ); + lResult = CallService( MS_CLIST_MENUMEASUREITEM, wParam, lParam ); break; case WM_DRAWITEM: - lResult = CallService( MS_CLIST_MENUDRAWITEM,wParam,lParam ); + lResult = CallService( MS_CLIST_MENUDRAWITEM, wParam, lParam ); break; case WM_LBUTTONDOWN: @@ -714,12 +700,12 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, case WM_LBUTTONDBLCLK: // Popup message dialog //if (pThumb) pThumb->ThumbDeselect( TRUE ); - if(!fcOpt.bUseSingleClick && pThumb) + if (!fcOpt.bUseSingleClick && pThumb) pThumb->PopUpMessageDialog(); break; case WM_RBUTTONDOWN: - if(bEnableTip && fcOpt.bShowTip && pThumb) pThumb->KillTip(); + if (bEnableTip && fcOpt.bShowTip && pThumb) pThumb->KillTip(); break; case WM_REFRESH_CONTACT: if (pThumb) @@ -731,7 +717,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, break; case WM_TIMER: - if(pThumb)pThumb->OnTimer(wParam); + if (pThumb)pThumb->OnTimer(wParam); break; case WM_HOTKEY: @@ -762,17 +748,17 @@ extern void SetThumbsOpacity( BYTE btAlpha ) static void GetScreenRect() { - rcScreen.left = GetSystemMetrics( SM_XVIRTUALSCREEN ); - rcScreen.top = GetSystemMetrics( SM_YVIRTUALSCREEN ); - rcScreen.right = GetSystemMetrics( SM_CXVIRTUALSCREEN ) + rcScreen.left; - rcScreen.bottom = GetSystemMetrics( SM_CYVIRTUALSCREEN ) + rcScreen.top; + rcScreen.left = GetSystemMetrics( SM_XVIRTUALSCREEN ); + rcScreen.top = GetSystemMetrics( SM_YVIRTUALSCREEN ); + rcScreen.right = GetSystemMetrics( SM_CXVIRTUALSCREEN ) + rcScreen.left; + rcScreen.bottom = GetSystemMetrics( SM_CYVIRTUALSCREEN ) + rcScreen.top; } void OnStatusChanged() { - int idStatus = ID_STATUS_OFFLINE; + int idStatus = ID_STATUS_OFFLINE; for (int i = 0; i < thumbList.getCount(); ++i) { @@ -788,12 +774,12 @@ void ApplyOptionsChanges() CreateThumbsFont(); CreateBackgroundBrush(); -// dwOfflineModes = DBGetContactSettingDword( NULL, "CLC","OfflineModes", CLCDEFAULT_OFFLINEMODES ); - if(!fcOpt.bToTop && ToTopTimerID){ +// dwOfflineModes = DBGetContactSettingDword( NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES ); + if (!fcOpt.bToTop && ToTopTimerID){ KillTimer(NULL, ToTopTimerID); ToTopTimerID = 0; } - if(fcOpt.bToTop){ + if (fcOpt.bToTop){ if (ToTopTimerID) KillTimer(NULL, ToTopTimerID); fcOpt.ToTopTime = (fcOpt.ToTopTime<1)?1:fcOpt.ToTopTime; fcOpt.ToTopTime = (fcOpt.ToTopTime>TOTOPTIME_MAX)?TOTOPTIME_MAX:fcOpt.ToTopTime; @@ -815,18 +801,18 @@ static void RegisterWindowClass() WNDCLASSEX wcx; ZeroMemory( &wcx, sizeof( wcx ) ); - wcx.cbSize = sizeof( WNDCLASSEX ); - wcx.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; - wcx.lpfnWndProc = CommWndProc; - wcx.cbClsExtra = 0; - wcx.cbWndExtra = 0; - wcx.hInstance = hInst; - wcx.hIcon = NULL; - wcx.hCursor = NULL; - wcx.hbrBackground = GetSysColorBrush(COLOR_3DFACE); - wcx.lpszMenuName = NULL; - wcx.lpszClassName = WND_CLASS; - wcx.hIconSm = NULL; + wcx.cbSize = sizeof( WNDCLASSEX ); + wcx.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS; + wcx.lpfnWndProc = CommWndProc; + wcx.cbClsExtra = 0; + wcx.cbWndExtra = 0; + wcx.hInstance = hInst; + wcx.hIcon = NULL; + wcx.hCursor = NULL; + wcx.hbrBackground = GetSysColorBrush(COLOR_3DFACE); + wcx.lpszMenuName = NULL; + wcx.lpszClassName = WND_CLASS; + wcx.hIconSm = NULL; SetLastError( 0 ); @@ -844,30 +830,30 @@ static void UnregisterWindowClass() static void CreateThumbWnd( TCHAR *ptszName, HANDLE hContact, int nX, int nY ) { - HWND hwnd = NULL; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + HWND hwnd = NULL; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); // Prepare for window creation if ( pThumb == NULL ) { - hwnd = CreateWindowEx( WS_EX_TOOLWINDOW | WS_EX_TOPMOST, - WND_CLASS, - ptszName, - WS_POPUP, - nX, - nY, - 50, - 20, - NULL /*hwndMiranda*/, - NULL, - hInst, + hwnd = CreateWindowEx( WS_EX_TOOLWINDOW | WS_EX_TOPMOST, + WND_CLASS, + ptszName, + WS_POPUP, + nX, + nY, + 50, + 20, + NULL /*hwndMiranda*/, + NULL, + hInst, NULL ); if ( hwnd != NULL ) { pThumb = thumbList.AddThumb( hwnd, ptszName, hContact ); - SetWindowLong( hwnd, GWL_USERDATA, (long)pThumb ); + SetWindowLong( hwnd, GWLP_USERDATA, (long)pThumb ); pThumb->ResizeThumb(); pThumb->SetThumbOpacity( fcOpt.thumbAlpha ); @@ -911,14 +897,14 @@ static void CreateThumbsFont() GetFontSetting(TRUE, nFontId, &lf, &tColor[nFontId]); { LONG height; - HDC hdc=GetDC(NULL); - height=lf.lfHeight; - lf.lfHeight=-MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); - ReleaseDC(NULL,hdc); + HDC hdc = GetDC(NULL); + height = lf.lfHeight; + lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); + ReleaseDC(NULL, hdc); hFont[nFontId] = CreateFontIndirectA(&lf); - lf.lfHeight=height; + lf.lfHeight = height; } } } @@ -948,7 +934,7 @@ static void CreateBackgroundBrush() } if (NULL != hBkBrush) { - SetClassLong((HWND)WND_CLASS, GCL_HBRBACKGROUND, (LONG)NULL); + SetClassLong((HWND)WND_CLASS, GCLP_HBRBACKGROUND, (LONG)NULL); DeleteObject( hBkBrush ); hBkBrush = NULL; } @@ -975,17 +961,17 @@ static void CreateBackgroundBrush() nBackgroundBmpUse = (WORD)DBGetContactSettingWord(NULL, sModule, "BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT); // Create brush - hBkBrush = CreateSolidBrush(bkColor); + hBkBrush = CreateSolidBrush(bkColor); // Attach brush to the window - SetClassLong((HWND)WND_CLASS, GCL_HBRBACKGROUND, (LONG)hBkBrush); + SetClassLong((HWND)WND_CLASS, GCLP_HBRBACKGROUND, (LONG)hBkBrush); } static int GetContactStatus( HANDLE hContact ) { - char *szProto = NULL; - int idStatus = ID_STATUS_OFFLINE; + char *szProto = NULL; + int idStatus = ID_STATUS_OFFLINE; if ( hContact == NULL ) { @@ -993,11 +979,11 @@ static int GetContactStatus( HANDLE hContact ) return( 0 ); } - szProto = ( char* )CallService( "Proto/GetContactBaseProto", (WPARAM)hContact, 0 ); + szProto = ( char* )CallService( "Proto/GetContactBaseProto", (WPARAM)hContact, 0 ); if ( NULL != szProto ) { - idStatus = DBGetContactSettingWord( hContact, szProto, "Status", ID_STATUS_OFFLINE ); + idStatus = DBGetContactSettingWord( hContact, szProto, "Status", ID_STATUS_OFFLINE ); } @@ -1031,39 +1017,39 @@ BOOL IsStatusVisible( int status ) void RegHotkey( HANDLE hContact, HWND hwnd ) { - char szBuf[ MAX_PATH ]= {0}; -/* char szPath[ MAX_PATH ]= {0}; + char szBuf[ MAX_PATH ] = {0}; +/* char szPath[ MAX_PATH ] = {0}; GetModuleFileName( NULL, szPath, MAX_PATH ); PathRemoveFileSpec( szPath ); strcat( szPath, "\\Thumbs.ini" ); GetPrivateProfileString( "Hotkeys", szName, "", szBuf, MAX_PATH - 1, szPath );*/ DBVARIANT dbv; - if(DBGetContactSettingString ( hContact, sModule, "Hotkey", &dbv)) return; + if (DBGetContactSettingString ( hContact, sModule, "Hotkey", &dbv)) return; strncpy(szBuf, dbv.pszVal, MAX_PATH - 1); DBFreeVariant( &dbv ); if ( 0 != strlen( szBuf ) ) { - UINT nModifiers = 0; - char chKey = 0; - char szMod[ 2 ][ 20 ] = {0}; - char szKey[ 20 ] = {0}; + UINT nModifiers = 0; + char chKey = 0; + char szMod[ 2 ][ 20 ] = {0}; + char szKey[ 20 ] = {0}; int i = 0; sscanf( szBuf, "%[^'+']+%[^'+']+%[^'+']", szMod[ 0 ], szMod[ 1 ], szKey ); for ( i = 0; i < 2; ++i ) { - if( 0 == strncmp( szMod[ i ], "ALT", 19 ) ) + if ( 0 == strncmp( szMod[ i ], "ALT", 19 ) ) { nModifiers = nModifiers | MOD_ALT; } - else if( 0 == strncmp( szMod[ i ], "CTRL", 19 ) ) + else if ( 0 == strncmp( szMod[ i ], "CTRL", 19 ) ) { nModifiers = nModifiers | MOD_CONTROL; } - else if( 0 == strncmp( szMod[ i ], "SHIFT", 19 ) ) + else if ( 0 == strncmp( szMod[ i ], "SHIFT", 19 ) ) { nModifiers = nModifiers | MOD_SHIFT; } @@ -1090,20 +1076,17 @@ void SaveContactsPos() thumbList[i]->GetThumbRect( &rc ); - if( 0 == GetLastError() ) - DBWriteContactSettingDword( thumbList[i]->hContact, sModule, "ThumbsPos", DB_POS_MAKE_XY(rc.left,rc.top) ); + if ( 0 == GetLastError() ) + DBWriteContactSettingDword( thumbList[i]->hContact, sModule, "ThumbsPos", DB_POS_MAKE_XY(rc.left, rc.top) ); } } static void LoadContacts() { - HANDLE hContact = (HANDLE)CallService( MS_DB_CONTACT_FINDFIRST, 0, 0) ; - - while( hContact != NULL ) - { + HANDLE hContact = (HANDLE)CallService( MS_DB_CONTACT_FINDFIRST, 0, 0) ; + while( hContact != NULL ) { LoadContact( hContact ); - hContact = (HANDLE)CallService( MS_DB_CONTACT_FINDNEXT, ( WPARAM ) hContact, 0 ); } } @@ -1113,57 +1096,54 @@ static void LoadContacts() static void LoadMenus() { - CLISTMENUITEM mi; - - // Remove thumb menu item - hRemoveThumb = CreateServiceFunction( sModule "/RemoveThumb",OnContactMenu_Remove ); - ZeroMemory( &mi,sizeof( mi ) ); + // Remove thumb menu item + hRemoveThumb = CreateServiceFunction( sModule "/RemoveThumb", OnContactMenu_Remove ); - mi.cbSize = sizeof( mi ); - mi.position = 0xFFFFF; - mi.flags = CMIF_TCHAR; - mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( IDI_HIDE ) ); - mi.ptszName = _T("Remove thumb"); - mi.pszService = sModule "/RemoveThumb"; - hMenuItemRemove = (HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM,0, ( LPARAM )&mi ); - - // Hide all thumbs main menu item - hMainHideAllThumbs = CreateServiceFunction( sModule "/MainHideAllThumbs",OnMainMenu_HideAll ); - ZeroMemory( &mi,sizeof( mi ) ); + CLISTMENUITEM mi = { 0 }; + mi.cbSize = sizeof( mi ); + mi.position = 0xFFFFF; + mi.flags = CMIF_TCHAR; + mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( IDI_HIDE ) ); + mi.ptszName = _T("Remove thumb"); + mi.pszService = sModule "/RemoveThumb"; + hMenuItemRemove = (HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, ( LPARAM )&mi ); + + // Hide all thumbs main menu item + hMainHideAllThumbs = CreateServiceFunction( sModule "/MainHideAllThumbs", OnMainMenu_HideAll ); + ZeroMemory( &mi, sizeof( mi ) ); - mi.cbSize = sizeof( mi ); - mi.position = 0xFFFFF; - mi.flags = CMIF_TCHAR; - mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); - mi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); - mi.pszService = sModule "/MainHideAllThumbs"; - hMainMenuItemHideAll = (HANDLE)CallService( MS_CLIST_ADDMAINMENUITEM,0, ( LPARAM )&mi ); - - if(ServiceExists(MS_HOTKEY_REGISTER)){ - HOTKEYDESC hkd={0}; - - hkd.cbSize = sizeof(hkd); - hkd.pszSection = "Floating Contacts"; + mi.cbSize = sizeof( mi ); + mi.position = 0xFFFFF; + mi.flags = CMIF_TCHAR; + mi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); + mi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); + mi.pszService = sModule "/MainHideAllThumbs"; + hMainMenuItemHideAll = (HANDLE)CallService( MS_CLIST_ADDMAINMENUITEM, 0, ( LPARAM )&mi ); + + if (ServiceExists(MS_HOTKEY_REGISTER)) { + HOTKEYDESC hkd = {0}; + hkd.cbSize = sizeof(hkd); + hkd.pszSection = "Floating Contacts"; - hkd.pszName = sModule "/MainHideAllThumbs"; - hkd.pszDescription = "Show/Hide all thumbs"; - hkd.pszService = sModule "/MainHideAllThumbs"; - CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&hkd); - - hHideWhenCListShow = CreateServiceFunction( sModule "/HideWhenCListShow",OnHotKey_HideWhenCListShow ); - hkd.pszName = sModule "/HideWhenCListShow"; - hkd.pszDescription = "Hide when contact list is shown"; - hkd.pszService = sModule "/HideWhenCListShow"; - CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&hkd); - } + hkd.pszName = sModule "/MainHideAllThumbs"; + hkd.pszDescription = "Show/Hide all thumbs"; + hkd.pszService = sModule "/MainHideAllThumbs"; + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&hkd); + + hHideWhenCListShow = CreateServiceFunction( sModule "/HideWhenCListShow", OnHotKey_HideWhenCListShow ); + hkd.pszName = sModule "/HideWhenCListShow"; + hkd.pszDescription = "Hide when contact list is shown"; + hkd.pszService = sModule "/HideWhenCListShow"; + CallService(MS_HOTKEY_REGISTER, 0, (LPARAM)&hkd); + } } static void LoadContact( HANDLE hContact ) { - DWORD dwPos = (DWORD)-1; - TCHAR *ptName = NULL; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + DWORD dwPos = (DWORD)-1; + TCHAR *ptName = NULL; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); int nX, nY; @@ -1219,32 +1199,30 @@ BOOL HideOnFullScreen() } -static int OnContactMenu_Remove( WPARAM wParam,LPARAM lParam ) +static INT_PTR OnContactMenu_Remove( WPARAM wParam, LPARAM lParam ) { - HANDLE hContact = ( HANDLE )wParam; - ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); + HANDLE hContact = ( HANDLE )wParam; + ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - if (pThumb) - { + if (pThumb) { pThumb->DeleteContactPos(); thumbList.RemoveThumb(pThumb); } DestroyMenu( hContactMenu ); - return 0; } -static int OnHotKey_HideWhenCListShow( WPARAM wParam,LPARAM lParam ) +static INT_PTR OnHotKey_HideWhenCListShow( WPARAM wParam, LPARAM lParam ) { - fcOpt.bHideWhenCListShow=!fcOpt.bHideWhenCListShow; + fcOpt.bHideWhenCListShow = !fcOpt.bHideWhenCListShow; DBWriteContactSettingByte(NULL, sModule, "HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); OnStatusChanged(); return 0; } -static int OnMainMenu_HideAll( WPARAM wParam,LPARAM lParam ) +static INT_PTR OnMainMenu_HideAll( WPARAM wParam, LPARAM lParam ) { CLISTMENUITEM clmi = {0}; int b; @@ -1253,10 +1231,10 @@ static int OnMainMenu_HideAll( WPARAM wParam,LPARAM lParam ) DBWriteContactSettingByte(NULL, sModule, "HideAll", (BYTE)fcOpt.bHideAll); OnStatusChanged(); - clmi.cbSize = sizeof( clmi ); - clmi.flags = CMIM_NAME | CMIM_ICON|CMIF_TCHAR; - clmi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); - clmi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); + clmi.cbSize = sizeof( clmi ); + clmi.flags = CMIM_NAME | CMIM_ICON|CMIF_TCHAR; + clmi.hIcon = LoadIcon( hInst, MAKEINTRESOURCE( fcOpt.bHideAll ? IDI_SHOW : IDI_HIDE ) ); + clmi.ptszName = fcOpt.bHideAll ? _T("Show all thumbs") : _T("Hide all thumbs"); b = CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hMainMenuItemHideAll, ( LPARAM )&clmi ); return 0; } @@ -1270,59 +1248,56 @@ static VOID CALLBACK ToTopTimerProc ( HWND hwnd, UINT uMsg, UINT_PTR idEvent, DW 0, 0, 0, - 0, + 0, SWP_NOSIZE | SWP_NOMOVE | /*SWP_NOZORDER |*/ SWP_NOACTIVATE); } } void ShowThumbsOnHideCList() { - if(!fcOpt.bHideWhenCListShow || fcOpt.bHideAll || HideOnFullScreen())return; + if (!fcOpt.bHideWhenCListShow || fcOpt.bHideAll || HideOnFullScreen()) + return; + for (int i = 0; i < thumbList.getCount(); ++i) - { - if ( !fcOpt.bHideOffline || IsStatusVisible( GetContactStatus(thumbList[i]->hContact) ) ) - { + if ( !fcOpt.bHideOffline || IsStatusVisible( GetContactStatus(thumbList[i]->hContact) )) ShowWindow( thumbList[i]->hwnd, SW_SHOWNA ); - } - } } void HideThumbsOnShowCList() { - if(!fcOpt.bHideWhenCListShow || fcOpt.bHideAll || HideOnFullScreen())return; + if (!fcOpt.bHideWhenCListShow || fcOpt.bHideAll || HideOnFullScreen())return; for (int i = 0; i < thumbList.getCount(); ++i) ShowWindow( thumbList[i]->hwnd, SW_HIDE ); } static LRESULT __stdcall newMirandaWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { - if( uMsg == WM_WINDOWPOSCHANGED) - { + if ( uMsg == WM_WINDOWPOSCHANGED) { WINDOWPOS *wp = (WINDOWPOS *)lParam; - if(wp->flags&SWP_HIDEWINDOW) { + if (wp->flags&SWP_HIDEWINDOW) { bIsCListShow = FALSE; ShowThumbsOnHideCList(); } - else if(wp->flags&SWP_SHOWWINDOW){ + else if (wp->flags&SWP_SHOWWINDOW){ bIsCListShow = TRUE; HideThumbsOnShowCList(); } - else if(!(wp->flags&SWP_NOMOVE)){ - BYTE method=DBGetContactSettingByte(NULL, "ModernData", "HideBehind", 0); - if(method) { - WORD wBehindEdgeBorderSize=DBGetContactSettingWord(NULL, "ModernData", "HideBehindBorderSize", 0); + else if (!(wp->flags&SWP_NOMOVE)) { + BYTE method = DBGetContactSettingByte(NULL, "ModernData", "HideBehind", 0); + if (method) { + WORD wBehindEdgeBorderSize = DBGetContactSettingWord(NULL, "ModernData", "HideBehindBorderSize", 0); RECT rc = {wp->x, wp->y, wp->x+wp->cx, wp->y+wp->cy}; RECT rcScreen = {wBehindEdgeBorderSize*(2-method), 0, GetSystemMetrics(SM_CXSCREEN)-wBehindEdgeBorderSize*(method-1), GetSystemMetrics(SM_CYSCREEN)}; RECT rcOverlap; BOOL isIntersect; isIntersect = IntersectRect( &rcOverlap, &rc, &rcScreen ); - if ( !isIntersect && bIsCListShow ){ + if ( !isIntersect && bIsCListShow ) { bIsCListShow = FALSE; ShowThumbsOnHideCList(); } - else if ( isIntersect && !bIsCListShow ){ + else if ( isIntersect && !bIsCListShow ) { bIsCListShow = TRUE; HideThumbsOnShowCList(); } diff --git a/plugins/FloatingContacts/options.cpp b/plugins/FloatingContacts/options.cpp index be257e7456..f4c2c6371c 100644 --- a/plugins/FloatingContacts/options.cpp +++ b/plugins/FloatingContacts/options.cpp @@ -28,9 +28,9 @@ static SFontSettings s_rgFontSettingsMiranda[FLT_FONTIDS]; #define FLT_SAME_AS_NONE ((BYTE)0xFF) #define FLT_SAME_AS_MIRANDA ((BYTE)0xFE) -static char* s_rgszFontSizes[]={"8","10","14","16","18","20","24","28"}; +static char* s_rgszFontSizes[] = {"8","10","14","16","18","20","24","28"}; -static const TCHAR* s_rgszFontIdDescr[FLT_FONTIDS] = +static const TCHAR* s_rgszFontIdDescr[FLT_FONTIDS] = { _T("Standard contacts"), _T("Online contacts to whom you have a different visibility"), @@ -39,7 +39,7 @@ static const TCHAR* s_rgszFontIdDescr[FLT_FONTIDS] = _T("Contacts which are 'not on list'"), }; -static WORD s_rgwFontSameAsDefault[FLT_FONTIDS] = +static WORD s_rgwFontSameAsDefault[FLT_FONTIDS] = { MAKEWORD(FLT_SAME_AS_MIRANDA, 0x0F), MAKEWORD(FLT_SAME_AS_MIRANDA, 0x0F), @@ -48,7 +48,7 @@ static WORD s_rgwFontSameAsDefault[FLT_FONTIDS] = MAKEWORD(FLT_SAME_AS_MIRANDA, 0x0F), }; -static int s_rgnMirandaFontId[FLT_FONTIDS] = +static int s_rgnMirandaFontId[FLT_FONTIDS] = { FONTID_CONTACTS, FONTID_INVIS, @@ -106,25 +106,25 @@ OnOptionsInitialize OPTIONSDIALOGPAGE odp; ZeroMemory(&odp, sizeof(odp)); - odp.cbSize = sizeof(odp); - odp.hInstance = hInst; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLTCONT); - odp.ptszTitle = _T("Floating Contacts"); - odp.ptszGroup = _T("Plugins"); - odp.ptszTab = _T("Main Features"); - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; - odp.pfnDlgProc = (DLGPROC)OptWndProc; + odp.cbSize = sizeof(odp); + odp.hInstance = hInst; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLTCONT); + odp.ptszTitle = _T("Floating Contacts"); + odp.ptszGroup = _T("Plugins"); + odp.ptszTab = _T("Main Features"); + odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; + odp.pfnDlgProc = (DLGPROC)OptWndProc; CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); ZeroMemory(&odp, sizeof(odp)); - odp.cbSize = sizeof(odp); - odp.hInstance = hInst; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN); - odp.ptszTitle = _T("Floating Contacts"); - odp.ptszGroup = _T("Plugins"); - odp.ptszTab = _T("Appearance"); - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; - odp.pfnDlgProc = (DLGPROC)OptSknWndProc; + odp.cbSize = sizeof(odp); + odp.hInstance = hInst; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN); + odp.ptszTitle = _T("Floating Contacts"); + odp.ptszGroup = _T("Plugins"); + odp.ptszTab = _T("Appearance"); + odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; + odp.pfnDlgProc = (DLGPROC)OptSknWndProc; CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); return 0; @@ -157,9 +157,9 @@ FillFontListThread LOGFONTA lf = {0}; HDC hdc = GetDC(hwndDlg); - lf.lfCharSet = DEFAULT_CHARSET; - lf.lfFaceName[0] = 0; - lf.lfPitchAndFamily = 0; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfFaceName[0] = 0; + lf.lfPitchAndFamily = 0; EnumFontFamiliesExA(hdc, &lf, (FONTENUMPROCA)EnumFontsProc, (LPARAM)GetDlgItem(hwndDlg,IDC_TYPEFACE), 0); ReleaseDC(hwndDlg, hdc); return; @@ -280,8 +280,8 @@ GetFontSetting wsprintfA(idstr, "Font%dAs", nFontId); wSameAs = (WORD)DBGetContactSettingWord(NULL, sModule, idstr, s_rgwFontSameAsDefault[nFontId]); - bySameAs=LOBYTE(wSameAs); - bySameAsFlags=HIBYTE(wSameAs); + bySameAs = LOBYTE(wSameAs); + bySameAsFlags = HIBYTE(wSameAs); if (FLT_SAME_AS_MIRANDA == bySameAs) { @@ -454,20 +454,20 @@ OptWndProc fcOpt.bFixedWidth = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_WIDTH); DBWriteContactSettingByte(NULL, sModule, "FixedWidth", (BYTE)fcOpt.bFixedWidth); - fcOpt.nThumbWidth = GetDlgItemInt(hwndDlg, IDC_TXT_WIDTH, &bSuccess, FALSE); + fcOpt.nThumbWidth = GetDlgItemInt(hwndDlg, IDC_TXT_WIDTH, &bSuccess, FALSE); DBWriteContactSettingDword(NULL, sModule, "Width", fcOpt.nThumbWidth ); - if(bEnableTip) + if (bEnableTip) { fcOpt.bShowTip = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_TIP); DBWriteContactSettingByte(NULL, sModule, "ShowTip", (BYTE)fcOpt.bShowTip); - fcOpt.TimeIn = GetDlgItemInt(hwndDlg, IDC_TXT_TIMEIN, &bSuccess, FALSE); + fcOpt.TimeIn = GetDlgItemInt(hwndDlg, IDC_TXT_TIMEIN, &bSuccess, FALSE); DBWriteContactSettingWord(NULL, sModule, "TimeIn", fcOpt.TimeIn ); } fcOpt.bToTop = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_TOTOP); DBWriteContactSettingByte(NULL, sModule, "ToTop", (BYTE)fcOpt.bToTop); - fcOpt.ToTopTime = GetDlgItemInt(hwndDlg, IDC_TXT_TOTOPTIME, &bSuccess, FALSE); + fcOpt.ToTopTime = GetDlgItemInt(hwndDlg, IDC_TXT_TOTOPTIME, &bSuccess, FALSE); DBWriteContactSettingWord(NULL, sModule, "ToTopTime", fcOpt.ToTopTime ); fcOpt.bHideWhenCListShow = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_CLISTSHOW); @@ -605,7 +605,7 @@ OptSknWndProc SIZE size; HFONT hFont = CreateFontIndirectA(&lf); - hdc=GetDC(hwndDlg); + hdc = GetDC(hwndDlg); SelectObject(hdc, hFont); GetTextExtentPoint32A(hdc, "x", 1, &size); ReleaseDC(hwndDlg, hdc); @@ -790,8 +790,8 @@ OptSknWndProc } lf.lfHeight = GetDlgItemInt(hwndDlg, IDC_FONTSIZE, NULL, FALSE); { - HDC hdc=GetDC(NULL); - lf.lfHeight=-MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); + HDC hdc = GetDC(NULL); + lf.lfHeight = -MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72); ReleaseDC(NULL,hdc); } lf.lfWidth = 0; @@ -895,7 +895,7 @@ OptSknWndProc , 0 ); s_rgFontSettings[wParam].size = (char)GetDlgItemInt(hwndDlg, IDC_FONTSIZE, NULL, FALSE); - s_rgFontSettings[wParam].style= (IsDlgButtonChecked(hwndDlg, IDC_BOLD) ? DBFONTF_BOLD : 0) + s_rgFontSettings[wParam].style = (IsDlgButtonChecked(hwndDlg, IDC_BOLD) ? DBFONTF_BOLD : 0) | (IsDlgButtonChecked(hwndDlg, IDC_ITALIC) ? DBFONTF_ITALIC : 0) | (IsDlgButtonChecked(hwndDlg, IDC_UNDERLINE) ? DBFONTF_UNDERLINE : 0); s_rgFontSettings[wParam].colour = SendDlgItemMessage(hwndDlg, IDC_COLOUR, CPM_GETCOLOUR, 0, 0); @@ -959,7 +959,7 @@ OptSknWndProc char szPercent[20]; nPos = (BYTE)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0); - fcOpt.thumbAlpha = (BYTE)(( nPos * 255 ) / 100 ); + fcOpt.thumbAlpha = (BYTE)(( nPos * 255 ) / 100 ); SetThumbsOpacity(fcOpt.thumbAlpha); wsprintfA(szPercent, "%d%%", nPos); @@ -985,7 +985,7 @@ OptSknWndProc case IDC_BROWSE: { char str[MAX_PATH]; - OPENFILENAMEA ofn={0}; + OPENFILENAMEA ofn = {0}; char filter[512]; GetDlgItemTextA(hwndDlg, IDC_FILENAME, str, sizeof(str)); diff --git a/plugins/FloatingContacts/thumbs.cpp b/plugins/FloatingContacts/thumbs.cpp index ad08865f01..34501bfd57 100644 --- a/plugins/FloatingContacts/thumbs.cpp +++ b/plugins/FloatingContacts/thumbs.cpp @@ -6,13 +6,13 @@ ThumbList thumbList; ///////////////////////////////////////////////////////////////////////////// // ThumbInfo static POINT ptOld; -static BOOL bMouseDown = FALSE; -static BOOL bMouseIn = FALSE; -static BOOL bMouseMoved = FALSE; -static short nLeft = 0; -static short nTop = 0; -static int nOffs = 5; -static ThumbInfo *pThumbMouseIn = NULL; +static BOOL bMouseDown = FALSE; +static BOOL bMouseIn = FALSE; +static BOOL bMouseMoved = FALSE; +static short nLeft = 0; +static short nTop = 0; +static int nOffs = 5; +static ThumbInfo *pThumbMouseIn = NULL; static void SnapToScreen( RECT rcThumb, int nX, int nY, int *pX, int *pY ) { @@ -22,7 +22,7 @@ static void SnapToScreen( RECT rcThumb, int nX, int nY, int *pX, int *pY ) assert( NULL != pX ); assert( NULL != pY ); - nWidth = rcThumb.right - rcThumb.left; + nWidth = rcThumb.right - rcThumb.left; nHeight = rcThumb.bottom - rcThumb.top; *pX = nX < ( nOffs + rcScreen.left ) ? rcScreen.left : nX; @@ -40,8 +40,8 @@ ThumbInfo::ThumbInfo() ThumbInfo::~ThumbInfo() { - if(pThumbMouseIn==this){ - pThumbMouseIn=NULL; + if (pThumbMouseIn == this){ + pThumbMouseIn = NULL; KillTimer(hwnd, TIMERID_LEAVE_T); } dropTarget->Release(); @@ -105,7 +105,7 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) // Get thumb dimnsions GetThumbRect( &rcThumb ); - nWidth = rcThumb.right - rcThumb.left; + nWidth = rcThumb.right - rcThumb.left; nHeight = rcThumb.bottom - rcThumb.top; // Docking and screen boundaries check @@ -121,7 +121,7 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) for (int i = 0; i < thumbList.getCount(); ++i) { - ThumbInfo *pCurThumb = thumbList[i]; + ThumbInfo *pCurThumb = thumbList[i]; if ( pCurThumb != this ) { @@ -132,38 +132,38 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) // These are rects we will dock into - rcLeft.left = rc.left - nOffs; - rcLeft.top = rc.top - nOffs; - rcLeft.right = rc.left + nOffs; - rcLeft.bottom = rc.bottom + nOffs; + rcLeft.left = rc.left - nOffs; + rcLeft.top = rc.top - nOffs; + rcLeft.right = rc.left + nOffs; + rcLeft.bottom = rc.bottom + nOffs; - rcTop.left = rc.left - nOffs; - rcTop.top = rc.top - nOffs; - rcTop.right = rc.right + nOffs; - rcTop.bottom = rc.top + nOffs; - - rcRight.left = rc.right - nOffs; - rcRight.top = rc.top - nOffs; - rcRight.right = rc.right + nOffs; - rcRight.bottom = rc.bottom + nOffs; - - rcBottom.left = rc.left - nOffs; - rcBottom.top = rc.bottom - nOffs; - rcBottom.right = rc.right + nOffs; + rcTop.left = rc.left - nOffs; + rcTop.top = rc.top - nOffs; + rcTop.right = rc.right + nOffs; + rcTop.bottom = rc.top + nOffs; + + rcRight.left = rc.right - nOffs; + rcRight.top = rc.top - nOffs; + rcRight.right = rc.right + nOffs; + rcRight.bottom = rc.bottom + nOffs; + + rcBottom.left = rc.left - nOffs; + rcBottom.top = rc.bottom - nOffs; + rcBottom.right = rc.right + nOffs; rcBottom.bottom = rc.bottom + nOffs; - bDockedLeft = FALSE; - bDockedRight = FALSE; + bDockedLeft = FALSE; + bDockedRight = FALSE; // Upper-left - pt.x = rcThumb.left; - pt.y = rcThumb.top; - bDocked = FALSE; + pt.x = rcThumb.left; + pt.y = rcThumb.top; + bDocked = FALSE; if ( PtInRect( &rcRight, pt ) ) { - nNewX = rc.right; + nNewX = rc.right; bDocked = TRUE; } @@ -179,21 +179,21 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) if ( PtInRect( &rcTop, pt ) ) { - nNewY = rc.top; - bDockedLeft = bDocked; + nNewY = rc.top; + bDockedLeft = bDocked; } // Upper-right - pt.x = rcThumb.right; - pt.y = rcThumb.top; - bDocked = FALSE; + pt.x = rcThumb.right; + pt.y = rcThumb.top; + bDocked = FALSE; if ( !bLeading && PtInRect( &rcLeft, pt ) ) { if ( !bDockedLeft ) { - nNewX = rc.left - nWidth; - bDocked = TRUE; + nNewX = rc.left - nWidth; + bDocked = TRUE; } else if ( rc.right == rcThumb.left ) { @@ -214,8 +214,8 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) if ( !bLeading && PtInRect( &rcTop, pt ) ) { - nNewY = rc.top; - bDockedRight = bDocked; + nNewY = rc.top; + bDockedRight = bDocked; } if ( fcOpt.bMoveTogether ) @@ -281,13 +281,13 @@ void ThumbInfo::PositionThumbWorker(short nX, short nY, POINT *newPos) void ThumbInfo::ResizeThumb() { - HDC hdc = NULL; - HFONT hOldFont = NULL; + HDC hdc = NULL; + HFONT hOldFont = NULL; POINT ptText; SIZEL sizeIcon; SIZEL sizeText; RECT rcThumb; - int index = FLT_FONTID_NOTONLIST; + int index = FLT_FONTID_NOTONLIST; ThumbInfo *pNextThumb = NULL; @@ -324,7 +324,7 @@ void ThumbInfo::ResizeThumb() } else { - index = FLT_FONTID_INVIS; + index = FLT_FONTID_INVIS; } } else if (ID_STATUS_OFFLINE == nContactStatus) @@ -416,7 +416,7 @@ void ThumbInfo::OnLButtonDown(short nX, short nY) { RECT rc; - if(bEnableTip && fcOpt.bShowTip) KillTip(); + if (bEnableTip && fcOpt.bShowTip) KillTip(); // ptOld.x = nX; // ptOld.y = nY; @@ -426,12 +426,12 @@ void ThumbInfo::OnLButtonDown(short nX, short nY) GetCursorPos(&ptOld); GetThumbRect(&rc); - nLeft = (short)rc.left; - nTop = (short)rc.top; + nLeft = (short)rc.left; + nTop = (short)rc.top; - //bMouseIn = FALSE; - bMouseDown = TRUE; - bMouseMoved = FALSE; + //bMouseIn = FALSE; + bMouseDown = TRUE; + bMouseMoved = FALSE; // SetCapture(hwnd); } @@ -459,7 +459,7 @@ void ThumbInfo::OnLButtonUp() if ( IntersectRect( &rcOverlap, &rcMiranda, &rcThumb ) ) { - if( IsWindowVisible( hwndMiranda ) ) + if ( IsWindowVisible( hwndMiranda ) ) { DeleteContactPos( ); thumbList.RemoveThumb( this ); @@ -480,7 +480,7 @@ void ThumbInfo::OnMouseMove(short nX, short nY, WPARAM wParam) // Position thumb - if( bMouseDown ) + if ( bMouseDown ) { ptNew.x = nX; @@ -491,8 +491,8 @@ void ThumbInfo::OnMouseMove(short nX, short nY, WPARAM wParam) dX = ptNew.x - ptOld.x; dY = ptNew.y - ptOld.y; - if(dX || dY){ - bMouseMoved = TRUE; + if (dX || dY){ + bMouseMoved = TRUE; nLeft += (short)dX; nTop += (short)dY; @@ -511,25 +511,25 @@ void ThumbInfo::OnMouseMove(short nX, short nY, WPARAM wParam) if ( !pThumbMouseIn )// { SetTimer( hwnd, TIMERID_LEAVE_T, 10, NULL ); - pThumbMouseIn=this; + pThumbMouseIn = this; ThumbSelect( TRUE ); } - if(bEnableTip && fcOpt.bShowTip && !bMouseDown){ + if (bEnableTip && fcOpt.bShowTip && !bMouseDown){ WORD tmpTimeIn; POINT pt; RECT rc; GetCursorPos(&pt); GetThumbRect(&rc); - if(!PtInRect(&rc,pt)){ + if (!PtInRect(&rc,pt)) { KillTip(); return; } - if(fTipTimerActive && abs(pt.x-ptTipSt.x)<5 && abs(pt.y-ptTipSt.x)<5){ + if (fTipTimerActive && abs(pt.x-ptTipSt.x)<5 && abs(pt.y-ptTipSt.x)<5){ return; } - ptTipSt=pt; + ptTipSt = pt; if (fTipTimerActive) { KillTimer(hwnd, TIMERID_HOVER_T); @@ -602,7 +602,7 @@ void ThumbInfo::UpdateContent() int oldBkMode, index = 0;// nStatus; UINT fStyle = ILD_NORMAL; - HDC hdcDraw = bmpContent.getDC(); + HDC hdcDraw = bmpContent.getDC(); SetRect(&rc, 0, 0, szSize.cx, szSize.cy); if ( NULL != hBmpBackground ) @@ -624,7 +624,7 @@ void ThumbInfo::UpdateContent() height = rcBkgnd.bottom - rcBkgnd.top; GetObject(hBmpBackground, sizeof(bmp), &bmp); - hdcBmp = CreateCompatibleDC( hdcDraw ); + hdcBmp = CreateCompatibleDC( hdcDraw ); hbmTmp = (HBITMAP)SelectObject( hdcBmp, hBmpBackground ); maxx = (0 != (nBackgroundBmpUse & CLBF_TILEH) ? rcBkgnd.right : rcBkgnd.left + 1); @@ -715,7 +715,7 @@ void ThumbInfo::UpdateContent() ImageList_GetIconSize_my( himl, size ); - oldBkMode = SetBkMode( hdcDraw, TRANSPARENT ); + oldBkMode = SetBkMode( hdcDraw, TRANSPARENT ); if (!DBGetContactSettingByte(hContact, "CList", "NotOnList", 0)) { @@ -729,9 +729,9 @@ void ThumbInfo::UpdateContent() if ( NULL != szProto ) { - nStatus = CallProtoService(szProto, PS_GETSTATUS, 0, 0); - nContactStatus = DBGetContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE); - nApparentMode = DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0); + nStatus = CallProtoService(szProto, PS_GETSTATUS, 0, 0); + nContactStatus = DBGetContactSettingWord(hContact, szProto, "Status", ID_STATUS_OFFLINE); + nApparentMode = DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0); if ( (nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) || (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE) ) @@ -742,8 +742,8 @@ void ThumbInfo::UpdateContent() } else { - index = FLT_FONTID_INVIS; - if(fcOpt.bShowIdle && DBGetContactSettingDword(hContact, szProto, "IdleTS", 0)){ + index = FLT_FONTID_INVIS; + if (fcOpt.bShowIdle && DBGetContactSettingDword(hContact, szProto, "IdleTS", 0)) { fStyle|=ILD_BLEND50; } } @@ -755,7 +755,7 @@ void ThumbInfo::UpdateContent() else { index = FLT_FONTID_CONTACTS; - if(fcOpt.bShowIdle && DBGetContactSettingDword(hContact, szProto, "IdleTS", 0)){ + if (fcOpt.bShowIdle && DBGetContactSettingDword(hContact, szProto, "IdleTS", 0)) { fStyle|=ILD_BLEND50; } } @@ -849,23 +849,23 @@ void ThumbInfo::PopUpMessageDialog( ) void ThumbInfo::OnTimer(BYTE idTimer) { - if(idTimer == TIMERID_SELECT_T){ + if (idTimer == TIMERID_SELECT_T){ KillTimer( hwnd, TIMERID_SELECT_T ); ThumbDeselect( FALSE ); } - if(idTimer == TIMERID_LEAVE_T && !bMouseDown){ + if (idTimer == TIMERID_LEAVE_T && !bMouseDown){ POINT pt; RECT rc; GetCursorPos(&pt); GetThumbRect(&rc); - if(!PtInRect(&rc, pt)){ + if (!PtInRect(&rc, pt)) { KillTimer( hwnd, TIMERID_LEAVE_T ); - pThumbMouseIn = NULL; + pThumbMouseIn = NULL; ThumbDeselect( TRUE ); } } - if(bEnableTip && fcOpt.bShowTip && idTimer == TIMERID_HOVER_T){ + if (bEnableTip && fcOpt.bShowTip && idTimer == TIMERID_HOVER_T){ POINT pt; CLCINFOTIP ti = {0}; ti.cbSize = sizeof(ti); @@ -873,7 +873,7 @@ void ThumbInfo::OnTimer(BYTE idTimer) KillTimer(hwnd, TIMERID_HOVER_T); fTipTimerActive = FALSE; GetCursorPos(&pt); - if(abs(pt.x-ptTipSt.x)<5 && abs(pt.y-ptTipSt.y)<5){ + if (abs(pt.x-ptTipSt.x)<5 && abs(pt.y-ptTipSt.y)<5){ ti.ptCursor = pt; fTipActive = TRUE; @@ -889,8 +889,8 @@ void DockThumbs( ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft ) { if ( ( pThumbRight->dockOpt.hwndLeft == NULL ) && ( pThumbLeft->dockOpt.hwndRight == NULL ) ) { - pThumbRight->dockOpt.hwndLeft = pThumbLeft->hwnd; - pThumbLeft->dockOpt.hwndRight = pThumbRight->hwnd; + pThumbRight->dockOpt.hwndLeft = pThumbLeft->hwnd; + pThumbLeft->dockOpt.hwndRight = pThumbRight->hwnd; } } @@ -938,7 +938,7 @@ ThumbList::~ThumbList() ThumbInfo *ThumbList::AddThumb(HWND hwnd, TCHAR *ptszName, HANDLE hContact) { - ThumbInfo *pThumb = NULL; + ThumbInfo *pThumb = NULL; if ( ptszName == NULL ) return( NULL ); if ( hContact == NULL ) return( NULL ); @@ -949,11 +949,11 @@ ThumbInfo *ThumbList::AddThumb(HWND hwnd, TCHAR *ptszName, HANDLE hContact) if ( pThumb != NULL ) { _tcsncpy( pThumb->ptszName, ptszName, USERNAME_LEN - 1 ); - pThumb->hContact = hContact; - pThumb->hwnd = hwnd; + pThumb->hContact = hContact; + pThumb->hwnd = hwnd; - pThumb->dockOpt.hwndLeft = NULL; - pThumb->dockOpt.hwndRight = NULL; + pThumb->dockOpt.hwndLeft = NULL; + pThumb->dockOpt.hwndRight = NULL; pThumb->fTipActive = FALSE; diff --git a/plugins/FreeImage/Miranda/main.cpp b/plugins/FreeImage/Miranda/main.cpp index 804e349d7e..8a3d538d4b 100644 --- a/plugins/FreeImage/Miranda/main.cpp +++ b/plugins/FreeImage/Miranda/main.cpp @@ -406,9 +406,9 @@ SetMemIO(FreeImageIO *io) { unsigned __stdcall fiio_mem_ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle) { unsigned x; - for( x=0; x= FIIOMEM(datalen) ) { //if we are at or above 1G, we cant double without going negative - if( FIIOMEM(datalen) & 0x40000000 ) { + if ( FIIOMEM(datalen) & 0x40000000 ) { //max 2G - if( FIIOMEM(datalen) == 0x7FFFFFFF ) { + if ( FIIOMEM(datalen) == 0x7FFFFFFF ) { return 0; } newdatalen = 0x7FFFFFFF; - } else if( FIIOMEM(datalen) == 0 ) { + } else if ( FIIOMEM(datalen) == 0 ) { //default to 4K if nothing yet newdatalen = 4096; } else { @@ -440,7 +440,7 @@ unsigned __stdcall fiio_mem_WriteProc(void *buffer, unsigned size, unsigned coun newdatalen = FIIOMEM(datalen) << 1; } newdata = realloc( FIIOMEM(data), newdatalen ); - if( !newdata ) { + if ( !newdata ) { return 0; } FIIOMEM(data) = newdata; @@ -448,7 +448,7 @@ unsigned __stdcall fiio_mem_WriteProc(void *buffer, unsigned size, unsigned coun } memcpy( (char *)FIIOMEM(data) + FIIOMEM(curpos), buffer, size*count ); FIIOMEM(curpos) += size*count; - if( FIIOMEM(curpos) > FIIOMEM(filelen) ) { + if ( FIIOMEM(curpos) > FIIOMEM(filelen) ) { FIIOMEM(filelen) = FIIOMEM(curpos); } return count; @@ -458,21 +458,21 @@ int __stdcall fiio_mem_SeekProc(fi_handle handle, long offset, int origin) { switch(origin) { //0 to filelen-1 are 'inside' the file default: case SEEK_SET: //can fseek() to 0-7FFFFFFF always - if( offset >= 0 ) { + if ( offset >= 0 ) { FIIOMEM(curpos) = offset; return 0; } break; case SEEK_CUR: - if( FIIOMEM(curpos)+offset >= 0 ) { + if ( FIIOMEM(curpos)+offset >= 0 ) { FIIOMEM(curpos) += offset; return 0; } break; case SEEK_END: - if( FIIOMEM(filelen)+offset >= 0 ) { + if ( FIIOMEM(filelen)+offset >= 0 ) { FIIOMEM(curpos) = FIIOMEM(filelen)+offset; return 0; } @@ -847,7 +847,7 @@ static INT_PTR serviceGetInterface(WPARAM wParam, LPARAM lParam) { FI_INTERFACE **ppfe = (FI_INTERFACE **)lParam; - if((DWORD)wParam != FI_IF_VERSION) + if ((DWORD)wParam != FI_IF_VERSION) return CALLSERVICE_NOTFOUND; if(ppfe) { @@ -877,7 +877,7 @@ static INT_PTR serviceLoad(WPARAM wParam, LPARAM lParam) } // check that the plugin has reading capabilities ... - if((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) { + if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsReading(fif)) { // ok, let's load the file FIBITMAP *dib; diff --git a/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp b/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp index 6355c3c293..d87658c24f 100644 --- a/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp +++ b/plugins/FreeImage/Source/FreeImage/BitmapAccess.cpp @@ -130,7 +130,7 @@ void* FreeImage_Aligned_Malloc(size_t amount, size_t alignment) { That's why the code below allocates *two* alignments instead of one. */ void* mem_real = malloc(amount + 2 * alignment); - if(!mem_real) return NULL; + if (!mem_real) return NULL; char* mem_align = (char*)((unsigned long)(2 * alignment - (unsigned long)mem_real % (unsigned long)alignment) + (unsigned long)mem_real); *((long*)mem_align - 1) = (long)mem_real; return mem_align; @@ -165,7 +165,7 @@ FreeImage_GetImageSizeHeader(BOOL header_only, unsigned width, unsigned height, // palette is aligned on a 16 bytes boundary dib_size += sizeof(RGBQUAD) * CalculateUsedPaletteEntries(bpp); dib_size += (dib_size % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - dib_size % FIBITMAP_ALIGNMENT : 0); - if(!header_only) { + if (!header_only) { const size_t header_size = dib_size; // pixels are aligned on a 16 bytes boundary @@ -396,7 +396,7 @@ FreeImage_Unload(FIBITMAP *dib) { FIBITMAP * DLL_CALLCONV FreeImage_Clone(FIBITMAP *dib) { - if(!dib) return NULL; + if (!dib) return NULL; unsigned width = FreeImage_GetWidth(dib); unsigned height = FreeImage_GetHeight(dib); @@ -915,7 +915,7 @@ FreeImage_SetDotsPerMeterY(FIBITMAP *dib, unsigned res) { BITMAPINFOHEADER * DLL_CALLCONV FreeImage_GetInfoHeader(FIBITMAP *dib) { - if(!dib) return NULL; + if (!dib) return NULL; size_t lp = (size_t)dib->data + sizeof(FREEIMAGEHEADER); lp += (lp % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - lp % FIBITMAP_ALIGNMENT : 0); lp += FIBITMAP_ALIGNMENT - sizeof(BITMAPINFOHEADER) % FIBITMAP_ALIGNMENT; @@ -933,13 +933,13 @@ FreeImage_GetInfo(FIBITMAP *dib) { FIMETADATA * DLL_CALLCONV FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag) { - if(!dib) + if (!dib) return NULL; // get the metadata model METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata; TAGMAP *tagmap = NULL; - if( (*metadata).find(model) != (*metadata).end() ) { + if ( (*metadata).find(model) != (*metadata).end() ) { tagmap = (*metadata)[model]; } if(tagmap) { @@ -976,7 +976,7 @@ FreeImage_FindFirstMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, FITAG **tag BOOL DLL_CALLCONV FreeImage_FindNextMetadata(FIMETADATA *mdhandle, FITAG **tag) { - if(!mdhandle) + if (!mdhandle) return FALSE; METADATAHEADER *mdh = (METADATAHEADER *)mdhandle->data; @@ -1019,7 +1019,7 @@ FreeImage_FindCloseMetadata(FIMETADATA *mdhandle) { BOOL DLL_CALLCONV FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src) { - if(!src || !dst) return FALSE; + if (!src || !dst) return FALSE; // get metadata links METADATAMAP *src_metadata = ((FREEIMAGEHEADER *)src->data)->metadata; @@ -1034,7 +1034,7 @@ FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src) { TAGMAP *src_tagmap = (*i).second; if(src_tagmap) { - if( dst_metadata->find(model) != dst_metadata->end() ) { + if ( dst_metadata->find(model) != dst_metadata->end() ) { // destroy dst model FreeImage_SetMetadata((FREE_IMAGE_MDMODEL)model, dst, NULL, NULL); } @@ -1069,7 +1069,7 @@ FreeImage_CloneMetadata(FIBITMAP *dst, FIBITMAP *src) { BOOL DLL_CALLCONV FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG *tag) { - if(!dib) + if (!dib) return FALSE; TAGMAP *tagmap = NULL; @@ -1083,7 +1083,7 @@ FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, if(key != NULL) { - if(!tagmap) { + if (!tagmap) { // this model, doesn't exist: create it tagmap = new(std::nothrow) TAGMAP(); (*metadata)[model] = tagmap; @@ -1158,7 +1158,7 @@ FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, BOOL DLL_CALLCONV FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FITAG **tag) { - if(!dib || !key || !tag) + if (!dib || !key || !tag) return FALSE; TAGMAP *tagmap = NULL; @@ -1166,7 +1166,7 @@ FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, // get the metadata model METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata; - if(!(*metadata).empty()) { + if (!(*metadata).empty()) { METADATAMAP::iterator model_iterator = metadata->find(model); if (model_iterator != metadata->end() ) { // this model exists : try to get the requested tag @@ -1186,17 +1186,17 @@ FreeImage_GetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, unsigned DLL_CALLCONV FreeImage_GetMetadataCount(FREE_IMAGE_MDMODEL model, FIBITMAP *dib) { - if(!dib) + if (!dib) return FALSE; TAGMAP *tagmap = NULL; // get the metadata model METADATAMAP *metadata = ((FREEIMAGEHEADER *)dib->data)->metadata; - if( (*metadata).find(model) != (*metadata).end() ) { + if ( (*metadata).find(model) != (*metadata).end() ) { tagmap = (*metadata)[model]; } - if(!tagmap) { + if (!tagmap) { // this model, doesn't exist: return return 0; } diff --git a/plugins/FreeImage/Source/FreeImage/Conversion.cpp b/plugins/FreeImage/Source/FreeImage/Conversion.cpp index 04cec65ab5..3c14bab9dd 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion.cpp @@ -145,7 +145,7 @@ _convertCMYKtoRGBA(unsigned width, unsigned height, BYTE* line_start, unsigned p BOOL ConvertCMYKtoRGBA(FIBITMAP* dib) { - if(!FreeImage_HasPixels(dib)) { + if (!FreeImage_HasPixels(dib)) { return FALSE; } @@ -294,7 +294,7 @@ _convertLABtoRGB(unsigned width, unsigned height, BYTE* line_start, unsigned pit BOOL ConvertLABtoRGB(FIBITMAP* dib) { - if(!FreeImage_HasPixels(dib)) { + if (!FreeImage_HasPixels(dib)) { return FALSE; } @@ -330,7 +330,7 @@ ConvertLABtoRGB(FIBITMAP* dib) { FIBITMAP* RemoveAlphaChannel(FIBITMAP* src) { - if(!FreeImage_HasPixels(src)) { + if (!FreeImage_HasPixels(src)) { return NULL; } @@ -367,10 +367,10 @@ FreeImage_ColorQuantize(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize) { FIBITMAP * DLL_CALLCONV FreeImage_ColorQuantizeEx(FIBITMAP *dib, FREE_IMAGE_QUANTIZE quantize, int PaletteSize, int ReserveSize, RGBQUAD *ReservePalette) { - if( PaletteSize < 2 ) PaletteSize = 2; - if( PaletteSize > 256 ) PaletteSize = 256; - if( ReserveSize < 0 ) ReserveSize = 0; - if( ReserveSize > PaletteSize ) ReserveSize = PaletteSize; + if ( PaletteSize < 2 ) PaletteSize = 2; + if ( PaletteSize > 256 ) PaletteSize = 256; + if ( ReserveSize < 0 ) ReserveSize = 0; + if ( ReserveSize > PaletteSize ) ReserveSize = PaletteSize; if (FreeImage_HasPixels(dib)) { if (FreeImage_GetBPP(dib) == 24) { switch(quantize) { diff --git a/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp b/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp index abaf2f1824..c0c4785704 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion16_555.cpp @@ -115,7 +115,7 @@ FreeImage_ConvertLine32To16_555(BYTE *target, BYTE *source, int width_in_pixels) FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo16Bits555(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL; + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL; const int width = FreeImage_GetWidth(dib); const int height = FreeImage_GetHeight(dib); diff --git a/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp b/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp index eb3dd9de3f..28e8255b4e 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion16_565.cpp @@ -111,7 +111,7 @@ FreeImage_ConvertLine32To16_565(BYTE *target, BYTE *source, int width_in_pixels) FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo16Bits565(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL; + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return NULL; const int width = FreeImage_GetWidth(dib); const int height = FreeImage_GetHeight(dib); diff --git a/plugins/FreeImage/Source/FreeImage/Conversion24.cpp b/plugins/FreeImage/Source/FreeImage/Conversion24.cpp index e99eb5d4df..f04b946ef0 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion24.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion24.cpp @@ -121,12 +121,12 @@ FreeImage_ConvertLine32To24(BYTE *target, BYTE *source, int width_in_pixels) { FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo24Bits(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const unsigned bpp = FreeImage_GetBPP(dib); const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); - if((image_type != FIT_BITMAP) && (image_type != FIT_RGB16)) { + if ((image_type != FIT_BITMAP) && (image_type != FIT_RGB16)) { return NULL; } diff --git a/plugins/FreeImage/Source/FreeImage/Conversion32.cpp b/plugins/FreeImage/Source/FreeImage/Conversion32.cpp index b8bd518471..fad74671cd 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion32.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion32.cpp @@ -186,12 +186,12 @@ FreeImage_ConvertLine8To32MapTransparency(BYTE *target, BYTE *source, int width_ FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo32Bits(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const int bpp = FreeImage_GetBPP(dib); const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); - if((image_type != FIT_BITMAP) && (image_type != FIT_RGB16) && (image_type != FIT_RGBA16)) { + if ((image_type != FIT_BITMAP) && (image_type != FIT_RGB16) && (image_type != FIT_RGBA16)) { return NULL; } diff --git a/plugins/FreeImage/Source/FreeImage/Conversion4.cpp b/plugins/FreeImage/Source/FreeImage/Conversion4.cpp index 13048b6d3f..7c09ac824a 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion4.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion4.cpp @@ -29,7 +29,7 @@ void DLL_CALLCONV FreeImage_ConvertLine1To4(BYTE *target, BYTE *source, int width_in_pixels) { BOOL hinibble = TRUE; - for (int cols = 0; cols < width_in_pixels; cols++){ + for (int cols = 0; cols < width_in_pixels; cols++) { if (hinibble == TRUE){ target[cols >> 1] = ((source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 15 : 0) << 4; } @@ -46,7 +46,7 @@ FreeImage_ConvertLine8To4(BYTE *target, BYTE *source, int width_in_pixels, RGBQU BOOL hinibble = TRUE; BYTE index; - for (int cols = 0; cols < width_in_pixels; cols++){ + for (int cols = 0; cols < width_in_pixels; cols++) { index = GREY(palette[source[cols]].rgbRed, palette[source[cols]].rgbGreen, palette[source[cols]].rgbBlue); if (hinibble) { target[cols >> 1] = (index & 0xF0); @@ -140,7 +140,7 @@ FreeImage_ConvertLine32To4(BYTE *target, BYTE *source, int width_in_pixels) { FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo4Bits(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const int bpp = FreeImage_GetBPP(dib); diff --git a/plugins/FreeImage/Source/FreeImage/Conversion8.cpp b/plugins/FreeImage/Source/FreeImage/Conversion8.cpp index 05e3944394..2eaeb94671 100644 --- a/plugins/FreeImage/Source/FreeImage/Conversion8.cpp +++ b/plugins/FreeImage/Source/FreeImage/Conversion8.cpp @@ -101,12 +101,12 @@ FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels) { FIBITMAP * DLL_CALLCONV FreeImage_ConvertTo8Bits(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const int bpp = FreeImage_GetBPP(dib); const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); - if((image_type != FIT_BITMAP) && (image_type != FIT_UINT16)) { + if ((image_type != FIT_BITMAP) && (image_type != FIT_UINT16)) { return NULL; } @@ -250,12 +250,12 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) { FIBITMAP * DLL_CALLCONV FreeImage_ConvertToGreyscale(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib); const int bpp = FreeImage_GetBPP(dib); - if((color_type == FIC_PALETTE) || (color_type == FIC_MINISWHITE)) { + if ((color_type == FIC_PALETTE) || (color_type == FIC_MINISWHITE)) { const int width = FreeImage_GetWidth(dib); const int height = FreeImage_GetHeight(dib); FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8); diff --git a/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp b/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp index e72d14cb83..181ff396e1 100644 --- a/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp +++ b/plugins/FreeImage/Source/FreeImage/ConversionFloat.cpp @@ -31,7 +31,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib) { FIBITMAP *src = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib); @@ -40,11 +40,11 @@ FreeImage_ConvertToFloat(FIBITMAP *dib) { case FIT_BITMAP: { // allow conversion from 8-bit - if((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) { + if ((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) { src = dib; } else { src = FreeImage_ConvertToGreyscale(dib); - if(!src) return NULL; + if (!src) return NULL; } break; } @@ -68,7 +68,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib) { const unsigned height = FreeImage_GetHeight(src); dst = FreeImage_AllocateT(FIT_FLOAT, width, height); - if(!dst) { + if (!dst) { if(src != dib) { FreeImage_Unload(src); } diff --git a/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp b/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp index bd38504a1e..6b9d17fbed 100644 --- a/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp +++ b/plugins/FreeImage/Source/FreeImage/ConversionRGB16.cpp @@ -31,7 +31,7 @@ FreeImage_ConvertToRGB16(FIBITMAP *dib) { FIBITMAP *src = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib); @@ -40,11 +40,11 @@ FreeImage_ConvertToRGB16(FIBITMAP *dib) { case FIT_BITMAP: { // convert to 24-bit if needed - if((FreeImage_GetBPP(dib) == 24) || (FreeImage_GetBPP(dib) == 32)) { + if ((FreeImage_GetBPP(dib) == 24) || (FreeImage_GetBPP(dib) == 32)) { src = dib; } else { src = FreeImage_ConvertTo24Bits(dib); - if(!src) return NULL; + if (!src) return NULL; } break; } @@ -70,7 +70,7 @@ FreeImage_ConvertToRGB16(FIBITMAP *dib) { const unsigned height = FreeImage_GetHeight(src); dst = FreeImage_AllocateT(FIT_RGB16, width, height); - if(!dst) { + if (!dst) { if(src != dib) { FreeImage_Unload(src); } diff --git a/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp b/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp index b5161d566d..6b8739532f 100644 --- a/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp +++ b/plugins/FreeImage/Source/FreeImage/ConversionRGBF.cpp @@ -31,7 +31,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) { FIBITMAP *src = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib); @@ -41,9 +41,9 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) { { // allow conversion from 24- and 32-bit const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib); - if((color_type != FIC_RGB) && (color_type != FIC_RGBALPHA)) { + if ((color_type != FIC_RGB) && (color_type != FIC_RGBALPHA)) { src = FreeImage_ConvertTo24Bits(dib); - if(!src) return NULL; + if (!src) return NULL; } else { src = dib; } @@ -83,7 +83,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) { const unsigned height = FreeImage_GetHeight(src); dst = FreeImage_AllocateT(FIT_RGBF, width, height); - if(!dst) { + if (!dst) { if(src != dib) { FreeImage_Unload(src); } diff --git a/plugins/FreeImage/Source/FreeImage/ConversionType.cpp b/plugins/FreeImage/Source/FreeImage/ConversionType.cpp index b537f72814..23528b60fe 100644 --- a/plugins/FreeImage/Source/FreeImage/ConversionType.cpp +++ b/plugins/FreeImage/Source/FreeImage/ConversionType.cpp @@ -47,7 +47,7 @@ CONVERT_TYPE::convert(FIBITMAP *src, FREE_IMAGE_TYPE dst_type) { dst = FreeImage_AllocateT(dst_type, width, height, bpp, FreeImage_GetRedMask(src), FreeImage_GetGreenMask(src), FreeImage_GetBlueMask(src)); - if(!dst) return NULL; + if (!dst) return NULL; // convert from src_type to dst_type @@ -86,7 +86,7 @@ CONVERT_TO_BYTE::convert(FIBITMAP *src, BOOL scale_linear) { // allocate a 8-bit dib dst = FreeImage_AllocateT(FIT_BITMAP, width, height, 8, 0, 0, 0); - if(!dst) return NULL; + if (!dst) return NULL; // build a greyscale palette RGBQUAD *pal = FreeImage_GetPalette(dst); @@ -160,7 +160,7 @@ CONVERT_TO_COMPLEX::convert(FIBITMAP *src) { // allocate dst image dst = FreeImage_AllocateT(FIT_COMPLEX, width, height); - if(!dst) return NULL; + if (!dst) return NULL; // convert from src_type to FIT_COMPLEX @@ -236,7 +236,7 @@ FIBITMAP* DLL_CALLCONV FreeImage_ConvertToStandardType(FIBITMAP *src, BOOL scale_linear) { FIBITMAP *dst = NULL; - if(!src) return NULL; + if (!src) return NULL; // convert from src_type to FIT_BITMAP @@ -306,7 +306,7 @@ FIBITMAP* DLL_CALLCONV FreeImage_ConvertToType(FIBITMAP *src, FREE_IMAGE_TYPE dst_type, BOOL scale_linear) { FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(src)) return NULL; + if (!FreeImage_HasPixels(src)) return NULL; // convert from src_type to dst_type diff --git a/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp b/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp index ed4691f3a2..3744cfe3b4 100644 --- a/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp +++ b/plugins/FreeImage/Source/FreeImage/ConversionUINT16.cpp @@ -31,7 +31,7 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) { FIBITMAP *src = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(dib); @@ -40,11 +40,11 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) { case FIT_BITMAP: { // convert to greyscale if needed - if((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) { + if ((FreeImage_GetBPP(dib) == 8) && (FreeImage_GetColorType(dib) == FIC_MINISBLACK)) { src = dib; } else { src = FreeImage_ConvertToGreyscale(dib); - if(!src) return NULL; + if (!src) return NULL; } break; } @@ -70,7 +70,7 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) { const unsigned height = FreeImage_GetHeight(src); dst = FreeImage_AllocateT(FIT_UINT16, width, height); - if(!dst) { + if (!dst) { if(src != dib) { FreeImage_Unload(src); } diff --git a/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp b/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp index f8cf7604eb..b289530be7 100644 --- a/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp +++ b/plugins/FreeImage/Source/FreeImage/FreeImageIO.cpp @@ -69,7 +69,7 @@ _MemoryReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle) { for(x = 0; x < count; x++) { //if there isnt size bytes left to read, set pos to eof and return a short count - if( (mem_header->filelen - mem_header->curpos) < (long)size ) { + if ( (mem_header->filelen - mem_header->curpos) < (long)size ) { mem_header->curpos = mem_header->filelen; break; } @@ -91,13 +91,13 @@ _MemoryWriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle) //double the data block size if we need to while( (mem_header->curpos + (long)(size*count)) >= mem_header->datalen ) { //if we are at or above 1G, we cant double without going negative - if( mem_header->datalen & 0x40000000 ) { + if ( mem_header->datalen & 0x40000000 ) { //max 2G - if( mem_header->datalen == 0x7FFFFFFF ) { + if ( mem_header->datalen == 0x7FFFFFFF ) { return 0; } newdatalen = 0x7FFFFFFF; - } else if( mem_header->datalen == 0 ) { + } else if ( mem_header->datalen == 0 ) { //default to 4K if nothing yet newdatalen = 4096; } else { @@ -105,7 +105,7 @@ _MemoryWriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle) newdatalen = mem_header->datalen << 1; } newdata = realloc( mem_header->data, newdatalen ); - if( !newdata ) { + if ( !newdata ) { return 0; } mem_header->data = newdata; @@ -113,7 +113,7 @@ _MemoryWriteProc(void *buffer, unsigned size, unsigned count, fi_handle handle) } memcpy( (char *)mem_header->data + mem_header->curpos, buffer, size*count ); mem_header->curpos += size*count; - if( mem_header->curpos > mem_header->filelen ) { + if ( mem_header->curpos > mem_header->filelen ) { mem_header->filelen = mem_header->curpos; } return count; @@ -126,21 +126,21 @@ _MemorySeekProc(fi_handle handle, long offset, int origin) { switch(origin) { //0 to filelen-1 are 'inside' the file default: case SEEK_SET: //can fseek() to 0-7FFFFFFF always - if( offset >= 0 ) { + if ( offset >= 0 ) { mem_header->curpos = offset; return 0; } break; case SEEK_CUR: - if( mem_header->curpos + offset >= 0 ) { + if ( mem_header->curpos + offset >= 0 ) { mem_header->curpos += offset; return 0; } break; case SEEK_END: - if( mem_header->filelen + offset >= 0 ) { + if ( mem_header->filelen + offset >= 0 ) { mem_header->curpos = mem_header->filelen + offset; return 0; } diff --git a/plugins/FreeImage/Source/FreeImage/Halftoning.cpp b/plugins/FreeImage/Source/FreeImage/Halftoning.cpp index 313cc26e15..82df9b607b 100644 --- a/plugins/FreeImage/Source/FreeImage/Halftoning.cpp +++ b/plugins/FreeImage/Source/FreeImage/Halftoning.cpp @@ -312,7 +312,7 @@ FIBITMAP * DLL_CALLCONV FreeImage_Dither(FIBITMAP *dib, FREE_IMAGE_DITHER algorithm) { FIBITMAP *input = NULL, *dib8 = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const unsigned bpp = FreeImage_GetBPP(dib); @@ -401,7 +401,7 @@ FIBITMAP * DLL_CALLCONV FreeImage_Threshold(FIBITMAP *dib, BYTE T) { FIBITMAP *dib8 = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; const unsigned bpp = FreeImage_GetBPP(dib); diff --git a/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp b/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp index d0abd793eb..44b210aca0 100644 --- a/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp +++ b/plugins/FreeImage/Source/FreeImage/J2KHelper.cpp @@ -57,7 +57,7 @@ FIBITMAP* J2KImageToFIBITMAP(int format_id, const opj_image_t *image) { BOOL bIsValid = TRUE; for(int c = 0; c < numcomps - 1; c++) { - if( (image->comps[c].dx == image->comps[c+1].dx) && + if ( (image->comps[c].dx == image->comps[c+1].dx) && (image->comps[c].dy == image->comps[c+1].dy) && (image->comps[c].prec == image->comps[c+1].prec) ) { continue; @@ -67,7 +67,7 @@ FIBITMAP* J2KImageToFIBITMAP(int format_id, const opj_image_t *image) { } } bIsValid &= ((numcomps == 1) || (numcomps == 3) || (numcomps == 4)); - if(!bIsValid) { + if (!bIsValid) { if(numcomps) { FreeImage_OutputMessageProc(format_id, "Warning: image contains %d greyscale components. Only the first will be loaded.\n", numcomps); numcomps = 1; @@ -106,7 +106,7 @@ FIBITMAP* J2KImageToFIBITMAP(int format_id, const opj_image_t *image) { } else { throw FI_MSG_ERROR_UNSUPPORTED_FORMAT; } - if(!dib) { + if (!dib) { throw FI_MSG_ERROR_DIB_MEMORY; } @@ -398,7 +398,7 @@ opj_image_t* FIBITMAPToJ2KImage(int format_id, FIBITMAP *dib, const opj_cparamet } // create the image image = opj_image_create(numcomps, &cmptparm[0], color_space); - if(!image) { + if (!image) { throw FI_MSG_ERROR_DIB_MEMORY; } diff --git a/plugins/FreeImage/Source/FreeImage/MultiPage.cpp b/plugins/FreeImage/Source/FreeImage/MultiPage.cpp index 8eaa0aa1f4..e5bcee3ded 100644 --- a/plugins/FreeImage/Source/FreeImage/MultiPage.cpp +++ b/plugins/FreeImage/Source/FreeImage/MultiPage.cpp @@ -328,7 +328,7 @@ FreeImage_OpenMultiBitmapU(FREE_IMAGE_FORMAT fif, const wchar_t *filename, BOOL // convert to single character - no national chars in extensions char *extension = (char *)malloc(wcslen(filename)+1); unsigned int i=0; - for(; i < wcslen(filename); i++) // convert 16-bit to 8-bit + for (; i < wcslen(filename); i++) // convert 16-bit to 8-bit extension[i] = (char)(filename[i] & 0x00FF); // set terminating 0 extension[i]=0; @@ -400,7 +400,7 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h BOOL DLL_CALLCONV FreeImage_SaveMultiBitmapToHandle(FREE_IMAGE_FORMAT fif, FIMULTIBITMAP *bitmap, FreeImageIO *io, fi_handle handle, int flags) { - if(!bitmap || !bitmap->data || !io || !handle) { + if (!bitmap || !bitmap->data || !io || !handle) { return FALSE; } @@ -546,7 +546,7 @@ FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags) { if (success) { remove(header->m_filename); success = (rename(spool_name.c_str(), header->m_filename) == 0) ? TRUE:FALSE; - if(!success) { + if (!success) { FreeImage_OutputMessageProc(header->fif, "Failed to rename %s to %s", spool_name.c_str(), header->m_filename); } } else { @@ -647,12 +647,12 @@ FreeImage_SavePageToBlock(MULTIBITMAPHEADER *header, FIBITMAP *data) { FIMEMORY *hmem = FreeImage_OpenMemory(); if(hmem==NULL) return NULL; // save the file to memory - if(!FreeImage_SaveToMemory(header->cache_fif, data, hmem, 0)) { + if (!FreeImage_SaveToMemory(header->cache_fif, data, hmem, 0)) { FreeImage_CloseMemory(hmem); return NULL; } // get the buffer from the memory stream - if(!FreeImage_AcquireMemory(hmem, &compressed_data, &compressed_size)) { + if (!FreeImage_AcquireMemory(hmem, &compressed_data, &compressed_size)) { FreeImage_CloseMemory(hmem); return NULL; } diff --git a/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp b/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp index f907c41d55..6eb9aeaf48 100644 --- a/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp +++ b/plugins/FreeImage/Source/FreeImage/NNQuantizer.cpp @@ -60,7 +60,7 @@ NNQuantizer::NNQuantizer(int PaletteSize) freq = (int *)malloc(netsize * sizeof(int)); radpower = (int *)malloc(initrad * sizeof(int)); - if( !network || !bias || !freq || !radpower ) { + if ( !network || !bias || !freq || !radpower ) { if(network) free(network); if(bias) free(bias); if(freq) free(freq); @@ -455,7 +455,7 @@ FIBITMAP* NNQuantizer::Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *Reserve // 3) Initialize the network and apply the learning algorithm - if( netsize > ReserveSize ) { + if ( netsize > ReserveSize ) { netsize -= ReserveSize; initnet(); learn(sampling); diff --git a/plugins/FreeImage/Source/FreeImage/PSDParser.cpp b/plugins/FreeImage/Source/FreeImage/PSDParser.cpp index 57c703a06f..93573d01c0 100644 --- a/plugins/FreeImage/Source/FreeImage/PSDParser.cpp +++ b/plugins/FreeImage/Source/FreeImage/PSDParser.cpp @@ -72,7 +72,7 @@ bool psdHeaderInfo::Read(FreeImageIO *io, fi_handle handle) { psdHeader header; const int n = (int)io->read_proc(&header, sizeof(header), 1, handle); - if(!n) { + if (!n) { return false; } @@ -282,7 +282,7 @@ int psdDisplayInfo::Read(FreeImageIO *io, fi_handle handle) { n = (int)io->read_proc(&ShortValue, sizeof(ShortValue), 1, handle); nBytes += n * sizeof(ShortValue); _Opacity = (short)psdGetValue(ShortValue, sizeof(_Opacity) ); - if((_Opacity < 0) || (_Opacity > 100)) { + if ((_Opacity < 0) || (_Opacity > 100)) { throw "Invalid DisplayInfo::Opacity value"; } @@ -418,7 +418,7 @@ BOOL invertColor(FIBITMAP* dib) { FREE_IMAGE_TYPE type = FreeImage_GetImageType(dib); const unsigned Bpp = FreeImage_GetBPP(dib)/8; - if((type == FIT_BITMAP && Bpp == 4) || type == FIT_RGBA16) { + if ((type == FIT_BITMAP && Bpp == 4) || type == FIT_RGBA16) { const unsigned width = FreeImage_GetWidth(dib); const unsigned height = FreeImage_GetHeight(dib); BYTE *line_start = FreeImage_GetScanLine(dib, 0); @@ -508,7 +508,7 @@ bool psdParser::ReadImageResources(FreeImageIO *io, fi_handle handle, LONG lengt n = (int)io->read_proc(&oResource._OSType, sizeof(oResource._OSType), 1, handle); nBytes += n * sizeof(oResource._OSType); - if( (nBytes % 2) != 0 ) { + if ( (nBytes % 2) != 0 ) { return false; } @@ -653,7 +653,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { SwapShort(&nCompression); #endif - if((nCompression != PSDP_COMPRESSION_NONE && nCompression != PSDP_COMPRESSION_RLE)) { + if ((nCompression != PSDP_COMPRESSION_NONE && nCompression != PSDP_COMPRESSION_RLE)) { FreeImage_OutputMessageProc(_fi_format_id, "Unsupported compression %d", nCompression); return NULL; } @@ -730,7 +730,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { throw "Unsupported color mode"; break; } - if(!bitmap) { + if (!bitmap) { throw FI_MSG_ERROR_DIB_MEMORY; } @@ -797,7 +797,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { // later use this array as WORD rleLineSizeList[nChannels][nHeight]; WORD *rleLineSizeList = new (std::nothrow) WORD[nChannels*nHeight]; - if(!rleLineSizeList) { + if (!rleLineSizeList) { FreeImage_Unload(bitmap); SAFE_DELETE_ARRAY(line_start); throw std::bad_alloc(); @@ -820,7 +820,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { } BYTE* rle_line_start = new (std::nothrow) BYTE[largestRLELine]; - if(!rle_line_start) { + if (!rle_line_start) { FreeImage_Unload(bitmap); SAFE_DELETE_ARRAY(line_start); SAFE_DELETE_ARRAY(rleLineSizeList); @@ -924,7 +924,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { // --- Further process the bitmap --- - if((mode == PSDP_CMYK || mode == PSDP_MULTICHANNEL)) { + if ((mode == PSDP_CMYK || mode == PSDP_MULTICHANNEL)) { // CMYK values are "inverted", invert them back if(mode == PSDP_MULTICHANNEL) { @@ -933,7 +933,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { FreeImage_Invert(bitmap); } - if((_fi_flags & PSD_CMYK) == PSD_CMYK) { + if ((_fi_flags & PSD_CMYK) == PSD_CMYK) { // keep as CMYK if(mode == PSDP_MULTICHANNEL) { @@ -971,7 +971,7 @@ FIBITMAP* psdParser::ReadImageData(FreeImageIO *io, fi_handle handle) { CREATE_GREYSCALE_PALETTE_REVERSE(FreeImage_GetPalette(bitmap), 2); } else if(mode == PSDP_INDEXED) { - if(!_colourModeData._plColourData || _colourModeData._Length != 768 || _ColourCount < 0) { + if (!_colourModeData._plColourData || _colourModeData._Length != 768 || _ColourCount < 0) { FreeImage_OutputMessageProc(_fi_format_id, "Indexed image has no palette. Using the default grayscale one."); } else { _colourModeData.FillPalette(bitmap); @@ -1037,7 +1037,7 @@ FIBITMAP* psdParser::Load(FreeImageIO *io, fi_handle handle, int s_format_id, in FreeImage_CreateICCProfile(Bitmap, _iccProfile._ProfileData, _iccProfile._ProfileSize); if ((flags & PSD_CMYK) == PSD_CMYK) { short mode = _headerInfo._ColourMode; - if((mode == PSDP_CMYK) || (mode == PSDP_MULTICHANNEL)) { + if ((mode == PSDP_CMYK) || (mode == PSDP_MULTICHANNEL)) { FreeImage_GetICCProfile(Bitmap)->flags |= FIICC_COLOR_IS_CMYK; } } diff --git a/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp b/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp index edee36584a..158f9997b2 100644 --- a/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp +++ b/plugins/FreeImage/Source/FreeImage/PixelAccess.cpp @@ -29,7 +29,7 @@ BYTE * DLL_CALLCONV FreeImage_GetBits(FIBITMAP *dib) { - if(!FreeImage_HasPixels(dib)) { + if (!FreeImage_HasPixels(dib)) { return NULL; } // returns the pixels aligned on a FIBITMAP_ALIGNMENT bytes alignment boundary @@ -41,7 +41,7 @@ FreeImage_GetBits(FIBITMAP *dib) { BYTE * DLL_CALLCONV FreeImage_GetScanLine(FIBITMAP *dib, int scanline) { - if(!FreeImage_HasPixels(dib)) { + if (!FreeImage_HasPixels(dib)) { return NULL; } return CalculateScanLine(FreeImage_GetBits(dib), FreeImage_GetPitch(dib), scanline); @@ -51,10 +51,10 @@ BOOL DLL_CALLCONV FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) { BYTE shift; - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return FALSE; - if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { + if ((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { BYTE *bits = FreeImage_GetScanLine(dib, y); switch(FreeImage_GetBPP(dib)) { @@ -80,10 +80,10 @@ FreeImage_GetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) { BOOL DLL_CALLCONV FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) { - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return FALSE; - if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { + if ((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { BYTE *bits = FreeImage_GetScanLine(dib, y); switch(FreeImage_GetBPP(dib)) { @@ -91,7 +91,7 @@ FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) { { bits += 2*x; WORD *pixel = (WORD *)bits; - if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) { + if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) { value->rgbBlue = (BYTE)((((*pixel & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F); value->rgbGreen = (BYTE)((((*pixel & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F); value->rgbRed = (BYTE)((((*pixel & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F); @@ -132,10 +132,10 @@ BOOL DLL_CALLCONV FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) { BYTE shift; - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return FALSE; - if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { + if ((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { BYTE *bits = FreeImage_GetScanLine(dib, y); switch(FreeImage_GetBPP(dib)) { @@ -162,10 +162,10 @@ FreeImage_SetPixelIndex(FIBITMAP *dib, unsigned x, unsigned y, BYTE *value) { BOOL DLL_CALLCONV FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) { - if(!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) + if (!FreeImage_HasPixels(dib) || (FreeImage_GetImageType(dib) != FIT_BITMAP)) return FALSE; - if((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { + if ((x < FreeImage_GetWidth(dib)) && (y < FreeImage_GetHeight(dib))) { BYTE *bits = FreeImage_GetScanLine(dib, y); switch(FreeImage_GetBPP(dib)) { @@ -173,7 +173,7 @@ FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) { { bits += 2*x; WORD *pixel = (WORD *)bits; - if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) { + if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) { *pixel = ((value->rgbBlue >> 3) << FI16_565_BLUE_SHIFT) | ((value->rgbGreen >> 2) << FI16_565_GREEN_SHIFT) | ((value->rgbRed >> 3) << FI16_565_RED_SHIFT); diff --git a/plugins/FreeImage/Source/FreeImage/Plugin.cpp b/plugins/FreeImage/Source/FreeImage/Plugin.cpp index bdc0e0f8a2..ce2863a72e 100644 --- a/plugins/FreeImage/Source/FreeImage/Plugin.cpp +++ b/plugins/FreeImage/Source/FreeImage/Plugin.cpp @@ -712,7 +712,7 @@ FreeImage_GetFIFFromFilenameU(const wchar_t *filename) { // convert to single character - no national chars in extensions char *extension = (char *)malloc(wcslen(place)+1); unsigned int i=0; - for(; i < wcslen(place); i++) // convert 16-bit to 8-bit + for (; i < wcslen(place); i++) // convert 16-bit to 8-bit extension[i] = (char)(place[i] & 0x00FF); // set terminating 0 extension[i]=0; diff --git a/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp b/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp index 4041d859fa..2d8d6e0b4a 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginBMP.cpp @@ -213,7 +213,7 @@ LoadPixelDataRLE4(FreeImageIO *io, fi_handle handle, int width, int height, FIBI height = abs(height); pixels = (BYTE*)malloc(width * height * sizeof(BYTE)); - if(!pixels) throw(1); + if (!pixels) throw(1); memset(pixels, 0, width * height * sizeof(BYTE)); BYTE *q = pixels; @@ -313,7 +313,7 @@ LoadPixelDataRLE4(FreeImageIO *io, fi_handle handle, int width, int height, FIBI BOOL hinibble = TRUE; - for (int cols = 0; cols < width; cols++){ + for (int cols = 0; cols < width; cols++) { if (hinibble) { dst[cols >> 1] = (src[cols] << 4); } else { @@ -352,7 +352,7 @@ LoadPixelDataRLE8(FreeImageIO *io, fi_handle handle, int width, int height, FIBI int bits = 0; for (;;) { - if( io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) { + if ( io->read_proc(&status_byte, sizeof(BYTE), 1, handle) != 1) { return FALSE; } @@ -520,7 +520,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit switch (compression) { case BI_RGB : - if( LoadPixelData(io, handle, dib, height, pitch, bit_count) ) { + if ( LoadPixelData(io, handle, dib, height, pitch, bit_count) ) { return dib; } else { throw "Error encountered while decoding BMP data"; @@ -528,7 +528,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit break; case BI_RLE4 : - if( LoadPixelDataRLE4(io, handle, width, height, dib) ) { + if ( LoadPixelDataRLE4(io, handle, width, height, dib) ) { return dib; } else { throw "Error encountered while decoding RLE4 BMP data"; @@ -536,7 +536,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit break; case BI_RLE8 : - if( LoadPixelDataRLE8(io, handle, width, height, dib) ) { + if ( LoadPixelDataRLE8(io, handle, width, height, dib) ) { return dib; } else { throw "Error encountered while decoding RLE8 BMP data"; @@ -597,7 +597,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]); } else { - if( bit_count == 32 ) { + if ( bit_count == 32 ) { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } else { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); @@ -747,7 +747,7 @@ LoadOS22XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_ return dib; case BI_RLE4 : - if( LoadPixelDataRLE4(io, handle, width, height, dib) ) { + if ( LoadPixelDataRLE4(io, handle, width, height, dib) ) { return dib; } else { throw "Error encountered while decoding RLE4 BMP data"; @@ -755,7 +755,7 @@ LoadOS22XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_ break; case BI_RLE8 : - if( LoadPixelDataRLE8(io, handle, width, height, dib) ) { + if ( LoadPixelDataRLE8(io, handle, width, height, dib) ) { return dib; } else { throw "Error encountered while decoding RLE8 BMP data"; @@ -805,7 +805,7 @@ LoadOS22XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_ case 24 : case 32 : { - if( bit_count == 32 ) { + if ( bit_count == 32 ) { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } else { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); @@ -951,7 +951,7 @@ LoadOS21XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_ case 24 : case 32 : { - if( bit_count == 32 ) { + if ( bit_count == 32 ) { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } else { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); @@ -1082,7 +1082,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // check the signature - if((bitmapfileheader.bfType != 0x4D42) && (bitmapfileheader.bfType != 0x4142)) { + if ((bitmapfileheader.bfType != 0x4D42) && (bitmapfileheader.bfType != 0x4142)) { FreeImage_OutputMessageProc(s_format_id, FI_MSG_ERROR_MAGIC_NUMBER); return NULL; } diff --git a/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp b/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp index 5dcd16b84f..746fa034a6 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginCUT.cpp @@ -105,7 +105,7 @@ static FIBITMAP * DLL_CALLCONV Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FIBITMAP *dib = NULL; - if(!handle) { + if (!handle) { return NULL; } diff --git a/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp b/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp index 4e2d1d8fa2..0a1667d7f1 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginDDS.cpp @@ -444,7 +444,7 @@ LoadDXT_Helper (FreeImageIO *io, fi_handle handle, int page, int flags, void *da typedef typename INFO::Block Block; Block *input_buffer = new(std::nothrow) Block[(width + 3) / 4]; - if(!input_buffer) return; + if (!input_buffer) return; int widthRest = (int) width & 3; int heightRest = (int) height & 3; diff --git a/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp b/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp index 4a19b8b56f..b9963a11b2 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginEXR.cpp @@ -96,7 +96,7 @@ C_IStream::seekg (Imf::Int64 pos) { void C_OStream::write (const char c[/*n*/], int n) { - if((unsigned)n != _io->write_proc((void*)&c[0], 1, n, _handle)) { + if ((unsigned)n != _io->write_proc((void*)&c[0], 1, n, _handle)) { Iex::throwErrnoExc(); } } @@ -178,7 +178,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { bool bUseRgbaInterface = false; FIBITMAP *dib = NULL; - if(!handle) { + if (!handle) { return NULL; } @@ -242,7 +242,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { bHandled = true; } } - if(!bHandled) { + if (!bHandled) { THROW (Iex::InputExc, "Unable to handle mixed component types (color model = " << exr_color_model << ")"); } } @@ -260,9 +260,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // check for supported image color models // -------------------------------------------------------------- - if((components == 1) || (components == 2)) { + if ((components == 1) || (components == 2)) { // if the image is gray-alpha (YA), ignore the alpha channel - if((components == 1) && channels.findChannel("Y")) { + if ((components == 1) && channels.findChannel("Y")) { image_type = FIT_FLOAT; components = 1; } else { @@ -307,7 +307,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // allocate a new dib dib = FreeImage_AllocateHeaderT(header_only, image_type, width, height, 0); - if(!dib) THROW (Iex::NullExc, FI_MSG_ERROR_MEMORY); + if (!dib) THROW (Iex::NullExc, FI_MSG_ERROR_MEMORY); // try to load the preview image // -------------------------------------------------------------- @@ -410,7 +410,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { pitch, // yStride 1, 1, // x/y sampling 0.0)); // fillValue - } else if((components == 3) || (components == 4)) { + } else if ((components == 3) || (components == 4)) { const char *channel_name[4] = { "R", "G", "B", "A" }; for(int c = 0; c < components; c++) { @@ -450,12 +450,12 @@ Set the preview image using the dib embedded thumbnail */ static BOOL SetPreviewImage(FIBITMAP *dib, Imf::Header& header) { - if(!FreeImage_GetThumbnail(dib)) { + if (!FreeImage_GetThumbnail(dib)) { return FALSE; } FIBITMAP* thumbnail = FreeImage_GetThumbnail(dib); - if((FreeImage_GetImageType(thumbnail) != FIT_BITMAP) || (FreeImage_GetBPP(thumbnail) != 32)) { + if ((FreeImage_GetImageType(thumbnail) != FIT_BITMAP) || (FreeImage_GetBPP(thumbnail) != 32)) { // invalid thumbnail - ignore it FreeImage_OutputMessageProc(s_format_id, FI_MSG_WARNING_INVALID_THUMBNAIL); } else { @@ -560,16 +560,16 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void BOOL bIsFlipped = FALSE; half *halfData = NULL; - if(!dib || !handle) return FALSE; + if (!dib || !handle) return FALSE; try { // check for EXR_LC compression and verify that the format is RGB - if((flags & EXR_LC) == EXR_LC) { + if ((flags & EXR_LC) == EXR_LC) { FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); - if(((image_type != FIT_RGBF) && (image_type != FIT_RGBAF)) || ((flags & EXR_FLOAT) == EXR_FLOAT)) { + if (((image_type != FIT_RGBF) && (image_type != FIT_RGBAF)) || ((flags & EXR_FLOAT) == EXR_FLOAT)) { THROW (Iex::IoExc, "EXR_LC compression is only available with RGB[A]F images"); } - if((FreeImage_GetWidth(dib) % 2) || (FreeImage_GetHeight(dib) % 2)) { + if ((FreeImage_GetWidth(dib) % 2) || (FreeImage_GetHeight(dib) % 2)) { THROW (Iex::IoExc, "EXR_LC compression only works when the width and height are a multiple of 2"); } } @@ -579,19 +579,19 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // compression Imf::Compression compress; - if((flags & EXR_NONE) == EXR_NONE) { + if ((flags & EXR_NONE) == EXR_NONE) { // no compression compress = Imf::NO_COMPRESSION; - } else if((flags & EXR_ZIP) == EXR_ZIP) { + } else if ((flags & EXR_ZIP) == EXR_ZIP) { // zlib compression, in blocks of 16 scan lines compress = Imf::ZIP_COMPRESSION; - } else if((flags & EXR_PIZ) == EXR_PIZ) { + } else if ((flags & EXR_PIZ) == EXR_PIZ) { // piz-based wavelet compression compress = Imf::PIZ_COMPRESSION; - } else if((flags & EXR_PXR24) == EXR_PXR24) { + } else if ((flags & EXR_PXR24) == EXR_PXR24) { // lossy 24-bit float compression compress = Imf::PXR24_COMPRESSION; - } else if((flags & EXR_B44) == EXR_B44) { + } else if ((flags & EXR_B44) == EXR_B44) { // lossy 44% float compression compress = Imf::B44_COMPRESSION; } else { @@ -615,13 +615,13 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void SetPreviewImage(dib, header); // check for EXR_LC compression - if((flags & EXR_LC) == EXR_LC) { + if ((flags & EXR_LC) == EXR_LC) { return SaveAsEXR_LC(ostream, dib, header, width, height); } // output pixel type Imf::PixelType pixelType; - if((flags & EXR_FLOAT) == EXR_FLOAT) { + if ((flags & EXR_FLOAT) == EXR_FLOAT) { pixelType = Imf::FLOAT; // save as float data type } else { // default value @@ -667,7 +667,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void if(pixelType == Imf::HALF) { // convert from float to half halfData = new(std::nothrow) half[width * height * components]; - if(!halfData) THROW (Iex::NullExc, FI_MSG_ERROR_MEMORY); + if (!halfData) THROW (Iex::NullExc, FI_MSG_ERROR_MEMORY); for(int y = 0; y < height; y++) { float *src_bits = (float*)FreeImage_GetScanLine(dib, height - 1 - y); @@ -700,7 +700,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void (char*)(bits), // base bytespp, // xStride pitch)); // yStride - } else if((image_type == FIT_RGBF) || (image_type == FIT_RGBAF)) { + } else if ((image_type == FIT_RGBF) || (image_type == FIT_RGBAF)) { for(int c = 0; c < components; c++) { char *channel_base = (char*)(bits) + c*bytespc; frameBuffer.insert (channel_name[c],// name diff --git a/plugins/FreeImage/Source/FreeImage/PluginG3.cpp b/plugins/FreeImage/Source/FreeImage/PluginG3.cpp index d5c08b36e6..c383a455b7 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginG3.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginG3.cpp @@ -124,7 +124,7 @@ copyFaxFile(FreeImageIO *io, fi_handle handle, TIFF* tifin, uint32 xsize, int st throw FI_MSG_ERROR_MEMORY; } - if(!G3ReadFile(io, handle, tifin->tif_rawdata, tifin->tif_rawdatasize)) { + if (!G3ReadFile(io, handle, tifin->tif_rawdata, tifin->tif_rawdatasize)) { throw "Read error at scanline 0"; } tifin->tif_rawcp = tifin->tif_rawdata; @@ -319,7 +319,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // open a temporary memory buffer to save decoded scanlines memory = FreeImage_OpenMemory(); - if(!memory) throw FI_MSG_ERROR_MEMORY; + if (!memory) throw FI_MSG_ERROR_MEMORY; // wrap the raw fax file faxTIFF = TIFFClientOpen("(FakeInput)", "w", diff --git a/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp b/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp index e8d84afac4..bf7c2550ae 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginGIF.cpp @@ -167,8 +167,8 @@ FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key static BOOL FreeImage_GetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, FREE_IMAGE_MDTYPE type, FITAG **tag) { - if( FreeImage_GetMetadata(model, dib, key, tag) ) { - if( FreeImage_GetTagType(*tag) == type ) { + if ( FreeImage_GetMetadata(model, dib, key, tag) ) { + if ( FreeImage_GetTagType(*tag) == type ) { return TRUE; } } @@ -187,10 +187,10 @@ StringTable::StringTable() StringTable::~StringTable() { - if( m_buffer != NULL ) { + if ( m_buffer != NULL ) { delete [] m_buffer; } - if( m_strmap != NULL ) { + if ( m_strmap != NULL ) { delete [] m_strmap; m_strmap = NULL; } @@ -218,10 +218,10 @@ void StringTable::Initialize(int minCodeSize) BYTE *StringTable::FillInputBuffer(int len) { - if( m_buffer == NULL ) { + if ( m_buffer == NULL ) { m_buffer = new(std::nothrow) BYTE[len]; m_bufferRealSize = len; - } else if( len > m_bufferRealSize ) { + } else if ( len > m_bufferRealSize ) { delete [] m_buffer; m_buffer = new(std::nothrow) BYTE[len]; m_bufferRealSize = len; @@ -273,7 +273,7 @@ int StringTable::CompressEnd(BYTE *buf) bool StringTable::Compress(BYTE *buf, int *len) { - if( m_bufferSize == 0 || m_done ) { + if ( m_bufferSize == 0 || m_done ) { return false; } @@ -288,7 +288,7 @@ bool StringTable::Compress(BYTE *buf, int *len) int nextprefix = (((m_prefix)<<8)&0xFFF00) + (ch & 0x000FF); if(firstPixelPassed) { - if( m_strmap[nextprefix] > 0) { + if ( m_strmap[nextprefix] > 0) { m_prefix = m_strmap[nextprefix]; } else { m_partial |= m_prefix << m_partialSize; @@ -304,13 +304,13 @@ bool StringTable::Compress(BYTE *buf, int *len) m_strmap[nextprefix] = m_nextCode; //increment the next highest valid code, increase the code size - if( m_nextCode == (1 << m_codeSize) ) { + if ( m_nextCode == (1 << m_codeSize) ) { m_codeSize++; } m_nextCode++; //if we're out of codes, restart the string table - if( m_nextCode == MAX_LZW_CODE ) { + if ( m_nextCode == MAX_LZW_CODE ) { m_partial |= m_clearCode << m_partialSize; m_partialSize += m_codeSize; ClearCompressorTable(); @@ -321,7 +321,7 @@ bool StringTable::Compress(BYTE *buf, int *len) } //increment to the next pixel - if( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) { + if ( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) { m_bufferShift -= m_bpp; } else { m_bufferPos++; @@ -329,7 +329,7 @@ bool StringTable::Compress(BYTE *buf, int *len) } //jump out here if the output buffer is full - if( bufpos - buf == *len ) { + if ( bufpos - buf == *len ) { return true; } @@ -341,7 +341,7 @@ bool StringTable::Compress(BYTE *buf, int *len) m_prefix = ch & 0x000FF; //increment to the next pixel - if( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) { + if ( m_bufferShift > 0 && !(m_bufferPos + 1 == m_bufferSize && m_bufferShift <= m_slack) ) { m_bufferShift -= m_bpp; } else { m_bufferPos++; @@ -349,7 +349,7 @@ bool StringTable::Compress(BYTE *buf, int *len) } //jump out here if the output buffer is full - if( bufpos - buf == *len ) { + if ( bufpos - buf == *len ) { return true; } } @@ -363,12 +363,12 @@ bool StringTable::Compress(BYTE *buf, int *len) bool StringTable::Decompress(BYTE *buf, int *len) { - if( m_bufferSize == 0 || m_done ) { + if ( m_bufferSize == 0 || m_done ) { return false; } BYTE *bufpos = buf; - for( ; m_bufferPos < m_bufferSize; m_bufferPos++ ) { + for ( ; m_bufferPos < m_bufferSize; m_bufferPos++ ) { m_partial |= (int)m_buffer[m_bufferPos] << m_partialSize; m_partialSize += 8; while( m_partialSize >= m_codeSize ) { @@ -376,22 +376,22 @@ bool StringTable::Decompress(BYTE *buf, int *len) m_partial >>= m_codeSize; m_partialSize -= m_codeSize; - if( code > m_nextCode || (m_nextCode == MAX_LZW_CODE && code != m_clearCode) || code == m_endCode ) { + if ( code > m_nextCode || (m_nextCode == MAX_LZW_CODE && code != m_clearCode) || code == m_endCode ) { m_done = true; *len = (int)(bufpos - buf); return true; } - if( code == m_clearCode ) { + if ( code == m_clearCode ) { ClearDecompressorTable(); continue; } //add new string to string table, if not the first pass since a clear code - if( m_oldCode != MAX_LZW_CODE ) { + if ( m_oldCode != MAX_LZW_CODE ) { m_strings[m_nextCode] = m_strings[m_oldCode] + m_strings[code == m_nextCode ? m_oldCode : code][0]; } - if( (int)m_strings[code].size() > *len - (bufpos - buf) ) { + if ( (int)m_strings[code].size() > *len - (bufpos - buf) ) { //out of space, stuff the code back in for next time m_partial <<= m_codeSize; m_partialSize += m_codeSize; @@ -406,9 +406,9 @@ bool StringTable::Decompress(BYTE *buf, int *len) bufpos += m_strings[code].size(); //increment the next highest valid code, add a bit to the mask if we need to increase the code size - if( m_oldCode != MAX_LZW_CODE && m_nextCode < MAX_LZW_CODE ) { - if( ++m_nextCode < MAX_LZW_CODE ) { - if( (m_nextCode & m_codeMask) == 0 ) { + if ( m_oldCode != MAX_LZW_CODE && m_nextCode < MAX_LZW_CODE ) { + if ( ++m_nextCode < MAX_LZW_CODE ) { + if ( (m_nextCode & m_codeMask) == 0 ) { m_codeSize++; m_codeMask |= m_nextCode; } @@ -443,7 +443,7 @@ void StringTable::ClearCompressorTable(void) void StringTable::ClearDecompressorTable(void) { - for( int i = 0; i < m_clearCode; i++ ) { + for ( int i = 0; i < m_clearCode; i++ ) { m_strings[i].resize(1); m_strings[i][0] = (char)i; } @@ -492,13 +492,13 @@ MimeType() { static BOOL DLL_CALLCONV Validate(FreeImageIO *io, fi_handle handle) { char buf[6]; - if( io->read_proc(buf, 6, 1, handle) < 1 ) { + if ( io->read_proc(buf, 6, 1, handle) < 1 ) { return FALSE; } BOOL bResult = FALSE; - if( !strncmp(buf, "GIF", 3) ) { - if( buf[3] >= '0' && buf[3] <= '9' && buf[4] >= '0' && buf[4] <= '9' && buf[5] >= 'a' && buf[5] <= 'z' ) { + if ( !strncmp(buf, "GIF", 3) ) { + if ( buf[3] >= '0' && buf[3] <= '9' && buf[4] >= '0' && buf[4] <= '9' && buf[5] >= 'a' && buf[5] <= 'z' ) { bResult = TRUE; } } @@ -525,7 +525,7 @@ SupportsExportType(FREE_IMAGE_TYPE type) { static void *DLL_CALLCONV Open(FreeImageIO *io, fi_handle handle, BOOL read) { GIFinfo *info = new(std::nothrow) GIFinfo; - if( info == NULL ) { + if ( info == NULL ) { return NULL; } @@ -534,10 +534,10 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { // memset(info, 0, sizeof(GIFinfo)); info->read = read; - if( read ) { + if ( read ) { try { //Header - if( !Validate(io, handle) ) { + if ( !Validate(io, handle) ) { throw FI_MSG_ERROR_MAGIC_NUMBER; } io->seek_proc(handle, 6, SEEK_CUR); @@ -545,16 +545,16 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { //Logical Screen Descriptor io->seek_proc(handle, 4, SEEK_CUR); BYTE packed; - if( io->read_proc(&packed, 1, 1, handle) < 1 ) { + if ( io->read_proc(&packed, 1, 1, handle) < 1 ) { throw "EOF reading Logical Screen Descriptor"; } - if( io->read_proc(&info->background_color, 1, 1, handle) < 1 ) { + if ( io->read_proc(&info->background_color, 1, 1, handle) < 1 ) { throw "EOF reading Logical Screen Descriptor"; } io->seek_proc(handle, 1, SEEK_CUR); //Global Color Table - if( packed & GIF_PACKED_LSD_HAVEGCT ) { + if ( packed & GIF_PACKED_LSD_HAVEGCT ) { info->global_color_table_offset = io->tell_proc(handle); info->global_color_table_size = 2 << (packed & GIF_PACKED_LSD_GCTSIZE); io->seek_proc(handle, 3 * info->global_color_table_size, SEEK_CUR); @@ -564,42 +564,42 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { size_t gce_offset = 0; BYTE block = 0; while( block != GIF_BLOCK_TRAILER ) { - if( io->read_proc(&block, 1, 1, handle) < 1 ) { + if ( io->read_proc(&block, 1, 1, handle) < 1 ) { throw "EOF reading blocks"; } - if( block == GIF_BLOCK_IMAGE_DESCRIPTOR ) { + if ( block == GIF_BLOCK_IMAGE_DESCRIPTOR ) { info->image_descriptor_offsets.push_back(io->tell_proc(handle)); //GCE may be 0, meaning no GCE preceded this ID info->graphic_control_extension_offsets.push_back(gce_offset); gce_offset = 0; io->seek_proc(handle, 8, SEEK_CUR); - if( io->read_proc(&packed, 1, 1, handle) < 1 ) { + if ( io->read_proc(&packed, 1, 1, handle) < 1 ) { throw "EOF reading Image Descriptor"; } //Local Color Table - if( packed & GIF_PACKED_ID_HAVELCT ) { + if ( packed & GIF_PACKED_ID_HAVELCT ) { io->seek_proc(handle, 3 * (2 << (packed & GIF_PACKED_ID_LCTSIZE)), SEEK_CUR); } //LZW Minimum Code Size io->seek_proc(handle, 1, SEEK_CUR); - } else if( block == GIF_BLOCK_EXTENSION ) { + } else if ( block == GIF_BLOCK_EXTENSION ) { BYTE ext; - if( io->read_proc(&ext, 1, 1, handle) < 1 ) { + if ( io->read_proc(&ext, 1, 1, handle) < 1 ) { throw "EOF reading extension"; } - if( ext == GIF_EXT_GRAPHIC_CONTROL ) { + if ( ext == GIF_EXT_GRAPHIC_CONTROL ) { //overwrite previous offset if more than one GCE found before an ID gce_offset = io->tell_proc(handle); - } else if( ext == GIF_EXT_COMMENT ) { + } else if ( ext == GIF_EXT_COMMENT ) { info->comment_extension_offsets.push_back(io->tell_proc(handle)); - } else if( ext == GIF_EXT_APPLICATION ) { + } else if ( ext == GIF_EXT_APPLICATION ) { info->application_extension_offsets.push_back(io->tell_proc(handle)); } - } else if( block == GIF_BLOCK_TRAILER ) { + } else if ( block == GIF_BLOCK_TRAILER ) { continue; } else { throw "Invalid GIF block found"; @@ -607,12 +607,12 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { //Data Sub-blocks BYTE len; - if( io->read_proc(&len, 1, 1, handle) < 1 ) { + if ( io->read_proc(&len, 1, 1, handle) < 1 ) { throw "EOF reading sub-block"; } while( len != 0 ) { io->seek_proc(handle, len, SEEK_CUR); - if( io->read_proc(&len, 1, 1, handle) < 1 ) { + if ( io->read_proc(&len, 1, 1, handle) < 1 ) { throw "EOF reading sub-block"; } } @@ -632,12 +632,12 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { static void DLL_CALLCONV Close(FreeImageIO *io, fi_handle handle, void *data) { - if( data == NULL ) { + if ( data == NULL ) { return; } GIFinfo *info = (GIFinfo *)data; - if( !info->read ) { + if ( !info->read ) { //Trailer BYTE b = GIF_BLOCK_TRAILER; io->write_proc(&b, 1, 1, handle); @@ -648,7 +648,7 @@ Close(FreeImageIO *io, fi_handle handle, void *data) { static int DLL_CALLCONV PageCount(FreeImageIO *io, fi_handle handle, void *data) { - if( data == NULL ) { + if ( data == NULL ) { return 0; } GIFinfo *info = (GIFinfo *)data; @@ -658,15 +658,15 @@ PageCount(FreeImageIO *io, fi_handle handle, void *data) { static FIBITMAP * DLL_CALLCONV Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { - if( data == NULL ) { + if ( data == NULL ) { return NULL; } GIFinfo *info = (GIFinfo *)data; - if( page == -1 ) { + if ( page == -1 ) { page = 0; } - if( page < 0 || page >= (int)info->image_descriptor_offsets.size() ) { + if ( page < 0 || page >= (int)info->image_descriptor_offsets.size() ) { return NULL; } @@ -679,7 +679,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { WORD w; //playback pages to generate what the user would see for this frame - if( (flags & GIF_PLAYBACK) == GIF_PLAYBACK ) { + if ( (flags & GIF_PLAYBACK) == GIF_PLAYBACK ) { //Logical Screen Descriptor io->seek_proc(handle, 6, SEEK_SET); WORD logicalwidth, logicalheight; @@ -691,7 +691,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { #endif //set the background color with 0 alpha RGBQUAD background; - if( info->global_color_table_offset != 0 && info->background_color < info->global_color_table_size ) { + if ( info->global_color_table_offset != 0 && info->background_color < info->global_color_table_size ) { io->seek_proc(handle, (long)(info->global_color_table_offset + (info->background_color * 3)), SEEK_SET); io->read_proc(&background.rgbRed, 1, 1, handle); io->read_proc(&background.rgbGreen, 1, 1, handle); @@ -705,16 +705,16 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { //allocate entire logical area dib = FreeImage_Allocate(logicalwidth, logicalheight, 32); - if( dib == NULL ) { + if ( dib == NULL ) { throw FI_MSG_ERROR_DIB_MEMORY; } //fill with background color to start int x, y; RGBQUAD *scanline; - for( y = 0; y < logicalheight; y++ ) { + for ( y = 0; y < logicalheight; y++ ) { scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, y); - for( x = 0; x < logicalwidth; x++ ) { + for ( x = 0; x < logicalwidth; x++ ) { *scanline++ = background; } } @@ -743,14 +743,14 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { pageinfo.push_back(PageInfo(disposal_method, left, top, width, height)); - if( start != end ) { - if( left == 0 && top == 0 && width == logicalwidth && height == logicalheight ) { - if( disposal_method == GIF_DISPOSAL_BACKGROUND ) { + if ( start != end ) { + if ( left == 0 && top == 0 && width == logicalwidth && height == logicalheight ) { + if ( disposal_method == GIF_DISPOSAL_BACKGROUND ) { pageinfo.pop_back(); start++; break; - } else if( disposal_method != GIF_DISPOSAL_PREVIOUS ) { - if( !have_transparent ) { + } else if ( disposal_method != GIF_DISPOSAL_PREVIOUS ) { + if ( !have_transparent ) { break; } } @@ -758,23 +758,23 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } start--; } - if( start < 0 ) { + if ( start < 0 ) { start = 0; } //draw each page into the logical area delay_time = 0; - for( page = start; page <= end; page++ ) { + for ( page = start; page <= end; page++ ) { PageInfo &info = pageinfo[end - page]; //things we can skip having to decode - if( page != end ) { - if( info.disposal_method == GIF_DISPOSAL_PREVIOUS ) { + if ( page != end ) { + if ( info.disposal_method == GIF_DISPOSAL_PREVIOUS ) { continue; } - if( info.disposal_method == GIF_DISPOSAL_BACKGROUND ) { - for( y = 0; y < info.height; y++ ) { + if ( info.disposal_method == GIF_DISPOSAL_BACKGROUND ) { + for ( y = 0; y < info.height; y++ ) { scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, logicalheight - (y + info.top) - 1) + info.left; - for( x = 0; x < info.width; x++ ) { + for ( x = 0; x < info.width; x++ ) { *scanline++ = background; } } @@ -784,14 +784,14 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { //decode page FIBITMAP *pagedib = Load(io, handle, page, GIF_LOAD256, data); - if( pagedib != NULL ) { + if ( pagedib != NULL ) { RGBQUAD *pal = FreeImage_GetPalette(pagedib); have_transparent = false; - if( FreeImage_IsTransparent(pagedib) ) { + if ( FreeImage_IsTransparent(pagedib) ) { int count = FreeImage_GetTransparencyCount(pagedib); BYTE *table = FreeImage_GetTransparencyTable(pagedib); - for( int i = 0; i < count; i++ ) { - if( table[i] == 0 ) { + for ( int i = 0; i < count; i++ ) { + if ( table[i] == 0 ) { have_transparent = true; transparent_color = i; break; @@ -799,11 +799,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } } //copy page data into logical buffer, with full alpha opaqueness - for( y = 0; y < info.height; y++ ) { + for ( y = 0; y < info.height; y++ ) { scanline = (RGBQUAD *)FreeImage_GetScanLine(dib, logicalheight - (y + info.top) - 1) + info.left; BYTE *pageline = FreeImage_GetScanLine(pagedib, info.height - y - 1); - for( x = 0; x < info.width; x++ ) { - if( !have_transparent || *pageline != transparent_color ) { + for ( x = 0; x < info.width; x++ ) { + if ( !have_transparent || *pageline != transparent_color ) { *scanline = pal[*pageline]; scanline->rgbReserved = 255; } @@ -812,9 +812,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } } //copy frame time - if( page == end ) { + if ( page == end ) { FITAG *tag; - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, pagedib, "FrameTime", FIDT_LONG, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, pagedib, "FrameTime", FIDT_LONG, &tag) ) { delay_time = *(LONG *)FreeImage_GetTagValue(tag); } } @@ -846,18 +846,18 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { no_local_palette = (packed & GIF_PACKED_ID_HAVELCT) ? false : true; int bpp = 8; - if( (flags & GIF_LOAD256) == 0 ) { - if( !no_local_palette ) { + if ( (flags & GIF_LOAD256) == 0 ) { + if ( !no_local_palette ) { int size = 2 << (packed & GIF_PACKED_ID_LCTSIZE); - if( size <= 2 ) bpp = 1; - else if( size <= 16 ) bpp = 4; - } else if( info->global_color_table_offset != 0 ) { - if( info->global_color_table_size <= 2 ) bpp = 1; - else if( info->global_color_table_size <= 16 ) bpp = 4; + if ( size <= 2 ) bpp = 1; + else if ( size <= 16 ) bpp = 4; + } else if ( info->global_color_table_offset != 0 ) { + if ( info->global_color_table_size <= 2 ) bpp = 1; + else if ( info->global_color_table_size <= 16 ) bpp = 4; } } dib = FreeImage_Allocate(width, height, bpp); - if( dib == NULL ) { + if ( dib == NULL ) { throw FI_MSG_ERROR_DIB_MEMORY; } @@ -870,7 +870,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { //Palette RGBQUAD *pal = FreeImage_GetPalette(dib); - if( !no_local_palette ) { + if ( !no_local_palette ) { int size = 2 << (packed & GIF_PACKED_ID_LCTSIZE); int i = 0; @@ -880,7 +880,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->read_proc(&pal[i].rgbBlue, 1, 1, handle); i++; } - } else if( info->global_color_table_offset != 0 ) { + } else if ( info->global_color_table_offset != 0 ) { long pos = io->tell_proc(handle); io->seek_proc(handle, (long)info->global_color_table_offset, SEEK_SET); @@ -895,7 +895,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->seek_proc(handle, pos, SEEK_SET); } else { //its legal to have no palette, but we're going to generate *something* - for( int i = 0; i < 256; i++ ) { + for ( int i = 0; i < 256; i++ ) { pal[i].rgbRed = (BYTE)i; pal[i].rgbGreen = (BYTE)i; pal[i].rgbBlue = (BYTE)i; @@ -916,24 +916,24 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->read_proc(stringtable->FillInputBuffer(b), b, 1, handle); int size = sizeof(buf); while( stringtable->Decompress(buf, &size) ) { - for( int i = 0; i < size; i++ ) { + for ( int i = 0; i < size; i++ ) { scanline[xpos] |= (buf[i] & mask) << shift; - if( shift > 0 ) { + if ( shift > 0 ) { shift -= bpp; } else { xpos++; shift = 8 - bpp; } - if( ++x >= width ) { - if( interlaced ) { + if ( ++x >= width ) { + if ( interlaced ) { y += g_GifInterlaceIncrement[interlacepass]; - if( y >= height && ++interlacepass < GIF_INTERLACE_PASSES ) { + if ( y >= height && ++interlacepass < GIF_INTERLACE_PASSES ) { y = g_GifInterlaceOffset[interlacepass]; } } else { y++; } - if( y >= height ) { + if ( y >= height ) { stringtable->Done(); break; } @@ -947,7 +947,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->read_proc(&b, 1, 1, handle); } - if( page == 0 ) { + if ( page == 0 ) { size_t idx; //Logical Screen Descriptor @@ -963,7 +963,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", ANIMTAG_LOGICALHEIGHT, FIDT_SHORT, 1, 2, &logicalheight); //Global Color Table - if( info->global_color_table_offset != 0 ) { + if ( info->global_color_table_offset != 0 ) { RGBQUAD globalpalette[256]; io->seek_proc(handle, (long)info->global_color_table_offset, SEEK_SET); int i = 0; @@ -976,29 +976,29 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "GlobalPalette", ANIMTAG_GLOBALPALETTE, FIDT_PALETTE, info->global_color_table_size, info->global_color_table_size * 4, globalpalette); //background color - if( info->background_color < info->global_color_table_size ) { + if ( info->background_color < info->global_color_table_size ) { FreeImage_SetBackgroundColor(dib, &globalpalette[info->background_color]); } } //Application Extension LONG loop = 1; //If no AE with a loop count is found, the default must be 1 - for( idx = 0; idx < info->application_extension_offsets.size(); idx++ ) { + for ( idx = 0; idx < info->application_extension_offsets.size(); idx++ ) { io->seek_proc(handle, (long)info->application_extension_offsets[idx], SEEK_SET); io->read_proc(&b, 1, 1, handle); - if( b == 11 ) { //All AEs start with an 11 byte sub-block to determine what type of AE it is + if ( b == 11 ) { //All AEs start with an 11 byte sub-block to determine what type of AE it is char buf[11]; io->read_proc(buf, 11, 1, handle); - if( !memcmp(buf, "NETSCAPE2.0", 11) || !memcmp(buf, "ANIMEXTS1.0", 11) ) { //Not everybody recognizes ANIMEXTS1.0 but it is valid + if ( !memcmp(buf, "NETSCAPE2.0", 11) || !memcmp(buf, "ANIMEXTS1.0", 11) ) { //Not everybody recognizes ANIMEXTS1.0 but it is valid io->read_proc(&b, 1, 1, handle); - if( b == 3 ) { //we're supposed to have a 3 byte sub-block now + if ( b == 3 ) { //we're supposed to have a 3 byte sub-block now io->read_proc(&b, 1, 1, handle); //this should be 0x01 but isn't really important io->read_proc(&w, 2, 1, handle); #ifdef FREEIMAGE_BIGENDIAN SwapShort(&w); #endif loop = w; - if( loop > 0 ) loop++; + if ( loop > 0 ) loop++; break; } } @@ -1007,7 +1007,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FreeImage_SetMetadataEx(FIMD_ANIMATION, dib, "Loop", ANIMTAG_LOOP, FIDT_LONG, 1, 4, &loop); //Comment Extension - for( idx = 0; idx < info->comment_extension_offsets.size(); idx++ ) { + for ( idx = 0; idx < info->comment_extension_offsets.size(); idx++ ) { io->seek_proc(handle, (long)info->comment_extension_offsets[idx], SEEK_SET); std::string comment; char buf[255]; @@ -1025,7 +1025,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } //Graphic Control Extension - if( info->graphic_control_extension_offsets[page] != 0 ) { + if ( info->graphic_control_extension_offsets[page] != 0 ) { io->seek_proc(handle, (long)(info->graphic_control_extension_offsets[page] + 1), SEEK_SET); io->read_proc(&packed, 1, 1, handle); io->read_proc(&w, 2, 1, handle); @@ -1037,9 +1037,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { disposal_method = (packed & GIF_PACKED_GCE_DISPOSAL) >> 2; delay_time = w * 10; //convert cs to ms transparent_color = b; - if( have_transparent ) { + if ( have_transparent ) { int size = 1 << bpp; - if( transparent_color <= size ) { + if ( transparent_color <= size ) { BYTE table[256]; memset(table, 0xFF, size); table[transparent_color] = 0; @@ -1054,7 +1054,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { delete stringtable; } catch (const char *msg) { - if( dib != NULL ) { + if ( dib != NULL ) { FreeImage_Unload(dib); } FreeImage_OutputMessageProc(s_format_id, msg); @@ -1066,12 +1066,12 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { static BOOL DLL_CALLCONV Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { - if( data == NULL ) { + if ( data == NULL ) { return FALSE; } //GIFinfo *info = (GIFinfo *)data; - if( page == -1 ) { + if ( page == -1 ) { page = 0; } @@ -1081,7 +1081,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void FITAG *tag; int bpp = FreeImage_GetBPP(dib); - if( bpp != 1 && bpp != 4 && bpp != 8 ) { + if ( bpp != 1 && bpp != 4 && bpp != 8 ) { throw "Only 1, 4, or 8 bpp images supported"; } @@ -1089,22 +1089,22 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void int disposal_method = GIF_DISPOSAL_BACKGROUND, delay_time = 100, transparent_color = 0; WORD left = 0, top = 0, width = (WORD)FreeImage_GetWidth(dib), height = (WORD)FreeImage_GetHeight(dib); WORD output_height = height; - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", FIDT_SHORT, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", FIDT_SHORT, &tag) ) { left = *(WORD *)FreeImage_GetTagValue(tag); } - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", FIDT_SHORT, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", FIDT_SHORT, &tag) ) { top = *(WORD *)FreeImage_GetTagValue(tag); } - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", FIDT_BYTE, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", FIDT_BYTE, &tag) ) { no_local_palette = *(BYTE *)FreeImage_GetTagValue(tag) ? true : false; } - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Interlaced", FIDT_BYTE, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Interlaced", FIDT_BYTE, &tag) ) { interlaced = *(BYTE *)FreeImage_GetTagValue(tag) ? true : false; } - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTime", FIDT_LONG, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTime", FIDT_LONG, &tag) ) { delay_time = *(LONG *)FreeImage_GetTagValue(tag); } - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "DisposalMethod", FIDT_BYTE, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "DisposalMethod", FIDT_BYTE, &tag) ) { disposal_method = *(BYTE *)FreeImage_GetTagValue(tag); } @@ -1116,17 +1116,17 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void SwapShort(&height); #endif - if( page == 0 ) { + if ( page == 0 ) { //gather some info WORD logicalwidth = width; // width has already been swapped... - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", FIDT_SHORT, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", FIDT_SHORT, &tag) ) { logicalwidth = *(WORD *)FreeImage_GetTagValue(tag); #ifdef FREEIMAGE_BIGENDIAN SwapShort(&logicalwidth); #endif } WORD logicalheight = height; // height has already been swapped... - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", FIDT_SHORT, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", FIDT_SHORT, &tag) ) { logicalheight = *(WORD *)FreeImage_GetTagValue(tag); #ifdef FREEIMAGE_BIGENDIAN SwapShort(&logicalheight); @@ -1134,9 +1134,9 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } RGBQUAD *globalpalette = NULL; int globalpalette_size = 0; - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "GlobalPalette", FIDT_PALETTE, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "GlobalPalette", FIDT_PALETTE, &tag) ) { globalpalette_size = FreeImage_GetTagCount(tag); - if( globalpalette_size >= 2 ) { + if ( globalpalette_size >= 2 ) { globalpalette = (RGBQUAD *)FreeImage_GetTagValue(tag); } } @@ -1147,36 +1147,36 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void packed = GIF_PACKED_LSD_COLORRES; b = 0; RGBQUAD background_color; - if( globalpalette != NULL ) { + if ( globalpalette != NULL ) { packed |= GIF_PACKED_LSD_HAVEGCT; - if( globalpalette_size < 4 ) { + if ( globalpalette_size < 4 ) { globalpalette_size = 2; packed |= 0 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 8 ) { + } else if ( globalpalette_size < 8 ) { globalpalette_size = 4; packed |= 1 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 16 ) { + } else if ( globalpalette_size < 16 ) { globalpalette_size = 8; packed |= 2 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 32 ) { + } else if ( globalpalette_size < 32 ) { globalpalette_size = 16; packed |= 3 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 64 ) { + } else if ( globalpalette_size < 64 ) { globalpalette_size = 32; packed |= 4 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 128 ) { + } else if ( globalpalette_size < 128 ) { globalpalette_size = 64; packed |= 5 & GIF_PACKED_LSD_GCTSIZE; - } else if( globalpalette_size < 256 ) { + } else if ( globalpalette_size < 256 ) { globalpalette_size = 128; packed |= 6 & GIF_PACKED_LSD_GCTSIZE; } else { globalpalette_size = 256; packed |= 7 & GIF_PACKED_LSD_GCTSIZE; } - if( FreeImage_GetBackgroundColor(dib, &background_color) ) { - for( int i = 0; i < globalpalette_size; i++ ) { - if( background_color.rgbRed == globalpalette[i].rgbRed && + if ( FreeImage_GetBackgroundColor(dib, &background_color) ) { + for ( int i = 0; i < globalpalette_size; i++ ) { + if ( background_color.rgbRed == globalpalette[i].rgbRed && background_color.rgbGreen == globalpalette[i].rgbGreen && background_color.rgbBlue == globalpalette[i].rgbBlue ) { @@ -1194,7 +1194,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void io->write_proc(&b, 1, 1, handle); //Global Color Table - if( globalpalette != NULL ) { + if ( globalpalette != NULL ) { int i = 0; while( i < globalpalette_size ) { io->write_proc(&globalpalette[i].rgbRed, 1, 1, handle); @@ -1206,13 +1206,13 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void //Application Extension LONG loop = 0; - if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Loop", FIDT_LONG, &tag) ) { + if ( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "Loop", FIDT_LONG, &tag) ) { loop = *(LONG *)FreeImage_GetTagValue(tag); } - if( loop != 1 ) { + if ( loop != 1 ) { //the Netscape extension is really "repeats" not "loops" - if( loop > 1 ) loop--; - if( loop > 0xFFFF ) loop = 0xFFFF; + if ( loop > 1 ) loop--; + if ( loop > 0xFFFF ) loop = 0xFFFF; w = (WORD)loop; #ifdef FREEIMAGE_BIGENDIAN SwapShort(&w); @@ -1227,9 +1227,9 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void FIMETADATA *mdhandle = NULL; FITAG *tag = NULL; mdhandle = FreeImage_FindFirstMetadata(FIMD_COMMENTS, dib, &tag); - if( mdhandle ) { + if ( mdhandle ) { do { - if( FreeImage_GetTagType(tag) == FIDT_ASCII ) { + if ( FreeImage_GetTagType(tag) == FIDT_ASCII ) { int length = FreeImage_GetTagLength(tag) - 1; char *value = (char *)FreeImage_GetTagValue(tag); io->write_proc((void *)"\x21\xFE", 2, 1, handle); @@ -1250,11 +1250,11 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } //Graphic Control Extension - if( FreeImage_IsTransparent(dib) ) { + if ( FreeImage_IsTransparent(dib) ) { int count = FreeImage_GetTransparencyCount(dib); BYTE *table = FreeImage_GetTransparencyTable(dib); - for( int i = 0; i < count; i++ ) { - if( table[i] == 0 ) { + for ( int i = 0; i < count; i++ ) { + if ( table[i] == 0 ) { have_transparent = true; transparent_color = i; break; @@ -1263,7 +1263,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } io->write_proc((void *)"\x21\xF9\x04", 3, 1, handle); b = (BYTE)((disposal_method << 2) & GIF_PACKED_GCE_DISPOSAL); - if( have_transparent ) b |= GIF_PACKED_GCE_HAVETRANS; + if ( have_transparent ) b |= GIF_PACKED_GCE_HAVETRANS; io->write_proc(&b, 1, 1, handle); //Notes about delay time for GIFs: //IE5/IE6 have a minimum and default of 100ms @@ -1287,14 +1287,14 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void io->write_proc(&width, 2, 1, handle); io->write_proc(&height, 2, 1, handle); packed = 0; - if( !no_local_palette ) packed |= GIF_PACKED_ID_HAVELCT | ((bpp - 1) & GIF_PACKED_ID_LCTSIZE); - if( interlaced ) packed |= GIF_PACKED_ID_INTERLACED; + if ( !no_local_palette ) packed |= GIF_PACKED_ID_HAVELCT | ((bpp - 1) & GIF_PACKED_ID_LCTSIZE); + if ( interlaced ) packed |= GIF_PACKED_ID_INTERLACED; io->write_proc(&packed, 1, 1, handle); //Local Color Table - if( !no_local_palette ) { + if ( !no_local_palette ) { int palsize = 1 << bpp; - for( int i = 0; i < palsize; i++ ) { + for ( int i = 0; i < palsize; i++ ) { io->write_proc(&pal[i].rgbRed, 1, 1, handle); io->write_proc(&pal[i].rgbGreen, 1, 1, handle); io->write_proc(&pal[i].rgbBlue, 1, 1, handle); @@ -1318,7 +1318,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void memcpy(stringtable->FillInputBuffer(line), FreeImage_GetScanLine(dib, output_height - y - 1), line); while( stringtable->Compress(bufptr, &size) ) { bufptr += size; - if( bufptr - buf == sizeof(buf) ) { + if ( bufptr - buf == sizeof(buf) ) { io->write_proc(&b, 1, 1, handle); io->write_proc(buf, sizeof(buf), 1, handle); size = sizeof(buf); @@ -1327,9 +1327,9 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void size = (int)(sizeof(buf) - (bufptr - buf)); } } - if( interlaced ) { + if ( interlaced ) { y += g_GifInterlaceIncrement[interlacepass]; - if( y >= output_height && ++interlacepass < GIF_INTERLACE_PASSES ) { + if ( y >= output_height && ++interlacepass < GIF_INTERLACE_PASSES ) { y = g_GifInterlaceOffset[interlacepass]; } } else { @@ -1339,14 +1339,14 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void size = (int)(bufptr - buf); BYTE last[4]; w = (WORD)stringtable->CompressEnd(last); - if( size + w >= sizeof(buf) ) { + if ( size + w >= sizeof(buf) ) { //one last full size sub-block io->write_proc(&b, 1, 1, handle); io->write_proc(buf, size, 1, handle); io->write_proc(last, sizeof(buf) - size, 1, handle); //and possibly a tiny additional sub-block b = (BYTE)(w - (sizeof(buf) - size)); - if( b > 0 ) { + if ( b > 0 ) { io->write_proc(&b, 1, 1, handle); io->write_proc(last + w - b, b, 1, handle); } diff --git a/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp b/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp index 96a10d7d35..a0334e1143 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginHDR.cpp @@ -127,7 +127,7 @@ rgbe_GetLine(FreeImageIO *io, fi_handle handle, char *buffer, int length) { int i; memset(buffer, 0, length); for(i = 0; i < length; i++) { - if(!io->read_proc(&buffer[i], 1, 1, handle)) + if (!io->read_proc(&buffer[i], 1, 1, handle)) return FALSE; if(buffer[i] == 0x0A) break; @@ -196,7 +196,7 @@ rgbe_ReadHeader(FreeImageIO *io, fi_handle handle, unsigned *width, unsigned *he header_info->exposure = 1.0; // get the first line - if(!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) + if (!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) return rgbe_Error(rgbe_read_error, NULL); // check the signature @@ -208,19 +208,19 @@ rgbe_ReadHeader(FreeImageIO *io, fi_handle handle, unsigned *width, unsigned *he else { header_info->valid |= RGBE_VALID_PROGRAMTYPE; for(i = 0; i < sizeof(header_info->programtype) - 1; i++) { - if((buf[i+2] == 0) || isspace(buf[i+2])) + if ((buf[i+2] == 0) || isspace(buf[i+2])) break; header_info->programtype[i] = buf[i+2]; } header_info->programtype[i] = 0; } - for(;;) { + for (;;) { // get next line - if(!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) + if (!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) return rgbe_Error(rgbe_read_error, NULL); - if((buf[0] == 0) || (buf[0] == '\n')) { + if ((buf[0] == 0) || (buf[0] == '\n')) { // end of header so break out of loop bHeaderFound = TRUE; break; @@ -236,17 +236,17 @@ rgbe_ReadHeader(FreeImageIO *io, fi_handle handle, unsigned *width, unsigned *he header_info->exposure = tempf; header_info->valid |= RGBE_VALID_EXPOSURE; } - else if((buf[0] == '#') && (buf[1] == 0x20)) { + else if ((buf[0] == '#') && (buf[1] == 0x20)) { header_info->valid |= RGBE_VALID_COMMENT; strcpy(header_info->comment, buf); } } - if(!bHeaderFound || !bFormatFound) { + if (!bHeaderFound || !bFormatFound) { return rgbe_Error(rgbe_format_error, "invalid header"); } // get next line - if(!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) + if (!rgbe_GetLine(io, handle, buf, HDR_MAXLINE)) return rgbe_Error(rgbe_read_error, NULL); // get the image width & height @@ -364,14 +364,14 @@ rgbe_ReadPixels_RLE(FreeImageIO *io, fi_handle handle, FIRGBF *data, int scanlin free(scanline_buffer); return rgbe_Error(rgbe_read_error,NULL); } - if((rgbe[0] != 2) || (rgbe[1] != 2) || (rgbe[2] & 0x80)) { + if ((rgbe[0] != 2) || (rgbe[1] != 2) || (rgbe[2] & 0x80)) { // this file is not run length encoded rgbe_RGBEToFloat(data, rgbe); data ++; free(scanline_buffer); return rgbe_ReadPixels(io, handle, data, scanline_width * num_scanlines - 1); } - if((((int)rgbe[2]) << 8 | rgbe[3]) != scanline_width) { + if ((((int)rgbe[2]) << 8 | rgbe[3]) != scanline_width) { free(scanline_buffer); return rgbe_Error(rgbe_format_error,"wrong scanline width"); } @@ -394,7 +394,7 @@ rgbe_ReadPixels_RLE(FreeImageIO *io, fi_handle handle, FIRGBF *data, int scanlin if(buf[0] > 128) { // a run of the same value count = buf[0] - 128; - if((count == 0) || (count > ptr_end - ptr)) { + if ((count == 0) || (count > ptr_end - ptr)) { free(scanline_buffer); return rgbe_Error(rgbe_format_error, "bad scanline data"); } @@ -404,12 +404,12 @@ rgbe_ReadPixels_RLE(FreeImageIO *io, fi_handle handle, FIRGBF *data, int scanlin else { // a non-run count = buf[0]; - if((count == 0) || (count > ptr_end - ptr)) { + if ((count == 0) || (count > ptr_end - ptr)) { free(scanline_buffer); return rgbe_Error(rgbe_format_error, "bad scanline data"); } *ptr++ = buf[1]; - if(--count > 0) { + if (--count > 0) { if(io->read_proc(ptr, 1, sizeof(BYTE) * count, handle) < 1) { free(scanline_buffer); return rgbe_Error(rgbe_read_error, NULL); @@ -530,7 +530,7 @@ rgbe_WritePixels_RLE(FreeImageIO *io, fi_handle handle, FIRGBF *data, unsigned s // first red, then green, then blue, then exponent for(int i = 0; i < 4; i++) { BOOL bOK = rgbe_WriteBytes_RLE(io, handle, &buffer[i*scanline_width], scanline_width); - if(!bOK) { + if (!bOK) { free(buffer); return bOK; } @@ -606,7 +606,7 @@ static FIBITMAP * DLL_CALLCONV Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FIBITMAP *dib = NULL; - if(!handle) { + if (!handle) { return NULL; } @@ -624,7 +624,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // allocate a RGBF image dib = FreeImage_AllocateHeaderT(header_only, FIT_RGBF, width, height); - if(!dib) { + if (!dib) { throw FI_MSG_ERROR_MEMORY; } @@ -640,7 +640,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { for(unsigned y = 0; y < height; y++) { FIRGBF *scanline = (FIRGBF*)FreeImage_GetScanLine(dib, height - 1 - y); - if(!rgbe_ReadPixels_RLE(io, handle, scanline, width, 1)) { + if (!rgbe_ReadPixels_RLE(io, handle, scanline, width, 1)) { FreeImage_Unload(dib); return NULL; } @@ -659,7 +659,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { static BOOL DLL_CALLCONV Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { - if(!dib) return FALSE; + if (!dib) return FALSE; if(FreeImage_GetImageType(dib) != FIT_RGBF) { return FALSE; @@ -676,7 +676,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void rgbe_WriteMetadata(dib, &header_info); // fill a comment sprintf(header_info.comment, "# Made with FreeImage %s", FreeImage_GetVersion()); - if(!rgbe_WriteHeader(io, handle, width, height, &header_info)) { + if (!rgbe_WriteHeader(io, handle, width, height, &header_info)) { return FALSE; } @@ -684,7 +684,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void for(unsigned y = 0; y < height; y++) { FIRGBF *scanline = (FIRGBF*)FreeImage_GetScanLine(dib, height - 1 - y); - if(!rgbe_WritePixels_RLE(io, handle, scanline, width, 1)) { + if (!rgbe_WritePixels_RLE(io, handle, scanline, width, 1)) { return FALSE; } } diff --git a/plugins/FreeImage/Source/FreeImage/PluginICO.cpp b/plugins/FreeImage/Source/FreeImage/PluginICO.cpp index 7f41a0d841..1107841d33 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginICO.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginICO.cpp @@ -232,7 +232,7 @@ Open(FreeImageIO *io, fi_handle handle, BOOL read) { SwapIconHeader(lpIH); #endif - if(!(lpIH->idReserved == 0) || !(lpIH->idType == 1)) { + if (!(lpIH->idReserved == 0) || !(lpIH->idType == 1)) { // Not an ICO file free(lpIH); return NULL; @@ -295,7 +295,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only) return NULL; } - if( bmih.biBitCount <= 8 ) { + if ( bmih.biBitCount <= 8 ) { // read the palette data io->read_proc(FreeImage_GetPalette(dib), CalculateUsedPaletteEntries(bit_count) * sizeof(RGBQUAD), 1, handle); #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB @@ -339,7 +339,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only) // bitmap has been loaded successfully! // convert to 32bpp and generate an alpha channel - if((flags & ICO_MAKEALPHA) == ICO_MAKEALPHA) { + if ((flags & ICO_MAKEALPHA) == ICO_MAKEALPHA) { FIBITMAP *dib32 = FreeImage_ConvertTo32Bits(dib); FreeImage_Unload(dib); @@ -350,7 +350,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only) int width_and = WidthBytes(width); BYTE *line_and = (BYTE *)malloc(width_and); - if( line_and == NULL ) { + if ( line_and == NULL ) { FreeImage_Unload(dib32); return NULL; } @@ -361,7 +361,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only) io->read_proc(line_and, width_and, 1, handle); for(int x = 0; x < width; x++) { quad->rgbReserved = (line_and[x>>3] & (0x80 >> (x & 0x07))) != 0 ? 0 : 0xFF; - if( quad->rgbReserved == 0 ) { + if ( quad->rgbReserved == 0 ) { quad->rgbBlue ^= 0xFF; quad->rgbGreen ^= 0xFF; quad->rgbRed ^= 0xFF; @@ -409,7 +409,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->seek_proc(handle, 0, SEEK_SET); io->seek_proc(handle, icon_list[page].dwImageOffset, SEEK_CUR); - if((icon_list[page].bWidth == 0) && (icon_list[page].bHeight == 0)) { + if ((icon_list[page].bWidth == 0) && (icon_list[page].bHeight == 0)) { // Vista icon support dib = FreeImage_LoadFromHandle(FIF_PNG, io, handle, header_only ? FIF_LOAD_NOPIXELS : PNG_DEFAULT); } @@ -530,7 +530,7 @@ SaveStandardIcon(FreeImageIO *io, FIBITMAP *dib, fi_handle handle) { #endif // AND mask BYTE *and_mask = (BYTE*)malloc(size_and); - if(!and_mask) { + if (!and_mask) { return FALSE; } @@ -642,14 +642,14 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void std::vector vPages; int k; - if(!dib || !handle || !data) { + if (!dib || !handle || !data) { return FALSE; } // check format limits unsigned w = FreeImage_GetWidth(dib); unsigned h = FreeImage_GetHeight(dib); - if((w < 16) || (w > 256) || (h < 16) || (h > 256) || (w != h)) { + if ((w < 16) || (w > 256) || (h < 16) || (h > 256) || (w != h)) { FreeImage_OutputMessageProc(s_format_id, "Unsupported icon size: width x height = %d x %d", w, h); return FALSE; } @@ -667,7 +667,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // load all icons for(k = 0; k < icon_header->idCount; k++) { icon_dib = Load(io, handle, k, flags, data); - if(!icon_dib) { + if (!icon_dib) { throw FI_MSG_ERROR_DIB_MEMORY; } vPages.push_back(icon_dib); @@ -694,7 +694,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // save the icon descriptions ICONDIRENTRY *icon_list = (ICONDIRENTRY *)malloc(icon_header->idCount * sizeof(ICONDIRENTRY)); - if(!icon_list) { + if (!icon_list) { throw FI_MSG_ERROR_MEMORY; } memset(icon_list, 0, icon_header->idCount * sizeof(ICONDIRENTRY)); @@ -710,7 +710,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void icon_list[k].bReserved = 0; icon_list[k].wPlanes = bmih->biPlanes; icon_list[k].wBitCount = bmih->biBitCount; - if( (icon_list[k].wPlanes * icon_list[k].wBitCount) >= 8 ) { + if ( (icon_list[k].wPlanes * icon_list[k].wBitCount) >= 8 ) { icon_list[k].bColorCount = 0; } else { icon_list[k].bColorCount = (BYTE)(1 << (icon_list[k].wPlanes * icon_list[k].wBitCount)); @@ -731,7 +731,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void for(k = 0; k < icon_header->idCount; k++) { icon_dib = (FIBITMAP*)vPages[k]; - if((icon_list[k].bWidth == 0) && (icon_list[k].bHeight == 0)) { + if ((icon_list[k].bWidth == 0) && (icon_list[k].bHeight == 0)) { // Vista icon support FreeImage_SaveToHandle(FIF_PNG, icon_dib, io, handle, PNG_DEFAULT); } diff --git a/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp b/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp index ae1f903f82..b6cd45d6db 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginIFF.cpp @@ -220,7 +220,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { SwapLong(&type); #endif - if((type != ID_ILBM) && (type != ID_PBM)) + if ((type != ID_ILBM) && (type != ID_PBM)) return NULL; size -= 4; @@ -266,7 +266,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { depth = planes > 8 ? 24 : 8; - if( depth == 24 ) { + if ( depth == 24 ) { dib = FreeImage_Allocate(width, height, depth, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } else { dib = FreeImage_Allocate(width, height, depth); @@ -358,7 +358,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // t = [0..127] => copy the next t+1 bytes literally unsigned size_to_read = t + 1; - if((size_to_read + x) > src_size) { + if ((size_to_read + x) > src_size) { // sanity check for buffer overruns size_to_read = src_size - x; io->read_proc(src + x, size_to_read, 1, handle); @@ -373,7 +373,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { io->read_proc(&b, 1, 1, handle); unsigned size_to_copy = (unsigned)(-(int)t + 1); - if((size_to_copy + x) > src_size) { + if ((size_to_copy + x) > src_size) { // sanity check for buffer overruns size_to_copy = src_size - x; memset(src + x, b, size_to_copy); diff --git a/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp b/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp index c868ce253d..6e772afdaa 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginJ2K.cpp @@ -142,7 +142,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FIBITMAP *dib = NULL; // check the file format - if(!Validate(io, handle)) { + if (!Validate(io, handle)) { return NULL; } @@ -163,7 +163,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { file_length = io->tell_proc(handle) - start_pos; io->seek_proc(handle, start_pos, SEEK_SET); src = (BYTE*)malloc(file_length * sizeof(BYTE)); - if(!src) { + if (!src) { throw FI_MSG_ERROR_MEMORY; } if(io->read_proc(src, 1, file_length, handle) < 1) { @@ -186,7 +186,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // decode the stream and fill the image structure image = opj_decode(dinfo, cio); - if(!image) { + if (!image) { throw "Failed to decode image!\n"; } @@ -203,7 +203,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // create output image dib = J2KImageToFIBITMAP(s_format_id, image); - if(!dib) throw "Failed to import JPEG2000 image"; + if (!dib) throw "Failed to import JPEG2000 image"; // free image data structure opj_image_destroy(image); @@ -261,7 +261,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void try { // convert the dib to a OpenJPEG image image = FIBITMAPToJ2KImage(s_format_id, dib, ¶meters); - if(!image) return FALSE; + if (!image) return FALSE; // decide if MCT should be used parameters.tcp_mct = (image->numcomps == 3) ? 1 : 0; diff --git a/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp b/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp index df41218761..ed1cb267bb 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginJP2.cpp @@ -142,7 +142,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FIBITMAP *dib = NULL; // check the file format - if(!Validate(io, handle)) { + if (!Validate(io, handle)) { return NULL; } @@ -163,7 +163,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { file_length = io->tell_proc(handle) - start_pos; io->seek_proc(handle, start_pos, SEEK_SET); src = (BYTE*)malloc(file_length * sizeof(BYTE)); - if(!src) { + if (!src) { throw FI_MSG_ERROR_MEMORY; } if(io->read_proc(src, 1, file_length, handle) < 1) { @@ -186,7 +186,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // decode the stream and fill the image structure image = opj_decode(dinfo, cio); - if(!image) { + if (!image) { throw "Failed to decode image!\n"; } @@ -203,7 +203,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // create output image dib = J2KImageToFIBITMAP(s_format_id, image); - if(!dib) throw "Failed to import JPEG2000 image"; + if (!dib) throw "Failed to import JPEG2000 image"; // free image data structure opj_image_destroy(image); @@ -261,7 +261,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void try { // convert the dib to a OpenJPEG image image = FIBITMAPToJ2KImage(s_format_id, dib, ¶meters); - if(!image) return FALSE; + if (!image) return FALSE; // decide if MCT should be used parameters.tcp_mct = (image->numcomps == 3) ? 1 : 0; diff --git a/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp b/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp index ed52bfdd0d..b6393de7aa 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginJPEG.cpp @@ -757,7 +757,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) { continue; } if(memcmp(marker->data, "JFXX" , 5) == 0) { - if(!cinfo->saw_JFIF_marker || cinfo->JFIF_minor_version < 2) { + if (!cinfo->saw_JFIF_marker || cinfo->JFIF_minor_version < 2) { FreeImage_OutputMessageProc(s_format_id, "Warning: non-standard JFXX segment"); } jpeg_read_jfxx(dib, marker->data, marker->data_length); @@ -785,7 +785,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) { BYTE *icc_profile = NULL; unsigned icc_length = 0; - if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) { + if ( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) { // copy ICC profile data FreeImage_CreateICCProfile(dib, icc_profile, icc_length); // clean up @@ -995,11 +995,11 @@ static BOOL jpeg_write_jfxx(j_compress_ptr cinfo, FIBITMAP *dib) { // get the thumbnail to be stored FIBITMAP* thumbnail = FreeImage_GetThumbnail(dib); - if(!thumbnail) { + if (!thumbnail) { return TRUE; } // check for a compatible output format - if((FreeImage_GetImageType(thumbnail) != FIT_BITMAP) || (FreeImage_GetBPP(thumbnail) != 8) && (FreeImage_GetBPP(thumbnail) != 24)) { + if ((FreeImage_GetImageType(thumbnail) != FIT_BITMAP) || (FreeImage_GetBPP(thumbnail) != 8) && (FreeImage_GetBPP(thumbnail) != 24)) { FreeImage_OutputMessageProc(s_format_id, FI_MSG_WARNING_INVALID_THUMBNAIL); return FALSE; } @@ -1325,22 +1325,22 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // step 5b: allocate dib and init header - if((cinfo.num_components == 4) && (cinfo.out_color_space == JCS_CMYK)) { + if ((cinfo.num_components == 4) && (cinfo.out_color_space == JCS_CMYK)) { // CMYK image - if((flags & JPEG_CMYK) == JPEG_CMYK) { + if ((flags & JPEG_CMYK) == JPEG_CMYK) { // load as CMYK dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 32, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!dib) throw FI_MSG_ERROR_DIB_MEMORY; + if (!dib) throw FI_MSG_ERROR_DIB_MEMORY; FreeImage_GetICCProfile(dib)->flags |= FIICC_COLOR_IS_CMYK; } else { // load as CMYK and convert to RGB dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!dib) throw FI_MSG_ERROR_DIB_MEMORY; + if (!dib) throw FI_MSG_ERROR_DIB_MEMORY; } } else { // RGB or greyscale image dib = FreeImage_AllocateHeader(header_only, cinfo.output_width, cinfo.output_height, 8 * cinfo.num_components, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!dib) throw FI_MSG_ERROR_DIB_MEMORY; + if (!dib) throw FI_MSG_ERROR_DIB_MEMORY; if (cinfo.num_components == 1) { // build a greyscale palette @@ -1385,7 +1385,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // step 7a: while (scan lines remain to be read) jpeg_read_scanlines(...); - if((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) != JPEG_CMYK)) { + if ((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) != JPEG_CMYK)) { // convert from CMYK to RGB JSAMPARRAY buffer; // output row buffer @@ -1411,7 +1411,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { dst += 3; } } - } else if((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) == JPEG_CMYK)) { + } else if ((cinfo.out_color_space == JCS_CMYK) && ((flags & JPEG_CMYK) == JPEG_CMYK)) { // convert from LibJPEG CMYK to standard CMYK JSAMPARRAY buffer; // output row buffer @@ -1466,7 +1466,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { jpeg_destroy_decompress(&cinfo); // check for automatic Exif rotation - if(!header_only && ((flags & JPEG_EXIFROTATE) == JPEG_EXIFROTATE)) { + if (!header_only && ((flags & JPEG_EXIFROTATE) == JPEG_EXIFROTATE)) { rotate_exif(&dib); } @@ -1560,12 +1560,12 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void jpeg_set_defaults(&cinfo); // progressive-JPEG support - if((flags & JPEG_PROGRESSIVE) == JPEG_PROGRESSIVE) { + if ((flags & JPEG_PROGRESSIVE) == JPEG_PROGRESSIVE) { jpeg_simple_progression(&cinfo); } // compute optimal Huffman coding tables for the image - if((flags & JPEG_OPTIMIZE) == JPEG_OPTIMIZE) { + if ((flags & JPEG_OPTIMIZE) == JPEG_OPTIMIZE) { cinfo.optimize_coding = TRUE; } @@ -1590,7 +1590,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // set subsampling options if required if(cinfo.in_color_space == JCS_RGB) { - if((flags & JPEG_SUBSAMPLING_411) == JPEG_SUBSAMPLING_411) { + if ((flags & JPEG_SUBSAMPLING_411) == JPEG_SUBSAMPLING_411) { // 4:1:1 (4x1 1x1 1x1) - CrH 25% - CbH 25% - CrV 100% - CbV 100% // the horizontal color resolution is quartered cinfo.comp_info[0].h_samp_factor = 4; // Y @@ -1599,7 +1599,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void cinfo.comp_info[1].v_samp_factor = 1; cinfo.comp_info[2].h_samp_factor = 1; // Cr cinfo.comp_info[2].v_samp_factor = 1; - } else if((flags & JPEG_SUBSAMPLING_420) == JPEG_SUBSAMPLING_420) { + } else if ((flags & JPEG_SUBSAMPLING_420) == JPEG_SUBSAMPLING_420) { // 4:2:0 (2x2 1x1 1x1) - CrH 50% - CbH 50% - CrV 50% - CbV 50% // the chrominance resolution in both the horizontal and vertical directions is cut in half cinfo.comp_info[0].h_samp_factor = 2; // Y @@ -1608,7 +1608,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void cinfo.comp_info[1].v_samp_factor = 1; cinfo.comp_info[2].h_samp_factor = 1; // Cr cinfo.comp_info[2].v_samp_factor = 1; - } else if((flags & JPEG_SUBSAMPLING_422) == JPEG_SUBSAMPLING_422){ //2x1 (low) + } else if ((flags & JPEG_SUBSAMPLING_422) == JPEG_SUBSAMPLING_422){ //2x1 (low) // 4:2:2 (2x1 1x1 1x1) - CrH 50% - CbH 50% - CrV 100% - CbV 100% // half of the horizontal resolution in the chrominance is dropped (Cb & Cr), // while the full resolution is retained in the vertical direction, with respect to the luminance @@ -1619,7 +1619,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void cinfo.comp_info[2].h_samp_factor = 1; // Cr cinfo.comp_info[2].v_samp_factor = 1; } - else if((flags & JPEG_SUBSAMPLING_444) == JPEG_SUBSAMPLING_444){ //1x1 (no subsampling) + else if ((flags & JPEG_SUBSAMPLING_444) == JPEG_SUBSAMPLING_444){ //1x1 (no subsampling) // 4:4:4 (1x1 1x1 1x1) - CrH 100% - CbH 100% - CrV 100% - CbV 100% // the resolution of chrominance information (Cb & Cr) is preserved // at the same rate as the luminance (Y) information diff --git a/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp b/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp index ff0c5b8679..87cbe967b2 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPCD.cpp @@ -155,7 +155,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { try { // allocate the dib and write out the header dib = FreeImage_AllocateHeader(header_only, width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!dib) throw FI_MSG_ERROR_DIB_MEMORY; + if (!dib) throw FI_MSG_ERROR_DIB_MEMORY; if(header_only) { return dib; @@ -173,7 +173,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { BYTE *y1 = (BYTE*)malloc(width * sizeof(BYTE)); BYTE *y2 = (BYTE*)malloc(width * sizeof(BYTE)); BYTE *cbcr = (BYTE*)malloc(width * sizeof(BYTE)); - if(!y1 || !y2 || !cbcr) throw FI_MSG_ERROR_MEMORY; + if (!y1 || !y2 || !cbcr) throw FI_MSG_ERROR_MEMORY; BYTE *yl[] = { y1, y2 }; diff --git a/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp b/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp index cd75629ddc..a6feb5fea7 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPCX.cpp @@ -84,9 +84,9 @@ pcx_validate(FreeImageIO *io, fi_handle handle) { // version if(signature[1] <= 5) { // encoding - if((signature[2] == 0) || (signature[2] == 1)) { + if ((signature[2] == 0) || (signature[2] == 1)) { // bits per pixel per plane - if((signature[3] == 1) || (signature[3] == 8)) { + if ((signature[3] == 1) || (signature[3] == 8)) { return TRUE; } } @@ -339,7 +339,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { BYTE *ReadBuf = NULL; // buffer; BOOL bIsRLE; // True if the file is run-length encoded - if(!handle) { + if (!handle) { return NULL; } @@ -351,7 +351,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { long start_pos = io->tell_proc(handle); BOOL validated = pcx_validate(io, handle); io->seek_proc(handle, start_pos, SEEK_SET); - if(!validated) { + if (!validated) { throw FI_MSG_ERROR_MAGIC_NUMBER; } @@ -478,10 +478,10 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // --------------- line = (BYTE*)malloc(linelength * sizeof(BYTE)); - if(!line) throw FI_MSG_ERROR_MEMORY; + if (!line) throw FI_MSG_ERROR_MEMORY; ReadBuf = (BYTE*)malloc(IO_BUF_SIZE * sizeof(BYTE)); - if(!ReadBuf) throw FI_MSG_ERROR_MEMORY; + if (!ReadBuf) throw FI_MSG_ERROR_MEMORY; bits = FreeImage_GetScanLine(dib, height - 1); @@ -513,7 +513,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { unsigned x, y, written; buffer = (BYTE*)malloc(width * sizeof(BYTE)); - if(!buffer) throw FI_MSG_ERROR_MEMORY; + if (!buffer) throw FI_MSG_ERROR_MEMORY; for (y = 0; y < height; y++) { written = readline(*io, handle, line, linelength, bIsRLE, ReadBuf, &ReadPos); @@ -553,7 +553,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { free(buffer); - } else if((header.planes == 3) && (header.bpp == 8)) { + } else if ((header.planes == 3) && (header.bpp == 8)) { BYTE *pline; for (unsigned y = 0; y < height; y++) { diff --git a/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp b/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp index 231e8baa22..8ccbd48ba5 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPFM.cpp @@ -48,7 +48,7 @@ pfm_get_line(FreeImageIO *io, fi_handle handle, char *buffer, int length) { int i; memset(buffer, 0, length); for(i = 0; i < length; i++) { - if(!io->read_proc(&buffer[i], 1, 1, handle)) + if (!io->read_proc(&buffer[i], 1, 1, handle)) return FALSE; if(buffer[i] == 0x0A) break; @@ -67,7 +67,7 @@ pfm_get_int(FreeImageIO *io, fi_handle handle) { // skip forward to start of next number - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; while (1) { // eat comments @@ -78,7 +78,7 @@ pfm_get_int(FreeImageIO *io, fi_handle handle) { firstchar = TRUE; while (1) { - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; if (firstchar && c == ' ') { // loop off 1 sp after # @@ -96,7 +96,7 @@ pfm_get_int(FreeImageIO *io, fi_handle handle) { break; } - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; } // we're at the start of a number, continue until we hit a non-number @@ -106,7 +106,7 @@ pfm_get_int(FreeImageIO *io, fi_handle handle) { while (1) { i = (i * 10) + (c - '0'); - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; if (c < '0' || c > '9') break; @@ -231,7 +231,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { if(bResult) { bResult = (sscanf(line_buffer, "%f", &scalefactor) == 1) ? TRUE : FALSE; } - if(!bResult) { + if (!bResult) { throw "Read error: invalid PFM header"; } @@ -251,7 +251,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { if(image_type == FIT_RGBF) { const unsigned lineWidth = 3 * width; lineBuffer = (float*)malloc(lineWidth * sizeof(float)); - if(!lineBuffer) { + if (!lineBuffer) { throw FI_MSG_ERROR_MEMORY; } @@ -285,7 +285,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } else if(image_type == FIT_FLOAT) { const unsigned lineWidth = width; lineBuffer = (float*)malloc(lineWidth * sizeof(float)); - if(!lineBuffer) { + if (!lineBuffer) { throw FI_MSG_ERROR_MEMORY; } @@ -330,10 +330,10 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { static BOOL DLL_CALLCONV Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { - if(!dib || !handle) return FALSE; + if (!dib || !handle) return FALSE; FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); - if((image_type != FIT_RGBF) && (image_type != FIT_FLOAT)) { + if ((image_type != FIT_RGBF) && (image_type != FIT_FLOAT)) { return FALSE; } diff --git a/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp b/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp index 99958a489c..0c44cb2d1f 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPICT.cpp @@ -1168,7 +1168,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // io->seek_proc( handle, 122, SEEK_CUR ); // found = TRUE; BYTE data[ 2 ]; - if( io->read_proc( data, 2, 1, handle ) ) { + if ( io->read_proc( data, 2, 1, handle ) ) { io->seek_proc( handle, -2, SEEK_CUR ); if ( data[0] == 0xFF && data[1] == 0xD8 ) { diff --git a/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp b/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp index b2cddec2b8..ad398a87e8 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPNG.cpp @@ -104,7 +104,7 @@ ReadMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { for(int i = 0; i < num_text; i++) { // create a tag tag = FreeImage_CreateTag(); - if(!tag) return FALSE; + if (!tag) return FALSE; DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length); @@ -354,7 +354,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } #ifndef FREEIMAGE_BIGENDIAN - if((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { + if ((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { // turn on 16 bit byte swapping png_set_swap(png_ptr); } @@ -503,7 +503,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); - if((color_type == PNG_COLOR_TYPE_GRAY) && trans_color) { + if ((color_type == PNG_COLOR_TYPE_GRAY) && trans_color) { // single transparent color if (trans_color->gray < palette_entries) { BYTE table[256]; @@ -511,7 +511,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { table[trans_color->gray] = 0; FreeImage_SetTransparencyTable(dib, table, palette_entries); } - } else if((color_type == PNG_COLOR_TYPE_PALETTE) && trans_alpha) { + } else if ((color_type == PNG_COLOR_TYPE_PALETTE) && trans_alpha) { // transparency table FreeImage_SetTransparencyTable(dib, (BYTE *)trans_alpha, num_trans); } @@ -726,7 +726,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void pixel_depth = FreeImage_GetBPP(dib); BOOL bInterlaced = FALSE; - if( (flags & PNG_INTERLACED) == PNG_INTERLACED) { + if ( (flags & PNG_INTERLACED) == PNG_INTERLACED) { interlace_type = PNG_INTERLACE_ADAM7; bInterlaced = TRUE; } else { @@ -735,9 +735,9 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // set the ZLIB compression level or default to PNG default compression level (ZLIB level = 6) int zlib_level = flags & 0x0F; - if((zlib_level >= 1) && (zlib_level <= 9)) { + if ((zlib_level >= 1) && (zlib_level <= 9)) { png_set_compression_level(png_ptr, zlib_level); - } else if((flags & PNG_Z_NO_COMPRESSION) == PNG_Z_NO_COMPRESSION) { + } else if ((flags & PNG_Z_NO_COMPRESSION) == PNG_Z_NO_COMPRESSION) { png_set_compression_level(png_ptr, Z_NO_COMPRESSION); } diff --git a/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp b/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp index 3155315559..a30f858851 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginPNM.cpp @@ -37,7 +37,7 @@ GetInt(FreeImageIO *io, fi_handle handle) { // skip forward to start of next number - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; while (1) { // eat comments @@ -48,7 +48,7 @@ GetInt(FreeImageIO *io, fi_handle handle) { firstchar = TRUE; while (1) { - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; if (firstchar && c == ' ') { // loop off 1 sp after # @@ -66,7 +66,7 @@ GetInt(FreeImageIO *io, fi_handle handle) { break; } - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; } // we're at the start of a number, continue until we hit a non-number @@ -76,7 +76,7 @@ GetInt(FreeImageIO *io, fi_handle handle) { while (1) { i = (i * 10) + (c - '0'); - if(!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; + if (!io->read_proc(&c, 1, 1, handle)) throw FI_MSG_ERROR_PARSING; if (c < '0' || c > '9') break; @@ -239,9 +239,9 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { int height = GetInt(io, handle); int maxval = 1; - if((id_two == '2') || (id_two == '5') || (id_two == '3') || (id_two == '6')) { + if ((id_two == '2') || (id_two == '5') || (id_two == '3') || (id_two == '6')) { maxval = GetInt(io, handle); - if((maxval <= 0) || (maxval > 65535)) { + if ((maxval <= 0) || (maxval > 65535)) { FreeImage_OutputMessageProc(s_format_id, "Invalid max value : %d", maxval); throw (const char*)NULL; } @@ -539,7 +539,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void char buffer[256]; // temporary buffer whose size should be enough for what we need - if(!dib || !handle) return FALSE; + if (!dib || !handle) return FALSE; FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib); diff --git a/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp b/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp index 08fd558450..08fc0c9e17 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginRAS.cpp @@ -203,7 +203,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { BYTE *bits; // Pointer to dib data WORD x, y; - if(!handle) { + if (!handle) { return NULL; } @@ -309,7 +309,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // Read SUN raster colormap int numcolors = 1 << header.depth; - if((DWORD)(3 * numcolors) > header.maplength) { + if ((DWORD)(3 * numcolors) > header.maplength) { // some RAS may have less colors than the full palette numcolors = header.maplength / 3; } else { diff --git a/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp b/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp index 2229cbb20b..4611824f4d 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginRAW.cpp @@ -79,14 +79,14 @@ public: virtual int get_char() { int c = 0; if(substream) return substream->get_char(); - if(!_io->read_proc(&c, 1, 1, _handle)) return -1; + if (!_io->read_proc(&c, 1, 1, _handle)) return -1; return c; } virtual char* gets(char *buffer, int length) { if (substream) return substream->gets(buffer, length); memset(buffer, 0, length); for(int i = 0; i < length; i++) { - if(!_io->read_proc(&buffer[i], 1, 1, _handle)) + if (!_io->read_proc(&buffer[i], 1, 1, _handle)) return NULL; if(buffer[i] == 0x0A) break; @@ -137,7 +137,7 @@ libraw_ConvertToDib(libraw_processed_image_t *image) { if(bpp == 16) { // allocate output dib dib = FreeImage_AllocateT(FIT_RGB16, width, height); - if(!dib) { + if (!dib) { throw FI_MSG_ERROR_DIB_MEMORY; } // write data @@ -154,7 +154,7 @@ libraw_ConvertToDib(libraw_processed_image_t *image) { } else if(bpp == 8) { // allocate output dib dib = FreeImage_AllocateT(FIT_BITMAP, width, height, 24); - if(!dib) { + if (!dib) { throw FI_MSG_ERROR_DIB_MEMORY; } // write data @@ -468,15 +468,15 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // header only mode dib = FreeImage_AllocateHeaderT(header_only, FIT_RGB16, RawProcessor.imgdata.sizes.width, RawProcessor.imgdata.sizes.height); } - else if((flags & RAW_PREVIEW) == RAW_PREVIEW) { + else if ((flags & RAW_PREVIEW) == RAW_PREVIEW) { // try to get the embedded JPEG dib = libraw_LoadEmbeddedPreview(RawProcessor, 0); - if(!dib) { + if (!dib) { // no JPEG preview: try to load as 8-bit/sample (i.e. RGB 24-bit) dib = libraw_LoadRawData(RawProcessor, 8); } } - else if((flags & RAW_DISPLAY) == RAW_DISPLAY) { + else if ((flags & RAW_DISPLAY) == RAW_DISPLAY) { // load raw data as 8-bit/sample (i.e. RGB 24-bit) dib = libraw_LoadRawData(RawProcessor, 8); } diff --git a/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp b/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp index 0fd162b1d4..3ac189e0ef 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginSGI.cpp @@ -265,7 +265,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // read the Offset Tables int index_len = height * zsize; pRowIndex = (LONG*)malloc(index_len * sizeof(LONG)); - if(!pRowIndex) { + if (!pRowIndex) { throw FI_MSG_ERROR_MEMORY; } @@ -282,7 +282,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // Discard row size index for (i = 0; i < (int)(index_len * sizeof(LONG)); i++) { BYTE packed = 0; - if( io->read_proc(&packed, sizeof(BYTE), 1, handle) < 1 ) { + if ( io->read_proc(&packed, sizeof(BYTE), 1, handle) < 1 ) { throw SGI_EOF_IN_RLE_INDEX; } } @@ -307,7 +307,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } dib = FreeImage_Allocate(width, height, bitcount); - if(!dib) { + if (!dib) { throw FI_MSG_ERROR_DIB_MEMORY; } diff --git a/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp b/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp index 5fb1f53ee0..4e3f1a720a 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginTARGA.cpp @@ -176,7 +176,7 @@ FIBITMAP* TargaThumbnail::toFIBITMAP() { const unsigned line_size = _depth * _w / 8; FIBITMAP* dib = FreeImage_Allocate(_w, _h, _depth); - if(!dib) { + if (!dib) { return NULL; } @@ -1203,14 +1203,14 @@ saveRLE(FIBITMAP* dib, FreeImageIO* io, fi_handle handle) { // read next pixel from dib - if( x + 1*pixel_size < line_size) { + if ( x + 1*pixel_size < line_size) { AssignPixel(next, (bits + x + 1*pixel_size), pixel_size); } else { // last pixel in line // include current pixel and flush - if(!has_rle) { + if (!has_rle) { writeToPacket(packet, current, pixel_size); packet += pixel_size; @@ -1231,7 +1231,7 @@ saveRLE(FIBITMAP* dib, FreeImageIO* io, fi_handle handle) { // has rle - if(!has_rle) { + if (!has_rle) { // flush non rle packet flushPacket(line, pixel_size, packet_begin, packet, packet_count, has_rle); diff --git a/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp b/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp index d5db9574da..54f81e0938 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginTIFF.cpp @@ -450,7 +450,7 @@ static FIBITMAP* CreateImageType(BOOL header_only, FREE_IMAGE_TYPE fit, int width, int height, uint16 bitspersample, uint16 samplesperpixel) { FIBITMAP *dib = NULL; - if((width < 0) || (height < 0)) { + if ((width < 0) || (height < 0)) { // check for malicious images return NULL; } @@ -462,7 +462,7 @@ CreateImageType(BOOL header_only, FREE_IMAGE_TYPE fit, int width, int height, ui if(bpp == 16) { - if((samplesperpixel == 2) && (bitspersample == 8)) { + if ((samplesperpixel == 2) && (bitspersample == 8)) { // 8-bit indexed + 8-bit alpha channel -> convert to 8-bit transparent dib = FreeImage_AllocateHeader(header_only, width, height, 8); } else { @@ -562,7 +562,7 @@ ReadImageType(TIFF *tiff, uint16 bitspersample, uint16 samplesperpixel) { break; case 48: // 3 x half float => convert to RGBF - if((samplesperpixel == 3) && (bitspersample == 16)) { + if ((samplesperpixel == 3) && (bitspersample == 16)) { fit = FIT_RGBF; } break; @@ -683,7 +683,7 @@ WriteCompression(TIFF *tiff, uint16 bitspersample, uint16 samplesperpixel, uint1 } else if ((flags & TIFF_LZW) == TIFF_LZW) { compression = COMPRESSION_LZW; } else if ((flags & TIFF_JPEG) == TIFF_JPEG) { - if(((bitsperpixel == 8) && (photometric != PHOTOMETRIC_PALETTE)) || (bitsperpixel == 24)) { + if (((bitsperpixel == 8) && (photometric != PHOTOMETRIC_PALETTE)) || (bitsperpixel == 24)) { compression = COMPRESSION_JPEG; // RowsPerStrip must be multiple of 8 for JPEG uint32 rowsperstrip = (uint32) -1; @@ -736,7 +736,7 @@ WriteCompression(TIFF *tiff, uint16 bitspersample, uint16 samplesperpixel, uint1 // and many palette-color images. But natural 24-bit color images and some 8-bit // grayscale images do much better with differencing. - if((bitspersample == 8) || (bitspersample == 16)) { + if ((bitspersample == 8) || (bitspersample == 16)) { if ((bitsperpixel >= 8) && (photometric != PHOTOMETRIC_PALETTE)) { TIFFSetField(tiff, TIFFTAG_PREDICTOR, 2); } else { @@ -793,7 +793,7 @@ tiff_read_xmp_profile(TIFF *tiff, FIBITMAP *dib) { if (TIFFGetField(tiff, TIFFTAG_XMLPACKET, &profile_size, &profile) == 1) { // create a tag FITAG *tag = FreeImage_CreateTag(); - if(!tag) return FALSE; + if (!tag) return FALSE; FreeImage_SetTagID(tag, TIFFTAG_XMLPACKET); // 700 FreeImage_SetTagKey(tag, g_TagLib_XMPFieldName); @@ -832,7 +832,7 @@ tiff_read_exif_profile(TIFF *tiff, FIBITMAP *dib) { if(TIFFGetField(tiff, TIFFTAG_EXIFIFD, &exif_offset)) { // read EXIF tags - if(!TIFFReadEXIFDirectory(tiff, exif_offset)) { + if (!TIFFReadEXIFDirectory(tiff, exif_offset)) { return FALSE; } @@ -877,7 +877,7 @@ tiff_write_iptc_profile(TIFF *tiff, FIBITMAP *dib) { uint32 iptc_size = profile_size; iptc_size += (4-(iptc_size & 0x03)); // Round up for long word alignment BYTE *iptc_profile = (BYTE*)malloc(iptc_size); - if(!iptc_profile) { + if (!iptc_profile) { free(profile); return FALSE; } @@ -1046,7 +1046,7 @@ static void * DLL_CALLCONV Open(FreeImageIO *io, fi_handle handle, BOOL read) { // wrapper for TIFF I/O fi_TIFFIO *fio = (fi_TIFFIO*)malloc(sizeof(fi_TIFFIO)); - if(!fio) return NULL; + if (!fio) return NULL; fio->io = io; fio->handle = handle; @@ -1106,7 +1106,7 @@ IsValidBitsPerSample(uint16 photometric, uint16 bitspersample, uint16 samplesper switch(bitspersample) { case 1: case 4: - if((photometric == PHOTOMETRIC_MINISWHITE) || (photometric == PHOTOMETRIC_MINISBLACK) || (photometric == PHOTOMETRIC_PALETTE)) { + if ((photometric == PHOTOMETRIC_MINISWHITE) || (photometric == PHOTOMETRIC_MINISBLACK) || (photometric == PHOTOMETRIC_PALETTE)) { return TRUE; } else { return FALSE; @@ -1155,12 +1155,12 @@ FindLoadMethod(TIFF *tif, FREE_IMAGE_TYPE image_type, int flags) { switch(photometric) { // convert to 24 or 32 bits RGB if the image is full color case PHOTOMETRIC_RGB: - if((image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { + if ((image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { // load 48-bit RGB and 64-bit RGBA without conversion loadMethod = LoadAsGenericStrip; } else if(image_type == FIT_RGBF) { - if((samplesperpixel == 3) && (bitspersample == 16)) { + if ((samplesperpixel == 3) && (bitspersample == 16)) { // load 3 x 16-bit half as RGBF loadMethod = LoadAsHalfFloat; } @@ -1182,7 +1182,7 @@ FindLoadMethod(TIFF *tif, FREE_IMAGE_TYPE image_type, int flags) { // to avoid multiple conversions. Conversion can be done by changing // the profile from it's original CMYK to an RGB profile with an // apropriate color management system. Works with non-tiled TIFFs. - if(!bIsTiled) { + if (!bIsTiled) { loadMethod = LoadAsCMYK; } break; @@ -1192,7 +1192,7 @@ FindLoadMethod(TIFF *tif, FREE_IMAGE_TYPE image_type, int flags) { // When samplesperpixel = 2 and bitspersample = 8, set the image as a // 8-bit indexed image + 8-bit alpha layer image // and convert to a 8-bit image with a transparency table - if((samplesperpixel > 1) && (bitspersample == 8)) { + if ((samplesperpixel > 1) && (bitspersample == 8)) { loadMethod = LoadAs8BitTrns; } else { loadMethod = LoadAsGenericStrip; @@ -1203,7 +1203,7 @@ FindLoadMethod(TIFF *tif, FREE_IMAGE_TYPE image_type, int flags) { break; } - if((loadMethod == LoadAsGenericStrip) && bIsTiled) { + if ((loadMethod == LoadAsGenericStrip) && bIsTiled) { loadMethod = LoadAsTiled; } @@ -1249,7 +1249,7 @@ ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *tiff, FIBITMA // ... or read the first subIFD - if(!thumbnail) { + if (!thumbnail) { uint16 subIFD_count = 0; uint64* subIFD_offsets = NULL; // ### Theoretically this should also read the first subIFD from a Photoshop-created file with "pyramid". @@ -1276,7 +1276,7 @@ ReadThumbnail(FreeImageIO *io, fi_handle handle, void *data, TIFF *tiff, FIBITMA // ... or read Photoshop thumbnail - if(!thumbnail) { + if (!thumbnail) { uint32 ps_size = 0; void *ps_data = NULL; @@ -1399,7 +1399,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { uint32 *raster = NULL; - if(!header_only) { + if (!header_only) { raster = (uint32*)_TIFFmalloc(width * height * sizeof(uint32)); if (raster == NULL) { @@ -1443,7 +1443,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { ReadResolution(tif, dib); - if(!header_only) { + if (!header_only) { // read the raster lines and save them in the DIB // with RGB mode, we have to change the order of the 3 samples RGB @@ -1636,7 +1636,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { alpha = FreeImage_Allocate(width, height, 8); } - if(!alpha) { + if (!alpha) { FreeImage_OutputMessageProc(s_format_id, "Failed to allocate temporary alpha channel"); } else { alpha_bits = FreeImage_GetScanLine(alpha, height - 1); @@ -1658,7 +1658,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { ReadResolution(tif, dib); - if(!header_only) { + if (!header_only) { // calculate the line + pitch (separate for scr & dest) @@ -1706,7 +1706,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { for(BYTE *pixel = bits, *al_pixel = alpha_bits, *src_pixel = buf + l * src_line; pixel < bits + dib_pitch; pixel += dibBpp, al_pixel += alpha_Bpp, src_pixel += srcBpp) { // copy pixel byte by byte BYTE b = 0; - for( ; b < dibBpp; ++b) { + for ( ; b < dibBpp; ++b) { pixel[b] = src_pixel[b]; } // TODO write the remaining bytes to extra channel(s) @@ -1814,7 +1814,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { free(buf); - if(!asCMYK) { + if (!asCMYK) { ConvertCMYKtoRGBA(dib); // The ICC Profile is invalid, clear it @@ -1862,7 +1862,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { ReadPalette(tif, photometric, bitspersample, dib); - if(!header_only) { + if (!header_only) { // calculate the line + pitch (separate for scr & dest) const tmsize_t src_line = TIFFScanlineSize(tif); @@ -2000,7 +2000,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { ReadPalette(tif, photometric, bitspersample, dib); // get the tile geometry - if(!TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tileWidth) || !TIFFGetField(tif, TIFFTAG_TILELENGTH, &tileHeight)) { + if (!TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tileWidth) || !TIFFGetField(tif, TIFFTAG_TILELENGTH, &tileHeight)) { throw "Invalid tiled TIFF image"; } @@ -2142,7 +2142,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { ReadResolution(tif, dib); - if(!header_only) { + if (!header_only) { // calculate the line + pitch (separate for scr & dest) @@ -2268,7 +2268,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag bitspersample = bitsperpixel / samplesperpixel; photometric = GetPhotometric(dib); - if((bitsperpixel == 8) && FreeImage_IsTransparent(dib)) { + if ((bitsperpixel == 8) && FreeImage_IsTransparent(dib)) { // 8-bit transparent picture : convert later to 8-bit + 8-bit alpha samplesperpixel = 2; bitspersample = 8; @@ -2276,7 +2276,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag else if(bitsperpixel == 32) { // 32-bit images : check for CMYK or alpha transparency - if((((iccProfile->flags & FIICC_COLOR_IS_CMYK) == FIICC_COLOR_IS_CMYK) || ((flags & TIFF_CMYK) == TIFF_CMYK))) { + if ((((iccProfile->flags & FIICC_COLOR_IS_CMYK) == FIICC_COLOR_IS_CMYK) || ((flags & TIFF_CMYK) == TIFF_CMYK))) { // CMYK support photometric = PHOTOMETRIC_SEPARATED; TIFFSetField(out, TIFFTAG_INKSET, INKSET_CMYK); @@ -2301,7 +2301,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag samplesperpixel = 4; bitspersample = bitsperpixel / samplesperpixel; - if((((iccProfile->flags & FIICC_COLOR_IS_CMYK) == FIICC_COLOR_IS_CMYK) || ((flags & TIFF_CMYK) == TIFF_CMYK))) { + if ((((iccProfile->flags & FIICC_COLOR_IS_CMYK) == FIICC_COLOR_IS_CMYK) || ((flags & TIFF_CMYK) == TIFF_CMYK))) { // CMYK support photometric = PHOTOMETRIC_SEPARATED; TIFFSetField(out, TIFFTAG_INKSET, INKSET_CMYK); @@ -2321,7 +2321,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag samplesperpixel = 3; bitspersample = bitsperpixel / samplesperpixel; // the library converts to and from floating-point XYZ CIE values - if((flags & TIFF_LOGLUV) == TIFF_LOGLUV) { + if ((flags & TIFF_LOGLUV) == TIFF_LOGLUV) { photometric = PHOTOMETRIC_LOGLUV; TIFFSetField(out, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_FLOAT); // TIFFSetField(out, TIFFTAG_STONITS, 1.0); // assume unknown @@ -2421,7 +2421,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag // thumbnail tag - if((ifd == 0) && (ifdCount > 1)) { + if ((ifd == 0) && (ifdCount > 1)) { uint16 nsubifd = 1; uint64 subifd[1]; subifd[0] = 0; @@ -2442,7 +2442,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag case 4 : case 8 : { - if((bitsperpixel == 8) && FreeImage_IsTransparent(dib)) { + if ((bitsperpixel == 8) && FreeImage_IsTransparent(dib)) { // 8-bit transparent picture : convert to 8-bit + 8-bit alpha // get the transparency table @@ -2564,7 +2564,7 @@ SaveOneTIFF(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flag // write out the directory tag if we wrote a page other than -1 or if we have a thumbnail to write later - if( (page >= 0) || ((ifd == 0) && (ifdCount > 1)) ) { + if ( (page >= 0) || ((ifd == 0) && (ifdCount > 1)) ) { TIFFWriteDirectory(out); // else: TIFFClose will WriteDirectory } @@ -2594,7 +2594,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } bResult = SaveOneTIFF(io, bitmap, handle, page, flags, data, ifd, ifdCount); - if(!bResult) { + if (!bResult) { return FALSE; } } diff --git a/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp b/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp index 0aac48ca27..140029e862 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginXBM.cpp @@ -109,14 +109,14 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * while(!found_declaration && !eof) { - if( readLine(line, MAX_LINE, io, handle) == NULL) { + if ( readLine(line, MAX_LINE, io, handle) == NULL) { eof = TRUE; } else { - if( strlen( line ) == MAX_LINE - 1 ) + if ( strlen( line ) == MAX_LINE - 1 ) return( ERR_XBM_LINE ); - if( sscanf(line, "#define %s %d", name_and_type, &v) == 2 ) { - if( ( t = strrchr( name_and_type, '_' ) ) == NULL ) + if ( sscanf(line, "#define %s %d", name_and_type, &v) == 2 ) { + if ( ( t = strrchr( name_and_type, '_' ) ) == NULL ) t = name_and_type; else t++; @@ -127,11 +127,11 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * continue; } - if( sscanf( line, "static short %s = {", name_and_type ) == 1 ) { + if ( sscanf( line, "static short %s = {", name_and_type ) == 1 ) { version = 10; found_declaration = TRUE; } - else if( sscanf( line, "static char %s = {", name_and_type ) == 1 ) { + else if ( sscanf( line, "static char %s = {", name_and_type ) == 1 ) { version = 11; found_declaration = TRUE; } @@ -142,12 +142,12 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * } } - if(!found_declaration) + if (!found_declaration) return( ERR_XBM_DECL ); - if(*widthP == -1 ) + if (*widthP == -1 ) return( ERR_XBM_WIDTH ); - if( *heightP == -1 ) + if ( *heightP == -1 ) return( ERR_XBM_HEIGHT ); padding = 0; @@ -189,7 +189,7 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * hex_table['f'] = 15; if(version == 10) { - for( bytes = 0, ptr = *dataP; bytes < raster_length; bytes += 2 ) { + for ( bytes = 0, ptr = *dataP; bytes < raster_length; bytes += 2 ) { while( ( c1 = readChar(io, handle) ) != 'x' ) { if ( c1 == EOF ) return( ERR_XBM_EOFREAD ); @@ -197,14 +197,14 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * c1 = readChar(io, handle); c2 = readChar(io, handle); - if( c1 == EOF || c2 == EOF ) + if ( c1 == EOF || c2 == EOF ) return( ERR_XBM_EOFREAD ); value1 = ( hex_table[c1] << 4 ) + hex_table[c2]; if ( value1 >= 256 ) return( ERR_XBM_SYNTAX ); c1 = readChar(io, handle); c2 = readChar(io, handle); - if( c1 == EOF || c2 == EOF ) + if ( c1 == EOF || c2 == EOF ) return( ERR_XBM_EOFREAD ); value2 = ( hex_table[c1] << 4 ) + hex_table[c2]; if ( value2 >= 256 ) @@ -219,7 +219,7 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * /* ** skip until digit is found */ - for( ; ; ) { + for ( ; ; ) { c1 = readChar(io, handle); if ( c1 == EOF ) return( ERR_XBM_EOFREAD ); @@ -230,7 +230,7 @@ readXBMFile(FreeImageIO *io, fi_handle handle, int *widthP, int *heightP, char * /* ** loop on digits */ - for( ; ; ) { + for ( ; ; ) { c2 = readChar(io, handle); if ( c2 == EOF ) return( ERR_XBM_EOFREAD ); @@ -327,7 +327,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // allocate a new dib dib = FreeImage_Allocate(width, height, 1); - if(!dib) throw (char*)ERR_XBM_MEMORY; + if (!dib) throw (char*)ERR_XBM_MEMORY; // write the palette data RGBQUAD *pal = FreeImage_GetPalette(dib); @@ -347,7 +347,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { count = 0; mask = 1; } - if(*bP & mask) { + if (*bP & mask) { // Set bit(x, y) to 0 bits[x >> 3] &= (0xFF7F >> (x & 0x7)); } else { diff --git a/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp b/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp index a698321958..16db443c47 100644 --- a/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp +++ b/plugins/FreeImage/Source/FreeImage/PluginXPM.cpp @@ -53,7 +53,7 @@ FindChar(FreeImageIO *io, fi_handle handle, BYTE look_for) { BYTE c; io->read_proc(&c, sizeof(BYTE), 1, handle); while(c != look_for) { - if( io->read_proc(&c, sizeof(BYTE), 1, handle) != 1 ) + if ( io->read_proc(&c, sizeof(BYTE), 1, handle) != 1 ) return FALSE; } return TRUE; @@ -62,14 +62,14 @@ FindChar(FreeImageIO *io, fi_handle handle, BYTE look_for) { // find start of string, read data until ending quote found, allocate memory and return a string static char * ReadString(FreeImageIO *io, fi_handle handle) { - if( !FindChar(io, handle,'"') ) + if ( !FindChar(io, handle,'"') ) return NULL; BYTE c; std::string s; io->read_proc(&c, sizeof(BYTE), 1, handle); while(c != '"') { s += c; - if( io->read_proc(&c, sizeof(BYTE), 1, handle) != 1 ) + if ( io->read_proc(&c, sizeof(BYTE), 1, handle) != 1 ) return NULL; } char *cstr = (char *)malloc(s.length()+1); @@ -166,16 +166,16 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS; //find the starting brace - if( !FindChar(io, handle,'{') ) + if ( !FindChar(io, handle,'{') ) throw "Could not find starting brace"; //read info string str = ReadString(io, handle); - if(!str) + if (!str) throw "Error reading info string"; int width, height, colors, cpp; - if( sscanf(str, "%d %d %d %d", &width, &height, &colors, &cpp) != 4 ) { + if ( sscanf(str, "%d %d %d %d", &width, &height, &colors, &cpp) != 4 ) { free(str); throw "Improperly formed info string"; } @@ -193,7 +193,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FILE_RGBA rgba; str = ReadString(io, handle); - if(!str) + if (!str) throw "Error reading color strings"; std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars @@ -207,14 +207,14 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } //prefer the color visual - if( strstr(keys," c ") ) { + if ( strstr(keys," c ") ) { char *clr = strstr(keys," c ") + 3; while( *clr == ' ' ) clr++; //find the start of the hex rgb value - if( *clr == '#' ) { + if ( *clr == '#' ) { int red = 0, green = 0, blue = 0, n; clr++; //end string at first space, if any found - if( strchr(clr,' ') ) + if ( strchr(clr,' ') ) *(strchr(clr,' ')) = '\0'; //parse hex color, it can be #rgb #rrggbb #rrrgggbbb or #rrrrggggbbbb switch( strlen(clr) ) { @@ -239,14 +239,14 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { n = 0; break; } - if( n != 3 ) { + if ( n != 3 ) { free(str); throw "Improperly formed hex color value"; } rgba.r = (BYTE)red; rgba.g = (BYTE)green; rgba.b = (BYTE)blue; - } else if( !strncmp(clr,"None",4) || !strncmp(clr,"none",4) ) { + } else if ( !strncmp(clr,"None",4) || !strncmp(clr,"none",4) ) { rgba.r = rgba.g = rgba.b = 0xFF; } else { char *tmp = clr; @@ -256,8 +256,8 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { //part of the color name. How many named color end with a 1 or 2 character //word? Probably none in our list at least. while( (tmp = strchr(tmp,' ')) != NULL ) { - if( tmp[1] != ' ' ) { - if( (tmp[2] == ' ') || (tmp[2] != ' ' && tmp[3] == ' ') ) { + if ( tmp[1] != ' ' ) { + if ( (tmp[2] == ' ') || (tmp[2] != ' ' && tmp[3] == ' ') ) { tmp[0] = '\0'; break; } @@ -288,7 +288,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { rawpal[chrs] = rgba; //build palette if needed - if( colors <= 256 ) { + if ( colors <= 256 ) { RGBQUAD *pal = FreeImage_GetPalette(dib); pal[i].rgbBlue = rgba.b; pal[i].rgbGreen = rgba.g; @@ -308,7 +308,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { for(int y = 0; y < height; y++ ) { BYTE *line = FreeImage_GetScanLine(dib, height - y - 1); str = ReadString(io, handle); - if(!str) + if (!str) throw "Error reading pixel strings"; char *pixel_ptr = str; @@ -317,7 +317,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { std::string chrs(pixel_ptr,cpp); FILE_RGBA rgba = rawpal[chrs]; - if( colors > 256 ) { + if ( colors > 256 ) { line[FI_RGBA_BLUE] = rgba.b; line[FI_RGBA_GREEN] = rgba.g; line[FI_RGBA_RED] = rgba.r; @@ -338,7 +338,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } catch(const char *text) { FreeImage_OutputMessageProc(s_format_id, text); - if( dib != NULL ) + if ( dib != NULL ) FreeImage_Unload(dib); return NULL; @@ -355,7 +355,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void footer[] = "\"\n};\n", buf[256]; //256 is more then enough to sprintf 4 ints into, or the base-92 chars and #rrggbb line - if( io->write_proc(header, (unsigned int)strlen(header), 1, handle) != 1 ) + if ( io->write_proc(header, (unsigned int)strlen(header), 1, handle) != 1 ) return FALSE; int width = FreeImage_GetWidth(dib), height = FreeImage_GetHeight(dib), bpp = FreeImage_GetBPP(dib); @@ -378,7 +378,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void for(x = 0; x < width; x++ ) { FILE_RGB rgb; DWORDRGBA u; - if( bpp > 8 ) { + if ( bpp > 8 ) { u.rgba.b = rgb.b = line[FI_RGBA_BLUE]; u.rgba.g = rgb.g = line[FI_RGBA_GREEN]; u.rgba.r = rgb.r = line[FI_RGBA_RED]; @@ -391,7 +391,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void rgb.r = pal[u.index].rgbRed; line++; } - if( color2chrs.find(u.index) == color2chrs.end() ) { //new color + if ( color2chrs.find(u.index) == color2chrs.end() ) { //new color std::string chrs(Base92(num_colors)); color2chrs[u.index] = chrs; chrs2color[num_colors] = rgb; @@ -403,22 +403,22 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void int cpp = (int)(log((double)num_colors)/log(92.0)) + 1; sprintf(buf, "%d %d %d %d", FreeImage_GetWidth(dib), FreeImage_GetHeight(dib), num_colors, cpp ); - if( io->write_proc(buf, (unsigned int)strlen(buf), 1, handle) != 1 ) + if ( io->write_proc(buf, (unsigned int)strlen(buf), 1, handle) != 1 ) return FALSE; - if( io->write_proc(start_colors, (unsigned int)strlen(start_colors), 1, handle) != 1 ) + if ( io->write_proc(start_colors, (unsigned int)strlen(start_colors), 1, handle) != 1 ) return FALSE; //write colors, using map of chrs->rgb for(x = 0; x < num_colors; x++ ) { sprintf(buf, "%*s c #%02x%02x%02x", cpp, Base92(x), chrs2color[x].r, chrs2color[x].g, chrs2color[x].b ); - if( io->write_proc(buf, (unsigned int)strlen(buf), 1, handle) != 1 ) + if ( io->write_proc(buf, (unsigned int)strlen(buf), 1, handle) != 1 ) return FALSE; - if( x == num_colors - 1 ) { - if( io->write_proc(start_pixels, (unsigned int)strlen(start_pixels), 1, handle) != 1 ) + if ( x == num_colors - 1 ) { + if ( io->write_proc(start_pixels, (unsigned int)strlen(start_pixels), 1, handle) != 1 ) return FALSE; } else { - if( io->write_proc(new_line, (unsigned int)strlen(new_line), 1, handle) != 1 ) + if ( io->write_proc(new_line, (unsigned int)strlen(new_line), 1, handle) != 1 ) return FALSE; } } @@ -429,7 +429,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void BYTE *line = FreeImage_GetScanLine(dib, height - y - 1); for(x = 0; x < width; x++ ) { DWORDRGBA u; - if( bpp > 8 ) { + if ( bpp > 8 ) { u.rgba.b = line[FI_RGBA_BLUE]; u.rgba.g = line[FI_RGBA_GREEN]; u.rgba.r = line[FI_RGBA_RED]; @@ -440,14 +440,14 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void line++; } sprintf(buf, "%*s", cpp, (char *)color2chrs[u.index].c_str()); - if( io->write_proc(buf, cpp, 1, handle) != 1 ) + if ( io->write_proc(buf, cpp, 1, handle) != 1 ) return FALSE; } - if( y == height - 1 ) { - if( io->write_proc(footer, (unsigned int)strlen(footer), 1, handle) != 1 ) + if ( y == height - 1 ) { + if ( io->write_proc(footer, (unsigned int)strlen(footer), 1, handle) != 1 ) return FALSE; } else { - if( io->write_proc(new_line, (unsigned int)strlen(new_line), 1, handle) != 1 ) + if ( io->write_proc(new_line, (unsigned int)strlen(new_line), 1, handle) != 1 ) return FALSE; } } diff --git a/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp b/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp index 27f8c95a07..33ae08ea59 100644 --- a/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp +++ b/plugins/FreeImage/Source/FreeImage/ToneMapping.cpp @@ -38,7 +38,7 @@ FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param, dou switch(tmo) { // Adaptive logarithmic mapping (F. Drago, 2003) case FITMO_DRAGO03: - if((first_param == 0) && (second_param == 0)) { + if ((first_param == 0) && (second_param == 0)) { // use default values (gamma = 2.2, exposure = 0) return FreeImage_TmoDrago03(dib, 2.2, 0); } else { @@ -48,7 +48,7 @@ FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param, dou break; // Dynamic range reduction inspired by photoreceptor phhysiology (E. Reinhard, 2005) case FITMO_REINHARD05: - if((first_param == 0) && (second_param == 0)) { + if ((first_param == 0) && (second_param == 0)) { // use default values by setting intensity to 0 and contrast to 0 return FreeImage_TmoReinhard05(dib, 0, 0); } else { @@ -58,7 +58,7 @@ FreeImage_ToneMapping(FIBITMAP *dib, FREE_IMAGE_TMO tmo, double first_param, dou break; // Gradient Domain HDR Compression (R. Fattal, 2002) case FITMO_FATTAL02: - if((first_param == 0) && (second_param == 0)) { + if ((first_param == 0) && (second_param == 0)) { // use default values by setting color saturation to 0.5 and attenuation to 0.85 return FreeImage_TmoFattal02(dib, 0.5, 0.85); } else { diff --git a/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp b/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp index 041eae368b..532fbfc3e6 100644 --- a/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp +++ b/plugins/FreeImage/Source/FreeImage/WuQuantizer.cpp @@ -66,7 +66,7 @@ WuQuantizer::WuQuantizer(FIBITMAP *dib) { // Allocate Qadd Qadd = (WORD *)malloc(sizeof(WORD) * width * height); - if(!gm2 || !wt || !mr || !mg || !mb || !Qadd) { + if (!gm2 || !wt || !mr || !mg || !mb || !Qadd) { if(gm2) free(gm2); if(wt) free(wt); if(mr) free(mr); @@ -127,10 +127,10 @@ WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int R } } - if( ReserveSize > 0 ) { + if ( ReserveSize > 0 ) { int max = 0; for(i = 0; i < SIZE_3D; i++) { - if( vwt[i] > max ) max = vwt[i]; + if ( vwt[i] > max ) max = vwt[i]; } max++; for(i = 0; i < ReserveSize; i++) { diff --git a/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp b/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp index 66869b2806..c40ee29c60 100644 --- a/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp +++ b/plugins/FreeImage/Source/FreeImage/tmoColorConvert.cpp @@ -275,7 +275,7 @@ ClampConvertRGBFTo24(FIBITMAP *src) { const unsigned height = FreeImage_GetHeight(src); FIBITMAP *dst = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!dst) return NULL; + if (!dst) return NULL; const unsigned src_pitch = FreeImage_GetPitch(src); const unsigned dst_pitch = FreeImage_GetPitch(dst); @@ -321,7 +321,7 @@ ConvertRGBFToY(FIBITMAP *src) { const unsigned height = FreeImage_GetHeight(src); FIBITMAP *dst = FreeImage_AllocateT(FIT_FLOAT, width, height); - if(!dst) return NULL; + if (!dst) return NULL; const unsigned src_pitch = FreeImage_GetPitch(src); const unsigned dst_pitch = FreeImage_GetPitch(dst); @@ -444,7 +444,7 @@ NormalizeY(FIBITMAP *Y, float minPrct, float maxPrct) { int pitch = FreeImage_GetPitch(Y); // find max & min luminance values - if((minPrct > 0) || (maxPrct < 1)) { + if ((minPrct > 0) || (maxPrct < 1)) { maxLum = 0, minLum = 0; findMaxMinPercentile(Y, minPrct, &minLum, maxPrct, &maxLum); } else { diff --git a/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp b/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp index a61534474d..b820bb3577 100644 --- a/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp +++ b/plugins/FreeImage/Source/FreeImage/tmoDrago03.cpp @@ -258,13 +258,13 @@ FIBITMAP* DLL_CALLCONV FreeImage_TmoDrago03(FIBITMAP *src, double gamma, double exposure) { float maxLum, minLum, avgLum; - if(!FreeImage_HasPixels(src)) return NULL; + if (!FreeImage_HasPixels(src)) return NULL; // working RGBF variable FIBITMAP *dib = NULL; dib = FreeImage_ConvertToRGBF(src); - if(!dib) return NULL; + if (!dib) return NULL; // default algorithm parameters const float biasParam = 0.85F; diff --git a/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp b/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp index c458246c6f..71be370b3e 100644 --- a/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp +++ b/plugins/FreeImage/Source/FreeImage/tmoFattal02.cpp @@ -54,7 +54,7 @@ static FIBITMAP* GaussianLevel5x5(FIBITMAP *dib) { h_dib = FreeImage_AllocateT(image_type, width, height); v_dib = FreeImage_AllocateT(image_type, width, height); - if(!h_dib || !v_dib) throw(1); + if (!h_dib || !v_dib) throw(1); const unsigned pitch = FreeImage_GetPitch(dib) / sizeof(float); @@ -166,7 +166,7 @@ static FIBITMAP* GradientLevel(FIBITMAP *H, float *avgGrad, int k) { const unsigned height = FreeImage_GetHeight(H); G = FreeImage_AllocateT(image_type, width, height); - if(!G) throw(1); + if (!G) throw(1); const unsigned pitch = FreeImage_GetPitch(H) / sizeof(float); @@ -246,7 +246,7 @@ static FIBITMAP* PhiMatrix(FIBITMAP **gradients, float *avgGrad, int nlevels, fl try { phi = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*)); - if(!phi) throw(1); + if (!phi) throw(1); memset(phi, 0, nlevels * sizeof(FIBITMAP*)); for(int k = nlevels-1; k >= 0; k--) { @@ -266,7 +266,7 @@ static FIBITMAP* PhiMatrix(FIBITMAP **gradients, float *avgGrad, int nlevels, fl if(ALPHA == 0) ALPHA = EPSILON; phi[k] = FreeImage_AllocateT(FIT_FLOAT, width, height); - if(!phi[k]) throw(1); + if (!phi[k]) throw(1); src_pixel = (float*)FreeImage_GetBits(Gk); dst_pixel = (float*)FreeImage_GetBits(phi[k]); @@ -285,7 +285,7 @@ static FIBITMAP* PhiMatrix(FIBITMAP **gradients, float *avgGrad, int nlevels, fl if(k < nlevels-1) { // compute PHI(k) = L( PHI(k+1) ) * phi(k) FIBITMAP *L = FreeImage_Rescale(phi[k+1], width, height, FILTER_BILINEAR); - if(!L) throw(1); + if (!L) throw(1); src_pixel = (float*)FreeImage_GetBits(L); dst_pixel = (float*)FreeImage_GetBits(phi[k]); @@ -345,9 +345,9 @@ static FIBITMAP* Divergence(FIBITMAP *H, FIBITMAP *PHI) { const unsigned height = FreeImage_GetHeight(H); Gx = FreeImage_AllocateT(image_type, width, height); - if(!Gx) throw(1); + if (!Gx) throw(1); Gy = FreeImage_AllocateT(image_type, width, height); - if(!Gy) throw(1); + if (!Gy) throw(1); const unsigned pitch = FreeImage_GetPitch(H) / sizeof(float); @@ -377,7 +377,7 @@ static FIBITMAP* Divergence(FIBITMAP *H, FIBITMAP *PHI) { // calculate the divergence divG = FreeImage_AllocateT(image_type, width, height); - if(!divG) throw(1); + if (!divG) throw(1); gx = (float*)FreeImage_GetBits(Gx); gy = (float*)FreeImage_GetBits(Gy); @@ -421,7 +421,7 @@ static FIBITMAP* LogLuminance(FIBITMAP *Y) { try { // get the luminance channel FIBITMAP *H = FreeImage_Clone(Y); - if(!H) throw(1); + if (!H) throw(1); const unsigned width = FreeImage_GetWidth(H); const unsigned height = FreeImage_GetHeight(H); @@ -509,7 +509,7 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) { try { // get the normalized luminance FIBITMAP *H = LogLuminance(Y); - if(!H) throw(1); + if (!H) throw(1); // get the number of levels for the pyramid const unsigned width = FreeImage_GetWidth(H); @@ -522,19 +522,19 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) { // create the Gaussian pyramid pyramid = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*)); - if(!pyramid) throw(1); + if (!pyramid) throw(1); memset(pyramid, 0, nlevels * sizeof(FIBITMAP*)); - if(!GaussianPyramid(H, pyramid, nlevels)) throw(1); + if (!GaussianPyramid(H, pyramid, nlevels)) throw(1); // calculate gradient magnitude and its average value on each pyramid level gradients = (FIBITMAP**)malloc(nlevels * sizeof(FIBITMAP*)); - if(!gradients) throw(1); + if (!gradients) throw(1); memset(gradients, 0, nlevels * sizeof(FIBITMAP*)); avgGrad = (float*)malloc(nlevels * sizeof(float)); - if(!avgGrad) throw(1); + if (!avgGrad) throw(1); - if(!GradientPyramid(pyramid, nlevels, gradients, avgGrad)) throw(1); + if (!GradientPyramid(pyramid, nlevels, gradients, avgGrad)) throw(1); // free the Gaussian pyramid for(k = 0; k < nlevels; k++) { @@ -544,7 +544,7 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) { // compute the gradient attenuation function PHI(x, y) phy = PhiMatrix(gradients, avgGrad, nlevels, alpha, beta); - if(!phy) throw(1); + if (!phy) throw(1); // free the gradient pyramid for(k = 0; k < nlevels; k++) { @@ -556,7 +556,7 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) { // compute gradients in x and y directions, attenuate them with the attenuation matrix, // then compute the divergence div G from the attenuated gradient. divG = Divergence(H, phy); - if(!divG) throw(1); + if (!divG) throw(1); // H & phy no longer needed FreeImage_Unload(H); H = NULL; @@ -564,7 +564,7 @@ static FIBITMAP* tmoFattal02(FIBITMAP *Y, float alpha, float beta) { // solve the PDE (Poisson equation) using a multigrid solver and 3 cycles FIBITMAP *U = FreeImage_MultigridPoissonSolver(divG, 3); - if(!U) throw(1); + if (!U) throw(1); FreeImage_Unload(divG); @@ -618,21 +618,21 @@ FreeImage_TmoFattal02(FIBITMAP *dib, double color_saturation, double attenuation FIBITMAP *Yout = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; try { // convert to RGBF src = FreeImage_ConvertToRGBF(dib); - if(!src) throw(1); + if (!src) throw(1); // get the luminance channel Yin = ConvertRGBFToY(src); - if(!Yin) throw(1); + if (!Yin) throw(1); // perform the tone mapping Yout = tmoFattal02(Yin, alpha, beta); - if(!Yout) throw(1); + if (!Yout) throw(1); // clip low and high values and normalize to [0..1] //NormalizeY(Yout, 0.001F, 0.995F); diff --git a/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp b/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp index f91b41c062..dfa6553806 100644 --- a/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp +++ b/plugins/FreeImage/Source/FreeImage/tmoReinhard05.cpp @@ -59,7 +59,7 @@ ToneMappingReinhard05(FIBITMAP *dib, FIBITMAP *Y, float f, float m, float a, flo // check input parameters - if((FreeImage_GetImageType(dib) != FIT_RGBF) || (FreeImage_GetImageType(Y) != FIT_FLOAT)) { + if ((FreeImage_GetImageType(dib) != FIT_RGBF) || (FreeImage_GetImageType(Y) != FIT_FLOAT)) { return FALSE; } @@ -81,7 +81,7 @@ ToneMappingReinhard05(FIBITMAP *dib, FIBITMAP *Y, float f, float m, float a, flo // get statistics about the data (but only if its really needed) f = exp(-f); - if((m == 0) || (a != 1) && (c != 1)) { + if ((m == 0) || (a != 1) && (c != 1)) { // avoid these calculations if its not needed after ... LuminanceFromY(Y, &maxLum, &minLum, &Lav, &Llav); k = (log(maxLum) - Llav) / (log(maxLum) - log(minLum)); @@ -103,7 +103,7 @@ ToneMappingReinhard05(FIBITMAP *dib, FIBITMAP *Y, float f, float m, float a, flo bits = (BYTE*)FreeImage_GetBits(dib); Ybits = (BYTE*)FreeImage_GetBits(Y); - if((a == 1) && (c == 0)) { + if ((a == 1) && (c == 0)) { // when using default values, use a fastest code for(y = 0; y < height; y++) { @@ -131,7 +131,7 @@ ToneMappingReinhard05(FIBITMAP *dib, FIBITMAP *Y, float f, float m, float a, flo // channel averages Cav[0] = Cav[1] = Cav[2] = 0; - if((a != 1) && (c != 0)) { + if ((a != 1) && (c != 0)) { // channel averages are not needed when (a == 1) or (c == 0) bits = (BYTE*)FreeImage_GetBits(dib); for(y = 0; y < height; y++) { @@ -215,17 +215,17 @@ User parameters control intensity, contrast, and level of adaptation */ FIBITMAP* DLL_CALLCONV FreeImage_TmoReinhard05Ex(FIBITMAP *src, double intensity, double contrast, double adaptation, double color_correction) { - if(!FreeImage_HasPixels(src)) return NULL; + if (!FreeImage_HasPixels(src)) return NULL; // working RGBF variable FIBITMAP *dib = NULL, *Y = NULL; dib = FreeImage_ConvertToRGBF(src); - if(!dib) return NULL; + if (!dib) return NULL; // get the Luminance channel Y = ConvertRGBFToY(dib); - if(!Y) { + if (!Y) { FreeImage_Unload(dib); return NULL; } diff --git a/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp b/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp index 690db87d8c..e4be1d0bd2 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/BSplineRotate.cpp @@ -556,7 +556,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x // allocate output image FIBITMAP *dst = FreeImage_Allocate(width, height, bpp); - if(!dst) + if (!dst) return NULL; // buid a grey scale palette RGBQUAD *pal = FreeImage_GetPalette(dst); @@ -566,7 +566,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x // allocate a temporary array ImageRasterArray = (double*)malloc(width * height * sizeof(double)); - if(!ImageRasterArray) { + if (!ImageRasterArray) { FreeImage_Unload(dst); return NULL; } @@ -583,7 +583,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x // convert between a representation based on image samples // and a representation based on image B-spline coefficients bResult = SamplesToCoefficients(ImageRasterArray, width, height, spline); - if(!bResult) { + if (!bResult) { FreeImage_Unload(dst); free(ImageRasterArray); return NULL; @@ -611,7 +611,7 @@ Rotate8Bit(FIBITMAP *dib, double angle, double x_shift, double y_shift, double x x1 = x0 + a11 * (double)x; y1 = y0 + a21 * (double)x; if(use_mask) { - if((x1 <= -0.5) || (((double)width - 0.5) <= x1) || (y1 <= -0.5) || (((double)height - 0.5) <= y1)) { + if ((x1 <= -0.5) || (((double)width - 0.5) <= x1) || (y1 <= -0.5) || (((double)height - 0.5) <= y1)) { p = 0; } else { @@ -652,7 +652,7 @@ FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, BYTE *src_bits, *dst_bits; FIBITMAP *src8 = NULL, *dst8 = NULL, *dst = NULL; - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; try { @@ -666,20 +666,20 @@ FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, } return dst_8; } - if((bpp == 24) || (bpp == 32)) { + if ((bpp == 24) || (bpp == 32)) { // allocate dst image int width = FreeImage_GetWidth(dib); int height = FreeImage_GetHeight(dib); - if( bpp == 24 ) { + if ( bpp == 24 ) { dst = FreeImage_Allocate(width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } else { dst = FreeImage_Allocate(width, height, bpp, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); } - if(!dst) throw(1); + if (!dst) throw(1); // allocate a temporary 8-bit dib (no need to build a palette) src8 = FreeImage_Allocate(width, height, 8); - if(!src8) throw(1); + if (!src8) throw(1); // process each channel separately // ------------------------------- @@ -698,7 +698,7 @@ FreeImage_RotateEx(FIBITMAP *dib, double angle, double x_shift, double y_shift, // process channel dst8 = Rotate8Bit(src8, angle, x_shift, y_shift, x_origin, y_origin, ROTATE_CUBIC, use_mask); - if(!dst8) throw(1); + if (!dst8) throw(1); // insert channel to destination dib for(y = 0; y < height; y++) { diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp b/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp index 5f01ad815f..f6e6c5509c 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/Channels.cpp @@ -31,7 +31,7 @@ FIBITMAP * DLL_CALLCONV FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { - if(!FreeImage_HasPixels(src)) return NULL; + if (!FreeImage_HasPixels(src)) return NULL; FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(src); unsigned bpp = FreeImage_GetBPP(src); @@ -63,7 +63,7 @@ FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { unsigned width = FreeImage_GetWidth(src); unsigned height = FreeImage_GetHeight(src); FIBITMAP *dst = FreeImage_Allocate(width, height, 8) ; - if(!dst) return NULL; + if (!dst) return NULL; // build a greyscale palette RGBQUAD *pal = FreeImage_GetPalette(dst); for(int i = 0; i < 256; i++) { @@ -90,7 +90,7 @@ FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { } // 48-bit RGB or 64-bit RGBA images - if((image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { + if ((image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { int c; // select the channel to extract (always RGB[A]) @@ -116,7 +116,7 @@ FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { unsigned width = FreeImage_GetWidth(src); unsigned height = FreeImage_GetHeight(src); FIBITMAP *dst = FreeImage_AllocateT(FIT_UINT16, width, height) ; - if(!dst) return NULL; + if (!dst) return NULL; // perform extraction @@ -138,7 +138,7 @@ FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { } // 96-bit RGBF or 128-bit RGBAF images - if((image_type == FIT_RGBF) || (image_type == FIT_RGBAF)) { + if ((image_type == FIT_RGBF) || (image_type == FIT_RGBAF)) { int c; // select the channel to extract (always RGB[A]) @@ -164,7 +164,7 @@ FreeImage_GetChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { unsigned width = FreeImage_GetWidth(src); unsigned height = FreeImage_GetHeight(src); FIBITMAP *dst = FreeImage_AllocateT(FIT_FLOAT, width, height) ; - if(!dst) return NULL; + if (!dst) return NULL; // perform extraction @@ -199,32 +199,32 @@ BOOL DLL_CALLCONV FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { int c; - if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; + if (!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; // src and dst images should have the same width and height unsigned src_width = FreeImage_GetWidth(src); unsigned src_height = FreeImage_GetHeight(src); unsigned dst_width = FreeImage_GetWidth(dst); unsigned dst_height = FreeImage_GetHeight(dst); - if((src_width != dst_width) || (src_height != dst_height)) + if ((src_width != dst_width) || (src_height != dst_height)) return FALSE; // src image should be grayscale, dst image should be RGB or RGBA FREE_IMAGE_COLOR_TYPE src_type = FreeImage_GetColorType(src); FREE_IMAGE_COLOR_TYPE dst_type = FreeImage_GetColorType(dst); - if((dst_type != FIC_RGB) && (dst_type != FIC_RGBALPHA) || (src_type != FIC_MINISBLACK)) { + if ((dst_type != FIC_RGB) && (dst_type != FIC_RGBALPHA) || (src_type != FIC_MINISBLACK)) { return FALSE; } FREE_IMAGE_TYPE src_image_type = FreeImage_GetImageType(src); FREE_IMAGE_TYPE dst_image_type = FreeImage_GetImageType(dst); - if((dst_image_type == FIT_BITMAP) && (src_image_type == FIT_BITMAP)) { + if ((dst_image_type == FIT_BITMAP) && (src_image_type == FIT_BITMAP)) { // src image should be grayscale, dst image should be 24- or 32-bit unsigned src_bpp = FreeImage_GetBPP(src); unsigned dst_bpp = FreeImage_GetBPP(dst); - if((src_bpp != 8) || (dst_bpp != 24) && (dst_bpp != 32)) + if ((src_bpp != 8) || (dst_bpp != 24) && (dst_bpp != 32)) return FALSE; @@ -263,12 +263,12 @@ FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL chan return TRUE; } - if(((dst_image_type == FIT_RGB16) || (dst_image_type == FIT_RGBA16)) && (src_image_type == FIT_UINT16)) { + if (((dst_image_type == FIT_RGB16) || (dst_image_type == FIT_RGBA16)) && (src_image_type == FIT_UINT16)) { // src image should be grayscale, dst image should be 48- or 64-bit unsigned src_bpp = FreeImage_GetBPP(src); unsigned dst_bpp = FreeImage_GetBPP(dst); - if((src_bpp != 16) || (dst_bpp != 48) && (dst_bpp != 64)) + if ((src_bpp != 16) || (dst_bpp != 48) && (dst_bpp != 64)) return FALSE; @@ -307,12 +307,12 @@ FreeImage_SetChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL chan return TRUE; } - if(((dst_image_type == FIT_RGBF) || (dst_image_type == FIT_RGBAF)) && (src_image_type == FIT_FLOAT)) { + if (((dst_image_type == FIT_RGBF) || (dst_image_type == FIT_RGBAF)) && (src_image_type == FIT_FLOAT)) { // src image should be grayscale, dst image should be 96- or 128-bit unsigned src_bpp = FreeImage_GetBPP(src); unsigned dst_bpp = FreeImage_GetBPP(dst); - if((src_bpp != 32) || (dst_bpp != 96) && (dst_bpp != 128)) + if ((src_bpp != 32) || (dst_bpp != 96) && (dst_bpp != 128)) return FALSE; @@ -367,14 +367,14 @@ FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { double *dst_bits = NULL; FIBITMAP *dst = NULL; - if(!FreeImage_HasPixels(src)) return NULL; + if (!FreeImage_HasPixels(src)) return NULL; if(FreeImage_GetImageType(src) == FIT_COMPLEX) { // allocate a dib of type FIT_DOUBLE unsigned width = FreeImage_GetWidth(src); unsigned height = FreeImage_GetHeight(src); dst = FreeImage_AllocateT(FIT_DOUBLE, width, height) ; - if(!dst) return NULL; + if (!dst) return NULL; // perform extraction @@ -415,7 +415,7 @@ FreeImage_GetComplexChannel(FIBITMAP *src, FREE_IMAGE_COLOR_CHANNEL channel) { src_bits = (FICOMPLEX *)FreeImage_GetScanLine(src, y); dst_bits = (double *)FreeImage_GetScanLine(dst, y); for(x = 0; x < width; x++) { - if((src_bits[x].r == 0) && (src_bits[x].i == 0)) { + if ((src_bits[x].r == 0) && (src_bits[x].i == 0)) { phase = 0; } else { phase = atan2(src_bits[x].i, src_bits[x].r); @@ -446,12 +446,12 @@ FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANN double *src_bits = NULL; FICOMPLEX *dst_bits = NULL; - if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; + if (!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; // src image should be of type FIT_DOUBLE, dst image should be of type FIT_COMPLEX const FREE_IMAGE_TYPE src_type = FreeImage_GetImageType(src); const FREE_IMAGE_TYPE dst_type = FreeImage_GetImageType(dst); - if((src_type != FIT_DOUBLE) || (dst_type != FIT_COMPLEX)) + if ((src_type != FIT_DOUBLE) || (dst_type != FIT_COMPLEX)) return FALSE; // src and dst images should have the same width and height @@ -459,7 +459,7 @@ FreeImage_SetComplexChannel(FIBITMAP *dst, FIBITMAP *src, FREE_IMAGE_COLOR_CHANN unsigned src_height = FreeImage_GetHeight(src); unsigned dst_width = FreeImage_GetWidth(dst); unsigned dst_height = FreeImage_GetHeight(dst); - if((src_width != dst_width) || (src_height != dst_height)) + if ((src_width != dst_width) || (src_height != dst_height)) return FALSE; // select the channel to modify diff --git a/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp b/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp index 83c2f92123..7046a4acc9 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/ClassicRotate.cpp @@ -63,7 +63,7 @@ HorizontalSkewT(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double weigh // background const T pxlBlack[4] = {0, 0, 0, 0 }; const T *pxlBkg = static_cast(bkcolor); // assume at least bytespp and 4*sizeof(T) max - if(!pxlBkg) { + if (!pxlBkg) { // default background color is black pxlBkg = pxlBlack; } @@ -98,7 +98,7 @@ HorizontalSkewT(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double weigh } // check boundaries iXPos = i + iOffset; - if((iXPos >= 0) && (iXPos < (int)dst_width)) { + if ((iXPos >= 0) && (iXPos < (int)dst_width)) { // update left over on source for(unsigned j = 0; j < samples; j++) { pxlSrc[j] = pxlSrc[j] - (pxlLeft[j] - pxlOldLeft[j]); @@ -115,7 +115,7 @@ HorizontalSkewT(FIBITMAP *src, FIBITMAP *dst, int row, int iOffset, double weigh // go to rightmost point of skew iXPos = src_width + iOffset; - if((iXPos >= 0) && (iXPos < (int)dst_width)) { + if ((iXPos >= 0) && (iXPos < (int)dst_width)) { dst_bits = FreeImage_GetScanLine(dst, row) + iXPos * bytespp; // If still in image bounds, put leftovers there @@ -194,7 +194,7 @@ VerticalSkewT(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double weight, // background const T pxlBlack[4] = {0, 0, 0, 0 }; const T *pxlBkg = static_cast(bkcolor); // assume at least bytespp and 4*sizeof(T) max - if(!pxlBkg) { + if (!pxlBkg) { // default background color is black pxlBkg = pxlBlack; } @@ -235,7 +235,7 @@ VerticalSkewT(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double weight, } // check boundaries iYPos = i + iOffset; - if((iYPos >= 0) && (iYPos < (int)dst_height)) { + if ((iYPos >= 0) && (iYPos < (int)dst_height)) { // update left over on source for(unsigned j = 0; j < samples; j++) { pxlSrc[j] = pxlSrc[j] - (pxlLeft[j] - pxlOldLeft[j]); @@ -252,7 +252,7 @@ VerticalSkewT(FIBITMAP *src, FIBITMAP *dst, int col, int iOffset, double weight, // go to bottom point of skew iYPos = src_height + iOffset; - if((iYPos >= 0) && (iYPos < (int)dst_height)) { + if ((iYPos >= 0) && (iYPos < (int)dst_height)) { dst_bits = FreeImage_GetScanLine(dst, iYPos) + index; // if still in image bounds, put leftovers there @@ -367,7 +367,7 @@ Rotate90(FIBITMAP *src) { } } } - else if((bpp == 8) || (bpp == 24) || (bpp == 32)) { + else if ((bpp == 8) || (bpp == 24) || (bpp == 32)) { // anything other than BW : // This optimized version of rotation rotates image by smaller blocks. It is quite // a bit faster than obvious algorithm, because it produces much less CPU cache misses. @@ -472,7 +472,7 @@ Rotate180(FIBITMAP *src) { } break; } - // else if((bpp == 8) || (bpp == 24) || (bpp == 32)) FALL TROUGH + // else if ((bpp == 8) || (bpp == 24) || (bpp == 32)) FALL TROUGH case FIT_UINT16: case FIT_RGB16: case FIT_RGBA16: @@ -559,7 +559,7 @@ Rotate270(FIBITMAP *src) { } } } - else if((bpp == 8) || (bpp == 24) || (bpp == 32)) { + else if ((bpp == 8) || (bpp == 24) || (bpp == 32)) { // anything other than BW : // This optimized version of rotation rotates image by smaller blocks. It is quite // a bit faster than obvious algorithm, because it produces much less CPU cache misses. @@ -767,7 +767,7 @@ RotateAny(FIBITMAP *src, double dAngle, const void *bkcolor) { // Bring angle to range of [0 .. 360) dAngle += 360; } - if((dAngle > 45) && (dAngle <= 135)) { + if ((dAngle > 45) && (dAngle <= 135)) { // Angle in (45 .. 135] // Rotate image by 90 degrees into temporary image, // so it requires only an extra rotation angle @@ -775,7 +775,7 @@ RotateAny(FIBITMAP *src, double dAngle, const void *bkcolor) { image = Rotate90(src); dAngle -= 90; } - else if((dAngle > 135) && (dAngle <= 225)) { + else if ((dAngle > 135) && (dAngle <= 225)) { // Angle in (135 .. 225] // Rotate image by 180 degrees into temporary image, // so it requires only an extra rotation angle @@ -783,7 +783,7 @@ RotateAny(FIBITMAP *src, double dAngle, const void *bkcolor) { image = Rotate180(src); dAngle -= 180; } - else if((dAngle > 225) && (dAngle <= 315)) { + else if ((dAngle > 225) && (dAngle <= 315)) { // Angle in (225 .. 315] // Rotate image by 270 degrees into temporary image, // so it requires only an extra rotation angle @@ -825,7 +825,7 @@ RotateAny(FIBITMAP *src, double dAngle, const void *bkcolor) { FIBITMAP *DLL_CALLCONV FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) { - if(!FreeImage_HasPixels(dib)) return NULL; + if (!FreeImage_HasPixels(dib)) return NULL; if(0 == angle) { return FreeImage_Clone(dib); @@ -846,7 +846,7 @@ FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) { // perform the rotation FIBITMAP *dst = RotateAny(dib, angle, bkcolor); - if(!dst) throw(1); + if (!dst) throw(1); // build a greyscale palette RGBQUAD *dst_pal = FreeImage_GetPalette(dst); @@ -863,9 +863,9 @@ FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) { return dst; } - else if((bpp == 8) || (bpp == 24) || (bpp == 32)) { + else if ((bpp == 8) || (bpp == 24) || (bpp == 32)) { FIBITMAP *dst = RotateAny(dib, angle, bkcolor); - if(!dst) throw(1); + if (!dst) throw(1); if(bpp == 8) { // copy original palette to rotated bitmap @@ -878,7 +878,7 @@ FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) { // copy background color RGBQUAD bkcolor; - if( FreeImage_GetBackgroundColor(dib, &bkcolor) ) { + if ( FreeImage_GetBackgroundColor(dib, &bkcolor) ) { FreeImage_SetBackgroundColor(dst, &bkcolor); } @@ -898,7 +898,7 @@ FreeImage_Rotate(FIBITMAP *dib, double angle, const void *bkcolor) { case FIT_RGBAF: { FIBITMAP *dst = RotateAny(dib, angle, bkcolor); - if(!dst) throw(1); + if (!dst) throw(1); // copy metadata from src to dst FreeImage_CloneMetadata(dst, dib); diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp b/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp index 67191768bb..8b9bbd6482 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/Colors.cpp @@ -108,7 +108,7 @@ FreeImage_Invert(FIBITMAP *src) { return FALSE; } } - else if((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { + else if ((image_type == FIT_UINT16) || (image_type == FIT_RGB16) || (image_type == FIT_RGBA16)) { // Calculate the number of words per pixel (1 for 16-bit, 3 for 48-bit or 4 for 64-bit) const unsigned wordspp = (FreeImage_GetLine(src) / width) / sizeof(WORD); @@ -149,11 +149,11 @@ FreeImage_AdjustCurve(FIBITMAP *src, BYTE *LUT, FREE_IMAGE_COLOR_CHANNEL channel unsigned x, y; BYTE *bits = NULL; - if(!FreeImage_HasPixels(src) || !LUT || (FreeImage_GetImageType(src) != FIT_BITMAP)) + if (!FreeImage_HasPixels(src) || !LUT || (FreeImage_GetImageType(src) != FIT_BITMAP)) return FALSE; int bpp = FreeImage_GetBPP(src); - if((bpp != 8) && (bpp != 24) && (bpp != 32)) + if ((bpp != 8) && (bpp != 24) && (bpp != 32)) return FALSE; // apply the LUT @@ -271,7 +271,7 @@ BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *src, double gamma) { BYTE LUT[256]; // Lookup table - if(!FreeImage_HasPixels(src) || (gamma <= 0)) + if (!FreeImage_HasPixels(src) || (gamma <= 0)) return FALSE; // Build the lookup table @@ -302,7 +302,7 @@ FreeImage_AdjustBrightness(FIBITMAP *src, double percentage) { BYTE LUT[256]; // Lookup table double value; - if(!FreeImage_HasPixels(src)) + if (!FreeImage_HasPixels(src)) return FALSE; // Build the lookup table @@ -328,7 +328,7 @@ FreeImage_AdjustContrast(FIBITMAP *src, double percentage) { BYTE LUT[256]; // Lookup table double value; - if(!FreeImage_HasPixels(src)) + if (!FreeImage_HasPixels(src)) return FALSE; // Build the lookup table @@ -357,7 +357,7 @@ FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL cha BYTE *bits = NULL; unsigned x, y; - if(!FreeImage_HasPixels(src) || !histo) return FALSE; + if (!FreeImage_HasPixels(src) || !histo) return FALSE; unsigned width = FreeImage_GetWidth(src); unsigned height = FreeImage_GetHeight(src); @@ -377,7 +377,7 @@ FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL cha } return TRUE; } - else if((bpp == 24) || (bpp == 32)) { + else if ((bpp == 24) || (bpp == 32)) { int bytespp = bpp / 8; // bytes / pixel // clear histogram array diff --git a/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp b/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp index e4b8155739..59757287ed 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/CopyPaste.cpp @@ -58,12 +58,12 @@ Combine1(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned BOOL value; // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 1) || (FreeImage_GetBPP(src_dib) != 1)) { + if ((FreeImage_GetBPP(dst_dib) != 1) || (FreeImage_GetBPP(src_dib) != 1)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -97,12 +97,12 @@ Combine4(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned BOOL bOddStart, bOddEnd; // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 4) || (FreeImage_GetBPP(src_dib) != 4)) { + if ((FreeImage_GetBPP(dst_dib) != 4) || (FreeImage_GetBPP(src_dib) != 4)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -196,12 +196,12 @@ Combine4(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned static BOOL Combine8(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) { // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 8) || (FreeImage_GetBPP(src_dib) != 8)) { + if ((FreeImage_GetBPP(dst_dib) != 8) || (FreeImage_GetBPP(src_dib) != 8)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -238,12 +238,12 @@ Combine8(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned static BOOL Combine16_555(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) { // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) { + if ((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -298,12 +298,12 @@ Combine16_555(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsi static BOOL Combine16_565(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) { // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) { + if ((FreeImage_GetBPP(dst_dib) != 16) || (FreeImage_GetBPP(src_dib) != 16)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -362,12 +362,12 @@ Combine16_565(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsi static BOOL Combine24(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) { // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 24) || (FreeImage_GetBPP(src_dib) != 24)) { + if ((FreeImage_GetBPP(dst_dib) != 24) || (FreeImage_GetBPP(src_dib) != 24)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -404,12 +404,12 @@ Combine24(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned static BOOL Combine32(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y, unsigned alpha) { // check the bit depth of src and dst images - if((FreeImage_GetBPP(dst_dib) != 32) || (FreeImage_GetBPP(src_dib) != 32)) { + if ((FreeImage_GetBPP(dst_dib) != 32) || (FreeImage_GetBPP(src_dib) != 32)) { return FALSE; } // check the size of src image - if((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { + if ((x + FreeImage_GetWidth(src_dib) > FreeImage_GetWidth(dst_dib)) || (y + FreeImage_GetHeight(src_dib) > FreeImage_GetHeight(dst_dib))) { return FALSE; } @@ -459,7 +459,7 @@ CombineSameType(FIBITMAP *dst_dib, FIBITMAP *src_dib, unsigned x, unsigned y) { unsigned dst_pitch = FreeImage_GetPitch(dst_dib); // check the size of src image - if((x + src_width > dst_width) || (y + src_height > dst_height)) { + if ((x + src_width > dst_width) || (y + src_height > dst_height)) { return FALSE; } @@ -493,7 +493,7 @@ Works with any bitmap type. FIBITMAP * DLL_CALLCONV FreeImage_Copy(FIBITMAP *src, int left, int top, int right, int bottom) { - if(!FreeImage_HasPixels(src)) + if (!FreeImage_HasPixels(src)) return NULL; // normalize the rectangle @@ -506,7 +506,7 @@ FreeImage_Copy(FIBITMAP *src, int left, int top, int right, int bottom) { // check the size of the sub image int src_width = FreeImage_GetWidth(src); int src_height = FreeImage_GetHeight(src); - if((left < 0) || (right > src_width) || (top < 0) || (bottom > src_height)) { + if ((left < 0) || (right > src_width) || (top < 0) || (bottom > src_height)) { return NULL; } @@ -608,7 +608,7 @@ FreeImage_Copy(FIBITMAP *src, int left, int top, int right, int bottom) { // copy background color RGBQUAD bkcolor; - if( FreeImage_GetBackgroundColor(src, &bkcolor) ) { + if ( FreeImage_GetBackgroundColor(src, &bkcolor) ) { FreeImage_SetBackgroundColor(dst, &bkcolor); } @@ -639,13 +639,13 @@ BOOL DLL_CALLCONV FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha) { BOOL bResult = FALSE; - if(!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; + if (!FreeImage_HasPixels(src) || !FreeImage_HasPixels(dst)) return FALSE; // check the size of src image - if((left < 0) || (top < 0)) { + if ((left < 0) || (top < 0)) { return FALSE; } - if((left + FreeImage_GetWidth(src) > FreeImage_GetWidth(dst)) || (top + FreeImage_GetHeight(src) > FreeImage_GetHeight(dst))) { + if ((left + FreeImage_GetWidth(src) > FreeImage_GetWidth(dst)) || (top + FreeImage_GetHeight(src) > FreeImage_GetHeight(dst))) { return FALSE; } @@ -704,7 +704,7 @@ FreeImage_Paste(FIBITMAP *dst, FIBITMAP *src, int left, int top, int alpha) { return FALSE; } - if(!clone) return FALSE; + if (!clone) return FALSE; // paste src to dst switch(FreeImage_GetBPP(dst)) { diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp b/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp index 245c5c3a18..3e4807042d 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/Display.cpp @@ -40,20 +40,20 @@ For colour images, the computation is done separately for R, G, and B samples. */ FIBITMAP * DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP *bg) { - if(!FreeImage_HasPixels(fg)) return NULL; + if (!FreeImage_HasPixels(fg)) return NULL; int width = FreeImage_GetWidth(fg); int height = FreeImage_GetHeight(fg); int bpp = FreeImage_GetBPP(fg); - if((bpp != 8) && (bpp != 32)) + if ((bpp != 8) && (bpp != 32)) return NULL; if(bg) { int bg_width = FreeImage_GetWidth(bg); int bg_height = FreeImage_GetHeight(bg); int bg_bpp = FreeImage_GetBPP(bg); - if((bg_width != width) || (bg_height != height) || (bg_bpp != 24)) + if ((bg_width != width) || (bg_height != height) || (bg_bpp != 24)) return NULL; } @@ -71,7 +71,7 @@ FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP // allocate the composite image FIBITMAP *composite = FreeImage_Allocate(width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - if(!composite) return NULL; + if (!composite) return NULL; // get the palette RGBQUAD *pal = FreeImage_GetPalette(fg); @@ -133,7 +133,7 @@ FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg, RGBQUAD *appBkColor, FIBITMAP // background color - if(!bHasBkColor) { + if (!bHasBkColor) { if(bg) { // get the background color from the background image bkc.rgbBlue = bg_bits[FI_RGBA_BLUE]; diff --git a/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp b/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp index 5822f748a6..c5345497f5 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp @@ -61,7 +61,7 @@ ls_jpeg_error_exit (j_common_ptr cinfo) { (*cinfo->err->output_message)(cinfo); // allow JPEG with a premature end of file - if((cinfo)->err->msg_parm.i[0] != 13) { + if ((cinfo)->err->msg_parm.i[0] != 13) { // let the memory manager delete any temp files before we die jpeg_destroy(cinfo); @@ -171,7 +171,7 @@ LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat // crop option if(crop != NULL) { - if(!jtransform_parse_crop_spec(&transfoptions, crop)) { + if (!jtransform_parse_crop_spec(&transfoptions, crop)) { FreeImage_OutputMessageProc(FIF_JPEG, "Bogus crop argument %s", crop); throw(1); } @@ -180,14 +180,14 @@ LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat // Open the input file if(bUseUnicode) { #ifdef _WIN32 - if((fp = _wfopen(filenameIO->wsrc_file, L"rb")) == NULL) { + if ((fp = _wfopen(filenameIO->wsrc_file, L"rb")) == NULL) { FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open input file for reading"); } #else fp = NULL; #endif // _WIN32 } else { - if((fp = fopen(filenameIO->src_file, "rb")) == NULL) { + if ((fp = fopen(filenameIO->src_file, "rb")) == NULL) { FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open %s for reading", filenameIO->src_file); } } @@ -211,7 +211,7 @@ LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat // Prepare transformation workspace // Fails right away if perfect flag is TRUE and transformation is not perfect - if( !jtransform_request_workspace(&srcinfo, &transfoptions) ) { + if ( !jtransform_request_workspace(&srcinfo, &transfoptions) ) { FreeImage_OutputMessageProc(FIF_JPEG, "Transformation is not perfect"); throw(1); } @@ -237,14 +237,14 @@ LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat // Open the output file if(bUseUnicode) { #ifdef _WIN32 - if((fp = _wfopen(filenameIO->wdst_file, L"wb")) == NULL) { + if ((fp = _wfopen(filenameIO->wdst_file, L"wb")) == NULL) { FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open output file for writing"); } #else fp = NULL; #endif // _WIN32 } else { - if((fp = fopen(filenameIO->dst_file, "wb")) == NULL) { + if ((fp = fopen(filenameIO->dst_file, "wb")) == NULL) { FreeImage_OutputMessageProc(FIF_JPEG, "Cannot open %s for writing", filenameIO->dst_file); } } diff --git a/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp b/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp index 3b577cbd0a..6d17d45319 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/MultigridPoissonSolver.cpp @@ -311,7 +311,7 @@ static BOOL fmg_mglin(FIBITMAP *U, int n, int ncycle) { #define _CREATE_ARRAY_GRID_(array, array_size) \ array = (FIBITMAP**)malloc(array_size * sizeof(FIBITMAP*));\ - if(!array) throw(1);\ + if (!array) throw(1);\ memset(array, 0, array_size * sizeof(FIBITMAP*)) #define _FREE_ARRAY_GRID_(array, array_size) \ @@ -351,7 +351,7 @@ static BOOL fmg_mglin(FIBITMAP *U, int n, int ncycle) { // allocate storage for r.h.s. on grid (ng - 2) ... IRHO[ngrid] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IRHO[ngrid]) throw(1); + if (!IRHO[ngrid]) throw(1); // ... and fill it by restricting from the fine grid fmg_restrict(IRHO[ngrid], U, nn); @@ -361,16 +361,16 @@ static BOOL fmg_mglin(FIBITMAP *U, int n, int ncycle) { nn = nn/2 + 1; ngrid--; IRHO[ngrid] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IRHO[ngrid]) throw(1); + if (!IRHO[ngrid]) throw(1); fmg_restrict(IRHO[ngrid], IRHO[ngrid+1], nn); } nn = 3; IU[0] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IU[0]) throw(1); + if (!IU[0]) throw(1); IRHS[0] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IRHS[0]) throw(1); + if (!IRHS[0]) throw(1); // initial solution on coarsest grid fmg_solve(IU[0], IRHO[0]); @@ -384,11 +384,11 @@ static BOOL fmg_mglin(FIBITMAP *U, int n, int ncycle) { nn = 2*nn - 1; IU[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IU[j]) throw(1); + if (!IU[j]) throw(1); IRHS[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IRHS[j]) throw(1); + if (!IRHS[j]) throw(1); IRES[j] = FreeImage_AllocateT(FIT_FLOAT, nn, nn); - if(!IRES[j]) throw(1); + if (!IRES[j]) throw(1); fmg_prolongate(IU[j], IU[j-1], nn); @@ -464,7 +464,7 @@ where j is such that 2^j is the nearest larger dimension corresponding to MAX(im */ FIBITMAP* DLL_CALLCONV FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle) { - if(!FreeImage_HasPixels(Laplacian)) return NULL; + if (!FreeImage_HasPixels(Laplacian)) return NULL; int width = FreeImage_GetWidth(Laplacian); int height = FreeImage_GetHeight(Laplacian); @@ -473,7 +473,7 @@ FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle) { int n = MAX(width, height); int size = 0; while((n >>= 1) > 0) size++; - if((1 << size) < MAX(width, height)) { + if ((1 << size) < MAX(width, height)) { size++; } // size must be of the form 2^j + 1 for some integer j @@ -481,7 +481,7 @@ FreeImage_MultigridPoissonSolver(FIBITMAP *Laplacian, int ncycle) { // allocate a temporary square image I FIBITMAP *I = FreeImage_AllocateT(FIT_FLOAT, size, size); - if(!I) return NULL; + if (!I) return NULL; // copy Laplacian into I and shift pixels to create a boundary FreeImage_Paste(I, Laplacian, 1, 1, 255); diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp b/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp index d957d9cb5e..e79e5f456c 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/Rescale.cpp @@ -52,7 +52,7 @@ FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTE break; } - if(!pFilter) { + if (!pFilter) { return NULL; } @@ -60,7 +60,7 @@ FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTE // perform upsampling or downsampling - if((FreeImage_GetBPP(src) == 4) || (FreeImage_GetColorType(src) == FIC_PALETTE)) { + if ((FreeImage_GetBPP(src) == 4) || (FreeImage_GetColorType(src) == FIC_PALETTE)) { // special case for 4-bit images or color map indexed images ... if(FreeImage_IsTransparent(src) == FALSE) { FIBITMAP *src24 = NULL; @@ -68,10 +68,10 @@ FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTE try { // transparent conversion to 24-bit (any transparency table will be destroyed) src24 = FreeImage_ConvertTo24Bits(src); - if(!src24) throw(1); + if (!src24) throw(1); // perform upsampling or downsampling dst24 = Engine.scale(src24, dst_width, dst_height); - if(!dst24) throw(1); + if (!dst24) throw(1); FreeImage_Unload(src24); src24 = NULL; // color quantize to 8-bit dst = FreeImage_ColorQuantize(dst24, FIQ_NNQUANT); @@ -86,10 +86,10 @@ FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTE try { // transparent conversion to 32-bit (keep transparency) src32 = FreeImage_ConvertTo32Bits(src); - if(!src32) throw(1); + if (!src32) throw(1); // perform upsampling or downsampling dst = Engine.scale(src32, dst_width, dst_height); - if(!dst) throw(1); + if (!dst) throw(1); // free and return FreeImage_Unload(src32); } catch(int) { @@ -98,16 +98,16 @@ FreeImage_Rescale(FIBITMAP *src, int dst_width, int dst_height, FREE_IMAGE_FILTE } } } - else if((FreeImage_GetBPP(src) == 16) && (FreeImage_GetImageType(src) == FIT_BITMAP)) { + else if ((FreeImage_GetBPP(src) == 16) && (FreeImage_GetImageType(src) == FIT_BITMAP)) { // convert 16-bit RGB to 24-bit FIBITMAP *src24 = NULL; try { // transparent conversion to 24-bit (any transparency table will be destroyed) src24 = FreeImage_ConvertTo24Bits(src); - if(!src24) throw(1); + if (!src24) throw(1); // perform upsampling or downsampling dst = Engine.scale(src24, dst_width, dst_height); - if(!dst) throw(1); + if (!dst) throw(1); // free and return FreeImage_Unload(src24); } catch(int) { @@ -137,14 +137,14 @@ FreeImage_MakeThumbnail(FIBITMAP *dib, int max_pixel_size, BOOL convert) { FIBITMAP *thumbnail = NULL; int new_width, new_height; - if(!FreeImage_HasPixels(dib) || (max_pixel_size <= 0)) return NULL; + if (!FreeImage_HasPixels(dib) || (max_pixel_size <= 0)) return NULL; int width = FreeImage_GetWidth(dib); int height = FreeImage_GetHeight(dib); if(max_pixel_size == 0) max_pixel_size = 1; - if((width < max_pixel_size) && (height < max_pixel_size)) { + if ((width < max_pixel_size) && (height < max_pixel_size)) { // image is smaller than the requested thumbnail return FreeImage_Clone(dib); } @@ -192,7 +192,7 @@ FreeImage_MakeThumbnail(FIBITMAP *dib, int max_pixel_size, BOOL convert) { break; } - if((thumbnail != NULL) && (image_type != FIT_BITMAP) && convert) { + if ((thumbnail != NULL) && (image_type != FIT_BITMAP) && convert) { // convert to a standard bitmap FIBITMAP *bitmap = NULL; switch(image_type) { diff --git a/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp b/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp index 5dcec62af0..5421bd47ab 100644 --- a/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp +++ b/plugins/FreeImage/Source/FreeImageToolkit/Resize.cpp @@ -68,7 +68,7 @@ CWeightsTable::CWeightsTable(CGenericFilter *pFilter, unsigned uDstSize, unsigne int iRight = MIN ((int)ceil (dCenter + dWidth), int(uSrcSize) - 1); // cut edge points to fit in filter window in case of spill-off - if((iRight - iLeft + 1) > int(m_WindowSize)) { + if ((iRight - iLeft + 1) > int(m_WindowSize)) { if(iLeft < (int(uSrcSize) - 1 / 2)) { iLeft++; } else { @@ -87,7 +87,7 @@ CWeightsTable::CWeightsTable(CGenericFilter *pFilter, unsigned uDstSize, unsigne m_WeightTable[u].Weights[iSrc-iLeft] = weight; dTotalWeight += weight; } - if((dTotalWeight > 0) && (dTotalWeight != 1)) { + if ((dTotalWeight > 0) && (dTotalWeight != 1)) { // normalize weight of neighbouring points for(iSrc = iLeft; iSrc <= iRight; iSrc++) { // normalize point @@ -149,7 +149,7 @@ FIBITMAP* CResizeEngine::scale(FIBITMAP *src, unsigned dst_width, unsigned dst_h // allocate the dst image FIBITMAP *dst = FreeImage_AllocateT(image_type, dst_width, dst_height, bpp, redMask, greenMask, blueMask); - if(!dst) return NULL; + if (!dst) return NULL; if(bpp == 8) { if(FreeImage_GetColorType(src) == FIC_MINISWHITE) { @@ -191,7 +191,7 @@ FIBITMAP* CResizeEngine::scale(FIBITMAP *src, unsigned dst_width, unsigned dst_h // allocate a temporary image FIBITMAP *tmp = FreeImage_AllocateT(image_type, dst_width, src_height, bpp, redMask, greenMask, blueMask); - if(!tmp) { + if (!tmp) { FreeImage_Unload(dst); return NULL; } @@ -211,7 +211,7 @@ FIBITMAP* CResizeEngine::scale(FIBITMAP *src, unsigned dst_width, unsigned dst_h // allocate a temporary image FIBITMAP *tmp = FreeImage_AllocateT(image_type, src_width, dst_height, bpp, redMask, greenMask, blueMask); - if(!tmp) { + if (!tmp) { FreeImage_Unload(dst); return NULL; } diff --git a/plugins/FreeImage/Source/LibPNG/pngrutil.c b/plugins/FreeImage/Source/LibPNG/pngrutil.c index 7b4557f5a3..995896dbc5 100644 --- a/plugins/FreeImage/Source/LibPNG/pngrutil.c +++ b/plugins/FreeImage/Source/LibPNG/pngrutil.c @@ -3115,7 +3115,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display) /* This can only be the RGB case, so each copy is exactly one * pixel and it is not necessary to check for a partial copy. */ - for(;;) + for (;;) { dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2]; diff --git a/plugins/FreeImage/Source/LibTIFF/tif_color.c b/plugins/FreeImage/Source/LibTIFF/tif_color.c index 06cc431a0a..f0302e4bf2 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_color.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_color.c @@ -49,7 +49,7 @@ TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32 l, int32 a, int32 b, float L = (float)l * 100.0F / 255.0F; float cby, tmp; - if( L < 8.856F ) { + if ( L < 8.856F ) { *Y = (L * cielab->Y0) / 903.292F; cby = 7.787F * (*Y / cielab->Y0) + 16.0F / 116.0F; } else { @@ -58,13 +58,13 @@ TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32 l, int32 a, int32 b, } tmp = (float)a / 500.0F + cby; - if( tmp < 0.2069F ) + if ( tmp < 0.2069F ) *X = cielab->X0 * (tmp - 0.13793F) / 7.787F; else *X = cielab->X0 * tmp * tmp * tmp; tmp = cby - (float)b / 200.0F; - if( tmp < 0.2069F ) + if ( tmp < 0.2069F ) *Z = cielab->Z0 * (tmp - 0.13793F) / 7.787F; else *Z = cielab->Z0 * tmp * tmp * tmp; diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dir.c b/plugins/FreeImage/Source/LibTIFF/tif_dir.c index 7815857f21..081bb43c06 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_dir.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_dir.c @@ -193,7 +193,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap) /* * Setup new compression routine state. */ - if( (status = TIFFSetCompressionScheme(tif, v)) != 0 ) + if ( (status = TIFFSetCompressionScheme(tif, v)) != 0 ) td->td_compression = (uint16) v; else status = 0; @@ -341,11 +341,11 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap) td->td_sampleformat = (uint16) v; /* Try to fix up the SWAB function for complex data. */ - if( td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT + if ( td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT && td->td_bitspersample == 32 && tif->tif_postdecode == _TIFFSwab32BitData ) tif->tif_postdecode = _TIFFSwab16BitData; - else if( (td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT + else if ( (td->td_sampleformat == SAMPLEFORMAT_COMPLEXINT || td->td_sampleformat == SAMPLEFORMAT_COMPLEXIEEEFP) && td->td_bitspersample == 64 && tif->tif_postdecode == _TIFFSwab64BitData ) @@ -388,7 +388,7 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap) s = va_arg(ap, char*); v = checkInkNamesString(tif, v, s); status = v > 0; - if( v > 0 ) { + if ( v > 0 ) { _TIFFsetNString(&td->td_inknames, s, v); td->td_inknameslen = v; } @@ -839,7 +839,7 @@ _TIFFVGetField(TIFF* tif, ttag_t tag, va_list ap) * the other. If the client tries to get a tag that is not valid * for the image's codec then we'll arrive here. */ - if( fip == NULL || fip->field_bit != FIELD_CUSTOM ) + if ( fip == NULL || fip->field_bit != FIELD_CUSTOM ) { TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField", "%s: Invalid %stag \"%s\" " @@ -1008,7 +1008,7 @@ TIFFFreeDirectory(TIFF* tif) TIFFClrFieldBit(tif, FIELD_YCBCRPOSITIONING); /* Cleanup custom tag values */ - for( i = 0; i < td->td_customValueCount; i++ ) { + for ( i = 0; i < td->td_customValueCount; i++ ) { if (td->td_customValues[i].value) _TIFFfree(td->td_customValues[i].value); } diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c b/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c index a2055f44a5..7b7507a8cb 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_dirinfo.c @@ -831,7 +831,7 @@ _TIFFFindOrRegisterFieldInfo( TIFF *tif, ttag_t tag, TIFFDataType dt ) const TIFFFieldInfo *fld; fld = _TIFFFindFieldInfo( tif, tag, dt ); - if( fld == NULL ) + if ( fld == NULL ) { fld = _TIFFCreateAnonFieldInfo( tif, tag, dt ); if (!_TIFFMergeFieldInfo(tif, fld, 1)) diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirread.c b/plugins/FreeImage/Source/LibTIFF/tif_dirread.c index 86d2fa87a9..3567b2ae51 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_dirread.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_dirread.c @@ -991,7 +991,7 @@ EstimateStripByteCounts(TIFF* tif, TIFFDirEntry* dir, uint16 dircount) td->td_stripbytecount = (uint32*) _TIFFCheckMalloc(tif, td->td_nstrips, sizeof (uint32), "for \"StripByteCounts\" array"); - if( td->td_stripbytecount == NULL ) + if ( td->td_stripbytecount == NULL ) return -1; if (td->td_compression != COMPRESSION_NONE) { @@ -1689,7 +1689,7 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp) */ cp = (char *)_TIFFCheckMalloc(tif, dp->tdir_count + 1, 1, mesg); - if( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 ) + if ( (ok = (cp && TIFFFetchString(tif, dp, cp))) != 0 ) cp[dp->tdir_count] = '\0'; /* XXX */ break; } @@ -1762,7 +1762,7 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEntry* dp) case TIFF_ASCII: case TIFF_UNDEFINED: /* bit of a cheat... */ { char c[2]; - if( (ok = (TIFFFetchString(tif, dp, c) != 0)) != 0 ) { + if ( (ok = (TIFFFetchString(tif, dp, c) != 0)) != 0 ) { c[1] = '\0'; /* XXX paranoid */ ok = (fip->field_passcount ? TIFFSetField(tif, dp->tdir_tag, 1, c) @@ -1797,7 +1797,7 @@ TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl) if (v && TIFFFetchShortArray(tif, dir, v)) { uint16 i; int check_count = dir->tdir_count; - if( samples < check_count ) + if ( samples < check_count ) check_count = samples; for (i = 1; i < check_count; i++) @@ -1839,7 +1839,7 @@ TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl) uint16 i; int check_count = dir->tdir_count; - if( samples < check_count ) + if ( samples < check_count ) check_count = samples; for (i = 1; i < check_count; i++) if (v[i] != v[0]) { @@ -1878,7 +1878,7 @@ TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* minv, double* maxv) if (v && TIFFFetchAnyArray(tif, dir, v)) { uint16 i; int check_count = dir->tdir_count; - if( samples < check_count ) + if ( samples < check_count ) check_count = samples; *minv = *maxv = v[0]; @@ -1928,17 +1928,17 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, long nstrips, uint32** lpp) dir->tdir_count, sizeof (uint16), "to fetch strip tag"); if (dp == NULL) return (0); - if( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) { + if ( (status = TIFFFetchShortArray(tif, dir, dp)) != 0 ) { int i; - for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ ) + for ( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ ) { lp[i] = dp[i]; } } _TIFFfree((char*) dp); - } else if( nstrips != (int) dir->tdir_count ) { + } else if ( nstrips != (int) dir->tdir_count ) { /* Special case to correct length */ uint32* dp = (uint32*) _TIFFCheckMalloc(tif, @@ -1947,10 +1947,10 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEntry* dir, long nstrips, uint32** lpp) return (0); status = TIFFFetchLongArray(tif, dir, dp); - if( status != 0 ) { + if ( status != 0 ) { int i; - for( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ ) + for ( i = 0; i < nstrips && i < (int) dir->tdir_count; i++ ) { lp[i] = dp[i]; } @@ -1980,10 +1980,10 @@ TIFFFetchRefBlackWhite(TIFF* tif, TIFFDirEntry* dir) */ cp = (char *)_TIFFCheckMalloc(tif, dir->tdir_count, sizeof (uint32), mesg); - if( (ok = (cp && TIFFFetchLongArray(tif, dir, (uint32*) cp))) != 0) { + if ( (ok = (cp && TIFFFetchLongArray(tif, dir, (uint32*) cp))) != 0) { float* fp = (float*) _TIFFCheckMalloc(tif, dir->tdir_count, sizeof (float), mesg); - if( (ok = (fp != NULL)) != 0 ) { + if ( (ok = (fp != NULL)) != 0 ) { uint32 i; for (i = 0; i < dir->tdir_count; i++) fp[i] = (float)((uint32*) cp)[i]; @@ -2006,7 +2006,7 @@ TIFFFetchSubjectDistance(TIFF* tif, TIFFDirEntry* dir) float v; int ok = 0; - if( dir->tdir_count != 1 || dir->tdir_type != TIFF_RATIONAL ) + if ( dir->tdir_count != 1 || dir->tdir_type != TIFF_RATIONAL ) { TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "incorrect count or type for SubjectDistance, tag ignored" ); @@ -2064,7 +2064,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) if (rowsperstrip >= td->td_rowsperstrip) return; nstrips = (tstrip_t) TIFFhowmany(bytecount, stripbytes); - if( nstrips == 0 ) /* something is wonky, do nothing. */ + if ( nstrips == 0 ) /* something is wonky, do nothing. */ return; newcounts = (uint32*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint32), diff --git a/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c b/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c index 17b8002af4..962937298e 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_dirwrite.c @@ -185,14 +185,14 @@ _TIFFWriteDirectory(TIFF* tif, int done) * is set or not. For normal fields, we just use the * FieldSet test. */ - if( fip->field_bit == FIELD_CUSTOM ) + if ( fip->field_bit == FIELD_CUSTOM ) { int ci, is_set = FALSE; - for( ci = 0; ci < td->td_customValueCount; ci++ ) + for ( ci = 0; ci < td->td_customValueCount; ci++ ) is_set |= (td->td_customValues[ci].info == fip); - if( !is_set ) + if ( !is_set ) continue; } else if (!FieldSet(fields, fip->field_bit)) @@ -352,7 +352,7 @@ _TIFFWriteDirectory(TIFF* tif, int done) } dir++; - if( fip->field_bit != FIELD_CUSTOM ) + if ( fip->field_bit != FIELD_CUSTOM ) ResetFieldBit(fields, fip->field_bit); } @@ -496,20 +496,20 @@ _TIFFWriteCustomDirectory(TIFF* tif, toff_t *pdiroff) * is set or not. For normal fields, we just use the * FieldSet test. */ - if( fip->field_bit == FIELD_CUSTOM ) + if ( fip->field_bit == FIELD_CUSTOM ) { int ci, is_set = FALSE; - for( ci = 0; ci < td->td_customValueCount; ci++ ) + for ( ci = 0; ci < td->td_customValueCount; ci++ ) is_set |= (td->td_customValues[ci].info == fip); - if( !is_set ) + if ( !is_set ) continue; } else if (!FieldSet(fields, fip->field_bit)) continue; - if( fip->field_bit != FIELD_CUSTOM ) + if ( fip->field_bit != FIELD_CUSTOM ) ResetFieldBit(fields, fip->field_bit); } @@ -718,7 +718,7 @@ TIFFWriteNormalTag(TIFF* tif, TIFFDirEntry* dir, const TIFFFieldInfo* fip) char* cp; if (fip->field_passcount) { - if( wc == (uint16) TIFF_VARIABLE2 ) + if ( wc == (uint16) TIFF_VARIABLE2 ) TIFFGetField(tif, fip->field_tag, &wc2, &cp); else TIFFGetField(tif, fip->field_tag, &wc, &cp); @@ -1163,7 +1163,7 @@ TIFFWriteAnyArray(TIFF* tif, break; case TIFF_DOUBLE: { - if( !TIFFWriteDoubleArray(tif, dir, v)) + if ( !TIFFWriteDoubleArray(tif, dir, v)) goto out; } break; @@ -1270,7 +1270,7 @@ TIFFRewriteDirectory( TIFF *tif ) static const char module[] = "TIFFRewriteDirectory"; /* We don't need to do anything special if it hasn't been written. */ - if( tif->tif_diroff == 0 ) + if ( tif->tif_diroff == 0 ) return TIFFWriteDirectory( tif ); /* diff --git a/plugins/FreeImage/Source/LibTIFF/tif_extension.c b/plugins/FreeImage/Source/LibTIFF/tif_extension.c index b00d9ac2aa..e8fb4a2cac 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_extension.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_extension.c @@ -46,7 +46,7 @@ ttag_t TIFFGetTagListEntry( TIFF *tif, int tag_index ) { TIFFDirectory* td = &tif->tif_dir; - if( tag_index < 0 || tag_index >= td->td_customValueCount ) + if ( tag_index < 0 || tag_index >= td->td_customValueCount ) return (ttag_t) -1; else return td->td_customValues[tag_index].info->field_tag; @@ -71,7 +71,7 @@ void *TIFFGetClientInfo( TIFF *tif, const char *name ) while( link != NULL && strcmp(link->name,name) != 0 ) link = link->next; - if( link != NULL ) + if ( link != NULL ) return link->data; else return NULL; @@ -89,7 +89,7 @@ void TIFFSetClientInfo( TIFF *tif, void *data, const char *name ) while( link != NULL && strcmp(link->name,name) != 0 ) link = link->next; - if( link != NULL ) + if ( link != NULL ) { link->data = data; return; diff --git a/plugins/FreeImage/Source/LibTIFF/tif_fax3.c b/plugins/FreeImage/Source/LibTIFF/tif_fax3.c index 047ba5d5aa..2e74a37c69 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_fax3.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_fax3.c @@ -387,7 +387,7 @@ _TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx) *cp++ &= 0xff << (8-bx); run -= 8-bx; } - if( (n = run >> 3) != 0 ) { /* multiple bytes to fill */ + if ( (n = run >> 3) != 0 ) { /* multiple bytes to fill */ if ((n/sizeof (long)) > 1) { /* * Align to longword boundary and fill. @@ -422,7 +422,7 @@ _TIFFFax3fillruns(unsigned char* buf, uint32* runs, uint32* erun, uint32 lastx) *cp++ |= 0xff >> bx; run -= 8-bx; } - if( (n = run>>3) != 0 ) { /* multiple bytes to fill */ + if ( (n = run>>3) != 0 ) { /* multiple bytes to fill */ if ((n/sizeof (long)) > 1) { /* * Align to longword boundary and fill. @@ -1454,7 +1454,7 @@ Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s) NeedBits16( 13, BADG4 ); BADG4: #ifdef FAX3_DEBUG - if( GetBits(13) != 0x1001 ) + if ( GetBits(13) != 0x1001 ) fputs( "Bad EOFB\n", stderr ); #endif ClrBits( 13 ); diff --git a/plugins/FreeImage/Source/LibTIFF/tif_fax3.h b/plugins/FreeImage/Source/LibTIFF/tif_fax3.h index c4e16c52d8..ec2811f660 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_fax3.h +++ b/plugins/FreeImage/Source/LibTIFF/tif_fax3.h @@ -360,7 +360,7 @@ static const char* StateNames[] = { doneBlack1d: \ if (a0 >= lastx) \ goto done1d; \ - if( *(pa-1) == 0 && *(pa-2) == 0 ) \ + if ( *(pa-1) == 0 && *(pa-2) == 0 ) \ pa -= 2; \ } \ eof1d: \ diff --git a/plugins/FreeImage/Source/LibTIFF/tif_getimage.c b/plugins/FreeImage/Source/LibTIFF/tif_getimage.c index 714d7e85e2..041e540cba 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_getimage.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_getimage.c @@ -202,7 +202,7 @@ TIFFRGBAImageEnd(TIFFRGBAImage* img) _TIFFfree(img->ycbcr), img->ycbcr = NULL; if (img->cielab) _TIFFfree(img->cielab), img->cielab = NULL; - if( img->redcmap ) { + if ( img->redcmap ) { _TIFFfree( img->redcmap ); _TIFFfree( img->greencmap ); _TIFFfree( img->bluecmap ); @@ -273,10 +273,10 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024]) } #ifdef DEFAULT_EXTRASAMPLE_AS_ALPHA - if( !TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric)) + if ( !TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img->photometric)) img->photometric = PHOTOMETRIC_MINISWHITE; - if( extrasamples == 0 + if ( extrasamples == 0 && img->samplesperpixel == 4 && img->photometric == PHOTOMETRIC_RGB ) { @@ -317,7 +317,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, TIFF* tif, int stop, char emsg[1024]) img->redcmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color); img->greencmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color); img->bluecmap = (uint16 *) _TIFFmalloc(sizeof(uint16)*n_color); - if( !img->redcmap || !img->greencmap || !img->bluecmap ) { + if ( !img->redcmap || !img->greencmap || !img->bluecmap ) { sprintf(emsg, "Out of memory for colormap copy"); return (0); } @@ -1575,7 +1575,7 @@ static void putcontig8bitYCbCrGenericTile( (void) y; fromskew = (fromskew * group_size) / h_group; - for( yy = 0; yy < h; yy++ ) + for ( yy = 0; yy < h; yy++ ) { unsigned char *pp_line; int y_line_group = yy / v_group; @@ -1584,7 +1584,7 @@ static void putcontig8bitYCbCrGenericTile( pp_line = pp + v_line_group * - for( xx = 0; xx < w; xx++ ) + for ( xx = 0; xx < w; xx++ ) { Cb = pp } @@ -1818,7 +1818,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr41tile) pp += 6; } while (--x); - if( (w&3) != 0 ) + if ( (w&3) != 0 ) { int32 Cb = pp[4]; int32 Cr = pp[5]; @@ -1918,7 +1918,7 @@ DECLAREContigPutFunc(putcontig8bitYCbCr21tile) pp += 4; } while (--x); - if( (w&1) != 0 ) + if ( (w&1) != 0 ) { int32 Cb = pp[2]; int32 Cr = pp[3]; @@ -2093,7 +2093,7 @@ makebwmap(TIFFRGBAImage* img) int i; uint32* p; - if( nsamples == 0 ) + if ( nsamples == 0 ) nsamples = 1; img->BWmap = (uint32**) _TIFFmalloc( @@ -2151,7 +2151,7 @@ setupMap(TIFFRGBAImage* img) range = (int32)((1L<bitspersample)-1); /* treat 16 bit the same as eight bit */ - if( img->bitspersample == 16 ) + if ( img->bitspersample == 16 ) range = (int32) 255; img->Map = (TIFFRGBValue*) _TIFFmalloc((range+1) * sizeof (TIFFRGBValue)); @@ -2528,7 +2528,7 @@ TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster ) int ok; uint32 rowsperstrip, rows_to_read; - if( TIFFIsTiled( tif ) ) + if ( TIFFIsTiled( tif ) ) { TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Can't use TIFFReadRGBAStrip() with tiled file."); @@ -2536,7 +2536,7 @@ TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster ) } TIFFGetFieldDefaulted(tif, TIFFTAG_ROWSPERSTRIP, &rowsperstrip); - if( (row % rowsperstrip) != 0 ) + if ( (row % rowsperstrip) != 0 ) { TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Row passed to TIFFReadRGBAStrip() must be first in a strip."); @@ -2548,7 +2548,7 @@ TIFFReadRGBAStrip(TIFF* tif, uint32 row, uint32 * raster ) img.row_offset = row; img.col_offset = 0; - if( row + rowsperstrip > img.height ) + if ( row + rowsperstrip > img.height ) rows_to_read = img.height - row; else rows_to_read = rowsperstrip; @@ -2586,7 +2586,7 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) * tile boundary. */ - if( !TIFFIsTiled( tif ) ) + if ( !TIFFIsTiled( tif ) ) { TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Can't use TIFFReadRGBATile() with stripped file."); @@ -2595,7 +2595,7 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) TIFFGetFieldDefaulted(tif, TIFFTAG_TILEWIDTH, &tile_xsize); TIFFGetFieldDefaulted(tif, TIFFTAG_TILELENGTH, &tile_ysize); - if( (col % tile_xsize) != 0 || (row % tile_ysize) != 0 ) + if ( (col % tile_xsize) != 0 || (row % tile_ysize) != 0 ) { TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Row/col passed to TIFFReadRGBATile() must be top" @@ -2620,12 +2620,12 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) * a full tile configuration afterwards. */ - if( row + tile_ysize > img.height ) + if ( row + tile_ysize > img.height ) read_ysize = img.height - row; else read_ysize = tile_ysize; - if( col + tile_xsize > img.width ) + if ( col + tile_xsize > img.width ) read_xsize = img.width - col; else read_xsize = tile_xsize; @@ -2649,10 +2649,10 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) * bottom to top format. */ - if( read_xsize == tile_xsize && read_ysize == tile_ysize ) + if ( read_xsize == tile_xsize && read_ysize == tile_ysize ) return( ok ); - for( i_row = 0; i_row < read_ysize; i_row++ ) { + for ( i_row = 0; i_row < read_ysize; i_row++ ) { memmove( raster + (tile_ysize - i_row - 1) * tile_xsize, raster + (read_ysize - i_row - 1) * read_xsize, read_xsize * sizeof(uint32) ); @@ -2660,7 +2660,7 @@ TIFFReadRGBATile(TIFF* tif, uint32 col, uint32 row, uint32 * raster) 0, sizeof(uint32) * (tile_xsize - read_xsize) ); } - for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { + for ( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize, 0, sizeof(uint32) * tile_xsize ); } diff --git a/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c b/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c index 06062b3376..ee7d886fa8 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_jpeg.c @@ -888,7 +888,7 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) if (cc % sp->bytesperline) TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read"); - if( nrows > (int) sp->cinfo.d.image_height ) + if ( nrows > (int) sp->cinfo.d.image_height ) nrows = sp->cinfo.d.image_height; /* data is expected to be read in multiples of a scanline */ @@ -901,7 +901,7 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) ** For Mk1 always use it. */ #if !defined(JPEG_LIB_MK1) - if( sp->cinfo.d.data_precision == 12 ) + if ( sp->cinfo.d.data_precision == 12 ) #endif { line_work_buf = (JSAMPROW) @@ -910,7 +910,7 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) } do { - if( line_work_buf != NULL ) + if ( line_work_buf != NULL ) { /* ** In the MK1 case, we aways read into a 16bit buffer, and then @@ -920,13 +920,13 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) if (TIFFjpeg_read_scanlines(sp, &line_work_buf, 1) != 1) return (0); - if( sp->cinfo.d.data_precision == 12 ) + if ( sp->cinfo.d.data_precision == 12 ) { int value_pairs = (sp->cinfo.d.output_width * sp->cinfo.d.num_components) / 2; int iPair; - for( iPair = 0; iPair < value_pairs; iPair++ ) + for ( iPair = 0; iPair < value_pairs; iPair++ ) { unsigned char *out_ptr = ((unsigned char *) buf) + iPair * 3; @@ -938,13 +938,13 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) out_ptr[2] = ((in_ptr[1] & 0xff) >> 0); } } - else if( sp->cinfo.d.data_precision == 8 ) + else if ( sp->cinfo.d.data_precision == 8 ) { int value_count = (sp->cinfo.d.output_width * sp->cinfo.d.num_components); int iValue; - for( iValue = 0; iValue < value_count; iValue++ ) + for ( iValue = 0; iValue < value_count; iValue++ ) { ((unsigned char *) buf)[iValue] = line_work_buf[iValue] & 0xff; @@ -968,7 +968,7 @@ JPEGDecode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) cc -= sp->bytesperline; } while (--nrows > 0); - if( line_work_buf != NULL ) + if ( line_work_buf != NULL ) _TIFFfree( line_work_buf ); } @@ -992,7 +992,7 @@ JPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) if (cc % sp->bytesperline) TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read"); - if( nrows > (int) sp->cinfo.d.image_height ) + if ( nrows > (int) sp->cinfo.d.image_height ) nrows = sp->cinfo.d.image_height; /* data is expected to be read in multiples of a scanline */ @@ -1075,7 +1075,7 @@ JPEGDecodeRaw(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) int value_pairs = (sp->cinfo.d.output_width * sp->cinfo.d.num_components) / 2; int iPair; - for( iPair = 0; iPair < value_pairs; iPair++ ) + for ( iPair = 0; iPair < value_pairs; iPair++ ) { unsigned char *out_ptr = ((unsigned char *) buf) + iPair * 3; JSAMPLE *in_ptr = tmpbuf + iPair * 2; @@ -1275,7 +1275,7 @@ JPEGSetupEncode(TIFF* tif) /* Create a JPEGTables field if appropriate */ if (sp->jpegtablesmode & (JPEGTABLESMODE_QUANT|JPEGTABLESMODE_HUFF)) { - if( sp->jpegtables == NULL + if ( sp->jpegtables == NULL || memcmp(sp->jpegtables,"\0\0\0\0\0\0\0\0\0",8) == 0 ) { if (!prepare_JPEGTables(tif)) @@ -1443,7 +1443,7 @@ JPEGEncode(TIFF* tif, tidata_t buf, tsize_t cc, tsample_t s) TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline discarded"); /* The last strip will be limited to image size */ - if( !isTiled(tif) && tif->tif_row+nrows > tif->tif_dir.td_imagelength ) + if ( !isTiled(tif) && tif->tif_row+nrows > tif->tif_dir.td_imagelength ) nrows = tif->tif_dir.td_imagelength - tif->tif_row; while (nrows-- > 0) { @@ -1591,7 +1591,7 @@ JPEGCleanup(TIFF* tif) tif->tif_tagmethods.vsetfield = sp->vsetparent; tif->tif_tagmethods.printdir = sp->printdir; - if( sp->cinfo_initialized ) + if ( sp->cinfo_initialized ) TIFFjpeg_destroy(sp); /* release libjpeg resources */ if (sp->jpegtables) /* tag value */ _TIFFfree(sp->jpegtables); @@ -1630,7 +1630,7 @@ JPEGResetUpsampled( TIFF* tif ) * Must recalculate cached tile size in case sampling state changed. * Should we really be doing this now if image size isn't set? */ - if( tif->tif_tilesize > 0 ) + if ( tif->tif_tilesize > 0 ) tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; if(tif->tif_scanlinesize > 0 ) @@ -1750,20 +1750,20 @@ JPEGFixupTestSubsampling( TIFF * tif ) * this we actually have to scan the header of a strip or tile of * jpeg data to get the sampling. */ - if( !sp->cinfo.comm.is_decompressor + if ( !sp->cinfo.comm.is_decompressor || sp->ycbcrsampling_fetched || td->td_photometric != PHOTOMETRIC_YCBCR ) return; sp->ycbcrsampling_fetched = 1; - if( TIFFIsTiled( tif ) ) + if ( TIFFIsTiled( tif ) ) { - if( !TIFFFillTile( tif, 0 ) ) + if ( !TIFFFillTile( tif, 0 ) ) return; } else { - if( !TIFFFillStrip( tif, 0 ) ) + if ( !TIFFFillStrip( tif, 0 ) ) return; } @@ -1900,9 +1900,9 @@ static int JPEGInitializeLibJPEG( TIFF * tif, int force_encode, int force_decode if(sp->cinfo_initialized) { - if( force_encode && sp->cinfo.comm.is_decompressor ) + if ( force_encode && sp->cinfo.comm.is_decompressor ) TIFFjpeg_destroy( sp ); - else if( force_decode && !sp->cinfo.comm.is_decompressor ) + else if ( force_decode && !sp->cinfo.comm.is_decompressor ) TIFFjpeg_destroy( sp ); else return 1; @@ -1915,26 +1915,26 @@ static int JPEGInitializeLibJPEG( TIFF * tif, int force_encode, int force_decode * the state in decompressor mode if we have tile data, even if we * are not in read-only file access mode. */ - if( TIFFIsTiled( tif ) + if ( TIFFIsTiled( tif ) && TIFFGetField( tif, TIFFTAG_TILEBYTECOUNTS, &byte_counts ) && byte_counts != NULL ) { data_is_empty = byte_counts[0] == 0; } - if( !TIFFIsTiled( tif ) + if ( !TIFFIsTiled( tif ) && TIFFGetField( tif, TIFFTAG_STRIPBYTECOUNTS, &byte_counts) && byte_counts != NULL ) { data_is_empty = byte_counts[0] == 0; } - if( force_decode ) + if ( force_decode ) decompress = 1; - else if( force_encode ) + else if ( force_encode ) decompress = 0; - else if( tif->tif_mode == O_RDONLY ) + else if ( tif->tif_mode == O_RDONLY ) decompress = 1; - else if( data_is_empty ) + else if ( data_is_empty ) decompress = 0; else decompress = 1; @@ -2040,7 +2040,7 @@ TIFFInitJPEG(TIFF* tif, int scheme) ** the JPEGTables field. It will be properly created the right ** size later. */ - if( tif->tif_diroff == 0 ) + if ( tif->tif_diroff == 0 ) { #define SIZE_OF_JPEGTABLES 2000 /* diff --git a/plugins/FreeImage/Source/LibTIFF/tif_luv.c b/plugins/FreeImage/Source/LibTIFF/tif_luv.c index 153900701e..5e72ca63ba 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_luv.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_luv.c @@ -1200,7 +1200,7 @@ LogL16InitState(TIFF* tif) "No support for converting user data format to LogL"); return (0); } - if( isTiled(tif) ) + if ( isTiled(tif) ) sp->tbuflen = multiply(td->td_tilewidth, td->td_tilelength); else sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip); @@ -1301,7 +1301,7 @@ LogLuvInitState(TIFF* tif) "No support for converting user data format to LogLuv"); return (0); } - if( isTiled(tif) ) + if ( isTiled(tif) ) sp->tbuflen = multiply(td->td_tilewidth, td->td_tilelength); else sp->tbuflen = multiply(td->td_imagewidth, td->td_rowsperstrip); diff --git a/plugins/FreeImage/Source/LibTIFF/tif_lzw.c b/plugins/FreeImage/Source/LibTIFF/tif_lzw.c index 97105be1eb..16fcd7f9a7 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_lzw.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_lzw.c @@ -195,7 +195,7 @@ LZWSetupDecode(TIFF* tif) static const char module[] = " LZWSetupDecode"; int code; - if( sp == NULL ) + if ( sp == NULL ) { /* * Allocate state block so tag methods have storage to record @@ -257,7 +257,7 @@ LZWPreDecode(TIFF* tif, tsample_t s) (void) s; assert(sp != NULL); - if( sp->dec_codetab == NULL ) + if ( sp->dec_codetab == NULL ) { tif->tif_setupdecode( tif ); } @@ -764,7 +764,7 @@ LZWPreEncode(TIFF* tif, tsample_t s) (void) s; assert(sp != NULL); - if( sp->enc_hashtab == NULL ) + if ( sp->enc_hashtab == NULL ) { tif->tif_setupencode( tif ); } diff --git a/plugins/FreeImage/Source/LibTIFF/tif_packbits.c b/plugins/FreeImage/Source/LibTIFF/tif_packbits.c index 52206ee322..1fc96d13a2 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_packbits.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_packbits.c @@ -203,7 +203,7 @@ PackBitsEncodeChunk(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s) while ((long)cc > 0) { int chunk = rowsize; - if( cc < chunk ) + if ( cc < chunk ) chunk = cc; if (PackBitsEncode(tif, bp, chunk, s) < 0) @@ -237,7 +237,7 @@ PackBitsDecode(TIFF* tif, tidata_t op, tsize_t occ, tsample_t s) if (n == -128) /* nop */ continue; n = -n + 1; - if( occ < n ) + if ( occ < n ) { TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "PackBitsDecode: discarding %ld bytes " diff --git a/plugins/FreeImage/Source/LibTIFF/tif_predict.c b/plugins/FreeImage/Source/LibTIFF/tif_predict.c index 4f477ab7ea..7f7dc636be 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_predict.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_predict.c @@ -117,7 +117,7 @@ PredictorSetupDecode(TIFF* tif) * Override default decoding method with one that does the * predictor stuff. */ - if( tif->tif_decoderow != PredictorDecodeRow ) + if ( tif->tif_decoderow != PredictorDecodeRow ) { sp->decoderow = tif->tif_decoderow; tif->tif_decoderow = PredictorDecodeRow; @@ -150,7 +150,7 @@ PredictorSetupDecode(TIFF* tif) * Override default decoding method with one that does the * predictor stuff. */ - if( tif->tif_decoderow != PredictorDecodeRow ) + if ( tif->tif_decoderow != PredictorDecodeRow ) { sp->decoderow = tif->tif_decoderow; tif->tif_decoderow = PredictorDecodeRow; @@ -195,7 +195,7 @@ PredictorSetupEncode(TIFF* tif) * Override default encoding method with one that does the * predictor stuff. */ - if( tif->tif_encoderow != PredictorEncodeRow ) + if ( tif->tif_encoderow != PredictorEncodeRow ) { sp->encoderow = tif->tif_encoderow; tif->tif_encoderow = PredictorEncodeRow; @@ -212,7 +212,7 @@ PredictorSetupEncode(TIFF* tif) * Override default encoding method with one that does the * predictor stuff. */ - if( tif->tif_encoderow != PredictorEncodeRow ) + if ( tif->tif_encoderow != PredictorEncodeRow ) { sp->encoderow = tif->tif_encoderow; tif->tif_encoderow = PredictorEncodeRow; @@ -580,7 +580,7 @@ PredictorEncodeTile(TIFF* tif, tidata_t bp0, tsize_t cc0, tsample_t s) * the callers buffer. http://trac.osgeo.org/gdal/ticket/1965 */ working_copy = (uint8*) _TIFFmalloc(cc0); - if( working_copy == NULL ) + if ( working_copy == NULL ) { TIFFErrorExt(tif->tif_clientdata, module, "Out of memory allocating %d byte temp buffer.", diff --git a/plugins/FreeImage/Source/LibTIFF/tif_read.c b/plugins/FreeImage/Source/LibTIFF/tif_read.c index 5618e63e6e..351a1b058d 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_read.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_read.c @@ -99,7 +99,7 @@ TIFFReadScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample) if (!TIFFCheckRead(tif, 0)) return (-1); - if( (e = TIFFSeek(tif, row, sample)) != 0) { + if ( (e = TIFFSeek(tif, row, sample)) != 0) { /* * Decompress desired row into user buffer. */ @@ -141,7 +141,7 @@ TIFFReadEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t buf, tsize_t size) * rows in the strip (check for truncated last strip on any * of the separations). */ - if( td->td_rowsperstrip >= td->td_imagelength ) + if ( td->td_rowsperstrip >= td->td_imagelength ) strips_per_sep = 1; else strips_per_sep = (td->td_imagelength+td->td_rowsperstrip-1) diff --git a/plugins/FreeImage/Source/LibTIFF/tif_thunder.c b/plugins/FreeImage/Source/LibTIFF/tif_thunder.c index 6439c54e42..b8c6cc93cc 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_thunder.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_thunder.c @@ -72,7 +72,7 @@ ThunderSetupDecode(TIFF* tif) { static const char module[] = "ThunderSetupDecode"; - if( tif->tif_dir.td_bitspersample != 4 ) + if ( tif->tif_dir.td_bitspersample != 4 ) { TIFFErrorExt(tif->tif_clientdata, module, "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.", diff --git a/plugins/FreeImage/Source/LibTIFF/tif_unix.c b/plugins/FreeImage/Source/LibTIFF/tif_unix.c index f693df7653..7e294cb78b 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_unix.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_unix.c @@ -176,7 +176,7 @@ TIFFOpen(const char* name, const char* mode) } tif = TIFFFdOpen((int)fd, name, mode); - if(!tif) + if (!tif) close(fd); return tif; } @@ -229,7 +229,7 @@ TIFFOpenW(const wchar_t* name, const char* mode) _TIFFfree(mbname); - if(!tif) + if (!tif) close(fd); return tif; } diff --git a/plugins/FreeImage/Source/LibTIFF/tif_win32.c b/plugins/FreeImage/Source/LibTIFF/tif_win32.c index ddfd778ead..5b3875901d 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_win32.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_win32.c @@ -210,7 +210,7 @@ TIFFOpen(const char* name, const char* mode) } tif = TIFFFdOpen((int)fd, name, mode); - if(!tif) + if (!tif) CloseHandle(fd); return tif; } @@ -266,7 +266,7 @@ TIFFOpenW(const wchar_t* name, const char* mode) tif = TIFFFdOpen((int)fd, (mbname != NULL) ? mbname : "", mode); - if(!tif) + if (!tif) CloseHandle(fd); _TIFFfree(mbname); diff --git a/plugins/FreeImage/Source/LibTIFF/tif_write.c b/plugins/FreeImage/Source/LibTIFF/tif_write.c index 067d3f76fe..043e645b87 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_write.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_write.c @@ -124,7 +124,7 @@ TIFFWriteScanline(TIFF* tif, tdata_t buf, uint32 row, tsample_t sample) tif->tif_rawcc = 0; tif->tif_rawcp = tif->tif_rawdata; - if( td->td_stripbytecount[strip] > 0 ) + if ( td->td_stripbytecount[strip] > 0 ) { /* if we are writing over existing tiles, zero length */ td->td_stripbytecount[strip] = 0; @@ -225,7 +225,7 @@ TIFFWriteEncodedStrip(TIFF* tif, tstrip_t strip, tdata_t data, tsize_t cc) tif->tif_rawcc = 0; tif->tif_rawcp = tif->tif_rawdata; - if( td->td_stripbytecount[strip] > 0 ) + if ( td->td_stripbytecount[strip] > 0 ) { /* Force TIFFAppendToStrip() to consider placing data at end of file. */ @@ -359,7 +359,7 @@ TIFFWriteEncodedTile(TIFF* tif, ttile_t tile, tdata_t data, tsize_t cc) tif->tif_rawcc = 0; tif->tif_rawcp = tif->tif_rawdata; - if( td->td_stripbytecount[tile] > 0 ) + if ( td->td_stripbytecount[tile] > 0 ) { /* Force TIFFAppendToStrip() to consider placing data at end of file. */ @@ -628,7 +628,7 @@ TIFFAppendToStrip(TIFF* tif, tstrip_t strip, tidata_t data, tsize_t cc) if (td->td_stripoffset[strip] == 0 || tif->tif_curoff == 0) { assert(td->td_nstrips > 0); - if( td->td_stripbytecount[strip] != 0 + if ( td->td_stripbytecount[strip] != 0 && td->td_stripoffset[strip] != 0 && td->td_stripbytecount[strip] >= cc ) { diff --git a/plugins/FreeImage/Source/LibTIFF/tif_zip.c b/plugins/FreeImage/Source/LibTIFF/tif_zip.c index 818b9dde09..74ee9c4b5a 100644 --- a/plugins/FreeImage/Source/LibTIFF/tif_zip.c +++ b/plugins/FreeImage/Source/LibTIFF/tif_zip.c @@ -118,7 +118,7 @@ ZIPPreDecode(TIFF* tif, tsample_t s) (void) s; assert(sp != NULL); - if( (sp->state & ZSTATE_INIT_DECODE) == 0 ) + if ( (sp->state & ZSTATE_INIT_DECODE) == 0 ) tif->tif_setupdecode( tif ); sp->stream.next_in = tif->tif_rawdata; @@ -196,7 +196,7 @@ ZIPPreEncode(TIFF* tif, tsample_t s) (void) s; assert(sp != NULL); - if( sp->state != ZSTATE_INIT_ENCODE ) + if ( sp->state != ZSTATE_INIT_ENCODE ) tif->tif_setupencode( tif ); sp->stream.next_out = tif->tif_rawdata; @@ -285,7 +285,7 @@ ZIPCleanup(TIFF* tif) if (sp->state & ZSTATE_INIT_ENCODE) { deflateEnd(&sp->stream); sp->state = 0; - } else if( sp->state & ZSTATE_INIT_DECODE) { + } else if ( sp->state & ZSTATE_INIT_DECODE) { inflateEnd(&sp->stream); sp->state = 0; } diff --git a/plugins/FreeImage/Source/Metadata/Exif.cpp b/plugins/FreeImage/Source/Metadata/Exif.cpp index ed667b0974..7d0955c5db 100644 --- a/plugins/FreeImage/Source/Metadata/Exif.cpp +++ b/plugins/FreeImage/Source/Metadata/Exif.cpp @@ -69,7 +69,7 @@ static int FreeImage_strnicmp(const char *s1, const char *s2, size_t len) { unsigned char c1, c2; - if(!s1 || !s2) return -1; + if (!s1 || !s2) return -1; c1 = 0; c2 = 0; if(len) { @@ -182,7 +182,7 @@ processMakerNote(FIBITMAP *dib, char *pval, BOOL msb_order, DWORD *subdirOffset, FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "Make", &tagMake); const char *Maker = (char*)FreeImage_GetTagValue(tagMake); - if((memcmp("OLYMP\x00\x01", pval, 7) == 0) || (memcmp("OLYMP\x00\x02", pval, 7) == 0) || (memcmp("EPSON", pval, 5) == 0) || (memcmp("AGFA", pval, 4) == 0)) { + if ((memcmp("OLYMP\x00\x01", pval, 7) == 0) || (memcmp("OLYMP\x00\x02", pval, 7) == 0) || (memcmp("EPSON", pval, 5) == 0) || (memcmp("AGFA", pval, 4) == 0)) { // Olympus Type 1 Makernote // Epson and Agfa use Olympus maker note standard, // see: http://www.ozhiker.com/electronics/pjmt/jpeg_info/ @@ -280,11 +280,11 @@ processMakerNote(FIBITMAP *dib, char *pval, BOOL msb_order, DWORD *subdirOffset, *subdirOffset = 0; } } - else if((memcmp("SONY CAM\x20\x00\x00\x00", pval, 12) == 0) || (memcmp("SONY DSC\x20\x00\x00\x00", pval, 12) == 0)) { + else if ((memcmp("SONY CAM\x20\x00\x00\x00", pval, 12) == 0) || (memcmp("SONY DSC\x20\x00\x00\x00", pval, 12) == 0)) { *md_model = TagLib::EXIF_MAKERNOTE_SONY; *subdirOffset = 12; } - else if((memcmp("SIGMA\x00\x00\x00", pval, 8) == 0) || (memcmp("FOVEON\x00\x00", pval, 8) == 0)) { + else if ((memcmp("SIGMA\x00\x00\x00", pval, 8) == 0) || (memcmp("FOVEON\x00\x00", pval, 8) == 0)) { FITAG *tagModel = NULL; FreeImage_GetMetadata(FIMD_EXIF_MAIN, dib, "Model", &tagModel); const char *Model = (char*)FreeImage_GetTagValue(tagModel); @@ -365,7 +365,7 @@ processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) { // create a tag FITAG *canonTag = FreeImage_CreateTag(); - if(!canonTag) return FALSE; + if (!canonTag) return FALSE; // we intentionally skip the first array member (if needed) for (DWORD i = startIndex; i < FreeImage_GetTagCount(tag); i++) { @@ -560,7 +560,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig do { // if there is anything on the stack then pop it off - if(!destack.empty()) { + if (!destack.empty()) { ifdp = ifdstack.top(); ifdstack.pop(); de = destack.top(); destack.pop(); md_model = modelstack.top(); modelstack.pop(); @@ -577,13 +577,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig // determine how many entries there are in the current IFD nde = ReadUint16(msb_order, ifdp); - for(; de < nde; de++) { + for (; de < nde; de++) { char *pde = NULL; // pointer to the directory entry char *pval = NULL; // pointer to the tag value // create a tag FITAG *tag = FreeImage_CreateTag(); - if(!tag) return FALSE; + if (!tag) return FALSE; // point to the directory entry pde = (char*) DIR_ENTRY_ADDR(ifdp, de); @@ -592,7 +592,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig FreeImage_SetTagID(tag, ReadUint16(msb_order, pde)); // get the tag type WORD tag_type = (WORD)ReadUint16(msb_order, pde + 2); - if((tag_type - 1) >= EXIF_NUM_FORMATS) { + if ((tag_type - 1) >= EXIF_NUM_FORMATS) { // a problem occured : delete the tag (not free'd after) FreeImage_DeleteTag(tag); // break out of the for loop @@ -658,7 +658,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig next_ifd = (BYTE*)tiffp + sub_offset; } - if((sub_offset < (DWORD) length) && (next_mdmodel != TagLib::UNKNOWN)) { + if ((sub_offset < (DWORD) length) && (next_mdmodel != TagLib::UNKNOWN)) { // push our current directory state onto the stack ifdstack.push(ifdp); // bump to the next entry @@ -675,7 +675,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig // select a new metadata model modelstack.push(next_mdmodel); - // delete the tag as it won't be stored nor deleted in the for() loop + // delete the tag as it won't be stored nor deleted in the for () loop FreeImage_DeleteTag(tag); break; // break out of the for loop @@ -707,7 +707,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig const WORD entriesCount0th = ReadUint16(msb_order, ifd0th); DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); - if((next_offset == 0) || (next_offset >= length)) { + if ((next_offset == 0) || (next_offset >= length)) { return TRUE; //< no thumbnail } @@ -763,7 +763,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const BYTE *tiffp, unsigned long offset, unsig } } - if(/*thCompression != 6 ||*/ thOffset == 0 || thSize == 0) { + if (/*thCompression != 6 ||*/ thOffset == 0 || thSize == 0) { return TRUE; } diff --git a/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp b/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp index 5d9f3034ec..84e15d0822 100644 --- a/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp +++ b/plugins/FreeImage/Source/Metadata/FreeImageTag.cpp @@ -81,11 +81,11 @@ FreeImage_DeleteTag(FITAG *tag) { FITAG * DLL_CALLCONV FreeImage_CloneTag(FITAG *tag) { - if(!tag) return NULL; + if (!tag) return NULL; // allocate a new tag FITAG *clone = FreeImage_CreateTag(); - if(!clone) return NULL; + if (!clone) return NULL; try { // copy the tag @@ -97,7 +97,7 @@ FreeImage_CloneTag(FITAG *tag) { // tag key if(src_tag->key) { dst_tag->key = (char*)malloc((strlen(src_tag->key) + 1) * sizeof(char)); - if(!dst_tag->key) { + if (!dst_tag->key) { throw FI_MSG_ERROR_MEMORY; } strcpy(dst_tag->key, src_tag->key); @@ -105,7 +105,7 @@ FreeImage_CloneTag(FITAG *tag) { // tag description if(src_tag->description) { dst_tag->description = (char*)malloc((strlen(src_tag->description) + 1) * sizeof(char)); - if(!dst_tag->description) { + if (!dst_tag->description) { throw FI_MSG_ERROR_MEMORY; } strcpy(dst_tag->description, src_tag->description); @@ -118,7 +118,7 @@ FreeImage_CloneTag(FITAG *tag) { dst_tag->length = src_tag->length; // tag value dst_tag->value = (BYTE*)malloc(src_tag->length * sizeof(BYTE)); - if(!dst_tag->value) { + if (!dst_tag->value) { throw FI_MSG_ERROR_MEMORY; } memcpy(dst_tag->value, src_tag->value, src_tag->length); @@ -253,7 +253,7 @@ FreeImage_SetTagValue(FITAG *tag, const void *value) { case FIDT_ASCII: { tag_header->value = (char*)malloc((tag_header->length + 1) * sizeof(char)); - if(!tag_header->value) { + if (!tag_header->value) { return FALSE; } char *src_data = (char*)value; @@ -267,7 +267,7 @@ FreeImage_SetTagValue(FITAG *tag, const void *value) { default: tag_header->value = malloc(tag_header->length * sizeof(BYTE)); - if(!tag_header->value) { + if (!tag_header->value) { return FALSE; } memcpy(tag_header->value, value, tag_header->length); diff --git a/plugins/FreeImage/Source/Metadata/IPTC.cpp b/plugins/FreeImage/Source/Metadata/IPTC.cpp index 1aba46c094..817beddf98 100644 --- a/plugins/FreeImage/Source/Metadata/IPTC.cpp +++ b/plugins/FreeImage/Source/Metadata/IPTC.cpp @@ -46,7 +46,7 @@ read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) { WORD tag_id; - if(!dataptr || (datalen == 0)) { + if (!dataptr || (datalen == 0)) { return FALSE; } @@ -59,7 +59,7 @@ read_iptc_profile(FIBITMAP *dib, const BYTE *dataptr, unsigned int datalen) { // find start of the BIM portion of the binary data size_t offset = 0; while(offset < length - 1) { - if((profile[offset] == 0x1C) && (profile[offset+1] == 0x02)) + if ((profile[offset] == 0x1C) && (profile[offset+1] == 0x02)) break; offset++; } @@ -211,7 +211,7 @@ append_iptc_tag(BYTE *profile, unsigned *profile_size, WORD id, DWORD length, co // calculate the new buffer size size_t buffer_size = (5 + *profile_size + length) * sizeof(BYTE); buffer = (BYTE*)malloc(buffer_size); - if(!buffer) + if (!buffer) return NULL; // add the header diff --git a/plugins/FreeImage/Source/Metadata/TagConversion.cpp b/plugins/FreeImage/Source/Metadata/TagConversion.cpp index 041ba9a747..7b91598014 100644 --- a/plugins/FreeImage/Source/Metadata/TagConversion.cpp +++ b/plugins/FreeImage/Source/Metadata/TagConversion.cpp @@ -39,7 +39,7 @@ ConvertAnyTag(FITAG *tag) { static std::string buffer; DWORD i; - if(!tag) + if (!tag) return NULL; buffer.erase(); @@ -259,7 +259,7 @@ ConvertExifTag(FITAG *tag) { char format[MAX_TEXT_EXTENT]; static std::string buffer; - if(!tag) + if (!tag) return NULL; buffer.erase(); @@ -993,7 +993,7 @@ ConvertExifGPSTag(FITAG *tag) { char format[MAX_TEXT_EXTENT]; static std::string buffer; - if(!tag) + if (!tag) return NULL; buffer.erase(); diff --git a/plugins/FreeImage/Source/Metadata/TagLib.cpp b/plugins/FreeImage/Source/Metadata/TagLib.cpp index 123d860041..eff291beab 100644 --- a/plugins/FreeImage/Source/Metadata/TagLib.cpp +++ b/plugins/FreeImage/Source/Metadata/TagLib.cpp @@ -1478,14 +1478,14 @@ TagLib::TagLib() { BOOL TagLib::addMetadataModel(MDMODEL md_model, TagInfo *tag_table) { // check that the model doesn't already exist - if((_table_map.find(md_model) == _table_map.end()) && (tag_table != NULL)) { + if ((_table_map.find(md_model) == _table_map.end()) && (tag_table != NULL)) { // add the tag description table TAGINFO *info_map = new(std::nothrow) TAGINFO(); - if(!info_map) return FALSE; + if (!info_map) return FALSE; for(int i = 0; ; i++) { - if((tag_table[i].tag == 0) && (tag_table[i].fieldname == NULL)) + if ((tag_table[i].tag == 0) && (tag_table[i].fieldname == NULL)) break; (*info_map)[tag_table[i].tag] = &tag_table[i]; } diff --git a/plugins/FreeImage/Source/Metadata/XTIFF.cpp b/plugins/FreeImage/Source/Metadata/XTIFF.cpp index c6ec5ba858..bc63cf38b2 100644 --- a/plugins/FreeImage/Source/Metadata/XTIFF.cpp +++ b/plugins/FreeImage/Source/Metadata/XTIFF.cpp @@ -123,7 +123,7 @@ tiff_read_geotiff_profile(TIFF *tif, FIBITMAP *dib) { if(TIFFGetField(tif, fieldInfo->field_tag, ¶ms)) { // create a tag FITAG *tag = FreeImage_CreateTag(); - if(!tag) + if (!tag) return; WORD tag_id = (WORD)fieldInfo->field_tag; @@ -147,7 +147,7 @@ tiff_read_geotiff_profile(TIFF *tif, FIBITMAP *dib) { if(TIFFGetField(tif, fieldInfo->field_tag, &tag_count, &data)) { // create a tag FITAG *tag = FreeImage_CreateTag(); - if(!tag) + if (!tag) return; WORD tag_id = (WORD)fieldInfo->field_tag; @@ -315,7 +315,7 @@ tiff_read_exif_tag(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib, TagLib& t // build FreeImage tag from Tiff Tag data we collected FITAG *fitag = FreeImage_CreateTag(); - if(!fitag) { + if (!fitag) { if(mem_alloc) { _TIFFfree(raw_data); } @@ -514,18 +514,18 @@ tiff_read_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) { // test if tag value is set // (lifted directly form LibTiff _TIFFWriteDirectory) - if( fld->field_bit == FIELD_CUSTOM ) { + if ( fld->field_bit == FIELD_CUSTOM ) { int ci, is_set = FALSE; - for( ci = 0; ci < td->td_customValueCount; ci++ ) { + for ( ci = 0; ci < td->td_customValueCount; ci++ ) { is_set |= (td->td_customValues[ci].info == fld); } - if( !is_set ) { + if ( !is_set ) { continue; } - } else if(!TIFFFieldSet(tif, fld->field_bit)) { + } else if (!TIFFFieldSet(tif, fld->field_bit)) { continue; } @@ -639,7 +639,7 @@ tiff_write_exif_tags(TIFF *tif, TagLib::MDMODEL md_model, FIBITMAP *dib) { // check for identical formats // (enum value are the sames between FREE_IMAGE_MDTYPE and TIFFDataType types) - if((int)tif_tag_type != (int)tag_type) { + if ((int)tif_tag_type != (int)tag_type) { // skip tag or _TIFFmemcpy will fail continue; } diff --git a/plugins/FreeImage/Source/Utilities.h b/plugins/FreeImage/Source/Utilities.h index bf836e1e87..b743325129 100644 --- a/plugins/FreeImage/Source/Utilities.h +++ b/plugins/FreeImage/Source/Utilities.h @@ -174,7 +174,7 @@ MAXMIN(const T* L, long n, T& max, T& min) { long k1, k2; i1 = 0; i2 = 0; min = L[0]; max = L[0]; j = 0; - if((n % 2) != 0) j = 1; + if ((n % 2) != 0) j = 1; for(i = j; i < n; i+= 2) { k1 = i; k2 = i+1; x1 = L[k1]; x2 = L[k2]; diff --git a/plugins/FreeImage/Source/Zlib/zutil.h b/plugins/FreeImage/Source/Zlib/zutil.h index 223a74d3dc..8f33fd3e7d 100644 --- a/plugins/FreeImage/Source/Zlib/zutil.h +++ b/plugins/FreeImage/Source/Zlib/zutil.h @@ -219,7 +219,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # include extern int ZLIB_INTERNAL z_verbose; extern void ZLIB_INTERNAL z_error OF((char *m)); -# define Assert(cond,msg) {if(!(cond)) z_error(msg);} +# define Assert(cond,msg) {if (!(cond)) z_error(msg);} # define Trace(x) {if (z_verbose>=0) fprintf x ;} # define Tracev(x) {if (z_verbose>0) fprintf x ;} # define Tracevv(x) {if (z_verbose>1) fprintf x ;} diff --git a/plugins/HistoryLinkListPlus/linklist.c b/plugins/HistoryLinkListPlus/linklist.c index c6625dc933..cd4f59f056 100644 --- a/plugins/HistoryLinkListPlus/linklist.c +++ b/plugins/HistoryLinkListPlus/linklist.c @@ -265,7 +265,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam) } } actCount++; - if( ((int)(((float)actCount/histCount)*100.00)) % 10 == 0 ) + if ( ((int)(((float)actCount/histCount)*100.00)) % 10 == 0 ) SendMessage(hWndProgress, WM_COMMAND, 100, ((int)(((float)actCount/histCount)*100.00))); hEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT, (WPARAM)hEvent, 0); diff --git a/plugins/HistoryLinkListPlus/linklist_dlg.c b/plugins/HistoryLinkListPlus/linklist_dlg.c index 3cd20ace43..c416e0121a 100644 --- a/plugins/HistoryLinkListPlus/linklist_dlg.c +++ b/plugins/HistoryLinkListPlus/linklist_dlg.c @@ -246,7 +246,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) TCHAR filter[40]; // open Search Box - if( wParam == IDM_SEARCH ) + if ( wParam == IDM_SEARCH ) { HWND hWndSearchDlg; @@ -283,7 +283,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) } // view only incoming messages - else if( wParam == IDM_DIR_IN ) + else if ( wParam == IDM_DIR_IN ) { GetFilterText(listMenu, filter, _countof(filter)); SetDlgItemText(hDlg, IDC_STATUS, filter); diff --git a/plugins/HistoryLinkListPlus/linklist_fct.c b/plugins/HistoryLinkListPlus/linklist_fct.c index 3c95874e40..ed0816ba1f 100644 --- a/plugins/HistoryLinkListPlus/linklist_fct.c +++ b/plugins/HistoryLinkListPlus/linklist_fct.c @@ -141,7 +141,7 @@ int ExtractURI(DBEVENTINFO *dbei, HANDLE hEvent, LISTELEMENT *listStart) } if ( !isLink ) { - for( j=0; j<_countof(hyperlinkSubstrings); j++ ) + for ( j=0; j<_countof(hyperlinkSubstrings); j++ ) { if ( _tcsstr(wordsearch+1,hyperlinkSubstrings[j]) ) { @@ -156,7 +156,7 @@ int ExtractURI(DBEVENTINFO *dbei, HANDLE hEvent, LISTELEMENT *listStart) isLink = 1; //e-mail addresses type = LINK_MAIL; } - else if( isLink ) { + else if ( isLink ) { type = LINK_URL; } @@ -164,11 +164,11 @@ int ExtractURI(DBEVENTINFO *dbei, HANDLE hEvent, LISTELEMENT *listStart) { LPTSTR tok_ctx; - if( (_tcsstr(wordsearch, _T("www.")) != NULL) && (_tcsstr(wordsearch, _T("http://")) == NULL) ) + if ( (_tcsstr(wordsearch, _T("www.")) != NULL) && (_tcsstr(wordsearch, _T("http://")) == NULL) ) { _tcsncpy_s(link, _countof(link), _T("http://"), _mstrlen(_T("http://"))); // Link longer than defined max -> cut link to max - if( (i-wordStart+1) > (int)(LINK_MAX-_mstrlen(_T("http://"))) ) + if ( (i-wordStart+1) > (int)(LINK_MAX-_mstrlen(_T("http://"))) ) _tcsncpy_s(link + _mstrlen(_T("http://")), _countof(link), word, LINK_MAX - _mstrlen(_T("http://"))); else _tcsncpy_s(link + _mstrlen(_T("http://")), _countof(link), word, i-wordStart+1); @@ -373,7 +373,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc { linePos = GetLastLinePos(listStart); - if((realListCount - append) == 1) + if ((realListCount - append) == 1) _tcscpy_s(lastDate, _countof(lastDate), actualElement->date); for(appCount = 1; appCount <= (realListCount - append); appCount++) @@ -410,7 +410,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc if ( (params & WLL_IN) && (actualElement->direction == DIRECTION_IN) ) filter1 = 1; - else if( (params & WLL_OUT) && (actualElement->direction == DIRECTION_OUT) ) + else if ( (params & WLL_OUT) && (actualElement->direction == DIRECTION_OUT) ) filter1 = 1; if ( (params & WLL_MAIL) && (actualElement->type == LINK_MAIL) ) @@ -435,7 +435,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc CallService(MS_DB_EVENT_GET, (WPARAM)actualElement->hEvent, (LPARAM)&dbe); dbe.pBlob[dbe.cbBlob] = 0; msg = DbGetEventTextT(&dbe, CP_ACP); - if( _tcsstr(msg, searchString) ) + if ( _tcsstr(msg, searchString) ) filter3 = 1; free(dbe.pBlob); @@ -523,7 +523,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc linePos++; actualElement->linePos = linePos; actCount++; - if( hwndProgress && ( ((int)(((float)actCount/listCount)*100.00)) % 10 == 0 ) ) + if ( hwndProgress && ( ((int)(((float)actCount/listCount)*100.00)) % 10 == 0 ) ) SendMessage(hwndProgress, WM_COMMAND, 100,((int)(((float)actCount/listCount)*100.00))); } @@ -531,7 +531,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc } if ( listCount > 0 ) { - if((actCount < listCount) && (append == 0) && (options.showLine != 0)) + if ((actCount < listCount) && (append == 0) && (options.showLine != 0)) DrawLine(hDlg, lineLen); } else if ( searchString == NULL ) @@ -857,12 +857,12 @@ void GetListInfo(BYTE params, LISTELEMENT *listStart, LPCTSTR searchString, siz else filter3 = 1; - if((filter1 == 1) && (filter2 == 1) && (filter3 == 1)) + if ((filter1 == 1) && (filter2 == 1) && (filter3 == 1)) { (*elementCount)++; tempLen = _tcslen(actualElement->link); - if(*maxLen < tempLen) + if (*maxLen < tempLen) *maxLen = tempLen; } actualElement = actualElement->nextElement; @@ -1324,13 +1324,13 @@ BOOL SaveEditAsStream( HWND hDlg ) ofn.lpstrTitle = _T("Save RTF File"); ofn.Flags = OFN_OVERWRITEPROMPT; // Get a filename or quit - if( ! GetSaveFileName( &ofn ) ) + if ( ! GetSaveFileName( &ofn ) ) return FALSE; // Create the specified file hFile = CreateFile( szFilename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); // Quit if file creation fails - if( hFile == INVALID_HANDLE_VALUE ) + if ( hFile == INVALID_HANDLE_VALUE ) return FALSE; // Pass file handle to callback // so the callback can do the file write @@ -1347,7 +1347,7 @@ BOOL SaveEditAsStream( HWND hDlg ) DWORD CALLBACK RTFSaveStreamCallback(DWORD_PTR dwCookie, LPBYTE lpBuffer, LONG lSize, LONG *plRead) { // Sanity check...exit if nothing passed - if( ! lSize ) + if ( ! lSize ) return 1; // Initialize "amount read" variable for WriteFile() *plRead = 0; diff --git a/plugins/HistorySweeperLight/historysweeperlight.h b/plugins/HistorySweeperLight/historysweeperlight.h index 1943d9b07e..2600cc2d67 100644 --- a/plugins/HistorySweeperLight/historysweeperlight.h +++ b/plugins/HistorySweeperLight/historysweeperlight.h @@ -23,7 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIRANDA_VER 0x0A00 -#define _USE_32BIT_TIME_T +#if !defined( _WIN64 ) + #define _USE_32BIT_TIME_T +#endif #include #include diff --git a/plugins/IEView/HTMLBuilder.cpp b/plugins/IEView/HTMLBuilder.cpp index 7c83609eea..9fa9e24824 100644 --- a/plugins/IEView/HTMLBuilder.cpp +++ b/plugins/IEView/HTMLBuilder.cpp @@ -258,7 +258,7 @@ wchar_t *HTMLBuilder::getContactName(HANDLE hContact, const char* szProto) { if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) { if (ci.type == CNFT_ASCIIZ) { if (ci.pszVal) { - if(!wcscmp((wchar_t *)ci.pszVal, TranslateW(L"'(Unknown Contact)'"))) { + if (!wcscmp((wchar_t *)ci.pszVal, TranslateW(L"'(Unknown Contact)'"))) { ci.dwFlag &= ~CNF_UNICODE; if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) { szName = Utils::convertToWCS((char *)ci.pszVal); diff --git a/plugins/IEView/Options.cpp b/plugins/IEView/Options.cpp index afd577bf89..9ab5bfe63c 100644 --- a/plugins/IEView/Options.cpp +++ b/plugins/IEView/Options.cpp @@ -1689,7 +1689,7 @@ void Options::setEmbedsize(int size){ DBWriteContactSettingDword(NULL, ieviewModuleName, "Embedsize", (DWORD) size); } -int Options::getEmbedsize(){ +int Options::getEmbedsize() { return DBGetContactSettingDword(NULL, ieviewModuleName, "Embedsize", 0); } diff --git a/plugins/IEView/SRMMHTMLBuilder.cpp b/plugins/IEView/SRMMHTMLBuilder.cpp index f142cf3028..303cae44e1 100644 --- a/plugins/IEView/SRMMHTMLBuilder.cpp +++ b/plugins/IEView/SRMMHTMLBuilder.cpp @@ -104,7 +104,7 @@ char *SRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) { dbtts.cbDest = 70;; dbtts.szDest = str; szResult[0] = '\0'; - if(!(dwFlags & SMF_LOG_SHOWDATES)) { + if (!(dwFlags & SMF_LOG_SHOWDATES)) { dbtts.szFormat = (char *)"s"; } else { diff --git a/plugins/IEView/TabSRMMHTMLBuilder.cpp b/plugins/IEView/TabSRMMHTMLBuilder.cpp index 42bc5fc2c7..78d00177a8 100644 --- a/plugins/IEView/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/TabSRMMHTMLBuilder.cpp @@ -168,7 +168,7 @@ char *TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG dbtts.cbDest = 70;; dbtts.szDest = str; - if(!isGroupBreak || !(dwFlags & MWF_LOG_SHOWDATES)) { + if (!isGroupBreak || !(dwFlags & MWF_LOG_SHOWDATES)) { dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t"; szResult[0] = '\0'; } diff --git a/plugins/Import/mirabilis.c b/plugins/Import/mirabilis.c index 79a07f1546..8d4577acd6 100644 --- a/plugins/Import/mirabilis.c +++ b/plugins/Import/mirabilis.c @@ -245,7 +245,7 @@ static int GetHighestIndexEntry(void) DWORD ofs; ofs=*(PDWORD)(pIdx+12); - for(;;) { + for (;;) { entry=(struct TIdxIndexEntry*)(pIdx+ofs); if(entry->entryIdLow==(DWORD)-2) return ((struct TIdxDatEntry*)entry)->entryId; if(entry->ofsHigher>=0xF0000000) ofs=entry->ofsInHere; @@ -257,7 +257,7 @@ static int GetIdDatOfs(DWORD id) { struct TIdxIndexEntry *entry; DWORD ofs = *(PDWORD)(pIdx+12); - for(;;) { + for (;;) { entry=(struct TIdxIndexEntry*)(pIdx+ofs); if(entry->entryIdLow==(DWORD)-2) { if(entry->entryIdHigh==id) return ((struct TIdxDatEntry*)entry)->datOfs; @@ -390,7 +390,7 @@ DWORD ReadPropertyBlock(DWORD dwOffset, char* SearchWord, int* nSearchResult) if ( SearchWord ) { // Is this the property we are searching for? - if(!lstrcmpA((char*)(pDat+nameOfs),SearchWord)){ + if (!lstrcmpA((char*)(pDat+nameOfs),SearchWord)) { *nSearchResult = 1; return dwOffset; } } @@ -486,10 +486,10 @@ DWORD FindMyDetails(void) DWORD dwOffset = GetIdDatOfs(1005); if (!dwOffset) return 0; - if(*(PDWORD)(pDat+dwOffset+0x08) != 1005) return 0; - if(*(PBYTE)(pDat+dwOffset+0x0C) != 0xE4) return 0; - if(*(int*)(pDat+dwOffset+0x1e) != 'USER') return 0; - if(*(PDWORD)(pDat+dwOffset+0x22) != 6) return 0; + if (*(PDWORD)(pDat+dwOffset+0x08) != 1005) return 0; + if (*(PBYTE)(pDat+dwOffset+0x0C) != 0xE4) return 0; + if (*(int*)(pDat+dwOffset+0x1e) != 'USER') return 0; + if (*(PDWORD)(pDat+dwOffset+0x22) != 6) return 0; return dwOffset; } @@ -528,7 +528,7 @@ DWORD FindGroupList(DWORD dwOffset) dwOffset += 0x04; // ++ UNKNOWN ++ dwPhoneEntries = *(PDWORD)(pDat+dwOffset); // Phonebook starts here dwOffset += 0x04; - for(n = 0;n 1) return 6 + (char*)(pDat + dwOffset); @@ -666,10 +666,10 @@ char* GetGroupName(DWORD dwGroupID) case DBV2000A: case DBV2000B: case DBV2001A: - for (n = 0; n < dwGroups; n++){ - if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupID", &nSearchResult)){ + for (n = 0; n < dwGroups; n++) { + if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupID", &nSearchResult)) { if (nSearchResult) { - if (dwGroupID == *(PDWORD)(pDat + tmpOfs + 1)){ + if (dwGroupID == *(PDWORD)(pDat + tmpOfs + 1)) { strGroupName = 3 + (char*)(pDat + ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)); if (nSearchResult) { if ((DWORD)*(strGroupName - 2) > 1) @@ -746,7 +746,7 @@ int ImportGroups() switch (nFormat) { case ENTRYV99A: case ENTRYV99B: - for (n = 0; n < dwGroups; n++){ + for (n = 0; n < dwGroups; n++) { if (*(PWORD)(pDat+dwOffset+4) > 1) { if ( CreateGroup(DBVT_ASCIIZ, (char*)(pDat + dwOffset) + 6, NULL )) nImported++; @@ -759,8 +759,8 @@ int ImportGroups() case ENTRYV2001A: case ENTRYV2001B: case ENTRYV2002A: - for (n = 0; n < dwGroups; n++){ - if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)){ + for (n = 0; n < dwGroups; n++) { + if (tmpOfs = ReadPropertyBlock(dwOffset, "GroupName", &nSearchResult)) { if (nSearchResult) { if (CreateGroup( DBVT_ASCIIZ, (char*)(pDat + tmpOfs + 3), NULL )) nImported++; diff --git a/plugins/Import/mirandahistory.c b/plugins/Import/mirandahistory.c index 232d295f8d..ba7a923df7 100644 --- a/plugins/Import/mirandahistory.c +++ b/plugins/Import/mirandahistory.c @@ -92,7 +92,7 @@ static PBYTE ReadHistoryLines(FILE *fp,int *cbBlob) blob=(char*)realloc(blob,*cbBlob+1); lstrcpy(blob+ofs,str); } - if(*cbBlob) { + if (*cbBlob) { (*cbBlob)--; blob[*cbBlob-1]=0; } @@ -150,7 +150,7 @@ static void OldMirandaHistoryImport(HWND hdlgProgress) tmEventTime.tm_mon=atoi(timeofs+10)-1; tmEventTime.tm_year=atoi(timeofs+13)-1900; dbei.timestamp=mktime(&tmEventTime)+_timezone; - if(!(importOptions&historyTypeToOption[type])) continue; + if (!(importOptions&historyTypeToOption[type])) continue; hContact=HistoryImportFindContact(hdlgProgress,uin,importOptions&IOPT_ADDUNKNOWN); if(hContact==INVALID_HANDLE_VALUE) break; dbei.flags=issent(type)?DBEF_SENT:DBEF_READ; diff --git a/plugins/JSON/Source/JSONChildren.h b/plugins/JSON/Source/JSONChildren.h index acc9a712a2..d7a38bb9dc 100644 --- a/plugins/JSON/Source/JSONChildren.h +++ b/plugins/JSON/Source/JSONChildren.h @@ -74,7 +74,7 @@ public: } //clears (and deletes) everything from the vector and sets it's size to 0 - inline void clear(){ + inline void clear() { if (array){ //don't bother clearing anything if there is nothing in it JSON_ASSERT(mycapacity != 0, JSON_TEXT("mycapacity is not zero, but array is null")); deleteAll(); @@ -204,7 +204,7 @@ public: } //shrinks the array to only as large as it needs to be to hold everything within it - inline void shrink(){ + inline void shrink() { if (mysize == 0){ //size is zero, we should completely free the array libjson_free(array); //free does checks for a null pointer, so don't bother checking array = 0; diff --git a/plugins/JSON/Source/JSONDebug.h b/plugins/JSON/Source/JSONDebug.h index cace9b5c8e..faadd5f07a 100644 --- a/plugins/JSON/Source/JSONDebug.h +++ b/plugins/JSON/Source/JSONDebug.h @@ -14,7 +14,7 @@ #ifdef JSON_SAFE #define JSON_ASSERT_SAFE(condition, msg, code)\ {\ - if (!(condition)){\ + if (!(condition)) {\ JSON_FAIL(msg);\ code\ }\ @@ -44,7 +44,7 @@ #ifdef JSON_SAFE #define JSON_ASSERT_SAFE(condition, msg, code)\ {\ - if (!(condition)){\ + if (!(condition)) {\ code\ }\ } diff --git a/plugins/JSON/Source/JSONIterators.cpp b/plugins/JSON/Source/JSONIterators.cpp index 5b140d9b17..a22db2af71 100644 --- a/plugins/JSON/Source/JSONIterators.cpp +++ b/plugins/JSON/Source/JSONIterators.cpp @@ -17,7 +17,7 @@ JSONNode::json_iterator JSONNode::find(const json_string & name_t){ JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node")); makeUniqueInternal(); - if (JSONNode ** res = internal -> at(name_t)){ + if (JSONNode ** res = internal -> at(name_t)) { return ptr_to_json_iterator(res); } return end(); @@ -28,7 +28,7 @@ JSONNode::json_iterator JSONNode::find(const json_string & name_t){ JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node")); makeUniqueInternal(); - if (JSONNode ** res = internal -> at_nocase(name_t)){ + if (JSONNode ** res = internal -> at_nocase(name_t)) { return ptr_to_json_iterator(res); } return end(); @@ -71,7 +71,7 @@ JSONNode::json_iterator JSONNode::insert(json_iterator pos, const JSONNode & x){ JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node")); JSON_ASSERT_UNIQUE("insert 1"); - if (json_iterator_ptr(pos) >= internal -> Children.end()){ + if (json_iterator_ptr(pos) >= internal -> Children.end()) { internal -> push_back(x); return end() - 1; } @@ -104,7 +104,7 @@ JSONNode::json_iterator JSONNode::insertFFF(json_iterator pos, JSONNode ** const JSONNode::const_iterator JSONNode::find(const json_string & name_t) const { JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node")); - if (JSONNode ** res = internal -> at(name_t)){ + if (JSONNode ** res = internal -> at(name_t)) { return JSONNode::const_iterator(res); } return JSONNode::const_iterator(internal -> end()); @@ -114,7 +114,7 @@ JSONNode::json_iterator JSONNode::insertFFF(json_iterator pos, JSONNode ** const JSONNode::const_iterator JSONNode::find_nocase(const json_string & name_t) const { JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("finding a non-iteratable node")); - if (JSONNode ** res = internal -> at_nocase(name_t)){ + if (JSONNode ** res = internal -> at_nocase(name_t)) { return JSONNode::const_iterator(res); } return JSONNode::const_iterator(internal -> end()); @@ -153,7 +153,7 @@ JSONNode::json_iterator JSONNode::insertFFF(json_iterator pos, JSONNode ** const JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE || type() == JSON_ARRAY, JSON_TEXT("erasing a non-iteratable node")); JSON_ASSERT_UNIQUE("insert 1"); - if (pos.it < internal -> Children.begin()){ + if (pos.it < internal -> Children.begin()) { internal -> push_front(x); return rend() - 1; } diff --git a/plugins/JSON/Source/JSONMemory.h b/plugins/JSON/Source/JSONMemory.h index 4797bd619f..24c1eee6cf 100644 --- a/plugins/JSON/Source/JSONMemory.h +++ b/plugins/JSON/Source/JSONMemory.h @@ -77,7 +77,7 @@ #include class JSONNode; struct auto_expand { - auto_expand(void) : mymap(){} + auto_expand(void) : mymap() {} ~auto_expand(void){ purge(); } void purge(void); inline void clear(void){ purge(); mymap.clear(); } @@ -91,7 +91,7 @@ }; struct auto_expand_node { - auto_expand_node(void) : mymap(){} + auto_expand_node(void) : mymap() {} ~auto_expand_node(void){ purge(); } void purge(void); inline void clear(void){ purge(); mymap.clear(); } @@ -109,7 +109,7 @@ template class json_auto { public: json_auto(void) : ptr(0){} - json_auto(size_t count) : ptr(json_malloc(count)){} + json_auto(size_t count) : ptr(json_malloc(count)) {} ~json_auto(void){ libjson_free(ptr); } diff --git a/plugins/JSON/Source/JSONNode.cpp b/plugins/JSON/Source/JSONNode.cpp index f4ced9a478..ac6106b261 100644 --- a/plugins/JSON/Source/JSONNode.cpp +++ b/plugins/JSON/Source/JSONNode.cpp @@ -16,7 +16,7 @@ #endif #define IMPLEMENT_CTOR(type)\ - JSONNode::JSONNode(const json_string & name_t, type value_t) : internal(internalJSONNode::newInternal()){\ + JSONNode::JSONNode(const json_string & name_t, type value_t) : internal(internalJSONNode::newInternal()) {\ internal -> Set(value_t);\ internal -> setname(name_t);\ incAllocCount();\ @@ -24,7 +24,7 @@ IMPLEMENT_FOR_ALL_TYPES(IMPLEMENT_CTOR) #ifndef JSON_LIBRARY - JSONNode::JSONNode(const json_string & name_t, const json_char * value_t) : internal(internalJSONNode::newInternal()){ + JSONNode::JSONNode(const json_string & name_t, const json_char * value_t) : internal(internalJSONNode::newInternal()) { internal -> Set(json_string(value_t)); internal -> setname(name_t); incAllocCount(); @@ -103,7 +103,7 @@ void JSONNode::cast(char newtype){ #ifdef JSON_REF_COUNT void JSONNode::merge(JSONNode & other){ #else -void JSONNode::merge(JSONNode &){ +void JSONNode::merge(JSONNode &) { #endif JSON_CHECK_INTERNAL(); #ifdef JSON_REF_COUNT @@ -125,9 +125,9 @@ void JSONNode::merge(JSONNode &){ } //different just to supress the warning - void JSONNode::merge(unsigned int num, ...){ + void JSONNode::merge(unsigned int num, ...) { #else - void JSONNode::merge(unsigned int, ...){ + void JSONNode::merge(unsigned int, ...) { #endif JSON_CHECK_INTERNAL(); #ifdef JSON_REF_COUNT @@ -153,7 +153,7 @@ JSONNode JSONNode::duplicate(void) const { JSONNode & JSONNode::at(json_index_t pos){ JSON_CHECK_INTERNAL(); - if (pos >= internal -> size()){ + if (pos >= internal -> size()) { JSON_FAIL(JSON_TEXT("at() out of bounds")); throw std::out_of_range(EMPTY_STRING2); } @@ -162,7 +162,7 @@ JSONNode & JSONNode::at(json_index_t pos){ const JSONNode & JSONNode::at(json_index_t pos) const { JSON_CHECK_INTERNAL(); - if (pos >= internal -> size()){ + if (pos >= internal -> size()) { JSON_FAIL(JSON_TEXT("at() const out of bounds")); throw std::out_of_range(EMPTY_STRING2); } @@ -186,7 +186,7 @@ JSONNode & JSONNode::at(const json_string & name_t){ JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node")); makeUniqueInternal(); - if (JSONNode ** res = internal -> at(name_t)){ + if (JSONNode ** res = internal -> at(name_t)) { return *(*res); } JSON_FAIL(json_string(JSON_TEXT("at could not find child by name: ")) + name_t); @@ -196,7 +196,7 @@ JSONNode & JSONNode::at(const json_string & name_t){ const JSONNode & JSONNode::at(const json_string & name_t) const { JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node")); - if (JSONNode ** res = internal -> at(name_t)){ + if (JSONNode ** res = internal -> at(name_t)) { return *(*res); } JSON_FAIL(json_string(JSON_TEXT("at const could not find child by name: ")) + name_t); @@ -208,7 +208,7 @@ const JSONNode & JSONNode::at(const json_string & name_t) const { JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node")); makeUniqueInternal(); - if (JSONNode ** res = internal -> at_nocase(name_t)){ + if (JSONNode ** res = internal -> at_nocase(name_t)) { return *(*res); } JSON_FAIL(json_string(JSON_TEXT("at_nocase could not find child by name: ")) + name_t); @@ -218,7 +218,7 @@ const JSONNode & JSONNode::at(const json_string & name_t) const { const JSONNode & JSONNode::at_nocase(const json_string & name_t) const { JSON_CHECK_INTERNAL(); JSON_ASSERT(type() == JSON_NODE, JSON_TEXT("at a non-iteratable node")); - if (JSONNode ** res = internal -> at_nocase(name_t)){ + if (JSONNode ** res = internal -> at_nocase(name_t)) { return *(*res); } JSON_FAIL(json_string(JSON_TEXT("at_nocase const could not find child by name: ")) + name_t); @@ -240,7 +240,7 @@ const JSONNode & JSONNode::at(const json_string & name_t) const { JSONNode JSON_PTR_LIB JSONNode::pop_back(json_index_t pos){ JSON_CHECK_INTERNAL(); - if (pos >= internal -> size()){ + if (pos >= internal -> size()) { JSON_FAIL(JSON_TEXT("pop_back out of bounds")); throw std::out_of_range(EMPTY_STRING2); } @@ -259,7 +259,7 @@ JSONNode JSON_PTR_LIB JSONNode::pop_back(const json_string & name_t){ #ifdef JSON_LIBRARY return internal -> pop_back(name_t); #else - if (JSONNode * res = internal -> pop_back(name_t)){ + if (JSONNode * res = internal -> pop_back(name_t)) { auto_delete temp(res); return *(temp.mynode); } @@ -275,7 +275,7 @@ JSONNode JSON_PTR_LIB JSONNode::pop_back(const json_string & name_t){ #ifdef JSON_LIBRARY return internal -> pop_back_nocase(name_t); #else - if (JSONNode * res = internal -> pop_back_nocase(name_t)){ + if (JSONNode * res = internal -> pop_back_nocase(name_t)) { auto_delete temp(res); return *(temp.mynode); } diff --git a/plugins/JSON/Source/JSONNode.h b/plugins/JSON/Source/JSONNode.h index b4fad7573c..36ebcd6145 100644 --- a/plugins/JSON/Source/JSONNode.h +++ b/plugins/JSON/Source/JSONNode.h @@ -443,7 +443,7 @@ JSON_PRIVATE static JSONNode * newJSONNode(const JSONNode & orig JSON_MUTEX_COPY_DECL2); static JSONNode * newJSONNode(internalJSONNode * internal_t); //used by JSONWorker - JSONNode(const json_string & unparsed) : internal(internalJSONNode::newInternal(unparsed)){ //root, specialized because it can only be array or node + JSONNode(const json_string & unparsed) : internal(internalJSONNode::newInternal(unparsed)) { //root, specialized because it can only be array or node incAllocCount(); } JSONNode(internalJSONNode * internal_t) : internal(internal_t){ //do not increment anything, this is only used in one case and it's already taken care of @@ -484,7 +484,7 @@ JSON_PRIVATE file because they are inlined. */ -inline JSONNode::JSONNode(char mytype) : internal(internalJSONNode::newInternal(mytype)){ +inline JSONNode::JSONNode(char mytype) : internal(internalJSONNode::newInternal(mytype)) { JSON_ASSERT((mytype == JSON_NULL) || (mytype == JSON_STRING) || (mytype == JSON_NUMBER) || @@ -494,7 +494,7 @@ inline JSONNode::JSONNode(char mytype) : internal(internalJSONNode::newInternal( incAllocCount(); } -inline JSONNode::JSONNode(const JSONNode & orig): internal(orig.internal -> incRef()){ +inline JSONNode::JSONNode(const JSONNode & orig): internal(orig.internal -> incRef()) { incAllocCount(); } @@ -521,7 +521,7 @@ inline bool JSONNode::empty(void) const { inline void JSONNode::clear(void){ JSON_CHECK_INTERNAL(); - if (!empty()){ + if (!empty()) { makeUniqueInternal(); internal -> Children.clear(); } @@ -713,7 +713,7 @@ inline void JSONNode::decRef(void){ //decrements internal's counter, deletes it JSON_CHECK_INTERNAL(); #ifdef JSON_REF_COUNT internal -> decRef(); - if (internal -> hasNoReferences()){ + if (internal -> hasNoReferences()) { internalJSONNode::deleteInternal(internal); } #else @@ -722,7 +722,7 @@ inline void JSONNode::decRef(void){ //decrements internal's counter, deletes it } #ifdef JSON_REF_COUNT - inline void JSONNode::makeUniqueInternal(){ //makes internal it's own + inline void JSONNode::makeUniqueInternal() { //makes internal it's own JSON_CHECK_INTERNAL(); internal = internal -> makeUnique(); //might return itself or a new one that's exactly the same } diff --git a/plugins/JSON/Source/JSONNode_Mutex.cpp b/plugins/JSON/Source/JSONNode_Mutex.cpp index 0f0dbe5d7b..f047f58403 100644 --- a/plugins/JSON/Source/JSONNode_Mutex.cpp +++ b/plugins/JSON/Source/JSONNode_Mutex.cpp @@ -73,14 +73,14 @@ void JSONNode::lock(int thread){ //make sure that the same thread isn't locking it more than once (possible due to complex ref counting) std::map >::iterator it = threadlocks.find(thread); - if (it == threadlocks.end()){ + if (it == threadlocks.end()) { std::map newthread; newthread[thislock] = 1; threadlocks.insert(std::pair >(thread, newthread)); } else { //this thread already has some things locked, check if the current mutex is std::map & newthread = it -> second; std::map::iterator locker = newthread.find(thislock); - if (locker == newthread.end()){ //current mutex is not locked, set it to locked + if (locker == newthread.end()) { //current mutex is not locked, set it to locked newthread.insert(std::pair(thislock, 1)); } else { //it's already locked, don't relock it ++(locker -> second); @@ -133,7 +133,7 @@ void internalJSONNode::_set_mutex(void * mutex, bool unset){ if (mutex){ #ifdef JSON_MUTEX_MANAGE std::map::iterator it = mutex_manager.find(mutex); - if (it == mutex_manager.end()){ + if (it == mutex_manager.end()) { mutex_manager.insert(std::pair(mutex, 1)); } else { ++it -> second; @@ -168,7 +168,7 @@ void internalJSONNode::_unset_mutex(void){ if (mylock){ mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("this"), (long)mylock))); std::map::iterator it = mutex_manager.find(mylock); - if (it == mutex_manager.end()){ + if (it == mutex_manager.end()) { mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("references"), JSON_TEXT("error")))); } else { mut.push_back(JSON_NEW(JSONNode(JSON_TEXT("references"), it -> second))); diff --git a/plugins/JSON/Source/JSONWorker.cpp b/plugins/JSON/Source/JSONWorker.cpp index 093d9a75b2..245e1568dc 100644 --- a/plugins/JSON/Source/JSONWorker.cpp +++ b/plugins/JSON/Source/JSONWorker.cpp @@ -3,7 +3,7 @@ #ifdef JSON_VALIDATE JSONNode JSONWorker::validate(const json_string & json){ JSONNode res = parse(json); - if (!res.validate()){ + if (!res.validate()) { throw std::invalid_argument(EMPTY_STRING2); } return JSONNode(true, res); //forces it to simply return the original interal, even with ref counting off @@ -23,14 +23,14 @@ JSONNode JSONWorker::parse(const json_string & json){ json_char firstchar = s.ptr[0]; json_string _comment; json_char * runner = s.ptr; - if (firstchar == '\5'){ //multiple comments will be consolidated into one + if (firstchar == '\5') { //multiple comments will be consolidated into one newcomment: - while(*(++runner) != '\5'){ + while(*(++runner) != '\5') { JSON_ASSERT(*runner, JSON_TEXT("Removing white space failed")); _comment += *runner; } firstchar = *(++runner); //step past the trailing tag - if (firstchar == '\5'){ + if (firstchar == '\5') { _comment += '\n'; goto newcomment; } @@ -43,13 +43,13 @@ JSONNode JSONWorker::parse(const json_string & json){ case '{': case '[': #if defined JSON_DEBUG || defined JSON_SAFE - if (firstchar == '['){ - if (lastchar != ']'){ + if (firstchar == '[') { + if (lastchar != ']') { JSON_FAIL(JSON_TEXT("Missing final ]")); break; } } else { - if (lastchar != '}'){ + if (lastchar != '}') { JSON_FAIL(JSON_TEXT("Missing final }")); break; } @@ -70,7 +70,7 @@ JSONNode JSONWorker::parse(const json_string & json){ #define QUOTECASE()\ case JSON_TEXT('\"'):\ - while (*(++p) != JSON_TEXT('\"')){\ + while (*(++p) != JSON_TEXT('\"')) {\ JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a quotation"), return json_string::npos;);\ }\ break; @@ -88,7 +88,7 @@ JSONNode JSONWorker::parse(const json_string & json){ case left: {\ size_t brac = 1;\ while (brac){\ - switch (*(++p)){\ + switch (*(++p)) {\ case right:\ --brac;\ break;\ @@ -122,7 +122,7 @@ size_t JSONWorker::FindNextRelevant(json_char ch, const json_string & value_t, c #define AND_RUNNER ,runner inline void SingleLineComment(const json_char * & p, json_char * & runner){ COMMENT_DELIMITER(); - while((*(++p)) && (*p != JSON_TEXT('\n'))){ + while((*(++p)) && (*p != JSON_TEXT('\n'))) { *runner++ = *p; } COMMENT_DELIMITER(); @@ -154,9 +154,9 @@ inline void SingleLineComment(const json_char * & p){ case JSON_TEXT('\r'): //defined as white space break; case JSON_TEXT('/'): //a C comment - if (*(++p) == JSON_TEXT('*')){ //a multiline comment + if (*(++p) == JSON_TEXT('*')) { //a multiline comment COMMENT_DELIMITER(); - while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))){ + while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))) { JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a multiline quote"), COMMENT_DELIMITER(); goto endofloop;); *runner++ = *p; } @@ -171,7 +171,7 @@ inline void SingleLineComment(const json_char * & p){ break; case JSON_TEXT('\"'): //a quote *runner++ = JSON_TEXT('\"'); - while(*(++p) != JSON_TEXT('\"')){ //find the end of the quotation, as white space is preserved within it + while(*(++p) != JSON_TEXT('\"')) { //find the end of the quotation, as white space is preserved within it JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a quotation"), goto endofloop;); switch(*p){ case JSON_TEXT('\\'): @@ -214,8 +214,8 @@ json_string JSONWorker::RemoveWhiteSpaceAndComments(const json_string & value_t) case JSON_TEXT('\r'): //defined as white space break; case JSON_TEXT('/'): //a C comment - if (*(++p) == JSON_TEXT('*')){ //a multiline comment - while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))){ + if (*(++p) == JSON_TEXT('*')) { //a multiline comment + while ((*(++p) != JSON_TEXT('*')) || (*(p + 1) != JSON_TEXT('/'))) { JSON_ASSERT_SAFE(*p, JSON_TEXT("Null terminator inside of a multiline quote"), goto endofloop;); } ++p; @@ -228,7 +228,7 @@ json_string JSONWorker::RemoveWhiteSpaceAndComments(const json_string & value_t) break; case JSON_TEXT('\"'): //a quote result += JSON_TEXT('\"'); - while(*(++p) != JSON_TEXT('\"')){ //find the end of the quotation, as white space is preserved within it + while(*(++p) != JSON_TEXT('\"')) { //find the end of the quotation, as white space is preserved within it JSON_ASSERT(*p, JSON_TEXT("Null terminator inside of a quotation")); switch(*p){ case JSON_TEXT('\\'): @@ -269,11 +269,11 @@ json_string JSONWorker::RemoveWhiteSpaceAndComments(const json_string & value_t) json_string JSONWorker::UTF(const json_char * & pos){ json_string result; unsigned json_char first = UTF8(pos); - if ((*(pos + 1) == '\\') && (*(pos + 2) == 'u')){ + if ((*(pos + 1) == '\\') && (*(pos + 2) == 'u')) { pos += 2; unsigned json_char second = UTF8(pos); //surrogate pair, not two characters - if ((first > 0xD800) && (first < 0xDBFF) && (second > 0xDC00) && (second < 0xDFFF)){ + if ((first > 0xD800) && (first < 0xDBFF) && (second > 0xDC00) && (second < 0xDFFF)) { result += SurrogatePair(first, second); } else { result += first; @@ -564,7 +564,7 @@ json_string JSONWorker::UnfixString(const json_string & value_t, bool flag){ res += JSON_TEXT("\\\'"); break; default: - /*if (((unsigned json_char)(*p) < 32) || ((unsigned json_char)(*p) > 126)){ + /*if (((unsigned json_char)(*p) < 32) || ((unsigned json_char)(*p) > 126)) { //res += toUTF8((unsigned json_char)(*p)); } else*/ { res += *p; @@ -587,13 +587,13 @@ inline void JSONWorker::NewNode(const internalJSONNode * parent, const json_stri #ifdef JSON_COMMENTS const json_char * runner = (array) ? value.c_str() : name.c_str(); json_string _comment; - if (*runner == '\5'){ //multiple comments will be consolidated into one + if (*runner == '\5') { //multiple comments will be consolidated into one newcomment: - while(*(++runner) != '\5'){ + while(*(++runner) != '\5') { JSON_ASSERT(*runner, JSON_TEXT("Removing white space failed")); _comment += *runner; } - if (*(++runner) == '\5'){ //step past the trailing tag + if (*(++runner) == '\5') { //step past the trailing tag _comment += '\n'; goto newcomment; } diff --git a/plugins/JSON/Source/JSONWriter.cpp b/plugins/JSON/Source/JSONWriter.cpp index 9b53689002..ce040f57f3 100644 --- a/plugins/JSON/Source/JSONWriter.cpp +++ b/plugins/JSON/Source/JSONWriter.cpp @@ -117,13 +117,13 @@ json_string internalJSONNode::Write(unsigned int indent, bool arrayChild){ const bool formatted = indent != 0xFFFFFFFF; #ifndef JSON_PREPARSE - if (!(formatted || fetched)){ //It's not formatted or fetched, just do a raw dump + if (!(formatted || fetched)) { //It's not formatted or fetched, just do a raw dump return WriteComment(indent) + WriteName(false, arrayChild) + _string; } #endif //It's either formatted or fetched - switch (type()){ + switch (type()) { case JSON_NODE: //got members, write the members Fetch(); return WriteComment(indent) + WriteName(formatted, arrayChild) + JSON_TEXT("{") + WriteChildren(indent) + JSON_TEXT("}"); diff --git a/plugins/JSON/Source/JSON_Base64.cpp b/plugins/JSON/Source/JSON_Base64.cpp index fcde330b1a..fdf7930208 100644 --- a/plugins/JSON/Source/JSON_Base64.cpp +++ b/plugins/JSON/Source/JSON_Base64.cpp @@ -50,13 +50,13 @@ json_string JSONBase64::json_encode64(const unsigned char * binary, size_t bytes } inline json_char toBinary(json_char c){ - if (c == JSON_TEXT('+')){ + if (c == JSON_TEXT('+')) { return JSON_TEXT('>'); - } else if (c == JSON_TEXT('/')){ + } else if (c == JSON_TEXT('/')) { return JSON_TEXT('?'); - } else if (c < JSON_TEXT(':')){ + } else if (c < JSON_TEXT(':')) { return c + JSON_TEXT('\x04'); - } else if (c < JSON_TEXT('[')){ + } else if (c < JSON_TEXT('[')) { return c - JSON_TEXT('\x41'); } return c - 71; @@ -97,10 +97,10 @@ std::string JSONBase64::json_decode64(const json_string & encoded){ //now do the ones that might have padding, the first two characters can not be padding, so do them quickly const char second = toBinary(runner[1]); result += (toBinary(runner[0]) << 2) + ((second & 0x30) >> 4); - if (runner[2] != '='){ //not two = pads + if (runner[2] != '=') { //not two = pads const char third = toBinary(runner[2]); result += ((second & 0xf) << 4) + ((third & 0x3c) >> 2); - if (runner[3] != '='){ //no padding + if (runner[3] != '=') { //no padding result += ((third & 0x3) << 6) + toBinary(runner[3]); } } diff --git a/plugins/JSON/Source/NumberToString.h b/plugins/JSON/Source/NumberToString.h index a1ea2d4d3c..a5e93d4302 100644 --- a/plugins/JSON/Source/NumberToString.h +++ b/plugins/JSON/Source/NumberToString.h @@ -84,7 +84,7 @@ public: #endif //strip the trailing zeros for(json_char * pos = &result[0]; *pos; ++pos){ - if (*pos == '.'){ //only care about after the decimal + if (*pos == '.') { //only care about after the decimal for(json_char * runner = pos + 1; *runner; ++runner){ if (*runner != JSON_TEXT('0')) pos = runner + 1; } diff --git a/plugins/JSON/Source/internalJSONNode.cpp b/plugins/JSON/Source/internalJSONNode.cpp index 2651394a8a..626546586c 100644 --- a/plugins/JSON/Source/internalJSONNode.cpp +++ b/plugins/JSON/Source/internalJSONNode.cpp @@ -32,7 +32,7 @@ internalJSONNode::internalJSONNode(const internalJSONNode & orig) : #ifdef JSON_MUTEX_CALLBACKS _set_mutex(orig.mylock, false); #endif - if (!orig.Children.empty()){ + if (!orig.Children.empty()) { Children.reserve(orig.Children.size()); json_foreach(orig.Children, myrunner){ Children.push_back(JSONNode::newJSONNode((*myrunner) -> duplicate())); @@ -61,7 +61,7 @@ internalJSONNode::internalJSONNode(const json_string & unparsed) : _type(), _nam initializeValid(0){ incinternalAllocCount(); - switch (unparsed[0]){ + switch (unparsed[0]) { case JSON_TEXT('{'): //node _type = JSON_NODE; #ifdef JSON_PREPARSE @@ -89,7 +89,7 @@ internalJSONNode::internalJSONNode(const json_string & name_t, const json_string incinternalAllocCount(); - if (value_t.empty()){ + if (value_t.empty()) { _type = JSON_NULL; #ifdef JSON_VALIDATE isValid = true; @@ -196,7 +196,7 @@ void internalJSONNode::FetchNumber(void) const { #ifndef JSON_PREPARSE void internalJSONNode::Fetch(void) const { if (fetched) return; - switch (type()){ + switch (type()) { case JSON_STRING: FetchString(); break; @@ -288,7 +288,7 @@ bool internalJSONNode::IsEqualTo(const internalJSONNode * val) const { Fetch(); val -> Fetch(); #endif - switch (type()){ + switch (type()) { case JSON_STRING: return val -> _string == _string; case JSON_NUMBER: @@ -358,7 +358,7 @@ JSONNode * internalJSONNode::pop_back(json_index_t pos){ } JSONNode * internalJSONNode::pop_back(const json_string & name_t){ - if (JSONNode ** res = at(name_t)){ + if (JSONNode ** res = at(name_t)) { JSONNode * result = *res; Children.erase(res); return result; @@ -368,7 +368,7 @@ JSONNode * internalJSONNode::pop_back(const json_string & name_t){ #ifdef JSON_CASE_INSENSITIVE_FUNCTIONS JSONNode * internalJSONNode::pop_back_nocase(const json_string & name_t){ - if (JSONNode ** res = at_nocase(name_t)){ + if (JSONNode ** res = at_nocase(name_t)) { JSONNode * result = *res; Children.erase(res); return result; @@ -392,9 +392,9 @@ JSONNode ** internalJSONNode::at(const json_string & name_t){ const json_char c_one = *ch_one; const json_char c_two = *ch_two; if (c_one != c_two){ - if ((c_two > 64) && (c_two < 91)){ //A - Z + if ((c_two > 64) && (c_two < 91)) { //A - Z if (c_one != (json_char)(c_two + 32)) return false; - } else if ((c_two > 96) && (c_two < 123)){ //a - z + } else if ((c_two > 96) && (c_two < 123)) { //a - z if (c_one != (json_char)(c_two - 32)) return false; } else { //not a letter, so return false return false; @@ -434,7 +434,7 @@ JSONNode ** internalJSONNode::at(const json_string & name_t){ (*myrunner) -> internal -> Fetch(); #endif if ((*myrunner) -> type() == JSON_NULL) return false; - } else if (!((*myrunner) -> internal -> isValid)){ + } else if (!((*myrunner) -> internal -> isValid)) { JSON_FAIL(_name + JSON_TEXT(" is null and not valid")); return false; } @@ -477,7 +477,7 @@ JSONNode ** internalJSONNode::at(const json_string & name_t){ dumpage.push_back(JSON_NEW(JSONNode(JSON_TEXT("_type"), JSON_TEXT(#ty))));\ break; - switch(type()){ + switch(type()) { DUMPCASE(JSON_NULL) DUMPCASE(JSON_STRING) DUMPCASE(JSON_NUMBER) diff --git a/plugins/JSON/Source/internalJSONNode.h b/plugins/JSON/Source/internalJSONNode.h index 8667e3fbbb..9e9f9de983 100644 --- a/plugins/JSON/Source/internalJSONNode.h +++ b/plugins/JSON/Source/internalJSONNode.h @@ -290,7 +290,7 @@ inline json_string internalJSONNode::as_string(void) const { inline long internalJSONNode::as_int(void) const { Fetch(); - switch(type()){ + switch(type()) { case JSON_NULL: return 0; case JSON_BOOL: @@ -305,7 +305,7 @@ inline long internalJSONNode::as_int(void) const { inline json_number internalJSONNode::as_float(void) const { Fetch(); - switch(type()){ + switch(type()) { case JSON_NULL: return (json_number)0.0; case JSON_BOOL: @@ -317,7 +317,7 @@ inline json_number internalJSONNode::as_float(void) const { inline bool internalJSONNode::as_bool(void) const { Fetch(); - switch(type()){ + switch(type()) { case JSON_NUMBER: return _value._number != 0.0f; case JSON_NULL: diff --git a/plugins/JSON/miminterface.cpp b/plugins/JSON/miminterface.cpp index 30ccb9a69c..b6fbf4ce88 100644 --- a/plugins/JSON/miminterface.cpp +++ b/plugins/JSON/miminterface.cpp @@ -55,7 +55,7 @@ extern "C" { return 0; } - int GetInterface(WPARAM wParam, LPARAM lParam) { + INT_PTR GetInterface(WPARAM wParam, LPARAM lParam) { LPJSONSERVICEINTERFACE lpJSI=(LPJSONSERVICEINTERFACE)wParam; memset(lpJSI,0,sizeof(JSONSERVICEINTERFACE)); @@ -247,7 +247,7 @@ WRAPPER_21(EQUAL,json_equal,JSONNODE*,JSONNODE*); pluginLink=link; mir_getMMI(&mmi); - s_services[ciServices++]=CreateServiceFunction(MS_JSON_GETINTERFACE,GetInterface); + s_services[ciServices++] = CreateServiceFunction(MS_JSON_GETINTERFACE,GetInterface); CSF(FREE); CSF(DELETE); diff --git a/plugins/KeyboardNotify/EnumProc.cpp b/plugins/KeyboardNotify/EnumProc.cpp index a225bd0a03..7a5a23f0e3 100644 --- a/plugins/KeyboardNotify/EnumProc.cpp +++ b/plugins/KeyboardNotify/EnumProc.cpp @@ -62,7 +62,7 @@ void LoadProcsLibrary(void) lpfVDMEnumTaskWOWEx = (INT (WINAPI *)(DWORD, TASKENUMPROCEX, LPARAM)) GetProcAddress(hInstLib2, "VDMEnumTaskWOWEx"); } else { - if(!(hInstLib = LoadLibraryA("Kernel32.DLL"))) + if (!(hInstLib = LoadLibraryA("Kernel32.DLL"))) return; if (bWindowsNT && !(hInstLib2 = LoadLibraryA("VDMDBG.DLL"))) diff --git a/plugins/KeyboardNotify/flash.cpp b/plugins/KeyboardNotify/flash.cpp index fd3815d0b1..aa0014a329 100644 --- a/plugins/KeyboardNotify/flash.cpp +++ b/plugins/KeyboardNotify/flash.cpp @@ -108,7 +108,7 @@ FLASHING_SEQUENCE *getCustomSeq(void) customStr[0] = _T('\0'); - if(!DBGetContactSetting(NULL, KEYBDMODULE, fmtDBSettingName("custom%d", wCustomTheme), &dbv)) { + if (!DBGetContactSetting(NULL, KEYBDMODULE, fmtDBSettingName("custom%d", wCustomTheme), &dbv)) { wcscpy(customStr, dbv.pwszVal); DBFreeVariant(&dbv); } diff --git a/plugins/KeyboardNotify/ignore.cpp b/plugins/KeyboardNotify/ignore.cpp index ededae2c84..97988f59a5 100644 --- a/plugins/KeyboardNotify/ignore.cpp +++ b/plugins/KeyboardNotify/ignore.cpp @@ -309,7 +309,7 @@ INT_PTR CALLBACK DlgProcIgnoreOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x, nm->pt.y)); if(hItem == NULL) break; - if(!(hitFlags & CLCHT_ONITEMEXTRA)) + if (!(hitFlags & CLCHT_ONITEMEXTRA)) break; if(nm->iColumn == IGNOREEVENT_MAX) { //ignore all for(iImage=0; iImage < IGNOREEVENT_MAX; iImage++) diff --git a/plugins/KeyboardNotify/keyboard.cpp b/plugins/KeyboardNotify/keyboard.cpp index cb77a88827..df1033fce7 100644 --- a/plugins/KeyboardNotify/keyboard.cpp +++ b/plugins/KeyboardNotify/keyboard.cpp @@ -46,9 +46,11 @@ typedef struct _KEYBOARD_INDICATOR_PARAMETERS { void outportb(UINT portid, BYTE value) { + #if !defined( _WIN64 ) __asm mov edx,portid __asm mov al,value __asm out dx,al + #endif } diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/main.cpp index fbadbf7e19..ff131f0c89 100644 --- a/plugins/KeyboardNotify/main.cpp +++ b/plugins/KeyboardNotify/main.cpp @@ -698,7 +698,7 @@ BOOL contactCheckProtocol(char *szProto, HANDLE hContact, WORD eventType) BOOL checkStatus(char *szProto) { - if(!szProto) + if (!szProto) return checkGlobalStatus(); return isStatusEnabled(CallProtoService(szProto, PS_GETSTATUS, 0, 0)); @@ -710,7 +710,7 @@ BOOL checkXstatus(char *szProto) unsigned int i; int status=0; ICQ_CUSTOM_STATUS xstatus={0}; - if(!szProto) + if (!szProto) return checkGlobalXstatus(); for(i=0; i < ProtoList.protoCount; i++) @@ -762,7 +762,7 @@ static int PluginMessageEventHook(WPARAM wParam, LPARAM lParam) // ** Checks for pending events. If it finds any, it pings the FlashThread to keep the LEDs flashing. // ** -static VOID CALLBACK ReminderTimer(HWND hwnd, UINT message, UINT idEvent, DWORD dwTime) +static VOID CALLBACK ReminderTimer(HWND hwnd, UINT message, UINT_PTR idEvent, DWORD dwTime) { int nIndex; CLISTEVENT *pCLEvent; @@ -791,23 +791,19 @@ static VOID CALLBACK ReminderTimer(HWND hwnd, UINT message, UINT idEvent, DWORD // Support for third-party plugins and mBot's scripts -static int EnableService(WPARAM wParam, LPARAM lParam) +static INT_PTR EnableService(WPARAM wParam, LPARAM lParam) { bFlashingEnabled = TRUE; - return 0; } - -static int DisableService(WPARAM wParam, LPARAM lParam) +static INT_PTR DisableService(WPARAM wParam, LPARAM lParam) { bFlashingEnabled = FALSE; - return 0; } - -static int StartBlinkService(WPARAM wParam, LPARAM lParam) +static INT_PTR StartBlinkService(WPARAM wParam, LPARAM lParam) { nExternCount += (unsigned int)wParam; if (bFlashOnOther && checkNotifyOptions() && checkGlobalStatus() && checkGlobalXstatus()) { @@ -819,8 +815,7 @@ static int StartBlinkService(WPARAM wParam, LPARAM lParam) return 0; } - -static int EventsWereOpenedService(WPARAM wParam, LPARAM lParam) +static INT_PTR EventsWereOpenedService(WPARAM wParam, LPARAM lParam) { if ((unsigned int)wParam > nExternCount) nExternCount = 0; @@ -831,7 +826,7 @@ static int EventsWereOpenedService(WPARAM wParam, LPARAM lParam) } -static int IsFlashingActiveService(WPARAM wParam, LPARAM lParam) +static INT_PTR IsFlashingActiveService(WPARAM wParam, LPARAM lParam) { if (!bReminderDisabled) return 0; @@ -987,9 +982,9 @@ void GetWindowsVersion(void) ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - if(!(bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi))) { + if (!(bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *) &osvi))) { osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if(!GetVersionEx((OSVERSIONINFO *)&osvi)) + if (!GetVersionEx((OSVERSIONINFO *)&osvi)) osvi.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS; } bWindowsNT = osvi.dwPlatformId==VER_PLATFORM_WIN32_NT; diff --git a/plugins/KeyboardNotify/options.cpp b/plugins/KeyboardNotify/options.cpp index d415862503..993f9e119d 100644 --- a/plugins/KeyboardNotify/options.cpp +++ b/plugins/KeyboardNotify/options.cpp @@ -1116,7 +1116,8 @@ void exportThemes(const TCHAR *filename) void importThemes(const TCHAR *filename, BOOL overrideExisting) { - int i, status=0; + int status=0; + size_t i; FILE *fImport; TCHAR buffer[MAX_PATH+1], theme[MAX_PATH+1], *str; @@ -1428,7 +1429,8 @@ INT_PTR CALLBACK DlgProcXstatusList(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA case WM_INITDIALOG: { - unsigned int i, j; + unsigned int i; + WPARAM j; int imageCount; HICON hIconAux; HIMAGELIST hImageList; diff --git a/plugins/KeyboardNotify/protolist.h b/plugins/KeyboardNotify/protolist.h index f48f64d126..5a08d929da 100644 --- a/plugins/KeyboardNotify/protolist.h +++ b/plugins/KeyboardNotify/protolist.h @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ typedef struct { - unsigned int count; + UINT_PTR count; BOOL *enabled; } XSTATUS_INFO; diff --git a/plugins/KeyboardNotify/trigger.cpp b/plugins/KeyboardNotify/trigger.cpp index 2f07230696..df3d7daaf3 100644 --- a/plugins/KeyboardNotify/trigger.cpp +++ b/plugins/KeyboardNotify/trigger.cpp @@ -57,7 +57,7 @@ int getCustomNro(DWORD actionID, HWND hwndDlg, int nItems) return DEF_SETTING_CUSTOMTHEME; } -static BOOL CALLBACK DlgProcOptsActionKbdNotify(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DlgProcOptsActionKbdNotify(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { DBVARIANT dbv; DWORD actionID; diff --git a/plugins/LangMan/langpack.c b/plugins/LangMan/langpack.c index 6ce827c71a..2c517137d7 100644 --- a/plugins/LangMan/langpack.c +++ b/plugins/LangMan/langpack.c @@ -54,10 +54,10 @@ static void CleanupAuthors(char *szAuthors) char *p,*p2; /* remove trailing dot (if any) */ p=&szAuthors[lstrlenA(szAuthors)-1]; - if(*p=='.') *p='\0'; + if (*p=='.') *p='\0'; /* remove any extra info in parentheses, which is ok * but makes the list very long for some packs */ - for(;;) { + for (;;) { p=strchr(szAuthors,'('); p2=strchr(szAuthors,')'); if(p==NULL || p2==NULL) { @@ -65,7 +65,7 @@ static void CleanupAuthors(char *szAuthors) p2=strchr(szAuthors,']'); if(p==NULL || p2==NULL) break; } - if(*(p-1)==' ') --p; + if (*(p-1)==' ') --p; MoveMemory(p,p2+1,lstrlenA(p2+1)+1); } } @@ -105,7 +105,7 @@ static void CleanupEmail(char *szAuthorEmail) /* lower case */ CharLowerA(szAuthorEmail); /* 'none' specified */ - if(!lstrcmpiA(szAuthorEmail,"none")) szAuthorEmail[0]='\0'; + if (!lstrcmpiA(szAuthorEmail,"none")) szAuthorEmail[0]='\0'; } static void CleanupLastModifiedUsing(char *szLastModifiedUsing,int nSize) @@ -127,7 +127,7 @@ static void CleanupLastModifiedUsing(char *szLastModifiedUsing,int nSize) p=strstr(szLastModifiedUsing," v0."); if(p!=NULL) MoveMemory(p+1,p+2,lstrlenA(p+2)+1); /* default if empty */ - if(!szLastModifiedUsing[0]) { + if (!szLastModifiedUsing[0]) { lstrcpynA(szLastModifiedUsing,MIRANDANAME" ",nSize); CallService(MS_SYSTEM_GETVERSIONTEXT,nSize-lstrlenA(szLastModifiedUsing),(LPARAM)szLastModifiedUsing+lstrlenA(szLastModifiedUsing)); } @@ -190,7 +190,7 @@ static BOOL LoadPackData(LANGPACK_INFO *pack,BOOL fEnabledPacks,const char *pszF lstrcpynA(pack->szLastModifiedUsing, pszColon+1, sizeof(pack->szLastModifiedUsing)); /* buffer safe */ else if ( !lstrcmpA(line, "Authors")) { buf=pack->szAuthors+lstrlenA(pack->szAuthors); /* allow multiple tags */ - if((sizeof(pack->szAuthors)-lstrlenA(pack->szAuthors))>0) /* buffer safe */ + if ((sizeof(pack->szAuthors)-lstrlenA(pack->szAuthors))>0) /* buffer safe */ mir_snprintf(buf,sizeof(pack->szAuthors)-lstrlenA(pack->szAuthors),(pack->szAuthors[0]=='\0')?"%s":" %s",pszColon+1); } else if ( !lstrcmpA(line, "Author-email") && !pack->szAuthorEmail[0]) lstrcpynA(pack->szAuthorEmail, pszColon+1, sizeof(pack->szAuthorEmail)); /* buffer safe */ @@ -213,7 +213,7 @@ static BOOL LoadPackData(LANGPACK_INFO *pack,BOOL fEnabledPacks,const char *pszF CleanupEmail(pack->szAuthorEmail); CleanupLastModifiedUsing(pack->szLastModifiedUsing,sizeof(pack->szLastModifiedUsing)); /* codepage */ - if(!(pack->flags&LPF_NOLOCALE)) + if (!(pack->flags&LPF_NOLOCALE)) if(GetLocaleInfoA(pack->Locale,LOCALE_IDEFAULTANSICODEPAGE,line,6)) pack->codepage=(WORD)atoi(line); /* CP_ACP on error */ /* language */ @@ -223,14 +223,14 @@ static BOOL LoadPackData(LANGPACK_INFO *pack,BOOL fEnabledPacks,const char *pszF lstrcpyA(pack->szLanguage,szLanguageA); /* buffer safe */ #endif /* ensure the pack always has a language name */ - if(!pack->szLanguage[0] && !GetLocaleInfo(pack->Locale,LOCALE_SENGLANGUAGE,pack->szLanguage,SIZEOF(pack->szLanguage))) { + if (!pack->szLanguage[0] && !GetLocaleInfo(pack->Locale,LOCALE_SENGLANGUAGE,pack->szLanguage,SIZEOF(pack->szLanguage))) { TCHAR *p; lstrcpyn(pack->szLanguage,pack->szFileName,SIZEOF(pack->szLanguage)); /* buffer safe */ p=_tcsrchr(pack->szLanguage,_T('.')); if(p!=NULL) *p='\0'; } /* ensure the pack always has a filelisting name */ - if(!pack->szFLName[0]) + if (!pack->szFLName[0]) lstrcatA(lstrcpyA(pack->szFLName,szLanguageA)," Language Pack"); /* buffer safe */ fclose(fp); return TRUE; @@ -242,11 +242,11 @@ BOOL GetPackPath(TCHAR *pszPath,int nSize,BOOL fEnabledPacks,const TCHAR *pszFil { TCHAR *p; /* main path */ - if(!GetModuleFileName(NULL,pszPath,nSize)) return FALSE; + if (!GetModuleFileName(NULL,pszPath,nSize)) return FALSE; p=_tcsrchr(pszPath,_T('\\')); if(p!=NULL) *(p+1)=_T('\0'); /* subdirectory */ - if(!fEnabledPacks) { + if (!fEnabledPacks) { if(nSize<(lstrlen(pszPath)+10)) return FALSE; lstrcat(pszPath,_T("Plugins\\Language\\")); } @@ -274,18 +274,18 @@ BOOL EnumPacks(ENUM_PACKS_CALLBACK callback,const TCHAR *pszFilePattern,const ch if(hFind!=INVALID_HANDLE_VALUE) { do { if(wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) continue; - if((lstrlen(wfd.cFileName)<4) || wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.')) continue; + if ((lstrlen(wfd.cFileName)<4) || wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.')) continue; /* get data */ ZeroMemory(&pack,sizeof(pack)); lstrcpy(pack.szFileName,CharLower(wfd.cFileName)); /* buffer safe */ if(LoadPackData(&pack,TRUE,pszFileVersionHeader)) { pack.ftFileDate=wfd.ftLastWriteTime; /* enabled? */ - if(!fPackFound) pack.flags|=LPF_ENABLED; + if (!fPackFound) pack.flags|=LPF_ENABLED; fPackFound=TRUE; /* callback */ if(callback!=NULL) res=callback(&pack,wParam,lParam); - if(!res) { FindClose(hFind); return FALSE; } + if (!res) { FindClose(hFind); return FALSE; } } } while(FindNextFile(hFind,&wfd)); FindClose(hFind); @@ -311,9 +311,9 @@ BOOL EnumPacks(ENUM_PACKS_CALLBACK callback,const TCHAR *pszFilePattern,const ch } } pack.flags=LPF_NOLOCALE|LPF_DEFAULT; - if(!fPackFound) pack.flags|=LPF_ENABLED; + if (!fPackFound) pack.flags|=LPF_ENABLED; /* callback */ - if(!callback(&pack,wParam,lParam)) return FALSE; + if (!callback(&pack,wParam,lParam)) return FALSE; } /* disabled packs */ @@ -331,7 +331,7 @@ BOOL EnumPacks(ENUM_PACKS_CALLBACK callback,const TCHAR *pszFilePattern,const ch fPackFound=TRUE; /* callback */ if(callback!=NULL) res=callback(&pack,wParam,lParam); - if(!res) { FindClose(hFind); return FALSE; } + if (!res) { FindClose(hFind); return FALSE; } } } while(FindNextFile(hFind,&wfd)); FindClose(hFind); @@ -343,14 +343,14 @@ BOOL EnumPacks(ENUM_PACKS_CALLBACK callback,const TCHAR *pszFilePattern,const ch BOOL IsPluginIncluded(const LANGPACK_INFO *pack,char *pszFileBaseName) { char *p; - if(!lstrcmpiA(pszFileBaseName,"png2dib") || !lstrcmpiA(pszFileBaseName,"loadavatars")) + if (!lstrcmpiA(pszFileBaseName,"png2dib") || !lstrcmpiA(pszFileBaseName,"loadavatars")) return TRUE; /* workaround: does not need no translation */ for(p=(char*)pack->szPluginsIncluded;;) { p=strstr(p,CharLowerA(pszFileBaseName)); if(p==NULL) return FALSE; if(p==pack->szPluginsIncluded || *(p-1)==' ' || *(p-1)==',') { p+=lstrlenA(pszFileBaseName)+1; - if(*p==',' || *p==' ' || *p==0) return TRUE; + if (*p==',' || *p==' ' || *p==0) return TRUE; } else p+=lstrlenA(pszFileBaseName)+1; } @@ -377,7 +377,7 @@ BOOL EnablePack(const LANGPACK_INFO *pack,const TCHAR *pszFilePattern) /* move file */ if(GetPackPath(szFrom,SIZEOF(szFrom),TRUE,wfd.cFileName)) if(GetPackPath(szDest,SIZEOF(szDest),FALSE,wfd.cFileName)) - if(!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { + if (!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { DeleteFile(szDest); MoveFile(szFrom,szDest); } @@ -403,7 +403,7 @@ void CorrectPacks(const TCHAR *pszFilePattern,BOOL fDisableAll) WIN32_FIND_DATA wfd; /* main path */ - if(!GetModuleFileName(NULL,szDir,SIZEOF(szDir))) return; + if (!GetModuleFileName(NULL,szDir,SIZEOF(szDir))) return; pszFile=_tcsrchr(szDir,_T('\\')); if(pszFile!=NULL) *pszFile=_T('\0'); @@ -415,12 +415,12 @@ void CorrectPacks(const TCHAR *pszFilePattern,BOOL fDisableAll) if(wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) continue; if(lstrlen(wfd.cFileName)<4 || wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.')) continue; /* ensure dir exists */ - if(!fDirCreated && GetPackPath(szFrom,SIZEOF(szFrom),FALSE,NULL)) + if (!fDirCreated && GetPackPath(szFrom,SIZEOF(szFrom),FALSE,NULL)) fDirCreated=CreateDirectory(szFrom,NULL); /* move file */ if(GetPackPath(szDest,SIZEOF(szDest),FALSE,wfd.cFileName)) { mir_sntprintf(szFrom,SIZEOF(szFrom),_T("%s\\Plugins\\%s"),szDir,wfd.cFileName); - if(!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { + if (!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { DeleteFile(szDest); MoveFile(szFrom,szDest); } @@ -437,14 +437,14 @@ void CorrectPacks(const TCHAR *pszFilePattern,BOOL fDisableAll) if(wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) continue; if(lstrlen(wfd.cFileName)<4 || wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.')) continue; /* skip first file */ - if(!fDisableAll) { fDisableAll=TRUE; continue; } + if (!fDisableAll) { fDisableAll=TRUE; continue; } /* ensure dir exists */ - if(!fDirCreated && GetPackPath(szFrom,SIZEOF(szFrom),FALSE,NULL)) + if (!fDirCreated && GetPackPath(szFrom,SIZEOF(szFrom),FALSE,NULL)) fDirCreated=CreateDirectory(szFrom,NULL); /* move file */ if(GetPackPath(szFrom,SIZEOF(szFrom),TRUE,wfd.cFileName)) if(GetPackPath(szDest,SIZEOF(szDest),FALSE,wfd.cFileName)) { - if(!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { + if (!MoveFile(szFrom,szDest) && GetLastError()==ERROR_ALREADY_EXISTS) { DeleteFile(szDest); MoveFile(szFrom,szDest); } diff --git a/plugins/LangMan/options.c b/plugins/LangMan/options.c index 487461a2d2..37bc03f003 100644 --- a/plugins/LangMan/options.c +++ b/plugins/LangMan/options.c @@ -71,10 +71,10 @@ static HIMAGELIST CreateRadioImages(COLORREF clrBk,COLORREF clrText) if(hTheme!=NULL) { SetRect(&rc,0,0,size.cx,size.cy); /* unchecked */ - if(!pfnDrawThemeBackground(hTheme,hdc,BP_RADIOBUTTON,RBS_UNCHECKEDNORMAL,&rc,NULL)) { + if (!pfnDrawThemeBackground(hTheme,hdc,BP_RADIOBUTTON,RBS_UNCHECKEDNORMAL,&rc,NULL)) { /* checked */ OffsetRect(&rc,size.cx,0); - if(!pfnDrawThemeBackground(hTheme,hdc,BP_RADIOBUTTON,RBS_CHECKEDNORMAL,&rc,NULL)) + if (!pfnDrawThemeBackground(hTheme,hdc,BP_RADIOBUTTON,RBS_CHECKEDNORMAL,&rc,NULL)) himl=ImageList_Create(size.cx,size.cy,ILC_COLOR32|ILC_MASK,3,0); } pfnCloseThemeData(hTheme); @@ -157,7 +157,7 @@ static void CleanupPluginName(char *szShortName) int len; /* strip-off anything in brackets */ for(p=szShortName;*p!='\0';++p) - if(*p=='(' || *p=='[') { + if (*p=='(' || *p=='[') { *p='\0'; break; } @@ -181,7 +181,7 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox,const LANGPACK_INFO *pack PLUGININFO *(__cdecl *MirandaPluginInfo)(DWORD); /* enum plugins */ - if(!(pack->flags&LPF_DEFAULT) && GetModuleFileName(NULL,szDir,SIZEOF(szDir))) { + if (!(pack->flags&LPF_DEFAULT) && GetModuleFileName(NULL,szDir,SIZEOF(szDir))) { p=_tcsrchr(szDir,_T('\\')); if(p!=NULL) *p=_T('\0'); mir_sntprintf(szSearch,SIZEOF(szSearch),_T("%s\\Plugins\\*.dll"),szDir); @@ -192,7 +192,7 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox,const LANGPACK_INFO *pack SendMessage(hwndListBox,LB_INITSTORAGE,128,lstrlenA(pack->szPluginsIncluded)); /* speed up */ do { if(wfd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) continue; - if((lstrlen(wfd.cFileName)<4) || (wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.'))) continue; + if ((lstrlen(wfd.cFileName)<4) || (wfd.cFileName[lstrlen(wfd.cFileName)-4]!=_T('.'))) continue; /* file name */ lstrcpy(szSearch,wfd.cFileName); /* buffer safe */ p=_tcsrchr(szSearch,_T('.')); @@ -233,7 +233,7 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox,const LANGPACK_INFO *pack } } /* all are included? */ - if(!SendMessage(hwndListBox,LB_GETCOUNT,0,0)) + if (!SendMessage(hwndListBox,LB_GETCOUNT,0,0)) SendMessage(hwndListBox,LB_ADDSTRING,0,(LPARAM)TranslateT("All installed plugins are included.")); } @@ -243,12 +243,12 @@ static void DisplayPackInfo(HWND hwndDlg,const LANGPACK_INFO *pack) SendDlgItemMessage(hwndDlg,IDC_LANGNOTINCLUDED,LB_RESETCONTENT,0,0); DisplayNotIncludedPlugins(GetDlgItem(hwndDlg,IDC_LANGNOTINCLUDED),pack); /* locale string */ - if(!(pack->flags&LPF_NOLOCALE)) { + if (!(pack->flags&LPF_NOLOCALE)) { TCHAR szLocaleName[128]; szLocaleName[0]=_T('\0'); /* can't use LOCALE_SNAME as it is not present on pre WinVista */ - if(!GetLocaleInfo(pack->Locale,LOCALE_SISO639LANGNAME,szLocaleName,SIZEOF(szLocaleName))) { /* Win98/NT4+ */ - if(!GetLocaleInfo(pack->Locale,LOCALE_SLANGUAGE,szLocaleName,SIZEOF(szLocaleName))) /* not unique! */ + if (!GetLocaleInfo(pack->Locale,LOCALE_SISO639LANGNAME,szLocaleName,SIZEOF(szLocaleName))) { /* Win98/NT4+ */ + if (!GetLocaleInfo(pack->Locale,LOCALE_SLANGUAGE,szLocaleName,SIZEOF(szLocaleName))) /* not unique! */ szLocaleName[0]=_T('\0'); } else { if(GetLocaleInfo(pack->Locale,LOCALE_SISO3166CTRYNAME,&szLocaleName[3],SIZEOF(szLocaleName)-3)) /* Win98/NT4+ */ @@ -256,7 +256,7 @@ static void DisplayPackInfo(HWND hwndDlg,const LANGPACK_INFO *pack) } /* add some note if its incompatible */ if(szLocaleName[0]) { - if(!IsValidLocale(pack->Locale,LCID_INSTALLED)) { + if (!IsValidLocale(pack->Locale,LCID_INSTALLED)) { TCHAR *pszIncompat; pszIncompat=TranslateT("(incompatible)"); szLocaleName[SIZEOF(szLocaleName)-lstrlen(pszIncompat)-1]=0; @@ -278,7 +278,7 @@ static void DisplayPackInfo(HWND hwndDlg,const LANGPACK_INFO *pack) /* version */ SetDlgItemTextA(hwndDlg,IDC_LANGVERSION,pack->szVersion); if(pack->szVersion[0] && pack->szFLName[0]) { - if(!IsWindowVisible(GetDlgItem(hwndDlg,IDC_LANGVERSIONLABEL))) { + if (!IsWindowVisible(GetDlgItem(hwndDlg,IDC_LANGVERSIONLABEL))) { ShowWindow(GetDlgItem(hwndDlg,IDC_LANGVERSIONLABEL),SW_SHOW); ShowWindow(GetDlgItem(hwndDlg,IDC_LANGVERSION),SW_SHOW); } @@ -311,7 +311,7 @@ static void DeletePackFile(HWND hwndDlg,HWND hwndList,int iItem,LANGPACK_INFO *p szFileName[lstrlen(szFileName)+1]=_T('\0'); sfo.pFrom=szFileName; /* ask to delete file */ - if(!SHFileOperation(&sfo) && !sfo.fAnyOperationsAborted) { + if (!SHFileOperation(&sfo) && !sfo.fAnyOperationsAborted) { LVITEM lvi; int nCount; lvi.iItem=iItem; @@ -342,7 +342,7 @@ static BOOL InsertPackItemEnumProc(LANGPACK_INFO *pack,WPARAM wParam,LPARAM lPar CopyMemory(pack2,pack,sizeof(LANGPACK_INFO)); /* country flag icon */ lvi.mask=LVIF_TEXT|LVIF_PARAM|LVIF_STATE; - if((HIMAGELIST)lParam!=NULL) { + if ((HIMAGELIST)lParam!=NULL) { HICON hIcon; if(pack->flags&LPF_DEFAULT) hIcon=(HICON)CallService(MS_FLAGS_CREATEMERGEDFLAGICON,CTRY_UNITED_STATES,CTRY_UNITED_KINGDOM); @@ -350,7 +350,7 @@ static BOOL InsertPackItemEnumProc(LANGPACK_INFO *pack,WPARAM wParam,LPARAM lPar int countryId=0xFFFF; /* Unknown */ TCHAR szBuf[6]; /* get country id from locale */ - if(!(pack->flags&LPF_NOLOCALE)) + if (!(pack->flags&LPF_NOLOCALE)) if(GetLocaleInfo(pack->Locale,LOCALE_ICOUNTRY,szBuf,SIZEOF(szBuf))) countryId=_ttoi(szBuf); hIcon=(HICON)CallService(MS_FLAGS_LOADFLAGICON,countryId,0); @@ -429,7 +429,7 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA case M_SHOWFILECOL: { HWND hwndList; hwndList=GetDlgItem(hwndDlg,IDC_LANGLIST); - if((BOOL)lParam && ListView_GetItemCount(hwndList)>1) { + if ((BOOL)lParam && ListView_GetItemCount(hwndList)>1) { LVCOLUMN lvc; LVITEM lvi; LANGPACK_INFO *pack; @@ -502,7 +502,7 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA hti.iItem=ListView_GetNextItem((HWND)wParam,-1,LVNI_SELECTED); if(hti.iItem!=-1) break; - if(!ListView_GetItemRect((HWND)wParam,hti.iItem,&rc,LVIR_SELECTBOUNDS)) + if (!ListView_GetItemRect((HWND)wParam,hti.iItem,&rc,LVIR_SELECTBOUNDS)) break; hti.pt.x=rc.left+(rc.right-rc.left)/2; hti.pt.y=rc.top+(rc.bottom-rc.top)/2; @@ -517,10 +517,10 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA lvi.iItem=hti.iItem; lvi.iSubItem=0; lvi.mask=LVIF_PARAM; - if(!ListView_GetItem((HWND)wParam,&lvi)) break; + if (!ListView_GetItem((HWND)wParam,&lvi)) break; pack=(LANGPACK_INFO*)lvi.lParam; /* context menu */ - if(!(pack->flags&LPF_DEFAULT)) { + if (!(pack->flags&LPF_DEFAULT)) { hContextMenu=CreatePopupMenu(); if(hContextMenu!=NULL) { AppendMenu(hContextMenu,MF_STRING,2,TranslateT("&Remove...")); @@ -553,7 +553,7 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA } case LVN_ITEMCHANGED: { NMLISTVIEW *nmlv=(NMLISTVIEW*)lParam; - if(!(nmlv->uChanged&LVIF_STATE)) break; + if (!(nmlv->uChanged&LVIF_STATE)) break; /* display info and check radio item */ if(nmlv->uNewState&LVIS_SELECTED && !(nmlv->uOldState&LVIS_SELECTED)) { ListView_SetItemState(nmhdr->hwndFrom,nmlv->iItem,INDEXTOSTATEIMAGEMASK(2),LVIS_STATEIMAGEMASK); @@ -588,7 +588,7 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA lvi.mask=LVIF_PARAM; if(ListView_GetItem(nmhdr->hwndFrom,&lvi)) { pack=(LANGPACK_INFO*)lvi.lParam; - if(!(pack->flags&LPF_DEFAULT)) + if (!(pack->flags&LPF_DEFAULT)) DeletePackFile(hwndDlg,nmhdr->hwndFrom,iItem,pack); } break; diff --git a/plugins/LangMan/utils.c b/plugins/LangMan/utils.c index e727df2427..c4ca4a8a6b 100644 --- a/plugins/LangMan/utils.c +++ b/plugins/LangMan/utils.c @@ -49,7 +49,7 @@ void ShowInfoMessage(BYTE flags,const char *pszTitle,const char *pszTextFmt,...) msn.szInfo=(char*)szText; msn.uTimeout=30000; /* max timeout */ msn.dwInfoFlags=flags; - if(!CallServiceSync(MS_CLIST_SYSTRAY_NOTIFY,0,(LPARAM)&msn)) + if (!CallServiceSync(MS_CLIST_SYSTRAY_NOTIFY,0,(LPARAM)&msn)) return; /* success */ } diff --git a/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp b/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp index 8b2d2a262e..59b6ba3168 100644 --- a/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foo_mlt.cpp @@ -374,7 +374,7 @@ public: } void on_quit() { - if(!g_off && FindWindow(MIRANDA_WINDOWCLASS, NULL) != NULL) + if (!g_off && FindWindow(MIRANDA_WINDOWCLASS, NULL) != NULL) SendData(L"0\\0foobar2000\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0"); } }; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp index b374014164..ad00db236f 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/cfg_var.cpp @@ -9,7 +9,7 @@ void cfg_var_reader::config_read_file(stream_reader * p_stream,abort_callback & for(cfg_var_reader * walk = g_list; walk != NULL; walk = walk->m_next) { vars.set(walk->m_guid,walk); } - for(;;) { + for (;;) { GUID guid; t_uint32 size; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp index 8de3814e54..76ba27d35a 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/config_object.cpp @@ -184,7 +184,7 @@ void config_object_impl::set_data(stream_reader * p_stream,abort_callback & p_ab m_data.set_size(0); enum {delta = 1024}; t_uint8 buffer[delta]; - for(;;) + for (;;) { t_size delta_done = p_stream->read(buffer,delta,p_abort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp index 5cc6879cea..a3c0405e9e 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem.cpp @@ -615,7 +615,7 @@ void stream_reader::read_string_ex(pfc::string_base & p_out,t_size p_bytes,abort pfc::array_t temp; t_size allocWalk = expBase; t_size done = 0; - for(;;) { + for (;;) { const t_size target = pfc::min_t(allocWalk, p_bytes); temp.set_size(target); read_object(temp.get_ptr() + done, target - done, p_abort); @@ -640,7 +640,7 @@ void stream_reader::read_string_raw(pfc::string_base & p_out,abort_callback & p_ enum {delta = 256}; char buffer[delta]; p_out.reset(); - for(;;) { + for (;;) { t_size delta_done; delta_done = read(buffer,delta,p_abort); p_out.add_string(buffer,delta_done); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h index 5e6769ea9c..5c537e67b7 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/filesystem_helper.h @@ -662,5 +662,5 @@ private: #define FB2K_RETRY_ON_SHARING_VIOLATION(OP, ABORT, TIMEOUT) \ { \ pfc::lores_timer timer; timer.start(); \ - for(;;) try { {OP;} break; } catch(exception_io_sharing_violation) { if (timer.query() > TIMEOUT) throw; ABORT.sleep(0.01); } \ + for (;;) try { {OP;} break; } catch(exception_io_sharing_violation) { if (timer.query() > TIMEOUT) throw; ABORT.sleep(0.01); } \ } diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp index 2e9dd0aca6..3af8caaa65 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/input.cpp @@ -203,7 +203,7 @@ void input_entry::g_open_for_info_write(service_ptr_t & p_ins void input_entry::g_open_for_info_write_timeout(service_ptr_t & p_instance,service_ptr_t p_filehint,const char * p_path,abort_callback & p_abort,double p_timeout,bool p_from_redirect) { pfc::lores_timer timer; timer.start(); - for(;;) { + for (;;) { try { g_open_for_info_write(p_instance,p_filehint,p_path,p_abort,p_from_redirect); break; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp index eeffb79aa2..eb68fff666 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/metadb_handle_list.cpp @@ -101,7 +101,7 @@ namespace { pfc::string8_fastalloc temp; temp.prealloc(512); const t_size total = m_items.get_size(); - for(;;) { + for (;;) { const t_size index = (*m_walk)++; if (index >= total) break; m_out[index].index = index; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp index 516bf3750d..384bb812b1 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/SDK/tag_processor_id3v2.cpp @@ -46,7 +46,7 @@ void tag_processor_id3v2::g_remove_ex(tag_write_callback & p_callback,const serv t_size tag_processor_id3v2::g_multiskip(const service_ptr_t & p_file,t_filesize & p_size_skipped,abort_callback & p_abort) { t_filesize offset = 0; t_size count = 0; - for(;;) { + for (;;) { t_filesize delta; g_skip_at(p_file, offset, delta, p_abort); if (delta == 0) break; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h index 4425097c87..05497ce011 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ProfileCache.h @@ -31,7 +31,7 @@ namespace ProfileCache { throw; } pfc::array_t buffer; buffer.set_size(64*1024); - for(;;) { + for (;;) { t_size delta = buffer.get_size(); delta = fRemote->read(buffer.get_ptr(), delta, abort); fLocal->write(buffer.get_ptr(), delta, abort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h index 2b42213ba5..bc20bd2298 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/ThreadUtils.h @@ -28,7 +28,7 @@ namespace ThreadUtils { static void WaitAbortable_MsgLoop(HANDLE ev, abort_callback & abort) { const HANDLE handles[2] = {ev, abort.get_abort_event()}; - for(;;) { + for (;;) { SetLastError(0); const DWORD status = MsgWaitForMultipleObjects(2, handles, FALSE, INFINITE, QS_ALLEVENTS); switch(status) { @@ -54,7 +54,7 @@ namespace ThreadUtils { pfc::array_t handles; handles.set_size(evCount + 1); handles[0] = abort.get_abort_event(); pfc::memcpy_t(handles.get_ptr() + 1, ev, evCount); - for(;;) { + for (;;) { SetLastError(0); const DWORD status = MsgWaitForMultipleObjects(handles.get_count(), handles.get_ptr(), FALSE, INFINITE, QS_ALLEVENTS); switch(status) { @@ -84,7 +84,7 @@ namespace ThreadUtils { PFC_ASSERT( timeout != INFINITE ); const DWORD entry = GetTickCount(); const HANDLE handles[1] = {abort.get_abort_event()}; - for(;;) { + for (;;) { const DWORD done = GetTickCount() - entry; if (done >= timeout) return; SetLastError(0); @@ -106,7 +106,7 @@ namespace ThreadUtils { PFC_ASSERT( timeout != INFINITE ); const DWORD entry = GetTickCount(); const HANDLE handles[2] = {ev, abort.get_abort_event()}; - for(;;) { + for (;;) { const DWORD done = GetTickCount() - entry; if (done >= timeout) return false; SetLastError(0); @@ -246,7 +246,7 @@ namespace ThreadUtils { TRACK_CALL_TEXT("CSingleThreadWrapper entry"); try { TBase instance; - for(;;) { + for (;;) { command_ptr cmd; if (processMsgs) m_commands.Get_MsgLoop(cmd, m_threadAbort); else m_commands.Get(cmd, m_threadAbort); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp index 048700ec94..8752c12472 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/cue_creator.cpp @@ -28,7 +28,7 @@ static bool is_meta_same_everywhere(const cue_creator::t_entry_list & p_list,con iter = p_list.first(); if (!iter.is_valid()) return false; if (!iter->m_infos.meta_format(p_meta,reference)) return false; - for(;iter.is_valid();++iter) + for (;iter.is_valid();++iter) { if (!iter->m_infos.meta_format(p_meta,temp)) return false; if (strcmp(temp,reference)!=0) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp index 41e2e1560d..5e20ea177e 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/file_info_const_impl.cpp @@ -182,7 +182,7 @@ void file_info_const_impl::copy(const file_info & p_source) { // profiler(file_info_const_impl__copy__pass2); t_size index; - for( index = 0; index < m_meta_count; index ++ ) + for ( index = 0; index < m_meta_count; index ++ ) { t_size val; const t_size val_max = p_source.meta_enum_value_count(index); @@ -204,12 +204,12 @@ void file_info_const_impl::copy(const file_info & p_source) else { meta[index].m_valuemap = valuemap; - for( val = 0; val < val_max ; val ++ ) + for ( val = 0; val < val_max ; val ++ ) *(valuemap ++ ) = stringbuffer_append(stringbuffer, p_source.meta_enum_value(index,val) ); } } - for( index = 0; index < m_info_count; index ++ ) + for ( index = 0; index < m_info_count; index ++ ) { const char * name = p_source.info_enum_name(index); const char * name_opt = optimize_infoname(name); diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp index 0d38e95e50..a5a9068b06 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/filetimetools.cpp @@ -31,7 +31,7 @@ t_filetimestamp foobar2000_io::filetimestamp_from_string(const char * date) { t_size remaining = strlen(date); SYSTEMTIME st = {}; st.wDay = 1; st.wMonth = 1; - for(;;) { + for (;;) { #define ADVANCE(n) { PFC_ASSERT( remaining >= n); date += n; remaining -= n; } #define ADVANCE_TEST(n) { if (remaining < n) throw exception_time_error(); } #define PARSE(var, digits) { ADVANCE_TEST(digits); var = (WORD) ParseDateElem(date, digits); ADVANCE(digits) ; } diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp index c434405c26..28eee6ff6f 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/listview_helper.cpp @@ -138,7 +138,7 @@ static bool ProbeColumn(HWND view, int index) { int ListView_GetColumnCount(HWND listView) { if (!ProbeColumn(listView, 0)) return 0; int hi = 1; - for(;;) { + for (;;) { if (!ProbeColumn(listView, hi)) break; hi <<= 1; if (hi <= 0) { diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp index ec63ff4039..b88403a352 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/text_file_loader.cpp @@ -48,7 +48,7 @@ namespace text_file_loader mem.set_size(delta); - for(;;) + for (;;) { done = p_file->read(mem.get_ptr(),delta,p_abort); if (done > 0) diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp index c97eee4338..6021e4e569 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/helpers/wildcard.cpp @@ -2,7 +2,7 @@ static bool test_recur(const char * fn,const char * rm,bool b_sep) { - for(;;) + for (;;) { if ((b_sep && *rm==';') || *rm==0) return *fn==0; else if (*rm=='*') diff --git a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h index 5d57dbc921..ce91ae029c 100644 --- a/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h +++ b/plugins/ListeningTo/players/foo_mlt/foobar2000/shared/shared.h @@ -814,7 +814,7 @@ private: static bool IsPointInsideControl(const POINT& pt, HWND wnd) { HWND walk = WindowFromPoint(pt); - for(;;) { + for (;;) { if (walk == NULL) return false; if (walk == wnd) return true; if (GetWindowLong(walk,GWL_STYLE) & WS_POPUP) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/array.h b/plugins/ListeningTo/players/foo_mlt/pfc/array.h index 9e5c10359c..0ad6be2499 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/array.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/array.h @@ -224,7 +224,7 @@ namespace pfc { template static int compare(const t_array1 & p_array1, const t_array2 & p_array2) { t_size walk = 0; - for(;;) { + for (;;) { if (walk >= p_array1.get_size() && walk >= p_array2.get_size()) return 0; else if (walk >= p_array1.get_size()) return -1; else if (walk >= p_array2.get_size()) return 1; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h b/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h index ff273719e2..930e003212 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/avltree.h @@ -43,10 +43,10 @@ namespace pfc { t_rawptr step(bool direction) throw() { t_self* walk = this; - for(;;) { + for (;;) { t_self* t = walk->child(direction); if (t != NULL) return t->peakchild(!direction); - for(;;) { + for (;;) { t = walk->m_parent; if (t == NULL) return NULL; if (t->which_child(walk) != direction) return t; @@ -56,7 +56,7 @@ namespace pfc { } t_rawptr peakchild(bool direction) throw() { t_self* walk = this; - for(;;) { + for (;;) { t_rawptr next = walk->child(direction); if (next == NULL) return walk; walk = next; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp index ce1c36e97a..c2a7db0f12 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/base64.cpp @@ -48,7 +48,7 @@ namespace pfc { { const t_size max = textLen - 4; t_size textWalk = 0; - for(; textWalk < max; textWalk ++) { + for (; textWalk < max; textWalk ++) { const t_uint8 v = alphabetRev[(t_uint8)text[textWalk]]; if (v == 0xFF) throw pfc::exception_invalid_params(); bitWriter::set_bits(reinterpret_cast(out),outWritePtr,v,6); @@ -57,7 +57,7 @@ namespace pfc { t_uint8 temp[3]; t_size tempWritePtr = 0; - for(; textWalk < textLen; textWalk ++) { + for (; textWalk < textLen; textWalk ++) { const char c = text[textWalk]; if (c == '=') break; const t_uint8 v = alphabetRev[(t_uint8)c]; @@ -65,7 +65,7 @@ namespace pfc { bitWriter::set_bits(temp,tempWritePtr,v,6); tempWritePtr += 6; } - for(; textWalk < textLen; textWalk ++) { + for (; textWalk < textLen; textWalk ++) { if (text[textWalk] != '=') throw pfc::exception_invalid_params(); } memcpy(reinterpret_cast(out) + (outWritePtr/8), temp, tempWritePtr/8); diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp index ed0fc02080..c90a9eac08 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/guid.cpp @@ -41,7 +41,7 @@ unsigned GUID_from_text::read_dword(const char * ptr) void GUID_from_text::read_bytes(BYTE * out,unsigned num,const char * ptr) { - for(;num;num--) + for (;num;num--) { *out = read_byte(ptr); out++;ptr+=2; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h b/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h index 5455990cc4..bc68c65f41 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/iterators.h @@ -86,7 +86,7 @@ namespace pfc { static int compare(const t_list1 & p_list1, const t_list2 p_list2) { typename t_list1::const_iterator iter1 = p_list1.first(); typename t_list2::const_iterator iter2 = p_list2.first(); - for(;;) { + for (;;) { if (iter1.is_empty() && iter2.is_empty()) return 0; else if (iter1.is_empty()) return -1; else if (iter2.is_empty()) return 1; @@ -103,7 +103,7 @@ namespace pfc { static bool listEquals(const t_list1 & p_list1, const t_list2 & p_list2) { typename t_list1::const_iterator iter1 = p_list1.first(); typename t_list2::const_iterator iter2 = p_list2.first(); - for(;;) { + for (;;) { if (iter1.is_empty() && iter2.is_empty()) return true; else if (iter1.is_empty() || iter2.is_empty()) return false; else if (*iter1 != *iter2) return false; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp index 4db4b59011..fcb5a07b4c 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/other.cpp @@ -37,7 +37,7 @@ namespace pfc { if (p_delta<0) { - for(;p_delta<0;p_delta++) + for (;p_delta<0;p_delta++) { t_size idx; for(idx=1;idx0;p_delta--) + for (;p_delta>0;p_delta--) { t_size idx; for(idx=count-2;(int)idx>=0;idx--) diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp index 84e5156c51..e936e656fa 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/pathUtils.cpp @@ -105,7 +105,7 @@ string replaceIllegalNameChars(string fn, bool allowWC) { bool isInsideDirectory(pfc::string directory, pfc::string inside) { //not very efficient string walk = inside; - for(;;) { + for (;;) { walk = getParent(walk); if (walk == "") return false; if (equals(directory,walk)) return true; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h b/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h index dbdc8bc160..77444e8b67 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/primitives.h @@ -368,7 +368,7 @@ namespace pfc { t_size subtract_sorted_lists_calculate_count(const t_source1 & p_source1, const t_source2 & p_source2) { t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -393,7 +393,7 @@ namespace pfc { p_destination.set_size(subtract_sorted_lists_calculate_count(p_source1,p_source2)); t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -416,7 +416,7 @@ namespace pfc { t_size merge_sorted_lists_calculate_count(const t_source1 & p_source1, const t_source2 & p_source2) { t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); @@ -441,7 +441,7 @@ namespace pfc { p_destination.set_size(merge_sorted_lists_calculate_count(p_source1,p_source2)); t_size walk1 = 0, walk2 = 0, walk_out = 0; const t_size max1 = p_source1.get_size(), max2 = p_source2.get_size(); - for(;;) { + for (;;) { int state; if (walk1 < max1 && walk2 < max2) { state = pfc::compare_t(p_source1[walk1],p_source2[walk2]); diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp index a1506128e4..9b235c5845 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/string.cpp @@ -315,7 +315,7 @@ int strcmp_ex(const char* p1,t_size n1,const char* p2,t_size n2) { t_size idx = 0; n1 = strlen_max(p1,n1); n2 = strlen_max(p2,n2); - for(;;) + for (;;) { if (idx == n1 && idx == n2) return 0; else if (idx == n1) return -1;//end of param1 @@ -384,7 +384,7 @@ t_int64 atoi64_ex(const char * src,t_size len) int stricmp_ascii_ex(const char * const s1,t_size const len1,const char * const s2,t_size const len2) throw() { t_size walk1 = 0, walk2 = 0; - for(;;) { + for (;;) { char c1 = (walk1 < len1) ? s1[walk1] : 0; char c2 = (walk2 < len2) ? s2[walk2] : 0; c1 = ascii_tolower(c1); c2 = ascii_tolower(c2); @@ -397,7 +397,7 @@ int stricmp_ascii_ex(const char * const s1,t_size const len1,const char * const } int stricmp_ascii(const char * s1,const char * s2) throw() { - for(;;) { + for (;;) { char c1 = ascii_tolower(*s1), c2 = ascii_tolower(*s2); if (c1c2) return 1; @@ -441,7 +441,7 @@ format_hex::format_hex(t_uint64 p_val,unsigned p_width) if (n > 16 - p_width) n = 16 - p_width; char * out = m_buffer; - for(;n<16;n++) + for (;n<16;n++) *(out++) = temp[n]; *out = 0; } @@ -469,7 +469,7 @@ format_hex_lowercase::format_hex_lowercase(t_uint64 p_val,unsigned p_width) if (n > 16 - p_width) n = 16 - p_width; char * out = m_buffer; - for(;n<16;n++) + for (;n<16;n++) *(out++) = temp[n]; *out = 0; } @@ -497,7 +497,7 @@ format_uint::format_uint(t_uint64 val,unsigned p_width,unsigned p_base) char * out = m_buffer; - for(;n 0) { if (walk > splitBase) p_output(p_string + splitBase, walk - splitBase); @@ -880,7 +880,7 @@ namespace pfc { } template void splitStringByLines(t_out & out, const char * str) { - for(;;) { + for (;;) { const char * next = strchr(str, '\n'); if (next == NULL) { out += string_part(str, strlen(str)); break; @@ -892,7 +892,7 @@ namespace pfc { } } template void splitStringByChar(t_out & out, const char * str, char c) { - for(;;) { + for (;;) { const char * next = strchr(str, c); if (next == NULL) { out += string_part(str, strlen(str)); break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp index f6652ee5f4..1e469a02a2 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.cpp @@ -38,7 +38,7 @@ bool string::startsWith(char c) const { bool string::startsWith(string s) const { const char * walk = ptr(); const char * subWalk = s.ptr(); - for(;;) { + for (;;) { if (*subWalk == 0) return true; if (*walk != *subWalk) return false; walk++; subWalk++; @@ -66,7 +66,7 @@ char string::lastChar() const { string string::replace(stringp strOld, stringp strNew) const { t_size walk = 0; string ret; - for(;;) { + for (;;) { t_size next = indexOf(strOld, walk); if (next == ~0) { ret += subString(walk); break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h index 2b93528e8e..121221e738 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h +++ b/plugins/ListeningTo/players/foo_mlt/pfc/stringNew.h @@ -238,7 +238,7 @@ namespace pfc { string acc; if (iter.is_valid()) { acc = *iter; - for(++iter; iter.is_valid(); ++iter) { + for (++iter; iter.is_valid(); ++iter) { acc = acc + separator + *iter; } } diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp index 77b2deed59..52280337c6 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/string_conv.cpp @@ -131,7 +131,7 @@ namespace pfc { t_size estimate_utf8_to_wide(const char * p_in) { t_size inptr = 0; t_size retval = 1;//1 for null terminator - for(;;) { + for (;;) { unsigned newchar = 0; t_size delta = utf8_decode_char(p_in + inptr,newchar); if (delta == 0 || newchar == 0) break; diff --git a/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp b/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp index 81b37d21b9..58663abbf2 100644 --- a/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp +++ b/plugins/ListeningTo/players/foo_mlt/pfc/utf8.cpp @@ -12,7 +12,7 @@ t_size utf8_char_len_from_header(char p_c) throw() t_uint8 c = (t_uint8)p_c; t_size cnt = 0; - for(;;) + for (;;) { if ((p_c & mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=6) return 0; @@ -34,7 +34,7 @@ t_size utf8_decode_char(const char *p_utf8,unsigned & wide) throw() { unsigned res=0; unsigned n; unsigned cnt=0; - for(;;) + for (;;) { if ((*utf8&mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=max) return 0; @@ -82,7 +82,7 @@ t_size utf8_decode_char(const char *p_utf8,unsigned & wide,t_size max) throw() unsigned res=0; unsigned n; unsigned cnt=0; - for(;;) + for (;;) { if ((*utf8&mask_tab[cnt])==val_tab[cnt]) break; if (++cnt>=max) return 0; @@ -224,7 +224,7 @@ t_size utf8_char_len(const char * s,t_size max) throw() t_size skip_utf8_chars(const char * ptr,t_size count) throw() { t_size num = 0; - for(;count && ptr[num];count--) + for (;count && ptr[num];count--) { t_size d = utf8_char_len(ptr+num); if (d<=0) break; @@ -295,7 +295,7 @@ t_size strlen_utf8(const char * p,t_size num) throw() unsigned w; t_size d; t_size ret = 0; - for(;num;) + for (;num;) { d = utf8_decode_char(p,w); if (w==0 || d<=0) break; diff --git a/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h b/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h index 7e1f75d22b..73082908c0 100644 --- a/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h +++ b/plugins/ListeningTo/players/winamp_mlt/wa_ipc.h @@ -1632,7 +1632,7 @@ typedef struct { ** ** (5.5+) ** If you pass 1 in wParam then you will have zero returned if a language pack is in use. -** if(!SendMessage(hwnd_winamp,WM_WA_IPC,1,IPC_GETLANGUAGEPACKINSTANCE)){ +** if (!SendMessage(hwnd_winamp,WM_WA_IPC,1,IPC_GETLANGUAGEPACKINSTANCE)) { ** // winamp is currently using a language pack ** } ** @@ -1753,7 +1753,7 @@ typedef struct { ** information about it such as the name of the skin file. ** ** if(uMsg == WM_WA_IPC && lParam == IPC_GETSKININFO){ -** if(is_our_skin()){ +** if(is_our_skin()) { ** return is_our_skin_name(); ** } ** } @@ -2059,7 +2059,7 @@ typedef struct { ** ** BOOL CALLBACK enumWndProc(HWND hwnd, LPARAM lParam){ ** -** if(SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)){ +** if(SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)hwnd,IPC_FF_ISMAINWND)) { ** // do processing in here ** // or continue the enum for other main windows (if they exist) ** // and just comment out the line below diff --git a/plugins/MenuItemEx/main.c b/plugins/MenuItemEx/main.c index 00c3019ca6..6bce1486b3 100644 --- a/plugins/MenuItemEx/main.c +++ b/plugins/MenuItemEx/main.c @@ -327,7 +327,7 @@ BOOL isMetaContact(HANDLE hContact) { char *proto; if(bMetaContacts) { proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if( lstrcmpA(proto,"MetaContacts") == 0 ) { + if ( lstrcmpA(proto,"MetaContacts") == 0 ) { return TRUE; } } @@ -362,7 +362,7 @@ void GetID(HANDLE hContact,LPSTR szProto,LPSTR szID) *szID='\0'; - if( uID && DBGetContactSetting(hContact, szProto, uID ,&dbv_uniqueid)==0 ) { + if ( uID && DBGetContactSetting(hContact, szProto, uID ,&dbv_uniqueid)==0 ) { if (dbv_uniqueid.type ==DBVT_DWORD) wsprintfA(szID, "%u", dbv_uniqueid.dVal); else if (dbv_uniqueid.type ==DBVT_WORD) @@ -384,7 +384,7 @@ int StatusMsgExists(HANDLE hContact) int i; module = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!module) return 0; + if (!module) return 0; for(i = 0; i < SIZEOF(statusMsg); i++) { if (statusMsg[i].flag & 8) @@ -408,7 +408,7 @@ BOOL IPExists(HANDLE hContact) DWORD mIP,rIP; szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) return 0; + if (!szProto) return 0; mIP = DBGetContactSettingDword(hContact, szProto, "IP", 0); rIP = DBGetContactSettingDword(hContact, szProto, "RealIP", 0); @@ -422,7 +422,7 @@ BOOL MirVerExists(HANDLE hContact) BOOL ret=0; szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) return 0; + if (!szProto) return 0; msg = DBGetString(hContact,szProto,"MirVer"); if(msg) { @@ -439,8 +439,8 @@ void getIP(HANDLE hContact,LPSTR szProto,LPSTR szIP) char szrIP[64]={0}; DWORD mIP = DBGetContactSettingDword(hContact, szProto, "IP", 0); DWORD rIP = DBGetContactSettingDword(hContact, szProto, "RealIP", 0); - if( mIP ) wsprintfA(szmIP, "External IP: %d.%d.%d.%d\r\n", mIP>>24,(mIP>>16)&0xFF,(mIP>>8)&0xFF,mIP&0xFF); - if( rIP ) wsprintfA(szrIP, "Internal IP: %d.%d.%d.%d\r\n", rIP>>24,(rIP>>16)&0xFF,(rIP>>8)&0xFF,rIP&0xFF); + if ( mIP ) wsprintfA(szmIP, "External IP: %d.%d.%d.%d\r\n", mIP>>24,(mIP>>16)&0xFF,(mIP>>8)&0xFF,mIP&0xFF); + if ( rIP ) wsprintfA(szrIP, "Internal IP: %d.%d.%d.%d\r\n", rIP>>24,(rIP>>16)&0xFF,(rIP>>8)&0xFF,rIP&0xFF); strcpy(szIP,szrIP); strcat(szIP,szmIP); } @@ -450,7 +450,7 @@ LPSTR getMirVer(HANDLE hContact) LPSTR szProto, msg; szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) return NULL; + if (!szProto) return NULL; msg = DBGetString(hContact,szProto,"MirVer"); if(msg) { @@ -646,12 +646,12 @@ void ModifyCopyID(CLISTMENUITEM *cli, HANDLE hContact, BOOL bShowID, BOOL bTrimI if(isMetaContact(hContact)) { hC = getMostOnline(hContact); - if( !hContact ) hC = getDefaultContact(hContact); + if ( !hContact ) hC = getDefaultContact(hContact); hContact = hC; } szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) { + if (!szProto) { HideItem(cli,hmenuCopyID); return; } @@ -696,7 +696,7 @@ void ModifyStatusMsg(CLISTMENUITEM *cli,HANDLE hContact) cli->flags|=CMIM_ICON; szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) { + if (!szProto) { HideItem(cli,hmenuStatusMsg); return; } @@ -718,7 +718,7 @@ void ModifyCopyIP(CLISTMENUITEM *cli,HANDLE hContact) cli->flags |= CMIM_ICON; szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!szProto) { + if (!szProto) { HideItem(cli,hmenuCopyIP); return; } @@ -745,7 +745,7 @@ void ModifyCopyMirVer(CLISTMENUITEM *cli,HANDLE hContact) mir_free(msg); } } - if(!cli->hIcon) cli->hIcon = hIcon[0]; + if (!cli->hIcon) cli->hIcon = hIcon[0]; CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hmenuCopyMirVer,(LPARAM)cli); } @@ -759,7 +759,7 @@ INT_PTR onCopyID(WPARAM wparam,LPARAM lparam) hContact = (HANDLE)wparam; if(isMetaContact(hContact)) { hC = getMostOnline(hContact); - if( !hContact ) hC = getDefaultContact(hContact); + if ( !hContact ) hC = getDefaultContact(hContact); hContact = hC; } if ((szProto = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)) == NULL) @@ -796,7 +796,7 @@ INT_PTR onCopyStatusMsg(WPARAM wparam,LPARAM lparam) DWORD flags=DBGetContactSettingDword(NULL,VISPLG,"flags",vf_default); module = (LPSTR) CallService(MS_PROTO_GETCONTACTBASEPROTO, wparam, 0); - if(!module) return 0; + if (!module) return 0; buffer[0]=0; for(i = 0; i < SIZEOF(statusMsg); i++) { @@ -1039,12 +1039,12 @@ int BuildMenu(WPARAM wparam,LPARAM lparam) } else HideItem(&miPROTO,hmenuProto); - if((bShowAll || flags & VF_ADD) && bIsOnline && (bMir_08 ? IsAccountEnabled( pa ) : TRUE)) + if ((bShowAll || flags & VF_ADD) && bIsOnline && (bMir_08 ? IsAccountEnabled( pa ) : TRUE)) ShowItem(&miADD,hmenuAdded); else HideItem(&miADD,hmenuAdded); - if((bShowAll || flags & VF_REQ) && bIsOnline && (bMir_08 ? IsAccountEnabled( pa ) : TRUE)) + if ((bShowAll || flags & VF_REQ) && bIsOnline && (bMir_08 ? IsAccountEnabled( pa ) : TRUE)) ShowItem(&miREQ,hmenuAuthReq); else HideItem(&miREQ,hmenuAuthReq); @@ -1055,22 +1055,22 @@ int BuildMenu(WPARAM wparam,LPARAM lparam) } else HideItem(&miCID,hmenuCopyID); - if((bShowAll || flags&VF_RECV) && DirectoryExists((HANDLE)wparam)) ShowItem(&miRECV,hmenuRecvFiles); + if ((bShowAll || flags&VF_RECV) && DirectoryExists((HANDLE)wparam)) ShowItem(&miRECV,hmenuRecvFiles); else HideItem(&miRECV,hmenuRecvFiles); - if((bShowAll || flags&VF_STAT) && StatusMsgExists((HANDLE)wparam)){ + if ((bShowAll || flags&VF_STAT) && StatusMsgExists((HANDLE)wparam)) { ShowItem(&miSTAT,hmenuStatusMsg); ModifyStatusMsg(&miSTAT,(HANDLE)wparam); } else HideItem(&miSTAT,hmenuStatusMsg); - if((bShowAll || flags&VF_CIP) && IPExists((HANDLE)wparam)){ + if ((bShowAll || flags&VF_CIP) && IPExists((HANDLE)wparam)) { ShowItem(&miCIP,hmenuCopyIP); ModifyCopyIP(&miCIP,(HANDLE)wparam); } else HideItem(&miCIP,hmenuCopyIP); - if((bShowAll || flags&VF_CMV) && MirVerExists((HANDLE)wparam)){ + if ((bShowAll || flags&VF_CMV) && MirVerExists((HANDLE)wparam)) { ShowItem(&miCMV,hmenuCopyMirVer); ModifyCopyMirVer(&miCMV,(HANDLE)wparam); } @@ -1119,7 +1119,7 @@ static int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) { CustomButtonClickData *cbcd=(CustomButtonClickData *)lParam; - if(!strcmp(cbcd->pszModule, MODULENAME) && cbcd->dwButtonId == 0) + if (!strcmp(cbcd->pszModule, MODULENAME) && cbcd->dwButtonId == 0) onRecvFiles(wParam, 0); return 0; diff --git a/plugins/MetaContacts/addto.c b/plugins/MetaContacts/addto.c index 3fcfcd2a62..f6ef14529b 100644 --- a/plugins/MetaContacts/addto.c +++ b/plugins/MetaContacts/addto.c @@ -61,7 +61,7 @@ int FillList(HWND list, BOOL sort) while(hMetaUser) // The DB is searched through, to get all the metacontacts { - if((metaID=DBGetContactSettingDword(hMetaUser,META_PROTO,META_ID,(DWORD)-1))==(DWORD)-1) + if ((metaID=DBGetContactSettingDword(hMetaUser,META_PROTO,META_ID,(DWORD)-1))==(DWORD)-1) { // This isn't a MetaContact, go to the next hMetaUser = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hMetaUser,0); @@ -257,13 +257,13 @@ INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP { HANDLE hMeta, hContact = (HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); int item; // Get the index of the selected metacontact - if((item = SendMessage(GetDlgItem(hwndDlg, IDC_METALIST),LB_GETCURSEL, 0, 0))==-1) + if ((item = SendMessage(GetDlgItem(hwndDlg, IDC_METALIST),LB_GETCURSEL, 0, 0))==-1) return IDOK == MessageBox(hwndDlg,Translate("Please select a MetaContact"),Translate("No MetaContact selected"),MB_ICONHAND); hMeta = (HANDLE)SendMessage(GetDlgItem(hwndDlg, IDC_METALIST), LB_GETITEMDATA, (WPARAM)item, 0); { - if(!Meta_Assign(hContact,hMeta, FALSE)) + if (!Meta_Assign(hContact,hMeta, FALSE)) { MessageBox(hwndDlg, Translate("Assignment to the MetaContact failed."), Translate("Assignment failure"),MB_ICONERROR); } diff --git a/plugins/MetaContacts/edit.c b/plugins/MetaContacts/edit.c index 9a5f55d920..f477d825dc 100644 --- a/plugins/MetaContacts/edit.c +++ b/plugins/MetaContacts/edit.c @@ -222,7 +222,7 @@ void ApplyChanges(CHANGES *chg) AI.format = PA_FORMAT_UNKNOWN; strcpy(AI.filename, "X"); - if((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) + if ((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) DBWriteContactSettingString(chg->hMeta, "ContactPhoto", "File",AI.filename); } @@ -388,7 +388,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR switch(LOWORD(wParam)) // hit control { case IDC_LST_CONTACTS: // did we hit our ListView contorl? - if(((LPNMHDR)lParam)->code == NM_CLICK) { + if (((LPNMHDR)lParam)->code == NM_CLICK) { hwnd = GetDlgItem(hwndDlg, IDC_LST_CONTACTS); sel=SendMessage(hwnd,LVM_GETNEXTITEM,-1,LVNI_FOCUSED|LVNI_SELECTED); // return item selected // enable buttons @@ -404,7 +404,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR EnableWindow(hwnd, (sel != -1) && (sel < changes.num_contacts - 1)); /* // custom draw stuff - change colour of listview things - doesn't affect selection :( - } else if(((LPNMHDR)lParam)->code == NM_CUSTOMDRAW) { + } else if (((LPNMHDR)lParam)->code == NM_CUSTOMDRAW) { SetWindowLong(hwndDlg, DWL_MSGRESULT, (LONG)ProcessCustomDraw(lParam)); return TRUE; */ diff --git a/plugins/MetaContacts/meta_api.c b/plugins/MetaContacts/meta_api.c index bf3aed5d2f..6a8781f6e1 100644 --- a/plugins/MetaContacts/meta_api.c +++ b/plugins/MetaContacts/meta_api.c @@ -88,7 +88,7 @@ INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) { DWORD num_contacts = DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "NumContacts", -1); if(num_contacts == -1) return 1; - if((DWORD)lParam >= num_contacts || (DWORD)lParam < 0) + if ((DWORD)lParam >= num_contacts || (DWORD)lParam < 0) return 1; if(DBWriteContactSettingDword((HANDLE)wParam, META_PROTO, "Default", (DWORD)lParam)) return 1; @@ -120,7 +120,7 @@ INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) { INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) { HANDLE hContact = Meta_GetContactHandle((HANDLE)wParam, (int)lParam); HANDLE hMeta = (HANDLE)DBGetContactSettingDword(hContact, META_PROTO, "Handle", 0); - if(!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0)) + if (!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0)) return 1; DBWriteContactSettingDword(hMeta, META_PROTO, "ForceSend", (DWORD)hContact); @@ -136,7 +136,7 @@ INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) { INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)lParam; HANDLE hMeta = (HANDLE)DBGetContactSettingDword(hContact, META_PROTO, "Handle", 0); - if(!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0)) + if (!hContact || !hMeta || hMeta != (HANDLE)wParam || DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0)) return 1; DBWriteContactSettingDword(hMeta, META_PROTO, "ForceSend", (DWORD)hContact); @@ -182,7 +182,7 @@ INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) { HANDLE hMeta = (HANDLE)wParam; HANDLE hContact; - if(!hMeta) return 0; + if (!hMeta) return 0; if(DBGetContactSettingByte(hMeta, META_PROTO, "ForceDefault", 0)) { if(lParam) *(DWORD *)lParam = DBGetContactSettingDword((HANDLE)wParam, META_PROTO, "Default", -1); @@ -191,7 +191,7 @@ INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) { hContact = (HANDLE)DBGetContactSettingDword(hMeta, META_PROTO, "ForceSend", 0); - if(!hContact) { + if (!hContact) { if(lParam) *(DWORD *)lParam = -1; } else { if(lParam) *(DWORD *)lParam = (DWORD)Meta_GetContactNumber(hContact); diff --git a/plugins/MetaContacts/meta_main.c b/plugins/MetaContacts/meta_main.c index eea5e0666e..2de31f978a 100644 --- a/plugins/MetaContacts/meta_main.c +++ b/plugins/MetaContacts/meta_main.c @@ -187,7 +187,7 @@ int __declspec(dllexport)Load(PLUGINLINK *link) char *proto; while(hContact != NULL) { //proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!DBGetContactSetting(hContact, "Protocol", "p", &dbv)) { + if (!DBGetContactSetting(hContact, "Protocol", "p", &dbv)) { proto = dbv.pszVal; if (proto && !lstrcmp( META_PROTO, proto)) { DBWriteContactSettingWord(hContact, META_PROTO, "Status", ID_STATUS_OFFLINE); @@ -218,7 +218,7 @@ int __declspec(dllexport)Load(PLUGINLINK *link) // that metacontacts: have the correct number of subcontacts, and have reasonable defaults if(Meta_SetHandles()) { // error - db corruption - if(!DBGetContactSettingByte(0, META_PROTO, "DisabledMessageShown", 0)) { + if (!DBGetContactSettingByte(0, META_PROTO, "DisabledMessageShown", 0)) { MessageBox(0, Translate("Error - Database corruption.\nPlugin disabled."), Translate("MetaContacts"), MB_OK | MB_ICONERROR); DBWriteContactSettingByte(0, META_PROTO, "DisabledMessageShown", 1); } diff --git a/plugins/MetaContacts/meta_menu.c b/plugins/MetaContacts/meta_menu.c index 36caabffa7..37ceb1116a 100644 --- a/plugins/MetaContacts/meta_menu.c +++ b/plugins/MetaContacts/meta_menu.c @@ -43,7 +43,7 @@ INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam) // Get some information about the selected contact. // proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0); - if(!DBGetContactSettingStringUtf((HANDLE)wParam,"CList","Group",&dbv)) { + if (!DBGetContactSettingStringUtf((HANDLE)wParam,"CList","Group",&dbv)) { group = _strdup(dbv.pszVal); DBFreeVariant(&dbv); } @@ -70,14 +70,14 @@ INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam) } // Assign the contact to the MetaContact just created (and make default). - if(!Meta_Assign((HANDLE)wParam,hMetaContact,TRUE)) { + if (!Meta_Assign((HANDLE)wParam,hMetaContact,TRUE)) { MessageBox(0,Translate("There was a problem in assigning the contact to the MetaContact"),Translate("Error"),MB_ICONEXCLAMATION); CallService(MS_DB_CONTACT_DELETE, (WPARAM)hMetaContact, 0); return 0; } // hide the contact if clist groups disabled (shouldn't create one anyway since menus disabled) - if(!Meta_IsEnabled()) + if (!Meta_IsEnabled()) DBWriteContactSettingByte(hMetaContact, "CList", "Hidden", 1); } @@ -153,7 +153,7 @@ void Meta_RemoveContactNumber(HANDLE hMeta, int number) { hContact = Meta_GetContactHandle(hMeta, number); // make sure this contact thinks it's part of this metacontact - if((HANDLE)DBGetContactSettingDword(hContact,META_PROTO,"Handle", 0) == hMeta) { + if ((HANDLE)DBGetContactSettingDword(hContact,META_PROTO,"Handle", 0) == hMeta) { // remove link to meta contact DBDeleteContactSetting(hContact,META_PROTO,"IsSubcontact"); @@ -231,7 +231,7 @@ void Meta_RemoveContactNumber(HANDLE hMeta, int number) { AI.format = PA_FORMAT_UNKNOWN; strcpy(AI.filename, "X"); - if((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) + if ((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) DBWriteContactSettingString(hMeta, "ContactPhoto", "File",AI.filename); } } @@ -250,9 +250,9 @@ INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam) DWORD metaID; HANDLE hContact; - if((metaID=DBGetContactSettingDword((HANDLE)wParam,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) + if ((metaID=DBGetContactSettingDword((HANDLE)wParam,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) {// The wParam is a metacontact - if(!lParam) { // check from recursion - see second half of this function + if (!lParam) { // check from recursion - see second half of this function if(MessageBox((HWND)CallService(MS_CLUI_GETHWND,0,0),Translate("This will remove the MetaContact permanently.\n\nProceed Anyway?"), Translate("Are you sure?"),MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2)!=IDYES) { @@ -327,7 +327,7 @@ INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam) { HANDLE hMeta; - if((hMeta = (HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",0)) != 0) + if ((hMeta = (HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",0)) != 0) { // the wParam is a subcontact DBWriteContactSettingDword(hMeta, META_PROTO, "Default", (DWORD)Meta_GetContactNumber((HANDLE)wParam)); NotifyEventHooks(hEventDefaultChanged, (WPARAM)hMeta, (LPARAM)(HANDLE)wParam); @@ -439,7 +439,7 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam) hContact = Meta_GetContactHandle((HANDLE)wParam, i); proto = _strdup((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)); - if(!proto) + if (!proto) status = ID_STATUS_OFFLINE; else status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE); @@ -513,7 +513,7 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam) } else {// This is a simple contact - if(!Meta_IsEnabled()) + if (!Meta_IsEnabled()) { // groups disabled - all meta menu options hidden mi.flags = CMIM_FLAGS | CMIF_HIDDEN; diff --git a/plugins/MetaContacts/meta_options.c b/plugins/MetaContacts/meta_options.c index 6fd6aa47e5..af23243c5e 100644 --- a/plugins/MetaContacts/meta_options.c +++ b/plugins/MetaContacts/meta_options.c @@ -65,7 +65,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara CheckDlgButton(hwndDlg, IDC_CHK_SUBHISTORY, options_changes.subhistory ? TRUE : FALSE); CheckDlgButton(hwndDlg, IDC_CHK_COPYDATA, options_changes.copydata ? TRUE : FALSE); - if(!options_changes.subcontact_windows) { + if (!options_changes.subcontact_windows) { hw = GetDlgItem(hwndDlg, IDC_CHK_METAHISTORY); EnableWindow(hw, FALSE); } else { @@ -257,7 +257,7 @@ int Meta_WriteOptions(MetaOptions *opt) { DBWriteContactSettingByte(NULL, META_PROTO, "MetaMessageIcon", (BYTE)(opt->flash_meta_message_icon ? 1 : 0)); DBWriteContactSettingByte(NULL, META_PROTO, "CopyUserInfo", (BYTE)(opt->copy_userinfo ? 1 : 0)); - if(!opt->subcontact_windows) + if (!opt->subcontact_windows) DBWriteContactSettingByte(NULL, META_PROTO, "MetaHistory", 1); else DBWriteContactSettingByte(NULL, META_PROTO, "MetaHistory", (BYTE)(opt->metahistory ? 1 : 0)); @@ -289,7 +289,7 @@ int Meta_ReadOptions(MetaOptions *opt) { opt->flash_meta_message_icon = (DBGetContactSettingByte(NULL, META_PROTO, "MetaMessageIcon", 1) == 1 ? TRUE : FALSE); opt->copy_userinfo = (DBGetContactSettingByte(NULL, META_PROTO, "CopyUserInfo", 1) == 1 ? TRUE : FALSE); - if(!opt->subcontact_windows) + if (!opt->subcontact_windows) opt->metahistory = TRUE; else opt->metahistory = (DBGetContactSettingByte(NULL, META_PROTO, "MetaHistory", 1) == 1 ? TRUE : FALSE); @@ -340,7 +340,7 @@ ProtoStatusPrio *priorities = 0; int GetRealPriority(char *proto, int status) { char szSetting[256]; - if(!proto) { + if (!proto) { mir_snprintf(szSetting, 256, "DefaultPrio_%d", status); return DBGetContactSettingWord(0, META_PROTO, szSetting, GetDefaultPrio(status)); } else { @@ -401,7 +401,7 @@ void WritePriorities() { current = priorities + (i + 1); for(j = ID_STATUS_OFFLINE; j <= ID_STATUS_OUTTOLUNCH; j++) { mir_snprintf(szSetting, 256, "ProtoPrio_%s%d", pppDesc[i]->szName, j); - if(!current->def[j - ID_STATUS_OFFLINE]) + if (!current->def[j - ID_STATUS_OFFLINE]) DBWriteContactSettingWord(0, META_PROTO, szSetting, (WORD)current->prio[j - ID_STATUS_OFFLINE]); else DBDeleteContactSetting(0, META_PROTO, szSetting); @@ -438,7 +438,7 @@ void SetPriority(int proto_index, int status, BOOL def, int prio) { } else { current = priorities + (proto_index + 1); current->def[status - ID_STATUS_OFFLINE] = def; - if(!def) { + if (!def) { current->prio[status - ID_STATUS_OFFLINE] = prio; } } diff --git a/plugins/MetaContacts/meta_services.c b/plugins/MetaContacts/meta_services.c index bbf9177132..67644af23c 100644 --- a/plugins/MetaContacts/meta_services.c +++ b/plugins/MetaContacts/meta_services.c @@ -90,7 +90,7 @@ INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam) ret = PF1_IM | PF1_CHAT | PF1_FILESEND | PF1_MODEMSGRECV | PF1_NUMERICUSERID; break; case PFLAGNUM_2: - if(!options.suppress_proto) { + if (!options.suppress_proto) { ret = PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE; } @@ -264,7 +264,7 @@ INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam) CCSDATA *ccs = (CCSDATA *) lParam; HANDLE hMeta; - if((hMeta = (HANDLE)DBGetContactSettingDword(ccs->hContact,META_PROTO, "Handle", (DWORD)0)) == (DWORD)0) { + if ((hMeta = (HANDLE)DBGetContactSettingDword(ccs->hContact,META_PROTO, "Handle", (DWORD)0)) == (DWORD)0) { return CallService(MS_PROTO_CHAINSEND, wParam, lParam); // Can't find the MetaID of the metacontact linked to } @@ -336,7 +336,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam) DWORD default_contact_number; - if((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact, let through the stack of protocols // (this should normally not happen, since linked contacts do not appear on the list.) @@ -350,7 +350,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam) most_online = Meta_GetMostOnline(ccs->hContact); //DBEVENTINFO dbei; - if(!most_online) { + if (!most_online) { DWORD dwThreadId; HANDLE hEvent; TFakeAckParams *tfap; @@ -429,7 +429,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) PROTORECVEVENT *pre = (PROTORECVEVENT *) ccs->lParam; HANDLE hMeta; - if((hMeta = (HANDLE)DBGetContactSettingDword(ccs->hContact,META_PROTO, "Handle", (DWORD)0)) == (DWORD)0) { + if ((hMeta = (HANDLE)DBGetContactSettingDword(ccs->hContact,META_PROTO, "Handle", (DWORD)0)) == (DWORD)0) { CallService(MS_PROTO_CHAINRECV, wParam, (LPARAM)ccs); // Can't find the MetaID of the metacontact linked to // this contact, let through the protocol chain return 0; @@ -444,7 +444,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) // if meta disabled (now message api) or window open (message api), or using subcontact windows, // let through but add db event for metacontact history - if(!Meta_IsEnabled() + if (!Meta_IsEnabled() || DBGetContactSettingByte(ccs->hContact, META_PROTO, "WindowOpen", 0) == 1 || options.subcontact_windows) { @@ -494,7 +494,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam) } } - if(!added) { + if (!added) { // otherwise add raw db event ZeroMemory(&dbei, sizeof(dbei)); dbei.cbSize = sizeof(dbei); @@ -571,7 +571,7 @@ INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam) proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0); // contact is not a meta proto contact - just leave it - if(!proto || strcmp(proto, META_PROTO)) { + if (!proto || strcmp(proto, META_PROTO)) { return 0; } @@ -629,7 +629,7 @@ int Meta_HandleACK(WPARAM wParam, LPARAM lParam) return 0; // Can't find the MetaID, let through the protocol chain - if(!strcmp(ack->szModule, META_PROTO)) { + if (!strcmp(ack->szModule, META_PROTO)) { return 0; // don't rebroadcast our own acks } @@ -654,8 +654,8 @@ int Meta_HandleACK(WPARAM wParam, LPARAM lParam) return 0; } - //if(!DBGetContactSetting(AI.hContact, "ContactPhoto", "File", &dbv)) { - if(!DBGetContactSetting(ack->hContact, "ContactPhoto", "File", &dbv)) { + //if (!DBGetContactSetting(AI.hContact, "ContactPhoto", "File", &dbv)) { + if (!DBGetContactSetting(ack->hContact, "ContactPhoto", "File", &dbv)) { DBWriteContactSettingString(hUser, "ContactPhoto", "File", dbv.pszVal); DBFreeVariant(&dbv); } @@ -713,7 +713,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); int meta_id; while ( hContact != NULL ) { - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { Meta_CopyData(hContact); } hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); @@ -734,7 +734,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) // from here on, we're just interested in contact settings if(wParam == 0) return 0; - if((hMeta=(HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",0))!=0 + if ((hMeta=(HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",0))!=0 && CallService(MS_DB_CONTACT_IS, (WPARAM)hMeta, 0)) // just to be safe { // This contact is attached to a MetaContact. @@ -742,9 +742,9 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) contact_number = Meta_GetContactNumber((HANDLE)wParam); if(contact_number == -1) return 0; // exit - db corruption - if(!meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Group") && + if (!meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Group") && Meta_IsEnabled() && DBGetContactSettingByte((HANDLE)wParam, META_PROTO, "Hidden", 0) == 0 && !Miranda_Terminated()) { - if((dcws->value.type == DBVT_ASCIIZ || dcws->value.type == DBVT_UTF8) && !Meta_IsHiddenGroup(dcws->value.pszVal)) { + if ((dcws->value.type == DBVT_ASCIIZ || dcws->value.type == DBVT_UTF8) && !Meta_IsHiddenGroup(dcws->value.pszVal)) { // subcontact group reassigned - copy to saved group MyDBWriteContactSetting((HANDLE)wParam, META_PROTO, "OldCListGroup", &dcws->value); DBWriteContactSettingString((HANDLE)wParam, "CList", "Group", META_HIDDEN_GROUP); @@ -755,7 +755,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) } else // copy IP - if(!strcmp(dcws->szSetting, "IP")) { + if (!strcmp(dcws->szSetting, "IP")) { if(dcws->value.type == DBVT_DWORD) DBWriteContactSettingDword(hMeta, META_PROTO, "IP", dcws->value.dVal); else @@ -763,7 +763,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) } else // copy RealIP - if(!strcmp(dcws->szSetting, "RealIP")) { + if (!strcmp(dcws->szSetting, "RealIP")) { if(dcws->value.type == DBVT_DWORD) DBWriteContactSettingDword(hMeta, META_PROTO, "RealIP", dcws->value.dVal); else @@ -771,7 +771,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) } else // copy ListeningTo - if(!strcmp(dcws->szSetting, "ListeningTo")) { + if (!strcmp(dcws->szSetting, "ListeningTo")) { switch(dcws->value.type) { case DBVT_ASCIIZ: DBWriteContactSettingString(hMeta, META_PROTO, "ListeningTo", dcws->value.pszVal); @@ -788,7 +788,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) } } else - if(!strcmp(dcws->szSetting, "Nick") && !dcws->value.type == DBVT_DELETED) { + if (!strcmp(dcws->szSetting, "Nick") && !dcws->value.type == DBVT_DELETED) { DBVARIANT dbv; HANDLE most_online; @@ -812,21 +812,21 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) return 0; } else - if(!strcmp(dcws->szSetting, "IdleTS")) { + if (!strcmp(dcws->szSetting, "IdleTS")) { if(dcws->value.type == DBVT_DWORD) DBWriteContactSettingDword(hMeta, META_PROTO, "IdleTS", dcws->value.dVal); else if(dcws->value.type == DBVT_DELETED) DBWriteContactSettingDword(hMeta, META_PROTO, "IdleTS", 0); } else - if(!strcmp(dcws->szSetting, "LogonTS")) { + if (!strcmp(dcws->szSetting, "LogonTS")) { if(dcws->value.type == DBVT_DWORD) DBWriteContactSettingDword(hMeta, META_PROTO, "LogonTS", dcws->value.dVal); else if(dcws->value.type == DBVT_DELETED) DBWriteContactSettingDword(hMeta, META_PROTO, "LogonTS", 0); } else - if(!strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "MyHandle")) { + if (!strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "MyHandle")) { HANDLE most_online; if(dcws->value.type == DBVT_DELETED) { @@ -856,7 +856,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) return 0; } else - if(!strcmp(dcws->szSetting, "Status") && !dcws->value.type == DBVT_DELETED) { + if (!strcmp(dcws->szSetting, "Status") && !dcws->value.type == DBVT_DELETED) { // subcontact changing status // update subcontact status setting @@ -869,7 +869,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) DBWriteContactSettingString(hMeta, META_PROTO, buffer, buffer2); // if the contact was forced, unforce it (which updates status) - if((HANDLE)DBGetContactSettingDword(hMeta, META_PROTO, "ForceSend", 0) == (HANDLE)wParam) { + if ((HANDLE)DBGetContactSettingDword(hMeta, META_PROTO, "ForceSend", 0) == (HANDLE)wParam) { MetaAPI_UnforceSendContact((WPARAM)hMeta, 0); } else { // set status to that of most online contact @@ -891,7 +891,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) AI.format = PA_FORMAT_UNKNOWN; strcpy(AI.filename, "X"); - if((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) + if ((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) DBWriteContactSettingString(hMeta, "ContactPhoto", "File",AI.filename); } } else @@ -904,8 +904,8 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) Meta_CopyData(hMeta); } else - if(!meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Hidden")) { - if((dcws->value.type == DBVT_DELETED || DBGetContactSettingByte((HANDLE)wParam, "CList", "Hidden", 0) == 0) + if (!meta_group_hack_disabled && !strcmp(dcws->szModule, "CList") && !strcmp(dcws->szSetting, "Hidden")) { + if ((dcws->value.type == DBVT_DELETED || DBGetContactSettingByte((HANDLE)wParam, "CList", "Hidden", 0) == 0) && DBGetContactSettingByte((HANDLE)wParam, META_PROTO, "Hidden", 0) == 1) { // a subcontact we hid (e.g. jabber) has been unhidden - hide it again :( @@ -982,7 +982,7 @@ INT_PTR Meta_UserIsTyping(WPARAM wParam, LPARAM lParam) HANDLE most_online = Meta_GetMostOnline((HANDLE)wParam); Meta_CopyContactNick((HANDLE)wParam, most_online); - if(!most_online) return 0; + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); if(proto) { @@ -1007,12 +1007,12 @@ int Meta_ContactIsTyping(WPARAM wParam, LPARAM lParam) { HANDLE hMeta; - if((hMeta = (HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",(DWORD)0)) != 0 + if ((hMeta = (HANDLE)DBGetContactSettingDword((HANDLE)wParam,META_PROTO,"Handle",(DWORD)0)) != 0 // check metacontacts enabled && Meta_IsEnabled() ) { // This contact is attached to a MetaContact. - if(!options.subcontact_windows) { // we don't want clicking on the clist notification icon to open the metacontact message window + if (!options.subcontact_windows) { // we don't want clicking on the clist notification icon to open the metacontact message window // try to remove any clist events we added for subcontact CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1); @@ -1052,7 +1052,7 @@ int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) { message_window_api_enabled = TRUE; - if((hMeta = (HANDLE)DBGetContactSettingDword(mwed->hContact, META_PROTO, "Handle", 0)) != 0 + if ((hMeta = (HANDLE)DBGetContactSettingDword(mwed->hContact, META_PROTO, "Handle", 0)) != 0 || DBGetContactSettingDword(mwed->hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1) { // contact is subcontact of metacontact, or an actual metacontact - record whether window is open or closed @@ -1064,7 +1064,7 @@ int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) { } } else if(mwed->uType == MSG_WINDOW_EVT_CLOSE || mwed->uType == MSG_WINDOW_EVT_CLOSING) { DBWriteContactSettingByte(mwed->hContact, META_PROTO, "WindowOpen", 0); - if(!hMeta) { // hMeta is 0 for metacontact (sorry) + if (!hMeta) { // hMeta is 0 for metacontact (sorry) DWORD saved_def; MetaAPI_UnforceSendContact((WPARAM)mwed->hContact, 0); @@ -1152,7 +1152,7 @@ int Meta_CListMW_ExtraIconsApply(WPARAM wParam, LPARAM lParam) { WORD status = DBGetContactSettingWord(most_online_im, proto, "Status", ID_STATUS_OFFLINE); iec.cbSize = sizeof(iec); for(i = 0; i < proto_count; i++) { - if(!strcmp((proto_names + i * 128), proto)) { + if (!strcmp((proto_names + i * 128), proto)) { if(hExtraImage[i * 2 + (status == ID_STATUS_OFFLINE ? 1 : 0)]) { iec.hImage = hExtraImage[i * 2 + (status == ID_STATUS_OFFLINE ? 1 : 0)]; iec.ColumnType = EXTRA_ICON_ADV2; @@ -1186,7 +1186,7 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam) { char buffer[512]; int caps; - if(!most_online) + if (!most_online) return 0; if(options.subcontact_windows) { @@ -1208,7 +1208,7 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam) { // get the contacts messaging capabilities caps = CallService(buffer, (WPARAM)PFLAGNUM_1, 0); - if((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) + if ((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) // let event process normally return 0; else { @@ -1369,7 +1369,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); int meta_id; while ( hContact != NULL ) { - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { Meta_CopyData(hContact); } hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); @@ -1380,7 +1380,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) InitIcons(); - if(!Meta_IsEnabled()) + if (!Meta_IsEnabled()) { // modify main menu item menu.flags = CMIM_NAME; @@ -1464,7 +1464,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) { caps = CallService(buffer, (WPARAM)PFLAGNUM_1, 0); - if((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) { + if ((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) { // set default contact for sending/status and open message window DBWriteContactSettingDword((HANDLE)wParam, META_PROTO, "Default", (DWORD)(int)lParam); NotifyEventHooks(hEventDefaultChanged, wParam, (LPARAM)hContact); @@ -1511,7 +1511,7 @@ INT_PTR Meta_FileResume(WPARAM wParam, LPARAM lParam) DBFreeVariant(&dbv); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); @@ -1547,7 +1547,7 @@ INT_PTR Meta_FileAllow(WPARAM wParam, LPARAM lParam) DBFreeVariant(&dbv); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); @@ -1584,7 +1584,7 @@ INT_PTR Meta_FileDeny(WPARAM wParam, LPARAM lParam) DBFreeVariant(&dbv); - if(!most_online) + if (!most_online) return 1; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); @@ -1621,7 +1621,7 @@ INT_PTR Meta_FileRecv(WPARAM wParam, LPARAM lParam) DBFreeVariant(&dbv); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); @@ -1659,7 +1659,7 @@ int Meta_FileCancel(WPARAM wParam, LPARAM lParam) DBFreeVariant(&dbv); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); @@ -1683,7 +1683,7 @@ INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam) char *proto = 0; DWORD default_contact_number; - if((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact // (this should normally not happen, since linked contacts do not appear on the list.) @@ -1698,7 +1698,7 @@ INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam) most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_FILESEND); - if(!most_online) { + if (!most_online) { //PUShowMessage("no most online for ft", SM_NOTIFY); return 0; } @@ -1728,7 +1728,7 @@ INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) { char *proto = 0; DWORD default_contact_number; - if((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact // (this should normally not happen, since linked contacts do not appear on the list.) @@ -1740,11 +1740,11 @@ INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam) { most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_MODEMSGRECV); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); - if(!proto) return 0; + if (!proto) return 0; //Meta_CopyContactNick(ccs->hContact, most_online, proto); @@ -1761,7 +1761,7 @@ INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) { char *proto = 0; DWORD default_contact_number; - if((default_contact_number = DBGetContactSettingDword(AI->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(AI->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact // (this should normally not happen, since linked contacts do not appear on the list.) @@ -1776,11 +1776,11 @@ INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam) { hMeta = AI->hContact; hSub = Meta_GetMostOnlineSupporting(AI->hContact, PFLAGNUM_4, PF4_AVATARS); - if(!hSub) + if (!hSub) return GAIR_NOAVATAR; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hSub, 0); - if(!proto) return GAIR_NOAVATAR; + if (!proto) return GAIR_NOAVATAR; AI->hContact = hSub; @@ -1797,7 +1797,7 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam) { char *proto = 0; DWORD default_contact_number; - if((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(ccs->hContact,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact // (this should normally not happen, since linked contacts do not appear on the list.) @@ -1811,23 +1811,23 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam) { most_online = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_4, PF4_AVATARS); - if(!most_online) + if (!most_online) return 0; proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)most_online, 0); - if(!proto) return 0; + if (!proto) return 0; AI.cbSize = sizeof(AI); AI.hContact = ccs->hContact; AI.format = PA_FORMAT_UNKNOWN; strcpy(AI.filename, "X"); - if((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) + if ((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) DBWriteContactSettingString(ccs->hContact, "ContactPhoto", "File",AI.filename); most_online = Meta_GetMostOnline(ccs->hContact); Meta_CopyContactNick(ccs->hContact, most_online); - if(!most_online) + if (!most_online) return 0; //Meta_CopyContactNick(ccs->hContact, most_online, proto); diff --git a/plugins/MetaContacts/meta_utils.c b/plugins/MetaContacts/meta_utils.c index 38a9e69f6c..ccee31e2a5 100644 --- a/plugins/MetaContacts/meta_utils.c +++ b/plugins/MetaContacts/meta_utils.c @@ -40,7 +40,7 @@ INT_PTR MyDBGetContactSetting(HANDLE hContact, const char *szModule, const char static BOOL strsvc, strsvcset = FALSE; memset(dbv, 0, sizeof(DBVARIANT)); - if(!strsvcset) {strsvc = ServiceExists(MS_DB_CONTACT_GETSETTING_STR); strsvcset = TRUE;} + if (!strsvcset) {strsvc = ServiceExists(MS_DB_CONTACT_GETSETTING_STR); strsvcset = TRUE;} // preserve unicode strings - this service should return other data types unchanged if(strsvc) return DBGetContactSettingW(hContact, szModule, szSetting, dbv); @@ -70,10 +70,10 @@ int Meta_EqualDBV(DBVARIANT *dbv, DBVARIANT *id) { break; case DBVT_ASCIIZ: case DBVT_UTF8: - if(!strcmp(dbv->pszVal,id->pszVal)) + if (!strcmp(dbv->pszVal,id->pszVal)) return 1; case DBVT_WCHAR: - if(!wcscmp(dbv->pwszVal,id->pwszVal)) + if (!wcscmp(dbv->pwszVal,id->pwszVal)) return 1; case DBVT_BLOB: if(dbv->cpbVal == id->cpbVal) @@ -110,14 +110,14 @@ HANDLE Meta_GetHandle(const char *protocol, DBVARIANT *id) char str[MAXMODULELABELLENGTH]; strcpy(str,protocol); strcat(str,PS_GETCAPS); - if(!ServiceExists(str)) + if (!ServiceExists(str)) return NULL; field = (char *)CallProtoService(protocol,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0); hUser = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); while(hUser) { // Scan the database and retrieve the field for each contact - if(!DBGetContactSetting(hUser,protocol,field,&dbv)) + if (!DBGetContactSetting(hUser,protocol,field,&dbv)) { if(dbv.type == id->type) { // If the id parameter and the value returned by the DBGetContactSetting @@ -140,7 +140,7 @@ HANDLE Meta_GetHandle(const char *protocol, DBVARIANT *id) break; case DBVT_ASCIIZ: case DBVT_UTF8: - if(!strcmp(dbv.pszVal,id->pszVal)) + if (!strcmp(dbv.pszVal,id->pszVal)) { DBFreeVariant(&dbv); return hUser; @@ -151,7 +151,7 @@ HANDLE Meta_GetHandle(const char *protocol, DBVARIANT *id) break; } case DBVT_WCHAR: - if(!wcscmp(dbv.pwszVal,id->pwszVal)) + if (!wcscmp(dbv.pwszVal,id->pwszVal)) { DBFreeVariant(&dbv); return hUser; @@ -177,7 +177,7 @@ HANDLE Meta_GetHandle(const char *protocol, DBVARIANT *id) } // end switch } else DBFreeVariant(&dbv); - } // end if(!DBGetContactSetting(hUser,protocol,field,&dbv)) + } // end if (!DBGetContactSetting(hUser,protocol,field,&dbv)) // This contact wasn't the good one, go to the next. hUser = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hUser,0); } // end while @@ -249,15 +249,15 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default) WORD status; HANDLE most_online; - if((metaID=DBGetContactSettingDword(dest,META_PROTO,META_ID,(DWORD)-1))==-1) { + if ((metaID=DBGetContactSettingDword(dest,META_PROTO,META_ID,(DWORD)-1))==-1) { MessageBox(0, Translate("Could not get MetaContact id"), Translate("Assignment Error"), MB_OK | MB_ICONWARNING); return FALSE; } - if((num_contacts=DBGetContactSettingDword(dest,META_PROTO,"NumContacts",(DWORD)-1))==-1) { + if ((num_contacts=DBGetContactSettingDword(dest,META_PROTO,"NumContacts",(DWORD)-1))==-1) { MessageBox(0, Translate("Could not retreive MetaContact contact count"), Translate("Assignment Error"), MB_OK | MB_ICONWARNING); return FALSE; } - if(!(proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)src,0))) { + if (!(proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)src,0))) { MessageBox(0, Translate("Could not retreive contact protocol"), Translate("Assignment Error"), MB_OK | MB_ICONWARNING); return FALSE; } @@ -309,7 +309,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default) DBFreeVariant(&cws.value); // If we can get the nickname of the subcontact... - if(!DBGetContactSetting(src,proto,"Nick",&cws.value)) { + if (!DBGetContactSetting(src,proto,"Nick",&cws.value)) { // write the nickname strcpy(buffer, "Nick"); strcat(buffer, _itoa((int)(num_contacts - 1), buffer2, 10)); @@ -340,7 +340,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default) DBWriteContactSettingString(dest, META_PROTO, buffer, name); // Get the status - if(!proto) + if (!proto) status = ID_STATUS_OFFLINE; else status = DBGetContactSettingWord(src, proto, "Status", ID_STATUS_OFFLINE); @@ -373,7 +373,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default) // Add the MetaContactFilter module to the old contact to intercept messages and forward to the new // metacontact - if( !CallService( MS_PROTO_ISPROTOONCONTACT, (WPARAM)src, ( LPARAM )META_FILTER )) + if ( !CallService( MS_PROTO_ISPROTOONCONTACT, (WPARAM)src, ( LPARAM )META_FILTER )) CallService( MS_PROTO_ADDTOCONTACT, (WPARAM)src, ( LPARAM )META_FILTER ); // Write the link in the contact @@ -423,7 +423,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default) AI.format = PA_FORMAT_UNKNOWN; strcpy(AI.filename, "X"); - if((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) + if ((int)CallProtoService(META_PROTO, PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS) DBWriteContactSettingString(dest, "ContactPhoto", "File",AI.filename); } @@ -469,7 +469,7 @@ HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long ca char *proto, *most_online_proto; // you can't get more online than having the default contact ONLINE - so check that first - if((default_contact_number = DBGetContactSettingDword(hMeta,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) + if ((default_contact_number = DBGetContactSettingDword(hMeta,META_PROTO,"Default",(DWORD)-1)) == (DWORD)-1) { // This is a simple contact - return NULL to signify error. // (this should normally not happen, since all meta contacts have a default contact) @@ -489,7 +489,7 @@ HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long ca return most_online_contact; // a subcontact is being temporarily 'forced' to do sending - if((most_online_contact = (HANDLE)DBGetContactSettingDword(hMeta, META_PROTO, "ForceSend", 0))) { + if ((most_online_contact = (HANDLE)DBGetContactSettingDword(hMeta, META_PROTO, "ForceSend", 0))) { caps = proto ? CallProtoService(proto, PS_GETCAPS, (WPARAM)pflagnum, 0) : 0; if(proto && strcmp(proto, "IRC") == 0) caps |= PF1_IM; if(proto && (caps & capability) == capability && capability != 0) // capability is 0 when we're working out status @@ -523,7 +523,7 @@ HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long ca hContact = Meta_GetContactHandle(hMeta, i); proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!proto || CallProtoService(proto, PS_GETSTATUS, 0, 0) < ID_STATUS_ONLINE) // proto offline or connecting + if (!proto || CallProtoService(proto, PS_GETSTATUS, 0, 0) < ID_STATUS_ONLINE) // proto offline or connecting continue; caps = proto ? CallProtoService(proto, PS_GETCAPS, (WPARAM)pflagnum, 0) : 0; @@ -611,9 +611,9 @@ BOOL dbv_same(DBVARIANT *dbv1, DBVARIANT *dbv2) { hContact = Meta_GetContactHandle(hMeta, j); if(hContact) { - if(!module) { + if (!module) { used_mod = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); - if(!used_mod) continue; // next contact + if (!used_mod) continue; // next contact } else used_mod = module; @@ -627,14 +627,14 @@ BOOL dbv_same(DBVARIANT *dbv1, DBVARIANT *dbv2) { if(strcmp(settings[i], "MirVer") == 0) { if(DBGetContactSettingWord(hContact, used_mod, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) { - if(!free || (dbv1.pszVal == NULL || strcmp(dbv1.pszVal, "") == 0 || strlen(dbv1.pszVal) < 2)) { + if (!free || (dbv1.pszVal == NULL || strcmp(dbv1.pszVal, "") == 0 || strlen(dbv1.pszVal) < 2)) { MyDBWriteContactSetting(hMeta, (module ? used_mod : META_PROTO), settings[i], &dbv2); bDataWritten = TRUE; //only break if found something to copy } } } else { - if(!free || !dbv_same(&dbv1, &dbv2)) { + if (!free || !dbv_same(&dbv1, &dbv2)) { MyDBWriteContactSetting(hMeta, (module ? used_mod : META_PROTO), settings[i], &dbv2); if(dbv2.type == DBVT_ASCIIZ || dbv2.type == DBVT_UTF8) { if(dbv2.pszVal != NULL && strcmp(dbv2.pszVal, "") != 0) @@ -706,21 +706,21 @@ void CopyStatusData(HANDLE hMeta) { proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); if(proto && DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE) == status) { - if(!bDoneStatus && !MyDBGetContactSetting(hContact, "CList", "StatusMsg", &dbv)) { + if (!bDoneStatus && !MyDBGetContactSetting(hContact, "CList", "StatusMsg", &dbv)) { MyDBWriteContactSetting(hMeta, "CList", "StatusMsg", &dbv); DBFreeVariant(&dbv); bDoneStatus = TRUE; } - if((!bDoneXStatus) && (!MyDBGetContactSetting(hContact, proto, "XStatusId", &dbv)) && dbv.type != DBVT_DELETED) { + if ((!bDoneXStatus) && (!MyDBGetContactSetting(hContact, proto, "XStatusId", &dbv)) && dbv.type != DBVT_DELETED) { DBWriteContactSettingString(hMeta, META_PROTO, "XStatusProto", proto); MyDBWriteContactSetting(hMeta, META_PROTO, "XStatusId", &dbv); DBFreeVariant(&dbv); - if(!MyDBGetContactSetting(hContact, proto, "XStatusMsg", &dbv)) { + if (!MyDBGetContactSetting(hContact, proto, "XStatusMsg", &dbv)) { MyDBWriteContactSetting(hMeta, META_PROTO, "XStatusMsg", &dbv); DBFreeVariant(&dbv); } - if(!MyDBGetContactSetting(hContact, proto, "XStatusName", &dbv)) { + if (!MyDBGetContactSetting(hContact, proto, "XStatusName", &dbv)) { MyDBWriteContactSetting(hMeta, META_PROTO, "XStatusName", &dbv); DBFreeVariant(&dbv); } @@ -731,8 +731,8 @@ void CopyStatusData(HANDLE hMeta) { if(bDoneStatus && bDoneXStatus) break; } - if(!bDoneStatus) DBDeleteContactSetting(hMeta, "CList", "StatusMsg"); - if(!bDoneXStatus) { + if (!bDoneStatus) DBDeleteContactSetting(hMeta, "CList", "StatusMsg"); + if (!bDoneXStatus) { DBDeleteContactSetting(hMeta, META_PROTO, "XStatusId"); DBDeleteContactSetting(hMeta, META_PROTO, "XStatusMsg"); DBDeleteContactSetting(hMeta, META_PROTO, "XStatusName"); @@ -773,7 +773,7 @@ int Meta_SetHandles(void) { BOOL found; while ( hContact != NULL ) { - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_LINK,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_LINK,(DWORD)-1))!=(DWORD)-1) { // is a subcontact // get nick for debug messages @@ -837,7 +837,7 @@ int Meta_SetHandles(void) { hContact2 = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact2, 0 ); } - if(!found) { + if (!found) { // problem - subcontact's meta not found MessageBox(0, "Subcontact's MetaContact not found - deleting MetaContact data", nick_buffer, MB_OK | MB_ICONERROR); @@ -855,14 +855,14 @@ int Meta_SetHandles(void) { CallService(MS_IGNORE_UNIGNORE, (WPARAM)hContact, (WPARAM)IGNOREEVENT_USERONLINE); } else { - if(!DBGetContactSettingByte(hContact, META_PROTO, "IsSubcontact", 0)) + if (!DBGetContactSettingByte(hContact, META_PROTO, "IsSubcontact", 0)) DBWriteContactSettingByte(hContact, META_PROTO, "IsSubcontact", 1); } } else DBDeleteContactSetting(hContact, META_PROTO, "Handle"); - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { // is a metacontact // get nick for debug messages @@ -905,7 +905,7 @@ int Meta_SetHandles(void) { // loop through one more time - check contact counts match hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); while ( hContact != NULL ) { - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_ID,(DWORD)-1))!=(DWORD)-1) { // get nick for debug messages strcpy(nick_buffer, Translate("MetaId: ")); strcat(nick_buffer, _itoa(meta_id, buffer2, 10)); @@ -948,7 +948,7 @@ int Meta_HideLinkedContacts(void) { // ensure the hidden group does not exist (how this occurs i wonder but there have been reports!) // (sometimes protocol server side groups are to blame - msn and icq) - if(!meta_group_hack_disabled) do { + if (!meta_group_hack_disabled) do { group_name = (char *)CallService(MS_CLIST_GROUPGETNAME, (WPARAM)hGroup, 0); if(group_name && !strcmp(group_name, META_HIDDEN_GROUP)) { // disabled because it shows a message box @@ -967,11 +967,11 @@ int Meta_HideLinkedContacts(void) { while ( hContact != NULL ) { - if((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_LINK,(DWORD)-1))!=(DWORD)-1) { + if ((meta_id = DBGetContactSettingDword(hContact,META_PROTO,META_LINK,(DWORD)-1))!=(DWORD)-1) { // is a subcontact // * ensure filter present - if( !CallService( MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, ( LPARAM )META_FILTER )) + if ( !CallService( MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, ( LPARAM )META_FILTER )) CallService( MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, ( LPARAM )META_FILTER ); @@ -992,7 +992,7 @@ int Meta_HideLinkedContacts(void) { num_contacts = DBGetContactSettingDword(hContact2, META_PROTO, "NumContacts", (DWORD)-1); if(contact_number >= 0 && contact_number < num_contacts) { - if(!proto) + if (!proto) status = ID_STATUS_OFFLINE; else status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE); @@ -1019,7 +1019,7 @@ int Meta_HideLinkedContacts(void) { DBFreeVariant(&dbv); } else { - if(!DBGetContactSetting(hContact, "CList", "MyHandle", &dbv)) { + if (!DBGetContactSetting(hContact, "CList", "MyHandle", &dbv)) { strcpy(buffer, "CListName"); strcat(buffer, _itoa(contact_number, buffer2, 10)); MyDBWriteContactSetting(hContact2, META_PROTO, buffer, &dbv); @@ -1074,7 +1074,7 @@ int Meta_UnhideLinkedContacts(void) { hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); } - if(!CallService(MS_SYSTEM_TERMINATED, 0, 0)) + if (!CallService(MS_SYSTEM_TERMINATED, 0, 0)) CallService(MS_CLUI_SORTLIST, 0, 0); return 0; } @@ -1107,7 +1107,7 @@ int Meta_HideMetaContacts(int hide) { hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); } - if(!CallService(MS_SYSTEM_TERMINATED, 0, 0)) + if (!CallService(MS_SYSTEM_TERMINATED, 0, 0)) CallService(MS_CLUI_SORTLIST, 0, 0); return 0; } @@ -1131,9 +1131,9 @@ void Meta_RestoreGroup(HANDLE hContact) { } else { DBCONTACTWRITESETTING cws; - if(!DBGetContactSetting(hContact, META_PROTO, "OldCListGroup", &cws.value)) { + if (!DBGetContactSetting(hContact, META_PROTO, "OldCListGroup", &cws.value)) { - if((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { + if ((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { DBDeleteContactSetting(hContact, "CList", "Group"); } else { int hGroup = 1; @@ -1168,8 +1168,8 @@ void Meta_RestoreGroup(HANDLE hContact) { } DBDeleteContactSetting(hContact, META_PROTO, "OldCListGroup"); - if(!DBGetContactSetting(hContact, "CList", "Group", &cws.value)) { - if((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { + if (!DBGetContactSetting(hContact, "CList", "Group", &cws.value)) { + if ((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { DBDeleteContactSetting(hContact, "CList", "Group"); } DBFreeVariant(&cws.value); @@ -1200,8 +1200,8 @@ void Meta_SetGroup(HANDLE hContact) { } else { DBCONTACTWRITESETTING cws; // save old group and move to invisible group (i.e. non-existent group) - if(!MyDBGetContactSetting(hContact, "CList", "Group", &cws.value)) { - if((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { + if (!MyDBGetContactSetting(hContact, "CList", "Group", &cws.value)) { + if ((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) { // it's already in the group (shouldn't be - but maybe a crash) } else { cws.szModule = META_PROTO; @@ -1283,15 +1283,15 @@ int Meta_CopyContactNick(HANDLE hMeta, HANDLE hContact) { hContact = Meta_GetContactHandle(hMeta, 0); } - if(!hContact) return 1; + if (!hContact) return 1; //proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); // read proto direct from db, since we do this on load and other proto plugins may not be loaded yet - if(!DBGetContactSetting(hContact, "Protocol", "p", &dbv_proto)) { + if (!DBGetContactSetting(hContact, "Protocol", "p", &dbv_proto)) { proto = dbv_proto.pszVal; if(options.clist_contact_name == CNNT_NICK && proto) { - if(!MyDBGetContactSetting(hContact, proto, "Nick", &dbv)) { + if (!MyDBGetContactSetting(hContact, proto, "Nick", &dbv)) { MyDBWriteContactSetting(hMeta, META_PROTO, "Nick", &dbv); DBFreeVariant(&dbv); //CallService(MS_CLIST_INVALIDATEDISPLAYNAME, (WPARAM)hMeta, 0); @@ -1518,7 +1518,7 @@ void copyHistory(HANDLE hContactFrom,HANDLE hContactTo) if (!hContactFrom || !hContactTo) return; //id = Meta_GetUniqueIdentifier(hContactFrom, &id_length); - //if(!id) return; + //if (!id) return; progress_dialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, DlgProcNull); ShowWindow(progress_dialog, SW_SHOW); @@ -1534,7 +1534,7 @@ void copyHistory(HANDLE hContactFrom,HANDLE hContactTo) ZeroMemory(&dbei, sizeof(dbei)); dbei.cbSize = sizeof(dbei); - if((dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0)) == -1) + if ((dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0)) == -1) break; buffer = mir_realloc(buffer, dbei.cbBlob);// + id_length); @@ -1584,7 +1584,7 @@ void Meta_RemoveHistory(HANDLE hContactRemoveFrom, HANDLE hContactSource) { if (!hContactRemoveFrom || !hContactSource) return; id = Meta_GetUniqueIdentifier(hContactSource, &id_length); - if(!id) return; + if (!id) return; progress_dialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DELPROGRESS), 0, DlgProcNull); ShowWindow(progress_dialog, SW_SHOW); @@ -1599,7 +1599,7 @@ void Meta_RemoveHistory(HANDLE hContactRemoveFrom, HANDLE hContactSource) { ZeroMemory(&dbei, sizeof(dbei)); dbei.cbSize = sizeof(dbei); - if((dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0)) == -1) { + if ((dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0)) == -1) { break; } @@ -1650,7 +1650,7 @@ char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused) { id = (char *)mir_alloc(256); - if(!proto) return 0; + if (!proto) return 0; strncpy(id, proto, 127); strcat(id, "*"); // seperate proto & proto id with asterisk to make one long comparable string @@ -1658,7 +1658,7 @@ char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused) { used = strlen(id); field = (char *)CallProtoService(proto,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0); - if(!field) return 0; + if (!field) return 0; DBGetContactSetting(hContact,proto,field,&dbv); switch(dbv.type) @@ -1683,7 +1683,7 @@ char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused) { strncpy(id + used, buff, 256 - used); if(used) { *pused = (DWORD)(used + strlen(buff) + 1); - if(*pused > 256) *pused = 256; + if (*pused > 256) *pused = 256; } return id; diff --git a/plugins/MirOTR/MirOTR/dbfilter.cpp b/plugins/MirOTR/MirOTR/dbfilter.cpp index bfc2f80e9d..aab60e18e5 100644 --- a/plugins/MirOTR/MirOTR/dbfilter.cpp +++ b/plugins/MirOTR/MirOTR/dbfilter.cpp @@ -25,7 +25,7 @@ VOID CALLBACK DeleteTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi next = DeleteEvents.first; while (current = next) { if (difftime(time(0), current->timestamp) < 1) break; - if(!CallService(MS_DB_EVENT_GET, (WPARAM)current->hDbEvent, (LPARAM)&info)) // && info.flags&DBEF_READ) + if (!CallService(MS_DB_EVENT_GET, (WPARAM)current->hDbEvent, (LPARAM)&info)) // && info.flags&DBEF_READ) { CallService(MS_DB_EVENT_DELETE, (WPARAM)current->hContact, (LPARAM)current->hDbEvent); next = current->next; @@ -44,7 +44,7 @@ VOID CALLBACK DeleteTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi // add prefix to sent messages int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) { - if(!options.prefix_messages || !lParam) return 0; + if (!options.prefix_messages || !lParam) return 0; HANDLE hContact = (HANDLE)wParam; DBEVENTINFO *dbei = (DBEVENTINFO *)lParam; if ((dbei->eventType != EVENTTYPE_MESSAGE) || !(dbei->flags & DBEF_SENT) || (dbei->flags & DBEF_OTR_PREFIXED)) @@ -53,21 +53,21 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) { return 0; // just to be safe const char *proto = contact_get_proto(hContact); - if(!proto ) return 0; + if (!proto ) return 0; if (DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) == 1) return 0; if(g_metaproto && strcmp(proto, g_metaproto) == 0) { hContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); - if(!hContact) return 0; + if (!hContact) return 0; proto = contact_get_proto(hContact); - if(!proto ) return 0; + if (!proto ) return 0; } ConnContext *context = otrl_context_find_miranda(otr_user_state, hContact); bool encrypted = otr_context_get_trust(context) != TRUST_NOT_PRIVATE; - if(!encrypted) return 0; + if (!encrypted) return 0; DBEVENTINFO my_dbei = *dbei; // copy the other event @@ -178,7 +178,7 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) { } int OnDatabaseEventAdded(WPARAM wParam, LPARAM lParam) { - if(!options.delete_history) return 0; + if (!options.delete_history) return 0; DBEVENTINFO info = {0}; info.cbSize = sizeof(info); @@ -189,7 +189,7 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) { static DWORD len = strlen(prefix); info.cbBlob = lenutf*2; info.pBlob = (PBYTE)mir_alloc(info.cbBlob); - if(!CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&info)) { + if (!CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&info)) { if(info.eventType == EVENTTYPE_MESSAGE) { HANDLE hContact = (HANDLE)wParam, hSub; if(options.bHaveMetaContacts && (hSub = (HANDLE)CallService @@ -249,13 +249,13 @@ int WindowEvent(WPARAM wParam, LPARAM lParam) { } if(mwd->uType != MSG_WINDOW_EVT_OPEN) return 0; - if(!options.bHaveSRMMIcons) return 0; + if (!options.bHaveSRMMIcons) return 0; HANDLE hContact = mwd->hContact, hTemp; if(options.bHaveMetaContacts && (hTemp = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0) hContact = hTemp; - if(!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME)) + if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME)) return 0; lib_cs_lock(); diff --git a/plugins/MirOTR/MirOTR/entities.cpp b/plugins/MirOTR/MirOTR/entities.cpp index ce11fe3bec..ae2335bc01 100644 --- a/plugins/MirOTR/MirOTR/entities.cpp +++ b/plugins/MirOTR/MirOTR/entities.cpp @@ -327,7 +327,7 @@ static _Bool parse_entity(const char *current, char **to, const char **from, size_t maxlen) { const char *end = (const char *)memchr(current, ';', maxlen); - if(!end) return 0; + if (!end) return 0; if(current[1] == '#') { @@ -367,7 +367,7 @@ static _Bool parse_entity(const char *current, char **to, size_t decode_html_entities_utf8(char *dest, const char *src, size_t len) { - if(!src) src = dest; + if (!src) src = dest; char *to = dest; const char *from = src; diff --git a/plugins/MirOTR/MirOTR/options.cpp b/plugins/MirOTR/MirOTR/options.cpp index 1109a8fffd..f8d1dba7a1 100644 --- a/plugins/MirOTR/MirOTR/options.cpp +++ b/plugins/MirOTR/MirOTR/options.cpp @@ -88,7 +88,7 @@ void LoadOptions() { options.autoshow_verify = (DBGetContactSettingByte(0, MODULENAME, "AutoShowVerify", 1) == 1); DBVARIANT dbv; - if(!DBGetContactSettingUTF8String(0, MODULENAME, "Prefix", &dbv)) { + if (!DBGetContactSettingUTF8String(0, MODULENAME, "Prefix", &dbv)) { strncpy(options.prefix, dbv.pszVal, OPTIONS_PREFIXLEN); options.prefix[OPTIONS_PREFIXLEN-1] = 0; DBFreeVariant(&dbv); diff --git a/plugins/MirOTR/MirOTR/otr.cpp b/plugins/MirOTR/MirOTR/otr.cpp index c094314d56..dfc5575fa4 100644 --- a/plugins/MirOTR/MirOTR/otr.cpp +++ b/plugins/MirOTR/MirOTR/otr.cpp @@ -268,7 +268,7 @@ extern "C" { TCHAR buff[512]; mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT((HANDLE)opdata)); //MessageBox(0, buff, Translate("OTR Information"), MB_OK); - if(!Miranda_Terminated()) { + if (!Miranda_Terminated()) { ShowMessage((HANDLE)opdata, buff); } @@ -283,7 +283,7 @@ extern "C" { TrustLevel trusted = otr_context_get_trust(context); SetEncryptionStatus((HANDLE)opdata, trusted); TCHAR buff[1024]; - if(!is_reply) { + if (!is_reply) { if(trusted == TRUST_PRIVATE) { mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_CONTINUE_OTR), contact_get_nameT((HANDLE)opdata)); } else if (trusted == TRUST_UNVERIFIED) { diff --git a/plugins/MirOTR/MirOTR/svcs_menu.cpp b/plugins/MirOTR/MirOTR/svcs_menu.cpp index 83ef6cd660..712ea4d5b6 100644 --- a/plugins/MirOTR/MirOTR/svcs_menu.cpp +++ b/plugins/MirOTR/MirOTR/svcs_menu.cpp @@ -9,9 +9,9 @@ HANDLE hMenuBuildEvent, hStopItem, hStartItem; int StartOTR(HANDLE hContact) { const char *proto = contact_get_proto(hContact); - if(!proto) return 1; // error + if (!proto) return 1; // error char *uname = contact_get_id(hContact); - if(!uname) return 1; // error + if (!uname) return 1; // error DWORD pol = DBGetContactSettingDword(hContact, MODULENAME, "Policy", CONTACT_DEFAULT_POLICY); if(pol == CONTACT_DEFAULT_POLICY) pol = options.default_policy; @@ -74,9 +74,9 @@ int otr_disconnect_contact(HANDLE hContact) { } const char *proto = contact_get_proto(hContact); - if(!proto) return 1; // error + if (!proto) return 1; // error char *uname = contact_get_id(hContact); - if(!uname) return 1; // error + if (!uname) return 1; // error lib_cs_lock(); otrl_message_disconnect(otr_user_state, &ops, hContact, proto, proto, uname); @@ -164,14 +164,14 @@ int SVC_PrebuildContactMenu(WPARAM wParam, LPARAM lParam) { const char *proto = contact_get_proto(hContact); DWORD pol = CONTACT_DEFAULT_POLICY; - if(!proto || DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) == 1) { + if (!proto || DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) == 1) { goto hide_all; } if(proto && g_metaproto && strcmp(proto, g_metaproto) == 0) { // make menu act as per most online subcontact hContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); - if(!hContact) + if (!hContact) goto hide_all; proto = contact_get_proto(hContact); } diff --git a/plugins/MirOTR/MirOTR/svcs_proto.cpp b/plugins/MirOTR/MirOTR/svcs_proto.cpp index 5ea6055908..89f2473597 100644 --- a/plugins/MirOTR/MirOTR/svcs_proto.cpp +++ b/plugins/MirOTR/MirOTR/svcs_proto.cpp @@ -9,7 +9,7 @@ //TODO: Social-Millionaire-Dialoge INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){ - if(!lParam) return 0; + if (!lParam) return 0; CCSDATA *ccs = (CCSDATA *) lParam; @@ -21,7 +21,7 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){ char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0); if(proto && g_metaproto && strcmp(proto, g_metaproto) == 0) // bypass for metacontacts return CallService(MS_PROTO_CHAINSEND, wParam, lParam); - if(!proto || !ccs->hContact) return 1; // error + if (!proto || !ccs->hContact) return 1; // error gcry_error_t err; char *newmessage = 0; @@ -40,7 +40,7 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){ } else { oldmessage_utf = mir_utf8encode(oldmessage); } - if(!oldmessage_utf) return 1; + if (!oldmessage_utf) return 1; // don't filter OTR messages being sent (OTR messages should only happen *after* the otrl_message_sending call below) if(strncmp(oldmessage_utf, "?OTR", 4) == 0) { @@ -128,7 +128,7 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){ } INT_PTR SVC_OTRSendMessageW(WPARAM wParam, LPARAM lParam){ - if(!lParam) return 0; + if (!lParam) return 0; CCSDATA *ccs = (CCSDATA *) lParam; if (!(ccs->wParam & PREF_UTF)) ccs->wParam |= PREF_UNICODE; @@ -159,7 +159,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){ } char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0); - if(!proto) + if (!proto) return 1; //error else if(proto && g_metaproto && strcmp(proto, g_metaproto) == 0) // bypass for metacontacts return CallService(MS_PROTO_CHAINRECV, wParam, lParam); @@ -176,7 +176,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){ } else { oldmessage_utf = mir_utf8encode(oldmessage); } - if(!oldmessage_utf) return 1; + if (!oldmessage_utf) return 1; char *newmessage = NULL; @@ -194,7 +194,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){ lib_cs_unlock(); mir_free(uname); - if( !(pre->flags & PREF_UTF)) mir_free(oldmessage_utf); + if ( !(pre->flags & PREF_UTF)) mir_free(oldmessage_utf); oldmessage_utf = NULL; diff --git a/plugins/MirOTR/MirOTR/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/svcs_srmm.cpp index e37ee9db51..fbc2797178 100644 --- a/plugins/MirOTR/MirOTR/svcs_srmm.cpp +++ b/plugins/MirOTR/MirOTR/svcs_srmm.cpp @@ -14,13 +14,13 @@ BBButton OTRButton; // } // // if(mwd->uType != MSG_WINDOW_EVT_OPEN) return 0; -// if(!options.bHaveSRMMIcons) return 0; +// if (!options.bHaveSRMMIcons) return 0; // // HANDLE hContact = mwd->hContact, hTemp; // if(options.bHaveMetaContacts && (hTemp = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0)) != 0) // hContact = hTemp; // -// if(!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME)) +// if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULENAME)) // return 0; // // lib_cs_lock(); @@ -148,7 +148,7 @@ void SetEncryptionStatus(HANDLE hContact, TrustLevel level) { char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); bool chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0)); - // if(!chat_room) DBWriteContactSettingByte(hContact, MODULENAME, "Encrypted", (encrypted ? 1 : 0)); + // if (!chat_room) DBWriteContactSettingByte(hContact, MODULENAME, "Encrypted", (encrypted ? 1 : 0)); if(options.bHaveSRMMIcons || options.bHaveButtonsBar) { //strcat(dbg_msg, "\nchanging icon"); @@ -197,7 +197,7 @@ void SetEncryptionStatus(HANDLE hContact, TrustLevel level) { if (options.bHaveButtonsBar) CallService(MS_BB_SETBUTTONSTATE, (WPARAM)hContact, (LPARAM)&button); db_dword_set(hContact, MODULENAME, "TrustLevel", level); - if(!chat_room && options.bHaveMetaContacts) { + if (!chat_room && options.bHaveMetaContacts) { HANDLE hMeta = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); HANDLE hMostOnline = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hMeta, 0); if(hMeta && hContact == hMostOnline) { diff --git a/plugins/MirOTR/MirOTR/utils.cpp b/plugins/MirOTR/MirOTR/utils.cpp index 3d3a50506e..2b592742d4 100644 --- a/plugins/MirOTR/MirOTR/utils.cpp +++ b/plugins/MirOTR/MirOTR/utils.cpp @@ -370,7 +370,7 @@ bool GetEncryptionStatus(HANDLE hContact) { char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0); bool chat_room = (proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0)); - if(!chat_room) { + if (!chat_room) { if (options.bHaveMetaContacts) { HANDLE hMeta = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); if(hMeta && hContact == (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hMeta, 0)) { diff --git a/plugins/MirOTR/ekhtml/include/ekhtml_private.h b/plugins/MirOTR/ekhtml/include/ekhtml_private.h index 47d31282fa..90d99caeb2 100644 --- a/plugins/MirOTR/ekhtml/include/ekhtml_private.h +++ b/plugins/MirOTR/ekhtml/include/ekhtml_private.h @@ -150,8 +150,8 @@ char *ekhtml_find_notcharsmap(const char *buf, int len, { const char *endp = buf + len; - for(;bufnalloced + EKHTML_BLOCKSIZE; - if((newbuf = realloc(parser->buf, newsize)) == NULL){ + if ((newbuf = realloc(parser->buf, newsize)) == NULL){ fprintf(stderr, "BAD! Can't allocate %d bytes in ekhtml_buffer_grow\n", newsize); fflush(stderr); /* Just in case someone changes the buffering scheme */ @@ -119,7 +119,7 @@ int parser_state_determine(const char *startp, const char *endp){ assert(startp != endp); - if(*startp != '<') + if (*startp != '<') return EKHTML_STATE_INDATA; firstchar = startp + 1; @@ -130,7 +130,7 @@ int parser_state_determine(const char *startp, const char *endp){ if(newstate == EKHTML_STATE_NONE){ if(firstchar + 2 >= endp) /* Not enough data to evaluate */ return EKHTML_STATE_NONE; - if(*(firstchar + 1) == '-' && *(firstchar + 2) == '-') + if (*(firstchar + 1) == '-' && *(firstchar + 2) == '-') return EKHTML_STATE_COMMENT; else return EKHTML_STATE_SPECIAL; @@ -238,7 +238,7 @@ void ekhtml_parser_feed(ekhtml_parser_t *parser, ekhtml_string_t *str){ parser->nbuf += tocopy; if(parser->nalloced == parser->nbuf){ /* Process the buffer */ - if(!ekhtml_parser_flush(parser, 0)){ + if (!ekhtml_parser_flush(parser, 0)) { /* If we didn't actually process anything, grow our buffer */ ekhtml_buffer_grow(parser); } @@ -270,7 +270,7 @@ ekhtml_parser_startendcb_add(ekhtml_parser_t *parser, const char *tag, unsigned int taglen; hnode_t *hn; - if(!tag){ + if (!tag){ if(isStart) parser->startcb_unk = startcb; else @@ -289,7 +289,7 @@ ekhtml_parser_startendcb_add(ekhtml_parser_t *parser, const char *tag, lookup_str.str = newtag; lookup_str.len = taglen; - if((hn = hash_lookup(parser->startendcb, &lookup_str))){ + if ((hn = hash_lookup(parser->startendcb, &lookup_str))) { cont = hnode_get(hn); free(newtag); if(isStart) @@ -333,7 +333,7 @@ static hash_val_t ekhtml_string_hash(const void *key){ size_t len = s->len; int c; - while(len--){ + while(len--) { c = str[len]; res = ((res << 5) + res) + c; /* res * 33 + c */ } @@ -353,7 +353,7 @@ void ekhtml_parser_destroy(ekhtml_parser_t *ekparser){ hscan_t hs; hash_scan_begin(&hs, ekparser->startendcb); - while((hn = hash_scan_next(&hs))){ + while((hn = hash_scan_next(&hs))) { ekhtml_string_t *key = (ekhtml_string_t *)hnode_getkey(hn); ekhtml_tag_container *cont = hnode_get(hn); diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_comment.c b/plugins/MirOTR/ekhtml/src/ekhtml_comment.c index e37cc487b5..11c4e8cf2e 100644 --- a/plugins/MirOTR/ekhtml/src/ekhtml_comment.c +++ b/plugins/MirOTR/ekhtml/src/ekhtml_comment.c @@ -66,22 +66,22 @@ char *ekhtml_parse_comment(ekhtml_parser_t *parser, void **state_data, if(comstate->dashes == 0){ /* Still on the quest for the double dash*/ /* XXX -- Searching for '--' could be faster, doing multibyte searching, or something similar */ - for(; workp < endp - 1; workp += 2){ - if(*workp == '-') + for (; workp < endp - 1; workp += 2){ + if (*workp == '-') break; } - if(!(workp < endp - 1)){ + if (!(workp < endp - 1)) { *offset = endp - 1 - curp; return NULL; } - if((*(workp - 1) == '-') && + if ((*(workp - 1) == '-') && (workp - curp) > (sizeof("