April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Store the bumpmap format capability in the format table.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 163940540dbba2c9923f9570ada70c612af0e553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163940540dbba2c9923f9570a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:00 2010 +0200 wined3d: Store the bumpmap format capability in the format table. --- dlls/wined3d/directx.c | 27 +++++---------------------- dlls/wined3d/utils.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 21 +++++++++++---------- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e7475e7..94a1fb2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3204,28 +3204,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceType(IWineD3D *iface, UINT Adapter static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType, const struct wined3d_format_desc *format_desc) { - switch(format_desc->format) - { - case WINED3DFMT_R8G8_SNORM: - case WINED3DFMT_R16G16_SNORM: - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - case WINED3DFMT_R8G8B8A8_SNORM: - /* Ask the fixed function pipeline implementation if it can deal - * with the conversion. If we've got a GL extension giving native - * support this will be an identity conversion. */ - if (adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup)) - { - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - } - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } + /* Ask the fixed function pipeline implementation if it can deal + * with the conversion. If we've got a GL extension giving native + * support this will be an identity conversion. */ + return (format_desc->Flags & WINED3DFMT_FLAG_BUMPMAP) + && adapter->fragment_pipe->color_fixup_supported(format_desc->color_fixup); } /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7585804..8e9540b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -732,43 +732,43 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Bump mapping stuff */ {WINED3DFMT_R8G8_SNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 3, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8_snorm}, {WINED3DFMT_R8G8_SNORM, GL_DSDT8_NV, GL_DSDT8_NV, 0, GL_DSDT_NV, GL_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r5g5_snorm_l6_unorm}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_DSDT8_MAG8_NV, GL_DSDT8_MAG8_NV, 0, GL_DSDT_MAG_NV, GL_BYTE, 3, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, &convert_r5g5_snorm_l6_unorm_nv}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8_snorm_l8x8_unorm}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, &convert_r8g8_snorm_l8x8_unorm_nv}, {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8, GL_RGBA8, 0, GL_BGRA, GL_UNSIGNED_BYTE, 4, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r8g8b8a8_snorm}, {WINED3DFMT_R8G8B8A8_SNORM, GL_SIGNED_RGBA8_NV, GL_SIGNED_RGBA8_NV, 0, GL_RGBA, GL_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, WINED3D_GL_EXT_NONE, &convert_r16g16_snorm}, {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2e17b1..5a22610 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2978,16 +2978,17 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; */ /* WineD3D pixel format flags */ -#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x1 -#define WINED3DFMT_FLAG_FILTERING 0x2 -#define WINED3DFMT_FLAG_DEPTH 0x4 -#define WINED3DFMT_FLAG_STENCIL 0x8 -#define WINED3DFMT_FLAG_RENDERTARGET 0x10 -#define WINED3DFMT_FLAG_FOURCC 0x20 -#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x40 -#define WINED3DFMT_FLAG_COMPRESSED 0x80 -#define WINED3DFMT_FLAG_GETDC 0x100 -#define WINED3DFMT_FLAG_FLOAT 0x200 +#define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 +#define WINED3DFMT_FLAG_FILTERING 0x00000002 +#define WINED3DFMT_FLAG_DEPTH 0x00000004 +#define WINED3DFMT_FLAG_STENCIL 0x00000008 +#define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 +#define WINED3DFMT_FLAG_FOURCC 0x00000020 +#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 +#define WINED3DFMT_FLAG_COMPRESSED 0x00000080 +#define WINED3DFMT_FLAG_GETDC 0x00000100 +#define WINED3DFMT_FLAG_FLOAT 0x00000200 +#define WINED3DFMT_FLAG_BUMPMAP 0x00000400 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Store the sRGB read format capability in the format table.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: c0417812556cf3ada911bf490807bfa8cfd78f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0417812556cf3ada911bf490… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:01 2010 +0200 wined3d: Store the sRGB read format capability in the format table. --- dlls/wined3d/directx.c | 31 ++----------------------------- dlls/wined3d/utils.c | 22 ++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 94a1fb2..1fa277b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3298,35 +3298,8 @@ static BOOL CheckRenderTargetCapability(struct wined3d_adapter *adapter, static BOOL CheckSrgbReadCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - /* Check for supported sRGB formats (Texture loading and framebuffer) */ - if (!gl_info->supported[EXT_TEXTURE_SRGB]) - { - TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n"); - return FALSE; - } - - switch (format_desc->format) - { - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_L8_UNORM: - case WINED3DFMT_L8A8_UNORM: - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - - default: - TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(format_desc->format)); - return FALSE; - } - return FALSE; + return adapter->gl_info.supported[EXT_TEXTURE_SRGB] + && (format_desc->Flags & WINED3DFMT_FLAG_SRGB_READ); } static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8e9540b..b6fb5e9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -582,23 +582,23 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_DXT1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT2, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT4, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, @@ -658,11 +658,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET + | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET + | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, @@ -678,7 +680,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B4G4R4A4_UNORM, GL_RGBA4, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B2G3R3_UNORM, GL_R3_G3_B2, GL_R3_G3_B2, 0, GL_RGB, GL_UNSIGNED_BYTE_3_3_2, 0, @@ -719,11 +721,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L8A8_UNORM, GL_LUMINANCE8_ALPHA8, GL_SLUMINANCE8_ALPHA8_EXT, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_L4A4_UNORM, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE4_ALPHA4, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a22610..f79ca0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2989,6 +2989,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_GETDC 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 +#define WINED3DFMT_FLAG_SRGB_READ 0x00000800 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Store the sRGB write format capability in the format table.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: be7b01589f2d6c69325180824adf5fb4857fba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7b01589f2d6c69325180824… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:02 2010 +0200 wined3d: Store the sRGB write format capability in the format table. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1fa277b..e4544be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3308,7 +3308,7 @@ static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, /* 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 ((format_desc->format == WINED3DFMT_B8G8R8X8_UNORM) || (format_desc->format == WINED3DFMT_B8G8R8A8_UNORM)) + if (format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) { int vs_selected_mode; int ps_selected_mode; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b6fb5e9..60a7bee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -659,12 +659,12 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET - | WINED3DFMT_FLAG_SRGB_READ, + | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET - | WINED3DFMT_FLAG_SRGB_READ, + | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f79ca0f..d0ed13c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2990,6 +2990,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 +#define WINED3DFMT_FLAG_SRGB_WRITE 0x00001000 struct wined3d_format_desc {

1 0

Henri Verbeet : wined3d: Store the VTF format capability in the format table.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: c1ea8fb6c7e230020da18444e5f5e757b2edc330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ea8fb6c7e230020da18444e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 00:09:03 2010 +0200 wined3d: Store the VTF format capability in the format table. --- dlls/wined3d/directx.c | 26 ++------------------------ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4544be..baabda8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3636,30 +3636,8 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, static BOOL CheckVertexTextureCapability(struct wined3d_adapter *adapter, const struct wined3d_format_desc *format_desc) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - - if (!gl_info->limits.vertex_samplers) - { - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - - switch (format_desc->format) - { - case WINED3DFMT_R32G32B32A32_FLOAT: - if (!gl_info->supported[ARB_TEXTURE_FLOAT]) - { - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - TRACE_(d3d_caps)("[OK]\n"); - return TRUE; - - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return FALSE; - } - return FALSE; + return adapter->gl_info.limits.vertex_samplers + && (format_desc->Flags & WINED3DFMT_FLAG_VTF); } static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 60a7bee..ac7e2da 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -619,7 +619,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, 0, - WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0ed13c..c316a4b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2991,6 +2991,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN; #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 #define WINED3DFMT_FLAG_SRGB_WRITE 0x00001000 +#define WINED3DFMT_FLAG_VTF 0x00002000 struct wined3d_format_desc {

1 0

Hans Leidekker : msi: Fix some test failures on Windows.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 7d9d6707c1134efd00356e26522c3935f5aea9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9d6707c1134efd00356e265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:37:44 2010 +0200 msi: Fix some test failures on Windows. --- dlls/msi/tests/package.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e2a95c0..ce15c66 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2007,7 +2007,7 @@ static void test_property_table(void) const char *query; UINT r; MSIHANDLE hpkg, hdb, hrec; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], package[10]; DWORD sz; BOOL found; @@ -2050,15 +2050,14 @@ static void test_property_table(void) r = run_query(hdb, query); ok(r == ERROR_SUCCESS, "failed to add column\n"); - hpkg = package_from_db(hdb); - todo_wine - { - ok(!hpkg, "package should not be created\n"); - } + sprintf(package, "#%i", hdb); + r = MsiOpenPackage(package, &hpkg); + todo_wine ok(r != ERROR_SUCCESS, "MsiOpenPackage succeeded\n"); + if (r == ERROR_SUCCESS) + MsiCloseHandle(hpkg); - MsiCloseHandle(hdb); - MsiCloseHandle(hpkg); - DeleteFile(msifile); + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); hdb = create_package_db(); ok (hdb, "failed to create package database\n");

1 0

Hans Leidekker : msi: Store a copy of the file extension in the MSIMIME structure.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 319465831c1470cffc20a815c702ab2d556735a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319465831c1470cffc20a815c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:08 2010 +0200 msi: Store a copy of the file extension in the MSIMIME structure. Fixes a crash that occurs when the extension foreign key points to nowhere. Reported by Vincent Pelletier. --- dlls/msi/classes.c | 11 ++++++----- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index ce2325d..22d11c1 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -344,7 +344,7 @@ static MSIEXTENSION *load_given_extension( MSIPACKAGE *package, LPCWSTR extensio static MSIMIME *load_mime( MSIPACKAGE* package, MSIRECORD *row ) { - LPCWSTR buffer; + LPCWSTR extension; MSIMIME *mt; /* fill in the data */ @@ -356,8 +356,9 @@ static MSIMIME *load_mime( MSIPACKAGE* package, MSIRECORD *row ) mt->ContentType = msi_dup_record_field( row, 1 ); TRACE("loading mime %s\n", debugstr_w(mt->ContentType)); - buffer = MSI_RecordGetString( row, 2 ); - mt->Extension = load_given_extension( package, buffer ); + extension = MSI_RecordGetString( row, 2 ); + mt->Extension = load_given_extension( package, extension ); + mt->suffix = strdupW( extension ); mt->clsid = msi_dup_record_field( row, 3 ); mt->Class = load_given_class( package, mt->clsid ); @@ -1467,7 +1468,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mt->ContentType ); - MSI_RecordSetStringW( uirow, 2, mt->Extension->Extension ); + MSI_RecordSetStringW( uirow, 2, mt->suffix ); ui_actiondata( package, szRegisterMIMEInfo, uirow ); msiobj_release( &uirow->hdr ); } @@ -1512,7 +1513,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, mime->ContentType ); - MSI_RecordSetStringW( uirow, 2, mime->Extension->Extension ); + MSI_RecordSetStringW( uirow, 2, mime->suffix ); ui_actiondata( package, szUnregisterMIMEInfo, uirow ); msiobj_release( &uirow->hdr ); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6e7829a..06a4367 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -553,6 +553,7 @@ struct tagMSIMIME struct list entry; LPWSTR ContentType; /* Primary Key */ MSIEXTENSION *Extension; + LPWSTR suffix; LPWSTR clsid; MSICLASS *Class; /* not in the table, set during installation */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0fdce76..0c06088 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -214,6 +214,7 @@ static void free_package_structures( MSIPACKAGE *package ) MSIMIME *mt = LIST_ENTRY( item, MSIMIME, entry ); list_remove( &mt->entry ); + msi_free( mt->suffix ); msi_free( mt->clsid ); msi_free( mt->ContentType ); msi_free( mt );

1 0

Hans Leidekker : msi: Test the contents of some of the system tables before and after patching.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 73f1294431393c3029590fd590be4994ea6f326b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f1294431393c3029590fd59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:36 2010 +0200 msi: Test the contents of some of the system tables before and after patching. --- dlls/msi/tests/patch.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ff6d399..369254c 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -789,6 +789,175 @@ static void test_MsiOpenDatabase( void ) DeleteFileA( mspfile ); } +static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) +{ + static char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; + char query[0x100]; + UINT r; + MSIHANDLE hview, hrec; + + sprintf( query, fmt, table, entry ); + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + +static void test_system_tables( void ) +{ + UINT r; + const char *query; + MSIHANDLE hproduct, hdb, hview, hrec; + + if (!pMsiApplyPatchA) + { + win_skip("MsiApplyPatchA is not available\n"); + return; + } + + CreateDirectoryA( "msitest", NULL ); + create_file( "msitest\\patch.txt", 1000 ); + + create_database( msifile, tables, sizeof(tables) / sizeof(struct msi_table) ); + create_patch( mspfile ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, NULL ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hproduct ); + ok( hdb, "failed to get database handle\n" ); + + r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + query = "SELECT * FROM `_Storages`"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = find_entry( hdb, "_Tables", "Directory" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "File" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Component" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Feature" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "FeatureComponents" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "InstallExecuteSequence" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Media" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "_Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hproduct ); + + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); + ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ + "expected ERROR_SUCCESS, got %u\n", r ); + + if (r == ERROR_PATCH_PACKAGE_INVALID) + { + win_skip("Windows Installer < 3.0 detected\n"); + return; + } + + r = MsiOpenProductA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", &hproduct ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hproduct ); + ok( hdb, "failed to get database handle\n" ); + + r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + query = "SELECT * FROM `_Storages`"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = find_entry( hdb, "_Tables", "Directory" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "File" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Component" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Feature" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "FeatureComponents" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "InstallExecuteSequence" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Media" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "_Property" ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "MsiPatchHeaders" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "Patch" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + r = find_entry( hdb, "_Tables", "PatchPackage" ); + todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hproduct ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + DeleteFileA( msifile ); + DeleteFileA( mspfile ); + RemoveDirectoryA( "msitest" ); +} + START_TEST(patch) { DWORD len; @@ -810,6 +979,7 @@ START_TEST(patch) test_simple_patch(); test_MsiOpenDatabase(); + test_system_tables(); SetCurrentDirectoryA( prev_path ); }

1 0

Hans Leidekker : msi: Make sure to only open a patch database in msi_apply_patch_package.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: c6f281fcf736628cc2f9121bfd9b057bba7ac327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f281fcf736628cc2f9121bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:38:54 2010 +0200 msi: Make sure to only open a patch database in msi_apply_patch_package. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0b23656..fd7f782 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -541,12 +541,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) TRACE("%p %s\n", package, debugstr_w( file ) ); - /* FIXME: - * We probably want to make sure we only open a patch collection here. - * Patch collections (.msp) and databases (.msi) have different GUIDs - * but currently MSI_OpenDatabaseW will accept both. - */ - r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &patch_db ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db ); if ( r != ERROR_SUCCESS ) { ERR("failed to open patch collection %s\n", debugstr_w( file ) ); @@ -565,7 +560,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) /* * There might be a CAB file in the patch package, - * so append it to the list of storage to search for streams. + * so append it to the list of storages to search for streams. */ append_storage_to_db( package->db, patch_db->storage );

1 0

Hans Leidekker : msi: Simplify msi_set_context.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: df6b195a1aa870c226cd7b145056c33ca9b5265f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6b195a1aa870c226cd7b145… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 29 09:39:08 2010 +0200 msi: Simplify msi_set_context. --- dlls/msi/action.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fd7f782..96dbc3d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -693,20 +693,13 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package) static UINT msi_set_context(MSIPACKAGE *package) { - WCHAR val[10]; - DWORD sz = 10; - DWORD num; - UINT r; + int num; package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; - r = msi_get_property(package->db, szAllUsers, val, &sz); - if (r == ERROR_SUCCESS) - { - num = atolW(val); - if (num == 1 || num == 2) - package->Context = MSIINSTALLCONTEXT_MACHINE; - } + num = msi_get_property_int(package->db, szAllUsers, 0); + if (num == 1 || num == 2) + package->Context = MSIINSTALLCONTEXT_MACHINE; return ERROR_SUCCESS; }

1 0

Alexandre Julliard : winex11: Make the cursor window global instead of per-thread, and send it a message when the cursor changes.
by Alexandre Julliard 29 Apr '10

29 Apr '10

Module: wine Branch: master Commit: 6551553fe6393f02787c73e7e1c35c45bd6aafba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6551553fe6393f02787c73e7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 19:23:05 2010 -0500 winex11: Make the cursor window global instead of per-thread, and send it a message when the cursor changes. --- dlls/user32/tests/cursoricon.c | 15 +++++-------- dlls/winex11.drv/mouse.c | 42 +++++++++++++++++++++++---------------- dlls/winex11.drv/window.c | 3 ++ dlls/winex11.drv/x11drv.h | 5 ++- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c1da70d..2a4100e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1639,13 +1639,12 @@ static void test_DestroyCursor(void) * ERROR_INVALID_CURSOR_HANDLE. This happens because we called * DestroyCursor() 2+ times after calling SetCursor(). The calls to * GetCursor() and SetCursor(NULL) in between make no difference. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(cursor); - todo_wine { - ok(!ret, "DestroyCursor succeeded.\n"); - error = GetLastError(); - ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ - "Last error: 0x%08x\n", error); - } + todo_wine ok(!ret, "DestroyCursor succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ + "Last error: 0x%08x\n", error); } DeleteObject(cursorInfo.hbmMask); @@ -1664,9 +1663,7 @@ static void test_DestroyCursor(void) SetLastError(0xdeadbeef); SetCursor(cursor); error = GetLastError(); - todo_wine { - ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); - } + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); /* Check if LoadCursor() returns the same handle with the same icon. */ cursor2 = LoadCursor(NULL, IDC_ARROW); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e0e6bb1..5a1a09f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -86,6 +86,7 @@ static const UINT button_up_flags[NB_BUTTONS] = }; POINT cursor_pos; +static HWND cursor_window; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ static XContext cursor_context; @@ -206,6 +207,28 @@ Cursor get_x11_cursor( HCURSOR handle ) } /*********************************************************************** + * set_window_cursor + */ +void set_window_cursor( HWND hwnd, HCURSOR handle ) +{ + struct x11drv_win_data *data; + Cursor cursor; + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + wine_tsx11_lock(); + if ((cursor = get_x11_cursor( handle ))) + { + TRACE( "%p xid %lx\n", handle, cursor ); + XDefineCursor( gdi_display, data->whole_window, cursor ); + /* Make the change take effect immediately */ + XFlush( gdi_display ); + data->cursor = handle; + } + wine_tsx11_unlock(); +} + +/*********************************************************************** * update_mouse_state * * Update the various window states on a mouse event. @@ -216,7 +239,7 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned get_coords( hwnd, window, x, y, pt ); - data->cursor_window = hwnd; + cursor_window = hwnd; /* update the wine server Z-order */ @@ -1012,22 +1035,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle ) { - struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); - struct x11drv_win_data *data; - Cursor cursor; - - if (!(data = X11DRV_get_win_data( thread_data->cursor_window ))) return; - - wine_tsx11_lock(); - if ((cursor = get_x11_cursor( handle ))) - { - TRACE( "%p xid %lx\n", handle, cursor ); - XDefineCursor( gdi_display, data->whole_window, cursor ); - /* Make the change take effect immediately */ - XFlush( gdi_display ); - data->cursor = handle; - } - wine_tsx11_unlock(); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 831b7c9..8cd3bf3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2493,6 +2493,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; + case WM_X11DRV_SET_CURSOR: + set_window_cursor( hwnd, (HCURSOR)lp ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a3f8b7..13afe78 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -546,7 +546,6 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - HWND cursor_window; /* current window that contains the cursor */ Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ @@ -714,7 +713,8 @@ enum x11drv_window_messages WM_X11DRV_ACQUIRE_SELECTION = 0x80001000, WM_X11DRV_SET_WIN_FORMAT, WM_X11DRV_SET_WIN_REGION, - WM_X11DRV_RESIZE_DESKTOP + WM_X11DRV_RESIZE_DESKTOP, + WM_X11DRV_SET_CURSOR }; /* _NET_WM_STATE properties that we keep track of */ @@ -782,6 +782,7 @@ extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor get_x11_cursor( HCURSOR handle ); +extern void set_window_cursor( HWND hwnd, HCURSOR handle ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time,

1 0