March 2008 - Wine-commits - list.winehq.org

Roderick Colenbrander : wined3d: Add srgb write support to CheckDeviceFormat.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 856af1b5d77a4b3b4ab95b6f70961d55bd7680a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856af1b5d77a4b3b4ab95b6f7… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 22:45:52 2008 +0000 wined3d: Add srgb write support to CheckDeviceFormat. --- dlls/wined3d/directx.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6665a42..df0cea2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2004,6 +2004,26 @@ static BOOL CheckSrgbReadCapability(UINT Adapter, WINED3DFORMAT CheckFormat) return FALSE; } +static BOOL CheckSrgbWriteCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT CheckFormat) +{ + /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are + * doing the color fixup in shaders. + * Note Windows drivers (at least on the Geforce 8800) also offer this on R5G6B5. */ + if((CheckFormat == WINED3DFMT_X8R8G8B8) || (CheckFormat == WINED3DFMT_X8R8G8B8)) { + int vs_selected_mode; + int ps_selected_mode; + select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); + + if((ps_selected_mode == SHADER_ARB) || (ps_selected_mode == SHADER_GLSL)) { + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + } + } + + TRACE_(d3d_caps)("[FAILED] - no SRGB writing support on format=%s\n", debug_d3dformat(CheckFormat)); + return FALSE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2301,6 +2321,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_SRGBWRITE support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { + if(CheckSrgbWriteCapability(Adapter, DeviceType, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBWRITE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_VERTEXTEXTURE support */ if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { if(CheckVertexTextureCapability(Adapter, CheckFormat)) { @@ -2413,6 +2443,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_SRGBWRITE support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { + if(CheckSrgbWriteCapability(Adapter, DeviceType, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBWRITE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_VERTEXTEXTURE support */ if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { if(CheckVertexTextureCapability(Adapter, CheckFormat)) { @@ -2474,6 +2514,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_SRGBWRITE support */ + if(Usage & WINED3DUSAGE_QUERY_SRGBWRITE) { + if(CheckSrgbWriteCapability(Adapter, DeviceType, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_SRGBWRITE; + } else { + TRACE_(d3d_caps)("[FAILED] - No query srgbwrite support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_VERTEXTEXTURE support */ if(Usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) { if(CheckVertexTextureCapability(Adapter, CheckFormat)) {

1 0

Alexandre Julliard : kernel32/tests: Added some tests for FindResource.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 9879f78c13052b05fa56ef13ce545669ff96f878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9879f78c13052b05fa56ef13c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 13:09:44 2008 +0100 kernel32/tests: Added some tests for FindResource. --- dlls/kernel32/tests/Makefile.in | 2 ++ dlls/kernel32/tests/resource.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/resource.rc | 26 ++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index d87e47d..e48ecaf 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -39,6 +39,8 @@ CTESTS = \ virtual.c \ volume.c +RC_SRCS = resource.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 3e152e6..79d17f1 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -263,6 +263,42 @@ end: CloseHandle( file ); } +static void test_find_resource(void) +{ + HRSRC rsrc; + + rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_MENU ); + ok( rsrc != 0, "resource not found\n" ); + rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL )); + ok( rsrc != 0, "resource not found\n" ); + rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + MAKELANGID( LANG_GERMAN, SUBLANG_DEFAULT )); + ok( rsrc != 0, "resource not found\n" ); + + SetLastError( 0xdeadbeef ); + rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_DIALOG ); + ok( !rsrc, "resource found\n" ); + ok( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(2), (LPCWSTR)RT_MENU ); + ok( !rsrc, "resource found\n" ); + ok( GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + ok( !rsrc, "resource found\n" ); + ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + MAKELANGID( LANG_FRENCH, SUBLANG_DEFAULT ) ); + ok( !rsrc, "resource found\n" ); + ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); +} + START_TEST(resource) { DeleteFile( filename ); @@ -283,4 +319,5 @@ START_TEST(resource) update_resources_version(); check_exe( check_not_empty ); DeleteFile( filename ); + test_find_resource(); } diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc new file mode 100644 index 0000000..f40a878 --- /dev/null +++ b/dlls/kernel32/tests/resource.rc @@ -0,0 +1,26 @@ +/* + * Resources for kernel test suite. + * + * Copyright 2008 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +1 MENU LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +{ + MENUITEM "foo", 1 +}

1 0

Roderick Colenbrander : wined3d: Return WINED3DERR_NOTAVAILABLE when cubemapping isn't supported.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 460f0d16087aad2abd9e1524b15c096415fafe51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460f0d16087aad2abd9e1524b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 20:59:14 2008 +0000 wined3d: Return WINED3DERR_NOTAVAILABLE when cubemapping isn't supported. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index db351ee..103e8f1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2312,6 +2312,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } } + } else { + TRACE_(d3d_caps)("[FAILED] - No cube texture support\n"); + return WINED3DERR_NOTAVAILABLE; } } else if(RType == WINED3DRTYPE_SURFACE) { /* Surface allows:

1 0

Roderick Colenbrander : wined3d: Don' t continue with CheckDeviceFormat when the texture format isn't around.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 5d151c0ffc60627b1d54ae397a83ef1770491d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d151c0ffc60627b1d54ae397… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 21:11:12 2008 +0000 wined3d: Don't continue with CheckDeviceFormat when the texture format isn't around. It is legal to pass Usage=0 to CheckDeviceFormat and in both this case and in the case a format isn't available UsageCaps would be 0 and a format would be reported available. --- dlls/wined3d/directx.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 103e8f1..1c7d9e3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2311,6 +2311,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + } else { + TRACE_(d3d_caps)("[FAILED] - Cube texture format not supported\n"); + return WINED3DERR_NOTAVAILABLE; } } else { TRACE_(d3d_caps)("[FAILED] - No cube texture support\n"); @@ -2423,6 +2426,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } else { + TRACE_(d3d_caps)("[FAILED] - Texture format not supported\n"); + return WINED3DERR_NOTAVAILABLE; } } else if((RType == WINED3DRTYPE_VOLUME) || (RType == WINED3DRTYPE_VOLUMETEXTURE)) { /* Volume is to VolumeTexture what Surface is to Texture but its usage caps are not documented.

1 0

Roderick Colenbrander : wined3d: Remove unneeded code in CheckDeviceFormat.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 9e9ef6238a5f27423e28c8f95f69fb02b98d8f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9ef6238a5f27423e28c8f95… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 21:41:59 2008 +0000 wined3d: Remove unneeded code in CheckDeviceFormat. All these checks are done during the capability checks which are performed under the resource type checks. --- dlls/wined3d/directx.c | 152 +----------------------------------------------- 1 files changed, 1 insertions(+), 151 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1c7d9e3..6665a42 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2170,8 +2170,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) * MAKEFOURCC('I','N','S','T') is used. Should a (broken) app check for this provide a proper return value. * We can do instancing with all shader versions, but we need vertex shaders. * - * Additionally applications have to set the D3DRS_POINTSIZE render state to -MAKEFOURCC('I','N','S','T') once + * Additionally applications have to set the D3DRS_POINTSIZE render state to MAKEFOURCC('I','N','S','T') once * to enable instancing. WineD3D doesn't need that and just ignores it. * * With Shader Model 3.0 capable cards Instancing 'just works' in Windows. @@ -2556,155 +2555,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - switch (CheckFormat) { - - /***** - * supported: RGB(A) formats - */ - case WINED3DFMT_R8G8B8: /* Enable for dx7, blacklisted for 8 and 9 above */ - case WINED3DFMT_A8R8G8B8: - case WINED3DFMT_X8R8G8B8: - case WINED3DFMT_R5G6B5: - case WINED3DFMT_X1R5G5B5: - case WINED3DFMT_A1R5G5B5: - case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_R3G3B2: - case WINED3DFMT_A8: - case WINED3DFMT_X4R4G4B4: - case WINED3DFMT_A8B8G8R8: - case WINED3DFMT_X8B8G8R8: - case WINED3DFMT_A2R10G10B10: - case WINED3DFMT_A2B10G10R10: - case WINED3DFMT_G16R16: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - - /***** - * supported: Palettized - */ - case WINED3DFMT_P8: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - - /***** - * Supported: (Alpha)-Luminance - */ - case WINED3DFMT_L8: - case WINED3DFMT_A8L8: - case WINED3DFMT_A4L4: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - - /***** - * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or - * GL_NV_texture_shader), but advertized to make apps happy. - * Enable some because games often fail when they are not available - * and are still playable even without bump mapping - */ - case WINED3DFMT_V8U8: - case WINED3DFMT_V16U16: - case WINED3DFMT_L6V5U5: - case WINED3DFMT_X8L8V8U8: - case WINED3DFMT_Q8W8V8U8: - WARN_(d3d_caps)("[Not supported, but pretended to do]\n"); - return WINED3D_OK; - - /* Those are not advertized by the nvidia windows driver, and not - * supported natively by GL_NV_texture_shader or GL_ATI_envmap_bumpmap. - * WINED3DFMT_A2W10V10U10 could be loaded into shaders using the unsigned - * ARGB format if needed - */ - case WINED3DFMT_W11V11U10: - case WINED3DFMT_A2W10V10U10: - WARN_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - } else { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - - - /***** - * Odd formats - not supported - */ - case WINED3DFMT_VERTEXDATA: - case WINED3DFMT_INDEX16: - case WINED3DFMT_INDEX32: - case WINED3DFMT_Q16W16V16U16: - TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ - return WINED3DERR_NOTAVAILABLE; - - /***** - * WINED3DFMT_CxV8U8: Not supported right now - */ - case WINED3DFMT_CxV8U8: - TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ - return WINED3DERR_NOTAVAILABLE; - - /* Not supported */ - case WINED3DFMT_A16B16G16R16: - case WINED3DFMT_A8R3G3B2: - TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ - return WINED3DERR_NOTAVAILABLE; - - /* Floating point formats */ - case WINED3DFMT_R16F: - case WINED3DFMT_A16B16G16R16F: - if(GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - } else { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - case WINED3DFMT_R32F: - case WINED3DFMT_A32B32G32R32F: - if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - } else { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - - case WINED3DFMT_G16R16F: - case WINED3DFMT_G32R32F: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - - /* ATI instancing hack: Although ATI cards do not support Shader Model 3.0, they support - * instancing. To query if the card supports instancing CheckDeviceFormat with the special format - * MAKEFOURCC('I','N','S','T') is used. Should a (broken) app check for this provide a proper return value. - * We can do instancing with all shader versions, but we need vertex shaders. - * - * Additionally applications have to set the D3DRS_POINTSIZE render state to MAKEFOURCC('I','N','S','T') once - * to enable instancing. WineD3D doesn't need that and just ignores it. - * - * With Shader Model 3.0 capable cards Instancing 'just works' in Windows. - */ - case WINEMAKEFOURCC('I','N','S','T'): - TRACE("ATI Instancing check hack\n"); - if(GL_SUPPORT(ARB_VERTEX_PROGRAM) || GL_SUPPORT(ARB_VERTEX_SHADER)) { - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - } else { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - - default: - break; - } - /* When the UsageCaps exactly matches Usage return WINED3D_OK except for the situation in which * WINED3DUSAGE_AUTOGENMIPMAP isn't around, then WINED3DOK_NOAUTOGEN is returned if all the other * usage flags match. */

1 0

Roderick Colenbrander : wined3d: We don't offer index/vertex buffer caps. Neither do Windows drivers (at least Nvidia, Ati and Intel).
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: eef51ed4ca95342a43dd604bc311299fbd800567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef51ed4ca95342a43dd604bc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 20:50:26 2008 +0000 wined3d: We don't offer index/vertex buffer caps. Neither do Windows drivers (at least Nvidia, Ati and Intel). --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2cc7b03..79da9c1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2523,7 +2523,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt /* Do nothing, continue with checking the format below */ break; } - } + } else if((RType == WINED3DRTYPE_INDEXBUFFER) || (RType == WINED3DRTYPE_VERTEXBUFFER)){ + /* For instance vertexbuffer/indexbuffer aren't supported yet because no Windows drivers seem to offer it */ + TRACE_(d3d_caps)("Unhandled resource type D3DRTYPE_INDEXBUFFER / D3DRTYPE_VERTEXBUFFER\n"); + return WINED3DERR_NOTAVAILABLE; + } /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as

1 0

Roderick Colenbrander : wined3d: When volume textures aren't around ( GL_EXT_texture3D not supported) return WINED3DERR_NOTAVAILABLE.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 6f3127291f6d8255717a0751f4550461e8c15641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3127291f6d8255717a0751f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 20:53:56 2008 +0000 wined3d: When volume textures aren't around (GL_EXT_texture3D not supported) return WINED3DERR_NOTAVAILABLE. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 79da9c1..7ed9739 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2472,6 +2472,9 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } + } else { + TRACE_(d3d_caps)("[FAILED] - No volume texture support\n"); + return WINED3DERR_NOTAVAILABLE; } /* Filter formats that need conversion; For one part, this conversion is unimplemented,

1 0

Roderick Colenbrander : wined3d: Add reporting of D3DRTYPE_VOLUME capabilties.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 616944ae7e990946ad2a6e8235c017a482dfb93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=616944ae7e990946ad2a6e823… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 21 20:57:14 2008 +0000 wined3d: Add reporting of D3DRTYPE_VOLUME capabilties. We assume it has the same capabilities as VOLUMETEXTURE. MSDN is very vague on this topic. Intel/Nvidia/ATI drivers seem to offer nearly the same caps on both, so do that too. --- dlls/wined3d/directx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ed9739..db351ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2421,8 +2421,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; } - } else if(RType == WINED3DRTYPE_VOLUMETEXTURE) { - /* Volumetexture allows: + } else if((RType == WINED3DRTYPE_VOLUME) || (RType == WINED3DRTYPE_VOLUMETEXTURE)) { + /* Volume is to VolumeTexture what Surface is to Texture but its usage caps are not documented. + * Most driver seem to offer (nearly) the same on Volume and VolumeTexture, so do that too. + * + * Volumetexture allows: * - D3DUSAGE_DYNAMIC * - D3DUSAGE_NONSECURE (d3d9ex) * - D3DUSAGE_SOFTWAREPROCESSING

1 0

Reece Dunn : user32: Fixed the HiliteMenuItem tests to pass on Windows 9x.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 56b2ab241e311d845f9446cfae3451888ac1799b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b2ab241e311d845f9446cfa… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Mar 21 09:16:33 2008 +0000 user32: Fixed the HiliteMenuItem tests to pass on Windows 9x. --- dlls/user32/tests/menu.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 2f7677c..0ff6a1c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1903,18 +1903,17 @@ static void test_menu_hilitemenuitem( void ) { ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION), "HiliteMenuItem: call should have failed.\n"); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, - "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); } + ok(GetLastError() == 0xdeadbeef || /* 9x */ + GetLastError() == ERROR_INVALID_WINDOW_HANDLE /* NT */, + "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!HiliteMenuItem(hWnd, NULL, 1, MF_HILITE | MF_BYPOSITION), "HiliteMenuItem: call should have failed.\n"); - todo_wine - { - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, + ok(GetLastError() == 0xdeadbeef || /* 9x */ + GetLastError() == ERROR_INVALID_MENU_HANDLE /* NT */, "HiliteMenuItem: expected error ERROR_INVALID_MENU_HANDLE, got: %d\n", GetLastError()); - } ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), "HiliteMenuItem: Item 2 is hilited\n");

1 0

Dan Hipschman : advapi32: Add a stub for CreateRestrictedToken.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 2904f543f4593c5101b32b1044794f36d62bd7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2904f543f4593c5101b32b104… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Mar 21 15:37:36 2008 -0700 advapi32: Add a stub for CreateRestrictedToken. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 2 +- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 38ae793..d066f5c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -97,7 +97,7 @@ # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) -# @ stub CreateRestrictedToken +@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) # @ stub CreateTraceInstanceId diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b8c0a31..333ad86 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -734,6 +734,46 @@ BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token) ThreadImpersonationToken, &token, sizeof token )); } +/************************************************************************* + * CreateRestrictedToken [ADVAPI32.@] + * + * Create a new more restricted token from an existing token. + * + * PARAMS + * baseToken [I] Token to base the new restricted token on + * flags [I] Options + * nDisableSids [I] Length of disableSids array + * disableSids [I] Array of SIDs to disable in the new token + * nDeletePrivs [I] Length of deletePrivs array + * deletePrivs [I] Array of privileges to delete in the new token + * nRestrictSids [I] Length of restrictSids array + * restrictSids [I] Array of SIDs to restrict in the new token + * newToken [O] Address where the new token is stored + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI CreateRestrictedToken( + HANDLE baseToken, + DWORD flags, + DWORD nDisableSids, + PSID_AND_ATTRIBUTES disableSids, + DWORD nDeletePrivs, + PLUID_AND_ATTRIBUTES deletePrivs, + DWORD nRestrictSids, + PSID_AND_ATTRIBUTES restrictSids, + PHANDLE newToken) +{ + FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", + baseToken, flags, nDisableSids, disableSids, + nDeletePrivs, deletePrivs, + nRestrictSids, restrictSids, + newToken); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /* ############################## ###### SID FUNCTIONS ###### ############################## diff --git a/include/winbase.h b/include/winbase.h index 7a0cce0..03e3bbc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1375,6 +1375,7 @@ WINADVAPI BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURIT WINADVAPI BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser) WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); WINBASEAPI HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR); #define CreateSemaphore WINELIB_NAME_AW(CreateSemaphore) diff --git a/include/winnt.h b/include/winnt.h index 78c44a5..96ed387 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3535,7 +3535,7 @@ typedef struct { typedef struct _SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes; -} SID_AND_ATTRIBUTES; +} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; /* security entities */ #define SECURITY_NULL_RID (0x00000000L)

1 0