Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 52268: [CMD] * Fix msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 23:16:43 2011 New Revision: 52268 URL: http://svn.reactos.org/svn/reactos?rev=52268&view=rev Log: [CMD] * Fix msvc build. Modified: trunk/reactos/base/shell/cmd/rsrc.rc Modified: trunk/reactos/base/shell/cmd/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/rsrc.rc?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/rsrc.rc [iso-8859-1] Wed Jun 15 23:16:43 2011 @@ -14,4 +14,4 @@ #include "lang/de-DE.rc" #include "lang/ja-JP.rc" #include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" +#include "lang/ru-RU.rc"

1 0

[akhaldi] 52267: [CMAKE] * Merge 50715 from the cmake branch.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 23:07:31 2011 New Revision: 52267 URL: http://svn.reactos.org/svn/reactos?rev=52267&view=rev Log: [CMAKE] * Merge 50715 from the cmake branch. Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Wed Jun 15 23:07:31 2011 @@ -1014,10 +1014,12 @@ #define __ASM_CFI(str) str /* Define to a macro to define an assembly function */ +#ifndef _MSC_VER #ifndef NO_UNDERSCORE_PREFIX #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t.def _" #name suffix "; .scl 2; .type 32; .endef\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); +#endif #endif /* Define to a macro to generate an assembly function directive */

1 0

[akhaldi] 52266: [RICHED20] * Fix msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 22:48:49 2011 New Revision: 52266 URL: http://svn.reactos.org/svn/reactos?rev=52266&view=rev Log: [RICHED20] * Fix msvc build. Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Wed Jun 15 22:48:49 2011 @@ -1039,7 +1039,9 @@ /* Define to a macro to generate an assembly function with stdcall calling convention */ +#ifndef _MSC_VER #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code) +#endif /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */

1 0

[tkreuzer] 52265: [SMSS] - really remove the link command - fix an integer overflow
by tkreuzer＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: tkreuzer Date: Wed Jun 15 22:47:29 2011 New Revision: 52265 URL: http://svn.reactos.org/svn/reactos?rev=52265&view=rev Log: [SMSS] - really remove the link command - fix an integer overflow Modified: trunk/reactos/base/system/smss/CMakeLists.txt trunk/reactos/base/system/smss/initpage.c Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Wed Jun 15 22:47:29 2011 @@ -27,7 +27,6 @@ target_link_libraries(smss nt smlib) if(MSVC) - # target_link_libraries(smss msvcsup) set_entrypoint(smss DllMainCRTStartup) endif() Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Wed Jun 15 22:47:29 2011 @@ -189,7 +189,7 @@ if (InitialSize.QuadPart > GIGABYTE) { InitialSize.QuadPart = GIGABYTE; - MaximumSize.QuadPart = GIGABYTE * 3 / 2; + MaximumSize.QuadPart = (ULONGLONG)GIGABYTE * 3 / 2; } }

1 0

[tkreuzer] 52264: [SMSS] - Use integer instead of floating point - Don't link to msvcsup
by tkreuzer＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: tkreuzer Date: Wed Jun 15 22:44:21 2011 New Revision: 52264 URL: http://svn.reactos.org/svn/reactos?rev=52264&view=rev Log: [SMSS] - Use integer instead of floating point - Don't link to msvcsup Modified: trunk/reactos/base/system/smss/CMakeLists.txt trunk/reactos/base/system/smss/initpage.c Modified: trunk/reactos/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/CMakeList… ============================================================================== --- trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/CMakeLists.txt [iso-8859-1] Wed Jun 15 22:44:21 2011 @@ -27,7 +27,7 @@ target_link_libraries(smss nt smlib) if(MSVC) - target_link_libraries(smss msvcsup) + # target_link_libraries(smss msvcsup) set_entrypoint(smss DllMainCRTStartup) endif() Modified: trunk/reactos/base/system/smss/initpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initpage.… ============================================================================== --- trunk/reactos/base/system/smss/initpage.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initpage.c [iso-8859-1] Wed Jun 15 22:44:21 2011 @@ -189,7 +189,7 @@ if (InitialSize.QuadPart > GIGABYTE) { InitialSize.QuadPart = GIGABYTE; - MaximumSize.QuadPart = GIGABYTE * 1.5; + MaximumSize.QuadPart = GIGABYTE * 3 / 2; } }

1 0

[tkreuzer] 52263: [FREELDR] Bring back call to EnableA20 in rbuild builds
by tkreuzer＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: tkreuzer Date: Wed Jun 15 22:36:51 2011 New Revision: 52263 URL: http://svn.reactos.org/svn/reactos?rev=52263&view=rev Log: [FREELDR] Bring back call to EnableA20 in rbuild builds Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Wed Jun 15 22:36:51 2011 @@ -57,6 +57,8 @@ /* Store the boot partition */ mov byte ptr [_FrldrBootPartition], dh + + call _EnableA20 /* GO! */ push eax

1 0

[akhaldi] 52262: [GDIPLUS] * Fix msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 22:35:33 2011 New Revision: 52262 URL: http://svn.reactos.org/svn/reactos?rev=52262&view=rev Log: [GDIPLUS] * Fix msvc build. Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Wed Jun 15 22:35:33 2011 @@ -23,9 +23,13 @@ pen.c region.c stringformat.c - #${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) + +if(MSVC) + list(APPEND SOURCE + ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c) +endif() add_library(gdiplus SHARED ${SOURCE})

1 0

[akhaldi] 52261: [CMAKE] * Skip rosautotest in msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 22:21:50 2011 New Revision: 52261 URL: http://svn.reactos.org/svn/reactos?rev=52261&view=rev Log: [CMAKE] * Skip rosautotest in msvc build. Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=52261&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Wed Jun 15 22:21:50 2011 @@ -3,7 +3,9 @@ #add_subdirectory(dibtests) #add_subdirectory(dxtest) #add_subdirectory(regtests) -add_subdirectory(rosautotest) +if(NOT MSVC) # FIXME: msvc build + add_subdirectory(rosautotest) +endif() add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests)

1 0

[tkreuzer] 52260: [MSVC] Don't compile wine direct x dlls on MSVC for now
by tkreuzer＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: tkreuzer Date: Wed Jun 15 22:07:14 2011 New Revision: 52260 URL: http://svn.reactos.org/svn/reactos?rev=52260&view=rev Log: [MSVC] Don't compile wine direct x dlls on MSVC for now Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Wed Jun 15 22:07:14 2011 @@ -1,4 +1,5 @@ +if(NOT MSVC) add_subdirectory(d3d8) add_subdirectory(d3d9) add_subdirectory(d3dx9_24) @@ -22,3 +23,4 @@ add_subdirectory(d3dx9_42) add_subdirectory(ddraw) add_subdirectory(wined3d) +endif()

1 0

[akhaldi] 52259: [INPUT] * Fix msvc build.
by akhaldi＠svn.reactos.org 15 Jun '11

15 Jun '11

Author: akhaldi Date: Wed Jun 15 21:59:28 2011 New Revision: 52259 URL: http://svn.reactos.org/svn/reactos?rev=52259&view=rev Log: [INPUT] * Fix msvc build. Modified: trunk/reactos/dll/cpl/input/rsrc.rc Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/rsrc.rc [iso-8859-1] Wed Jun 15 21:59:28 2011 @@ -18,4 +18,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc"

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