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

Alexandre Julliard : gdi32: Add separate functions for releasing/ freeing DCs to replace the standard GDI ones.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 1476e346457e0f7797cbf7759a5802aa99d82864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1476e346457e0f7797cbf7759… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 21 21:37:40 2007 +0200 gdi32: Add separate functions for releasing/freeing DCs to replace the standard GDI ones. This should make it possible to use a different locking mechanism for DCs. --- dlls/gdi32/bitblt.c | 28 ++++---- dlls/gdi32/bitmap.c | 10 +- dlls/gdi32/brush.c | 4 +- dlls/gdi32/clipping.c | 42 +++++----- dlls/gdi32/dc.c | 186 ++++++++++++++++++++++++-------------------- dlls/gdi32/dib.c | 24 +++--- dlls/gdi32/driver.c | 6 +- dlls/gdi32/enhmfdrv/init.c | 15 +++- dlls/gdi32/font.c | 58 +++++++------- dlls/gdi32/freetype.c | 4 +- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdiobj.c | 6 +- dlls/gdi32/mapping.c | 26 +++--- dlls/gdi32/mfdrv/init.c | 15 +++- dlls/gdi32/opengl.c | 26 +++---- dlls/gdi32/painting.c | 62 +++++++------- dlls/gdi32/palette.c | 18 ++-- dlls/gdi32/path.c | 24 +++--- dlls/gdi32/pen.c | 2 +- dlls/gdi32/printdrv.c | 18 ++-- 20 files changed, 302 insertions(+), 274 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1476e346457e0f7797cbf…

1 0

Paul Vriens : msi/tests: Be verbose when GetProcAddress fails.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: f581a1cbef4553865036ded89fe7b98137a5562b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f581a1cbef4553865036ded89… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 13:51:23 2007 +0200 msi/tests: Be verbose when GetProcAddress fails. --- dlls/msi/tests/install.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 778d05a..f3de7e7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -869,8 +869,15 @@ static void init_functionpointers(void) { HMODULE hmsi = GetModuleHandleA("msi.dll"); - pMsiQueryComponentStateA = (void*)GetProcAddress(hmsi, "MsiQueryComponentStateA"); - pMsiSourceListGetInfoA = (void*)GetProcAddress(hmsi, "MsiSourceListGetInfoA"); +#define GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hmsi, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(MsiQueryComponentStateA); + GET_PROC(MsiSourceListGetInfoA); + +#undef GET_PROC } static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val)

1 0

Stefan Dösinger : wined3d: fogstart == fogend means full fog.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 04d62b4322abfc11f726e6998217569e87c452cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d62b4322abfc11f726e6998… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 13 23:19:37 2007 +0200 wined3d: fogstart == fogend means full fog. --- dlls/d3d9/tests/visual.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 35 +++++++++++++++++++---- 2 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6807fc8..ed7266e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -557,9 +557,77 @@ static void fog_test(IDirect3DDevice9 *device) trace("Info: Table fog not supported by this device\n"); } + /* Now test the special case fogstart == fogend */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + + if(IDirect3DDevice9_BeginScene(device) == D3D_OK) + { + start = 512; + end = 512; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); + ok(hr == D3D_OK, "Setting fog start returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); + ok(hr == D3D_OK, "Setting fog start returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok( hr == D3D_OK, "SetFVF returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); + ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); + ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %s\n", DXGetErrorString9(hr)); + + /* Untransformed vertex, z coord = 0.1, fogstart = 512, fogend = 512. Would result in + * a completely fog-free primitive because start > zcoord, but because start == end, the primitive + * is fully covered by fog. The same happens to the 2nd untransformed quad with z = 1.0. + * The third transformed quad remains unfogged because the fogcoords are read from the specular + * color and has fixed fogstart and fogend. + */ + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_1, + sizeof(unstransformed_1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, unstransformed_2, + sizeof(unstransformed_1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok( hr == D3D_OK, "SetFVF returned %s\n", DXGetErrorString9(hr)); + /* Transformed, vertex fog != NONE, pixel fog == NONE: Use specular color alpha component */ + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, + 2 /*PrimCount */, Indices, D3DFMT_INDEX16, transformed_1, + sizeof(transformed_1[0])); + ok(hr == D3D_OK, "DrawIndexedPrimitiveUP returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "EndScene returned %s\n", DXGetErrorString9(hr)); + } + else + { + ok(FALSE, "BeginScene failed\n"); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 160, 360); + ok(color == 0x0000FF00, "Untransformed vertex with vertex fog and z = 0.1 has color %08x\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x0000FF00, "Untransformed vertex with vertex fog and z = 1.0 has color %08x\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %s\n", DXGetErrorString9(hr)); + start = 0.0; + end = 1.0; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); + ok(hr == D3D_OK, "Setting fog start returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); + ok(hr == D3D_OK, "Setting fog end returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); + ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %s\n", DXGetErrorString9(hr)); } /* This test verifies the behaviour of cube maps wrt. texture wrapping. diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 99fdfdc..be2f902 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -802,6 +802,11 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo fogstart = 1.0; fogend = 0.0; } + + if(GL_SUPPORT(EXT_FOG_COORD)) { + glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); + checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + } context->last_was_foggy_shader = TRUE; } else if( use_ps(stateblock->wineD3DDevice) ) { @@ -837,6 +842,11 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo break; default: FIXME("Unexpected WINED3DRS_FOGVERTEXMODE %d\n", stateblock->renderState[WINED3DRS_FOGVERTEXMODE]); } + + if(GL_SUPPORT(EXT_FOG_COORD)) { + glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); + checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + } } /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, * the system will apply only pixel(=table) fog effects." @@ -944,13 +954,26 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo glEnable(GL_FOG); checkGLcall("glEnable GL_FOG"); - glFogfv(GL_FOG_START, &fogstart); - checkGLcall("glFogf(GL_FOG_START, fogstart"); - TRACE("Fog Start == %f\n", fogstart); + if(fogstart != fogend) + { + glFogfv(GL_FOG_START, &fogstart); + checkGLcall("glFogf(GL_FOG_START, fogstart"); + TRACE("Fog Start == %f\n", fogstart); + + glFogfv(GL_FOG_END, &fogend); + checkGLcall("glFogf(GL_FOG_END, fogend"); + TRACE("Fog End == %f\n", fogend); + } + else + { + glFogf(GL_FOG_START, -1.0 / 0.0); + checkGLcall("glFogf(GL_FOG_START, fogstart"); + TRACE("Fog Start == %f\n", fogstart); - glFogfv(GL_FOG_END, &fogend); - checkGLcall("glFogf(GL_FOG_END, fogend"); - TRACE("Fog End == %f\n", fogend); + glFogf(GL_FOG_END, 0.0); + checkGLcall("glFogf(GL_FOG_END, fogend"); + TRACE("Fog End == %f\n", fogend); + } } else { glDisable(GL_FOG); checkGLcall("glDisable GL_FOG");

1 0

Stefan Dösinger : d3d9: Some caps fixes.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 01c6c982bb8f2f8c8d5ab786272419d9f6a04684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c6c982bb8f2f8c8d5ab7862… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 21 12:13:42 2007 +0200 d3d9: Some caps fixes. --- dlls/d3d9/d3d9_private.h | 2 + dlls/d3d9/device.c | 7 +++++ dlls/d3d9/directx.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 8 ++++- include/d3d9caps.h | 2 + 5 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9049777..160cb67 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -155,6 +155,8 @@ typedef struct IDirect3D9Impl } IDirect3D9Impl; +void filter_caps(D3DCAPS9* pCaps); + /* ---------------- */ /* IDirect3DDevice9 */ /* ---------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index baa11c3..aa65c7e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -155,11 +155,18 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 ifa return D3DERR_INVALIDCALL; /* well this is what MSDN says to return */ } + memset(pCaps, 0, sizeof(*pCaps)); D3D9CAPSTOWINECAPS(pCaps, pWineCaps) EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetDeviceCaps(This->WineD3DDevice, pWineCaps); LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, pWineCaps); + + /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ + pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; + + filter_caps(pCaps); + TRACE("Returning %p %p\n", This, pCaps); return hrc; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index acc95ce..28268f8 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -219,6 +219,63 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 ifa return hr; } +void filter_caps(D3DCAPS9* pCaps) +{ + + DWORD textureFilterCaps = + D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC | + D3DPTFILTERCAPS_MINFPYRAMIDALQUAD | D3DPTFILTERCAPS_MINFGAUSSIANQUAD| + D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | + D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| + D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; + pCaps->TextureFilterCaps &= textureFilterCaps; + pCaps->CubeTextureFilterCaps &= textureFilterCaps; + pCaps->VolumeTextureFilterCaps &= textureFilterCaps; + + pCaps->DevCaps &= + D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY | + D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY| D3DDEVCAPS_TEXTUREVIDEOMEMORY | + D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | D3DDEVCAPS_TEXTURENONLOCALVIDMEM| + D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | + D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT| D3DDEVCAPS_CANBLTSYSTONONLOCAL | + D3DDEVCAPS_HWRASTERIZATION | D3DDEVCAPS_PUREDEVICE | D3DDEVCAPS_QUINTICRTPATCHES | + D3DDEVCAPS_RTPATCHES | D3DDEVCAPS_RTPATCHHANDLEZERO | D3DDEVCAPS_NPATCHES; + + pCaps->ShadeCaps &= + D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_SPECULARGOURAUDRGB | + D3DPSHADECAPS_ALPHAGOURAUDBLEND | D3DPSHADECAPS_FOGGOURAUD; + + pCaps->RasterCaps &= + D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_FOGVERTEX | + D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR | + D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER | + D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE | + D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | + D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE; + + pCaps->DevCaps2 &= + D3DDEVCAPS2_STREAMOFFSET | D3DDEVCAPS2_DMAPNPATCH | D3DDEVCAPS2_ADAPTIVETESSRTPATCH | + D3DDEVCAPS2_ADAPTIVETESSNPATCH | D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES | + D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH| D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; + + pCaps->Caps2 &= + D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | + D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP; + + pCaps->VertexProcessingCaps &= + D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | + D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER | D3DVTXPCAPS_TWEENING | + D3DVTXPCAPS_TEXGEN_SPHEREMAP | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER; + + pCaps->TextureCaps &= + D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA | + D3DPTEXTURECAPS_SQUAREONLY | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | + D3DPTEXTURECAPS_ALPHAPALETTE | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | + D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | + D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP | + D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV; +} + static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hrc = D3D_OK; @@ -233,6 +290,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt if(pWineCaps == NULL){ return D3DERR_INVALIDCALL; /*well this is what MSDN says to return*/ } + memset(pCaps, 0, sizeof(*pCaps)); D3D9CAPSTOWINECAPS(pCaps, pWineCaps) EnterCriticalSection(&d3d9_cs); hrc = IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, pWineCaps); @@ -241,6 +299,9 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES; + + filter_caps(pCaps); + TRACE("(%p) returning %p\n", This, pCaps); return hrc; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 43888bf..0522114 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1974,8 +1974,12 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPTEXTURECAPS_BORDER | WINED3DPTEXTURECAPS_MIPMAP | WINED3DPTEXTURECAPS_PROJECTED | - WINED3DPTEXTURECAPS_PERSPECTIVE | - WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; + WINED3DPTEXTURECAPS_PERSPECTIVE; + + if( !GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_POW2 | + WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; + } if( GL_SUPPORT(EXT_TEXTURE3D)) { *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 573d459..c66d291 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -171,6 +171,8 @@ #define D3DPTFILTERCAPS_MINFPOINT 0x00000100 #define D3DPTFILTERCAPS_MINFLINEAR 0x00000200 #define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400 +#define D3DPTFILTERCAPS_MINFPYRAMIDALQUAD 0x00000800 +#define D3DPTFILTERCAPS_MINFGAUSSIANQUAD 0x00001000 #define D3DPTFILTERCAPS_MIPFPOINT 0x00010000 #define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000 #define D3DPTFILTERCAPS_MAGFPOINT 0x01000000

1 0

Stefan Dösinger : wined3d: Implement range based fog and advertize it correctly.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 0dade7207f6ce2a21384c4e8c784efc7bd13ab06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dade7207f6ce2a21384c4e8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 21 12:30:22 2007 +0200 wined3d: Implement range based fog and advertize it correctly. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/state.c | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0522114..01e6138 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1889,7 +1889,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPRASTERCAPS_ZFOG | WINED3DPRASTERCAPS_FOGVERTEX | WINED3DPRASTERCAPS_FOGTABLE | - WINED3DPRASTERCAPS_FOGRANGE | WINED3DPRASTERCAPS_STIPPLE | WINED3DPRASTERCAPS_SUBPIXEL | WINED3DPRASTERCAPS_ZTEST | @@ -1902,6 +1901,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; } + if(GL_SUPPORT(NV_FOG_DISTANCE)) { + *pCaps->RasterCaps |= WINED3DPRASTERCAPS_FOGRANGE; + } /* FIXME Add: WINED3DPRASTERCAPS_COLORPERSPECTIVE WINED3DPRASTERCAPS_STRETCHBLTMULTISAMPLE diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index be2f902..fb060c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -988,9 +988,21 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo checkGLcall("glFogf(GL_FOG_END, fogend"); } } +} - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); +static void state_rangefog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) { + if (GL_SUPPORT(NV_FOG_DISTANCE)) { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); + } else { + WARN("Range fog enabled, but not supported by this opengl implementation\n"); + } + } else { + if (GL_SUPPORT(NV_FOG_DISTANCE)) { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); + } } } @@ -3534,7 +3546,7 @@ const struct StateEntry StateTable[] = { /* 45, WINED3DRS_TEXTUREADDRESSV */ 0, /* Handled in ddraw */ state_undefined }, { /* 46, WINED3DRS_MIPMAPLODBIAS */ STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, { /* 47, WINED3DRS_ZBIAS */ STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }, - { /* 48, WINED3DRS_RANGEFOGENABLE */ 0, state_nogl }, + { /* 48, WINED3DRS_RANGEFOGENABLE */ STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }, { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_translucentsi },

1 0

Paul Vriens : ntdll/tests: Use skip instead of trace.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: d1b5f309f5a748026afcb3702b369e446c49259f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b5f309f5a748026afcb3702… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 12:09:40 2007 +0200 ntdll/tests: Use skip instead of trace. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index cdbf8d7..40d13fd 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -337,7 +337,7 @@ static void test_RtlUniform(void) */ if (result == 0x7fffff9f) { - trace("Most likely running on Windows Vista, skipping rest of tests\n"); + skip("Most likely running on Windows Vista which uses a different algorithm\n"); return; } @@ -635,7 +635,7 @@ static void test_RtlRandom(void) */ if (seed == 0x3fc) { - trace("Most likely running on Windows Vista, skipping rest of tests\n"); + skip("Most likely running on Windows Vista which uses a different algorithm\n"); return; }

1 0

Mikolaj Zalewski : msvcrt: Test that some functions depends on locale codepage, not the one set by _setmbcp.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 12ff6788b3f94b8c4f803c92c42b99adab623110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ff6788b3f94b8c4f803c92c… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Sun Aug 19 22:59:52 2007 -0700 msvcrt: Test that some functions depends on locale codepage, not the one set by _setmbcp. --- dlls/msvcrt/mbcs.c | 83 +++++++++++++++++++++++++------------------- dlls/msvcrt/tests/string.c | 13 +++++++ 2 files changed, 60 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 024c9b5..38c249b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -360,21 +360,6 @@ unsigned int CDECL _mbclen(const unsigned char* str) } /********************************************************************* - * mblen(MSVCRT.@) - */ -int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) -{ - if (str && *str && size) - { - if(MSVCRT___mb_cur_max == 1) - return 1; /* ASCII CP */ - - return !MSVCRT_isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); - } - return 0; -} - -/********************************************************************* * _mbslen(MSVCRT.@) */ MSVCRT_size_t CDECL _mbslen(const unsigned char* str) @@ -395,27 +380,6 @@ MSVCRT_size_t CDECL _mbslen(const unsigned char* str) } /********************************************************************* - * _mbstrlen(MSVCRT.@) - */ -MSVCRT_size_t CDECL _mbstrlen(const char* str) -{ - if(MSVCRT___mb_cur_max > 1) - { - MSVCRT_size_t len = 0; - while(*str) - { - /* FIXME: According to the documentation we are supposed to test for - * multi-byte character validity. Whatever that means - */ - str += MSVCRT_isleadbyte(*str) ? 2 : 1; - len++; - } - return len; - } - return strlen(str); /* ASCII CP */ -} - -/********************************************************************* * _mbccpy(MSVCRT.@) */ void CDECL _mbccpy(unsigned char* dest, const unsigned char* src) @@ -1477,3 +1441,50 @@ unsigned char* CDECL _mbspbrk(const unsigned char* str, const unsigned char* acc } return NULL; } + + +/* + * Functions depending on locale codepage + */ + +/********************************************************************* + * mblen(MSVCRT.@) + * REMARKS + * Unlike most of the multibyte string functions this function uses + * the locale codepage, not the codepage set by _setmbcp + */ +int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) +{ + if (str && *str && size) + { + if(MSVCRT___mb_cur_max == 1) + return 1; /* ASCII CP */ + + return !MSVCRT_isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + } + return 0; +} + +/********************************************************************* + * _mbstrlen(MSVCRT.@) + * REMARKS + * Unlike most of the multibyte string functions this function uses + * the locale codepage, not the codepage set by _setmbcp + */ +MSVCRT_size_t CDECL _mbstrlen(const char* str) +{ + if(MSVCRT___mb_cur_max > 1) + { + MSVCRT_size_t len = 0; + while(*str) + { + /* FIXME: According to the documentation we are supposed to test for + * multi-byte character validity. Whatever that means + */ + str += MSVCRT_isleadbyte(*str) ? 2 : 1; + len++; + } + return len; + } + return strlen(str); /* ASCII CP */ +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 209f1fa..4f82652 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -201,6 +201,19 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + + /* functions that depend on locale codepage, not mbcp. + * we hope the current locale to be SBCS because setlocale(LC_ALL, ".1252") seems not to work yet + * (as of Wine 0.9.43) + */ + if (__mb_cur_max == 1) + { + expect_eq(mblen((char *)mbstring, 3), 1, int, "%x"); + expect_eq(_mbstrlen((char *)mbstring2), 7, int, "%d"); + } + else + skip("Current locale has double-byte charset - could leave to false positives\n"); + _setmbcp(curr_mbcp); }

1 0

Paul Vriens : ntdll/tests: Do GetModuleHandle only once and add a few skip' s.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 9783ce360e6cb180c5113f7dcbdf006bb2b93e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9783ce360e6cb180c5113f7dc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 21 11:28:25 2007 +0200 ntdll/tests: Do GetModuleHandle only once and add a few skip's. --- dlls/ntdll/tests/exception.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c59a5bb..8afbc81 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -537,7 +537,7 @@ static void test_exceptions(void) if (!pNtGetContextThread || !pNtSetContextThread) { - trace( "NtGetContextThread/NtSetContextThread not found, skipping tests\n" ); + skip( "NtGetContextThread/NtSetContextThread not found\n" ); return; } @@ -797,19 +797,21 @@ static void test_simd_exceptions(void) START_TEST(exception) { #ifdef __i386__ - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); - pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); - pNtSetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtSetContextThread" ); - pNtReadVirtualMemory = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtReadVirtualMemory" ); - pRtlRaiseException = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "RtlRaiseException" ); - pNtTerminateProcess = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtTerminateProcess" ); - pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + + pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); + pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); + pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); + pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); + pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); + pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); - pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), + pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); if (!pNtCurrentTeb) { - trace( "NtCurrentTeb not found, skipping tests\n" ); + skip( "NtCurrentTeb not found\n" ); return; }

1 0

Mikolaj Zalewski : msvcrt: Test and fix _mbclen/_mbslen.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: cea1052f626b6d6f1f57c62429a198c6edc8a06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea1052f626b6d6f1f57c6242… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Sun Aug 19 22:46:56 2007 -0700 msvcrt: Test and fix _mbclen/_mbslen. --- dlls/msvcrt/mbcs.c | 18 ++++++++++-------- dlls/msvcrt/tests/string.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5882630..024c9b5 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -356,7 +356,7 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) */ unsigned int CDECL _mbclen(const unsigned char* str) { - return MSVCRT_isleadbyte(*str) ? 2 : 1; + return _ismbblead(*str) ? 2 : 1; } /********************************************************************* @@ -379,17 +379,19 @@ int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) */ MSVCRT_size_t CDECL _mbslen(const unsigned char* str) { - if(MSVCRT___mb_cur_max > 1) + MSVCRT_size_t len = 0; + while(*str) { - MSVCRT_size_t len = 0; - while(*str) + if (_ismbblead(*str)) { - str += MSVCRT_isleadbyte(*str) ? 2 : 1; - len++; + str++; + if (!*str) /* count only full chars */ + break; } - return len; + str++; + len++; } - return u_strlen(str); /* ASCII CP */ + return len; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8b55cf3..209f1fa 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -166,6 +166,8 @@ static void test_mbcp(void) int mb_orig_max = __mb_cur_max; int curr_mbcp = _getmbcp(); unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */ + unsigned char *mbstring2 = (unsigned char *)"\xb0\xb1\xb2\xb3Q\xb4\xb5"; /* correct string */ + unsigned char *mbsonlylead = (unsigned char *)"\xb0"; /* some two single-byte code pages*/ test_codepage(1252); @@ -186,12 +188,19 @@ static void test_mbcp(void) ok(_ismbbtrail('\xb0'), "\xa0 should be a trail byte\n"); ok(_ismbbtrail(' ') == FALSE, "' ' should not be a trail byte\n"); - /* _mbsnextc */ expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x"); expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */ expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */ + /* _mbclen/_mbslen */ + expect_eq(_mbclen(mbstring), 2, int, "%d"); + expect_eq(_mbclen(&mbstring[2]), 2, int, "%d"); + expect_eq(_mbclen(&mbstring[3]), 1, int, "%d"); + expect_eq(_mbslen(mbstring2), 4, int, "%d"); + expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ + expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + _setmbcp(curr_mbcp); }

1 0

Mikolaj Zalewski : msvcrt: Test and fix _mbsnextc.
by Alexandre Julliard Aug. 21, 2007

Aug. 21, 2007

Module: wine Branch: master Commit: 545f446bf3573b38e3fcc6b59ef89de9d189eec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545f446bf3573b38e3fcc6b59… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Sun Aug 19 22:34:12 2007 -0700 msvcrt: Test and fix _mbsnextc. --- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/tests/string.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1bbb32d..5882630 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -282,9 +282,9 @@ int CDECL _getmbcp(void) */ unsigned int CDECL _mbsnextc(const unsigned char* str) { - if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*str)) + if(_ismbblead(*str)) return *str << 8 | str[1]; - return *str; /* ASCII CP or SB char */ + return *str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6ac3fe2..8b55cf3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -25,6 +25,8 @@ #include <stdlib.h> #include <mbctype.h> +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); @@ -163,6 +165,7 @@ static void test_mbcp(void) { int mb_orig_max = __mb_cur_max; int curr_mbcp = _getmbcp(); + unsigned char *mbstring = (unsigned char *)"\xb0\xb1\xb2 \xb3\xb4 \xb5"; /* incorrect string */ /* some two single-byte code pages*/ test_codepage(1252); @@ -182,6 +185,13 @@ static void test_mbcp(void) ok(_ismbblead(0x123420) == FALSE, "0x123420 should not be a lead byte\n"); ok(_ismbbtrail('\xb0'), "\xa0 should be a trail byte\n"); ok(_ismbbtrail(' ') == FALSE, "' ' should not be a trail byte\n"); + + + /* _mbsnextc */ + expect_eq(_mbsnextc(mbstring), 0xb0b1, int, "%x"); + expect_eq(_mbsnextc(&mbstring[2]), 0xb220, int, "%x"); /* lead + invalid tail */ + expect_eq(_mbsnextc(&mbstring[3]), 0x20, int, "%x"); /* single char */ + _setmbcp(curr_mbcp); }

1 0