November 2010 - Wine-Commits

Henri Verbeet : ddraw: Setup the device window in SetCooperativeLevel().
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

Module: wine Branch: master Commit: 7e3985e1fea60da73bae2b9465b94e5d110909fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3985e1fea60da73bae2b946… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:33 2010 +0100 ddraw: Setup the device window in SetCooperativeLevel(). --- dlls/d3d8/device.c | 9 ++++++++- dlls/d3d9/device.c | 26 ++++++++++++++++++-------- dlls/ddraw/ddraw.c | 37 +++++++++++++++++++++++-------------- dlls/ddraw/tests/d3d.c | 3 +++ dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/wined3d/device.c | 14 +++++++++----- dlls/wined3d/swapchain.c | 7 ------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 8 ++++++++ 9 files changed, 70 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3985e1fea60da73bae2…

1 0

Henri Verbeet : wined3d: Don' t use floating point textures without ARB_texture_float.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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: Move the fullscreen window setup / restore code to the device.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

Module: wine Branch: master Commit: 45cee64295e00681dabb0343e89b3727f8e8da70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cee64295e00681dabb0343e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 8 11:50:31 2010 +0100 wined3d: Move the fullscreen window setup / restore code to the device. --- dlls/wined3d/device.c | 91 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 91 +--------------------------------------- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 92 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45cee64295e00681dabb0…

1 0

Maarten Lankhorst : quartz: Forward IQualityControl on pullpin to base filter.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

Module: wine Branch: master Commit: 3329873b818bfbb2b70846b6f2aa34bd07f5b973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3329873b818bfbb2b70846b6f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:12 2010 +0100 quartz: Forward IQualityControl on pullpin to base filter. --- dlls/quartz/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 118be2c..297b2d6 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -337,9 +337,10 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Eric Pouech : server: Removed the no longer used bare parameter out of get_console_mode request.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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

Maarten Lankhorst : quartz: Use media time instead of stream time in null renderer.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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

Maarten Lankhorst : quartz: Actually use the start time in SendRun.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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

Detlef Riekenberg : wtsapi32: Add a stub for WTSLogoffSession.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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 : strmbase: Forward IQualityControl on output pin to base filter.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

Module: wine Branch: master Commit: 81763bf2ba6638de16f5fa2f4e57cc3f831102d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81763bf2ba6638de16f5fa2f4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:11 2010 +0100 strmbase: Forward IQualityControl on output pin to base filter. --- dlls/strmbase/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 1b0b48c..1731145 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -359,9 +359,10 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Maarten Lankhorst : quartz: Remove position from filtergraph.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

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