Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-18 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT][GDI32] Introduce atan2 library, use it for gdi32 to fix a crash. CORE-11521

Browse source 
As suggested by Thomas :)

svn path=/trunk/; revision=71985
This commit is contained in:
Mark Jansen 2016-07-23 20:35:11 +00:00
parent 0ee9e9b016
commit 517ee59e43
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/sdk/lib/crt/CMakeLists.txt
View file

@ -66,3 +66,19 @@ add_library(strtol
string/wctype.c) string/wctype.c)
add_target_compile_definitions(strtol _LIBCNT_) add_target_compile_definitions(strtol _LIBCNT_)
add_dependencies(strtol psdk) add_dependencies(strtol psdk)
if(ARCH STREQUAL "i386")
list(APPEND ATAN2_ASM_SOURCE math/i386/atan2_asm.s)
elseif(ARCH STREQUAL "amd64")
list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S)
elseif(ARCH STREQUAL "arm")
list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s)
endif()
add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE})
add_library(atan2 ${atan2_asm})
set_target_properties(atan2 PROPERTIES LINKER_LANGUAGE "C")
add_dependencies(atan2 asm)

1
reactos/win32ss/gdi/gdi32/CMakeLists.txt
View file

@ -61,6 +61,7 @@ target_link_libraries(gdi32
win32ksys win32ksys
dxguid dxguid
msvcrtex msvcrtex
atan2
${PSEH_LIB}) ${PSEH_LIB})
add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)

17
reactos/win32ss/gdi/gdi32/wine/rosglue.c
View file

@ -520,23 +520,6 @@ _assert (
DbgRaiseAssertionFailure(); DbgRaiseAssertionFailure();
} }
#if defined(_MSC_VER) && (DBG != 1)
/* MSVC uses its own in this case. */
#else
double
__cdecl
atan2(
double y,
double x)
{
__debugbreak();
return 0.;
}
#endif
/******************************************************************************/ /******************************************************************************/
static static