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

Michael Stefaniuc : dmband: COM cleanup for IDirectMusicTrack8.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 70eadcd543caed54eeb892de2121901347cbe512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eadcd543caed54eeb892de2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:16:24 2015 +0200 dmband: COM cleanup for IDirectMusicTrack8. --- dlls/dmband/bandtrack.c | 131 +++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70eadcd543caed54eeb89…

1 0

Michael Stefaniuc : dmband: Pass objects instead of ifaces to helpers.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 367ee6caa9153077d94902a8e56ec75c3cf2d72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=367ee6caa9153077d94902a8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:15:04 2015 +0200 dmband: Pass objects instead of ifaces to helpers. --- dlls/dmband/bandtrack.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 3c00415..9159f17 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -306,10 +306,9 @@ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_IsDirty (LPPERSISTSTR return S_FALSE; } -static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicBand** ppBand, - DMUS_PRIVATE_BAND_ITEM_HEADER* pHeader) { - - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); +static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream, + IDirectMusicBand **ppBand, DMUS_PRIVATE_BAND_ITEM_HEADER *pHeader) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -352,9 +351,9 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM if return S_OK; } -static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface);*/ +static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, ListSize[3], ListCount[3]; @@ -426,8 +425,8 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicBandTrack_IPersistStream_LoadBand (iface, pClonedStream, &pBand, &header); + + hr = load_band(This, pClonedStream, &pBand, &header); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -474,9 +473,9 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandsList (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); +static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -538,7 +537,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (LPPERSIS } case DMUS_FOURCC_BANDS_LIST: { TRACE_(dmfile)(": TRACK list\n"); - hr = IDirectMusicBandTrack_IPersistStream_ParseBandsList (iface, &Chunk, pStm); + hr = parse_bands_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -584,7 +583,7 @@ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { TRACE_(dmfile)(": Band track form\n"); - hr = IDirectMusicBandTrack_IPersistStream_ParseBandTrackForm (iface, &Chunk, pStm); + hr = parse_bandtrack_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmime: Move struct definitions to the files that need them.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 619c697da0a2968bfee1f9fd7ad990d05739658a URL: http://source.winehq.org/git/wine.git/?a=commit;h=619c697da0a2968bfee1f9fd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:12:30 2015 +0200 dmime: Move struct definitions to the files that need them. --- dlls/dmime/dmime_private.h | 141 ----------------------------------------- dlls/dmime/lyricstrack.c | 8 +++ dlls/dmime/markertrack.c | 8 +++ dlls/dmime/paramcontroltrack.c | 8 +++ dlls/dmime/segtriggertrack.c | 9 +++ dlls/dmime/seqtrack.c | 8 +++ dlls/dmime/sysextrack.c | 8 +++ dlls/dmime/tempotrack.c | 10 +++ dlls/dmime/timesigtrack.c | 8 +++ dlls/dmime/wavetrack.c | 11 ++++ 10 files changed, 78 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=619c697da0a2968bfee1f…

1 0

Sebastian Lackner : windowscodecs: Distinguish interface pointer and implementation pointer.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 40e364f0a6877abdb8e0abc9ba88825aefd81495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e364f0a6877abdb8e0abc9b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 05:52:08 2015 +0200 windowscodecs: Distinguish interface pointer and implementation pointer. --- dlls/windowscodecs/info.c | 20 ++++++++++---------- dlls/windowscodecs/stream.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 2cb64d4..cf3c38a 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -230,7 +230,7 @@ static HRESULT WINAPI BitmapDecoderInfo_QueryInterface(IWICBitmapDecoderInfo *if IsEqualIID(&IID_IWICBitmapCodecInfo, iid) || IsEqualIID(&IID_IWICBitmapDecoderInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoderInfo_iface; } else { @@ -671,7 +671,7 @@ static HRESULT BitmapDecoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWIC This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICBitmapDecoderInfo_iface; return S_OK; } @@ -700,7 +700,7 @@ static HRESULT WINAPI BitmapEncoderInfo_QueryInterface(IWICBitmapEncoderInfo *if IsEqualIID(&IID_IWICBitmapCodecInfo, iid) || IsEqualIID(&IID_IWICBitmapEncoderInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoderInfo_iface; } else { @@ -962,7 +962,7 @@ static HRESULT BitmapEncoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWIC This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICBitmapEncoderInfo_iface; return S_OK; } @@ -990,7 +990,7 @@ static HRESULT WINAPI FormatConverterInfo_QueryInterface(IWICFormatConverterInfo IsEqualIID(&IID_IWICComponentInfo, iid) || IsEqualIID(&IID_IWICFormatConverterInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICFormatConverterInfo_iface; } else { @@ -1179,7 +1179,7 @@ static HRESULT FormatConverterInfo_Constructor(HKEY classkey, REFCLSID clsid, IW This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICFormatConverterInfo_iface; return S_OK; } @@ -1208,7 +1208,7 @@ static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface IsEqualIID(&IID_IWICPixelFormatInfo, iid) || IsEqualIID(&IID_IWICPixelFormatInfo2 ,iid)) { - *ppv = This; + *ppv = &This->IWICPixelFormatInfo2_iface; } else { @@ -1473,7 +1473,7 @@ static HRESULT PixelFormatInfo_Constructor(HKEY classkey, REFCLSID clsid, IWICCo This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICPixelFormatInfo2_iface; return S_OK; } @@ -1504,7 +1504,7 @@ static HRESULT WINAPI MetadataReaderInfo_QueryInterface(IWICMetadataReaderInfo * IsEqualIID(&IID_IWICMetadataHandlerInfo, riid) || IsEqualIID(&IID_IWICMetadataReaderInfo, riid)) { - *ppv = This; + *ppv = &This->IWICMetadataReaderInfo_iface; } else { @@ -1912,7 +1912,7 @@ static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWI This->classkey = classkey; This->clsid = *clsid; - *info = (IWICComponentInfo *)This; + *info = (IWICComponentInfo *)&This->IWICMetadataReaderInfo_iface; return S_OK; } diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index f6bfedf..d05e940 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -757,7 +757,7 @@ static HRESULT WINAPI IWICStreamImpl_QueryInterface(IWICStream *iface, if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || IsEqualIID(&IID_ISequentialStream, iid) || IsEqualIID(&IID_IWICStream, iid)) { - *ppv = This; + *ppv = &This->IWICStream_iface; IUnknown_AddRef((IUnknown*)*ppv); return S_OK; }

1 0

Michael Müller : wininet: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: efd41e4f2b1c784d4939aa10d869f87f2384f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd41e4f2b1c784d4939aa10d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:28:02 2015 +0200 wininet: Fix arguments of HttpAddRequestHeaders. --- dlls/wininet/http.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3be88b7..dc54820 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1671,7 +1671,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } else if (!strcmpW(header, szAuthorization) && (host = get_host_header(request))) @@ -1692,7 +1693,8 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(request, header, authorization, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, header, authorization, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(data); heap_free(authorization); } @@ -3413,7 +3415,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | - (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); } } @@ -4253,7 +4255,8 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(cookies); } @@ -4974,7 +4977,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_FixURL(request); if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { - HTTP_ProcessHeader(request, szConnection, szKeepAlive, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ProcessHeader(request, szConnection, szKeepAlive, + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); } HTTP_InsertAuthorization(request, request->authInfo, szAuthorization); HTTP_InsertAuthorization(request, request->proxyAuthInfo, szProxy_Authorization); @@ -5991,7 +5995,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* Add status code */ HTTP_ProcessHeader(request, szStatus, status_code, - HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(request->version); heap_free(request->statusText);

1 0

Michael Müller : rpcrt4: Fix arguments of HttpAddRequestHeaders.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: ab82b446a0e771e5dd261975eb58937f78c99cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab82b446a0e771e5dd261975e… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 12:27:43 2015 +0200 rpcrt4: Fix arguments of HttpAddRequestHeaders. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8c0263b..fbc2ad7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2275,7 +2275,7 @@ static RPC_STATUS insert_content_length_header(HINTERNET request, DWORD len) WCHAR header[sizeof(fmtW) / sizeof(fmtW[0]) + 10]; sprintfW(header, fmtW, len); - if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE))) return RPC_S_OK; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD))) return RPC_S_OK; return RPC_S_SERVER_UNAVAILABLE; } @@ -2867,7 +2867,7 @@ static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request } if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC) - HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE); + HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); destroy_authinfo(info); return status;

1 0

Nikolay Sivov : dmsynth: Cleanup IDirectMusicSynth8 creation helper.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 32924d4ed0e49b74f5d4f6bbe2d63a4837f40117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32924d4ed0e49b74f5d4f6bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 12:13:43 2015 +0300 dmsynth: Cleanup IDirectMusicSynth8 creation helper. --- dlls/dmsynth/synth.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index af8a6fd..cdf8026 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -575,31 +575,37 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) -{ - IDirectMusicSynth8Impl *obj; - - TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSynth8Impl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; - obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; - obj->ref = 0; - /* fill in caps */ - obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); - obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; - obj->pCaps.guidPort = CLSID_DirectMusicSynth; - obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; - obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; - obj->pCaps.dwMaxChannelGroups = 1000; - obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = 2; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); - - return IDirectMusicSynth8Impl_QueryInterface ((LPDIRECTMUSICSYNTH8)obj, lpcGUID, ppobj); +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj, IUnknown *outer) +{ + static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', + 'S','y','n','t','h','e','s','i','z','e','r',0}; + IDirectMusicSynth8Impl *obj; + HRESULT hr; + + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ppobj, outer); + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (NULL == obj) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + obj->IDirectMusicSynth8_iface.lpVtbl = &DirectMusicSynth8_Vtbl; + obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; + obj->ref = 1; + /* fill in caps */ + obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); + obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; + obj->pCaps.guidPort = CLSID_DirectMusicSynth; + obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; + obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; + obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; + obj->pCaps.dwMaxChannelGroups = 1000; + obj->pCaps.dwMaxVoices = 1000; + obj->pCaps.dwMaxAudioChannels = 2; + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; + strcpyW(obj->pCaps.wszDescription, descrW); + + hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); + IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); + return hr; }

1 0

Michael Müller : fltlib: Add stub for FilterLoad.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: ca0973486aeee2d7f4d919f326fd472a24c77b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0973486aeee2d7f4d919f32… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 25 08:17:11 2015 +0200 fltlib: Add stub for FilterLoad. --- dlls/fltlib/fltlib.c | 15 ++++++++++++--- dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 50f46ac..b968c2b 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -79,13 +79,22 @@ HRESULT WINAPI FilterFindClose(HANDLE handle) } /********************************************************************** + * FilterLoad (FLTLIB.@) + */ +HRESULT WINAPI FilterLoad(LPCWSTR filtername) +{ + FIXME("(%s) stub\n", debugstr_w(filtername)); + return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); +} + +/********************************************************************** * FilterUnload (FLTLIB.@) */ -HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +HRESULT WINAPI FilterUnload(LPCWSTR filtername) { - FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + FIXME("(%s) stub\n", debugstr_w(filtername)); - if (!lpFilterName) + if (!filtername) return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); return S_OK; diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index 91e803b..226a615 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -16,7 +16,7 @@ @ stub FilterInstanceFindFirst @ stub FilterInstanceFindNext @ stub FilterInstanceGetInformation -@ stub FilterLoad +@ stdcall FilterLoad(wstr) @ stub FilterReplyMessage @ stub FilterSendMessage @ stdcall FilterUnload(wstr)

1 0

Michael Stefaniuc : dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 7090b26300bf26dbdc2d39cdfb61640d5f445d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7090b26300bf26dbdc2d39cdf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 25 00:38:37 2015 +0200 dmcompos: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmcompos/chordmaptrack.c | 74 ++++++++++++++++++------------ dlls/dmcompos/signposttrack.c | 103 +++++++++++++++++++++++++----------------- 2 files changed, 105 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7090b26300bf26dbdc2d3…

1 0

Ken Thomases : dbghelp: Parse the DWARF information in Mach-O modules.
by Alexandre Julliard June 25, 2015

June 25, 2015

Module: wine Branch: master Commit: 3a9698f4afff9e349146c126d682e00422e62064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9698f4afff9e349146c126d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 24 17:17:49 2015 -0500 dbghelp: Parse the DWARF information in Mach-O modules. At this point, this is just the .eh_frame information used for walking the stack. --- dlls/dbghelp/macho_module.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f6e5ed3..f39b4b6 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1002,6 +1002,10 @@ BOOL macho_load_debug_info(struct module* module) macho_finish_stabs(module, &mdi.ht_symtab); + if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, + &module->format_info[DFI_MACHO]->u.macho_info->file_map)) + ret = TRUE; + pool_destroy(&mdi.pool); return ret; } @@ -1125,6 +1129,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } + macho_info->module->reloc_delta = macho_info->module->module.BaseOfImage - fmap.u.macho.segs_start; macho_module_info = (void*)(modfmt + 1); macho_info->module->format_info[DFI_MACHO] = modfmt;

1 0