src/audio/fusionsound/SDL_fsaudio.h
author Sam Lantinga
Thu, 16 May 2013 00:43:22 -0700
changeset 7180 3733e68edbc3
parent 6885 700f1b25f77f
child 7191 75360622e65f
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
slouken@2947
     1
/*
slouken@5535
     2
  Simple DirectMedia Layer
slouken@6885
     3
  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
slouken@2947
     4
slouken@5535
     5
  This software is provided 'as-is', without any express or implied
slouken@5535
     6
  warranty.  In no event will the authors be held liable for any damages
slouken@5535
     7
  arising from the use of this software.
slouken@2947
     8
slouken@5535
     9
  Permission is granted to anyone to use this software for any purpose,
slouken@5535
    10
  including commercial applications, and to alter it and redistribute it
slouken@5535
    11
  freely, subject to the following restrictions:
slouken@2947
    12
slouken@5535
    13
  1. The origin of this software must not be misrepresented; you must not
slouken@5535
    14
     claim that you wrote the original software. If you use this software
slouken@5535
    15
     in a product, an acknowledgment in the product documentation would be
slouken@5535
    16
     appreciated but is not required.
slouken@5535
    17
  2. Altered source versions must be plainly marked as such, and must not be
slouken@5535
    18
     misrepresented as being the original software.
slouken@5535
    19
  3. This notice may not be removed or altered from any source distribution.
slouken@2947
    20
*/
slouken@2947
    21
#include "SDL_config.h"
slouken@2947
    22
slouken@2947
    23
#ifndef _SDL_fsaudio_h
slouken@2947
    24
#define _SDL_fsaudio_h
slouken@2947
    25
slouken@2947
    26
#include <fusionsound/fusionsound.h>
slouken@2947
    27
slouken@2947
    28
#include "../SDL_sysaudio.h"
slouken@2947
    29
slouken@2947
    30
/* Hidden "this" pointer for the audio functions */
slouken@2947
    31
#define _THIS	SDL_AudioDevice *this
slouken@2947
    32
slouken@2947
    33
struct SDL_PrivateAudioData
slouken@2947
    34
{
slouken@2947
    35
    /* Interface */
slouken@2947
    36
    IFusionSound *fs;
slouken@2947
    37
slouken@2947
    38
    /* The stream interface for the audio device */
slouken@2947
    39
    IFusionSoundStream *stream;
slouken@2947
    40
slouken@2947
    41
    /* Raw mixing buffer */
slouken@2947
    42
    Uint8 *mixbuf;
slouken@2947
    43
    int mixlen;
slouken@2947
    44
    int mixsamples;
slouken@2947
    45
slouken@2947
    46
};
slouken@2947
    47
slouken@2947
    48
#endif /* _SDL_fsaudio_h */
slouken@2947
    49
/* vi: set ts=4 sw=4 expandtab: */