March 2012 - Wine-Commits - list.winehq.org

Andrew Eikum : winmm: Support DRVM_MAPPER_PREFERRED_GET in waveXxxMessage.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 6a6e1bd50ea1bbef09b62f4593794959abff1a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6e1bd50ea1bbef09b62f459… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 27 12:41:04 2012 -0500 winmm: Support DRVM_MAPPER_PREFERRED_GET in waveXxxMessage. --- dlls/winmm/tests/capture.c | 10 ++++++++++ dlls/winmm/tests/wave.c | 9 +++++++++ dlls/winmm/waveform.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 50a34c2..32deb28 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "mmddk.h" #include "mmsystem.h" #define NOBITMAP #include "mmreg.h" @@ -639,11 +640,20 @@ static void wave_in_tests(void) WAVEFORMATEX format; HWAVEIN win; MMRESULT rc; + DWORD preferred, status; UINT ndev,d; ndev=waveInGetNumDevs(); trace("found %d WaveIn devices\n",ndev); + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&preferred, (DWORD_PTR)&status); + ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a96d088..8a070b3 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1378,11 +1378,20 @@ static void wave_out_tests(void) WAVEFORMATEX format; HWAVEOUT wout; MMRESULT rc; + DWORD preferred, status; UINT ndev,d; ndev=waveOutGetNumDevs(); trace("found %d WaveOut devices\n",ndev); + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&preferred, (DWORD_PTR)&status); + ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d7d2be6..3ca087e 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2797,6 +2797,20 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; + case DRVM_MAPPER_PREFERRED_GET: + if(dwParam1) { + if(g_outmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + } + + if(dwParam2) + /* Status flags */ + *(DWORD *)dwParam2 = 0; + + return MMSYSERR_NOERROR; } TRACE("Message not supported: %u\n", uMessage); @@ -3173,6 +3187,20 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; + case DRVM_MAPPER_PREFERRED_GET: + if(dwParam1) { + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + } + + if(dwParam2) + /* Status flags */ + *(DWORD *)dwParam2 = 0; + + return MMSYSERR_NOERROR; } TRACE("Message not supported: %u\n", uMessage);

1 0

Michael Stefaniuc : riched20: Avoid a forward declaration of a vtbl.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 6f299c5d76bcece865d46fafae288443c89ce902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f299c5d76bcece865d46fafa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:31:45 2012 +0200 riched20: Avoid a forward declaration of a vtbl. --- dlls/riched20/txtsrv.c | 84 +++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index a2fe8dc..25b3283 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -62,49 +62,6 @@ typedef struct ITextServicesImpl { char spare[256]; } ITextServicesImpl; -static const ITextServicesVtbl textservices_Vtbl; - -/****************************************************************** - * CreateTextServices (RICHED20.4) - */ -HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, - ITextHost * pITextHost, - IUnknown **ppUnk) -{ - ITextServicesImpl *ITextImpl; - HRESULT hres; - TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); - if (pITextHost == NULL) - return E_POINTER; - - ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); - if (ITextImpl == NULL) - return E_OUTOFMEMORY; - InitializeCriticalSection(&ITextImpl->csTxtSrv); - ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); - ITextImpl->ref = 1; - ITextHost_AddRef(pITextHost); - ITextImpl->pMyHost = pITextHost; - ITextImpl->ITextServices_iface.lpVtbl = &textservices_Vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); - ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; - - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - - if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } - - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; - return S_OK; -} - static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) { return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); @@ -370,7 +327,7 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -static const ITextServicesVtbl textservices_Vtbl = +static const ITextServicesVtbl textservices_vtbl = { fnTextSrv_QueryInterface, fnTextSrv_AddRef, @@ -394,3 +351,42 @@ static const ITextServicesVtbl textservices_Vtbl = THISCALL(fnTextSrv_OnTxPropertyBitsChange), THISCALL(fnTextSrv_TxGetCachedSize) }; + +/****************************************************************** + * CreateTextServices (RICHED20.4) + */ +HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) +{ + ITextServicesImpl *ITextImpl; + HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); + if (pITextHost == NULL) + return E_POINTER; + + ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); + if (ITextImpl == NULL) + return E_OUTOFMEMORY; + InitializeCriticalSection(&ITextImpl->csTxtSrv); + ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); + ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); + ITextImpl->pMyHost = pITextHost; + ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); + ITextImpl->editor->exStyleFlags = 0; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; + + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); + + if (pUnkOuter) + { + FIXME("Support aggregation\n"); + return CLASS_E_NOAGGREGATION; + } + + *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + return S_OK; +}

1 0

Andrew Eikum : winmm: Report waveIn devices' component type as Microphone.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 447b045825e1d0ba7cdeb2f75ef3935d320f97bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=447b045825e1d0ba7cdeb2f75… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 27 11:11:11 2012 -0500 winmm: Report waveIn devices' component type as Microphone. --- dlls/winmm/waveform.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 3ca087e..c7d3118 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3671,7 +3671,7 @@ static UINT WINMM_GetSourceLineInfo(WINMM_MMDevice *mmdevice, UINT mmdev_index, memcpy(info->Target.szPname, mmdevice->out_caps.szPname, sizeof(info->Target.szPname)); }else{ - info->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_LINE; + info->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE; info->Target.dwType = MIXERLINE_TARGETTYPE_UNDEFINED; info->Target.szPname[0] = '\0'; } @@ -3740,7 +3740,7 @@ static UINT WINMM_GetComponentTypeLineInfo(WINMM_MMDevice *mmdevice, return WINMM_GetDestinationLineInfo(mmdevice, mmdev_index, info, flags); } - if(info->dwComponentType == MIXERLINE_COMPONENTTYPE_SRC_LINE){ + if(info->dwComponentType == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE){ if(is_out) return MIXERR_INVALLINE; info->dwSource = 0;

1 0

Aric Stewart : wineqtdecoder: Implement base IQualityControl in QTOutPin.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: d2348911b73ce30985998dbd80ea797407741f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2348911b73ce30985998dbd8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:05:59 2012 -0500 wineqtdecoder: Implement base IQualityControl in QTOutPin. --- dlls/wineqtdecoder/qtsplitter.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e7bfa0b..ba2d05d 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -133,6 +133,7 @@ extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { BaseOutputPin pin; + IQualityControl IQualityControl_iface; AM_MEDIA_TYPE * pmt; OutputQueue * queue; @@ -1246,6 +1247,8 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + else if (IsEqualIID(riid, &IID_IQualityControl)) + *ppv = &This->IQualityControl_iface; if (*ppv) { @@ -1346,6 +1349,52 @@ static const IPinVtbl QT_OutputPin_Vtbl = { BasePinImpl_NewSegment }; +static inline QTOutPin *impl_from_IQualityControl( IQualityControl *iface ) +{ + return CONTAINING_RECORD(iface, QTOutPin, IQualityControl_iface); +} + +HRESULT WINAPI QT_QualityControl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +{ + QTOutPin *This = impl_from_IQualityControl(iface); + return IPin_QueryInterface(&This->pin.pin.IPin_iface, riid, ppv); +} + +ULONG WINAPI QT_QualityControl_AddRef(IQualityControl *iface) +{ + QTOutPin *This = impl_from_IQualityControl(iface); + return IPin_AddRef(&This->pin.pin.IPin_iface); +} + +ULONG WINAPI QT_QualityControl_Release(IQualityControl *iface) +{ + QTOutPin *This = impl_from_IQualityControl(iface); + return IPin_Release(&This->pin.pin.IPin_iface); +} + +static HRESULT WINAPI QT_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +{ + REFERENCE_TIME late = qm.Late; + if (qm.Late < 0 && -qm.Late > qm.TimeStamp) + late = -qm.TimeStamp; + /* TODO: Do Something */ + return S_OK; +} + +HRESULT WINAPI QT_QualityControl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +{ + /* Do nothing */ + return S_OK; +} + +static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = { + QT_QualityControl_QueryInterface, + QT_QualityControl_AddRef, + QT_QualityControl_Release, + QT_QualityControl_Notify, + QT_QualityControl_SetSink +}; + static const BasePinFuncTable output_BaseFuncTable = { NULL, BaseOutputPinImpl_AttemptConnection, @@ -1386,6 +1435,7 @@ static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_ME pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, amt); pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; BaseFilterImpl_IncrementPinVersion(&This->filter);

1 0

Michael Stefaniuc : riched20: Support COM aggregation in CreateTextServices ().
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 74c5d202a18b40a784a6464e2bde4727452b100b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5d202a18b40a784a6464e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:33:10 2012 +0200 riched20: Support COM aggregation in CreateTextServices(). --- dlls/riched20/txtsrv.c | 96 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 25b3283..e9cc5e1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -54,53 +54,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct ITextServicesImpl { + IUnknown IUnknown_inner; ITextServices ITextServices_iface; - ITextHost *pMyHost; + IUnknown *outer_unk; LONG ref; + ITextHost *pMyHost; CRITICAL_SECTION csTxtSrv; ME_TextEditor *editor; char spare[256]; } ITextServicesImpl; -static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +static inline ITextServicesImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); + return CONTAINING_RECORD(iface, ITextServicesImpl, IUnknown_inner); } -static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices)) - *ppv = This; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - TRACE ("-- Interface = %p\n", *ppv); - return S_OK; + ITextServicesImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if IsEqualIID(riid, &IID_ITextServices) + *ppv = &This->ITextServices_iface; + else { + *ppv = NULL; + FIXME("Unknown interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - FIXME("Unknown interface: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_AddRef(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedIncrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); - TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1); return ref; } -static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedDecrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -112,6 +116,36 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) return ref; } +static const IUnknownVtbl textservices_inner_vtbl = +{ + ITextServicesImpl_QueryInterface, + ITextServicesImpl_AddRef, + ITextServicesImpl_Release +}; + +static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +{ + return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); +} + +static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_Release(This->outer_unk); +} + DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *plresult) { @@ -371,6 +405,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->ref = 1; ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; + ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; @@ -382,11 +417,10 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } + ITextImpl->outer_unk = pUnkOuter; + else + ITextImpl->outer_unk = &ITextImpl->IUnknown_inner; - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + *ppUnk = &ITextImpl->IUnknown_inner; return S_OK; }

1 0

Bruno Jesus : kernel32/tests: Show that ini cache must not be used if file no longer exists.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: a4e3268886c0dc719ef2882ce9830195fbb5ca08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e3268886c0dc719ef2882ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:26:42 2012 -0300 kernel32/tests: Show that ini cache must not be used if file no longer exists. --- dlls/kernel32/tests/profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 44a7927..745f3b5 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -500,6 +500,13 @@ static void test_profile_refresh(void) /* This also deletes the file */ CloseHandle(h); + + /* Cache must be invalidated if file no longer exists and default must be returned */ + SetLastError(0xdeadbeef); + res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); + todo_wine ok( res == 421 || + broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "Got %d instead of 421\n", res); } static void create_test_file(LPCSTR name, LPCSTR data, DWORD size)

1 0

Henri Verbeet : winex11: Use GLX_DONT_CARE instead of ~0 in ConvertAttribWGLtoGLX().
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 22d3e6dba1a2cc3fa891be9d1121697e541860b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d3e6dba1a2cc3fa891be9d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:49 2012 +0200 winex11: Use GLX_DONT_CARE instead of ~0 in ConvertAttribWGLtoGLX(). --- dlls/winex11.drv/opengl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e8d0f89..e25e082 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -680,7 +680,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf int pop; int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; - int pixelattrib = ~0; + int pixelattrib = GLX_DONT_CARE; /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ @@ -876,15 +876,15 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf } /* By default glXChooseFBConfig defaults to GLX_WINDOW_BIT. wglChoosePixelFormatARB searches through - * all formats. Unless drawattrib is set to a non-zero value override it with ~0, so that pixmap and pbuffer - * formats appear as well. */ - if(!drawattrib) drawattrib = ~0; + * all formats. Unless drawattrib is set to a non-zero value override it with GLX_DONT_CARE, so that + * pixmap and pbuffer formats appear as well. */ + if (!drawattrib) drawattrib = GLX_DONT_CARE; PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib); /* By default glXChooseFBConfig uses GLX_RGBA_BIT as the default value. Since wglChoosePixelFormatARB - * searches in all formats we have to do the same. For this reason we set GLX_RENDER_TYPE to ~0 unless - * it is overridden. */ + * searches in all formats we have to do the same. For this reason we set GLX_RENDER_TYPE to + * GLX_DONT_CARE unless it is overridden. */ PUSH2(oGLXAttr, GLX_RENDER_TYPE, pixelattrib); TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib);

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface ().
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 8db93e2a551d973f79ece1faa9cea29e5caa3984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db93e2a551d973f79ece1faa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:51 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface(). --- dlls/d3d9/volumetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index d6d625b..03a467f 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -32,20 +32,20 @@ static inline IDirect3DVolumeTexture9Impl *impl_from_IDirect3DVolumeTexture9(IDi static HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(IDirect3DVolumeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVolumeTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Christian Costa : attrib: Display unknown options.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 25b97e99839473276bfba9a35abde480a7181c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b97e99839473276bfba9a35… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:05:37 2012 +0200 attrib: Display unknown options. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 0728563..34b8592 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -167,7 +167,7 @@ int wmain(int argc, WCHAR *argv[]) } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { WINE_FIXME("Option /R not yet supported\n"); } else { - WINE_FIXME("Unrecognized option\n"); + WINE_FIXME("Unknown option %s\n", debugstr_w(param)); } } else if (param[0]) { strcpyW(name, param);

1 0

Dmitry Timoshkov : psapi: Add missing return value checks.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 4c6a19837b7eb2477a65ab107d36405446d8c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a19837b7eb2477a65ab107… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 22 16:27:26 2012 +0800 psapi: Add missing return value checks. --- dlls/psapi/tests/psapi_main.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 2087881..1944065 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -178,15 +178,20 @@ static void test_GetProcessMemoryInfo(void) DWORD ret; SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ret = pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); +todo_wine + ok(!ret, "GetProcessMemoryInfo should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -239,13 +244,16 @@ static void test_GetMappedFileName(void) HANDLE hfile, hmap; SetLastError(0xdeadbeef); - pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath));

1 0