include/SDL_config.h
author Sam Lantinga <slouken@libsdl.org>
Thu, 16 May 2013 00:43:22 -0700
changeset 7180 3733e68edbc3
parent 7011 82bbfbbc720e
child 7191 75360622e65f
child 8460 f483e8bdae3c
permissions -rw-r--r--
Fixed bug 1846 - _allmul implementation in SDL_stdlib.c doesn't clean up the stack

Colin Barrett

I see this manifest itself (VS2012 x86) as:

"Run-Time Check Failure #0 - The value of ESP was not properly saved across a function call. This is usually a result of calling a function declared with one calling convention with a function pointer declared with a different calling convention."

in the first call to SDL_GetTicks in my application. The disassembly at the problem line is:

hires_now.QuadPart *= 1000;
00AD0792 push 0
00AD0794 push 3E8h
00AD0799 mov eax,dword ptr [ebp-10h]
00AD079C push eax
00AD079D mov ecx,dword ptr [hires_now]
00AD07A0 push ecx
00AD07A1 call _allmul (0AE7D40h)
00AD07A6 mov dword ptr [hires_now],eax
00AD07A9 mov dword ptr [ebp-10h],edx

Apparently _allmul should be popping the stack but isn't (other similar functions in SDL_stdlib.c - _alldiv and whatnot - DO pop the stack).

A 'ret 10h' at the end of _allmul appears to do the trick
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 
    22 #ifndef _SDL_config_h
    23 #define _SDL_config_h
    24 
    25 #include "SDL_platform.h"
    26 
    27 /**
    28  *  \file SDL_config.h
    29  */
    30  
    31 /* Add any platform that doesn't build using the configure system. */
    32 #if defined(__WIN32__)
    33 #include "SDL_config_windows.h"
    34 #elif defined(__MACOSX__)
    35 #include "SDL_config_macosx.h"
    36 #elif defined(__IPHONEOS__) 
    37 #include "SDL_config_iphoneos.h"
    38 #elif defined(__ANDROID__)
    39 #include "SDL_config_android.h"
    40 #elif defined(__PSP__)
    41 #include "SDL_config_psp.h"
    42 #else
    43 /* This is a minimal configuration just to get SDL running on new platforms */
    44 #include "SDL_config_minimal.h"
    45 #endif /* platform config */
    46 
    47 #ifdef USING_GENERATED_CONFIG_H
    48 #error Wrong SDL_config.h, check your include path?
    49 #endif
    50 
    51 #endif /* _SDL_config_h */