October 2015 - Wine-Commits

Matteo Bruni : wined3d: Don' t output the fogcoord varying when not necessary.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 5b8be5550e967e37df44a735ef493f5d81b2e47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8be5550e967e37df44a735e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:03 2015 +0200 wined3d: Don't output the fogcoord varying when not necessary. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b5b6e8..22c75b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1827,7 +1827,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "} ffp_point;\n"); } - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && version->major < 3) { declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } @@ -5234,12 +5234,15 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context * the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ - if (args->fog_src == VS_FOG_Z) - shader_addline(buffer, "%s = gl_Position.z;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); - else if (!reg_maps->fog) - shader_addline(buffer, "%s = 0.0;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + if (reg_maps->shader_version.major < 3) + { + if (args->fog_src == VS_FOG_Z) + shader_addline(buffer, "%s = gl_Position.z;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + else if (!reg_maps->fog) + shader_addline(buffer, "%s = 0.0;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + } /* We always store the clipplanes without y inversion */ if (args->clip_enabled)

1 0

Matteo Bruni : wined3d: Avoid the builtin texture coordinate varyings on core profile.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: ad2fc9397e859067ced0fc7314e2c73425e6c270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fc9397e859067ced0fc731… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:04 2015 +0200 wined3d: Avoid the builtin texture coordinate varyings on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 70 +++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad2fc9397e859067ced0f…

1 0

Jacek Caban : advapi32: Added FIXME about an unsupported argument and initialize its value.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: a754579159e9c59a39bd9e7809e0c54598f7556d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a754579159e9c59a39bd9e780… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 16 12:59:41 2015 +0200 advapi32: Added FIXME about an unsupported argument and initialize its value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4820b33..8d97af9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -902,6 +902,12 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; + if (security) + { + FIXME( "security argument not supported.\n"); + *security = 0; + } + done: if (buf_ptr != buffer) heap_free( buf_ptr ); return RtlNtStatusToDosError( status ); @@ -1091,6 +1097,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; + if (security) + { + FIXME( "security argument not supported.\n"); + *security = 0; + } + done: if (buf_ptr != buffer) heap_free( buf_ptr ); return RtlNtStatusToDosError( status );

1 0

Matteo Bruni : wined3d: Avoid the builtin color varyings on core profile.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 9be8d0a9f4e1f09feffaef7d6dc2d37f9ff2d383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be8d0a9f4e1f09feffaef7d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:05 2015 +0200 wined3d: Avoid the builtin color varyings on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 118 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be8d0a9f4e1f09feffae…

1 0

Stefan Dösinger : wined3d: Pass a context to surface_load_texture.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 31e0755ea664e02f05a1e500a19fb5f584c1c1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e0755ea664e02f05a1e500a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 15 22:41:10 2015 +0200 wined3d: Pass a context to surface_load_texture. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eb88b59..1b78712 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3881,13 +3881,13 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, } static HRESULT surface_load_texture(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, BOOL srgb) + struct wined3d_context *context, BOOL srgb) { + const struct wined3d_gl_info *gl_info = context->gl_info; RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; const struct wined3d_color_key_conversion *conversion; struct wined3d_texture *texture = surface->container; - struct wined3d_context *context; UINT width, src_pitch, dst_pitch; struct wined3d_bo_address data; struct wined3d_format format; @@ -3909,8 +3909,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) { - context = context_acquire(device, NULL); - if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); @@ -3918,8 +3916,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); - context_release(context); - return WINED3D_OK; } @@ -3934,10 +3930,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; RECT rect = {0, 0, surface->resource.width, surface->resource.height}; - context = context_acquire(device, NULL); surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &rect, surface, dst_location, &rect); - context_release(context); return WINED3D_OK; } @@ -3975,9 +3969,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_load_location(surface, WINED3D_LOCATION_SYSMEM); } - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); @@ -4051,8 +4042,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); - context_release(context); - HeapFree(GetProcessHeap(), 0, mem); return WINED3D_OK; @@ -4074,7 +4063,6 @@ static void surface_multisample_resolve(struct wined3d_surface *surface, struct HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; HRESULT hr; struct wined3d_context *context = NULL; @@ -4154,7 +4142,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (FAILED(hr = surface_load_texture(surface, gl_info, location == WINED3D_LOCATION_TEXTURE_SRGB))) + context = context_acquire(device, NULL); + hr = surface_load_texture(surface, context, location == WINED3D_LOCATION_TEXTURE_SRGB); + context_release(context); + if (FAILED(hr)) return hr; break;

1 0

André Hentschel : comdlg32/tests: Disable test which crashes on Win10.
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 03bf3cac66726cd7b0d8825f66b5f8316cfe9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bf3cac66726cd7b0d8825f6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 16 13:40:43 2015 +0200 comdlg32/tests: Disable test which crashes on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/printdlg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 7e06c97..4c6a473 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -379,14 +379,16 @@ static void test_PrintDlgExW(void) return; } - /* Set CommDlgExtendedError != 0 */ - PrintDlgA(NULL); - SetLastError(0xdeadbeef); - res = pPrintDlgExW(NULL); - ok( (res == E_INVALIDARG), - "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", - res, GetLastError(), CommDlgExtendedError()); - + if (0) /* Crashes on Win10 */ + { + /* Set CommDlgExtendedError != 0 */ + PrintDlgA(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(NULL); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError() ); + } pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); if (!pDlg) return;

1 0

Henri Verbeet : d3d8: Simplify d3d8_device_GetBackBuffer().
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: aee692d2244127ecea4f477ed0d3a83ceb6dd5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee692d2244127ecea4f477ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:35:07 2015 +0200 d3d8: Simplify d3d8_device_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 20ce900..9dd78b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -722,7 +722,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain *wined3d_swapchain; struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; @@ -734,14 +734,9 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) - { - wined3d_mutex_unlock(); - *backbuffer = NULL; - return D3DERR_INVALIDCALL; - } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx))) + wined3d_swapchain = device->implicit_swapchain->wined3d_swapchain; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL;

1 0

Nikolay Sivov : strmbase: Avoid using HRESULT codes as BOOL value ( PVS-Studio).
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: a59e3e0f4ef9b3232d3cd24f237f48f4e6920003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59e3e0f4ef9b3232d3cd24f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 10:17:59 2015 +0300 strmbase: Avoid using HRESULT codes as BOOL value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index cbcd964..36960e3 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -101,7 +101,7 @@ HRESULT WINAPI OutputQueue_Construct( EnterCriticalSection(&This->csQueue); if (bAuto && pInputPin->pMemInputPin) - threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin); + threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin) == S_OK; else threaded = bQueue;

1 0

Frédéric Delanoy : winmm/tests: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 91a4f41712d02f28bca33043d37b376c751d791f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a4f41712d02f28bca33043d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 15 19:43:50 2015 +0200 winmm/tests: Simplify conditional expression (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 2f235fa..2f230f5 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -156,7 +156,7 @@ static void test_api(void) par = 0xdead; ret = joyGetThreshold(joyid, &par); ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); - if (!win98 || (win98 && i < 8)) + if (!win98 || i < 8) { if ((1 << i) & threshold_error) ok(par == period[8], "Test [%d]: Expected %d, got %d\n", i, period[8], par);

1 0

Henri Verbeet : wined3d: The cursor image surface is not allowed to be NULL in wined3d_device_set_cursor_properties ().
by Alexandre Julliard Oct. 16, 2015

Oct. 16, 2015

Module: wine Branch: master Commit: 8b9e56cc9e3d526e64e6fe7de664ed487875a0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9e56cc9e3d526e64e6fe7de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:35:09 2015 +0200 wined3d: The cursor image surface is not allowed to be NULL in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 138 +++++++++++++++++++++++++------------------------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4d1030d..0d607ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4205,6 +4205,10 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) { + struct wined3d_display_mode mode; + struct wined3d_map_desc map_desc; + HRESULT hr; + TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", device, x_hotspot, y_hotspot, cursor_image); @@ -4214,86 +4218,84 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device device->cursor_texture = NULL; } - if (cursor_image) + if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) { - struct wined3d_display_mode mode; - struct wined3d_map_desc map_desc; - HRESULT hr; + WARN("Surface %p has an invalid format %s.\n", + cursor_image, debug_d3dformat(cursor_image->resource.format->id)); + return WINED3DERR_INVALIDCALL; + } - /* MSDN: Cursor must be A8R8G8B8 */ - if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) - { - WARN("surface %p has an invalid format.\n", cursor_image); - return WINED3DERR_INVALIDCALL; - } + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) + { + WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", + cursor_image, cursor_image->resource.width, cursor_image->resource.height, + mode.width, mode.height); + return WINED3DERR_INVALIDCALL; + } - /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) - { - WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", - cursor_image, cursor_image->resource.width, cursor_image->resource.height, - mode.width, mode.height); - return WINED3DERR_INVALIDCALL; - } + /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* TODO: MSDN: Cursor sizes must be a power of 2 */ + /* Do not store the surface's pointer because the application may + * release it after setting the cursor image. Windows doesn't + * addref the set surface, so we can't do this either without + * creating circular refcount dependencies. */ + if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) + { + ERR("Failed to create cursor texture.\n"); + return WINED3DERR_INVALIDCALL; + } - /* Do not store the surface's pointer because the application may - * release it after setting the cursor image. Windows doesn't - * addref the set surface, so we can't do this either without - * creating circular refcount dependencies. */ - if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) - { - ERR("Failed to create cursor texture.\n"); - return WINED3DERR_INVALIDCALL; - } + if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) + { + UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; + ICONINFO cursor_info; + DWORD *mask_bits; + HCURSOR cursor; - device->cursorWidth = cursor_image->resource.width; - device->cursorHeight = cursor_image->resource.height; + /* 32-bit user32 cursors ignore the alpha channel if it's all + * zeroes, and use the mask instead. Fill the mask with all ones + * to ensure we still get a fully transparent cursor. */ + if (!(mask_bits = HeapAlloc(GetProcessHeap(), 0, mask_size))) + return E_OUTOFMEMORY; + memset(mask_bits, 0xff, mask_size); + + wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); + cursor_info.fIcon = FALSE; + cursor_info.xHotspot = x_hotspot; + cursor_info.yHotspot = y_hotspot; + cursor_info.hbmMask = CreateBitmap(cursor_image->resource.width, + cursor_image->resource.height, 1, 1, mask_bits); + cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width, + cursor_image->resource.height, 1, 32, map_desc.data); + wined3d_surface_unmap(cursor_image); + + /* Create our cursor and clean up. */ + cursor = CreateIconIndirect(&cursor_info); + if (cursor_info.hbmMask) + DeleteObject(cursor_info.hbmMask); + if (cursor_info.hbmColor) + DeleteObject(cursor_info.hbmColor); + if (device->hardwareCursor) + DestroyCursor(device->hardwareCursor); + device->hardwareCursor = cursor; + if (device->bCursorVisible) + SetCursor(cursor); - if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) - { - UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; - ICONINFO cursorInfo; - DWORD *maskBits; - HCURSOR cursor; - - /* 32-bit user32 cursors ignore the alpha channel if it's all - * zeroes, and use the mask instead. Fill the mask with all ones - * to ensure we still get a fully transparent cursor. */ - maskBits = HeapAlloc(GetProcessHeap(), 0, mask_size); - memset(maskBits, 0xff, mask_size); - wined3d_surface_map(cursor_image, &map_desc, NULL, - WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); - TRACE("width: %u height: %u.\n", cursor_image->resource.width, cursor_image->resource.height); - - cursorInfo.fIcon = FALSE; - cursorInfo.xHotspot = x_hotspot; - cursorInfo.yHotspot = y_hotspot; - cursorInfo.hbmMask = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, - 1, 1, maskBits); - cursorInfo.hbmColor = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, - 1, 32, map_desc.data); - wined3d_surface_unmap(cursor_image); - /* Create our cursor and clean up. */ - cursor = CreateIconIndirect(&cursorInfo); - if (cursorInfo.hbmMask) DeleteObject(cursorInfo.hbmMask); - if (cursorInfo.hbmColor) DeleteObject(cursorInfo.hbmColor); - if (device->hardwareCursor) DestroyCursor(device->hardwareCursor); - device->hardwareCursor = cursor; - if (device->bCursorVisible) SetCursor( cursor ); - HeapFree(GetProcessHeap(), 0, maskBits); - } + HeapFree(GetProcessHeap(), 0, mask_bits); } + TRACE("New cursor dimensions are %ux%u.\n", cursor_image->resource.width, cursor_image->resource.height); + device->cursorWidth = cursor_image->resource.width; + device->cursorHeight = cursor_image->resource.height; device->xHotSpot = x_hotspot; device->yHotSpot = y_hotspot; + return WINED3D_OK; }

1 0