Fix: more warnings

Patch by XhmikosR

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1354 10f7b99b-c216-0410-bff0-8a66a9350fd8

17 files changed, 122 insertions, 90 deletions

diff --git a/src/apps/mplayerc/Struct.h b/src/apps/mplayerc/Struct.h
index 3c19b5c89..695d4fd77 100644
--- a/src/apps/mplayerc/Struct.h
+++ b/src/apps/mplayerc/Struct.h
@@ -19,7 +19,7 @@
 typedef LONG NTSTATUS, *PNTSTATUS;

 typedef LONG KPRIORITY;

 

-#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0)

+//#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0)

 

 typedef void (CALLBACK *PKNORMAL_ROUTINE)(PVOID, PVOID, PVOID);

 

diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index 10a7a8441..b154c0383 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -78,6 +78,7 @@
 				AdditionalLibraryDirectories="..\..\..\lib;..\..\..\lib\wm7;..\..\..\lib\qt6;..\..\..\lib\detours;..\..\..\lib\lglcd;..\..\..\lib\dx"

 				IgnoreDefaultLibraryNames="MSVCRT"

 				DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"

+				GenerateDebugInformation="false"

 				SubSystem="2"

 				LargeAddressAware="2"

 				RandomizedBaseAddress="1"

@@ -168,6 +169,7 @@
 				AdditionalLibraryDirectories="..\..\..\lib64;..\..\..\lib64\lglcd;..\..\..\lib64\detours;..\..\..\lib64\dx"

 				IgnoreDefaultLibraryNames=""

 				DelayLoadDLLs="d3d9.dll;gdiplus.dll;psapi.dll"

+				GenerateDebugInformation="false"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj
index 736586cb8..955143090 100644
--- a/src/decss/decss.vcproj
+++ b/src/decss/decss.vcproj
@@ -176,6 +176,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -235,6 +236,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/dsutil/dsutil.vcproj b/src/dsutil/dsutil.vcproj
index 3ee9a62c4..e2b84bb84 100644
--- a/src/dsutil/dsutil.vcproj
+++ b/src/dsutil/dsutil.vcproj
@@ -180,6 +180,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221 /IGNORE:4006"

 				AdditionalDependencies="vfw32.lib Version.lib"

 				OutputFile="..\..\lib\$(ProjectName)RU.lib"

 			/>

@@ -241,6 +242,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221 /IGNORE:4006"

 				AdditionalDependencies="vfw32.lib Version.lib"

 				OutputFile="..\..\lib64\$(ProjectName)RU.lib"

 			/>

diff --git a/src/filters/muxer/wavdest/wavdest.vcproj b/src/filters/muxer/wavdest/wavdest.vcproj
index 61bf47bb5..e9a4624eb 100644
--- a/src/filters/muxer/wavdest/wavdest.vcproj
+++ b/src/filters/muxer/wavdest/wavdest.vcproj
@@ -177,6 +177,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -237,6 +238,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/parser/mp4splitter/MP4Splitter.vcproj b/src/filters/parser/mp4splitter/MP4Splitter.vcproj
index df3539b68..8720d4e14 100644
--- a/src/filters/parser/mp4splitter/MP4Splitter.vcproj
+++ b/src/filters/parser/mp4splitter/MP4Splitter.vcproj
@@ -179,6 +179,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -240,6 +241,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
index ac23eba73..5a32cd1ee 100644
--- a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
+++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
@@ -181,6 +181,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="basesplitterRU.lib basevideofilterRU.lib"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib"

@@ -243,6 +244,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="basesplitterRU.lib basevideofilterRU.lib"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

diff --git a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
index 080e7bed5..2c467c477 100644
--- a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
+++ b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
@@ -177,6 +177,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -237,6 +238,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/reader/vtsreader/vtsreader.vcproj b/src/filters/reader/vtsreader/vtsreader.vcproj
index 913257bab..d3ede1567 100644
--- a/src/filters/reader/vtsreader/vtsreader.vcproj
+++ b/src/filters/reader/vtsreader/vtsreader.vcproj
@@ -174,6 +174,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -233,6 +234,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/source/subtitlesource/subtitlesource.vcproj b/src/filters/source/subtitlesource/subtitlesource.vcproj
index a7b119ff8..0f566df0f 100644
--- a/src/filters/source/subtitlesource/subtitlesource.vcproj
+++ b/src/filters/source/subtitlesource/subtitlesource.vcproj
@@ -462,6 +462,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -522,6 +523,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/switcher/audioswitcher/audioswitcher.vcproj b/src/filters/switcher/audioswitcher/audioswitcher.vcproj
index 6bd27b2db..81a73e79e 100644
--- a/src/filters/switcher/audioswitcher/audioswitcher.vcproj
+++ b/src/filters/switcher/audioswitcher/audioswitcher.vcproj
@@ -470,6 +470,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 			/>

 			<Tool

@@ -530,6 +531,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 			/>

 			<Tool

diff --git a/src/filters/transform/mpadecfilter/libdca/include/dca.h b/src/filters/transform/mpadecfilter/libdca/include/dca.h
index cb5192499..6c7efb0c3 100644
--- a/src/filters/transform/mpadecfilter/libdca/include/dca.h
+++ b/src/filters/transform/mpadecfilter/libdca/include/dca.h
@@ -1,96 +1,96 @@
-/*
- * dca.h
- * Copyright (C) 2004 Gildas Bazin <gbazin@videolan.org>
- *
- * This file is part of libdca, a free DTS Coherent Acoustics stream decoder.
- * See http://www.videolan.org/developers/libdca.html for updates.
- *
- * libdca is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * libdca is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef LIBDCA_DCA_H
-#define LIBDCA_DCA_H
-
+/*

+ * dca.h

+ * Copyright (C) 2004 Gildas Bazin <gbazin@videolan.org>

+ *

+ * This file is part of libdca, a free DTS Coherent Acoustics stream decoder.

+ * See http://www.videolan.org/developers/libdca.html for updates.

+ *

+ * libdca is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * libdca is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the

+ * Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+ */

+

+#ifndef LIBDCA_DCA_H

+#define LIBDCA_DCA_H

+

 #define LIBDCA_DOUBLE

 

 # ifdef __cplusplus

 extern "C" {

-# endif
-
-/* x86 accelerations */
-#define MM_ACCEL_X86_MMX	0x80000000
-#define MM_ACCEL_X86_3DNOW	0x40000000
-#define MM_ACCEL_X86_MMXEXT	0x20000000
-
-uint32_t mm_accel (void);
-
-#if defined(LIBDCA_FIXED)
-typedef int32_t sample_t;
-typedef int32_t level_t;
-#elif defined(LIBDCA_DOUBLE)
-typedef double sample_t;
-typedef double level_t;
-#else
-typedef float sample_t;
-typedef float level_t;
-#endif
-
-typedef struct dca_state_s dca_state_t;
-
-#define DCA_MONO 0
-#define DCA_CHANNEL 1
-#define DCA_STEREO 2
-#define DCA_STEREO_SUMDIFF 3
-#define DCA_STEREO_TOTAL 4
-#define DCA_3F 5
-#define DCA_2F1R 6
-#define DCA_3F1R 7
-#define DCA_2F2R 8
-#define DCA_3F2R 9
-#define DCA_4F2R 10
-
-#define DCA_DOLBY 101 /* FIXME */
-
-#define DCA_CHANNEL_MAX  DCA_3F2R /* We don't handle anything above that */
-#define DCA_CHANNEL_BITS 6
-#define DCA_CHANNEL_MASK 0x3F
-
-#define DCA_LFE 0x80
-#define DCA_ADJUST_LEVEL 0x100
-
-dca_state_t * dca_init (uint32_t mm_accel);
-
-int dca_syncinfo (dca_state_t *state, uint8_t * buf, int * flags,
-                  int * sample_rate, int * bit_rate, int *frame_length);
-
-int dca_frame (dca_state_t * state, uint8_t * buf, int * flags,
-               level_t * level, sample_t bias);
-
-void dca_dynrng (dca_state_t * state,
-                 level_t (* call) (level_t, void *), void * data);
-
-int dca_blocks_num (dca_state_t * state);
-int dca_block (dca_state_t * state);
-
-sample_t * dca_samples (dca_state_t * state);
-
-void dca_free (dca_state_t * state);
+# endif

+

+/* x86 accelerations */

+#define MM_ACCEL_X86_MMX	0x80000000

+#define MM_ACCEL_X86_3DNOW	0x40000000

+#define MM_ACCEL_X86_MMXEXT	0x20000000

+

+uint32_t mm_accel (void);

+

+#if defined(LIBDCA_FIXED)

+typedef int32_t sample_t;

+typedef int32_t level_t;

+#elif defined(LIBDCA_DOUBLE)

+typedef double sample_t;

+typedef double level_t;

+#else

+typedef float sample_t;

+typedef float level_t;

+#endif

+

+typedef struct dca_state_s dca_state_t;

+

+#define DCA_MONO 0

+#define DCA_CHANNEL 1

+#define DCA_STEREO 2

+#define DCA_STEREO_SUMDIFF 3

+#define DCA_STEREO_TOTAL 4

+#define DCA_3F 5

+#define DCA_2F1R 6

+#define DCA_3F1R 7

+#define DCA_2F2R 8

+#define DCA_3F2R 9

+#define DCA_4F2R 10

+

+#define DCA_DOLBY 101 /* FIXME */

+

+#define DCA_CHANNEL_MAX  DCA_3F2R /* We don't handle anything above that */

+#define DCA_CHANNEL_BITS 6

+#define DCA_CHANNEL_MASK 0x3F

+

+#define DCA_LFE 0x80

+#define DCA_ADJUST_LEVEL 0x100

+

+dca_state_t * dca_init (uint32_t mm_accel);

+

+int dca_syncinfo (dca_state_t *state, uint8_t * buf, int * flags,

+                  int * sample_rate, int * bit_rate, int *frame_length);

+

+int dca_frame (dca_state_t * state, uint8_t * buf, int * flags,

+               level_t * level, sample_t bias);

+

+void dca_dynrng (dca_state_t * state,

+                 level_t (* call) (level_t, void *), void * data);

+

+int dca_blocks_num (dca_state_t * state);

+int dca_block (dca_state_t * state);

+

+sample_t * dca_samples (dca_state_t * state);

+

+void dca_free (dca_state_t * state);

 

 # ifdef __cplusplus

 }

-# endif
-
-#endif /* LIBDCA_DCA_H */
+# endif

+

+#endif /* LIBDCA_DCA_H */

diff --git a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
index 3609c159d..39064b0d1 100644
--- a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
+++ b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
@@ -462,6 +462,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				LinkLibraryDependencies="true"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="libavcodec_gcc.lib libgcc.a libmingwex.a"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib"

@@ -525,6 +526,7 @@
 			<Tool

 				Name="VCLibrarianTool"

 				LinkLibraryDependencies="true"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="libavcodec_gcc.lib libgcc.a libmingwex.a"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
index 901f137aa..010ac5867 100644
--- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
+++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
@@ -194,6 +194,7 @@
 				OutputFile="..\..\..\..\bin\x86\$(ProjectName).ax"

 				AdditionalLibraryDirectories="..\..\..\..\lib;..\..\..\..\lib\detours"

 				ModuleDefinitionFile="Mpeg2DecFilter.def"

+				GenerateDebugInformation="false"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

@@ -259,6 +260,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				OutputFile="..\..\..\..\bin\x64\$(ProjectName).ax"

+				GenerateDebugInformation="false"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

 			/>

@@ -446,6 +448,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="basevideofilterRU.lib idct_mmx.obj motion_comp_mmx.obj"

 				OutputFile="..\..\..\..\lib\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib"

@@ -508,6 +511,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				AdditionalDependencies="basevideofilterRU.lib"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

diff --git a/src/subpic/subpic.vcproj b/src/subpic/subpic.vcproj
index e7f0b077b..4a8243fc7 100644
--- a/src/subpic/subpic.vcproj
+++ b/src/subpic/subpic.vcproj
@@ -179,6 +179,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221 /IGNORE:4006"

 				AdditionalDependencies="d3d9.lib ddraw.lib"

 				OutputFile="..\..\lib\$(ProjectName)RU.lib"

 			/>

@@ -240,6 +241,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221 /IGNORE:4006"

 				AdditionalDependencies="d3d9.lib ddraw.lib"

 				OutputFile="..\..\lib64\$(ProjectName)RU.lib"

 			/>

diff --git a/src/subtitles/subtitles.vcproj b/src/subtitles/subtitles.vcproj
index d26800961..8b8653bea 100644
--- a/src/subtitles/subtitles.vcproj
+++ b/src/subtitles/subtitles.vcproj
@@ -177,6 +177,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\lib\subtitlesRU.lib"

 			/>

 			<Tool

@@ -237,6 +238,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\lib64\subtitlesRU.lib"

 			/>

 			<Tool

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index 12f474827..710a4e6a9 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -174,6 +174,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\lib\TreePropSheetRU.lib"

 			/>

 			<Tool

@@ -233,6 +234,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				AdditionalOptions="/IGNORE:4221"

 				OutputFile="..\..\..\lib64\TreePropSheetRU.lib"

 			/>

 			<Tool