diff options
author | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-07 13:23:55 +0000 |
---|---|---|
committer | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-07 13:23:55 +0000 |
commit | 893a00d9132cb0d5899f704d85af7134e022e3ec (patch) | |
tree | 3298e6274adca769d620da8779188989c808cbb0 /loader | |
parent | 314ca124e9444c8aec610ca8b2b0770263a0b199 (diff) | |
download | mpv-893a00d9132cb0d5899f704d85af7134e022e3ec.tar.bz2 mpv-893a00d9132cb0d5899f704d85af7134e022e3ec.tar.xz |
Applies kabis changes to avifile 0.6 cvs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@719 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r-- | loader/win32.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/loader/win32.c b/loader/win32.c index 474192bfef..105f8afc1f 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -584,15 +584,19 @@ void* WINAPI expResetEvent(void* event) void* WINAPI expWaitForSingleObject(void* object, int duration) { mutex_list *ml = (mutex_list *)object; - int ret=0x12345678; // fixed by Zdenek Kabelac + int ret=WAIT_FAILED; // fixed by Zdenek Kabelac mutex_list* pp=mlist; // dbgprintf("WaitForSingleObject(0x%x, duration %d) =>\n",object, duration); - do { - if (pp == NULL) dbgprintf("WaitForSingleObject: NotFound\n"); - if((pp->pm, mlist->pm)==0) - break;; - }while((pp=pp->prev)); - + // loop below was slightly fixed - its used just for checking if + // this object really exists in our list + if (!ml) + return (void*) ret; + while (pp && (pp->pm != ml->pm)) + pp = pp->prev; + if (!pp) { + //dbgprintf("WaitForSingleObject: NotFound\n"); + return (void*)ret; + } pthread_mutex_lock(ml->pm); |