June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : amstream: Release pins and streams array on instance release (Valgrind).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: a7e2b99145239868bf13035e945b233d8384c5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e2b99145239868bf13035e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 00:27:51 2015 +0300 amstream: Release pins and streams array on instance release (Valgrind). --- dlls/amstream/amstream.c | 1 + dlls/amstream/mediastreamfilter.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 372ddd6..1f8428b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -114,6 +114,7 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) { for(i = 0; i < This->nbStreams; i++) IAMMediaStream_Release(This->pStreams[i]); + CoTaskMemFree(This->pStreams); if (This->ipin) IPin_Release(This->ipin); if (This->media_stream_filter) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index d428970..d0c6714 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -249,6 +249,8 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) IMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } + CoTaskMemFree(This->streams); + CoTaskMemFree(This->pins); BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); }

1 0

Nikolay Sivov : amstream/tests: Get rid of global stream pointer that we don't really need.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 84c2fda63dc5c4725f585b1da26a2c19ef5f5d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c2fda63dc5c4725f585b1da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 00:26:50 2015 +0300 amstream/tests: Get rid of global stream pointer that we don't really need. --- dlls/amstream/tests/amstream.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 5121b35..f2f5723 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -28,19 +28,15 @@ static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; -static IAMMultiMediaStream* pams; static IDirectDraw7* pdd7; static IDirectDrawSurface7* pdds7; -static int create_ammultimediastream(void) +static IAMMultiMediaStream *create_ammultimediastream(void) { - return S_OK == CoCreateInstance( - &CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, (LPVOID*)&pams); -} - -static void release_ammultimediastream(void) -{ - IAMMultiMediaStream_Release(pams); + IAMMultiMediaStream *stream = NULL; + CoCreateInstance(&CLSID_AMMultiMediaStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMultiMediaStream, + (void**)&stream); + return stream; } static int create_directdraw(void) @@ -89,10 +85,11 @@ static void release_directdraw(void) static void test_openfile(void) { + IAMMultiMediaStream *pams; HRESULT hr; IGraphBuilder* pgraph; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); @@ -112,21 +109,22 @@ static void test_openfile(void) if (pgraph) IGraphBuilder_Release(pgraph); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } static void test_renderfile(void) { + IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; if (!create_directdraw()) { - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); return; } @@ -162,22 +160,23 @@ error: IMediaStream_Release(pvidstream); release_directdraw(); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } static void test_media_streams(void) { + IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *video_stream = NULL; IMediaStream *audio_stream = NULL; IMediaStream *dummy_stream; IMediaStreamFilter* media_stream_filter = NULL; - if (!create_ammultimediastream()) + if (!(pams = create_ammultimediastream())) return; if (!create_directdraw()) { - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); return; } @@ -424,7 +423,7 @@ static void test_media_streams(void) IMediaStreamFilter_Release(media_stream_filter); release_directdraw(); - release_ammultimediastream(); + IAMMultiMediaStream_Release(pams); } START_TEST(amstream)

1 0

Jacek Caban : urlmon/tests: Skip https tests on platforms that don' t support them.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: ab3744d2752e98eedd223810df01ef20a80f68f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3744d2752e98eedd223810d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 19 13:42:36 2015 +0200 urlmon/tests: Skip https tests on platforms that don't support them. Based on patch by Huw Davies. --- dlls/urlmon/tests/url.c | 68 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index dd3a52d..96ee6cc 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3851,6 +3851,32 @@ static void register_protocols(void) IInternetSession_Release(session); } +static BOOL can_do_https(void) +{ + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "GET", "/tests/hello.html", NULL, NULL, NULL, + INTERNET_FLAG_SECURE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + "request failed: %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return ret; +} + START_TEST(url) { HMODULE hurlmon; @@ -3930,25 +3956,34 @@ START_TEST(url) trace("file test (no callback)...\n"); test_BindToStorage(FILE_TEST, BINDTEST_NO_CALLBACK, TYMED_ISTREAM); - trace("synchronous https test (invalid CN, dialog)\n"); - onsecurityproblem_hres = S_FALSE; - http_is_first = TRUE; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + if(can_do_https()) { + trace("synchronous https test (invalid CN, dialog)\n"); + onsecurityproblem_hres = S_FALSE; + http_is_first = TRUE; + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); - bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + + trace("asynchronous https test (invalid CN, fail)\n"); + onsecurityproblem_hres = E_FAIL; + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); - trace("asynchronous https test (invalid CN, fail)\n"); - onsecurityproblem_hres = E_FAIL; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + trace("asynchronous https test (invalid CN, accept)\n"); + onsecurityproblem_hres = S_OK; + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + + trace("asynchronous https test (invalid CN, dialog 2)\n"); + onsecurityproblem_hres = S_FALSE; + test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + invalid_cn_accepted = FALSE; - trace("asynchronous https test (invalid CN, accept)\n"); - onsecurityproblem_hres = S_OK; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); + trace("asynchronous https test...\n"); + test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); + }else { + win_skip("Skipping https testt\n"); + } - trace("asynchronous https test (invalid CN, dialog 2)\n"); - onsecurityproblem_hres = S_FALSE; - test_BindToStorage(HTTPS_TEST, BINDTEST_INVALID_CN, TYMED_ISTREAM); - invalid_cn_accepted = FALSE; + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; trace("winetest test (async switch)...\n"); test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_ASYNC_SWITCH, TYMED_ISTREAM); @@ -4003,9 +4038,6 @@ START_TEST(url) trace("winetest test (no callback)...\n"); test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_NO_CALLBACK|BINDTEST_USE_CACHE, TYMED_ISTREAM); - trace("asynchronous https test...\n"); - test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); - trace("emulated https test...\n"); test_BindToStorage(HTTPS_TEST, BINDTEST_EMULATE, TYMED_ISTREAM);

1 0

Jacek Caban : wininet: Call set_socket_blocking always and only when needed.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: eef89b507052affd4d6d1abba3e1f83447196dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef89b507052affd4d6d1abba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 19 15:21:36 2015 +0200 wininet: Call set_socket_blocking always and only when needed. --- dlls/wininet/netconnection.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 40f53de..983782d 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -280,10 +280,10 @@ void init_winsock(void) InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); } -static void set_socket_blocking(int socket, BOOL is_blocking) +static void set_socket_blocking(netconn_t *conn, BOOL is_blocking) { ULONG arg = !is_blocking; - ioctlsocket(socket, FIONBIO, &arg); + ioctlsocket(conn->socket, FIONBIO, &arg); } static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) @@ -297,7 +297,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { - set_socket_blocking(netconn->socket, FALSE); + set_socket_blocking(netconn, FALSE); result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { @@ -325,9 +325,6 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t closesocket(netconn->socket); netconn->socket = -1; } - else { - set_socket_blocking(netconn->socket, TRUE); - } } if(result == -1) return ERROR_INTERNET_CANNOT_CONNECT; @@ -468,6 +465,8 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode assert(status != SEC_E_OK); + set_socket_blocking(connection, TRUE); + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { if(out_buf.cbBuffer) { assert(status == SEC_I_CONTINUE_NEEDED); @@ -662,6 +661,9 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { + /* send is always blocking. */ + set_socket_blocking(connection, TRUE); + if(!connection->secure) { *sent = sock_send(connection->socket, msg, len, flags); @@ -707,7 +709,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo conn->extra_buf = NULL; } - set_socket_blocking(conn->socket, blocking && !buf_len); + set_socket_blocking(conn, blocking && !buf_len); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 0) { if(!buf_len) { @@ -748,7 +750,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - set_socket_blocking(conn->socket, blocking); + set_socket_blocking(conn, blocking); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) { if(size < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { @@ -819,7 +821,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i if (!connection->secure) { - set_socket_blocking(connection->socket, blocking); + set_socket_blocking(connection, blocking); *recvd = sock_recv(connection->socket, buf, len, 0); return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } @@ -894,9 +896,8 @@ BOOL NETCON_is_alive(netconn_t *netconn) int len; char b; - set_socket_blocking(netconn->socket, FALSE); + set_socket_blocking(netconn, FALSE); len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); - set_socket_blocking(netconn->socket, TRUE); return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); }

1 0

Nikolay Sivov : oleaut32/tests: Fix stub buffer leak (Valgrind).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 4b1ff0078b183da73d084e791fc381cdb98278a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1ff0078b183da73d084e791… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 10:47:44 2015 +0300 oleaut32/tests: Fix stub buffer leak (Valgrind). --- dlls/oleaut32/tests/typelib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5bde6f2..df68340 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5500,6 +5500,7 @@ static void test_stub(void) hr = IPSFactoryBuffer_CreateStub(factory, &interfaceguid, &uk, &base_stub); ok(hr == S_OK, "got: %x, side: %04x\n", hr, side); + IRpcStubBuffer_Release(base_stub); IPSFactoryBuffer_Release(factory); next:

1 0

Nikolay Sivov : ieframe/tests: Fix some leaks (Valgrind).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 71cf22e5b0714eb9c854bbcb776d44845f28ef2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cf22e5b0714eb9c854bbcb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 09:36:39 2015 +0300 ieframe/tests: Fix some leaks (Valgrind). --- dlls/ieframe/tests/intshcut.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index ef99d42..75c6cfb 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -156,13 +156,14 @@ static void _check_string_transform(unsigned line, IUniformResourceLocatorA *url todo_wine ok_(__FILE__,line)(!lstrcmpA(output, expectedOutput), "unexpected URL change %s -> %s (expected %s)\n", input, output, expectedOutput); - CoTaskMemFree(output); }else { todo_wine ok_(__FILE__,line)(hr == S_FALSE, "GetUrl failed, hr=0x%x\n", hr); todo_wine ok_(__FILE__,line)(!output, "GetUrl returned %s\n", output); } + if (hr == S_OK) + CoTaskMemFree(output); } static void test_ReadAndWriteProperties(void) @@ -252,7 +253,7 @@ static void test_ReadAndWriteProperties(void) hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); ok(lstrcmpA(url, testurl) == 0, "Wrong url read from file: %s\n",url); - + CoTaskMemFree(url); hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -381,6 +382,7 @@ static void test_InternetShortcut(void) ok(hres == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hres); if(FAILED(hres)) return; + url->lpVtbl->Release(url); test_Aggregability(); test_QueryInterface();

1 0

Nikolay Sivov : gdi32/freetype: Properly handle loading of FT_Long-sized types (Valgrind).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 885394bb0ae83925f57c9066da2d06f6e011fa17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=885394bb0ae83925f57c9066d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 09:03:54 2015 +0300 gdi32/freetype: Properly handle loading of FT_Long-sized types (Valgrind). --- dlls/gdi32/freetype.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fc19f51..06b1b1e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1511,6 +1511,14 @@ static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) return ERROR_SUCCESS; } +static LONG reg_load_ftlong(HKEY hkey, const WCHAR *value, FT_Long *data) +{ + DWORD dw; + LONG ret = reg_load_dword(hkey, value, &dw); + *data = dw; + return ret; +} + static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) { return RegSetValueExW(hkey, value, 0, REG_DWORD, (BYTE*)&data, sizeof(DWORD)); @@ -1541,10 +1549,10 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu else face->FullName = NULL; - reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); + reg_load_ftlong(hkey_face, face_index_value, &face->face_index); reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); - reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_flags_value, (DWORD*)&face->flags); + reg_load_ftlong(hkey_face, face_version_value, &face->font_version); + reg_load_dword(hkey_face, face_flags_value, &face->flags); needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); @@ -1558,9 +1566,9 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu { face->scalable = FALSE; reg_load_dword(hkey_face, face_width_value, (DWORD*)&face->size.width); - reg_load_dword(hkey_face, face_size_value, (DWORD*)&face->size.size); - reg_load_dword(hkey_face, face_x_ppem_value, (DWORD*)&face->size.x_ppem); - reg_load_dword(hkey_face, face_y_ppem_value, (DWORD*)&face->size.y_ppem); + reg_load_ftlong(hkey_face, face_size_value, &face->size.size); + reg_load_ftlong(hkey_face, face_x_ppem_value, &face->size.x_ppem); + reg_load_ftlong(hkey_face, face_y_ppem_value, &face->size.y_ppem); reg_load_dword(hkey_face, face_internal_leading_value, (DWORD*)&face->size.internal_leading); TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n",

1 0

Nikolay Sivov : amstream: Get rid of some casts by using proper iface types.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 5b248546806c247c8a3c5011fc2d78af8d9da253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b248546806c247c8a3c5011f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 20 23:34:58 2015 +0300 amstream: Get rid of some casts by using proper iface types. --- dlls/amstream/amstream.c | 41 ++++++++++++++++++--------------------- dlls/amstream/amstream_private.h | 5 +++-- dlls/amstream/audiodata.c | 2 -- dlls/amstream/main.c | 1 - dlls/amstream/mediastream.c | 9 ++++----- dlls/amstream/mediastreamfilter.c | 1 - 6 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index fcef7ec..372ddd6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -27,7 +27,6 @@ #include "wingdi.h" #include "amstream_private.h" -#include "amstream.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); @@ -37,10 +36,10 @@ typedef struct { IGraphBuilder* pFilterGraph; IMediaSeeking* media_seeking; IMediaControl* media_control; - IBaseFilter* media_stream_filter; + IMediaStreamFilter *media_stream_filter; IPin* ipin; ULONG nbStreams; - IMediaStream** pStreams; + IAMMediaStream **pStreams; STREAM_TYPE StreamType; OAEVENT event; } IAMMultiMediaStreamImpl; @@ -114,11 +113,11 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) if (!ref) { for(i = 0; i < This->nbStreams; i++) - IMediaStream_Release(This->pStreams[i]); + IAMMediaStream_Release(This->pStreams[i]); if (This->ipin) IPin_Release(This->ipin); if (This->media_stream_filter) - IBaseFilter_Release(This->media_stream_filter); + IMediaStreamFilter_Release(This->media_stream_filter); if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -151,10 +150,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream for (i = 0; i < This->nbStreams; i++) { - IMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL); + IAMMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL); if (IsEqualIID(&PurposeId, idPurpose)) { - *ppMediaStream = This->pStreams[i]; + *ppMediaStream = (IMediaStream*)This->pStreams[i]; IMediaStream_AddRef(*ppMediaStream); return S_OK; } @@ -258,9 +257,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (SUCCEEDED(hr)) hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter); + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaStreamFilter, (void**)&This->media_stream_filter); if (SUCCEEDED(hr)) - hr = IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); + hr = IGraphBuilder_AddFilter(This->pFilterGraph, (IBaseFilter*)This->media_stream_filter, filternameW); if (SUCCEEDED(hr)) { IMediaEventEx* media_event = NULL; @@ -277,7 +276,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (FAILED(hr)) { if (This->media_stream_filter) - IBaseFilter_Release(This->media_stream_filter); + IMediaStreamFilter_Release(This->media_stream_filter); This->media_stream_filter = NULL; if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); @@ -313,19 +312,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); - HRESULT hr = S_OK; TRACE("(%p/%p)->(%p)\n", This, iface, ppFilter); if (!ppFilter) return E_POINTER; - *ppFilter = NULL; - - if (This->media_stream_filter) - hr = IBaseFilter_QueryInterface(This->media_stream_filter, &IID_IMediaStreamFilter, (LPVOID*)ppFilter); + *ppFilter = This->media_stream_filter; + if (*ppFilter) + IMediaStreamFilter_AddRef(*ppFilter); - return hr; + return S_OK; } static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream* iface, IUnknown* stream_object, const MSPID* PurposeId, @@ -333,8 +330,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; - IMediaStream* pStream; - IMediaStream** pNewStreams; + IAMMediaStream* pStream; + IAMMediaStream** pNewStreams; TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, stream_object, debugstr_guid(PurposeId), dwFlags, ppNewStream); @@ -374,10 +371,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { - pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); + pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IAMMediaStream*)); if (!pNewStreams) { - IMediaStream_Release(pStream); + IAMMediaStream_Release(pStream); return E_OUTOFMEMORY; } This->pStreams = pNewStreams; @@ -385,13 +382,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream This->nbStreams++; if (ppNewStream) - *ppNewStream = pStream; + *ppNewStream = (IMediaStream*)pStream; } if (SUCCEEDED(hr)) { /* Add stream to the media stream filter */ - IMediaStreamFilter_AddMediaStream((IMediaStreamFilter*)This->media_stream_filter, (IAMMediaStream*)pStream); + IMediaStreamFilter_AddMediaStream(This->media_stream_filter, pStream); } return hr; diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 0881c3e..64a376f 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -31,13 +31,14 @@ #include "dshow.h" #include "mmstream.h" #include "austream.h" +#include "amstream.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, - STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; + STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) DECLSPEC_HIDDEN; + STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 3a62a9f..c3bc1a6 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -25,8 +25,6 @@ #include "winbase.h" #include "amstream_private.h" -#include "amstream.h" - WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index e80c491..1149584 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -32,7 +32,6 @@ #include "rpcproxy.h" #include "amstream_private.h" -#include "amstream.h" #include "wine/debug.h" diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index f619cbd..b457d1f 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "amstream_private.h" -#include "amstream.h" #include "ddstream.h" @@ -428,7 +427,7 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStreamImpl_IDirect }; HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) + STREAM_TYPE stream_type, IAMMediaStream **media_stream) { DirectDrawMediaStreamImpl *object; @@ -446,7 +445,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; + *media_stream = &object->IAMMediaStream_iface; return S_OK; } @@ -828,7 +827,7 @@ static const struct IAudioMediaStreamVtbl AudioMediaStreamImpl_IAudioMediaStream }; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IMediaStream **media_stream) + STREAM_TYPE stream_type, IAMMediaStream **media_stream) { AudioMediaStreamImpl *object; @@ -846,7 +845,7 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; - *media_stream = (IMediaStream*)&object->IAMMediaStream_iface; + *media_stream = &object->IAMMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8c26c8e..d428970 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -29,7 +29,6 @@ #include "wine/strmbase.h" #include "amstream_private.h" -#include "amstream.h" #include "ddstream.h"

1 0

Nikolay Sivov : ole32/tests: Fix source buffer leak (Valgrind).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 1e97a2db17950fc853c917bef734a2871201c5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e97a2db17950fc853c917bef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 20 21:25:25 2015 +0300 ole32/tests: Fix source buffer leak (Valgrind). --- dlls/ole32/tests/usrmarshal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index b1803df..23cb910 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -869,6 +869,8 @@ static void test_marshal_SNB(void) g_expect_user_free = TRUE; SNB_UserFree(&umcb.Flags, &snb2); g_expect_user_free = FALSE; + + HeapFree(GetProcessHeap(), 0, src); } static void test_marshal_HDC(void)

1 0

Jacek Caban : mshtml: Added IHTMLXMLHttpRequest:: onreadystatechange property implementation.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 430df1ca61d09fe1b501841ada4d641e18219222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430df1ca61d09fe1b501841ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 21 13:05:11 2015 +0200 mshtml: Added IHTMLXMLHttpRequest::onreadystatechange property implementation. --- dlls/mshtml/xmlhttprequest.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index c3efbbc..4cb3fda 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -28,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -169,15 +171,19 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_statusText(IHTMLXMLHttpRequest *ifa static HRESULT WINAPI HTMLXMLHttpRequest_put_onreadystatechange(IHTMLXMLHttpRequest *iface, VARIANT v) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_event_handler(&This->event_target, EVENTID_READYSTATECHANGE, &v); } static HRESULT WINAPI HTMLXMLHttpRequest_get_onreadystatechange(IHTMLXMLHttpRequest *iface, VARIANT *p) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_event_handler(&This->event_target, EVENTID_READYSTATECHANGE, p); } static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface) @@ -246,12 +252,35 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); +} + +static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + + FIXME("(%p)\n", This); + + assert(eid == EVENTID_READYSTATECHANGE); +} + +static dispex_static_data_vtbl_t HTMLXMLHttpRequest_dispex_vtbl = { + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLXMLHttpRequest_bind_event +}; + static const tid_t HTMLXMLHttpRequest_iface_tids[] = { IHTMLXMLHttpRequest_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { - NULL, + &HTMLXMLHttpRequest_dispex_vtbl, DispHTMLXMLHttpRequest_tid, NULL, HTMLXMLHttpRequest_iface_tids

1 0