Ros-diffs July 2019

ros-diffs@reactos.org

22 participants
146 discussions

[reactos] 01/01: [REACTOS] Fix warning C4146: unary minus operator applied to unsigned type, result still unsigned

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08c6d21e1fb9af8fc4d43… commit 08c6d21e1fb9af8fc4d43a29e74ac3e05581c096 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 26 13:37:31 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 27 11:21:28 2019 +0200 [REACTOS] Fix warning C4146: unary minus operator applied to unsigned type, result still unsigned --- drivers/bus/acpi/cmbatt/cmbatt.c | 2 +- sdk/lib/drivers/sound/shared/time.c | 4 ++-- subsystems/win/basesrv/dosdev.c | 2 +- win32ss/drivers/font/bmfd/bmfd.h | 4 ++-- win32ss/drivers/font/bmfd/glyph.c | 2 +- win32ss/user/ntuser/menu.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index 775f755c134..cdac118c531 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -980,7 +980,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, else if (DeviceExtension->State & BATTERY_DISCHARGING) { /* The battery is discharging, so treat the rate as a negative rate */ - DeviceExtension->Rate = -DeviceExtension->Rate; + DeviceExtension->Rate = -(LONG)DeviceExtension->Rate; } else if (!(DeviceExtension->State & BATTERY_CHARGING) && (DeviceExtension->Rate)) { diff --git a/sdk/lib/drivers/sound/shared/time.c b/sdk/lib/drivers/sound/shared/time.c index 19b61bca216..70e0d36b635 100644 --- a/sdk/lib/drivers/sound/shared/time.c +++ b/sdk/lib/drivers/sound/shared/time.c @@ -29,8 +29,8 @@ SleepMs(ULONG Milliseconds) { LARGE_INTEGER Period; - Period.QuadPart = -Milliseconds; - Period.QuadPart *= 10000; + Period.QuadPart = Milliseconds; + Period.QuadPart *= -10000; KeDelayExecutionThread(KernelMode, FALSE, &Period); } diff --git a/subsystems/win/basesrv/dosdev.c b/subsystems/win/basesrv/dosdev.c index 83a01242e73..958dceca8ee 100644 --- a/subsystems/win/basesrv/dosdev.c +++ b/subsystems/win/basesrv/dosdev.c @@ -809,7 +809,7 @@ CSR_API(BaseSrvDefineDosDevice) /* There's a target provided - new device, update buffer */ else { - RtlInitUnicodeString(&LinkTarget, &CurrentBuffer[-TargetLength - 1]); + RtlInitUnicodeString(&LinkTarget, CurrentBuffer - TargetLength - 1); } /* diff --git a/win32ss/drivers/font/bmfd/bmfd.h b/win32ss/drivers/font/bmfd/bmfd.h index 58aedb268ee..d1d954a6b7f 100644 --- a/win32ss/drivers/font/bmfd/bmfd.h +++ b/win32ss/drivers/font/bmfd/bmfd.h @@ -244,8 +244,8 @@ typedef struct { FONTOBJ *pfo; PBMFD_FACE pface; - ULONG xScale; - ULONG yScale; + LONG xScale; + LONG yScale; ULONG ulAngle; } BMFD_FONT, *PBMFD_FONT; diff --git a/win32ss/drivers/font/bmfd/glyph.c b/win32ss/drivers/font/bmfd/glyph.c index ebc5f06e824..ddbcecf1a12 100644 --- a/win32ss/drivers/font/bmfd/glyph.c +++ b/win32ss/drivers/font/bmfd/glyph.c @@ -83,7 +83,7 @@ BmfdQueryGlyphAndBitmap( PGLYPHENTRY pge; ULONG xSrc, ySrc, cxSrc, cySrc; ULONG xDst, yDst, cxDst, cyDst; - ULONG xScale, yScale; + LONG xScale, yScale; ULONG ulGlyphOffset, cjDstRow, color; PVOID pvSrc0, pvDst0; diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 5e48e5a5f7d..97e1fa2b805 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1752,7 +1752,7 @@ static void FASTCALL MENU_DrawBitmapItem(HDC hdc, PITEM lpitem, const RECT *rect drawItem.itemData = lpitem->dwItemData; /* some applications make this assumption on the DC's origin */ GreSetViewportOrgEx( hdc, lpitem->xItem, lpitem->yItem, &origorg); - RECTL_vOffsetRect( &drawItem.rcItem, - lpitem->xItem, - lpitem->yItem); + RECTL_vOffsetRect(&drawItem.rcItem, -(LONG)lpitem->xItem, -(LONG)lpitem->yItem); co_IntSendMessage( UserHMGetHandle(WndOwner), WM_DRAWITEM, 0, (LPARAM)&drawItem); GreSetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); return;

5 years, 5 months

[reactos] 01/01: [WIN32SS] Addendum to font alignment CORE-16133

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64e182e4296574c9f6b08… commit 64e182e4296574c9f6b08e1339c1abe8e40c7db0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jul 27 10:00:42 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jul 27 10:00:42 2019 +0200 [WIN32SS] Addendum to font alignment CORE-16133 addendum to 0.4.13-dev-707-g 0e4db883e5727569b5c3a35da3a6f8c5e921bbf3 Jim Tabor intended to structurally use flTextAlign over lTextAlign internally within IntExtTextOutW(). He initially committed these changes in 0.4.12-dev-805-g 3377fe184efa77e7c4971c2ac70ed33ab12f0724 But we unintentionally lost these changes via 0.4.13-dev-370-g 8f482af0a876d269cca64288f114eb1fe1180ef0 Many thanks to Doug Lyons who helped a lot with fixing CORE-16133. --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 162df2a2708..3d94d788681 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5794,7 +5794,7 @@ IntExtTextOutW( IntLPtoDP(dc, (POINT *)lprc, 2); } - if (pdcattr->lTextAlign & TA_UPDATECP) + if (pdcattr->flTextAlign & TA_UPDATECP) { Start.x = pdcattr->ptlCurrent.x; Start.y = pdcattr->ptlCurrent.y; @@ -5931,7 +5931,7 @@ IntExtTextOutW( * Process the horizontal alignment and modify XStart accordingly. */ DxShift = fuOptions & ETO_PDY ? 1 : 0; - if (pdcattr->lTextAlign & (TA_RIGHT | TA_CENTER)) + if (pdcattr->flTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; LPCWSTR TempText = String; @@ -6017,7 +6017,7 @@ IntExtTextOutW( previous = 0; - if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) + if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) { RealXStart -= TextWidth / 2; } @@ -6417,7 +6417,7 @@ IntExtTextOutW( } } - if (pdcattr->lTextAlign & TA_UPDATECP) { + if (pdcattr->flTextAlign & TA_UPDATECP) { pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; }

5 years, 5 months

[reactos] 01/01: [MEDIA][FONTS] Add Comic Sans MS fonts (comic.ttf, comicbd.ttf) (#1754)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7aacdcc0d5561b672b37… commit d7aacdcc0d5561b672b37352bfd77ff8e039298b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 27 14:53:06 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 27 14:53:06 2019 +0900 [MEDIA][FONTS] Add Comic Sans MS fonts (comic.ttf, comicbd.ttf) (#1754) Add Comic Sans MS font files. CORE-16237 Add "Comic Relief" fonts by Jeff Davis under SIL Open Font License in the name of "Comic Sans MS". We cannot choose Comic Sans MS currently but it's font engine's bug. --- media/fonts/CMakeLists.txt | 2 + media/fonts/comic.ttf | Bin 0 -> 66344 bytes media/fonts/comicbd.ttf | Bin 0 -> 76532 bytes media/fonts/doc/ComicSansMS/OFL.txt | 97 ++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 5c2b1c38463..a7b182f7563 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -1,5 +1,7 @@ list(APPEND FONT_FILES + comic.ttf + comicbd.ttf DejaVuMathTeXGyre.ttf DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf diff --git a/media/fonts/comic.ttf b/media/fonts/comic.ttf new file mode 100644 index 00000000000..531d50196bd Binary files /dev/null and b/media/fonts/comic.ttf differ diff --git a/media/fonts/comicbd.ttf b/media/fonts/comicbd.ttf new file mode 100644 index 00000000000..2b8ab42f5bd Binary files /dev/null and b/media/fonts/comicbd.ttf differ diff --git a/media/fonts/doc/ComicSansMS/OFL.txt b/media/fonts/doc/ComicSansMS/OFL.txt new file mode 100644 index 00000000000..9f015a3df2d --- /dev/null +++ b/media/fonts/doc/ComicSansMS/OFL.txt @@ -0,0 +1,97 @@ +Copyright (c) 2013, Jeff Davis (info(a)loudifier.com), +with Reserved Font Name "Comic Relief". + +Copyright (c) 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com), +renamed as "Comic Sans MS". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.

5 years, 5 months

[reactos] 01/01: [WINHLP32] All the lang resource files are in UTF-8.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d433f03b56ab2f2fd5177… commit d433f03b56ab2f2fd51779acf3e886b833c84acd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jul 26 14:53:03 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 26 14:53:26 2019 +0200 [WINHLP32] All the lang resource files are in UTF-8. --- base/applications/winhlp32/lang/Cs.rc | 5 +---- base/applications/winhlp32/lang/Da.rc | 2 -- base/applications/winhlp32/lang/De.rc | 2 -- base/applications/winhlp32/lang/Fr.rc | 3 --- base/applications/winhlp32/lang/He.rc | 2 -- base/applications/winhlp32/lang/It.rc | 3 --- base/applications/winhlp32/lang/Ja.rc | 3 --- base/applications/winhlp32/lang/Ko.rc | 2 -- base/applications/winhlp32/lang/Lt.rc | 3 --- base/applications/winhlp32/lang/Nl.rc | 2 -- base/applications/winhlp32/lang/Pt.rc | 2 -- base/applications/winhlp32/lang/Rm.rc | 2 -- base/applications/winhlp32/lang/Ro.rc | 2 -- base/applications/winhlp32/lang/Ru.rc | 3 --- base/applications/winhlp32/lang/Si.rc | 2 -- base/applications/winhlp32/lang/Sr.rc | 2 -- base/applications/winhlp32/lang/Uk.rc | 3 --- base/applications/winhlp32/lang/Zh.rc | 3 --- base/applications/winhlp32/rsrc.rc | 2 ++ 19 files changed, 3 insertions(+), 45 deletions(-) diff --git a/base/applications/winhlp32/lang/Cs.rc b/base/applications/winhlp32/lang/Cs.rc index bef638d58c4..538c166355e 100644 --- a/base/applications/winhlp32/lang/Cs.rc +++ b/base/applications/winhlp32/lang/Cs.rc @@ -1,5 +1,4 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * +/* * Help Viewer Czech resources * * Copyright 1996 Ulrich Schmid @@ -23,8 +22,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -/* Czech strings in CP1250 */ - MAIN_MENU MENU { POPUP "&Soubor" { diff --git a/base/applications/winhlp32/lang/Da.rc b/base/applications/winhlp32/lang/Da.rc index c7b21a23b64..124b4f7e2b5 100644 --- a/base/applications/winhlp32/lang/Da.rc +++ b/base/applications/winhlp32/lang/Da.rc @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/De.rc b/base/applications/winhlp32/lang/De.rc index fa755f348b3..b5b4c47fc99 100644 --- a/base/applications/winhlp32/lang/De.rc +++ b/base/applications/winhlp32/lang/De.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Fr.rc b/base/applications/winhlp32/lang/Fr.rc index b54df12c53b..1e7baf6e603 100644 --- a/base/applications/winhlp32/lang/Fr.rc +++ b/base/applications/winhlp32/lang/Fr.rc @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/He.rc b/base/applications/winhlp32/lang/He.rc index c7f101a31df..b0cc773d6a5 100644 --- a/base/applications/winhlp32/lang/He.rc +++ b/base/applications/winhlp32/lang/He.rc @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/It.rc b/base/applications/winhlp32/lang/It.rc index 16d43462fa8..46c5cf6f7e8 100644 --- a/base/applications/winhlp32/lang/It.rc +++ b/base/applications/winhlp32/lang/It.rc @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Ja.rc b/base/applications/winhlp32/lang/Ja.rc index ef7bbca16f5..51c82c70a2f 100644 --- a/base/applications/winhlp32/lang/Ja.rc +++ b/base/applications/winhlp32/lang/Ja.rc @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Ko.rc b/base/applications/winhlp32/lang/Ko.rc index fad00e07646..c98e65558da 100644 --- a/base/applications/winhlp32/lang/Ko.rc +++ b/base/applications/winhlp32/lang/Ko.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Lt.rc b/base/applications/winhlp32/lang/Lt.rc index b132576d757..3b296400a6f 100644 --- a/base/applications/winhlp32/lang/Lt.rc +++ b/base/applications/winhlp32/lang/Lt.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Nl.rc b/base/applications/winhlp32/lang/Nl.rc index ea3f61060a7..6fb9a69563f 100644 --- a/base/applications/winhlp32/lang/Nl.rc +++ b/base/applications/winhlp32/lang/Nl.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Pt.rc b/base/applications/winhlp32/lang/Pt.rc index dc367c8aa5a..2451ee892d2 100644 --- a/base/applications/winhlp32/lang/Pt.rc +++ b/base/applications/winhlp32/lang/Pt.rc @@ -25,8 +25,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Rm.rc b/base/applications/winhlp32/lang/Rm.rc index 2300f3ae5f0..5fda40d3a0f 100644 --- a/base/applications/winhlp32/lang/Rm.rc +++ b/base/applications/winhlp32/lang/Rm.rc @@ -22,8 +22,6 @@ LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT -#pragma code_page(65001) - /* FIXME: This file is in the Vallader Romansh dialect and not in the official Rumantsch Grischun. */ diff --git a/base/applications/winhlp32/lang/Ro.rc b/base/applications/winhlp32/lang/Ro.rc index 89aa71ced1e..901f8c471ad 100644 --- a/base/applications/winhlp32/lang/Ro.rc +++ b/base/applications/winhlp32/lang/Ro.rc @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Ru.rc b/base/applications/winhlp32/lang/Ru.rc index 2b46e1e5322..4ff9e645514 100644 --- a/base/applications/winhlp32/lang/Ru.rc +++ b/base/applications/winhlp32/lang/Ru.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Si.rc b/base/applications/winhlp32/lang/Si.rc index e3c994a9bfc..0352f22124f 100644 --- a/base/applications/winhlp32/lang/Si.rc +++ b/base/applications/winhlp32/lang/Si.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Sr.rc b/base/applications/winhlp32/lang/Sr.rc index 4ef9c1bc795..60cd576dcf9 100644 --- a/base/applications/winhlp32/lang/Sr.rc +++ b/base/applications/winhlp32/lang/Sr.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Uk.rc b/base/applications/winhlp32/lang/Uk.rc index b3915713881..437387b1c18 100644 --- a/base/applications/winhlp32/lang/Uk.rc +++ b/base/applications/winhlp32/lang/Uk.rc @@ -23,9 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT MAIN_MENU MENU diff --git a/base/applications/winhlp32/lang/Zh.rc b/base/applications/winhlp32/lang/Zh.rc index 0cf8eb3f24d..17f853258d5 100644 --- a/base/applications/winhlp32/lang/Zh.rc +++ b/base/applications/winhlp32/lang/Zh.rc @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED MAIN_MENU MENU diff --git a/base/applications/winhlp32/rsrc.rc b/base/applications/winhlp32/rsrc.rc index 3666e112585..0d5e24733c6 100644 --- a/base/applications/winhlp32/rsrc.rc +++ b/base/applications/winhlp32/rsrc.rc @@ -35,6 +35,8 @@ IDI_WINHELP ICON "res/winhelp.ico" #include <reactos/manifest_exe.rc> /* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/Bg.rc" #endif

5 years, 5 months

[reactos] 01/01: [USER32_APITEST] Add #include 'precomp.h' in MessageStateAnalyzer

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8084c042f1873984c2de4… commit 8084c042f1873984c2de4658a85700d697415667 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 21:45:11 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 21:45:11 2019 +0900 [USER32_APITEST] Add #include 'precomp.h' in MessageStateAnalyzer --- modules/rostests/apitests/user32/MessageStateAnalyzer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/apitests/user32/MessageStateAnalyzer.c b/modules/rostests/apitests/user32/MessageStateAnalyzer.c index e6e1f40436a..2b5b882c276 100644 --- a/modules/rostests/apitests/user32/MessageStateAnalyzer.c +++ b/modules/rostests/apitests/user32/MessageStateAnalyzer.c @@ -4,6 +4,8 @@ * PURPOSE: debugging and analysis of message states * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ + +#include "precomp.h" #include "undocuser.h" #include "winxx.h" #include <strsafe.h>

5 years, 5 months

[reactos] 01/01: [USER32_APITEST] Move <strsafe.h> #inclusion

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5d8cf7db3c1f5c2b52a… commit 9c5d8cf7db3c1f5c2b52a4bf11b68d87fa6de29c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 21:30:36 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 21:30:36 2019 +0900 [USER32_APITEST] Move <strsafe.h> #inclusion --- modules/rostests/apitests/user32/MessageStateAnalyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/MessageStateAnalyzer.c b/modules/rostests/apitests/user32/MessageStateAnalyzer.c index 490b69d3e69..e6e1f40436a 100644 --- a/modules/rostests/apitests/user32/MessageStateAnalyzer.c +++ b/modules/rostests/apitests/user32/MessageStateAnalyzer.c @@ -4,9 +4,9 @@ * PURPOSE: debugging and analysis of message states * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <strsafe.h> #include "undocuser.h" #include "winxx.h" +#include <strsafe.h> static void MsgDumpPrintf(LPCSTR fmt, ...) {

5 years, 5 months

[reactos] 01/01: [WIN32SS][NTGDI] text/font vertical alignment patch CORE-16133

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e4db883e5727569b5c3a… commit 0e4db883e5727569b5c3a35da3a6f8c5e921bbf3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 26 19:13:00 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 26 19:13:00 2019 +0900 [WIN32SS][NTGDI] text/font vertical alignment patch CORE-16133 Based on Doug Lyons' patch. It partially fix CORE-16246 and CORE-16133. Selection area is not fixed yet. --- win32ss/gdi/ntgdi/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 4e4d4f6f8fd..162df2a2708 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5916,9 +5916,9 @@ IntExtTextOutW( * Process the vertical alignment and determine the yoff. */ #define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) - if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) + if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE) yoff = 0; - else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM) yoff = -(fixDescender >> 6); else /* TA_TOP */ yoff = fixAscender >> 6;

5 years, 5 months

[reactos] 01/01: [CODEOWNERS] Add UniATA (#1689)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c00dc468637ebfe0708ae… commit c00dc468637ebfe0708ae040eca991d6ac4e9a0a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Jul 24 19:59:07 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:59:07 2019 +0200 [CODEOWNERS] Add UniATA (#1689) --- CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index a6a954d82dc..07865197b38 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -239,6 +239,11 @@ CMakeLists.txt @learn-more @ThFabba # S: Maintained /dll/shellext @learn-more +# UniATA +# M: ThFabba, Thomas Faber +# S: Upstream +/drivers/storage/ide/uniata/ @ThFabba + # Upstream File Systems # M: HeisSpiter, Pierre Schweitzer # S: Upstream

5 years, 5 months

[reactos] 01/01: [TRANSLATION] Hebrew Translations For Setup (#1750)

by Shy Zedaka

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=112127593bab56ef59961… commit 112127593bab56ef5996163a3cdd5e952c27170e Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Wed Jul 24 20:56:48 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:56:48 2019 +0200 [TRANSLATION] Hebrew Translations For Setup (#1750) --- base/setup/reactos/lang/he-IL.rc | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/base/setup/reactos/lang/he-IL.rc b/base/setup/reactos/lang/he-IL.rc index 809ee4b34ae..2e6e9f750bc 100644 --- a/base/setup/reactos/lang/he-IL.rc +++ b/base/setup/reactos/lang/he-IL.rc @@ -1,4 +1,4 @@ -/* Translated by Baruch Rutman */ +/* Translated by Baruch Rutman, Additional Translations By Shy Zedaka */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -8,8 +8,8 @@ CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ברוכים הבאים לאשף ההתקנה של ReactOS", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "עדיין אי אפשר להתקין את ReactOS ישירות מהתקליטור הזה! נא אתחל מחדש מחשבך מהדיסק כדי להתקין את ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "לחץ על סיום כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "אתה לא יכול להתקין את ReactOS מהדיסק הזה ברגע זה! נע הפעל מחדש את המחשב מהדיסק הזה בשביל להתקין את ReactOS", IDC_STATIC, 115, 40, 195, 100 + LTEXT "לחץ על 'סיום' כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17 END IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143 @@ -21,7 +21,7 @@ BEGIN LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10 LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 7, 128, 297, 8 + LTEXT "לחץ על 'הבא' כדי להגדיר את ההתקנים.", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 + PUSHBUTTON "אל תשדרג", IDC_SKIPUPGRADE, 230, 128, 80, 14 LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 END @@ -46,7 +46,7 @@ BEGIN CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "תצוגה:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "לחץ על הבא כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8 + LTEXT "לחץ על 'הבא' כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -59,7 +59,7 @@ BEGIN PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15 PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15 - // LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 + // LTEXT "לחץ על 'הבא' כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20 END IDD_PARTITION DIALOGEX 0, 0, 145, 90 @@ -68,10 +68,10 @@ CAPTION "יצירת מחיצה" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "יצירת ואתחול המחיצה", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "יצירה ואתחול מחיצה", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 LTEXT "גודל:", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "ג""ב", IDC_UNIT, 117, 24, 14, 9 + LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 LTEXT "מערכת קבצים:", IDC_STATIC, 13, 46, 42, 9 CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 PUSHBUTTON "אישור", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP @@ -98,17 +98,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "סוג התקנה:", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "מחשב:", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "תצוגה:", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "מקלדת:", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP @@ -124,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "התקן קבצים...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 END @@ -136,14 +136,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "כאשר תלחץ על 'סיים' המחשב שלך יפעיל את עצמו מחדש", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "'אם יש דיסק בכונן, הסר אותו ואז, בשביל מחדש את המחשב לחץ על 'סיום", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_TYPETITLE "ברוכים הבאים אל תכנית ההתקנה של ReactOS" + IDS_TYPETITLE "ברוכים הבאים לתוכנית ההתקנה של ReactOS" IDS_TYPESUBTITLE "בחירת סוג התקנה." IDS_DEVICETITLE "Setup the basic devices" IDS_DEVICESUBTITLE "Set the settings of display and keyboard." @@ -153,25 +153,25 @@ BEGIN IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_SUMMARYTITLE "Installation Summary" + IDS_SUMMARYTITLE "סיכום ההתקנה" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_ABORTSETUP2 "לבטל את ההתקנה?" IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'.\nSetup is unable to continue." IDS_CAPTION "התקנת ReactOS" END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "שם" + IDS_INSTALLATION_PATH "נתיב ההתקנה" + IDS_INSTALLATION_VENDOR "שם הספק" END STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_TYPE "Type" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_NAME "שם" + IDS_PARTITION_TYPE "סוג" + IDS_PARTITION_SIZE "גודל" + IDS_PARTITION_STATUS "מצב" END

5 years, 5 months

[reactos] 01/01: [DSOUND_NEW] Remove unused dsound_convert.c file (#1748)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a84d120a60727a77c430… commit 1a84d120a60727a77c4303ed2300d89284cd63cb Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Jul 24 20:56:33 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 24 19:56:33 2019 +0200 [DSOUND_NEW] Remove unused dsound_convert.c file (#1748) --- dll/directx/dsound_new/dsound_convert.c | 435 -------------------------------- 1 file changed, 435 deletions(-) diff --git a/dll/directx/dsound_new/dsound_convert.c b/dll/directx/dsound_new/dsound_convert.c deleted file mode 100644 index 0a6e474d09d..00000000000 --- a/dll/directx/dsound_new/dsound_convert.c +++ /dev/null @@ -1,435 +0,0 @@ -/* DirectSound format conversion and mixing routines - * - * Copyright 2007 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* 8 bits is unsigned, the rest is signed. - * First I tried to reuse existing stuff from alsa-lib, after that - * didn't work, I gave up and just went for individual hacks. - * - * 24 bit is expensive to do, due to unaligned access. - * In dlls/winex11.drv/dib_convert.c convert_888_to_0888_asis there is a way - * around it, but I'm happy current code works, maybe something for later. - * - * The ^ 0x80 flips the signed bit, this is the conversion from - * signed (-128.. 0.. 127) to unsigned (0...255) - * This is only temporary: All 8 bit data should be converted to signed. - * then when fed to the sound card, it should be converted to unsigned again. - * - * Sound is LITTLE endian - */ - -#include "config.h" - -#include <stdarg.h> - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "mmsystem.h" -#include "winternl.h" -#include "wine/debug.h" -#include "dsound.h" -#include "dsdriver.h" -#include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); - -#ifdef WORDS_BIGENDIAN -#define le16(x) RtlUshortByteSwap((x)) -#define le32(x) RtlUlongByteSwap((x)) -#else -#define le16(x) (x) -#define le32(x) (x) -#endif - -static inline void src_advance(const void **src, UINT stride, INT *count, UINT *freqAcc, UINT adj) -{ - *freqAcc += adj; - if (*freqAcc >= (1 << DSOUND_FREQSHIFT)) - { - ULONG adv = (*freqAcc >> DSOUND_FREQSHIFT); - *freqAcc &= (1 << DSOUND_FREQSHIFT) - 1; - *(const char **)src += adv * stride; - *count -= adv; - } -} - -static void convert_8_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - *(BYTE *)dst = *(const BYTE *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD dest = *(const BYTE *)src, *dest16 = dst; - *dest16 = le16(dest * 257 - 32768); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE dest = *(const BYTE *)src; - BYTE *dest24 = dst; - dest24[0] = dest; - dest24[1] = dest; - dest24[2] = dest - 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_8_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = *(const BYTE *)src, *dest32 = dst; - *dest32 = le32(dest * 16843009 - 2147483648U); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = (le16(*(const WORD *)src)) / 256; - *dst8 -= 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - *(WORD *)dst = *(const WORD *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD dest = le16(*(const WORD *)src); - BYTE *dest24 = dst; - - dest24[0] = dest / 256; - dest24[1] = dest; - dest24[2] = dest / 256; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_16_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = *(const WORD *)src, *dest32 = dst; - *dest32 = dest * 65537; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = ((const BYTE *)src)[2]; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD *dest16 = dst; - const BYTE *source = src; - *dest16 = le16(source[2] * 256 + source[1]); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dest24 = dst; - const BYTE *src24 = src; - - dest24[0] = src24[0]; - dest24[1] = src24[1]; - dest24[2] = src24[2]; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_24_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD *dest32 = dst; - const BYTE *source = src; - *dest32 = le32(source[2] * 16777217 + source[1] * 65536 + source[0] * 256); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_8 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - BYTE *dst8 = dst; - *dst8 = (le32(*(const DWORD *)src) / 16777216); - *dst8 -= 0x80; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_16 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - WORD *dest16 = dst; - *dest16 = le16(le32(*(const DWORD *)src) / 65536); - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_24 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD dest = le32(*(const DWORD *)src); - BYTE *dest24 = dst; - - dest24[0] = dest / 256; - dest24[1] = dest / 65536; - dest24[2] = dest / 16777216; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -static void convert_32_to_32 (const void *src, void *dst, UINT src_stride, - UINT dst_stride, INT count, UINT freqAcc, UINT adj) -{ - while (count > 0) - { - DWORD *dest = dst; - *dest = *(const DWORD *)src; - - dst = (char *)dst + dst_stride; - src_advance(&src, src_stride, &count, &freqAcc, adj); - } -} - -const bitsconvertfunc convertbpp[4][4] = { - { convert_8_to_8, convert_8_to_16, convert_8_to_24, convert_8_to_32 }, - { convert_16_to_8, convert_16_to_16, convert_16_to_24, convert_16_to_32 }, - { convert_24_to_8, convert_24_to_16, convert_24_to_24, convert_24_to_32 }, - { convert_32_to_8, convert_32_to_16, convert_32_to_24, convert_32_to_32 }, -}; - -static void mix8(signed char *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - while (len--) - /* 8-bit WAV is unsigned, it's here converted to signed, normalize function will convert it back again */ - *(dst++) += (signed char)((BYTE)*(src++) - (BYTE)0x80); -} - -static void mix16(SHORT *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) - { - *dst += le16(*src); - ++dst; ++src; - } -} - -static void mix24(BYTE *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) - { - DWORD field; - field = ((DWORD)src[2] << 16) + ((DWORD)src[1] << 8) + (DWORD)src[0]; - if (src[2] & 0x80) - field |= 0xFF000000U; - *(dst++) += field; - ++src; - } -} - -static void mix32(INT *src, LONGLONG *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) - *(dst++) += le32(*(src++)); -} - -const mixfunc mixfunctions[4] = { - (mixfunc)mix8, - (mixfunc)mix16, - (mixfunc)mix24, - (mixfunc)mix32 -}; - -static void norm8(INT *src, signed char *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - while (len--) - { - *dst = (*src) + 0x80; - if (*src < -0x80) - *dst = 0; - else if (*src > 0x7f) - *dst = 0xff; - ++dst; - ++src; - } -} - -static void norm16(INT *src, SHORT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) - { - *dst = le16(*src); - if (*src <= -0x8000) - *dst = le16(0x8000); - else if (*src > 0x7fff) - *dst = le16(0x7fff); - ++dst; - ++src; - } -} - -static void norm24(INT *src, BYTE *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) - { - if (*src <= -0x800000) - { - dst[0] = 0; - dst[1] = 0; - dst[2] = 0x80; - } - else if (*src > 0x7fffff) - { - dst[0] = 0xff; - dst[1] = 0xff; - dst[2] = 0x7f; - } - else - { - dst[0] = *src; - dst[1] = *src >> 8; - dst[2] = *src >> 16; - } - ++dst; - ++src; - } -} - -static void norm32(LONGLONG *src, INT *dst, unsigned len) -{ - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) - { - *dst = le32(*src); - if (*src <= -(LONGLONG)0x80000000) - *dst = le32(0x80000000); - else if (*src > 0x7fffffff) - *dst = le32(0x7fffffff); - ++dst; - ++src; - } -} - -const normfunc normfunctions[4] = { - (normfunc)norm8, - (normfunc)norm16, - (normfunc)norm24, - (normfunc)norm32, -};

5 years, 5 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2019