January 2010 - Wine-commits

Henri Verbeet : wined3d: Get rid of some unnecessary casts to specific shader types.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 705f96fa39682262b674908fb12656dd5723cb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705f96fa39682262b674908fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 19:51:28 2010 +0100 wined3d: Get rid of some unnecessary casts to specific shader types. --- dlls/wined3d/arb_program_shader.c | 55 +++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 55 ++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=705f96fa39682262b6749…

1 0

Henri Verbeet : wined3d: Add support for ARB_sync.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: c698171fa37ea16a7ac511b1cd89f1d3dc9fd3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c698171fa37ea16a7ac511b1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 19:51:29 2010 +0100 wined3d: Add support for ARB_sync. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4cd47b3..688b499 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -70,6 +70,7 @@ static const struct { {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX, 0 }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_sync", ARB_SYNC, 0 }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP, 0 }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION, 0 }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a03e566..aeac47b 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -75,6 +75,9 @@ typedef double GLclampd; typedef void GLvoid; typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLsizeiptr; +typedef INT64 GLint64; +typedef UINT64 GLuint64; +typedef struct __GLsync *GLsync; /* Booleans */ #define GL_FALSE 0x0 @@ -1749,6 +1752,7 @@ typedef enum wined3d_gl_extension ARB_PROVOKING_VERTEX, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, + ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_CUBE_MAP, @@ -2389,6 +2393,34 @@ typedef unsigned int GLhandleARB; #define GL_SHADING_LANGUAGE_VERSION_ARB 0x8b8c #endif +/* GL_ARB_sync */ +#ifndef GL_ARB_sync +#define GL_ARB_sync 1 +#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 +#define GL_OBJECT_TYPE 0x9112 +#define GL_SYNC_CONDITION 0x9113 +#define GL_SYNC_STATUS 0x9114 +#define GL_SYNC_FLAGS 0x9115 +#define GL_SYNC_FENCE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 +#define GL_UNSIGNALED 0x9118 +#define GL_SIGNALED 0x9119 +#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 +#define GL_TIMEOUT_IGNORED 0xffffffffffffffffULL +#define GL_ALREADY_SIGNALED 0x911a +#define GL_TIMEOUT_EXPIRED 0x911b +#define GL_CONDITION_SATISFIED 0x911c +#define GL_WAIT_FAILED 0x911d +#endif +typedef GLsync (WINE_GLAPI *PGLFNFENCESYNCPROC)(GLenum condition, GLbitfield flags); +typedef GLboolean (WINE_GLAPI *PGLFNISSYNCPROC)(GLsync sync); +typedef GLvoid (WINE_GLAPI *PGLFNDELETESYNCPROC)(GLsync sync); +typedef GLenum (WINE_GLAPI *PGLFNCLIENTWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef GLvoid (WINE_GLAPI *PGLFNWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef GLvoid (WINE_GLAPI *PGLFNGETINTEGER64VPROC)(GLenum pname, GLint64 *params); +typedef GLvoid (WINE_GLAPI *PGLFNGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei bufsize, + GLsizei *length, GLint *values); + /* GL_ARB_texture_border_clamp */ #ifndef GL_ARB_texture_border_clamp #define GL_ARB_texture_border_clamp 1 @@ -4032,6 +4064,21 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glBindAttribLocationARB, ARB_SHADER_OBJECTS, NULL) \ USE_GL_FUNC(WINED3D_PFNGLGETATTRIBLOCATIONARBPROC, \ glGetAttribLocationARB, ARB_SHADER_OBJECTS, NULL) \ + /* GL_ARB_sync */ \ + USE_GL_FUNC(PGLFNFENCESYNCPROC, \ + glFenceSync, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNISSYNCPROC, \ + glIsSync, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNDELETESYNCPROC, \ + glDeleteSync, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNCLIENTWAITSYNCPROC, \ + glClientWaitSync, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNWAITSYNCPROC, \ + glWaitSync, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNGETINTEGER64VPROC, \ + glGetInteger64v, ARB_SYNC, NULL) \ + USE_GL_FUNC(PGLFNGETSYNCIVPROC, \ + glGetSynciv, ARB_SYNC, NULL) \ /* GL_ARB_texture_compression */ \ USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE2DPROC, \ glCompressedTexImage2DARB, ARB_TEXTURE_COMPRESSION, NULL) \

1 0

Henri Verbeet : wined3d: Add an ARB_sync implementation of event queries.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 96b150929b0791c7c30ade49d55cedf2d608537e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b150929b0791c7c30ade49d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 19:51:30 2010 +0100 wined3d: Add an ARB_sync implementation of event queries. --- dlls/wined3d/context.c | 55 +++++++++++++++++++++++++++++----------- dlls/wined3d/query.c | 49 +++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 10 ++++++- 3 files changed, 88 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96b150929b0791c7c30ad…

1 0

Henri Verbeet : wined3d: Add support for ARB_vertex_array_bgra.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 98568f0ba1dbd0f0e81d3fe4aab115c711f45eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98568f0ba1dbd0f0e81d3fe4a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 19:51:31 2010 +0100 wined3d: Add support for ARB_vertex_array_bgra. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 20201b1..024aab5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -483,7 +483,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * FLOAT16s if not supported. Also, we can't iterate over the array, so use macros to generate code for all * the attributes that our current fixed function pipeline implementation cares for. */ - BOOL support_d3dcolor = gl_info->supported[EXT_VERTEX_ARRAY_BGRA]; + BOOL support_d3dcolor = gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, TRUE, TRUE, FALSE, &stride_this_run, &float16_used) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4dbfeb1..d66b46e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -298,7 +298,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, stream_info->elements[idx].stream_idx = element->input_slot; stream_info->elements[idx].buffer_object = buffer_object; - if (!This->adapter->gl_info.supported[EXT_VERTEX_ARRAY_BGRA] + if (!This->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] && element->format_desc->format == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << idx; @@ -361,7 +361,7 @@ void device_stream_info_from_strided(const struct wined3d_gl_info *gl_info, { if (!stream_info->elements[i].format_desc) continue; - if (!gl_info->supported[EXT_VERTEX_ARRAY_BGRA] + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && stream_info->elements[i].format_desc->format == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << i; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 688b499..ba9fdb8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -82,6 +82,7 @@ static const struct { {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0) }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE, 0 }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG, 0 }, + {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA, 0 }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND, 0 }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT, 0 }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM, 0 }, @@ -1842,6 +1843,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str TRACE_(d3d_caps)(" IMPLIED: ARB_depth_clamp support (by NV_depth_clamp).\n"); gl_info->supported[ARB_DEPTH_CLAMP] = TRUE; } + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) + { + TRACE_(d3d_caps)(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); + gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; + } if (gl_info->supported[NV_TEXTURE_SHADER2]) { if (gl_info->supported[NV_REGISTER_COMBINERS]) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e8521bc..8250e79 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -334,7 +334,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, WINED3DFORMAT format GL_EXTCALL(glVertexAttrib4ubvARB(index, ptr)); break; case WINED3DFMT_B8G8R8A8_UNORM: - if (gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { const DWORD *src = ptr; DWORD c = *src & 0xff00ff00; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index adb426b..75cb837 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4167,7 +4167,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break; case WINED3DFMT_B8G8R8A8_UNORM: - if (gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { const DWORD *src = (const DWORD *)ptr; DWORD c = *src & 0xff00ff00; @@ -4544,7 +4544,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi else { WORD slow_mask = (1 << WINED3D_FFP_PSIZE); - slow_mask |= -!gl_info->supported[EXT_VERTEX_ARRAY_BGRA] + slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); if (fixup || (!dataLocations->position_transformed diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c1e921d..7b3341e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1098,7 +1098,7 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) gl_info->gl_formats[idx].heightscale = 1.5f; gl_info->gl_formats[idx].color_fixup = create_yuv_fixup_desc(YUV_FIXUP_YV12); - if (gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { idx = getFmtIdx(WINED3DFMT_B8G8R8A8_UNORM); gl_info->gl_formats[idx].gl_vtx_format = GL_BGRA; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index aeac47b..33e24c3 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1764,6 +1764,7 @@ typedef enum wined3d_gl_extension ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, + ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM,

1 0

Henri Verbeet : wined3d: Move some macros to directx.c.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 005eb0bd7dee3202069c0a908f2ac5a03c24c817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005eb0bd7dee3202069c0a908… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 19:51:32 2010 +0100 wined3d: Move some macros to directx.c. Nothing GL specific about these. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ba9fdb8..6183c4c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); #define GLINFO_LOCATION (*gl_info) +#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +#define MAKEDWORD_VERSION(maj, min) ((maj & 0xffff) << 16) | (min & 0xffff) /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 33e24c3..306de2a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4567,9 +4567,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma USE_GL_FUNC(WINED3D_PFNWGLQUERYPBUFFERARBPROC, wglQueryPbufferARB, 0, NULL) \ USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) -#define WINE_DEFAULT_VIDMEM 64*1024*1024 -#define MAKEDWORD_VERSION(maj, min) ((maj & 0x0000FFFF) << 16) | (min & 0x0000FFFF) - struct wined3d_fbo_ops { PGLFNGLISRENDERBUFFERPROC glIsRenderbuffer;

1 0

Andrew Nguyen : shlwapi/tests: Add tests for HashData.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 20ac06134e0599c547e4fcdc1fa7f0497b9da410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ac06134e0599c547e4fcdc1… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 25 12:44:43 2010 -0600 shlwapi/tests: Add tests for HashData. --- dlls/shlwapi/tests/url.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2205e09..a253c11 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1082,6 +1082,93 @@ static void test_ParseURL(void) } } +static void test_HashData(void) +{ + HRESULT res; + BYTE input[16] = {0x51, 0x33, 0x4F, 0xA7, 0x45, 0x15, 0xF0, 0x52, 0x90, + 0x2B, 0xE7, 0xF5, 0xFD, 0xE1, 0xA6, 0xA7}; + BYTE output[32]; + static const BYTE expected[] = {0x54, 0x9C, 0x92, 0x55, 0xCD, 0x82, 0xFF, + 0xA1, 0x8E, 0x0F, 0xCF, 0x93, 0x14, 0xAA, + 0xE3, 0x2D}; + static const BYTE expected2[] = {0x54, 0x9C, 0x92, 0x55, 0xCD, 0x82, 0xFF, + 0xA1, 0x8E, 0x0F, 0xCF, 0x93, 0x14, 0xAA, + 0xE3, 0x2D, 0x47, 0xFC, 0x80, 0xB8, 0xD0, + 0x49, 0xE6, 0x13, 0x2A, 0x30, 0x51, 0x8D, + 0xF9, 0x4B, 0x07, 0xA6}; + static const BYTE expected3[] = {0x2B, 0xDC, 0x9A, 0x1B, 0xF0, 0x5A, 0xF9, + 0xC6, 0xBE, 0x94, 0x6D, 0xF3, 0x33, 0xC1, + 0x36, 0x07}; + int i; + + /* Test hashing with identically sized input/output buffers. */ + res = HashData(input, 16, output, 16); + ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); + if(res == S_OK) + ok(!memcmp(output, expected, sizeof(expected)), + "Output buffer did not match expected contents\n"); + + /* Test hashing with larger output buffer. */ + res = HashData(input, 16, output, 32); + ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); + if(res == S_OK) + ok(!memcmp(output, expected2, sizeof(expected2)), + "Output buffer did not match expected contents\n"); + + /* Test hashing with smaller input buffer. */ + res = HashData(input, 8, output, 16); + ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); + if(res == S_OK) + ok(!memcmp(output, expected3, sizeof(expected3)), + "Output buffer did not match expected contents\n"); + + /* Test passing NULL pointers for input/output parameters. */ + res = HashData(NULL, 0, NULL, 0); + ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ + "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + + res = HashData(input, 0, NULL, 0); + ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ + "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + + res = HashData(NULL, 0, output, 0); + ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ + "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + + /* Test passing valid pointers with sizes of zero. */ + for (i = 0; i < sizeof(input)/sizeof(BYTE); i++) + input[i] = 0x00; + + for (i = 0; i < sizeof(output)/sizeof(BYTE); i++) + output[i] = 0xFF; + + res = HashData(input, 0, output, 0); + ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); + + /* The buffers should be unchanged. */ + for (i = 0; i < sizeof(input)/sizeof(BYTE); i++) + { + ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); + if(input[i] != 0x00) break; + } + + for (i = 0; i < sizeof(output)/sizeof(BYTE); i++) + { + ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); + if(output[i] != 0xFF) break; + } + + /* Input/output parameters are not validated. */ + res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); + ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); + + if (0) + { + res = HashData((BYTE *)0xdeadbeef, 1, (BYTE *)0xdeadbeef, 1); + trace("HashData returned 0x%08x\n", res); + } +} + /* ########################### */ START_TEST(url) @@ -1103,4 +1190,5 @@ START_TEST(url) test_UrlIs(); test_UrlUnescape(); test_ParseURL(); + test_HashData(); }

1 0

Andrew Nguyen : shlwapi: Only check for NULL pointers in HashData.
by Alexandre Julliard 26 Jan '10

26 Jan '10

Module: wine Branch: master Commit: 6c6088078d5b936e75a4b1fb1e4cf26a4ecd2ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6088078d5b936e75a4b1fb1… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 25 06:44:57 2010 -0600 shlwapi: Only check for NULL pointers in HashData. --- dlls/shlwapi/url.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d266069..c6fa977 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1401,8 +1401,7 @@ HRESULT WINAPI HashData(const unsigned char *lpSrc, DWORD nSrcLen, { INT srcCount = nSrcLen - 1, destCount = nDestLen - 1; - if (IsBadReadPtr(lpSrc, nSrcLen) || - IsBadWritePtr(lpDest, nDestLen)) + if (!lpSrc || !lpDest) return E_INVALIDARG; while (destCount >= 0)

1 0

Jason Edmeades : user32: Preselect all editbox text when combo gets focus.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f27b032d50b720abae8a971e3eeac382f132d38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27b032d50b720abae8a971e3… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jan 24 12:56:11 2010 -0800 user32: Preselect all editbox text when combo gets focus. --- dlls/user32/combo.c | 10 ++++++++-- dlls/user32/controls.h | 1 + dlls/user32/tests/combo.c | 8 ++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 85e372a..d31f17e 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1910,8 +1910,14 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar case WM_GETFONT: return (LRESULT)lphc->hFont; case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) - SetFocus( lphc->hWndEdit ); + if( lphc->wState & CBF_EDIT ) { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if( !(lphc->wState & CBF_BEENFOCUSED) ) { + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; + } + } else COMBO_SetFocus( lphc ); return TRUE; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 8275ee5..2054922 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -199,6 +199,7 @@ extern INT SCROLL_SetNCSbState( HWND hwnd, int vMin, int vMax, int vPos, #define CBF_SELCHANGE 0x0400 #define CBF_NOEDITNOTIFY 0x1000 #define CBF_NOLBSELECT 0x2000 /* do not change current selection */ +#define CBF_BEENFOCUSED 0x4000 /* has it ever had focus */ #define CBF_EUI 0x8000 /* combo state struct */ diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index b0f7488..bee685c 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -449,13 +449,13 @@ static void test_editselection(void) SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); - todo_wine ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); /* Now emulate a key press */ edit[0] = 0x00; SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); - todo_wine ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); + ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); @@ -489,7 +489,7 @@ static void test_editselection(void) SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); - todo_wine ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); /* Now change the selection to the apparently invalid start -1, end -1 and show it means no selection (ie start -1) but cursor at end */ @@ -497,7 +497,7 @@ static void test_editselection(void) edit[0] = 0x00; SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); - todo_wine ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); + ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); DestroyWindow(hCombo); }

1 0

André Hentschel : oleaut32: Fix a crash in VB6.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 571b7a5a3a1c0c6e334f880deaa01a7c68ea0aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=571b7a5a3a1c0c6e334f880de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 20:14:48 2010 +0100 oleaut32: Fix a crash in VB6. --- dlls/oleaut32/olefont.c | 3 +++ dlls/oleaut32/tests/olefont.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index a9b2c04..2fc842c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -463,6 +463,9 @@ static HRESULT WINAPI OLEFontImpl_put_Name( OLEFontImpl *this = (OLEFontImpl *)iface; TRACE("(%p)->(%p)\n", this, name); + if (!name) + return CTL_E_INVALIDPROPERTYVALUE; + if (this->description.lpstrName==0) { this->description.lpstrName = HeapAlloc(GetProcessHeap(), diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 55e0e58..fd26388 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -795,6 +795,45 @@ static void test_AddRefHfont(void) IFont_Release(ifnt3); } +static void test_returns(void) +{ + IFont *pFont; + FONTDESC fontdesc; + HRESULT hr; + + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = MSSansSerif_font; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = 0; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&pFont); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_put_Name(pFont, NULL); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, + "IFont::put_Name: Expected CTL_E_INVALIDPROPERTYVALUE got 0x%08x\n", + hr); + + hr = IFont_get_Name(pFont, NULL); + ok(hr == E_POINTER, + "IFont::get_Name: Expected E_POINTER got 0x%08x\n", + hr); + + hr = IFont_get_Size(pFont, NULL); + ok(hr == E_POINTER, + "IFont::get_Size: Expected E_POINTER got 0x%08x\n", + hr); + + hr = IFont_get_Bold(pFont, NULL); + ok(hr == E_POINTER, + "IFont::get_Bold: Expected E_POINTER got 0x%08x\n", + hr); +} + START_TEST(olefont) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -827,4 +866,5 @@ START_TEST(olefont) test_IsEqual(); test_ReleaseHfont(); test_AddRefHfont(); + test_returns(); }

1 0

Jason Edmeades : user32/tests: Combo should preselect all text on first WM_SETFOCUS.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 0641192b520fda444e62e0aa84ddc67937f405a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0641192b520fda444e62e0aa8… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jan 24 12:37:59 2010 -0800 user32/tests: Combo should preselect all text on first WM_SETFOCUS. --- dlls/user32/tests/combo.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/edit.c | 8 ++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 8108dce..b0f7488 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -401,6 +401,106 @@ static void test_changesize( DWORD style) DestroyWindow(hCombo); } +static void test_editselection(void) +{ + HWND hCombo; + INT start,end; + HWND hEdit; + COMBOBOXINFO cbInfo; + BOOL ret; + DWORD len; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + char edit[20]; + + pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo){ + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + /* Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Initially combo selection is empty*/ + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Set some text, and press a key to replace it */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason1"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason1")==0, "Unexpected text retrieved %s\n", edit); + + /* Now what is the selection - still empty */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Give it focus, and it gets selected */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + todo_wine ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now emulate a key press */ + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + todo_wine ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); + + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now what happens when it gets more focus a second time - it doesnt reselect */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + DestroyWindow(hCombo); + + /* Start again - Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Set some text and give focus so it gets selected */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason2"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2")==0, "Unexpected text retrieved %s\n", edit); + + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + + /* Now what is the selection */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + todo_wine ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now change the selection to the apparently invalid start -1, end -1 and + show it means no selection (ie start -1) but cursor at end */ + SendMessage(hCombo, CB_SETEDITSEL, 0, -1); + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + todo_wine ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -414,6 +514,7 @@ START_TEST(combo) test_WM_LBUTTONDOWN(); test_changesize(CBS_DROPDOWN); test_changesize(CBS_DROPDOWNLIST); + test_editselection(); DestroyWindow(hMainWnd); } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 3b38d30..7ecee13 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -869,6 +869,14 @@ static void test_edit_control_3(void) ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); test_notify(1, 0, 1); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessage(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)"");

1 0