Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMCTL32] Remove an unnecessary include.
by Thomas Faber 14 Apr '19

14 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6122f3f436a4551e2a853… commit 6122f3f436a4551e2a85318b7e6452a6fbada2c5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Apr 14 14:25:35 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Apr 14 14:35:29 2019 +0200 [COMCTL32] Remove an unnecessary include. --- dll/win32/comctl32/lang/comctl_Sq.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/comctl32/lang/comctl_Sq.rc b/dll/win32/comctl32/lang/comctl_Sq.rc index fd6e6e7bf7..5c17bdeea2 100644 --- a/dll/win32/comctl32/lang/comctl_Sq.rc +++ b/dll/win32/comctl32/lang/comctl_Sq.rc @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "comctl32.h" - LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE

1 0

[reactos] 03/03: [BOOTDATA] Remove stray value.
by Hermès Bélusca-Maïto 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b7f710fc7d0ddb0b6d57… commit 3b7f710fc7d0ddb0b6d57b1ac5023215bfb80d23 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:25:35 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:25:35 2019 +0200 [BOOTDATA] Remove stray value. --- boot/bootdata/hivesft.inf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index f63f87ca96..4387338e3f 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -602,9 +602,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontDPI","LogPixels",0x00010003,96 -; win32k GRE initialization +; Win32k GRE initialization HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","MS Shell Dlg",0x00000002,"Microsoft Sans Serif" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FIXEDFON.FON",0x00000002,"vgafix.fon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","FONTS.FON",0x00000002,"vgasys.fon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize","OEMFONT.FON",0x00000002,"vgaoem.fon"

1 0

[reactos] 02/03: [WIN32SS:NTGDI] IntEscapeMatrix(): Use FreeType trigonometric functions instead of CRT ones.
by Hermès Bélusca-Maïto 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61475b9fede67b4eb2236… commit 61475b9fede67b4eb2236c4ff9a495052c66cda9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:19:03 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:19:03 2019 +0200 [WIN32SS:NTGDI] IntEscapeMatrix(): Use FreeType trigonometric functions instead of CRT ones. --- win32ss/gdi/ntgdi/freetype.c | 77 +++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index b5433d3844..a613a9f265 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -336,6 +336,39 @@ SharedFace_Release(PSHARED_FACE Ptr) IntUnLockFreeType(); } + +static __inline void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) +{ + pt->x.value = vec->x >> 6; + pt->x.fract = (vec->x & 0x3f) << 10; + pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); + pt->y.value = vec->y >> 6; + pt->y.fract = (vec->y & 0x3f) << 10; + pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); +} + +/* + This function builds an FT_Fixed from a float. It puts the integer part + in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. + It fails if the integer part of the float number is greater than SHORT_MAX. +*/ +static __inline FT_Fixed FT_FixedFromFloat(FLOAT f) +{ + short value = f; + unsigned short fract = (f - value) * 0xFFFF; + return (FT_Fixed)((long)value << 16 | (unsigned long)fract); +} + +/* + This function builds an FT_Fixed from a FIXED. It simply put f.value + in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. +*/ +static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) +{ + return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); +} + + #if DBG VOID DumpFontGDI(PFONTGDI FontGDI) { @@ -685,10 +718,11 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) { - double radian = (lfEscapement * M_PI) / 180 / 10; - - pmat->xx = (FT_Fixed)(cos(radian) * (1 << 16)); - pmat->xy = (FT_Fixed)(-sin(radian) * (1 << 16)); + FT_Vector vecAngle; + FT_Angle angle = FT_FixedFromFloat((FLOAT)(lfEscapement * M_PI) / (FLOAT)(180 * 10)); + FT_Vector_Unit(&vecAngle, angle); + pmat->xx = vecAngle.x; + pmat->xy = -vecAngle.y; pmat->yx = -pmat->xy; pmat->yy = pmat->xx; } @@ -2970,37 +3004,6 @@ ftGdiGlyphCacheSet( } -static void FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt) -{ - pt->x.value = vec->x >> 6; - pt->x.fract = (vec->x & 0x3f) << 10; - pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12)); - pt->y.value = vec->y >> 6; - pt->y.fract = (vec->y & 0x3f) << 10; - pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12)); -} - -/* - This function builds an FT_Fixed from a float. It puts the integer part - in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed. - It fails if the integer part of the float number is greater than SHORT_MAX. -*/ -static __inline FT_Fixed FT_FixedFromFloat(float f) -{ - short value = f; - unsigned short fract = (f - value) * 0xFFFF; - return (FT_Fixed)((long)value << 16 | (unsigned long)fract); -} - -/* - This function builds an FT_Fixed from a FIXED. It simply put f.value - in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed. -*/ -static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) -{ - return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract); -} - static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) { TTPOLYGONHEADER *pph; @@ -3545,7 +3548,7 @@ ftGdiGetGlyphOutline( if (aveWidth && potm) { widthRatio = (FLOAT)aveWidth * eM11 / - (FLOAT) potm->otmTextMetrics.tmAveCharWidth; + (FLOAT)potm->otmTextMetrics.tmAveCharWidth; } left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; @@ -3594,7 +3597,7 @@ ftGdiGetGlyphOutline( FT_Matrix rotationMat; FT_Vector vecAngle; DPRINT("Rotation Trans!\n"); - angle = FT_FixedFromFloat((float)orientation / 10.0); + angle = FT_FixedFromFloat((FLOAT)orientation / 10.0); FT_Vector_Unit(&vecAngle, angle); rotationMat.xx = vecAngle.x; rotationMat.xy = -vecAngle.y;

1 0

[reactos] 01/03: [GDI32] Do not 'hard-assert' during the font-unit-test.
by Hermès Bélusca-Maïto 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7334567211b921220ef82… commit 7334567211b921220ef82f168ef8e4bc7d5b2724 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 14 01:17:15 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 14 01:17:15 2019 +0200 [GDI32] Do not 'hard-assert' during the font-unit-test. --- win32ss/gdi/gdi32/objects/font.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 1b6cfa7296..7a7c23b0b5 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -1340,7 +1340,7 @@ GetOutlineTextMetricsA( else output->otmpFullName = 0; - assert(left == 0); + ASSERT(left == 0); if(output != lpOTM) { @@ -1730,6 +1730,13 @@ VOID DumpFamilyInfo(const FONTFAMILYINFO *Info, LONG Count) VOID DoFontSystemUnittest(VOID) { +#ifndef RTL_SOFT_ASSERT +#define RTL_SOFT_ASSERT(exp) \ + (void)((!(exp)) ? \ + DbgPrint("%s(%d): Soft assertion failed\n Expression: %s\n", __FILE__, __LINE__, #exp), FALSE : TRUE) +#define RTL_SOFT_ASSERT_defined +#endif + LOGFONTW LogFont; FONTFAMILYINFO Info[4]; UNICODE_STRING Str1, Str2; @@ -1744,8 +1751,8 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret == RTL_NUMBER_OF(Info)); - ASSERT(InfoCount > 32); + RTL_SOFT_ASSERT(ret == RTL_NUMBER_OF(Info)); + RTL_SOFT_ASSERT(InfoCount > 32); /* L"Microsoft Sans Serif" ANSI_CHARSET */ RtlZeroMemory(&LogFont, sizeof(LogFont)); @@ -1755,19 +1762,19 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret != -1); - ASSERT(InfoCount > 0); - ASSERT(InfoCount < 16); + RTL_SOFT_ASSERT(ret != -1); + RTL_SOFT_ASSERT(InfoCount > 0); + RTL_SOFT_ASSERT(InfoCount < 16); RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfLogFont.lfFaceName); RtlInitUnicodeString(&Str2, L"Microsoft Sans Serif"); ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); - ASSERT(ret == 0); + RTL_SOFT_ASSERT(ret == 0); RtlInitUnicodeString(&Str1, Info[0].EnumLogFontEx.elfFullName); RtlInitUnicodeString(&Str2, L"Tahoma"); ret = RtlCompareUnicodeString(&Str1, &Str2, TRUE); - ASSERT(ret == 0); + RTL_SOFT_ASSERT(ret == 0); /* L"Non-Existent" DEFAULT_CHARSET */ RtlZeroMemory(&LogFont, sizeof(LogFont)); @@ -1777,8 +1784,13 @@ VOID DoFontSystemUnittest(VOID) ret = NtGdiGetFontFamilyInfo(NULL, &LogFont, Info, &InfoCount); DPRINT1("ret: %ld, InfoCount: %ld\n", ret, InfoCount); DumpFamilyInfo(Info, ret); - ASSERT(ret == 0); - ASSERT(InfoCount == 0); + RTL_SOFT_ASSERT(ret == 0); + RTL_SOFT_ASSERT(InfoCount == 0); + +#ifdef RTL_SOFT_ASSERT_defined +#undef RTL_SOFT_ASSERT_defined +#undef RTL_SOFT_ASSERT +#endif } #endif @@ -1796,8 +1808,8 @@ CreateFontIndirectW( static BOOL bDidTest = FALSE; if (!bDidTest) { - DoFontSystemUnittest(); bDidTest = TRUE; + DoFontSystemUnittest(); } #endif if (lplf)

1 0

[reactos] 01/01: [3RDPARTY] Addendum to 146096cd: Make some warnings non-fatal.
by Hermès Bélusca-Maïto 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a96e0adbc9b4ac64fb50… commit 4a96e0adbc9b4ac64fb5020e678ea636ef6edfc3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 13 18:24:01 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 18:24:01 2019 +0200 [3RDPARTY] Addendum to 146096cd: Make some warnings non-fatal. --- dll/3rdparty/libtirpc/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index a48db75fdb..dd636c9928 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -6,6 +6,11 @@ add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup -D_CRT_NONSTDC_NO_ include_directories(${REACTOS_SOURCE_DIR}/dll/3rdparty/libtirpc/tirpc) +if(MSVC) + # error C4133: '=': incompatible types - from 'char *' to 'int32_t *' + replace_compile_flags("/we4133" " ") +endif() + list(APPEND SOURCE src/asprintf.c # src/auth_des.c

1 0

[reactos] 01/01: [OPENGLCFG] Edit the applet name so it uses the same capitalization scheme as the other Control Panel applets.
by Jared Smudde 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca72c931f3313787e539f… commit ca72c931f3313787e539fd75a068ae82b3962e3b Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Fri Apr 12 18:20:59 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:55 2019 +0200 [OPENGLCFG] Edit the applet name so it uses the same capitalization scheme as the other Control Panel applets. --- dll/cpl/openglcfg/lang/en-US.rc | 2 +- dll/cpl/openglcfg/lang/tr-TR.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/openglcfg/lang/en-US.rc b/dll/cpl/openglcfg/lang/en-US.rc index 9a79f3ea02..f7bfdd7a51 100644 --- a/dll/cpl/openglcfg/lang/en-US.rc +++ b/dll/cpl/openglcfg/lang/en-US.rc @@ -20,7 +20,7 @@ STRINGTABLE BEGIN IDS_RENDERER_DEFAULT "System default" IDS_RENDERER_RSWR "ReactOS Software Implementation" - IDS_CPLNAME "OpenGL configuration" + IDS_CPLNAME "OpenGL Configuration" IDS_CPLDESCRIPTION "Configures OpenGL renderer." IDS_DEBUG_SET "Set" IDS_DEBUG_CLEAR "Clear" diff --git a/dll/cpl/openglcfg/lang/tr-TR.rc b/dll/cpl/openglcfg/lang/tr-TR.rc index 84479007e3..31543db881 100644 --- a/dll/cpl/openglcfg/lang/tr-TR.rc +++ b/dll/cpl/openglcfg/lang/tr-TR.rc @@ -22,7 +22,7 @@ STRINGTABLE BEGIN IDS_RENDERER_DEFAULT "Dizge Ön Tanımlı" IDS_RENDERER_RSWR "ReactOS Yazılım Gerçekleştirmesi" - IDS_CPLNAME "OpenGL yapılandırması" + IDS_CPLNAME "OpenGL Yapılandırması" IDS_CPLDESCRIPTION "OpenGL işleyicisini yapılandırır." IDS_DEBUG_SET "Ayarla" IDS_DEBUG_CLEAR "Sil"

1 0

[reactos] 01/01: [RAPPS] Fix blurry Theme category icon.
by Jared Smudde 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a7dcb24adf648e05bdfa… commit 1a7dcb24adf648e05bdfa70a76efa5a8ca757951 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Fri Apr 12 18:47:31 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:30 2019 +0200 [RAPPS] Fix blurry Theme category icon. --- base/applications/rapps/res/cats/themes.ico | Bin 2462 -> 2462 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/rapps/res/cats/themes.ico b/base/applications/rapps/res/cats/themes.ico index a9320d6abe..0ed14c07de 100644 Binary files a/base/applications/rapps/res/cats/themes.ico and b/base/applications/rapps/res/cats/themes.ico differ

1 0

[reactos] 01/01: [DIRECTX] Fix typos in readme.txt (#1498)
by Oleg Dubinskiy 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a88727570635c015cd93… commit 7a88727570635c015cd9352f5c26432f70466083 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Apr 13 18:07:02 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 13 17:07:02 2019 +0200 [DIRECTX] Fix typos in readme.txt (#1498) See also PR #687. --- dll/directx/wine/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/directx/wine/readme.txt b/dll/directx/wine/readme.txt index 2bb71f0b6b..99308ae012 100644 --- a/dll/directx/wine/readme.txt +++ b/dll/directx/wine/readme.txt @@ -2,7 +2,7 @@ This Is wine DirectX support. It works in reactos and windows When ReactOS own ReactX are inplace this file will be remove from our SVN -for now they stay as tempary sovlotions +for now they stay as temporary solutions People that have help getting this thing

1 0

[reactos] 01/01: [CMAKE] Don't use the PCH for generated files.
by Thomas Faber 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5685ad4a123bee7731fd9… commit 5685ad4a123bee7731fd9911d1ec96b3471b8e02 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Apr 8 07:12:20 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Apr 13 15:58:22 2019 +0200 [CMAKE] Don't use the PCH for generated files. The PCH must be used with the same compiler flags it was generated with, so don't use it for files that use modified flags. --- base/applications/winhlp32/CMakeLists.txt | 5 ++--- dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 10 +++++----- dll/win32/jscript/CMakeLists.txt | 6 +++--- dll/win32/msi/CMakeLists.txt | 6 +++--- dll/win32/msxml3/CMakeLists.txt | 6 +++--- dll/win32/vbscript/CMakeLists.txt | 4 ++-- dll/win32/wbemprox/CMakeLists.txt | 4 ++-- 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index e248a0e18a7..0deaeafee5d 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE callback.c hlpfile.c macro.c - macro.lex.yy.c winhelp.c precomp.h) @@ -19,9 +18,9 @@ list(APPEND SOURCE set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) -add_executable(winhlp32 ${SOURCE} string.c rsrc.rc) +add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc) set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) -#add_pch(winhlp32 precomp.h SOURCE) +add_pch(winhlp32 precomp.h SOURCE) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index efae762ef65..88d2383b7b6 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -13,13 +13,9 @@ spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) list(APPEND SOURCE asmparser.c - asmshader.tab.c - asmshader.yy.c blob.c bytecodewriter.c compiler.c - hlsl.tab.c - hlsl.yy.c main.c reflection.c utils.c @@ -28,6 +24,10 @@ list(APPEND SOURCE add_library(d3dcompiler_43 MODULE ${SOURCE} + asmshader.tab.c + asmshader.yy.c + hlsl.tab.c + hlsl.yy.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def) @@ -43,5 +43,5 @@ set_module_type(d3dcompiler_43 win32dll) target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp) add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll) add_dependencies(d3dcompiler_43 d3d_idl_headers) -#add_pch(d3dcompiler_43 precomp.h SOURCE) +add_pch(d3dcompiler_43 precomp.h SOURCE) add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index c97df1f8d49..cb4041f0020 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -10,7 +10,6 @@ list(APPEND SOURCE activex.c array.c bool.c - cc_parser.tab.c compile.c date.c decode.c @@ -29,7 +28,6 @@ list(APPEND SOURCE math.c number.c object.c - parser.tab.c regexp.c string.c vbarray.c @@ -48,6 +46,8 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps add_library(jscript MODULE ${SOURCE} + cc_parser.tab.c + parser.tab.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) @@ -57,5 +57,5 @@ add_dependencies(jscript jscript_idlheader stdole2) set_module_type(jscript win32dll) target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) -#add_pch(jscript precomp.h SOURCE) +add_pch(jscript precomp.h SOURCE) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 15697e5037c..e4f586db632 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -22,7 +22,6 @@ list(APPEND SOURCE assembly.c automation.c classes.c - cond.tab.c create.c custom.c database.c @@ -47,7 +46,6 @@ list(APPEND SOURCE script.c select.c source.c - sql.tab.c storages.c streams.c string.c @@ -64,6 +62,8 @@ set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREA add_library(msi MODULE ${SOURCE} + cond.tab.c + sql.tab.c ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c msi.rc @@ -84,5 +84,5 @@ add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 kernel32 ntdll) -#add_pch(msi precomp.h SOURCE) +add_pch(msi precomp.h SOURCE) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index 1e0e20abc1e..e61ac57f6cd 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -47,8 +47,6 @@ list(APPEND SOURCE xmlelem.c xmlparser.c xmlview.c - xslpattern.tab.c - xslpattern.yy.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c) @@ -65,6 +63,8 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_de add_library(msxml3 MODULE ${SOURCE} + xslpattern.tab.c + xslpattern.yy.c factory.c uuid.c version.rc @@ -75,5 +75,5 @@ set_module_type(msxml3 win32dll) target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib) add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb -#add_pch(msxml3 precomp.h SOURCE) +add_pch(msxml3 precomp.h SOURCE) add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index bd530e7d109..b95e66abae6 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -8,7 +8,6 @@ list(APPEND SOURCE global.c interp.c lex.c - parser.tab.c regexp.c utils.c vbdisp.c @@ -35,6 +34,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript MODULE ${SOURCE} + parser.tab.c vbscript.rc ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def) @@ -42,5 +42,5 @@ set_module_type(vbscript win32dll) target_link_libraries(vbscript uuid wine) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(vbscript vbscript_idlheader stdole2) -#add_pch(vbscript precomp.h SOURCE) +add_pch(vbscript precomp.h SOURCE) add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 49df8d0e1eb..3f48d3e6d5c 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -19,7 +19,6 @@ list(APPEND SOURCE services.c table.c wbemlocator.c - wql.tab.c precomp.h) # wql.tab.c has been generated with relative file paths... @@ -27,6 +26,7 @@ set_source_files_properties(wql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE add_library(wbemprox MODULE ${SOURCE} + wql.tab.c guid.c wbemprox.rc ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def) @@ -36,5 +36,5 @@ set_module_type(wbemprox win32dll) target_link_libraries(wbemprox uuid wine) add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) -#add_pch(wbemprox precomp.h SOURCE) +add_pch(wbemprox precomp.h SOURCE) add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)

1 0

[reactos] 05/05: [CMAKE] Add 3 more critical warnings for MSVC - C4311: pointer truncation from '<pointer>' to '<integer>' - C4312: conversion from '<integer>' to '<pointer>' of greater size - C4133: incompatible types - from '<x> *' to '<y> *' - C4028: formal parameter different from declaration
by Timo Kreuzer 13 Apr '19

13 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=545a2c79367e1457e4bc7… commit 545a2c79367e1457e4bc7ac14d3c0f840c7e063c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Feb 27 22:00:40 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Apr 13 14:07:50 2019 +0200 [CMAKE] Add 3 more critical warnings for MSVC - C4311: pointer truncation from '<pointer>' to '<integer>' - C4312: conversion from '<integer>' to '<pointer>' of greater size - C4133: incompatible types - from '<x> *' to '<y> *' - C4028: formal parameter different from declaration --- sdk/cmake/msvc.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 6eec2b15bcd..8419591b8b5 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -90,13 +90,15 @@ add_compile_flags("/wd4018") # - C4098: void function returning a value # - C4113: parameter lists differ # - C4129: unrecognized escape sequence -# - TODO: C4133: incompatible types +# - C4133: incompatible types - from '<x> *' to '<y> *' # - C4163: 'identifier': not available as an intrinsic function # - C4229: modifiers on data are ignored -# - C4700: uninitialized variable usage +# - C4311: pointer truncation from '<pointer>' to '<integer>' +# - C4312: conversion from '<integer>' to '<pointer>' of greater size # - C4603: macro is not defined or definition is different after precompiled header use +# - C4700: uninitialized variable usage # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4716") # TODO: Check and fix other architectures. if(ARCH STREQUAL "i386") add_compile_flags("/we4028")

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs