July 2019 - Wine-commits - list.winehq.org

Jacek Caban : ntdll: Move null terminating result to pf_vsnprintf callers.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: b350095b7660bd91c42d66ce12cd206586ea6b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b350095b7660bd91c42d66ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 3 21:06:14 2019 +0200 ntdll: Move null terminating result to pf_vsnprintf callers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index c1a0194..6b7293b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -75,17 +75,23 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( out->unicode ) { LPWSTR p = out->buf.W + out->used; - out->used += len; if (!out->buf.W) + { + out->used += len; return len; + } if( space >= len ) { memcpy( p, str, len*sizeof(WCHAR) ); + out->used += len; return len; } if( space > 0 ) + { memcpy( p, str, space*sizeof(WCHAR) ); + out->used += space; + } } else { @@ -93,16 +99,23 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) ULONG n; RtlUnicodeToMultiByteSize( &n, str, len * sizeof(WCHAR) ); - out->used += n; if (!out->buf.A) + { + out->used += n; return len; + } if( space >= n ) { RtlUnicodeToMultiByteN( p, n, NULL, str, len * sizeof(WCHAR) ); + out->used += n; return len; } - if (space > 0) RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); + if (space > 0) + { + RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); + out->used += space; + } } return -1; } @@ -116,17 +129,23 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( !out->unicode ) { LPSTR p = out->buf.A + out->used; - out->used += len; if (!out->buf.A) + { + out->used += len; return len; + } if( space >= len ) { memcpy( p, str, len ); + out->used += len; return len; } if( space > 0 ) + { memcpy( p, str, space ); + out->used += space; + } } else { @@ -134,16 +153,23 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) ULONG n; RtlMultiByteToUnicodeSize( &n, str, len ); - out->used += n / sizeof(WCHAR); if (!out->buf.W) + { + out->used += n / sizeof(WCHAR); return len; + } if (space >= n / sizeof(WCHAR)) { RtlMultiByteToUnicodeN( p, n, NULL, str, len ); + out->used += n / sizeof(WCHAR); return len; } - if (space > 0) RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); + if (space > 0) + { + RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); + out->used += space; + } } return -1; } @@ -657,9 +683,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis /* check we reached the end, and null terminate the string */ assert( *p == 0 ); - pf_output_stringW( out, p, 1 ); - - return out->used - 1; + return out->used; } @@ -686,6 +710,7 @@ int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_l } r = pf_vsnprintf( &out, formatW, args ); RtlFreeHeap( GetProcessHeap(), 0, formatW ); + if (out.used < len) str[out.used] = 0; return r; } @@ -696,13 +721,16 @@ int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_l int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) { pf_output out; + int r; out.unicode = TRUE; out.buf.W = str; out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, args ); + r = pf_vsnprintf( &out, format, args ); + if (out.used < len) str[out.used] = 0; + return r; }

1 0

Jacek Caban : ntdll: Implement _snprintf_s and _vsnprintf_s.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 4c2afc8ad95d8e19b1fe1c470a2b23eaba5bf81b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2afc8ad95d8e19b1fe1c47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 3 21:06:21 2019 +0200 ntdll: Implement _snprintf_s and _vsnprintf_s. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/printf.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94bc52c..299bfac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1406,6 +1406,7 @@ @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) @ varargs _snprintf(ptr long str) NTDLL__snprintf +@ varargs _snprintf_s(ptr long long str) _snprintf_s @ varargs _snwprintf(ptr long wstr) NTDLL__snwprintf @ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _strcmpi(str str) _stricmp @@ -1420,6 +1421,7 @@ @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) @ cdecl -norelay _vsnprintf(ptr long str ptr) NTDLL__vsnprintf +@ cdecl _vsnprintf_s(ptr long str ptr) _vsnprintf_s @ cdecl _vsnwprintf(ptr long wstr ptr) NTDLL__vsnwprintf @ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp @ cdecl _wcslwr(wstr) NTDLL__wcslwr diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 6b7293b..018f774 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -765,6 +765,51 @@ int WINAPIV NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) /********************************************************************* + * _vsnprintf_s (NTDLL.@) + */ +int CDECL _vsnprintf_s( char *str, SIZE_T size, SIZE_T len, const char *format, __ms_va_list args ) +{ + DWORD sz; + LPWSTR formatW = NULL; + pf_output out; + int r; + + out.unicode = FALSE; + out.buf.A = str; + out.used = 0; + out.len = min( size, len ); + + if (format) + { + RtlMultiByteToUnicodeSize( &sz, format, strlen(format) + 1 ); + if (!(formatW = RtlAllocateHeap( GetProcessHeap(), 0, sz ))) return -1; + RtlMultiByteToUnicodeN( formatW, sz, NULL, format, strlen(format) + 1 ); + } + r = pf_vsnprintf( &out, formatW, args ); + RtlFreeHeap( GetProcessHeap(), 0, formatW ); + if (out.used < size) str[out.used] = 0; + else str[0] = 0; + if (r == size) r = -1; + return r; +} + + +/********************************************************************* + * _snprintf_s (NTDLL.@) + */ +int WINAPIV _snprintf_s( char *str, SIZE_T size, SIZE_T len, const char *format, ... ) +{ + int ret; + __ms_va_list valist; + + __ms_va_start( valist, format ); + ret = _vsnprintf_s( str, size, len, format, valist ); + __ms_va_end( valist ); + return ret; +} + + +/********************************************************************* * vsprintf (NTDLL.@) */ int CDECL NTDLL_vsprintf( char *str, const char *format, __ms_va_list args ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 7954508..5a2d845 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -61,6 +61,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); +static int (WINAPIV *p__snprintf_s)(char *, size_t, size_t, const char *, ...); static int (__cdecl *p_tolower)(int); static int (__cdecl *p_toupper)(int); @@ -103,6 +104,7 @@ static void InitFunctionPtrs(void) p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); + p__snprintf_s = (void *)GetProcAddress(hntdll, "_snprintf_s"); p_tolower = (void *)GetProcAddress(hntdll, "tolower"); p_toupper = (void *)GetProcAddress(hntdll, "toupper"); @@ -1333,6 +1335,53 @@ static void test__snprintf(void) res = p__snprintf(buffer, strlen(teststring) + 1, teststring); ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); + + memset(buffer, 0x7c, sizeof(buffer)); + res = p__snprintf(buffer, 4, "test"); + ok(res == 4, "res = %d\n", res); + ok(!memcmp(buffer, "test", 4), "buf = %s\n", buffer); + ok(buffer[4] == 0x7c, "buffer[4] = %x\n", buffer[4]); + + memset(buffer, 0x7c, sizeof(buffer)); + res = p__snprintf(buffer, 3, "test"); + ok(res == -1, "res = %d\n", res); + } + +static void test__snprintf_s(void) +{ + char buf[32]; + int res; + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, sizeof(buf), sizeof(buf), "test"); + ok(res == 4, "res = %d\n", res); + ok(!strcmp(buf, "test"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 4, 4, "test"); + ok(res == -1, "res = %d\n", res); + ok(!buf[0], "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 5, 4, "test"); + ok(res == 4, "res = %d\n", res); + ok(!strcmp(buf, "test"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 5, 3, "test"); + ok(res == -1, "res = %d\n", res); + ok(!strcmp(buf, "tes"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 4, 10, "test"); + ok(res == -1, "res = %d\n", res); + ok(!buf[0], "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 6, 5, "test%c", 0); + ok(res == 5, "res = %d\n", res); + ok(!memcmp(buf, "test\0", 6), "buf = %s\n", buf); + } static void test_tolower(void) @@ -1442,6 +1491,10 @@ START_TEST(string) test_bsearch(); if (p__snprintf) test__snprintf(); + if (p__snprintf_s) + test__snprintf_s(); + else + win_skip("_snprintf_s not available\n"); test_tolower(); test_toupper(); test__strnicmp();

1 0

Zebediah Figura : ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 2698249362e7dce9426a948f55c921f931bb0dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2698249362e7dce9426a948f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 17:44:35 2019 -0500 ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 77 +------------------------------------------------ 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4ec8aaa..30865a0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -71,77 +71,6 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -static BOOL guid_from_string(const WCHAR *s, GUID *id) -{ - int i; - - if (!s || s[0] != '{') - { - memset( id, 0, sizeof (CLSID) ); - return FALSE; - } - - id->Data1 = 0; - for (i = 1; i < 9; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9] != '-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14] != '-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19] != '-') return FALSE; - - for (i = 20; i < 37; i += 2) - { - if (i == 24) - { - if (s[i] != '-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}') - return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { HANDLE event = context; @@ -594,7 +523,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; - GUID class; ULONG len; TRACE("device %s, enable %u.\n", debugstr_us(name), enable); @@ -615,9 +543,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (*p == '\\') refstr = p; if (!refstr) refstr = p; - if (!guid_from_string( refstr - 38, &class )) - return STATUS_INVALID_PARAMETER; - len = lstrlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) @@ -676,7 +601,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable { broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = class; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast );

1 0

Zebediah Figura : user32/tests: Test opening raw input devices.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 2ed141d6807da1e2e23c71d01aaf7af64af10ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ed141d6807da1e2e23c71d0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 3 11:09:36 2019 -0500 user32/tests: Test opening raw input devices. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 168b055..d0dc4a8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1625,6 +1625,7 @@ static void test_GetRawInputDeviceList(void) char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; + HANDLE file; /* get required buffer size */ name[0] = '\0'; @@ -1664,6 +1665,14 @@ static void test_GetRawInputDeviceList(void) ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + /* setupapi returns an NT device path, but CreateFile() < Vista can't + * understand that; so use the \\?\ prefix instead */ + name[1] = '\\'; + file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + todo_wine_if(info.dwType != RIM_TYPEHID) + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + CloseHandle(file); } /* check if variable changes from larger to smaller value */

1 0

Zebediah Figura : quartz/dsoundrender: Use flush_event instead of reimplementing it.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 221a0cdb94d4c8ff8a96d20ee191ad5b9a07421f URL: https://source.winehq.org/git/wine.git/?a=commit;h=221a0cdb94d4c8ff8a96d20e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:43 2019 -0500 quartz/dsoundrender: Use flush_event instead of reimplementing it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f74b673..fd04212 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,8 +64,6 @@ typedef struct DSoundRenderImpl REFERENCE_TIME play_time; - HANDLE blocked; - LONG volume; LONG pan; @@ -245,7 +243,7 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) This->in_loop = 1; LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->blocked, 10); + WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; @@ -270,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (hr != S_OK) { This->in_loop = 1; LeaveCriticalSection(&This->renderer.csRenderLock); - ret = WaitForSingleObject(This->blocked, 10); + ret = WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; if (This->renderer.sink.flushing || This->renderer.filter.state == State_Stopped) @@ -434,7 +432,6 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) IDirectSoundBuffer_Stop(This->dsbuffer); This->writepos = This->buf_size; - SetEvent(This->blocked); } static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) @@ -445,13 +442,7 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.sink.pin.pConnectedTo) { - if (This->renderer.filter.state == State_Paused) - { - /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ - SetEvent(This->blocked); - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - ResetEvent(This->blocked); } } @@ -548,17 +539,6 @@ static HRESULT WINAPI DSoundRender_EndOfStream(BaseRenderer* iface) return hr; } -static HRESULT WINAPI DSoundRender_BeginFlush(BaseRenderer* iface) -{ - DSoundRenderImpl *This = impl_from_BaseRenderer(iface); - - TRACE("\n"); - BaseRendererImpl_BeginFlush(iface); - SetEvent(This->blocked); - - return S_OK; -} - static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -566,8 +546,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->renderer.filter.state != State_Stopped) - ResetEvent(This->blocked); if (This->dsbuffer) { @@ -602,8 +580,6 @@ static void dsound_render_destroy(BaseRenderer *iface) IDirectSound8_Release(filter->dsound); filter->dsound = NULL; - CloseHandle(filter->blocked); - strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -643,7 +619,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CompleteConnect, DSoundRender_BreakConnect, DSoundRender_EndOfStream, - DSoundRender_BeginFlush, + NULL, DSoundRender_EndFlush, dsound_render_destroy, dsound_render_query_interface, @@ -695,14 +671,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) if (SUCCEEDED(hr)) { - pDSoundRender->blocked = CreateEventW(NULL, TRUE, TRUE, NULL); - - if (!pDSoundRender->blocked || FAILED(hr)) - { - IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); - return HRESULT_FROM_WIN32(GetLastError()); - } - *out = &pDSoundRender->renderer.filter.IUnknown_inner; } else @@ -735,7 +703,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->renderer.filter.state = State_Paused; - ResetEvent(This->blocked); ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock);

1 0

Zebediah Figura : quartz/dsoundrender: Use BaseRendererImpl_Pause().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: ca5a068a7b59b30ffdf81730db47c3de9dbbabb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca5a068a7b59b30ffdf81730… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:44 2019 -0500 quartz/dsoundrender: Use BaseRendererImpl_Pause(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fd04212..a5ebf1d 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -682,34 +682,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) return hr; } -static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->renderer.csRenderLock); - if (This->renderer.filter.state != State_Paused) - { - if (This->renderer.filter.state == State_Stopped) - { - if (This->renderer.sink.pin.pConnectedTo) - ResetEvent(This->renderer.state_event); - This->renderer.sink.end_of_stream = 0; - } - - hr = IDirectSoundBuffer_Stop(This->dsbuffer); - if (SUCCEEDED(hr)) - This->renderer.filter.state = State_Paused; - - ResetEvent(This->renderer.flush_event); - } - LeaveCriticalSection(&This->renderer.csRenderLock); - - return hr; -} - static const IBaseFilterVtbl DSoundRender_Vtbl = { BaseFilterImpl_QueryInterface, @@ -717,7 +689,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, - DSoundRender_Pause, + BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, BaseRendererImpl_SetSyncSource,

1 0

Zebediah Figura : strmbase: Remove several unused callbacks.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 48b475ad008adfdc831ab1e9cd90ea806d649237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b475ad008adfdc831ab1e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:45 2019 -0500 strmbase: Remove several unused callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 26 +++++--------------------- dlls/quartz/dsoundrender.c | 36 ++++++++++++++---------------------- dlls/quartz/videorenderer.c | 32 ++++++++++---------------------- dlls/quartz/vmr9.c | 33 +++++++++++---------------------- dlls/strmbase/renderer.c | 23 ++--------------------- include/wine/strmbase.h | 34 ++++++++++++---------------------- 6 files changed, 54 insertions(+), 130 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 74055d7..aeae6be 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -55,27 +55,11 @@ static void null_renderer_destroy(BaseRenderer *iface) CoTaskMemFree(filter); } -static const BaseRendererFuncTable RendererFuncTable = { - NullRenderer_CheckMediaType, - NullRenderer_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - /**/ - NULL, - NULL, - NULL, - NULL, - NULL, - null_renderer_destroy, +static const BaseRendererFuncTable RendererFuncTable = +{ + .pfnCheckMediaType = NullRenderer_CheckMediaType, + .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_destroy = null_renderer_destroy, }; static const IBaseFilterVtbl NullRenderer_Vtbl = diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a5ebf1d..e44b455 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -601,28 +601,20 @@ static HRESULT dsound_render_query_interface(BaseRenderer *iface, REFIID iid, vo return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = { - DSoundRender_CheckMediaType, - DSoundRender_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - DSoundRender_OnStartStreaming, - DSoundRender_OnStopStreaming, - NULL, - NULL, - NULL, - DSoundRender_ShouldDrawSampleNow, - DSoundRender_PrepareReceive, - /**/ - DSoundRender_CompleteConnect, - DSoundRender_BreakConnect, - DSoundRender_EndOfStream, - NULL, - DSoundRender_EndFlush, - dsound_render_destroy, - dsound_render_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = DSoundRender_CheckMediaType, + .pfnDoRenderSample = DSoundRender_DoRenderSample, + .pfnOnStartStreaming = DSoundRender_OnStartStreaming, + .pfnOnStopStreaming = DSoundRender_OnStopStreaming, + .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, + .pfnPrepareReceive = DSoundRender_PrepareReceive, + .pfnCompleteConnect = DSoundRender_CompleteConnect, + .pfnBreakConnect = DSoundRender_BreakConnect, + .pfnEndOfStream = DSoundRender_EndOfStream, + .pfnEndFlush = DSoundRender_EndFlush, + .renderer_destroy = dsound_render_destroy, + .renderer_query_interface = dsound_render_query_interface, }; HRESULT DSoundRender_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 2a18015..decbe83 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -469,28 +469,16 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig return BaseWindowImpl_OnSize(iface, Width, Height); } -static const BaseRendererFuncTable BaseFuncTable = { - VideoRenderer_CheckMediaType, - VideoRenderer_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - VideoRenderer_OnStartStreaming, - VideoRenderer_OnStopStreaming, - NULL, - NULL, - NULL, - VideoRenderer_ShouldDrawSampleNow, - NULL, - /**/ - NULL, - NULL, - NULL, - NULL, - VideoRenderer_EndFlush, - video_renderer_destroy, - video_renderer_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = VideoRenderer_CheckMediaType, + .pfnDoRenderSample = VideoRenderer_DoRenderSample, + .pfnOnStartStreaming = VideoRenderer_OnStartStreaming, + .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, + .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, + .pfnEndFlush = VideoRenderer_EndFlush, + .renderer_destroy = video_renderer_destroy, + .renderer_query_interface = video_renderer_query_interface, }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e5efc16..6761fbf 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -558,28 +558,17 @@ static HRESULT vmr_query_interface(BaseRenderer *iface, REFIID iid, void **out) return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = { - VMR9_CheckMediaType, - VMR9_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - VMR9_OnStartStreaming, - VMR9_OnStopStreaming, - NULL, - NULL, - NULL, - VMR9_ShouldDrawSampleNow, - NULL, - /**/ - VMR9_CompleteConnect, - VMR9_BreakConnect, - NULL, - NULL, - NULL, - vmr_destroy, - vmr_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = VMR9_CheckMediaType, + .pfnDoRenderSample = VMR9_DoRenderSample, + .pfnOnStartStreaming = VMR9_OnStartStreaming, + .pfnOnStopStreaming = VMR9_OnStopStreaming, + .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, + .pfnCompleteConnect = VMR9_CompleteConnect, + .pfnBreakConnect = VMR9_BreakConnect, + .renderer_destroy = vmr_destroy, + .renderer_query_interface = vmr_query_interface, }; static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 06adbe7..41a0e28 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -117,12 +117,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) - { - if (pFilter->pFuncsTable->pfnBeginFlush) - hr = pFilter->pFuncsTable->pfnBeginFlush(pFilter); - else - hr = BaseRendererImpl_BeginFlush(pFilter); - } + hr = BaseRendererImpl_BeginFlush(pFilter); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -334,17 +329,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp return hr; } - if (This->pFuncsTable->pfnPrepareRender) - This->pFuncsTable->pfnPrepareRender(This); - EnterCriticalSection(&This->csRenderLock); - if ( This->filter.state == State_Paused ) - { - if (This->pFuncsTable->pfnOnReceiveFirstSample) - This->pFuncsTable->pfnOnReceiveFirstSample(This, pSample); - + if (This->filter.state == State_Paused) SetEvent(This->state_event); - } /* Wait for render Time */ if (This->filter.pClock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) @@ -361,9 +348,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp REFERENCE_TIME now; DWORD_PTR cookie; - if (This->pFuncsTable->pfnOnWaitStart) - This->pFuncsTable->pfnOnWaitStart(This); - IReferenceClock_GetTime(This->filter.pClock, &now); if (now - This->filter.rtStreamStart - start <= -10000) @@ -380,9 +364,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp EnterCriticalSection(&This->csRenderLock); } - - if (This->pFuncsTable->pfnOnWaitEnd) - This->pFuncsTable->pfnOnWaitEnd(This); } else { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 22d65f8..f7f8741 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -576,28 +576,18 @@ typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (BaseRenderer *This); typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin *pReceivePin); typedef struct BaseRendererFuncTable { - /* Required */ - BaseRenderer_CheckMediaType pfnCheckMediaType; - BaseRenderer_DoRenderSample pfnDoRenderSample; - /* Optional, Data Handlers */ - BaseRenderer_OnReceiveFirstSample pfnOnReceiveFirstSample; - BaseRenderer_OnRenderEnd pfnOnRenderEnd; - BaseRenderer_OnRenderStart pfnOnRenderStart; - BaseRenderer_OnStartStreaming pfnOnStartStreaming; - BaseRenderer_OnStopStreaming pfnOnStopStreaming; - BaseRenderer_OnWaitEnd pfnOnWaitEnd; - BaseRenderer_OnWaitStart pfnOnWaitStart; - BaseRenderer_PrepareRender pfnPrepareRender; - BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; - BaseRenderer_PrepareReceive pfnPrepareReceive; - /* Optional, Input Pin */ - BaseRenderer_CompleteConnect pfnCompleteConnect; - BaseRenderer_BreakConnect pfnBreakConnect; - BaseRenderer_EndOfStream pfnEndOfStream; - BaseRenderer_BeginFlush pfnBeginFlush; - BaseRenderer_EndFlush pfnEndFlush; - void (*renderer_destroy)(BaseRenderer *iface); - HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); + BaseRenderer_CheckMediaType pfnCheckMediaType; + BaseRenderer_DoRenderSample pfnDoRenderSample; + BaseRenderer_OnStartStreaming pfnOnStartStreaming; + BaseRenderer_OnStopStreaming pfnOnStopStreaming; + BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; + BaseRenderer_PrepareReceive pfnPrepareReceive; + BaseRenderer_CompleteConnect pfnCompleteConnect; + BaseRenderer_BreakConnect pfnBreakConnect; + BaseRenderer_EndOfStream pfnEndOfStream; + BaseRenderer_EndFlush pfnEndFlush; + void (*renderer_destroy)(BaseRenderer *iface); + HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample);

1 0

Zebediah Figura : strmbase: Rename pfnOnStartStreaming to renderer_start_stream.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: fa5c24e9330bf94fc9cf84ce604e2d289bb6dac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5c24e9330bf94fc9cf84ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:46 2019 -0500 strmbase: Rename pfnOnStartStreaming to renderer_start_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e44b455..0759d7f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -434,7 +434,7 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) This->writepos = This->buf_size; } -static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) +static void dsound_render_start_stream(BaseRenderer *iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -605,7 +605,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, - .pfnOnStartStreaming = DSoundRender_OnStartStreaming, + .renderer_start_stream = dsound_render_start_stream, .pfnOnStopStreaming = DSoundRender_OnStopStreaming, .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, .pfnPrepareReceive = DSoundRender_PrepareReceive, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index decbe83..6f95fb6 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -417,7 +417,7 @@ static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } -static VOID WINAPI VideoRenderer_OnStartStreaming(BaseRenderer* iface) +static void video_renderer_start_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -473,7 +473,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, - .pfnOnStartStreaming = VideoRenderer_OnStartStreaming, + .renderer_start_stream = video_renderer_start_stream, .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnEndFlush = VideoRenderer_EndFlush, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6761fbf..e40ae6e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -429,7 +429,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) return hr; } -static VOID WINAPI VMR9_OnStartStreaming(BaseRenderer* iface) +static void vmr_start_stream(BaseRenderer *iface) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -562,7 +562,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, - .pfnOnStartStreaming = VMR9_OnStartStreaming, + .renderer_start_stream = vmr_start_stream, .pfnOnStopStreaming = VMR9_OnStopStreaming, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .pfnCompleteConnect = VMR9_CompleteConnect, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 41a0e28..e6fb024 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -441,8 +441,8 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (SUCCEEDED(hr)) { QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); - if (This->pFuncsTable->pfnOnStartStreaming) - This->pFuncsTable->pfnOnStartStreaming(This); + if (This->pFuncsTable->renderer_start_stream) + This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); This->filter.state = State_Running; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f7f8741..86aee4b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -562,7 +562,6 @@ typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(BaseRenderer *This, IMedia typedef VOID (WINAPI *BaseRenderer_OnReceiveFirstSample)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderEnd)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderStart)(BaseRenderer *This, IMediaSample *pMediaSample); -typedef VOID (WINAPI *BaseRenderer_OnStartStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This); @@ -578,7 +577,7 @@ typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; - BaseRenderer_OnStartStreaming pfnOnStartStreaming; + void (*renderer_start_stream)(BaseRenderer *iface); BaseRenderer_OnStopStreaming pfnOnStopStreaming; BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; BaseRenderer_PrepareReceive pfnPrepareReceive;

1 0

Zebediah Figura : strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 444f9b7ba2fda3f2c32cd4674eb78186505352d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444f9b7ba2fda3f2c32cd467… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:47 2019 -0500 strmbase: Rename pfnOnStopStreaming to renderer_stop_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 8 ++++---- include/wine/strmbase.h | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0759d7f..930b7a9 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ return S_OK; } -static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) +static void dsound_render_stop_stream(BaseRenderer *iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -606,7 +606,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, .renderer_start_stream = dsound_render_start_stream, - .pfnOnStopStreaming = DSoundRender_OnStopStreaming, + .renderer_stop_stream = dsound_render_stop_stream, .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, .pfnPrepareReceive = DSoundRender_PrepareReceive, .pfnCompleteConnect = DSoundRender_CompleteConnect, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6f95fb6..37c30ba 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -405,7 +405,7 @@ static HRESULT video_renderer_query_interface(BaseRenderer *iface, REFIID iid, v return S_OK; } -static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) +static void video_renderer_stop_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -474,7 +474,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_start_stream = video_renderer_start_stream, - .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, + .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnEndFlush = VideoRenderer_EndFlush, .renderer_destroy = video_renderer_destroy, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e40ae6e..f210d2c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -447,7 +447,7 @@ static void vmr_start_stream(BaseRenderer *iface) GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->target_rect); } -static VOID WINAPI VMR9_OnStopStreaming(BaseRenderer* iface) +static void vmr_stop_stream(BaseRenderer *iface) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +563,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_start_stream = vmr_start_stream, - .pfnOnStopStreaming = VMR9_OnStopStreaming, + .renderer_stop_stream = vmr_stop_stream, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .pfnCompleteConnect = VMR9_CompleteConnect, .pfnBreakConnect = VMR9_BreakConnect, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index e6fb024..e823e6b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -399,8 +399,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csRenderLock); { RendererPosPassThru_ResetMediaTime(This->pPosition); - if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); This->filter.state = State_Stopped; SetEvent(This->state_event); SetEvent(This->flush_event); @@ -469,8 +469,8 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } - else if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + else if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 86aee4b..0c2c9db 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -562,7 +562,6 @@ typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(BaseRenderer *This, IMedia typedef VOID (WINAPI *BaseRenderer_OnReceiveFirstSample)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderEnd)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderStart)(BaseRenderer *This, IMediaSample *pMediaSample); -typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_PrepareRender)(BaseRenderer *This); @@ -578,7 +577,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_start_stream)(BaseRenderer *iface); - BaseRenderer_OnStopStreaming pfnOnStopStreaming; + void (*renderer_stop_stream)(BaseRenderer *iface); BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; BaseRenderer_PrepareReceive pfnPrepareReceive; BaseRenderer_CompleteConnect pfnCompleteConnect;

1 0

Nikolay Sivov : devenum: Don't free uninitialized pointer value.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 57c6b9fd41ec306fb10a01a36e4347f7f08451d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c6b9fd41ec306fb10a01a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:23 2019 +0300 devenum: Don't free uninitialized pointer value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 76bb0c2..8e82fcd 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -379,9 +379,9 @@ static void free_regfilter2(REGFILTER2 *rgf) static void write_filter_data(IPropertyBag *prop_bag, REGFILTER2 *rgf) { + BYTE *data = NULL, *array; IAMFilterData *fildata; SAFEARRAYBOUND sabound; - BYTE *data, *array; VARIANT var = {}; ULONG size; HRESULT hr;

1 0