wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Igor Kotrasinski : dsound: Fix conning formula to correctly interpolate volume.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 65e19a096d911a0a7ee2329d2c8f110fb0008f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e19a096d911a0a7ee2329d2… Author: Igor Kotrasinski <ikk_pl(a)yahoo.co.uk> Date: Sat Apr 11 15:44:14 2015 +0000 dsound: Fix conning formula to correctly interpolate volume. --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index ffd4d45..5eb02a6 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -242,7 +242,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle > dwOutsideConeAngle) flAngle = dwOutsideConeAngle; /* this probably isn't the right thing, but it's ok for the time being */ - lVolume += ((dsb->ds3db_ds3db.lConeOutsideVolume)/((dwOutsideConeAngle) - (dwInsideConeAngle))) * flAngle; + lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume);

1 0

Sebastian Lackner : ws2_32: Add a missing call to release_sock_fd.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: ea371a2446eb6befa2954fe5a6428da0e562aa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea371a2446eb6befa2954fe5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 14 07:37:50 2015 +0200 ws2_32: Add a missing call to release_sock_fd. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2fd2ce1..95ea83c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3091,6 +3091,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (ret <= 0) { SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); + release_sock_fd( s, fd ); return FALSE; }

1 0

Bruno Jesus : ws2_32: Convert EBADF errno to ENOTSOCK.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: b69eb168161fcb4397cfa8c10b99a0b00279c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69eb168161fcb4397cfa8c10… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:51 2015 -0300 ws2_32: Convert EBADF errno to ENOTSOCK. --- dlls/ws2_32/socket.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfcc755..2fd2ce1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -863,7 +863,6 @@ static UINT sock_get_error( int err ) switch(err) { case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; case EPERM: case EACCES: return WSAEACCES; case EFAULT: return WSAEFAULT; @@ -872,6 +871,7 @@ static UINT sock_get_error( int err ) case EWOULDBLOCK: return WSAEWOULDBLOCK; case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; + case EBADF: case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; case EMSGSIZE: return WSAEMSGSIZE; @@ -2901,9 +2901,6 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) errno = loc_errno; switch (errno) { - case EBADF: - SetLastError(WSAENOTSOCK); - break; case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; @@ -3360,7 +3357,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3370,7 +3367,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3467,7 +3464,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3519,7 +3516,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3565,7 +3562,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3643,7 +3640,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, &tv, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3668,7 +3665,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3829,7 +3826,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3863,7 +3860,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3898,7 +3895,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -4164,7 +4161,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; if (ioctl(fd, FIONREAD, out_buff ) == -1) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); release_sock_fd( s, fd ); break; } @@ -4182,7 +4179,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); else { /* The SIOCATMARK value read from ioctl() is reversed

1 0

Bruno Jesus : ws2_32/tests: Add one more SO_ERROR test.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 383ed3ce9a98ff8fbd520dc418dbad68698fae23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383ed3ce9a98ff8fbd520dc41… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:08 2015 -0300 ws2_32/tests: Add one more SO_ERROR test. --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c7b3ea7..aa06a08 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1387,6 +1387,16 @@ todo_wine err, WSAGetLastError()); closesocket(s); + /* Test with the closed socket */ + SetLastError(0xdeadbeef); + size = sizeof(i); + i = 1234; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), + "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", + err, WSAGetLastError()); + ok (i == 1234, "expected 1234, got %d\n", i); /* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */ s = socket(AF_INET, SOCK_DGRAM, 0);

1 0

Andrew Eikum : dsound: Stricter validation for formats in secondary buffers.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: a9a80b56b1ab3001fe844aa3a4017c787d6464b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a80b56b1ab3001fe844aa3a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 11:25:23 2015 -0500 dsound: Stricter validation for formats in secondary buffers. --- dlls/dsound/dsound.c | 24 ++- dlls/dsound/tests/dsound.c | 478 ++++++++++++++++++++++++--------------------- 2 files changed, 277 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9a80b56b1ab3001fe844…

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 80428310610a667fe8c106fd199251015b1548d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80428310610a667fe8c106fd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 08:21:17 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 411 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 61 +++--- 2 files changed, 415 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80428310610a667fe8c10…

1 0

Thomas Faber : mshtml: Remove nsIDOMWindowUtils:: SetCriticalDisplayPortForElement.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 3f63177204a68c4103d8f39ce4f70aea868cf769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f63177204a68c4103d8f39ce… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Apr 9 14:51:40 2015 +0200 mshtml: Remove nsIDOMWindowUtils::SetCriticalDisplayPortForElement. --- dlls/mshtml/nsiface.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 054c308..7989e9a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2918,7 +2918,6 @@ interface nsIDOMWindowUtils : nsISupports nsresult SetDisplayPortMarginsForElement(float aLeftMargin, float aTopMargin, float aRightMargin, float aBottomMargin, uint32_t aAlignmentX, uint32_t aAlignmentY, nsIDOMElement *aElement, uint32_t aPriority); nsresult SetDisplayPortBaseForElement(int32_t aX, int32_t aY, int32_t aWidth, int32_t aHeight, nsIDOMElement *aElement); - nsresult SetCriticalDisplayPortForElement(float aXPx, float aYPx, float aWidthPx, float aHeightPx, nsIDOMElement *aElement); nsresult SetResolution(float aXResolution, float aYResolution); nsresult GetResolution(float *aXResolution, float *aYResolution); nsresult GetIsResolutionSet(bool *aIsResolutionSet);

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in object and embed element implementation.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: b94dd24eafc524f2946f6ee3aede99f869800749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94dd24eafc524f2946f6ee3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 13 13:26:32 2015 +0200 mshtml: Use debugstr_mshtml_guid in object and embed element implementation. --- dlls/mshtml/htmlembed.c | 5 ++--- dlls/mshtml/htmlobject.c | 7 ++----- dlls/mshtml/main.c | 2 ++ dlls/mshtml/pluginhost.c | 3 --- dlls/mshtml/pluginhost.h | 2 ++ 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index a06f08e..54070ed 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -227,14 +227,13 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else if(IsEqualGUID(&IID_IHTMLEmbedElement, riid)) { - TRACE("(%p)->(IID_IHTMLEmbedElement %p)\n", This, ppv); *ppv = &This->IHTMLEmbedElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 2633f48..0e2033e 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -645,21 +645,18 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; }else if(IsEqualGUID(&IID_IHTMLObjectElement2, riid)) { - TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { /* Special pseudo-interface returning HTMLPluginContainse struct. */ - TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; node_addref(&This->plugin_container.element.node); return S_OK; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8d9f1ac..8938f01e 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -42,6 +42,7 @@ #define INIT_GUID #include "mshtml_private.h" #include "resource.h" +#include "pluginhost.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -540,6 +541,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); X(DIID_HTMLTextContainerEvents); + X(IID_HTMLPluginContainer); X(IID_IConnectionPoint); X(IID_IConnectionPointContainer); X(IID_ICustomDoc); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index b6fcf72..7b1133d 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -37,9 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -const IID IID_HTMLPluginContainer = - {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; - static BOOL check_load_safety(PluginHost *host) { DWORD policy_size, policy; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 0460c3c..5135c33 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -58,6 +58,8 @@ struct HTMLPluginContainer { DWORD props_len; }; +DEFINE_GUID(IID_HTMLPluginContainer, 0xbd7a6050,0xb373,0x4f6f,0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a); + extern const IID IID_HTMLPluginContainer DECLSPEC_HIDDEN; HRESULT create_plugin_host(HTMLDocumentNode*,HTMLPluginContainer*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Increment ref count in QI(IID_HTMLPluginContainer) call.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 81c13caf375634d49dba699dd84e7bf172954297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c13caf375634d49dba699dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 13 13:26:26 2015 +0200 mshtml: Increment ref count in QI(IID_HTMLPluginContainer) call. --- dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/script.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index e7dbe9a..2633f48 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -658,8 +658,10 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IHTMLObjectElement2 %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement2_iface; }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { + /* Special pseudo-interface returning HTMLPluginContainse struct. */ TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); *ppv = &This->plugin_container; + node_addref(&This->plugin_container.element.node); return S_OK; }else { HRESULT hres; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 757036c..4590854 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1509,8 +1509,11 @@ void bind_event_scripts(HTMLDocumentNode *doc) else bind_node_event(doc, event_target, target_node, event, event_disp); - if(target_node) + if(target_node) { IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(plugin_container) + node_release(&plugin_container->element.node); + } } heap_free(event);

1 0

Joachim Priesner : wined3d: Load ModelView matrix for glLightfv calls.
by Alexandre Julliard 13 Apr '15

13 Apr '15

Module: wine Branch: master Commit: 8fff427bc0cc13e5e081da7a90af8c660e667698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fff427bc0cc13e5e081da7a9… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sat Apr 11 17:16:52 2015 +0200 wined3d: Load ModelView matrix for glLightfv calls. Analogous to the light() function in state.c, the correct ModelView matrix has to be loaded when glLightfv is called. --- dlls/wined3d/glsl_shader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a1b6b0..2422982 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7208,6 +7208,11 @@ void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; + /* Light settings are affected by the ModelView transform in OpenGL, the View transform in Direct3D. */ + gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); + gl_info->gl_ops.gl.p_glPushMatrix(); + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW]._11); + for (k = 0; k < gl_info->limits.lights; ++k) { if (!(light = state->lights[k])) @@ -7218,6 +7223,8 @@ void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d checkGLcall("glLightfv dirn"); } + gl_info->gl_ops.gl.p_glPopMatrix(); + for (k = 0; k < gl_info->limits.clipplanes; ++k) { if (!isStateDirty(context, STATE_CLIPPLANE(k)))

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015