August 2007 - Wine-Commits - list.winehq.org

appdb/. .htaccess
by WineHQ Aug. 21, 2007

Aug. 21, 2007

ChangeSet ID: 31331 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/20 19:53:44 Modified files: . : .htaccess Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add an entry for redirecting the site during an outage Patch: http://cvs.winehq.org/patch.py?id=31331 Old revision New revision Changes Path 1.7 1.8 +3 -0 appdb/.htaccess Index: appdb/.htaccess diff -u -p appdb/.htaccess:1.7 appdb/.htaccess:1.8 --- appdb/.htaccess:1.7 21 Aug 2007 0:53:44 -0000 +++ appdb/.htaccess 21 Aug 2007 0:53:44 -0000 @@ -1,6 +1,9 @@ # default permissions allow from all +# uncomment this to take the website offline +# RedirectMatch ^.*$ http://appdb.winehq.org/site_outage.html + # Set Our Default Directory Index DirectoryIndex index.php

1 0

appdb/. site_outage.html
by WineHQ Aug. 21, 2007

Aug. 21, 2007

ChangeSet ID: 31330 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/20 19:45:47 Added files: . : site_outage.html Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a site outage page that we can use when the site is offline Patch: http://cvs.winehq.org/patch.py?id=31330 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/site_outage.html Index: appdb/site_outage.html diff -u -p /dev/null appdb/site_outage.html:1.1 --- /dev/null 21 Aug 2007 0:45:47 -0000 +++ appdb/site_outage.html 21 Aug 2007 0:45:47 -0000 @@ -0,0 +1,12 @@ +<html> +<head> +<title>AppDB temporarily offline</title> +</head> +<body> +<h1>Wine Application Database</h1> +<h3>Sorry, the AppDB is temporarily offline</h3> +<h3>While we are down you might want to checkout the main +<a href="http://www.winehq.org">WineHQ site</h3> +</body> +</html> +

1 0

Vitaliy Margolen : dinput: Check acquired flag instead of fd.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 81fc89fa6d8053fbf3a0f1bd5cf16d21ffe9a7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fc89fa6d8053fbf3a0f1bd5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 19 22:26:31 2007 -0600 dinput: Check acquired flag instead of fd. --- dlls/dinput/joystick_linuxinput.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f5f7e5d..c025219 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -737,7 +737,8 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceState( TRACE("(this=%p,0x%08x,%p)\n", This, len, ptr); - if (This->joyfd==-1) { + if (!This->base.acquired) + { WARN("not acquired\n"); return DIERR_NOTACQUIRED; } @@ -863,13 +864,14 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities( return DI_OK; } -static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) { +static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface) +{ JoystickImpl *This = (JoystickImpl *)iface; + TRACE("(%p)\n",This); - if (This->joyfd==-1) { - return DIERR_NOTACQUIRED; - } + if (!This->base.acquired) + return DIERR_NOTACQUIRED; joy_polldev(This); return DI_OK;

1 0

Vitaliy Margolen : dinput: Use correct data structure for EVIOCGABS instead of an array.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 3cd13628aae30e4bc012c6ccd66cc0357646af95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd13628aae30e4bc012c6ccd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 19 22:26:27 2007 -0600 dinput: Use correct data structure for EVIOCGABS instead of an array. --- dlls/dinput/joystick_linuxinput.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 14d825c..f5f7e5d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -149,14 +149,8 @@ struct JoyDev { BYTE keybits[(KEY_MAX+7)/8]; BYTE ffbits[(FF_MAX+7)/8]; -#define AXIS_ABS 0 -#define AXIS_ABSMIN 1 -#define AXIS_ABSMAX 2 -#define AXIS_ABSFUZZ 3 -#define AXIS_ABSFLAT 4 - /* data returned by the EVIOCGABS() ioctl */ - int axes[ABS_MAX][5]; + struct input_absinfo axes[ABS_MAX]; }; struct JoystickImpl @@ -290,11 +284,11 @@ static void find_joydevs(void) if (-1!=ioctl(fd,EVIOCGABS(j),&(joydev.axes[j]))) { TRACE(" ... with axis %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", j, - joydev.axes[j][AXIS_ABS], - joydev.axes[j][AXIS_ABSMIN], - joydev.axes[j][AXIS_ABSMAX], - joydev.axes[j][AXIS_ABSFUZZ], - joydev.axes[j][AXIS_ABSFLAT] + joydev.axes[j].value, + joydev.axes[j].minimum, + joydev.axes[j].maximum, + joydev.axes[j].fuzz, + joydev.axes[j].flat ); } } @@ -420,12 +414,12 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i], df->dwObjSize); newDevice->axes[i] = idx; - newDevice->props[idx].lDevMin = newDevice->joydev->axes[i][AXIS_ABSMIN]; - newDevice->props[idx].lDevMax = newDevice->joydev->axes[i][AXIS_ABSMAX]; + newDevice->props[idx].lDevMin = newDevice->joydev->axes[i].minimum; + newDevice->props[idx].lDevMax = newDevice->joydev->axes[i].maximum; newDevice->props[idx].lMin = 0; newDevice->props[idx].lMax = 0xffff; newDevice->props[idx].lSaturation = 0; - newDevice->props[idx].lDeadZone = MulDiv(newDevice->joydev->axes[i][AXIS_ABSFLAT], 0xffff, + newDevice->props[idx].lDeadZone = MulDiv(newDevice->joydev->axes[i].flat, 0xffff, newDevice->props[idx].lDevMax - newDevice->props[idx].lDevMin); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; @@ -615,7 +609,7 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) */ #define CENTER_AXIS(a) \ (ji->axes[a] == -1 ? 0 : joystick_map_axis( &ji->props[ji->axes[a]], \ - ji->joydev->axes[a][AXIS_ABS] )) + ji->joydev->axes[a].value )) static void fake_current_js_state(JoystickImpl *ji) { int i;

1 0

Vitaliy Margolen : dinput: Remove redundant declaration.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: ca8a0a8aaa6b6dcbd77f829a68c76bb4490cc2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8a0a8aaa6b6dcbd77f829a6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 19 22:26:24 2007 -0600 dinput: Remove redundant declaration. --- dlls/dinput/joystick_linuxinput.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f3fc11e..14d825c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -159,17 +159,6 @@ struct JoyDev { int axes[ABS_MAX][5]; }; -struct ObjProps -{ - /* what we have */ - LONG havemax; - LONG havemin; - /* what range and deadzone the game wants */ - LONG wantmin; - LONG wantmax; - LONG deadzone; -}; - struct JoystickImpl { struct IDirectInputDevice2AImpl base;

1 0

Vitaliy Margolen : dinput: Don't try to create non existing device.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: f47c63a1f9ef7f110dc6bff2408cc6ff61eb419b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47c63a1f9ef7f110dc6bff24… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Aug 19 22:26:19 2007 -0600 dinput: Don't try to create non existing device. --- dlls/dinput/joystick_linuxinput.c | 69 ++++++++++++++++++++++--------------- 1 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index feeb118..f3fc11e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -505,24 +505,31 @@ static HRESULT joydev_create_deviceA(IDirectInputImpl *dinput, REFGUID rguid, RE find_joydevs(); - if ((index = get_joystick_index(rguid)) < MAX_JOYDEV) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceA,riid) || - IsEqualGUID(&IID_IDirectInputDevice2A,riid) || - IsEqualGUID(&IID_IDirectInputDevice7A,riid) || - IsEqualGUID(&IID_IDirectInputDevice8A,riid)) { - *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, index); - TRACE("Creating a Joystick device (%p)\n", *pdev); - if (*pdev==0) { - ERR("out of memory\n"); - return DIERR_OUTOFMEMORY; + if ((index = get_joystick_index(rguid)) < MAX_JOYDEV && + have_joydevs && index < have_joydevs) + { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceA, riid) || + IsEqualGUID(&IID_IDirectInputDevice2A, riid) || + IsEqualGUID(&IID_IDirectInputDevice7A, riid) || + IsEqualGUID(&IID_IDirectInputDevice8A, riid)) + { + *pdev = (IDirectInputDeviceA*) alloc_device(rguid, &JoystickAvt, dinput, index); + TRACE("Created a Joystick device (%p)\n", *pdev); + + if (*pdev == NULL) + { + ERR("out of memory\n"); + return DIERR_OUTOFMEMORY; + } + return DI_OK; } - return DI_OK; - } else { + + WARN("no interface\n"); return DIERR_NOINTERFACE; - } } + WARN("invalid device GUID\n"); return DIERR_DEVICENOTREG; } @@ -533,24 +540,30 @@ static HRESULT joydev_create_deviceW(IDirectInputImpl *dinput, REFGUID rguid, RE find_joydevs(); - if ((index = get_joystick_index(rguid)) < MAX_JOYDEV) { - if ((riid == NULL) || - IsEqualGUID(&IID_IDirectInputDeviceW,riid) || - IsEqualGUID(&IID_IDirectInputDevice2W,riid) || - IsEqualGUID(&IID_IDirectInputDevice7W,riid) || - IsEqualGUID(&IID_IDirectInputDevice8W,riid)) { - *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, index); - TRACE("Creating a Joystick device (%p)\n", *pdev); - if (*pdev==0) { - ERR("out of memory\n"); - return DIERR_OUTOFMEMORY; + if ((index = get_joystick_index(rguid)) < MAX_JOYDEV && + have_joydevs && index < have_joydevs) + { + if ((riid == NULL) || + IsEqualGUID(&IID_IDirectInputDeviceW, riid) || + IsEqualGUID(&IID_IDirectInputDevice2W, riid) || + IsEqualGUID(&IID_IDirectInputDevice7W, riid) || + IsEqualGUID(&IID_IDirectInputDevice8W, riid)) + { + *pdev = (IDirectInputDeviceW*) alloc_device(rguid, &JoystickWvt, dinput, index); + TRACE("Created a Joystick device (%p)\n", *pdev); + + if (*pdev == NULL) + { + ERR("out of memory\n"); + return DIERR_OUTOFMEMORY; + } + return DI_OK; } - return DI_OK; - } else { + WARN("no interface\n"); return DIERR_NOINTERFACE; - } } + WARN("invalid device GUID\n"); return DIERR_DEVICENOTREG; }

1 0

Stefan Dösinger : wined3d: Reinstall the internal reference on vertex buffers.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 55b63fe095894d2135e2c04436d0d728c8540575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b63fe095894d2135e2c0443… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 14:49:39 2007 +0200 wined3d: Reinstall the internal reference on vertex buffers. --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/stateblock.c | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 86507a0..8852e4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2240,9 +2240,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, if (pStreamData != NULL) { IWineD3DVertexBufferImpl *vbImpl = (IWineD3DVertexBufferImpl *) pStreamData; InterlockedIncrement(&vbImpl->bindCount); + IWineD3DVertexBuffer_AddRef(pStreamData); } if (oldSrc != NULL) { InterlockedDecrement(&((IWineD3DVertexBufferImpl *) oldSrc)->bindCount); + IWineD3DVertexBuffer_Release(oldSrc); } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); @@ -4752,13 +4754,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, UINT PrimitiveCount, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DVertexBuffer *vb; TRACE("(%p) : Type=(%d,%s), pCount=%d, pVtxData=%p, Stride=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ + vb = This->stateBlock->streamSource[0]; This->stateBlock->streamSource[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; + if(vb) IWineD3DVertexBuffer_Release(vb); This->stateBlock->streamOffset[0] = 0; This->stateBlock->streamStride[0] = VertexStreamZeroStride; This->stateBlock->streamIsUP = TRUE; @@ -4787,6 +4792,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * UINT VertexStreamZeroStride) { int idxStride; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DVertexBuffer *vb; IWineD3DIndexBuffer *ib; TRACE("(%p) : Type=(%d,%s), MinVtxIdx=%d, NumVIdx=%d, PCount=%d, pidxdata=%p, IdxFmt=%d, pVtxdata=%p, stride=%d\n", @@ -4801,7 +4807,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * } /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ + vb = This->stateBlock->streamSource[0]; This->stateBlock->streamSource[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; + if(vb) IWineD3DVertexBuffer_Release(vb); This->stateBlock->streamIsUP = TRUE; This->stateBlock->streamOffset[0] = 0; This->stateBlock->streamStride[0] = VertexStreamZeroStride; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 772bd78..6ab6247 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -262,6 +262,13 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { } } } + for (counter = 0; counter < MAX_STREAMS; counter++) { + if(This->streamSource[counter]) { + if(0 != IWineD3DVertexBuffer_Release(This->streamSource[counter])) { + TRACE("Vertex buffer still referenced by stateblock, applications has leaked Stream %u, buffer %p\n", counter, This->streamSource[counter]); + } + } + } if(This->pIndexData) IWineD3DIndexBuffer_Release(This->pIndexData); }

1 0

Stefan Dösinger : wined3d: Fix some alpha channels in formats.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: a7a0d4dfd16576aa11f65fcfeffe8300500a3aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a0d4dfd16576aa11f65fcfe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 13 00:47:55 2007 +0200 wined3d: Fix some alpha channels in formats. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dfc1fc6..abb5eb3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -150,14 +150,14 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A8R8G8B8 ,GL_RGBA8 ,GL_SRGB8_ALPHA8_EXT ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_X8R8G8B8 ,GL_RGB8 ,GL_SRGB8_EXT ,GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_R5G6B5 ,GL_RGB5 ,GL_RGB5 ,GL_RGB ,GL_UNSIGNED_SHORT_5_6_5 }, - {WINED3DFMT_X1R5G5B5 ,GL_RGB5_A1 ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, + {WINED3DFMT_X1R5G5B5 ,GL_RGB5 ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, {WINED3DFMT_A1R5G5B5 ,GL_RGB5_A1 ,GL_RGB5_A1 ,GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV }, {WINED3DFMT_A4R4G4B4 ,GL_RGBA4 ,GL_SRGB8_ALPHA8_EXT ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, {WINED3DFMT_R3G3B2 ,GL_R3_G3_B2 ,GL_R3_G3_B2 ,GL_RGB ,GL_UNSIGNED_BYTE_3_3_2 }, {WINED3DFMT_A8 ,GL_ALPHA8 ,GL_ALPHA8 ,GL_ALPHA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A8R3G3B2 ,0 ,0 ,0 ,0 }, {WINED3DFMT_X4R4G4B4 ,GL_RGB4 ,GL_RGB4 ,GL_BGRA ,GL_UNSIGNED_SHORT_4_4_4_4_REV }, - {WINED3DFMT_A2B10G10R10 ,GL_RGB ,GL_RGB ,GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV }, + {WINED3DFMT_A2B10G10R10 ,GL_RGBA ,GL_RGBA ,GL_RGBA ,GL_UNSIGNED_INT_2_10_10_10_REV }, {WINED3DFMT_A8B8G8R8 ,GL_RGBA8 ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_X8B8G8R8 ,GL_RGB8 ,GL_RGB8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV }, {WINED3DFMT_G16R16 ,0 ,0 ,0 ,0 },

1 0

Stefan Dösinger : wined3d: FIX D3DBLEND_BOTHSRCALPHA and BLEND_BOTHINVSRCALPHA.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 306fcfeee7235c4c51b579898678487c8a88895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=306fcfeee7235c4c51b579898… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 12 21:44:30 2007 +0200 wined3d: FIX D3DBLEND_BOTHSRCALPHA and BLEND_BOTHINVSRCALPHA. --- dlls/wined3d/directx.c | 5 ++- dlls/wined3d/state.c | 60 ++++++++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e9b2aca..43888bf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1934,8 +1934,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPBLENDCAPS_ZERO; *pCaps->DestBlendCaps = WINED3DPBLENDCAPS_BLENDFACTOR | - WINED3DPBLENDCAPS_BOTHINVSRCALPHA | - WINED3DPBLENDCAPS_BOTHSRCALPHA | WINED3DPBLENDCAPS_DESTALPHA | WINED3DPBLENDCAPS_DESTCOLOR | WINED3DPBLENDCAPS_INVDESTALPHA | @@ -1948,6 +1946,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPBLENDCAPS_ZERO; /* NOTE: WINED3DPBLENDCAPS_SRCALPHASAT is not supported as dest blend factor, * according to the glBlendFunc manpage + * + * WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA are + * legacy settings for srcblend only */ *pCaps->AlphaCmpCaps = WINED3DPCMPCAPS_ALWAYS | diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9a768d1..99fdfdc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -247,33 +247,6 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D return; }; - switch (stateblock->renderState[WINED3DRS_SRCBLEND]) { - case WINED3DBLEND_ZERO : srcBlend = GL_ZERO; break; - case WINED3DBLEND_ONE : srcBlend = GL_ONE; break; - case WINED3DBLEND_SRCCOLOR : srcBlend = GL_SRC_COLOR; break; - case WINED3DBLEND_INVSRCCOLOR : srcBlend = GL_ONE_MINUS_SRC_COLOR; break; - case WINED3DBLEND_SRCALPHA : srcBlend = GL_SRC_ALPHA; break; - case WINED3DBLEND_INVSRCALPHA : srcBlend = GL_ONE_MINUS_SRC_ALPHA; break; - case WINED3DBLEND_DESTALPHA : srcBlend = GL_DST_ALPHA; break; - case WINED3DBLEND_INVDESTALPHA : srcBlend = GL_ONE_MINUS_DST_ALPHA; break; - case WINED3DBLEND_DESTCOLOR : srcBlend = GL_DST_COLOR; break; - case WINED3DBLEND_INVDESTCOLOR : srcBlend = GL_ONE_MINUS_DST_COLOR; break; - case WINED3DBLEND_SRCALPHASAT : srcBlend = GL_SRC_ALPHA_SATURATE; break; - - case WINED3DBLEND_BOTHSRCALPHA : srcBlend = GL_SRC_ALPHA; - dstBlend = GL_SRC_ALPHA; - break; - - case WINED3DBLEND_BOTHINVSRCALPHA : srcBlend = GL_ONE_MINUS_SRC_ALPHA; - dstBlend = GL_ONE_MINUS_SRC_ALPHA; - break; - - case WINED3DBLEND_BLENDFACTOR : srcBlend = GL_CONSTANT_COLOR; break; - case WINED3DBLEND_INVBLENDFACTOR : srcBlend = GL_ONE_MINUS_CONSTANT_COLOR; break; - default: - FIXME("Unrecognized src blend value %d\n", stateblock->renderState[WINED3DRS_SRCBLEND]); - } - switch (stateblock->renderState[WINED3DRS_DESTBLEND]) { case WINED3DBLEND_ZERO : dstBlend = GL_ZERO; break; case WINED3DBLEND_ONE : dstBlend = GL_ONE; break; @@ -291,12 +264,17 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D WARN("Application uses SRCALPHASAT as dest blend factor, expect problems\n"); break; + /* WINED3DBLEND_BOTHSRCALPHA and WINED3DBLEND_BOTHINVSRCALPHA are legacy source blending + * values which are still valid up to d3d9. They should not occur as dest blend values + */ case WINED3DBLEND_BOTHSRCALPHA : dstBlend = GL_SRC_ALPHA; srcBlend = GL_SRC_ALPHA; + FIXME("WINED3DRS_DESTBLEND = WINED3DBLEND_BOTHSRCALPHA, what to do?\n"); break; case WINED3DBLEND_BOTHINVSRCALPHA : dstBlend = GL_ONE_MINUS_SRC_ALPHA; srcBlend = GL_ONE_MINUS_SRC_ALPHA; + FIXME("WINED3DRS_DESTBLEND = WINED3DBLEND_BOTHINVSRCALPHA, what to do?\n"); break; case WINED3DBLEND_BLENDFACTOR : dstBlend = GL_CONSTANT_COLOR; break; @@ -305,6 +283,34 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D FIXME("Unrecognized dst blend value %d\n", stateblock->renderState[WINED3DRS_DESTBLEND]); } + switch (stateblock->renderState[WINED3DRS_SRCBLEND]) { + case WINED3DBLEND_ZERO : srcBlend = GL_ZERO; break; + case WINED3DBLEND_ONE : srcBlend = GL_ONE; break; + case WINED3DBLEND_SRCCOLOR : srcBlend = GL_SRC_COLOR; break; + case WINED3DBLEND_INVSRCCOLOR : srcBlend = GL_ONE_MINUS_SRC_COLOR; break; + case WINED3DBLEND_SRCALPHA : srcBlend = GL_SRC_ALPHA; break; + case WINED3DBLEND_INVSRCALPHA : srcBlend = GL_ONE_MINUS_SRC_ALPHA; break; + case WINED3DBLEND_DESTALPHA : srcBlend = GL_DST_ALPHA; break; + case WINED3DBLEND_INVDESTALPHA : srcBlend = GL_ONE_MINUS_DST_ALPHA; break; + case WINED3DBLEND_DESTCOLOR : srcBlend = GL_DST_COLOR; break; + case WINED3DBLEND_INVDESTCOLOR : srcBlend = GL_ONE_MINUS_DST_COLOR; break; + case WINED3DBLEND_SRCALPHASAT : srcBlend = GL_SRC_ALPHA_SATURATE; break; + + case WINED3DBLEND_BOTHSRCALPHA : srcBlend = GL_SRC_ALPHA; + dstBlend = GL_ONE_MINUS_SRC_ALPHA; + break; + + case WINED3DBLEND_BOTHINVSRCALPHA : srcBlend = GL_ONE_MINUS_SRC_ALPHA; + dstBlend = GL_SRC_ALPHA; + break; + + case WINED3DBLEND_BLENDFACTOR : srcBlend = GL_CONSTANT_COLOR; break; + case WINED3DBLEND_INVBLENDFACTOR : srcBlend = GL_ONE_MINUS_CONSTANT_COLOR; break; + default: + FIXME("Unrecognized src blend value %d\n", stateblock->renderState[WINED3DRS_SRCBLEND]); + } + + if(stateblock->renderState[WINED3DRS_EDGEANTIALIAS] || stateblock->renderState[WINED3DRS_ANTIALIASEDLINEENABLE]) { glEnable(GL_LINE_SMOOTH);

1 0

Stefan Dösinger : wined3d: Remove a debug hack.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 4baee1973c1519ac69115fcbe3f2e789e2ab991e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4baee1973c1519ac69115fcbe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 20:47:10 2007 +0200 wined3d: Remove a debug hack. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b9d92e..86507a0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4344,7 +4344,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) HRESULT temp_result; int i; - ERR("(%p)\n", This); + TRACE("(%p)\n", This); if (This->isRecordingState) { return WINED3DERR_INVALIDCALL;

1 0