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

André Hentschel : winebuild: Create stubs for ARM.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 220aeda3a0e69309c65a1f09843fae7e517e0145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220aeda3a0e69309c65a1f098… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:36:26 2012 +0200 winebuild: Create stubs for ARM. --- tools/winebuild/import.c | 15 +++++++++++++++ tools/winebuild/parser.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index af02a9d..c73b86c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1256,6 +1256,21 @@ void output_stubs( DLLSPEC *spec ) output( "\tmovq $%d,%%rsi\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; + case CPU_ARM: + output( "\tldr r0,[PC,#0]\n"); + output( "\tmov PC,PC\n"); + output( "\t.long .L__wine_spec_file_name\n" ); + output( "\tldr r1,[PC,#0]\n"); + output( "\tmov PC,PC\n"); + if (exp_name) + { + output( "\t.long .L%s_string\n", name ); + count++; + } + else + output( "\t.long %d\n", odp->ordinal ); + output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + break; default: assert(0); } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 6a1eb85..1e23e3c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -403,9 +403,9 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) odp->link_name = xstrdup(""); /* don't bother generating stubs for Winelib */ if (odp->flags & FLAG_CPU_MASK) - odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); else - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); return parse_spec_arguments( odp, spec, 1 ); }

1 0

André Hentschel : include: Add new ARM defines to winnt.h.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 1de185efbaae6545e993461794ff973889aa15a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de185efbaae6545e99346179… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:37:44 2012 +0200 include: Add new ARM defines to winnt.h. --- include/winnt.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5cde0f4..a6b0cf2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -790,6 +790,11 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 #define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 /* Execution state flags */ @@ -1541,9 +1546,11 @@ typedef struct _CONTEXT /* The following flags control the contents of the CONTEXT structure. */ -#define CONTEXT_ARM 0x0000040 +#define CONTEXT_ARM 0x0200000 #define CONTEXT_CONTROL (CONTEXT_ARM | 0x00000001) #define CONTEXT_INTEGER (CONTEXT_ARM | 0x00000002) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM | 0x00000004) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)

1 0

André Hentschel : include: Add peARM to fusion.idl.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 82290556929caa1a198f86dd10efa7b4344d41bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82290556929caa1a198f86dd1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 21:38:51 2012 +0200 include: Add peARM to fusion.idl. --- include/fusion.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/fusion.idl b/include/fusion.idl index 9963838..d645662 100644 --- a/include/fusion.idl +++ b/include/fusion.idl @@ -38,6 +38,7 @@ typedef enum peI386 = 0x00000002, peIA64 = 0x00000003, peAMD64 = 0x00000004, + peARM = 0x00000005, peInvalid = 0xffffffff } PEKIND;

1 0

Christian Costa : amstream: Implement AddMediaStream and GetMediaStream in media stream filter.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 76d69cdb91b5325af9ad1be1f14ee54d985df28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d69cdb91b5325af9ad1be1f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Mar 27 23:45:55 2012 +0200 amstream: Implement AddMediaStream and GetMediaStream in media stream filter. --- dlls/amstream/mediastreamfilter.c | 43 ++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index d576b49..cd08490 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -37,7 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { BaseFilter filter; - + ULONG nb_streams; + IMediaStream** streams; } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -89,7 +90,12 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) + { + int i; + for (i = 0; i < This->nb_streams; i++) + IMediaStream_Release(This->streams[i]); HeapFree(GetProcessHeap(), 0, This); + } return refCount; } @@ -170,16 +176,43 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* iface, IAMMediaStream *pAMMediaStream) { - FIXME("(%p)->(%p): Stub!\n", iface, pAMMediaStream); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + IMediaStream** streams; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, pAMMediaStream); + + streams = CoTaskMemRealloc(This->streams, (This->nb_streams + 1) * sizeof(IMediaStream*)); + if (!streams) + return E_OUTOFMEMORY; + This->streams = streams; + This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; + This->nb_streams++; + + IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + + return S_OK; } static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* iface, REFMSPID idPurpose, IMediaStream **ppMediaStream) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_guid(idPurpose), ppMediaStream); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + MSPID purpose_id; + unsigned int i; - return E_NOTIMPL; + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(idPurpose), ppMediaStream); + + for (i = 0; i < This->nb_streams; i++) + { + IMediaStream_GetInformation(This->streams[i], &purpose_id, NULL); + if (IsEqualIID(&purpose_id, idPurpose)) + { + *ppMediaStream = This->streams[i]; + IMediaStream_AddRef(*ppMediaStream); + return S_OK; + } + } + + return MS_E_NOSTREAM; } static HRESULT WINAPI MediaStreamFilterImpl_EnumMediaStreams(IMediaStreamFilter* iface, LONG Index, IMediaStream **ppMediaStream)

1 0

Aric Stewart : wineqtdecoder: Implement base IQualityControl in QTOutPin.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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

Andrew Eikum : winmm: Support DRVM_MAPPER_PREFERRED_GET in waveXxxMessage.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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

Andrew Eikum : winmm: Report waveIn devices' component type as Microphone.
by Alexandre Julliard 28 Mar '12

28 Mar '12

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

Vincent Povirk : gdiplus: Measure strings at device size, then rescale to world size.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: e2e77545fff96e52d6b3f931e40e622586777ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e77545fff96e52d6b3f931e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 27 11:44:52 2012 -0500 gdiplus: Measure strings at device size, then rescale to world size. --- dlls/gdiplus/graphics.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 89ed61b..f46d1ce 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4943,6 +4943,7 @@ struct measure_string_args { RectF *bounds; INT *codepointsfitted; INT *linesfilled; + REAL rel_width, rel_height; }; static GpStatus measure_string_callback(HDC hdc, @@ -4952,12 +4953,16 @@ static GpStatus measure_string_callback(HDC hdc, INT underlined_index_count, void *user_data) { struct measure_string_args *args = user_data; + REAL new_width, new_height; + + new_width = bounds->Width / args->rel_width; + new_height = (bounds->Height + bounds->Y - args->bounds->Y) / args->rel_height; - if (bounds->Width > args->bounds->Width) - args->bounds->Width = bounds->Width; + if (new_width > args->bounds->Width) + args->bounds->Width = new_width; - if (bounds->Height + bounds->Y > args->bounds->Height + args->bounds->Y) - args->bounds->Height = bounds->Height + bounds->Y - args->bounds->Y; + if (new_height > args->bounds->Height) + args->bounds->Height = new_height; if (args->codepointsfitted) *args->codepointsfitted = index + length; @@ -4977,9 +4982,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, INT *codepointsfitted, INT *linesfilled) { - HFONT oldfont; + HFONT oldfont, gdifont; struct measure_string_args args; HDC temp_hdc=NULL, hdc; + GpPointF pt[3]; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5002,7 +5008,20 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(format) TRACE("may be ignoring some format flags: attr %x\n", format->attr); - oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + get_font_hfont(graphics, font, &gdifont); + oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; bounds->Y = rect->Y; @@ -5016,7 +5035,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, gdip_format_string(hdc, string, length, font, rect, format, measure_string_callback, &args); - DeleteObject(SelectObject(hdc, oldfont)); + SelectObject(hdc, oldfont); + DeleteObject(gdifont); if (temp_hdc) DeleteDC(temp_hdc);

1 0

Henri Verbeet : winex11: Use GLX_DONT_CARE instead of ~0 in ConvertAttribWGLtoGLX().
by Alexandre Julliard 28 Mar '12

28 Mar '12

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: Store an implementation pointer to the d3d9 structure in IDirect3DDevice9Impl .
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: cbc3e9985c92658ad786be12f878e6862841a80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc3e9985c92658ad786be12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:50 2012 +0200 d3d9: Store an implementation pointer to the d3d9 structure in IDirect3DDevice9Impl. --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5886618..7d1821c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -165,7 +165,7 @@ typedef struct IDirect3DDevice9Impl struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; - IDirect3D9Ex *d3d_parent; + struct IDirect3D9Impl *d3d_parent; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 39cd740..ab96d79 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -190,8 +190,6 @@ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *if void **ppobj) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3D9 *d3d; - IDirect3D9Impl *d3dimpl; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -203,20 +201,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *if return S_OK; } else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. - * It doesn't matter with which function the device was created. - */ - IDirect3DDevice9_GetDirect3D(iface, &d3d); - d3dimpl = (IDirect3D9Impl *) d3d; + * It doesn't matter with which function the device was created. */ - if(d3dimpl->extended) { + if (This->d3d_parent->extended) + { *ppobj = iface; IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); - IDirect3D9_Release(d3d); TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj); return S_OK; } else { WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n"); - IDirect3D9_Release(d3d); *ppobj = NULL; return E_NOINTERFACE; } @@ -265,7 +259,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(IDirect3DDevi wined3d_device_decref(This->wined3d_device); wined3d_mutex_unlock(); - IDirect3D9_Release(This->d3d_parent); + IDirect3D9Ex_Release(&This->d3d_parent->IDirect3D9Ex_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -325,7 +319,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } - return IDirect3D9Ex_QueryInterface(This->d3d_parent, &IID_IDirect3D9, (void **)ppD3D9); + return IDirect3D9Ex_QueryInterface(&This->d3d_parent->IDirect3D9Ex_iface, + &IID_IDirect3D9, (void **)ppD3D9); } static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *pCaps) @@ -3513,8 +3508,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IDirect3D9Impl *parent, struct return E_OUTOFMEMORY; } - device->d3d_parent = &parent->IDirect3D9Ex_iface; - IDirect3D9_AddRef(device->d3d_parent); + IDirect3D9Ex_AddRef(&parent->IDirect3D9Ex_iface); + device->d3d_parent = parent; return D3D_OK; }

1 0