November 2010 - Wine-commits

Henri Verbeet : wined3d: Don' t use floating point textures without ARB_texture_float.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 7a64870014b22f4c9ce1b2557f1ab18ef425f226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a64870014b22f4c9ce1b2557… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:34 2010 +0100 wined3d: Don't use floating point textures without ARB_texture_float. The floating point formats from ARB_texture_rg are only defined when ARB_texture_float is also supported. It would have been nice if the formats table itself was able to express this, but as far as I'm aware this is only an issue for ARB_texture_rg, so it's probably not worth changing. --- dlls/wined3d/utils.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f2d6bde..8770f04 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1174,6 +1174,13 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) if (!gl_info->supported[format_texture_info[i].extension]) continue; format = &gl_info->formats[fmt_idx]; + + /* ARB_texture_rg defines floating point formats, but only if + * ARB_texture_float is also supported. */ + if (!gl_info->supported[ARB_TEXTURE_FLOAT] + && (format->Flags & WINED3DFMT_FLAG_FLOAT)) + continue; + format->glInternal = format_texture_info[i].gl_internal; format->glGammaInternal = format_texture_info[i].gl_srgb_internal; format->rtInternal = format_texture_info[i].gl_rt_internal;

1 0

Henri Verbeet : wined3d: Test for "AMD" in the renderer string as well to detect AMD cards.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 50b76b76cb4464871ea01528cea0cd4ef4602afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b76b76cb4464871ea01528c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:35 2010 +0100 wined3d: Test for "AMD" in the renderer string as well to detect AMD cards. Specifically, the Gallium r600 driver reports "X.Org" for vendor and a string of the form "Gallium 0.4 on AMD RV730" for the renderer. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32d2431..a06130b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1373,6 +1373,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "ATI") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") + || strstr(gl_renderer, "AMD") || strstr(gl_renderer, "R100") || strstr(gl_renderer, "R200") || strstr(gl_renderer, "R300")

1 0

Jacek Caban : mshtml: Don' t free string that will be cleared by SafeArrayDestroy.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 645f34ddeba6e273b56a85b1eac53fba072adf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f34ddeba6e273b56a85b1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 12:48:26 2010 +0100 mshtml: Don't free string that will be cleared by SafeArrayDestroy. --- dlls/mshtml/tests/dom.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ec3e4ef..f472768 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5693,7 +5693,6 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) SAFEARRAYBOUND dim; SAFEARRAY *sa; VARIANT *var; - BSTR str; HRESULT hres; dim.lLbound = 0; @@ -5701,7 +5700,7 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) sa = SafeArrayCreate(VT_VARIANT, 1, &dim); SafeArrayAccessData(sa, (void**)&var); V_VT(var) = VT_BSTR; - V_BSTR(var) = str = a2bstr(text); + V_BSTR(var) = a2bstr(text); SafeArrayUnaccessData(sa); if(ln) @@ -5710,7 +5709,6 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) hres = IHTMLDocument2_write(doc, sa); ok(hres == S_OK, "write failed: %08x\n", hres); - SysFreeString(str); SafeArrayDestroy(sa); }

1 0

Maarten Lankhorst : quartz: Use media time instead of stream time in null renderer.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2830ccacb0e47c2abde470f4acb49b1e92f43e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2830ccacb0e47c2abde470f4a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:53 2010 +0100 quartz: Use media time instead of stream time in null renderer. --- dlls/quartz/nullrenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 0d35d97..7656927 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa TRACE("%p %p\n", pin, pSample); - if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) + if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, start); EnterCriticalSection(&This->filter.csFilter); if (This->pInputPin->flushing || This->pInputPin->end_of_stream)

1 0

Eric Pouech : kernel32: Use fd availability for testing whether a console handle refers to a bare console .
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: f67b0377abd491bfe4cc2713ee644119a3e00218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67b0377abd491bfe4cc2713e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:14:46 2010 +0100 kernel32: Use fd availability for testing whether a console handle refers to a bare console. --- dlls/kernel32/console.c | 43 ++++++++++++++++++++----------------------- 1 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 129c4a8..2ea1cd8 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -171,11 +171,9 @@ static BOOL S_termios_raw /* = FALSE */; /* returns the fd for a bare console (-1 otherwise) */ static int get_console_bare_fd(HANDLE hin) { - BOOL is_bare; int fd; - if (get_console_mode(hin, NULL, &is_bare) && is_bare && - wine_server_handle_to_fd(hin, 0, &fd, NULL) == STATUS_SUCCESS) + if (wine_server_handle_to_fd(hin, 0, &fd, NULL) == STATUS_SUCCESS) return fd; return -1; } @@ -191,12 +189,8 @@ static BOOL save_console_mode(HANDLE hin) return ret; } -static BOOL put_console_into_raw_mode(HANDLE hin) +static BOOL put_console_into_raw_mode(int fd) { - int fd; - - if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; - RtlEnterCriticalSection(&CONSOLE_CritSect); if (!S_termios_raw) { @@ -217,7 +211,6 @@ static BOOL put_console_into_raw_mode(HANDLE hin) } RtlLeaveCriticalSection(&CONSOLE_CritSect); - close(fd); return S_termios_raw; } @@ -1166,14 +1159,13 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, DW static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) { - BOOL bare; + int fd; enum read_console_input_return ret; - if (!get_console_mode(handle, NULL, &bare)) return rci_error; - - if (bare) + if ((fd = get_console_bare_fd(handle)) != -1) { - put_console_into_raw_mode(handle); + put_console_into_raw_mode(fd); + close(fd); if (WaitForSingleObject(GetConsoleInputWaitHandle(), 0) != WAIT_OBJECT_0) { ret = bare_console_fetch_input(handle, timeout); @@ -1182,6 +1174,8 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R } else { + if (!get_console_mode(handle, NULL, NULL)) return rci_error; + if (WaitForSingleObject(GetConsoleInputWaitHandle(), timeout) != WAIT_OBJECT_0) return rci_timeout; } @@ -1602,14 +1596,19 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD charsread; LPWSTR xbuf = lpBuffer; DWORD mode; - BOOL is_bare; + BOOL is_bare = FALSE; + int fd; TRACE("(%p,%p,%d,%p,%p)\n", hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved); - if (!get_console_mode(hConsoleInput, &mode, &is_bare)) + if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; - + if ((fd == get_console_bare_fd(hConsoleInput)) == -1) + { + close(fd); + is_bare = TRUE; + } if (mode & ENABLE_LINE_INPUT) { if (!S_EditString || S_EditString[S_EditStrPos] == 0) @@ -2300,8 +2299,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber DWORD nw = 0; const WCHAR* psz = lpBuffer; CONSOLE_SCREEN_BUFFER_INFO csbi; - int k, first = 0; - BOOL bare; + int k, first = 0, fd; TRACE("%p %s %d %p %p\n", hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), @@ -2309,14 +2307,13 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - if (!get_console_mode(hConsoleOutput, &mode, &bare)) return FALSE; - - if (bare) + if ((fd = get_console_bare_fd(hConsoleOutput)) != -1) { char* ptr; unsigned len; BOOL ret; + close(fd); /* FIXME: mode ENABLED_OUTPUT is not processed (or actually we rely on underlying Unix/TTY fd * to do the job */ @@ -2338,7 +2335,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber return ret; } - if (!GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) + if (!GetConsoleMode(hConsoleOutput, &mode) || !GetConsoleScreenBufferInfo(hConsoleOutput, &csbi)) return FALSE; if (!nNumberOfCharsToWrite) return TRUE;

1 0

Eric Pouech : server: Removed the no longer used bare parameter out of get_console_mode request.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 91e3a40e412a6c04cfaf8f6d0d3d16a1a4c4bfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e3a40e412a6c04cfaf8f6d0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:15:01 2010 +0100 server: Removed the no longer used bare parameter out of get_console_mode request. --- dlls/kernel32/console.c | 32 +++++++++++++------------------- include/wine/server_protocol.h | 4 ++-- server/console.c | 6 ++---- server/protocol.def | 1 - server/request.h | 1 - server/trace.c | 1 - 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2ea1cd8..d49731f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -131,23 +131,6 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) } } -static BOOL get_console_mode(HANDLE conin, DWORD* mode, BOOL* bare) -{ - BOOL ret; - - SERVER_START_REQ( get_console_mode ) - { - req->handle = console_handle_unmap(conin); - if ((ret = !wine_server_call_err( req ))) - { - if (mode) *mode = reply->mode; - if (bare) *bare = reply->is_bare; - } - } - SERVER_END_REQ; - return ret; -} - static struct termios S_termios; /* saved termios for bare consoles */ static BOOL S_termios_raw /* = FALSE */; @@ -1174,7 +1157,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R } else { - if (!get_console_mode(handle, NULL, NULL)) return rci_error; + if (!VerifyConsoleIoHandle(handle)) return rci_error; if (WaitForSingleObject(GetConsoleInputWaitHandle(), timeout) != WAIT_OBJECT_0) return rci_timeout; @@ -2135,7 +2118,18 @@ BOOL WINAPI SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput) */ BOOL WINAPI GetConsoleMode(HANDLE hcon, LPDWORD mode) { - return get_console_mode(hcon, mode, NULL); + BOOL ret; + + SERVER_START_REQ( get_console_mode ) + { + req->handle = console_handle_unmap(hcon); + if ((ret = !wine_server_call_err( req ))) + { + if (mode) *mode = reply->mode; + } + } + SERVER_END_REQ; + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e41d8f7..72f3cde 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1550,7 +1550,7 @@ struct get_console_mode_reply { struct reply_header __header; int mode; - int is_bare; + char __pad_12[4]; }; @@ -5519,6 +5519,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 410 +#define SERVER_PROTOCOL_VERSION 411 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 4441163..42d985d 100644 --- a/server/console.c +++ b/server/console.c @@ -565,7 +565,7 @@ static void propagate_console_signal( struct console_input *console, enum_processes(propagate_console_signal_cb, &csi); } -static int get_console_mode( obj_handle_t handle, int *bare ) +static int get_console_mode( obj_handle_t handle ) { struct object *obj; int ret = 0; @@ -575,12 +575,10 @@ static int get_console_mode( obj_handle_t handle, int *bare ) if (obj->ops == &console_input_ops) { ret = ((struct console_input *)obj)->mode; - *bare = console_input_is_bare((struct console_input *)obj); } else if (obj->ops == &screen_buffer_ops) { ret = ((struct screen_buffer *)obj)->mode; - *bare = console_input_is_bare(((struct screen_buffer *)obj)->input); } else set_error( STATUS_OBJECT_TYPE_MISMATCH ); @@ -1537,7 +1535,7 @@ DECL_HANDLER(get_console_input_info) /* get a console mode (input or output) */ DECL_HANDLER(get_console_mode) { - reply->mode = get_console_mode( req->handle, &reply->is_bare ); + reply->mode = get_console_mode( req->handle ); } /* set a console mode (input or output) */ diff --git a/server/protocol.def b/server/protocol.def index 321a933..6245f4c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1226,7 +1226,6 @@ struct console_renderer_event obj_handle_t handle; /* handle to the console */ @REPLY int mode; /* console mode */ - int is_bare; /* whether the console has an evt_queue */ @END diff --git a/server/request.h b/server/request.h index 55af0e1..e0bffaf 100644 --- a/server/request.h +++ b/server/request.h @@ -976,7 +976,6 @@ C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_mode_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, is_bare) == 12 ); C_ASSERT( sizeof(struct get_console_mode_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 ); diff --git a/server/trace.c b/server/trace.c index b6155a1..83d5b16 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1649,7 +1649,6 @@ static void dump_get_console_mode_request( const struct get_console_mode_request static void dump_get_console_mode_reply( const struct get_console_mode_reply *req ) { fprintf( stderr, " mode=%d", req->mode ); - fprintf( stderr, ", is_bare=%d", req->is_bare ); } static void dump_set_console_mode_request( const struct set_console_mode_request *req )

1 0

Detlef Riekenberg : wtsapi32: Add a stub for WTSLogoffSession.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2e0e6677c66bad85b548d70237b8a85253972b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0e6677c66bad85b548d7023… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 7 20:13:59 2010 +0100 wtsapi32: Add a stub for WTSLogoffSession. --- dlls/wtsapi32/wtsapi32.c | 10 ++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ab35de4..604752a 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -142,6 +142,16 @@ void WINAPI WTSFreeMemory(PVOID pMemory) } /************************************************************ + * WTSLogoffSession (WTSAPI32.@) + */ +BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait) +{ + FIXME("(%p, 0x%x, %d): stub\n", hserver, session_id, bwait); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/************************************************************ * WTSOpenServerA (WTSAPI32.@) */ HANDLE WINAPI WTSOpenServerA(LPSTR pServerName) diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 2be9df0..f20bbe2 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -7,7 +7,7 @@ @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) -@ stub WTSLogoffSession +@ stdcall WTSLogoffSession(ptr long long) @ stdcall WTSOpenServerA(ptr) @ stdcall WTSOpenServerW(ptr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr)

1 0

Maarten Lankhorst : quartz: Remove position from filtergraph.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 4f8584ac2734ca6e649661824051d39f0320e95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8584ac2734ca6e649661824… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:08 2010 +0100 quartz: Remove position from filtergraph. --- dlls/quartz/filtergraph.c | 59 ++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8c7339b..44f87b2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -203,7 +203,6 @@ typedef struct _IFilterGraphImpl { GUID timeformatseek; REFERENCE_TIME start_time; REFERENCE_TIME pause_time; - LONGLONG position; LONGLONG stop_position; LONG recursioncount; } IFilterGraphImpl; @@ -1956,7 +1955,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { else This->start_time += now - This->pause_time; } - else This->position = This->start_time = 0; + else This->start_time = 0; SendFilterMessage(iface, SendRun, 0); This->state = State_Running; @@ -1990,13 +1989,6 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock) - { - LONGLONG time = This->start_time; - IReferenceClock_GetTime(This->refClock, &time); - This->position += time - This->start_time; - } - if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); SendFilterMessage(iface, SendStop, 0); This->state = State_Stopped; @@ -2319,10 +2311,8 @@ static HRESULT WINAPI FoundDuration(IFilterGraphImpl *This, IMediaSeeking *seek, if (FAILED(hr)) return hr; - /* FIXME: Minimum or maximum duration? Assuming minimum */ - if (duration > 0 && *pdur < duration) + if (*pdur < duration) *pdur = duration; - return hr; } @@ -2337,7 +2327,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, return E_POINTER; EnterCriticalSection(&This->cs); - *pDuration = -1; + *pDuration = 0; hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); LeaveCriticalSection(&This->cs); @@ -2361,37 +2351,45 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, hr = IMediaSeeking_GetDuration(iface, pStop); else *pStop = This->stop_position; - LeaveCriticalSection(&This->cs); return hr; } +static HRESULT WINAPI FoundCurrentPosition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pposition) +{ + HRESULT hr; + LONGLONG pos = 0, *ppos = (LONGLONG*)pposition; + + hr = IMediaSeeking_GetCurrentPosition(seek, &pos); + if (FAILED(hr)) + return hr; + + if (*ppos < 0 || pos < *ppos) + *ppos = pos; + return hr; +} + static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaSeeking_vtbl, iface); - LONGLONG time = 0; + HRESULT hr; if (!pCurrent) return E_POINTER; EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time += This->position - This->start_time; - if (time < This->position) - time = This->position; - *pCurrent = time; + *pCurrent = -1; + hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); + if (hr == E_NOTIMPL) { + *pCurrent = 0; + hr = S_OK; } - else - *pCurrent = This->position; LeaveCriticalSection(&This->cs); TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - return S_OK; + return hr; } static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, @@ -2435,11 +2433,8 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, state = This->state; TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); - if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) - { - This->position = *pCurrent; - } - else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) + if ((dwCurrentFlags & 0x7) != AM_SEEKING_AbsolutePositioning && + (dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); if ((dwStopFlags & 0x7) == AM_SEEKING_AbsolutePositioning) @@ -5477,7 +5472,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->start_time = fimpl->position = 0; + fimpl->start_time = fimpl->pause_time = 0; fimpl->stop_position = -1; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0;

1 0

Maarten Lankhorst : quartz: Actually use the start time in SendRun.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 120dd66ed2ba4374d93013e125d2682c003969f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120dd66ed2ba4374d93013e12… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:09 2010 +0100 quartz: Actually use the start time in SendRun. --- dlls/quartz/filtergraph.c | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 44f87b2..f8d2ff2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1829,21 +1829,7 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF static HRESULT WINAPI SendRun(IBaseFilter *pFilter, DWORD_PTR data) { - LONGLONG time = 0; - IReferenceClock *clock = NULL; - - IBaseFilter_GetSyncSource(pFilter, &clock); - if (clock) - { - IReferenceClock_GetTime(clock, &time); - if (time) - /* Add 50 ms */ - time += 500000; - if (time < 0) - time = 0; - IReferenceClock_Release(clock); - } - + REFERENCE_TIME time = *(REFERENCE_TIME*)data; return IBaseFilter_Run(pFilter, time); } @@ -1940,7 +1926,6 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&This->cs); if (This->state == State_Running) goto out; @@ -1957,7 +1942,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->start_time = 0; - SendFilterMessage(iface, SendRun, 0); + SendFilterMessage(iface, SendRun, (DWORD_PTR)&This->start_time); This->state = State_Running; out: LeaveCriticalSection(&This->cs);

1 0

Maarten Lankhorst : strmbase: Add support for IQualityControl.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 0a4ee681682c2943b3a22e29ef995c737bb7c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4ee681682c2943b3a22e29e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:10 2010 +0100 strmbase: Add support for IQualityControl. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/qualitycontrol.c | 79 ++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 15 ++++++++ 3 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 4c1f2ab..9ecb169 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ filter.c \ mediatype.c \ pin.c \ + qualitycontrol.c \ seeking.c \ transform.c diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c new file mode 100644 index 0000000..d97350a --- /dev/null +++ b/dlls/strmbase/qualitycontrol.c @@ -0,0 +1,79 @@ +/* + * Quality Control Interfaces + * + * Copyright 2010 Maarten Lankhorst for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/strmbase.h" + +#include "uuids.h" +#include "wine/debug.h" + +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +void QualityControlImpl_init(QualityControlImpl *This, IPin *input, IBaseFilter *self) { + This->input = input; + This->self = self; + This->tonotify = NULL; +} + +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_QueryInterface(This->self, riid, ppv); +} + +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_AddRef(This->self); +} + +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { + QualityControlImpl *This = (QualityControlImpl*)iface; + return IUnknown_Release(This->self); +} + +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + HRESULT hr = S_FALSE; + QualityControlImpl *This = (QualityControlImpl*)iface; + if (This->tonotify) + return IQualityControl_Notify(This->tonotify, This->self, qm); + if (This->input) { + IPin *to = NULL; + IPin_ConnectedTo(This->input, &to); + if (to) { + IQualityControl *qc = NULL; + IUnknown_QueryInterface(to, &IID_IQualityControl, (void**)&qc); + if (qc) { + hr = IQualityControl_Notify(qc, This->self, qm); + IQualityControl_Release(qc); + } + IPin_Release(to); + } + } + return hr; +} + +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { + QualityControlImpl *This = (QualityControlImpl*)iface; + This->tonotify = tonotify; + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index e79ab37..b748930 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -194,6 +194,21 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enu HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum); +/* Quality Control */ +typedef struct QualityControlImpl { + const IQualityControlVtbl *lpVtbl; + IPin *input; + IBaseFilter *self; + IQualityControl *tonotify; +} QualityControlImpl; + +void QualityControlImpl_init(QualityControlImpl *This, IPin *input, IBaseFilter *self); +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); + /* Transform Filter */ typedef struct TransformFilter {

1 0