From 968dcab2c40c2e07ba24994131c1f3c82237a227 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 22 Apr 2012 10:51:05 +0000 Subject: fix C4819 warnings and thus compilation under some system codepages like Japanese git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4466 10f7b99b-c216-0410-bff0-8a66a9350fd8 --- include/qt/ConditionalMacros.h | 2 +- src/DSUtil/DSUtil.cpp | 14 ++++---- src/apps/mplayerc/Mpeg2SectionData.cpp | 8 ++--- src/filters/parser/AviSplitter/AviFile.cpp | 38 +++++++++++----------- src/filters/reader/CDDAReader/CDDAReader.cpp | 2 +- src/filters/reader/UDPReader/UDPReader.cpp | 2 +- src/filters/transform/MPCVideoDec/FfmpegContext.c | 18 +++++----- src/thirdparty/ui/TreePropSheet/PropPageFrame.h | 2 +- .../ui/TreePropSheet/PropPageFrameDefault.h | 2 +- src/thirdparty/ui/TreePropSheet/TreePropSheet.h | 2 +- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/include/qt/ConditionalMacros.h b/include/qt/ConditionalMacros.h index 8c8857ead..8c2e73219 100644 --- a/include/qt/ConditionalMacros.h +++ b/include/qt/ConditionalMacros.h @@ -212,7 +212,7 @@ #if TARGET_RT_MAC_CFM #define PRAGMA_IMPORT 1 #if (__SC__ <= 0x0810) - /* old versions of SC don't support #pragma import resetΣ */ + /* old versions of SC don't support #pragma import reset */ #define PRAGMA_IMPORT_OFF 1 #endif #else diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 7389067e8..71c9dee67 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -897,7 +897,7 @@ cdrom_t GetCDROMType(TCHAR drive, CAtlList& files) CDROM_TOC TOC; if (DeviceIoControl(hDrive, IOCTL_CDROM_READ_TOC, NULL, 0, &TOC, sizeof(TOC), &BytesReturned, 0)) { for (ptrdiff_t i = TOC.FirstTrack; i <= TOC.LastTrack; i++) { - // MMC-3 Draft Revision 10g: Table 222 – Q Sub-channel control field + // MMC-3 Draft Revision 10g: Table 222 - Q Sub-channel control field TOC.TrackData[i-1].Control &= 5; if (TOC.TrackData[i-1].Control == 0 || TOC.TrackData[i-1].Control == 1) { CString fn; @@ -1655,7 +1655,7 @@ static struct { {"Bikol", "bik", ""}, {"Bini", "bin", ""}, {"Bislama", "bis", "bi"}, - {"Bokmål, Norwegian; Norwegian Bokmål", "nob", "nb"}, + {"BokmÃ¥l, Norwegian; Norwegian BokmÃ¥l", "nob", "nb"}, {"Bosnian", "bos", "bs"}, {"Braj", "bra", ""}, {"Breton", "bre", "br", MAKELCID( MAKELANGID(LANG_BRETON, SUBLANG_DEFAULT), SORT_DEFAULT)}, @@ -1782,7 +1782,7 @@ static struct { {"Greenlandic; Kalaallisut", "kal", "kl", MAKELCID( MAKELANGID(LANG_GREENLANDIC, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Guarani", "grn", "gn"}, {"Gujarati", "guj", "gu", MAKELCID( MAKELANGID(LANG_GUJARATI, SUBLANG_DEFAULT), SORT_DEFAULT)}, - {"Gwich´in", "gwi", ""}, + {"Gwich’in", "gwi", ""}, {"Haida", "hai", ""}, {"Hausa", "hau", "ha", MAKELCID( MAKELANGID(LANG_HAUSA, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Hawaiian", "haw", ""}, @@ -1936,7 +1936,7 @@ static struct { {"Northern Sami", "sme", "se"}, {"North Ndebele", "nde", "nd"}, {"Norwegian", "nor", "no", MAKELCID( MAKELANGID(LANG_NORWEGIAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, - {"Norwegian Bokmål; Bokmål, Norwegian", "nob", "nb", MAKELCID( MAKELANGID(LANG_NORWEGIAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, + {"Norwegian BokmÃ¥l; BokmÃ¥l, Norwegian", "nob", "nb", MAKELCID( MAKELANGID(LANG_NORWEGIAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Norwegian Nynorsk; Nynorsk, Norwegian", "nno", "nn", MAKELCID( MAKELANGID(LANG_NORWEGIAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Nubian languages", "nub", ""}, {"Nyamwezi", "nym", ""}, @@ -1945,7 +1945,7 @@ static struct { {"Nynorsk, Norwegian; Norwegian Nynorsk", "nno", "nn"}, {"Nyoro", "nyo", ""}, {"Nzima", "nzi", ""}, - {"Occitan (post 1500},; Provençal", "oci", "oc", MAKELCID( MAKELANGID(LANG_OCCITAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, + {"Occitan (post 1500},; Provençal", "oci", "oc", MAKELCID( MAKELANGID(LANG_OCCITAN, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Ojibwa", "oji", "oj"}, {"Old Bulgarian; Old Slavonic; Church Slavonic;", "chu", "cu"}, {"Oriya", "ori", "or"}, @@ -1971,8 +1971,8 @@ static struct { {"Polish", "pol", "pl", MAKELCID( MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Portuguese", "por", "pt", MAKELCID( MAKELANGID(LANG_PORTUGUESE, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Prakrit languages", "pra", ""}, - {"Provençal; Occitan (post 1500)", "oci", "oc"}, - {"Provençal, Old (to 1500)", "pro", ""}, + {"Provençal; Occitan (post 1500)", "oci", "oc"}, + {"Provençal, Old (to 1500)", "pro", ""}, {"Pushto", "pus", "ps"}, {"Quechua", "que", "qu", MAKELCID( MAKELANGID(LANG_QUECHUA, SUBLANG_DEFAULT), SORT_DEFAULT)}, {"Raeto-Romance", "roh", "rm"}, diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index 190653609..ac5c94f9f 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -70,10 +70,10 @@ CString CMpeg2DataParser::ConvertString (BYTE* pBuffer, int nLength) 28591, // 09 - ??? - ISO/IEC 8859-13 - Latin alphabet No. 7 28591, // 0a - ??? - ISO/IEC 8859-14 - Latin alphabet No. 8 (Celtic) 28605, // 0b - ISO 8859-15 Latin 9 - 28591, // 0c - réservé - 28591, // 0d - réservé - 28591, // 0e - réservé - 28591, // 0f - réservé + 28591, // 0c - reserved + 28591, // 0d - reserved + 28591, // 0e - reserved + 28591, // 0f - reserved // TODO ! 28591, 28591, 28591, 28591, 28591, 28591, 28591, 28591, diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp index 68414f6aa..de23bc014 100644 --- a/src/filters/parser/AviSplitter/AviFile.cpp +++ b/src/filters/parser/AviSplitter/AviFile.cpp @@ -167,28 +167,28 @@ HRESULT CAviFile::Parse(DWORD parentid, __int64 end) if (parentid == FCC('INFO') && size > 0) { switch (id) { case FCC('IARL'): // Archival Location. Indicates where the subject of the file is archived. - case FCC('IART'): // Artist. Lists the artist of the original subject of the file; for example, “Michaelangelo.” - case FCC('ICMS'): // Commissioned. Lists the name of the person or organization that commissioned the subject of the file; for example, “Pope Julian II.” + case FCC('IART'): // Artist. Lists the artist of the original subject of the file; for example, "Michaelangelo." + case FCC('ICMS'): // Commissioned. Lists the name of the person or organization that commissioned the subject of the file; for example, "Pope Julian II." case FCC('ICMT'): // Comments. Provides general comments about the file or the subject of the file. If the comment is several sentences long, end each sentence with a period. Do not include new-line characters. - case FCC('ICOP'): // Copyright. Records the copyright information for the file; for example, “Copyright Encyclopedia International 1991.” If there are multiple copyrights, separate them by a semicolon followed by a space. - case FCC('ICRD'): // Creation date. Specifies the date the subject of the file was created. List dates in year-month-day format, padding one-digit months and days with a zero on the left; for example, “1553-05-03” for May 3, 1553. - case FCC('ICRP'): // Cropped. Describes whether an image has been cropped and, if so, how it was cropped; for example, “lower-right corner.” - case FCC('IDIM'): // Dimensions. Specifies the size of the original subject of the file; for example, “8.5 in h, 11 in w.” - case FCC('IDPI'): // Dots Per Inch. Stores dots per inch setting of the digitizer used to produce the file, such as “300.” - case FCC('IENG'): // Engineer. Stores the name of the engineer who worked on the file. If there are multiple engineers, separate the names by a semicolon and a blank; for example, “Smith, John; Adams, Joe.” - case FCC('IGNR'): // Genre. Describes the original work, such as “landscape,” “portrait,” “still life,” etc. - case FCC('IKEY'): // Keywords. Provides a list of keywords that refer to the file or subject of the file. Separate multiple keywords with a semicolon and a blank; for example, “Seattle; aerial view; scenery.” + case FCC('ICOP'): // Copyright. Records the copyright information for the file; for example, "Copyright Encyclopedia International 1991." If there are multiple copyrights, separate them by a semicolon followed by a space. + case FCC('ICRD'): // Creation date. Specifies the date the subject of the file was created. List dates in year-month-day format, padding one-digit months and days with a zero on the left; for example, "1553-05-03" for May 3, 1553. + case FCC('ICRP'): // Cropped. Describes whether an image has been cropped and, if so, how it was cropped; for example, "lower-right corner." + case FCC('IDIM'): // Dimensions. Specifies the size of the original subject of the file; for example, "8.5 in h, 11 in w." + case FCC('IDPI'): // Dots Per Inch. Stores dots per inch setting of the digitizer used to produce the file, such as "300." + case FCC('IENG'): // Engineer. Stores the name of the engineer who worked on the file. If there are multiple engineers, separate the names by a semicolon and a blank; for example, "Smith, John; Adams, Joe." + case FCC('IGNR'): // Genre. Describes the original work, such as "landscape," "portrait," "still life," etc. + case FCC('IKEY'): // Keywords. Provides a list of keywords that refer to the file or subject of the file. Separate multiple keywords with a semicolon and a blank; for example, "Seattle; aerial view; scenery." case FCC('ILGT'): // Lightness. Describes the changes in lightness settings on the digitizer required to produce the file. Note that the format of this information depends on hardware used. - case FCC('IMED'): // Medium. Describes the original subject of the file, such as “computer image,” “drawing,” “lithograph,” and so on. - case FCC('INAM'): // Name. Stores the title of the subject of the file, such as “Seattle From Above.” - case FCC('IPLT'): // Palette Setting. Specifies the number of colors requested when digitizing an image, such as “256.” - case FCC('IPRD'): // Product. Specifies the name of the title the file was originally intended for, such as “Encyclopedia of Pacific Northwest Geography.” - case FCC('ISBJ'): // Subject. Describes the contents of the file, such as “Aerial view of Seattle.” - case FCC('ISFT'): // Software. Identifies the name of the software package used to create the file, such as “Microsoft WaveEdit.” + case FCC('IMED'): // Medium. Describes the original subject of the file, such as "computer image," "drawing," "lithograph," and so on. + case FCC('INAM'): // Name. Stores the title of the subject of the file, such as "Seattle From Above." + case FCC('IPLT'): // Palette Setting. Specifies the number of colors requested when digitizing an image, such as "256." + case FCC('IPRD'): // Product. Specifies the name of the title the file was originally intended for, such as "Encyclopedia of Pacific Northwest Geography." + case FCC('ISBJ'): // Subject. Describes the contents of the file, such as "Aerial view of Seattle." + case FCC('ISFT'): // Software. Identifies the name of the software package used to create the file, such as "Microsoft WaveEdit." case FCC('ISHP'): // Sharpness. Identifies the changes in sharpness for the digitizer required to produce the file (the format depends on the hardware used). - case FCC('ISRC'): // Source. Identifies the name of the person or organization who supplied the original subject of the file; for example, “Trey Research.” - case FCC('ISRF'): // Source Form. Identifies the original form of the material that was digitized, such as “slide,” “paper,” “map,” and so on. This is not necessarily the same as IMED. - case FCC('ITCH'): { // Technician. Identifies the technician who digitized the subject file; for example, “Smith, John.” + case FCC('ISRC'): // Source. Identifies the name of the person or organization who supplied the original subject of the file; for example, "Trey Research." + case FCC('ISRF'): // Source Form. Identifies the original form of the material that was digitized, such as "slide," "paper," "map," and so on. This is not necessarily the same as IMED. + case FCC('ITCH'): { // Technician. Identifies the technician who digitized the subject file; for example, "Smith, John." CStringA str; if (S_OK != ByteRead((BYTE*)str.GetBufferSetLength(size), size)) { return E_FAIL; diff --git a/src/filters/reader/CDDAReader/CDDAReader.cpp b/src/filters/reader/CDDAReader/CDDAReader.cpp index 5b9c46e2d..261853c86 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.cpp +++ b/src/filters/reader/CDDAReader/CDDAReader.cpp @@ -307,7 +307,7 @@ bool CCDDAStream::Load(const WCHAR* fnw) return false; } - // MMC-3 Draft Revision 10g: Table 222 – Q Sub-channel control field + // MMC-3 Draft Revision 10g: Table 222 - Q Sub-channel control field m_TOC.TrackData[iTrackIndex-1].Control &= 5; if (!(m_TOC.TrackData[iTrackIndex-1].Control == 0 || m_TOC.TrackData[iTrackIndex-1].Control == 1)) { CloseHandle(m_hDrive); diff --git a/src/filters/reader/UDPReader/UDPReader.cpp b/src/filters/reader/UDPReader/UDPReader.cpp index 50fcbca08..28e704d41 100644 --- a/src/filters/reader/UDPReader/UDPReader.cpp +++ b/src/filters/reader/UDPReader/UDPReader.cpp @@ -48,7 +48,7 @@ int g_cTemplates = countof(g_Templates); STDAPI DllRegisterServer() { SetRegKeyValue(_T("udp"), 0, _T("Source Filter"), CStringFromGUID(__uuidof(CUDPReader))); - SetRegKeyValue(_T("tévé"), 0, _T("Source Filter"), CStringFromGUID(__uuidof(CUDPReader))); + SetRegKeyValue(_T("tévé"), 0, _T("Source Filter"), CStringFromGUID(__uuidof(CUDPReader))); return AMovieDllRegisterServer2(TRUE); } diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.c b/src/filters/transform/MPCVideoDec/FfmpegContext.c index d3d3590f5..e2ca44048 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.c +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.c @@ -584,7 +584,7 @@ HRESULT FFVC1UpdatePictureParam (DXVA_PictureParameters* pPicParams, struct AVCo *nSliceType = vc1->s.pict_type; } - // Cf §7.1.1.25 in VC1 specification, §3.2.14.3 in DXVA spec + // Cf section 7.1.1.25 in VC1 specification, section 3.2.14.3 in DXVA spec pPicParams->bRcontrol = vc1->rnd; pPicParams->bPicDeblocked = ((vc1->profile == PROFILE_ADVANCED && vc1->overlap == 1 && @@ -652,28 +652,28 @@ HRESULT FFMpeg2DecodeFrame (DXVA_PictureParameters* pPicParams, DXVA_QmatrixData pPicParams->wPicWidthInMBminus1 = s->mb_width-1; pPicParams->wPicHeightInMBminus1 = (s->mb_height >> is_field) - 1; - pPicParams->bMacroblockWidthMinus1 = 15; // This is equal to “15” for MPEG-1, MPEG-2, H.263, and MPEG-4 - pPicParams->bMacroblockHeightMinus1 = 15; // This is equal to “15” for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 + pPicParams->bMacroblockWidthMinus1 = 15; // This is equal to "15" for MPEG-1, MPEG-2, H.263, and MPEG-4 + pPicParams->bMacroblockHeightMinus1 = 15; // This is equal to "15" for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 - pPicParams->bBlockWidthMinus1 = 7; // This is equal to “7” for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 - pPicParams->bBlockHeightMinus1 = 7; // This is equal to “7” for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 + pPicParams->bBlockWidthMinus1 = 7; // This is equal to "7" for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 + pPicParams->bBlockHeightMinus1 = 7; // This is equal to "7" for MPEG-1, MPEG-2, H.261, H.263, and MPEG-4 - pPicParams->bBPPminus1 = 7; // It is equal to “7” for MPEG-1, MPEG-2, H.261, and H.263 + pPicParams->bBPPminus1 = 7; // It is equal to "7" for MPEG-1, MPEG-2, H.261, and H.263 pPicParams->bPicStructure = s->picture_structure; //pPicParams->bSecondField pPicParams->bPicIntra = (s->current_picture.f.pict_type == AV_PICTURE_TYPE_I); pPicParams->bPicBackwardPrediction = (s->current_picture.f.pict_type == AV_PICTURE_TYPE_B); - pPicParams->bBidirectionalAveragingMode = 0; // The value “0” indicates MPEG-1 and MPEG-2 rounded averaging (//2), + pPicParams->bBidirectionalAveragingMode = 0; // The value "0" indicates MPEG-1 and MPEG-2 rounded averaging (//2), //pPicParams->bMVprecisionAndChromaRelation = 0; // Indicates that luminance motion vectors have half-sample precision and that chrominance motion vectors are derived from luminance motion vectors according to the rules in MPEG-2 - pPicParams->bChromaFormat = 0x01; // For MPEG-1, MPEG-2 “Main Profile,” H.261 and H.263 bitstreams, this value shall always be set to ‘01’, indicating "4:2:0" format + pPicParams->bChromaFormat = 0x01; // For MPEG-1, MPEG-2 "Main Profile," H.261 and H.263 bitstreams, this value shall always be set to ‘01’, indicating "4:2:0" format // pPicParams->bPicScanFixed = 1; // set in UpdatePicParams // pPicParams->bPicScanMethod = 1; // set in UpdatePicParams // pPicParams->bPicReadbackRequests; // ?? - // pPicParams->bRcontrol = 0; // It shall be set to “0” for all MPEG-1, and MPEG-2 bitstreams in order to conform with the rounding operator defined by those standards + // pPicParams->bRcontrol = 0; // It shall be set to "0" for all MPEG-1, and MPEG-2 bitstreams in order to conform with the rounding operator defined by those standards // pPicParams->bPicSpatialResid8; // set in UpdatePicParams // pPicParams->bPicOverflowBlocks; // set in UpdatePicParams // pPicParams->bPicExtrapolation; = 0; // by H.263 Annex D and MPEG-4 diff --git a/src/thirdparty/ui/TreePropSheet/PropPageFrame.h b/src/thirdparty/ui/TreePropSheet/PropPageFrame.h index 4bbab31c5..e16684961 100644 --- a/src/thirdparty/ui/TreePropSheet/PropPageFrame.h +++ b/src/thirdparty/ui/TreePropSheet/PropPageFrame.h @@ -301,6 +301,6 @@ private: ///////////////////////////////////////////////////////////////////////////// //{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein. +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // AFX_PROPPAGEFRAME_H__B968548B_F0B4_4C35_85DD_C44242A9D368__INCLUDED_ diff --git a/src/thirdparty/ui/TreePropSheet/PropPageFrameDefault.h b/src/thirdparty/ui/TreePropSheet/PropPageFrameDefault.h index 024d5fdd2..57fc20af2 100644 --- a/src/thirdparty/ui/TreePropSheet/PropPageFrameDefault.h +++ b/src/thirdparty/ui/TreePropSheet/PropPageFrameDefault.h @@ -113,6 +113,6 @@ protected: ///////////////////////////////////////////////////////////////////////////// //{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein. +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // AFX_PROPPAGEFRAMEDEFAULT_H__5C5B7AC9_2DF5_4E8C_8F5E_DE2CC04BBED7__INCLUDED_ diff --git a/src/thirdparty/ui/TreePropSheet/TreePropSheet.h b/src/thirdparty/ui/TreePropSheet/TreePropSheet.h index d4aea3259..8599d218b 100644 --- a/src/thirdparty/ui/TreePropSheet/TreePropSheet.h +++ b/src/thirdparty/ui/TreePropSheet/TreePropSheet.h @@ -478,6 +478,6 @@ private: ///////////////////////////////////////////////////////////////////////////// //{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein. +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // AFX_TREEPROPSHEET_H__50695CFB_FCE4_4188_ADB4_BF05A5488E41__INCLUDED_ -- cgit v1.2.3