diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:52:29 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:52:29 +0200 |
| commit | 0f72485ee72d23fe1ff3db39310836f776ba9f6a (patch) | |
| tree | 1504ed9f7fc96b890dbb5431e19b4ef2da000822 /loader | |
| parent | 8b33a04d023e858e413bf720f68b40c4297e059a (diff) | |
| parent | 4e50b6df73fd6aa3e426aba796f38b9357ea457b (diff) | |
| download | mpv-0f72485ee72d23fe1ff3db39310836f776ba9f6a.tar.bz2 mpv-0f72485ee72d23fe1ff3db39310836f776ba9f6a.tar.xz | |
Merge svn changes up to r30264
Conflicts:
gui/wm/ws.c
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/registry.c | 2 | ||||
| -rw-r--r-- | loader/win32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/loader/registry.c b/loader/registry.c index c92321f4e0..37a262270e 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -385,7 +385,7 @@ long __stdcall RegCloseKey(long key) if(handle==head) head=head->prev; free(handle); - return 1; + return 0; } long __stdcall RegQueryValueExA(long key, const char* value, int* reserved, int* type, int* data, int* count) diff --git a/loader/win32.c b/loader/win32.c index c6c4c7bcec..4a7f02162f 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -208,8 +208,8 @@ static inline void dbgprintf(char* fmt, ...) vprintf(fmt, va); // mp_dbg(MSGT_WIN32, MSGL_DBG3, fmt, va); va_end(va); + fflush(stdout); } - fflush(stdout); } |