June 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : oledb32: Add support for converting to W/ STR types in GetConversionSize.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 23b5640b3286e71b9f9ea78aaa131298281469f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b5640b3286e71b9f9ea78aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:50 2017 +0000 oledb32: Add support for converting to W/STR types in GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 24 ++++++++++++ dlls/oledb32/tests/convert.c | 88 ++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b5640b3286e71b9f9ea…

1 0

Alistair Leslie-Hughes : oledb32: Add FIXME for DBTYPE_NUMERIC type.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 6e148790f4ae852be437f4cb40d4ef63fa6c0c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e148790f4ae852be437f4cb4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:58 2017 +0000 oledb32: Add FIXME for DBTYPE_NUMERIC type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 59b2ecd..d959f65 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1081,7 +1081,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } - break; + + case DBTYPE_NUMERIC: + FIXME("Unimplemented conversion %04x -> DBTYPE_NUMERIC\n", src_type); + return E_NOTIMPL; default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);

1 0

Paul Gofman : d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 5cbc84e51eca1a8ce35916ddeebe79b4ccbd761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc84e51eca1a8ce35916dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 19 12:24:22 2017 +0300 d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d75c5ce..2a78074 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3230,7 +3230,7 @@ PS_OUTPUT RenderScenePS( VS_OUTPUT In, uniform bool2x3 mb) Output.RGBColor.xy += mul(Output.RGBColor, m3x2column); Output.RGBColor.xy += mul(Output.RGBColor, m3x2row); } - if (mb2x3column[0][1]) + if (mb2x3column[0][0]) { Output.RGBColor += sin(Output.RGBColor); Output.RGBColor += cos(Output.RGBColor); @@ -3486,7 +3486,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x00000002, 0x00000118, 0x00000128, 0x00000148, 0x00060002, 0x00000002, 0x00000150, 0x00000160, 0x00000180, 0x00000002, 0x00000003, 0x0000018c, 0x0000019c, 0x000001cc, 0x000a0002, 0x00000002, 0x000001d4, 0x000001e4, 0x00000204, 0x000c0002, 0x00000002, 0x00000210, 0x00000220, 0x00000240, - 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000002, 0x00000294, + 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000001, 0x00000294, 0x000002a4, 0x000002bc, 0x00000000, 0x00000005, 0x000002c8, 0x000002a4, 0x000002d8, 0x00000003, 0x00000001, 0x000002e4, 0x00000000, 0x56695f67, 0x00746365, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x3278326d, 0x756c6f63, 0xab006e6d, @@ -3543,7 +3543,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x80e40003, 0xa0e4000d, 0x03000002, 0x80030000, 0x80e40000, 0x80e40003, 0x03000005, 0x800c0000, 0x80550000, 0xa0440004, 0x04000004, 0x800c0000, 0x80000000, 0xa0440003, 0x80e40000, 0x04000004, 0x800c0000, 0x80aa0003, 0xa0440005, 0x80e40000, 0x03000002, 0x80030003, 0x80ee0000, 0x80e40000, - 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40806, 0x04000004, + 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40805, 0x04000004, 0x800f0000, 0x80e40003, 0xa0550010, 0xa0aa0010, 0x02000013, 0x800f0000, 0x80e40000, 0x04000004, 0x800f0000, 0x80e40000, 0xa000000f, 0xa055000f, 0x03000005, 0x800f0000, 0x80e40000, 0x80e40000, 0x04000004, 0x800f0002, 0x80e40000, 0xa0aa000f, 0xa0ff000f, 0x04000004, 0x800f0002, 0x80e40000, @@ -4317,7 +4317,7 @@ got (%g, %g, %g, %g), parameter %s.\n", static const BOOL test_effect_preshader_bconsts[] = { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE }; static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) @@ -6057,7 +6057,7 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) {14, 0, 0}, {15, 0, 14}, {16, 0, 1}, - {17, 0, 7}, + {17, 0, 6}, }; static D3DLIGHT9 light_filler = {D3DLIGHT_DIRECTIONAL, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}};

1 0

Hans Leidekker : webservices: Add support for reading WS_XML_QNAME values.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 7fef84e3c5400d01373eeca3999f7959ad92a660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fef84e3c5400d01373eeca39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:37:42 2017 +0200 webservices: Add support for reading WS_XML_QNAME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 336 ++++++++++++++++++++++------------------ dlls/webservices/tests/reader.c | 27 ++++ 2 files changed, 216 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fef84e3c5400d01373ee…

1 0

Hans Leidekker : winhttp: Only read as much data as advertized when draining content.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 09238973e82bdb9e17637319c02389f7d0db0b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09238973e82bdb9e17637319c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:39:10 2017 +0200 winhttp: Only read as much data as advertized when draining content. Fixes a regression caused by 2fa86fd6616e1671dd3ecfa3d2d6eaccf10be994. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index db6d12d..f35d73b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1302,13 +1302,20 @@ done: /* read any content returned by the server so that the connection can be reused */ static void drain_content( request_t *request ) { - DWORD bytes_read; + DWORD size, bytes_read, bytes_total = 0, bytes_left = request->content_length - request->content_read; char buffer[2048]; refill_buffer( request, FALSE ); for (;;) { - if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; + if (request->read_chunked) size = sizeof(buffer); + else + { + if (bytes_total >= bytes_left) return; + size = min( sizeof(buffer), bytes_left - bytes_total ); + } + if (!read_data( request, buffer, size, &bytes_read, FALSE ) || !bytes_read) return; + bytes_total += bytes_read; } }

1 0

Dmitry Timoshkov : cmd: '$E' in the prompt should be interpreted as an escape code (0x1b).
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 586e171d6fc81db670d290ebcc84fc467db7c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e171d6fc81db670d290ebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:24:11 2017 +0800 cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1aa3c1c..102e485 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -379,7 +379,7 @@ static void WCMD_show_prompt (void) { while (*q) q++; break; case 'E': - *q++ = '\E'; + *q++ = '\x1b'; break; case 'F': *q++ = ')';

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of ChangeDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 508d7a33e38ab5faf524327b7680132accc83e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508d7a33e38ab5faf524327b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:40 2017 +0200 wineandroid: Add a stub implementation of ChangeDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 11 +++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 871e41d..75905a4 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -207,6 +207,17 @@ static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) /*********************************************************************** + * ANDROID_ChangeDisplaySettingsEx + */ +LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, + HWND hwnd, DWORD flags, LPVOID lpvoid ) +{ + FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid ); + return DISP_CHANGE_SUCCESSFUL; +} + + +/*********************************************************************** * ANDROID_GetMonitorInfo */ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 918140f..8e98baa 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx +@ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of EnumDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 1aa8cf05000cfc7f560835dc01ab3afb2f2a2fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa8cf05000cfc7f560835dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:58 2017 +0200 wineandroid: Add a stub implementation of EnumDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 39 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 75905a4..54be12a 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -268,6 +268,45 @@ BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pr } +/*********************************************************************** + * ANDROID_EnumDisplaySettingsEx + */ +BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) +{ + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; + + devmode->dmSize = offsetof( DEVMODEW, dmICMMethod ); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + memcpy( devmode->dmDeviceName, dev_name, sizeof(dev_name) ); + devmode->dmDriverExtra = 0; + devmode->u2.dmDisplayFlags = 0; + devmode->dmDisplayFrequency = 0; + devmode->u1.s2.dmPosition.x = 0; + devmode->u1.s2.dmPosition.y = 0; + devmode->u1.s2.dmDisplayOrientation = 0; + devmode->u1.s2.dmDisplayFixedOutput = 0; + + if (n == ENUM_CURRENT_SETTINGS || n == ENUM_REGISTRY_SETTINGS) n = 0; + if (n == 0) + { + devmode->dmPelsWidth = screen_width; + devmode->dmPelsHeight = screen_height; + devmode->dmBitsPerPel = screen_bpp; + devmode->dmDisplayFrequency = 60; + devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); + return TRUE; + } + TRACE( "mode %d -- not present\n", n ); + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; +} + + static const struct gdi_dc_funcs android_drv_funcs = { NULL, /* pAbortDoc */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 8e98baa..3439ff6 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -11,6 +11,7 @@ @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors +@ cdecl EnumDisplaySettingsEx(ptr long ptr long) ANDROID_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow

1 0

Zebediah Figura : quartz: Restore a comment explaining mediatime.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1d14d2665be5615cad7db519ef3cc2dd067cc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d14d2665be5615cad7db519… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:31 2017 -0500 quartz: Restore a comment explaining mediatime. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7cad3a7..a9855e9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -33,6 +33,7 @@ #include "wine/strmbase.h" #include "wine/list.h" +/* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time)

1 0

Zebediah Figura : quartz: Use nAvgBytesPerSec to calculate length.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e994c62e3e66aebe137a3f2b15bdf3246fdaa08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e994c62e3e66aebe137a3f2b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:32 2017 -0500 quartz: Use nAvgBytesPerSec to calculate length. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/waveparser.c | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9e8f69c..7902955 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -115,9 +115,9 @@ static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = time; - ret *= wfx->nSamplesPerSec; + ret *= wfx->nAvgBytesPerSec; ret /= 10000000; - ret *= wfx->nBlockAlign; + ret -= ret % wfx->nBlockAlign; return ret; } @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ TRACE("Format = %p\n", format); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec); + TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6e8c664..f6bea2c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -43,9 +43,8 @@ typedef struct WAVEParserImpl ParserImpl Parser; LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; - DWORD dwSampleSize; - DWORD nSamplesPerSec; - DWORD dwLength; + DWORD nAvgBytesPerSec; + DWORD nBlockAlign; } WAVEParserImpl; static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) @@ -62,7 +61,7 @@ static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) { LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); duration *= 10000000; - duration /= (This->dwSampleSize * This->nSamplesPerSec); + duration /= This->nAvgBytesPerSec; return duration; } @@ -71,11 +70,11 @@ static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) { LONGLONG bytepos; - bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos = This->nAvgBytesPerSec; bytepos *= duration; bytepos /= 10000000; + bytepos -= bytepos % This->nBlockAlign; bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); - bytepos -= bytepos % This->dwSampleSize; return MEDIATIME_FROM_BYTES(bytepos); } @@ -252,7 +251,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, PIN_INFO piOutput; AM_MEDIA_TYPE amt; WAVEParserImpl * pWAVEParser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - LONGLONG length, avail; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; @@ -321,10 +319,8 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbPrefix = 0; props->cbBuffer = 4096; props->cBuffers = 3; - pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; - IAsyncReader_Length(This->pReader, &length, &avail); - pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; + pWAVEParser->nBlockAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nAvgBytesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, props, &amt); CoTaskMemFree(amt.pbFormat);

1 0