May 2015 - Wine-commits - list.winehq.org

Andrey Gusev : Ukrainian translation for release 1.7.43
by Jeremy Newman 29 May '15

29 May '15

Module: website Branch: master Commit: 4b58238dc4fce23390ff2ff0bb950c966a1ba420 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b58238dc4fce23390ff2f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 29 13:01:14 2015 +0300 Ukrainian translation for release 1.7.43 --- news/uk/2015051501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2015051501.xml b/news/uk/2015051501.xml new file mode 100644 index 0000000..9540a47 --- /dev/null +++ b/news/uk/2015051501.xml @@ -0,0 +1,17 @@ +<news> +<date>15 травня 2015</date> +<title>Випущено Wine 1.7.43</title> +<body> + Розробницький реліз Wine 1.7.43 наразі доступний. + <a href="{$root}/announce/1.7.43">Що нового</a> в цьому релізі: +<ul> + <li>Покращена підтримка вікон Shell Browser.</li> + <li>Більше бібліотек API Sets.</li> + <li>Підтримка операцій читання та запису з вбудованими пристроями.</li> + <li>Значно оновлено переклад каталонською мовою.</li> + <li>Підтримка режиму WoW64 на системах з архітектурою ARM64.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.42
by Jeremy Newman 29 May '15

29 May '15

Module: website Branch: master Commit: 649530ff7c0e072eac87eab65d4fcab4f6dfa2e3 URL: http://source.winehq.org/git/website.git/?a=commit;h=649530ff7c0e072eac87ea… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri May 29 13:00:45 2015 +0300 Ukrainian translation for release 1.7.42 --- news/uk/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2015050101.xml b/news/uk/2015050101.xml new file mode 100644 index 0000000..54b957c --- /dev/null +++ b/news/uk/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>1 травня 2015</date> +<title>Випущено Wine 1.7.42</title> +<body> + Розробницький реліз Wine 1.7.42 наразі доступний. + <a href="{$root}/announce/1.7.42">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка димамічної відомості часового поясу.</li> + <li>Початкова підтримка оболонки робочого столу.</li> + <li>Більша підтримка для Direct2D.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.44
by Alexandre Julliard 29 May '15

29 May '15

Module: website Branch: master Commit: 7817d9d0d6f5d338ad9dbdcd045e05018c584d0d URL: http://source.winehq.org/git/website.git/?a=commit;h=7817d9d0d6f5d338ad9dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:57:52 2015 +0900 Wine release 1.7.44 --- news/en/2015052901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015052901.xml b/news/en/2015052901.xml new file mode 100644 index 0000000..469fa77 --- /dev/null +++ b/news/en/2015052901.xml @@ -0,0 +1,16 @@ +<news> +<date>May 29, 2015</date> +<title>Wine 1.7.44 Released</title> +<body> + The Wine development release 1.7.44 is now available. + <a href="{$root}/announce/1.7.44">What's new</a> in this release: +<ul> + <li>More support for the COM interfaces of the RichEdit control.</li> + <li>Initial version of a SmartTee filter.</li> + <li>Some more support for the ARM64 platform.</li> + <li>Support for the null device kernel object.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.44.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 7efe31d9294275f2505361c19afa4e8e50be2c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efe31d9294275f2505361c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:56:03 2015 +0900 Release 1.7.44. --- ANNOUNCE | 600 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 339 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7efe31d9294275f250536…

1 0

Tag wine-1.7.44 : Alexandre Julliard : Release 1.7.44
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: refs/tags/wine-1.7.44 Tag: c754f5bef76d6149f3a92373a127a437fbac1c09 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c754f5bef76d6149f3a92373a127… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 20:56:03 2015 +0900 Release 1.7.44

1 0

Damjan Jovanovic : qcap: Implement a stubbed SmartTee filter.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: cdd40604693e81334de167b52562782e53a820c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd40604693e81334de167b52… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:29 2015 +0200 qcap: Implement a stubbed SmartTee filter. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/qcap_main.c | 2 +- dlls/qcap/smartteefilter.c | 497 +++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/smartteefilter.c | 26 +- 4 files changed, 512 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd40604693e81334de16…

1 0

Damjan Jovanovic : qcap: Implement the SmartTee media type functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: 9bf73a043abfeb7e12bd325366fc22f35cd776fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf73a043abfeb7e12bd32536… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 28 19:04:34 2015 +0200 qcap: Implement the SmartTee media type functions. --- dlls/qcap/smartteefilter.c | 70 ++++++++++++++++++++++++++++++++++------ dlls/qcap/tests/smartteefilter.c | 12 +++---- 2 files changed, 66 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index bf68398..9af2e9a 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -261,9 +261,13 @@ static const IPinVtbl SmartTeeFilterInputVtbl = { static HRESULT WINAPI SmartTeeFilterInput_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, AM_MEDIA_TYPE(%p)): stub\n", This, pmt); + TRACE("(%p, AM_MEDIA_TYPE(%p))\n", This, pmt); dump_AM_MEDIA_TYPE(pmt); - return E_NOTIMPL; + if (!pmt) + return VFW_E_TYPE_NOT_ACCEPTED; + /* We'll take any media type, but the output pins will later + * struggle to connect downstream. */ + return S_OK; } static LONG WINAPI SmartTeeFilterInput_GetMediaTypeVersion(BasePin *base) @@ -274,8 +278,18 @@ static LONG WINAPI SmartTeeFilterInput_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterInput_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p)->(%d, %p): stub\n", This, iPosition, amt); - return S_FALSE; + HRESULT hr; + TRACE("(%p)->(%d, %p)\n", This, iPosition, amt); + if (iPosition) + return S_FALSE; + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + hr = S_OK; + } else + hr = S_FALSE; + LeaveCriticalSection(&This->filter.csFilter); + return hr; } static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSample *pSample) @@ -307,6 +321,20 @@ static ULONG WINAPI SmartTeeFilterCapture_Release(IPin *iface) return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } +static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + SmartTeeFilter *This = impl_from_IPin(iface); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppEnum); + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + } else + hr = VFW_E_NOT_CONNECTED; + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, SmartTeeFilterCapture_AddRef, @@ -320,7 +348,7 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, + SmartTeeFilterCapture_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -338,8 +366,12 @@ static LONG WINAPI SmartTeeFilterCapture_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, %d, %p): stub\n", This, iPosition, amt); - return E_NOTIMPL; + TRACE("(%p, %d, %p)\n", This, iPosition, amt); + if (iPosition == 0) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + return S_OK; + } else + return S_FALSE; } static HRESULT WINAPI SmartTeeFilterCapture_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, @@ -381,6 +413,20 @@ static ULONG WINAPI SmartTeeFilterPreview_Release(IPin *iface) return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } +static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + SmartTeeFilter *This = impl_from_IPin(iface); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppEnum); + EnterCriticalSection(&This->filter.csFilter); + if (This->input->pin.pConnectedTo) { + hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + } else + hr = VFW_E_NOT_CONNECTED; + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, SmartTeeFilterPreview_AddRef, @@ -394,7 +440,7 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - BasePinImpl_EnumMediaTypes, + SmartTeeFilterPreview_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -412,8 +458,12 @@ static LONG WINAPI SmartTeeFilterPreview_GetMediaTypeVersion(BasePin *base) static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_BasePin(base); - FIXME("(%p, %d, %p): stub\n", This, iPosition, amt); - return E_NOTIMPL; + TRACE("(%p, %d, %p)\n", This, iPosition, amt); + if (iPosition == 0) { + CopyMediaType(amt, &This->input->pin.mtCurrent); + return S_OK; + } else + return S_FALSE; } static HRESULT WINAPI SmartTeeFilterPreview_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 78378e2..1255887 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1010,13 +1010,13 @@ static HRESULT WINAPI SourcePin_Connect(IPin *iface, IPin *pReceivePin, const AM if (pmt && !IsEqualGUID(&pmt->formattype, &GUID_NULL)) return VFW_E_TYPE_NOT_ACCEPTED; hr = IPin_ReceiveConnection(pReceivePin, &This->IPin_iface, &This->mediaType); - todo_wine ok(SUCCEEDED(hr), "SmartTeeFilter's Input pin's IPin_ReceiveConnection() failed with 0x%08x\n", hr); + ok(SUCCEEDED(hr), "SmartTeeFilter's Input pin's IPin_ReceiveConnection() failed with 0x%08x\n", hr); if (SUCCEEDED(hr)) { EnterCriticalSection(&This->cs); hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (void**)&This->memInputPin); if (SUCCEEDED(hr)) { hr = IMemInputPin_GetAllocator(This->memInputPin, &This->allocator); - ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); if (SUCCEEDED(hr)) { ALLOCATOR_PROPERTIES requested, actual; ZeroMemory(&requested, sizeof(ALLOCATOR_PROPERTIES)); @@ -1307,9 +1307,9 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in } hr = IGraphBuilder_Connect(graphBuilder, capturePin, &captureSinkFilter->IPin_iface); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "connecting Capture pin without first connecting Input pin returned 0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "connecting Capture pin without first connecting Input pin returned 0x%08x\n", hr); hr = IGraphBuilder_Connect(graphBuilder, previewPin, &previewSinkFilter->IPin_iface); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "connecting Preview pin without first connecting Input pin returned 0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "connecting Preview pin without first connecting Input pin returned 0x%08x\n", hr); sourceFilter = create_SourceFilter(); if (sourceFilter == NULL) { @@ -1502,9 +1502,9 @@ static void test_smart_tee_filter(void) IEnumMediaTypes_Release(enumMediaTypes); enumMediaTypes = NULL; hr = IPin_EnumMediaTypes(capturePin, &enumMediaTypes); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); hr = IPin_EnumMediaTypes(previewPin, &enumMediaTypes); - todo_wine ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); hr = IPin_QueryInternalConnections(inputPin, NULL, &nPin); ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr);

1 0

Daniel Lehman : msvcr120: Add erf functions.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e89813fe3cf80e9d4aea13a5f1f651cce4b12c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89813fe3cf80e9d4aea13a5f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 21 09:25:48 2015 -0700 msvcr120: Add erf functions. --- configure | 2 ++ configure.ac | 2 ++ dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++++++++++++++ include/config.h.in | 6 ++++++ 6 files changed, 50 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 28e6c19..c571b48 100755 --- a/configure +++ b/configure @@ -16572,6 +16572,8 @@ fi for ac_func in \ cbrt \ cbrtf \ + erf \ + erff \ exp2 \ exp2f \ llrint \ diff --git a/configure.ac b/configure.ac index 88eb77b..c61a975 100644 --- a/configure.ac +++ b/configure.ac @@ -2590,6 +2590,8 @@ fi AC_CHECK_FUNCS(\ cbrt \ cbrtf \ + erf \ + erff \ exp2 \ exp2f \ llrint \ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1d1196d..1a1470e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2119,12 +2119,12 @@ @ stub ctanhl @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div -@ stub erf +@ cdecl erf(double) MSVCR120_erf @ stub erfc @ stub erfcf @ stub erfcl -@ stub erff -@ stub erfl +@ cdecl erff(double) MSVCR120_erff +@ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp @ cdecl exp2(double) MSVCR120_exp2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 7f6be1d..f47f906 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1788,12 +1788,12 @@ @ stub ctanhl @ stub ctanl @ cdecl -ret64 div(long long) msvcr120.div -@ stub erf +@ cdecl erf(double) msvcr120.erf @ stub erfc @ stub erfcf @ stub erfcl -@ stub erff -@ stub erfl +@ cdecl erff(double) msvcr120.erff +@ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit @ cdecl exp(double) msvcr120.exp @ cdecl exp2(double) msvcr120.exp2 diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6779430..162dcfb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2607,6 +2607,40 @@ short CDECL MSVCR120__ldtest(LDOUBLE *x) } /********************************************************************* + * erff (MSVCR120.@) + */ +float CDECL MSVCR120_erff(float x) +{ +#ifdef HAVE_ERFF + return erff(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * erf (MSVCR120.@) + */ +double CDECL MSVCR120_erf(double x) +{ +#ifdef HAVE_ERF + return erf(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * erfl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_erfl(LDOUBLE x) +{ + return MSVCR120_erf(x); +} + +/********************************************************************* * fmaxf (MSVCR120.@) */ float CDECL MSVCR120_fmaxf(float x, float y) diff --git a/include/config.h.in b/include/config.h.in index bcc6eb9..0f435d1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -111,6 +111,12 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE +/* Define to 1 if you have the `erf' function. */ +#undef HAVE_ERF + +/* Define to 1 if you have the `erff' function. */ +#undef HAVE_ERFF + /* Define to 1 if you have the `exp2' function. */ #undef HAVE_EXP2

1 0

Iván Matellanes : msvcirt: Share exceptions implementation with msvcp.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: e35e107e5eda2c64c2da8265a4b7ca5eceecaeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e107e5eda2c64c2da8265a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue May 26 13:08:39 2015 +0200 msvcirt: Share exceptions implementation with msvcp. --- dlls/msvcirt/Makefile.in | 3 ++ dlls/msvcirt/msvcirt.c | 40 ++++++++--------- dlls/msvcirt/msvcirt.h | 25 +++++++++++ dlls/msvcirt/msvcirt.spec | 52 +++++++++++----------- dlls/msvcp90/exception.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt40/msvcrt40.spec | 22 ++++----- 6 files changed, 181 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35e107e5eda2c64c2da8…

1 0

Matteo Bruni : wined3d: Remove point size scaling hack.
by Alexandre Julliard 29 May '15

29 May '15

Module: wine Branch: master Commit: b551da8eef4aaeea27207969c6f9065882f3f6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b551da8eef4aaeea27207969c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 28 23:23:02 2015 +0200 wined3d: Remove point size scaling hack. Not sure how this was supposed to work, according to the GL spec the clamping to POINT_SIZE_RANGE happens after the scaling is applied. --- dlls/wined3d/state.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 28e26ab..40b04e7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1507,40 +1507,11 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s if (state->render_states[WINED3D_RS_POINTSCALEENABLE]) { - DWORD h = state->viewport.height; - GLfloat scaleFactor; + float scale_factor = state->viewport.height * state->viewport.height; - if (pointSize.f < gl_info->limits.pointsize_min) - { - /* Minimum valid point size for OpenGL is driver specific. For Direct3D it is - * 0.0f. This means that OpenGL will clamp really small point sizes to the - * driver minimum. To correct for this we need to multiply by the scale factor when sizes - * are less than 1.0f. scale_factor = 1.0f / point_size. - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_min; - /* Clamp the point size, don't rely on the driver to do it. MacOS says min point size - * is 1.0, but then accepts points below that and draws too small points - */ - pointSize.f = gl_info->limits.pointsize_min; - } - else if(pointSize.f > gl_info->limits.pointsize_max) - { - /* gl already scales the input to glPointSize, - * d3d scales the result after the point size scale. - * If the point size is bigger than the max size, use the - * scaling to scale it bigger, and set the gl point size to max - */ - scaleFactor = pointSize.f / gl_info->limits.pointsize_max; - TRACE("scale: %f\n", scaleFactor); - pointSize.f = gl_info->limits.pointsize_max; - } else { - scaleFactor = 1.0f; - } - scaleFactor = powf(h * scaleFactor, 2); - - att[0] = A.f / scaleFactor; - att[1] = B.f / scaleFactor; - att[2] = C.f / scaleFactor; + att[0] = A.f / scale_factor; + att[1] = B.f / scale_factor; + att[2] = C.f / scale_factor; } if (gl_info->supported[ARB_POINT_PARAMETERS]) @@ -1558,7 +1529,7 @@ void state_pscale(struct wined3d_context *context, const struct wined3d_state *s WARN("POINT_PARAMETERS not supported in this version of opengl\n"); } - gl_info->gl_ops.gl.p_glPointSize(pointSize.f); + gl_info->gl_ops.gl.p_glPointSize(max(pointSize.f, FLT_MIN)); checkGLcall("glPointSize(...);"); }

1 0