December 2006 - Wine-commits

Stefan Dösinger : wined3d: Move WINED3DRS_COLORVERTEX to the state table.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 81a1dce0cb8a4871fae60517aaeb832f031e1c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a1dce0cb8a4871fae60517a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 10 22:44:18 2006 +0100 wined3d: Move WINED3DRS_COLORVERTEX to the state table. --- dlls/wined3d/device.c | 41 +---------------------------------------- dlls/wined3d/state.c | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0b2645a..42d9308 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3384,51 +3384,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_VERTEXBLEND : case WINED3DRS_TWEENFACTOR : case WINED3DRS_INDEXEDVERTEXBLENDENABLE : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_COLORVERTEX : case WINED3DRS_DIFFUSEMATERIALSOURCE : case WINED3DRS_SPECULARMATERIALSOURCE : case WINED3DRS_AMBIENTMATERIALSOURCE : case WINED3DRS_EMISSIVEMATERIALSOURCE : - { - GLenum Parm = GL_AMBIENT_AND_DIFFUSE; - - if (This->stateBlock->renderState[WINED3DRS_COLORVERTEX]) { - TRACE("diff %d, amb %d, emis %d, spec %d\n", - This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE], - This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE], - This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE], - This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE]); - - if (This->stateBlock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) { - if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { - Parm = GL_AMBIENT_AND_DIFFUSE; - } else { - Parm = GL_DIFFUSE; - } - } else if (This->stateBlock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { - Parm = GL_AMBIENT; - } else if (This->stateBlock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { - Parm = GL_EMISSION; - } else if (This->stateBlock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { - Parm = GL_SPECULAR; - } else { - Parm = -1; - } - - if (Parm == -1) { - if (This->tracking_color != DISABLED_TRACKING) This->tracking_color = NEEDS_DISABLE; - } else { - This->tracking_color = NEEDS_TRACKING; - This->tracking_parm = Parm; - } - - } else { - if (This->tracking_color != DISABLED_TRACKING) This->tracking_color = NEEDS_DISABLE; - } - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_LINEPATTERN : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a2272f6..24006cd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -810,6 +810,45 @@ static void state_fogdensity(DWORD state checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); } +/* TODO: Merge with primitive type + init_materials()!! */ +static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock) { + GLenum Parm = GL_AMBIENT_AND_DIFFUSE; + + if (stateblock->renderState[WINED3DRS_COLORVERTEX]) { + TRACE("diff %d, amb %d, emis %d, spec %d\n", + stateblock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE], + stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE], + stateblock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE], + stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE]); + + if (stateblock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE] == D3DMCS_COLOR1) { + if (stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + Parm = GL_AMBIENT_AND_DIFFUSE; + } else { + Parm = GL_DIFFUSE; + } + } else if (stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == D3DMCS_COLOR1) { + Parm = GL_AMBIENT; + } else if (stateblock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == D3DMCS_COLOR1) { + Parm = GL_EMISSION; + } else if (stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == D3DMCS_COLOR1) { + Parm = GL_SPECULAR; + } else { + Parm = -1; + } + + if (Parm == -1) { + if (stateblock->wineD3DDevice->tracking_color != DISABLED_TRACKING) stateblock->wineD3DDevice->tracking_color = NEEDS_DISABLE; + } else { + stateblock->wineD3DDevice->tracking_color = NEEDS_TRACKING; + stateblock->wineD3DDevice->tracking_parm = Parm; + } + + } else { + if (stateblock->wineD3DDevice->tracking_color != DISABLED_TRACKING) stateblock->wineD3DDevice->tracking_color = NEEDS_DISABLE; + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -956,14 +995,14 @@ const struct StateEntry StateTable[] = { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_unknown }, { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, + { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_unknown }, { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_unknown }, { /*144, WINED3DRS_COLORKEYBLENDENABLE */ STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_unknown }, - { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, - { /*146, WINED3DRS_SPECULARMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, - { /*147, WINED3DRS_AMBIENTMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, - { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_unknown }, + { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, + { /*146, WINED3DRS_SPECULARMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, + { /*147, WINED3DRS_AMBIENTMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, + { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*149, Undefined */ 0, state_undefined }, { /*150, Undefined */ 0, state_undefined }, { /*151, WINED3DRS_VERTEXBLEND */ 0, state_nogl },

1 0

Alexandre Julliard : shell32: Avoid using garbage data in wildcard expansion.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: a051487d3b6eb0fb8bdea80c8326d8b325c95c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a051487d3b6eb0fb8bdea80c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 15:37:35 2006 +0100 shell32: Avoid using garbage data in wildcard expansion. --- dlls/shell32/shlfileop.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 1437c07..1aa41de 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -824,6 +824,8 @@ static void parse_wildcard_files(FILE_LI LPWSTR szFullPath; BOOL res; + if (hFile == INVALID_HANDLE_VALUE) return; + for (res = TRUE; res; res = FindNextFileW(hFile, &wfd)) { if (IsDotDir(wfd.cFileName)) continue;

1 0

lostwages/templates/en download.template
by Jeremy Newman 11 Dec '06

11 Dec '06

ChangeSet ID: 30474 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/12/11 10:01:56 Modified files: templates/en : download.template Log message: Marcus Meissner <meissner(a)suse.de> SUSE adjustments Patch: http://cvs.winehq.org/patch.py?id=30474 Old revision New revision Changes Path 1.88 1.89 +3 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.88 lostwages/templates/en/download.template:1.89 --- lostwages/templates/en/download.template:1.88 11 Dec 2006 16: 1:56 -0000 +++ lostwages/templates/en/download.template 11 Dec 2006 16: 1:56 -0000 @@ -39,7 +39,9 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SUSE</a></b> - binary and source .rpms for SUSE 9.1, 9.2, 9.3, 10.0, and 10.1</td> + binary and source .rpms for SUSE 9.3, 10.0, 10.1, and 10.2.<br/> + Release and daily snapshots are also available via the <a href="http://en.opensuse.org/Wine">openSUSE buildservice</a>, as YUM and YAST package repositories. + </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

tools/. download.inc.php
by Jeremy Newman 11 Dec '06

11 Dec '06

ChangeSet ID: 30473 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2006/12/11 09:48:40 Modified files: . : download.inc.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> avoid infinite loop in Wine downloader scripts Patch: http://cvs.winehq.org/patch.py?id=30473 Old revision New revision Changes Path 1.1 1.2 +24 -11 tools/download.inc.php Index: tools/download.inc.php diff -u -p tools/download.inc.php:1.1 tools/download.inc.php:1.2 --- tools/download.inc.php:1.1 11 Dec 2006 15:48:40 -0000 +++ tools/download.inc.php 11 Dec 2006 15:48:40 -0000 @@ -31,17 +31,20 @@ $aList += array("http://switch.dl.source ); -function is_downloadable($sUrl){ +function is_downloadable($sUrl) +{ global $iFileSize; $parse = parse_url($sUrl); // open a socket connection - if($fp = @fsockopen($parse['host'], 80, $errno, $errstr, 10)){ + if($fp = @fsockopen($parse['host'], 80, $errno, $errstr, 10)) + { // set request $get = "HEAD ".$parse['path']." HTTP/1.1\r\n". "Host: ".$parse['host']."\r\n". "Connection: close\r\n\r\n"; fputs($fp, $get); - while(!feof($fp)){ + while(!feof($fp)) + { // get ONLY header informations $header .= fgets($fp, 128); } @@ -55,20 +58,30 @@ function is_downloadable($sUrl){ } -if($_REQUEST['action']=="showlist") { +if($_REQUEST['action']=="showlist") +{ echo "<h2>List of mirrors available for file ".$sFileName." (".$iFileSize." bytes)</h2>"; - foreach($aList as $sLocation) { + foreach($aList as $sLocation) + { echo $sLocation.": "; - if(is_downloadable($sLocation.$sFileName)) { + if(is_downloadable($sLocation.$sFileName)) echo "<font color=\"green\">online</font>"; - } else { + else echo "<font color=\"red\">offline</font>"; - } echo "\n<br />"; + flush(); } -} else { - while(!is_downloadable($sUrl)) { - $iRand = rand(0, (sizeof($aList)-1)); +} else +{ + $iRand = rand(0, (sizeof($aList)-1)); + $sUrl = $aList[$iRand].$sFileName; + // we continue as long as we didn't find a working mirror and we didn't tried all the mirrors + while(!is_downloadable($sUrl) && sizeof($aAlreadyTried)<sizeof($aList)) + { + $aAlreadyTried[$iRand] = true; + // we loop until we take a random mirror that we didn't already tried ; of course if we have already tried all mirrors we stop + while($aAlreadyTried[$iRand] == true && sizeof($aAlreadyTried)<sizeof($aList)) + $iRand = rand(0, (sizeof($aList)-1)); $sUrl = $aList[$iRand].$sFileName; } header("Location: ".$sUrl);

1 0

Roderick Colenbrander : wgl: Make the WGL code independant of the number of supported pixel formats.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 055f8712b40cc39ef1c280ae023ad8aa68c1a7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=055f8712b40cc39ef1c280ae0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Dec 10 19:17:03 2006 +0100 wgl: Make the WGL code independant of the number of supported pixel formats. --- dlls/winex11.drv/opengl.c | 74 ++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8f55c92..f7abbf3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1065,7 +1065,9 @@ int X11DRV_DescribePixelFormat(X11DRV_PD GLXFBConfig cur; int nCfgs = 0; int ret = 0; + int fmt_count = 0; int fmt_index = 0; + BOOL res = FALSE; if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); @@ -1083,20 +1085,21 @@ int X11DRV_DescribePixelFormat(X11DRV_PD return 0; /* unespected error */ } - /* This function always reports the total number of supported pixel formats. - * At the moment we only support the pixel format corresponding to the main - * visual which got created at x11drv initialization. More formats could be - * supported if there was a way to recreate x11 windows in x11drv. - * Because we only support one format nCfgs needs to be set to 1. - */ - nCfgs = 1; + /* Look for the iPixelFormat in our list of supported formats. If it is supported we get the index in the FBConfig table and the number of supported formats back */ + res = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &fmt_count); if (ppfd == NULL) { - /* The application is only querying the number of visuals */ - wine_tsx11_lock(); - if (NULL != cfgs) XFree(cfgs); - wine_tsx11_unlock(); - return nCfgs; + /* The application is only querying the number of visuals */ + wine_tsx11_lock(); + if (NULL != cfgs) XFree(cfgs); + wine_tsx11_unlock(); + return fmt_count; + } else if(res == FALSE) { + WARN("unexpected iPixelFormat(%d): not >=1 and <=nFormats(%d), returning NULL!\n", iPixelFormat, fmt_count); + wine_tsx11_lock(); + if (NULL != cfgs) XFree(cfgs); + wine_tsx11_unlock(); + return 0; } if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) { @@ -1105,18 +1108,7 @@ int X11DRV_DescribePixelFormat(X11DRV_PD return 0; } - if (nCfgs < iPixelFormat || 1 > iPixelFormat) { - WARN("unexpected iPixelFormat(%d): not >=1 and <=nFormats(%d), returning NULL\n", iPixelFormat, nCfgs); - return 0; - } - - /* Retrieve the index in the FBConfig table corresponding to the visual ID from the main visual */ - if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &value)) { - ERR("Can't find a valid pixel format index from the main visual, expect problems!\n"); - return 0; - } - - ret = nCfgs; + ret = fmt_count; cur = cfgs[fmt_index]; memset(ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); @@ -1218,6 +1210,9 @@ int X11DRV_GetPixelFormat(X11DRV_PDEVICE BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { + int fmt_index = 0; + int value; + TRACE("(%p,%d,%p)\n", physDev, iPixelFormat, ppfd); if (!has_opengl()) { @@ -1225,12 +1220,9 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC return 0; } - /* At the moment we only support the pixelformat corresponding to the main - * x11drv visual which got created at x11drv initialization. More formats - * could be supported if there was a way to recreate x11 windows in x11drv - */ - if(iPixelFormat != 1) { - TRACE("Invalid iPixelFormat: %d\n", iPixelFormat); + /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ + if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &value)) { + ERR("Invalid iPixelFormat: %d\n", iPixelFormat); return 0; } @@ -1240,14 +1232,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC int nCfgs_fmt = 0; GLXFBConfig* cfgs_fmt = NULL; GLXFBConfig cur_cfg; - int value; int gl_test = 0; - int fmt_index = 0; - - if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &value)) { - ERR("Can't find a valid pixel format index from the main visual, expect problems!\n"); - return TRUE; /* Return true because the SetPixelFormat stuff itself passed */ - } /* * How to test if hdc current drawable is compatible (visual/FBConfig) ? @@ -1293,8 +1278,8 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDE Wine_GLContext *ret; GLXFBConfig* cfgs_fmt = NULL; GLXFBConfig cur_cfg; - int hdcPF = 1; /* We can only use Wine's main visual which has an index of 1 */ - int tmp = 0; + int hdcPF = physDev->current_pf; + int fmt_count = 0; int fmt_index = 0; int nCfgs_fmt = 0; int value = 0; @@ -1313,7 +1298,7 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDE /* We can only render using the iPixelFormat (1) of Wine's Main visual, we need to get the corresponding GLX format. * If this fails something is very wrong on the system. */ - if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &fmt_index, &tmp)) { + if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &fmt_index, &fmt_count)) { ERR("Cannot get FB Config for main iPixelFormat 1, expect problems!\n"); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; @@ -1326,8 +1311,8 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDE return NULL; } - if (nCfgs_fmt < fmt_index) { - ERR("(%p): unexpected pixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, fmt_index, nCfgs_fmt); + if (fmt_count < hdcPF) { + ERR("(%p): unexpected pixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, hdcPF, fmt_count); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } @@ -1833,6 +1818,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCrea object->display = gdi_display; object->width = iWidth; object->height = iHeight; + object->pixelFormat = iPixelFormat; nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); if (-1 == nAttribs) { @@ -2014,8 +2000,8 @@ HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDE } /* The function wglGetPbufferDCARB returns a DC to which the pbuffer can be connected. - * We only support one onscreen rendering format (the one from the main visual), so use that. */ - physDev->current_pf = 1; + * All formats in our pixelformat list are compatible with each other and the main drawable. */ + physDev->current_pf = object->pixelFormat; physDev->drawable = object->drawable; TRACE("(%p)->(%p)\n", hPbuffer, physDev->hdc);

1 0

Christoph Frick : dinput: Ensure that the size of the dev caps pointer is large enough - no exact.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: f37f598daf909642cb970880e072dfda329face2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37f598daf909642cb970880e… Author: Christoph Frick <frick(a)sc-networks.de> Date: Mon Dec 11 10:05:22 2006 +0100 dinput: Ensure that the size of the dev caps pointer is large enough - no exact. --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0ba4877..868fe89 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1097,7 +1097,7 @@ static HRESULT WINAPI JoystickAImpl_GetC return E_POINTER; } - if (lpDIDevCaps->dwSize != sizeof(DIDEVCAPS)) { + if (lpDIDevCaps->dwSize < sizeof(DIDEVCAPS)) { WARN("invalid argument\n"); return DIERR_INVALIDPARAM; }

1 0

Christoph Frick : dinput: Utilize IDirectInputDevice2AImpl_Acquire/ Unacquire.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 71f41e5d0272a435840d00c08c6252cdf5008364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f41e5d0272a435840d00c08… Author: Christoph Frick <frick(a)sc-networks.de> Date: Mon Dec 11 10:04:49 2006 +0100 dinput: Utilize IDirectInputDevice2AImpl_Acquire/Unacquire. --- dlls/dinput/joystick_linuxinput.c | 39 +++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 868fe89..c5a35a1 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -605,26 +605,29 @@ static HRESULT WINAPI JoystickAImpl_SetD static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { JoystickImpl *This = (JoystickImpl *)iface; + HRESULT res; TRACE("(this=%p)\n",This); - if (This->joyfd!=-1) - return S_FALSE; + if (This->df==NULL) { return DIERR_INVALIDPARAM; } - - if (-1==(This->joyfd=open(This->joydev->device,O_RDWR))) { - if (-1==(This->joyfd=open(This->joydev->device,O_RDONLY))) { - /* Couldn't open the device at all */ - perror(This->joydev->device); - return DIERR_NOTFOUND; - } else { - /* Couldn't open in r/w but opened in read-only. */ - WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + res = IDirectInputDevice2AImpl_Acquire(iface); + if (res==DI_OK) { + if (-1==(This->joyfd=open(This->joydev->device,O_RDWR))) { + if (-1==(This->joyfd=open(This->joydev->device,O_RDONLY))) { + /* Couldn't open the device at all */ + perror(This->joydev->device); + IDirectInputDevice2AImpl_Unacquire(iface); + return DIERR_NOTFOUND; + } else { + /* Couldn't open in r/w but opened in read-only. */ + WARN("Could not open %s in read-write mode. Force feedback will be disabled.\n", This->joydev->device); + } } } - return 0; + return res; } /****************************************************************************** @@ -633,15 +636,15 @@ static HRESULT WINAPI JoystickAImpl_Acqu static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { JoystickImpl *This = (JoystickImpl *)iface; + HRESULT res; TRACE("(this=%p)\n",This); - if (This->joyfd!=-1) { - close(This->joyfd); - This->joyfd = -1; - return DI_OK; + res = IDirectInputDevice2AImpl_Unacquire(iface); + if (res==DI_OK && This->joyfd!=-1) { + close(This->joyfd); + This->joyfd = -1; } - else - return DI_NOEFFECT; + return res; } /*

1 0

Chris Robinson : wgl: Properly handle GLX_DRAWABLE_TYPE queries.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 9da10277ce21568c09539c0c705b781fe775751e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da10277ce21568c09539c0c7… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Dec 10 00:00:47 2006 -0800 wgl: Properly handle GLX_DRAWABLE_TYPE queries. --- dlls/winex11.drv/opengl.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9d42019..8f55c92 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -615,6 +615,7 @@ static int ConvertAttribWGLtoGLX(const i int nAttribs = 0; unsigned cur = 0; int pop; + int drawattrib = 0; int isColor = 0; int wantColorBits = 0; int sz_alpha = 0; @@ -692,25 +693,27 @@ static int ConvertAttribWGLtoGLX(const i case WGL_DRAW_TO_BITMAP_ARB: pop = iWGLAttr[++cur]; TRACE("pAttr[%d] = WGL_DRAW_TO_BITMAP_ARB: %d\n", cur, pop); + /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { - PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT); - TRACE("pAttr[%d] = GLX_DRAWABLE_TYPE: GLX_PIXMAP_BIT\n", cur); + drawattrib |= GLX_PIXMAP_BIT; } break; case WGL_DRAW_TO_WINDOW_ARB: pop = iWGLAttr[++cur]; + TRACE("pAttr[%d] = WGL_DRAW_TO_WINDOW_ARB: %d\n", cur, pop); + /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { - PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT); - TRACE("pAttr[%d] = GLX_DRAWABLE_TYPE: GLX_WINDOW_BIT\n", cur); + drawattrib |= GLX_WINDOW_BIT; } break; case WGL_DRAW_TO_PBUFFER_ARB: pop = iWGLAttr[++cur]; + TRACE("pAttr[%d] = WGL_DRAW_TO_PBUFFER_ARB: %d\n", cur, pop); + /* GLX_DRAWABLE_TYPE flags need to be OR'd together. See below. */ if (pop) { - PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT); - TRACE("pAttr[%d] = GLX_DRAWABLE_TYPE: GLX_PBUFFER_BIT\n", cur); + drawattrib |= GLX_PBUFFER_BIT; } break; @@ -756,7 +759,7 @@ static int ConvertAttribWGLtoGLX(const i return -1; /** error: don't support it */ } else { PUSH2(oGLXAttr, GLX_X_RENDERABLE, pop); - PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT); + drawattrib |= GLX_PBUFFER_BIT; } } break ; @@ -807,6 +810,12 @@ static int ConvertAttribWGLtoGLX(const i TRACE("pAttr[%d] = WGL_COLOR_BITS_ARB: %d\n", cur, wantColorBits); } + /* Apply the OR'd drawable type bitmask now. */ + if (drawattrib) { + PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); + TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib); + } + return nAttribs; } @@ -2433,6 +2442,7 @@ static GLboolean WINAPI X11DRV_wglGetPix curCfg = cfgs[fmt_index]; hTest = pglXGetFBConfigAttrib(gdi_display, curCfg, curGLXAttr, piValues + i); if (hTest) goto get_error; + curGLXAttr = 0; } else { piValues[i] = GL_FALSE; }

1 0

Stefan Dösinger : wined3d: Remove the unused tween factor stateblock member.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 3e05e133f9afec791a0da095f584ce8124131fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e05e133f9afec791a0da095f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 19:50:38 2006 +0100 wined3d: Remove the unused tween factor stateblock member. --- dlls/wined3d/device.c | 9 +-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/wined3d_private.h | 3 --- 3 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e1fbd50..af5e099 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3382,15 +3382,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGCOLOR : case WINED3DRS_FOGDENSITY : case WINED3DRS_VERTEXBLEND : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_TWEENFACTOR : - { - tmpvalue.d = Value; - This->updateStateBlock->tween_factor = tmpvalue.f; - TRACE("Vertex Blending Tween Factor to %f\n", This->updateStateBlock->tween_factor); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_INDEXEDVERTEXBLENDENABLE : diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c0db61f..98904cc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -167,7 +167,6 @@ void stateblock_copy( Dest->viewport = This->viewport; Dest->material = This->material; Dest->pixelShader = This->pixelShader; - Dest->tween_factor = This->tween_factor; Dest->glsl_program = This->glsl_program; /* Fixed size arrays */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd49944..aaa7de7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1171,9 +1171,6 @@ struct IWineD3DStateBlockImpl INT pixelShaderConstantI[MAX_CONST_I * 4]; float *pixelShaderConstantF; - /* Indexed Vertex Blending */ - FLOAT tween_factor; - /* RenderState */ DWORD renderState[WINEHIGHEST_RENDER_STATE + 1];

1 0

Stefan Dösinger : wined3d: Set WINED3DRS_INDEXEDVERTEXBLENDENABLE to state_nogl.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 1328da09da948a0f4182ef78b183f75d65d6c04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328da09da948a0f4182ef78b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 19:53:41 2006 +0100 wined3d: Set WINED3DRS_INDEXEDVERTEXBLENDENABLE to state_nogl. --- dlls/wined3d/device.c | 7 +------ dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index af5e099..0b2645a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3383,13 +3383,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_FOGDENSITY : case WINED3DRS_VERTEXBLEND : case WINED3DRS_TWEENFACTOR : - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - break; - case WINED3DRS_INDEXEDVERTEXBLENDENABLE : - { - TRACE("Indexed Vertex Blend Enable to %u\n", (BOOL) Value); - } + StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; case WINED3DRS_COLORVERTEX : diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b439795..a2272f6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -982,7 +982,7 @@ const struct StateEntry StateTable[] = { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_unknown }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_unknown }, - { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ STATE_RENDER(WINED3DRS_INDEXEDVERTEXBLENDENABLE), state_unknown }, + { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, state_nogl }, { /*168, WINED3DRS_COLORWRITEENABLE */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_unknown }, { /*169, Undefined */ 0, state_undefined }, { /*170, WINED3DRS_TWEENFACTOR */ 0, state_nogl },

1 0